@rallycry/conveyor-agent 11.0.32 → 11.0.34

package/dist/{chunk-XZDTLVWA.js → chunk-6WVCWKDN.js}

@@ -8,7 +8,7 @@ import {
   readWorkspaceBytes,
   statWorkspacePath,
   workspacePathExists
-} from "./chunk-IHNXVFIB.js";
+} from "./chunk-VDK54VLS.js";
 import {
   reportBootMilestone
 } from "./chunk-Q4FQOJ7D.js";

package/dist/{chunk-Q2E2TM3J.js → chunk-IQP2LHB4.js}

@@ -97,7 +97,7 @@ import {
   statWorkspacePath,
   updateRemoteToken,
   verifyGitCredential
-} from "./chunk-IHNXVFIB.js";
+} from "./chunk-VDK54VLS.js";
 import {
   registerBootMilestoneSocketFallback,
   reportBootMilestone
@@ -947,6 +947,8 @@ function mapAssistant(record) {
     type: "assistant",
     message: { role: "assistant", content }
   };
+  const id = stringField(message, "id");
+  if (id !== void 0) result.message.id = id;
   const usage = mapUsage(message);
   if (usage !== void 0) result.message.usage = usage;
   if (record.isApiErrorMessage === true) result.isApiError = true;
@@ -2112,11 +2114,19 @@ function userRecordText(record) {
   if (content.some((b) => isRecord3(b) && b.type === "tool_result")) return void 0;
   return content.filter((b) => isRecord3(b) && b.type === "text").map((b) => typeof b.text === "string" ? b.text : "").filter((t) => t.length > 0).join("\n");
 }
-function isBackgroundTaskNotificationRecord(raw) {
-  if (!isRecord3(raw) || raw.type !== "user") return false;
-  if (raw.isSidechain === true || raw.isMeta === true) return false;
-  const text = userRecordText(raw);
-  return text !== void 0 && text.trimStart().startsWith(TASK_NOTIFICATION_PREFIX);
+function backgroundTaskCompletion(raw) {
+  if (!isRecord3(raw) || raw.isSidechain === true || raw.isMeta === true) return null;
+  const text = notificationText(raw);
+  if (text === void 0 || !text.trimStart().startsWith(TASK_NOTIFICATION_PREFIX)) return null;
+  const taskId = /<task-id>([^<]+)<\/task-id>/.exec(text)?.[1]?.trim();
+  return { taskId: taskId || null };
+}
+function notificationText(record) {
+  if (record.type === "user") return userRecordText(record);
+  if (record.type !== "attachment") return void 0;
+  const attachment = record.attachment;
+  if (!isRecord3(attachment) || attachment.commandMode !== "task-notification") return void 0;
+  return typeof attachment.prompt === "string" ? attachment.prompt : void 0;
 }
 function mapSystem2(record) {
   if (record.subtype === "init") {
@@ -3666,7 +3676,8 @@ var PtySession = class {
    * backgrounded gate/subagent just finished) and the chat-proxy projection.
    */
   handleRawRecord(raw) {
-    if (isBackgroundTaskNotificationRecord(raw)) this.bridge?.notifyBackgroundTaskDone?.();
+    const completion = backgroundTaskCompletion(raw);
+    if (completion) this.bridge?.notifyBackgroundTaskDone?.(completion.taskId);
     if (typeof this.bridge?.sendChatEvent === "function") this.relayChatRecord(raw);
   }
   /**
@@ -12035,26 +12046,46 @@ function safeVoid(promise, context) {
     });
   }
 }
-function addTurnUsage(total, usage) {
-  const next = {
-    inputTokens: total.inputTokens + (usage.input_tokens ?? 0),
-    outputTokens: total.outputTokens + (usage.output_tokens ?? 0),
-    cacheReadInputTokens: total.cacheReadInputTokens + (usage.cache_read_input_tokens ?? 0),
-    cacheCreationInputTokens: total.cacheCreationInputTokens + (usage.cache_creation_input_tokens ?? 0),
-    totalTokens: 0
-  };
-  next.totalTokens = next.inputTokens + next.outputTokens + next.cacheReadInputTokens + next.cacheCreationInputTokens;
-  return next;
-}
-function emptyTurnUsage() {
+function maxUsage2(a, b) {
   return {
-    inputTokens: 0,
-    outputTokens: 0,
-    cacheReadInputTokens: 0,
-    cacheCreationInputTokens: 0,
-    totalTokens: 0
+    input_tokens: Math.max(a.input_tokens ?? 0, b.input_tokens ?? 0),
+    output_tokens: Math.max(a.output_tokens ?? 0, b.output_tokens ?? 0),
+    cache_read_input_tokens: Math.max(
+      a.cache_read_input_tokens ?? 0,
+      b.cache_read_input_tokens ?? 0
+    ),
+    cache_creation_input_tokens: Math.max(
+      a.cache_creation_input_tokens ?? 0,
+      b.cache_creation_input_tokens ?? 0
+    )
   };
 }
+var TurnUsageLedger = class {
+  byMessage = /* @__PURE__ */ new Map();
+  anonymous = 0;
+  add(usage, messageId) {
+    const id = messageId ?? `anon-${this.anonymous++}`;
+    const previous = this.byMessage.get(id);
+    this.byMessage.set(id, previous ? maxUsage2(previous, usage) : usage);
+  }
+  total() {
+    const sum = {
+      inputTokens: 0,
+      outputTokens: 0,
+      cacheReadInputTokens: 0,
+      cacheCreationInputTokens: 0,
+      totalTokens: 0
+    };
+    for (const usage of this.byMessage.values()) {
+      sum.inputTokens += usage.input_tokens ?? 0;
+      sum.outputTokens += usage.output_tokens ?? 0;
+      sum.cacheReadInputTokens += usage.cache_read_input_tokens ?? 0;
+      sum.cacheCreationInputTokens += usage.cache_creation_input_tokens ?? 0;
+    }
+    sum.totalTokens = sum.inputTokens + sum.outputTokens + sum.cacheReadInputTokens + sum.cacheCreationInputTokens;
+    return sum;
+  }
+};
 function epochSecondsToISO(value) {
   if (typeof value === "string") return value;
   if (typeof value !== "number" || value <= 0) return void 0;
@@ -12417,7 +12448,7 @@ async function processAssistantCase(event, host, state) {
   const usage = await handleAssistantCase(event, host, state.turnToolCalls);
   if (usage) {
     state.lastAssistantUsage = usage;
-    state.turnUsage = addTurnUsage(state.turnUsage, usage);
+    state.turnUsage.add(usage, event.message.id);
   }
   if (!state.sawApiError || event.isApiError && !state.terminalApiError) {
     const fullText = event.message.content.filter((b) => b.type === "text").map((b) => b.text).join(" ");
@@ -12438,7 +12469,7 @@ async function processResultCase(event, host, context, startTime, state) {
     startTime,
     state.isTyping,
     state.lastAssistantUsage,
-    state.turnUsage
+    state.turnUsage.total()
   );
   if (info.stoppedTyping) state.isTyping = false;
   state.retriable = info.retriable;
@@ -12471,7 +12502,7 @@ async function processEvents(events, context, host) {
     staleSession: void 0,
     authError: void 0,
     lastAssistantUsage: void 0,
-    turnUsage: emptyTurnUsage(),
+    turnUsage: new TurnUsageLedger(),
     turnToolCalls: [],
     questionPending: false
   };
@@ -13916,7 +13947,7 @@ var QueryBridge = class {
     let bridge;
     if (harnessKind === "pty") {
       this.directStream = wrapBridgeWithDirectStream(
-        buildPtyBridge(connection, () => this.onBackgroundTaskDone?.()),
+        buildPtyBridge(connection, (taskId) => this.onBackgroundTaskDone?.(taskId)),
         connection
       );
       bridge = this.directStream.bridge;
@@ -14641,6 +14672,8 @@ function isBackgroundLaunch(tool2, input) {
 var BackgroundWorkTracker = class {
   /** Absolute expiry (epoch ms) of each outstanding launch, oldest first. */
   deadlines = [];
+  /** CLI task ids already counted as complete. */
+  completedTaskIds = /* @__PURE__ */ new Set();
   maxMs;
   onChange;
   log;
@@ -14669,7 +14702,11 @@ var BackgroundWorkTracker = class {
    * runner never saw, a re-injected record) must be a no-op, never a negative
    * balance that would keep the pod awake after the real work finished.
    */
-  noteCompletion(now = Date.now()) {
+  noteCompletion(now = Date.now(), taskId = null) {
+    if (taskId !== null) {
+      if (this.completedTaskIds.has(taskId)) return;
+      this.completedTaskIds.add(taskId);
+    }
     this.prune(now);
     if (this.deadlines.length === 0) return;
     this.deadlines.shift();
@@ -14689,6 +14726,7 @@ var BackgroundWorkTracker = class {
   }
   /** Drop everything (shutdown / session teardown). */
   clear() {
+    this.completedTaskIds.clear();
     if (this.deadlines.length === 0) return;
     this.deadlines.length = 0;
     this.onChange?.();
@@ -16057,7 +16095,7 @@ var SessionRunner = class _SessionRunner {
       onUserQuestion: (signal) => this.handleUserQuestionSignal(signal)
     });
     bridge.isParentTask = this.fullContext?.isParentTask ?? false;
-    bridge.onBackgroundTaskDone = () => this.backgroundWork.noteCompletion();
+    bridge.onBackgroundTaskDone = (taskId) => this.backgroundWork.noteCompletion(Date.now(), taskId ?? null);
     bridge.onSoftStop = () => {
       process.stderr.write("[conveyor-agent] Soft stop requested (discovery ExitPlanMode)\n");
       this.softStop();

package/dist/{chunk-IHNXVFIB.js → chunk-VDK54VLS.js}

@@ -4085,14 +4085,19 @@ var CATALOG = {
   lgtm: {
     name: "lgtm",
     image: "grafana/otel-lgtm:0.11.6",
-    // The otel-lgtm image's own CMD is ["/otel-lgtm/run-all.sh"] (WORKDIR
-    // /otel-lgtm). Declaring it explicitly makes lgtm a command-based service so
-    // the lazy start-file gate wraps it like the others — otherwise it launches
-    // via image CMD at boot and can't be parked (which is why warm-booting it at
-    // a minimal request OOMKilled it). getSidecarSpecs strips this command for a
-    // baked lgtm image, so it only applies to the stock image whose launcher is
-    // exactly this path.
-    command: ["/otel-lgtm/run-all.sh"],
+    // Runs the image's own launcher (/otel-lgtm/run-all.sh) after capping
+    // Tempo's retention. The image ships Tempo with the 14-day default, and its
+    // blocks live on the container's writable layer, which counts against the
+    // 1Gi ephemeral-storage limit below; overrunning it evicts the whole pod.
+    // At 100% sampling a busy dev stack writes up to ~2 GB of traces a day, so
+    // keep 3h (plus 10m before a retired block leaves disk). The grep keeps it
+    // idempotent, and a failed append still starts the stack. lgtm has no bake,
+    // so no baked image ever strips this command.
+    command: [
+      "sh",
+      "-c",
+      "grep -q '^compactor:' /otel-lgtm/tempo-config.yaml || printf '\\ncompactor:\\n  compaction:\\n    block_retention: 3h\\n    compacted_block_retention: 10m\\n' >> /otel-lgtm/tempo-config.yaml; exec /otel-lgtm/run-all.sh"
+    ],
     ports: [
       // OTLP gRPC + HTTP — agents and user code emit telemetry here.
       4317,

package/dist/cli.js

@@ -7,7 +7,7 @@ import {
   WorkspaceCommandSupervisor,
   startWorkspaceCommandsAfterConnect,
   stopWorkspaceCommands
-} from "./chunk-XZDTLVWA.js";
+} from "./chunk-6WVCWKDN.js";
 import {
   PtyHarness,
   SessionRunner,
@@ -27,7 +27,7 @@ import {
   runUsageProbe,
   sampleKeyUsage,
   usesNativeUsageReporting
-} from "./chunk-Q2E2TM3J.js";
+} from "./chunk-IQP2LHB4.js";
 import "./chunk-37J5MMQT.js";
 import {
   inheritedEnv,
@@ -46,7 +46,7 @@ import {
   createServiceLogger,
   fetchBootstrap,
   loadConveyorConfig
-} from "./chunk-IHNXVFIB.js";
+} from "./chunk-VDK54VLS.js";
 import "./chunk-Q4FQOJ7D.js";
 import "./chunk-W4LZ7R6Z.js";
 import "./chunk-372R6E4C.js";
@@ -1468,7 +1468,7 @@ if (!RUNNER_MODES.includes(CONVEYOR_MODE)) {
   process.exit(1);
 }
 if (CONVEYOR_MODE === "serving") {
-  const { runServingSession } = await import("./serve-boot-VDR3RXRA.js");
+  const { runServingSession } = await import("./serve-boot-QOXREHJK.js");
   exitContext.runnerMode = "serving";
   exitContext.sessionId = process.env.CONVEYOR_SESSION_ID ?? exitContext.sessionId;
   const outcome = await runServingSession({

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   SessionRunner,
   unshallowRepo
-} from "./chunk-Q2E2TM3J.js";
+} from "./chunk-IQP2LHB4.js";
 import "./chunk-37J5MMQT.js";
 import "./chunk-EKTPDG3G.js";
 import {
@@ -17,7 +17,7 @@ import {
   stageAndCommit,
   updateRemoteToken,
   workspacePathExists
-} from "./chunk-IHNXVFIB.js";
+} from "./chunk-VDK54VLS.js";
 import "./chunk-Q4FQOJ7D.js";
 import {
   runAuthTokenCommand,

package/dist/{serve-boot-VDR3RXRA.js → serve-boot-QOXREHJK.js}

@@ -1,6 +1,6 @@
 import {
   WorkspaceCommandSupervisor
-} from "./chunk-XZDTLVWA.js";
+} from "./chunk-6WVCWKDN.js";
 import {
   AgentConnection,
   CodespacePortVisibility,
@@ -11,7 +11,7 @@ import {
   createServiceLogger,
   ensureOnTaskBranch,
   loadConveyorConfig
-} from "./chunk-IHNXVFIB.js";
+} from "./chunk-VDK54VLS.js";
 import "./chunk-Q4FQOJ7D.js";
 import "./chunk-W4LZ7R6Z.js";
 import "./chunk-IA45XHOA.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rallycry/conveyor-agent",
-  "version": "11.0.32",
+  "version": "11.0.34",
   "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",