@rallycry/conveyor-agent 11.0.33 → 11.0.35

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-A73WZJ4Y.js → chunk-MYJQXN6E.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;
@@ -6879,7 +6881,7 @@ function buildTaskAgentPreamble(context, workspaceDir, runtimeTui, agentMode) {
 Environment \u2014 already built${managedStack ? " and running" : ""}. These are the facts you would otherwise spend calls discovering:`,
     `- The repo is cloned at your working directory with \`${context.githubBranch}\` checked out, dependencies installed, database migrated, git configured${managedStack ? ", and the dev stack up" : ""}. Commit and push directly to this branch.`,
     ...stackLines,
-    `- Browser automation is the Playwright CLI (\`playwright\`, pinned 1.62.1), NOT an MCP server \u2014 there are no \`mcp__playwright__*\` tools here. Only the headless shell is baked, so a launch must name it AND disable the sandbox: \`chromium.launch({ channel: "chromium-headless-shell", args: ["--no-sandbox"] })\`. A bare \`chromium.launch()\` FAILS: since playwright 1.49 that resolves to the full browser, which is deliberately not installed (pods have no display and cannot run Chromium's sandbox). Screenshots land wherever you write them \u2014 move or delete them before committing.`,
+    `- Browser automation is the Playwright CLI (\`playwright\`, pinned 1.63.0), NOT an MCP server \u2014 there are no \`mcp__playwright__*\` tools here. Only the headless shell is baked, so a launch must name it AND disable the sandbox: \`chromium.launch({ channel: "chromium-headless-shell", args: ["--no-sandbox"] })\`. A bare \`chromium.launch()\` FAILS: since playwright 1.49 that resolves to the full browser, which is deliberately not installed (pods have no display and cannot run Chromium's sandbox). Screenshots land wherever you write them \u2014 move or delete them before committing.`,
     `- The clone is \`--single-branch\`, so a bare \`git fetch origin <branch>\` does NOT create \`origin/<branch>\`. To reference any other branch, use the explicit refspec: \`git fetch origin <branch>:refs/remotes/origin/<branch>\`.`,
     `- The shell cwd resets between Bash calls, and so does every shell variable. A var you export in one call is EMPTY in the next, which silently redirects output to \`/\` and loses it. Write literal absolute paths (\`git -C\`, \`bun run --cwd\`), and \`mkdir -p\` a directory in the SAME call as the redirect that writes to it.`,
     `- The \`gh\` CLI is available for READ-ONLY PR and CI state (\`gh pr view\`, \`gh pr checks\`, \`gh pr diff\`), one read at a time. ${ciWaitRule(agentMode)} Use the mcp__conveyor__* tools for anything that mutates a PR or card.`,
@@ -12044,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;
@@ -12426,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(" ");
@@ -12447,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;
@@ -12480,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
   };

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-A73WZJ4Y.js";
+} from "./chunk-MYJQXN6E.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-A73WZJ4Y.js";
+} from "./chunk-MYJQXN6E.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.33",
+  "version": "11.0.35",
   "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",
@@ -38,17 +38,17 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.3.280",
-    "@modelcontextprotocol/sdk": "^1.30.0",
-    "node-pty": "^1.0.0",
-    "socket.io-client": "^4.8.3",
-    "tar": "^7.5.21",
-    "zod": "^4.0.0"
+    "@anthropic-ai/claude-agent-sdk": "^0.3.283",
+    "@modelcontextprotocol/sdk": "^1.30.1",
+    "node-pty": "^1.1.0",
+    "socket.io-client": "^4.8.4",
+    "tar": "^7.5.22",
+    "zod": "^4.6.5"
   },
   "devDependencies": {
     "@project/shared": "workspace:*",
-    "tsup": "^8.0.0",
-    "typescript": "^5.3.0",
-    "vitest": "^5.0.1"
+    "tsup": "^8.5.1",
+    "typescript": "~6.0.3",
+    "vitest": "^5.0.2"
   }
 }