Skip to content

Add worktree bootstrap for local configuration - #56

Merged
comp615 merged 2 commits into
block:mainfrom
comp615:fix/worktree-bootstrap
Sep 14, 2026
Merged

comp615 merged 2 commits into
block:mainfrom
comp615:fix/worktree-bootstrap

Conversation

@comp615

@comp615 comp615 commented Sep 14, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • require agents to bootstrap every newly created worktree
  • copy the source checkout's ignored .env.local without overwriting target configuration
  • use the new worktree's Hermit-provided bin/pnpm install --frozen-lockfile
  • leave machine-shared Keychain credentials and pnpm package cache in place instead of copying arbitrary ignored files

Validation

  • created a fresh worktree and copied its missing .env.local
  • installed locked dependencies through the worktree's bin/pnpm Hermit proxy
  • verified repeated bootstrap preserves existing and differing target configuration
  • verified another repository is rejected as a source
  • verified Vite enables the relay broker from the copied configuration
  • ran shell syntax and git diff --check

🤖 Written with Amp.

Signed-off-by: Charlie Croom <ccroom@squareup.com>
Amp-Thread-ID: https://ampcode.com/threads/T-01a0a0a7-fa7d-74da-94c6-0c908ecce474
Co-authored-by: Amp <amp@ampcode.com>
@comp615
comp615 requested a review from wesbillman as a code owner September 14, 2026 16:11
Signed-off-by: Charlie Croom <ccroom@squareup.com>
Amp-Thread-ID: https://ampcode.com/threads/T-01a0a0a7-fa7d-74da-94c6-0c908ecce474
Co-authored-by: Amp <amp@ampcode.com>
@comp615
comp615 merged commit 792e958 into block:main Sep 14, 2026
12 checks passed
@comp615
comp615 deleted the fix/worktree-bootstrap branch September 14, 2026 19:20
delkc added a commit that referenced this pull request Sep 15, 2026
* origin/main:
  Fix inline mention styling in channels (#74)
  Fix self-replenishing background channel warming (#71)
  Add links and thread previews (#42)
  Add shared receive-only channel and thread typing (#33)
  Warm channel heads in the background before they are opened (#54)
  Add Developer settings tab with cache clear and broker stats (#53)
  Request sized relay media for avatars (#58)
  Allow parallel browser development ports (#57)
  Add worktree bootstrap for local configuration (#56)
  Make thread opens part of navigation history (#55)
  Remove the decoded-avatar hot set; respect Save-Data (#60)
  Add CODEOWNERS reviewers (#61)
  Add guarded Workflows page and session capability (#48)

Signed-off-by: Clay Delk <clay.delk@gmail.com>

# Conflicts:
#	dev/relay-broker.mjs
#	src/bundled/channels/ChannelsPage.tsx
#	src/features/messages/ChannelTimeline.tsx
#	src/features/messages/MessageComposer.tsx
#	src/features/messages/MessageRow.tsx
#	src/features/messages/ThreadPanel.test.tsx
#	src/features/messages/ThreadPanel.tsx
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