@rallycry/conveyor-agent 11.0.4 → 11.0.5

package/dist/{boot-SWUVT5B4.js → boot-7XH4FFLO.js}

@@ -1,6 +1,6 @@
 import {
   startWorkbenchServer
-} from "./chunk-UBDSLM44.js";
+} from "./chunk-D57S4UR5.js";
 import {
   TOMBSTONE_MESSAGE,
   isLegacyEntrypointLaunch
@@ -8,7 +8,7 @@ import {
 import {
   readAgentVersion
 } from "./chunk-XORJ6SII.js";
-import "./chunk-3F4ZZKCA.js";
+import "./chunk-W6VILPQE.js";
 import {
   GitPrepJob,
   defaultGit,

package/dist/{chunk-UBDSLM44.js → chunk-D57S4UR5.js}

@@ -1,6 +1,6 @@
 import {
   loadPtySpawn
-} from "./chunk-3F4ZZKCA.js";
+} from "./chunk-W6VILPQE.js";
 import {
   terminateProcessGroup
 } from "./chunk-W4LZ7R6Z.js";

package/dist/{chunk-HYPX6FEX.js → chunk-J2NPWBVZ.js}

@@ -9,6 +9,7 @@ import {
   buildPromptBytes,
   buildSpawnArgs,
   cleanTerminalOutput,
+  ensureSessionTarget,
   inheritedEnv,
   killPtyWithEscalation,
   needsRawReadyGate,
@@ -27,7 +28,7 @@ import {
   spawnOptionsFingerprint,
   transcriptSize,
   turnOptionsFrom
-} from "./chunk-3F4ZZKCA.js";
+} from "./chunk-W6VILPQE.js";
 import {
   AgentConnection,
   CodespacePortVisibility,
@@ -5720,13 +5721,19 @@ var PtyHarness = class _PtyHarness {
   }
   async *executeQuery(opts) {
     const want = opts.resume ?? opts.options.resume ?? this.parked?.reportedSessionId ?? void 0;
-    const fingerprint = this.fingerprintOf(opts.options);
+    const options = ensureSessionTarget(opts.options, want);
+    if (options !== opts.options) {
+      _PtyHarness.log.warn("spawn had no session target \u2014 minted one", {
+        sessionId: options.sessionId
+      });
+    }
+    const fingerprint = this.fingerprintOf(options);
     let session;
-    if (this.parked?.canReuse(want, fingerprint) && !await this.parkedHomeDied(opts.options)) {
+    if (this.parked?.canReuse(want, fingerprint) && !await this.parkedHomeDied(options)) {
       session = this.parked;
       this.parked = null;
       this.cancelEndedTimer();
-      await session.beginTurn(opts.prompt, opts.options);
+      await session.beginTurn(opts.prompt, options);
     } else {
       if (this.parked) {
         const stale = this.parked;
@@ -5734,10 +5741,10 @@ var PtyHarness = class _PtyHarness {
         this.cancelEndedTimer();
         await stale.teardown();
       }
-      session = await this.spawnSession(opts.prompt, opts.options, want);
+      session = await this.spawnSession(opts.prompt, options, want);
     }
     yield* this.drain(session);
-    yield* this.recoverFailedDelivery(session, opts.options, want);
+    yield* this.recoverFailedDelivery(session, options, want);
   }
   /**
    * Did the shared `~/.claude` mount die while this session sat parked?
@@ -6768,8 +6775,8 @@ function wrapBridgeWithDirectStream(inner, reporter, options = {}) {
 }
 
 // src/execution/query-executor.ts
-import { createHash as createHash2 } from "crypto";
-import { existsSync, readFileSync as readFileSync2, truncateSync } from "fs";
+import { createHash as createHash2, randomUUID as randomUUID2 } from "crypto";
+import { existsSync, readFileSync as readFileSync2, renameSync, truncateSync } from "fs";
 
 // src/execution/chat-instructions.ts
 function buildChatInstructions(context, scenario, newMessages) {
@@ -7678,11 +7685,8 @@ function tagContextIntro(runnerMode) {
   return `These docs match this task's tags. They auto-load when you edit matching files, and you can Read any of them the moment you need its detail \u2014 do NOT read them all up front.`;
 }
 function formatResolvedTags(resolved, subProject, mentioned, runnerMode) {
-  const parts = [
-    `
-## Reference Guides (load on demand)`,
-    tagContextIntro(runnerMode)
-  ];
+  const parts = [`
+## Reference Guides (load on demand)`, tagContextIntro(runnerMode)];
   for (const tag of resolved) {
     if (tag.entries.length === 0 && !tag.hasOverview) continue;
     const desc = tag.description ? ` \u2014 ${tag.description}` : "";
@@ -8122,7 +8126,10 @@ function buildRelaunchWithSession(mode, context, agentMode, isAuto) {
     parts.push(`You were relaunched but no new instructions have been given since your last run.`);
     if (agentMode === "auto" || agentMode === "building" || isAuto) {
       parts.push(
-        ...builderKickoff(context, `You are the Builder on this card \u2014 pick up where you left off.`)
+        ...builderKickoff(
+          context,
+          `You are the Builder on this card \u2014 pick up where you left off.`
+        )
       );
     } else {
       parts.push(
@@ -9405,7 +9412,9 @@ var driveListFilesContract = defineToolContract({
     fields: {
       folderId: f.optional(f.string({ desc: `Folder to list. ${ROOT_DEFAULT}` })),
       search: f.optional(f.string({ desc: "Only return names containing this text", max: 200 })),
-      limit: f.optional(f.number({ desc: "Max entries (default 100)", int: true, min: 1, max: 200 }))
+      limit: f.optional(
+        f.number({ desc: "Max entries (default 100)", int: true, min: 1, max: 200 })
+      )
     }
   },
   mcp: {
@@ -9414,7 +9423,9 @@ var driveListFilesContract = defineToolContract({
       projectId: mcpProjectId,
       folderId: f.optional(f.string({ desc: `Folder to list. ${ROOT_DEFAULT}` })),
       search: f.optional(f.string({ desc: "Only return names containing this text", max: 200 })),
-      limit: f.optional(f.number({ desc: "Max entries (default 100)", int: true, min: 1, max: 200 }))
+      limit: f.optional(
+        f.number({ desc: "Max entries (default 100)", int: true, min: 1, max: 200 })
+      )
     }
   }
 });
@@ -9517,7 +9528,12 @@ var listMeetingsContract = defineToolContract({
     description: `List this project's meetings, newest first \u2014 each with its title, date, source, status, participants, and a short summary preview. Start here when you are asked about "the meeting", "what did we decide", or "what came out of that call". ${SUMMARY_NOTE}`,
     fields: {
       limit: f.optional(
-        f.number({ desc: "How many to return (default 20, maximum 50).", int: true, min: 1, max: 50 })
+        f.number({
+          desc: "How many to return (default 20, maximum 50).",
+          int: true,
+          min: 1,
+          max: 50
+        })
       ),
       search: f.optional(
         f.string({ desc: "Case-insensitive match on the meeting title.", max: 200 })
@@ -9529,7 +9545,12 @@ var listMeetingsContract = defineToolContract({
     fields: {
       projectId: mcpProjectId,
       limit: f.optional(
-        f.number({ desc: "How many to return (default 20, maximum 50).", int: true, min: 1, max: 50 })
+        f.number({
+          desc: "How many to return (default 20, maximum 50).",
+          int: true,
+          min: 1,
+          max: 50
+        })
       ),
       search: f.optional(
         f.string({ desc: "Case-insensitive match on the meeting title.", max: 200 })
@@ -9583,9 +9604,7 @@ var SINCE_MINUTES = f.optional(
     max: 10080
   })
 );
-var START_TIME = f.optional(
-  f.string({ desc: "ISO 8601 lower bound (overrides sinceMinutes)" })
-);
+var START_TIME = f.optional(f.string({ desc: "ISO 8601 lower bound (overrides sinceMinutes)" }));
 var END_TIME = f.optional(f.string({ desc: "ISO 8601 upper bound (default now)" }));
 var LIMIT = f.optional(
   f.number({ desc: "Max entries per page (default 50)", int: true, min: 1, max: 200 })
@@ -9619,7 +9638,10 @@ var gcpFields = {
     })
   ),
   search: f.optional(
-    f.string({ desc: "Free-text search across all log fields (exact substring, not regex)", max: 256 })
+    f.string({
+      desc: "Free-text search across all log fields (exact substring, not regex)",
+      max: 256
+    })
   ),
   filter: f.optional(
     f.string({
@@ -11246,7 +11268,9 @@ var CONTEXT_PATH_SHAPE = z18.object({
   locator: z18.string().min(1).max(CONTEXT_LINK_LOCATOR_MAX).regex(/^[^\r\n]*$/, "Locator cannot contain line breaks").optional().describe(
     'Verified-link tether: text that must keep existing in the file. With locatorType "test" it must appear inside a real it/test/describe TITLE; with "code" anywhere in the file. Validated at write time against the checkout and re-checked by the periodic sweep \u2014 a rename/delete flags the link stale. Locators containing <> are placeholders and never checked.'
   ),
-  locatorType: z18.enum(["test", "code"]).optional().describe("How the locator must match \u2014 required iff locator is set; not valid on folder links")
+  locatorType: z18.enum(["test", "code"]).optional().describe(
+    "How the locator must match \u2014 required iff locator is set; not valid on folder links"
+  )
 }).refine((link) => link.locator === void 0 === (link.locatorType === void 0), {
   message: "locator and locatorType must be provided together"
 }).refine((link) => link.locator === void 0 || link.type !== "folder", {
@@ -11640,52 +11664,43 @@ function buildDriveCreateFileTool(connection, projectId) {
   );
 }
 function buildDriveUpdateFileTool(connection, projectId) {
-  return defineContractTool(
-    driveUpdateFileContract,
-    async ({ fileId, content, mimeType }) => {
-      try {
-        const file = await connection.call("updateProjectDriveFile", {
-          projectId,
-          fileId,
-          content,
-          mimeType
-        });
-        return textResult(`Updated "${file.name}" (${file.id})`);
-      } catch (error) {
-        return errText2("Failed to update the Google Drive file", error);
-      }
+  return defineContractTool(driveUpdateFileContract, async ({ fileId, content, mimeType }) => {
+    try {
+      const file = await connection.call("updateProjectDriveFile", {
+        projectId,
+        fileId,
+        content,
+        mimeType
+      });
+      return textResult(`Updated "${file.name}" (${file.id})`);
+    } catch (error) {
+      return errText2("Failed to update the Google Drive file", error);
     }
-  );
+  });
 }
 function buildDriveDeleteFileTool(connection, projectId) {
-  return defineContractTool(
-    driveDeleteFileContract,
-    async ({ fileId }) => {
-      try {
-        const result = await connection.call("deleteProjectDriveFile", { projectId, fileId });
-        return textResult(`Moved "${result.name}" (${result.id}) to the Google Drive trash`);
-      } catch (error) {
-        return errText2("Failed to delete the Google Drive file", error);
-      }
+  return defineContractTool(driveDeleteFileContract, async ({ fileId }) => {
+    try {
+      const result = await connection.call("deleteProjectDriveFile", { projectId, fileId });
+      return textResult(`Moved "${result.name}" (${result.id}) to the Google Drive trash`);
+    } catch (error) {
+      return errText2("Failed to delete the Google Drive file", error);
     }
-  );
+  });
 }
 function buildDriveCreateFolderTool(connection, projectId) {
-  return defineContractTool(
-    driveCreateFolderContract,
-    async ({ name, folderId }) => {
-      try {
-        const folder = await connection.call("createProjectDriveFolder", {
-          projectId,
-          name,
-          folderId
-        });
-        return textResult(`Created folder "${folder.name}" (${folder.id})`);
-      } catch (error) {
-        return errText2("Failed to create the Google Drive folder", error);
-      }
+  return defineContractTool(driveCreateFolderContract, async ({ name, folderId }) => {
+    try {
+      const folder = await connection.call("createProjectDriveFolder", {
+        projectId,
+        name,
+        folderId
+      });
+      return textResult(`Created folder "${folder.name}" (${folder.id})`);
+    } catch (error) {
+      return errText2("Failed to create the Google Drive folder", error);
     }
-  );
+  });
 }
 function buildDriveTools(connection, projectId) {
   return [
@@ -13681,6 +13696,29 @@ async function runInitialQuery(host, context, options, resume, promptDelivery) {
   }
   await trackAndRun(host, context, queryOptions, agentQuery);
 }
+function rotateSessionFile(cwd, sessionUuid) {
+  const path = sessionTranscriptPath(cwd, sessionUuid);
+  try {
+    if (!existsSync(path)) return true;
+    renameSync(path, `${path.replace(/\.jsonl$/, "")}.aborted-${Date.now()}.jsonl`);
+    return true;
+  } catch (error) {
+    logger5.warn("Could not rotate an aborted transcript aside", {
+      path,
+      error: error instanceof Error ? error.message : String(error)
+    });
+    return false;
+  }
+}
+function freshSessionOptions(host, context, options) {
+  const lineageUuid = taskIdToSessionUuid(
+    sessionLineageKey(context.taskId, host.agentMode, host.config.mode)
+  );
+  if (rotateSessionFile(host.config.workspaceDir, lineageUuid)) {
+    return { ...options, sessionId: lineageUuid };
+  }
+  return { ...options, sessionId: randomUUID2() };
+}
 async function buildRetryQuery(host, context, options, lastErrorWasImage) {
   if (lastErrorWasImage) {
     host.connection.postChatMessage(
@@ -13700,10 +13738,7 @@ async function buildRetryQuery(host, context, options, lastErrorWasImage) {
   );
   return host.harness.executeQuery({
     prompt: host.createInputStream(retryPrompt),
-    // Strip sessionId on retry — if the failing query partially created a
-    // session with that ID, passing it again would error. Let the SDK
-    // auto-generate on retry attempts.
-    options: { ...options, sessionId: void 0 },
+    options: freshSessionOptions(host, context, options),
     resume: void 0
   });
 }
@@ -13735,7 +13770,7 @@ async function handleAuthError(context, host, options) {
   );
   const freshQuery = host.harness.executeQuery({
     prompt: host.createInputStream(freshPrompt),
-    options: { ...options, sessionId: void 0 },
+    options: freshSessionOptions(host, context, options),
     resume: void 0
   });
   return runWithRetry(freshQuery, context, host, options);
@@ -13756,7 +13791,7 @@ async function handleStaleSession(context, host, options) {
   );
   const freshQuery = host.harness.executeQuery({
     prompt: host.createInputStream(freshPrompt),
-    options: { ...options, sessionId: void 0 },
+    options: freshSessionOptions(host, context, options),
     resume: void 0
   });
   return runWithRetry(freshQuery, context, host, options);
@@ -13856,7 +13891,7 @@ async function handleUsageCapRejection(context, host, options, rateLimitType, re
   );
   const freshQuery = host.harness.executeQuery({
     prompt: host.createInputStream(freshPrompt),
-    options: { ...options, sessionId: void 0 },
+    options: freshSessionOptions(host, context, options),
     resume: void 0
   });
   return runWithRetry(freshQuery, context, host, options);
@@ -14654,10 +14689,8 @@ var BackgroundWorkTracker = class {
     this.prune(now);
     if (this.deadlines.length === 0) return;
     this.deadlines.shift();
-    this.log(
-      `[conveyor-agent] background work finished; ${this.deadlines.length} outstanding
-`
-    );
+    this.log(`[conveyor-agent] background work finished; ${this.deadlines.length} outstanding
+`);
     this.onChange?.();
   }
   /** Is any non-expired background work outstanding? */
@@ -14886,8 +14919,10 @@ var SessionRunner = class _SessionRunner {
       if (this.backgroundWork.hasPending()) holding = "background work outstanding";
       else if (isHeavyGateActive()) holding = "a gate process is running";
     } catch (err) {
-      process.stderr.write(`[conveyor-agent] Background-work probe failed, not deferring: ${err}
-`);
+      process.stderr.write(
+        `[conveyor-agent] Background-work probe failed, not deferring: ${err}
+`
+      );
       return false;
     }
     if (!holding) {

package/dist/{chunk-3F4ZZKCA.js → chunk-W6VILPQE.js}

@@ -4,6 +4,7 @@ import {
 } from "./chunk-W4LZ7R6Z.js";
 
 // src/harness/pty/pty-support.ts
+import { randomUUID } from "crypto";
 import { stat } from "fs/promises";
 import { tmpdir } from "os";
 
@@ -153,6 +154,10 @@ function resolvePlanDialogTiming() {
     windowMs: envMs("CONVEYOR_PTY_PLAN_DIALOG_WINDOW_MS", PLAN_DIALOG_WINDOW_MS)
   };
 }
+function ensureSessionTarget(options, want, mintId = randomUUID) {
+  if (want || options.sessionId) return options;
+  return { ...options, sessionId: mintId() };
+}
 function turnOptionsFrom(options) {
   return {
     canUseTool: options.canUseTool,
@@ -278,6 +283,7 @@ export {
   resolveSubmitNudgeTiming,
   resolveSubmitRedeliveryMaxAttempts,
   resolvePlanDialogTiming,
+  ensureSessionTarget,
   turnOptionsFrom,
   killPtyWithEscalation,
   loadPtySpawn,

package/dist/cli.js

@@ -27,13 +27,13 @@ import {
   resolveTuiKindFromEnv,
   runUsageProbe,
   sampleKeyUsage
-} from "./chunk-HYPX6FEX.js";
+} from "./chunk-J2NPWBVZ.js";
 import "./chunk-XORJ6SII.js";
 import {
   inheritedEnv,
   resolvePtySpawn,
   sessionTempBase
-} from "./chunk-3F4ZZKCA.js";
+} from "./chunk-W6VILPQE.js";
 import {
   AgentConnection,
   CodespacePortVisibility,
@@ -1201,7 +1201,7 @@ function wireSpawnChildren(mode, connection, supervisors, logger7) {
 
 // src/cli.ts
 if (process.argv[2] === "boot") {
-  const { runBoot } = await import("./boot-SWUVT5B4.js");
+  const { runBoot } = await import("./boot-7XH4FFLO.js");
   process.exit(await runBoot(process.argv.slice(3)));
 }
 if (isLegacyEntrypointLaunch(process.env)) {
@@ -1303,7 +1303,7 @@ process.on("unhandledRejection", (reason) => {
   process.exit(1);
 });
 if (process.env.CONVEYOR_MODE === "workbench") {
-  const { startWorkbenchServer } = await import("./server-7XH7RYUX.js");
+  const { startWorkbenchServer } = await import("./server-2Z5V3IPA.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;

package/dist/gate-cli.js

@@ -79,7 +79,9 @@ function runGate(argv, options = {}) {
 try {
   process.exitCode = await runGate(process.argv.slice(2));
 } catch (error) {
-  process.stderr.write(`conveyor-gate: ${error instanceof Error ? error.message : String(error)}
-`);
+  process.stderr.write(
+    `conveyor-gate: ${error instanceof Error ? error.message : String(error)}
+`
+  );
   process.exitCode = 2;
 }

package/dist/index.js

@@ -1,9 +1,9 @@
 import {
   SessionRunner,
   unshallowRepo
-} from "./chunk-HYPX6FEX.js";
+} from "./chunk-J2NPWBVZ.js";
 import "./chunk-XORJ6SII.js";
-import "./chunk-3F4ZZKCA.js";
+import "./chunk-W6VILPQE.js";
 import {
   AgentConnection,
   GIT_TIMEOUT_MS,

package/dist/{server-7XH7RYUX.js → server-2Z5V3IPA.js}

@@ -1,7 +1,7 @@
 import {
   startWorkbenchServer
-} from "./chunk-UBDSLM44.js";
-import "./chunk-3F4ZZKCA.js";
+} from "./chunk-D57S4UR5.js";
+import "./chunk-W6VILPQE.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.4",
+  "version": "11.0.5",
   "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",