feat: one OpenCode per project — worktree sessions run in-app (#265) #273

Merged

dries merged 5 commits from integration/one-opencode-per-project into main 2026-07-09 14:29:36 +02:00

Conversation 1 Commits 5 Files changed 40 +1380 -725

dries commented 2026-07-09 12:50:40 +02:00

Owner

Copy link

Summary

One OpenCode instance per project. Worktree and same-directory
sessions now run in-app on that single instance instead of each
spawning their own opencode --port 0 in a dedicated tmux window.

Net effect per project: 1 opencode + 1 tmux session instead of N.

Implements the spec at spec/one-opencode-per-project/requirements.md
(parent #265) across four tickets.

What changed

• #266 — opencode.CreateSession sends the session's directory
  (URL-encoded x-opencode-directory header) so one instance can create
  a session rooted at an external directory (a worktree). Optional Port
  on CreateSessionRequest skips lsof discovery when the instance is
  already known.
• #267 — new hostsvc.Host.EnsureProjectOpencode: discovers or
  launches exactly one opencode per project (rooted at the main
  checkout), seeded with a scoped external_directory
OPENCODE_PERMISSION rule for the project's .worktrees/<repo>/**
  root. Idempotent; remote gRPC passthrough included.
• #268 — wires /wt, MCP new_session (worktree + same-dir), and
  loops spawn_worktree to create sessions in-app on the project
  instance. WorktreeSessionResult carries the created session ID;
  SessionLauncher drops the tmux launcher for an injected ensurer;
  frontend navigates to the session in-app.
• #269 — retires the per-worktree tmux machinery
  (LaunchWorktreeWindow, the ocman-worktree session, dead result
  fields, the frontend tmux-switch button) and updates AGENTS.md +
  docs/architecture.md.

Also includes a standalone test-infra fix: internal/mcp worktree test
now cleans GIT_* env so git init in a tempdir isn't hijacked by
hook-injected GIT_DIR.

Notes / limitations

• If a project's opencode was already running before this change, its
  launch was not seeded with the external_directory rule; runtime
  autoapprove covers that gap. (Documented in AGENTS.md.)
• The OPENCODE_PERMISSION merge helper composes with #101 (inherit
  parent always-allow) — that ticket is out of scope here.

Testing

make test && make lint && make build green. New tests cover the
directory header + URL-encoding, EnsureProjectOpencode
(discover/launch/idempotent/non-repo/timeout), the permission builder
(scoped, merge-preserving), and the in-app /wt wiring.

Reviewed via the two-axis code-review (standards + spec); the one
finding — a stale frontend tmux-switch button — is fixed in #269.

Closes #265
Closes #266
Closes #267
Closes #268
Closes #269

## Summary One OpenCode instance **per project**. Worktree and same-directory sessions now run **in-app** on that single instance instead of each spawning their own `opencode --port 0` in a dedicated tmux window. Net effect per project: **1 opencode + 1 tmux session** instead of N. Implements the spec at `spec/one-opencode-per-project/requirements.md` (parent #265) across four tickets. ## What changed - **#266** — `opencode.CreateSession` sends the session's `directory` (URL-encoded `x-opencode-directory` header) so one instance can create a session rooted at an external directory (a worktree). Optional `Port` on `CreateSessionRequest` skips lsof discovery when the instance is already known. - **#267** — new `hostsvc.Host.EnsureProjectOpencode`: discovers or launches exactly one opencode per project (rooted at the main checkout), seeded with a scoped `external_directory` `OPENCODE_PERMISSION` rule for the project's `.worktrees/<repo>/**` root. Idempotent; remote gRPC passthrough included. - **#268** — wires `/wt`, MCP `new_session` (worktree + same-dir), and loops `spawn_worktree` to create sessions in-app on the project instance. `WorktreeSessionResult` carries the created session ID; `SessionLauncher` drops the tmux launcher for an injected ensurer; frontend navigates to the session in-app. - **#269** — retires the per-worktree tmux machinery (`LaunchWorktreeWindow`, the `ocman-worktree` session, dead result fields, the frontend tmux-switch button) and updates AGENTS.md + `docs/architecture.md`. Also includes a standalone test-infra fix: `internal/mcp` worktree test now cleans `GIT_*` env so `git init` in a tempdir isn't hijacked by hook-injected `GIT_DIR`. ## Notes / limitations - If a project's opencode was **already running** before this change, its launch was not seeded with the `external_directory` rule; runtime autoapprove covers that gap. (Documented in AGENTS.md.) - The `OPENCODE_PERMISSION` merge helper composes with #101 (inherit parent always-allow) — that ticket is out of scope here. ## Testing `make test && make lint && make build` green. New tests cover the directory header + URL-encoding, `EnsureProjectOpencode` (discover/launch/idempotent/non-repo/timeout), the permission builder (scoped, merge-preserving), and the in-app `/wt` wiring. Reviewed via the two-axis code-review (standards + spec); the one finding — a stale frontend tmux-switch button — is fixed in #269. Closes #265 Closes #266 Closes #267 Closes #268 Closes #269

dries added 7 commits 2026-07-09 12:50:40 +02:00

init e951e3f871

test(mcp): clean GIT_* env for worktree test git init ... 38450e8b48

TestNewSession_WorktreeCreatesWithModel shelled out to git init with the
ambient environment, so GIT_DIR/GIT_INDEX_FILE injected by a git hook
made it operate on the wrong repo and ResolveRepoRoot later failed.
Strip the git context vars via gitexec.CleanEnv, matching the pattern in
internal/git and internal/server tests.

feat(opencode): send session directory on create (#266) ... 20ec5284dd

CreateSession now sends the requested directory via the
x-opencode-directory header so a single opencode instance can create a
session rooted at an external directory (a worktree). Adds an optional
Port field to CreateSessionRequest so callers with a known instance port
skip lsof discovery.

feat(hostsvc): add EnsureProjectOpencode host primitive (#267) ... 6b317e4f63

New Host.EnsureProjectOpencode guarantees exactly one opencode instance
per project, rooted at the main checkout: discovers a running instance
and, if none, launches one in tmux seeded with a scoped
external_directory OPENCODE_PERMISSION rule and waits for its port.
Idempotent. Wired through the local host and the remote gRPC passthrough;
no caller uses it yet (#268).

Merge branch 'feat/266-createsession-directory' into integration/one-opencode-per-project 9bd274c84f

feat(worktree): run worktree and same-dir sessions in-app on the project instance (#268) ... 76eec97602

Wire /wt, MCP new_session, and loops spawn_worktree through
EnsureProjectOpencode (#267) + directory-aware CreateSession (#266):

- CreateWorktreeSession ensures the project's single opencode instance,
  then creates the session in-app rooted at the worktree — no
  per-worktree tmux window. Returns the created session ID.
- WorktreeSessionResult gains SessionID; stops populating the
  tmux-switch fields.
- SessionLauncher drops launchTmux/discoverPort/waitForPort for a single
  injected project-opencode ensurer; worktree and same-dir splits
  self-heal instead of failing when no instance is running.
- URL-encode the x-opencode-directory header (paths with spaces).
- Frontend /wt navigates to the session in-app; Worktrees view joins by
  per-session directory.

LaunchWorktreeTmux is left wired but uncalled; #269 removes it.

refactor(tmux): retire per-worktree tmux launcher; update docs (#269) ... 7de0376c2d

Worktree sessions run in-app on the project's single opencode instance
(#268), so the per-worktree tmux machinery is dead. Remove:

- tmux.LaunchWorktreeWindow / LaunchWorktreeWindowWith and the
  WorktreeSession ("ocman-worktree") constant + their tests.
- the LaunchWorktreeTmux host dep and its server wiring.
- WorktreeSessionResult.{TmuxSession,TmuxTarget,OpencodeLaunched}.
- the frontend per-worktree tmux-switch button in WorktreesView and the
  now-dead tmuxTargetForWorktree / tmuxWindowNameForWorktreePath helpers
  (worktree rows now only offer in-app "Open session").

Update AGENTS.md, docs/architecture.md, and spec/worktree-sessions to
describe the one-opencode-per-project in-app model, the scoped
external_directory OPENCODE_PERMISSION seeding, and the
pre-existing-instance limitation.

dries force-pushed integration/one-opencode-per-project from 7de0376c2d to f1d1ffb7f1 2026-07-09 13:37:21 +02:00 Compare

dries force-pushed integration/one-opencode-per-project from f1d1ffb7f1 to ecea0136f5 2026-07-09 13:43:03 +02:00 Compare

dries force-pushed integration/one-opencode-per-project from ecea0136f5 to 5181602888 2026-07-09 14:18:28 +02:00 Compare

forgejo-actions commented 2026-07-09 14:25:55 +02:00

Copy link

Coverage ratchet: ✅ pass

Suite	Baseline	This PR	Δ
go	71.50%	71.80%	+0.30	✅
frontend	61.42%	61.52%	+0.10	✅

Tolerance: -0.1%. Baseline stored on gh-pages.

<!-- coverage-ratchet --> ### Coverage ratchet: ✅ pass | Suite | Baseline | This PR | Δ | | |---|---|---|---|---| | go | 71.50% | 71.80% | +0.30 | ✅ | | frontend | 61.42% | 61.52% | +0.10 | ✅ | _Tolerance: -0.1%. Baseline stored on `gh-pages`._

dries merged commit 5181602888 into main 2026-07-09 14:29:36 +02:00

dries deleted branch integration/one-opencode-per-project 2026-07-09 14:29:36 +02:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

backend

Go backend code

  

bug

Something is broken or incorrect

  

chore

Maintenance, tooling, or cleanup

  

duplication

Code duplication to be addressed

  

effort:complex

Significant effort or risk

  

effort:medium

Moderate effort required

  

effort:trivial

Quick fix, low complexity

  

enhancement

New feature or capability

  

frontend

TypeScript / React frontend code

  

fullstack

Touches both backend and frontend

  

priority:high

Should be addressed soon

  

ready-for-agent

Agent-grabbable ticket, fully specced

  

refactor

Code restructuring without behaviour change

  

security

Security related

No labels

backend

bug

chore

duplication

effort:complex

effort:medium

effort:trivial

enhancement

frontend

fullstack

priority:high

ready-for-agent

refactor

security

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

dries/ocman!273

No description provided.