@rallycry/conveyor-agent 10.13.14 → 10.13.15

package/dist/cli.js

@@ -28,7 +28,7 @@ import {
   runUsageProbe,
   sampleKeyUsage,
   textResult
-} from "./chunk-J4UH5TOO.js";
+} from "./chunk-SAHOFQBQ.js";
 import "./chunk-7TQO4ZF4.js";
 import {
   getWorkbenchClient
@@ -47,13 +47,11 @@ 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;
@@ -61,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;
@@ -203,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;
@@ -278,7 +256,6 @@ var WorkspaceCommandSupervisor = class {
   connection;
   env;
   awaitGitReadyFn;
-  startLazySidecarsFn;
   waitForSidecarsFn;
   runStartCommandFn;
   loadForwardPortsFn;
@@ -313,8 +290,7 @@ 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.runStartCommandFn = options.runStartCommand ?? executors.runStartCommand;
     this.loadForwardPortsFn = options.loadForwardPorts ?? loadForwardPorts;
@@ -328,14 +304,6 @@ 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))
@@ -380,7 +348,6 @@ var WorkspaceCommandSupervisor = class {
     await this.waitForSidecarsFn({
       onLog: (message) => this.forwardSetupOutput("stdout", `[sidecars] ${message}
 `),
-      startLazy: false,
       signal: this.abortController.signal
     });
     if (this.stopped) return;
@@ -720,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");
@@ -751,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
     });
@@ -792,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";
@@ -833,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 });
 }
@@ -1923,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,7 +1980,7 @@ if (process.env.CONVEYOR_MODE === "workbench") {
     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,