@rallycry/conveyor-agent 10.13.13 → 10.13.15

package/dist/{chunk-IE7EOKMD.js → chunk-VKZ5W2VO.js}

@@ -52,4 +52,4 @@ export {
   DEFAULT_WORKBENCH_PORT,
   timingSafeTokenEqual
 };
-//# sourceMappingURL=chunk-IE7EOKMD.js.map
+//# sourceMappingURL=chunk-VKZ5W2VO.js.map

package/dist/chunk-VKZ5W2VO.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/workbench/protocol.ts"],"sourcesContent":["/**\n * Wire protocol for the workbench launcher — the loopback control channel\n * between the protected agent container and the restartable workbench\n * container (see docs/superpowers/specs/2026-07-16-workbench-container-split-design.md).\n *\n * Newline-delimited JSON frames over a plain TCP socket. Every connection\n * carries exactly ONE operation: the first client frame is a WorkbenchRequest\n * (with the shared token); everything after is a WorkbenchFrame in either\n * direction. Binary payloads (pty bytes, file contents) ride base64 `d`\n * fields — intra-pod loopback makes the 33% inflation cheap,\n * and NDJSON keeps the framing trivially robust across partial reads.\n */\n\nimport crypto from \"node:crypto\";\nimport type { Socket } from \"node:net\";\n\n/** First frame of every connection (client → server). */\nexport type WorkbenchRequest =\n  | { op: \"ping\"; token: string }\n  | {\n      op: \"exec\";\n      token: string;\n      /** Shell form — spawned as `sh -c command` (setup/start commands). */\n      command?: string;\n      /** Argv form — spawned directly, no shell (git and friends). */\n      argv?: string[];\n      cwd: string;\n      env?: Record<string, string>;\n    }\n  | {\n      op: \"pty\";\n      token: string;\n      file: string;\n      args: string[];\n      cwd: string;\n      env: Record<string, string>;\n      cols: number;\n      rows: number;\n    }\n  | { op: \"readFile\"; token: string; path: string }\n  | { op: \"stat\"; token: string; path: string }\n  | { op: \"readdir\"; token: string; path: string };\n\n/** Mid-stream frames (either direction after the opening request). */\nexport type WorkbenchFrame =\n  | { t: \"out\"; s: \"stdout\" | \"stderr\"; d: string }\n  | { t: \"exit\"; code: number | null; signal: string | null }\n  | { t: \"data\"; d: string }\n  | { t: \"end\" }\n  | { t: \"input\"; d: string }\n  | { t: \"resize\"; cols: number; rows: number }\n  | { t: \"kill\"; sig?: string }\n  | { t: \"signal\"; mode: \"term-group\" }\n  | {\n      t: \"stat\";\n      exists: boolean;\n      isFile: boolean;\n      isDirectory: boolean;\n      size: number;\n      mtimeMs: number;\n    }\n  | { t: \"entries\"; names: string[] }\n  | { t: \"pong\"; version: string }\n  | { t: \"error\"; message: string; code?: string };\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n  return typeof value === \"object\" && value !== null;\n}\n\n/** Parse one NDJSON line into a frame-shaped record, or null when malformed. */\nexport function parseLine(line: string): Record<string, unknown> | null {\n  if (!line) return null;\n  try {\n    const parsed: unknown = JSON.parse(line);\n    return isRecord(parsed) ? parsed : null;\n  } catch {\n    return null;\n  }\n}\n\n/**\n * Incremental NDJSON reader. Feed raw socket chunks; complete lines are\n * parsed and handed to the callback (malformed lines are dropped — the same\n * contract as the hook socket's envelope parsing).\n */\nexport class FrameReader {\n  private buffer = \"\";\n\n  constructor(private readonly onFrame: (frame: Record<string, unknown>) => void) {}\n\n  push(chunk: Buffer | string): void {\n    this.buffer += chunk.toString();\n    let index = this.buffer.indexOf(\"\\n\");\n    while (index >= 0) {\n      const line = this.buffer.slice(0, index);\n      this.buffer = this.buffer.slice(index + 1);\n      const frame = parseLine(line);\n      if (frame) this.onFrame(frame);\n      index = this.buffer.indexOf(\"\\n\");\n    }\n  }\n}\n\n/** Serialize + write one frame. Write errors are the socket's problem —\n *  callers handle teardown via the socket's own error/close events. */\nexport function writeFrame(\n  socket: Pick<Socket, \"write\">,\n  frame: WorkbenchRequest | WorkbenchFrame,\n): void {\n  try {\n    socket.write(`${JSON.stringify(frame)}\\n`);\n  } catch {\n    /* socket already destroyed — close handling owns cleanup */\n  }\n}\n\nexport const DEFAULT_WORKBENCH_PORT = 7411;\n\n/** Matches the timingSafeEqualStr helper used for every other shared-secret\n *  comparison in the codebase (preview-resolve.ts, workspace-attach-token.ts,\n *  card-image-link.ts) — constant-time so the loopback auth check can't leak\n *  the token via response-time. */\nexport function timingSafeTokenEqual(a: string, b: string): boolean {\n  const ab = Buffer.from(a);\n  const bb = Buffer.from(b);\n  if (ab.length !== bb.length) return false;\n  return crypto.timingSafeEqual(ab, bb);\n}\n"],"mappings":";AAaA,OAAO,YAAY;AAoDnB,SAAS,SAAS,OAAkD;AAClE,SAAO,OAAO,UAAU,YAAY,UAAU;AAChD;AAGO,SAAS,UAAU,MAA8C;AACtE,MAAI,CAAC,KAAM,QAAO;AAClB,MAAI;AACF,UAAM,SAAkB,KAAK,MAAM,IAAI;AACvC,WAAO,SAAS,MAAM,IAAI,SAAS;AAAA,EACrC,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAOO,IAAM,cAAN,MAAkB;AAAA,EAGvB,YAA6B,SAAmD;AAAnD;AAAA,EAAoD;AAAA,EAApD;AAAA,EAFrB,SAAS;AAAA,EAIjB,KAAK,OAA8B;AACjC,SAAK,UAAU,MAAM,SAAS;AAC9B,QAAI,QAAQ,KAAK,OAAO,QAAQ,IAAI;AACpC,WAAO,SAAS,GAAG;AACjB,YAAM,OAAO,KAAK,OAAO,MAAM,GAAG,KAAK;AACvC,WAAK,SAAS,KAAK,OAAO,MAAM,QAAQ,CAAC;AACzC,YAAM,QAAQ,UAAU,IAAI;AAC5B,UAAI,MAAO,MAAK,QAAQ,KAAK;AAC7B,cAAQ,KAAK,OAAO,QAAQ,IAAI;AAAA,IAClC;AAAA,EACF;AACF;AAIO,SAAS,WACd,QACA,OACM;AACN,MAAI;AACF,WAAO,MAAM,GAAG,KAAK,UAAU,KAAK,CAAC;AAAA,CAAI;AAAA,EAC3C,QAAQ;AAAA,EAER;AACF;AAEO,IAAM,yBAAyB;AAM/B,SAAS,qBAAqB,GAAW,GAAoB;AAClE,QAAM,KAAK,OAAO,KAAK,CAAC;AACxB,QAAM,KAAK,OAAO,KAAK,CAAC;AACxB,MAAI,GAAG,WAAW,GAAG,OAAQ,QAAO;AACpC,SAAO,OAAO,gBAAgB,IAAI,EAAE;AACtC;","names":[]}

package/dist/cli.js

@@ -28,11 +28,11 @@ import {
   runUsageProbe,
   sampleKeyUsage,
   textResult
-} from "./chunk-TB5SQIGX.js";
+} from "./chunk-SAHOFQBQ.js";
 import "./chunk-7TQO4ZF4.js";
 import {
   getWorkbenchClient
-} from "./chunk-YRC57EYG.js";
+} from "./chunk-LZM5OKAC.js";
 import {
   workbenchEnabled
 } from "./chunk-4VUQ2NPF.js";
@@ -40,21 +40,18 @@ import {
   buildPromptBytes,
   inheritedEnv,
   loadPtySpawn,
-  runSetupCommand,
   runStartCommand,
   terminateProcessGroup
-} from "./chunk-2K6RRTQC.js";
-import "./chunk-IE7EOKMD.js";
+} from "./chunk-RSIW2UCR.js";
+import "./chunk-VKZ5W2VO.js";
 
 // src/cli.ts
 import { readFileSync } from "fs";
-import { join as join3, dirname as dirname3 } from "path";
+import { join as join3, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 
 // src/setup/sidecars.ts
 import net from "net";
-import { mkdir, writeFile } from "fs/promises";
-import { dirname } from "path";
 var POSTGRES_TIMEOUT_MS = 12e4;
 var FIREBASE_TIMEOUT_MS = 6e4;
 var FALLBACK_TIMEOUT_MS = 3e4;
@@ -62,22 +59,6 @@ var DEFAULT_SIDECAR_POLL_INTERVAL_MS = 1e3;
 var DEFAULT_PROBE_TIMEOUT_MS = 2e3;
 var POSTGRES_DEFAULT_PORT = 5432;
 var FIREBASE_DEFAULT_PORT = 9099;
-async function startLazySidecars(env, onLog, signal) {
-  throwIfAborted(signal);
-  const markerPath = env.CONVEYOR_SIDECAR_START_FILE;
-  if (!markerPath) return;
-  try {
-    await mkdir(dirname(markerPath), { recursive: true });
-    throwIfAborted(signal);
-    await writeFile(markerPath, "start\n", "utf8");
-    throwIfAborted(signal);
-    onLog("Started lazy sidecars");
-  } catch (err) {
-    if (signal?.aborted) throw abortError();
-    const message = err instanceof Error ? err.message : String(err);
-    onLog(`WARNING: failed to start lazy sidecars: ${message}`);
-  }
-}
 function parseHostPort(value, defaultPort) {
   const trimmed = value.trim().replace(/^[a-z]+:\/\//i, "");
   if (!trimmed) return null;
@@ -204,12 +185,8 @@ async function waitForSidecars(opts = {}) {
     timeoutMs,
     pollIntervalMs = DEFAULT_SIDECAR_POLL_INTERVAL_MS,
     probe = defaultProbe,
-    startLazy = true,
     signal
   } = opts;
-  if (startLazy) {
-    await startLazySidecars(env, onLog, signal);
-  }
   throwIfAborted(signal);
   const targets = resolveSidecarTargets(env);
   if (targets.length === 0) return;
@@ -253,14 +230,10 @@ function defaultCommandExecutors() {
   if (workbenchEnabled()) {
     const client = getWorkbenchClient();
     return {
-      runSetupCommand: (command, cwd, onOutput, signal) => client.runSetupCommand(command, cwd, onOutput, signal),
       runStartCommand: (cmd, cwd, onOutput) => client.runStartCommand(cmd, cwd, onOutput)
     };
   }
-  return {
-    runSetupCommand: (command, cwd, onOutput, signal) => runSetupCommand(command, cwd, onOutput, signal),
-    runStartCommand
-  };
+  return { runStartCommand };
 }
 var defaultWriteOutput = (stream, data) => {
   (stream === "stderr" ? process.stderr : process.stdout).write(data);
@@ -283,9 +256,7 @@ var WorkspaceCommandSupervisor = class {
   connection;
   env;
   awaitGitReadyFn;
-  startLazySidecarsFn;
   waitForSidecarsFn;
-  runSetupCommandFn;
   runStartCommandFn;
   loadForwardPortsFn;
   writeOutput;
@@ -302,6 +273,14 @@ var WorkspaceCommandSupervisor = class {
   startCommandLaunchRequested = false;
   started = false;
   stopped = false;
+  /** Resolved by notifyLoopReady() once the runner's core loop (the PTY) is
+   *  live, or 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;
+  });
   constructor(options) {
     this.config = options.config;
     this.workspaceDir = options.workspaceDir;
@@ -311,10 +290,8 @@ var WorkspaceCommandSupervisor = class {
       onLog: opts.onLog,
       signal: opts.signal
     }));
-    this.startLazySidecarsFn = options.startLazySidecars ?? ((env, onLog, signal) => startLazySidecars(env, onLog, signal));
-    this.waitForSidecarsFn = options.waitForSidecars ?? ((opts) => waitForSidecars({ onLog: opts.onLog, startLazy: opts.startLazy, signal: opts.signal }));
+    this.waitForSidecarsFn = options.waitForSidecars ?? ((opts) => waitForSidecars({ onLog: opts.onLog, signal: opts.signal }));
     const executors = defaultCommandExecutors();
-    this.runSetupCommandFn = options.runSetupCommand ?? executors.runSetupCommand;
     this.runStartCommandFn = options.runStartCommand ?? executors.runStartCommand;
     this.loadForwardPortsFn = options.loadForwardPorts ?? loadForwardPorts;
     this.writeOutput = options.writeOutput ?? defaultWriteOutput;
@@ -327,23 +304,23 @@ var WorkspaceCommandSupervisor = class {
     if (this.started || this.stopped) return;
     this.started = true;
     this.connection.onRunStartCommand(() => this.restartStartCommand());
-    this.trackBackgroundTask(
-      this.startLazySidecarsFn(
-        this.env,
-        (message) => this.forwardSetupOutput("stdout", `[sidecars] ${message}
-`),
-        this.abortController.signal
-      ).catch((error) => this.reportUnexpectedError(error))
-    );
     if (this.config) {
       this.trackBackgroundTask(
         this.runSetupAndStart().catch((error) => this.reportUnexpectedError(error))
       );
     }
   }
+  /** 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. */
+  notifyLoopReady() {
+    this.resolveLoopReady();
+  }
   stop() {
     if (this.shutdownPromise) return this.shutdownPromise;
     this.stopped = true;
+    this.resolveLoopReady();
     this.abortController.abort();
     const backgroundTasks = [...this.backgroundTasks];
     const termination = this.terminateAllStartCommands();
@@ -371,16 +348,15 @@ var WorkspaceCommandSupervisor = class {
     await this.waitForSidecarsFn({
       onLog: (message) => this.forwardSetupOutput("stdout", `[sidecars] ${message}
 `),
-      startLazy: false,
       signal: this.abortController.signal
     });
     if (this.stopped) return;
     this.reportBootMilestoneFn("sidecars_ready");
-    await this.runConfiguredSetup();
+    await this.loopReady;
     if (this.stopped) return;
-    this.reportBootMilestoneFn("setup_complete");
     const startCommandRunning = this.config?.startCommand ? await this.ensureStartCommandLaunched(this.config.startCommand) : false;
     if (this.stopped) return;
+    this.reportBootMilestoneFn("start_command_launched");
     const forwardPorts = await this.loadForwardPortsFn(this.workspaceDir);
     if (this.stopped) return;
     const previewPorts = buildSessionPreviewPorts(forwardPorts);
@@ -390,24 +366,6 @@ var WorkspaceCommandSupervisor = class {
       ...previewPorts.length > 0 ? { previewPorts } : {}
     });
   }
-  async runConfiguredSetup() {
-    const command = this.config?.setupCommand;
-    if (!command) return;
-    try {
-      await this.runSetupCommandFn(
-        command,
-        this.workspaceDir,
-        (stream, data) => this.forwardSetupOutput(stream, data),
-        this.abortController.signal
-      );
-    } catch (error) {
-      if (this.stopped) return;
-      this.connection.sendEvent({
-        type: "setup_error",
-        message: error instanceof Error ? error.message : "Setup command failed"
-      });
-    }
-  }
   restartStartCommand() {
     if (this.stopped || !this.config?.startCommand) return;
     this.connection.sendEvent({
@@ -729,7 +687,7 @@ var ProjectSessionRunner = class {
 };
 
 // src/usage/multi-key-probe.ts
-import { mkdtemp, writeFile as writeFile2, copyFile, rm } from "fs/promises";
+import { mkdtemp, writeFile, copyFile, rm } from "fs/promises";
 import { tmpdir } from "os";
 import { join } from "path";
 var logger = createServiceLogger("multi-key-probe");
@@ -760,7 +718,7 @@ async function isolatedProbe(token, now) {
   let dir = null;
   try {
     dir = await mkdtemp(join(tmpdir(), "conveyor-usage-"));
-    await writeFile2(join(dir, ".credentials.json"), buildSynthesizedCredentials(token, now), {
+    await writeFile(join(dir, ".credentials.json"), buildSynthesizedCredentials(token, now), {
       encoding: "utf8",
       mode: 384
     });
@@ -801,7 +759,7 @@ async function probeKeysUsage(keys, deps = {}) {
 
 // src/harness/pty/adapters/opencode-auth.ts
 import { promises as fs } from "fs";
-import { dirname as dirname2, join as join2 } from "path";
+import { dirname, join as join2 } from "path";
 import { homedir } from "os";
 var logger2 = createServiceLogger("opencode-auth");
 var OPENCODE_CODEX_PLUGIN = "opencode-openai-codex-auth@4.4.0";
@@ -842,7 +800,7 @@ async function readJsonFile(path) {
   }
 }
 async function writeJsonFile(path, value) {
-  await fs.mkdir(dirname2(path), { recursive: true });
+  await fs.mkdir(dirname(path), { recursive: true });
   await fs.writeFile(path, `${JSON.stringify(value, null, 2)}
 `, { mode: 384 });
 }
@@ -1349,6 +1307,7 @@ var AdhocSessionRunner = class {
         return;
       }
       this.commandSupervisor.start();
+      this.commandSupervisor.notifyLoopReady?.();
       await this.connection.emitStatus("running");
       this.callbacks.onEvent?.({ type: "adhoc_runner_started", projectId: this.config.projectId });
       this.lifecycle.startIdleTimer();
@@ -1931,7 +1890,7 @@ function createSpawnedChildRunner(inputs) {
 
 // src/cli.ts
 if (process.argv.includes("--version")) {
-  const __dirname = dirname3(fileURLToPath(import.meta.url));
+  const __dirname = dirname2(fileURLToPath(import.meta.url));
   const pkgPath = join3(__dirname, "..", "package.json");
   const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
   process.stdout.write(pkg.version + "\n");
@@ -2013,15 +1972,15 @@ process.on("unhandledRejection", (reason) => {
   process.exit(1);
 });
 if (process.env.CONVEYOR_MODE === "workbench") {
-  const { startWorkbenchServer } = await import("./server-UGE67KIZ.js");
-  const { DEFAULT_WORKBENCH_PORT } = await import("./protocol-QJRHTTMQ.js");
+  const { startWorkbenchServer } = await import("./server-TVIXWCAI.js");
+  const { DEFAULT_WORKBENCH_PORT } = await import("./protocol-IHRTO5C4.js");
   const port = Number(process.env.CONVEYOR_WORKBENCH_PORT) || DEFAULT_WORKBENCH_PORT;
   const token = process.env.CONVEYOR_WORKBENCH_TOKEN ?? process.env.POD_BOOTSTRAP_TOKEN ?? "";
   if (!token) {
     logger6.error("workbench mode requires POD_BOOTSTRAP_TOKEN (or CONVEYOR_WORKBENCH_TOKEN)");
     process.exit(1);
   }
-  const pkgDir = dirname3(fileURLToPath(import.meta.url));
+  const pkgDir = dirname2(fileURLToPath(import.meta.url));
   const pkg = JSON.parse(readFileSync(join3(pkgDir, "..", "package.json"), "utf-8"));
   const handle = await startWorkbenchServer({
     port,
@@ -2266,6 +2225,7 @@ if (!workspaceCommandSupervisor) {
   });
   process.exit(0);
 }
+runner.setWorkspaceCommands(workspaceCommandSupervisor);
 void checkSessionTaskIdentity({
   sessionId: process.env.CONVEYOR_SESSION_ID,
   taskId: CONVEYOR_TASK_ID,