Skip to content

relase branch rebased with main#84

Merged
amandal0903 merged 16 commits intoreleasefrom
relase-rebased-with-main
Apr 7, 2026
Merged

relase branch rebased with main#84
amandal0903 merged 16 commits intoreleasefrom
relase-rebased-with-main

Conversation

@amandal0903
Copy link
Copy Markdown
Collaborator

What

release branch rebased with main

amandal0903 and others added 16 commits April 6, 2026 01:42
* Support inline diff view and add GitHub-style L/R comment labels

- Remove forced side-by-side mode that blocked inline diff view
- Restore useInlineViewWhenSpaceIsLimited default to true
- Add GitHub-style line labels: L{n} for original, R{n} for modified
- Fix race condition in getDocumentComments via EditorOption.inDiffEditor fallback
- Show comments from both sides in inline mode on the modified editor
- Refresh widgets when user toggles between split and inline view
- Use diff computation result for consistent labels between creation and restoration
- Add 18 unit tests for controller side/label detection logic

* Fix type errors in comment controller test

- Remove unused CommentSide import
- Add missing updatedAt field to mock getThread return
- Use Pick<DisposableStore, 'add'> to match ensureNoDisposablesAreLeakedInTestSuite return type

* Fix diff stats to combine committed and local changes in a single pass

The old logic used an either/or approach: show committed-against-base
stats OR local working-tree changes, never both. This meant uncommitted
edits were invisible when the branch had commits ahead.

Replace with a single `git diff --numstat baseRef` that compares the
base ref directly to the working tree, capturing committed + staged +
unstaged changes in one accurate numstat without double-counting.
Untracked files are still added separately.

Also document the diff stats calculation in CLAUDE.md/copilot-instructions.md
and add 6 new test cases covering: .claude/ exclusion, large untracked files,
file deletions, staged+unstaged overlap, and the full combined scenario.
* Add auto-update system with GitHub Releases and orchestrator banner

- Add GitHub Actions workflow (release-dmg.yml) that builds arm64/x64
  DMGs and zips on push to release branch, publishes GitHub Release
- Add WorkstreamsUpdateService that polls GitHub Releases API, downloads
  update zip, extracts .app, and swaps on restart via helper script
- Add update banner to orchestrator sidebar bottom with three states:
  [Update]/[Changelog] → [Downloading...] → [Restart]/[Changelog]
- Add changelogUrl field to IUpdate interface for release page links
- Configure product.json with updateUrl and quality for update checks

* Support inline diff view and add GitHub-style L/R comment labels

- Remove forced side-by-side mode that blocked inline diff view
- Restore useInlineViewWhenSpaceIsLimited default to true
- Add GitHub-style line labels: L{n} for original, R{n} for modified
- Fix race condition in getDocumentComments via EditorOption.inDiffEditor fallback
- Show comments from both sides in inline mode on the modified editor
- Refresh widgets when user toggles between split and inline view
- Use diff computation result for consistent labels between creation and restoration
- Add 18 unit tests for controller side/label detection logic

* Set initial version to 0.1.0

* Fix conflict resolution in comment controller test

Restore main's changes: remove unused CommentSide import, use Pick<DisposableStore> type, add updatedAt to mock thread

* Update package.json: bump to 0.2.0, set Workstream Labs author and Elastic-2.0 license

---------
* Support inline diff view and add GitHub-style L/R comment labels

- Remove forced side-by-side mode that blocked inline diff view
- Restore useInlineViewWhenSpaceIsLimited default to true
- Add GitHub-style line labels: L{n} for original, R{n} for modified
- Fix race condition in getDocumentComments via EditorOption.inDiffEditor fallback
- Show comments from both sides in inline mode on the modified editor
- Refresh widgets when user toggles between split and inline view
- Use diff computation result for consistent labels between creation and restoration
- Add 18 unit tests for controller side/label detection logic

* Fix type errors in comment controller test

- Remove unused CommentSide import
- Add missing updatedAt field to mock getThread return
- Use Pick<DisposableStore, 'add'> to match ensureNoDisposablesAreLeakedInTestSuite return type

* Use git-branch icon for local branch to distinguish from worktrees

* Set VS Code API version in product.json to fix extension activation

Built-in extensions like json-language-features require vscode ^1.91.0
but the app reported 0.2.0 (from package.json). Adding the version to
product.json prevents the fallback and reports the correct API version.

* fix: version
* Support inline diff view and add GitHub-style L/R comment labels

- Remove forced side-by-side mode that blocked inline diff view
- Restore useInlineViewWhenSpaceIsLimited default to true
- Add GitHub-style line labels: L{n} for original, R{n} for modified
- Fix race condition in getDocumentComments via EditorOption.inDiffEditor fallback
- Show comments from both sides in inline mode on the modified editor
- Refresh widgets when user toggles between split and inline view
- Use diff computation result for consistent labels between creation and restoration
- Add 18 unit tests for controller side/label detection logic

* Fix type errors in comment controller test

- Remove unused CommentSide import
- Add missing updatedAt field to mock getThread return
- Use Pick<DisposableStore, 'add'> to match ensureNoDisposablesAreLeakedInTestSuite return type

* Fix diff stats to combine committed and local changes in a single pass

The old logic used an either/or approach: show committed-against-base
stats OR local working-tree changes, never both. This meant uncommitted
edits were invisible when the branch had commits ahead.

Replace with a single `git diff --numstat baseRef` that compares the
base ref directly to the working tree, capturing committed + staged +
unstaged changes in one accurate numstat without double-counting.
Untracked files are still added separately.

Also document the diff stats calculation in CLAUDE.md/copilot-instructions.md
and add 6 new test cases covering: .claude/ exclusion, large untracked files,
file deletions, staged+unstaged overlap, and the full combined scenario.

* Use git-branch icon for local branch to distinguish from worktrees

* Main release (#71)

* Add end-to-end auto-update system (#69)

* Add auto-update system with GitHub Releases and orchestrator banner

- Add GitHub Actions workflow (release-dmg.yml) that builds arm64/x64
  DMGs and zips on push to release branch, publishes GitHub Release
- Add WorkstreamsUpdateService that polls GitHub Releases API, downloads
  update zip, extracts .app, and swaps on restart via helper script
- Add update banner to orchestrator sidebar bottom with three states:
  [Update]/[Changelog] → [Downloading...] → [Restart]/[Changelog]
- Add changelogUrl field to IUpdate interface for release page links
- Configure product.json with updateUrl and quality for update checks

* Support inline diff view and add GitHub-style L/R comment labels

- Remove forced side-by-side mode that blocked inline diff view
- Restore useInlineViewWhenSpaceIsLimited default to true
- Add GitHub-style line labels: L{n} for original, R{n} for modified
- Fix race condition in getDocumentComments via EditorOption.inDiffEditor fallback
- Show comments from both sides in inline mode on the modified editor
- Refresh widgets when user toggles between split and inline view
- Use diff computation result for consistent labels between creation and restoration
- Add 18 unit tests for controller side/label detection logic

* Set initial version to 0.1.0

* Fix conflict resolution in comment controller test

Restore main's changes: remove unused CommentSide import, use Pick<DisposableStore> type, add updatedAt to mock thread

* Update package.json: bump to 0.2.0, set Workstream Labs author and Elastic-2.0 license

---------

* Test b (#70)

* Support inline diff view and add GitHub-style L/R comment labels

- Remove forced side-by-side mode that blocked inline diff view
- Restore useInlineViewWhenSpaceIsLimited default to true
- Add GitHub-style line labels: L{n} for original, R{n} for modified
- Fix race condition in getDocumentComments via EditorOption.inDiffEditor fallback
- Show comments from both sides in inline mode on the modified editor
- Refresh widgets when user toggles between split and inline view
- Use diff computation result for consistent labels between creation and restoration
- Add 18 unit tests for controller side/label detection logic

* Fix type errors in comment controller test

- Remove unused CommentSide import
- Add missing updatedAt field to mock getThread return
- Use Pick<DisposableStore, 'add'> to match ensureNoDisposablesAreLeakedInTestSuite return type

* Use git-branch icon for local branch to distinguish from worktrees

* Set VS Code API version in product.json to fix extension activation

Built-in extensions like json-language-features require vscode ^1.91.0
but the app reported 0.2.0 (from package.json). Adding the version to
product.json prevents the fallback and reports the correct API version.

* fix: version

* fix: icon

* bump version to 0.2.1

* Test release! (#72)

* Add end-to-end auto-update system (#69)

* Add auto-update system with GitHub Releases and orchestrator banner

- Add GitHub Actions workflow (release-dmg.yml) that builds arm64/x64
  DMGs and zips on push to release branch, publishes GitHub Release
- Add WorkstreamsUpdateService that polls GitHub Releases API, downloads
  update zip, extracts .app, and swaps on restart via helper script
- Add update banner to orchestrator sidebar bottom with three states:
  [Update]/[Changelog] → [Downloading...] → [Restart]/[Changelog]
- Add changelogUrl field to IUpdate interface for release page links
- Configure product.json with updateUrl and quality for update checks

* Support inline diff view and add GitHub-style L/R comment labels

- Remove forced side-by-side mode that blocked inline diff view
- Restore useInlineViewWhenSpaceIsLimited default to true
- Add GitHub-style line labels: L{n} for original, R{n} for modified
- Fix race condition in getDocumentComments via EditorOption.inDiffEditor fallback
- Show comments from both sides in inline mode on the modified editor
- Refresh widgets when user toggles between split and inline view
- Use diff computation result for consistent labels between creation and restoration
- Add 18 unit tests for controller side/label detection logic

* Set initial version to 0.1.0

* Fix conflict resolution in comment controller test

Restore main's changes: remove unused CommentSide import, use Pick<DisposableStore> type, add updatedAt to mock thread

* Update package.json: bump to 0.2.0, set Workstream Labs author and Elastic-2.0 license

---------

* Test b (#70)

* Support inline diff view and add GitHub-style L/R comment labels

- Remove forced side-by-side mode that blocked inline diff view
- Restore useInlineViewWhenSpaceIsLimited default to true
- Add GitHub-style line labels: L{n} for original, R{n} for modified
- Fix race condition in getDocumentComments via EditorOption.inDiffEditor fallback
- Show comments from both sides in inline mode on the modified editor
- Refresh widgets when user toggles between split and inline view
- Use diff computation result for consistent labels between creation and restoration
- Add 18 unit tests for controller side/label detection logic

* Fix type errors in comment controller test

- Remove unused CommentSide import
- Add missing updatedAt field to mock getThread return
- Use Pick<DisposableStore, 'add'> to match ensureNoDisposablesAreLeakedInTestSuite return type

* Use git-branch icon for local branch to distinguish from worktrees

* Set VS Code API version in product.json to fix extension activation

Built-in extensions like json-language-features require vscode ^1.91.0
but the app reported 0.2.0 (from package.json). Adding the version to
product.json prevents the fallback and reports the correct API version.

* fix: version

* fix: icon

* bump version to 0.2.1

* move release workflow to repo root .github/workflows/ so GitHub discovers it

* bump version to 0.2.2

* Main release (#73)

* Test relese 2 (#74)

* Main release (#75)

* Resolved branch containing changes both from 'release' & 'main' (#77)
- Fix comment duplication when switching between unified and split diff views — comments no longer appear twice after toggling view modes                                          
- Fix multiple comments on the same line being hidden due to widget deduplication logic                                   
- Enable comment glyphs on untracked and SCM-changed files — users can now leave comments on files that aren't yet committed       
- Fix context/addition line labeling and cross-editor side assignment in diff comments (GitHub-style L/R labels)        
- Hook lifecycle management fix
- Version bump to 0.2.6

---------
Co-authored-by: Gagan Aryan <gaganaryan19@gmail.com>
* Add create issue button to layout control menu

* Open GitHub issue chooser on create issue button click

* Replace branch picker codicon with git-branch PNG icon

* Use git-branch PNG icon in add worktree modal and clean up dead code
…editor terminal (#81)

* Fix worktree switch tab order and focus restoration

Preserve the original interleaved editor/terminal tab order when
switching between worktrees. Previously, Phase 2 terminal restore
appended terminals at the end (e.g. [E1, E2, T1, T2] instead of
[E1, T1, T2, E2]) and the last terminal stole focus.

- Add tabIndex to ITerminalOwnership; snapshot in Phase 1 alongside
  groupIndex so each terminal's tab position is recorded before
  backgrounding
- After Phase 2 shows terminals, reorder them to their saved tabIndex
  via moveEditor to restore original interleaved positions
- Save per-group active editor URI in Phase 1; restore focus in Phase 2
  after terminals are re-shown to prevent focus theft
- Replace console.warn debug leftovers with logService.trace
- Skip duplicate Stop notifications (self-transition guard)
- Fix test mocks: add shellLaunchConfig, capabilities, getSessionState

* Bump version to v0.2.8

* Remap Cmd+J to open terminal in editor area instead of toggling bottom panel
@amandal0903 amandal0903 merged commit c633d62 into release Apr 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants