@hua-labs/tap 0.1.1 → 0.2.0

package/dist/cli.mjs

@@ -1,49 +1,218 @@
 // src/commands/init.ts
-import * as fs5 from "fs";
-import * as path5 from "path";
+import * as fs6 from "fs";
+import * as path6 from "path";
 
 // src/state.ts
-import * as fs2 from "fs";
-import * as path2 from "path";
+import * as fs3 from "fs";
+import * as path3 from "path";
 import * as crypto from "crypto";
 
 // src/config/resolve.ts
+import * as fs2 from "fs";
+import * as path2 from "path";
+
+// src/utils.ts
 import * as fs from "fs";
 import * as path from "path";
-var SHARED_CONFIG_FILE = "tap-config.json";
-var LOCAL_CONFIG_FILE = "tap-config.local.json";
-var DEFAULT_RUNTIME_COMMAND = "node";
-var DEFAULT_APP_SERVER_URL = "ws://127.0.0.1:4501";
+var VALID_RUNTIMES = ["claude", "codex", "gemini"];
+function isValidRuntime(name) {
+  return VALID_RUNTIMES.includes(name);
+}
+function detectPlatform() {
+  return process.platform;
+}
+var _noGitWarned = false;
+function _setNoGitWarned() {
+  _noGitWarned = true;
+}
 function findRepoRoot(startDir = process.cwd()) {
   let dir = path.resolve(startDir);
   while (true) {
     if (fs.existsSync(path.join(dir, ".git"))) return dir;
-    if (fs.existsSync(path.join(dir, "package.json"))) return dir;
+    if (fs.existsSync(path.join(dir, "package.json"))) {
+      if (!_noGitWarned) {
+        _setNoGitWarned();
+        logWarn(
+          "No .git directory found. Resolved repo root via package.json \u2014 comms directory may be created in an unexpected location. Use --comms-dir to specify explicitly."
+        );
+      }
+      return dir;
+    }
     const parent = path.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
+  if (!_noGitWarned) {
+    _setNoGitWarned();
+    logWarn(
+      "No git repository or package.json found. Using current directory as root. Run 'git init' first, or use --comms-dir to specify the comms path."
+    );
+  }
+  return process.cwd();
+}
+function resolveCommsDir(args, repoRoot) {
+  const idx = args.indexOf("--comms-dir");
+  if (idx !== -1 && args[idx + 1]) {
+    return path.resolve(args[idx + 1]);
+  }
+  const { config } = resolveConfig({}, repoRoot);
+  return config.commsDir;
+}
+function createAdapterContext(commsDir, repoRoot) {
+  const { config } = resolveConfig({}, repoRoot);
+  return {
+    commsDir: path.resolve(commsDir),
+    repoRoot: path.resolve(repoRoot),
+    stateDir: config.stateDir,
+    platform: detectPlatform()
+  };
+}
+function parseArgs(args) {
+  const positional = [];
+  const flags = {};
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg.startsWith("--")) {
+      const key = arg.slice(2);
+      const next = args[i + 1];
+      if (next && !next.startsWith("--")) {
+        flags[key] = next;
+        i++;
+      } else {
+        flags[key] = true;
+      }
+    } else if (arg.startsWith("-")) {
+      flags[arg.slice(1)] = true;
+    } else {
+      positional.push(arg);
+    }
+  }
+  return { positional, flags };
+}
+var _jsonMode = false;
+function setJsonMode(enabled) {
+  _jsonMode = enabled;
+}
+function log(message) {
+  if (!_jsonMode) console.log(`  ${message}`);
+}
+function logSuccess(message) {
+  if (!_jsonMode) console.log(`  + ${message}`);
+}
+function logWarn(message) {
+  if (!_jsonMode) console.log(`  ! ${message}`);
+}
+function logError(message) {
+  if (!_jsonMode) console.error(`  x ${message}`);
+}
+function logHeader(message) {
+  if (!_jsonMode) console.log(`
+  ${message}
+`);
+}
+function resolveInstanceId(identifier, state) {
+  if (state.instances[identifier]) {
+    return { ok: true, instanceId: identifier };
+  }
+  if (isValidRuntime(identifier)) {
+    const matches = Object.values(state.instances).filter(
+      (inst) => inst.runtime === identifier
+    );
+    if (matches.length === 1) {
+      return { ok: true, instanceId: matches[0].instanceId };
+    }
+    if (matches.length > 1) {
+      const ids = matches.map((m) => m.instanceId).join(", ");
+      return {
+        ok: false,
+        code: "TAP_INSTANCE_AMBIGUOUS",
+        message: `Multiple ${identifier} instances found: ${ids}. Specify one explicitly.`
+      };
+    }
+  }
+  return {
+    ok: false,
+    code: "TAP_INSTANCE_NOT_FOUND",
+    message: `Instance not found: ${identifier}`
+  };
+}
+function buildInstanceId(runtime, name) {
+  return name ? `${runtime}-${name}` : runtime;
+}
+function findPortConflict(state, port, excludeInstanceId) {
+  for (const [id, inst] of Object.entries(state.instances)) {
+    if (id !== excludeInstanceId && inst.port === port) return id;
+  }
+  return null;
+}
+
+// src/config/resolve.ts
+var SHARED_CONFIG_FILE = "tap-config.json";
+var LOCAL_CONFIG_FILE = "tap-config.local.json";
+var LEGACY_CONFIG_FILE = ".tap-config";
+var DEFAULT_RUNTIME_COMMAND = "node";
+var DEFAULT_APP_SERVER_URL = "ws://127.0.0.1:4501";
+function findRepoRoot2(startDir = process.cwd()) {
+  let dir = path2.resolve(startDir);
+  while (true) {
+    if (fs2.existsSync(path2.join(dir, ".git"))) return dir;
+    if (fs2.existsSync(path2.join(dir, "package.json"))) {
+      if (!_noGitWarned) {
+        _setNoGitWarned();
+        console.error(
+          "[tap] warning: No .git directory found. Resolved via package.json. Use --comms-dir to specify explicitly."
+        );
+      }
+      return dir;
+    }
+    const parent = path2.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  if (!_noGitWarned) {
+    _setNoGitWarned();
+    console.error(
+      "[tap] warning: No git repository found. Using cwd as root. Run 'git init' or use --comms-dir."
+    );
+  }
   return process.cwd();
 }
 function loadJsonFile(filePath) {
-  if (!fs.existsSync(filePath)) return null;
+  if (!fs2.existsSync(filePath)) return null;
   try {
-    const raw = fs.readFileSync(filePath, "utf-8");
+    const raw = fs2.readFileSync(filePath, "utf-8");
     return JSON.parse(raw);
   } catch {
     return null;
   }
 }
 function loadSharedConfig(repoRoot) {
-  return loadJsonFile(path.join(repoRoot, SHARED_CONFIG_FILE));
+  return loadJsonFile(path2.join(repoRoot, SHARED_CONFIG_FILE));
 }
 function loadLocalConfig(repoRoot) {
-  return loadJsonFile(path.join(repoRoot, LOCAL_CONFIG_FILE));
+  return loadJsonFile(path2.join(repoRoot, LOCAL_CONFIG_FILE));
+}
+function readLegacyShellValue(configText, key) {
+  const match = configText.match(new RegExp(`^${key}="?(.+?)"?$`, "m"));
+  return match?.[1]?.trim() || null;
+}
+function loadLegacyShellConfig(repoRoot) {
+  const filePath = path2.join(repoRoot, LEGACY_CONFIG_FILE);
+  if (!fs2.existsSync(filePath)) return null;
+  try {
+    const raw = fs2.readFileSync(filePath, "utf-8");
+    const commsDir = readLegacyShellValue(raw, "TAP_COMMS_DIR");
+    if (!commsDir) return null;
+    return { commsDir };
+  } catch {
+    return null;
+  }
 }
 function resolveConfig(overrides = {}, startDir) {
-  const repoRoot = findRepoRoot(startDir);
+  const repoRoot = findRepoRoot2(startDir);
   const shared = loadSharedConfig(repoRoot) ?? {};
   const local = loadLocalConfig(repoRoot) ?? {};
+  const legacy = loadLegacyShellConfig(repoRoot) ?? {};
   const sources = {
     repoRoot: "auto",
     commsDir: "auto",
@@ -53,10 +222,10 @@ function resolveConfig(overrides = {}, startDir) {
   };
   let commsDir;
   if (overrides.commsDir) {
-    commsDir = path.resolve(overrides.commsDir);
+    commsDir = resolvePath(repoRoot, overrides.commsDir);
     sources.commsDir = "cli-flag";
   } else if (process.env.TAP_COMMS_DIR) {
-    commsDir = path.resolve(process.env.TAP_COMMS_DIR);
+    commsDir = resolvePath(repoRoot, process.env.TAP_COMMS_DIR);
     sources.commsDir = "env";
   } else if (local.commsDir) {
     commsDir = resolvePath(repoRoot, local.commsDir);
@@ -64,15 +233,18 @@ function resolveConfig(overrides = {}, startDir) {
   } else if (shared.commsDir) {
     commsDir = resolvePath(repoRoot, shared.commsDir);
     sources.commsDir = "shared-config";
+  } else if (legacy.commsDir) {
+    commsDir = resolvePath(repoRoot, legacy.commsDir);
+    sources.commsDir = "legacy-shell-config";
   } else {
-    commsDir = path.join(path.dirname(repoRoot), "tap-comms");
+    commsDir = path2.join(repoRoot, "tap-comms");
   }
   let stateDir;
   if (overrides.stateDir) {
-    stateDir = path.resolve(overrides.stateDir);
+    stateDir = resolvePath(repoRoot, overrides.stateDir);
     sources.stateDir = "cli-flag";
   } else if (process.env.TAP_STATE_DIR) {
-    stateDir = path.resolve(process.env.TAP_STATE_DIR);
+    stateDir = resolvePath(repoRoot, process.env.TAP_STATE_DIR);
     sources.stateDir = "env";
   } else if (local.stateDir) {
     stateDir = resolvePath(repoRoot, local.stateDir);
@@ -81,7 +253,7 @@ function resolveConfig(overrides = {}, startDir) {
     stateDir = resolvePath(repoRoot, shared.stateDir);
     sources.stateDir = "shared-config";
   } else {
-    stateDir = path.join(repoRoot, ".tap-comms");
+    stateDir = path2.join(repoRoot, ".tap-comms");
   }
   let runtimeCommand;
   if (overrides.runtimeCommand) {
@@ -121,7 +293,21 @@ function resolveConfig(overrides = {}, startDir) {
   };
 }
 function resolvePath(repoRoot, p) {
-  return path.isAbsolute(p) ? p : path.resolve(repoRoot, p);
+  const normalized = normalizeTapPath(p);
+  return path2.isAbsolute(normalized) ? normalized : path2.resolve(repoRoot, normalized);
+}
+function normalizeTapPath(input) {
+  const trimmed = input.trim().replace(/^["'`]+|["'`]+$/g, "");
+  if (/^[A-Za-z]:[\\/]/.test(trimmed)) {
+    return trimmed;
+  }
+  if (process.platform === "win32") {
+    const match = trimmed.match(/^\/([A-Za-z])\/(.*)$/);
+    if (match) {
+      return `${match[1].toUpperCase()}:\\${match[2].replace(/\//g, "\\")}`;
+    }
+  }
+  return trimmed;
 }
 
 // src/state.ts
@@ -132,10 +318,10 @@ function getStateDir(repoRoot) {
   return config.stateDir;
 }
 function getStatePath(repoRoot) {
-  return path2.join(getStateDir(repoRoot), STATE_FILE);
+  return path3.join(getStateDir(repoRoot), STATE_FILE);
 }
 function stateExists(repoRoot) {
-  return fs2.existsSync(getStatePath(repoRoot));
+  return fs3.existsSync(getStatePath(repoRoot));
 }
 function migrateStateV1toV2(v1) {
   const instances = {};
@@ -163,8 +349,8 @@ function migrateStateV1toV2(v1) {
 }
 function loadState(repoRoot) {
   const statePath = getStatePath(repoRoot);
-  if (!fs2.existsSync(statePath)) return null;
-  const raw = fs2.readFileSync(statePath, "utf-8");
+  if (!fs3.existsSync(statePath)) return null;
+  const raw = fs3.readFileSync(statePath, "utf-8");
   const parsed = JSON.parse(raw);
   if (parsed.schemaVersion === 1 || parsed.runtimes) {
     const migrated = migrateStateV1toV2(parsed);
@@ -175,11 +361,11 @@ function loadState(repoRoot) {
 }
 function saveState(repoRoot, state) {
   const stateDir = getStateDir(repoRoot);
-  fs2.mkdirSync(stateDir, { recursive: true });
+  fs3.mkdirSync(stateDir, { recursive: true });
   const statePath = getStatePath(repoRoot);
   const tmp = `${statePath}.tmp.${process.pid}`;
-  fs2.writeFileSync(tmp, JSON.stringify(state, null, 2), "utf-8");
-  fs2.renameSync(tmp, statePath);
+  fs3.writeFileSync(tmp, JSON.stringify(state, null, 2), "utf-8");
+  fs3.renameSync(tmp, statePath);
 }
 function createInitialState(commsDir, repoRoot, packageVersion) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -187,8 +373,8 @@ function createInitialState(commsDir, repoRoot, packageVersion) {
     schemaVersion: SCHEMA_VERSION,
     createdAt: now,
     updatedAt: now,
-    commsDir: path2.resolve(commsDir),
-    repoRoot: path2.resolve(repoRoot),
+    commsDir: path3.resolve(commsDir),
+    repoRoot: path3.resolve(repoRoot),
     packageVersion,
     instances: {}
   };
@@ -217,186 +403,85 @@ function getInstalledInstances(state) {
   );
 }
 function ensureBackupDir(stateDir, instanceId) {
-  const backupDir = path2.join(stateDir, "backups", instanceId);
-  fs2.mkdirSync(backupDir, { recursive: true });
+  const backupDir = path3.join(stateDir, "backups", instanceId);
+  fs3.mkdirSync(backupDir, { recursive: true });
   return backupDir;
 }
 function backupFile(filePath, backupDir) {
-  const basename3 = path2.basename(filePath);
+  const basename3 = path3.basename(filePath);
   const hash = fileHash(filePath);
-  const backupPath = path2.join(backupDir, `${basename3}.${hash}.bak`);
-  fs2.copyFileSync(filePath, backupPath);
+  const backupPath = path3.join(backupDir, `${basename3}.${hash}.bak`);
+  fs3.copyFileSync(filePath, backupPath);
   return backupPath;
 }
 function fileHash(filePath) {
-  if (!fs2.existsSync(filePath)) return "";
-  const content = fs2.readFileSync(filePath);
+  if (!fs3.existsSync(filePath)) return "";
+  const content = fs3.readFileSync(filePath);
   return crypto.createHash("sha256").update(content).digest("hex").slice(0, 16);
 }
 
-// src/utils.ts
-import * as fs3 from "fs";
-import * as path3 from "path";
-var VALID_RUNTIMES = ["claude", "codex", "gemini"];
-function isValidRuntime(name) {
-  return VALID_RUNTIMES.includes(name);
-}
-function detectPlatform() {
-  return process.platform;
-}
-function findRepoRoot2(startDir = process.cwd()) {
-  let dir = path3.resolve(startDir);
-  while (true) {
-    if (fs3.existsSync(path3.join(dir, ".git"))) return dir;
-    if (fs3.existsSync(path3.join(dir, "package.json"))) return dir;
-    const parent = path3.dirname(dir);
-    if (parent === dir) break;
-    dir = parent;
+// src/version.ts
+import * as fs4 from "fs";
+import * as path4 from "path";
+import { fileURLToPath } from "url";
+var FALLBACK_VERSION = "0.0.0";
+function resolvePackageVersion(metaUrl = import.meta.url) {
+  const moduleDir = path4.dirname(fileURLToPath(metaUrl));
+  const packageJsonPath = path4.join(moduleDir, "..", "package.json");
+  try {
+    const parsed = JSON.parse(fs4.readFileSync(packageJsonPath, "utf-8"));
+    if (typeof parsed.version === "string" && parsed.version.trim()) {
+      return parsed.version;
+    }
+  } catch {
   }
-  return process.cwd();
+  return FALLBACK_VERSION;
 }
-function resolveCommsDir(args, repoRoot) {
-  const idx = args.indexOf("--comms-dir");
-  if (idx !== -1 && args[idx + 1]) {
-    return path3.resolve(args[idx + 1]);
-  }
-  const { config } = resolveConfig({}, repoRoot);
-  return config.commsDir;
+var version = resolvePackageVersion();
+
+// src/permissions.ts
+import * as fs5 from "fs";
+import * as path5 from "path";
+import * as os from "os";
+
+// src/toml.ts
+function splitLines(content) {
+  return content.replace(/\r\n/g, "\n").split("\n");
 }
-function createAdapterContext(commsDir, repoRoot) {
-  const { config } = resolveConfig({}, repoRoot);
-  return {
-    commsDir: path3.resolve(commsDir),
-    repoRoot: path3.resolve(repoRoot),
-    stateDir: config.stateDir,
-    platform: detectPlatform()
-  };
+function tableHeader(selector) {
+  return `[${selector}]`;
 }
-function parseArgs(args) {
-  const positional = [];
-  const flags = {};
-  for (let i = 0; i < args.length; i++) {
-    const arg = args[i];
-    if (arg.startsWith("--")) {
-      const key = arg.slice(2);
-      const next = args[i + 1];
-      if (next && !next.startsWith("--")) {
-        flags[key] = next;
-        i++;
-      } else {
-        flags[key] = true;
+function findTableRange(lines, selector) {
+  const header = tableHeader(selector);
+  for (let i = 0; i < lines.length; i++) {
+    if (lines[i].trim() !== header) continue;
+    let end = lines.length;
+    for (let j = i + 1; j < lines.length; j++) {
+      const trimmed = lines[j].trim();
+      if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
+        end = j;
+        break;
       }
-    } else if (arg.startsWith("-")) {
-      flags[arg.slice(1)] = true;
-    } else {
-      positional.push(arg);
     }
+    return { start: i, end };
   }
-  return { positional, flags };
-}
-var _jsonMode = false;
-function setJsonMode(enabled) {
-  _jsonMode = enabled;
+  return null;
 }
-function log(message) {
-  if (!_jsonMode) console.log(`  ${message}`);
+function escapeBasicString(value) {
+  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
-function logSuccess(message) {
-  if (!_jsonMode) console.log(`  + ${message}`);
+function renderValue(value) {
+  if (Array.isArray(value)) {
+    return `[${value.map((item) => `"${escapeBasicString(item)}"`).join(", ")}]`;
+  }
+  return `"${escapeBasicString(value)}"`;
 }
-function logWarn(message) {
-  if (!_jsonMode) console.log(`  ! ${message}`);
-}
-function logError(message) {
-  if (!_jsonMode) console.error(`  x ${message}`);
-}
-function logHeader(message) {
-  if (!_jsonMode) console.log(`
-  ${message}
-`);
-}
-function resolveInstanceId(identifier, state) {
-  if (state.instances[identifier]) {
-    return { ok: true, instanceId: identifier };
-  }
-  if (isValidRuntime(identifier)) {
-    const matches = Object.values(state.instances).filter(
-      (inst) => inst.runtime === identifier
-    );
-    if (matches.length === 1) {
-      return { ok: true, instanceId: matches[0].instanceId };
-    }
-    if (matches.length > 1) {
-      const ids = matches.map((m) => m.instanceId).join(", ");
-      return {
-        ok: false,
-        code: "TAP_INSTANCE_AMBIGUOUS",
-        message: `Multiple ${identifier} instances found: ${ids}. Specify one explicitly.`
-      };
-    }
-  }
-  return {
-    ok: false,
-    code: "TAP_INSTANCE_NOT_FOUND",
-    message: `Instance not found: ${identifier}`
-  };
-}
-function buildInstanceId(runtime, name) {
-  return name ? `${runtime}-${name}` : runtime;
-}
-function findPortConflict(state, port, excludeInstanceId) {
-  for (const [id, inst] of Object.entries(state.instances)) {
-    if (id !== excludeInstanceId && inst.port === port) return id;
-  }
-  return null;
-}
-
-// src/version.ts
-var version = "0.1.0";
-
-// src/permissions.ts
-import * as fs4 from "fs";
-import * as path4 from "path";
-import * as os from "os";
-
-// src/toml.ts
-function splitLines(content) {
-  return content.replace(/\r\n/g, "\n").split("\n");
-}
-function tableHeader(selector) {
-  return `[${selector}]`;
-}
-function findTableRange(lines, selector) {
-  const header = tableHeader(selector);
-  for (let i = 0; i < lines.length; i++) {
-    if (lines[i].trim() !== header) continue;
-    let end = lines.length;
-    for (let j = i + 1; j < lines.length; j++) {
-      const trimmed = lines[j].trim();
-      if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
-        end = j;
-        break;
-      }
-    }
-    return { start: i, end };
-  }
-  return null;
-}
-function escapeBasicString(value) {
-  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-}
-function renderValue(value) {
-  if (Array.isArray(value)) {
-    return `[${value.map((item) => `"${escapeBasicString(item)}"`).join(", ")}]`;
-  }
-  return `"${escapeBasicString(value)}"`;
-}
-function extractTomlTable(content, selector) {
-  const lines = splitLines(content);
-  const range = findTableRange(lines, selector);
-  if (!range) return null;
-  return `${lines.slice(range.start, range.end).join("\n")}
-`;
+function extractTomlTable(content, selector) {
+  const lines = splitLines(content);
+  const range = findTableRange(lines, selector);
+  if (!range) return null;
+  return `${lines.slice(range.start, range.end).join("\n")}
+`;
 }
 function removeTomlTable(content, selector) {
   const lines = splitLines(content);
@@ -486,13 +571,13 @@ var CLAUDE_DENY_RULES = [
 ];
 function applyClaudePermissions(repoRoot, mode) {
   const warnings = [];
-  const claudeDir = path4.join(repoRoot, ".claude");
-  const settingsPath = path4.join(claudeDir, "settings.local.json");
-  fs4.mkdirSync(claudeDir, { recursive: true });
+  const claudeDir = path5.join(repoRoot, ".claude");
+  const settingsPath = path5.join(claudeDir, "settings.local.json");
+  fs5.mkdirSync(claudeDir, { recursive: true });
   let settings = {};
-  if (fs4.existsSync(settingsPath)) {
+  if (fs5.existsSync(settingsPath)) {
     try {
-      settings = JSON.parse(fs4.readFileSync(settingsPath, "utf-8"));
+      settings = JSON.parse(fs5.readFileSync(settingsPath, "utf-8"));
     } catch {
       warnings.push(
         ".claude/settings.local.json was invalid JSON. Starting fresh."
@@ -506,8 +591,8 @@ function applyClaudePermissions(repoRoot, mode) {
     const cleaned = existingDeny.filter((r) => !tapRuleSet.has(r));
     settings.deny = cleaned;
     const tmp2 = `${settingsPath}.tmp.${process.pid}`;
-    fs4.writeFileSync(tmp2, JSON.stringify(settings, null, 2) + "\n", "utf-8");
-    fs4.renameSync(tmp2, settingsPath);
+    fs5.writeFileSync(tmp2, JSON.stringify(settings, null, 2) + "\n", "utf-8");
+    fs5.renameSync(tmp2, settingsPath);
     logWarn("Claude: full mode \u2014 tap deny rules removed. Use with caution.");
     warnings.push("Full permission mode: tap deny rules removed.");
     return { applied: true, warnings };
@@ -515,18 +600,18 @@ function applyClaudePermissions(repoRoot, mode) {
   const newDeny = [.../* @__PURE__ */ new Set([...existingDeny, ...CLAUDE_DENY_RULES])];
   settings.deny = newDeny;
   const tmp = `${settingsPath}.tmp.${process.pid}`;
-  fs4.writeFileSync(tmp, JSON.stringify(settings, null, 2) + "\n", "utf-8");
-  fs4.renameSync(tmp, settingsPath);
+  fs5.writeFileSync(tmp, JSON.stringify(settings, null, 2) + "\n", "utf-8");
+  fs5.renameSync(tmp, settingsPath);
   logSuccess(
     `Claude: ${CLAUDE_DENY_RULES.length} deny rules applied to .claude/settings.local.json`
   );
   return { applied: true, warnings };
 }
 function findCodexConfigPath() {
-  return path4.join(os.homedir(), ".codex", "config.toml");
+  return path5.join(os.homedir(), ".codex", "config.toml");
 }
 function canonicalizeTrustPath(targetPath) {
-  let resolved = path4.resolve(targetPath).replace(/\//g, "\\");
+  let resolved = path5.resolve(targetPath).replace(/\//g, "\\");
   const driveRoot = /^[A-Za-z]:\\$/;
   if (!driveRoot.test(resolved)) {
     resolved = resolved.replace(/\\+$/g, "");
@@ -536,10 +621,10 @@ function canonicalizeTrustPath(targetPath) {
 function applyCodexPermissions(repoRoot, commsDir, mode) {
   const warnings = [];
   const configPath = findCodexConfigPath();
-  fs4.mkdirSync(path4.dirname(configPath), { recursive: true });
+  fs5.mkdirSync(path5.dirname(configPath), { recursive: true });
   let content = "";
-  if (fs4.existsSync(configPath)) {
-    content = fs4.readFileSync(configPath, "utf-8");
+  if (fs5.existsSync(configPath)) {
+    content = fs5.readFileSync(configPath, "utf-8");
   }
   const trustTargets = getCodexWritableRoots(repoRoot, commsDir);
   if (mode === "full") {
@@ -601,8 +686,8 @@ function applyCodexPermissions(repoRoot, commsDir, mode) {
     );
   }
   const tmp = `${configPath}.tmp.${process.pid}`;
-  fs4.writeFileSync(tmp, content, "utf-8");
-  fs4.renameSync(tmp, configPath);
+  fs5.writeFileSync(tmp, content, "utf-8");
+  fs5.renameSync(tmp, configPath);
   const modeLabel = mode === "full" ? "danger-full-access" : "workspace-write, network=full";
   logSuccess(
     `Codex: sandbox=${modeLabel}, ${trustTargets.length} path(s) trusted`
@@ -611,12 +696,12 @@ function applyCodexPermissions(repoRoot, commsDir, mode) {
 }
 function getCodexWritableRoots(repoRoot, commsDir) {
   const roots = [repoRoot, commsDir];
-  const parent = path4.dirname(repoRoot);
+  const parent = path5.dirname(repoRoot);
   for (let i = 1; i <= 4; i++) {
-    const wtPath = path4.join(parent, `hua-wt-${i}`);
-    if (fs4.existsSync(wtPath)) roots.push(wtPath);
+    const wtPath = path5.join(parent, `hua-wt-${i}`);
+    if (fs5.existsSync(wtPath)) roots.push(wtPath);
   }
-  return [...new Set(roots.map((r) => path4.resolve(r)))];
+  return [...new Set(roots.map((r) => path5.resolve(r)))];
 }
 function buildPermissionSummary(mode, repoRoot, commsDir) {
   const trustedPaths = getCodexWritableRoots(repoRoot, commsDir);
@@ -654,7 +739,7 @@ function parsePermissionMode(args) {
   return "safe";
 }
 async function initCommand(args) {
-  const repoRoot = findRepoRoot2();
+  const repoRoot = findRepoRoot();
   const commsDir = resolveCommsDir(args, repoRoot);
   const permMode = parsePermissionMode(args);
   if (stateExists(repoRoot) && !args.includes("--force")) {
@@ -670,13 +755,13 @@ async function initCommand(args) {
   logHeader("@hua-labs/tap init");
   log(`Comms directory: ${commsDir}`);
   for (const dir of COMMS_DIRS) {
-    const dirPath = path5.join(commsDir, dir);
-    fs5.mkdirSync(dirPath, { recursive: true });
+    const dirPath = path6.join(commsDir, dir);
+    fs6.mkdirSync(dirPath, { recursive: true });
     logSuccess(`Created ${dir}/`);
   }
-  const gitignorePath = path5.join(commsDir, ".gitignore");
-  if (!fs5.existsSync(gitignorePath)) {
-    fs5.writeFileSync(
+  const gitignorePath = path6.join(commsDir, ".gitignore");
+  if (!fs6.existsSync(gitignorePath)) {
+    fs6.writeFileSync(
       gitignorePath,
       ["tap.db", ".lock", "*.tmp.*", ".DS_Store"].join("\n") + "\n",
       "utf-8"
@@ -685,12 +770,12 @@ async function initCommand(args) {
   }
   const { config } = resolveConfig({}, repoRoot);
   const stateDir = config.stateDir;
-  fs5.mkdirSync(path5.join(stateDir, "pids"), { recursive: true });
-  fs5.mkdirSync(path5.join(stateDir, "logs"), { recursive: true });
-  fs5.mkdirSync(path5.join(stateDir, "backups"), { recursive: true });
-  const stateDirRel = path5.relative(repoRoot, stateDir);
+  fs6.mkdirSync(path6.join(stateDir, "pids"), { recursive: true });
+  fs6.mkdirSync(path6.join(stateDir, "logs"), { recursive: true });
+  fs6.mkdirSync(path6.join(stateDir, "backups"), { recursive: true });
+  const stateDirRel = path6.relative(repoRoot, stateDir);
   logSuccess(`Created ${stateDirRel}/ state directory`);
-  const repoGitignore = path5.join(repoRoot, ".gitignore");
+  const repoGitignore = path6.join(repoRoot, ".gitignore");
   const gitignoreEntries = [
     { entry: stateDirRel.replace(/\\/g, "/") + "/", label: "tap-comms state" },
     {
@@ -698,11 +783,11 @@ async function initCommand(args) {
       label: "tap-comms local config (machine-specific)"
     }
   ];
-  if (fs5.existsSync(repoGitignore)) {
-    const content = fs5.readFileSync(repoGitignore, "utf-8");
+  if (fs6.existsSync(repoGitignore)) {
+    const content = fs6.readFileSync(repoGitignore, "utf-8");
     for (const { entry, label } of gitignoreEntries) {
       if (!content.includes(entry)) {
-        fs5.appendFileSync(repoGitignore, `
+        fs6.appendFileSync(repoGitignore, `
 # ${label}
 ${entry}
 `);
@@ -742,64 +827,178 @@ ${entry}
 }
 
 // src/adapters/claude.ts
-import * as fs6 from "fs";
-import * as path6 from "path";
+import * as fs8 from "fs";
+import * as path8 from "path";
 import { execSync } from "child_process";
-var MCP_SERVER_KEY = "tap-comms";
-function findMcpJsonPath(ctx) {
-  return path6.join(ctx.repoRoot, ".mcp.json");
+
+// src/adapters/common.ts
+import * as fs7 from "fs";
+import * as os2 from "os";
+import * as path7 from "path";
+import { spawnSync } from "child_process";
+import { fileURLToPath as fileURLToPath2 } from "url";
+function probeCommand(candidates) {
+  for (const candidate of candidates) {
+    const result = spawnSync(candidate, ["--version"], {
+      encoding: "utf-8",
+      shell: process.platform === "win32"
+    });
+    if (result.status === 0) {
+      const version2 = `${result.stdout ?? ""}${result.stderr ?? ""}`.trim() || null;
+      return { command: candidate, version: version2 };
+    }
+  }
+  return { command: null, version: null };
 }
-function findClaudeCommand() {
+function getHomeDir() {
+  return os2.homedir();
+}
+function toForwardSlashPath(filePath) {
+  return path7.resolve(filePath).replace(/\\/g, "/");
+}
+function canWriteOrCreate(filePath) {
   try {
-    execSync("claude --version", { stdio: "pipe" });
-    return "claude";
+    if (fs7.existsSync(filePath)) {
+      fs7.accessSync(filePath, fs7.constants.W_OK);
+      return true;
+    }
+    const parent = path7.dirname(filePath);
+    fs7.mkdirSync(parent, { recursive: true });
+    fs7.accessSync(parent, fs7.constants.W_OK);
+    return true;
   } catch {
-    return null;
+    return false;
   }
 }
-function buildMcpServerEntry(ctx) {
-  const localChannels = findLocalChannels(ctx);
-  if (!localChannels) return null;
-  return {
-    type: "stdio",
-    command: "npx",
-    args: ["bun", localChannels],
-    env: { TAP_COMMS_DIR: ctx.commsDir }
-  };
-}
-function findLocalChannels(ctx) {
+function findLocalTapCommsSource(ctx) {
   const candidates = [
-    path6.join(
+    path7.join(
       ctx.repoRoot,
       "packages",
       "tap-plugin",
       "channels",
       "tap-comms.ts"
     ),
-    path6.join(
+    path7.join(
       ctx.repoRoot,
       "node_modules",
       "@hua-labs",
+      "tap-plugin",
       "channels",
       "tap-comms.ts"
     )
   ];
-  for (const p of candidates) {
-    if (fs6.existsSync(p)) return p;
+  for (const candidate of candidates) {
+    if (fs7.existsSync(candidate)) return candidate;
+  }
+  return null;
+}
+function findBundledTapCommsSource(metaUrl = import.meta.url) {
+  const moduleDir = path7.dirname(fileURLToPath2(metaUrl));
+  const candidates = [
+    path7.join(moduleDir, "mcp-server.mjs"),
+    path7.join(moduleDir, "..", "mcp-server.mjs"),
+    path7.join(moduleDir, "..", "mcp-server.ts")
+  ];
+  for (const candidate of candidates) {
+    if (fs7.existsSync(candidate)) return candidate;
+  }
+  return null;
+}
+function findTapCommsServerEntry(ctx, metaUrl = import.meta.url) {
+  return findBundledTapCommsSource(metaUrl) ?? findLocalTapCommsSource(ctx);
+}
+function findPreferredBunCommand() {
+  const home = getHomeDir();
+  const candidates = process.platform === "win32" ? [path7.join(home, ".bun", "bin", "bun.exe"), "bun", "bun.cmd"] : [path7.join(home, ".bun", "bin", "bun"), "bun"];
+  for (const candidate of candidates) {
+    if (path7.isAbsolute(candidate) && !fs7.existsSync(candidate)) continue;
+    const result = spawnSync(candidate, ["--version"], {
+      encoding: "utf-8",
+      shell: process.platform === "win32"
+    });
+    if (result.status === 0) {
+      return path7.isAbsolute(candidate) ? toForwardSlashPath(candidate) : candidate;
+    }
   }
   return null;
 }
+function buildManagedMcpServerSpec(ctx, instanceId) {
+  const sourcePath = findTapCommsServerEntry(ctx);
+  const bunCommand = findPreferredBunCommand();
+  const warnings = [];
+  const issues = [];
+  const env = {
+    TAP_AGENT_NAME: "<set-per-session>",
+    TAP_COMMS_DIR: toForwardSlashPath(ctx.commsDir)
+  };
+  if (instanceId) {
+    env.TAP_AGENT_ID = instanceId;
+  }
+  if (!sourcePath) {
+    issues.push(
+      "tap-comms MCP server entry not found. Reinstall @hua-labs/tap or run from a repo with packages/tap-plugin/channels/ available."
+    );
+    return { command: null, args: [], env, sourcePath, warnings, issues };
+  }
+  const isBundled = sourcePath.endsWith(".mjs");
+  let command = bunCommand;
+  if (!command && isBundled) {
+    command = process.execPath;
+    warnings.push(
+      "bun not found; using node to run the compiled MCP server. Install bun for better performance."
+    );
+  }
+  if (!command) {
+    issues.push(
+      "bun is required to run the repo-local tap-comms MCP server (.ts source). Install bun: https://bun.sh"
+    );
+    return { command: null, args: [], env, sourcePath, warnings, issues };
+  }
+  return {
+    command: isBundled && command === process.execPath ? toForwardSlashPath(command) : command,
+    args: [toForwardSlashPath(sourcePath)],
+    env,
+    sourcePath,
+    warnings,
+    issues
+  };
+}
+
+// src/adapters/claude.ts
+var MCP_SERVER_KEY = "tap-comms";
+function findMcpJsonPath(ctx) {
+  return path8.join(ctx.repoRoot, ".mcp.json");
+}
+function findClaudeCommand() {
+  try {
+    execSync("claude --version", { stdio: "pipe" });
+    return "claude";
+  } catch {
+    return null;
+  }
+}
+function buildMcpServerEntry(ctx) {
+  const managed = buildManagedMcpServerSpec(ctx, ctx.instanceId);
+  if (!managed.command) return null;
+  return {
+    type: "stdio",
+    command: managed.command,
+    args: managed.args,
+    env: managed.env
+  };
+}
 var claudeAdapter = {
   runtime: "claude",
   async probe(ctx) {
     const warnings = [];
     const issues = [];
     const configPath = findMcpJsonPath(ctx);
-    const configExists = fs6.existsSync(configPath);
+    const configExists = fs8.existsSync(configPath);
     const runtimeCommand = findClaudeCommand();
     const canWrite = configExists ? (() => {
       try {
-        fs6.accessSync(configPath, fs6.constants.W_OK);
+        fs8.accessSync(configPath, fs8.constants.W_OK);
         return true;
       } catch {
         return false;
@@ -810,13 +1009,10 @@ var claudeAdapter = {
         "Claude CLI not found in PATH. Config will be created but may need manual setup."
       );
     }
-    const localChannels = findLocalChannels(ctx);
-    if (!localChannels) {
-      issues.push(
-        "tap-comms MCP server not found locally. Ensure packages/tap-plugin/channels/tap-comms.ts exists. Run from the monorepo root."
-      );
-    }
-    if (!fs6.existsSync(ctx.commsDir)) {
+    const managed = buildManagedMcpServerSpec(ctx);
+    warnings.push(...managed.warnings);
+    issues.push(...managed.issues);
+    if (!fs8.existsSync(ctx.commsDir)) {
       issues.push(
         `Comms directory not found: ${ctx.commsDir}. Run "init" first.`
       );
@@ -840,7 +1036,7 @@ var claudeAdapter = {
     const operations = [];
     const ownedArtifacts = [];
     if (probe.configExists) {
-      const raw = fs6.readFileSync(configPath, "utf-8");
+      const raw = fs8.readFileSync(configPath, "utf-8");
       try {
         const config = JSON.parse(raw);
         if (config.mcpServers?.[MCP_SERVER_KEY]) {
@@ -857,7 +1053,7 @@ var claudeAdapter = {
     const serverEntry = buildMcpServerEntry(ctx);
     if (!serverEntry) {
       warnings.push(
-        "tap-comms MCP server not found locally. Skipping .mcp.json patch. Run from monorepo root with packages/tap-plugin/channels/ available."
+        "tap-comms MCP server entry not found. Skipping .mcp.json patch. Reinstall @hua-labs/tap or run from a repo with packages/tap-plugin/channels/ available."
       );
       return {
         runtime: "claude",
@@ -899,9 +1095,9 @@ var claudeAdapter = {
       try {
         if (op.type === "set" || op.type === "merge") {
           let config = {};
-          if (fs6.existsSync(op.path)) {
+          if (fs8.existsSync(op.path)) {
             backupFile(op.path, plan.backupDir);
-            const raw = fs6.readFileSync(op.path, "utf-8");
+            const raw = fs8.readFileSync(op.path, "utf-8");
             try {
               config = JSON.parse(raw);
             } catch {
@@ -914,12 +1110,12 @@ var claudeAdapter = {
             setNestedKey(config, op.key, op.value);
           }
           const tmp = `${op.path}.tmp.${process.pid}`;
-          fs6.writeFileSync(
+          fs8.writeFileSync(
             tmp,
             JSON.stringify(config, null, 2) + "\n",
             "utf-8"
           );
-          fs6.renameSync(tmp, op.path);
+          fs8.renameSync(tmp, op.path);
           changedFiles.push(op.path);
           appliedOps++;
         }
@@ -948,12 +1144,12 @@ var claudeAdapter = {
     if (configPath) {
       checks.push({
         name: "Config file exists",
-        passed: fs6.existsSync(configPath),
-        message: fs6.existsSync(configPath) ? void 0 : `${configPath} not found`
+        passed: fs8.existsSync(configPath),
+        message: fs8.existsSync(configPath) ? void 0 : `${configPath} not found`
       });
-      if (fs6.existsSync(configPath)) {
+      if (fs8.existsSync(configPath)) {
         try {
-          const raw = fs6.readFileSync(configPath, "utf-8");
+          const raw = fs8.readFileSync(configPath, "utf-8");
           const config = JSON.parse(raw);
           checks.push({ name: "Config is valid JSON", passed: true });
           const entry = config.mcpServers?.[MCP_SERVER_KEY];
@@ -963,7 +1159,7 @@ var claudeAdapter = {
             message: entry ? void 0 : `mcpServers.${MCP_SERVER_KEY} not found`
           });
           if (entry) {
-            const hasCommsDir = entry.env?.TAP_COMMS_DIR === ctx.commsDir;
+            const hasCommsDir = normalizeTapCommsDir(entry.env?.TAP_COMMS_DIR) === normalizeTapCommsDir(ctx.commsDir);
             checks.push({
               name: "TAP_COMMS_DIR configured",
               passed: hasCommsDir,
@@ -981,8 +1177,8 @@ var claudeAdapter = {
     }
     checks.push({
       name: "Comms directory exists",
-      passed: fs6.existsSync(ctx.commsDir),
-      message: fs6.existsSync(ctx.commsDir) ? void 0 : `${ctx.commsDir} not found`
+      passed: fs8.existsSync(ctx.commsDir),
+      message: fs8.existsSync(ctx.commsDir) ? void 0 : `${ctx.commsDir} not found`
     });
     const cmd = findClaudeCommand();
     checks.push({
@@ -1014,174 +1210,62 @@ function setNestedKey(obj, keyPath, value) {
   }
   current[keys[keys.length - 1]] = value;
 }
+function normalizeTapCommsDir(value) {
+  return typeof value === "string" ? path8.resolve(value).replace(/\\/g, "/") : "";
+}
 
 // src/adapters/codex.ts
-import * as fs9 from "fs";
-import * as path9 from "path";
-import { fileURLToPath } from "url";
+import * as fs10 from "fs";
+import * as path10 from "path";
+import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/artifact-backups.ts
 import * as crypto2 from "crypto";
-import * as fs7 from "fs";
-import * as path7 from "path";
+import * as fs9 from "fs";
+import * as path9 from "path";
 function selectorHash(selector) {
   return crypto2.createHash("sha256").update(selector).digest("hex").slice(0, 12);
 }
 function artifactBackupPath(backupDir, kind, selector) {
   const safeKind = kind.replace(/[^a-z-]/gi, "-");
-  return path7.join(backupDir, `${safeKind}-${selectorHash(selector)}.json`);
+  return path9.join(backupDir, `${safeKind}-${selectorHash(selector)}.json`);
 }
 function writeArtifactBackup(backupPath, payload) {
-  fs7.mkdirSync(path7.dirname(backupPath), { recursive: true });
+  fs9.mkdirSync(path9.dirname(backupPath), { recursive: true });
   const tmp = `${backupPath}.tmp.${process.pid}`;
-  fs7.writeFileSync(tmp, JSON.stringify(payload, null, 2) + "\n", "utf-8");
-  fs7.renameSync(tmp, backupPath);
+  fs9.writeFileSync(tmp, JSON.stringify(payload, null, 2) + "\n", "utf-8");
+  fs9.renameSync(tmp, backupPath);
 }
 function readArtifactBackup(backupPath) {
-  if (!fs7.existsSync(backupPath)) return null;
+  if (!fs9.existsSync(backupPath)) return null;
   try {
-    const raw = fs7.readFileSync(backupPath, "utf-8");
+    const raw = fs9.readFileSync(backupPath, "utf-8");
     return JSON.parse(raw);
   } catch {
     return null;
   }
 }
 
-// src/adapters/common.ts
-import * as fs8 from "fs";
-import * as os2 from "os";
-import * as path8 from "path";
-import { spawnSync } from "child_process";
-function probeCommand(candidates) {
-  for (const candidate of candidates) {
-    const result = spawnSync(candidate, ["--version"], {
-      encoding: "utf-8",
-      shell: process.platform === "win32"
-    });
-    if (result.status === 0) {
-      const version2 = `${result.stdout ?? ""}${result.stderr ?? ""}`.trim() || null;
-      return { command: candidate, version: version2 };
-    }
-  }
-  return { command: null, version: null };
+// src/adapters/codex.ts
+var MCP_SELECTOR = "mcp_servers.tap-comms";
+var ENV_SELECTOR = "mcp_servers.tap-comms.env";
+function findCodexConfigPath2() {
+  return path10.join(getHomeDir(), ".codex", "config.toml");
 }
-function getHomeDir() {
-  return os2.homedir();
+function canonicalizeTrustPath2(targetPath) {
+  let resolved = path10.resolve(targetPath).replace(/\//g, "\\");
+  const driveRoot = /^[A-Za-z]:\\$/;
+  if (!driveRoot.test(resolved)) {
+    resolved = resolved.replace(/\\+$/g, "");
+  }
+  return resolved.startsWith("\\\\?\\") ? resolved : `\\\\?\\${resolved}`;
 }
-function toForwardSlashPath(filePath) {
-  return path8.resolve(filePath).replace(/\\/g, "/");
+function trustSelector(targetPath) {
+  return `projects.'${canonicalizeTrustPath2(targetPath)}'`;
 }
-function canWriteOrCreate(filePath) {
-  try {
-    if (fs8.existsSync(filePath)) {
-      fs8.accessSync(filePath, fs8.constants.W_OK);
-      return true;
-    }
-    const parent = path8.dirname(filePath);
-    fs8.mkdirSync(parent, { recursive: true });
-    fs8.accessSync(parent, fs8.constants.W_OK);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function findLocalTapCommsSource(ctx) {
-  const candidates = [
-    path8.join(
-      ctx.repoRoot,
-      "packages",
-      "tap-plugin",
-      "channels",
-      "tap-comms.ts"
-    ),
-    path8.join(
-      ctx.repoRoot,
-      "node_modules",
-      "@hua-labs",
-      "tap-plugin",
-      "channels",
-      "tap-comms.ts"
-    )
-  ];
-  for (const candidate of candidates) {
-    if (fs8.existsSync(candidate)) return candidate;
-  }
-  return null;
-}
-function findPreferredBunCommand() {
-  const home = getHomeDir();
-  const candidates = process.platform === "win32" ? [path8.join(home, ".bun", "bin", "bun.exe"), "bun", "bun.cmd"] : [path8.join(home, ".bun", "bin", "bun"), "bun"];
-  for (const candidate of candidates) {
-    if (path8.isAbsolute(candidate) && !fs8.existsSync(candidate)) continue;
-    const result = spawnSync(candidate, ["--version"], {
-      encoding: "utf-8",
-      shell: process.platform === "win32"
-    });
-    if (result.status === 0) {
-      return path8.isAbsolute(candidate) ? toForwardSlashPath(candidate) : candidate;
-    }
-  }
-  return null;
-}
-function buildManagedMcpServerSpec(ctx) {
-  const sourcePath = findLocalTapCommsSource(ctx);
-  const bunCommand = findPreferredBunCommand();
-  const warnings = [];
-  const issues = [];
-  if (sourcePath && bunCommand) {
-    return {
-      command: bunCommand,
-      args: [toForwardSlashPath(sourcePath)],
-      env: {
-        TAP_AGENT_NAME: "<set-per-session>",
-        TAP_COMMS_DIR: toForwardSlashPath(ctx.commsDir)
-      },
-      sourcePath,
-      warnings,
-      issues
-    };
-  }
-  if (!sourcePath) {
-    issues.push(
-      "tap-comms MCP server source not found. v1 requires a repo-local tap-plugin/channels installation."
-    );
-  }
-  if (!bunCommand) {
-    issues.push("bun is required to run the repo-local tap-comms MCP server.");
-  }
-  return {
-    command: null,
-    args: [],
-    env: {
-      TAP_AGENT_NAME: "<set-per-session>",
-      TAP_COMMS_DIR: toForwardSlashPath(ctx.commsDir)
-    },
-    sourcePath,
-    warnings,
-    issues
-  };
-}
-
-// src/adapters/codex.ts
-var MCP_SELECTOR = "mcp_servers.tap-comms";
-var ENV_SELECTOR = "mcp_servers.tap-comms.env";
-function findCodexConfigPath2() {
-  return path9.join(getHomeDir(), ".codex", "config.toml");
-}
-function canonicalizeTrustPath2(targetPath) {
-  let resolved = path9.resolve(targetPath).replace(/\//g, "\\");
-  const driveRoot = /^[A-Za-z]:\\$/;
-  if (!driveRoot.test(resolved)) {
-    resolved = resolved.replace(/\\+$/g, "");
-  }
-  return resolved.startsWith("\\\\?\\") ? resolved : `\\\\?\\${resolved}`;
-}
-function trustSelector(targetPath) {
-  return `projects.'${canonicalizeTrustPath2(targetPath)}'`;
-}
-function getTrustTargets(ctx) {
-  const targets = [ctx.repoRoot, process.cwd()];
-  return [...new Set(targets.map((value) => path9.resolve(value)))];
+function getTrustTargets(ctx) {
+  const targets = [ctx.repoRoot, process.cwd()];
+  return [...new Set(targets.map((value) => path10.resolve(value)))];
 }
 function buildManagedArtifacts(configPath, ctx) {
   const artifacts = [
@@ -1198,14 +1282,14 @@ function buildManagedArtifacts(configPath, ctx) {
   return artifacts;
 }
 function readConfigOrEmpty(configPath) {
-  if (!fs9.existsSync(configPath)) return "";
-  return fs9.readFileSync(configPath, "utf-8");
+  if (!fs10.existsSync(configPath)) return "";
+  return fs10.readFileSync(configPath, "utf-8");
 }
 function writeTomlFile(filePath, content) {
-  fs9.mkdirSync(path9.dirname(filePath), { recursive: true });
+  fs10.mkdirSync(path10.dirname(filePath), { recursive: true });
   const tmp = `${filePath}.tmp.${process.pid}`;
-  fs9.writeFileSync(tmp, content, "utf-8");
-  fs9.renameSync(tmp, filePath);
+  fs10.writeFileSync(tmp, content, "utf-8");
+  fs10.renameSync(tmp, filePath);
 }
 function verifyManagedToml(content, ctx, configPath) {
   const checks = [];
@@ -1214,8 +1298,8 @@ function verifyManagedToml(content, ctx, configPath) {
   const envTable = extractTomlTable(content, ENV_SELECTOR);
   checks.push({
     name: "Codex config exists",
-    passed: fs9.existsSync(configPath),
-    message: fs9.existsSync(configPath) ? void 0 : `${configPath} not found`
+    passed: fs10.existsSync(configPath),
+    message: fs10.existsSync(configPath) ? void 0 : `${configPath} not found`
   });
   checks.push({
     name: "tap-comms MCP table present",
@@ -1255,7 +1339,7 @@ var codexAdapter = {
     const warnings = [];
     const issues = [];
     const configPath = findCodexConfigPath2();
-    const configExists = fs9.existsSync(configPath);
+    const configExists = fs10.existsSync(configPath);
     const runtimeProbe = probeCommand(
       ctx.platform === "win32" ? ["codex", "codex.cmd"] : ["codex"]
     );
@@ -1264,7 +1348,7 @@ var codexAdapter = {
         "Codex CLI not found in PATH. Config can still be written, but runtime verification will be limited."
       );
     }
-    if (!fs9.existsSync(ctx.commsDir)) {
+    if (!fs10.existsSync(ctx.commsDir)) {
       issues.push(
         `Comms directory not found: ${ctx.commsDir}. Run "init" first.`
       );
@@ -1325,7 +1409,7 @@ var codexAdapter = {
     const configPath = plan.operations[0]?.path ?? findCodexConfigPath2();
     const warnings = [];
     const changedFiles = [];
-    const managed = buildManagedMcpServerSpec(ctx);
+    const managed = buildManagedMcpServerSpec(ctx, ctx.instanceId);
     warnings.push(...managed.warnings);
     if (managed.issues.length > 0 || !managed.command) {
       return {
@@ -1340,7 +1424,7 @@ var codexAdapter = {
       };
     }
     const existingContent = readConfigOrEmpty(configPath);
-    if (fs9.existsSync(configPath) && existingContent) {
+    if (fs10.existsSync(configPath) && existingContent) {
       backupFile(configPath, plan.backupDir);
     }
     const artifactsWithBackups = plan.ownedArtifacts.map((artifact) => {
@@ -1415,8 +1499,8 @@ var codexAdapter = {
     const checks = verifyManagedToml(content, ctx, configPath);
     checks.push({
       name: "Comms directory exists",
-      passed: fs9.existsSync(ctx.commsDir),
-      message: fs9.existsSync(ctx.commsDir) ? void 0 : `${ctx.commsDir} not found`
+      passed: fs10.existsSync(ctx.commsDir),
+      message: fs10.existsSync(ctx.commsDir) ? void 0 : `${ctx.commsDir} not found`
     });
     checks.push({
       name: "Codex CLI found",
@@ -1439,12 +1523,12 @@ var codexAdapter = {
     return "app-server";
   },
   resolveBridgeScript(ctx) {
-    const distDir = path9.dirname(fileURLToPath(import.meta.url));
+    const distDir = path10.dirname(fileURLToPath3(import.meta.url));
     const candidates = [
       // 1. Relative to bundled CLI (npm install / npx)
-      path9.join(distDir, "bridges", "codex-bridge-runner.mjs"),
+      path10.join(distDir, "bridges", "codex-bridge-runner.mjs"),
       // 2. Monorepo development — dist inside repo
-      path9.join(
+      path10.join(
         ctx.repoRoot,
         "packages",
         "tap-comms",
@@ -1453,7 +1537,7 @@ var codexAdapter = {
         "codex-bridge-runner.mjs"
       ),
       // 3. Source file — dev mode with strip-types
-      path9.join(
+      path10.join(
         ctx.repoRoot,
         "packages",
         "tap-comms",
@@ -1463,30 +1547,30 @@ var codexAdapter = {
       )
     ];
     for (const candidate of candidates) {
-      if (fs9.existsSync(candidate)) return candidate;
+      if (fs10.existsSync(candidate)) return candidate;
     }
     return null;
   }
 };
 
 // src/adapters/gemini.ts
-import * as fs10 from "fs";
-import * as path10 from "path";
+import * as fs11 from "fs";
+import * as path11 from "path";
 var GEMINI_SELECTOR = "mcpServers.tap-comms";
 function candidateConfigPaths(ctx) {
   const home = getHomeDir();
   return [
-    path10.join(ctx.repoRoot, ".gemini", "settings.json"),
-    path10.join(home, ".gemini", "settings.json"),
-    path10.join(home, ".gemini", "antigravity", "mcp_config.json")
+    path11.join(ctx.repoRoot, ".gemini", "settings.json"),
+    path11.join(home, ".gemini", "settings.json"),
+    path11.join(home, ".gemini", "antigravity", "mcp_config.json")
   ];
 }
 function chooseGeminiConfigPath(ctx) {
   const [workspaceConfig, homeConfig, antigravityConfig] = candidateConfigPaths(ctx);
-  if (fs10.existsSync(workspaceConfig)) return workspaceConfig;
-  if (fs10.existsSync(homeConfig)) return homeConfig;
-  if (fs10.existsSync(antigravityConfig)) {
-    const raw = fs10.readFileSync(antigravityConfig, "utf-8").trim();
+  if (fs11.existsSync(workspaceConfig)) return workspaceConfig;
+  if (fs11.existsSync(homeConfig)) return homeConfig;
+  if (fs11.existsSync(antigravityConfig)) {
+    const raw = fs11.readFileSync(antigravityConfig, "utf-8").trim();
     if (raw) {
       try {
         JSON.parse(raw);
@@ -1498,8 +1582,8 @@ function chooseGeminiConfigPath(ctx) {
   return workspaceConfig;
 }
 function readJsonFile(filePath) {
-  if (!fs10.existsSync(filePath)) return {};
-  const raw = fs10.readFileSync(filePath, "utf-8").trim();
+  if (!fs11.existsSync(filePath)) return {};
+  const raw = fs11.readFileSync(filePath, "utf-8").trim();
   if (!raw) return {};
   return JSON.parse(raw);
 }
@@ -1530,8 +1614,8 @@ function verifyGeminiConfig(config, configPath, ctx) {
   const entry = readNestedKey(config, GEMINI_SELECTOR);
   checks.push({
     name: "Gemini config exists",
-    passed: fs10.existsSync(configPath),
-    message: fs10.existsSync(configPath) ? void 0 : `${configPath} not found`
+    passed: fs11.existsSync(configPath),
+    message: fs11.existsSync(configPath) ? void 0 : `${configPath} not found`
   });
   checks.push({
     name: "tap-comms entry present",
@@ -1540,8 +1624,8 @@ function verifyGeminiConfig(config, configPath, ctx) {
   });
   checks.push({
     name: "Comms directory exists",
-    passed: fs10.existsSync(ctx.commsDir),
-    message: fs10.existsSync(ctx.commsDir) ? void 0 : `${ctx.commsDir} not found`
+    passed: fs11.existsSync(ctx.commsDir),
+    message: fs11.existsSync(ctx.commsDir) ? void 0 : `${ctx.commsDir} not found`
   });
   if (entry?.env && typeof entry.env === "object") {
     checks.push({
@@ -1558,7 +1642,7 @@ var geminiAdapter = {
     const warnings = [];
     const issues = [];
     const configPath = chooseGeminiConfigPath(ctx);
-    const configExists = fs10.existsSync(configPath);
+    const configExists = fs11.existsSync(configPath);
     const runtimeProbe = probeCommand(
       ctx.platform === "win32" ? ["gemini", "gemini.cmd"] : ["gemini"]
     );
@@ -1567,10 +1651,12 @@ var geminiAdapter = {
         "Gemini CLI not found in PATH. Config can still be written, but runtime verification will be limited."
       );
     }
-    if (!fs10.existsSync(ctx.commsDir)) {
-      issues.push(`Comms directory not found: ${ctx.commsDir}. Run "init" first.`);
+    if (!fs11.existsSync(ctx.commsDir)) {
+      issues.push(
+        `Comms directory not found: ${ctx.commsDir}. Run "init" first.`
+      );
     }
-    const managed = buildManagedMcpServerSpec(ctx);
+    const managed = buildManagedMcpServerSpec(ctx, ctx.instanceId);
     warnings.push(...managed.warnings);
     issues.push(...managed.issues);
     return {
@@ -1599,7 +1685,9 @@ var geminiAdapter = {
           conflicts.push(`Existing ${GEMINI_SELECTOR} entry will be updated.`);
         }
       } catch {
-        warnings.push(`${configPath} exists but is not valid JSON. It will be replaced.`);
+        warnings.push(
+          `${configPath} exists but is not valid JSON. It will be replaced.`
+        );
       }
     }
     operations.push({
@@ -1621,7 +1709,7 @@ var geminiAdapter = {
     const configPath = plan.operations[0]?.path ?? chooseGeminiConfigPath(ctx);
     const warnings = [];
     const changedFiles = [];
-    const managed = buildManagedMcpServerSpec(ctx);
+    const managed = buildManagedMcpServerSpec(ctx, ctx.instanceId);
     warnings.push(...managed.warnings);
     if (managed.issues.length > 0 || !managed.command) {
       return {
@@ -1637,20 +1725,26 @@ var geminiAdapter = {
     }
     let config = {};
     let previousValue = void 0;
-    if (fs10.existsSync(configPath)) {
-      if (fs10.readFileSync(configPath, "utf-8").trim()) {
+    if (fs11.existsSync(configPath)) {
+      if (fs11.readFileSync(configPath, "utf-8").trim()) {
         backupFile(configPath, plan.backupDir);
       }
       try {
         config = readJsonFile(configPath);
       } catch {
-        warnings.push(`${configPath} was invalid JSON. Created backup and starting fresh.`);
+        warnings.push(
+          `${configPath} was invalid JSON. Created backup and starting fresh.`
+        );
         config = {};
       }
       previousValue = readNestedKey(config, GEMINI_SELECTOR);
     }
     const artifact = plan.ownedArtifacts[0];
-    const backupPath = artifactBackupPath(plan.backupDir, artifact.kind, artifact.selector);
+    const backupPath = artifactBackupPath(
+      plan.backupDir,
+      artifact.kind,
+      artifact.selector
+    );
     writeArtifactBackup(backupPath, {
       kind: "json-path",
       selector: artifact.selector,
@@ -1662,10 +1756,10 @@ var geminiAdapter = {
       args: managed.args,
       env: managed.env
     });
-    fs10.mkdirSync(path10.dirname(configPath), { recursive: true });
+    fs11.mkdirSync(path11.dirname(configPath), { recursive: true });
     const tmp = `${configPath}.tmp.${process.pid}`;
-    fs10.writeFileSync(tmp, JSON.stringify(config, null, 2) + "\n", "utf-8");
-    fs10.renameSync(tmp, configPath);
+    fs11.writeFileSync(tmp, JSON.stringify(config, null, 2) + "\n", "utf-8");
+    fs11.renameSync(tmp, configPath);
     changedFiles.push(configPath);
     return {
       success: true,
@@ -1736,19 +1830,22 @@ function getAdapter(runtime) {
 }
 
 // src/engine/bridge.ts
-import * as fs12 from "fs";
-import * as path12 from "path";
-import { spawn, execSync as execSync3 } from "child_process";
+import * as fs13 from "fs";
+import * as net from "net";
+import * as path13 from "path";
+import { randomBytes } from "crypto";
+import { spawn, spawnSync as spawnSync2, execSync as execSync3 } from "child_process";
+import { fileURLToPath as fileURLToPath4 } from "url";
 
 // src/runtime/resolve-node.ts
-import * as fs11 from "fs";
-import * as path11 from "path";
+import * as fs12 from "fs";
+import * as path12 from "path";
 import { execSync as execSync2 } from "child_process";
 function readNodeVersion(repoRoot) {
-  const nvFile = path11.join(repoRoot, ".node-version");
-  if (!fs11.existsSync(nvFile)) return null;
+  const nvFile = path12.join(repoRoot, ".node-version");
+  if (!fs12.existsSync(nvFile)) return null;
   try {
-    const raw = fs11.readFileSync(nvFile, "utf-8").trim();
+    const raw = fs12.readFileSync(nvFile, "utf-8").trim();
     return raw.length > 0 ? raw.replace(/^v/, "") : null;
   } catch {
     return null;
@@ -1758,16 +1855,16 @@ function fnmCandidateDirs() {
   if (process.platform === "win32") {
     return [
       process.env.FNM_DIR,
-      process.env.APPDATA ? path11.join(process.env.APPDATA, "fnm") : null,
-      process.env.LOCALAPPDATA ? path11.join(process.env.LOCALAPPDATA, "fnm") : null,
-      process.env.USERPROFILE ? path11.join(process.env.USERPROFILE, "scoop", "persist", "fnm") : null
+      process.env.APPDATA ? path12.join(process.env.APPDATA, "fnm") : null,
+      process.env.LOCALAPPDATA ? path12.join(process.env.LOCALAPPDATA, "fnm") : null,
+      process.env.USERPROFILE ? path12.join(process.env.USERPROFILE, "scoop", "persist", "fnm") : null
     ].filter(Boolean);
   }
   return [
     process.env.FNM_DIR,
-    process.env.HOME ? path11.join(process.env.HOME, ".local", "share", "fnm") : null,
-    process.env.HOME ? path11.join(process.env.HOME, ".fnm") : null,
-    process.env.XDG_DATA_HOME ? path11.join(process.env.XDG_DATA_HOME, "fnm") : null
+    process.env.HOME ? path12.join(process.env.HOME, ".local", "share", "fnm") : null,
+    process.env.HOME ? path12.join(process.env.HOME, ".fnm") : null,
+    process.env.XDG_DATA_HOME ? path12.join(process.env.XDG_DATA_HOME, "fnm") : null
   ].filter(Boolean);
 }
 function nodeExecutableName() {
@@ -1777,14 +1874,14 @@ function probeFnmNode(desiredVersion) {
   const dirs = fnmCandidateDirs();
   const exe = nodeExecutableName();
   for (const baseDir of dirs) {
-    const candidate = path11.join(
+    const candidate = path12.join(
       baseDir,
       "node-versions",
       `v${desiredVersion}`,
       "installation",
       exe
     );
-    if (!fs11.existsSync(candidate)) continue;
+    if (!fs12.existsSync(candidate)) continue;
     try {
       const v = execSync2(`"${candidate}" --version`, {
         encoding: "utf-8",
@@ -1810,107 +1907,881 @@ function detectNodeMajorVersion(command) {
     return null;
   }
 }
-function checkStripTypesSupport(command) {
-  const major = detectNodeMajorVersion(command);
-  if (major !== null && major >= 22) return true;
+function checkStripTypesSupport(command) {
+  const major = detectNodeMajorVersion(command);
+  if (major !== null && major >= 22) return true;
+  try {
+    execSync2(`"${command}" --experimental-strip-types -e ""`, {
+      timeout: 5e3,
+      stdio: "pipe"
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function findTsxFallback(repoRoot) {
+  const candidates = [
+    path12.join(repoRoot, "node_modules", ".bin", "tsx.exe"),
+    path12.join(repoRoot, "node_modules", ".bin", "tsx.CMD"),
+    path12.join(repoRoot, "node_modules", ".bin", "tsx")
+  ];
+  for (const c of candidates) {
+    if (fs12.existsSync(c)) return c;
+  }
+  return null;
+}
+function getFnmBinDir(repoRoot) {
+  const desiredVersion = readNodeVersion(repoRoot);
+  if (!desiredVersion) return null;
+  const nodePath = probeFnmNode(desiredVersion);
+  if (!nodePath) return null;
+  return path12.dirname(nodePath);
+}
+function resolveNodeRuntime(configCommand, repoRoot) {
+  if (configCommand === "bun" || configCommand.endsWith("bun.exe")) {
+    return {
+      command: configCommand,
+      supportsStripTypes: false,
+      source: "bun",
+      majorVersion: null
+    };
+  }
+  const desiredVersion = readNodeVersion(repoRoot);
+  if (desiredVersion) {
+    const fnmNode = probeFnmNode(desiredVersion);
+    if (fnmNode) {
+      const major2 = detectNodeMajorVersion(fnmNode);
+      return {
+        command: fnmNode,
+        supportsStripTypes: checkStripTypesSupport(fnmNode),
+        source: "fnm",
+        majorVersion: major2
+      };
+    }
+  }
+  const major = detectNodeMajorVersion(configCommand);
+  if (major !== null) {
+    return {
+      command: configCommand,
+      supportsStripTypes: checkStripTypesSupport(configCommand),
+      source: major === detectNodeMajorVersion("node") ? "path" : "config",
+      majorVersion: major
+    };
+  }
+  const tsx = findTsxFallback(repoRoot);
+  if (tsx) {
+    return {
+      command: tsx,
+      supportsStripTypes: false,
+      source: "tsx-fallback",
+      majorVersion: null
+    };
+  }
+  return {
+    command: configCommand,
+    supportsStripTypes: false,
+    source: "path",
+    majorVersion: null
+  };
+}
+function buildRuntimeEnv(repoRoot, baseEnv = process.env) {
+  const fnmBin = getFnmBinDir(repoRoot);
+  if (!fnmBin) return { ...baseEnv };
+  const pathKey = process.platform === "win32" ? "Path" : "PATH";
+  const currentPath = baseEnv[pathKey] ?? baseEnv.PATH ?? "";
+  return {
+    ...baseEnv,
+    [pathKey]: `${fnmBin}${path12.delimiter}${currentPath}`
+  };
+}
+
+// src/engine/bridge.ts
+var DEFAULT_APP_SERVER_URL2 = "ws://127.0.0.1:4501";
+var APP_SERVER_HEALTH_TIMEOUT_MS = 1500;
+var APP_SERVER_START_TIMEOUT_MS = 2e4;
+var APP_SERVER_GATEWAY_START_TIMEOUT_MS = 5e3;
+var APP_SERVER_HEALTH_RETRY_MS = 250;
+var APP_SERVER_AUTH_QUERY_PARAM = "tap_token";
+var APP_SERVER_AUTH_FILE_MODE = 384;
+function appServerLogFilePath(stateDir, instanceId) {
+  return path13.join(stateDir, "logs", `app-server-${instanceId}.log`);
+}
+function appServerGatewayLogFilePath(stateDir, instanceId) {
+  return path13.join(stateDir, "logs", `app-server-gateway-${instanceId}.log`);
+}
+function appServerGatewayTokenFilePath(stateDir, instanceId) {
+  return path13.join(
+    stateDir,
+    "secrets",
+    `app-server-gateway-${instanceId}.token`
+  );
+}
+function stderrLogFilePath(logPath) {
+  return `${logPath}.stderr`;
+}
+function writeProtectedTextFile(filePath, content) {
+  fs13.mkdirSync(path13.dirname(filePath), { recursive: true });
+  const tmp = `${filePath}.tmp.${process.pid}`;
+  fs13.writeFileSync(tmp, content, {
+    encoding: "utf-8",
+    mode: APP_SERVER_AUTH_FILE_MODE
+  });
+  fs13.chmodSync(tmp, APP_SERVER_AUTH_FILE_MODE);
+  fs13.renameSync(tmp, filePath);
+  fs13.chmodSync(filePath, APP_SERVER_AUTH_FILE_MODE);
+}
+function removeFileIfExists(filePath) {
+  if (!filePath || !fs13.existsSync(filePath)) {
+    return;
+  }
+  try {
+    fs13.unlinkSync(filePath);
+  } catch {
+  }
+}
+function getWebSocketCtor() {
+  const candidate = globalThis.WebSocket;
+  return typeof candidate === "function" ? candidate : null;
+}
+function delay(ms) {
+  return new Promise((resolve11) => setTimeout(resolve11, ms));
+}
+function isLoopbackHost(hostname) {
+  return hostname === "127.0.0.1" || hostname === "localhost";
+}
+function resolveCodexCommand(platform) {
+  const candidates = platform === "win32" ? ["codex.cmd", "codex.exe", "codex", "codex.ps1"] : ["codex"];
+  return probeCommand(candidates).command;
+}
+function formatCodexAppServerCommand(command, url) {
+  return `${command} app-server --listen ${url}`;
+}
+function resolvePowerShellCommand() {
+  return probeCommand(["pwsh", "powershell", "powershell.exe"]).command ?? "powershell";
+}
+function resolveAuthGatewayScript(repoRoot) {
+  const moduleDir = path13.dirname(fileURLToPath4(import.meta.url));
+  const candidates = [
+    path13.join(moduleDir, "..", "bridges", "codex-app-server-auth-gateway.mjs"),
+    path13.join(moduleDir, "..", "bridges", "codex-app-server-auth-gateway.ts"),
+    path13.join(
+      repoRoot,
+      "packages",
+      "tap-comms",
+      "dist",
+      "bridges",
+      "codex-app-server-auth-gateway.mjs"
+    ),
+    path13.join(
+      repoRoot,
+      "packages",
+      "tap-comms",
+      "src",
+      "bridges",
+      "codex-app-server-auth-gateway.ts"
+    )
+  ];
+  for (const candidate of candidates) {
+    if (fs13.existsSync(candidate)) {
+      return candidate;
+    }
+  }
+  return null;
+}
+function getBridgeRuntimeStateDir(repoRoot, instanceId) {
+  return path13.join(repoRoot, ".tmp", `codex-app-server-bridge-${instanceId}`);
+}
+async function allocateLoopbackPort(hostname) {
+  const bindHost = hostname === "localhost" ? "127.0.0.1" : hostname;
+  return await new Promise((resolve11, reject) => {
+    const server = net.createServer();
+    server.unref();
+    server.once("error", reject);
+    server.listen(0, bindHost, () => {
+      const address = server.address();
+      if (!address || typeof address === "string") {
+        server.close(() => {
+          reject(new Error("Failed to allocate a loopback port"));
+        });
+        return;
+      }
+      const port = address.port;
+      server.close((error) => {
+        if (error) {
+          reject(error);
+          return;
+        }
+        resolve11(port);
+      });
+    });
+  });
+}
+function buildProtectedAppServerUrl(publicUrl, token) {
+  const url = new URL(publicUrl);
+  url.searchParams.set(APP_SERVER_AUTH_QUERY_PARAM, token);
+  return url.toString().replace(/\/(?=\?|$)/, "");
+}
+function readGatewayTokenFromPath(tokenPath) {
+  return fs13.readFileSync(tokenPath, "utf8").trim();
+}
+function readGatewayToken(auth) {
+  if (!auth) {
+    return null;
+  }
+  const legacyToken = auth.token;
+  if (legacyToken?.trim()) {
+    return legacyToken.trim();
+  }
+  if (!auth.tokenPath || !fs13.existsSync(auth.tokenPath)) {
+    return null;
+  }
+  const fileToken = readGatewayTokenFromPath(auth.tokenPath);
+  return fileToken || null;
+}
+function materializeGatewayTokenFile(stateDir, instanceId, publicUrl, auth) {
+  if (auth.tokenPath && fs13.existsSync(auth.tokenPath)) {
+    return auth;
+  }
+  const token = readGatewayToken(auth);
+  if (!token) {
+    throw new Error(`Missing auth gateway token for ${instanceId}`);
+  }
+  const tokenPath = appServerGatewayTokenFilePath(stateDir, instanceId);
+  writeProtectedTextFile(tokenPath, `${token}
+`);
+  return {
+    ...auth,
+    protectedUrl: buildProtectedAppServerUrl(publicUrl, "***"),
+    tokenPath
+  };
+}
+async function createManagedAppServerAuth(options) {
+  const publicUrl = new URL(options.publicUrl);
+  const upstreamUrl = new URL(options.publicUrl);
+  upstreamUrl.port = String(await allocateLoopbackPort(publicUrl.hostname));
+  upstreamUrl.search = "";
+  upstreamUrl.hash = "";
+  const gatewayScript = resolveAuthGatewayScript(options.repoRoot);
+  if (!gatewayScript) {
+    throw new Error("Auth gateway script not found");
+  }
+  const token = randomBytes(24).toString("base64url");
+  const tokenPath = appServerGatewayTokenFilePath(
+    options.stateDir,
+    options.instanceId
+  );
+  writeProtectedTextFile(tokenPath, `${token}
+`);
+  const protectedUrl = buildProtectedAppServerUrl(options.publicUrl, "***");
+  const gatewayLogPath = appServerGatewayLogFilePath(
+    options.stateDir,
+    options.instanceId
+  );
+  fs13.mkdirSync(path13.dirname(gatewayLogPath), { recursive: true });
+  rotateLog(gatewayLogPath);
+  const runtime = resolveNodeRuntime(process.execPath, options.repoRoot);
+  const gatewayArgs = [];
+  if (gatewayScript.endsWith(".ts")) {
+    if (!runtime.supportsStripTypes) {
+      throw new Error(
+        "Current Node runtime cannot start the auth gateway from TypeScript source. Rebuild @hua-labs/tap or use Node 22.6+."
+      );
+    }
+    gatewayArgs.push("--experimental-strip-types");
+  }
+  gatewayArgs.push(gatewayScript);
+  const gatewayEnv = {
+    ...buildRuntimeEnv(options.repoRoot),
+    TAP_GATEWAY_LISTEN_URL: options.publicUrl,
+    TAP_GATEWAY_UPSTREAM_URL: upstreamUrl.toString().replace(/\/$/, ""),
+    TAP_GATEWAY_TOKEN_FILE: tokenPath
+  };
+  let gatewayPid;
+  {
+    let logFd = null;
+    try {
+      if (options.platform === "win32") {
+        gatewayPid = startWindowsDetachedProcess(
+          runtime.command,
+          gatewayArgs,
+          options.repoRoot,
+          gatewayLogPath,
+          gatewayEnv
+        );
+      } else {
+        logFd = fs13.openSync(gatewayLogPath, "a");
+        const child = spawn(runtime.command, gatewayArgs, {
+          cwd: options.repoRoot,
+          detached: true,
+          stdio: ["ignore", logFd, logFd],
+          env: gatewayEnv,
+          windowsHide: true
+        });
+        child.unref();
+        gatewayPid = child.pid ?? null;
+      }
+    } catch (error) {
+      removeFileIfExists(tokenPath);
+      throw error;
+    } finally {
+      if (logFd != null) {
+        fs13.closeSync(logFd);
+      }
+    }
+  }
+  if (gatewayPid == null) {
+    removeFileIfExists(tokenPath);
+    throw new Error("Failed to spawn app-server auth gateway");
+  }
+  return {
+    mode: "query-token",
+    protectedUrl,
+    upstreamUrl: upstreamUrl.toString().replace(/\/$/, ""),
+    tokenPath,
+    gatewayPid,
+    gatewayLogPath
+  };
+}
+function canReuseManagedAppServer(appServer) {
+  if (!appServer?.managed) {
+    return false;
+  }
+  if (appServer.pid != null && !isProcessAlive(appServer.pid)) {
+    return false;
+  }
+  const auth = appServer.auth;
+  if (auth) {
+    if (!auth.protectedUrl) {
+      return false;
+    }
+    if (!readGatewayToken(auth)) {
+      return false;
+    }
+    if (auth.gatewayPid != null && !isProcessAlive(auth.gatewayPid)) {
+      return false;
+    }
+  }
+  return true;
+}
+function markAppServerHealthy(appServer) {
+  const checkedAt = (/* @__PURE__ */ new Date()).toISOString();
+  return {
+    ...appServer,
+    healthy: true,
+    lastCheckedAt: checkedAt,
+    lastHealthyAt: checkedAt
+  };
+}
+function findReusableManagedAppServer(stateDir, publicUrl) {
+  const pidDir = path13.join(stateDir, "pids");
+  if (!fs13.existsSync(pidDir)) {
+    return null;
+  }
+  for (const name of fs13.readdirSync(pidDir)) {
+    if (!name.startsWith("bridge-") || !name.endsWith(".json")) {
+      continue;
+    }
+    try {
+      const raw = fs13.readFileSync(path13.join(pidDir, name), "utf-8");
+      const parsed = JSON.parse(raw);
+      if (parsed.appServer?.url !== publicUrl) {
+        continue;
+      }
+      if (canReuseManagedAppServer(parsed.appServer)) {
+        return markAppServerHealthy(parsed.appServer);
+      }
+    } catch {
+    }
+  }
+  return null;
+}
+function startWindowsDetachedProcess(command, args, repoRoot, logPath, env = process.env) {
+  const ext = path13.extname(command).toLowerCase();
+  const stderrLogPath = stderrLogFilePath(logPath);
+  const stdoutFd = fs13.openSync(logPath, "a");
+  const stderrFd = fs13.openSync(stderrLogPath, "a");
+  try {
+    const child = ext === ".ps1" ? spawn(
+      resolvePowerShellCommand(),
+      ["-NoLogo", "-NoProfile", "-File", command, ...args],
+      {
+        cwd: repoRoot,
+        detached: true,
+        stdio: ["ignore", stdoutFd, stderrFd],
+        env,
+        windowsHide: true
+      }
+    ) : spawn(command, args, {
+      cwd: repoRoot,
+      detached: true,
+      stdio: ["ignore", stdoutFd, stderrFd],
+      env,
+      windowsHide: true,
+      shell: ext === ".cmd" || ext === ".bat"
+    });
+    child.unref();
+    return child.pid ?? null;
+  } finally {
+    fs13.closeSync(stdoutFd);
+    fs13.closeSync(stderrFd);
+  }
+}
+function startWindowsCodexAppServer(command, url, repoRoot, logPath) {
+  return startWindowsDetachedProcess(
+    command,
+    ["app-server", "--listen", url],
+    repoRoot,
+    logPath
+  );
+}
+function findListeningProcessId(url, platform) {
+  if (platform !== "win32") {
+    return null;
+  }
+  let port;
+  try {
+    const parsed = new URL(url);
+    port = parsed.port ? Number.parseInt(parsed.port, 10) : null;
+  } catch {
+    return null;
+  }
+  if (port == null || !Number.isFinite(port)) {
+    return null;
+  }
+  const result = spawnSync2(
+    resolvePowerShellCommand(),
+    [
+      "-NoLogo",
+      "-NoProfile",
+      "-Command",
+      [
+        `$port = ${port}`,
+        "$processId = Get-NetTCPConnection -LocalPort $port -State Listen -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty OwningProcess",
+        "if ($processId) { $processId }"
+      ].join("; ")
+    ],
+    {
+      encoding: "utf-8",
+      windowsHide: true
+    }
+  );
+  if (result.status !== 0) {
+    return null;
+  }
+  const parsedPid = Number.parseInt((result.stdout ?? "").trim(), 10);
+  return Number.isFinite(parsedPid) ? parsedPid : null;
+}
+function resolveAppServerUrl(baseUrl, port) {
+  const resolvedBase = (baseUrl ?? DEFAULT_APP_SERVER_URL2).replace(/\/$/, "");
+  if (port == null) {
+    return resolvedBase;
+  }
+  try {
+    const parsed = new URL(resolvedBase);
+    parsed.port = String(port);
+    return parsed.toString().replace(/\/$/, "");
+  } catch {
+    return resolvedBase;
+  }
+}
+async function isTcpPortAvailable(hostname, port) {
+  const bindHost = hostname === "localhost" ? "127.0.0.1" : hostname;
+  return await new Promise((resolve11) => {
+    const server = net.createServer();
+    server.unref();
+    server.once("error", () => resolve11(false));
+    server.listen(port, bindHost, () => {
+      server.close((error) => resolve11(!error));
+    });
+  });
+}
+async function findNextAvailableAppServerPort(state, baseUrl, basePort = 4501, excludeInstanceId) {
+  let hostname = "127.0.0.1";
+  try {
+    hostname = new URL(baseUrl ?? DEFAULT_APP_SERVER_URL2).hostname;
+  } catch {
+  }
+  const maxAttempts = 1e3;
+  let port = basePort;
+  for (let attempt = 0; attempt < maxAttempts; attempt += 1, port += 1) {
+    const claimedInState = Object.entries(state.instances).some(
+      ([id, inst]) => id !== excludeInstanceId && inst.port === port
+    );
+    if (claimedInState) {
+      continue;
+    }
+    if (!isLoopbackHost(hostname)) {
+      return port;
+    }
+    if (await isTcpPortAvailable(hostname, port)) {
+      return port;
+    }
+  }
+  throw new Error(
+    `Failed to find a free app-server port starting at ${basePort}`
+  );
+}
+async function checkAppServerHealth(url, timeoutMs = APP_SERVER_HEALTH_TIMEOUT_MS) {
+  const WebSocket = getWebSocketCtor();
+  if (!WebSocket) {
+    return false;
+  }
+  return new Promise((resolve11) => {
+    let settled = false;
+    let socket = null;
+    const finish = (healthy) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      clearTimeout(timer);
+      try {
+        socket?.close();
+      } catch {
+      }
+      resolve11(healthy);
+    };
+    const timer = setTimeout(() => finish(false), timeoutMs);
+    try {
+      socket = new WebSocket(url);
+      socket.addEventListener("open", () => finish(true), { once: true });
+      socket.addEventListener("error", () => finish(false), { once: true });
+      socket.addEventListener("close", () => finish(false), { once: true });
+    } catch {
+      finish(false);
+    }
+  });
+}
+async function waitForAppServerHealth(url, timeoutMs) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (await checkAppServerHealth(url)) {
+      return true;
+    }
+    await delay(APP_SERVER_HEALTH_RETRY_MS);
+  }
+  return false;
+}
+async function terminateProcess(pid, platform) {
+  if (!isProcessAlive(pid)) {
+    return false;
+  }
+  try {
+    if (platform === "win32") {
+      execSync3(`taskkill /PID ${pid} /F /T`, { stdio: "pipe" });
+    } else {
+      process.kill(pid, "SIGTERM");
+      await delay(2e3);
+      if (isProcessAlive(pid)) {
+        process.kill(pid, "SIGKILL");
+      }
+    }
+  } catch {
+  }
+  return !isProcessAlive(pid);
+}
+async function stopManagedAppServer(appServer, platform) {
+  if (!appServer.managed) {
+    return false;
+  }
+  let stopped = false;
+  if (appServer.auth?.gatewayPid != null) {
+    stopped = await terminateProcess(appServer.auth.gatewayPid, platform) || stopped;
+  }
+  if (appServer.pid != null) {
+    stopped = await terminateProcess(appServer.pid, platform) || stopped;
+  }
+  removeFileIfExists(appServer.auth?.tokenPath);
+  return stopped;
+}
+async function ensureCodexAppServer(options) {
+  const effectiveUrl = resolveAppServerUrl(options.appServerUrl);
+  const fallbackManualCommand = formatCodexAppServerCommand(
+    "codex",
+    effectiveUrl
+  );
+  if (options.existingAppServer?.url === effectiveUrl && canReuseManagedAppServer(options.existingAppServer)) {
+    return markAppServerHealthy(options.existingAppServer);
+  }
+  const sharedManaged = findReusableManagedAppServer(
+    options.stateDir,
+    effectiveUrl
+  );
+  if (sharedManaged) {
+    return sharedManaged;
+  }
+  let parsedUrl;
   try {
-    execSync2(`"${command}" --experimental-strip-types -e ""`, {
-      timeout: 5e3,
-      stdio: "pipe"
-    });
-    return true;
+    parsedUrl = new URL(effectiveUrl);
   } catch {
-    return false;
+    throw new Error(
+      `Invalid app-server URL: ${effectiveUrl}
+Start it manually:
+  ${fallbackManualCommand}`
+    );
   }
-}
-function findTsxFallback(repoRoot) {
-  const candidates = [
-    path11.join(repoRoot, "node_modules", ".bin", "tsx.exe"),
-    path11.join(repoRoot, "node_modules", ".bin", "tsx.CMD"),
-    path11.join(repoRoot, "node_modules", ".bin", "tsx")
-  ];
-  for (const c of candidates) {
-    if (fs11.existsSync(c)) return c;
+  if (!isLoopbackHost(parsedUrl.hostname)) {
+    throw new Error(
+      `Auto-start only supports loopback app-server URLs. Current URL: ${effectiveUrl}
+Start it manually:
+  ${fallbackManualCommand}`
+    );
   }
-  return null;
-}
-function getFnmBinDir(repoRoot) {
-  const desiredVersion = readNodeVersion(repoRoot);
-  if (!desiredVersion) return null;
-  const nodePath = probeFnmNode(desiredVersion);
-  if (!nodePath) return null;
-  return path11.dirname(nodePath);
-}
-function resolveNodeRuntime(configCommand, repoRoot) {
-  if (configCommand === "bun" || configCommand.endsWith("bun.exe")) {
+  if (await checkAppServerHealth(effectiveUrl)) {
+    const hint = options.noAuth ? "Stop it first or use --no-server for an unmanaged external app-server." : "A listener is already running, so tap cannot insert the auth gateway there.\nStop it first or use --no-server for an unmanaged external app-server.";
+    throw new Error(`${effectiveUrl}: ${hint}`);
+  }
+  const resolvedCommand = resolveCodexCommand(options.platform);
+  if (!resolvedCommand) {
+    throw new Error(
+      `Codex CLI not found in PATH.
+Start the app-server manually:
+  ${fallbackManualCommand}`
+    );
+  }
+  const logPath = appServerLogFilePath(options.stateDir, options.instanceId);
+  fs13.mkdirSync(path13.dirname(logPath), { recursive: true });
+  rotateLog(logPath);
+  if (options.noAuth) {
+    const manualCommand2 = formatCodexAppServerCommand("codex", effectiveUrl);
+    let pid2;
+    if (options.platform === "win32") {
+      try {
+        pid2 = startWindowsCodexAppServer(
+          resolvedCommand,
+          effectiveUrl,
+          options.repoRoot,
+          logPath
+        );
+      } catch (err) {
+        throw new Error(
+          `Failed to spawn Codex app-server: ${err instanceof Error ? err.message : String(err)}
+Start it manually:
+  ${manualCommand2}`,
+          { cause: err }
+        );
+      }
+    } else {
+      const logFd = fs13.openSync(logPath, "a");
+      try {
+        const child = spawn(
+          resolvedCommand,
+          ["app-server", "--listen", effectiveUrl],
+          {
+            cwd: options.repoRoot,
+            detached: true,
+            stdio: ["ignore", logFd, logFd],
+            env: process.env,
+            windowsHide: true
+          }
+        );
+        child.unref();
+        pid2 = child.pid ?? null;
+      } catch (err) {
+        throw new Error(
+          `Failed to spawn Codex app-server: ${err instanceof Error ? err.message : String(err)}
+Start it manually:
+  ${manualCommand2}`,
+          { cause: err }
+        );
+      } finally {
+        fs13.closeSync(logFd);
+      }
+    }
+    if (pid2 == null) {
+      throw new Error(
+        `Failed to spawn Codex app-server.
+Start it manually:
+  ${manualCommand2}`
+      );
+    }
+    const healthy2 = await waitForAppServerHealth(
+      effectiveUrl,
+      APP_SERVER_START_TIMEOUT_MS
+    );
+    if (!healthy2) {
+      await terminateProcess(pid2, options.platform);
+      throw new Error(
+        `Codex app-server did not become healthy at ${effectiveUrl}.
+Check ${logPath}
+Or start it manually:
+  ${manualCommand2}`
+      );
+    }
+    pid2 = findListeningProcessId(effectiveUrl, options.platform) ?? pid2;
+    const healthyAt2 = (/* @__PURE__ */ new Date()).toISOString();
     return {
-      command: configCommand,
-      supportsStripTypes: false,
-      source: "bun",
-      majorVersion: null
+      url: effectiveUrl,
+      pid: pid2,
+      managed: true,
+      healthy: true,
+      lastCheckedAt: healthyAt2,
+      lastHealthyAt: healthyAt2,
+      logPath,
+      manualCommand: manualCommand2,
+      auth: null
     };
   }
-  const desiredVersion = readNodeVersion(repoRoot);
-  if (desiredVersion) {
-    const fnmNode = probeFnmNode(desiredVersion);
-    if (fnmNode) {
-      const major2 = detectNodeMajorVersion(fnmNode);
-      return {
-        command: fnmNode,
-        supportsStripTypes: checkStripTypesSupport(fnmNode),
-        source: "fnm",
-        majorVersion: major2
-      };
+  const auth = await createManagedAppServerAuth({
+    instanceId: options.instanceId,
+    stateDir: options.stateDir,
+    repoRoot: options.repoRoot,
+    platform: options.platform,
+    publicUrl: effectiveUrl
+  });
+  const manualCommand = formatCodexAppServerCommand("codex", auth.upstreamUrl);
+  let pid;
+  if (options.platform === "win32") {
+    try {
+      pid = startWindowsCodexAppServer(
+        resolvedCommand,
+        auth.upstreamUrl,
+        options.repoRoot,
+        logPath
+      );
+    } catch (err) {
+      if (auth.gatewayPid != null) {
+        await terminateProcess(auth.gatewayPid, options.platform);
+      }
+      removeFileIfExists(auth.tokenPath);
+      throw new Error(
+        `Failed to spawn Codex app-server: ${err instanceof Error ? err.message : String(err)}
+Start it manually:
+  ${manualCommand}`,
+        { cause: err }
+      );
+    }
+  } else {
+    const logFd = fs13.openSync(logPath, "a");
+    try {
+      const child = spawn(
+        resolvedCommand,
+        ["app-server", "--listen", auth.upstreamUrl],
+        {
+          cwd: options.repoRoot,
+          detached: true,
+          stdio: ["ignore", logFd, logFd],
+          env: process.env,
+          windowsHide: true
+        }
+      );
+      child.unref();
+      pid = child.pid ?? null;
+    } catch (err) {
+      if (auth.gatewayPid != null) {
+        await terminateProcess(auth.gatewayPid, options.platform);
+      }
+      removeFileIfExists(auth.tokenPath);
+      throw new Error(
+        `Failed to spawn Codex app-server: ${err instanceof Error ? err.message : String(err)}
+Start it manually:
+  ${manualCommand}`,
+        { cause: err }
+      );
+    } finally {
+      fs13.closeSync(logFd);
     }
   }
-  const major = detectNodeMajorVersion(configCommand);
-  if (major !== null) {
-    return {
-      command: configCommand,
-      supportsStripTypes: checkStripTypesSupport(configCommand),
-      source: major === detectNodeMajorVersion("node") ? "path" : "config",
-      majorVersion: major
-    };
+  if (pid == null) {
+    if (auth.gatewayPid != null) {
+      await terminateProcess(auth.gatewayPid, options.platform);
+    }
+    removeFileIfExists(auth.tokenPath);
+    throw new Error(
+      `Failed to spawn Codex app-server.
+Start it manually:
+  ${manualCommand}`
+    );
   }
-  const tsx = findTsxFallback(repoRoot);
-  if (tsx) {
-    return {
-      command: tsx,
-      supportsStripTypes: false,
-      source: "tsx-fallback",
-      majorVersion: null
-    };
+  const healthy = await waitForAppServerHealth(
+    auth.upstreamUrl,
+    APP_SERVER_START_TIMEOUT_MS
+  );
+  if (!healthy) {
+    await terminateProcess(pid, options.platform);
+    if (auth.gatewayPid != null) {
+      await terminateProcess(auth.gatewayPid, options.platform);
+    }
+    removeFileIfExists(auth.tokenPath);
+    throw new Error(
+      `Codex app-server did not become healthy at ${auth.upstreamUrl}.
+Check ${logPath}
+Or start it manually:
+  ${manualCommand}`
+    );
   }
+  const gatewayToken = readGatewayToken(auth);
+  if (!gatewayToken) {
+    await terminateProcess(pid, options.platform);
+    if (auth.gatewayPid != null) {
+      await terminateProcess(auth.gatewayPid, options.platform);
+    }
+    removeFileIfExists(auth.tokenPath);
+    throw new Error("Tap auth gateway token is missing after startup.");
+  }
+  const gatewayHealthy = await waitForAppServerHealth(
+    buildProtectedAppServerUrl(effectiveUrl, gatewayToken),
+    APP_SERVER_GATEWAY_START_TIMEOUT_MS
+  );
+  if (!gatewayHealthy) {
+    await terminateProcess(pid, options.platform);
+    if (auth.gatewayPid != null) {
+      await terminateProcess(auth.gatewayPid, options.platform);
+    }
+    removeFileIfExists(auth.tokenPath);
+    throw new Error(
+      `Tap auth gateway did not become healthy at ${effectiveUrl}.
+Check ${auth.gatewayLogPath ?? "the gateway log"} and ${logPath}.`
+    );
+  }
+  const healthyAt = (/* @__PURE__ */ new Date()).toISOString();
+  pid = findListeningProcessId(auth.upstreamUrl, options.platform) ?? pid;
   return {
-    command: configCommand,
-    supportsStripTypes: false,
-    source: "path",
-    majorVersion: null
-  };
-}
-function buildRuntimeEnv(repoRoot, baseEnv = process.env) {
-  const fnmBin = getFnmBinDir(repoRoot);
-  if (!fnmBin) return { ...baseEnv };
-  const pathKey = process.platform === "win32" ? "Path" : "PATH";
-  const currentPath = baseEnv[pathKey] ?? baseEnv.PATH ?? "";
-  return {
-    ...baseEnv,
-    [pathKey]: `${fnmBin}${path11.delimiter}${currentPath}`
+    url: effectiveUrl,
+    pid,
+    managed: true,
+    healthy: true,
+    lastCheckedAt: healthyAt,
+    lastHealthyAt: healthyAt,
+    logPath,
+    manualCommand,
+    auth
   };
 }
-
-// src/engine/bridge.ts
 function pidFilePath(stateDir, instanceId) {
-  return path12.join(stateDir, "pids", `bridge-${instanceId}.json`);
+  return path13.join(stateDir, "pids", `bridge-${instanceId}.json`);
 }
 function logFilePath(stateDir, instanceId) {
-  return path12.join(stateDir, "logs", `bridge-${instanceId}.log`);
+  return path13.join(stateDir, "logs", `bridge-${instanceId}.log`);
+}
+function runtimeHeartbeatFilePath(runtimeStateDir) {
+  return path13.join(runtimeStateDir, "heartbeat.json");
+}
+function loadRuntimeHeartbeatTimestamp(runtimeStateDir) {
+  if (!runtimeStateDir) {
+    return null;
+  }
+  const heartbeatPath = runtimeHeartbeatFilePath(runtimeStateDir);
+  if (!fs13.existsSync(heartbeatPath)) {
+    return null;
+  }
+  try {
+    const raw = fs13.readFileSync(heartbeatPath, "utf-8");
+    const parsed = JSON.parse(raw);
+    return typeof parsed.updatedAt === "string" ? parsed.updatedAt : null;
+  } catch {
+    return null;
+  }
+}
+function resolveHeartbeatTimestamp(state) {
+  return loadRuntimeHeartbeatTimestamp(state?.runtimeStateDir) ?? state?.lastHeartbeat ?? null;
 }
 function loadBridgeState(stateDir, instanceId) {
   const pidPath = pidFilePath(stateDir, instanceId);
-  if (!fs12.existsSync(pidPath)) return null;
+  if (!fs13.existsSync(pidPath)) return null;
   try {
-    const raw = fs12.readFileSync(pidPath, "utf-8");
+    const raw = fs13.readFileSync(pidPath, "utf-8");
     return JSON.parse(raw);
   } catch {
     return null;
@@ -1918,15 +2789,16 @@ function loadBridgeState(stateDir, instanceId) {
 }
 function saveBridgeState(stateDir, instanceId, state) {
   const pidPath = pidFilePath(stateDir, instanceId);
-  fs12.mkdirSync(path12.dirname(pidPath), { recursive: true });
-  const tmp = `${pidPath}.tmp.${process.pid}`;
-  fs12.writeFileSync(tmp, JSON.stringify(state, null, 2), "utf-8");
-  fs12.renameSync(tmp, pidPath);
+  const serializable = JSON.parse(JSON.stringify(state));
+  if (serializable.appServer?.auth) {
+    delete serializable.appServer.auth.token;
+  }
+  writeProtectedTextFile(pidPath, JSON.stringify(serializable, null, 2));
 }
 function clearBridgeState(stateDir, instanceId) {
   const pidPath = pidFilePath(stateDir, instanceId);
-  if (fs12.existsSync(pidPath)) {
-    fs12.unlinkSync(pidPath);
+  if (fs13.existsSync(pidPath)) {
+    fs13.unlinkSync(pidPath);
   }
 }
 function isProcessAlive(pid) {
@@ -1964,31 +2836,61 @@ async function startBridge(options) {
       `Bridge for ${instanceId} is already running (PID: ${existing.pid})`
     );
   }
+  const previousBridgeState = loadBridgeState(stateDir, instanceId);
+  const previousAppServer = previousBridgeState?.appServer ?? null;
   clearBridgeState(stateDir, instanceId);
   const logPath = logFilePath(stateDir, instanceId);
-  fs12.mkdirSync(path12.dirname(logPath), { recursive: true });
+  fs13.mkdirSync(path13.dirname(logPath), { recursive: true });
   rotateLog(logPath);
-  const logFd = fs12.openSync(logPath, "a");
-  const repoRoot = options.repoRoot ?? path12.resolve(stateDir, "..");
+  let logFd = null;
+  const repoRoot = options.repoRoot ?? path13.resolve(stateDir, "..");
+  const runtimeStateDir = getBridgeRuntimeStateDir(repoRoot, instanceId);
   const resolved = resolveNodeRuntime(
     options.runtimeCommand ?? "node",
     repoRoot
   );
   const command = resolved.command;
   const runtimeEnv = buildRuntimeEnv(repoRoot);
-  const child = spawn(command, [bridgeScript], {
-    detached: true,
-    stdio: ["ignore", logFd, logFd],
-    env: {
+  const effectiveAppServerUrl = resolveAppServerUrl(options.appServerUrl, port);
+  let appServer = null;
+  let bridgeAppServerUrl = effectiveAppServerUrl;
+  if (runtime === "codex" && options.manageAppServer) {
+    appServer = await ensureCodexAppServer({
+      instanceId,
+      stateDir,
+      repoRoot,
+      platform: options.platform,
+      appServerUrl: effectiveAppServerUrl,
+      existingAppServer: previousAppServer,
+      noAuth: options.noAuth
+    });
+    if (appServer.auth) {
+      appServer = {
+        ...appServer,
+        auth: materializeGatewayTokenFile(
+          stateDir,
+          instanceId,
+          effectiveAppServerUrl,
+          appServer.auth
+        )
+      };
+    }
+    bridgeAppServerUrl = effectiveAppServerUrl;
+  }
+  try {
+    const bridgeEnv = {
       ...runtimeEnv,
       TAP_COMMS_DIR: commsDir,
+      TAP_STATE_DIR: runtimeStateDir,
       TAP_BRIDGE_RUNTIME: runtime,
       TAP_BRIDGE_INSTANCE_ID: instanceId,
+      TAP_AGENT_ID: instanceId,
       TAP_AGENT_NAME: resolvedAgent,
       CODEX_TAP_AGENT_NAME: resolvedAgent,
       TAP_RESOLVED_NODE: resolved.command,
       TAP_STRIP_TYPES: resolved.supportsStripTypes ? "1" : "0",
-      ...options.appServerUrl ? { CODEX_APP_SERVER_URL: options.appServerUrl } : {},
+      ...bridgeAppServerUrl ? { CODEX_APP_SERVER_URL: bridgeAppServerUrl } : {},
+      ...appServer?.auth?.tokenPath ? { TAP_GATEWAY_TOKEN_FILE: appServer.auth.tokenPath } : {},
       ...port != null ? { TAP_BRIDGE_PORT: String(port) } : {},
       ...options.headless?.enabled ? {
         TAP_HEADLESS: "true",
@@ -1996,7 +2898,6 @@ async function startBridge(options) {
         TAP_MAX_REVIEW_ROUNDS: String(options.headless.maxRounds),
         TAP_QUALITY_FLOOR: options.headless.qualitySeverityFloor
       } : {},
-      // Bridge script operational flags
       ...options.busyMode ? { TAP_BUSY_MODE: options.busyMode } : {},
       ...options.pollSeconds != null ? { TAP_POLL_SECONDS: String(options.pollSeconds) } : {},
       ...options.reconnectSeconds != null ? { TAP_RECONNECT_SECONDS: String(options.reconnectSeconds) } : {},
@@ -2008,20 +2909,55 @@ async function startBridge(options) {
       ...options.threadId ? { TAP_THREAD_ID: options.threadId } : {},
       ...options.ephemeral ? { TAP_EPHEMERAL: "true" } : {},
       ...options.processExistingMessages ? { TAP_PROCESS_EXISTING: "true" } : {}
+    };
+    let bridgePid = null;
+    if (options.platform === "win32") {
+      bridgePid = startWindowsDetachedProcess(
+        command,
+        [bridgeScript],
+        repoRoot,
+        logPath,
+        bridgeEnv
+      );
+    } else {
+      logFd = fs13.openSync(logPath, "a");
+      const child = spawn(command, [bridgeScript], {
+        detached: true,
+        stdio: ["ignore", logFd, logFd],
+        env: bridgeEnv,
+        windowsHide: true
+      });
+      child.unref();
+      bridgePid = child.pid ?? null;
     }
-  });
-  child.unref();
-  fs12.closeSync(logFd);
-  if (!child.pid) {
-    throw new Error(`Failed to spawn bridge process for ${instanceId}`);
-  }
-  const state = {
-    pid: child.pid,
-    statePath: pidFilePath(stateDir, instanceId),
-    lastHeartbeat: (/* @__PURE__ */ new Date()).toISOString()
-  };
-  saveBridgeState(stateDir, instanceId, state);
-  return state;
+    if (logFd != null) {
+      fs13.closeSync(logFd);
+      logFd = null;
+    }
+    if (!bridgePid) {
+      throw new Error(`Failed to spawn bridge process for ${instanceId}`);
+    }
+    const state = {
+      pid: bridgePid,
+      statePath: pidFilePath(stateDir, instanceId),
+      lastHeartbeat: (/* @__PURE__ */ new Date()).toISOString(),
+      appServer,
+      runtimeStateDir
+    };
+    saveBridgeState(stateDir, instanceId, state);
+    return state;
+  } catch (err) {
+    if (logFd != null) {
+      try {
+        fs13.closeSync(logFd);
+      } catch {
+      }
+    }
+    if (appServer?.managed) {
+      await stopManagedAppServer(appServer, options.platform);
+    }
+    throw err;
+  }
 }
 async function stopBridge(options) {
   const { instanceId, stateDir, platform } = options;
@@ -2034,37 +2970,33 @@ async function stopBridge(options) {
     return false;
   }
   try {
-    if (platform === "win32") {
-      execSync3(`taskkill /PID ${state.pid} /F /T`, { stdio: "pipe" });
-    } else {
-      process.kill(state.pid, "SIGTERM");
-      await new Promise((resolve10) => setTimeout(resolve10, 2e3));
-      if (isProcessAlive(state.pid)) {
-        process.kill(state.pid, "SIGKILL");
-      }
-    }
+    await terminateProcess(state.pid, platform);
   } catch {
   }
   clearBridgeState(stateDir, instanceId);
   return true;
 }
 function rotateLog(logPath) {
-  if (!fs12.existsSync(logPath)) return;
+  if (!fs13.existsSync(logPath)) return;
   try {
-    const stats = fs12.statSync(logPath);
+    const stats = fs13.statSync(logPath);
     if (stats.size === 0) return;
     const prevPath = `${logPath}.prev`;
-    fs12.renameSync(logPath, prevPath);
+    fs13.renameSync(logPath, prevPath);
   } catch {
   }
 }
 function getHeartbeatAge(stateDir, instanceId) {
   const state = loadBridgeState(stateDir, instanceId);
-  if (!state?.lastHeartbeat) return null;
-  const heartbeatTime = new Date(state.lastHeartbeat).getTime();
+  const heartbeat = resolveHeartbeatTimestamp(state);
+  if (!heartbeat) return null;
+  const heartbeatTime = new Date(heartbeat).getTime();
   if (isNaN(heartbeatTime)) return null;
   return Math.floor((Date.now() - heartbeatTime) / 1e3);
 }
+function getBridgeHeartbeatTimestamp(stateDir, instanceId) {
+  return resolveHeartbeatTimestamp(loadBridgeState(stateDir, instanceId));
+}
 function getBridgeStatus(stateDir, instanceId) {
   const state = loadBridgeState(stateDir, instanceId);
   if (!state) return "stopped";
@@ -2084,7 +3016,7 @@ async function addCommand(args) {
       ok: false,
       command: "add",
       code: "TAP_INVALID_ARGUMENT",
-      message: "Missing runtime argument. Usage: npx @hua-labs/tap add <claude|codex|gemini> [--name <name>] [--port <port>] [--headless] [--role <role>]",
+      message: "Missing runtime argument. Usage: npx @hua-labs/tap add <claude|codex|gemini> [--name <name>] [--port <port>] [--agent-name <name>] [--headless] [--role <role>]",
       warnings: [],
       data: {}
     };
@@ -2104,6 +3036,7 @@ async function addCommand(args) {
   const instanceId = buildInstanceId(runtime, instanceName);
   const portStr = typeof flags["port"] === "string" ? flags["port"] : void 0;
   const port = portStr ? parseInt(portStr, 10) : null;
+  const agentNameFlag = typeof flags["agent-name"] === "string" ? flags["agent-name"] : null;
   const force = flags["force"] === true;
   const headlessFlag = flags["headless"] === true;
   const roleArg = typeof flags["role"] === "string" ? flags["role"] : void 0;
@@ -2150,7 +3083,7 @@ async function addCommand(args) {
       data: {}
     };
   }
-  const repoRoot = findRepoRoot2();
+  const repoRoot = findRepoRoot();
   const state = loadState(repoRoot);
   if (!state) {
     return {
@@ -2194,7 +3127,7 @@ async function addCommand(args) {
   logHeader(`@hua-labs/tap add ${instanceId}`);
   if (instanceName) log(`Instance name: ${instanceName}`);
   if (port !== null) log(`Port: ${port}`);
-  const ctx = createAdapterContext(state.commsDir, repoRoot);
+  const ctx = { ...createAdapterContext(state.commsDir, repoRoot), instanceId };
   const adapter = getAdapter(runtime);
   const warnings = [];
   log("Probing runtime...");
@@ -2226,13 +3159,15 @@ async function addCommand(args) {
   log(`Artifacts:  ${plan.ownedArtifacts.length}`);
   for (const w of plan.warnings) logWarn(w);
   if (plan.operations.length === 0) {
+    const failureMessage = probe.issues[0] ?? plan.warnings[0] ?? probe.warnings[0] ?? "No operations to apply. Runtime not configured.";
+    const failureCode = /MCP server/i.test(failureMessage) ? "TAP_LOCAL_SERVER_MISSING" : "TAP_PATCH_FAILED";
     return {
-      ok: true,
+      ok: false,
       command: "add",
       runtime,
       instanceId,
-      code: "TAP_NO_OP",
-      message: "No operations to apply. Runtime not configured.",
+      code: failureCode,
+      message: failureMessage,
       warnings,
       data: { planOps: 0 }
     };
@@ -2280,10 +3215,10 @@ async function addCommand(args) {
       logWarn("Bridge script not found. Bridge not started.");
       warnings.push("Bridge script not found. Run bridge manually.");
     } else {
-      const agentNameEnv = process.env.TAP_AGENT_NAME || process.env.CODEX_TAP_AGENT_NAME;
-      if (!agentNameEnv) {
+      const resolvedAgentName = agentNameFlag || process.env.TAP_AGENT_NAME || process.env.CODEX_TAP_AGENT_NAME;
+      if (!resolvedAgentName) {
         logWarn(
-          "No agent name set (TAP_AGENT_NAME). Bridge not started. Use: npx @hua-labs/tap bridge start <instance> --agent-name <name>"
+          "No agent name set. Bridge not started. Use: npx @hua-labs/tap bridge start <instance> --agent-name <name>"
         );
         warnings.push("Bridge not auto-started: no agent name available.");
       } else {
@@ -2297,7 +3232,7 @@ async function addCommand(args) {
             commsDir: ctx.commsDir,
             bridgeScript,
             platform: ctx.platform,
-            agentName: agentNameEnv,
+            agentName: resolvedAgentName,
             runtimeCommand: resolvedCfg.runtimeCommand,
             appServerUrl: resolvedCfg.appServerUrl,
             repoRoot,
@@ -2313,10 +3248,11 @@ async function addCommand(args) {
       }
     }
   }
+  const existingAgentName = state.instances[instanceId]?.agentName ?? null;
   const instanceState = {
     instanceId,
     runtime,
-    agentName: null,
+    agentName: agentNameFlag ?? existingAgentName,
     port,
     installed: true,
     configPath: probe.configPath ?? "",
@@ -2382,7 +3318,7 @@ function instanceStatusLine(inst, status) {
   return `${inst.instanceId.padEnd(20)} ${inst.runtime.padEnd(8)} ${status.padEnd(14)} ${mode.padEnd(14)}${bridgeInfo}${portStr}${restart}${warns}`;
 }
 async function statusCommand(_args) {
-  const repoRoot = findRepoRoot2();
+  const repoRoot = findRepoRoot();
   const state = loadState(repoRoot);
   if (!state) {
     return {
@@ -2395,7 +3331,7 @@ async function statusCommand(_args) {
     };
   }
   logHeader("@hua-labs/tap status");
-  log(`Version:    ${state.packageVersion}`);
+  log(`Version:    ${version}`);
   log(`Comms dir:  ${state.commsDir}`);
   log(`Repo root:  ${state.repoRoot}`);
   log(`Schema:     v${state.schemaVersion}`);
@@ -2452,7 +3388,7 @@ async function statusCommand(_args) {
     message: `${installed.length} instance(s) installed`,
     warnings: [],
     data: {
-      version: state.packageVersion,
+      version,
       commsDir: state.commsDir,
       repoRoot: state.repoRoot,
       instances
@@ -2461,7 +3397,7 @@ async function statusCommand(_args) {
 }
 
 // src/engine/rollback.ts
-import * as fs13 from "fs";
+import * as fs14 from "fs";
 async function rollbackRuntime(_instanceId, runtimeState) {
   const errors = [];
   const restoredFiles = [];
@@ -2490,7 +3426,7 @@ async function rollbackRuntime(_instanceId, runtimeState) {
   };
 }
 function rollbackArtifact(artifact) {
-  if (!fs13.existsSync(artifact.path)) {
+  if (!fs14.existsSync(artifact.path)) {
     return { restored: false, error: `File not found: ${artifact.path}` };
   }
   switch (artifact.kind) {
@@ -2508,7 +3444,7 @@ function rollbackArtifact(artifact) {
   }
 }
 function rollbackJsonPath(artifact) {
-  const raw = fs13.readFileSync(artifact.path, "utf-8");
+  const raw = fs14.readFileSync(artifact.path, "utf-8");
   let config;
   try {
     config = JSON.parse(raw);
@@ -2534,18 +3470,18 @@ function rollbackJsonPath(artifact) {
     cleanEmptyParents(config, artifact.selector);
   }
   const tmp = `${artifact.path}.tmp.${process.pid}`;
-  fs13.writeFileSync(tmp, JSON.stringify(config, null, 2) + "\n", "utf-8");
-  fs13.renameSync(tmp, artifact.path);
+  fs14.writeFileSync(tmp, JSON.stringify(config, null, 2) + "\n", "utf-8");
+  fs14.renameSync(tmp, artifact.path);
   return { restored: true };
 }
 function rollbackTomlTable(artifact) {
-  const content = fs13.readFileSync(artifact.path, "utf-8");
+  const content = fs14.readFileSync(artifact.path, "utf-8");
   const backup = artifact.backupPath ? readArtifactBackup(artifact.backupPath) : null;
   if (backup?.kind === "toml-table" && backup.selector === artifact.selector) {
     const nextContent = backup.existed ? replaceTomlTable(content, artifact.selector, backup.content ?? "") : removeTomlTable(content, artifact.selector);
     const tmp2 = `${artifact.path}.tmp.${process.pid}`;
-    fs13.writeFileSync(tmp2, nextContent, "utf-8");
-    fs13.renameSync(tmp2, artifact.path);
+    fs14.writeFileSync(tmp2, nextContent, "utf-8");
+    fs14.renameSync(tmp2, artifact.path);
     return { restored: true };
   }
   if (!extractTomlTable(content, artifact.selector)) {
@@ -2555,13 +3491,13 @@ function rollbackTomlTable(artifact) {
     };
   }
   const tmp = `${artifact.path}.tmp.${process.pid}`;
-  fs13.writeFileSync(tmp, removeTomlTable(content, artifact.selector), "utf-8");
-  fs13.renameSync(tmp, artifact.path);
+  fs14.writeFileSync(tmp, removeTomlTable(content, artifact.selector), "utf-8");
+  fs14.renameSync(tmp, artifact.path);
   return { restored: true };
 }
 function rollbackFile(artifact) {
-  if (fs13.existsSync(artifact.path)) {
-    fs13.unlinkSync(artifact.path);
+  if (fs14.existsSync(artifact.path)) {
+    fs14.unlinkSync(artifact.path);
     return { restored: true };
   }
   return { restored: false, error: `File not found: ${artifact.path}` };
@@ -2622,7 +3558,7 @@ async function removeCommand(args) {
       data: {}
     };
   }
-  const repoRoot = findRepoRoot2();
+  const repoRoot = findRepoRoot();
   const state = loadState(repoRoot);
   if (!state) {
     return {
@@ -2708,7 +3644,7 @@ async function removeCommand(args) {
 }
 
 // src/commands/bridge.ts
-import * as path13 from "path";
+import * as path14 from "path";
 function formatAge(seconds) {
   if (seconds < 60) return `${seconds}s ago`;
   if (seconds < 3600) return `${Math.floor(seconds / 60)}m ago`;
@@ -2720,6 +3656,7 @@ Usage:
 
 Subcommands:
   start <instance>  Start bridge for an instance (e.g. codex, codex-reviewer)
+  start --all       Start all registered app-server instances
   stop  <instance>  Stop bridge for an instance
   stop              Stop all running bridges
   status            Show bridge status for all instances
@@ -2727,6 +3664,8 @@ Subcommands:
 
 Options:
   --agent-name <name>              Agent identity for bridge (or set TAP_AGENT_NAME env)
+                                   Saved to state \u2014 only needed on first start
+  --all                            Start all registered app-server instances
   --busy-mode <steer|wait>         How to handle active turns (default: steer)
   --poll-seconds <n>               Inbox poll interval (default: 5)
   --reconnect-seconds <n>          Reconnect delay after disconnect (default: 5)
@@ -2734,17 +3673,98 @@ Options:
   --thread-id <id>                 Resume specific thread
   --ephemeral                      Use ephemeral thread (no persistence)
   --process-existing-messages      Process all existing inbox messages
+  --no-server                      Skip app-server auto-start and connect only
+  --no-auth                        Skip auth gateway (app-server listens directly, localhost only)
+
+Port Assignment:
+  Ports are auto-assigned from 4501 on first bridge start if not set via --port
+  during 'tap add'. Auto-assigned ports are saved to state for future starts.
 
 Examples:
   npx @hua-labs/tap bridge start codex --agent-name myAgent
+  npx @hua-labs/tap bridge start --all
+  npx @hua-labs/tap bridge start codex --agent-name myAgent --no-server
   npx @hua-labs/tap bridge start codex-reviewer --agent-name reviewer --busy-mode steer
   npx @hua-labs/tap bridge stop codex
   npx @hua-labs/tap bridge stop
   npx @hua-labs/tap bridge status
 `.trim();
+function formatAppServerState(appServer) {
+  const ownership = appServer.managed ? "managed" : "external";
+  const pid = appServer.pid != null ? ` pid:${appServer.pid}` : "";
+  const health = appServer.healthy ? "healthy" : "unhealthy";
+  const auth = appServer.auth != null ? `, auth gateway:${appServer.auth.gatewayPid ?? "-"} -> ${appServer.auth.upstreamUrl}` : "";
+  return `${health}, ${ownership}${pid}, ${appServer.url}${auth}`;
+}
+function redactProtectedUrl(url) {
+  try {
+    const parsed = new URL(url);
+    if (parsed.searchParams.has("tap_token")) {
+      parsed.searchParams.set("tap_token", "***");
+    }
+    return parsed.toString().replace(/\/$/, "");
+  } catch {
+    return url.replace(/tap_token=[^&]+/g, "tap_token=***");
+  }
+}
+function loadCurrentBridgeState(stateDir, instanceId, fallback) {
+  return loadBridgeState(stateDir, instanceId) ?? fallback ?? null;
+}
+function getSharedAppServerUsers(state, stateDir, currentInstanceId, appServerUrl) {
+  const shared = [];
+  for (const [id, inst] of Object.entries(state.instances)) {
+    if (id === currentInstanceId || !inst?.installed) {
+      continue;
+    }
+    const instanceId = id;
+    if (getBridgeStatus(stateDir, instanceId) !== "running") {
+      continue;
+    }
+    const bridgeState = loadCurrentBridgeState(
+      stateDir,
+      instanceId,
+      inst.bridge
+    );
+    if (bridgeState?.appServer?.url === appServerUrl) {
+      shared.push(instanceId);
+    }
+  }
+  return shared;
+}
+function transferManagedAppServerOwnership(state, stateDir, recipientId, appServer) {
+  const recipient = state.instances[recipientId];
+  if (!recipient) {
+    return false;
+  }
+  const bridgeState = loadCurrentBridgeState(
+    stateDir,
+    recipientId,
+    recipient.bridge
+  );
+  if (!bridgeState) {
+    return false;
+  }
+  const transferredAppServer = {
+    ...appServer,
+    managed: true,
+    healthy: true,
+    lastCheckedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    lastHealthyAt: appServer.lastHealthyAt ?? (/* @__PURE__ */ new Date()).toISOString()
+  };
+  const updatedBridge = {
+    ...bridgeState,
+    appServer: transferredAppServer
+  };
+  saveBridgeState(stateDir, recipientId, updatedBridge);
+  state.instances[recipientId] = {
+    ...recipient,
+    bridge: updatedBridge
+  };
+  return true;
+}
 async function bridgeStart(identifier, agentName, flags = {}) {
-  const repoRoot = findRepoRoot2();
-  const state = loadState(repoRoot);
+  const repoRoot = findRepoRoot();
+  let state = loadState(repoRoot);
   if (!state) {
     return {
       ok: false,
@@ -2767,7 +3787,7 @@ async function bridgeStart(identifier, agentName, flags = {}) {
     };
   }
   const instanceId = resolved.instanceId;
-  const instance = state.instances[instanceId];
+  let instance = state.instances[instanceId];
   if (!instance?.installed) {
     return {
       ok: false,
@@ -2794,6 +3814,13 @@ async function bridgeStart(identifier, agentName, flags = {}) {
       data: { bridgeMode: mode }
     };
   }
+  const resolvedAgentName = agentName ?? instance.agentName ?? void 0;
+  if (agentName && agentName !== instance.agentName) {
+    instance = { ...instance, agentName };
+    const updatedState = updateInstanceState(state, instanceId, instance);
+    saveState(repoRoot, updatedState);
+    state = updatedState;
+  }
   const ctx = createAdapterContext(state.commsDir, repoRoot);
   const bridgeScript = adapter.resolveBridgeScript?.(ctx);
   if (!bridgeScript) {
@@ -2810,19 +3837,63 @@ async function bridgeStart(identifier, agentName, flags = {}) {
   }
   const { config: resolvedConfig } = resolveConfig({}, repoRoot);
   const runtimeCommand = resolvedConfig.runtimeCommand;
-  const appServerUrl = resolvedConfig.appServerUrl;
+  const manageAppServer = instance.runtime === "codex" && flags["no-server"] !== true;
+  let effectivePort = instance.port;
+  if (effectivePort == null && manageAppServer) {
+    effectivePort = await findNextAvailableAppServerPort(
+      state,
+      resolvedConfig.appServerUrl,
+      4501,
+      instanceId
+    );
+    instance = { ...instance, port: effectivePort };
+    const updatedState = updateInstanceState(state, instanceId, instance);
+    saveState(repoRoot, updatedState);
+    state = updatedState;
+  }
+  const appServerUrl = resolveAppServerUrl(
+    resolvedConfig.appServerUrl,
+    effectivePort ?? void 0
+  );
   logHeader(`@hua-labs/tap bridge start ${instanceId}`);
   log(`Bridge script: ${bridgeScript}`);
   log(`Bridge mode:   ${mode}`);
   log(`Runtime cmd:   ${runtimeCommand}`);
   log(`App server:    ${appServerUrl}`);
-  if (instance.port) log(`Port:          ${instance.port}`);
+  if (effectivePort != null) log(`Port:          ${effectivePort}`);
+  if (resolvedAgentName) log(`Agent name:    ${resolvedAgentName}`);
+  const noAuth = flags["no-auth"] === true;
+  if (!manageAppServer && instance.runtime === "codex") {
+    log("Auto server:   disabled (--no-server)");
+  }
+  if (noAuth && manageAppServer) {
+    log("Auth gateway:  disabled (--no-auth)");
+  }
   const willBeHeadless = flags["headless"] === true || instance.headless?.enabled;
   if (willBeHeadless) {
     const role = (typeof flags["role"] === "string" ? flags["role"] : null) ?? instance.headless?.role ?? "reviewer";
     log(`Headless:      ${role}`);
   }
   try {
+    if (!manageAppServer && instance.runtime === "codex") {
+      log("Checking app-server health...");
+      const healthy = await checkAppServerHealth(appServerUrl);
+      if (healthy) {
+        logSuccess("App server reachable");
+      } else {
+        logError(`App server not reachable at ${appServerUrl}`);
+        return {
+          ok: false,
+          command: "bridge",
+          instanceId,
+          runtime: instance.runtime,
+          code: "TAP_BRIDGE_START_FAILED",
+          message: `App server not reachable at ${appServerUrl}. Start it first: codex app-server --listen ${appServerUrl}`,
+          warnings: [],
+          data: {}
+        };
+      }
+    }
     const busyModeRaw = flags["busy-mode"];
     if (busyModeRaw !== void 0 && busyModeRaw !== "steer" && busyModeRaw !== "wait") {
       return {
@@ -2871,11 +3942,13 @@ async function bridgeStart(identifier, agentName, flags = {}) {
       commsDir: ctx.commsDir,
       bridgeScript,
       platform: ctx.platform,
-      agentName,
+      agentName: resolvedAgentName,
       runtimeCommand,
       appServerUrl,
       repoRoot,
-      port: instance.port ?? void 0,
+      port: effectivePort ?? void 0,
+      manageAppServer,
+      noAuth,
       headless,
       busyMode,
       pollSeconds,
@@ -2886,7 +3959,25 @@ async function bridgeStart(identifier, agentName, flags = {}) {
       processExistingMessages
     });
     logSuccess(`Bridge started (PID: ${bridge.pid})`);
-    log(`Log: ${path13.join(ctx.stateDir, "logs", `bridge-${instanceId}.log`)}`);
+    log(`Log: ${path14.join(ctx.stateDir, "logs", `bridge-${instanceId}.log`)}`);
+    if (bridge.appServer) {
+      log(`App server:   ${formatAppServerState(bridge.appServer)}`);
+      if (bridge.appServer.logPath) {
+        log(`Server log:   ${bridge.appServer.logPath}`);
+      }
+      if (bridge.appServer.auth) {
+        log(
+          `Protected:    ${redactProtectedUrl(bridge.appServer.auth.protectedUrl)}`
+        );
+        if (bridge.appServer.auth.gatewayLogPath) {
+          log(`Gateway log:  ${bridge.appServer.auth.gatewayLogPath}`);
+        }
+        log(`TUI connect:  ${bridge.appServer.auth.upstreamUrl}`);
+      }
+      if (bridge.appServer.managed && !bridge.appServer.auth) {
+        log(`TUI connect:  ${bridge.appServer.url}`);
+      }
+    }
     const updated = { ...instance, bridge };
     const newState = updateInstanceState(state, instanceId, updated);
     saveState(repoRoot, newState);
@@ -2898,25 +3989,93 @@ async function bridgeStart(identifier, agentName, flags = {}) {
       code: "TAP_BRIDGE_START_OK",
       message: `Bridge for ${instanceId} started (PID: ${bridge.pid})`,
       warnings: [],
-      data: { pid: bridge.pid }
+      data: { pid: bridge.pid, appServer: bridge.appServer ?? null }
     };
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     logError(msg);
     return {
-      ok: false,
+      ok: false,
+      command: "bridge",
+      instanceId,
+      runtime: instance.runtime,
+      code: "TAP_BRIDGE_START_FAILED",
+      message: msg,
+      warnings: [],
+      data: {}
+    };
+  }
+}
+async function bridgeStartAll(flags = {}) {
+  const repoRoot = findRepoRoot();
+  const state = loadState(repoRoot);
+  if (!state) {
+    return {
+      ok: false,
+      command: "bridge",
+      code: "TAP_NOT_INITIALIZED",
+      message: "Not initialized. Run: npx @hua-labs/tap init",
+      warnings: [],
+      data: {}
+    };
+  }
+  const instanceIds = Object.keys(state.instances);
+  const appServerInstances = instanceIds.filter((id) => {
+    const inst = state.instances[id];
+    if (!inst?.installed) return false;
+    const adapter = getAdapter(inst.runtime);
+    return adapter.bridgeMode() === "app-server";
+  });
+  if (appServerInstances.length === 0) {
+    return {
+      ok: true,
       command: "bridge",
-      instanceId,
-      runtime: instance.runtime,
-      code: "TAP_BRIDGE_START_FAILED",
-      message: msg,
+      code: "TAP_NO_OP",
+      message: "No app-server instances found to start.",
       warnings: [],
       data: {}
     };
   }
+  logHeader("@hua-labs/tap bridge start --all");
+  log(
+    `Found ${appServerInstances.length} app-server instance(s): ${appServerInstances.join(", ")}`
+  );
+  log("");
+  const started = [];
+  const failed = [];
+  const warnings = [];
+  for (const instanceId of appServerInstances) {
+    const inst = state.instances[instanceId];
+    const storedName = inst?.agentName ?? void 0;
+    if (!storedName) {
+      const msg = `${instanceId}: skipped \u2014 no stored agent-name. Set it first: tap bridge start ${instanceId} --agent-name <name>`;
+      log(msg);
+      warnings.push(msg);
+      continue;
+    }
+    log(`Starting ${instanceId} (agent: ${storedName})...`);
+    const result = await bridgeStart(instanceId, storedName, flags);
+    if (result.ok) {
+      started.push(instanceId);
+      logSuccess(`${instanceId} started`);
+    } else {
+      failed.push(instanceId);
+      logError(`${instanceId}: ${result.message}`);
+    }
+    log("");
+  }
+  const message = started.length > 0 ? `Started ${started.length}/${appServerInstances.length} bridge(s): ${started.join(", ")}` + (failed.length > 0 ? `. Failed: ${failed.join(", ")}` : "") : `No bridges started. Failed: ${failed.join(", ")}`;
+  return {
+    ok: failed.length === 0 && started.length > 0,
+    command: "bridge",
+    code: started.length > 0 ? "TAP_BRIDGE_START_OK" : "TAP_BRIDGE_START_FAILED",
+    message,
+    warnings,
+    data: { started, failed }
+  };
 }
 async function bridgeStopOne(identifier) {
-  const repoRoot = findRepoRoot2();
+  const repoRoot = findRepoRoot();
   const state = loadState(repoRoot);
   if (!state) {
     return {
@@ -2941,20 +4100,64 @@ async function bridgeStopOne(identifier) {
   }
   const instanceId = resolved.instanceId;
   const ctx = createAdapterContext(state.commsDir, repoRoot);
+  const instance = state.instances[instanceId];
+  const bridgeState = loadCurrentBridgeState(
+    ctx.stateDir,
+    instanceId,
+    instance?.bridge
+  );
+  const appServer = bridgeState?.appServer ?? null;
   logHeader(`@hua-labs/tap bridge stop ${instanceId}`);
   const stopped = await stopBridge({
     instanceId,
     stateDir: ctx.stateDir,
     platform: ctx.platform
   });
+  let appServerStopped = false;
+  let appServerTransferredTo = null;
   if (stopped) {
     logSuccess(`Bridge for ${instanceId} stopped`);
-    const instance2 = state.instances[instanceId];
-    if (instance2) {
-      const updated = { ...instance2, bridge: null };
-      const newState = updateInstanceState(state, instanceId, updated);
-      saveState(repoRoot, newState);
+  } else {
+    log(`No running bridge for ${instanceId}`);
+  }
+  if (appServer?.managed) {
+    const sharedUsers = getSharedAppServerUsers(
+      state,
+      ctx.stateDir,
+      instanceId,
+      appServer.url
+    );
+    if (sharedUsers.length > 0) {
+      const recipient = sharedUsers[0];
+      if (transferManagedAppServerOwnership(
+        state,
+        ctx.stateDir,
+        recipient,
+        appServer
+      )) {
+        appServerTransferredTo = recipient;
+        log(`Managed app-server ownership moved to ${recipient}`);
+      } else {
+        log(
+          `Managed app-server left running at ${appServer.url} because ownership transfer failed`
+        );
+      }
+    } else {
+      appServerStopped = await stopManagedAppServer(appServer, ctx.platform);
+      if (appServerStopped) {
+        const gatewayNote = appServer.auth?.gatewayPid != null ? `, gateway PID: ${appServer.auth.gatewayPid}` : "";
+        logSuccess(
+          `Managed app-server stopped (PID: ${appServer.pid ?? "-"}${gatewayNote})`
+        );
+      }
     }
+  }
+  if (instance) {
+    const updated = { ...instance, bridge: null };
+    const newState = updateInstanceState(state, instanceId, updated);
+    saveState(repoRoot, newState);
+  }
+  if (stopped) {
     return {
       ok: true,
       command: "bridge",
@@ -2962,16 +4165,12 @@ async function bridgeStopOne(identifier) {
       code: "TAP_BRIDGE_STOP_OK",
       message: `Bridge for ${instanceId} stopped`,
       warnings: [],
-      data: {}
+      data: {
+        appServerStopped,
+        appServerTransferredTo
+      }
     };
   }
-  log(`No running bridge for ${instanceId}`);
-  const instance = state.instances[instanceId];
-  if (instance?.bridge) {
-    const updated = { ...instance, bridge: null };
-    const newState = updateInstanceState(state, instanceId, updated);
-    saveState(repoRoot, newState);
-  }
   return {
     ok: true,
     command: "bridge",
@@ -2979,11 +4178,14 @@ async function bridgeStopOne(identifier) {
     code: "TAP_BRIDGE_NOT_RUNNING",
     message: `No running bridge for ${instanceId}`,
     warnings: [],
-    data: {}
+    data: {
+      appServerStopped,
+      appServerTransferredTo
+    }
   };
 }
 async function bridgeStopAll() {
-  const repoRoot = findRepoRoot2();
+  const repoRoot = findRepoRoot();
   const state = loadState(repoRoot);
   if (!state) {
     return {
@@ -2998,9 +4200,22 @@ async function bridgeStopAll() {
   const ctx = createAdapterContext(state.commsDir, repoRoot);
   const instanceIds = Object.keys(state.instances);
   const stopped = [];
+  const managedAppServers = /* @__PURE__ */ new Map();
   logHeader("@hua-labs/tap bridge stop (all)");
   let stateChanged = false;
   for (const instanceId of instanceIds) {
+    const bridgeState = loadCurrentBridgeState(
+      ctx.stateDir,
+      instanceId,
+      state.instances[instanceId]?.bridge
+    );
+    const appServer = bridgeState?.appServer;
+    if (appServer?.managed && appServer.pid != null) {
+      managedAppServers.set(
+        `${appServer.url}:${appServer.pid}:${appServer.auth?.gatewayPid ?? "-"}`,
+        appServer
+      );
+    }
     const didStop = await stopBridge({
       instanceId,
       stateDir: ctx.stateDir,
@@ -3016,6 +4231,16 @@ async function bridgeStopAll() {
       stateChanged = true;
     }
   }
+  const stoppedAppServers = [];
+  for (const appServer of managedAppServers.values()) {
+    if (await stopManagedAppServer(appServer, ctx.platform)) {
+      stoppedAppServers.push(appServer.pid);
+      const gatewayNote = appServer.auth?.gatewayPid != null ? `, gateway PID ${appServer.auth.gatewayPid}` : "";
+      logSuccess(
+        `Stopped app-server PID ${appServer.pid} (${appServer.url}${gatewayNote})`
+      );
+    }
+  }
   if (stateChanged) {
     state.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     saveState(repoRoot, state);
@@ -3028,11 +4253,11 @@ async function bridgeStopAll() {
     code: stopped.length > 0 ? "TAP_BRIDGE_STOP_OK" : "TAP_BRIDGE_NOT_RUNNING",
     message,
     warnings: [],
-    data: { stopped }
+    data: { stopped, stoppedAppServers }
   };
 }
 function bridgeStatusAll() {
-  const repoRoot = findRepoRoot2();
+  const repoRoot = findRepoRoot();
   const state = loadState(repoRoot);
   if (!state) {
     return {
@@ -3067,7 +4292,8 @@ function bridgeStatusAll() {
         runtime: inst.runtime,
         pid: null,
         port: inst.port,
-        lastHeartbeat: null
+        lastHeartbeat: null,
+        appServer: null
       };
       continue;
     }
@@ -3075,7 +4301,7 @@ function bridgeStatusAll() {
     const bridgeState = loadBridgeState(stateDir, instanceId);
     const age = getHeartbeatAge(stateDir, instanceId);
     const pid = bridgeState?.pid ?? null;
-    const heartbeat = bridgeState?.lastHeartbeat ?? null;
+    const heartbeat = getBridgeHeartbeatTimestamp(stateDir, instanceId);
     const pidStr = pid ? String(pid) : "-";
     const portStr = inst.port ? String(inst.port) : "-";
     const ageStr = age !== null ? formatAge(age) : "-";
@@ -3083,12 +4309,24 @@ function bridgeStatusAll() {
     log(
       `${instanceId.padEnd(20)} ${inst.runtime.padEnd(8)} ${statusColor.padEnd(10)} ${pidStr.padEnd(8)} ${portStr.padEnd(6)} ${ageStr}`
     );
+    if (bridgeState?.appServer) {
+      log(`  App server: ${formatAppServerState(bridgeState.appServer)}`);
+      if (bridgeState.appServer.logPath) {
+        log(`  Server log: ${bridgeState.appServer.logPath}`);
+      }
+      if (bridgeState.appServer.auth) {
+        log(
+          `  Protected: ${redactProtectedUrl(bridgeState.appServer.auth.protectedUrl)}`
+        );
+      }
+    }
     bridges[instanceId] = {
       status,
       runtime: inst.runtime,
       pid,
       port: inst.port,
-      lastHeartbeat: heartbeat
+      lastHeartbeat: heartbeat,
+      appServer: bridgeState?.appServer ?? null
     };
   }
   if (instanceIds.length === 0) {
@@ -3105,7 +4343,7 @@ function bridgeStatusAll() {
   };
 }
 function bridgeStatusOne(identifier) {
-  const repoRoot = findRepoRoot2();
+  const repoRoot = findRepoRoot();
   const state = loadState(repoRoot);
   if (!state) {
     return {
@@ -3162,7 +4400,8 @@ function bridgeStatusOne(identifier) {
         bridgeMode: inst.bridgeMode,
         pid: null,
         port: inst.port,
-        lastHeartbeat: null
+        lastHeartbeat: null,
+        appServer: null
       }
     };
   }
@@ -3171,15 +4410,45 @@ function bridgeStatusOne(identifier) {
   const status = getBridgeStatus(stateDir, instanceId);
   const bridgeState = loadBridgeState(stateDir, instanceId);
   const age = getHeartbeatAge(stateDir, instanceId);
+  const heartbeat = getBridgeHeartbeatTimestamp(stateDir, instanceId);
   log(`Status:      ${status}`);
   if (bridgeState) {
     log(`PID:         ${bridgeState.pid}`);
     log(
-      `Heartbeat:   ${bridgeState.lastHeartbeat}${age !== null ? ` (${formatAge(age)})` : ""}`
+      `Heartbeat:   ${heartbeat ?? "-"}${age !== null ? ` (${formatAge(age)})` : ""}`
     );
     log(
-      `Log:         ${path13.join(stateDir, "logs", `bridge-${instanceId}.log`)}`
+      `Log:         ${path14.join(stateDir, "logs", `bridge-${instanceId}.log`)}`
     );
+    if (bridgeState.appServer) {
+      log(`App server:  ${bridgeState.appServer.url}`);
+      log(`Server PID:  ${bridgeState.appServer.pid ?? "-"}`);
+      log(
+        `Server mode: ${bridgeState.appServer.managed ? "managed" : "external"}`
+      );
+      log(
+        `Health:      ${bridgeState.appServer.healthy ? "healthy" : "unhealthy"}`
+      );
+      log(`Checked:     ${bridgeState.appServer.lastCheckedAt}`);
+      if (bridgeState.appServer.logPath) {
+        log(`Server log:  ${bridgeState.appServer.logPath}`);
+      }
+      if (bridgeState.appServer.auth) {
+        log(`Auth:        ${bridgeState.appServer.auth.mode}`);
+        log(
+          `Protected:   ${redactProtectedUrl(bridgeState.appServer.auth.protectedUrl)}`
+        );
+        log(`Upstream:    ${bridgeState.appServer.auth.upstreamUrl}`);
+        log(`TUI connect: ${bridgeState.appServer.auth.upstreamUrl}`);
+        log(`Gateway PID: ${bridgeState.appServer.auth.gatewayPid ?? "-"}`);
+        if (bridgeState.appServer.auth.gatewayLogPath) {
+          log(`Gateway log: ${bridgeState.appServer.auth.gatewayLogPath}`);
+        }
+      } else if (bridgeState.appServer.managed) {
+        log(`Auth:        none (--no-auth)`);
+        log(`TUI connect: ${bridgeState.appServer.url}`);
+      }
+    }
   }
   log("");
   return {
@@ -3195,7 +4464,8 @@ function bridgeStatusOne(identifier) {
       bridgeMode: inst.bridgeMode,
       pid: bridgeState?.pid ?? null,
       port: inst.port,
-      lastHeartbeat: bridgeState?.lastHeartbeat ?? null
+      lastHeartbeat: heartbeat,
+      appServer: bridgeState?.appServer ?? null
     }
   };
 }
@@ -3217,12 +4487,29 @@ async function bridgeCommand(args) {
   }
   switch (subcommand) {
     case "start": {
+      const wantsAll = flags["all"] === true || identifierArg === "--all";
+      const hasInstance = identifierArg && identifierArg !== "--all";
+      if (wantsAll && hasInstance) {
+        return {
+          ok: false,
+          command: "bridge",
+          code: "TAP_INVALID_ARGUMENT",
+          message: `Cannot combine <instance> with --all. Use either:
+  tap bridge start ${identifierArg}
+  tap bridge start --all`,
+          warnings: [],
+          data: {}
+        };
+      }
+      if (wantsAll) {
+        return bridgeStartAll(flags);
+      }
       if (!identifierArg) {
         return {
           ok: false,
           command: "bridge",
           code: "TAP_INVALID_ARGUMENT",
-          message: "Missing instance. Usage: npx @hua-labs/tap bridge start <instance>",
+          message: "Missing instance. Usage: npx @hua-labs/tap bridge start <instance> or --all",
           warnings: [],
           data: {}
         };
@@ -3253,41 +4540,268 @@ async function bridgeCommand(args) {
   }
 }
 
+// src/engine/dashboard.ts
+import * as fs15 from "fs";
+import * as path15 from "path";
+import { execSync as execSync4 } from "child_process";
+function collectAgents(commsDir) {
+  const heartbeatsPath = path15.join(commsDir, "heartbeats.json");
+  if (!fs15.existsSync(heartbeatsPath)) return [];
+  try {
+    const raw = fs15.readFileSync(heartbeatsPath, "utf-8");
+    const data = JSON.parse(raw);
+    return Object.entries(data).map(([name, info]) => ({
+      name: info.agent ?? name,
+      status: info.status ?? null,
+      lastActivity: info.lastActivity ?? info.timestamp ?? null,
+      joinedAt: info.joinedAt ?? null
+    }));
+  } catch {
+    return [];
+  }
+}
+function collectBridges(repoRoot) {
+  const state = loadState(repoRoot);
+  const { config } = resolveConfig({}, repoRoot);
+  const stateDir = config.stateDir;
+  const bridges = [];
+  if (state) {
+    for (const [id, inst] of Object.entries(state.instances)) {
+      if (!inst?.installed) continue;
+      if (inst.bridgeMode !== "app-server") continue;
+      const instanceId = id;
+      const status = getBridgeStatus(stateDir, instanceId);
+      const bridgeState = loadBridgeState(stateDir, instanceId);
+      const age = getHeartbeatAge(stateDir, instanceId);
+      bridges.push({
+        instanceId: id,
+        runtime: inst.runtime,
+        status,
+        pid: bridgeState?.pid ?? null,
+        port: inst.port ?? null,
+        heartbeatAge: age,
+        headless: inst.headless?.enabled ?? false
+      });
+    }
+  }
+  const tmpDir = path15.join(repoRoot, ".tmp");
+  if (fs15.existsSync(tmpDir)) {
+    try {
+      const dirs = fs15.readdirSync(tmpDir).filter((d) => d.startsWith("codex-app-server-bridge"));
+      for (const dir of dirs) {
+        const daemonPath = path15.join(tmpDir, dir, "bridge-daemon.json");
+        if (!fs15.existsSync(daemonPath)) continue;
+        try {
+          const raw = fs15.readFileSync(daemonPath, "utf-8");
+          const daemon = JSON.parse(raw);
+          const alreadyCovered = bridges.some(
+            (b) => b.pid === daemon.pid && b.pid !== null
+          );
+          if (alreadyCovered) continue;
+          const agentFile = path15.join(tmpDir, dir, "agent-name.txt");
+          const agentName = fs15.existsSync(agentFile) ? fs15.readFileSync(agentFile, "utf-8").trim() : dir;
+          const running = daemon.pid ? isProcessAlive(daemon.pid) : false;
+          const portMatch = daemon.appServerUrl?.match(/:(\d+)/);
+          const port = portMatch ? parseInt(portMatch[1], 10) : null;
+          bridges.push({
+            instanceId: agentName,
+            runtime: "codex",
+            status: running ? "running" : "stale",
+            pid: daemon.pid ?? null,
+            port,
+            heartbeatAge: null,
+            headless: false
+          });
+        } catch {
+        }
+      }
+    } catch {
+    }
+  }
+  return bridges;
+}
+function collectPRs() {
+  try {
+    const output = execSync4(
+      "gh pr list --state all --limit 10 --json number,title,author,state,url",
+      { encoding: "utf-8", timeout: 1e4, stdio: ["pipe", "pipe", "pipe"] }
+    );
+    const prs = JSON.parse(output);
+    return prs.map((pr) => ({
+      number: pr.number,
+      title: pr.title,
+      author: pr.author.login,
+      state: pr.state,
+      url: pr.url
+    }));
+  } catch {
+    return [];
+  }
+}
+function collectWarnings(bridges, agents) {
+  const warnings = [];
+  for (const bridge of bridges) {
+    if (bridge.status === "stale") {
+      warnings.push({
+        level: "warn",
+        message: `Bridge ${bridge.instanceId} is stale (PID ${bridge.pid} dead)`
+      });
+    }
+    if (bridge.status === "running" && bridge.heartbeatAge !== null && bridge.heartbeatAge > 60) {
+      warnings.push({
+        level: "warn",
+        message: `Bridge ${bridge.instanceId} heartbeat stale (${bridge.heartbeatAge}s ago)`
+      });
+    }
+  }
+  if (bridges.length === 0) {
+    warnings.push({
+      level: "warn",
+      message: "No bridges configured"
+    });
+  }
+  if (agents.length === 0) {
+    warnings.push({
+      level: "warn",
+      message: "No agent heartbeats found"
+    });
+  }
+  return warnings;
+}
+function collectDashboardSnapshot(repoRoot, commsDirOverride) {
+  const { config } = resolveConfig(
+    commsDirOverride ? { commsDir: commsDirOverride } : {},
+    repoRoot
+  );
+  const resolved = config;
+  const agents = collectAgents(resolved.commsDir);
+  const bridges = collectBridges(resolved.repoRoot);
+  const prs = collectPRs();
+  const warnings = collectWarnings(bridges, agents);
+  return {
+    generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    repoRoot: resolved.repoRoot,
+    commsDir: resolved.commsDir,
+    agents,
+    bridges,
+    prs,
+    warnings
+  };
+}
+
+// src/commands/up.ts
+var UP_HELP = `
+Usage:
+  tap-comms up [bridge-start options]
+
+Description:
+  Start all registered app-server bridge daemons with one command.
+  This is the orchestration entrypoint for headless/background TAP operation.
+
+Examples:
+  npx @hua-labs/tap up
+  npx @hua-labs/tap up --no-auth
+  npx @hua-labs/tap up --busy-mode wait
+`.trim();
+async function upCommand(args) {
+  if (args.includes("--help") || args.includes("-h")) {
+    log(UP_HELP);
+    return {
+      ok: true,
+      command: "up",
+      code: "TAP_NO_OP",
+      message: UP_HELP,
+      warnings: [],
+      data: {}
+    };
+  }
+  const repoRoot = findRepoRoot();
+  const result = await bridgeCommand(["start", "--all", ...args]);
+  const snapshot = collectDashboardSnapshot(repoRoot);
+  const activeBridges = snapshot.bridges.filter(
+    (bridge) => bridge.status === "running"
+  ).length;
+  if (!result.ok) {
+    return {
+      ...result,
+      command: "up",
+      data: {
+        ...result.data,
+        snapshot
+      }
+    };
+  }
+  return {
+    ok: true,
+    command: "up",
+    code: "TAP_UP_OK",
+    message: `tap up: ${activeBridges} bridge(s) running`,
+    warnings: result.warnings,
+    data: {
+      ...result.data,
+      snapshot
+    }
+  };
+}
+
+// src/commands/down.ts
+var DOWN_HELP = `
+Usage:
+  tap-comms down
+
+Description:
+  Stop all running bridge daemons and managed app-servers.
+
+Examples:
+  npx @hua-labs/tap down
+`.trim();
+async function downCommand(args) {
+  if (args.includes("--help") || args.includes("-h")) {
+    log(DOWN_HELP);
+    return {
+      ok: true,
+      command: "down",
+      code: "TAP_NO_OP",
+      message: DOWN_HELP,
+      warnings: [],
+      data: {}
+    };
+  }
+  const repoRoot = findRepoRoot();
+  const result = await bridgeCommand(["stop"]);
+  const snapshot = collectDashboardSnapshot(repoRoot);
+  if (!result.ok) {
+    return {
+      ...result,
+      command: "down",
+      data: {
+        ...result.data,
+        snapshot
+      }
+    };
+  }
+  return {
+    ok: true,
+    command: "down",
+    code: "TAP_DOWN_OK",
+    message: `tap down: ${snapshot.bridges.filter((bridge) => bridge.status === "running").length} bridge(s) still running`,
+    warnings: result.warnings,
+    data: {
+      ...result.data,
+      snapshot
+    }
+  };
+}
+
 // src/commands/serve.ts
-import * as fs14 from "fs";
-import * as path14 from "path";
-import { execSync as execSync4, spawn as spawn2 } from "child_process";
-function findServerEntry(repoRoot) {
-  const candidates = [
-    path14.join(repoRoot, "packages", "tap-plugin", "channels", "tap-comms.ts"),
-    path14.join(
-      repoRoot,
-      "node_modules",
-      "@hua-labs",
-      "tap-plugin",
-      "channels",
-      "tap-comms.ts"
-    )
-  ];
-  for (const p of candidates) {
-    if (fs14.existsSync(p)) return p;
-  }
-  return null;
-}
-function isBunInstalled() {
-  try {
-    execSync4("bun --version", { stdio: "pipe" });
-    return true;
-  } catch {
-    return false;
-  }
-}
+import * as path16 from "path";
+import { spawn as spawn2 } from "child_process";
 async function serveCommand(args) {
-  const repoRoot = findRepoRoot2();
+  const repoRoot = findRepoRoot();
   let commsDir;
   const commsDirIdx = args.indexOf("--comms-dir");
   if (commsDirIdx !== -1 && args[commsDirIdx + 1]) {
-    commsDir = path14.resolve(args[commsDirIdx + 1]);
+    commsDir = path16.resolve(args[commsDirIdx + 1]);
   }
   if (!commsDir && process.env.TAP_COMMS_DIR) {
     commsDir = process.env.TAP_COMMS_DIR;
@@ -3308,37 +4822,29 @@ async function serveCommand(args) {
       data: {}
     };
   }
-  if (!isBunInstalled()) {
-    return {
-      ok: false,
-      command: "serve",
-      code: "TAP_SERVE_BUN_REQUIRED",
-      message: "bun is required to run the tap-comms MCP server. Install: https://bun.sh",
-      warnings: [],
-      data: {}
-    };
-  }
-  const serverEntry = findServerEntry(repoRoot);
-  if (!serverEntry) {
+  const ctx = createAdapterContext(commsDir, repoRoot);
+  const managed = buildManagedMcpServerSpec(ctx);
+  if (!managed.command || !managed.sourcePath) {
+    const fallbackMessage = managed.issues[0] ?? "tap-comms MCP server not found. Reinstall @hua-labs/tap or run from a repo with packages/tap-plugin/channels/.";
     return {
       ok: false,
       command: "serve",
-      code: "TAP_SERVE_NO_SERVER",
-      message: "tap-comms MCP server not found. Run from a repo with packages/tap-plugin/channels/.",
+      code: managed.sourcePath ? "TAP_SERVE_BUN_REQUIRED" : "TAP_SERVE_NO_SERVER",
+      message: fallbackMessage,
       warnings: [],
       data: {}
     };
   }
-  const child = spawn2("bun", [serverEntry], {
+  const child = spawn2(managed.command, managed.args, {
     stdio: "inherit",
     env: {
       ...process.env,
       TAP_COMMS_DIR: commsDir
     }
   });
-  return new Promise((resolve10) => {
+  return new Promise((resolve11) => {
     child.on("error", (err) => {
-      resolve10({
+      resolve11({
         ok: false,
         command: "serve",
         code: "TAP_INTERNAL_ERROR",
@@ -3348,7 +4854,7 @@ async function serveCommand(args) {
       });
     });
     child.on("exit", (code) => {
-      resolve10({
+      resolve11({
         ok: code === 0,
         command: "serve",
         code: code === 0 ? "TAP_SERVE_OK" : "TAP_INTERNAL_ERROR",
@@ -3361,8 +4867,8 @@ async function serveCommand(args) {
 }
 
 // src/commands/init-worktree.ts
-import * as fs15 from "fs";
-import * as path15 from "path";
+import * as fs16 from "fs";
+import * as path17 from "path";
 import { execSync as execSync5 } from "child_process";
 var INIT_WORKTREE_HELP = `
 Usage:
@@ -3399,7 +4905,7 @@ function run(cmd, opts) {
   }
 }
 function toAbsolute(p) {
-  const resolved = path15.resolve(p);
+  const resolved = path17.resolve(p);
   return resolved.replace(/\\/g, "/");
 }
 function probeBun(candidate) {
@@ -3430,18 +4936,18 @@ function findBun() {
     }
   }
   const home = process.env.HOME || process.env.USERPROFILE || "";
-  const bunHome = path15.join(
+  const bunHome = path17.join(
     home,
     ".bun",
     "bin",
     process.platform === "win32" ? "bun.exe" : "bun"
   );
-  if (fs15.existsSync(bunHome) && probeBun(bunHome)) return bunHome;
+  if (fs16.existsSync(bunHome) && probeBun(bunHome)) return bunHome;
   return null;
 }
 function step1CreateWorktree(opts) {
   log("Step 1/9: Creating worktree...");
-  if (fs15.existsSync(opts.worktreePath)) {
+  if (fs16.existsSync(opts.worktreePath)) {
     logWarn(`Directory already exists: ${opts.worktreePath}`);
     try {
       run("git rev-parse --git-dir", { cwd: opts.worktreePath });
@@ -3503,22 +5009,22 @@ function step2MergeMain(opts, warnings) {
 }
 function step3CopyPermissions(opts, warnings) {
   log("Step 3/9: Copying permissions...");
-  const srcSettings = path15.join(
+  const srcSettings = path17.join(
     opts.repoRoot,
     ".claude",
     "settings.local.json"
   );
-  const destDir = path15.join(opts.worktreePath, ".claude");
-  const destSettings = path15.join(destDir, "settings.local.json");
-  if (!fs15.existsSync(srcSettings)) {
+  const destDir = path17.join(opts.worktreePath, ".claude");
+  const destSettings = path17.join(destDir, "settings.local.json");
+  if (!fs16.existsSync(srcSettings)) {
     warn(
       warnings,
       "No .claude/settings.local.json found in main repo. Skipping."
     );
     return;
   }
-  fs15.mkdirSync(destDir, { recursive: true });
-  fs15.copyFileSync(srcSettings, destSettings);
+  fs16.mkdirSync(destDir, { recursive: true });
+  fs16.copyFileSync(srcSettings, destSettings);
   logSuccess("Copied settings.local.json");
   try {
     run("git update-index --skip-worktree .claude/settings.local.json", {
@@ -3543,7 +5049,7 @@ function step4GenerateMcpJson(opts, warnings) {
   const wtAbs = toAbsolute(opts.worktreePath);
   const bunAbs = toAbsolute(bunPath);
   const commsAbs = toAbsolute(opts.commsDir);
-  const channelEntry = path15.join(
+  const channelEntry = path17.join(
     wtAbs,
     "packages/tap-plugin/channels/tap-comms.ts"
   );
@@ -3560,8 +5066,8 @@ function step4GenerateMcpJson(opts, warnings) {
       }
     }
   };
-  const mcpPath = path15.join(opts.worktreePath, ".mcp.json");
-  fs15.writeFileSync(mcpPath, JSON.stringify(mcpConfig, null, 2) + "\n", "utf-8");
+  const mcpPath = path17.join(opts.worktreePath, ".mcp.json");
+  fs16.writeFileSync(mcpPath, JSON.stringify(mcpConfig, null, 2) + "\n", "utf-8");
   logSuccess(`.mcp.json generated (absolute paths + cwd)`);
   log(`  bun: ${bunAbs}`);
   log(`  comms: ${commsAbs}`);
@@ -3599,275 +5105,126 @@ function step6BuildEslintPlugin(opts, warnings) {
 }
 function step7VerifyComms(opts, warnings) {
   log("Step 7/9: Verifying comms directory...");
-  if (!fs15.existsSync(opts.commsDir)) {
+  if (!fs16.existsSync(opts.commsDir)) {
     warn(warnings, `Comms directory not found: ${opts.commsDir}`);
-    warn(warnings, "Create it or run: npx @hua-labs/tap init");
-    return;
-  }
-  const requiredDirs = ["inbox", "findings", "reviews", "letters"];
-  for (const dir of requiredDirs) {
-    const dirPath = path15.join(opts.commsDir, dir);
-    if (!fs15.existsSync(dirPath)) {
-      fs15.mkdirSync(dirPath, { recursive: true });
-      logSuccess(`Created ${dir}/`);
-    }
-  }
-  logSuccess(`Comms verified: ${opts.commsDir}`);
-}
-function step8VerifyBun(warnings) {
-  log("Step 8/9: Verifying bun...");
-  const bunPath = findBun();
-  if (!bunPath) {
-    warn(warnings, "bun not found in PATH.");
-    warn(warnings, "Install: curl -fsSL https://bun.sh/install | bash");
-    return;
-  }
-  try {
-    const version2 = run(`"${bunPath}" --version`);
-    logSuccess(`bun ${version2} found: ${bunPath}`);
-  } catch {
-    warn(warnings, "bun found but version check failed.");
-  }
-}
-function step9Ready(opts) {
-  logHeader("Ready!");
-  log(`Worktree: ${toAbsolute(opts.worktreePath)}`);
-  log(`Branch:   ${opts.branch}`);
-  log(`Comms:    ${toAbsolute(opts.commsDir)}`);
-  if (opts.mission) log(`Mission:  ${opts.mission}`);
-  log("");
-  log("Next steps:");
-  log(`  cd ${opts.worktreePath}`);
-  log("  claude  # Start Claude Code session");
-  log("");
-}
-async function initWorktreeCommand(args) {
-  const { flags } = parseArgs(args);
-  if (flags["help"] === true || flags["h"] === true) {
-    log(INIT_WORKTREE_HELP);
-    return {
-      ok: true,
-      command: "init-worktree",
-      code: "TAP_NO_OP",
-      message: "init-worktree help",
-      warnings: [],
-      data: {}
-    };
-  }
-  const worktreePath = typeof flags["path"] === "string" ? flags["path"] : void 0;
-  if (!worktreePath) {
-    return {
-      ok: false,
-      command: "init-worktree",
-      code: "TAP_INVALID_ARGUMENT",
-      message: "Missing --path. Usage: npx @hua-labs/tap init-worktree --path ../hua-wt-3",
-      warnings: [],
-      data: {}
-    };
-  }
-  const repoRoot = findRepoRoot2();
-  const { config } = resolveConfig({}, repoRoot);
-  const branch = typeof flags["branch"] === "string" ? flags["branch"] : path15.basename(path15.resolve(worktreePath));
-  const base = typeof flags["base"] === "string" ? flags["base"] : "origin/main";
-  const mission = typeof flags["mission"] === "string" ? flags["mission"] : void 0;
-  const commsDir = typeof flags["comms-dir"] === "string" ? flags["comms-dir"] : config.commsDir;
-  const skipInstall = flags["skip-install"] === true;
-  const opts = {
-    worktreePath: path15.resolve(worktreePath),
-    branch,
-    base,
-    mission,
-    commsDir: path15.resolve(commsDir),
-    skipInstall,
-    repoRoot
-  };
-  logHeader(`@hua-labs/tap init-worktree`);
-  log(`Path:     ${opts.worktreePath}`);
-  log(`Branch:   ${opts.branch}`);
-  log(`Base:     ${opts.base}`);
-  log(`Comms:    ${opts.commsDir}`);
-  if (mission) log(`Mission:  ${mission}`);
-  log("");
-  const warnings = [];
-  const created = step1CreateWorktree(opts);
-  if (!created) {
-    return {
-      ok: false,
-      command: "init-worktree",
-      code: "TAP_PATCH_FAILED",
-      message: "Failed to create worktree.",
-      warnings,
-      data: {}
-    };
-  }
-  step2MergeMain(opts, warnings);
-  step3CopyPermissions(opts, warnings);
-  step4GenerateMcpJson(opts, warnings);
-  step5Install(opts, warnings);
-  step6BuildEslintPlugin(opts, warnings);
-  step7VerifyComms(opts, warnings);
-  step8VerifyBun(warnings);
-  step9Ready(opts);
-  return {
-    ok: true,
-    command: "init-worktree",
-    code: "TAP_INIT_OK",
-    message: `Worktree initialized: ${opts.worktreePath}`,
-    warnings,
-    data: {
-      path: opts.worktreePath,
-      branch: opts.branch,
-      commsDir: opts.commsDir
-    }
-  };
-}
-
-// src/engine/dashboard.ts
-import * as fs16 from "fs";
-import * as path16 from "path";
-import { execSync as execSync6 } from "child_process";
-function collectAgents(commsDir) {
-  const heartbeatsPath = path16.join(commsDir, "heartbeats.json");
-  if (!fs16.existsSync(heartbeatsPath)) return [];
-  try {
-    const raw = fs16.readFileSync(heartbeatsPath, "utf-8");
-    const data = JSON.parse(raw);
-    return Object.entries(data).map(([name, info]) => ({
-      name: info.agent ?? name,
-      status: info.status ?? null,
-      lastActivity: info.lastActivity ?? info.timestamp ?? null,
-      joinedAt: info.joinedAt ?? null
-    }));
-  } catch {
-    return [];
-  }
-}
-function collectBridges(repoRoot) {
-  const state = loadState(repoRoot);
-  const { config } = resolveConfig({}, repoRoot);
-  const stateDir = config.stateDir;
-  const bridges = [];
-  if (state) {
-    for (const [id, inst] of Object.entries(state.instances)) {
-      if (!inst?.installed) continue;
-      if (inst.bridgeMode !== "app-server") continue;
-      const instanceId = id;
-      const status = getBridgeStatus(stateDir, instanceId);
-      const bridgeState = loadBridgeState(stateDir, instanceId);
-      const age = getHeartbeatAge(stateDir, instanceId);
-      bridges.push({
-        instanceId: id,
-        runtime: inst.runtime,
-        status,
-        pid: bridgeState?.pid ?? null,
-        port: inst.port ?? null,
-        heartbeatAge: age,
-        headless: inst.headless?.enabled ?? false
-      });
-    }
-  }
-  const tmpDir = path16.join(repoRoot, ".tmp");
-  if (fs16.existsSync(tmpDir)) {
-    try {
-      const dirs = fs16.readdirSync(tmpDir).filter((d) => d.startsWith("codex-app-server-bridge"));
-      for (const dir of dirs) {
-        const daemonPath = path16.join(tmpDir, dir, "bridge-daemon.json");
-        if (!fs16.existsSync(daemonPath)) continue;
-        try {
-          const raw = fs16.readFileSync(daemonPath, "utf-8");
-          const daemon = JSON.parse(raw);
-          const alreadyCovered = bridges.some(
-            (b) => b.pid === daemon.pid && b.pid !== null
-          );
-          if (alreadyCovered) continue;
-          const agentFile = path16.join(tmpDir, dir, "agent-name.txt");
-          const agentName = fs16.existsSync(agentFile) ? fs16.readFileSync(agentFile, "utf-8").trim() : dir;
-          const running = daemon.pid ? isProcessAlive(daemon.pid) : false;
-          const portMatch = daemon.appServerUrl?.match(/:(\d+)/);
-          const port = portMatch ? parseInt(portMatch[1], 10) : null;
-          bridges.push({
-            instanceId: agentName,
-            runtime: "codex",
-            status: running ? "running" : "stale",
-            pid: daemon.pid ?? null,
-            port,
-            heartbeatAge: null,
-            headless: false
-          });
-        } catch {
-        }
-      }
-    } catch {
-    }
-  }
-  return bridges;
-}
-function collectPRs() {
-  try {
-    const output = execSync6(
-      "gh pr list --state all --limit 10 --json number,title,author,state,url",
-      { encoding: "utf-8", timeout: 1e4, stdio: ["pipe", "pipe", "pipe"] }
-    );
-    const prs = JSON.parse(output);
-    return prs.map((pr) => ({
-      number: pr.number,
-      title: pr.title,
-      author: pr.author.login,
-      state: pr.state,
-      url: pr.url
-    }));
-  } catch {
-    return [];
-  }
-}
-function collectWarnings(bridges, agents) {
-  const warnings = [];
-  for (const bridge of bridges) {
-    if (bridge.status === "stale") {
-      warnings.push({
-        level: "warn",
-        message: `Bridge ${bridge.instanceId} is stale (PID ${bridge.pid} dead)`
-      });
-    }
-    if (bridge.status === "running" && bridge.heartbeatAge !== null && bridge.heartbeatAge > 60) {
-      warnings.push({
-        level: "warn",
-        message: `Bridge ${bridge.instanceId} heartbeat stale (${bridge.heartbeatAge}s ago)`
-      });
+    warn(warnings, "Create it or run: npx @hua-labs/tap init");
+    return;
+  }
+  const requiredDirs = ["inbox", "findings", "reviews", "letters"];
+  for (const dir of requiredDirs) {
+    const dirPath = path17.join(opts.commsDir, dir);
+    if (!fs16.existsSync(dirPath)) {
+      fs16.mkdirSync(dirPath, { recursive: true });
+      logSuccess(`Created ${dir}/`);
     }
   }
-  if (bridges.length === 0) {
-    warnings.push({
-      level: "warn",
-      message: "No bridges configured"
-    });
+  logSuccess(`Comms verified: ${opts.commsDir}`);
+}
+function step8VerifyBun(warnings) {
+  log("Step 8/9: Verifying bun...");
+  const bunPath = findBun();
+  if (!bunPath) {
+    warn(warnings, "bun not found in PATH.");
+    warn(warnings, "Install: curl -fsSL https://bun.sh/install | bash");
+    return;
   }
-  if (agents.length === 0) {
-    warnings.push({
-      level: "warn",
-      message: "No agent heartbeats found"
-    });
+  try {
+    const version2 = run(`"${bunPath}" --version`);
+    logSuccess(`bun ${version2} found: ${bunPath}`);
+  } catch {
+    warn(warnings, "bun found but version check failed.");
   }
-  return warnings;
 }
-function collectDashboardSnapshot(repoRoot, commsDirOverride) {
-  const { config } = resolveConfig(
-    commsDirOverride ? { commsDir: commsDirOverride } : {},
+function step9Ready(opts) {
+  logHeader("Ready!");
+  log(`Worktree: ${toAbsolute(opts.worktreePath)}`);
+  log(`Branch:   ${opts.branch}`);
+  log(`Comms:    ${toAbsolute(opts.commsDir)}`);
+  if (opts.mission) log(`Mission:  ${opts.mission}`);
+  log("");
+  log("Next steps:");
+  log(`  cd ${opts.worktreePath}`);
+  log("  claude  # Start Claude Code session");
+  log("");
+}
+async function initWorktreeCommand(args) {
+  const { flags } = parseArgs(args);
+  if (flags["help"] === true || flags["h"] === true) {
+    log(INIT_WORKTREE_HELP);
+    return {
+      ok: true,
+      command: "init-worktree",
+      code: "TAP_NO_OP",
+      message: "init-worktree help",
+      warnings: [],
+      data: {}
+    };
+  }
+  const worktreePath = typeof flags["path"] === "string" ? flags["path"] : void 0;
+  if (!worktreePath) {
+    return {
+      ok: false,
+      command: "init-worktree",
+      code: "TAP_INVALID_ARGUMENT",
+      message: "Missing --path. Usage: npx @hua-labs/tap init-worktree --path ../hua-wt-3",
+      warnings: [],
+      data: {}
+    };
+  }
+  const repoRoot = findRepoRoot();
+  const { config } = resolveConfig({}, repoRoot);
+  const branch = typeof flags["branch"] === "string" ? flags["branch"] : path17.basename(path17.resolve(worktreePath));
+  const base = typeof flags["base"] === "string" ? flags["base"] : "origin/main";
+  const mission = typeof flags["mission"] === "string" ? flags["mission"] : void 0;
+  const commsDir = typeof flags["comms-dir"] === "string" ? flags["comms-dir"] : config.commsDir;
+  const skipInstall = flags["skip-install"] === true;
+  const opts = {
+    worktreePath: path17.resolve(worktreePath),
+    branch,
+    base,
+    mission,
+    commsDir: path17.resolve(commsDir),
+    skipInstall,
     repoRoot
-  );
-  const resolved = config;
-  const agents = collectAgents(resolved.commsDir);
-  const bridges = collectBridges(resolved.repoRoot);
-  const prs = collectPRs();
-  const warnings = collectWarnings(bridges, agents);
+  };
+  logHeader(`@hua-labs/tap init-worktree`);
+  log(`Path:     ${opts.worktreePath}`);
+  log(`Branch:   ${opts.branch}`);
+  log(`Base:     ${opts.base}`);
+  log(`Comms:    ${opts.commsDir}`);
+  if (mission) log(`Mission:  ${mission}`);
+  log("");
+  const warnings = [];
+  const created = step1CreateWorktree(opts);
+  if (!created) {
+    return {
+      ok: false,
+      command: "init-worktree",
+      code: "TAP_PATCH_FAILED",
+      message: "Failed to create worktree.",
+      warnings,
+      data: {}
+    };
+  }
+  step2MergeMain(opts, warnings);
+  step3CopyPermissions(opts, warnings);
+  step4GenerateMcpJson(opts, warnings);
+  step5Install(opts, warnings);
+  step6BuildEslintPlugin(opts, warnings);
+  step7VerifyComms(opts, warnings);
+  step8VerifyBun(warnings);
+  step9Ready(opts);
   return {
-    generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-    repoRoot: resolved.repoRoot,
-    commsDir: resolved.commsDir,
-    agents,
-    bridges,
-    prs,
-    warnings
+    ok: true,
+    command: "init-worktree",
+    code: "TAP_INIT_OK",
+    message: `Worktree initialized: ${opts.worktreePath}`,
+    warnings,
+    data: {
+      path: opts.worktreePath,
+      branch: opts.branch,
+      commsDir: opts.commsDir
+    }
   };
 }
 
@@ -3967,7 +5324,7 @@ async function dashboardCommand(args) {
   const intervalStr = typeof flags["interval"] === "string" ? flags["interval"] : "5";
   const intervalSeconds = Math.max(2, parseInt(intervalStr, 10) || 5);
   const commsDirOverride = typeof flags["comms-dir"] === "string" ? flags["comms-dir"] : void 0;
-  const repoRoot = findRepoRoot2();
+  const repoRoot = findRepoRoot();
   if (watchMode) {
     const run2 = () => {
       const snapshot2 = collectDashboardSnapshot(repoRoot, commsDirOverride);
@@ -4015,6 +5372,371 @@ async function dashboardCommand(args) {
   };
 }
 
+// src/commands/doctor.ts
+import {
+  existsSync as existsSync16,
+  mkdirSync as mkdirSync10,
+  readdirSync as readdirSync3,
+  readFileSync as readFileSync14,
+  statSync as statSync2,
+  unlinkSync as unlinkSync3
+} from "fs";
+import { join as join17 } from "path";
+var PASS = "pass";
+var WARN = "warn";
+var FAIL = "fail";
+function countFiles(dir, ext = ".md") {
+  if (!existsSync16(dir)) return 0;
+  try {
+    return readdirSync3(dir).filter((f) => f.endsWith(ext)).length;
+  } catch {
+    return 0;
+  }
+}
+function recentFileCount(dir, withinMs) {
+  if (!existsSync16(dir)) return 0;
+  const cutoff = Date.now() - withinMs;
+  let count = 0;
+  try {
+    for (const f of readdirSync3(dir)) {
+      if (!f.endsWith(".md")) continue;
+      try {
+        if (statSync2(join17(dir, f)).mtimeMs > cutoff) count++;
+      } catch {
+      }
+    }
+  } catch {
+  }
+  return count;
+}
+function checkComms(commsDir) {
+  const checks = [];
+  checks.push({
+    name: "comms directory",
+    status: existsSync16(commsDir) ? PASS : FAIL,
+    message: existsSync16(commsDir) ? commsDir : `Not found: ${commsDir}`,
+    fix: existsSync16(commsDir) ? void 0 : () => {
+      mkdirSync10(commsDir, { recursive: true });
+      return `Created ${commsDir}`;
+    }
+  });
+  for (const [subdir, required] of [
+    ["inbox", true],
+    ["reviews", false],
+    ["findings", false]
+  ]) {
+    const dir = join17(commsDir, subdir);
+    const exists = existsSync16(dir);
+    checks.push({
+      name: `${subdir} directory`,
+      status: exists ? PASS : required ? FAIL : WARN,
+      message: exists ? subdir === "findings" ? `${countFiles(dir)} findings` : subdir === "inbox" ? `${countFiles(dir)} messages` : "exists" : `Missing${required ? "" : " (optional)"}`,
+      fix: exists ? void 0 : () => {
+        mkdirSync10(dir, { recursive: true });
+        return `Created ${dir}`;
+      }
+    });
+  }
+  const heartbeats = join17(commsDir, "heartbeats.json");
+  if (existsSync16(heartbeats)) {
+    try {
+      const store = JSON.parse(readFileSync14(heartbeats, "utf-8"));
+      const agents = Object.keys(store);
+      const now = Date.now();
+      const active = agents.filter((a) => {
+        const ts = store[a]?.lastActivity;
+        return ts && now - new Date(ts).getTime() < 10 * 60 * 1e3;
+      });
+      checks.push({
+        name: "heartbeats",
+        status: active.length > 0 ? PASS : WARN,
+        message: `${active.length} active / ${agents.length} total`
+      });
+    } catch {
+      checks.push({
+        name: "heartbeats",
+        status: WARN,
+        message: "File exists but unreadable"
+      });
+    }
+  } else {
+    checks.push({
+      name: "heartbeats",
+      status: WARN,
+      message: "No heartbeats file"
+    });
+  }
+  return checks;
+}
+function checkInstances(repoRoot, stateDir) {
+  const checks = [];
+  const state = loadState(repoRoot);
+  if (!state) {
+    checks.push({
+      name: "tap state",
+      status: FAIL,
+      message: "Not initialized. Run: tap init"
+    });
+    return checks;
+  }
+  checks.push({
+    name: "tap state",
+    status: PASS,
+    message: `v${state.schemaVersion}, ${getInstalledInstances(state).length} instance(s)`
+  });
+  const installed = getInstalledInstances(state);
+  for (const id of installed) {
+    const inst = state.instances[id];
+    if (!inst) continue;
+    if (inst.bridgeMode === "app-server") {
+      const running = isBridgeRunning(stateDir, id);
+      const bridgeState = loadBridgeState(stateDir, id);
+      const heartbeatAge = getHeartbeatAge(stateDir, id);
+      let status;
+      let message;
+      let fix;
+      if (running && bridgeState) {
+        if (heartbeatAge !== null && heartbeatAge > 120) {
+          status = WARN;
+          message = `PID ${bridgeState.pid} alive but heartbeat stale (${Math.round(heartbeatAge)}s ago)`;
+        } else {
+          status = PASS;
+          message = `PID ${bridgeState.pid}, port ${inst.port ?? "auto"}`;
+        }
+      } else if (bridgeState && !running) {
+        status = WARN;
+        message = `Stale PID ${bridgeState.pid} (process dead)`;
+        fix = () => {
+          const appServer = bridgeState.appServer;
+          if (appServer?.managed) {
+            for (const pid of [appServer.auth?.gatewayPid, appServer.pid]) {
+              if (pid) {
+                try {
+                  process.kill(pid);
+                } catch {
+                }
+              }
+            }
+          }
+          const pidPath = join17(stateDir, "pids", `bridge-${id}.json`);
+          try {
+            unlinkSync3(pidPath);
+          } catch {
+          }
+          const currentState = loadState(repoRoot);
+          if (currentState?.instances[id]) {
+            currentState.instances[id].bridge = null;
+            currentState.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+            saveState(repoRoot, currentState);
+          }
+          return `Cleaned stale bridge + managed processes for ${id}`;
+        };
+      } else {
+        status = WARN;
+        message = "Not running";
+      }
+      checks.push({ name: `bridge: ${id}`, status, message, fix });
+    } else {
+      checks.push({
+        name: `instance: ${id}`,
+        status: PASS,
+        message: `${inst.runtime} (${inst.bridgeMode})`
+      });
+    }
+  }
+  return checks;
+}
+function checkMessageLifecycle(commsDir) {
+  const checks = [];
+  const inbox = join17(commsDir, "inbox");
+  if (!existsSync16(inbox)) {
+    checks.push({
+      name: "message flow",
+      status: FAIL,
+      message: "No inbox"
+    });
+    return checks;
+  }
+  const total = countFiles(inbox);
+  const recent1h = recentFileCount(inbox, 60 * 60 * 1e3);
+  const recent10m = recentFileCount(inbox, 10 * 60 * 1e3);
+  checks.push({
+    name: "message flow",
+    status: recent10m > 0 ? PASS : total > 0 ? WARN : FAIL,
+    message: `${total} total, ${recent1h} in last 1h, ${recent10m} in last 10m`
+  });
+  const receiptsPath = join17(commsDir, "receipts", "receipts.json");
+  if (existsSync16(receiptsPath)) {
+    try {
+      const receipts = JSON.parse(readFileSync14(receiptsPath, "utf-8"));
+      const receiptCount = Object.keys(receipts).length;
+      checks.push({
+        name: "read receipts",
+        status: PASS,
+        message: `${receiptCount} receipts tracked`
+      });
+    } catch {
+      checks.push({
+        name: "read receipts",
+        status: WARN,
+        message: "File exists but unreadable"
+      });
+    }
+  }
+  return checks;
+}
+function checkMcpServer(repoRoot) {
+  const checks = [];
+  const mcpJson = join17(repoRoot, ".mcp.json");
+  if (existsSync16(mcpJson)) {
+    try {
+      const config = JSON.parse(readFileSync14(mcpJson, "utf-8"));
+      const hasTapComms = config?.mcpServers?.["tap-comms"];
+      checks.push({
+        name: "MCP config (.mcp.json)",
+        status: hasTapComms ? PASS : WARN,
+        message: hasTapComms ? `command: ${hasTapComms.command}` : "tap-comms not configured"
+      });
+      if (hasTapComms?.args?.[0]) {
+        const mcpScript = hasTapComms.args[0];
+        checks.push({
+          name: "MCP server script",
+          status: existsSync16(mcpScript) ? PASS : FAIL,
+          message: existsSync16(mcpScript) ? mcpScript : `Not found: ${mcpScript}`
+        });
+      }
+    } catch {
+      checks.push({
+        name: "MCP config (.mcp.json)",
+        status: WARN,
+        message: "File exists but invalid JSON"
+      });
+    }
+  } else {
+    checks.push({
+      name: "MCP config (.mcp.json)",
+      status: WARN,
+      message: "Not found \u2014 MCP channel notifications won't work"
+    });
+  }
+  return checks;
+}
+function renderCheck(check, fixMode) {
+  const icons = {
+    pass: "[OK]",
+    warn: "[!!]",
+    fail: "[XX]",
+    skip: "[--]"
+  };
+  const icon = icons[check.status] || "[??]";
+  const fixable = fixMode && check.fix ? " (fixable)" : "";
+  const msg = check.message ? ` \u2014 ${check.message}${fixable}` : "";
+  return `  ${icon} ${check.name}${msg}`;
+}
+async function doctorCommand(args) {
+  const repoRoot = findRepoRoot();
+  const overrides = {};
+  let fixMode = false;
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === "--comms-dir" && args[i + 1]) {
+      overrides.commsDir = args[i + 1];
+    }
+    if (args[i] === "--fix") {
+      fixMode = true;
+    }
+  }
+  const { config } = resolveConfig(overrides, repoRoot);
+  const state = loadState(repoRoot);
+  const commsDir = overrides.commsDir ? config.commsDir : state?.commsDir ?? config.commsDir;
+  logHeader(`@hua-labs/tap doctor (v${version})${fixMode ? " --fix" : ""}`);
+  function runAllChecks() {
+    const checks = [];
+    checks.push(...checkComms(commsDir));
+    checks.push(...checkInstances(repoRoot, config.stateDir));
+    checks.push(...checkMessageLifecycle(commsDir));
+    checks.push(...checkMcpServer(repoRoot));
+    return checks;
+  }
+  const initialChecks = runAllChecks();
+  for (const section of ["Comms", "Instances", "Messages", "MCP"]) {
+    const sectionChecks = {
+      Comms: initialChecks.filter(
+        (c) => [
+          "comms directory",
+          "inbox directory",
+          "reviews directory",
+          "findings directory",
+          "heartbeats"
+        ].includes(c.name)
+      ),
+      Instances: initialChecks.filter(
+        (c) => c.name.startsWith("bridge:") || c.name.startsWith("instance:") || c.name === "tap state"
+      ),
+      Messages: initialChecks.filter(
+        (c) => ["message flow", "read receipts"].includes(c.name)
+      ),
+      MCP: initialChecks.filter(
+        (c) => c.name.startsWith("MCP") || c.name === "MCP server script"
+      )
+    }[section];
+    if (sectionChecks.length > 0) {
+      log(`${section}:`);
+      for (const c of sectionChecks) log(renderCheck(c, fixMode));
+      log("");
+    }
+  }
+  const fixed = [];
+  let finalChecks = initialChecks;
+  if (fixMode) {
+    const fixable = initialChecks.filter(
+      (c) => (c.status === "warn" || c.status === "fail") && c.fix
+    );
+    if (fixable.length > 0) {
+      log("Fixes:");
+      for (const c of fixable) {
+        try {
+          const desc = c.fix();
+          fixed.push(desc);
+          logSuccess(`  ${desc}`);
+        } catch (err) {
+          logWarn(
+            `  Failed to fix ${c.name}: ${err instanceof Error ? err.message : String(err)}`
+          );
+        }
+      }
+      log("");
+      log("Re-verifying...");
+      finalChecks = runAllChecks();
+      const postFails = finalChecks.filter((c) => c.status === "fail").length;
+      const postWarns = finalChecks.filter((c) => c.status === "warn").length;
+      log(
+        `  ${postFails === 0 ? "All clear" : `${postFails} remaining failures, ${postWarns} warnings`}`
+      );
+    } else {
+      log("Nothing to fix.");
+    }
+  }
+  const passes = finalChecks.filter((c) => c.status === "pass").length;
+  const warns = finalChecks.filter((c) => c.status === "warn").length;
+  const fails = finalChecks.filter((c) => c.status === "fail").length;
+  log("");
+  log(
+    `${finalChecks.length} checks: ${passes} passed, ${warns} warnings, ${fails} failures` + (fixed.length > 0 ? ` (${fixed.length} fixed)` : "")
+  );
+  return {
+    ok: fails === 0,
+    command: "doctor",
+    code: fails === 0 ? "TAP_STATUS_OK" : "TAP_VERIFY_FAILED",
+    message: `${passes} passed, ${warns} warnings, ${fails} failures`,
+    warnings: finalChecks.filter((c) => c.status === "warn").map((c) => `${c.name}: ${c.message}`),
+    data: {
+      checks: finalChecks.map(({ fix, ...rest }) => rest),
+      summary: { total: finalChecks.length, passes, warns, fails },
+      fixed
+    }
+  };
+}
+
 // src/output.ts
 function emitResult(result, jsonMode) {
   if (jsonMode) {
@@ -4053,7 +5775,10 @@ Commands:
   remove <instance>     Remove an instance and rollback config
   status                Show installed instances and bridge status
   bridge <sub> [inst]   Manage bridges (start, stop, status)
+  up                    Start all registered bridge daemons
+  down                  Stop all running bridge daemons
   dashboard             Show unified ops dashboard
+  doctor                Diagnose tap infrastructure health
   serve                 Start tap-comms MCP server (stdio)
   version               Show version
 
@@ -4077,7 +5802,10 @@ function normalizeCommandName(command) {
     case "remove":
     case "status":
     case "bridge":
+    case "up":
+    case "down":
     case "dashboard":
+    case "doctor":
     case "serve":
       return command;
     default:
@@ -4127,9 +5855,18 @@ async function main() {
       case "bridge":
         result = await bridgeCommand(commandArgs);
         break;
+      case "up":
+        result = await upCommand(commandArgs);
+        break;
+      case "down":
+        result = await downCommand(commandArgs);
+        break;
       case "dashboard":
         result = await dashboardCommand(commandArgs);
         break;
+      case "doctor":
+        result = await doctorCommand(commandArgs);
+        break;
       case "serve": {
         const serveResult = await serveCommand(commandArgs);
         if (!serveResult.ok) {