@rallycry/conveyor-agent 10.2.4 → 10.2.5

package/dist/{chunk-DEMRCBJN.js → chunk-CFELRV35.js}

@@ -1909,6 +1909,7 @@ async function restoreOnBoot(bundle, cwd) {
 import { z } from "zod";
 import { z as z2 } from "zod";
 var DEFAULT_SONNET_MODEL = "claude-sonnet-5";
+var TUI_KINDS = ["claude-code", "opencode"];
 var MAX_FILE_SIZE_BYTES = 25 * 1024 * 1024;
 var EMBED_THRESHOLD_IMAGES = 5 * 1024 * 1024;
 var EMBED_THRESHOLD_TEXT = 2 * 1024 * 1024;
@@ -2444,9 +2445,14 @@ var ListMyLiveSessionsRequestSchema = z2.object({
   /** Admin-only: list another member's sessions instead of the caller's. */
   targetUserId: z2.string().optional()
 });
+var GetProjectAvailableTuisRequestSchema = z2.object({
+  projectId: z2.string()
+});
 var StartAdhocSessionRequestSchema = z2.object({
   projectId: z2.string(),
   label: z2.string().max(200).optional(),
+  /** Coding-agent key to launch under — validated pick-time (ownership + TUI availability) in the handler. */
+  codingAgentKeyId: z2.string().optional(),
   /**
    * Session role. Constrained: other task-less modes fall through to the pm
    * runner in the pod entrypoint, and "review" would crash without a task.
@@ -2977,9 +2983,9 @@ var ClaudeCodeHarness = class {
 };
 
 // src/harness/pty/session.ts
-import { mkdtemp as mkdtemp2, mkdir as mkdir2, rm as rm4 } from "fs/promises";
+import { mkdtemp as mkdtemp2, mkdir as mkdir3, rm as rm5 } from "fs/promises";
 import { tmpdir as tmpdir3 } from "os";
-import { join as join3, dirname } from "path";
+import { join as join4, dirname } from "path";
 
 // src/harness/pty/event-queue.ts
 var AsyncEventQueue = class {
@@ -3442,76 +3448,6 @@ function mapChatRecords(raw) {
   }
 }
 
-// src/harness/pty/spawn-args.ts
-function resolveClaudeBinary() {
-  return process.env.CONVEYOR_CLAUDE_BIN ?? "claude";
-}
-function buildSpawnArgs(input) {
-  const args = [];
-  if (input.resume) {
-    args.push("--resume", input.resume);
-  } else if (input.sessionId) {
-    args.push("--session-id", input.sessionId);
-  }
-  args.push("--model", input.model);
-  if (input.permissionMode === "bypassPermissions") {
-    args.push("--dangerously-skip-permissions");
-  } else {
-    args.push("--permission-mode", "plan");
-  }
-  args.push("--settings", input.settingsPath);
-  if (input.appendSystemPrompt) {
-    args.push("--append-system-prompt", input.appendSystemPrompt);
-  }
-  if (input.mcpConfigPath) {
-    args.push("--mcp-config", input.mcpConfigPath);
-    if (input.strictMcpConfig) {
-      args.push("--strict-mcp-config");
-    }
-  }
-  return args;
-}
-function spawnOptionsFingerprint(input) {
-  return JSON.stringify([
-    input.model,
-    input.permissionMode,
-    input.appendSystemPrompt ?? "",
-    input.cwd
-  ]);
-}
-var ANSI_CSI = new RegExp(`${String.fromCharCode(27)}\\[[0-9;?]*[ -/]*[@-~]`, "g");
-function cleanTerminalOutput(raw, maxChars = 1200) {
-  const noAnsi = raw.replace(ANSI_CSI, "");
-  let out = "";
-  for (const ch of noAnsi) {
-    const code = ch.charCodeAt(0);
-    if (ch === "\r" || ch === "\n") out += "\n";
-    else if (ch === "	") out += ch;
-    else if (code < 32 || code === 127) continue;
-    else out += ch;
-  }
-  const lines = out.split("\n").map((line) => line.trimEnd()).filter((line) => line.trim().length > 0);
-  const text = lines.join("\n").trim();
-  return text.length > maxChars ? `\u2026${text.slice(-maxChars)}` : text;
-}
-function isMissingBinaryFailure(tail) {
-  return /execvp\(\d+\) failed|no such file or directory|command not found/i.test(tail);
-}
-function buildExitErrors(exitCode, rawOutput, binary) {
-  const errors = [`claude exited (code ${exitCode}) without a result`];
-  const tail = cleanTerminalOutput(rawOutput);
-  if (isMissingBinaryFailure(tail)) {
-    errors.push(
-      `The \`${binary}\` CLI could not be started \u2014 it is not installed or not on PATH. Install the Claude Code CLI in this environment (npm i -g @anthropic-ai/claude-code) or set CONVEYOR_CLAUDE_BIN to its absolute path.`
-    );
-  }
-  if (tail) {
-    errors.push(`Last terminal output before exit:
-${tail}`);
-  }
-  return errors;
-}
-
 // src/harness/pty/settings.ts
 import { mkdir, writeFile as writeFile2, chmod } from "fs/promises";
 import { homedir } from "os";
@@ -3982,6 +3918,238 @@ async function startToolServers(mcpServers, tempDir) {
   return { servers, mcpConfigPath };
 }
 
+// src/harness/pty/spawn-args.ts
+function buildSpawnArgs(input) {
+  const args = [];
+  if (input.resume) {
+    args.push("--resume", input.resume);
+  } else if (input.sessionId) {
+    args.push("--session-id", input.sessionId);
+  }
+  args.push("--model", input.model);
+  if (input.permissionMode === "bypassPermissions") {
+    args.push("--dangerously-skip-permissions");
+  } else {
+    args.push("--permission-mode", "plan");
+  }
+  args.push("--settings", input.settingsPath);
+  if (input.appendSystemPrompt) {
+    args.push("--append-system-prompt", input.appendSystemPrompt);
+  }
+  if (input.mcpConfigPath) {
+    args.push("--mcp-config", input.mcpConfigPath);
+    if (input.strictMcpConfig) {
+      args.push("--strict-mcp-config");
+    }
+  }
+  return args;
+}
+function spawnOptionsFingerprint(input) {
+  return JSON.stringify([
+    input.model,
+    input.permissionMode,
+    input.appendSystemPrompt ?? "",
+    input.cwd
+  ]);
+}
+var ANSI_CSI = new RegExp(`${String.fromCharCode(27)}\\[[0-9;?]*[ -/]*[@-~]`, "g");
+function cleanTerminalOutput(raw, maxChars = 1200) {
+  const noAnsi = raw.replace(ANSI_CSI, "");
+  let out = "";
+  for (const ch of noAnsi) {
+    const code = ch.charCodeAt(0);
+    if (ch === "\r" || ch === "\n") out += "\n";
+    else if (ch === "	") out += ch;
+    else if (code < 32 || code === 127) continue;
+    else out += ch;
+  }
+  const lines = out.split("\n").map((line) => line.trimEnd()).filter((line) => line.trim().length > 0);
+  const text = lines.join("\n").trim();
+  return text.length > maxChars ? `\u2026${text.slice(-maxChars)}` : text;
+}
+function isMissingBinaryFailure(tail) {
+  return /execvp\(\d+\) failed|no such file or directory|command not found/i.test(tail);
+}
+function buildExitErrors(exitCode, rawOutput, binary) {
+  const errors = [`claude exited (code ${exitCode}) without a result`];
+  const tail = cleanTerminalOutput(rawOutput);
+  if (isMissingBinaryFailure(tail)) {
+    errors.push(
+      `The \`${binary}\` CLI could not be started \u2014 it is not installed or not on PATH. Install the Claude Code CLI in this environment (npm i -g @anthropic-ai/claude-code) or set CONVEYOR_CLAUDE_BIN to its absolute path.`
+    );
+  }
+  if (tail) {
+    errors.push(`Last terminal output before exit:
+${tail}`);
+  }
+  return errors;
+}
+
+// src/harness/pty/credentials.ts
+import { chmod as chmod2, mkdir as mkdir2, readFile, rm as rm4, writeFile as writeFile4 } from "fs/promises";
+import { homedir as homedir2 } from "os";
+import { join as join3 } from "path";
+var SYNTH_TOKEN_TTL_MS = 365 * 24 * 60 * 60 * 1e3;
+var REFRESH_SKEW_MS = 30 * 24 * 60 * 60 * 1e3;
+function claudeCredentialsPath() {
+  return join3(claudeConfigHome(), ".credentials.json");
+}
+function isConveyorCloudEnv(env = process.env) {
+  return Boolean(env.CLAUDESPACE_NAME || env.CODESPACE_NAME || env.CODESPACES);
+}
+function parseClaudeAiOauth(raw) {
+  if (!raw || raw.trim() === "") return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (typeof parsed !== "object" || parsed === null) return null;
+    const oauth = parsed.claudeAiOauth;
+    if (typeof oauth !== "object" || oauth === null) return null;
+    const record = oauth;
+    return {
+      accessToken: record.accessToken,
+      refreshToken: record.refreshToken,
+      expiresAt: record.expiresAt
+    };
+  } catch {
+    return null;
+  }
+}
+function buildSynthesizedCredentials(token, now) {
+  return JSON.stringify({
+    claudeAiOauth: {
+      accessToken: token,
+      expiresAt: now + SYNTH_TOKEN_TTL_MS,
+      scopes: ["user:inference", "user:profile"],
+      subscriptionType: "max"
+    }
+  });
+}
+function planCredentialsWrite(input) {
+  if (!input.isCloud) return { action: "skip", reason: "not-cloud" };
+  if (!input.token) return { action: "skip", reason: "no-token" };
+  const contents = buildSynthesizedCredentials(input.token, input.now);
+  const existing = parseClaudeAiOauth(input.existingRaw);
+  if (!existing) return { action: "write", contents };
+  if (typeof existing.refreshToken === "string" && existing.refreshToken.length > 0) {
+    return { action: "skip", reason: "foreign-credentials" };
+  }
+  const fresh = existing.accessToken === input.token && typeof existing.expiresAt === "number" && existing.expiresAt > input.now + REFRESH_SKEW_MS;
+  if (fresh) return { action: "skip", reason: "current" };
+  return { action: "write", contents };
+}
+async function readRaw(path4) {
+  try {
+    return await readFile(path4, "utf8");
+  } catch {
+    return null;
+  }
+}
+async function ensureClaudeCredentials(env = process.env) {
+  try {
+    const path4 = claudeCredentialsPath();
+    const plan = planCredentialsWrite({
+      isCloud: isConveyorCloudEnv(env),
+      token: env.CLAUDE_CODE_OAUTH_TOKEN,
+      existingRaw: await readRaw(path4),
+      now: Date.now()
+    });
+    if (plan.action === "skip") return;
+    await mkdir2(claudeConfigHome(), { recursive: true });
+    await writeFile4(path4, plan.contents, { encoding: "utf8", mode: 384 });
+    await chmod2(path4, 384).catch(() => {
+    });
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    process.stderr.write(`[conveyor-agent] claude credentials sync failed: ${message}
+`);
+  }
+}
+function claudeJsonPath() {
+  const configDir = process.env.CLAUDE_CONFIG_DIR;
+  return configDir ? join3(configDir, ".claude.json") : join3(homedir2(), ".claude.json");
+}
+function asRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
+}
+function parseClaudeJson(existingRaw) {
+  if (!existingRaw || existingRaw.trim() === "") return {};
+  try {
+    return asRecord(JSON.parse(existingRaw));
+  } catch {
+    return {};
+  }
+}
+function seedWorkspaceTrust(config, trustCwd) {
+  const projects = asRecord(config.projects);
+  const entry = asRecord(projects[trustCwd]);
+  if (entry.hasTrustDialogAccepted === true) return false;
+  entry.hasTrustDialogAccepted = true;
+  projects[trustCwd] = entry;
+  config.projects = projects;
+  return true;
+}
+function planClaudeJsonSeed(existingRaw, trustCwd) {
+  const config = parseClaudeJson(existingRaw);
+  const isFresh = Object.keys(config).length === 0;
+  let changed = false;
+  if (config.hasCompletedOnboarding !== true) {
+    config.hasCompletedOnboarding = true;
+    changed = true;
+  }
+  if (config.bypassPermissionsModeAccepted !== true) {
+    config.bypassPermissionsModeAccepted = true;
+    changed = true;
+  }
+  if (isFresh && typeof config.theme !== "string") {
+    config.theme = "dark";
+    changed = true;
+  }
+  if (trustCwd && seedWorkspaceTrust(config, trustCwd)) {
+    changed = true;
+  }
+  return changed ? JSON.stringify(config) : null;
+}
+async function ensureClaudeOnboarding(env = process.env, trustCwd) {
+  try {
+    if (!isConveyorCloudEnv(env)) return;
+    const path4 = claudeJsonPath();
+    const contents = planClaudeJsonSeed(await readRaw(path4), trustCwd);
+    if (contents === null) return;
+    await writeFile4(path4, contents, "utf8");
+    const verify = await readRaw(path4);
+    if (verify === contents) {
+      process.stderr.write(
+        `[conveyor-agent] claude onboarding seeded${trustCwd ? ` (trust: ${trustCwd})` : ""}
+`
+      );
+    } else {
+      process.stderr.write(
+        `[conveyor-agent] claude onboarding seed read-back MISMATCH at ${path4}: wrote ${contents.length}B, read ${verify?.length ?? 0}B \u2014 CLI may see stale config and park at a startup dialog
+`
+      );
+    }
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    process.stderr.write(`[conveyor-agent] claude onboarding seed failed: ${message}
+`);
+  }
+}
+async function removeConveyorCredentials(env = process.env) {
+  try {
+    if (!isConveyorCloudEnv(env)) return;
+    const path4 = claudeCredentialsPath();
+    const existing = parseClaudeAiOauth(await readRaw(path4));
+    if (existing && typeof existing.refreshToken === "string" && existing.refreshToken.length > 0) {
+      return;
+    }
+    await rm4(path4, { force: true });
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    process.stderr.write(`[conveyor-agent] claude credentials removal failed: ${message}
+`);
+  }
+}
+
 // src/harness/pty/pty-support.ts
 import { stat as stat3 } from "fs/promises";
 var MAX_DIAGNOSTIC_OUTPUT = 4e3;
@@ -4037,7 +4205,9 @@ function inheritedEnv(socketPath) {
   for (const [key, value] of Object.entries(process.env)) {
     if (typeof value === "string") env[key] = value;
   }
-  env.CONVEYOR_HOOK_SOCKET = socketPath;
+  if (socketPath) {
+    env.CONVEYOR_HOOK_SOCKET = socketPath;
+  }
   env.MCP_TIMEOUT ??= "60000";
   env.MCP_TOOL_TIMEOUT ??= "180000";
   return env;
@@ -4087,18 +4257,65 @@ function parseUserQuestions(input) {
   return questions;
 }
 
+// src/harness/pty/adapters/claude.ts
+var ClaudeTuiAdapter = class {
+  id = "claude-code";
+  capabilities = {
+    resume: true,
+    structuredEvents: true,
+    prefill: true,
+    passiveTurns: true
+  };
+  resolveBinary(env = process.env) {
+    return env.CONVEYOR_CLAUDE_BIN ?? "claude";
+  }
+  buildSpawn(input) {
+    const { options, resume } = input;
+    const args = buildSpawnArgs({
+      ...resume ? { resume } : {},
+      ...options.sessionId ? { sessionId: options.sessionId } : {},
+      model: options.model,
+      permissionMode: options.permissionMode,
+      settingsPath: input.settingsPath ?? "",
+      ...options.appendSystemPrompt ? { appendSystemPrompt: options.appendSystemPrompt } : {},
+      ...input.mcpConfigPath ? { mcpConfigPath: input.mcpConfigPath, strictMcpConfig: true } : {}
+    });
+    return {
+      file: this.resolveBinary(),
+      args,
+      env: inheritedEnv(input.hookSocketPath)
+    };
+  }
+  async prepareEnvironment(opts) {
+    const env = opts.env ?? process.env;
+    await ensureClaudeCredentials(env);
+    await ensureClaudeOnboarding(env, opts.cwd);
+  }
+  spawnFingerprint(input) {
+    return spawnOptionsFingerprint(input);
+  }
+  encodePromptBytes(text) {
+    return buildPromptBytes(text);
+  }
+  buildExitErrors(exitCode, rawOutput) {
+    return buildExitErrors(exitCode, rawOutput, this.resolveBinary());
+  }
+};
+
 // src/harness/pty/session.ts
 var PtySession = class {
-  constructor(prompt, options, resume, bridge) {
+  constructor(prompt, options, resume, bridge, adapter = new ClaudeTuiAdapter()) {
     this.options = options;
     this.resume = resume;
     this.bridge = bridge;
+    this.adapter = adapter;
     this.turnPrompt = prompt;
     this.turn = turnOptionsFrom(options);
   }
   options;
   resume;
   bridge;
+  adapter;
   // The current turn's event stream. Null between turns (process parked) — the
   // process outlives any single turn, so the queue is per-turn, not per-process.
   activeQueue = null;
@@ -4184,7 +4401,7 @@ var PtySession = class {
   }
   /** Fingerprint of the spawn-time options a reused process cannot change. */
   get spawnFingerprint() {
-    return spawnOptionsFingerprint({
+    return this.adapter.spawnFingerprint({
       model: this.options.model,
       permissionMode: this.options.permissionMode,
       ...this.options.appendSystemPrompt ? { appendSystemPrompt: this.options.appendSystemPrompt } : {},
@@ -4321,29 +4538,19 @@ var PtySession = class {
       return;
     }
     try {
-      this.tempDir = await mkdtemp2(join3(tmpdir3(), "conveyor-pty-"));
-      const socketPath = join3(this.tempDir, "hook.sock");
-      this.socket = new HookSocketServer(
-        socketPath,
-        (progress) => this.handleProgress(progress),
-        (request) => this.handlePreToolUse(request)
-      );
-      await this.socket.listen();
-      const { settingsPath } = await writeHookSettings(this.tempDir);
-      await this.setupToolServers();
-      const transcriptPath = sessionTranscriptPath(this.options.cwd, sessionId);
-      await mkdir2(dirname(transcriptPath), { recursive: true });
-      const startOffset = this.resume ? await transcriptSize(transcriptPath) : 0;
-      const sendChat = this.bridge?.sendChatEvent?.bind(this.bridge);
-      this.tailer = new JsonlTailer(
-        transcriptPath,
-        (event) => this.handleTranscriptEvent(event),
-        sendChat ? (raw) => {
-          for (const chatEvent of mapChatRecords(raw)) sendChat(chatEvent);
-        } : void 0
-      );
-      this.tailer.start(startOffset);
-      await this.spawn(settingsPath, socketPath);
+      if (this.adapter.capabilities.structuredEvents) {
+        const { settingsPath, socketPath } = await this.startStructuredEventSources(sessionId);
+        await this.spawn(settingsPath, socketPath);
+      } else {
+        this.tempDir = await mkdtemp2(join4(tmpdir3(), "conveyor-pty-"));
+        await this.spawn();
+        this.pushEvent({
+          type: "system",
+          subtype: "init",
+          session_id: sessionId,
+          model: this.options.model
+        });
+      }
       if (signal) {
         this.abortHandler = () => {
           void this.teardown();
@@ -4364,6 +4571,38 @@ var PtySession = class {
       throw err;
     }
   }
+  /**
+   * Allocate the Claude-style structured-event sources: the PostToolUse hook
+   * socket, the per-run settings file, the in-process tool servers, and the
+   * transcript tailer. Only structured-events adapters call this — raw-terminal
+   * adapters have no trusted event source and skip it entirely. Returns the
+   * paths spawn() must wire into the child's argv/env.
+   */
+  async startStructuredEventSources(sessionId) {
+    this.tempDir = await mkdtemp2(join4(tmpdir3(), "conveyor-pty-"));
+    const socketPath = join4(this.tempDir, "hook.sock");
+    this.socket = new HookSocketServer(
+      socketPath,
+      (progress) => this.handleProgress(progress),
+      (request) => this.handlePreToolUse(request)
+    );
+    await this.socket.listen();
+    const { settingsPath } = await writeHookSettings(this.tempDir);
+    await this.setupToolServers();
+    const transcriptPath = sessionTranscriptPath(this.options.cwd, sessionId);
+    await mkdir3(dirname(transcriptPath), { recursive: true });
+    const startOffset = this.resume ? await transcriptSize(transcriptPath) : 0;
+    const sendChat = this.bridge?.sendChatEvent?.bind(this.bridge);
+    this.tailer = new JsonlTailer(
+      transcriptPath,
+      (event) => this.handleTranscriptEvent(event),
+      sendChat ? (raw) => {
+        for (const chatEvent of mapChatRecords(raw)) sendChat(chatEvent);
+      } : void 0
+    );
+    this.tailer.start(startOffset);
+    return { settingsPath, socketPath };
+  }
   writeStdin(text) {
     this.pty?.write(text);
   }
@@ -4429,7 +4668,7 @@ var PtySession = class {
     this.activeQueue?.close();
     this.activeQueue = null;
     if (this.tempDir) {
-      await rm4(this.tempDir, { recursive: true, force: true });
+      await rm5(this.tempDir, { recursive: true, force: true });
       this.tempDir = "";
     }
   }
@@ -4448,25 +4687,23 @@ var PtySession = class {
     this.mcpConfigPath = mcpConfigPath;
   }
   async spawn(settingsPath, socketPath) {
-    const args = buildSpawnArgs({
-      resume: this.resume,
-      sessionId: this.options.sessionId,
-      model: this.options.model,
-      permissionMode: this.options.permissionMode,
-      settingsPath,
-      ...this.options.appendSystemPrompt ? { appendSystemPrompt: this.options.appendSystemPrompt } : {},
+    const spec = this.adapter.buildSpawn({
+      options: this.options,
+      ...this.resume ? { resume: this.resume } : {},
+      ...settingsPath ? { settingsPath } : {},
+      ...socketPath ? { hookSocketPath: socketPath } : {},
       // Only this config: ignore the user's ~/.claude.json / project .mcp.json
       // so the agent's tool set is deterministic (and a stale personal conveyor
       // server doesn't load).
-      ...this.mcpConfigPath ? { mcpConfigPath: this.mcpConfigPath, strictMcpConfig: true } : {}
+      ...this.mcpConfigPath ? { mcpConfigPath: this.mcpConfigPath } : {}
     });
     const spawn2 = await loadPtySpawn();
-    const pty = spawn2(resolveClaudeBinary(), args, {
+    const pty = spawn2(spec.file, spec.args, {
       name: "xterm-color",
       cols: this.cols,
       rows: this.rows,
       cwd: this.options.cwd,
-      env: inheritedEnv(socketPath)
+      env: spec.env
     });
     const bridge = this.bridge;
     if (bridge) {
@@ -4487,12 +4724,13 @@ var PtySession = class {
     this.pty = pty;
   }
   async deliverPrompt(text) {
-    this.writeStdin(buildPromptBytes(text));
+    if (text === "" && !this.adapter.capabilities.prefill) return;
+    this.writeStdin(this.adapter.encodePromptBytes(text));
     if (this.turn.promptDelivery === "prefill") return;
     await sleep3(SUBMIT_SETTLE_MS);
     if (this._toreDown) return;
     this.writeStdin("\r");
-    this.armSubmitNudge();
+    if (this.adapter.capabilities.structuredEvents) this.armSubmitNudge();
   }
   async feedPrompt() {
     if (typeof this.turnPrompt === "string") {
@@ -4649,11 +4887,22 @@ var PtySession = class {
       this.tailer.close();
       await this.tailer.flush();
     }
-    if (!this.sawResult && this.activeQueue) {
+    if (!this.adapter.capabilities.structuredEvents) {
+      if (exitCode === 0) {
+        this.pushEvent({ type: "result", subtype: "success", result: "", total_cost_usd: 0 });
+      } else {
+        this.pushEvent({
+          type: "result",
+          subtype: "error",
+          errors: this.adapter.buildExitErrors(exitCode, this.recentOutput)
+        });
+      }
+      this.endTurn(exitCode === 0);
+    } else if (!this.sawResult && this.activeQueue) {
       this.activeQueue.push({
         type: "result",
         subtype: "error",
-        errors: buildExitErrors(exitCode, this.recentOutput, resolveClaudeBinary())
+        errors: this.adapter.buildExitErrors(exitCode, this.recentOutput)
       });
     }
     for (const listener of this.exitListeners) listener(exitCode);
@@ -4662,191 +4911,29 @@ var PtySession = class {
   }
 };
 
-// src/harness/pty/credentials.ts
-import { chmod as chmod2, mkdir as mkdir3, readFile, rm as rm5, writeFile as writeFile4 } from "fs/promises";
-import { homedir as homedir2 } from "os";
-import { join as join4 } from "path";
-var SYNTH_TOKEN_TTL_MS = 365 * 24 * 60 * 60 * 1e3;
-var REFRESH_SKEW_MS = 30 * 24 * 60 * 60 * 1e3;
-function claudeCredentialsPath() {
-  return join4(claudeConfigHome(), ".credentials.json");
-}
-function isConveyorCloudEnv(env = process.env) {
-  return Boolean(env.CLAUDESPACE_NAME || env.CODESPACE_NAME || env.CODESPACES);
-}
-function parseClaudeAiOauth(raw) {
-  if (!raw || raw.trim() === "") return null;
-  try {
-    const parsed = JSON.parse(raw);
-    if (typeof parsed !== "object" || parsed === null) return null;
-    const oauth = parsed.claudeAiOauth;
-    if (typeof oauth !== "object" || oauth === null) return null;
-    const record = oauth;
-    return {
-      accessToken: record.accessToken,
-      refreshToken: record.refreshToken,
-      expiresAt: record.expiresAt
-    };
-  } catch {
-    return null;
-  }
-}
-function buildSynthesizedCredentials(token, now) {
-  return JSON.stringify({
-    claudeAiOauth: {
-      accessToken: token,
-      expiresAt: now + SYNTH_TOKEN_TTL_MS,
-      scopes: ["user:inference", "user:profile"],
-      subscriptionType: "max"
-    }
-  });
-}
-function planCredentialsWrite(input) {
-  if (!input.isCloud) return { action: "skip", reason: "not-cloud" };
-  if (!input.token) return { action: "skip", reason: "no-token" };
-  const contents = buildSynthesizedCredentials(input.token, input.now);
-  const existing = parseClaudeAiOauth(input.existingRaw);
-  if (!existing) return { action: "write", contents };
-  if (typeof existing.refreshToken === "string" && existing.refreshToken.length > 0) {
-    return { action: "skip", reason: "foreign-credentials" };
-  }
-  const fresh = existing.accessToken === input.token && typeof existing.expiresAt === "number" && existing.expiresAt > input.now + REFRESH_SKEW_MS;
-  if (fresh) return { action: "skip", reason: "current" };
-  return { action: "write", contents };
-}
-async function readRaw(path4) {
-  try {
-    return await readFile(path4, "utf8");
-  } catch {
-    return null;
-  }
-}
-async function ensureClaudeCredentials(env = process.env) {
-  try {
-    const path4 = claudeCredentialsPath();
-    const plan = planCredentialsWrite({
-      isCloud: isConveyorCloudEnv(env),
-      token: env.CLAUDE_CODE_OAUTH_TOKEN,
-      existingRaw: await readRaw(path4),
-      now: Date.now()
-    });
-    if (plan.action === "skip") return;
-    await mkdir3(claudeConfigHome(), { recursive: true });
-    await writeFile4(path4, plan.contents, { encoding: "utf8", mode: 384 });
-    await chmod2(path4, 384).catch(() => {
-    });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    process.stderr.write(`[conveyor-agent] claude credentials sync failed: ${message}
-`);
-  }
-}
-function claudeJsonPath() {
-  const configDir = process.env.CLAUDE_CONFIG_DIR;
-  return configDir ? join4(configDir, ".claude.json") : join4(homedir2(), ".claude.json");
-}
-function asRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
-}
-function parseClaudeJson(existingRaw) {
-  if (!existingRaw || existingRaw.trim() === "") return {};
-  try {
-    return asRecord(JSON.parse(existingRaw));
-  } catch {
-    return {};
-  }
-}
-function seedWorkspaceTrust(config, trustCwd) {
-  const projects = asRecord(config.projects);
-  const entry = asRecord(projects[trustCwd]);
-  if (entry.hasTrustDialogAccepted === true) return false;
-  entry.hasTrustDialogAccepted = true;
-  projects[trustCwd] = entry;
-  config.projects = projects;
-  return true;
-}
-function planClaudeJsonSeed(existingRaw, trustCwd) {
-  const config = parseClaudeJson(existingRaw);
-  const isFresh = Object.keys(config).length === 0;
-  let changed = false;
-  if (config.hasCompletedOnboarding !== true) {
-    config.hasCompletedOnboarding = true;
-    changed = true;
-  }
-  if (config.bypassPermissionsModeAccepted !== true) {
-    config.bypassPermissionsModeAccepted = true;
-    changed = true;
-  }
-  if (isFresh && typeof config.theme !== "string") {
-    config.theme = "dark";
-    changed = true;
-  }
-  if (trustCwd && seedWorkspaceTrust(config, trustCwd)) {
-    changed = true;
-  }
-  return changed ? JSON.stringify(config) : null;
-}
-async function ensureClaudeOnboarding(env = process.env, trustCwd) {
-  try {
-    if (!isConveyorCloudEnv(env)) return;
-    const path4 = claudeJsonPath();
-    const contents = planClaudeJsonSeed(await readRaw(path4), trustCwd);
-    if (contents === null) return;
-    await writeFile4(path4, contents, "utf8");
-    const verify = await readRaw(path4);
-    if (verify === contents) {
-      process.stderr.write(
-        `[conveyor-agent] claude onboarding seeded${trustCwd ? ` (trust: ${trustCwd})` : ""}
-`
-      );
-    } else {
-      process.stderr.write(
-        `[conveyor-agent] claude onboarding seed read-back MISMATCH at ${path4}: wrote ${contents.length}B, read ${verify?.length ?? 0}B \u2014 CLI may see stale config and park at a startup dialog
-`
-      );
-    }
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    process.stderr.write(`[conveyor-agent] claude onboarding seed failed: ${message}
-`);
-  }
-}
-async function removeConveyorCredentials(env = process.env) {
-  try {
-    if (!isConveyorCloudEnv(env)) return;
-    const path4 = claudeCredentialsPath();
-    const existing = parseClaudeAiOauth(await readRaw(path4));
-    if (existing && typeof existing.refreshToken === "string" && existing.refreshToken.length > 0) {
-      return;
-    }
-    await rm5(path4, { force: true });
-  } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
-    process.stderr.write(`[conveyor-agent] claude credentials removal failed: ${message}
-`);
-  }
-}
-
 // src/harness/pty/index.ts
 var ENDED_GRACE_MS = 4e3;
-function fingerprintOf(options) {
-  return spawnOptionsFingerprint({
-    model: options.model,
-    permissionMode: options.permissionMode,
-    ...options.appendSystemPrompt ? { appendSystemPrompt: options.appendSystemPrompt } : {},
-    cwd: options.cwd
-  });
-}
 var PtyHarness = class {
   /**
    * `bridge` relays raw terminal I/O to/from the S2 server (and on to the S5
    * terminal). It is undefined for SDK-only callers and PTY runs that never
    * attach a relay; the session simply discards stdout in that case.
    */
-  constructor(bridge) {
+  constructor(bridge, adapter = new ClaudeTuiAdapter()) {
     this.bridge = bridge;
+    this.adapter = adapter;
   }
   bridge;
+  adapter;
+  /** Fingerprint of the spawn-time options a reused process cannot change. */
+  fingerprintOf(options) {
+    return this.adapter.spawnFingerprint({
+      model: options.model,
+      permissionMode: options.permissionMode,
+      ...options.appendSystemPrompt ? { appendSystemPrompt: options.appendSystemPrompt } : {},
+      cwd: options.cwd
+    });
+  }
   /** The session currently streaming events, if any — repaint target. */
   activeSession = null;
   /** A completed-but-alive session kept for the next turn (keep-alive). */
@@ -4865,7 +4952,7 @@ var PtyHarness = class {
   }
   async *executeQuery(opts) {
     const want = opts.resume ?? opts.options.resume;
-    const fingerprint = fingerprintOf(opts.options);
+    const fingerprint = this.fingerprintOf(opts.options);
     let session;
     if (this.parked?.canReuse(want, fingerprint)) {
       session = this.parked;
@@ -4879,9 +4966,8 @@ var PtyHarness = class {
         this.cancelEndedTimer();
         await stale.teardown();
       }
-      session = new PtySession(opts.prompt, opts.options, want, this.bridge);
-      await ensureClaudeCredentials();
-      await ensureClaudeOnboarding(process.env, opts.options.cwd);
+      session = new PtySession(opts.prompt, opts.options, want, this.bridge, this.adapter);
+      await this.adapter.prepareEnvironment({ cwd: opts.options.cwd });
       session.onExit(() => this.handleSessionExit(session));
       await session.start();
     }
@@ -10758,8 +10844,13 @@ export {
   applyBootstrapToEnv,
   AgentConnection,
   DEFAULT_SONNET_MODEL,
+  TUI_KINDS,
   DEFAULT_LIFECYCLE_CONFIG,
   Lifecycle,
+  cleanTerminalOutput,
+  inheritedEnv,
+  buildPromptBytes,
+  ClaudeTuiAdapter,
   PtyHarness,
   createServiceLogger,
   hasUncommittedChanges,
@@ -10787,4 +10878,4 @@ export {
   runStartCommand,
   unshallowRepo
 };
-//# sourceMappingURL=chunk-DEMRCBJN.js.map
+//# sourceMappingURL=chunk-CFELRV35.js.map