@rallycry/conveyor-agent 10.13.72 → 11.0.0

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

@@ -11,7 +11,7 @@ import {
   ensureDir,
   redactToken,
   reportBootMilestone
-} from "./chunk-WMMBAKPE.js";
+} from "./chunk-GL2DIQEQ.js";
 import {
   workbenchPort
 } from "./chunk-KMB3BU4S.js";
@@ -101,6 +101,7 @@ 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" };
@@ -853,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,
@@ -863,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));
 }
@@ -1017,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 {
@@ -1058,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-WMMBAKPE.js → chunk-GL2DIQEQ.js}

@@ -6,15 +6,112 @@ import {
 
 // src/boot/git-prep.ts
 import { execFile } from "child_process";
-import { existsSync, mkdirSync } from "fs";
-import { join } from "path";
+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;
+  }
+}
+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 {
+    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);
+    }
+    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 };
+  }
+}
+
+// src/boot/git-prep.ts
 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, {
@@ -143,10 +240,26 @@ 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";
-  const repoDir = join(workspacesDir, "repo");
+  const repoDir = join2(workspacesDir, "repo");
   const { branch, cloneUrl, repoOwner, repoName } = bundle.gitPlan;
   const credential = bundle.gitCredential;
   const paths = {
@@ -165,17 +278,17 @@ async function prepareWorkspaceGit(deps) {
     if (bundle.gitPlan.provider === "github") {
       syncGithubTokenFiles(bundle.githubToken ?? credential.secret);
     }
-    if (existsSync(join(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" };

package/dist/{chunk-2L5THOWD.js → chunk-JQVAWRVL.js}

@@ -5,10 +5,10 @@ import {
   readWorkspaceBytes,
   statWorkspacePath,
   workspacePathExists
-} from "./chunk-LSZ2KLJY.js";
+} from "./chunk-N4WSUTGV.js";
 import {
   reportBootMilestone
-} from "./chunk-WMMBAKPE.js";
+} from "./chunk-GL2DIQEQ.js";
 import {
   getWorkbenchClient
 } from "./chunk-EXQ6AHOY.js";

package/dist/{chunk-LSZ2KLJY.js → chunk-N4WSUTGV.js}

@@ -3,7 +3,7 @@ import {
   DEFAULT_RETRY_DELAY_MS,
   FETCH_TIMEOUT_MS,
   GIT_PREP_MAX_RETRIES
-} from "./chunk-WMMBAKPE.js";
+} from "./chunk-GL2DIQEQ.js";
 import {
   buildConveyorSocketOptions,
   callWithAck,
@@ -278,6 +278,8 @@ var AgentConnection = class _AgentConnection {
   earlyPullBranches = [];
   spawnReviewCallback = null;
   earlySpawnReviews = [];
+  spawnBuilderCallback = null;
+  earlySpawnBuilders = [];
   spawnTuiCallback = null;
   earlySpawnTuis = [];
   probeUsageCallback = null;
@@ -455,6 +457,10 @@ var AgentConnection = class _AgentConnection {
         if (this.spawnReviewCallback) this.spawnReviewCallback(data);
         else this.earlySpawnReviews.push(data);
       });
+      this.socket.on("session:spawnBuilder", (data) => {
+        if (this.spawnBuilderCallback) this.spawnBuilderCallback(data);
+        else this.earlySpawnBuilders.push(data);
+      });
       this.socket.on("session:spawnTui", (data) => {
         if (this.spawnTuiCallback) this.spawnTuiCallback(data);
         else this.earlySpawnTuis.push(data);
@@ -752,6 +758,13 @@ var AgentConnection = class _AgentConnection {
     for (const data of this.earlySpawnReviews) callback(data);
     this.earlySpawnReviews = [];
   }
+  /** Mirror of onSpawnReview for the Builder handoff. Drains the early buffer
+   *  so a Build pressed during boot is not lost. */
+  onSpawnBuilder(callback) {
+    this.spawnBuilderCallback = callback;
+    for (const data of this.earlySpawnBuilders) callback(data);
+    this.earlySpawnBuilders = [];
+  }
   /**
    * Report that a same-pod review child failed to spawn (fire-and-forget).
    * The server Ends the orphaned review session and falls back to a dedicated
@@ -767,6 +780,23 @@ var AgentConnection = class _AgentConnection {
     }).catch(() => {
     });
   }
+  /**
+   * Report that this (planner) pod could not spawn the Builder child, so the
+   * server can End the orphaned build session and reopen the card instead of
+   * leaving it InProgress with a Builder tab that never appears.
+   *
+   * sessionId is OUR (planner) session — the task-identity guard runs on it;
+   * the build session is identified separately.
+   */
+  reportBuilderSpawnFailure(buildSessionId, error) {
+    if (!this.socket) return;
+    void this.call("reportBuilderSpawnFailure", {
+      sessionId: this.config.sessionId,
+      buildSessionId,
+      ...error ? { error: error.slice(0, 2e3) } : {}
+    }).catch(() => {
+    });
+  }
   /**
    * Report that this pod's git credential is dead and refreshing did not fix
    * it (fire-and-forget).
@@ -2056,11 +2086,18 @@ var Lifecycle = class {
     }
   }
   // ── Idle timer ─────────────────────────────────────────────────────
-  startIdleTimer() {
+  /** Start (or restart) the idle timer.
+   *  @param overrideMs Optional custom delay in ms, mirroring
+   *  `startDormantTimer`. SessionRunner passes a short delay when it DEFERS a
+   *  shutdown because a spawned child is still working: the pod must re-check
+   *  soon after that child exits, rather than granting itself a fresh full idle
+   *  window every time it defers. */
+  startIdleTimer(overrideMs) {
     this.clearIdleTimers();
+    const delay2 = Math.max(0, overrideMs ?? this.config.idleTimeoutMs);
     this.idleTimer = setTimeout(() => {
       this.callbacks.onIdleTimeout();
-    }, this.config.idleTimeoutMs);
+    }, delay2);
   }
   cancelIdleTimer() {
     this.clearIdleTimers();