@cabane/companion 0.6.188 → 0.6.190

package/dist/cli.js

@@ -788,7 +788,15 @@ var init_config = __esm({
       // and an agent with no folder of its own and no prepare hook works there
       // (`turn-execution.ts`, `prepareEnvironment`). Default `~/.cabane/work`: hidden, so pairing a
       // laptop creates no new visible folder; set it to make the work visible.
-      root: z2.string().min(1).refine(isRootPath, { message: "must be an absolute path, or start with ~/" }).optional()
+      root: z2.string().min(1).refine(isRootPath, { message: "must be an absolute path, or start with ~/" }).optional(),
+      // An argv prefix the operator puts in front of every turn's runner: the companion starts
+      // `<prefix…> <its own run-turn command…>` instead of the runner bare. What the prefix does
+      // is the operator's (a box of their own making, ENG225); the companion knows nothing of it
+      // beyond handing the runner over, with the turn's inputs in its environment and the
+      // credential and secrets on its stdin (`runner/launch.ts`, `boxed`).
+      runner: z2.object({
+        command: z2.array(z2.string().min(1)).min(1)
+      }).strict().optional()
     });
     legacyOfferSchema = z2.object({
       claudeCode: z2.object({ enabled: z2.boolean().optional() }).passthrough().optional(),
@@ -1014,6 +1022,142 @@ var init_bundled_binaries = __esm({
   }
 });
 
+// src/harness-versions.ts
+function parseVersionToken(raw) {
+  if (!raw) return null;
+  const m = raw.match(/\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?/);
+  return m ? m[0] : null;
+}
+async function probeOpencodeVersion(serverUrl, fetchImpl = fetch) {
+  try {
+    const base = serverUrl.endsWith("/") ? serverUrl.slice(0, -1) : serverUrl;
+    const res = await fetchImpl(`${base}/global/health`, {
+      headers: { accept: "application/json" }
+    });
+    if (!res.ok) return null;
+    return extractOpencodeVersion(await res.json());
+  } catch {
+    return null;
+  }
+}
+function extractOpencodeVersion(json) {
+  if (!json || typeof json !== "object") return null;
+  const obj = json;
+  const candidates = [obj.version];
+  for (const v of Object.values(obj)) {
+    if (v && typeof v === "object") candidates.push(v.version);
+  }
+  for (const c of candidates) {
+    if (typeof c === "string") {
+      const parsed = parseVersionToken(c);
+      if (parsed) return parsed;
+    }
+  }
+  return null;
+}
+function emptyHarnessVersions() {
+  return { ...EMPTY };
+}
+var EMPTY;
+var init_harness_versions = __esm({
+  "src/harness-versions.ts"() {
+    "use strict";
+    EMPTY = { claudeCode: null, opencode: null, codex: null };
+  }
+});
+
+// src/harness-usable.ts
+import { spawn as spawn2 } from "child_process";
+function apiKeyVariable(runtime, env = process.env) {
+  return API_KEY_VARIABLES[runtime].find((name) => !!env[name]?.trim()) ?? null;
+}
+async function checkHarnessUsable(runtime, deps = {}) {
+  const env = deps.env ?? process.env;
+  const resolveBundled = deps.resolveBundled ?? ((r) => resolveBundledBinary(r));
+  const run = deps.run ?? runBounded;
+  const resolution = resolveBundled(runtime);
+  if (resolution.status !== "present" || !resolution.path) {
+    return {
+      status: "bundle_missing",
+      bundled: resolution.status === "present" ? "executable_missing" : resolution.status
+    };
+  }
+  const path = resolution.path;
+  const version = run(path, ["--version"], env).then(
+    (r) => r.code === 0 ? parseVersionToken(r.output) : null
+  );
+  const variable = apiKeyVariable(runtime, env);
+  if (variable) return { status: "api_key", variable, version: await version };
+  const statusArgs = runtime === "codex" ? ["login", "status"] : ["auth", "status", "--json"];
+  const [answer, v] = await Promise.all([run(path, statusArgs, env), version]);
+  if (answer.error) return { status: "check_failed", reason: answer.error };
+  const signedIn = runtime === "codex" ? readCodexStatus(answer) : readClaudeStatus(answer);
+  if (typeof signedIn === "string") return { status: "check_failed", reason: signedIn };
+  return signedIn ? { status: "signed_in", version: v } : { status: "signed_out", version: v };
+}
+function readClaudeStatus(answer) {
+  const start2 = answer.output.indexOf("{");
+  const end = answer.output.lastIndexOf("}");
+  if (start2 < 0 || end < start2) return "unreadable";
+  try {
+    const parsed = JSON.parse(answer.output.slice(start2, end + 1));
+    const loggedIn = parsed?.loggedIn;
+    return typeof loggedIn === "boolean" ? loggedIn : "unreadable";
+  } catch {
+    return "unreadable";
+  }
+}
+function readCodexStatus(answer) {
+  if (answer.code === 0) return true;
+  if (/not logged in/i.test(answer.output)) return false;
+  if (/config/i.test(answer.output)) return "config";
+  return "unreadable";
+}
+function runBounded(path, args, env) {
+  return new Promise((resolve2) => {
+    let settled = false;
+    let out = "";
+    const done = (result) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      resolve2(result);
+    };
+    let child;
+    try {
+      child = spawn2(path, args, { stdio: ["ignore", "pipe", "pipe"], env });
+    } catch {
+      resolve2({ code: null, output: "", error: "spawn" });
+      return;
+    }
+    const capture = (chunk) => {
+      if (out.length < 8192) out += chunk.toString();
+    };
+    child.stdout?.on("data", capture);
+    child.stderr?.on("data", capture);
+    const timer = setTimeout(() => {
+      child.kill("SIGKILL");
+      done({ code: null, output: out, error: "timeout" });
+    }, CHECK_TIMEOUT_MS);
+    timer.unref?.();
+    child.once("error", () => done({ code: null, output: out, error: "spawn" }));
+    child.once("close", (code) => done({ code, output: out }));
+  });
+}
+var API_KEY_VARIABLES, CHECK_TIMEOUT_MS;
+var init_harness_usable = __esm({
+  "src/harness-usable.ts"() {
+    "use strict";
+    init_bundled_binaries();
+    init_harness_versions();
+    API_KEY_VARIABLES = {
+      "claude-code": ["ANTHROPIC_API_KEY", "CLAUDE_CODE_OAUTH_TOKEN"],
+      codex: ["CODEX_API_KEY"]
+    };
+    CHECK_TIMEOUT_MS = 5e3;
+  }
+});
+
 // packages/agent-runtime/src/failure.ts
 import { z as z4 } from "zod";
 function encodeFailureReason(failure) {
@@ -5828,6 +5972,10 @@ var init_transport2 = __esm({
 });
 
 // packages/agent-runtime/src/codex/index.ts
+function isMissingRollout(err) {
+  const message2 = err instanceof Error ? err.message : String(err);
+  return /no rollout found for thread id/i.test(message2);
+}
 function createCodexAdapter(deps = {}) {
   const transport = deps.transport ?? (deps.enabled ? createSdkCodexTransport({ ...deps.apiKey ? { apiKey: deps.apiKey } : {} }) : null);
   return {
@@ -5846,8 +5994,8 @@ function createCodexAdapter(deps = {}) {
       }
       const directory = req.local.cwd ?? "";
       const decision = decideResume3(req.session, directory);
-      const resumeThreadId = "resume" in decision ? decision.resume : null;
-      const threadUsageBaseline = "resume" in decision ? decision.usageBaseline : null;
+      let resumeThreadId = "resume" in decision ? decision.resume : null;
+      let threadUsageBaseline = "resume" in decision ? decision.usageBaseline : null;
       if ("fresh" in decision && decision.reason === "cwd_mismatch") {
         deps.onWarn?.(
           "codex adapter: stored session directory no longer matches the current environment \u2014 starting a fresh thread (SJ527-analogue guard)",
@@ -5912,38 +6060,69 @@ function createCodexAdapter(deps = {}) {
           }
           if (signal.aborted) return;
         }
-        const spec = buildRunSpec2(req, resumeThreadId, threadStanding, images?.paths ?? []);
-        if (spec.model === null) {
-          deps.onWarn?.("Codex is using its default model because no model was resolved", {
-            model: req.config.model
-          });
+        for (; ; ) {
+          const spec = buildRunSpec2(req, resumeThreadId, threadStanding, images?.paths ?? []);
+          if (spec.model === null) {
+            deps.onWarn?.("Codex is using its default model because no model was resolved", {
+              model: req.config.model
+            });
+          }
+          let emitted = false;
+          try {
+            const result = await transport.run(spec, signal);
+            if (signal.aborted) return;
+            for await (const event of decodeCodexStream(result.events, {
+              signal,
+              cwd: req.local.cwd,
+              resumedThreadId: resumeThreadId,
+              degraded,
+              // Which segments the thread carries once this turn lands. A segment sent is that one —
+              // the later copy is what the model reads. One withheld is what the thread had. Read off
+              // the spec, so the record can't disagree with what was sent.
+              promptFingerprint: spec.preamble.core ? spec.fingerprints.core : threadStanding?.core ?? null,
+              conversationFingerprint: spec.preamble.conversation ? spec.fingerprints.conversation : threadStanding?.conversation ?? null,
+              compactions,
+              // What the thread held before this turn, for the write at `thread.started`.
+              heldStanding: {
+                promptFingerprint: threadStanding?.core ?? null,
+                conversationFingerprint: threadStanding?.conversation ?? null,
+                compactions: threadStanding ? compactions : null
+              },
+              storedState: req.session,
+              usageBaseline: threadUsageBaseline,
+              // Codex reports no model in-stream, so record what the thread was started with (null on the
+              // default token). Same for the reasoning effort.
+              resolvedModel: spec.model,
+              resolvedReasoningEffort: spec.modelReasoningEffort ?? null
+            })) {
+              emitted = true;
+              yield event;
+            }
+            return;
+          } catch (err) {
+            if (resumeThreadId === null || emitted || signal.aborted || !isMissingRollout(err)) {
+              throw err;
+            }
+            deps.onWarn?.(
+              "codex adapter: the stored thread has no rollout on this host \u2014 starting a fresh thread",
+              { threadId: resumeThreadId }
+            );
+            resumeThreadId = null;
+            threadUsageBaseline = null;
+            threadStanding = null;
+            compactions = 0;
+            req = { ...req, session: null };
+            degraded = true;
+            if (hooks?.fresh) {
+              const recomposed = await hooks.fresh("session_start_failed");
+              if (signal.aborted) return;
+              if (recomposed) {
+                req = { ...req, ...recomposed, session: null };
+                degraded = false;
+              }
+            }
+          }
         }
-        const result = await transport.run(spec, signal);
-        if (signal.aborted) return;
-        yield* decodeCodexStream(result.events, {
-          signal,
-          cwd: req.local.cwd,
-          resumedThreadId: resumeThreadId,
-          degraded,
-          // Which segments the thread carries once this turn lands. A segment sent is that one —
-          // the later copy is what the model reads. One withheld is what the thread had. Read off
-          // the spec, so the record can't disagree with what was sent.
-          promptFingerprint: spec.preamble.core ? spec.fingerprints.core : threadStanding?.core ?? null,
-          conversationFingerprint: spec.preamble.conversation ? spec.fingerprints.conversation : threadStanding?.conversation ?? null,
-          compactions,
-          // What the thread held before this turn, for the write at `thread.started`.
-          heldStanding: {
-            promptFingerprint: threadStanding?.core ?? null,
-            conversationFingerprint: threadStanding?.conversation ?? null,
-            compactions: threadStanding ? compactions : null
-          },
-          storedState: req.session,
-          usageBaseline: threadUsageBaseline,
-          // Codex reports no model in-stream, so record what the thread was started with (null on the
-          // default token). Same for the reasoning effort.
-          resolvedModel: spec.model,
-          resolvedReasoningEffort: spec.modelReasoningEffort ?? null
-        });
       } finally {
         if (images) {
           try {
@@ -7365,6 +7544,14 @@ function required(env, name) {
   if (!value) throw new Error(`runner: ${name} is not set`);
   return value;
 }
+function runnerPlace(env) {
+  const workRoot2 = env[PLACE_ENV.workRoot];
+  const transcriptDir = env[PLACE_ENV.transcriptDir];
+  return {
+    ...workRoot2 ? { workRoot: workRoot2 } : {},
+    ...transcriptDir ? { transcriptDir } : {}
+  };
+}
 function parseRunnerInput(env, stdin) {
   const dispatch = dispatchSchema.parse(JSON.parse(required(env, RUNNER_ENV.dispatch)));
   const spec = runnerSpecSchema.parse(JSON.parse(required(env, RUNNER_ENV.spec)));
@@ -7372,10 +7559,12 @@ function parseRunnerInput(env, stdin) {
   return {
     baseUrl: required(env, RUNNER_ENV.url),
     credential: credentials.credential,
+    ...credentials.secrets ? { secrets: credentials.secrets } : {},
     dispatch,
     turnId: required(env, RUNNER_ENV.turnId),
     resumed: env[RUNNER_ENV.resumed] === "1",
-    spec
+    spec,
+    place: runnerPlace(env)
   };
 }
 function runnerEnv(input) {
@@ -7388,7 +7577,10 @@ function runnerEnv(input) {
   };
 }
 function runnerStdin(input) {
-  return `${JSON.stringify({ credential: input.credential })}
+  return `${JSON.stringify({
+    credential: input.credential,
+    ...input.secrets ? { secrets: input.secrets } : {}
+  })}
 `;
 }
 function encodeLauncherMessage(message2) {
@@ -7418,7 +7610,7 @@ function decodeRunnerEvent(line) {
   if (!value || typeof value !== "object" || !("cabaneRunner" in value)) return null;
   return value;
 }
-var RUNNER_ENV, runtimeHealthSchema, runnerSpecSchema, dispatchSchema, credentialsSchema;
+var RUNNER_ENV, PLACE_ENV, runtimeHealthSchema, runnerSpecSchema, dispatchSchema, credentialsSchema;
 var init_protocol = __esm({
   "src/runner/protocol.ts"() {
     "use strict";
@@ -7437,6 +7629,10 @@ var init_protocol = __esm({
       // Everything else the turn is constructed from, as JSON: see `RunnerSpec`.
       spec: "CABANE_RUNNER_SPEC"
     };
+    PLACE_ENV = {
+      workRoot: "CABANE_WORK_ROOT",
+      transcriptDir: "CABANE_TRANSCRIPT_DIR"
+    };
     runtimeHealthSchema = z14.object({
       quotaState: z14.enum(["ok", "limited", "auth_expired", "unknown"]),
       limitedUntil: z14.string().nullable(),
@@ -7486,7 +7682,8 @@ var init_protocol = __esm({
       episode: z14.number().int().optional()
     });
     credentialsSchema = z14.object({
-      credential: z14.string().startsWith("cabrn_")
+      credential: z14.string().startsWith("cabrn_"),
+      secrets: z14.record(z14.string(), z14.string()).optional()
     });
   }
 });
@@ -7498,6 +7695,19 @@ function selfRunnerCommand() {
   if (!script) throw new Error("runner: cannot tell which script started this companion");
   return [process.execPath, ...process.execArgv, script, "run-turn"];
 }
+function wrappedRunnerCommand(prefix, own) {
+  return [...prefix ?? [], ...own];
+}
+function runnerExecEnv(base, boxed) {
+  const env = {};
+  for (const [k, v] of Object.entries(base)) {
+    if (v === void 0) continue;
+    if (boxed && (BOXED_ENV_DROPPED.includes(k) || k.startsWith(BOXED_ENV_DROPPED_PREFIX)))
+      continue;
+    env[k] = v;
+  }
+  return env;
+}
 function healthSnapshot(store) {
   const out = {};
   for (const r of store?.reports() ?? []) {
@@ -7694,13 +7904,12 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
     return { ok: false, durationMs: durationMs2, reason: reason2 };
   }
   try {
-    const env = {};
-    for (const [k, v] of Object.entries(launch.env ?? process.env)) {
-      if (v !== void 0) env[k] = v;
-    }
+    const boxed = launch.boxed === true;
+    const env = runnerExecEnv(launch.env ?? process.env, boxed);
     const input = {
       baseUrl: opts.baseUrl,
       credential: minted.credential,
+      ...boxed ? { secrets: launch.secrets?.() ?? {} } : {},
       dispatch: payload,
       turnId,
       resumed: handleOpts.resumed,
@@ -7772,7 +7981,7 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
           locks?.release(lockOwner(event.id));
           return;
         case "process_group":
-          groups.push(event.pgid);
+          if (!boxed) groups.push(event.pgid);
           return;
         case "remote_session":
           remote.push({ serverUrl: event.serverUrl, sessionId: event.sessionId });
@@ -7793,7 +8002,8 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
   }
   if (result) return result;
   const durationMs = Date.now() - startedAt;
-  const reason = thrown !== void 0 ? `runner_failed: ${thrown}` : `runner_exited: ${code}`;
+  const stopped = controller.signal.aborted && thrown === void 0;
+  const reason = stopped ? "cancelled" : thrown !== void 0 ? `runner_failed: ${thrown}` : `runner_exited: ${code}`;
   await child?.reap(groups);
   const reaped = await (launch.reapTurn ?? reapTurnScopes)(turnId).catch((err) => ({
     failures: [err instanceof Error ? err.message : String(err)]
@@ -7808,8 +8018,7 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
     await opts.api.setActiveRun(opts.workspaceId, payload.conversationId, payload.agentId, {
       activeRunStartedAt: null,
       turnId,
-      outcome: "failed",
-      errorReason: reason.slice(0, ERROR_REASON_MAX),
+      ...stopped ? { outcome: "interrupted" } : { outcome: "failed", errorReason: reason.slice(0, ERROR_REASON_MAX) },
       readThrough: payload.messageId
     });
   } catch (err) {
@@ -7827,11 +8036,12 @@ async function runTurnInRunner(opts, launch, duties, payload, handleOpts) {
     reason: "exited"
   });
   if (thrown !== void 0) throw new Error(thrown);
-  log2.warn({ turnId, code }, "runner: exited without reporting a result");
+  if (stopped) log2.info({ turnId, code }, "runner: stopped before it could report");
+  else log2.warn({ turnId, code }, "runner: exited without reporting a result");
   duties.notifyEnd({ id: payload.messageId, ok: false, durationMs, reason });
   return { ok: false, durationMs, reason };
 }
-var PINO_LEVELS;
+var BOXED_ENV_DROPPED, BOXED_ENV_DROPPED_PREFIX, PINO_LEVELS;
 var init_launch = __esm({
   "src/runner/launch.ts"() {
     "use strict";
@@ -7842,6 +8052,16 @@ var init_launch = __esm({
     init_boot_id();
     init_turn_containment();
     init_protocol();
+    BOXED_ENV_DROPPED = [
+      "ANTHROPIC_API_KEY",
+      "CLAUDE_CODE_OAUTH_TOKEN",
+      "CODEX_API_KEY",
+      "GH_TOKEN",
+      "GITHUB_TOKEN",
+      "DBUS_SESSION_BUS_ADDRESS",
+      "XDG_RUNTIME_DIR"
+    ];
+    BOXED_ENV_DROPPED_PREFIX = "CABANE_GATE_";
     PINO_LEVELS = {
       10: "trace",
       20: "debug",
@@ -8456,9 +8676,9 @@ import { z as z16 } from "zod";
 function secretsPath() {
   return join19(cabaneDir(), "secrets.json");
 }
-function loadSecretStore() {
+function loadSecretValues() {
   const path = secretsPath();
-  if (!existsSync10(path)) return makeStore({});
+  if (!existsSync10(path)) return {};
   let raw;
   try {
     raw = readFileSync8(path, "utf8");
@@ -8467,7 +8687,7 @@ function loadSecretStore() {
       `couldn't read ${path}: ${err instanceof Error ? err.message : String(err)}`
     );
   }
-  if (raw.trim().length === 0) return makeStore({});
+  if (raw.trim().length === 0) return {};
   let parsed;
   try {
     parsed = JSON.parse(raw);
@@ -8482,14 +8702,17 @@ function loadSecretStore() {
       `${path} must be a flat object mapping secret names to string values (e.g. { "GITHUB_TOKEN": "ghp_\u2026" }).`
     );
   }
-  return makeStore(result.data);
+  return result.data;
 }
 function loadSecretStoreTolerant(onWarn) {
+  return makeStore(loadSecretValuesTolerant(onWarn));
+}
+function loadSecretValuesTolerant(onWarn) {
   try {
-    return loadSecretStore();
+    return loadSecretValues();
   } catch (err) {
     onWarn?.(err instanceof Error ? err.message : String(err));
-    return makeStore({});
+    return {};
   }
 }
 function makeStore(map) {
@@ -8581,6 +8804,31 @@ var init_secrets = __esm({
   }
 });
 
+// src/turn-env.ts
+function harnessLoginEnv(store, runtime) {
+  const names = [
+    ...runtime in API_KEY_VARIABLES ? API_KEY_VARIABLES[runtime] : [],
+    GITHUB_TOKEN_NAME
+  ];
+  const env = {};
+  for (const name of names) {
+    const value = store.get(name);
+    if (value) env[name] = value;
+  }
+  return env;
+}
+function turnIdentityEnv(ids) {
+  return { CABANE_CONVERSATION_ID: ids.conversationId, CABANE_AGENT_ID: ids.agentId };
+}
+var GITHUB_TOKEN_NAME;
+var init_turn_env = __esm({
+  "src/turn-env.ts"() {
+    "use strict";
+    init_harness_usable();
+    GITHUB_TOKEN_NAME = "GH_TOKEN";
+  }
+});
+
 // src/transcript-writer.ts
 import { appendFileSync, chmodSync as chmodSync4, copyFileSync, mkdirSync as mkdirSync8, readdirSync, rmSync as rmSync6 } from "fs";
 import { basename as basename3, dirname as dirname7, join as join20 } from "path";
@@ -8971,6 +9219,7 @@ var init_turn_execution = __esm({
     init_prepare_failure();
     init_prepared();
     init_secrets();
+    init_turn_env();
     init_turn_control_tools();
     init_transcript_writer();
     init_turn_containment();
@@ -9038,6 +9287,7 @@ var init_turn_execution = __esm({
       // The harness's secret environment for this turn. Only ever handed to the
       // adapter; never logged, never merged into `process.env`.
       secretEnv = {};
+      secretStore;
       effectiveCwd;
       hookEnv;
       turnEnv;
@@ -9326,7 +9576,8 @@ var init_turn_execution = __esm({
           throw this.concluded(reason, reason);
         }
         this.resolvedMcpServers = resolvedMcpServers;
-        this.secretEnv = secretEnv;
+        this.secretEnv = { ...secretEnv, ...harnessLoginEnv(secretStore, this.turnContext.runtime) };
+        this.secretStore = secretStore;
       }
       async prepareEnvironment() {
         const { payload, workspaceId, turnId, turnLog } = this;
@@ -9477,6 +9728,10 @@ var init_turn_execution = __esm({
         }
         const turnEnv = {
           ...hookEnv,
+          ...turnIdentityEnv({
+            conversationId: this.payload.conversationId,
+            agentId: this.payload.agentId
+          }),
           CABANE_COMPANION_HOME: agentCompanionHome()
         };
         this.codexLocal = this.turnContext.runtime === "codex" ? { configSetsSandboxMode: await readCodexConfigSetsSandboxMode() } : void 0;
@@ -10551,8 +10806,14 @@ function runnerTurnOptions(input, log2, emit, extras = {}) {
     agentUsername: spec.agentUsername,
     credential: input.credential,
     local: spec.local,
-    workRoot: spec.workRoot,
+    // The place the runner stands in names its own root and transcript
+    // directory when it has them (`PLACE_ENV`); the launcher's host-computed
+    // values are what a runner on the person's own machine gets.
+    workRoot: input.place?.workRoot ?? spec.workRoot,
     runConfig: spec.runConfig,
+    // The launcher's copy of the device's secrets, when it sent one: a runner
+    // in a box has no `secrets.json` to read.
+    ...input.secrets ? { secretStore: makeStore(input.secrets) } : {},
     log: log2,
     ...queryFn ? { queryFn } : {},
     ...spec.opencodeServerUrl ? { opencodeServerUrl: spec.opencodeServerUrl } : {},
@@ -10562,7 +10823,7 @@ function runnerTurnOptions(input, log2, emit, extras = {}) {
     ...spec.totalTimeoutMs !== void 0 ? { totalTimeoutMs: spec.totalTimeoutMs } : {},
     ...spec.leaseRenewalMs !== void 0 ? { leaseRenewalMs: spec.leaseRenewalMs } : {},
     ...spec.preparingRowDelayMs !== void 0 ? { preparingRowDelayMs: spec.preparingRowDelayMs } : {},
-    ...spec.transcripts ? { transcriptDir: transcriptsDir() } : {},
+    ...spec.transcripts ? { transcriptDir: input.place?.transcriptDir ?? transcriptsDir() } : {},
     connectorHealth,
     inRunner: {
       bootId: spec.bootId,
@@ -10697,6 +10958,7 @@ var init_run_turn = __esm({
     init_exec_shim();
     init_launcher_channel();
     init_opencode_lock();
+    init_secrets();
     init_transcript_writer();
     init_turn_execution();
     init_protocol();
@@ -11134,133 +11396,8 @@ function spaced(sentence) {
 
 // src/harness-detect.ts
 init_config();
-
-// src/harness-usable.ts
-init_bundled_binaries();
-import { spawn as spawn2 } from "child_process";
-
-// src/harness-versions.ts
-var EMPTY = { claudeCode: null, opencode: null, codex: null };
-function parseVersionToken(raw) {
-  if (!raw) return null;
-  const m = raw.match(/\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?/);
-  return m ? m[0] : null;
-}
-async function probeOpencodeVersion(serverUrl, fetchImpl = fetch) {
-  try {
-    const base = serverUrl.endsWith("/") ? serverUrl.slice(0, -1) : serverUrl;
-    const res = await fetchImpl(`${base}/global/health`, {
-      headers: { accept: "application/json" }
-    });
-    if (!res.ok) return null;
-    return extractOpencodeVersion(await res.json());
-  } catch {
-    return null;
-  }
-}
-function extractOpencodeVersion(json) {
-  if (!json || typeof json !== "object") return null;
-  const obj = json;
-  const candidates = [obj.version];
-  for (const v of Object.values(obj)) {
-    if (v && typeof v === "object") candidates.push(v.version);
-  }
-  for (const c of candidates) {
-    if (typeof c === "string") {
-      const parsed = parseVersionToken(c);
-      if (parsed) return parsed;
-    }
-  }
-  return null;
-}
-function emptyHarnessVersions() {
-  return { ...EMPTY };
-}
-
-// src/harness-usable.ts
-var API_KEY_VARIABLES = {
-  "claude-code": ["ANTHROPIC_API_KEY", "CLAUDE_CODE_OAUTH_TOKEN"],
-  codex: ["CODEX_API_KEY"]
-};
-function apiKeyVariable(runtime, env = process.env) {
-  return API_KEY_VARIABLES[runtime].find((name) => !!env[name]?.trim()) ?? null;
-}
-var CHECK_TIMEOUT_MS = 5e3;
-async function checkHarnessUsable(runtime, deps = {}) {
-  const env = deps.env ?? process.env;
-  const resolveBundled = deps.resolveBundled ?? ((r) => resolveBundledBinary(r));
-  const run = deps.run ?? runBounded;
-  const resolution = resolveBundled(runtime);
-  if (resolution.status !== "present" || !resolution.path) {
-    return {
-      status: "bundle_missing",
-      bundled: resolution.status === "present" ? "executable_missing" : resolution.status
-    };
-  }
-  const path = resolution.path;
-  const version = run(path, ["--version"], env).then(
-    (r) => r.code === 0 ? parseVersionToken(r.output) : null
-  );
-  const variable = apiKeyVariable(runtime, env);
-  if (variable) return { status: "api_key", variable, version: await version };
-  const statusArgs = runtime === "codex" ? ["login", "status"] : ["auth", "status", "--json"];
-  const [answer, v] = await Promise.all([run(path, statusArgs, env), version]);
-  if (answer.error) return { status: "check_failed", reason: answer.error };
-  const signedIn = runtime === "codex" ? readCodexStatus(answer) : readClaudeStatus(answer);
-  if (typeof signedIn === "string") return { status: "check_failed", reason: signedIn };
-  return signedIn ? { status: "signed_in", version: v } : { status: "signed_out", version: v };
-}
-function readClaudeStatus(answer) {
-  const start2 = answer.output.indexOf("{");
-  const end = answer.output.lastIndexOf("}");
-  if (start2 < 0 || end < start2) return "unreadable";
-  try {
-    const parsed = JSON.parse(answer.output.slice(start2, end + 1));
-    const loggedIn = parsed?.loggedIn;
-    return typeof loggedIn === "boolean" ? loggedIn : "unreadable";
-  } catch {
-    return "unreadable";
-  }
-}
-function readCodexStatus(answer) {
-  if (answer.code === 0) return true;
-  if (/not logged in/i.test(answer.output)) return false;
-  if (/config/i.test(answer.output)) return "config";
-  return "unreadable";
-}
-function runBounded(path, args, env) {
-  return new Promise((resolve2) => {
-    let settled = false;
-    let out = "";
-    const done = (result) => {
-      if (settled) return;
-      settled = true;
-      clearTimeout(timer);
-      resolve2(result);
-    };
-    let child;
-    try {
-      child = spawn2(path, args, { stdio: ["ignore", "pipe", "pipe"], env });
-    } catch {
-      resolve2({ code: null, output: "", error: "spawn" });
-      return;
-    }
-    const capture = (chunk) => {
-      if (out.length < 8192) out += chunk.toString();
-    };
-    child.stdout?.on("data", capture);
-    child.stderr?.on("data", capture);
-    const timer = setTimeout(() => {
-      child.kill("SIGKILL");
-      done({ code: null, output: out, error: "timeout" });
-    }, CHECK_TIMEOUT_MS);
-    timer.unref?.();
-    child.once("error", () => done({ code: null, output: out, error: "spawn" }));
-    child.once("close", (code) => done({ code, output: out }));
-  });
-}
-
-// src/harness-detect.ts
+init_harness_usable();
+init_harness_versions();
 var DEFAULT_OPENCODE_SERVER_URL = "http://127.0.0.1:4096";
 var DEFAULT_OPENCODE_PROBE_MS = 1e3;
 var CONFIGURED_OPENCODE_PROBE_MS = 4e3;
@@ -12985,6 +13122,10 @@ function runtimeIssuesFor(gates) {
   return issues;
 }
 
+// src/supervisor.ts
+init_harness_versions();
+init_harness_usable();
+
 // src/opencode-models.ts
 var OPENCODE_RUNTIME = "opencode";
 function mapOpencodeProviders(json) {
@@ -14473,7 +14614,16 @@ var CompanionSupervisor = class {
       },
       runner: {
         provider: this.runnerProvider,
-        command: this.runnerCommand ?? selfRunnerCommand(),
+        command: wrappedRunnerCommand(
+          this.config.runner?.command,
+          this.runnerCommand ?? selfRunnerCommand()
+        ),
+        ...this.config.runner?.command ? {
+          boxed: true,
+          secrets: () => loadSecretValuesTolerant(
+            (m) => this.log.warn({ err: m }, "Could not read the secrets file for a boxed turn.")
+          )
+        } : {},
         ...this.runnerEnv ? { env: this.runnerEnv } : {},
         reportRunnerGone: (report) => this.reportRunnerGone(report),
         connectorHealth: this.connectorHealth,
@@ -17109,7 +17259,7 @@ init_errors();
 init_src();
 init_transcript_writer();
 import { existsSync as existsSync19, readFileSync as readFileSync17, readdirSync as readdirSync6 } from "fs";
-import { isAbsolute as isAbsolute2, join as join31 } from "path";
+import { basename as basename4, isAbsolute as isAbsolute2, join as join31 } from "path";
 async function transcript(opts = {}) {
   const dir2 = transcriptsDir();
   if (opts.follow) {
@@ -17232,13 +17382,28 @@ async function followTranscripts(dir2) {
     follower.tick();
   });
 }
-function listFiles(dir2) {
+function listTranscriptFiles(dir2) {
+  let entries;
   try {
-    return readdirSync6(dir2).filter((f) => f.endsWith(".jsonl")).sort().reverse();
+    entries = readdirSync6(dir2, { withFileTypes: true });
   } catch {
     return [];
   }
+  const files = [];
+  for (const entry of entries) {
+    if (entry.isFile() && entry.name.endsWith(".jsonl")) files.push(entry.name);
+    if (!entry.isDirectory() || entry.name === "anomalies") continue;
+    let inner;
+    try {
+      inner = readdirSync6(join31(dir2, entry.name));
+    } catch {
+      continue;
+    }
+    for (const name of inner) if (name.endsWith(".jsonl")) files.push(`${entry.name}/${name}`);
+  }
+  return files.sort((a, b) => basename4(a) < basename4(b) ? 1 : basename4(a) > basename4(b) ? -1 : 0);
 }
+var listFiles = listTranscriptFiles;
 function printList(dir2) {
   const files = listFiles(dir2);
   if (files.length === 0) {
@@ -17285,6 +17450,7 @@ function peek(path) {
 function resolveTarget(dir2, target) {
   if (isAbsolute2(target) || target.includes("/")) {
     if (existsSync19(target)) return target;
+    if (!isAbsolute2(target) && existsSync19(join31(dir2, target))) return join31(dir2, target);
     throw new CompanionError(`no transcript at ${target}.`);
   }
   const exact = join31(dir2, target);