oh-my-copilot 4.13.1 → 4.13.21

package/dist/team/__tests__/worktree-runtime-e2e.test.js

@@ -0,0 +1,182 @@
+// src/team/__tests__/worktree-runtime-e2e.test.ts
+//
+// Acceptance #1: 3 workers × 10 commits → 30 merge_succeeded events.
+// Uses real git via git-fixture helper.
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import { createGitFixture, orchestratorEventLogPath, readEventLog, waitForEventInLog, } from './helpers/git-fixture.js';
+import { startMergeOrchestrator, } from '../merge-orchestrator.js';
+beforeAll(() => {
+    process.env.OMC_RUNTIME_V2 = '1';
+});
+afterEach(() => {
+    process.env.OMC_RUNTIME_V2 = '1';
+});
+// ---------------------------------------------------------------------------
+// Acceptance #1: 3 workers × 10 commits — all 30 merges succeed
+// ---------------------------------------------------------------------------
+// Windows: real-git fixture is too slow under Defender ASR — heavy 30-commit
+// volume test gates on event-log polling that exceeds reasonable timeouts.
+// Other tests in this describe block + smaller integration tests
+// (rebase-smoke, teardown-invariant) validate the same code paths.
+const describeIfNotWin = process.platform === 'win32' ? describe.skip : describe;
+describeIfNotWin('worktree runtime e2e: 3 workers × 10 commits', () => {
+    let fixture;
+    let handle;
+    beforeEach(async () => {
+        fixture = await createGitFixture({
+            workerCount: 3,
+            leaderBranchName: 'omc-team-test-leader',
+            teamName: 'e2e-team',
+        });
+        process.env.OMC_RUNTIME_V2 = '1';
+        const config = {
+            teamName: fixture.teamName,
+            repoRoot: fixture.repoRoot,
+            leaderBranch: fixture.leaderBranch,
+            cwd: fixture.repoRoot,
+            pollIntervalMs: 100,
+            drainTimeoutMs: 20000,
+        };
+        handle = await startMergeOrchestrator(config);
+        await handle.registerWorker('worker-1');
+        await handle.registerWorker('worker-2');
+        await handle.registerWorker('worker-3');
+    });
+    afterEach(async () => {
+        try {
+            await handle.drainAndStop();
+        }
+        catch { /* ignore */ }
+        await fixture.cleanup();
+    });
+    it('all 30 commits across 3 workers produce merge_succeeded events', async () => {
+        // Each worker commits 10 files to disjoint paths (worker-N/file-X.ts)
+        // so there are NO conflicts. All merges should succeed.
+        //
+        // Use serialized commit→wait-for-merge loops to prevent burst-commit
+        // coalescing (the orchestrator merges latest HEAD per poll window, so
+        // 10 rapid commits → 1 merge event). By waiting for each merge before
+        // the next commit we guarantee at least 1 merge per commit.
+        //
+        // NOTE: rebase fan-out after each merge advances other workers' branch
+        // SHAs, which the orchestrator treats as new commits and also merges.
+        // So the total merge count may exceed 30 (each of the 30 user commits
+        // produces ≥1 merge, plus rebase-induced merges). We assert ≥30 total
+        // and ≥10 per worker.
+        const COMMITS_PER_WORKER = 10;
+        const eventLog = orchestratorEventLogPath(fixture.repoRoot, fixture.teamName);
+        const workers = ['worker-1', 'worker-2', 'worker-3'];
+        // Track total merges seen so far per worker (rebase-induced merges count too)
+        const mergeCountPerWorker = { 'worker-1': 0, 'worker-2': 0, 'worker-3': 0 };
+        for (const worker of workers) {
+            for (let i = 1; i <= COMMITS_PER_WORKER; i++) {
+                await fixture.commitFile(worker, `${worker}/file-${i}.ts`, `// ${worker} file ${i}\nexport const f${i} = ${i};\n`);
+                mergeCountPerWorker[worker] += 1;
+                // Wait for at least mergeCountPerWorker[worker] merges from this worker
+                // before issuing the next commit (prevents coalescing).
+                await waitForEventInLog({
+                    eventLogPath: eventLog,
+                    eventType: 'merge_succeeded',
+                    worker,
+                    count: mergeCountPerWorker[worker],
+                    timeoutMs: process.platform === 'win32' ? 15000 : 5000,
+                });
+                // Re-read current count in case rebase-induced merges arrived
+                const currentEvents = readEventLog(eventLog);
+                mergeCountPerWorker[worker] = currentEvents.filter((e) => e.type === 'merge_succeeded' && e.worker === worker).length;
+            }
+        }
+        const events = readEventLog(eventLog);
+        const mergeSucceeded = events.filter((e) => e.type === 'merge_succeeded');
+        // At least 30 merges: one per user commit. May be more due to rebase fan-out.
+        expect(mergeSucceeded.length).toBeGreaterThanOrEqual(30);
+        // All three workers should have contributed at least COMMITS_PER_WORKER merges
+        for (const worker of workers) {
+            const wMerges = mergeSucceeded.filter((e) => e.worker === worker);
+            expect(wMerges.length).toBeGreaterThanOrEqual(COMMITS_PER_WORKER);
+        }
+    }, 120000);
+    it('leader branch has merge commits after all workers finish', async () => {
+        const COMMITS_PER_WORKER = 3; // smaller count for speed
+        const eventLog = orchestratorEventLogPath(fixture.repoRoot, fixture.teamName);
+        const workers = ['worker-1', 'worker-2', 'worker-3'];
+        const mergeCountPerWorker = { 'worker-1': 0, 'worker-2': 0, 'worker-3': 0 };
+        // Serialized commit→wait-for-merge per worker to prevent coalescing
+        for (const worker of workers) {
+            for (let i = 1; i <= COMMITS_PER_WORKER; i++) {
+                await fixture.commitFile(worker, `${worker}/f${i}.ts`, `// ${worker} f${i}\n`);
+                mergeCountPerWorker[worker] += 1;
+                await waitForEventInLog({
+                    eventLogPath: eventLog,
+                    eventType: 'merge_succeeded',
+                    worker,
+                    count: mergeCountPerWorker[worker],
+                    timeoutMs: process.platform === 'win32' ? 15000 : 5000,
+                });
+                // Update count to include any rebase-induced merges
+                const currentEvents = readEventLog(eventLog);
+                mergeCountPerWorker[worker] = currentEvents.filter((e) => e.type === 'merge_succeeded' && e.worker === worker).length;
+            }
+        }
+        // Drain to ensure all merges are flushed
+        await handle.drainAndStop();
+        // Verify leader branch has merge commits via git log.
+        // Each worker's user commits produce ≥1 merge commit each.
+        // Rebase-induced merges may add more. Assert at least one worker's
+        // commits made it in as merge commits.
+        const { execFileSync } = await import('node:child_process');
+        const logOutput = execFileSync('git', ['log', '--merges', '--oneline', fixture.leaderBranch], {
+            cwd: fixture.repoRoot,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        }).trim();
+        const mergeCommitLines = logOutput.split('\n').filter((l) => l.trim().length > 0);
+        // At least one merge per worker (3 workers × 1 = 3 minimum)
+        expect(mergeCommitLines.length).toBeGreaterThanOrEqual(workers.length);
+    }, 60000);
+    it('leader inbox has merge notifications', async () => {
+        await fixture.commitFile('worker-1', 'worker-1/notify.ts', '// notify test\n');
+        const eventLog = orchestratorEventLogPath(fixture.repoRoot, fixture.teamName);
+        await waitForEventInLog({ eventLogPath: eventLog, eventType: 'merge_succeeded', worker: 'worker-1', timeoutMs: 8000 });
+        // Leader inbox should have been created and seeded by orchestrator startup
+        const leaderInboxPath = join(fixture.repoRoot, '.omcp', 'state', 'team', fixture.teamName, 'leader', 'inbox.md');
+        expect(existsSync(leaderInboxPath)).toBe(true);
+    });
+    it('orchestrator state is consistent across registerWorker calls', async () => {
+        const state = handle.getState();
+        expect(state.workers).toContain('worker-1');
+        expect(state.workers).toContain('worker-2');
+        expect(state.workers).toContain('worker-3');
+        expect(state.workers.length).toBe(3);
+    });
+});
+// ---------------------------------------------------------------------------
+// Leader branch name guard — never main/master (M3 compliance check)
+// ---------------------------------------------------------------------------
+describe('M3 compliance: fixture never uses main/master', () => {
+    it('fixture rejects main as leader branch', async () => {
+        await expect(createGitFixture({ workerCount: 1, leaderBranchName: 'main' })).rejects.toThrow(/main\/master/);
+    });
+    it('fixture rejects master as leader branch', async () => {
+        await expect(createGitFixture({ workerCount: 1, leaderBranchName: 'master' })).rejects.toThrow(/main\/master/);
+    });
+    it('orchestrator rejects main leader branch', async () => {
+        const fixture = await createGitFixture({ workerCount: 1 });
+        try {
+            process.env.OMC_RUNTIME_V2 = '1';
+            const config = {
+                teamName: fixture.teamName,
+                repoRoot: fixture.repoRoot,
+                leaderBranch: 'main', // should be rejected
+                cwd: fixture.repoRoot,
+            };
+            await expect(startMergeOrchestrator(config)).rejects.toThrow(/main\/master/);
+        }
+        finally {
+            await fixture.cleanup();
+        }
+    });
+});
+//# sourceMappingURL=worktree-runtime-e2e.test.js.map

package/dist/team/__tests__/worktree-runtime-e2e.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-runtime-e2e.test.js","sourceRoot":"","sources":["../../../src/team/__tests__/worktree-runtime-e2e.test.ts"],"names":[],"mappings":"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"}

package/dist/team/api-interop.d.ts

@@ -1,3 +1,4 @@
+export declare const LEGACY_TEAM_MCP_TOOLS: readonly ["team_send_message", "team_broadcast", "team_mailbox_list", "team_mailbox_mark_delivered", "team_mailbox_mark_notified", "team_create_task", "team_read_task", "team_list_tasks", "team_update_task", "team_claim_task", "team_transition_task_status", "team_release_task_claim", "team_read_config", "team_read_manifest", "team_read_worker_status", "team_read_worker_heartbeat", "team_update_worker_heartbeat", "team_write_worker_inbox", "team_write_worker_identity", "team_append_event", "team_get_summary", "team_cleanup", "team_write_shutdown_request", "team_read_shutdown_ack", "team_read_monitor_snapshot", "team_write_monitor_snapshot", "team_read_task_approval", "team_write_task_approval"];
 export declare const TEAM_API_OPERATIONS: readonly ["send-message", "broadcast", "mailbox-list", "mailbox-mark-delivered", "mailbox-mark-notified", "create-task", "read-task", "list-tasks", "update-task", "claim-task", "transition-task-status", "release-task-claim", "read-config", "read-manifest", "read-worker-status", "read-worker-heartbeat", "update-worker-heartbeat", "write-worker-inbox", "write-worker-identity", "append-event", "get-summary", "cleanup", "write-shutdown-request", "read-shutdown-ack", "read-monitor-snapshot", "write-monitor-snapshot", "read-task-approval", "write-task-approval", "orphan-cleanup"];
 export type TeamApiOperation = typeof TEAM_API_OPERATIONS[number];
 export type TeamApiEnvelope = {
@@ -12,7 +13,7 @@ export type TeamApiEnvelope = {
         message: string;
     };
 };
-export declare function resolveTeamApiCliCommand(_env?: NodeJS.ProcessEnv): 'omcp team api';
+export declare function resolveTeamApiCliCommand(env?: NodeJS.ProcessEnv): 'omcp team api' | 'omx team api';
 export declare function resolveTeamApiOperation(name: string): TeamApiOperation | null;
 export declare function buildLegacyTeamDeprecationHint(legacyName: string, originalArgs?: Record<string, unknown>, env?: NodeJS.ProcessEnv): string;
 export declare function executeTeamApiOperation(operation: TeamApiOperation, args: Record<string, unknown>, fallbackCwd: string): Promise<TeamApiEnvelope>;

package/dist/team/api-interop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-interop.d.ts","sourceRoot":"","sources":["../../src/team/api-interop.ts"],"names":[],"mappings":"AAsDA,eAAO,MAAM,mBAAmB,skBA8BtB,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC;AAElE,MAAM,MAAM,eAAe,GACvB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,gBAAgB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GACxE;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAgDrG,wBAAgB,wBAAwB,CAAC,IAAI,GAAE,MAAM,CAAC,UAAwB,GAAG,eAAe,CAE/F;AAoHD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAG7E;AAED,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAQR;AA4ID,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,gBAAgB,EAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,eAAe,CAAC,CAkb1B"}
+{"version":3,"file":"api-interop.d.ts","sourceRoot":"","sources":["../../src/team/api-interop.ts"],"names":[],"mappings":"AAwDA,eAAO,MAAM,qBAAqB,gsBA6BxB,CAAC;AAEX,eAAO,MAAM,mBAAmB,skBA8BtB,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC;AAElE,MAAM,MAAM,eAAe,GACvB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,gBAAgB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,GACxE;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAkDrG,wBAAgB,wBAAwB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,eAAe,GAAG,cAAc,CAc/G;AA4JD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAG7E;AAED,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAQR;AAwJD,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,gBAAgB,EAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,eAAe,CAAC,CA2c1B"}

package/dist/team/api-interop.js

@@ -6,9 +6,42 @@ import { queueBroadcastMailboxMessage, queueDirectMailboxMessage } from './mcp-c
 import { injectToLeaderPane, sendToWorker } from './tmux-session.js';
 import { listDispatchRequests, markDispatchRequestDelivered, markDispatchRequestNotified } from './dispatch-queue.js';
 import { generateMailboxTriggerMessage } from './worker-bootstrap.js';
+import { shutdownTeam } from './runtime.js';
 import { shutdownTeamV2 } from './runtime-v2.js';
+import { inspectTeamWorktreeCleanupSafety } from './git-worktree.js';
+import { createSwallowedErrorLogger } from '../lib/swallowed-error.js';
 const TEAM_UPDATE_TASK_MUTABLE_FIELDS = new Set(['subject', 'description', 'blocked_by', 'requires_code_change']);
 const TEAM_UPDATE_TASK_REQUEST_FIELDS = new Set(['team_name', 'task_id', 'workingDirectory', ...TEAM_UPDATE_TASK_MUTABLE_FIELDS]);
+export const LEGACY_TEAM_MCP_TOOLS = [
+    'team_send_message',
+    'team_broadcast',
+    'team_mailbox_list',
+    'team_mailbox_mark_delivered',
+    'team_mailbox_mark_notified',
+    'team_create_task',
+    'team_read_task',
+    'team_list_tasks',
+    'team_update_task',
+    'team_claim_task',
+    'team_transition_task_status',
+    'team_release_task_claim',
+    'team_read_config',
+    'team_read_manifest',
+    'team_read_worker_status',
+    'team_read_worker_heartbeat',
+    'team_update_worker_heartbeat',
+    'team_write_worker_inbox',
+    'team_write_worker_identity',
+    'team_append_event',
+    'team_get_summary',
+    'team_cleanup',
+    'team_write_shutdown_request',
+    'team_read_shutdown_ack',
+    'team_read_monitor_snapshot',
+    'team_write_monitor_snapshot',
+    'team_read_task_approval',
+    'team_write_task_approval',
+];
 export const TEAM_API_OPERATIONS = [
     'send-message',
     'broadcast',
@@ -75,23 +108,53 @@ function parseTeamWorkerEnv(raw) {
     return { teamName: match[1], workerName: match[2] };
 }
 function parseTeamWorkerContextFromEnv(env = process.env) {
-    return parseTeamWorkerEnv(env.OMC_TEAM_WORKER);
+    return parseTeamWorkerEnv(env.OMC_TEAM_WORKER) ?? parseTeamWorkerEnv(env.OMX_TEAM_WORKER);
 }
 function readTeamStateRootFromEnv(env = process.env) {
     const candidate = typeof env.OMC_TEAM_STATE_ROOT === 'string' && env.OMC_TEAM_STATE_ROOT.trim() !== ''
         ? env.OMC_TEAM_STATE_ROOT.trim()
-        : '';
+        : (typeof env.OMX_TEAM_STATE_ROOT === 'string' && env.OMX_TEAM_STATE_ROOT.trim() !== ''
+            ? env.OMX_TEAM_STATE_ROOT.trim()
+            : '');
     return candidate || null;
 }
-export function resolveTeamApiCliCommand(_env = process.env) {
+export function resolveTeamApiCliCommand(env = process.env) {
+    const hasOmcContext = ((typeof env.OMC_TEAM_WORKER === 'string' && env.OMC_TEAM_WORKER.trim() !== '')
+        || (typeof env.OMC_TEAM_STATE_ROOT === 'string' && env.OMC_TEAM_STATE_ROOT.trim() !== ''));
+    if (hasOmcContext)
+        return 'omcp team api';
+    const hasOmxContext = ((typeof env.OMX_TEAM_WORKER === 'string' && env.OMX_TEAM_WORKER.trim() !== '')
+        || (typeof env.OMX_TEAM_STATE_ROOT === 'string' && env.OMX_TEAM_STATE_ROOT.trim() !== ''));
+    if (hasOmxContext)
+        return 'omx team api';
     return 'omcp team api';
 }
 function isRuntimeV2Config(config) {
     return !!config && typeof config === 'object' && Array.isArray(config.workers);
 }
+function isLegacyRuntimeConfig(config) {
+    return !!config && typeof config === 'object' && Array.isArray(config.agentTypes);
+}
+function assertNoNativeWorktreeCleanupEvidence(teamName, cwd) {
+    const safety = inspectTeamWorktreeCleanupSafety(teamName, cwd);
+    if (!safety.hasEvidence)
+        return;
+    const evidence = safety.blockers.length > 0
+        ? safety.blockers
+        : safety.entries.map((entry) => ({
+            workerName: entry.workerName,
+            path: entry.path,
+            reason: 'worktree_cleanup_evidence_present',
+        }));
+    const details = evidence
+        .map((item) => `${item.workerName}:${item.reason}:${item.path}`)
+        .join(';');
+    throw new Error(`cleanup_blocked:worktree_cleanup_evidence_present:${details}`);
+}
 async function executeTeamCleanupViaRuntime(teamName, cwd) {
     const config = await teamReadConfig(teamName, cwd);
     if (!config) {
+        assertNoNativeWorktreeCleanupEvidence(teamName, cwd);
         await teamCleanup(teamName, cwd);
         return;
     }
@@ -99,6 +162,18 @@ async function executeTeamCleanupViaRuntime(teamName, cwd) {
         await shutdownTeamV2(teamName, cwd);
         return;
     }
+    if (isLegacyRuntimeConfig(config)) {
+        const legacyConfig = config;
+        const sessionName = typeof legacyConfig.tmuxSession === 'string' && legacyConfig.tmuxSession.trim() !== ''
+            ? legacyConfig.tmuxSession.trim()
+            : `omc-team-${teamName}`;
+        const leaderPaneId = typeof legacyConfig.leaderPaneId === 'string' && legacyConfig.leaderPaneId.trim() !== ''
+            ? legacyConfig.leaderPaneId.trim()
+            : undefined;
+        await shutdownTeam(teamName, sessionName, cwd, 30_000, undefined, leaderPaneId, legacyConfig.tmuxOwnsWindow === true);
+        return;
+    }
+    assertNoNativeWorktreeCleanupEvidence(teamName, cwd);
     await teamCleanup(teamName, cwd);
 }
 function readTeamStateRootFromFile(path) {
@@ -149,9 +224,11 @@ function resolveTeamWorkingDirectoryFromMetadata(teamName, candidateCwd, workerC
     const fromConfig = readTeamStateRootFromFile(join(teamRoot, 'config.json'));
     if (fromConfig)
         return stateRootToWorkingDirectory(fromConfig);
-    const fromManifest = readTeamStateRootFromFile(join(teamRoot, 'manifest.v2.json'));
-    if (fromManifest)
-        return stateRootToWorkingDirectory(fromManifest);
+    for (const manifestName of ['manifest.json', 'manifest.v2.json']) {
+        const fromManifest = readTeamStateRootFromFile(join(teamRoot, manifestName));
+        if (fromManifest)
+            return stateRootToWorkingDirectory(fromManifest);
+    }
     return null;
 }
 function resolveTeamWorkingDirectory(teamName, preferredCwd) {
@@ -160,7 +237,10 @@ function resolveTeamWorkingDirectory(teamName, preferredCwd) {
         return preferredCwd;
     const envTeamStateRoot = readTeamStateRootFromEnv();
     if (typeof envTeamStateRoot === 'string' && envTeamStateRoot.trim() !== '') {
-        return stateRootToWorkingDirectory(envTeamStateRoot.trim());
+        const envWorkingDirectory = stateRootToWorkingDirectory(envTeamStateRoot.trim());
+        if (teamStateExists(normalizedTeamName, envWorkingDirectory)) {
+            return envWorkingDirectory;
+        }
     }
     const seeds = [];
     for (const seed of [preferredCwd, process.cwd()]) {
@@ -204,6 +284,10 @@ export function buildLegacyTeamDeprecationHint(legacyName, originalArgs, env = p
 }
 const QUEUED_FOR_HOOK_DISPATCH_REASON = 'queued_for_hook_dispatch';
 const LEADER_PANE_MISSING_MAILBOX_PERSISTED_REASON = 'leader_pane_missing_mailbox_persisted';
+const WORKTREE_TRIGGER_STATE_ROOT = '$OMC_TEAM_STATE_ROOT';
+function resolveInstructionStateRoot(worktreePath) {
+    return worktreePath ? WORKTREE_TRIGGER_STATE_ROOT : undefined;
+}
 function queuedForHookDispatch() {
     return {
         ok: true,
@@ -246,6 +330,7 @@ function findWorkerDispatchTarget(teamName, toWorker, cwd) {
         return {
             paneId: recipient?.pane_id,
             workerIndex: recipient?.index,
+            instructionStateRoot: resolveInstructionStateRoot(recipient?.worktree_path),
         };
     });
 }
@@ -257,17 +342,19 @@ async function findMailboxDispatchRequestId(teamName, workerName, messageId, cwd
     return matching[0]?.request_id ?? null;
 }
 async function syncMailboxDispatchNotified(teamName, workerName, messageId, cwd) {
+    const logDispatchSyncFailure = createSwallowedErrorLogger('team.api-interop syncMailboxDispatchNotified dispatch state sync failed');
     const requestId = await findMailboxDispatchRequestId(teamName, workerName, messageId, cwd);
     if (!requestId)
         return;
-    await markDispatchRequestNotified(teamName, requestId, { message_id: messageId, last_reason: 'mailbox_mark_notified' }, cwd).catch(() => { });
+    await markDispatchRequestNotified(teamName, requestId, { message_id: messageId, last_reason: 'mailbox_mark_notified' }, cwd).catch(logDispatchSyncFailure);
 }
 async function syncMailboxDispatchDelivered(teamName, workerName, messageId, cwd) {
+    const logDispatchSyncFailure = createSwallowedErrorLogger('team.api-interop syncMailboxDispatchDelivered dispatch state sync failed');
     const requestId = await findMailboxDispatchRequestId(teamName, workerName, messageId, cwd);
     if (!requestId)
         return;
-    await markDispatchRequestNotified(teamName, requestId, { message_id: messageId, last_reason: 'mailbox_mark_delivered' }, cwd).catch(() => { });
-    await markDispatchRequestDelivered(teamName, requestId, { message_id: messageId, last_reason: 'mailbox_mark_delivered' }, cwd).catch(() => { });
+    await markDispatchRequestNotified(teamName, requestId, { message_id: messageId, last_reason: 'mailbox_mark_delivered' }, cwd).catch(logDispatchSyncFailure);
+    await markDispatchRequestDelivered(teamName, requestId, { message_id: messageId, last_reason: 'mailbox_mark_delivered' }, cwd).catch(logDispatchSyncFailure);
 }
 function validateCommonFields(args) {
     const teamName = String(args.team_name || '').trim();
@@ -311,7 +398,7 @@ export async function executeTeamApiOperation(operation, args, fallbackCwd) {
                     toWorkerIndex: target.workerIndex,
                     toPaneId: target.paneId,
                     body,
-                    triggerMessage: generateMailboxTriggerMessage(teamName, toWorker),
+                    triggerMessage: generateMailboxTriggerMessage(teamName, toWorker, 1, target.instructionStateRoot),
                     cwd,
                     notify: ({ workerName }, triggerMessage) => notifyMailboxTarget(teamName, workerName, triggerMessage, cwd),
                     deps: {
@@ -338,14 +425,19 @@ export async function executeTeamApiOperation(operation, args, fallbackCwd) {
                 const config = await teamReadConfig(teamName, cwd);
                 const recipients = (config?.workers ?? [])
                     .filter((worker) => worker.name !== fromWorker)
-                    .map((worker) => ({ workerName: worker.name, workerIndex: worker.index, paneId: worker.pane_id }));
+                    .map((worker) => ({
+                    workerName: worker.name,
+                    workerIndex: worker.index,
+                    paneId: worker.pane_id,
+                    instructionStateRoot: resolveInstructionStateRoot(worker.worktree_path),
+                }));
                 await queueBroadcastMailboxMessage({
                     teamName,
                     fromWorker,
                     recipients,
                     body,
                     cwd,
-                    triggerFor: (workerName) => generateMailboxTriggerMessage(teamName, workerName),
+                    triggerFor: (workerName) => generateMailboxTriggerMessage(teamName, workerName, 1, recipients.find((recipient) => recipient.workerName === workerName)?.instructionStateRoot),
                     notify: ({ workerName }, triggerMessage) => notifyMailboxTarget(teamName, workerName, triggerMessage, cwd),
                     deps: {
                         sendDirectMessage,
@@ -591,9 +683,11 @@ export async function executeTeamApiOperation(operation, args, fallbackCwd) {
                     pid: args.pid,
                     pane_id: args.pane_id,
                     working_dir: args.working_dir,
+                    worktree_repo_root: args.worktree_repo_root,
                     worktree_path: args.worktree_path,
                     worktree_branch: args.worktree_branch,
                     worktree_detached: args.worktree_detached,
+                    worktree_created: args.worktree_created,
                     team_state_root: args.team_state_root,
                 }, cwd);
                 return { ok: true, operation, data: { worker } };
@@ -634,10 +728,23 @@ export async function executeTeamApiOperation(operation, args, fallbackCwd) {
                 return { ok: true, operation, data: { team_name: teamName } };
             }
             case 'orphan-cleanup': {
-                // Destructive escape hatch: always calls teamCleanup directly, bypasses shutdown orchestration
+                // Destructive escape hatch: calls teamCleanup directly, bypassing shutdown orchestration.
+                // Native worktree recovery metadata/root AGENTS backups are protected unless callers
+                // explicitly acknowledge that this force path may delete those recovery records.
                 const teamName = String(args.team_name || '').trim();
                 if (!teamName)
                     return { ok: false, operation, error: { code: 'invalid_input', message: 'team_name is required' } };
+                const safety = inspectTeamWorktreeCleanupSafety(teamName, cwd);
+                if (safety.hasEvidence && args.acknowledge_lost_worktree_recovery !== true) {
+                    return {
+                        ok: false,
+                        operation,
+                        error: {
+                            code: 'invalid_input',
+                            message: 'orphan_cleanup_blocked:worktree_recovery_evidence_present; pass acknowledge_lost_worktree_recovery=true only after manually preserving or intentionally discarding worker worktrees and root AGENTS backups',
+                        },
+                    };
+                }
                 await teamCleanup(teamName, cwd);
                 return { ok: true, operation, data: { team_name: teamName } };
             }