@rallycry/conveyor-agent 10.13.15 → 10.13.16

package/dist/{chunk-SAHOFQBQ.js → chunk-OW2TIDWZ.js}

@@ -3,7 +3,15 @@ import {
 } from "./chunk-7TQO4ZF4.js";
 import {
   getWorkbenchClient
-} from "./chunk-LZM5OKAC.js";
+} from "./chunk-UDSRAHKP.js";
+import {
+  CLONE_TIMEOUT_MS,
+  DEFAULT_RETRY_DELAY_MS,
+  FETCH_TIMEOUT_MS,
+  GIT_PREP_MAX_RETRIES,
+  mapChatHistory,
+  readAgentVersion
+} from "./chunk-UZTJJD7Y.js";
 import {
   workbenchEnabled
 } from "./chunk-4VUQ2NPF.js";
@@ -23,7 +31,7 @@ import {
   sleep,
   transcriptSize,
   turnOptionsFrom
-} from "./chunk-RSIW2UCR.js";
+} from "./chunk-JG54UJ6V.js";
 
 // src/setup/bootstrap.ts
 var BOOTSTRAP_TIMEOUT_MS = 3e4;
@@ -271,8 +279,8 @@ var AgentConnection = class _AgentConnection {
   /** (Re)arm the recycle timer — called on every successful (re)connect. */
   scheduleSocketRecycle() {
     this.clearSocketRecycle();
-    const delay = _AgentConnection.SOCKET_RECYCLE_BASE_MS + Math.random() * _AgentConnection.SOCKET_RECYCLE_JITTER_MS;
-    this.armRecycleTimer(delay);
+    const delay2 = _AgentConnection.SOCKET_RECYCLE_BASE_MS + Math.random() * _AgentConnection.SOCKET_RECYCLE_JITTER_MS;
+    this.armRecycleTimer(delay2);
   }
   clearSocketRecycle() {
     if (this.recycleTimer) {
@@ -280,11 +288,11 @@ var AgentConnection = class _AgentConnection {
       this.recycleTimer = null;
     }
   }
-  armRecycleTimer(delay) {
+  armRecycleTimer(delay2) {
     this.recycleTimer = setTimeout(() => {
       this.recycleTimer = null;
       this.attemptSocketRecycle();
-    }, delay);
+    }, delay2);
     this.recycleTimer.unref?.();
   }
   attemptSocketRecycle() {
@@ -3005,10 +3013,10 @@ var Lifecycle = class {
    *  deadline regardless of message volume. */
   startDormantTimer(overrideMs) {
     this.cancelDormantTimer();
-    const delay = Math.max(0, overrideMs ?? this.config.dormantTimeoutMs);
+    const delay2 = Math.max(0, overrideMs ?? this.config.dormantTimeoutMs);
     this.dormantTimer = setTimeout(() => {
       this.callbacks.onDormantTimeout();
-    }, delay);
+    }, delay2);
   }
   cancelDormantTimer() {
     if (this.dormantTimer) {
@@ -10158,47 +10166,6 @@ var QueryBridge = class {
   }
 };
 
-// src/runner/session-runner-helpers.ts
-import { readFileSync as readFileSync2 } from "fs";
-import { dirname as dirname2, join as join8 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
-function mapChatHistory(messages) {
-  if (!messages) return [];
-  return messages.map((m) => ({
-    id: m.id,
-    role: m.role ?? "user",
-    content: m.content ?? "",
-    userId: m.userId,
-    userName: m.user?.name ?? void 0,
-    createdAt: m.createdAt,
-    ...m.files && m.files.length > 0 ? {
-      files: m.files.map((f) => ({
-        fileId: f.id,
-        fileName: f.fileName,
-        mimeType: f.mimeType,
-        fileSize: f.fileSize,
-        downloadUrl: f.downloadUrl ?? "",
-        content: f.content,
-        contentEncoding: f.contentEncoding
-      }))
-    } : {}
-  }));
-}
-function readAgentVersion() {
-  try {
-    const here = dirname2(fileURLToPath2(import.meta.url));
-    for (const rel of ["../package.json", "../../package.json"]) {
-      try {
-        const pkg = JSON.parse(readFileSync2(join8(here, rel), "utf-8"));
-        if (pkg.version) return pkg.version;
-      } catch {
-      }
-    }
-  } catch {
-  }
-  return null;
-}
-
 // src/execution/usage-sampler.ts
 import { existsSync as existsSync3 } from "fs";
 
@@ -10488,72 +10455,62 @@ async function sampleKeyUsage(token, probe = () => runUsageProbe(), hasSubscript
 }
 
 // src/setup/git-ready.ts
-import { access, stat as stat2 } from "fs/promises";
-var DEFAULT_FAILED_PATH = "/workspaces/.conveyor-git-failed";
-var DEFAULT_TIMEOUT_MS = 6e5;
+var GATE_MARGIN_MS = 5 * 6e4;
+var DEFAULT_TIMEOUT_MS = GIT_PREP_MAX_RETRIES * (CLONE_TIMEOUT_MS + FETCH_TIMEOUT_MS) + (GIT_PREP_MAX_RETRIES - 1) * DEFAULT_RETRY_DELAY_MS + GATE_MARGIN_MS;
 var DEFAULT_POLL_MS = 200;
-async function fileExists(path2) {
-  try {
-    await access(path2);
-    const s = await stat2(path2);
-    return s.isFile();
-  } catch {
-    return false;
-  }
-}
 function awaitGitReady(opts = {}) {
-  if (opts.signal?.aborted) return Promise.reject(abortError());
-  const markerPath = opts.markerPath ?? process.env.CONVEYOR_GIT_READY_MARKER;
-  if (!markerPath) {
+  if (!workbenchEnabled()) {
     return Promise.resolve("not-gated");
   }
-  const failedPath = opts.failedPath ?? process.env.CONVEYOR_GIT_FAILED_MARKER ?? DEFAULT_FAILED_PATH;
+  const clientFn = opts.clientFn ?? getWorkbenchClient;
   const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS;
   const pollMs = opts.pollMs ?? DEFAULT_POLL_MS;
-  opts.onLog?.(`waiting for workspace git (marker=${markerPath})`);
-  return pollForMarkers(markerPath, failedPath, timeoutMs, pollMs, opts.onLog, opts.signal);
-}
-function abortError() {
-  const error = new Error("Operation aborted");
-  error.name = "AbortError";
-  return error;
+  opts.onLog?.("waiting for workspace git (workbench daemon)");
+  return pollDaemon(clientFn, timeoutMs, pollMs, opts.onLog, opts.signal);
 }
-function abortableDelay(ms, signal) {
+function delay(ms, signal) {
   if (!signal) {
     return new Promise((resolve) => {
       setTimeout(resolve, ms);
     });
   }
-  if (signal.aborted) return Promise.reject(abortError());
-  return new Promise((resolve, reject) => {
+  if (signal.aborted) return Promise.resolve();
+  return new Promise((resolve) => {
     const timer = setTimeout(() => {
       signal.removeEventListener("abort", onAbort);
       resolve();
     }, ms);
     const onAbort = () => {
       clearTimeout(timer);
-      reject(abortError());
+      resolve();
     };
     signal.addEventListener("abort", onAbort, { once: true });
   });
 }
-async function pollForMarkers(markerPath, failedPath, timeoutMs, pollMs, onLog, signal) {
+async function pollDaemon(clientFn, timeoutMs, pollMs, onLog, signal) {
   const deadline = Date.now() + timeoutMs;
   for (; ; ) {
-    if (signal?.aborted) throw abortError();
-    if (await fileExists(markerPath)) {
-      onLog?.("workspace git ready");
-      return "ready";
+    if (signal?.aborted) {
+      onLog?.("workspace git wait aborted \u2014 giving up");
+      return "timeout";
     }
-    if (await fileExists(failedPath)) {
-      onLog?.("workspace git preparation failed (marker present)");
-      return "failed";
+    try {
+      const frame = await clientFn().gitStatus();
+      if (frame.state === "ready") {
+        onLog?.("workspace git ready");
+        return "ready";
+      }
+      if (frame.state === "failed") {
+        onLog?.(`workspace git preparation failed: ${frame.reason ?? "unknown reason"}`);
+        return "failed";
+      }
+    } catch {
     }
     if (Date.now() >= deadline) {
       onLog?.(`workspace git not ready after ${timeoutMs}ms \u2014 giving up`);
       return "timeout";
     }
-    await abortableDelay(pollMs, signal);
+    await delay(pollMs, signal);
   }
 }
 
@@ -10838,7 +10795,7 @@ async function handlePullBranch(workDir, branch) {
 }
 
 // src/runner/heavy-gate.ts
-import { readFileSync as readFileSync3 } from "fs";
+import { readFileSync as readFileSync2 } from "fs";
 import path from "path";
 var GATE_KEYS = ["heavy", "test", "typecheck", "build"];
 function runDir() {
@@ -10855,7 +10812,7 @@ function pidAlive(pid) {
 function isHeavyGateActive() {
   for (const key of GATE_KEYS) {
     try {
-      const raw = readFileSync3(path.join(runDir(), `${key}.pid`), "utf8").trim();
+      const raw = readFileSync2(path.join(runDir(), `${key}.pid`), "utf8").trim();
       const pid = Number.parseInt(raw, 10);
       if (Number.isInteger(pid) && pid > 0 && pidAlive(pid)) return true;
     } catch {
@@ -11754,12 +11711,12 @@ var SessionRunner = class _SessionRunner {
 };
 
 // src/setup/config.ts
-import { join as join9 } from "path";
+import { join as join8 } from "path";
 var DEVCONTAINER_PATH = ".devcontainer/conveyor/devcontainer.json";
 var DEVCONTAINER_PORT_DENY_LIST = /* @__PURE__ */ new Set([5432, 6379, 9200]);
 async function loadForwardPorts(workspaceDir) {
   try {
-    const raw = await readWorkspaceFile(join9(workspaceDir, DEVCONTAINER_PATH));
+    const raw = await readWorkspaceFile(join8(workspaceDir, DEVCONTAINER_PATH));
     const parsed = JSON.parse(raw);
     const ports = (parsed.forwardPorts ?? []).filter(
       (p) => typeof p === "number" && !DEVCONTAINER_PORT_DENY_LIST.has(p)
@@ -11853,4 +11810,4 @@ export {
   loadConveyorConfig,
   unshallowRepo
 };
-//# sourceMappingURL=chunk-SAHOFQBQ.js.map
+//# sourceMappingURL=chunk-OW2TIDWZ.js.map