claudecode-omc 4.4.10 → 4.7.4

package/dist/mcp/team-job-convergence.js

@@ -0,0 +1,101 @@
+import { existsSync, readFileSync, rmSync } from 'fs';
+import { join } from 'path';
+import { validateTeamName } from '../team/team-name.js';
+function readResultArtifact(omcJobsDir, jobId) {
+    const artifactPath = join(omcJobsDir, `${jobId}-result.json`);
+    if (!existsSync(artifactPath))
+        return { kind: 'none' };
+    let raw;
+    try {
+        raw = readFileSync(artifactPath, 'utf-8');
+    }
+    catch {
+        return { kind: 'none' };
+    }
+    try {
+        const parsed = JSON.parse(raw);
+        if (parsed?.status === 'completed' || parsed?.status === 'failed') {
+            return { kind: 'terminal', status: parsed.status, raw };
+        }
+        return { kind: 'none' };
+    }
+    catch (error) {
+        const message = `Failed to parse result artifact at ${artifactPath}: ${error instanceof Error ? error.message : String(error)}`;
+        return {
+            kind: 'parse-failed',
+            message,
+            payload: JSON.stringify({
+                status: 'failed',
+                error: {
+                    code: 'RESULT_ARTIFACT_PARSE_FAILED',
+                    message,
+                },
+            }),
+        };
+    }
+}
+export function convergeJobWithResultArtifact(job, jobId, omcJobsDir) {
+    const artifact = readResultArtifact(omcJobsDir, jobId);
+    if (artifact.kind === 'none')
+        return { job, changed: false };
+    if (artifact.kind === 'terminal') {
+        const changed = job.status !== artifact.status || job.result !== artifact.raw;
+        return {
+            job: changed
+                ? {
+                    ...job,
+                    status: artifact.status,
+                    result: artifact.raw,
+                }
+                : job,
+            changed,
+        };
+    }
+    const changed = job.status !== 'failed' || job.result !== artifact.payload || job.stderr !== artifact.message;
+    return {
+        job: changed
+            ? {
+                ...job,
+                status: 'failed',
+                result: artifact.payload,
+                stderr: artifact.message,
+            }
+            : job,
+        changed,
+    };
+}
+export function isJobTerminal(job) {
+    return job.status === 'completed' || job.status === 'failed' || job.status === 'timeout';
+}
+export function isPidAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export function clearScopedTeamState(job) {
+    if (!job.cwd || !job.teamName) {
+        return 'team state cleanup skipped (missing job cwd/teamName).';
+    }
+    try {
+        validateTeamName(job.teamName);
+    }
+    catch (error) {
+        return `team state cleanup skipped (invalid teamName): ${error instanceof Error ? error.message : String(error)}`;
+    }
+    const stateDir = join(job.cwd, '.omc', 'state', 'team', job.teamName);
+    try {
+        if (!existsSync(stateDir)) {
+            return `team state dir not found at ${stateDir}.`;
+        }
+        rmSync(stateDir, { recursive: true, force: true });
+        return `team state dir removed at ${stateDir}.`;
+    }
+    catch (error) {
+        return `team state cleanup failed at ${stateDir}: ${error instanceof Error ? error.message : String(error)}`;
+    }
+}
+//# sourceMappingURL=team-job-convergence.js.map

package/dist/mcp/team-job-convergence.js.map

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

package/dist/mcp/team-server.d.ts

@@ -1,16 +1,39 @@
 #!/usr/bin/env node
 /**
  * Team MCP Server - tmux CLI worker runtime tools
- *
- * Exposes three tools for running tmux-based teams (claude/codex/gemini workers):
- *   omc_run_team_start  - spawn workers in background, return jobId immediately
- *   omc_run_team_status - non-blocking poll for job completion
- *   omc_run_team_wait   - blocking wait: polls internally, returns when done (one call instead of N)
- *
- * __dirname in the CJS bundle (bridge/team-mcp.cjs) points to the bridge/
- * directory, where runtime-cli.cjs is co-located — works for all install paths.
- *
- * Built by: scripts/build-team-server.mjs → bridge/team-mcp.cjs
  */
+type DeprecatedTeamToolName = 'omc_run_team_start' | 'omc_run_team_status' | 'omc_run_team_wait' | 'omc_run_team_cleanup';
+export declare function createDeprecatedCliOnlyEnvelope(toolName: DeprecatedTeamToolName): {
+    content: Array<{
+        type: 'text';
+        text: string;
+    }>;
+    isError: true;
+};
+export declare function createDeprecatedCliOnlyEnvelopeWithArgs(toolName: DeprecatedTeamToolName, args?: unknown): {
+    content: Array<{
+        type: 'text';
+        text: string;
+    }>;
+    isError: true;
+};
+export declare function handleStatus(args: unknown): Promise<{
+    content: Array<{
+        type: 'text';
+        text: string;
+    }>;
+}>;
+export declare function handleWait(args: unknown): Promise<{
+    content: Array<{
+        type: 'text';
+        text: string;
+    }>;
+}>;
+export declare function handleCleanup(args: unknown): Promise<{
+    content: Array<{
+        type: 'text';
+        text: string;
+    }>;
+}>;
 export {};
 //# sourceMappingURL=team-server.d.ts.map

package/dist/mcp/team-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"team-server.d.ts","sourceRoot":"","sources":["../../src/mcp/team-server.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;GAYG"}
+{"version":3,"file":"team-server.d.ts","sourceRoot":"","sources":["../../src/mcp/team-server.ts"],"names":[],"mappings":";AACA;;GAEG;AA6BH,KAAK,sBAAsB,GACvB,oBAAoB,GACpB,qBAAqB,GACrB,mBAAmB,GACnB,sBAAsB,CAAC;AAa3B,wBAAgB,+BAA+B,CAAC,QAAQ,EAAE,sBAAsB,GAAG;IACjF,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,OAAO,EAAE,IAAI,CAAC;CACf,CAEA;AA6ED,wBAAgB,uCAAuC,CACrD,QAAQ,EAAE,sBAAsB,EAChC,IAAI,CAAC,EAAE,OAAO,GACb;IACD,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,OAAO,EAAE,IAAI,CAAC;CACf,CAeA;AA0ID,wBAAsB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,CA6B7G;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,CAkF3G;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,CAyB9G"}

package/dist/mcp/team-server.js

@@ -1,16 +1,6 @@
 #!/usr/bin/env node
 /**
  * Team MCP Server - tmux CLI worker runtime tools
- *
- * Exposes three tools for running tmux-based teams (claude/codex/gemini workers):
- *   omc_run_team_start  - spawn workers in background, return jobId immediately
- *   omc_run_team_status - non-blocking poll for job completion
- *   omc_run_team_wait   - blocking wait: polls internally, returns when done (one call instead of N)
- *
- * __dirname in the CJS bundle (bridge/team-mcp.cjs) points to the bridge/
- * directory, where runtime-cli.cjs is co-located — works for all install paths.
- *
- * Built by: scripts/build-team-server.mjs → bridge/team-mcp.cjs
  */
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
@@ -24,8 +14,104 @@ import { homedir } from 'os';
 import { killWorkerPanes } from '../team/tmux-session.js';
 import { validateTeamName } from '../team/team-name.js';
 import { NudgeTracker } from '../team/idle-nudge.js';
+import { clearScopedTeamState, convergeJobWithResultArtifact, isJobTerminal, isPidAlive, } from './team-job-convergence.js';
 const omcTeamJobs = new Map();
-const OMC_JOBS_DIR = join(homedir(), '.omc', 'team-jobs');
+const OMC_JOBS_DIR = process.env.OMC_JOBS_DIR || join(homedir(), '.omc', 'team-jobs');
+const DEPRECATION_CODE = 'deprecated_cli_only';
+const TEAM_CLI_REPLACEMENT_HINTS = {
+    omc_run_team_start: 'omc team start',
+    omc_run_team_status: 'omc team status <job_id>',
+    omc_run_team_wait: 'omc team wait <job_id>',
+    omc_run_team_cleanup: 'omc team cleanup <job_id>',
+};
+function isDeprecatedTeamToolName(name) {
+    return Object.prototype.hasOwnProperty.call(TEAM_CLI_REPLACEMENT_HINTS, name);
+}
+export function createDeprecatedCliOnlyEnvelope(toolName) {
+    return createDeprecatedCliOnlyEnvelopeWithArgs(toolName);
+}
+function quoteCliValue(value) {
+    return JSON.stringify(value);
+}
+function buildCliReplacement(toolName, args) {
+    const hasArgsObject = typeof args === 'object' && args !== null;
+    if (!hasArgsObject) {
+        return TEAM_CLI_REPLACEMENT_HINTS[toolName];
+    }
+    const parsed = (typeof args === 'object' && args !== null) ? args : {};
+    if (toolName === 'omc_run_team_start') {
+        const teamName = typeof parsed.teamName === 'string' ? parsed.teamName.trim() : '';
+        const cwd = typeof parsed.cwd === 'string' ? parsed.cwd.trim() : '';
+        const agentTypes = Array.isArray(parsed.agentTypes)
+            ? parsed.agentTypes.filter((item) => typeof item === 'string' && item.trim().length > 0)
+            : [];
+        const tasks = Array.isArray(parsed.tasks)
+            ? parsed.tasks
+                .map((task) => (typeof task === 'object' && task !== null && typeof task.description === 'string')
+                ? task.description.trim()
+                : '')
+                .filter(Boolean)
+            : [];
+        const flags = ['omc', 'team', 'start'];
+        if (teamName)
+            flags.push('--name', quoteCliValue(teamName));
+        if (cwd)
+            flags.push('--cwd', quoteCliValue(cwd));
+        if (agentTypes.length > 0) {
+            const uniqueAgentTypes = new Set(agentTypes);
+            if (uniqueAgentTypes.size === 1) {
+                flags.push('--agent', quoteCliValue(agentTypes[0]), '--count', String(agentTypes.length));
+            }
+            else {
+                flags.push('--agent', quoteCliValue(agentTypes.join(',')));
+            }
+        }
+        else {
+            flags.push('--agent', '"claude"');
+        }
+        if (tasks.length > 0) {
+            for (const task of tasks) {
+                flags.push('--task', quoteCliValue(task));
+            }
+        }
+        else {
+            flags.push('--task', '"<task>"');
+        }
+        return flags.join(' ');
+    }
+    const jobId = typeof parsed.job_id === 'string' ? parsed.job_id.trim() : '<job_id>';
+    if (toolName === 'omc_run_team_status') {
+        return `omc team status --job-id ${quoteCliValue(jobId)}`;
+    }
+    if (toolName === 'omc_run_team_wait') {
+        const timeoutMs = typeof parsed.timeout_ms === 'number' && Number.isFinite(parsed.timeout_ms)
+            ? ` --timeout-ms ${Math.floor(parsed.timeout_ms)}`
+            : '';
+        return `omc team wait --job-id ${quoteCliValue(jobId)}${timeoutMs}`;
+    }
+    if (toolName === 'omc_run_team_cleanup') {
+        const graceMs = typeof parsed.grace_ms === 'number' && Number.isFinite(parsed.grace_ms)
+            ? ` --grace-ms ${Math.floor(parsed.grace_ms)}`
+            : '';
+        return `omc team cleanup --job-id ${quoteCliValue(jobId)}${graceMs}`;
+    }
+    return TEAM_CLI_REPLACEMENT_HINTS[toolName];
+}
+export function createDeprecatedCliOnlyEnvelopeWithArgs(toolName, args) {
+    const cliReplacement = buildCliReplacement(toolName, args);
+    return {
+        content: [{
+                type: 'text',
+                text: JSON.stringify({
+                    code: DEPRECATION_CODE,
+                    tool: toolName,
+                    message: 'Legacy team MCP runtime tools are deprecated. Use the omc team CLI instead.',
+                    cli_replacement: cliReplacement,
+                }),
+            }],
+        isError: true,
+    };
+}
 function persistJob(jobId, job) {
     try {
         if (!existsSync(OMC_JOBS_DIR))
@@ -56,9 +142,26 @@ function validateJobId(job_id) {
         throw new Error(`Invalid job_id: "${job_id}". Must match /^omc-[a-z0-9]{1,12}$/`);
     }
 }
-// ---------------------------------------------------------------------------
-// Schemas
-// ---------------------------------------------------------------------------
+function saveJobState(jobId, job) {
+    omcTeamJobs.set(jobId, job);
+    persistJob(jobId, job);
+    return job;
+}
+function makeJobResponse(jobId, job, extra = {}) {
+    const elapsed = ((Date.now() - job.startedAt) / 1000).toFixed(1);
+    const out = { jobId, status: job.status, elapsedSeconds: elapsed, ...extra };
+    if (job.result) {
+        try {
+            out.result = JSON.parse(job.result);
+        }
+        catch {
+            out.result = job.result;
+        }
+    }
+    if (job.stderr)
+        out.stderr = job.stderr;
+    return { content: [{ type: 'text', text: JSON.stringify(out) }] };
+}
 const startSchema = z.object({
     teamName: z.string().describe('Slug name for the team (e.g. "auth-review")'),
     agentTypes: z.array(z.string()).describe('Agent type per worker: "claude", "codex", or "gemini"'),
@@ -78,9 +181,10 @@ const waitSchema = z.object({
     nudge_max_count: z.number().optional().describe('Maximum nudges per pane (default: 3)'),
     nudge_message: z.string().optional().describe('Message sent as nudge (default: "Continue working on your assigned task.")'),
 });
-// ---------------------------------------------------------------------------
-// Tool handlers
-// ---------------------------------------------------------------------------
+const cleanupSchema = z.object({
+    job_id: z.string().describe('Job ID returned by omc_run_team_start'),
+    grace_ms: z.number().optional().describe('Grace period in ms before force-killing panes (default: 10000)'),
+});
 async function handleStart(args) {
     if (typeof args === 'object'
         && args !== null
@@ -122,7 +226,6 @@ async function handleStart(args) {
             }
             job.result = stdout;
         }
-        // Only fall back to exit-code when stdout parsing did not set a status
         if (job.status === 'running') {
             if (code === 0)
                 job.status = 'completed';
@@ -142,109 +245,130 @@ async function handleStart(args) {
         content: [{ type: 'text', text: JSON.stringify({ jobId, pid: job.pid, message: 'Team started. Poll with omc_run_team_status.' }) }],
     };
 }
-async function handleStatus(args) {
+export async function handleStatus(args) {
     const { job_id } = statusSchema.parse(args);
     validateJobId(job_id);
-    const job = omcTeamJobs.get(job_id) ?? loadJobFromDisk(job_id);
+    let job = omcTeamJobs.get(job_id) ?? loadJobFromDisk(job_id);
     if (!job) {
         return { content: [{ type: 'text', text: JSON.stringify({ error: `No job found: ${job_id}` }) }] };
     }
-    const elapsed = ((Date.now() - job.startedAt) / 1000).toFixed(1);
-    const out = { jobId: job_id, status: job.status, elapsedSeconds: elapsed };
-    if (job.result) {
-        try {
-            out.result = JSON.parse(job.result);
-        }
-        catch {
-            out.result = job.result;
-        }
+    // Precedence: artifact terminal > job.status/result > pid liveness.
+    const artifactConvergence = convergeJobWithResultArtifact(job, job_id, OMC_JOBS_DIR);
+    if (artifactConvergence.changed) {
+        job = saveJobState(job_id, artifactConvergence.job);
+        return makeJobResponse(job_id, job);
     }
-    if (job.stderr)
-        out.stderr = job.stderr;
-    return { content: [{ type: 'text', text: JSON.stringify(out) }] };
+    if (isJobTerminal(job)) {
+        return makeJobResponse(job_id, job);
+    }
+    if (job.pid != null && !isPidAlive(job.pid)) {
+        job = saveJobState(job_id, {
+            ...job,
+            status: 'failed',
+            result: job.result ?? JSON.stringify({ error: 'Process no longer alive (MCP restart?)' }),
+        });
+    }
+    return makeJobResponse(job_id, job);
 }
-async function handleWait(args) {
+export async function handleWait(args) {
     const { job_id, timeout_ms = 300_000, nudge_delay_ms, nudge_max_count, nudge_message } = waitSchema.parse(args);
     validateJobId(job_id);
-    // Cap at 1 hour — matches Codex/Gemini wait_for_job behaviour
     const deadline = Date.now() + Math.min(timeout_ms, 3_600_000);
-    let pollDelay = 500; // ms; grows to 2000ms via 1.5× backoff
-    // Auto-nudge idle teammate panes (issue #1047)
+    let pollDelay = 500;
     const nudgeTracker = new NudgeTracker({
         ...(nudge_delay_ms != null ? { delayMs: nudge_delay_ms } : {}),
         ...(nudge_max_count != null ? { maxCount: nudge_max_count } : {}),
         ...(nudge_message != null ? { message: nudge_message } : {}),
     });
     while (Date.now() < deadline) {
-        const job = omcTeamJobs.get(job_id) ?? loadJobFromDisk(job_id);
+        let job = omcTeamJobs.get(job_id) ?? loadJobFromDisk(job_id);
         if (!job) {
             return { content: [{ type: 'text', text: JSON.stringify({ error: `No job found: ${job_id}` }) }] };
         }
-        // FIX 2: Detect orphan PIDs (e.g. after MCP restart) — if job is 'running' but
-        // the process is dead, mark it failed immediately rather than polling forever.
-        if (job.status === 'running' && job.pid != null) {
-            try {
-                process.kill(job.pid, 0);
+        // Precedence: artifact terminal > job.status/result > pid liveness > timeout.
+        const artifactConvergence = convergeJobWithResultArtifact(job, job_id, OMC_JOBS_DIR);
+        if (artifactConvergence.changed) {
+            job = saveJobState(job_id, artifactConvergence.job);
+            const out = makeJobResponse(job_id, job);
+            if (nudgeTracker.totalNudges > 0) {
+                const payload = JSON.parse(out.content[0].text);
+                payload.nudges = nudgeTracker.getSummary();
+                out.content[0].text = JSON.stringify(payload);
             }
-            catch (e) {
-                if (e.code === 'ESRCH') {
-                    job.status = 'failed';
-                    if (!job.result)
-                        job.result = JSON.stringify({ error: 'Process no longer alive (MCP restart?)' });
-                    persistJob(job_id, job);
-                    const elapsed = ((Date.now() - job.startedAt) / 1000).toFixed(1);
-                    return { content: [{ type: 'text', text: JSON.stringify({ jobId: job_id, status: 'failed', elapsedSeconds: elapsed, error: 'Process no longer alive (MCP restart?)' }) }] };
-                }
+            return out;
+        }
+        if (isJobTerminal(job)) {
+            const out = makeJobResponse(job_id, job);
+            if (nudgeTracker.totalNudges > 0) {
+                const payload = JSON.parse(out.content[0].text);
+                payload.nudges = nudgeTracker.getSummary();
+                out.content[0].text = JSON.stringify(payload);
             }
+            return out;
         }
-        if (job.status !== 'running') {
-            const elapsed = ((Date.now() - job.startedAt) / 1000).toFixed(1);
-            const out = { jobId: job_id, status: job.status, elapsedSeconds: elapsed };
-            if (job.result) {
-                try {
-                    out.result = JSON.parse(job.result);
-                }
-                catch {
-                    out.result = job.result;
-                }
+        if (job.pid != null && !isPidAlive(job.pid)) {
+            job = saveJobState(job_id, {
+                ...job,
+                status: 'failed',
+                result: job.result ?? JSON.stringify({ error: 'Process no longer alive (MCP restart?)' }),
+            });
+            const out = makeJobResponse(job_id, job, { error: 'Process no longer alive (MCP restart?)' });
+            if (nudgeTracker.totalNudges > 0) {
+                const payload = JSON.parse(out.content[0].text);
+                payload.nudges = nudgeTracker.getSummary();
+                out.content[0].text = JSON.stringify(payload);
             }
-            if (job.stderr)
-                out.stderr = job.stderr;
-            if (nudgeTracker.totalNudges > 0)
-                out.nudges = nudgeTracker.getSummary();
-            return { content: [{ type: 'text', text: JSON.stringify(out) }] };
+            return out;
         }
-        // Yield to Node.js event loop — lets child.on('close', ...) fire between polls.
-        // No deadlock: runtime-cli.cjs is an independent child process and never calls
-        // back into this MCP server.
         await new Promise(r => setTimeout(r, pollDelay));
         pollDelay = Math.min(Math.floor(pollDelay * 1.5), 2000);
-        // Auto-nudge idle panes (issue #1047): check worker panes for idle state
-        // and send continuation nudge via tmux send-keys.
         try {
             const panes = await loadPaneIds(job_id);
             if (panes?.paneIds?.length) {
                 await nudgeTracker.checkAndNudge(panes.paneIds, panes.leaderPaneId, job.teamName ?? '');
             }
         }
-        catch { /* nudge is best-effort — never fail the wait loop */ }
+        catch { /* best-effort */ }
     }
-    // Timeout: leave workers running — caller must use omc_run_team_cleanup to stop them explicitly.
-    // Do NOT kill the process or panes here; the user may call omc_run_team_wait again to keep
-    // waiting, or omc_run_team_status to check progress.
-    const elapsed = ((Date.now() - (omcTeamJobs.get(job_id)?.startedAt ?? Date.now())) / 1000).toFixed(1);
-    const timeoutOut = { error: `Timed out waiting for job ${job_id} after ${(timeout_ms / 1000).toFixed(0)}s — workers are still running; call omc_run_team_wait again to keep waiting or omc_run_team_cleanup to stop them`, jobId: job_id, status: 'running', elapsedSeconds: elapsed };
+    const startedAt = omcTeamJobs.get(job_id)?.startedAt ?? Date.now();
+    const elapsed = ((Date.now() - startedAt) / 1000).toFixed(1);
+    const timeoutOut = {
+        error: `Timed out waiting for job ${job_id} after ${(timeout_ms / 1000).toFixed(0)}s — workers are still running; call omc_run_team_wait again to keep waiting or omc_run_team_cleanup to stop them`,
+        jobId: job_id,
+        status: 'running',
+        elapsedSeconds: elapsed,
+    };
     if (nudgeTracker.totalNudges > 0)
         timeoutOut.nudges = nudgeTracker.getSummary();
     return { content: [{ type: 'text', text: JSON.stringify(timeoutOut) }] };
 }
-// ---------------------------------------------------------------------------
-// MCP server
-// ---------------------------------------------------------------------------
+export async function handleCleanup(args) {
+    const { job_id, grace_ms } = cleanupSchema.parse(args);
+    validateJobId(job_id);
+    const job = omcTeamJobs.get(job_id) ?? loadJobFromDisk(job_id);
+    if (!job)
+        return { content: [{ type: 'text', text: `Job ${job_id} not found` }] };
+    const panes = await loadPaneIds(job_id);
+    let paneCleanupMessage = 'No pane IDs recorded for this job — pane cleanup skipped.';
+    if (panes?.paneIds?.length) {
+        await killWorkerPanes({
+            paneIds: panes.paneIds,
+            leaderPaneId: panes.leaderPaneId,
+            teamName: job.teamName ?? '',
+            cwd: job.cwd ?? '',
+            graceMs: grace_ms ?? 10_000,
+        });
+        paneCleanupMessage = `Cleaned up ${panes.paneIds.length} worker pane(s).`;
+    }
+    job.cleanedUpAt = new Date().toISOString();
+    persistJob(job_id, job);
+    const cleanupOutcome = clearScopedTeamState(job);
+    return { content: [{ type: 'text', text: `${paneCleanupMessage} ${cleanupOutcome}` }] };
+}
 const TOOLS = [
     {
         name: 'omc_run_team_start',
-        description: 'Spawn tmux CLI workers (claude/codex/gemini) in the background. Returns jobId immediately. Poll with omc_run_team_status.',
+        description: '[DEPRECATED] CLI-only migration required. This tool no longer executes; use `omc team start`.',
         inputSchema: {
             type: 'object',
             properties: {
@@ -269,7 +393,7 @@ const TOOLS = [
     },
     {
         name: 'omc_run_team_status',
-        description: 'Non-blocking status check for a background omc_run_team job. Returns status and result when done.',
+        description: '[DEPRECATED] CLI-only migration required. This tool no longer executes; use `omc team status <job_id>`.',
         inputSchema: {
             type: 'object',
             properties: {
@@ -280,7 +404,7 @@ const TOOLS = [
     },
     {
         name: 'omc_run_team_wait',
-        description: 'Block (poll internally) until a background omc_run_team job reaches a terminal state (completed or failed). Returns the result when done. One call instead of N polling calls. Uses exponential backoff (500ms → 2000ms). Auto-nudges idle teammate panes via tmux send-keys. If this wait call times out, workers are left running — call omc_run_team_wait again to keep waiting, or omc_run_team_cleanup to stop them explicitly.',
+        description: '[DEPRECATED] CLI-only migration required. This tool no longer executes; use `omc team wait <job_id>`.',
         inputSchema: {
             type: 'object',
             properties: {
@@ -295,7 +419,7 @@ const TOOLS = [
     },
     {
         name: 'omc_run_team_cleanup',
-        description: 'Explicitly clean up worker panes when you want to stop workers. Kills all worker panes recorded for the job without touching the leader pane or the user session.',
+        description: '[DEPRECATED] CLI-only migration required. This tool no longer executes; use `omc team cleanup <job_id>`.',
         inputSchema: {
             type: 'object',
             properties: {
@@ -310,6 +434,9 @@ const server = new Server({ name: 'team', version: '1.0.0' }, { capabilities: {
 server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools: TOOLS }));
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
     const { name, arguments: args } = request.params;
+    if (isDeprecatedTeamToolName(name)) {
+        return createDeprecatedCliOnlyEnvelopeWithArgs(name, args);
+    }
     try {
         if (name === 'omc_run_team_start')
             return await handleStart(args ?? {});
@@ -317,27 +444,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             return await handleStatus(args ?? {});
         if (name === 'omc_run_team_wait')
             return await handleWait(args ?? {});
-        if (name === 'omc_run_team_cleanup') {
-            const { job_id, grace_ms } = (args ?? {});
-            validateJobId(job_id);
-            const job = omcTeamJobs.get(job_id) ?? loadJobFromDisk(job_id);
-            if (!job)
-                return { content: [{ type: 'text', text: `Job ${job_id} not found` }] };
-            const panes = await loadPaneIds(job_id);
-            if (!panes?.paneIds?.length) {
-                return { content: [{ type: 'text', text: 'No pane IDs recorded for this job — nothing to clean up.' }] };
-            }
-            await killWorkerPanes({
-                paneIds: panes.paneIds,
-                leaderPaneId: panes.leaderPaneId,
-                teamName: job.teamName ?? '',
-                cwd: job.cwd ?? '',
-                graceMs: grace_ms ?? 10_000,
-            });
-            job.cleanedUpAt = new Date().toISOString();
-            persistJob(job_id, job);
-            return { content: [{ type: 'text', text: `Cleaned up ${panes.paneIds.length} worker pane(s).` }] };
-        }
+        if (name === 'omc_run_team_cleanup')
+            return await handleCleanup(args ?? {});
         return { content: [{ type: 'text', text: `Unknown tool: ${name}` }], isError: true };
     }
     catch (error) {
@@ -349,8 +457,10 @@ async function main() {
     await server.connect(transport);
     console.error('OMC Team MCP Server running on stdio');
 }
-main().catch((error) => {
-    console.error('Failed to start server:', error);
-    process.exit(1);
-});
+if (process.env.OMC_TEAM_SERVER_DISABLE_AUTOSTART !== '1' && process.env.NODE_ENV !== 'test') {
+    main().catch((error) => {
+        console.error('Failed to start server:', error);
+        process.exit(1);
+    });
+}
 //# sourceMappingURL=team-server.js.map