@rallycry/conveyor-agent 10.13.57 → 10.13.59

package/dist/cli.js

@@ -24,17 +24,19 @@ import {
   loadConveyorConfig,
   loadForwardPorts,
   parseUsageGauges,
+  readWorkspaceBytes,
   resolvePlaywrightMcpServer,
   resolveSessionStart,
   resolveTuiAdapter,
   resolveTuiKindFromEnv,
   runUsageProbe,
   sampleKeyUsage,
+  statWorkspacePath,
   workspacePathExists
-} from "./chunk-VIEBOAJ7.js";
+} from "./chunk-JCRP6K6T.js";
 import {
   reportBootMilestone
-} from "./chunk-WVUQ5CH5.js";
+} from "./chunk-QZN6HVUY.js";
 import "./chunk-5OQQSDVT.js";
 import {
   getWorkbenchClient
@@ -49,12 +51,12 @@ import {
   runStartCommand,
   sessionTempBase,
   terminateProcessGroup
-} from "./chunk-PWYJZY3P.js";
+} from "./chunk-NAK6FY5U.js";
 import "./chunk-JIGG755T.js";
 
 // src/cli.ts
 import { readFileSync } from "fs";
-import { join as join3, dirname as dirname2 } from "path";
+import { join as join4, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 
 // src/setup/sidecars.ts
@@ -272,6 +274,143 @@ async function runDbSchemaSync(options) {
   }
 }
 
+// src/setup/deps-sync.ts
+import { join as join2 } from "path";
+var INSTALLER_SCRIPT_CANDIDATES = ["scripts/install-deps.sh"];
+var BUN_INSTALL = "bun install --frozen-lockfile";
+var DEPS_SYNC_TIMEOUT_MS = 9e5;
+var REGISTRY_KEY_ENV = "NPM_CACHE_READER_KEY";
+function isDisabled2(env) {
+  const flag = env.CONVEYOR_DEPS_SYNC?.trim().toLowerCase();
+  return flag === "0" || flag === "false";
+}
+var CKSUM_POLYNOMIAL = 79764919;
+var CKSUM_TABLE = (() => {
+  const table = new Uint32Array(256);
+  for (let index = 0; index < 256; index++) {
+    let value = index << 24;
+    for (let bit = 0; bit < 8; bit++) {
+      value = value & 2147483648 ? (value << 1 ^ CKSUM_POLYNOMIAL) >>> 0 : value << 1 >>> 0;
+    }
+    table[index] = value >>> 0;
+  }
+  return table;
+})();
+function posixCksum(bytes) {
+  let crc = 0;
+  for (const byte of bytes) {
+    crc = (crc << 8 ^ CKSUM_TABLE[(crc >>> 24 ^ byte) & 255]) >>> 0;
+  }
+  for (let length = bytes.length; length > 0; length >>>= 8) {
+    crc = (crc << 8 ^ CKSUM_TABLE[(crc >>> 24 ^ length & 255) & 255]) >>> 0;
+  }
+  return ~crc >>> 0;
+}
+function bunLockFingerprint(bytes) {
+  return `${posixCksum(bytes)}:${bytes.length}`;
+}
+async function defaultDirExists(path) {
+  return (await statWorkspacePath(path)).isDirectory;
+}
+async function readLockDrift(options) {
+  const { workspaceDir, readBytes } = options;
+  let baked;
+  try {
+    const raw = await readBytes(join2(workspaceDir, ".conveyor/prebake-cache.json"));
+    const parsed = JSON.parse(Buffer.from(raw).toString("utf8"));
+    const value = parsed?.bunLockCrc;
+    if (typeof value !== "string" || !value) return null;
+    baked = value;
+  } catch {
+    return null;
+  }
+  try {
+    const actual = bunLockFingerprint(await readBytes(join2(workspaceDir, "bun.lock")));
+    return actual === baked ? null : { baked, actual };
+  } catch {
+    return null;
+  }
+}
+async function resolveDepsSyncPlan(options) {
+  const { workspaceDir, env } = options;
+  const pathExists = options.pathExists ?? workspacePathExists;
+  const dirExists = options.dirExists ?? defaultDirExists;
+  const readBytes = options.readBytes ?? readWorkspaceBytes;
+  if (isDisabled2(env)) return null;
+  if (!await pathExists(join2(workspaceDir, "package.json"))) return null;
+  const override = env.CONVEYOR_DEPS_SYNC_COMMAND?.trim();
+  const resolveCommand = async () => {
+    if (override) return override;
+    for (const relative of INSTALLER_SCRIPT_CANDIDATES) {
+      if (await pathExists(join2(workspaceDir, relative))) return `bash ${relative}`;
+    }
+    return BUN_INSTALL;
+  };
+  if (!await dirExists(join2(workspaceDir, "node_modules"))) {
+    return {
+      command: await resolveCommand(),
+      cwd: workspaceDir,
+      reason: "missing_node_modules",
+      detail: "the pod booted with no node_modules \u2014 the baked dependency tree is absent"
+    };
+  }
+  const drift = await readLockDrift({ workspaceDir, readBytes });
+  if (drift) {
+    return {
+      command: await resolveCommand(),
+      cwd: workspaceDir,
+      reason: "lockfile_drift",
+      detail: `bun.lock changed since the image bake (baked ${drift.baked}, checked out ${drift.actual})`
+    };
+  }
+  return null;
+}
+function describeFailure(plan, error, env) {
+  const cause = error instanceof Error ? error.message : String(error);
+  const parts = [
+    `Dependency install failed (${plan.reason}): ${plan.detail}.`,
+    `Ran \`${plan.command}\` in ${plan.cwd} \u2014 ${cause}.`
+  ];
+  if (!env[REGISTRY_KEY_ENV]?.trim()) {
+    parts.push(
+      `${REGISTRY_KEY_ENV} is not set on this pod, so packages on the private registry cache cannot be fetched \u2014 set it as a project secret.`
+    );
+  }
+  return parts.join(" ");
+}
+async function runDepsSync(options) {
+  let plan = null;
+  try {
+    plan = await resolveDepsSyncPlan(options);
+  } catch {
+    return { outcome: "skipped" };
+  }
+  if (!plan) return { outcome: "skipped" };
+  const { onOutput, runCommand, env } = options;
+  onOutput("stdout", `[deps] ${plan.detail}
+`);
+  onOutput("stdout", `[deps] installing (${plan.reason}): ${plan.command}
+`);
+  const controller = new AbortController();
+  const abort = () => controller.abort();
+  options.signal?.addEventListener("abort", abort, { once: true });
+  const timer = setTimeout(abort, options.timeoutMs ?? DEPS_SYNC_TIMEOUT_MS);
+  timer.unref();
+  try {
+    await runCommand(plan.command, plan.cwd, onOutput, controller.signal);
+    onOutput("stdout", "[deps] dependencies installed\n");
+    return { outcome: "installed" };
+  } catch (error) {
+    const message = describeFailure(plan, error, env);
+    onOutput("stderr", `[deps] ${message}
+`);
+    return { outcome: "failed", message };
+  } finally {
+    clearTimeout(timer);
+    options.signal?.removeEventListener("abort", abort);
+  }
+}
+
 // src/setup/workspace-command-supervisor.ts
 function defaultCommandExecutors() {
   if (workbenchEnabled()) {
@@ -307,6 +446,7 @@ var WorkspaceCommandSupervisor = class {
   waitForSidecarsFn;
   runStartCommandFn;
   syncDbSchemaFn;
+  syncDepsFn;
   loadForwardPortsFn;
   writeOutput;
   terminateStartCommand;
@@ -352,6 +492,13 @@ var WorkspaceCommandSupervisor = class {
       onOutput: opts.onOutput,
       signal: opts.signal
     }));
+    this.syncDepsFn = options.syncDeps ?? ((opts) => runDepsSync({
+      workspaceDir: this.workspaceDir,
+      env: this.env,
+      runCommand: executors.runShellCommand,
+      onOutput: opts.onOutput,
+      signal: opts.signal
+    }));
     this.loadForwardPortsFn = options.loadForwardPorts ?? loadForwardPorts;
     this.writeOutput = options.writeOutput ?? defaultWriteOutput;
     this.terminateStartCommand = options.terminateStartCommand ?? terminateProcessGroup;
@@ -412,6 +559,8 @@ var WorkspaceCommandSupervisor = class {
     this.reportBootMilestoneFn("sidecars_ready");
     await this.loopReady;
     if (this.stopped) return;
+    await this.syncDeps();
+    if (this.stopped) return;
     await this.syncDbSchema();
     if (this.stopped) return;
     const startCommandRunning = this.config?.startCommand ? await this.ensureStartCommandLaunched(this.config.startCommand) : false;
@@ -426,6 +575,21 @@ var WorkspaceCommandSupervisor = class {
       ...previewPorts.length > 0 ? { previewPorts } : {}
     });
   }
+  /** Run the dependency sync, forwarding its output as setup output so it lands
+   *  in the card's setup log. A failure is announced with its own cause rather
+   *  than thrown: the start command still launches, but the card now carries
+   *  the reason instead of a generic `start command exited with code 1`. */
+  async syncDeps() {
+    const result = await this.syncDepsFn({
+      onOutput: (stream, data) => this.forwardSetupOutput(stream, data),
+      signal: this.abortController.signal
+    });
+    if (result.outcome !== "failed" || this.stopped) return;
+    this.connection.sendEvent({
+      type: "setup_error",
+      message: result.message ?? "Dependency install failed \u2014 the start command will fail until dependencies are installed (see pod logs)"
+    });
+  }
   /** Run the schema sync, forwarding its output as setup output so it lands in
    *  the card's setup log. A failure is announced rather than thrown: it is the
    *  exact condition that used to render as a silent "Displaying 0 results". */
@@ -762,7 +926,7 @@ var ProjectSessionRunner = class {
 
 // src/usage/multi-key-probe.ts
 import { mkdtemp, writeFile, copyFile, rm } from "fs/promises";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 var logger = createServiceLogger("multi-key-probe");
 function gaugesToSamples(stdout) {
   const { sessionUsage, weeklyUsage, sessionResetsAt, weeklyResetsAt, gauges } = parseUsageGauges(stdout);
@@ -790,12 +954,12 @@ function gaugesToSamples(stdout) {
 async function isolatedProbe(token, now) {
   let dir = null;
   try {
-    dir = await mkdtemp(join2(sessionTempBase(), "conveyor-usage-"));
-    await writeFile(join2(dir, ".credentials.json"), buildSynthesizedCredentials(token, now), {
+    dir = await mkdtemp(join3(sessionTempBase(), "conveyor-usage-"));
+    await writeFile(join3(dir, ".credentials.json"), buildSynthesizedCredentials(token, now), {
       encoding: "utf8",
       mode: 384
     });
-    await copyFile(claudeJsonPath(), join2(dir, ".claude.json")).catch(() => {
+    await copyFile(claudeJsonPath(), join3(dir, ".claude.json")).catch(() => {
     });
     return await runUsageProbe({ env: { ...process.env, CLAUDE_CONFIG_DIR: dir } });
   } catch (error) {
@@ -1558,7 +1722,7 @@ function hostsSpawnedChildren(mode) {
 
 // src/cli.ts
 if (process.argv[2] === "boot") {
-  const { runBoot } = await import("./boot-37ZX7POR.js");
+  const { runBoot } = await import("./boot-7OPX55AO.js");
   process.exit(await runBoot(process.argv.slice(3)));
 }
 if (isLegacyEntrypointLaunch(process.env)) {
@@ -1568,7 +1732,7 @@ if (isLegacyEntrypointLaunch(process.env)) {
 }
 if (process.argv.includes("--version")) {
   const __dirname = dirname2(fileURLToPath(import.meta.url));
-  const pkgPath = join3(__dirname, "..", "package.json");
+  const pkgPath = join4(__dirname, "..", "package.json");
   const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
   process.stdout.write(pkg.version + "\n");
   process.exit(0);
@@ -1660,7 +1824,7 @@ process.on("unhandledRejection", (reason) => {
   process.exit(1);
 });
 if (process.env.CONVEYOR_MODE === "workbench") {
-  const { startWorkbenchServer } = await import("./server-7UW4X3XF.js");
+  const { startWorkbenchServer } = await import("./server-ZACB5T5S.js");
   const { oomWatchdogOptionsFromEnv } = await import("./oom-watchdog-U7JERHA2.js");
   const { DEFAULT_WORKBENCH_PORT } = await import("./protocol-QLVS5W6O.js");
   const port = Number(process.env.CONVEYOR_WORKBENCH_PORT) || DEFAULT_WORKBENCH_PORT;
@@ -1670,7 +1834,7 @@ if (process.env.CONVEYOR_MODE === "workbench") {
     process.exit(1);
   }
   const pkgDir = dirname2(fileURLToPath(import.meta.url));
-  const pkg = JSON.parse(readFileSync(join3(pkgDir, "..", "package.json"), "utf-8"));
+  const pkg = JSON.parse(readFileSync(join4(pkgDir, "..", "package.json"), "utf-8"));
   const handle = await startWorkbenchServer({
     port,
     token,