@rallycry/conveyor-agent 10.13.71 → 11.0.0

package/dist/{boot-PKHZUDAC.js → boot-PKQ2I66D.js}

@@ -2,21 +2,24 @@ import {
   TOMBSTONE_MESSAGE,
   isLegacyEntrypointLaunch
 } from "./chunk-R3FDJQL6.js";
+import {
+  readAgentVersion
+} from "./chunk-XORJ6SII.js";
 import {
   GitPrepJob,
   defaultGit,
   ensureDir,
-  readAgentVersion,
   redactToken,
   reportBootMilestone
-} from "./chunk-QU53HND5.js";
+} from "./chunk-GL2DIQEQ.js";
 import {
   workbenchPort
 } from "./chunk-KMB3BU4S.js";
 import {
   startWorkbenchServer
-} from "./chunk-DOB2XE2I.js";
-import "./chunk-GJXAAPJ6.js";
+} from "./chunk-UBDSLM44.js";
+import "./chunk-3F4ZZKCA.js";
+import "./chunk-W4LZ7R6Z.js";
 import {
   DEFAULT_WORKBENCH_PORT
 } from "./chunk-6Q6LQBWO.js";
@@ -98,6 +101,8 @@ function decodeJwtClaims(jwt) {
 function resolveModeEnv(claims) {
   if (claims.mode === "review") return { CONVEYOR_MODE: "code-review" };
   if (claims.mode === "pack") return { CONVEYOR_MODE: "pack" };
+  if (claims.mode === "plan") return { CONVEYOR_MODE: "plan" };
+  if (claims.mode === "serving") return { CONVEYOR_MODE: "serving" };
   if (claims.mode === "adhoc") return { CONVEYOR_MODE: "adhoc" };
   if (!claims.taskId && claims.projectId) return { CONVEYOR_MODE: "pm" };
   return {};
@@ -849,6 +854,7 @@ async function startWorkspaceSshd(exec, log, port = process.env.CONVEYOR_WORKSPA
 // src/boot/workspace-extras.ts
 import {
   appendFileSync as appendFileSync3,
+  cpSync,
   existsSync as existsSync3,
   lstatSync as lstatSync2,
   mkdirSync as mkdirSync3,
@@ -859,7 +865,8 @@ import {
   statSync as statSync3,
   symlinkSync as symlinkSync2
 } from "fs";
-import { join as join5 } from "path";
+import { dirname as dirname2, join as join5 } from "path";
+import { fileURLToPath } from "url";
 function errText(err) {
   return redactToken(err instanceof Error ? err.message : String(err));
 }
@@ -1013,6 +1020,49 @@ function linkGrimoireSkills(workspace, log) {
   excludeLinkedSkills(workspace, linkedNames, log);
   log.info(`[boot] Linked ${linkedNames.length} grimoire skills into ${targetDir}`);
 }
+function bundledSkillsDir(moduleUrl = import.meta.url) {
+  try {
+    const dir = join5(dirname2(fileURLToPath(moduleUrl)), "..", "skills");
+    return isDir2(dir) ? dir : null;
+  } catch {
+    return null;
+  }
+}
+function materializeBundledSkills(workspace, log, sourceDirOverride) {
+  const sourceDir = sourceDirOverride === void 0 ? bundledSkillsDir() : sourceDirOverride;
+  if (!sourceDir) {
+    log.warn(
+      "[boot] WARN: no bundled skills payload in this agent build. Cloud modes that invoke a skill will have no workflow to follow. This is a packaging fault (tsup copySkillsPayload did not run), not a workspace problem."
+    );
+    return;
+  }
+  const targetDir = join5(workspace, ".claude", "skills");
+  try {
+    mkdirSync3(targetDir, { recursive: true });
+  } catch {
+    log.warn(`[boot] WARN: unable to create ${targetDir}; skipping bundled skills`);
+    return;
+  }
+  const copied = [];
+  let names = [];
+  try {
+    names = readdirSync2(sourceDir);
+  } catch {
+    return;
+  }
+  for (const name of names) {
+    if (!isDir2(join5(sourceDir, name))) continue;
+    const target = join5(targetDir, name);
+    if (existsSync3(target) || isSymlink(target)) continue;
+    try {
+      cpSync(join5(sourceDir, name), target, { recursive: true, dereference: true });
+      copied.push(name);
+    } catch {
+    }
+  }
+  excludeLinkedSkills(workspace, copied, log);
+  log.info(`[boot] Materialized ${copied.length} bundled skills into ${targetDir}`);
+}
 async function neutralizeGrimoirePointer(workspace, git, log) {
   if (!existsSync3(join5(workspace, ".claude", "grimoire"))) return;
   try {
@@ -1054,6 +1104,7 @@ async function runPreReadyBinds(workspace, bundle, git, log) {
   bindGraphifyBundle(workspace, graphifyEnv, log);
   await ensureGrimoireSubmodule(workspace, bundle.githubToken ?? "", git, log);
   linkGrimoireSkills(workspace, log);
+  materializeBundledSkills(workspace, log);
   await neutralizeGrimoirePointer(workspace, git, log);
 }
 async function cloneReferenceRepos(refsJson, git, log, referencesDir = "/workspaces/references") {

package/dist/chunk-3F4ZZKCA.js

@@ -0,0 +1,291 @@
+import {
+  ghHostsManagedByConveyor,
+  githubTokenFilePath
+} from "./chunk-W4LZ7R6Z.js";
+
+// src/harness/pty/pty-support.ts
+import { stat } from "fs/promises";
+import { tmpdir } from "os";
+
+// 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/pty-support.ts
+var MAX_DIAGNOSTIC_OUTPUT = 4e3;
+var MAX_BETWEEN_TURN_BUFFER = 500;
+var SUBMIT_SETTLE_MS = 300;
+var SUBMIT_NUDGE_INTERVAL_MS = 2e3;
+var SUBMIT_NUDGE_MAX_PRESSES = 5;
+var SUBMIT_NUDGE_SLOW_INTERVAL_MS = 5e3;
+var SUBMIT_NUDGE_WINDOW_MS = 9e4;
+var SUBMIT_REDELIVERY_MAX_ATTEMPTS = 2;
+var PLAN_DIALOG_FIRST_PRESS_MS = 700;
+var PLAN_DIALOG_INTERVAL_MS = 1500;
+var PLAN_DIALOG_SLOW_INTERVAL_MS = 5e3;
+var PLAN_DIALOG_FAST_WINDOW_MS = 1e4;
+var PLAN_DIALOG_WINDOW_MS = 9e4;
+var RAW_TUI_PROBE_SENTINEL = "zqx";
+var RAW_TUI_PROBE_ACK_MS = 500;
+var RAW_TUI_PROBE_RETRY_MS = 250;
+var RAW_TUI_PROBE_POLL_MS = 20;
+var RAW_TUI_FIRST_OUTPUT_MAX_MS = 1e4;
+var RAW_TUI_INPUT_LIVE_MAX_MS = 2e4;
+function envMs(name, fallback) {
+  const raw = Number(process.env[name]);
+  return Number.isFinite(raw) && raw > 0 ? raw : fallback;
+}
+function resolveSubmitSettleMs() {
+  return envMs("CONVEYOR_PTY_SUBMIT_SETTLE_MS", SUBMIT_SETTLE_MS);
+}
+function resolveRawTuiProbeTiming() {
+  const sentinel = process.env.CONVEYOR_PTY_RAW_PROBE_SENTINEL;
+  return {
+    // A sentinel must be non-empty (it is what we search for) and must stay
+    // free of digits and control chars — see the note on menu dialogs above.
+    sentinel: sentinel && /^[a-z]{1,8}$/.test(sentinel) ? sentinel : RAW_TUI_PROBE_SENTINEL,
+    ackMs: envMs("CONVEYOR_PTY_RAW_PROBE_ACK_MS", RAW_TUI_PROBE_ACK_MS),
+    retryMs: envMs("CONVEYOR_PTY_RAW_PROBE_RETRY_MS", RAW_TUI_PROBE_RETRY_MS),
+    pollMs: envMs("CONVEYOR_PTY_RAW_PROBE_POLL_MS", RAW_TUI_PROBE_POLL_MS),
+    firstOutputMaxMs: envMs("CONVEYOR_PTY_RAW_FIRST_OUTPUT_MAX_MS", RAW_TUI_FIRST_OUTPUT_MAX_MS),
+    maxMs: envMs("CONVEYOR_PTY_RAW_INPUT_LIVE_MAX_MS", RAW_TUI_INPUT_LIVE_MAX_MS)
+  };
+}
+function sentinelEchoed(rawOutput, sentinel) {
+  return cleanTerminalOutput(rawOutput, Number.MAX_SAFE_INTEGER).includes(sentinel);
+}
+var DEC_PRIVATE_MODE = new RegExp(`${String.fromCharCode(27)}\\[\\?[0-9;]+[hl]`);
+function sawTerminalSetup(rawOutput) {
+  return DEC_PRIVATE_MODE.test(rawOutput);
+}
+function needsRawReadyGate(caps) {
+  return caps.rawPromptGate;
+}
+function resolveSubmitNudgeTiming() {
+  return {
+    intervalMs: envMs("CONVEYOR_PTY_NUDGE_INTERVAL_MS", SUBMIT_NUDGE_INTERVAL_MS),
+    slowIntervalMs: envMs("CONVEYOR_PTY_NUDGE_SLOW_INTERVAL_MS", SUBMIT_NUDGE_SLOW_INTERVAL_MS),
+    maxPresses: SUBMIT_NUDGE_MAX_PRESSES,
+    windowMs: envMs("CONVEYOR_PTY_NUDGE_WINDOW_MS", SUBMIT_NUDGE_WINDOW_MS)
+  };
+}
+function resolveSubmitRedeliveryMaxAttempts() {
+  const value = process.env.CONVEYOR_PTY_SUBMIT_REDELIVERY_MAX;
+  if (!value) return SUBMIT_REDELIVERY_MAX_ATTEMPTS;
+  const raw = Number(value);
+  return Number.isFinite(raw) && raw >= 0 ? raw : SUBMIT_REDELIVERY_MAX_ATTEMPTS;
+}
+function resolvePlanDialogTiming() {
+  return {
+    firstPressMs: envMs("CONVEYOR_PTY_PLAN_DIALOG_FIRST_PRESS_MS", PLAN_DIALOG_FIRST_PRESS_MS),
+    intervalMs: envMs("CONVEYOR_PTY_PLAN_DIALOG_INTERVAL_MS", PLAN_DIALOG_INTERVAL_MS),
+    slowIntervalMs: envMs(
+      "CONVEYOR_PTY_PLAN_DIALOG_SLOW_INTERVAL_MS",
+      PLAN_DIALOG_SLOW_INTERVAL_MS
+    ),
+    fastWindowMs: envMs("CONVEYOR_PTY_PLAN_DIALOG_FAST_WINDOW_MS", PLAN_DIALOG_FAST_WINDOW_MS),
+    windowMs: envMs("CONVEYOR_PTY_PLAN_DIALOG_WINDOW_MS", PLAN_DIALOG_WINDOW_MS)
+  };
+}
+function turnOptionsFrom(options) {
+  return {
+    canUseTool: options.canUseTool,
+    promptDelivery: options.promptDelivery,
+    planDialogAutoAccept: options.planDialogAutoAccept,
+    abortController: options.abortController
+  };
+}
+var KILL_ESCALATION_MS = 5e3;
+function killPtyWithEscalation(pty, hasExited, escalationMs = KILL_ESCALATION_MS) {
+  try {
+    pty.kill();
+  } catch {
+  }
+  const timer = setTimeout(() => {
+    if (hasExited()) return;
+    try {
+      pty.kill("SIGKILL");
+    } catch {
+    }
+  }, escalationMs);
+  timer.unref?.();
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function extractSpawn(mod) {
+  if (!isRecord(mod)) return null;
+  if (typeof mod.spawn === "function") return mod.spawn;
+  const def = mod.default;
+  if (isRecord(def) && typeof def.spawn === "function") return def.spawn;
+  return null;
+}
+async function loadPtySpawn() {
+  const mod = await import("node-pty");
+  const spawn = extractSpawn(mod);
+  if (!spawn) throw new Error("node-pty: spawn export not found");
+  return spawn;
+}
+async function resolvePtySpawn() {
+  const { workbenchEnabled } = await import("./mode-ZJSOSLGU.js");
+  if (!workbenchEnabled()) return loadPtySpawn();
+  const { getWorkbenchClient } = await import("./client-IG6C5F2G.js");
+  return (file, args, options) => getWorkbenchClient().spawnPty(file, args, options);
+}
+function sessionTempBase() {
+  return process.env.CONVEYOR_SHARED_DIR ?? tmpdir();
+}
+function inheritedEnv(socketPath) {
+  const env = {};
+  for (const [key, value] of Object.entries(process.env)) {
+    if (typeof value === "string") env[key] = value;
+  }
+  if (env.CLAUDE_CODE_OAUTH_TOKEN) {
+    delete env.ANTHROPIC_API_KEY;
+  }
+  if (ghHostsManagedByConveyor() && env.CONVEYOR_KEEP_GH_TOKEN_ENV !== "1") {
+    delete env.GH_TOKEN;
+    delete env.GITHUB_TOKEN;
+    delete env.CONVEYOR_GITHUB_TOKEN;
+    env.CONVEYOR_GITHUB_TOKEN_FILE = githubTokenFilePath();
+  }
+  if (socketPath) {
+    env.CONVEYOR_HOOK_SOCKET = socketPath;
+  }
+  env.MCP_TIMEOUT ??= "60000";
+  env.MCP_TOOL_TIMEOUT ??= "180000";
+  return env;
+}
+function buildPromptBytes(text) {
+  return `\x1B[200~${text}\x1B[201~`;
+}
+function renderPromptContentText(content) {
+  return content.map((block) => {
+    const b = block;
+    if (b?.type === "text" && typeof b.text === "string") return b.text;
+    if (b?.type === "image") {
+      return `[Image attachment \u2014 use list_task_files / get_attachment to view]`;
+    }
+    return JSON.stringify(block);
+  }).join("\n\n");
+}
+async function transcriptSize(path) {
+  try {
+    return (await stat(path)).size;
+  } catch {
+    return 0;
+  }
+}
+function parseUserQuestions(input) {
+  if (!Array.isArray(input.questions)) return [];
+  const questions = [];
+  for (const entry of input.questions) {
+    if (!isRecord(entry)) continue;
+    if (typeof entry.question !== "string") continue;
+    const options = Array.isArray(entry.options) ? entry.options.filter(isRecord).filter((o) => typeof o.label === "string").map((o) => ({
+      label: o.label,
+      description: typeof o.description === "string" ? o.description : ""
+    })) : [];
+    questions.push({
+      question: entry.question,
+      header: typeof entry.header === "string" ? entry.header : "",
+      options,
+      ...typeof entry.multiSelect === "boolean" ? { multiSelect: entry.multiSelect } : {}
+    });
+  }
+  return questions;
+}
+
+export {
+  resolveClaudeBinary,
+  buildSpawnArgs,
+  spawnOptionsFingerprint,
+  cleanTerminalOutput,
+  buildExitErrors,
+  MAX_DIAGNOSTIC_OUTPUT,
+  MAX_BETWEEN_TURN_BUFFER,
+  resolveSubmitSettleMs,
+  resolveRawTuiProbeTiming,
+  sentinelEchoed,
+  sawTerminalSetup,
+  needsRawReadyGate,
+  resolveSubmitNudgeTiming,
+  resolveSubmitRedeliveryMaxAttempts,
+  resolvePlanDialogTiming,
+  turnOptionsFrom,
+  killPtyWithEscalation,
+  loadPtySpawn,
+  resolvePtySpawn,
+  sessionTempBase,
+  inheritedEnv,
+  buildPromptBytes,
+  renderPromptContentText,
+  transcriptSize,
+  parseUserQuestions
+};

package/dist/{chunk-QU53HND5.js → chunk-GL2DIQEQ.js}

@@ -2,61 +2,116 @@ import {
   gitCredentialHelper,
   syncGithubTokenFiles,
   writeGitCredential
-} from "./chunk-GJXAAPJ6.js";
+} from "./chunk-W4LZ7R6Z.js";
 
-// src/runner/session-runner-helpers.ts
-import { readFileSync } from "fs";
-import { dirname, join } from "path";
-import { fileURLToPath } from "url";
-function mapChatHistory(messages) {
-  if (!messages) return [];
-  return messages.map((m) => ({
-    id: m.id,
-    role: m.role ?? "user",
-    content: m.content ?? "",
-    userId: m.userId,
-    userName: m.user?.name ?? void 0,
-    createdAt: m.createdAt,
-    ...m.source ? { source: m.source } : {},
-    ...m.files && m.files.length > 0 ? {
-      files: m.files.map((f) => ({
-        fileId: f.id,
-        fileName: f.fileName,
-        mimeType: f.mimeType,
-        fileSize: f.fileSize,
-        downloadUrl: f.downloadUrl ?? "",
-        content: f.content,
-        contentEncoding: f.contentEncoding
-      }))
-    } : {}
-  }));
+// src/boot/git-prep.ts
+import { execFile } from "child_process";
+import { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
+import { join as join2 } from "path";
+import { promisify } from "util";
+
+// src/boot/commit-trailers.ts
+import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { dirname, isAbsolute, join } from "path";
+var HOOK_MARKER = "conveyor-commit-trailers";
+var realFs = {
+  exists: (path) => existsSync(path),
+  read: (path) => readFileSync(path, "utf8"),
+  write: (path, content) => writeFileSync(path, content, "utf8"),
+  mkdirp: (path) => mkdirSync(path, { recursive: true }),
+  chmodExec: (path) => chmodSync(path, 493)
+};
+function buildHookScript() {
+  return `#!/bin/sh
+# ${HOOK_MARKER} \u2014 stamps Conveyor card/driver/session provenance on each commit.
+# Generated by @rallycry/conveyor-agent (boot/commit-trailers.ts); edits are
+# overwritten on the next pod boot.
+#
+# Every path exits 0 on purpose: losing a commit to attribution bookkeeping
+# would be a far worse outcome than losing the attribution.
+MSG="$1"
+[ -n "$MSG" ] || exit 0
+
+stamp() {
+  [ -n "$2" ] || return 0
+  git interpret-trailers --in-place --if-exists doNothing --trailer "$1: $2" "$MSG" 2>/dev/null || true
+}
+
+stamp "Conveyor-Card" "$CONVEYOR_CARD_SLUG"
+stamp "Conveyor-Driver" "$CONVEYOR_DRIVER_ID"
+stamp "Conveyor-Session" "$CONVEYOR_SESSION_ID"
+exit 0
+`;
+}
+function resolveHookTargets(repoDir, hooksPath, hasHusky) {
+  const huskyTarget = { hookPath: join(repoDir, ".husky", "commit-msg"), huskyManaged: true };
+  if (hooksPath?.replace(/\/+$/, "").endsWith(".husky/_")) return [huskyTarget];
+  const dir = hooksPath ? isAbsolute(hooksPath) ? hooksPath : join(repoDir, hooksPath) : join(repoDir, ".git", "hooks");
+  const resolved = { hookPath: join(dir, "commit-msg"), huskyManaged: false };
+  return hasHusky ? [resolved, huskyTarget] : [resolved];
+}
+function excludeFromRepo(repoDir, relPath, fs) {
+  const excludePath = join(repoDir, ".git", "info", "exclude");
+  const existing = fs.exists(excludePath) ? fs.read(excludePath) : "";
+  if (existing.split("\n").some((line) => line.trim() === relPath)) return;
+  const separator = existing.length > 0 && !existing.endsWith("\n") ? "\n" : "";
+  fs.write(excludePath, `${existing}${separator}${relPath}
+`);
+}
+function declaresHusky(repoDir, fs) {
+  if (fs.exists(join(repoDir, ".husky"))) return true;
+  const pkgPath = join(repoDir, "package.json");
+  if (!fs.exists(pkgPath)) return false;
+  try {
+    const pkg = JSON.parse(fs.read(pkgPath));
+    if (pkg.devDependencies?.husky ?? pkg.dependencies?.husky) return true;
+    return Boolean(pkg.scripts?.prepare?.includes("husky"));
+  } catch {
+    return false;
+  }
 }
-function readAgentVersion() {
+async function installCommitTrailerHook(deps) {
+  const { git, repoDir, log } = deps;
+  const env = deps.env ?? process.env;
+  const fs = deps.fs ?? realFs;
+  if (!env.CONVEYOR_CARD_SLUG) return { state: "skipped", reason: "no-card" };
   try {
-    const here = dirname(fileURLToPath(import.meta.url));
-    for (const rel of ["../package.json", "../../package.json"]) {
-      try {
-        const pkg = JSON.parse(readFileSync(join(here, rel), "utf-8"));
-        if (pkg.version) return pkg.version;
-      } catch {
+    let hooksPath = null;
+    try {
+      const { stdout } = await git(["config", "--get", "core.hooksPath"], { cwd: repoDir });
+      hooksPath = stdout.trim() || null;
+    } catch {
+    }
+    const targets = resolveHookTargets(repoDir, hooksPath, declaresHusky(repoDir, fs));
+    const written = [];
+    for (const { hookPath, huskyManaged } of targets) {
+      if (fs.exists(hookPath) && !fs.read(hookPath).includes(HOOK_MARKER)) {
+        log.warn(`[boot] WARN: commit-msg hook already present at ${hookPath}; leaving it alone`);
+        continue;
       }
+      fs.mkdirp(dirname(hookPath));
+      fs.write(hookPath, buildHookScript());
+      fs.chmodExec(hookPath);
+      if (huskyManaged) excludeFromRepo(repoDir, ".husky/commit-msg", fs);
+      written.push(hookPath);
     }
-  } catch {
+    if (written.length === 0) return { state: "skipped", reason: "project-hook" };
+    log.info(`[boot] Commit trailers installed (${written.join(", ")})`);
+    return { state: "installed", paths: written };
+  } catch (err) {
+    const reason = err instanceof Error ? err.message : String(err);
+    log.warn(`[boot] WARN: commit trailer hook not installed: ${reason}`);
+    return { state: "failed", reason };
   }
-  return null;
 }
 
 // src/boot/git-prep.ts
-import { execFile } from "child_process";
-import { existsSync, mkdirSync } from "fs";
-import { join as join2 } from "path";
-import { promisify } from "util";
 var QUICK_GIT_TIMEOUT_MS = 6e4;
 var FETCH_TIMEOUT_MS = 3e5;
 var CLONE_TIMEOUT_MS = 6e5;
 var execFileAsync = promisify(execFile);
 function ensureDir(dir) {
-  mkdirSync(dir, { recursive: true });
+  mkdirSync2(dir, { recursive: true });
 }
 function defaultGit(args, opts = {}) {
   return execFileAsync("git", args, {
@@ -185,6 +240,22 @@ async function clonePostAssignment(deps, paths) {
   }
   return syncTaskBranchToRepo(deps, paths);
 }
+async function withCommitTrailers(deps, paths, state) {
+  if (state.state !== "ready") return state;
+  await installCommitTrailerHook({
+    git: deps.git,
+    repoDir: paths.repoDir,
+    log: deps.log,
+    // The bundle, NOT process.env: git prep runs inside the workbench sidecar,
+    // whose own env holds only CONVEYOR_API_URL and POD_BOOTSTRAP_TOKEN.
+    // `bundle.envVars` (where CONVEYOR_CARD_SLUG rides) is merged into
+    // `ctx.childEnv` for the separate agent container and is never written back
+    // onto this process — so reading process.env here saw nothing and skipped
+    // the install on every real pod.
+    env: { ...process.env, ...deps.bundle.envVars }
+  });
+  return state;
+}
 async function prepareWorkspaceGit(deps) {
   const { bundle, log } = deps;
   const workspacesDir = deps.workspacesDir ?? "/workspaces";
@@ -207,17 +278,17 @@ async function prepareWorkspaceGit(deps) {
     if (bundle.gitPlan.provider === "github") {
       syncGithubTokenFiles(bundle.githubToken ?? credential.secret);
     }
-    if (existsSync(join2(repoDir, ".git"))) {
+    if (existsSync2(join2(repoDir, ".git"))) {
       log.info(
         deps.podImage ? `[boot] Pod image \u2014 updating repo to latest (branch=${branch})...` : `[boot] Repo present (non-pod-image) \u2014 updating repo to latest (branch=${branch})...`
       );
-      return await syncTaskBranchToRepo(deps, paths);
+      return await withCommitTrailers(deps, paths, await syncTaskBranchToRepo(deps, paths));
     }
     try {
-      mkdirSync(workspacesDir, { recursive: true });
+      mkdirSync2(workspacesDir, { recursive: true });
     } catch {
     }
-    return await clonePostAssignment(deps, paths);
+    return await withCommitTrailers(deps, paths, await clonePostAssignment(deps, paths));
   } catch (err) {
     log.error(`[boot] ERROR: git prep failed unexpectedly: ${errText(err)}`);
     return { state: "failed", reason: "git prep failed unexpectedly" };
@@ -318,8 +389,6 @@ async function reportBootMilestone(opts) {
 }
 
 export {
-  mapChatHistory,
-  readAgentVersion,
   FETCH_TIMEOUT_MS,
   CLONE_TIMEOUT_MS,
   ensureDir,