feat(mcp): expose thread workspace inventory

[juliusmarminge]

Problem

An agent can see only the branch and worktree path recorded on its own thread. That does not reveal whether Git still agrees, which physical worktrees are available, whether they are dirty, or which live threads are bound to them.

Change

• enrich t3_worktree_status with separate recorded and actual workspace state plus an agreement result
• add bounded, cursor-based t3_worktree_list results with bounded thread bindings and per-entry availability
• add a dedicated internal Git worktree inventory read that returns canonical common-directory and physical worktree-root identity
• include detached and missing/prunable registered entries without changing the existing paginated vcs.listRefs wire payload or cache shape
• resolve each distinct nested or symlinked recorded path through Git identity before attributing it to a physical checkout
• expose both read tools consistently, including Claude read-only permission handling, presentation labels, tests, and docs

Behavior

These tools are read-only and current-project scoped. Inventory pages are sliced before per-worktree status reads, one missing or unreadable checkout produces an explicit entry outcome instead of failing the entire page, and plain non-repository project roots return a truthful status. Nested independent repositories are not attributed to a containing checkout. The tools do not create, switch, remove, prune, revive, or repair worktrees.

Validation

• vp test run apps/server/src/mcp/WorktreeMcpService.test.ts (60 tests)
• vp test run apps/server/src/vcs/GitVcsDriverCore.test.ts (58 tests)
• focused contracts, client-runtime, Git workflow, MCP registration, and Claude adapter coverage from the stack
• old-shape vcs.listRefs decode/cache compatibility coverage
• real GitWorkflow non-repository status plus detached, symlink, nested-repository, archived-binding, missing-path, and stale-entry coverage
• targeted server TypeScript check and targeted lint

Dependency

Bottom of native stack #8711, rooted on agents/mcp-controls/base-490318a at 490318afa505d3d033295eca12d7e62b4b922725. The dependent checkout mutation is PR #8680. This is independent of lifecycle PR #5589.

Implemented by GPT-5.6-Sol via Codex in T3 Code.

---

Note

Medium Risk
Breaking change:WorktreeMcpStatusResult adds required fields. New Git inventory and binding-resolution logic touches thread workspace attribution; mistakes could mis-report bindings or agreement, though tools are read-only and project-scoped.

Overview
Adds read-only workspace discovery for agents: t3_worktree_list pages Git-registered checkouts in the current project (branch, dirty state, availability, thread bindings) and t3_worktree_status now compares recorded thread metadata to on-disk Git state via an agreement field.

Git gains listWorktrees (canonical paths, common dir, detached entries) wired through GitWorkflowService; list/status resolve nested or symlinked recorded paths against repository identity without changing the vcs.listRefs wire shape. Claude’s read-only MCP allowlist, tool registration, presentation labels, and docs are updated accordingly.

^{Reviewed by Cursor Bugbot for commit 9eaeae0. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add listWorktrees operation to WorktreeMcpService and extend status result

• Exposes a new t3_worktree_list MCP tool that returns a paginated inventory of project git worktrees with per-worktree branch, git status, availability, and durable thread bindings.
• Adds listWorktrees(cwd) to GitVcsDriver and GitWorkflowService to enumerate worktree checkouts including detached ones, with canonicalized real paths via fileSystem.realPath.
• Extends WorktreeMcpStatusResult with recordedWorkspace, actualWorkspace, and agreement fields that compare the thread's recorded checkout against the physical repo state.
• Updates docs, read-only Claude allowlist, and tool presentation map to include the new tool.
• Behavioral Change: WorktreeMcpStatusResult schema now requires three new fields (recordedWorkspace, actualWorkspace, agreement); existing consumers of the status result must decode the new shape. Local branch refs in readGitRefsSnapshot now include prunable worktrees whose directories still exist.

^{Macroscope summarized 9eaeae0.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 71b8ce76-89e2-4f74-b444-f8a7e54f290f

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

Warning

Your free Security trial is over. An organization admin can activate Security or dismiss this notice.

---

_{Comment @coderabbitai help to get the list of available commands.}

[github-actions]

Thread transfer impact

⚠️ The latest CI run did not produce a thread transfer result for 9eaeae0.

This comment will update automatically after the next completed run.

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This PR adds a substantial agent-facing worktree inventory capability and changes existing status behavior, Git identity handling, and the MCP response contract. Its read-only scope limits operational risk, but the new runtime surface and shared VCS changes warrant human review.

No code changes detected at 9eaeae0. Prior analysis still applies.

^{You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

Macroscope has since reviewed this pull request. An earlier review was skipped by a cost limit; a review has now completed, so that notice no longer applies.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{Bugbot Autofix is ON, but a cloud agent failed to start.}

^{Reviewed by Cursor Bugbot for commit d1a6955. Configure here.}

[juliusmarminge]

Problem

An agent can see only the branch and worktree path recorded on its own thread. That does not reveal whether Git still agrees, which physical worktrees are available, whether they are dirty, or which live threads are bound to them.

Change

• enrich t3_worktree_status with separate recorded and actual workspace state plus an agreement result
• add bounded, cursor-based t3_worktree_list results with bounded thread bindings and per-entry availability
• add a dedicated internal Git worktree inventory read that returns canonical common-directory and physical worktree-root identity
• include detached and missing/prunable registered entries without changing the existing paginated vcs.listRefs wire payload or cache shape
• resolve each distinct nested or symlinked recorded path through Git identity before attributing it to a physical checkout
• expose both read tools consistently, including Claude read-only permission handling, presentation labels, tests, and docs

Behavior

These tools are read-only and current-project scoped. Inventory pages are sliced before per-worktree status reads, one missing or unreadable checkout produces an explicit entry outcome instead of failing the entire page, and plain non-repository project roots return a truthful status. Nested independent repositories are not attributed to a containing checkout. The tools do not create, switch, remove, prune, revive, or repair worktrees.

Validation

• vp test run apps/server/src/mcp/WorktreeMcpService.test.ts (60 tests)
• vp test run apps/server/src/vcs/GitVcsDriverCore.test.ts (58 tests)
• focused contracts, client-runtime, Git workflow, MCP registration, and Claude adapter coverage from the stack
• old-shape vcs.listRefs decode/cache compatibility coverage
• real GitWorkflow non-repository status plus detached, symlink, nested-repository, archived-binding, missing-path, and stale-entry coverage
• targeted server TypeScript check and targeted lint

Dependency

Bottom of native stack #8711, rooted on agents/mcp-controls/base-490318a at 490318afa505d3d033295eca12d7e62b4b922725. The dependent checkout mutation is PR #8680. This is independent of lifecycle PR #5589.

Implemented by GPT-5.6-Sol via Codex in T3 Code.

---

Note

Medium Risk
Breaking change:WorktreeMcpStatusResult adds required fields. New Git inventory and binding-resolution logic touches thread workspace attribution; mistakes could mis-report bindings or agreement, though tools are read-only and project-scoped.

Overview
Adds read-only workspace discovery for agents: t3_worktree_list pages Git-registered checkouts in the current project (branch, dirty state, availability, thread bindings) and t3_worktree_status now compares recorded thread metadata to on-disk Git state via an agreement field.

Git gains listWorktrees (canonical paths, common dir, detached entries) wired through GitWorkflowService; list/status resolve nested or symlinked recorded paths against repository identity without changing the vcs.listRefs wire shape. Claude’s read-only MCP allowlist, tool registration, presentation labels, and docs are updated accordingly.

^{Reviewed by Cursor Bugbot for commit 9eaeae0. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add listWorktrees operation to WorktreeMcpService and extend status result

• Exposes a new t3_worktree_list MCP tool that returns a paginated inventory of project git worktrees with per-worktree branch, git status, availability, and durable thread bindings.
• Adds listWorktrees(cwd) to GitVcsDriver and GitWorkflowService to enumerate worktree checkouts including detached ones, with canonicalized real paths via fileSystem.realPath.
• Extends WorktreeMcpStatusResult with recordedWorkspace, actualWorkspace, and agreement fields that compare the thread's recorded checkout against the physical repo state.
• Updates docs, read-only Claude allowlist, and tool presentation map to include the new tool.
• Behavioral Change: WorktreeMcpStatusResult schema now requires three new fields (recordedWorkspace, actualWorkspace, agreement); existing consumers of the status result must decode the new shape. Local branch refs in readGitRefsSnapshot now include prunable worktrees whose directories still exist.

^{Macroscope summarized 9eaeae0.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 71b8ce76-89e2-4f74-b444-f8a7e54f290f

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

Warning

Your free Security trial is over. An organization admin can activate Security or dismiss this notice.

---

_{Comment @coderabbitai help to get the list of available commands.}

[github-actions]

Thread transfer impact

⚠️ The latest CI run did not produce a thread transfer result for 9eaeae0.

This comment will update automatically after the next completed run.

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This PR adds a substantial agent-facing worktree inventory capability and changes existing status behavior, Git identity handling, and the MCP response contract. Its read-only scope limits operational risk, but the new runtime surface and shared VCS changes warrant human review.

No code changes detected at 9eaeae0. Prior analysis still applies.

^{You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

Macroscope has since reviewed this pull request. An earlier review was skipped by a cost limit; a review has now completed, so that notice no longer applies.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{Bugbot Autofix is ON, but a cloud agent failed to start.}

^{Reviewed by Cursor Bugbot for commit d1a6955. Configure here.}

[juliusmarminge]

Problem

An agent can see only the branch and worktree path recorded on its own thread. That does not reveal whether Git still agrees, which physical worktrees are available, whether they are dirty, or which live threads are bound to them.

Change

• enrich t3_worktree_status with separate recorded and actual workspace state plus an agreement result
• add bounded, cursor-based t3_worktree_list results with bounded thread bindings and per-entry availability
• add a dedicated internal Git worktree inventory read that returns canonical common-directory and physical worktree-root identity
• include detached and missing/prunable registered entries without changing the existing paginated vcs.listRefs wire payload or cache shape
• resolve each distinct nested or symlinked recorded path through Git identity before attributing it to a physical checkout
• expose both read tools consistently, including Claude read-only permission handling, presentation labels, tests, and docs

Behavior

These tools are read-only and current-project scoped. Inventory pages are sliced before per-worktree status reads, one missing or unreadable checkout produces an explicit entry outcome instead of failing the entire page, and plain non-repository project roots return a truthful status. Nested independent repositories are not attributed to a containing checkout. The tools do not create, switch, remove, prune, revive, or repair worktrees.

Validation

• vp test run apps/server/src/mcp/WorktreeMcpService.test.ts (60 tests)
• vp test run apps/server/src/vcs/GitVcsDriverCore.test.ts (58 tests)
• focused contracts, client-runtime, Git workflow, MCP registration, and Claude adapter coverage from the stack
• old-shape vcs.listRefs decode/cache compatibility coverage
• real GitWorkflow non-repository status plus detached, symlink, nested-repository, archived-binding, missing-path, and stale-entry coverage
• targeted server TypeScript check and targeted lint

Dependency

Bottom of native stack #8711, rooted on agents/mcp-controls/base-490318a at 490318afa505d3d033295eca12d7e62b4b922725. The dependent checkout mutation is PR #8680. This is independent of lifecycle PR #5589.

Implemented by GPT-5.6-Sol via Codex in T3 Code.

---

Note

Medium Risk
Breaking change:WorktreeMcpStatusResult adds required fields. New Git inventory and binding-resolution logic touches thread workspace attribution; mistakes could mis-report bindings or agreement, though tools are read-only and project-scoped.

Overview
Adds read-only workspace discovery for agents: t3_worktree_list pages Git-registered checkouts in the current project (branch, dirty state, availability, thread bindings) and t3_worktree_status now compares recorded thread metadata to on-disk Git state via an agreement field.

Git gains listWorktrees (canonical paths, common dir, detached entries) wired through GitWorkflowService; list/status resolve nested or symlinked recorded paths against repository identity without changing the vcs.listRefs wire shape. Claude’s read-only MCP allowlist, tool registration, presentation labels, and docs are updated accordingly.

^{Reviewed by Cursor Bugbot for commit 9eaeae0. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add listWorktrees operation to WorktreeMcpService and extend status result

• Exposes a new t3_worktree_list MCP tool that returns a paginated inventory of project git worktrees with per-worktree branch, git status, availability, and durable thread bindings.
• Adds listWorktrees(cwd) to GitVcsDriver and GitWorkflowService to enumerate worktree checkouts including detached ones, with canonicalized real paths via fileSystem.realPath.
• Extends WorktreeMcpStatusResult with recordedWorkspace, actualWorkspace, and agreement fields that compare the thread's recorded checkout against the physical repo state.
• Updates docs, read-only Claude allowlist, and tool presentation map to include the new tool.
• Behavioral Change: WorktreeMcpStatusResult schema now requires three new fields (recordedWorkspace, actualWorkspace, agreement); existing consumers of the status result must decode the new shape. Local branch refs in readGitRefsSnapshot now include prunable worktrees whose directories still exist.

^{Macroscope summarized 9eaeae0.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 71b8ce76-89e2-4f74-b444-f8a7e54f290f

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

Warning

Your free Security trial is over. An organization admin can activate Security or dismiss this notice.

---

_{Comment @coderabbitai help to get the list of available commands.}

[github-actions]

Thread transfer impact

⚠️ The latest CI run did not produce a thread transfer result for 9eaeae0.

This comment will update automatically after the next completed run.

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This PR adds a substantial agent-facing worktree inventory capability and changes existing status behavior, Git identity handling, and the MCP response contract. Its read-only scope limits operational risk, but the new runtime surface and shared VCS changes warrant human review.

No code changes detected at 9eaeae0. Prior analysis still applies.

^{You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

Macroscope has since reviewed this pull request. An earlier review was skipped by a cost limit; a review has now completed, so that notice no longer applies.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{Bugbot Autofix is ON, but a cloud agent failed to start.}

^{Reviewed by Cursor Bugbot for commit d1a6955. Configure here.}

[juliusmarminge]

Problem

An agent can see only the branch and worktree path recorded on its own thread. That does not reveal whether Git still agrees, which physical worktrees are available, whether they are dirty, or which live threads are bound to them.

Change

• enrich t3_worktree_status with separate recorded and actual workspace state plus an agreement result
• add bounded, cursor-based t3_worktree_list results with bounded thread bindings and per-entry availability
• add a dedicated internal Git worktree inventory read that returns canonical common-directory and physical worktree-root identity
• include detached and missing/prunable registered entries without changing the existing paginated vcs.listRefs wire payload or cache shape
• resolve each distinct nested or symlinked recorded path through Git identity before attributing it to a physical checkout
• expose both read tools consistently, including Claude read-only permission handling, presentation labels, tests, and docs

Behavior

These tools are read-only and current-project scoped. Inventory pages are sliced before per-worktree status reads, one missing or unreadable checkout produces an explicit entry outcome instead of failing the entire page, and plain non-repository project roots return a truthful status. Nested independent repositories are not attributed to a containing checkout. The tools do not create, switch, remove, prune, revive, or repair worktrees.

Validation

• vp test run apps/server/src/mcp/WorktreeMcpService.test.ts (60 tests)
• vp test run apps/server/src/vcs/GitVcsDriverCore.test.ts (58 tests)
• focused contracts, client-runtime, Git workflow, MCP registration, and Claude adapter coverage from the stack
• old-shape vcs.listRefs decode/cache compatibility coverage
• real GitWorkflow non-repository status plus detached, symlink, nested-repository, archived-binding, missing-path, and stale-entry coverage
• targeted server TypeScript check and targeted lint

Dependency

Bottom of native stack #8711, rooted on agents/mcp-controls/base-490318a at 490318afa505d3d033295eca12d7e62b4b922725. The dependent checkout mutation is PR #8680. This is independent of lifecycle PR #5589.

Implemented by GPT-5.6-Sol via Codex in T3 Code.

---

Note

Medium Risk
Breaking change:WorktreeMcpStatusResult adds required fields. New Git inventory and binding-resolution logic touches thread workspace attribution; mistakes could mis-report bindings or agreement, though tools are read-only and project-scoped.

Overview
Adds read-only workspace discovery for agents: t3_worktree_list pages Git-registered checkouts in the current project (branch, dirty state, availability, thread bindings) and t3_worktree_status now compares recorded thread metadata to on-disk Git state via an agreement field.

Git gains listWorktrees (canonical paths, common dir, detached entries) wired through GitWorkflowService; list/status resolve nested or symlinked recorded paths against repository identity without changing the vcs.listRefs wire shape. Claude’s read-only MCP allowlist, tool registration, presentation labels, and docs are updated accordingly.

^{Reviewed by Cursor Bugbot for commit 9eaeae0. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add listWorktrees operation to WorktreeMcpService and extend status result

• Exposes a new t3_worktree_list MCP tool that returns a paginated inventory of project git worktrees with per-worktree branch, git status, availability, and durable thread bindings.
• Adds listWorktrees(cwd) to GitVcsDriver and GitWorkflowService to enumerate worktree checkouts including detached ones, with canonicalized real paths via fileSystem.realPath.
• Extends WorktreeMcpStatusResult with recordedWorkspace, actualWorkspace, and agreement fields that compare the thread's recorded checkout against the physical repo state.
• Updates docs, read-only Claude allowlist, and tool presentation map to include the new tool.
• Behavioral Change: WorktreeMcpStatusResult schema now requires three new fields (recordedWorkspace, actualWorkspace, agreement); existing consumers of the status result must decode the new shape. Local branch refs in readGitRefsSnapshot now include prunable worktrees whose directories still exist.

^{Macroscope summarized 9eaeae0.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 71b8ce76-89e2-4f74-b444-f8a7e54f290f

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

Warning

Your free Security trial is over. An organization admin can activate Security or dismiss this notice.

---

_{Comment @coderabbitai help to get the list of available commands.}

[github-actions]

Thread transfer impact

⚠️ The latest CI run did not produce a thread transfer result for 9eaeae0.

This comment will update automatically after the next completed run.

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This PR adds a substantial agent-facing worktree inventory capability and changes existing status behavior, Git identity handling, and the MCP response contract. Its read-only scope limits operational risk, but the new runtime surface and shared VCS changes warrant human review.

No code changes detected at 9eaeae0. Prior analysis still applies.

^{You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

Macroscope has since reviewed this pull request. An earlier review was skipped by a cost limit; a review has now completed, so that notice no longer applies.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{Bugbot Autofix is ON, but a cloud agent failed to start.}

^{Reviewed by Cursor Bugbot for commit d1a6955. Configure here.}

[juliusmarminge]

Problem

An agent can see only the branch and worktree path recorded on its own thread. That does not reveal whether Git still agrees, which physical worktrees are available, whether they are dirty, or which live threads are bound to them.

Change

• enrich t3_worktree_status with separate recorded and actual workspace state plus an agreement result
• add bounded, cursor-based t3_worktree_list results with bounded thread bindings and per-entry availability
• add a dedicated internal Git worktree inventory read that returns canonical common-directory and physical worktree-root identity
• include detached and missing/prunable registered entries without changing the existing paginated vcs.listRefs wire payload or cache shape
• resolve each distinct nested or symlinked recorded path through Git identity before attributing it to a physical checkout
• expose both read tools consistently, including Claude read-only permission handling, presentation labels, tests, and docs

Behavior

These tools are read-only and current-project scoped. Inventory pages are sliced before per-worktree status reads, one missing or unreadable checkout produces an explicit entry outcome instead of failing the entire page, and plain non-repository project roots return a truthful status. Nested independent repositories are not attributed to a containing checkout. The tools do not create, switch, remove, prune, revive, or repair worktrees.

Validation

• vp test run apps/server/src/mcp/WorktreeMcpService.test.ts (60 tests)
• vp test run apps/server/src/vcs/GitVcsDriverCore.test.ts (58 tests)
• focused contracts, client-runtime, Git workflow, MCP registration, and Claude adapter coverage from the stack
• old-shape vcs.listRefs decode/cache compatibility coverage
• real GitWorkflow non-repository status plus detached, symlink, nested-repository, archived-binding, missing-path, and stale-entry coverage
• targeted server TypeScript check and targeted lint

Dependency

Bottom of native stack #8711, rooted on agents/mcp-controls/base-490318a at 490318afa505d3d033295eca12d7e62b4b922725. The dependent checkout mutation is PR #8680. This is independent of lifecycle PR #5589.

Implemented by GPT-5.6-Sol via Codex in T3 Code.

---

Note

Medium Risk
Breaking change:WorktreeMcpStatusResult adds required fields. New Git inventory and binding-resolution logic touches thread workspace attribution; mistakes could mis-report bindings or agreement, though tools are read-only and project-scoped.

Overview
Adds read-only workspace discovery for agents: t3_worktree_list pages Git-registered checkouts in the current project (branch, dirty state, availability, thread bindings) and t3_worktree_status now compares recorded thread metadata to on-disk Git state via an agreement field.

Git gains listWorktrees (canonical paths, common dir, detached entries) wired through GitWorkflowService; list/status resolve nested or symlinked recorded paths against repository identity without changing the vcs.listRefs wire shape. Claude’s read-only MCP allowlist, tool registration, presentation labels, and docs are updated accordingly.

^{Reviewed by Cursor Bugbot for commit 9eaeae0. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add listWorktrees operation to WorktreeMcpService and extend status result

• Exposes a new t3_worktree_list MCP tool that returns a paginated inventory of project git worktrees with per-worktree branch, git status, availability, and durable thread bindings.
• Adds listWorktrees(cwd) to GitVcsDriver and GitWorkflowService to enumerate worktree checkouts including detached ones, with canonicalized real paths via fileSystem.realPath.
• Extends WorktreeMcpStatusResult with recordedWorkspace, actualWorkspace, and agreement fields that compare the thread's recorded checkout against the physical repo state.
• Updates docs, read-only Claude allowlist, and tool presentation map to include the new tool.
• Behavioral Change: WorktreeMcpStatusResult schema now requires three new fields (recordedWorkspace, actualWorkspace, agreement); existing consumers of the status result must decode the new shape. Local branch refs in readGitRefsSnapshot now include prunable worktrees whose directories still exist.

^{Macroscope summarized 9eaeae0.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 71b8ce76-89e2-4f74-b444-f8a7e54f290f

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

Warning

Your free Security trial is over. An organization admin can activate Security or dismiss this notice.

---

_{Comment @coderabbitai help to get the list of available commands.}

[github-actions]

Thread transfer impact

⚠️ The latest CI run did not produce a thread transfer result for 9eaeae0.

This comment will update automatically after the next completed run.

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This PR adds a substantial agent-facing worktree inventory capability and changes existing status behavior, Git identity handling, and the MCP response contract. Its read-only scope limits operational risk, but the new runtime surface and shared VCS changes warrant human review.

No code changes detected at 9eaeae0. Prior analysis still applies.

^{You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

Macroscope has since reviewed this pull request. An earlier review was skipped by a cost limit; a review has now completed, so that notice no longer applies.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{Bugbot Autofix is ON, but a cloud agent failed to start.}

^{Reviewed by Cursor Bugbot for commit d1a6955. Configure here.}

[juliusmarminge]

Problem

An agent can see only the branch and worktree path recorded on its own thread. That does not reveal whether Git still agrees, which physical worktrees are available, whether they are dirty, or which live threads are bound to them.

Change

• enrich t3_worktree_status with separate recorded and actual workspace state plus an agreement result
• add bounded, cursor-based t3_worktree_list results with bounded thread bindings and per-entry availability
• add a dedicated internal Git worktree inventory read that returns canonical common-directory and physical worktree-root identity
• include detached and missing/prunable registered entries without changing the existing paginated vcs.listRefs wire payload or cache shape
• resolve each distinct nested or symlinked recorded path through Git identity before attributing it to a physical checkout
• expose both read tools consistently, including Claude read-only permission handling, presentation labels, tests, and docs

Behavior

These tools are read-only and current-project scoped. Inventory pages are sliced before per-worktree status reads, one missing or unreadable checkout produces an explicit entry outcome instead of failing the entire page, and plain non-repository project roots return a truthful status. Nested independent repositories are not attributed to a containing checkout. The tools do not create, switch, remove, prune, revive, or repair worktrees.

Validation

• vp test run apps/server/src/mcp/WorktreeMcpService.test.ts (60 tests)
• vp test run apps/server/src/vcs/GitVcsDriverCore.test.ts (58 tests)
• focused contracts, client-runtime, Git workflow, MCP registration, and Claude adapter coverage from the stack
• old-shape vcs.listRefs decode/cache compatibility coverage
• real GitWorkflow non-repository status plus detached, symlink, nested-repository, archived-binding, missing-path, and stale-entry coverage
• targeted server TypeScript check and targeted lint

Dependency

Bottom of native stack #8711, rooted on agents/mcp-controls/base-490318a at 490318afa505d3d033295eca12d7e62b4b922725. The dependent checkout mutation is PR #8680. This is independent of lifecycle PR #5589.

Implemented by GPT-5.6-Sol via Codex in T3 Code.

---

Note

Medium Risk
Breaking change:WorktreeMcpStatusResult adds required fields. New Git inventory and binding-resolution logic touches thread workspace attribution; mistakes could mis-report bindings or agreement, though tools are read-only and project-scoped.

Overview
Adds read-only workspace discovery for agents: t3_worktree_list pages Git-registered checkouts in the current project (branch, dirty state, availability, thread bindings) and t3_worktree_status now compares recorded thread metadata to on-disk Git state via an agreement field.

Git gains listWorktrees (canonical paths, common dir, detached entries) wired through GitWorkflowService; list/status resolve nested or symlinked recorded paths against repository identity without changing the vcs.listRefs wire shape. Claude’s read-only MCP allowlist, tool registration, presentation labels, and docs are updated accordingly.

^{Reviewed by Cursor Bugbot for commit 9eaeae0. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add listWorktrees operation to WorktreeMcpService and extend status result

• Exposes a new t3_worktree_list MCP tool that returns a paginated inventory of project git worktrees with per-worktree branch, git status, availability, and durable thread bindings.
• Adds listWorktrees(cwd) to GitVcsDriver and GitWorkflowService to enumerate worktree checkouts including detached ones, with canonicalized real paths via fileSystem.realPath.
• Extends WorktreeMcpStatusResult with recordedWorkspace, actualWorkspace, and agreement fields that compare the thread's recorded checkout against the physical repo state.
• Updates docs, read-only Claude allowlist, and tool presentation map to include the new tool.
• Behavioral Change: WorktreeMcpStatusResult schema now requires three new fields (recordedWorkspace, actualWorkspace, agreement); existing consumers of the status result must decode the new shape. Local branch refs in readGitRefsSnapshot now include prunable worktrees whose directories still exist.

^{Macroscope summarized 9eaeae0.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 71b8ce76-89e2-4f74-b444-f8a7e54f290f

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

Warning

Your free Security trial is over. An organization admin can activate Security or dismiss this notice.

---

_{Comment @coderabbitai help to get the list of available commands.}

[github-actions]

Thread transfer impact

⚠️ The latest CI run did not produce a thread transfer result for 9eaeae0.

This comment will update automatically after the next completed run.

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This PR adds a substantial agent-facing worktree inventory capability and changes existing status behavior, Git identity handling, and the MCP response contract. Its read-only scope limits operational risk, but the new runtime surface and shared VCS changes warrant human review.

No code changes detected at 9eaeae0. Prior analysis still applies.

^{You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

Macroscope has since reviewed this pull request. An earlier review was skipped by a cost limit; a review has now completed, so that notice no longer applies.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{Bugbot Autofix is ON, but a cloud agent failed to start.}

^{Reviewed by Cursor Bugbot for commit d1a6955. Configure here.}

[juliusmarminge]

Problem

An agent can see only the branch and worktree path recorded on its own thread. That does not reveal whether Git still agrees, which physical worktrees are available, whether they are dirty, or which live threads are bound to them.

Change

• enrich t3_worktree_status with separate recorded and actual workspace state plus an agreement result
• add bounded, cursor-based t3_worktree_list results with bounded thread bindings and per-entry availability
• add a dedicated internal Git worktree inventory read that returns canonical common-directory and physical worktree-root identity
• include detached and missing/prunable registered entries without changing the existing paginated vcs.listRefs wire payload or cache shape
• resolve each distinct nested or symlinked recorded path through Git identity before attributing it to a physical checkout
• expose both read tools consistently, including Claude read-only permission handling, presentation labels, tests, and docs

Behavior

These tools are read-only and current-project scoped. Inventory pages are sliced before per-worktree status reads, one missing or unreadable checkout produces an explicit entry outcome instead of failing the entire page, and plain non-repository project roots return a truthful status. Nested independent repositories are not attributed to a containing checkout. The tools do not create, switch, remove, prune, revive, or repair worktrees.

Validation

• vp test run apps/server/src/mcp/WorktreeMcpService.test.ts (60 tests)
• vp test run apps/server/src/vcs/GitVcsDriverCore.test.ts (58 tests)
• focused contracts, client-runtime, Git workflow, MCP registration, and Claude adapter coverage from the stack
• old-shape vcs.listRefs decode/cache compatibility coverage
• real GitWorkflow non-repository status plus detached, symlink, nested-repository, archived-binding, missing-path, and stale-entry coverage
• targeted server TypeScript check and targeted lint

Dependency

Bottom of native stack #8711, rooted on agents/mcp-controls/base-490318a at 490318afa505d3d033295eca12d7e62b4b922725. The dependent checkout mutation is PR #8680. This is independent of lifecycle PR #5589.

Implemented by GPT-5.6-Sol via Codex in T3 Code.

---

Note

Medium Risk
Breaking change:WorktreeMcpStatusResult adds required fields. New Git inventory and binding-resolution logic touches thread workspace attribution; mistakes could mis-report bindings or agreement, though tools are read-only and project-scoped.

Overview
Adds read-only workspace discovery for agents: t3_worktree_list pages Git-registered checkouts in the current project (branch, dirty state, availability, thread bindings) and t3_worktree_status now compares recorded thread metadata to on-disk Git state via an agreement field.

Git gains listWorktrees (canonical paths, common dir, detached entries) wired through GitWorkflowService; list/status resolve nested or symlinked recorded paths against repository identity without changing the vcs.listRefs wire shape. Claude’s read-only MCP allowlist, tool registration, presentation labels, and docs are updated accordingly.

^{Reviewed by Cursor Bugbot for commit 9eaeae0. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add listWorktrees operation to WorktreeMcpService and extend status result

• Exposes a new t3_worktree_list MCP tool that returns a paginated inventory of project git worktrees with per-worktree branch, git status, availability, and durable thread bindings.
• Adds listWorktrees(cwd) to GitVcsDriver and GitWorkflowService to enumerate worktree checkouts including detached ones, with canonicalized real paths via fileSystem.realPath.
• Extends WorktreeMcpStatusResult with recordedWorkspace, actualWorkspace, and agreement fields that compare the thread's recorded checkout against the physical repo state.
• Updates docs, read-only Claude allowlist, and tool presentation map to include the new tool.
• Behavioral Change: WorktreeMcpStatusResult schema now requires three new fields (recordedWorkspace, actualWorkspace, agreement); existing consumers of the status result must decode the new shape. Local branch refs in readGitRefsSnapshot now include prunable worktrees whose directories still exist.

^{Macroscope summarized 9eaeae0.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 71b8ce76-89e2-4f74-b444-f8a7e54f290f

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

Warning

Your free Security trial is over. An organization admin can activate Security or dismiss this notice.

---

_{Comment @coderabbitai help to get the list of available commands.}

[github-actions]

Thread transfer impact

⚠️ The latest CI run did not produce a thread transfer result for 9eaeae0.

This comment will update automatically after the next completed run.

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This PR adds a substantial agent-facing worktree inventory capability and changes existing status behavior, Git identity handling, and the MCP response contract. Its read-only scope limits operational risk, but the new runtime surface and shared VCS changes warrant human review.

No code changes detected at 9eaeae0. Prior analysis still applies.

^{You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

Macroscope has since reviewed this pull request. An earlier review was skipped by a cost limit; a review has now completed, so that notice no longer applies.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{Bugbot Autofix is ON, but a cloud agent failed to start.}

^{Reviewed by Cursor Bugbot for commit d1a6955. Configure here.}

[juliusmarminge]

Problem

An agent can see only the branch and worktree path recorded on its own thread. That does not reveal whether Git still agrees, which physical worktrees are available, whether they are dirty, or which live threads are bound to them.

Change

• enrich t3_worktree_status with separate recorded and actual workspace state plus an agreement result
• add bounded, cursor-based t3_worktree_list results with bounded thread bindings and per-entry availability
• add a dedicated internal Git worktree inventory read that returns canonical common-directory and physical worktree-root identity
• include detached and missing/prunable registered entries without changing the existing paginated vcs.listRefs wire payload or cache shape
• resolve each distinct nested or symlinked recorded path through Git identity before attributing it to a physical checkout
• expose both read tools consistently, including Claude read-only permission handling, presentation labels, tests, and docs

Behavior

These tools are read-only and current-project scoped. Inventory pages are sliced before per-worktree status reads, one missing or unreadable checkout produces an explicit entry outcome instead of failing the entire page, and plain non-repository project roots return a truthful status. Nested independent repositories are not attributed to a containing checkout. The tools do not create, switch, remove, prune, revive, or repair worktrees.

Validation

• vp test run apps/server/src/mcp/WorktreeMcpService.test.ts (60 tests)
• vp test run apps/server/src/vcs/GitVcsDriverCore.test.ts (58 tests)
• focused contracts, client-runtime, Git workflow, MCP registration, and Claude adapter coverage from the stack
• old-shape vcs.listRefs decode/cache compatibility coverage
• real GitWorkflow non-repository status plus detached, symlink, nested-repository, archived-binding, missing-path, and stale-entry coverage
• targeted server TypeScript check and targeted lint

Dependency

Bottom of native stack #8711, rooted on agents/mcp-controls/base-490318a at 490318afa505d3d033295eca12d7e62b4b922725. The dependent checkout mutation is PR #8680. This is independent of lifecycle PR #5589.

Implemented by GPT-5.6-Sol via Codex in T3 Code.

---

Note

Medium Risk
Breaking change:WorktreeMcpStatusResult adds required fields. New Git inventory and binding-resolution logic touches thread workspace attribution; mistakes could mis-report bindings or agreement, though tools are read-only and project-scoped.

Overview
Adds read-only workspace discovery for agents: t3_worktree_list pages Git-registered checkouts in the current project (branch, dirty state, availability, thread bindings) and t3_worktree_status now compares recorded thread metadata to on-disk Git state via an agreement field.

Git gains listWorktrees (canonical paths, common dir, detached entries) wired through GitWorkflowService; list/status resolve nested or symlinked recorded paths against repository identity without changing the vcs.listRefs wire shape. Claude’s read-only MCP allowlist, tool registration, presentation labels, and docs are updated accordingly.

^{Reviewed by Cursor Bugbot for commit 9eaeae0. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Add listWorktrees operation to WorktreeMcpService and extend status result

• Exposes a new t3_worktree_list MCP tool that returns a paginated inventory of project git worktrees with per-worktree branch, git status, availability, and durable thread bindings.
• Adds listWorktrees(cwd) to GitVcsDriver and GitWorkflowService to enumerate worktree checkouts including detached ones, with canonicalized real paths via fileSystem.realPath.
• Extends WorktreeMcpStatusResult with recordedWorkspace, actualWorkspace, and agreement fields that compare the thread's recorded checkout against the physical repo state.
• Updates docs, read-only Claude allowlist, and tool presentation map to include the new tool.
• Behavioral Change: WorktreeMcpStatusResult schema now requires three new fields (recordedWorkspace, actualWorkspace, agreement); existing consumers of the status result must decode the new shape. Local branch refs in readGitRefsSnapshot now include prunable worktrees whose directories still exist.

^{Macroscope summarized 9eaeae0.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 71b8ce76-89e2-4f74-b444-f8a7e54f290f

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

Warning

Your free Security trial is over. An organization admin can activate Security or dismiss this notice.

---

_{Comment @coderabbitai help to get the list of available commands.}

[github-actions]

Thread transfer impact

⚠️ The latest CI run did not produce a thread transfer result for 9eaeae0.

This comment will update automatically after the next completed run.

[macroscopeapp]

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This PR adds a substantial agent-facing worktree inventory capability and changes existing status behavior, Git identity handling, and the MCP response contract. Its read-only scope limits operational risk, but the new runtime surface and shared VCS changes warrant human review.

No code changes detected at 9eaeae0. Prior analysis still applies.

^{You can add or adjust custom eligibility rules. Learn more.}

[macroscopeapp]

Macroscope has since reviewed this pull request. An earlier review was skipped by a cost limit; a review has now completed, so that notice no longer applies.

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{Bugbot Autofix is ON, but a cloud agent failed to start.}

^{Reviewed by Cursor Bugbot for commit d1a6955. Configure here.}