claudecode-omc 4.4.10 → 4.7.4

package/docs/partials/mode-selection-guide.md

@@ -4,34 +4,43 @@
 
 | If you want... | Use this | Keyword |
 |----------------|----------|---------|
+| Clarify vague requirements first | `deep-interview` | "deep interview", "ouroboros", "don't assume" |
 | Full autonomous build from idea | `autopilot` | "autopilot", "build me", "I want a" |
-| Parallel autonomous (3-5x faster) | `ultrapilot` | "ultrapilot", "parallel build" |
+| Parallel autonomous (3-5x faster) | `team` (replaces `ultrapilot`) | `/team N:executor "task"` |
 | Persistence until verified done | `ralph` | "ralph", "don't stop" |
 | Parallel execution, manual oversight | `ultrawork` | "ulw", "ultrawork" |
 | Cost-efficient execution | `` (modifier) | "eco", "budget" |
-| Many similar independent tasks | `swarm` | "swarm N agents" |
+| Many similar independent tasks | `team` (replaces `swarm`) | `/team N:executor "task"` |
 
-## If You're Confused
+> **Note:** `ultrapilot` and `swarm` are **deprecated** — they now route to `team` mode.
 
-**Start with `autopilot`** - it handles most scenarios and transitions to other modes automatically.
+## If You're Confused or Uncertain
+
+**Don't know what you don't know?** Start with `/deep-interview` - it uses Socratic questioning to clarify vague ideas, expose hidden assumptions, and measure clarity before any code is written.
+
+**Already have a clear idea?** Start with `autopilot` - it handles most scenarios and transitions to other modes automatically.
 
 ## Detailed Decision Flowchart
 
 ```
+Uncertain about requirements or have a vague idea?
+├── YES: Use deep-interview to clarify before execution
+└── NO: Continue below
+
 Want autonomous execution?
 ├── YES: Is task parallelizable into 3+ independent components?
-│   ├── YES: ultrapilot (parallel autopilot with file ownership)
+│   ├── YES: team N:deep-executor (parallel autonomous with file ownership)
 │   └── NO: autopilot (sequential with ralph phases)
 └── NO: Want parallel execution with manual oversight?
     ├── YES: Do you want cost optimization?
-    │   ├── YES:  + ultrawork
+    │   ├── YES: eco + ultrawork
     │   └── NO: ultrawork alone
     └── NO: Want persistence until verified done?
         ├── YES: ralph (persistence + ultrawork + verification)
         └── NO: Standard orchestration (delegate to agents directly)
 
 Have many similar independent tasks (e.g., "fix 47 errors")?
-└── YES: swarm (N agents claiming from task pool)
+└── YES: team N:executor (N agents claiming from task pool)
 ```
 
 ## Examples
@@ -39,8 +48,8 @@ Have many similar independent tasks (e.g., "fix 47 errors")?
 | User Request | Best Mode | Why |
 |--------------|-----------|-----|
 | "Build me a REST API" | autopilot | Single coherent deliverable |
-| "Build frontend, backend, and database" | ultrapilot | Clear component boundaries |
-| "Fix all 47 TypeScript errors" | swarm | Many independent similar tasks |
+| "Build frontend, backend, and database" | team 3:deep-executor | Clear component boundaries |
+| "Fix all 47 TypeScript errors" | team 5:executor | Many independent similar tasks |
 | "Refactor auth module thoroughly" | ralph | Need persistence + verification |
 | "Quick parallel execution" | ultrawork | Manual oversight preferred |
 | "Save tokens while fixing errors" |  + ultrawork | Cost-conscious parallel |
@@ -51,8 +60,9 @@ Have many similar independent tasks (e.g., "fix 47 errors")?
 ### Standalone Modes
 These run independently:
 - **autopilot**: Autonomous end-to-end execution
-- **ultrapilot**: Parallel autonomous with file ownership
-- **swarm**: N-agent coordination with task pool
+- **team**: Canonical orchestration with coordinated agents (replaces `ultrapilot` and `swarm`)
+
+> **Deprecated:** `ultrapilot` and `swarm` now route to `team` mode.
 
 ### Wrapper Modes
 These wrap other modes:
@@ -78,5 +88,5 @@ These modify how other modes work:
 
 | Combination | Why Invalid |
 |-------------|-------------|
-| `autopilot ultrapilot` | Both are standalone - use one |
+| `autopilot team` | Both are standalone - use one |
 | `` alone | Needs an execution mode to modify |

package/docs/shared/mode-selection-guide.md

@@ -4,34 +4,43 @@
 
 | If you want... | Use this | Keyword |
 |----------------|----------|---------|
+| Clarify vague requirements first | `deep-interview` | "deep interview", "ouroboros", "don't assume" |
 | Full autonomous build from idea | `autopilot` | "autopilot", "build me", "I want a" |
-| Parallel autonomous (3-5x faster) | `ultrapilot` | "ultrapilot", "parallel build" |
+| Parallel autonomous (3-5x faster) | `team` (replaces `ultrapilot`) | `/team N:executor "task"` |
 | Persistence until verified done | `ralph` | "ralph", "don't stop" |
 | Parallel execution, manual oversight | `ultrawork` | "ulw", "ultrawork" |
 | Cost-efficient execution | `` (modifier) | "eco", "budget" |
-| Many similar independent tasks | `swarm` | "swarm N agents" |
+| Many similar independent tasks | `team` (replaces `swarm`) | `/team N:executor "task"` |
 
-## If You're Confused
+> **Note:** `ultrapilot` and `swarm` are **deprecated** — they now route to `team` mode.
 
-**Start with `autopilot`** - it handles most scenarios and transitions to other modes automatically.
+## If You're Confused or Uncertain
+
+**Don't know what you don't know?** Start with `/deep-interview` - it uses Socratic questioning to clarify vague ideas, expose hidden assumptions, and measure clarity before any code is written.
+
+**Already have a clear idea?** Start with `autopilot` - it handles most scenarios and transitions to other modes automatically.
 
 ## Detailed Decision Flowchart
 
 ```
+Uncertain about requirements or have a vague idea?
+├── YES: Use deep-interview to clarify before execution
+└── NO: Continue below
+
 Want autonomous execution?
 ├── YES: Is task parallelizable into 3+ independent components?
-│   ├── YES: ultrapilot (parallel autopilot with file ownership)
+│   ├── YES: team N:deep-executor (parallel autonomous with file ownership)
 │   └── NO: autopilot (sequential with ralph phases)
 └── NO: Want parallel execution with manual oversight?
     ├── YES: Do you want cost optimization?
-    │   ├── YES:  + ultrawork
+    │   ├── YES: eco + ultrawork
     │   └── NO: ultrawork alone
     └── NO: Want persistence until verified done?
         ├── YES: ralph (persistence + ultrawork + verification)
         └── NO: Standard orchestration (delegate to agents directly)
 
 Have many similar independent tasks (e.g., "fix 47 errors")?
-└── YES: swarm (N agents claiming from task pool)
+└── YES: team N:executor (N agents claiming from task pool)
 ```
 
 ## Examples
@@ -39,8 +48,8 @@ Have many similar independent tasks (e.g., "fix 47 errors")?
 | User Request | Best Mode | Why |
 |--------------|-----------|-----|
 | "Build me a REST API" | autopilot | Single coherent deliverable |
-| "Build frontend, backend, and database" | ultrapilot | Clear component boundaries |
-| "Fix all 47 TypeScript errors" | swarm | Many independent similar tasks |
+| "Build frontend, backend, and database" | team 3:deep-executor | Clear component boundaries |
+| "Fix all 47 TypeScript errors" | team 5:executor | Many independent similar tasks |
 | "Refactor auth module thoroughly" | ralph | Need persistence + verification |
 | "Quick parallel execution" | ultrawork | Manual oversight preferred |
 | "Save tokens while fixing errors" |  + ultrawork | Cost-conscious parallel |
@@ -51,8 +60,9 @@ Have many similar independent tasks (e.g., "fix 47 errors")?
 ### Standalone Modes
 These run independently:
 - **autopilot**: Autonomous end-to-end execution
-- **ultrapilot**: Parallel autonomous with file ownership
-- **swarm**: N-agent coordination with task pool
+- **team**: Canonical orchestration with coordinated agents (replaces `ultrapilot` and `swarm`)
+
+> **Deprecated:** `ultrapilot` and `swarm` now route to `team` mode.
 
 ### Wrapper Modes
 These wrap other modes:
@@ -78,5 +88,5 @@ These modify how other modes work:
 
 | Combination | Why Invalid |
 |-------------|-------------|
-| `autopilot ultrapilot` | Both are standalone - use one |
+| `autopilot team` | Both are standalone - use one |
 | `` alone | Needs an execution mode to modify |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudecode-omc",
-  "version": "4.4.10",
+  "version": "4.7.4",
   "description": "Multi-agent orchestration system for Claude Code - Inspired by oh-my-opencode",
   "type": "module",
   "main": "dist/index.js",
@@ -12,9 +12,9 @@
     }
   },
   "bin": {
-    "oh-my-claudecode": "dist/cli/index.js",
-    "omc": "dist/cli/index.js",
-    "omc-cli": "dist/cli/index.js"
+    "oh-my-claudecode": "bridge/cli.cjs",
+    "omc": "bridge/cli.cjs",
+    "omc-cli": "bridge/cli.cjs"
   },
   "files": [
     "dist",
@@ -23,6 +23,8 @@
     "bridge/mcp-server.cjs",
     "bridge/team-bridge.cjs",
     "bridge/team-mcp.cjs",
+    "bridge/team.js",
+    "bridge/cli.cjs",
     "bridge/runtime-cli.cjs",
     "commands",
     "hooks",
@@ -36,13 +38,16 @@
     "LICENSE"
   ],
   "scripts": {
-    "build": "tsc && node scripts/build-skill-bridge.mjs && node scripts/build-mcp-server.mjs && node scripts/build-bridge-entry.mjs && npm run compose-docs && npm run build:runtime-cli && npm run build:team-server",
+    "build": "tsc && node scripts/build-skill-bridge.mjs && node scripts/build-mcp-server.mjs && node scripts/build-bridge-entry.mjs && npm run compose-docs && npm run build:runtime-cli && npm run build:team-server && npm run build:cli",
     "build:bridge": "node scripts/build-skill-bridge.mjs",
     "build:codex": "echo '[deprecated] Codex MCP server removed in v5.0 - use tmux team workers instead'",
     "build:gemini": "echo '[deprecated] Gemini MCP server removed in v5.0 - use tmux team workers instead'",
     "build:bridge-entry": "node scripts/build-bridge-entry.mjs",
+    "build:cli": "node scripts/build-cli.mjs",
     "build:runtime-cli": "node scripts/build-runtime-cli.mjs",
     "build:team-server": "node scripts/build-team-server.mjs",
+    "ask:codex": "./scripts/ask-codex.sh",
+    "ask:gemini": "./scripts/ask-gemini.sh",
     "compose-docs": "node scripts/compose-docs.mjs",
     "dev": "tsc --watch",
     "start": "node dist/index.js",
@@ -55,7 +60,6 @@
     "sync-metadata": "tsx scripts/sync-metadata.ts",
     "sync-metadata:verify": "tsx scripts/sync-metadata.ts --verify",
     "sync-metadata:dry-run": "tsx scripts/sync-metadata.ts --dry-run",
-    "prepare": "npm run build",
     "prepublishOnly": "npm run build && npm run compose-docs"
   },
   "dependencies": {
@@ -73,6 +77,7 @@
     "zod": "^3.23.8"
   },
   "devDependencies": {
+    "@anthropic-ai/sdk": "^0.78.0",
     "@eslint/js": "^9.39.2",
     "@types/node": "^22.19.7",
     "@typescript-eslint/eslint-plugin": "^8.18.2",

package/scripts/ask-codex.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+set -uo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+LOCAL_CLI="$SCRIPT_DIR/../bridge/cli.cjs"
+FALLBACK_ADVISOR="$SCRIPT_DIR/run-provider-advisor.js"
+
+if [[ -f "$LOCAL_CLI" ]]; then
+  node "$LOCAL_CLI" ask codex "$@"
+  status=$?
+  if [[ $status -ne 126 && $status -ne 127 ]]; then
+    exit $status
+  fi
+
+  >&2 echo "[ask-codex] DEPRECATED fallback: local OMC CLI launch failed (exit $status); falling back to run-provider-advisor.js"
+elif [[ ! -f "$FALLBACK_ADVISOR" ]]; then
+  >&2 echo "[ask-codex] Error: local OMC CLI and fallback advisor script are both unavailable."
+  exit 1
+else
+  >&2 echo "[ask-codex] DEPRECATED fallback: local OMC CLI entrypoint not found; using run-provider-advisor.js"
+fi
+
+node "$FALLBACK_ADVISOR" codex "$@"
+exit $?

package/scripts/ask-gemini.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+set -uo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
+LOCAL_CLI="$SCRIPT_DIR/../bridge/cli.cjs"
+FALLBACK_ADVISOR="$SCRIPT_DIR/run-provider-advisor.js"
+
+if [[ -f "$LOCAL_CLI" ]]; then
+  node "$LOCAL_CLI" ask gemini "$@"
+  status=$?
+  if [[ $status -ne 126 && $status -ne 127 ]]; then
+    exit $status
+  fi
+
+  >&2 echo "[ask-gemini] DEPRECATED fallback: local OMC CLI launch failed (exit $status); falling back to run-provider-advisor.js"
+elif [[ ! -f "$FALLBACK_ADVISOR" ]]; then
+  >&2 echo "[ask-gemini] Error: local OMC CLI and fallback advisor script are both unavailable."
+  exit 1
+else
+  >&2 echo "[ask-gemini] DEPRECATED fallback: local OMC CLI entrypoint not found; using run-provider-advisor.js"
+fi
+
+node "$FALLBACK_ADVISOR" gemini "$@"
+exit $?

package/scripts/build-cli.mjs

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+import * as esbuild from 'esbuild';
+import { mkdir } from 'fs/promises';
+
+const outfile = 'bridge/cli.cjs';
+await mkdir('bridge', { recursive: true });
+
+const sharedExternal = [
+  'fs', 'fs/promises', 'path', 'os', 'util', 'stream', 'events',
+  'buffer', 'crypto', 'http', 'https', 'url',
+  'child_process', 'assert', 'module', 'net', 'tls',
+  'dns', 'readline', 'tty', 'worker_threads',
+  '@ast-grep/napi', 'better-sqlite3',
+  // Avoid bundling jsonc-parser's UMD internals
+  'jsonc-parser',
+];
+
+await esbuild.build({
+  entryPoints: ['src/cli/index.ts'],
+  bundle: true,
+  platform: 'node',
+  target: 'node18',
+  format: 'cjs',
+  outfile,
+  // Inject import.meta.url polyfill for CJS format
+  banner: {
+    js: 'const importMetaUrl = require("url").pathToFileURL(__filename);',
+  },
+  define: {
+    'import.meta.url': 'importMetaUrl',
+  },
+  external: sharedExternal,
+});
+console.log(`Built ${outfile}`);
+
+// Build team CLI module separately (dynamically imported by cli.cjs)
+const teamOutfile = 'bridge/team.js';
+await esbuild.build({
+  entryPoints: ['src/cli/team.ts'],
+  bundle: true,
+  platform: 'node',
+  target: 'node18',
+  format: 'esm',
+  outfile: teamOutfile,
+  external: sharedExternal,
+});
+console.log(`Built ${teamOutfile}`);

package/scripts/build-runtime-cli.mjs

@@ -19,6 +19,8 @@ await esbuild.build({
     'child_process', 'assert', 'module', 'net', 'tls',
     'dns', 'readline', 'tty', 'worker_threads',
     '@ast-grep/napi', 'better-sqlite3',
+    // jsonc-parser has dynamic requires that don't bundle well; we use a custom parser
+    'jsonc-parser',
   ],
 });
 console.log(`Built ${outfile}`);

package/scripts/context-guard-stop.mjs

@@ -20,8 +20,9 @@
  */
 
 import { existsSync, readFileSync, writeFileSync, mkdirSync, statSync, openSync, readSync, closeSync } from 'node:fs';
-import { join, dirname } from 'node:path';
-import { tmpdir } from 'node:os';
+import { join, dirname, resolve } from 'node:path';
+import { tmpdir, homedir } from 'node:os';
+import { execSync } from 'node:child_process';
 import { readStdin } from './lib/stdin.mjs';
 
 const THRESHOLD = parseInt(process.env.OMC_CONTEXT_GUARD_THRESHOLD || '75', 10);
@@ -63,6 +64,67 @@ function isUserAbort(data) {
   );
 }
 
+/**
+ * Resolve a transcript path that may be mismatched in worktree sessions (issue #1094).
+ * When Claude Code runs inside .claude/worktrees/X, the encoded project directory
+ * contains `--claude-worktrees-X` which doesn't exist. Strip it to find the real path.
+ */
+function resolveTranscriptPath(transcriptPath, cwd) {
+  if (!transcriptPath) return transcriptPath;
+  try {
+    if (existsSync(transcriptPath)) return transcriptPath;
+  } catch { /* fallthrough */ }
+
+  // Strategy 1: Strip Claude worktree segment from encoded project directory
+  const worktreePattern = /--claude-worktrees-[^/\\]+/;
+  if (worktreePattern.test(transcriptPath)) {
+    const resolved = transcriptPath.replace(worktreePattern, '');
+    try {
+      if (existsSync(resolved)) return resolved;
+    } catch { /* fallthrough */ }
+  }
+
+  // Strategy 2: Detect native git worktree via git-common-dir.
+  // When CWD is a linked worktree (created by `git worktree add`), the
+  // transcript path encodes the worktree CWD, but the file lives under
+  // the main repo's encoded path.
+  const effectiveCwd = cwd || process.cwd();
+  try {
+    const gitCommonDir = execSync('git rev-parse --git-common-dir', {
+      cwd: effectiveCwd,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    }).trim();
+
+    const absoluteCommonDir = resolve(effectiveCwd, gitCommonDir);
+    const mainRepoRoot = dirname(absoluteCommonDir);
+
+    const worktreeTop = execSync('git rev-parse --show-toplevel', {
+      cwd: effectiveCwd,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    }).trim();
+
+    if (mainRepoRoot !== worktreeTop) {
+      const lastSep = transcriptPath.lastIndexOf('/');
+      const sessionFile = lastSep !== -1 ? transcriptPath.substring(lastSep + 1) : '';
+      if (sessionFile) {
+        const configDir = process.env.CLAUDE_CONFIG_DIR || join(homedir(), '.claude');
+        const projectsDir = join(configDir, 'projects');
+        if (existsSync(projectsDir)) {
+          const encodedMain = mainRepoRoot.replace(/[/\\]/g, '-');
+          const resolvedPath = join(projectsDir, encodedMain, sessionFile);
+          try {
+            if (existsSync(resolvedPath)) return resolvedPath;
+          } catch { /* fallthrough */ }
+        }
+      }
+    }
+  } catch { /* not in a git repo or git not available — skip */ }
+
+  return transcriptPath;
+}
+
 /**
  * Estimate context usage percentage from the transcript file.
  */
@@ -148,7 +210,8 @@ async function main() {
     }
 
     const sessionId = data.session_id || data.sessionId || '';
-    const transcriptPath = data.transcript_path || data.transcriptPath || '';
+    const rawTranscriptPath = data.transcript_path || data.transcriptPath || '';
+    const transcriptPath = resolveTranscriptPath(rawTranscriptPath, data.cwd);
     const pct = estimateContextPercent(transcriptPath);
 
     if (pct >= THRESHOLD) {

package/scripts/context-safety.mjs

@@ -15,9 +15,73 @@
  *   - Allow ({ continue: true, suppressOutput: true }) otherwise
  */
 
-import { statSync, openSync, readSync, closeSync } from 'node:fs';
+import { existsSync, statSync, openSync, readSync, closeSync } from 'node:fs';
+import { join, dirname, resolve } from 'node:path';
+import { homedir } from 'node:os';
+import { execSync } from 'node:child_process';
 import { readStdin } from './lib/stdin.mjs';
 
+/**
+ * Resolve a transcript path that may be mismatched in worktree sessions (issue #1094).
+ * When Claude Code runs inside .claude/worktrees/X, the encoded project directory
+ * contains `--claude-worktrees-X` which doesn't exist. Strip it to find the real path.
+ */
+function resolveTranscriptPath(transcriptPath, cwd) {
+  if (!transcriptPath) return transcriptPath;
+  try {
+    if (existsSync(transcriptPath)) return transcriptPath;
+  } catch { /* fallthrough */ }
+
+  // Strategy 1: Strip Claude worktree segment from encoded project directory
+  const worktreePattern = /--claude-worktrees-[^/\\]+/;
+  if (worktreePattern.test(transcriptPath)) {
+    const resolved = transcriptPath.replace(worktreePattern, '');
+    try {
+      if (existsSync(resolved)) return resolved;
+    } catch { /* fallthrough */ }
+  }
+
+  // Strategy 2: Detect native git worktree via git-common-dir.
+  // When CWD is a linked worktree (created by `git worktree add`), the
+  // transcript path encodes the worktree CWD, but the file lives under
+  // the main repo's encoded path.
+  const effectiveCwd = cwd || process.cwd();
+  try {
+    const gitCommonDir = execSync('git rev-parse --git-common-dir', {
+      cwd: effectiveCwd,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    }).trim();
+
+    const absoluteCommonDir = resolve(effectiveCwd, gitCommonDir);
+    const mainRepoRoot = dirname(absoluteCommonDir);
+
+    const worktreeTop = execSync('git rev-parse --show-toplevel', {
+      cwd: effectiveCwd,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    }).trim();
+
+    if (mainRepoRoot !== worktreeTop) {
+      const lastSep = transcriptPath.lastIndexOf('/');
+      const sessionFile = lastSep !== -1 ? transcriptPath.substring(lastSep + 1) : '';
+      if (sessionFile) {
+        const configDir = process.env.CLAUDE_CONFIG_DIR || join(homedir(), '.claude');
+        const projectsDir = join(configDir, 'projects');
+        if (existsSync(projectsDir)) {
+          const encodedMain = mainRepoRoot.replace(/[/\\]/g, '-');
+          const resolvedPath = join(projectsDir, encodedMain, sessionFile);
+          try {
+            if (existsSync(resolvedPath)) return resolvedPath;
+          } catch { /* fallthrough */ }
+        }
+      }
+    }
+  } catch { /* not in a git repo or git not available — skip */ }
+
+  return transcriptPath;
+}
+
 const THRESHOLD = parseInt(process.env.OMC_CONTEXT_SAFETY_THRESHOLD || '55', 10);
 // TeamCreate was removed from BLOCKED_TOOLS in issue #1006.
 // Blocking TeamCreate at high context caused silent fallback to regular subagents,
@@ -79,7 +143,8 @@ async function main() {
       return;
     }
 
-    const transcriptPath = data.transcript_path || data.transcriptPath || '';
+    const rawTranscriptPath = data.transcript_path || data.transcriptPath || '';
+    const transcriptPath = resolveTranscriptPath(rawTranscriptPath, data.cwd);
     const pct = estimateContextPercent(transcriptPath);
 
     if (pct >= THRESHOLD) {

package/scripts/keyword-detector.mjs

@@ -258,18 +258,7 @@ function resolveConflicts(matches) {
   let resolved = [...matches];
 
 
-  // Team beats autopilot (legacy ultrapilot semantics)
-  if (names.includes('team') && names.includes('autopilot')) {
-    resolved = resolved.filter(m => m.name !== 'autopilot');
-  }
-
-  // Team beats ultrapilot (team is the canonical implementation)
-  if (names.includes('team') && names.includes('ultrapilot')) {
-    resolved = resolved.filter(m => m.name !== 'ultrapilot');
-  }
-
-  // Ralph + Team coexist (team-ralph linked mode)
-  // Both keywords are preserved so the skill can detect the composition.
+  // Team keyword detection removed — team is now explicit-only via /team skill.
 
   // Sort by priority order
   const priorityOrder = ['cancel','ralph','autopilot','team','ultrawork',
@@ -302,6 +291,13 @@ async function main() {
     return;
   }
 
+  // Team worker guard: prevent keyword detection inside team workers to avoid
+  // infinite spawning loops (worker detects "team" -> invokes team skill -> spawns more workers)
+  if (process.env.OMC_TEAM_WORKER) {
+    console.log(JSON.stringify({ continue: true, suppressOutput: true }));
+    return;
+  }
+
   try {
     const input = await readStdin();
     if (!input.trim()) {
@@ -346,14 +342,7 @@ async function main() {
       matches.push({ name: 'autopilot', args: '' });
     }
 
-    // Ultrapilot keywords (legacy names, routes to team via compatibility facade)
-    if (/\b(ultrapilot|ultra-pilot)\b/i.test(cleanPrompt) ||
-        /\bparallel\s+build\b/i.test(cleanPrompt) ||
-        /\bswarm\s+build\b/i.test(cleanPrompt) ||
-        /\bswarm\s+\d+\s+agents?\b/i.test(cleanPrompt) ||
-        /\bcoordinated\s+agents\b/i.test(cleanPrompt)) {
-      matches.push({ name: 'ultrapilot', args: '' });
-    }
+    // Ultrapilot keywords removed — routed to team which is now explicit-only (/team).
 
     // Ultrawork keywords
     if (/\b(ultrawork|ulw|uw)\b/i.test(cleanPrompt)) {
@@ -361,13 +350,8 @@ async function main() {
     }
 
 
-    // Team keywords (intent-gated to prevent false positives on bare "team")
-    // Uses negative lookbehind to exclude possessive/article contexts like "my team", "the team"
-    const hasTeamKeyword = /(?<!\b(?:my|the|our|a|his|her|their|its)\s)\bteam\b/i.test(cleanPrompt) ||
-      /\bcoordinated\s+team\b/i.test(cleanPrompt);
-    if (hasTeamKeyword && isTeamEnabled()) {
-      matches.push({ name: 'team', args: '' });
-    }
+    // Team keyword detection removed — team mode is now explicit-only via /team skill.
+    // This prevents infinite spawning when Claude workers receive prompts containing "team".
 
     // Pipeline keywords
     if (/\b(pipeline)\b/i.test(cleanPrompt) || /\bchain\s+agents\b/i.test(cleanPrompt)) {
@@ -447,13 +431,13 @@ async function main() {
 
     // Handle cancel specially - clear states and emit
     if (resolved.length > 0 && resolved[0].name === 'cancel') {
-      clearStateFiles(directory, ['ralph', 'autopilot', 'team', 'ultrawork', 'swarm', 'pipeline'], sessionId);
+      clearStateFiles(directory, ['ralph', 'autopilot', 'ultrawork', 'swarm', 'pipeline'], sessionId);
       console.log(JSON.stringify(createHookOutput(createSkillInvocation('cancel', prompt))));
       return;
     }
 
-    // Activate states for modes that need them
-    const stateModes = resolved.filter(m => ['ralph', 'autopilot', 'team', 'ultrawork'].includes(m.name));
+    // Activate states for modes that need them (team removed — explicit-only via /team skill)
+    const stateModes = resolved.filter(m => ['ralph', 'autopilot', 'ultrawork'].includes(m.name));
     for (const mode of stateModes) {
       activateState(directory, prompt, mode.name, sessionId);
     }
@@ -468,16 +452,10 @@ async function main() {
     // Special: Ralph with ultrawork
     const hasRalph = resolved.some(m => m.name === 'ralph');
     const hasUltrawork = resolved.some(m => m.name === 'ultrawork');
-    const hasTeam = resolved.some(m => m.name === 'team');
     if (hasRalph && !hasUltrawork) {
       activateState(directory, prompt, 'ultrawork', sessionId);
     }
 
-    // Link ralph + team if both detected (team-ralph composition)
-    if (hasRalph && hasTeam) {
-      linkRalphTeam(directory, sessionId);
-    }
-
     // Handle ultrathink specially - prepend message instead of skill invocation
     const ultrathinkIndex = resolved.findIndex(m => m.name === 'ultrathink');
     if (ultrathinkIndex !== -1) {