@linzumi/cli 0.0.85-beta → 0.0.87-beta

package/dist/index.js

@@ -39,6 +39,70 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
+// src/onboardingPlaceResponsiveness.ts
+import { Worker } from "node:worker_threads";
+function isPlaceResponsive(path2, deps = {}) {
+  const timeoutMs = deps.timeoutMs ?? defaultPlaceProbeTimeoutMs;
+  if (deps.probe !== void 0) {
+    return deps.probe(path2, timeoutMs);
+  }
+  return statProbe(path2, timeoutMs);
+}
+function statProbe(path2, timeoutMs) {
+  const sharedBuffer = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
+  const status = new Int32Array(sharedBuffer);
+  Atomics.store(status, 0, probeStatusPending);
+  let worker;
+  try {
+    worker = new Worker(probeWorkerSource, {
+      eval: true,
+      workerData: { sharedBuffer, path: path2 }
+    });
+  } catch {
+    return true;
+  }
+  worker.unref();
+  worker.on("error", () => {
+    if (Atomics.load(status, 0) === probeStatusPending) {
+      Atomics.store(status, 0, probeStatusUnresponsive);
+      Atomics.notify(status, 0);
+    }
+  });
+  Atomics.wait(status, 0, probeStatusPending, timeoutMs);
+  const result = Atomics.load(status, 0);
+  void worker.terminate().catch(() => {
+  });
+  return result === probeStatusResponsive;
+}
+var defaultPlaceProbeTimeoutMs, probeStatusPending, probeStatusResponsive, probeStatusUnresponsive, probeWorkerSource;
+var init_onboardingPlaceResponsiveness = __esm({
+  "src/onboardingPlaceResponsiveness.ts"() {
+    "use strict";
+    defaultPlaceProbeTimeoutMs = 1e3;
+    probeStatusPending = 0;
+    probeStatusResponsive = 1;
+    probeStatusUnresponsive = 2;
+    probeWorkerSource = `
+const { workerData, parentPort } = require('node:worker_threads');
+const { statSync } = require('node:fs');
+const status = new Int32Array(workerData.sharedBuffer);
+let result = ${probeStatusUnresponsive};
+try {
+  statSync(workerData.path);
+  result = ${probeStatusResponsive};
+} catch {
+  // A path that throws quickly (ENOENT/EACCES/ENOTDIR) is still a *responsive*
+  // volume - discovery's own existence checks will handle it. Only a wedged
+  // syscall (which never returns here) counts as unresponsive.
+  result = ${probeStatusResponsive};
+}
+Atomics.store(status, 0, result);
+Atomics.notify(status, 0);
+if (parentPort) parentPort.postMessage(result);
+`;
+  }
+});
+
 // src/onboardingProjectDiscovery.ts
 var onboardingProjectDiscovery_exports = {};
 __export(onboardingProjectDiscovery_exports, {
@@ -50,10 +114,12 @@ import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { basename, dirname, join } from "node:path";
 function discoverCurrentGitProject(args) {
   const startedAtMs = args.nowMs ?? Date.now();
+  const responsiveness = args.placeResponsiveness;
   const candidates = /* @__PURE__ */ new Map();
   const searchStats = [];
+  const cwdResponsive = isPlaceResponsive(args.cwd, responsiveness);
   const gitStartedAtMs = Date.now();
-  const topLevel = gitOutput(args.cwd, ["rev-parse", "--show-toplevel"]);
+  const topLevel = cwdResponsive ? gitOutput(args.cwd, ["rev-parse", "--show-toplevel"]) : void 0;
   const gitDurationMs = Date.now() - gitStartedAtMs;
   if (topLevel !== void 0) {
     mergeCandidate(
@@ -65,12 +131,28 @@ function discoverCurrentGitProject(args) {
     place: args.cwd,
     source: "git",
     duration_ms: gitDurationMs,
-    result_count: topLevel === void 0 ? 0 : 1
+    result_count: topLevel === void 0 ? 0 : 1,
+    skipped_unresponsive: cwdResponsive ? void 0 : true
   });
   const sourceRoots = args.sourceRoots ?? defaultLocalProjectSourceRoots(args.cwd);
   let placesSearched = 1;
   for (const sourceRoot of sourceRoots) {
     const sourceRootStartedAtMs = Date.now();
+    const rootResponsive = isPlaceResponsive(sourceRoot, responsiveness);
+    if (!rootResponsive) {
+      searchStats.push({
+        place: sourceRoot,
+        source: "git",
+        duration_ms: Date.now() - sourceRootStartedAtMs,
+        result_count: 0,
+        skipped_unresponsive: true
+      });
+      placesSearched += 1;
+      continue;
+    }
+    if (!isDirectory(sourceRoot)) {
+      continue;
+    }
     const foundInRoot = discoverGitWorktreesInSourceRoot(sourceRoot);
     for (const worktreePath of foundInRoot) {
       mergeCandidate(
@@ -218,7 +300,7 @@ function defaultLocalProjectSourceRoots(cwd) {
     ...ancestorSourceRoots(cwd),
     ...homeSourceRoots(),
     ...externalVolumeSourceRoots()
-  ]).filter(isDirectory);
+  ]);
 }
 function ancestorSourceRoots(cwd) {
   const sourceRootNames = /* @__PURE__ */ new Set([
@@ -331,6 +413,7 @@ var worktreePathSampleLimit, gitSpawnTimeoutMs;
 var init_onboardingProjectDiscovery = __esm({
   "src/onboardingProjectDiscovery.ts"() {
     "use strict";
+    init_onboardingPlaceResponsiveness();
     worktreePathSampleLimit = 25;
     gitSpawnTimeoutMs = 4e3;
   }
@@ -6977,6 +7060,7 @@ function startPortForwardWatcher(options) {
   const scanProcessCwds = options.scanProcessCwds ?? readProcessCwdRows;
   const nowMs = options.nowMs ?? Date.now;
   const commanderBoundPids = validPidSet(options.commanderBoundPids ?? []);
+  const commanderBoundPorts = validPortSet(options.commanderBoundPorts ?? []);
   const candidateStabilityByPort = /* @__PURE__ */ new Map();
   const emittedByPort = /* @__PURE__ */ new Map();
   const missingByPort = /* @__PURE__ */ new Map();
@@ -6990,12 +7074,15 @@ function startPortForwardWatcher(options) {
       const descendants = descendantPidSet(scanProcesses(), rootPid);
       const sockets = scanListenSockets();
       const observedPids = /* @__PURE__ */ new Set([...descendants, ...commanderBoundPids]);
-      const candidatePids = sockets.filter((socket) => observedPids.has(socket.pid)).map((socket) => socket.pid);
+      const candidatePids = sockets.filter(
+        (socket) => observedPids.has(socket.pid) || commanderBoundPorts.has(socket.port)
+      ).map((socket) => socket.pid);
       const candidates = detectedForwardCandidates(
         sockets,
         observedPids,
         scanProcessCwds(candidatePids),
-        commanderBoundPids
+        commanderBoundPids,
+        commanderBoundPorts
       );
       const scanTimeMs = nowMs();
       const stable = stableForwardCandidates(
@@ -7113,10 +7200,12 @@ function descendantPidSet(rows, rootPid) {
   }
   return descendants;
 }
-function detectedForwardCandidates(sockets, descendantPids, processCwds = /* @__PURE__ */ new Map(), commanderBoundPids = /* @__PURE__ */ new Set()) {
-  return sockets.filter((socket) => descendantPids.has(socket.pid)).filter((socket) => socket.port > 0 && socket.port < 65536).sort((left, right) => left.port - right.port).map((socket) => {
+function detectedForwardCandidates(sockets, descendantPids, processCwds = /* @__PURE__ */ new Map(), commanderBoundPids = /* @__PURE__ */ new Set(), commanderBoundPorts = /* @__PURE__ */ new Set()) {
+  return sockets.filter(
+    (socket) => descendantPids.has(socket.pid) || commanderBoundPorts.has(socket.port)
+  ).filter((socket) => socket.port > 0 && socket.port < 65536).sort((left, right) => left.port - right.port).map((socket) => {
     const cwd = processCwds.get(socket.pid);
-    const portKind = commanderBoundPids.size === 0 ? void 0 : commanderBoundPids.has(socket.pid) ? "commander_bound" : "descendant";
+    const portKind = commanderBoundPids.size === 0 && commanderBoundPorts.size === 0 ? void 0 : commanderBoundPids.has(socket.pid) || commanderBoundPorts.has(socket.port) ? "commander_bound" : "descendant";
     return {
       port: socket.port,
       pid: socket.pid,
@@ -7129,6 +7218,11 @@ function detectedForwardCandidates(sockets, descendantPids, processCwds = /* @__
 function validPidSet(pids) {
   return new Set(pids.filter((pid) => Number.isInteger(pid) && pid > 0));
 }
+function validPortSet(ports) {
+  return new Set(
+    ports.filter((port) => Number.isInteger(port) && port > 0 && port < 65536)
+  );
+}
 function normalizedPortKind(portKind) {
   return portKind ?? "descendant";
 }
@@ -11964,14 +12058,336 @@ var init_claudeCodePlanMirror = __esm({
   }
 });
 
+// src/runnerLogger.ts
+import { appendFileSync, openSync as openSync2 } from "node:fs";
+import { createWriteStream } from "node:fs";
+import { homedir as homedir5 } from "node:os";
+import { dirname as dirname3, join as join6 } from "node:path";
+import { mkdirSync as mkdirSync2 } from "node:fs";
+function createRunnerLogger(logFile, consoleReporter) {
+  mkdirSync2(dirname3(logFile), { recursive: true });
+  const fd = openSync2(logFile, "a");
+  const stream = createWriteStream("", { fd, flags: "a", autoClose: true });
+  const logger = ((event, payload) => {
+    const redacted = redactForCliLog(payload);
+    stream.write(
+      `${JSON.stringify({ ts: (/* @__PURE__ */ new Date()).toISOString(), event, ...redacted })}
+`,
+      "utf8"
+    );
+    consoleReporter?.(event, runnerConsolePayload(redacted, payload));
+  });
+  Object.defineProperty(logger, "close", {
+    value: () => closeStream(stream)
+  });
+  return logger;
+}
+function writeCliAuditEvent(event, payload, options = {}) {
+  const logFile = options.logFile ?? defaultCliAuditLogFile();
+  try {
+    mkdirSync2(dirname3(logFile), { recursive: true });
+    appendFileSync(
+      logFile,
+      `${JSON.stringify({
+        ts: (/* @__PURE__ */ new Date()).toISOString(),
+        event,
+        ...options.sessionId === void 0 ? {} : { sessionId: options.sessionId },
+        ...redactForCliLog(payload)
+      })}
+`,
+      "utf8"
+    );
+  } catch (_error) {
+    return;
+  }
+}
+function defaultCliAuditLogFile() {
+  const override = process.env.LINZUMI_CLI_AUDIT_LOG?.trim();
+  return override === void 0 || override === "" ? join6(homedir5(), ".linzumi", "logs", "command-events.jsonl") : override;
+}
+function defaultRunnerLogFile() {
+  return join6(homedir5(), ".linzumi", "logs", "linzumi-runner.log");
+}
+function redactForCliLog(value) {
+  return redactObject(value);
+}
+function redactValue(value, key) {
+  if (sensitiveKey(key)) {
+    return sensitiveMarker;
+  }
+  if (typeof value === "string") {
+    return redactString(value);
+  }
+  if (Array.isArray(value)) {
+    return key === "args" ? redactArgs(value) : value.map((item) => redactValue(item, void 0));
+  }
+  if (value !== null && typeof value === "object") {
+    return redactObject(value);
+  }
+  return value;
+}
+function redactObject(value) {
+  const headerName = typeof value.name === "string" ? value.name.toLowerCase() : void 0;
+  const shouldRedactHeaderValue = headerName === "authorization" || headerName === "cookie" || headerName === "set-cookie";
+  return Object.fromEntries(
+    Object.entries(value).filter(([key]) => key !== "runner_console").map(([key, entry]) => [
+      key,
+      shouldRedactHeaderValue && key === "value" ? sensitiveMarker : redactValue(entry, key)
+    ])
+  );
+}
+function runnerConsolePayload(redacted, original) {
+  const consoleFields = objectValue3(original.runner_console);
+  return consoleFields === void 0 ? redacted : { ...redacted, ...redactForCliLog(consoleFields) };
+}
+function objectValue3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
+}
+function redactArgs(args) {
+  let redactNext = false;
+  return args.map((arg) => {
+    if (typeof arg !== "string") {
+      redactNext = false;
+      return redactValue(arg, void 0);
+    }
+    if (redactNext) {
+      redactNext = false;
+      return sensitiveMarker;
+    }
+    const [flag, value] = splitArgAssignment(arg);
+    if (sensitiveArgFlags.has(flag)) {
+      if (value === void 0) {
+        redactNext = true;
+        return arg;
+      }
+      return `${flag}=${sensitiveMarker}`;
+    }
+    return redactString(arg);
+  });
+}
+function splitArgAssignment(value) {
+  const index = value.indexOf("=");
+  return index === -1 ? [value, void 0] : [value.slice(0, index), value.slice(index + 1)];
+}
+function sensitiveKey(key) {
+  if (key === void 0) {
+    return false;
+  }
+  return /^(authorization|cookie|set-cookie|password)$/i.test(key) || /(^|[_-])(access[_-]?token|api[_-]?key|auth[_-]?token|oauth[_-]?code|refresh[_-]?token|secret|token)$/i.test(
+    key
+  );
+}
+function redactString(value) {
+  const withRedactedQuery = redactUrlQuery(value);
+  return withRedactedQuery.replace(
+    /\beyJ[A-Za-z0-9_-]*\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\b/g,
+    sensitiveMarker
+  );
+}
+function redactUrlQuery(value) {
+  let parsed;
+  try {
+    parsed = new URL(value);
+  } catch (_error) {
+    return redactRelativeUrlQuery(value);
+  }
+  for (const name of [...parsed.searchParams.keys()]) {
+    if (sensitiveQueryParams.has(name.toLowerCase())) {
+      parsed.searchParams.set(name, sensitiveMarker);
+    }
+  }
+  return parsed.toString();
+}
+function redactRelativeUrlQuery(value) {
+  const queryStart = value.indexOf("?");
+  const hashStart = value.indexOf("#");
+  if (queryStart === -1 || hashStart !== -1 && hashStart < queryStart) {
+    return value;
+  }
+  const path2 = value.slice(0, queryStart);
+  const query = hashStart === -1 ? value.slice(queryStart + 1) : value.slice(queryStart + 1, hashStart);
+  const hash = hashStart === -1 ? "" : value.slice(hashStart);
+  const searchParams = new URLSearchParams(query);
+  let redacted = false;
+  for (const name of [...searchParams.keys()]) {
+    if (sensitiveQueryParams.has(name.toLowerCase())) {
+      searchParams.set(name, sensitiveMarker);
+      redacted = true;
+    }
+  }
+  switch (redacted) {
+    case true:
+      return `${path2}?${searchParams.toString()}${hash}`;
+    case false:
+      return value;
+  }
+}
+function closeStream(stream) {
+  if (stream.closed || stream.destroyed) {
+    return Promise.resolve();
+  }
+  return new Promise((resolve12, reject) => {
+    stream.once("error", reject);
+    stream.end(resolve12);
+  });
+}
+var sensitiveMarker, sensitiveQueryParams, sensitiveArgFlags;
+var init_runnerLogger = __esm({
+  "src/runnerLogger.ts"() {
+    "use strict";
+    sensitiveMarker = "<SENSITIVE_DATA>";
+    sensitiveQueryParams = /* @__PURE__ */ new Set([
+      "access_token",
+      "authorization",
+      "code",
+      "cookie",
+      "kandan_preview_ticket",
+      "refresh_token",
+      "token"
+    ]);
+    sensitiveArgFlags = /* @__PURE__ */ new Set([
+      "--access-token",
+      "--api-key",
+      "--authorization",
+      "--cookie",
+      "--oauth-code",
+      "--password",
+      "--refresh-token",
+      "--secret",
+      "--token"
+    ]);
+  }
+});
+
+// src/engineChildReaper.ts
+function registerEngineChild(registration, _killProcess = process.kill) {
+  reaperState.children.add(registration);
+  ensureExitHandlersInstalled();
+  return {
+    unregister: () => {
+      reaperState.children.delete(registration);
+    }
+  };
+}
+function reapAllEngineChildren(killProcess = process.kill, reason = "exit") {
+  const children = [...reaperState.children];
+  reaperState.children.clear();
+  for (const child of children) {
+    reapEngineChild(child, killProcess, reason);
+  }
+}
+function reapEngineChild(child, killProcess, reason) {
+  try {
+    child.stop();
+  } catch (error) {
+    auditReapFailure(child, reason, "stop", error);
+  }
+  if (child.pid === void 0) {
+    return;
+  }
+  if (child.ownProcessGroup) {
+    try {
+      killProcess(-child.pid, reapSignal);
+      return;
+    } catch (error) {
+      if (processSignalErrorCode(error) === "ESRCH") {
+        return;
+      }
+      auditReapFailure(child, reason, "group_kill", error);
+    }
+  }
+  try {
+    killProcess(child.pid, reapSignal);
+  } catch (error) {
+    if (processSignalErrorCode(error) === "ESRCH") {
+      return;
+    }
+    auditReapFailure(child, reason, "pid_kill", error);
+  }
+}
+function ensureExitHandlersInstalled() {
+  if (reaperState.handlersInstalled) {
+    return;
+  }
+  reaperState.handlersInstalled = true;
+  const onExit2 = () => {
+    reapAllEngineChildren(process.kill, "process_exit");
+  };
+  process.on("exit", onExit2);
+  const ownsUncaught = process.listenerCount("uncaughtException") === 0;
+  const ownsRejection = process.listenerCount("unhandledRejection") === 0;
+  const onUncaughtException = (error) => {
+    reapAllEngineChildren(process.kill, "uncaught_exception");
+    process.stderr.write(
+      `linzumi runner uncaughtException: ${error instanceof Error ? error.stack ?? error.message : String(error)}
+`
+    );
+    process.exit(1);
+  };
+  const onUnhandledRejection = (reason) => {
+    reapAllEngineChildren(process.kill, "unhandled_rejection");
+    process.stderr.write(
+      `linzumi runner unhandledRejection: ${reason instanceof Error ? reason.stack ?? reason.message : String(reason)}
+`
+    );
+    process.exit(1);
+  };
+  if (ownsUncaught) {
+    process.on("uncaughtException", onUncaughtException);
+  }
+  if (ownsRejection) {
+    process.on("unhandledRejection", onUnhandledRejection);
+  }
+  reaperState.removeHandlers = () => {
+    process.off("exit", onExit2);
+    if (ownsUncaught) {
+      process.off("uncaughtException", onUncaughtException);
+    }
+    if (ownsRejection) {
+      process.off("unhandledRejection", onUnhandledRejection);
+    }
+  };
+}
+function auditReapFailure(child, reason, stage, error) {
+  writeCliAuditEvent("process.reap_failed", {
+    purpose: child.kind,
+    pid: child.pid ?? null,
+    ownProcessGroup: child.ownProcessGroup,
+    reason,
+    stage,
+    code: processSignalErrorCode(error) ?? null,
+    message: error instanceof Error ? error.message : String(error)
+  });
+}
+function processSignalErrorCode(error) {
+  if (error !== null && typeof error === "object" && "code" in error) {
+    const code = error.code;
+    return typeof code === "string" ? code : void 0;
+  }
+  return void 0;
+}
+var reaperState, reapSignal;
+var init_engineChildReaper = __esm({
+  "src/engineChildReaper.ts"() {
+    "use strict";
+    init_runnerLogger();
+    reaperState = {
+      children: /* @__PURE__ */ new Set(),
+      handlersInstalled: false,
+      removeHandlers: void 0
+    };
+    reapSignal = "SIGKILL";
+  }
+});
+
 // src/claudeCodeLiveBashOutput.ts
 import {
-  mkdirSync as mkdirSync2,
+  mkdirSync as mkdirSync3,
   rmSync,
   writeFileSync,
   promises as fsPromises
 } from "node:fs";
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 import { StringDecoder } from "node:string_decoder";
 function shellSingleQuoted(value) {
   return `'${value.replaceAll("'", `'\\''`)}'`;
@@ -12096,12 +12512,12 @@ function createClaudeCodeLiveBashCapture(host) {
     isClaudeLiveBashWrappedCommand(command)) {
       return void 0;
     }
-    const file = join6(
+    const file = join7(
       host.captureDir,
       `${toolUseId.replaceAll(/[^\w-]/g, "_")}.out`
     );
     try {
-      mkdirSync2(host.captureDir, { recursive: true });
+      mkdirSync3(host.captureDir, { recursive: true });
       writeFileSync(file, "");
     } catch (error) {
       host.log?.("claude_live_bash.capture_file_failed", {
@@ -12183,8 +12599,8 @@ var init_claudeCodeLiveBashOutput = __esm({
 
 // src/claudeCodeSession.ts
 import { existsSync as existsSync4, readFileSync as readFileSync5 } from "node:fs";
-import { homedir as homedir5 } from "node:os";
-import { join as join7 } from "node:path";
+import { homedir as homedir6 } from "node:os";
+import { join as join8 } from "node:path";
 function claudeCodeSettingSources() {
   return ["user", "project", "local"];
 }
@@ -12328,7 +12744,7 @@ function claudeCodeRateLimitSummaryText(rateLimit, nowMs) {
 async function probeClaudeCodeAvailability(args) {
   if (!hasClaudeCodeAuthHint(process.env, {
     cwd: args.cwd,
-    homeDir: homedir5(),
+    homeDir: homedir6(),
     platform: process.platform,
     fileExists: existsSync4,
     readTextFile: readTextFileIfPresent
@@ -12361,7 +12777,7 @@ async function probeClaudeCodeAvailability(args) {
   }
 }
 function hasClaudeCodeAuthHint(env, deps) {
-  const configDir = env.CLAUDE_CONFIG_DIR ?? join7(deps.homeDir, ".claude");
+  const configDir = env.CLAUDE_CONFIG_DIR ?? join8(deps.homeDir, ".claude");
   return hasAnthropicCredentialEnv(env) || hasClaudeCloudProviderEnv(env) || hasClaudeCodeFileCredential(configDir, deps) || hasClaudeCodeApiKeyHelper(configDir, deps) || hasMacClaudeCodeKeychainAnchor(deps);
 }
 function claudeCodePolicyDeferHooks() {
@@ -12396,14 +12812,14 @@ function hasClaudeCloudProviderEnv(env) {
   return trueishEnv(env.CLAUDE_CODE_USE_BEDROCK) || trueishEnv(env.CLAUDE_CODE_USE_VERTEX) || trueishEnv(env.CLAUDE_CODE_USE_FOUNDRY) || trueishEnv(env.CLAUDE_CODE_USE_ANTHROPIC_AWS) || trueishEnv(env.CLAUDE_CODE_USE_MANTLE);
 }
 function hasClaudeCodeFileCredential(configDir, deps) {
-  return deps.fileExists(join7(configDir, ".credentials.json")) || deps.fileExists(join7(configDir, ".claude.json")) || deps.fileExists(join7(deps.homeDir, ".claude.json"));
+  return deps.fileExists(join8(configDir, ".credentials.json")) || deps.fileExists(join8(configDir, ".claude.json")) || deps.fileExists(join8(deps.homeDir, ".claude.json"));
 }
 function hasClaudeCodeApiKeyHelper(configDir, deps) {
   return [
-    join7(configDir, "settings.json"),
-    join7(configDir, "settings.local.json"),
-    join7(deps.cwd, ".claude", "settings.json"),
-    join7(deps.cwd, ".claude", "settings.local.json")
+    join8(configDir, "settings.json"),
+    join8(configDir, "settings.local.json"),
+    join8(deps.cwd, ".claude", "settings.json"),
+    join8(deps.cwd, ".claude", "settings.local.json")
   ].some((path2) => settingsFileHasApiKeyHelper(path2, deps));
 }
 function settingsFileHasApiKeyHelper(path2, deps) {
@@ -12423,9 +12839,9 @@ function hasMacClaudeCodeKeychainAnchor(deps) {
     return false;
   }
   return [
-    join7(deps.homeDir, "Library", "Application Support", "claude-cli-nodejs"),
-    join7(deps.homeDir, "Library", "Application Support", "Claude"),
-    join7(deps.homeDir, "Library", "Preferences", "claude-cli-nodejs")
+    join8(deps.homeDir, "Library", "Application Support", "claude-cli-nodejs"),
+    join8(deps.homeDir, "Library", "Application Support", "Claude"),
+    join8(deps.homeDir, "Library", "Preferences", "claude-cli-nodejs")
   ].some((path2) => deps.fileExists(path2));
 }
 function readTextFileIfPresent(path2) {
@@ -12657,7 +13073,16 @@ async function* defaultClaudeCodeRunner(options) {
           options.wrapApprovedToolInput
         )
       },
-      ...options.model === void 0 ? {} : { model: options.model }
+      ...options.model === void 0 ? {} : { model: options.model },
+      ...options.permissionMode === void 0 ? {} : {
+        permissionMode: options.permissionMode,
+        // The SDK requires this safety acknowledgement when a session is
+        // constructed in 'bypassPermissions' (sdk.d.ts Options:
+        // "Must be set to true when using permissionMode:
+        // 'bypassPermissions'"). It is the intentional-bypass flag, only
+        // meaningful for that mode; harmless for the others.
+        ...options.permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {}
+      }
       // exactOptionalPropertyTypes: the conditional spreads build a union the
       // SDK's Options cannot absorb verbatim; the shape is correct field-wise.
     }
@@ -13076,207 +13501,6 @@ var init_claudeCodeSession = __esm({
   }
 });
 
-// src/runnerLogger.ts
-import { appendFileSync, openSync as openSync2 } from "node:fs";
-import { createWriteStream } from "node:fs";
-import { homedir as homedir6 } from "node:os";
-import { dirname as dirname3, join as join8 } from "node:path";
-import { mkdirSync as mkdirSync3 } from "node:fs";
-function createRunnerLogger(logFile, consoleReporter) {
-  mkdirSync3(dirname3(logFile), { recursive: true });
-  const fd = openSync2(logFile, "a");
-  const stream = createWriteStream("", { fd, flags: "a", autoClose: true });
-  const logger = ((event, payload) => {
-    const redacted = redactForCliLog(payload);
-    stream.write(
-      `${JSON.stringify({ ts: (/* @__PURE__ */ new Date()).toISOString(), event, ...redacted })}
-`,
-      "utf8"
-    );
-    consoleReporter?.(event, runnerConsolePayload(redacted, payload));
-  });
-  Object.defineProperty(logger, "close", {
-    value: () => closeStream(stream)
-  });
-  return logger;
-}
-function writeCliAuditEvent(event, payload, options = {}) {
-  const logFile = options.logFile ?? defaultCliAuditLogFile();
-  try {
-    mkdirSync3(dirname3(logFile), { recursive: true });
-    appendFileSync(
-      logFile,
-      `${JSON.stringify({
-        ts: (/* @__PURE__ */ new Date()).toISOString(),
-        event,
-        ...options.sessionId === void 0 ? {} : { sessionId: options.sessionId },
-        ...redactForCliLog(payload)
-      })}
-`,
-      "utf8"
-    );
-  } catch (_error) {
-    return;
-  }
-}
-function defaultCliAuditLogFile() {
-  const override = process.env.LINZUMI_CLI_AUDIT_LOG?.trim();
-  return override === void 0 || override === "" ? join8(homedir6(), ".linzumi", "logs", "command-events.jsonl") : override;
-}
-function defaultRunnerLogFile() {
-  return join8(homedir6(), ".linzumi", "logs", "linzumi-runner.log");
-}
-function redactForCliLog(value) {
-  return redactObject(value);
-}
-function redactValue(value, key) {
-  if (sensitiveKey(key)) {
-    return sensitiveMarker;
-  }
-  if (typeof value === "string") {
-    return redactString(value);
-  }
-  if (Array.isArray(value)) {
-    return key === "args" ? redactArgs(value) : value.map((item) => redactValue(item, void 0));
-  }
-  if (value !== null && typeof value === "object") {
-    return redactObject(value);
-  }
-  return value;
-}
-function redactObject(value) {
-  const headerName = typeof value.name === "string" ? value.name.toLowerCase() : void 0;
-  const shouldRedactHeaderValue = headerName === "authorization" || headerName === "cookie" || headerName === "set-cookie";
-  return Object.fromEntries(
-    Object.entries(value).filter(([key]) => key !== "runner_console").map(([key, entry]) => [
-      key,
-      shouldRedactHeaderValue && key === "value" ? sensitiveMarker : redactValue(entry, key)
-    ])
-  );
-}
-function runnerConsolePayload(redacted, original) {
-  const consoleFields = objectValue3(original.runner_console);
-  return consoleFields === void 0 ? redacted : { ...redacted, ...redactForCliLog(consoleFields) };
-}
-function objectValue3(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
-}
-function redactArgs(args) {
-  let redactNext = false;
-  return args.map((arg) => {
-    if (typeof arg !== "string") {
-      redactNext = false;
-      return redactValue(arg, void 0);
-    }
-    if (redactNext) {
-      redactNext = false;
-      return sensitiveMarker;
-    }
-    const [flag, value] = splitArgAssignment(arg);
-    if (sensitiveArgFlags.has(flag)) {
-      if (value === void 0) {
-        redactNext = true;
-        return arg;
-      }
-      return `${flag}=${sensitiveMarker}`;
-    }
-    return redactString(arg);
-  });
-}
-function splitArgAssignment(value) {
-  const index = value.indexOf("=");
-  return index === -1 ? [value, void 0] : [value.slice(0, index), value.slice(index + 1)];
-}
-function sensitiveKey(key) {
-  if (key === void 0) {
-    return false;
-  }
-  return /^(authorization|cookie|set-cookie|password)$/i.test(key) || /(^|[_-])(access[_-]?token|api[_-]?key|auth[_-]?token|oauth[_-]?code|refresh[_-]?token|secret|token)$/i.test(
-    key
-  );
-}
-function redactString(value) {
-  const withRedactedQuery = redactUrlQuery(value);
-  return withRedactedQuery.replace(
-    /\beyJ[A-Za-z0-9_-]*\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\b/g,
-    sensitiveMarker
-  );
-}
-function redactUrlQuery(value) {
-  let parsed;
-  try {
-    parsed = new URL(value);
-  } catch (_error) {
-    return redactRelativeUrlQuery(value);
-  }
-  for (const name of [...parsed.searchParams.keys()]) {
-    if (sensitiveQueryParams.has(name.toLowerCase())) {
-      parsed.searchParams.set(name, sensitiveMarker);
-    }
-  }
-  return parsed.toString();
-}
-function redactRelativeUrlQuery(value) {
-  const queryStart = value.indexOf("?");
-  const hashStart = value.indexOf("#");
-  if (queryStart === -1 || hashStart !== -1 && hashStart < queryStart) {
-    return value;
-  }
-  const path2 = value.slice(0, queryStart);
-  const query = hashStart === -1 ? value.slice(queryStart + 1) : value.slice(queryStart + 1, hashStart);
-  const hash = hashStart === -1 ? "" : value.slice(hashStart);
-  const searchParams = new URLSearchParams(query);
-  let redacted = false;
-  for (const name of [...searchParams.keys()]) {
-    if (sensitiveQueryParams.has(name.toLowerCase())) {
-      searchParams.set(name, sensitiveMarker);
-      redacted = true;
-    }
-  }
-  switch (redacted) {
-    case true:
-      return `${path2}?${searchParams.toString()}${hash}`;
-    case false:
-      return value;
-  }
-}
-function closeStream(stream) {
-  if (stream.closed || stream.destroyed) {
-    return Promise.resolve();
-  }
-  return new Promise((resolve12, reject) => {
-    stream.once("error", reject);
-    stream.end(resolve12);
-  });
-}
-var sensitiveMarker, sensitiveQueryParams, sensitiveArgFlags;
-var init_runnerLogger = __esm({
-  "src/runnerLogger.ts"() {
-    "use strict";
-    sensitiveMarker = "<SENSITIVE_DATA>";
-    sensitiveQueryParams = /* @__PURE__ */ new Set([
-      "access_token",
-      "authorization",
-      "code",
-      "cookie",
-      "kandan_preview_ticket",
-      "refresh_token",
-      "token"
-    ]);
-    sensitiveArgFlags = /* @__PURE__ */ new Set([
-      "--access-token",
-      "--api-key",
-      "--authorization",
-      "--cookie",
-      "--oauth-code",
-      "--password",
-      "--refresh-token",
-      "--secret",
-      "--token"
-    ]);
-  }
-});
-
 // src/mcpConfig.ts
 function linzumiMcpServerConfig(options) {
   return {
@@ -13403,6 +13627,76 @@ var init_mcpConfig = __esm({
   }
 });
 
+// src/engineParentDeathWatchdog.ts
+function encodeParentDeathWatchdogConfig(config) {
+  return JSON.stringify(config);
+}
+function parentDeathWatchdogProgram() {
+  return `
+const { spawn } = require('node:child_process');
+const config = JSON.parse(process.argv[process.argv.length - 1]);
+const originalParentPid = process.ppid;
+const child = spawn(config.command, config.args, { stdio: 'inherit' });
+let done = false;
+function shutdown(signal) {
+  if (done) return;
+  done = true;
+  try { process.kill(-process.pid, signal); }
+  catch (_e) { try { child.kill(signal); } catch (_e2) {} }
+}
+process.on('SIGINT', () => shutdown('SIGINT'));
+process.on('SIGTERM', () => shutdown('SIGTERM'));
+process.on('SIGHUP', () => shutdown('SIGTERM'));
+child.on('exit', (code, signal) => {
+  clearInterval(watchdog);
+  // The child is gone; the wrapper must follow it down rather than linger as an
+  // orphan. On the forwarded-signal path (shutdown() above caught SIGINT/SIGTERM
+  // /SIGHUP and propagated it to the child), the wrapper still has its own
+  // handler installed for that signal, so a bare process.kill(self, signal)
+  // would just re-enter shutdown() - a no-op once done is set - and the wrapper
+  // would never exit. Remove the handlers first so the signal's DEFAULT
+  // disposition (terminate) applies, re-raise to mirror the child's death
+  // signal, then exit() as a belt-and-suspenders fallback in case re-raising
+  // does not terminate (e.g. a signal with no default-terminate disposition).
+  process.removeAllListeners('SIGINT');
+  process.removeAllListeners('SIGTERM');
+  process.removeAllListeners('SIGHUP');
+  if (signal) { try { process.kill(process.pid, signal); } catch (_e) {} }
+  process.exit(signal ? 1 : code == null ? 0 : code);
+});
+child.on('error', (err) => {
+  process.stderr.write('engine watchdog spawn failed: ' + (err && err.message) + '\\n');
+  process.exit(1);
+});
+const watchdog = setInterval(() => {
+  // Inlined parentDeathWatchdogShouldReap (keep in sync): reap PURELY on a ppid
+  // change from boot - covers reparent-to-subreaper AND reparent-to-init. NO
+  // \`=== 1\` arm: a runner that is PID 1 captures originalParentPid === 1, so
+  // such an arm would false-fire on the first poll and kill a healthy codex.
+  if (process.ppid !== originalParentPid) {
+    try { child.kill('SIGKILL'); } catch (_e) {}
+    try { process.kill(-process.pid, 'SIGKILL'); } catch (_e) {}
+    process.exit(0);
+  }
+}, config.pollIntervalMs);
+`.trim();
+}
+function parentDeathWatchdogSpawn(nodeExecPath, config) {
+  return {
+    command: nodeExecPath,
+    args: [
+      "-e",
+      parentDeathWatchdogProgram(),
+      encodeParentDeathWatchdogConfig(config)
+    ]
+  };
+}
+var init_engineParentDeathWatchdog = __esm({
+  "src/engineParentDeathWatchdog.ts"() {
+    "use strict";
+  }
+});
+
 // src/codexAppServer.ts
 import {
   spawn as spawn2
@@ -13444,13 +13738,18 @@ async function startCodexAppServerAttempt(codexBin, cwd, options, attempt) {
   let stderrText = "";
   const configuredStdio = codexAppServerStdio(process.stdout.isTTY === true);
   const stdio = [configuredStdio[0], configuredStdio[1], "pipe"];
+  const watchdogSpawn = parentDeathWatchdogSpawn(process.execPath, {
+    command: codexBin,
+    args,
+    pollIntervalMs: codexAppServerWatchdogPollMs
+  });
   writeCliAuditEvent("process.spawn", {
     command: codexBin,
     args,
     cwd,
     purpose: "codex.app_server"
   });
-  const child = spawn2(codexBin, args, {
+  const child = spawn2(watchdogSpawn.command, [...watchdogSpawn.args], {
     cwd,
     env: codexAppServerEnv(options.env, options.inheritEnv ?? true),
     stdio,
@@ -13467,7 +13766,17 @@ async function startCodexAppServerAttempt(codexBin, cwd, options, attempt) {
       }
     });
   }
-  const stop = () => stopCodexAppServerProcess(child);
+  const registered = registerEngineChild({
+    stop: () => stopCodexAppServerProcess(child),
+    pid: child.pid,
+    ownProcessGroup: true,
+    kind: "codex.app_server"
+  });
+  child.once("exit", () => registered.unregister());
+  const stop = () => {
+    registered.unregister();
+    stopCodexAppServerProcess(child);
+  };
   writeCliAuditEvent("process.spawned", {
     command: codexBin,
     args,
@@ -13571,7 +13880,7 @@ function stopCodexAppServerProcess(child, killProcess = process.kill) {
   child.kill("SIGINT");
 }
 function logProcessGroupSignalFailure(pid, error) {
-  const code = processSignalErrorCode(error);
+  const code = processSignalErrorCode2(error);
   const message = error instanceof Error ? error.message : String(error);
   const event = code === "EPERM" ? "process.group_signal_denied" : code === "ESRCH" ? "process.group_signal_missing" : "process.group_signal_failed";
   writeCliAuditEvent(event, {
@@ -13589,7 +13898,7 @@ function logProcessGroupSignalFailure(pid, error) {
     );
   }
 }
-function processSignalErrorCode(error) {
+function processSignalErrorCode2(error) {
   if (error !== null && typeof error === "object" && "code" in error) {
     const code = error.code;
     return typeof code === "string" ? code : void 0;
@@ -13973,13 +14282,16 @@ function readyzUrlForWebsocket(websocketUrl) {
   parsed.hash = "";
   return parsed.toString();
 }
-var blockedCodexAppServerEnvKeys;
+var codexAppServerWatchdogPollMs, blockedCodexAppServerEnvKeys;
 var init_codexAppServer = __esm({
   "src/codexAppServer.ts"() {
     "use strict";
     init_protocol();
     init_runnerLogger();
     init_mcpConfig();
+    init_engineChildReaper();
+    init_engineParentDeathWatchdog();
+    codexAppServerWatchdogPollMs = 2e3;
     blockedCodexAppServerEnvKeys = [
       "LINZUMI_MCP_ACCESS_TOKEN",
       "LINZUMI_MCP_OWNER_USERNAME"
@@ -14689,8 +15001,8 @@ function startCallbackServer(args) {
         }
         resolveCallback?.({ code, state });
         writeOauthResult(response, {
-          title: "Connected",
-          body: "You can close this tab. Your terminal will finish the setup.",
+          title: "Computer authorized",
+          body: "This computer has been authorized for agentic use in Linzumi. Feel free to close this tab and let the terminal finish setup.",
           status: 200
         });
       } catch (error) {
@@ -14733,29 +15045,108 @@ function writeOauthResult(response, args) {
   response.end(oauthResultHtml(args));
 }
 function oauthResultHtml(args) {
+  const success = args.status >= 200 && args.status < 300;
+  const badgeClass = success ? "badge badge--success" : "badge badge--notice";
+  const badgeMark = success ? '<svg viewBox="0 0 24 24" aria-hidden="true" focusable="false" class="mark"><path fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" d="M5 12.5l4.2 4.2L19 7"/></svg>' : '<svg viewBox="0 0 24 24" aria-hidden="true" focusable="false" class="mark"><path fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" d="M12 7v6M12 17h.01"/></svg>';
   return `<!doctype html>
-<html>
+<html lang="en">
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>${escapeHtml(args.title)}</title>
     <style>
-      :root { color-scheme: light dark; font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; }
-      body { margin: 0; min-height: 100vh; display: grid; place-items: center; background: #f6f7f9; color: #13161c; }
-      main { width: min(520px, calc(100vw - 32px)); border: 1px solid #d9dde5; border-radius: 12px; background: #fff; padding: 30px; box-shadow: 0 24px 70px rgba(18, 25, 38, 0.12); }
-      h1 { margin: 0 0 10px; font-size: 24px; line-height: 1.2; }
-      p { margin: 0; color: #465160; line-height: 1.55; }
+      :root {
+        color-scheme: light dark;
+        /* Linzumi brand tokens (light) \u2014 kandan/server_v2/web/src/ui/theme/tokens.css */
+        --page-bg: #f5f2ee;
+        --surface: #fcfaf7;
+        --foreground: #1e1b18;
+        --muted: #5c5550;
+        --divider: rgba(138, 148, 144, 0.16);
+        --accent: #c4897a;
+        --success: #5a9a6a;
+        --success-soft: rgba(90, 154, 106, 0.1);
+        --notice-soft: rgba(196, 137, 122, 0.1);
+        --shadow: 0 12px 40px rgba(106, 138, 122, 0.12), 0 4px 12px rgba(106, 138, 122, 0.06);
+      }
       @media (prefers-color-scheme: dark) {
-        body { background: #0f131a; color: #f3f5f8; }
-        main { background: #171c25; border-color: #2b3442; box-shadow: 0 24px 70px rgba(0, 0, 0, 0.4); }
-        p { color: #aab4c2; }
+        :root {
+          /* Linzumi brand tokens (dark) */
+          --page-bg: #171b19;
+          --surface: #202522;
+          --foreground: rgba(245, 241, 232, 0.95);
+          --muted: rgba(245, 241, 232, 0.68);
+          --divider: rgba(245, 241, 232, 0.1);
+          --accent: #c8a0b0;
+          --success: #72c488;
+          --success-soft: rgba(114, 196, 136, 0.14);
+          --notice-soft: rgba(200, 160, 176, 0.14);
+          --shadow: 0 18px 50px rgba(0, 0, 0, 0.5), 0 4px 12px rgba(0, 0, 0, 0.35);
+        }
+      }
+      * { box-sizing: border-box; }
+      body {
+        margin: 0;
+        min-height: 100vh;
+        display: grid;
+        place-items: center;
+        padding: 24px;
+        background:
+          radial-gradient(1200px 600px at 50% -10%, var(--notice-soft), transparent 60%),
+          var(--page-bg);
+        color: var(--foreground);
+        font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+        -webkit-font-smoothing: antialiased;
+      }
+      main {
+        width: min(520px, 100%);
+        border: 1px solid var(--divider);
+        border-radius: 16px;
+        background: var(--surface);
+        padding: 40px 36px;
+        box-shadow: var(--shadow);
+        text-align: center;
+      }
+      .logo {
+        width: 44px;
+        height: 44px;
+        margin: 28px auto 0;
+        color: var(--accent);
+      }
+      .logo svg { display: block; width: 100%; height: 100%; }
+      .badge {
+        width: 64px;
+        height: 64px;
+        margin: 0 auto 22px;
+        display: grid;
+        place-items: center;
+        border-radius: 999px;
+      }
+      .badge--success { background: var(--success-soft); color: var(--success); }
+      .badge--notice { background: var(--notice-soft); color: var(--accent); }
+      .mark { width: 32px; height: 32px; }
+      h1 {
+        margin: 0 0 12px;
+        font-size: 23px;
+        font-weight: 600;
+        line-height: 1.3;
+        letter-spacing: -0.01em;
+        color: var(--foreground);
+      }
+      p {
+        margin: 0;
+        color: var(--muted);
+        font-size: 15px;
+        line-height: 1.6;
       }
     </style>
   </head>
   <body>
     <main>
+      <div class="${badgeClass}">${badgeMark}</div>
       <h1>${escapeHtml(args.title)}</h1>
       <p>${escapeHtml(args.body)}</p>
+      <div class="logo">${LINZUMI_LOGO_SVG}</div>
     </main>
   </body>
 </html>`;
@@ -14786,10 +15177,12 @@ function openBrowser(url) {
     });
   });
 }
+var LINZUMI_LOGO_SVG;
 var init_oauth = __esm({
   "src/oauth.ts"() {
     "use strict";
     init_runnerLogger();
+    LINZUMI_LOGO_SVG = '<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><path fill="currentColor" d="M206.7,82.37l2.55-6.45,2.01-3.63c.67-1.21,1.07-1.88,2.55-3.63,1.34-1.61,3.36-4.43,5.64-6.58,2.42-2.24,5.06-4.3,7.93-6.18,3.92-2.53,8.17-4.52,12.63-5.91,1.79-.63,4.03-1.16,6.72-1.61,6.1-.88,12.29-.92,18.4-.13,2.69.45,5.06,1.03,7.12,1.75,2.15.67,3.49,1.07,5.64,2.15,4.55,2.16,8.87,4.77,12.9,7.79,1.61,1.34,2.42,2.15,4.16,4.16l5.91,7.66c1.34,2.01,1.34,2.28,2.15,4.03l2.55,6.58c.67,1.34-.13,1.34,1.07.94,1.21-.27,4.3-2.01,6.45-2.82,4.7-1.83,9.62-3,14.64-3.49,2.42-.27,3.76-.54,7.12-.27s9.27,1.21,12.76,2.15c3.63.94,6.58,2.55,8.73,3.49,2.15,1.07,2.55,1.48,4.16,2.55,3.49,2.51,6.77,5.29,9.81,8.33,1.52,1.7,3.04,3.58,4.57,5.64,2.74,4.49,4.86,9.32,6.31,14.37.67,2.28,1.07,3.49,1.34,6.72.27,3.22,0,10.48.4,12.76.27,2.28.27.67,1.61.94,1.48.27,4.3,0,6.72.4,2.42.27,4.97.85,7.66,1.75,6.76,2.32,13.01,5.92,18.4,10.61,2.28,1.75,2.96,2.69,4.3,4.3,3.51,3.93,6.32,8.43,8.33,13.3,1.07,2.15,1.21,2.28,1.88,5.1.54,2.96,1.61,8.19,1.61,12.36s-.81,9.67-1.34,12.76c-.67,3.22-1.07,4.03-2.15,6.18-2.16,4.54-4.81,8.82-7.93,12.76-1.25,1.61-2.6,3-4.03,4.16-1.48,1.34-2.69,2.42-4.7,3.76-3.79,2.34-7.74,4.4-11.82,6.18l-6.58,2.15c-2.06.45-4.12.72-6.18.81l-7.25.13c-2.28,0-2.82.27-6.58-.4-3.76-.81-11.69-2.82-15.99-4.3-4.16-1.34-6.31-2.69-9.67-4.43-3.49-1.75-10.48-6.18-12.9-7.39-8.26-4.54-16.78-8.58-25.52-12.09-4.3-1.75-9.27-3.22-11.82-4.03-2.55-.81-5.24-1.61-7.66-2.15-8.39-2.25-16.99-3.6-25.66-4.03-3.9-.27-4.84-.27-8.19-.13-3.67-.09-7.79.04-12.36.4-7.9.79-15.75,2.04-23.51,3.76-8.37,2.26-16.62,4.95-24.72,8.06-3.22,1.34-2.82.81-9.13,4.16-6.31,3.36-22.03,12.22-28.75,15.58-6.72,3.36-8.73,3.49-11.82,4.43-3.09,1.07-4.3,1.21-6.58,1.61-7.3,1.09-14.71,1.18-22.03.27-2.55-.54-5.78-1.61-7.79-2.28-2.01-.54-2.15-.67-4.03-1.75-2.02-1.07-5.64-3.22-7.79-4.7-3.24-2.15-6.14-4.77-8.6-7.79-1.34-1.52-2.69-3.36-4.03-5.51-1.52-2.51-2.96-5.24-4.3-8.19-2.03-5.46-3.03-11.24-2.96-17.06,0-2.96.13-6.72.67-9.67.54-2.87,1.34-5.6,2.42-8.19,4.24-10.52,12.04-19.22,22.03-24.58,5.19-2.98,10.88-4.98,16.79-5.91,2.55-.4,5.37-.13,6.72-.4,1.34-.27,1.34,1.34,1.61-.94.4-2.28,0-9.4.4-12.76.27-3.36.81-4.97,1.48-7.25,1.87-6.19,4.88-11.97,8.87-17.06,3.47-3.98,7.39-7.54,11.69-10.61,4.43-2.61,9.11-4.77,13.97-6.45,2.55-.67,6.99-1.34,9.13-1.75,2.15-.27,1.88-.13,3.63-.13,1.79-.09,4.03,0,6.72.27,2.69.18,5.73.72,9.13,1.61,3.49,1.07,9.27,4.03,11.28,4.7s.4.27,1.07-.94ZM512.27,255.7c0,141.39-114.62,256-256,256S.27,397.09.27,255.7,114.89-.3,256.27-.3s256,114.62,256,256ZM449.33,352.66c14.67-29.16,22.94-62.09,22.94-96.95,0-119.29-96.71-216-216-216S40.27,136.41,40.27,255.7c0,41.89,11.94,80.98,32.57,114.09,1.7,1.79,2.94.65,3.05-.57.27-1.61,2.75-20.85,4.43-27.27,1.87-7.6,4.52-14.98,7.93-22.03,1.75-3.49,3.76-7.93,6.18-11.82,8.77-13.95,19.75-26.38,32.51-36.81,7.24-5.32,14.87-10.08,22.84-14.24,9.74-4.78,20.09-8.22,30.76-10.21,4.03-.99,7.61-1.66,10.75-2.02,3.36-.54,5.78-.54,9.27-.94,3.49-.54,9.32-1.16,11.82-2.01,6.65-2.27,5.64-6.72,3.09-7.52-2.55-.81-9.67-1.88-13.84-2.96-4.16-1.21-8.73-2.82-11.28-3.76-2.55-.94-2.28-.94-3.9-2.02l-5.91-4.03c-.94-.94-1.34-.94.54-2.02l10.21-5.51c2.01-1.07,1.75-.67,3.09-.13,1.34.67,4.3,2.42,6.72,3.36,7.2,2.69,14.96,3.52,22.57,2.42,1.34-.27,1.34-.54,1.61-1.21.27-.67.81-.94-.13-2.69-.94-1.88-4.43-6.58-5.64-8.46l-1.21-2.28c-.27-.45-1.07-1.07,1.21-1.75,2.42-.54,10.48-2.58,12.9-2.82.86-.09.67,0,1.75,1.07,1.07,1.07,3.09,3.63,4.84,5.24,1.88,1.61,4.43,3.22,6.18,4.3,2.8,1.71,5.99,2.68,9.27,2.82,1.88,0,4.97-.13,7.12-.67,2.15-.4,3.63-.94,5.64-2.02,2.01-1.07,4.7-2.69,6.72-4.43,2.01-1.75,3.49-5.1,5.64-6.04,2.15-.81,4.97.54,7.12.94,2.28.4,4.97,1.21,6.18,1.61,1.21.4,2.01.4.67,2.28l-8.06,10.34c-1.34,1.88.13,5.51,1.21,5.64l5.64.27c2.28-.13,4.43.13,7.66-.67,3.36-.81,9.27-2.96,11.82-3.9,2.69-.94,3.22-1.34,4.16-2.01.81-.54,1.39-1.03,1.75-1.48.45-.27.67-1.07,2.82,0s9.4,4.97,11.28,6.18c2.01,1.21,1.07.94,0,1.75l-5.51,3.9c-1.48.94-1.07.94-3.22,1.88-2.15,1.07-6.58,2.96-9.67,4.03s-4.03,1.75-8.73,2.69c-4.7.81-14.51,1.75-19.48,2.55-4.97.81-7.93,1.34-10.34,2.01-2.28.67-2.15.94-3.49,1.88-1.48,1.07-2.69,1.61-4.97,3.9-2.28,2.28-5.91,6.85-8.73,9.81-2.82,2.96-6.45,6.04-8.33,7.79-2.02,1.61-1.61,1.34-3.36,2.42l-6.99,4.03-4.03,2.02-6.72,2.15c-2.42.67-3.9,1.21-7.66,2.01l-14.91,2.82c-3.63.81-4.3,1.07-7.12,2.01-2.96,1.07-6.22,2.46-9.81,4.16-3.22,1.43-6.81,3.45-10.75,6.04-13.6,9.14-24.61,21.63-31.97,36.27-2.01,3.76-2.96,6.58-3.9,9.27-1.07,2.69-1.61,4.03-2.28,6.58-.67,2.69-1.48,5.24-2.15,9.27-.54,4.16-1.48,11.15-1.75,15.45-.27,4.16-.27,6.04,0,10.21l1.88,14.91c.67,3.76,1.48,5.91,2.15,8.19l1.88,5.64c.99,2.6,2.42,5.78,4.3,9.54,2.15,3.76,5.37,9.13,8.06,13.03,10.08,14.51,23.81,26.36,40.17,33.05,22.55,9.22,43.32,10.46,61.89,10.46,3.25,0,6.49-.09,9.71-.23,3.07-.42,2.74-6.09,10.48-9.42,5.26-2.26,13.7-2.42,14.91-2.55,1.07-.13-5.24-4.57-7.79-6.45-2.55-1.88-4.97-4.3-6.72-5.91-1.75-1.75-2.42-2.28-3.9-4.16-1.61-1.88-3.9-5.51-5.24-7.12-1.34-1.61-1.48-2.28-2.55-2.55-.98-.27-2.37-.09-4.16.54-1.88.4-5.37,1.21-7.12,1.88-1.75.67-2.02.81-3.09,2.01-1.07,1.07-2.69,3.76-3.63,4.7-.81.94-.67.67-1.48.94-.81.27-2.42.67-3.63.54-1.34-.18-2.55-.58-3.63-1.21-.81-.81-1.48-2.42-1.88-3.22-.4-.94-.54-1.21-.54-2.15l.4-3.49c.18-1.52.72-3.27,1.61-5.24.94-1.75,1.88-3.49,4.16-5.64,2.15-2.02,7.52-5.51,9.13-6.85,1.61-1.34,1.21-2.15.54-3.63-2.69-5.16-6.33-9.77-10.75-13.57-2.42-1.88-5.51-3.22-7.79-4.3-2.15-1.21-2.01-1.21-5.78-2.42-3.76-1.07-13.16-3.63-16.79-4.84-3.63-1.07-2.82-.94-5.1-2.01l-8.19-4.3c-1.75-.94-1.34-.54-2.69-1.61l-5.51-4.57c-2.18-1.93-3.77-4.45-4.57-7.25-.45-1.52-.45-2.87,0-4.03.4-1.34,0-1.21,2.01-3.63,2.15-2.42,7.25-7.93,10.21-10.75,3.09-2.82,4.97-4.03,7.79-6.04,5.43-3.82,11.09-7.32,16.93-10.48,2.42-1.21,5.37-2.02,7.12-2.69,1.61-.81,2.64-1.43,3.09-1.88.54-.4.67.54.4-.94-.4-1.48-1.88-4.97-2.28-7.66-.4-2.82-.4-6.18,0-8.73.36-2.42,1.03-4.66,2.01-6.72,1.16-2.24,2.46-4.3,3.9-6.18,1.34-1.7,2.91-3.04,4.7-4.03,1.75-1.07,4.3-2.01,6.18-2.42,1.61-.45,3.13-.58,4.57-.4l4.57.27c1.34.18,2.55.49,3.63.94,1.07.54,2.55,1.48,3.09,2.01.4.67.67.13-.27,1.61-1.07,1.48-4.16,4.57-5.78,7.12-1.61,2.69-2.96,5.6-4.03,8.73-.94,3.22-1.88,8.73-2.01,10.75-.27,2.15,4.7,1.75,5.1.54.54-1.07.27-2.55,1.07-5.1.81-2.42,2.42-7.25,3.9-9.81,1.34-2.55,2.82-3.76,4.57-5.51,1.79-1.88,3.67-3.45,5.64-4.7,1.88-1.21,3.22-1.75,5.64-2.28,2.42-.4,6.18-.67,8.73-.67,2.42,0,3.9.13,6.18.94,2.15.81,5.24,2.69,7.12,4.03,1.79,1.52,3.22,3.09,4.3,4.7,1.21,1.61,1.88,2.96,2.55,5.1.67,2.15,1.34,5.1,1.34,7.66,0,2.69-.54,6.04-1.21,8.19-.63,2.24-1.43,4.03-2.42,5.37-.67,1.34-.94,1.61-2.15,2.82-1.21,1.34-3.22,3.22-4.97,4.57-1.75,1.21-4.43,2.28-5.51,3.22-.94.81-.4,2.51.4,2.42.94.13,1.75.4,4.57-.13,2.82-.4,8.33-2.15,12.22-2.82,11.99-2.63,24.41-2.63,36.4,0,3.22.54,4.16,1.07,6.31,1.75l6.04,2.28c2.42,1.07,5.51,2.42,8.19,4.16,8.15,5.36,15.14,12.3,20.55,20.42,1.61,2.42,2.87,4.66,3.76,6.72,1.85,4.51,3.42,9.13,4.7,13.84.67,2.82,1.21,4.43,1.61,8.19.4,3.76.4,11.82.54,14.37.27,2.55-.13,2.28,1.75,1.34,1.75-.94,20.09-7.74,30.63-31.57,9.16-20.71,1.9-47.26-2.28-55.34-1.75-3.22-4.16-6.99-6.31-9.81-4.44-5.14-9.6-9.62-15.31-13.3-2.96-1.7-5.55-3.09-7.79-4.16-4.33-1.6-8.77-2.86-13.3-3.76l-6.18-.4h-14.37c-2.69-.27-3.1-3.18-.54-4.3,3.64-1.58,9.88-2.63,18.54-2.42,8.78.21,14.91,1.88,17.33,2.55,13.98,3.94,30.19,16.65,38.55,30.76,6.61,11.16,9.81,29.96,9.81,29.96.37,1.75,2.18,1.66,3.08.35ZM232.78,345.3c-3.91,0-7.08,3.17-7.08,7.08s3.17,7.08,7.08,7.08,7.08-3.17,7.08-7.08-3.17-7.08-7.08-7.08Z"/></svg>';
   }
 });
 
@@ -15502,7 +15895,7 @@ var init_remoteCodexExecutionContext = __esm({
       "SHELL",
       "TMPDIR"
     ]);
-    ignoredEnvOverrideKeys = /* @__PURE__ */ new Set(["PATH"]);
+    ignoredEnvOverrideKeys = /* @__PURE__ */ new Set(["PATH", "GIT_PAGER"]);
     deniedEnvKeys = /* @__PURE__ */ new Set([
       "BASH_ENV",
       "ENV",
@@ -18127,7 +18520,7 @@ var linzumiCliVersion, linzumiCliVersionText;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    linzumiCliVersion = "0.0.85-beta";
+    linzumiCliVersion = "0.0.87-beta";
     linzumiCliVersionText = `linzumi ${linzumiCliVersion}`;
   }
 });
@@ -18406,6 +18799,9 @@ function releaseRunnerLock(path2, record) {
   }
 }
 function readRunnerLockForRelease(path2) {
+  return readRunnerLockOwner(path2);
+}
+function readRunnerLockOwner(path2) {
   try {
     return readRunnerLockIfPresent(path2);
   } catch (_error) {
@@ -18526,8 +18922,216 @@ var init_runnerLock = __esm({
   }
 });
 
-// src/runnerConsoleReporter.ts
+// src/runnerLockTakeover.ts
+function runnerLockTakeoverSleep(ms) {
+  return new Promise((resolve12) => {
+    setTimeout(resolve12, ms);
+  });
+}
+function runnerLockConflictReport(baseMessage) {
+  const bar = "=".repeat(64);
+  return [
+    "",
+    bar,
+    "ERROR: linzumi connect could not start - workspace already in use",
+    bar,
+    baseMessage,
+    bar,
+    ""
+  ].join("\n");
+}
+function isRunnerLockConflictReportedError(error) {
+  return error instanceof RunnerLockConflictReportedError || error instanceof Error && error.name === runnerLockConflictReportedErrorName;
+}
+function shouldResolveRunnerLockConflict(lockTakeover) {
+  return lockTakeover !== void 0;
+}
+async function resolveRunnerLockConflict(args) {
+  const report = runnerLockConflictReport(args.baseMessage);
+  if (args.takeOverWithoutPrompt) {
+    args.prompt.writeReport(report);
+    await stopHolderAndAwaitRelease(args.holder, args.lockPath, args.takeover);
+    return { outcome: "take_over" };
+  }
+  if (!args.prompt.isInteractive()) {
+    args.prompt.writeReport(report);
+    return { outcome: "declined", report };
+  }
+  args.prompt.writeReport(report);
+  const yes = await args.prompt.promptYesNo(
+    `Another runner (pid ${args.holder.pid}) is already connected to this workspace. Stop it and run here instead? [y/N] `
+  );
+  if (!yes) {
+    return { outcome: "declined", report };
+  }
+  await stopHolderAndAwaitRelease(args.holder, args.lockPath, args.takeover);
+  return { outcome: "take_over" };
+}
+async function stopHolderAndAwaitRelease(holder, lockPath, deps) {
+  deps.log("runner.lock_takeover_requested", {
+    holderPid: holder.pid,
+    holderRunnerId: holder.runnerId,
+    lockPath
+  });
+  if (!deps.isPidAlive(holder.pid)) {
+    deps.log("runner.lock_takeover_holder_already_gone", {
+      holderPid: holder.pid,
+      lockPath
+    });
+    return;
+  }
+  if (!stillHeldBy(deps, holder)) {
+    deps.log("runner.lock_takeover_owner_changed", {
+      holderPid: holder.pid,
+      lockPath
+    });
+    return;
+  }
+  sendSignalTolerant(deps, holder.pid, "SIGTERM");
+  if (await waitForHolderRelease(holder, deps, runnerLockTakeoverGracefulStopMs)) {
+    deps.log("runner.lock_takeover_graceful", {
+      holderPid: holder.pid,
+      lockPath
+    });
+    return;
+  }
+  if (!stillHeldBy(deps, holder)) {
+    deps.log("runner.lock_takeover_owner_changed", {
+      holderPid: holder.pid,
+      lockPath
+    });
+    return;
+  }
+  deps.log("runner.lock_takeover_escalating_sigkill", {
+    holderPid: holder.pid,
+    lockPath
+  });
+  sendSignalTolerant(deps, holder.pid, "SIGKILL");
+  if (await waitForHolderRelease(holder, deps, runnerLockTakeoverForcefulStopMs)) {
+    deps.log("runner.lock_takeover_forceful", {
+      holderPid: holder.pid,
+      lockPath
+    });
+    return;
+  }
+  throw new Error(
+    `Could not stop the runner holding this workspace (pid ${holder.pid}). It did not exit after SIGTERM and SIGKILL within the timeout. Stop it manually or remove the lock file (${lockPath}) and retry.`
+  );
+}
+async function waitForHolderRelease(holder, deps, timeoutMs) {
+  const deadline = deps.now() + timeoutMs;
+  while (deps.now() < deadline) {
+    if (!deps.isPidAlive(holder.pid) || deps.lockReleased()) {
+      return true;
+    }
+    await deps.sleep(runnerLockTakeoverPollMs);
+  }
+  return !deps.isPidAlive(holder.pid) || deps.lockReleased();
+}
+function stillHeldBy(deps, holder) {
+  const current = deps.currentLockOwner();
+  return current !== void 0 && current.machineId === holder.machineId && current.runnerId === holder.runnerId && current.pid === holder.pid && current.startedAt === holder.startedAt;
+}
+function sendSignalTolerant(deps, pid, signal) {
+  try {
+    deps.signalPid(pid, signal);
+  } catch (error) {
+    const code = error !== null && typeof error === "object" && "code" in error ? error.code : void 0;
+    if (code !== "ESRCH") {
+      deps.log("runner.lock_takeover_signal_failed", {
+        holderPid: pid,
+        signal,
+        code: typeof code === "string" ? code : null,
+        message: error instanceof Error ? error.message : String(error)
+      });
+    }
+  }
+}
+var runnerLockTakeoverGracefulStopMs, runnerLockTakeoverForcefulStopMs, runnerLockTakeoverPollMs, runnerLockConflictReportedErrorName, RunnerLockConflictReportedError;
+var init_runnerLockTakeover = __esm({
+  "src/runnerLockTakeover.ts"() {
+    "use strict";
+    runnerLockTakeoverGracefulStopMs = 1e4;
+    runnerLockTakeoverForcefulStopMs = 5e3;
+    runnerLockTakeoverPollMs = 200;
+    runnerLockConflictReportedErrorName = "RunnerLockConflictReportedError";
+    RunnerLockConflictReportedError = class extends Error {
+      constructor() {
+        super("");
+        this.name = runnerLockConflictReportedErrorName;
+      }
+    };
+  }
+});
+
+// src/blessedTputSetulcShim.ts
 import blessed from "blessed";
+function balanceTerminfoConditionals(cap) {
+  if (cap.indexOf("%;") === -1) {
+    return cap;
+  }
+  let depth = 0;
+  let repaired = "";
+  let index = 0;
+  while (index < cap.length) {
+    const here = cap[index];
+    const next = cap[index + 1];
+    if (here === "%" && next === "%") {
+      repaired += "%%";
+      index += 2;
+      continue;
+    }
+    if (here === "%" && next === "?") {
+      depth += 1;
+      repaired += "%?";
+      index += 2;
+      continue;
+    }
+    if (here === "%" && next === ";") {
+      if (depth > 0) {
+        depth -= 1;
+        repaired += "%;";
+      }
+      index += 2;
+      continue;
+    }
+    repaired += here;
+    index += 1;
+  }
+  return repaired;
+}
+function installBlessedSetulcShim(blessedModule = blessed) {
+  const tput = blessedModule.Tput;
+  const proto = tput?.prototype;
+  const original = proto?._compile;
+  if (proto === void 0 || typeof original !== "function") {
+    return;
+  }
+  if (proto[SHIM_FLAG] === true) {
+    return;
+  }
+  const patched = function patchedCompile(info, key, str) {
+    const safeStr = typeof str === "string" ? balanceTerminfoConditionals(str) : str;
+    return original.call(this, info, key, safeStr);
+  };
+  proto._compile = patched;
+  Object.defineProperty(proto, SHIM_FLAG, {
+    value: true,
+    enumerable: false,
+    configurable: true,
+    writable: true
+  });
+}
+var SHIM_FLAG;
+var init_blessedTputSetulcShim = __esm({
+  "src/blessedTputSetulcShim.ts"() {
+    "use strict";
+    SHIM_FLAG = "__linzumiSetulcShimInstalled";
+  }
+});
+
+// src/runnerConsoleReporter.ts
+import blessed2 from "blessed";
 function reportRunnerConsoleEvent(event, payload) {
   if (shouldRenderDashboard()) {
     const tui = initializeDashboardTui(dashboardState);
@@ -19512,20 +20116,21 @@ function handleDashboardKey(state, key, exitProcess = () => process.kill(process
 function createRunnerConsoleDashboardTui(state, exitProcess = () => process.kill(process.pid, "SIGINT")) {
   let rendering = false;
   let rawScrollAnchor;
-  const screen = blessed.screen({
+  installBlessedSetulcShim();
+  const screen = blessed2.screen({
     title: "Linzumi Commander",
     smartCSR: true,
     fullUnicode: true,
     mouse: true
   });
-  const header = blessed.box({
+  const header = blessed2.box({
     top: 0,
     left: 0,
     width: "100%",
     height: 1,
     tags: false
   });
-  const tableElement = blessed.listtable({
+  const tableElement = blessed2.listtable({
     top: 1,
     left: 0,
     width: "100%",
@@ -19554,7 +20159,7 @@ function createRunnerConsoleDashboardTui(state, exitProcess = () => process.kill
       }
     }
   });
-  const rawTitle = blessed.box({
+  const rawTitle = blessed2.box({
     top: 0,
     left: 12,
     right: 0,
@@ -19562,7 +20167,7 @@ function createRunnerConsoleDashboardTui(state, exitProcess = () => process.kill
     tags: false,
     hidden: true
   });
-  const backButton = blessed.button({
+  const backButton = blessed2.button({
     top: 0,
     left: 0,
     width: 10,
@@ -19577,7 +20182,7 @@ function createRunnerConsoleDashboardTui(state, exitProcess = () => process.kill
       hover: { inverse: true }
     }
   });
-  const rawBox = blessed.box({
+  const rawBox = blessed2.box({
     top: 3,
     left: 0,
     width: "100%",
@@ -20056,6 +20661,7 @@ var dashboardState, maxRawLines, escapeKey, ctrlCKey, enterKey, upKey, downKey,
 var init_runnerConsoleReporter = __esm({
   "src/runnerConsoleReporter.ts"() {
     "use strict";
+    init_blessedTputSetulcShim();
     dashboardState = {
       jobs: /* @__PURE__ */ new Map(),
       discovery: /* @__PURE__ */ new Map(),
@@ -21381,6 +21987,7 @@ import { spawn as spawn9, spawnSync as spawnSync5 } from "node:child_process";
 import { createHash as createHash5, randomUUID as randomUUID4 } from "node:crypto";
 import {
   chmodSync as chmodSync2,
+  existsSync as existsSync13,
   lstatSync,
   mkdirSync as mkdirSync12,
   mkdtempSync as mkdtempSync4,
@@ -21395,6 +22002,7 @@ import {
 import { readFile as readFile2 } from "node:fs/promises";
 import { createServer as createServer3 } from "node:http";
 import { homedir as homedir13, hostname as hostname2, tmpdir as tmpdir3 } from "node:os";
+import { createInterface } from "node:readline";
 import {
   basename as basename8,
   dirname as dirname13,
@@ -21419,42 +22027,35 @@ async function runLocalCodexRunner(options) {
   });
   try {
     if (options.machineId !== void 0) {
-      let runnerLock;
-      try {
-        runnerLock = acquireRunnerLock({
-          machineId: options.machineId,
-          runnerId: options.runnerId,
-          cwd: options.cwd,
-          workspace: runnerWorkspaceSlug(options) ?? null,
-          linzumiUrl: options.kandanUrl,
-          launchSource: options.launchSource,
-          configPath: options.runnerLockConfigPath,
-          // Wedged-runner takeover: a lock holder whose pid is alive but
-          // whose lock heartbeat went stale (>3 min) gets SIGKILLed and its
-          // lock replaced, instead of blocking recovery until someone runs
-          // kill -9 by hand. Log it so the runner log explains where the old
-          // pid went.
-          onTakeover: (takeover) => {
-            log2("runner.lock_takeover", {
-              runnerId: options.runnerId,
-              holderRunnerId: takeover.holderRunnerId,
-              holderPid: takeover.holderPid,
-              reason: takeover.reason,
-              lockPath: takeover.lockPath
-            });
-          }
-        });
-      } catch (error) {
-        if (isRunnerLockHeldError(error)) {
-          log2("runner.lock_held_by_live_process", {
+      const machineId = options.machineId;
+      const acquire = () => acquireRunnerLock({
+        machineId,
+        runnerId: options.runnerId,
+        cwd: options.cwd,
+        workspace: runnerWorkspaceSlug(options) ?? null,
+        linzumiUrl: options.kandanUrl,
+        launchSource: options.launchSource,
+        configPath: options.runnerLockConfigPath,
+        // Wedged-runner takeover: a lock holder whose pid is alive but
+        // whose lock heartbeat went stale (>3 min) gets SIGKILLed and its
+        // lock replaced, instead of blocking recovery until someone runs
+        // kill -9 by hand. Log it so the runner log explains where the old
+        // pid went.
+        onTakeover: (takeover) => {
+          log2("runner.lock_takeover", {
             runnerId: options.runnerId,
-            heldByRunnerId: error.heldBy.runnerId,
-            heldByPid: error.heldBy.pid,
-            lockPath: error.lockPath
+            holderRunnerId: takeover.holderRunnerId,
+            holderPid: takeover.holderPid,
+            reason: takeover.reason,
+            lockPath: takeover.lockPath
           });
         }
-        throw error;
-      }
+      });
+      const runnerLock = await acquireRunnerLockWithConflictResolution(
+        acquire,
+        options,
+        log2
+      );
       cleanup.actions.push(() => runnerLock.release());
       log2("runner.lock_acquired", {
         path: runnerLock.path,
@@ -22474,6 +23075,11 @@ async function openLocalCodexRunner(options, log2, cleanup, close) {
   if (options.channelSession !== void 0 && codex === void 0) {
     throw new Error("channel session requires a Codex app-server connection");
   }
+  const ownsRespawnableAppServer = runnerOwnsRespawnableAppServer({
+    codexUrl: options.codexUrl,
+    threadProcessRole: options.threadProcess?.role,
+    ownsStartedAppServer: started !== void 0
+  });
   const seq = { value: 0 };
   const discoveredCodexThreads = { value: [] };
   const runtimeDefaults = runnerRuntimeDefaults(options);
@@ -22565,6 +23171,7 @@ async function openLocalCodexRunner(options, log2, cleanup, close) {
   const dynamicChannelSessions = /* @__PURE__ */ new Map();
   const dynamicChannelSessionCodexClients = /* @__PURE__ */ new Map();
   const codexTurnFailureGuards = /* @__PURE__ */ new Map();
+  const lossReportPushes = [];
   const codexTurnFailureGuardFor = (client) => {
     const existing = codexTurnFailureGuards.get(client);
     if (existing !== void 0) {
@@ -22577,7 +23184,36 @@ async function openLocalCodexRunner(options, log2, cleanup, close) {
           ([codexThreadId]) => dynamicChannelSessionCodexClients.get(codexThreadId) === client
         ).map(([, session]) => session)
       ],
-      log: log2
+      log: log2,
+      // Spec: plans/2026-06-13-orphaned-mid-turn-reconnect-recovery-spec.md
+      // The runner process and its channel survive an app-server death, so the
+      // server otherwise keeps these thread bindings "connected" and never
+      // offers reconnect. Report the loss per affected thread (best-effort)
+      // so the bindings flip to disconnected/reconnectable upstream.
+      //
+      // Only do this for a runner that owns a respawnable app-server. For an
+      // external/remote `codexUrl` backend (or a thread-process worker) this
+      // runner cannot relaunch the dead app-server, so a reconnect could never
+      // recover the thread - marking it reconnectable would be misleading. In
+      // that case we still fail the in-flight turns terminally, but leave the
+      // binding as-is rather than offering a reconnect that cannot succeed.
+      onActiveThreadsFailed: ownsRespawnableAppServer ? (threadIds) => {
+        for (const codexThreadId of threadIds) {
+          lossReportPushes.push(
+            kandan.push(topic, "session:app_server_lost", {
+              codex_thread_id: codexThreadId
+            }).then(
+              () => void 0,
+              (error) => {
+                log2("kandan.session_app_server_lost_push_failed", {
+                  codex_thread_id: codexThreadId,
+                  message: error instanceof Error ? error.message : String(error)
+                });
+              }
+            )
+          );
+        }
+      } : void 0
     });
     codexTurnFailureGuards.set(client, guard);
     return guard;
@@ -22681,7 +23317,8 @@ async function openLocalCodexRunner(options, log2, cleanup, close) {
         portForwardWatcher: channelSessionPortForwardWatcherOptions({
           rootPid: portForwardWatcherRootPid,
           start: options.portForwardWatcher,
-          commanderBoundPids: args.commanderBoundPids
+          commanderBoundPids: args.commanderBoundPids,
+          commanderBoundPorts: args.commanderBoundPorts
         }),
         suppressedForwardPorts,
         onForwardPortApproved: (port, attribution) => {
@@ -22876,6 +23513,12 @@ async function openLocalCodexRunner(options, log2, cleanup, close) {
         portForwardWatcherRootPid: handle.processPid,
         commanderBoundPids: (handle.commanderManagedPorts ?? []).flatMap(
           (port) => port.pid === void 0 ? [] : [port.pid]
+        ),
+        // The exact codex app-server ports are commander-managed even though
+        // their listening pid is the wrapped grandchild, not the recorded
+        // wrapper pid (Codex P1).
+        commanderBoundPorts: (handle.commanderManagedPorts ?? []).map(
+          (port) => port.port
         )
       });
       switch (control.type) {
@@ -23025,6 +23668,7 @@ async function openLocalCodexRunner(options, log2, cleanup, close) {
     }
   });
   if (sharedCodexTurnFailureGuard !== void 0) {
+    const appServerLost = { handled: false };
     const failCodexSessionTurns = (cause) => {
       if (cleanup.closePromise !== void 0) {
         return;
@@ -23032,6 +23676,27 @@ async function openLocalCodexRunner(options, log2, cleanup, close) {
       log2("codex.app_server_connection_lost", { cause });
       sharedCodexTurnFailureGuard.failActiveTurns(cause);
       started?.stop();
+      if (ownsRespawnableAppServer && !appServerLost.handled) {
+        appServerLost.handled = true;
+        console.error(
+          `Codex app-server connection was lost (${cause}); exiting so a fresh runner can relaunch it. Run \`linzumi connect\` to reconnect.`
+        );
+        const sessionDrains = [
+          ...channelSession !== void 0 ? [channelSession] : [],
+          ...dynamicChannelSessions.values()
+        ].map(
+          (session) => session.close().catch((error) => {
+            log2("codex.app_server_lost_session_drain_failed", {
+              message: error instanceof Error ? error.message : String(error)
+            });
+          })
+        );
+        void awaitLossReportsThenExit({
+          pushes: [...lossReportPushes, ...sessionDrains],
+          exit: () => process.exit(75),
+          safetyCapMs: 5e3
+        });
+      }
     };
     codex?.onClose?.((error) => failCodexSessionTurns(error.message));
     started?.process.once(
@@ -23787,6 +24452,19 @@ async function resolveSessionControl(channelSession, dynamicChannelSessions, con
   }
   return void 0;
 }
+function runnerOwnsRespawnableAppServer(args) {
+  return args.codexUrl === void 0 && args.threadProcessRole !== "thread" && args.ownsStartedAppServer;
+}
+async function awaitLossReportsThenExit(args) {
+  const setTimeoutImpl = args.setTimeoutFn ?? setTimeout;
+  const drained = Promise.allSettled(args.pushes).then(() => void 0);
+  const safetyCap = new Promise((resolve12) => {
+    const handle = setTimeoutImpl(() => resolve12(), args.safetyCapMs);
+    handle?.unref?.();
+  });
+  await Promise.race([drained, safetyCap]);
+  args.exit();
+}
 function createCodexTurnFailureGuard(args) {
   const activeTurnsByThread = /* @__PURE__ */ new Map();
   const state = { failed: false };
@@ -23822,6 +24500,7 @@ function createCodexTurnFailureGuard(args) {
       if (activeTurns.length === 0) {
         return;
       }
+      args.onActiveThreadsFailed?.(activeTurns.map(([threadId]) => threadId));
       const sessions = Array.from(args.sessions());
       for (const [threadId, turnId] of activeTurns) {
         args.log("codex.active_turn_failed_on_connection_loss", {
@@ -23979,6 +24658,101 @@ function installCleanupHandlers(close) {
     process.off("exit", closeOnExit);
   };
 }
+async function acquireRunnerLockWithConflictResolution(acquire, options, log2) {
+  try {
+    return acquire();
+  } catch (error) {
+    if (!isRunnerLockHeldError(error)) {
+      throw error;
+    }
+    log2("runner.lock_held_by_live_process", {
+      runnerId: options.runnerId,
+      heldByRunnerId: error.heldBy.runnerId,
+      heldByPid: error.heldBy.pid,
+      lockPath: error.lockPath
+    });
+    const lockTakeover = options.lockTakeover;
+    if (!shouldResolveRunnerLockConflict(lockTakeover)) {
+      throw error;
+    }
+    const promptDeps = lockTakeover.prompt ?? defaultRunnerLockTakeoverPromptDeps(lockTakeover);
+    const takeoverDeps = resolveRunnerLockTakeoverDeps(
+      error.lockPath,
+      lockTakeover.takeover,
+      log2
+    );
+    const resolution = await resolveRunnerLockConflict({
+      holder: error.heldBy,
+      lockPath: error.lockPath,
+      baseMessage: error.message,
+      takeOverWithoutPrompt: lockTakeover.takeOverWithoutPrompt === true,
+      prompt: promptDeps,
+      takeover: takeoverDeps
+    });
+    if (resolution.outcome === "declined") {
+      throw new RunnerLockConflictReportedError();
+    }
+    log2("runner.lock_takeover_interactive", {
+      runnerId: options.runnerId,
+      heldByRunnerId: error.heldBy.runnerId,
+      heldByPid: error.heldBy.pid,
+      lockPath: error.lockPath
+    });
+    return acquire();
+  }
+}
+function defaultRunnerLockTakeoverPromptDeps(takeover) {
+  return {
+    isInteractive: () => takeover?.forceNonInteractive !== true && process.stdin.isTTY === true && process.stderr.isTTY === true,
+    writeReport: (text2) => {
+      process.stderr.write(`${text2}
+`);
+    },
+    promptYesNo: (question) => promptYesNoOnStdin(question)
+  };
+}
+function promptYesNoOnStdin(question) {
+  return new Promise((resolve12) => {
+    const rl = createInterface({
+      input: process.stdin,
+      output: process.stderr
+    });
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve12(/^y(es)?$/i.test(answer.trim()));
+    });
+  });
+}
+function resolveRunnerLockTakeoverDeps(lockPath, overrides, log2) {
+  return {
+    isPidAlive: overrides?.isPidAlive ?? runnerLockTakeoverPidIsAlive,
+    signalPid: overrides?.signalPid ?? ((pid, signal) => {
+      process.kill(pid, signal);
+    }),
+    lockReleased: overrides?.lockReleased ?? (() => !existsSync13(lockPath)),
+    // Re-reads the on-disk owner so the takeover flow can revalidate identity
+    // before signaling (never throws on a torn/partial lock file).
+    currentLockOwner: overrides?.currentLockOwner ?? (() => readRunnerLockOwner(lockPath)),
+    // runnerLockTakeoverSleep is deliberately NOT unref'ed - see its definition;
+    // an unref'ed timer here would let `linzumi connect` exit before retrying
+    // the lock acquisition during a takeover.
+    sleep: overrides?.sleep ?? runnerLockTakeoverSleep,
+    now: overrides?.now ?? (() => Date.now()),
+    log: overrides?.log ?? ((event, payload) => {
+      log2(event, payload);
+      writeCliAuditEvent(event, payload);
+    })
+  };
+}
+function runnerLockTakeoverPidIsAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    const code = error !== null && typeof error === "object" && "code" in error ? error.code : void 0;
+    return code !== "ESRCH";
+  }
+}
 function launchCodexTui(codexBin, codexUrl, cwd, codexThreadId, session, fast) {
   const args = codexTuiArgs(codexUrl, codexThreadId, session, fast);
   writeCliAuditEvent("process.spawn", {
@@ -24965,29 +25739,18 @@ async function applyControl(codex, kandan, topic, instanceId, options, agentProv
         approvalPolicy: stringValue(control.approvalPolicy) ?? void 0
       });
       if (applied.approval_policy === "never") {
-        const pendingForSession = [
-          ...pendingClaudeCodeApprovals.entries()
-        ].filter(
-          ([, pending]) => pending.sessionId === void 0 || pending.sessionId === control.threadId
-        );
-        for (const [requestId, pending] of pendingForSession) {
-          pending.resolve({ type: "allow" });
-          await publishClaudeCodeMessageState(kandan, topic, {
-            workspace: pending.workspace,
-            channel: pending.channel,
-            threadId: pending.threadId,
-            sourceSeq: pending.sourceSeq,
-            status: "processing",
-            reason: "Claude Code tool approved",
-            sessionId: pending.sessionId ?? control.threadId
-          });
-          log2("claude_code.approval_request_auto_approved", {
-            request_id: requestId,
-            source_seq: pending.sourceSeq,
-            session_id: pending.sessionId ?? control.threadId,
-            reason: "full_access_enabled"
-          });
-        }
+        await settleClaudeCodeApprovalsForSession({
+          kandan,
+          topic,
+          pendingClaudeCodeApprovals,
+          // activeClaudeCodeSessions is keyed by the SDK session id, so
+          // control.threadId here is the SDK session id, NOT the linzumi thread
+          // id. The drain matches pending approvals by their linzumi threadId,
+          // so pass the session's stored linzumi threadId (Codex PR #1846 P1).
+          sessionThreadId: claudeSession.threadId,
+          log: log2,
+          reason: "full_access_enabled"
+        });
       }
       return {
         instanceId,
@@ -25837,6 +26600,7 @@ async function startClaudeCodeProviderInstance(args) {
     args.options,
     args.control
   );
+  const initialPermissionMode = runtimeSettings.approvalPolicy === void 0 ? void 0 : claudePermissionModeForApprovalPolicy(runtimeSettings.approvalPolicy);
   if (args.resumeSessionId !== void 0) {
     try {
       await validateClaudeCodeResumeSession({
@@ -25856,6 +26620,16 @@ async function startClaudeCodeProviderInstance(args) {
     codexVersion: void 0
   };
   const abortController = new AbortController();
+  const reaperRegistration = registerEngineChild({
+    stop: () => {
+      if (!abortController.signal.aborted) {
+        abortController.abort(new Error("engine child reaper teardown"));
+      }
+    },
+    pid: void 0,
+    ownProcessGroup: false,
+    kind: "claude_code"
+  });
   const acceptedSourceSeqs = new Set(
     sourceSeq === void 0 ? [] : [sourceSeq]
   );
@@ -25863,6 +26637,7 @@ async function startClaudeCodeProviderInstance(args) {
   let startControlResponded = false;
   let activeSessionId;
   let sessionControls;
+  let startupApprovalDrain;
   const planMirrorClient = createLinzumiMcpApiClient({
     kandanUrl: args.options.kandanUrl,
     accessToken: args.options.token,
@@ -26193,6 +26968,18 @@ async function startClaudeCodeProviderInstance(args) {
             linzumiContext
           }),
           model: claudeCodeModelForRuntimeModel(runtimeSettings.model),
+          // Apply the user's initial access level at session START, mirroring
+          // codex (which seeds approvalPolicy / sandbox via
+          // codexThreadRuntimeOverrides at start). Without this every Claude
+          // Code session started in the SDK's 'default' mode and the no-prompt
+          // ("never" -> bypassPermissions) level only took effect once an
+          // update_session_settings control arrived post-start - so WebFetch
+          // (no built-in allowlist) still raised an approval card on turn 1.
+          // The mode is derived from runtimeSettings.approvalPolicy, which the
+          // server already gates so only "never" (paired with a full-access
+          // sandbox) survives to map to bypassPermissions; lesser levels keep
+          // their 'default' / 'acceptEdits' modes.
+          ...initialPermissionMode === void 0 ? {} : { permissionMode: initialPermissionMode },
           resumeSessionId: args.resumeSessionId,
           abortController,
           streamingInput: inputQueue,
@@ -26210,6 +26997,22 @@ async function startClaudeCodeProviderInstance(args) {
           allowedTools: ["mcp__linzumi__*"],
           onSessionControls: (controls) => {
             sessionControls = controls;
+            if (initialPermissionMode === "bypassPermissions") {
+              startupApprovalDrain = settleClaudeCodeApprovalsForSession({
+                kandan: args.kandan,
+                topic: args.topic,
+                pendingClaudeCodeApprovals: args.pendingClaudeCodeApprovals,
+                sessionThreadId: threadId,
+                log: args.log,
+                reason: "full_access_started"
+              }).catch((error) => {
+                args.log("claude_code.startup_approval_drain_failed", {
+                  linzumi_thread_id: threadId,
+                  claude_session_id: activeSessionId ?? null,
+                  message: error instanceof Error ? error.message : String(error)
+                });
+              });
+            }
           },
           onTurnCompleted: () => {
             inputQueue.completeTurn();
@@ -26260,6 +27063,7 @@ async function startClaudeCodeProviderInstance(args) {
     return result2;
   };
   const sessionWork = runSession();
+  void sessionWork.finally(() => reaperRegistration.unregister()).catch(() => void 0);
   sessionWorkHandle.value = sessionWork;
   const settled = await Promise.race([
     sessionWork.then((result2) => ({
@@ -26301,6 +27105,9 @@ async function startClaudeCodeProviderInstance(args) {
       message: error instanceof Error ? error.message : String(error)
     });
   }
+  if (startupApprovalDrain !== void 0) {
+    await startupApprovalDrain;
+  }
   void sessionWork.then(
     () => {
       args.log("claude_code.session_loop_ended", {
@@ -26336,6 +27143,35 @@ function claudePermissionModeForApprovalPolicy(approvalPolicy) {
       return void 0;
   }
 }
+function claudeCodeApprovalsForSessionThread(pendingClaudeCodeApprovals, sessionThreadId) {
+  return [...pendingClaudeCodeApprovals.entries()].filter(
+    ([, pending]) => pending.threadId === sessionThreadId
+  );
+}
+async function settleClaudeCodeApprovalsForSession(args) {
+  const pendingForSession = claudeCodeApprovalsForSessionThread(
+    args.pendingClaudeCodeApprovals,
+    args.sessionThreadId
+  );
+  for (const [requestId, pending] of pendingForSession) {
+    pending.resolve({ type: "allow" });
+    await publishClaudeCodeMessageState(args.kandan, args.topic, {
+      workspace: pending.workspace,
+      channel: pending.channel,
+      threadId: pending.threadId,
+      sourceSeq: pending.sourceSeq,
+      status: "processing",
+      reason: "Claude Code tool approved",
+      sessionId: pending.sessionId ?? args.sessionThreadId
+    });
+    args.log("claude_code.approval_request_auto_approved", {
+      request_id: requestId,
+      source_seq: pending.sourceSeq,
+      session_id: pending.sessionId ?? args.sessionThreadId,
+      reason: args.reason
+    });
+  }
+}
 function claudeSteerInputText(input) {
   const items = arrayValue(input) ?? [];
   const text2 = items.flatMap((item) => {
@@ -26698,9 +27534,11 @@ function channelSessionPortForwardWatcherOptions(args) {
     ...args.rootPid === void 0 ? [] : [args.rootPid],
     ...args.commanderBoundPids ?? []
   ];
+  const commanderBoundPorts = args.commanderBoundPorts ?? [];
   return {
     ...args.rootPid === void 0 ? {} : { rootPid: args.rootPid },
     ...commanderBoundPids.length === 0 ? {} : { commanderBoundPids },
+    ...commanderBoundPorts.length === 0 ? {} : { commanderBoundPorts },
     ...args.start === void 0 ? {} : { start: args.start }
   };
 }
@@ -28502,6 +29340,7 @@ var init_runner = __esm({
     init_commanderAttachments();
     init_claudeCodePipeline();
     init_claudeCodePlanMirror();
+    init_engineChildReaper();
     init_claudeCodeLiveBashOutput();
     init_claudeCodeSession();
     init_codexAppServer();
@@ -28524,6 +29363,7 @@ var init_runner = __esm({
     init_protocol();
     init_runnerLogger();
     init_runnerLock();
+    init_runnerLockTakeover();
     init_runnerConsoleReporter();
     init_version();
     init_telemetry();
@@ -28564,7 +29404,7 @@ var init_runner = __esm({
 });
 
 // src/kandanTls.ts
-import { existsSync as existsSync13, readFileSync as readFileSync17 } from "node:fs";
+import { existsSync as existsSync14, readFileSync as readFileSync17 } from "node:fs";
 import { Agent } from "undici";
 import WsWebSocket from "ws";
 function kandanTlsTrustFromEnv() {
@@ -28575,7 +29415,7 @@ function kandanTlsTrustFromCaFile(caFile) {
     return void 0;
   }
   const trimmed = caFile.trim();
-  if (!existsSync13(trimmed)) {
+  if (!existsSync14(trimmed)) {
     throw new Error(`KANDAN_TLS_CA_FILE does not exist: ${trimmed}`);
   }
   const ca = readFileSync17(trimmed, "utf8");
@@ -48853,7 +49693,7 @@ __export(signupFlow_exports, {
 });
 import { spawn as spawn12, spawnSync as spawnSync7 } from "node:child_process";
 import {
-  existsSync as existsSync16,
+  existsSync as existsSync17,
   constants as fsConstants,
   mkdirSync as mkdirSync15,
   mkdtempSync as mkdtempSync5,
@@ -48981,7 +49821,7 @@ function defaultSignupDraftStore(serviceUrl) {
   const path2 = defaultSignupDraftPath(serviceUrl);
   return {
     read: () => {
-      if (!existsSync16(path2)) {
+      if (!existsSync17(path2)) {
         return void 0;
       }
       let parsed;
@@ -49060,7 +49900,7 @@ function defaultSignupTaskCachePath(serviceUrl) {
   );
 }
 function readSignupTaskCache(path2) {
-  if (!existsSync16(path2)) {
+  if (!existsSync17(path2)) {
     return { version: 1, entries: {} };
   }
   let parsed;
@@ -51888,7 +52728,7 @@ async function discoverCodeRoots(homeDir) {
   const candidates = ["src", "code", "projects"].map(
     (name) => join23(homeDir, name)
   );
-  return candidates.filter((path2) => existsSync16(path2)).flatMap((path2) => discoveredProjectNames(path2));
+  return candidates.filter((path2) => existsSync17(path2)).flatMap((path2) => discoveredProjectNames(path2));
 }
 function discoveredProjectNames(root) {
   try {
@@ -51992,25 +52832,25 @@ function looksLikeProject(path2) {
     "pnpm-lock.yaml",
     "yarn.lock",
     "package-lock.json"
-  ].some((name) => existsSync16(join23(path2, name)));
+  ].some((name) => existsSync17(join23(path2, name)));
 }
 function detectProjectLanguage(path2) {
-  if (existsSync16(join23(path2, "pyproject.toml")) || existsSync16(join23(path2, "requirements.txt"))) {
+  if (existsSync17(join23(path2, "pyproject.toml")) || existsSync17(join23(path2, "requirements.txt"))) {
     return "Python";
   }
-  if (existsSync16(join23(path2, "Cargo.toml"))) {
+  if (existsSync17(join23(path2, "Cargo.toml"))) {
     return "Rust";
   }
-  if (existsSync16(join23(path2, "go.mod"))) {
+  if (existsSync17(join23(path2, "go.mod"))) {
     return "Go";
   }
-  if (existsSync16(join23(path2, "mix.exs"))) {
+  if (existsSync17(join23(path2, "mix.exs"))) {
     return "Elixir";
   }
-  if (existsSync16(join23(path2, "tsconfig.json")) || packageJsonMentionsTypeScript(path2)) {
+  if (existsSync17(join23(path2, "tsconfig.json")) || packageJsonMentionsTypeScript(path2)) {
     return "TypeScript";
   }
-  if (existsSync16(join23(path2, "package.json"))) {
+  if (existsSync17(join23(path2, "package.json"))) {
     return "JavaScript";
   }
   return "Project";
@@ -52026,7 +52866,7 @@ function packageJsonMentionsTypeScript(path2) {
   }
 }
 function hasGitMetadata(path2) {
-  return existsSync16(join23(path2, ".git"));
+  return existsSync17(join23(path2, ".git"));
 }
 function childDirectories(root) {
   try {
@@ -52147,9 +52987,10 @@ secure mission control for all your agents on your computers
 // src/index.ts
 init_onboardingDiscoveryChildProcess();
 init_runner();
+init_runnerLockTakeover();
 init_claudeCodeSession();
 init_authCache();
-import { existsSync as existsSync17, readFileSync as readFileSync22, realpathSync as realpathSync7 } from "node:fs";
+import { existsSync as existsSync18, readFileSync as readFileSync22, realpathSync as realpathSync7 } from "node:fs";
 import { homedir as homedir17 } from "node:os";
 import { resolve as resolve11 } from "node:path";
 import { fileURLToPath as fileURLToPath4 } from "node:url";
@@ -52245,7 +53086,7 @@ init_kandanTls();
 init_protocol();
 init_json();
 init_defaultUrls();
-import { existsSync as existsSync14, mkdirSync as mkdirSync13, readFileSync as readFileSync18, writeFileSync as writeFileSync12 } from "node:fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync13, readFileSync as readFileSync18, writeFileSync as writeFileSync12 } from "node:fs";
 import { dirname as dirname14, join as join21 } from "node:path";
 import { homedir as homedir14 } from "node:os";
 async function runAgentCliCommand(args, deps = {
@@ -52964,7 +53805,7 @@ function authorizationHeaders(token) {
   return { authorization: `Bearer ${token}` };
 }
 function readOptionalTextFile(path2) {
-  return existsSync14(path2) ? readFileSync18(path2, "utf8") : void 0;
+  return existsSync15(path2) ? readFileSync18(path2, "utf8") : void 0;
 }
 function writeTextFile(path2, content) {
   mkdirSync13(dirname14(path2), { recursive: true });
@@ -53055,7 +53896,7 @@ init_helloLinzumiProject();
 // src/commanderDaemon.ts
 init_runnerLogger();
 import {
-  existsSync as existsSync15,
+  existsSync as existsSync16,
   closeSync as closeSync3,
   mkdirSync as mkdirSync14,
   openSync as openSync4,
@@ -53149,7 +53990,7 @@ function startCommanderDaemon(options) {
 }
 function commanderDaemonStatus(runnerId, statusDir = commanderStatusDir(), processIdentityReader = readProcessIdentity) {
   const statusFile = commanderStatusFile(runnerId, statusDir);
-  if (!existsSync15(statusFile)) {
+  if (!existsSync16(statusFile)) {
     return { status: "missing", runnerId, statusFile };
   }
   const record = parseRecord(readFileSync19(statusFile, "utf8"));
@@ -53157,7 +53998,7 @@ function commanderDaemonStatus(runnerId, statusDir = commanderStatusDir(), proce
 }
 async function waitForCommanderDaemon(options) {
   const now = options.now ?? (() => Date.now());
-  const readTextFile = options.readTextFile ?? ((path2) => existsSync15(path2) ? readFileSync19(path2, "utf8") : void 0);
+  const readTextFile = options.readTextFile ?? ((path2) => existsSync16(path2) ? readFileSync19(path2, "utf8") : void 0);
   const statusImpl = options.statusImpl ?? commanderDaemonStatus;
   const deadline = now() + options.timeoutMs;
   while (now() <= deadline) {
@@ -66372,6 +67213,11 @@ var flagDefinitions = /* @__PURE__ */ new Map([
   ["command", { kind: "value" }],
   ["owner-username", { kind: "value" }],
   ["include-token", { kind: "boolean" }],
+  // Interactive lock-conflict resolution on connect: --take-over stops a live
+  // holder without a prompt (automation); --no-input forces non-interactive so
+  // a TTY never blocks on the takeover prompt (falls back to report + exit 1).
+  ["take-over", { kind: "boolean" }],
+  ["no-input", { kind: "boolean" }],
   ["help", { kind: "boolean" }]
 ]);
 var helloFlagDefinitions = /* @__PURE__ */ new Map([
@@ -66388,8 +67234,11 @@ if (isMainModule()) {
   try {
     await main(process.argv.slice(2));
   } catch (error) {
-    process.stderr.write(`${cliErrorMessage(error)}
+    const message = cliErrorMessage(error);
+    if (message !== "") {
+      process.stderr.write(`${message}
 `);
+    }
     process.exit(1);
   }
 }
@@ -66812,6 +67661,9 @@ async function runCommanderDaemonCommand(args) {
   }
 }
 function cliErrorMessage(error) {
+  if (isRunnerLockConflictReportedError(error)) {
+    return "";
+  }
   return signupPromptCancelMessage2(error) ?? userFacingErrorMessage(error, { includeSupportLine: true });
 }
 function signupPromptCancelMessage2(error) {
@@ -67099,7 +67951,7 @@ async function parseAgentRunnerArgs(args, deps = {
   };
 }
 function readAgentTokenTextFile(path2) {
-  return existsSync17(path2) ? readFileSync22(path2, "utf8") : void 0;
+  return existsSync18(path2) ? readFileSync22(path2, "utf8") : void 0;
 }
 function rejectAgentRunnerTargetingFlags(values) {
   const unsupportedFlags = [
@@ -67274,7 +68126,11 @@ async function parseRunnerArgs(args, deps = {
     workspaceSlug: workspaceSlug ?? singleWorkspaceScopeFromAccessToken(token),
     runtimeDefaults: runnerRuntimeDefaultsFromValues(values),
     onboardingDiscovery,
-    channelSession: void 0
+    channelSession: void 0,
+    lockTakeover: {
+      takeOverWithoutPrompt: values.get("take-over") === true,
+      forceNonInteractive: values.get("no-input") === true
+    }
   };
 }
 function runnerRuntimeDefaultsFromValues(values) {
@@ -67624,6 +68480,8 @@ Connection:
 
 Workspace:
   --workspace <slug>          Workspace slug
+  --take-over                 If another runner already holds this workspace, stop it and run here (no prompt)
+  --no-input                  Never prompt; if the workspace is held, print the conflict and exit
 
 Codex:
   --cwd <path>                Working directory for Codex, default current directory