@rallycry/conveyor-agent 11.0.15 → 11.0.16

package/dist/{boot-V3DNJ3MV.js → boot-CCRZMY2P.js}

@@ -1,6 +1,6 @@
 import {
   startWorkbenchServer
-} from "./chunk-IBAIJY7V.js";
+} from "./chunk-7TSQXIN3.js";
 import {
   TOMBSTONE_MESSAGE,
   isLegacyEntrypointLaunch
@@ -12,7 +12,7 @@ import {
   refreshSkillsAfterCheckout,
   runPreReadyBinds
 } from "./chunk-SR66HQKB.js";
-import "./chunk-JG3VMWRQ.js";
+import "./chunk-QLMNQSJL.js";
 import {
   GitPrepJob,
   defaultGit,

package/dist/{chunk-IBAIJY7V.js → chunk-7TSQXIN3.js}

@@ -1,6 +1,6 @@
 import {
   loadPtySpawn
-} from "./chunk-JG3VMWRQ.js";
+} from "./chunk-QLMNQSJL.js";
 import {
   terminateProcessGroup
 } from "./chunk-W4LZ7R6Z.js";

package/dist/{chunk-TOTCEWJD.js → chunk-B54XFOXL.js}

@@ -38,6 +38,36 @@ var RemoteProcessHandle = class extends EventEmitter {
 };
 
 // src/workbench/client.ts
+var WORKBENCH_COMMAND_ENV_DENYLIST = /* @__PURE__ */ new Set([
+  "POD_BOOTSTRAP_TOKEN",
+  "CONVEYOR_BOOTSTRAP_TOKEN",
+  "CONVEYOR_WORKBENCH_TOKEN",
+  "CONVEYOR_TASK_TOKEN",
+  "CONVEYOR_PROJECT_TOKEN",
+  "CONVEYOR_GIT_SECRET",
+  "CONVEYOR_GIT_CREDENTIAL_DIR",
+  "CONVEYOR_GITHUB_TOKEN",
+  "CONVEYOR_GITHUB_TOKEN_FILE",
+  "GH_TOKEN",
+  "GITHUB_TOKEN",
+  "GH_CONFIG_DIR",
+  "ANTHROPIC_API_KEY",
+  "CLAUDE_CODE_OAUTH_TOKEN",
+  "CONVEYOR_AGENT_KEY",
+  "CONVEYOR_CLAUDE_OAUTH",
+  "CONVEYOR_CODEX_OAUTH",
+  "CONVEYOR_OPENCODE_OAUTH",
+  "CLOUDSDK_AUTH_ACCESS_TOKEN"
+]);
+function serializableEnv(env) {
+  const result = {};
+  for (const [key, value] of Object.entries(env)) {
+    if (typeof value === "string" && !WORKBENCH_COMMAND_ENV_DENYLIST.has(key)) {
+      result[key] = value;
+    }
+  }
+  return result;
+}
 function frameError(frame) {
   return new WorkbenchError(frame.message, frame.code);
 }
@@ -158,7 +188,7 @@ var WorkbenchClient = class {
   }
   /** Mirrors setup/commands.ts runSetupCommand (shell form, streamed output,
    *  abort → graceful term-group kill, non-zero exit rejects). */
-  runSetupCommand(cmd, cwd, onOutput, signal) {
+  runSetupCommand(cmd, cwd, onOutput, signal, env = process.env) {
     return new Promise((resolve, reject) => {
       if (signal?.aborted) {
         const error = new Error("Operation aborted");
@@ -170,7 +200,7 @@ var WorkbenchClient = class {
       let exited = false;
       let aborting = false;
       const socket = this.open(
-        { op: "exec", command: cmd, cwd },
+        { op: "exec", command: cmd, cwd, env: serializableEnv(env) },
         (frame) => {
           if (frame.t === "out" && !aborting) {
             onOutput(frame.s, Buffer.from(frame.d, "base64").toString("utf8"));
@@ -204,14 +234,14 @@ var WorkbenchClient = class {
   }
   /** Mirrors setup/commands.ts runStartCommand: returns a live handle that
    *  emits exit/error and whose kill() runs the graceful term-group stop. */
-  runStartCommand(cmd, cwd, onOutput) {
+  runStartCommand(cmd, cwd, onOutput, env = process.env) {
     let socket;
     const handle = new RemoteProcessHandle(() => {
       if (socket) writeFrame(socket, { t: "signal", mode: "term-group" });
     });
     let exited = false;
     socket = this.open(
-      { op: "exec", command: cmd, cwd },
+      { op: "exec", command: cmd, cwd, env: serializableEnv(env) },
       (frame) => {
         if (frame.t === "out") {
           onOutput(frame.s, Buffer.from(frame.d, "base64").toString("utf8"));

package/dist/{chunk-UP5CGWRY.js → chunk-GAUVITY7.js}

@@ -29,7 +29,7 @@ import {
   spawnOptionsFingerprint,
   transcriptSize,
   turnOptionsFrom
-} from "./chunk-JG3VMWRQ.js";
+} from "./chunk-QLMNQSJL.js";
 import {
   AgentConnection,
   CodespacePortVisibility,
@@ -59,7 +59,7 @@ import {
   statWorkspacePath,
   updateRemoteToken,
   verifyGitCredential
-} from "./chunk-YMZ6Q55T.js";
+} from "./chunk-M4SD2ESQ.js";
 import {
   registerBootMilestoneSocketFallback,
   reportBootMilestone
@@ -80,7 +80,7 @@ import {
 } from "./chunk-IA45XHOA.js";
 import {
   getWorkbenchClient
-} from "./chunk-TOTCEWJD.js";
+} from "./chunk-B54XFOXL.js";
 import {
   workbenchEnabled
 } from "./chunk-KMB3BU4S.js";
@@ -16038,6 +16038,7 @@ var SessionRunner = class _SessionRunner {
 `);
       }
     }
+    this.workspaceCommands?.notifyWorkspaceReady();
     this.mode.applyServerMode(this.fullContext?.agentMode, this.fullContext?.isAuto);
     this.mode.resolveInitialMode(this.taskContext);
     if (this.fullContext?.isAuto && PRE_BUILD_TASK_STATUSES.has(this.taskContext.status) && this.mode.isBuildCapable && hasTaskPlan(this.fullContext.plan)) {
@@ -16070,7 +16071,6 @@ var SessionRunner = class _SessionRunner {
 `
       );
     }
-    this.workspaceCommands?.notifyLoopReady();
     while (!this.stopped) {
       if (this._state !== "idle") await this.setState("idle");
       await this.coreLoop();
@@ -16238,7 +16238,6 @@ var SessionRunner = class _SessionRunner {
     }
     if (delivery === "prefill") {
       await this.setState("waiting_for_input");
-      this.workspaceCommands?.notifyLoopReady();
       await this.callbacks.onEvent({ type: "execute_mode", mode: effectiveMode, delivery });
       if (this.pendingMessages.length > 0) {
         if (!this.stopped) await this.setState("idle");
@@ -16381,7 +16380,6 @@ var SessionRunner = class _SessionRunner {
    */
   async runPrefilledMessage(msg, effectiveMode) {
     await this.setState("waiting_for_input");
-    this.workspaceCommands?.notifyLoopReady();
     await this.callbacks.onEvent({
       type: "execute_mode",
       mode: effectiveMode,
@@ -16718,7 +16716,6 @@ var SessionRunner = class _SessionRunner {
         return this.callbacks.onStatusChange(status);
       },
       onEvent: (event) => {
-        this.workspaceCommands?.notifyLoopReady();
         if (!this.agentLiveReported) {
           this.agentLiveReported = true;
           void reportBootMilestone({ key: "agent_live" });

package/dist/{chunk-YMZ6Q55T.js → chunk-M4SD2ESQ.js}

@@ -20,7 +20,7 @@ import {
 import {
   WorkbenchError,
   getWorkbenchClient
-} from "./chunk-TOTCEWJD.js";
+} from "./chunk-B54XFOXL.js";
 import {
   workbenchEnabled
 } from "./chunk-KMB3BU4S.js";

package/dist/{chunk-JG3VMWRQ.js → chunk-QLMNQSJL.js}

@@ -200,7 +200,7 @@ async function loadPtySpawn() {
 async function resolvePtySpawn() {
   const { workbenchEnabled } = await import("./mode-ZJSOSLGU.js");
   if (!workbenchEnabled()) return loadPtySpawn();
-  const { getWorkbenchClient } = await import("./client-6AUPKKMV.js");
+  const { getWorkbenchClient } = await import("./client-DVVHMIOO.js");
   return (file, args, options) => getWorkbenchClient().spawnPty(file, args, options);
 }
 function sessionTempBase() {

package/dist/{chunk-DDECZOAT.js → chunk-X2MKHJBZ.js}

@@ -5,7 +5,7 @@ import {
   readWorkspaceBytes,
   statWorkspacePath,
   workspacePathExists
-} from "./chunk-YMZ6Q55T.js";
+} from "./chunk-M4SD2ESQ.js";
 import {
   reportBootMilestone
 } from "./chunk-GL2DIQEQ.js";
@@ -16,7 +16,7 @@ import {
 } from "./chunk-W4LZ7R6Z.js";
 import {
   getWorkbenchClient
-} from "./chunk-TOTCEWJD.js";
+} from "./chunk-B54XFOXL.js";
 import {
   workbenchEnabled
 } from "./chunk-KMB3BU4S.js";
@@ -197,8 +197,12 @@ async function runDepsSync(options) {
   let plan = null;
   try {
     plan = await resolveDepsSyncPlan(options);
-  } catch {
-    return { outcome: "skipped" };
+  } catch (error) {
+    const cause = error instanceof Error ? error.message : String(error);
+    const message = `Dependency state inspection failed before install could start: ${cause}.`;
+    options.onOutput("stderr", `[deps] ${message}
+`);
+    return { outcome: "failed", message };
   }
   if (!plan) return { outcome: "skipped" };
   const { onOutput, runCommand, env } = options;
@@ -449,16 +453,14 @@ var WorkspaceCommandSupervisor = class {
   startCommandLaunchRequested = false;
   started = false;
   stopped = false;
-  /** Resolved by notifyLoopReady() once the PTY is live — the runner fires it
-   *  on the first harness event of the initial query (or when a prefill
-   *  parks), NOT after the first turn completes, so the app's start command
-   *  isn't held behind a long working turn. Also resolved by stop() if
-   *  shutdown arrives first — either way unblocks the awaiter in
-   *  runSetupAndStart so a supervisor stopped before the loop ever signals
-   *  doesn't hang its background task (and therefore stop()) forever. */
-  resolveLoopReady;
-  loopReady = new Promise((resolve) => {
-    this.resolveLoopReady = resolve;
+  /** Resolved once SessionRunner has finished the authoritative task-branch
+   *  checkout and WIP restore. Those operations can change bun.lock and the
+   *  schema, so dependency repair and preview startup must not read the tree
+   *  before this boundary. stop() also resolves it so a failed early boot
+   *  cannot leave its background task parked forever. */
+  resolveWorkspaceReady;
+  workspaceReady = new Promise((resolve) => {
+    this.resolveWorkspaceReady = resolve;
   });
   constructor(options) {
     this.config = options.config;
@@ -508,17 +510,20 @@ var WorkspaceCommandSupervisor = class {
       );
     }
   }
-  /** Release the start-command launch — called once the runner's core loop
-   *  (the PTY) is live. Idempotent; resolving an already-settled promise is a
-   *  no-op, so a late/duplicate call (or one after stop() already resolved
-   *  it) is harmless. */
+  /** Release dependency reconciliation and preview startup after the runner
+   *  has made the workspace authoritative. Idempotent by Promise semantics. */
+  notifyWorkspaceReady() {
+    this.resolveWorkspaceReady();
+  }
+  /** @deprecated Call notifyWorkspaceReady once checkout and WIP restore
+   *  finish. Kept for simplified callers while they adopt that boundary. */
   notifyLoopReady() {
-    this.resolveLoopReady();
+    this.notifyWorkspaceReady();
   }
   stop() {
     if (this.shutdownPromise) return this.shutdownPromise;
     this.stopped = true;
-    this.resolveLoopReady();
+    this.resolveWorkspaceReady();
     this.abortController.abort();
     const backgroundTasks = [...this.backgroundTasks];
     const termination = this.terminateAllStartCommands();
@@ -549,7 +554,7 @@ var WorkspaceCommandSupervisor = class {
     });
     if (this.stopped) return;
     this.reportBootMilestoneFn("sidecars_ready");
-    await this.loopReady;
+    await this.workspaceReady;
     if (this.stopped) return;
     await this.reportTurboCacheFn({
       onOutput: (stream, data) => this.forwardSetupOutput(stream, data)

package/dist/cli.js

@@ -7,7 +7,7 @@ import {
   WorkspaceCommandSupervisor,
   startWorkspaceCommandsAfterConnect,
   stopWorkspaceCommands
-} from "./chunk-DDECZOAT.js";
+} from "./chunk-X2MKHJBZ.js";
 import {
   DEFAULT_SONNET_MODEL,
   PtyHarness,
@@ -27,13 +27,13 @@ import {
   resolveTuiKindFromEnv,
   runUsageProbe,
   sampleKeyUsage
-} from "./chunk-UP5CGWRY.js";
+} from "./chunk-GAUVITY7.js";
 import "./chunk-SR66HQKB.js";
 import {
   inheritedEnv,
   resolvePtySpawn,
   sessionTempBase
-} from "./chunk-JG3VMWRQ.js";
+} from "./chunk-QLMNQSJL.js";
 import {
   AgentConnection,
   CodespacePortVisibility,
@@ -44,12 +44,12 @@ import {
   createServiceLogger,
   fetchBootstrap,
   loadConveyorConfig
-} from "./chunk-YMZ6Q55T.js";
+} from "./chunk-M4SD2ESQ.js";
 import "./chunk-GL2DIQEQ.js";
 import "./chunk-W4LZ7R6Z.js";
 import "./chunk-7P6QZHXZ.js";
 import "./chunk-IA45XHOA.js";
-import "./chunk-TOTCEWJD.js";
+import "./chunk-B54XFOXL.js";
 import "./chunk-KMB3BU4S.js";
 import "./chunk-6Q6LQBWO.js";
 
@@ -462,7 +462,11 @@ var AdhocSessionRunner = class {
         return;
       }
       this.commandSupervisor.start();
-      this.commandSupervisor.notifyLoopReady?.();
+      if (this.commandSupervisor.notifyWorkspaceReady) {
+        this.commandSupervisor.notifyWorkspaceReady();
+      } else {
+        this.commandSupervisor.notifyLoopReady?.();
+      }
       await this.connection.emitStatus("running");
       this.callbacks.onEvent?.({ type: "adhoc_runner_started", projectId: this.config.projectId });
       this.lifecycle.startIdleTimer();
@@ -1201,7 +1205,7 @@ function wireSpawnChildren(mode, connection, supervisors, logger7) {
 
 // src/cli.ts
 if (process.argv[2] === "boot") {
-  const { runBoot } = await import("./boot-V3DNJ3MV.js");
+  const { runBoot } = await import("./boot-CCRZMY2P.js");
   process.exit(await runBoot(process.argv.slice(3)));
 }
 if (isLegacyEntrypointLaunch(process.env)) {
@@ -1303,7 +1307,7 @@ process.on("unhandledRejection", (reason) => {
   process.exit(1);
 });
 if (process.env.CONVEYOR_MODE === "workbench") {
-  const { startWorkbenchServer } = await import("./server-2IZBKD3Q.js");
+  const { startWorkbenchServer } = await import("./server-WM23BC5C.js");
   const { oomWatchdogOptionsFromEnv } = await import("./oom-watchdog-PAC5OJJG.js");
   const { DEFAULT_WORKBENCH_PORT } = await import("./protocol-QBCYO4GI.js");
   const port = Number(process.env.CONVEYOR_WORKBENCH_PORT) || DEFAULT_WORKBENCH_PORT;
@@ -1454,7 +1458,7 @@ if (!RUNNER_MODES.includes(CONVEYOR_MODE)) {
   process.exit(1);
 }
 if (CONVEYOR_MODE === "serving") {
-  const { runServingSession } = await import("./serve-boot-FJSZE737.js");
+  const { runServingSession } = await import("./serve-boot-VJR6J5PL.js");
   exitContext.runnerMode = "serving";
   exitContext.sessionId = process.env.CONVEYOR_SESSION_ID ?? exitContext.sessionId;
   const outcome = await runServingSession({

package/dist/{client-6AUPKKMV.js → client-DVVHMIOO.js}

@@ -4,7 +4,7 @@ import {
   WorkbenchError,
   getWorkbenchClient,
   resetWorkbenchClient
-} from "./chunk-TOTCEWJD.js";
+} from "./chunk-B54XFOXL.js";
 import "./chunk-KMB3BU4S.js";
 import "./chunk-6Q6LQBWO.js";
 export {

package/dist/index.d.ts

@@ -683,11 +683,11 @@ interface SessionRunnerPortDiscovery {
     start(): Promise<void>;
     stop(): void;
 }
-/** Duck-typed handle onto the boot supervisor — just enough surface for the
- *  runner to release the app's start command once the core loop is live.
- *  Avoids importing the concrete WorkspaceCommandSupervisor class here. */
+/** Duck-typed handle onto the boot supervisor. The runner releases setup only
+ *  after its task-branch checkout and WIP restore have made the workspace
+ *  authoritative. Avoids importing the concrete supervisor here. */
 interface SessionRunnerWorkspaceCommands {
-    notifyLoopReady(): void;
+    notifyWorkspaceReady(): void;
 }
 interface SessionRunnerDependencies {
     portDiscovery?: SessionRunnerPortDiscovery;

package/dist/index.js

@@ -1,9 +1,9 @@
 import {
   SessionRunner,
   unshallowRepo
-} from "./chunk-UP5CGWRY.js";
+} from "./chunk-GAUVITY7.js";
 import "./chunk-SR66HQKB.js";
-import "./chunk-JG3VMWRQ.js";
+import "./chunk-QLMNQSJL.js";
 import {
   AgentConnection,
   GIT_TIMEOUT_MS,
@@ -17,7 +17,7 @@ import {
   stageAndCommit,
   updateRemoteToken,
   workspacePathExists
-} from "./chunk-YMZ6Q55T.js";
+} from "./chunk-M4SD2ESQ.js";
 import "./chunk-GL2DIQEQ.js";
 import {
   runAuthTokenCommand,
@@ -28,7 +28,7 @@ import "./chunk-7P6QZHXZ.js";
 import "./chunk-IA45XHOA.js";
 import {
   getWorkbenchClient
-} from "./chunk-TOTCEWJD.js";
+} from "./chunk-B54XFOXL.js";
 import {
   workbenchEnabled
 } from "./chunk-KMB3BU4S.js";

package/dist/{serve-boot-FJSZE737.js → serve-boot-VJR6J5PL.js}

@@ -1,6 +1,6 @@
 import {
   WorkspaceCommandSupervisor
-} from "./chunk-DDECZOAT.js";
+} from "./chunk-X2MKHJBZ.js";
 import {
   AgentConnection,
   CodespacePortVisibility,
@@ -11,11 +11,11 @@ import {
   createServiceLogger,
   ensureOnTaskBranch,
   loadConveyorConfig
-} from "./chunk-YMZ6Q55T.js";
+} from "./chunk-M4SD2ESQ.js";
 import "./chunk-GL2DIQEQ.js";
 import "./chunk-W4LZ7R6Z.js";
 import "./chunk-IA45XHOA.js";
-import "./chunk-TOTCEWJD.js";
+import "./chunk-B54XFOXL.js";
 import "./chunk-KMB3BU4S.js";
 import "./chunk-6Q6LQBWO.js";
 
@@ -123,7 +123,11 @@ var ServeSessionRunner = class {
         );
       }
       this.commandSupervisor.start();
-      this.commandSupervisor.notifyLoopReady?.();
+      if (this.commandSupervisor.notifyWorkspaceReady) {
+        this.commandSupervisor.notifyWorkspaceReady();
+      } else {
+        this.commandSupervisor.notifyLoopReady?.();
+      }
       await this.connection.emitStatus("idle");
       this.callbacks.onEvent?.({ type: "serve_runner_started", taskId: this.config.taskId });
       await this.waitUntilStopped();

package/dist/{server-2IZBKD3Q.js → server-WM23BC5C.js}

@@ -1,7 +1,7 @@
 import {
   startWorkbenchServer
-} from "./chunk-IBAIJY7V.js";
-import "./chunk-JG3VMWRQ.js";
+} from "./chunk-7TSQXIN3.js";
+import "./chunk-QLMNQSJL.js";
 import "./chunk-W4LZ7R6Z.js";
 import "./chunk-6Q6LQBWO.js";
 import "./chunk-6W6UZ4SJ.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rallycry/conveyor-agent",
-  "version": "11.0.15",
+  "version": "11.0.16",
   "description": "Conveyor Agent Runner v10 - PTY harness for the task chat (SDK harness for audit/project-chat). Agent-as-User architecture with BaseService patterns. Works locally too.",
   "keywords": [
     "agent",