Skip to content

feat: move worktree storage to ~/.workstreams/ external directory#110

Merged
amandal0903 merged 7 commits intomainfrom
update-worktree-directory
Apr 12, 2026
Merged

feat: move worktree storage to ~/.workstreams/ external directory#110
amandal0903 merged 7 commits intomainfrom
update-worktree-directory

Conversation

@amandal0903
Copy link
Copy Markdown
Collaborator

Summary

  • Worktrees now live outside the repo at ~/.workstreams/<repoName>/<branchName>/<repoName>/ — eliminates .gitignore management, git-in-git nesting,
    and shows the project name in VS Code's title bar
  • Comments, metadata, and images co-located per branch at ~/.workstreams/<repoName>/<branchName>/
  • Removed dead code: ensureGitignore(), .workstreams traversal filter and sub-repo skip in git extension
  • Bumps version to 0.2.15

Worktrees now live outside the repository under a central
~/.workstreams/ directory. This eliminates .gitignore management,
git-in-git nesting, and gives VS Code a proper project name in
the title bar.

Structure: ~/.workstreams/<repoName>/<branchName>/<repoName>/
Metadata:  ~/.workstreams/<repoName>/<branchName>/workstream.json
Comments:  ~/.workstreams/<repoName>/<branchName>/comments.json
Images:    ~/.workstreams/<repoName>/<branchName>/images/

Bumps version to 0.2.15.
Worktrees under ~/.workstreams/ are managed by the orchestrator and
should bypass the workspace trust dialog. Adds an isWorkstreamsWorktree
check in doGetUriTrustInfo so all trust lookups (folder swap, git
extension) resolve as trusted for these paths.
Comments were keyed by worktree.name (display name like "Update
worktree directory") instead of worktree.branch (git branch like
"update-worktree-directory"). This caused comments to be saved in a
different directory than branchDir() uses for metadata, and would
orphan comments if the display name ever changed.
@cloudflare-workers-and-pages
Copy link
Copy Markdown

cloudflare-workers-and-pages bot commented Apr 12, 2026

Deploying workstreams with  Cloudflare Pages  Cloudflare Pages

Latest commit: 90ae9f0
Status: ✅  Deploy successful!
Preview URL: https://ddb664da.workstreams-31f.pages.dev
Branch Preview URL: https://update-worktree-directory.workstreams-31f.pages.dev

View logs

The git extension auto-discovers worktree repos under ~/.workstreams/
and registers them as separate SCM providers. Skip these unless the
repo is the current workspace folder (the active worktree).
Tests do heavy git I/O (create repos, worktrees, remotes, push)
which can exceed the default 2s mocha timeout.
@amandal0903 amandal0903 merged commit 8e3dec0 into main Apr 12, 2026
1 check passed
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.

1 participant