@alan-ai-hq/agent-manager-linux-arm64 0.1.159 → 0.1.161

package/alan-holder.cjs

@@ -637,14 +637,14 @@ function codePointLength(str) {
   const units = str.length;
   if (!highSurrogate.test(str))
     return units;
-  let count = units;
+  let count2 = units;
   for (let i = 0; i < units - 1; i++) {
     if ((str.charCodeAt(i) & 64512) === 55296 && (str.charCodeAt(i + 1) & 64512) === 56320) {
-      count--;
+      count2--;
       i++;
     }
   }
-  return count;
+  return count2;
 }
 function getLengthableOrigin(input2) {
   if (Array.isArray(input2))
@@ -5147,8 +5147,8 @@ var init_az = __esm({
 });
 
 // ../../node_modules/zod/v4/locales/be.js
-function getBelarusianPlural(count, one, few, many) {
-  const absCount = Math.abs(count);
+function getBelarusianPlural(count2, one, few, many) {
+  const absCount = Math.abs(count2);
   const lastDigit = absCount % 10;
   const lastTwoDigits = absCount % 100;
   if (lastTwoDigits >= 11 && lastTwoDigits <= 19) {
@@ -7942,8 +7942,8 @@ var init_hu = __esm({
 });
 
 // ../../node_modules/zod/v4/locales/hy.js
-function getArmenianPlural(count, one, many) {
-  return Math.abs(count) === 1 ? one : many;
+function getArmenianPlural(count2, one, many) {
+  return Math.abs(count2) === 1 ? one : many;
 }
 function withDefiniteArticle(word) {
   if (!word)
@@ -10841,8 +10841,8 @@ var init_ro = __esm({
 });
 
 // ../../node_modules/zod/v4/locales/ru.js
-function getRussianPlural(count, one, few, many) {
-  const absCount = Math.abs(count);
+function getRussianPlural(count2, one, few, many) {
+  const absCount = Math.abs(count2);
   const lastDigit = absCount % 10;
   const lastTwoDigits = absCount % 100;
   if (lastTwoDigits >= 11 && lastTwoDigits <= 19) {
@@ -22443,6 +22443,56 @@ var init_run_log_upload = __esm({
   }
 });
 
+// ../shared/dist/runtime-v2/run-media.js
+function runMediaPath(runId) {
+  return `/public/machines/me/runs/${encodeURIComponent(runId)}/media`;
+}
+function runMediaCompletePath(runId, mediaId) {
+  return `${runMediaPath(runId)}/${encodeURIComponent(mediaId)}/complete`;
+}
+var INT4_MAX, runMediaSourceSchema, runMediaUploadRequestSchema, runMediaUploadTargetSchema, runMediaUploadResponseSchema, runMediaCompleteResponseSchema;
+var init_run_media = __esm({
+  "../shared/dist/runtime-v2/run-media.js"() {
+    "use strict";
+    init_zod();
+    INT4_MAX = 2147483647;
+    runMediaSourceSchema = external_exports.enum(["generated_image", "session_media"]);
+    runMediaUploadRequestSchema = external_exports.object({
+      /** The `id` the transcript update carries; one upload per id and run. */
+      mediaId: external_exports.string().min(1).max(200),
+      source: runMediaSourceSchema,
+      kind: external_exports.enum(["image", "video"]),
+      mimeType: external_exports.string().min(1).max(200),
+      filename: external_exports.string().min(1).max(500),
+      bytes: external_exports.number().int().positive().max(INT4_MAX),
+      sha256: external_exports.string().regex(/^[0-9a-f]{64}$/),
+      width: external_exports.number().int().min(0).max(INT4_MAX).nullish(),
+      height: external_exports.number().int().min(0).max(INT4_MAX).nullish(),
+      toolId: external_exports.string().max(500).optional(),
+      sourcePath: external_exports.string().max(4096).optional(),
+      ts: external_exports.number().int().positive().optional()
+    });
+    runMediaUploadTargetSchema = external_exports.object({
+      url: external_exports.url(),
+      /** Every header the signed PUT expects, besides the body's `content-length`. */
+      headers: external_exports.record(external_exports.string(), external_exports.string()),
+      expiresAt: external_exports.iso.datetime()
+    });
+    runMediaUploadResponseSchema = external_exports.discriminatedUnion("status", [
+      external_exports.object({
+        status: external_exports.literal("upload"),
+        mediaId: external_exports.string(),
+        upload: runMediaUploadTargetSchema
+      }),
+      external_exports.object({ status: external_exports.literal("ready"), mediaId: external_exports.string() })
+    ]);
+    runMediaCompleteResponseSchema = external_exports.object({
+      status: external_exports.literal("ready"),
+      mediaId: external_exports.string()
+    });
+  }
+});
+
 // ../shared/dist/runtime-v2/skills.js
 var MAX_MACHINE_SKILLS, installedMachineSkillSchema, MAX_SKILL_UPLOADS, machineSkillScanRepositorySchema, machineSkillScanContextSchema, machineLocalSkillsReportSchema, machineSkillUploadSchema, machineSkillsSyncRequestSchema, desiredMachineSkillSchema, machineSkillDownloadSchema, machineSkillsSyncResponseSchema;
 var init_skills = __esm({
@@ -22565,6 +22615,7 @@ var init_runtime_v2 = __esm({
     init_mcp();
     init_run_log();
     init_run_log_upload();
+    init_run_media();
     init_skills();
     init_workspace();
   }
@@ -25098,11 +25149,15 @@ var init_background_task = __esm({
 function isUpdate(update, kind) {
   return update.sessionUpdate === kind;
 }
-var STEER_ID_META;
+var STEER_ID_META, MEDIA_SESSION_UPDATE_KINDS;
 var init_types2 = __esm({
   "../shared/dist/agent/acp/types.js"() {
     "use strict";
     STEER_ID_META = "alan.dev/steerId";
+    MEDIA_SESSION_UPDATE_KINDS = /* @__PURE__ */ new Set([
+      "_alan/generated_image",
+      "_alan/session_media"
+    ]);
   }
 });
 
@@ -25210,9 +25265,14 @@ var init_session_activity = __esm({
 });
 
 // ../shared/dist/agent/acp/transcript-byte-decoder.js
+var MIN_ELIDED_DATA_BYTES, DATA_KEY, MEDIA_MARKERS;
 var init_transcript_byte_decoder = __esm({
   "../shared/dist/agent/acp/transcript-byte-decoder.js"() {
     "use strict";
+    init_types2();
+    MIN_ELIDED_DATA_BYTES = 16 * 1024;
+    DATA_KEY = new TextEncoder().encode('"data":"');
+    MEDIA_MARKERS = [...MEDIA_SESSION_UPDATE_KINDS].map((kind) => new TextEncoder().encode(JSON.stringify(kind)));
   }
 });
 
@@ -25249,7 +25309,7 @@ var init_acp = __esm({
   }
 });
 
-// ../agent-core/dist/chunk-OUEMTEUX.js
+// ../agent-core/dist/chunk-RBQC7XZH.js
 function textBlock(text2) {
   return { type: "text", text: text2 };
 }
@@ -25384,8 +25444,8 @@ function readPatchHunks(value) {
     return hunk ? [hunk] : [];
   });
 }
-function hunkRange(start, count) {
-  return count === 1 ? String(start) : `${start},${count}`;
+function hunkRange(start, count2) {
+  return count2 === 1 ? String(start) : `${start},${count2}`;
 }
 function hunkHeader(hunk) {
   return `@@ -${hunkRange(hunk.oldStart, hunk.oldLines)} +${hunkRange(hunk.newStart, hunk.newLines)} @@`;
@@ -25396,14 +25456,14 @@ function patchPath(path) {
 function wholeFileHunk(content, deleted) {
   const lines = content === "" ? [] : content.split("\n");
   if (lines.at(-1) === "") lines.pop();
-  const count = lines.length;
+  const count2 = lines.length;
   const marked = lines.map((line) => `${deleted ? "-" : "+"}${line}`);
   if (content && !content.endsWith("\n")) marked.push("\");
   return {
-    oldStart: deleted && count ? 1 : 0,
-    oldLines: deleted ? count : 0,
-    newStart: !deleted && count ? 1 : 0,
-    newLines: deleted ? 0 : count,
+    oldStart: deleted && count2 ? 1 : 0,
+    oldLines: deleted ? count2 : 0,
+    newStart: !deleted && count2 ? 1 : 0,
+    newLines: deleted ? 0 : count2,
     lines: marked
   };
 }
@@ -25498,8 +25558,8 @@ function planEntries(todos) {
   });
 }
 var PROVIDER_PAYLOAD_META, TOOL_RESULT_ONLY_META, PARENT_TOOL_CALL_META, SUBAGENT_LAUNCHER_META, SUBAGENT_TASK_ID_META, SUBAGENT_OUTPUT_FILE_META, USAGE_META, TODOS_META, NOTICE_KIND_META, ASK_USER_QUESTIONS_META, USER_ANSWER_META, AWAITING_TOOL_CALLS_META, EXIT_PLAN_MODE_INPUT_META, BACKGROUND_TASK_META, TASK_PROGRESS_META, RATE_LIMIT_META, MODEL_META, TOOLS_META, SLASH_COMMANDS_META, TOOL_KIND_RULES, ANSWER_PREFIX, ACCEPT_WORDS, MIN_INLINE_MEDIA_CHARS, DATA_URL_PREFIX, BASE64_BODY, PLAN_ENTRY_STATUSES;
-var init_chunk_OUEMTEUX = __esm({
-  "../agent-core/dist/chunk-OUEMTEUX.js"() {
+var init_chunk_RBQC7XZH = __esm({
+  "../agent-core/dist/chunk-RBQC7XZH.js"() {
     "use strict";
     init_chunk_YXWJW7I5();
     init_constants();
@@ -25555,17 +25615,17 @@ var init_chunk_OUEMTEUX = __esm({
 var init_acp2 = __esm({
   "../agent-core/dist/acp.js"() {
     "use strict";
-    init_chunk_OUEMTEUX();
+    init_chunk_RBQC7XZH();
     init_chunk_YXWJW7I5();
   }
 });
 
-// ../agent-core/dist/chunk-D4TIXPWZ.js
+// ../agent-core/dist/chunk-TFIO37PI.js
 var import_fs4, NEWLINE2, TranscriptCursor, TranscriptLineLookup;
-var init_chunk_D4TIXPWZ = __esm({
-  "../agent-core/dist/chunk-D4TIXPWZ.js"() {
+var init_chunk_TFIO37PI = __esm({
+  "../agent-core/dist/chunk-TFIO37PI.js"() {
     "use strict";
-    init_chunk_OUEMTEUX();
+    init_chunk_RBQC7XZH();
     init_chunk_YXWJW7I5();
     import_fs4 = require("fs");
     NEWLINE2 = 10;
@@ -26113,7 +26173,7 @@ var init_chunk_ZCTKXKYY = __esm({
   }
 });
 
-// ../agent-core/dist/chunk-FYZKVT3E.js
+// ../agent-core/dist/chunk-N2M5D7RS.js
 function detectImageMimeType(buffer) {
   if (buffer.length >= 8 && buffer.subarray(0, 8).equals(PNG_SIGNATURE)) return "image/png";
   if (buffer.length >= 3 && buffer[0] === 255 && buffer[1] === 216 && buffer[2] === 255) {
@@ -26249,6 +26309,27 @@ function resultText(update) {
   if (typeof raw === "string") return raw;
   return raw === void 0 ? "" : JSON.stringify(raw);
 }
+function mediaUpdate(file2, body) {
+  const fields = {
+    id: file2.mediaId,
+    filename: file2.filename,
+    mimeType: file2.mimeType,
+    size: file2.data.length,
+    ...body,
+    sourcePath: file2.sourcePath,
+    sourceHash: file2.sha256,
+    toolId: file2.toolId,
+    ts: file2.ts,
+    ...file2.width === void 0 ? {} : { width: file2.width },
+    ...file2.height === void 0 ? {} : { height: file2.height }
+  };
+  if (file2.source === "generated_image") {
+    const image = { type: "generated_image", ...fields };
+    return { sessionUpdate: "_alan/generated_image", image };
+  }
+  const media = { type: "session_media", kind: file2.kind, ...fields };
+  return { sessionUpdate: "_alan/session_media", media };
+}
 function updateRequiredMessage(requirement, found) {
   const { cli, minimumVersion, feature } = requirement;
   const installed = found ? `${cli} ${found}` : `The ${cli} CLI`;
@@ -26533,10 +26614,10 @@ function silentStartError(name, timeoutMs) {
   };
 }
 var import_crypto4, import_fs5, import_path4, PNG_SIGNATURE, IMAGE_MIME_BY_EXT, VIDEO_MIME_BY_EXT, IMAGE_EXTENSIONS, VIDEO_EXTENSIONS, MAX_IMAGE_BYTES, MAX_VIDEO_BYTES, MAX_TURN_MEDIA_DATA_CHARS, MTIME_SLACK_MS, AGENT_BROWSER_MENTION, AGENT_BROWSER_CAPTURE_COMMAND, LocalMediaReader, SessionOpenRefusal, JsonRpcError, ACP_PROTOCOL_VERSION, ACP_ERROR, STDERR_TAIL_LINES, RESULT_EXIT_GRACE_MS, PerTurnSession;
-var init_chunk_FYZKVT3E = __esm({
-  "../agent-core/dist/chunk-FYZKVT3E.js"() {
+var init_chunk_N2M5D7RS = __esm({
+  "../agent-core/dist/chunk-N2M5D7RS.js"() {
     "use strict";
-    init_chunk_OUEMTEUX();
+    init_chunk_RBQC7XZH();
     init_chunk_ZCTKXKYY();
     init_chunk_6VWVDJ2A();
     init_chunk_YXWJW7I5();
@@ -26576,8 +26657,12 @@ var init_chunk_FYZKVT3E = __esm({
         this.#cwd = cwd;
         this.#clock = clock;
       }
-      /** Updates to record after `update`; nothing for anything but a tool call, which is almost all. */
+      /** Updates to record after `update`, with the bytes inline; nothing for most updates. */
       read(update) {
+        return this.find(update).map((found) => this.inline(found));
+      }
+      /** The media files a completed tool call wrote; nothing for anything but a tool call. */
+      find(update) {
         if (!isUpdate(update, "tool_call_update")) return [];
         const toolCallId = update.toolCallId;
         if (update.name !== void 0 || update.rawInput !== void 0) {
@@ -26623,20 +26708,42 @@ var init_chunk_FYZKVT3E = __esm({
           named: /* @__PURE__ */ new Set([...capturePaths(tool, content, extensions, cwd), ...this.#pathHints])
         });
       }
-      #payloadFields(file2, toolId, explicit) {
-        const dataChars = base64Length(file2.buffer.length);
-        const inline = explicit || this.#mediaDataChars + dataChars <= MAX_TURN_MEDIA_DATA_CHARS;
+      /** The update carrying the file's bytes, unless the turn's budget is spent on media nobody asked for. */
+      inline(found) {
+        const { file: file2 } = found;
+        const dataChars = base64Length(file2.data.length);
+        const inline = found.explicit || this.#mediaDataChars + dataChars <= MAX_TURN_MEDIA_DATA_CHARS;
         if (inline) this.#mediaDataChars += dataChars;
+        return mediaUpdate(
+          file2,
+          inline ? { data: file2.data.toString("base64") } : { inlineDataOmitted: true }
+        );
+      }
+      /** Uploads the file and returns a reference to it; inline as `inline` does when the upload fails. */
+      async publish(found, uploader, signal) {
+        try {
+          await uploader.upload(found.file, signal);
+          return mediaUpdate(found.file, { uploaded: true });
+        } catch {
+          return this.inline(found);
+        }
+      }
+      #found(file2, toolId, source, kind, explicit) {
         return {
-          id: (0, import_crypto4.randomUUID)(),
-          filename: (0, import_path4.basename)(file2.path),
-          mimeType: file2.mimeType,
-          size: file2.buffer.length,
-          ...inline ? { data: file2.buffer.toString("base64") } : { inlineDataOmitted: true },
-          sourcePath: file2.path,
-          sourceHash: (0, import_crypto4.createHash)("sha256").update(file2.buffer).digest("hex"),
-          toolId,
-          ts: this.#clock.now()
+          explicit,
+          file: {
+            mediaId: (0, import_crypto4.randomUUID)(),
+            source,
+            kind,
+            mimeType: file2.mimeType,
+            filename: (0, import_path4.basename)(file2.path),
+            data: file2.buffer,
+            sha256: (0, import_crypto4.createHash)("sha256").update(file2.buffer).digest("hex"),
+            ...kind === "image" ? imageDimensions(file2.buffer, file2.mimeType) : {},
+            toolId,
+            sourcePath: file2.path,
+            ts: this.#clock.now()
+          }
         };
       }
       #generatedImages(toolId, tool, content) {
@@ -26645,14 +26752,7 @@ var init_chunk_FYZKVT3E = __esm({
           mimeByExt: IMAGE_MIME_BY_EXT,
           maxBytes: MAX_IMAGE_BYTES
         });
-        return files.map((file2) => {
-          const image = {
-            type: "generated_image",
-            ...this.#payloadFields(file2, toolId, true),
-            ...imageDimensions(file2.buffer, file2.mimeType)
-          };
-          return { sessionUpdate: "_alan/generated_image", image };
-        });
+        return files.map((file2) => this.#found(file2, toolId, "generated_image", "image", true));
       }
       #sessionMedia(toolId, tool, content) {
         const isVideo = isAgentBrowserMedia(tool, content, "video");
@@ -26667,13 +26767,7 @@ var init_chunk_FYZKVT3E = __esm({
         );
         return files.map((file2) => {
           this.#pathHints.delete(file2.path);
-          const media = {
-            type: "session_media",
-            kind,
-            ...this.#payloadFields(file2, toolId, explicit),
-            ...kind === "image" ? imageDimensions(file2.buffer, file2.mimeType) : {}
-          };
-          return { sessionUpdate: "_alan/session_media", media };
+          return this.#found(file2, toolId, "session_media", kind, explicit);
         });
       }
     };
@@ -28626,9 +28720,29 @@ function backgroundTaskProgress(event, tasks) {
     }
   ];
 }
+function claudeMessageContextTokens(message) {
+  if (asString(message?.model) === "<synthetic>") return void 0;
+  const usage = asRecord(message?.usage);
+  if (!usage) return void 0;
+  const tokens2 = (asFiniteNumber(usage.input_tokens) ?? 0) + (asFiniteNumber(usage.cache_read_input_tokens) ?? 0) + (asFiniteNumber(usage.cache_creation_input_tokens) ?? 0) + (asFiniteNumber(usage.output_tokens) ?? 0);
+  return tokens2 > 0 ? tokens2 : void 0;
+}
+function resultContextWindow(event, model) {
+  const byModel = asRecord(event.modelUsage);
+  if (!byModel) return void 0;
+  const own2 = asFiniteNumber(asRecord(byModel[model])?.contextWindow);
+  if (own2 !== void 0) return own2;
+  let largest;
+  for (const entry of Object.values(byModel)) {
+    const size = asFiniteNumber(asRecord(entry)?.contextWindow);
+    if (size !== void 0 && size > (largest ?? 0)) largest = size;
+  }
+  return largest;
+}
 function resultUsage(event, context) {
   const usage = asRecord(event.usage);
   const model = asString(event.model).trim() || context.activeModel?.trim() || context.selectedModel?.trim() || "claude";
+  const contextSize = resultContextWindow(event, model);
   return usageUpdate({
     model,
     numTurns: asFiniteNumber(event.num_turns) ?? Math.max(context.iterations, 1),
@@ -28637,7 +28751,9 @@ function resultUsage(event, context) {
     outputTokens: asFiniteNumber(usage?.output_tokens) ?? 0,
     cacheReadTokens: asFiniteNumber(usage?.cache_read_input_tokens) ?? 0,
     cacheCreationTokens: asFiniteNumber(usage?.cache_creation_input_tokens) ?? 0,
-    costUsd: asFiniteNumber(event.total_cost_usd) ?? 0
+    costUsd: asFiniteNumber(event.total_cost_usd) ?? 0,
+    ...contextSize === void 0 ? {} : { contextSize },
+    ...context.contextTokens === void 0 ? {} : { contextTokens: context.contextTokens }
   });
 }
 function resultErrorText(event, subtype) {
@@ -28901,9 +29017,9 @@ var import_crypto7, import_fs6, import_path6, import_crypto8, import_promises15,
 var init_claude = __esm({
   "../agent-core/dist/providers/claude.js"() {
     "use strict";
-    init_chunk_D4TIXPWZ();
-    init_chunk_FYZKVT3E();
-    init_chunk_OUEMTEUX();
+    init_chunk_TFIO37PI();
+    init_chunk_N2M5D7RS();
+    init_chunk_RBQC7XZH();
     init_chunk_ZCTKXKYY();
     init_chunk_6VWVDJ2A();
     init_chunk_DLVRNIY5();
@@ -29201,6 +29317,7 @@ var init_claude = __esm({
       #announced = /* @__PURE__ */ new Set();
       #awaitingAskDenialFallback = false;
       #iterations = 0;
+      #contextTokens;
       #providerErrorCode;
       #deferredOnAnswer = false;
       #deferredOnBackground = false;
@@ -29340,6 +29457,7 @@ var init_claude = __esm({
       #handleSystem(event) {
         const subtype = asString(event.subtype);
         if (subtype === "api_retry") this.#noteRetry(event);
+        if (subtype === "compact_boundary") this.#noteCompaction(event);
         if (subtype === "task_started") {
           this.tasks.registerRecord(event, parentToolUseId(event));
           this.taskRecords.track(event, this.tasks.resolveToolUseId(event));
@@ -29424,13 +29542,25 @@ var init_claude = __esm({
           status
         });
       }
+      /** The window was just rewritten; the pre-compaction figure would overstate it until the next call. */
+      #noteCompaction(event) {
+        if (parentToolUseId(event)) return;
+        const after = asFiniteNumber(asRecord(event.compact_metadata)?.post_tokens);
+        this.#contextTokens = after !== void 0 && after > 0 ? after : void 0;
+      }
+      #noteContext(event, message) {
+        if (parentToolUseId(event)) return;
+        this.#contextTokens = claudeMessageContextTokens(message) ?? this.#contextTokens;
+      }
       #handleAssistant(event) {
         if (this.#awaitingAskDenialFallback) {
           this.#awaitingAskDenialFallback = false;
           return;
         }
         this.#iterations += 1;
-        for (const raw of asArray(asRecord(event.message)?.content)) {
+        const message = asRecord(event.message);
+        this.#noteContext(event, message);
+        for (const raw of asArray(message?.content)) {
           const block2 = asRecord(raw);
           if (!block2 || asString(block2.type) !== "tool_use") continue;
           const id = asString(block2.id);
@@ -29450,7 +29580,8 @@ var init_claude = __esm({
           resultUsage(event, {
             activeModel: this.grammar.model,
             selectedModel: this.#options.selectedModel,
-            iterations: this.#iterations
+            iterations: this.#iterations,
+            ...this.#contextTokens === void 0 ? {} : { contextTokens: this.#contextTokens }
           })
         ];
         if (typeof event.num_turns === "number") this.#iterations = event.num_turns;
@@ -30665,6 +30796,59 @@ function planEntries2(plan2) {
     ];
   });
 }
+function count(value) {
+  return asFiniteNumber(value) ?? 0;
+}
+function withTotal(tokens2, reported) {
+  return { ...tokens2, total: reported || tokens2.input + tokens2.output };
+}
+function appServerTokens(record2) {
+  return withTotal(
+    {
+      input: count(record2.inputTokens),
+      cachedInput: count(record2.cachedInputTokens),
+      cacheWrite: count(record2.cacheWriteInputTokens),
+      output: count(record2.outputTokens)
+    },
+    count(record2.totalTokens)
+  );
+}
+function rolloutTokens(record2) {
+  return withTotal(
+    {
+      input: count(record2.input_tokens),
+      cachedInput: count(record2.cached_input_tokens),
+      cacheWrite: count(record2.cache_write_input_tokens),
+      output: count(record2.output_tokens)
+    },
+    count(record2.total_tokens)
+  );
+}
+function subtractTokens(from, amount2) {
+  const minus = (a, b) => Math.max(a - b, 0);
+  return {
+    input: minus(from.input, amount2.input),
+    cachedInput: minus(from.cachedInput, amount2.cachedInput),
+    cacheWrite: minus(from.cacheWrite, amount2.cacheWrite),
+    output: minus(from.output, amount2.output),
+    total: minus(from.total, amount2.total)
+  };
+}
+function codexBreakdown(tokens2) {
+  return {
+    inputTokens: Math.max(tokens2.input - tokens2.cachedInput - tokens2.cacheWrite, 0),
+    outputTokens: tokens2.output,
+    cacheReadTokens: tokens2.cachedInput,
+    cacheCreationTokens: tokens2.cacheWrite
+  };
+}
+function codexUsageUpdate(spend, extra, fallbackModel) {
+  const update = usageUpdate({ ...codexBreakdown(spend), ...extra }, fallbackModel);
+  return spend.total > 0 && isUpdate(update, "usage_update") ? { ...update, used: spend.total } : update;
+}
+function codexContextTokens(last) {
+  return last.total > 0 ? last.total : void 0;
+}
 function createCodexSessionMemory() {
   return { shownWarnings: /* @__PURE__ */ new Set(), workers: /* @__PURE__ */ new Map() };
 }
@@ -31116,13 +31300,13 @@ function codexTurnInput(run, context) {
     ...images.length ? { imagePaths: images.map((image) => image.path) } : {}
   };
 }
-var import_fs7, import_path7, import_crypto9, import_crypto10, import_crypto11, import_crypto12, TokenRefresher, MCP_STARTUP_TIMEOUT_SEC, FIELD_TYPES, YES_NO, ACCEPT_DECLINE, MAX_INLINE_GENERATED_IMAGE_BYTES, PNG_SIGNATURE2, JPEG_NON_FRAME_MARKERS, IMAGE_GEN_CALL, PROMPT_LITERAL, RELOCATE_EVERY_MS, CodexImageGenerationFold, CodexRolloutImages, CodexRateLimits, USER_INPUT_METHOD, PERMISSIONS_METHOD, ELICITATION_METHOD, COMMAND_OR_FILE, LEGACY, DECISIONS, COORDINATION_TOOLS, SETTLED_AGENT, STATUS, CHANGE_OPERATIONS, SILENT_ON_START, IGNORED_ITEMS, PLAN_STATUS, CODEX_MCP_STATUS, WORKER_LIFECYCLE, INFO_KINDS, SILENT, CodexTurn, STDERR_TAIL_LINES3, MAX_BETWEEN_UPDATES, UNSUPPORTED_REQUEST, DECLINED_ELICITATION, IMAGE_CATCH_UP_MS, IMAGE_POLL_MS, CodexSession, CODEX_MIN_VERSION, CODEX_REQUIREMENT, CODEX_TESTED_LINE, DEFAULTS2, CLIENT_INFO, STATUS2, EXITED_WITHOUT_RESPONSE, CodexExecTurn, DEFAULTS22, CodexExecSession;
+var import_fs7, import_path7, import_crypto9, import_crypto10, import_crypto11, import_crypto12, TokenRefresher, MCP_STARTUP_TIMEOUT_SEC, FIELD_TYPES, YES_NO, ACCEPT_DECLINE, MAX_INLINE_GENERATED_IMAGE_BYTES, PNG_SIGNATURE2, JPEG_NON_FRAME_MARKERS, IMAGE_GEN_CALL, PROMPT_LITERAL, RELOCATE_EVERY_MS, CodexImageGenerationFold, CodexRolloutImages, CodexRateLimits, USER_INPUT_METHOD, PERMISSIONS_METHOD, ELICITATION_METHOD, COMMAND_OR_FILE, LEGACY, DECISIONS, COORDINATION_TOOLS, SETTLED_AGENT, STATUS, CHANGE_OPERATIONS, SILENT_ON_START, IGNORED_ITEMS, PLAN_STATUS, CodexTurnTokens, CODEX_MCP_STATUS, WORKER_LIFECYCLE, INFO_KINDS, SILENT, CodexTurn, STDERR_TAIL_LINES3, MAX_BETWEEN_UPDATES, UNSUPPORTED_REQUEST, DECLINED_ELICITATION, IMAGE_CATCH_UP_MS, IMAGE_POLL_MS, CodexSession, CODEX_MIN_VERSION, CODEX_REQUIREMENT, CODEX_TESTED_LINE, DEFAULTS2, CLIENT_INFO, STATUS2, EXITED_WITHOUT_RESPONSE, CodexExecTurn, DEFAULTS22, CodexExecSession;
 var init_codex = __esm({
   "../agent-core/dist/providers/codex.js"() {
     "use strict";
-    init_chunk_D4TIXPWZ();
-    init_chunk_FYZKVT3E();
-    init_chunk_OUEMTEUX();
+    init_chunk_TFIO37PI();
+    init_chunk_N2M5D7RS();
+    init_chunk_RBQC7XZH();
     init_chunk_ZCTKXKYY();
     init_chunk_6VWVDJ2A();
     init_chunk_DLVRNIY5();
@@ -31134,6 +31318,7 @@ var init_codex = __esm({
     import_crypto9 = require("crypto");
     import_crypto10 = require("crypto");
     init_runtime_v2();
+    init_acp();
     init_agent2();
     import_crypto11 = require("crypto");
     init_agent2();
@@ -31267,10 +31452,13 @@ var init_codex = __esm({
       #reported = /* @__PURE__ */ new Set();
       #cursor;
       #lastMiss;
-      constructor(locate, clock) {
+      #onTokenCount;
+      /** `onTokenCount` also hears each `token_count` the rollout gains, for the turn's usage. */
+      constructor(locate, clock, onTokenCount) {
         this.#locate = locate;
         this.#clock = clock;
         this.#fold = new CodexImageGenerationFold(clock);
+        this.#onTokenCount = onTokenCount;
       }
       get waiting() {
         return this.#fold.waiting;
@@ -31291,7 +31479,10 @@ var init_codex = __esm({
       }
       /** What the rollout gained since the last drain. */
       drain() {
-        for (const line of this.#open()?.read() ?? []) this.#fold.foldLine(line.text);
+        for (const line of this.#open()?.read() ?? []) {
+          this.#fold.foldLine(line.text);
+          if (this.#onTokenCount) this.#readTokenCount(line.text, this.#onTokenCount);
+        }
         return this.admit(this.#fold.take());
       }
       /** The turn is over: what is left, then every call still pending as failed. */
@@ -31308,6 +31499,16 @@ var init_codex = __esm({
         }
         return updates;
       }
+      #readTokenCount(text2, onTokenCount) {
+        if (!text2.includes('"token_count"')) return;
+        try {
+          const payload = asRecord(asRecord(JSON.parse(text2))?.payload);
+          const info = asRecord(payload?.info);
+          if (asString(payload?.type) === "token_count" && info) onTokenCount(info);
+        } catch {
+          return;
+        }
+      }
       #open() {
         if (this.#cursor) return this.#cursor;
         const now = this.#clock.monotonic();
@@ -31409,6 +31610,31 @@ var init_codex = __esm({
       ["inProgress", "in_progress"],
       ["completed", "completed"]
     ]);
+    CodexTurnTokens = class {
+      #baseline;
+      #last;
+      #window;
+      /** Records one report; `total` absent means `last` is the whole turn so far. */
+      note(last, total, window) {
+        if (total) this.#baseline ??= subtractTokens(total, last);
+        this.#last = last;
+        if (window !== void 0 && window > 0) this.#window = window;
+      }
+      get hasBaseline() {
+        return this.#baseline !== void 0;
+      }
+      spend(total) {
+        return this.#baseline ? subtractTokens(total, this.#baseline) : total;
+      }
+      /** The context the turn's last call left, and the window, as far as they are known. */
+      get context() {
+        const contextTokens = this.#last ? codexContextTokens(this.#last) : void 0;
+        return {
+          ...this.#window === void 0 ? {} : { contextSize: this.#window },
+          ...contextTokens === void 0 ? {} : { contextTokens }
+        };
+      }
+    };
     CODEX_MCP_STATUS = {
       starting: "starting",
       ready: "connected",
@@ -31455,6 +31681,7 @@ var init_codex = __esm({
       #end;
       #failFast;
       #lastError;
+      #tokens = new CodexTurnTokens();
       codexTurnId;
       constructor(memory, clock = systemClock2) {
         this.#memory = memory;
@@ -31549,19 +31776,16 @@ var init_codex = __esm({
       }
       #usage(params) {
         const usage = asRecord(params.tokenUsage);
-        const last = asRecord(usage?.last);
-        if (!last) return [];
-        const number4 = (value) => asFiniteNumber(value) ?? 0;
+        const lastRecord = asRecord(usage?.last);
+        if (!lastRecord) return [];
+        const last = appServerTokens(lastRecord);
+        const totalRecord = asRecord(usage?.total);
+        const total = totalRecord ? appServerTokens(totalRecord) : void 0;
+        this.#tokens.note(last, total, asFiniteNumber(usage?.modelContextWindow));
         return [
-          usageUpdate(
-            {
-              inputTokens: number4(last.inputTokens),
-              outputTokens: number4(last.outputTokens) + number4(last.reasoningOutputTokens),
-              cacheReadTokens: number4(last.cachedInputTokens),
-              cacheCreationTokens: number4(last.cacheWriteInputTokens),
-              ...asFiniteNumber(usage?.modelContextWindow) === void 0 ? {} : { contextSize: number4(usage?.modelContextWindow) },
-              costUsd: 0
-            },
+          codexUsageUpdate(
+            total ? this.#tokens.spend(total) : last,
+            { ...this.#tokens.context, costUsd: 0 },
             this.#memory.model ?? "codex"
           )
         ];
@@ -32102,12 +32326,16 @@ var init_codex = __esm({
       #lastError;
       #answered = false;
       #images;
+      #tokens = new CodexTurnTokens();
+      #resumed;
       constructor(resumeId, rollout) {
         this.#threadId = resumeId;
+        this.#resumed = resumeId !== void 0;
         if (!rollout) return;
         this.#images = new CodexRolloutImages(
           () => this.#threadId ? findCodexRollout(rollout.codexHome, this.#threadId) : void 0,
-          rollout.clock
+          rollout.clock,
+          (info) => this.#noteTokenCount(info)
         );
         if (resumeId) this.#images.startAtEnd();
       }
@@ -32169,22 +32397,34 @@ var init_codex = __esm({
         if (mapped) return itemUpdates(mapped, completed);
         return [{ sessionUpdate: "_alan/unhandled", kind: `item/${type || "(untyped)"}` }];
       }
+      /** The rollout's per-call counts: exec's own usage is only the thread's running total. */
+      #noteTokenCount(info) {
+        const last = asRecord(info.last_token_usage);
+        const total = asRecord(info.total_token_usage);
+        if (!last) return;
+        this.#tokens.note(
+          rolloutTokens(last),
+          total ? rolloutTokens(total) : void 0,
+          asFiniteNumber(info.model_context_window)
+        );
+      }
       #completed(usage) {
         this.#end = { status: "completed" };
-        const number4 = (value) => asFiniteNumber(value) ?? 0;
+        const rolloutUpdates = this.#images?.drain() ?? [];
         return [
-          ...usage ? [
-            usageUpdate({
-              inputTokens: number4(usage.input_tokens),
-              outputTokens: number4(usage.output_tokens) + number4(usage.reasoning_output_tokens),
-              cacheReadTokens: number4(usage.cached_input_tokens),
-              cacheCreationTokens: number4(usage.cache_write_input_tokens),
-              costUsd: 0
-            })
-          ] : [],
+          ...rolloutUpdates,
+          ...usage ? this.#usage(rolloutTokens(usage)) : [],
           { sessionUpdate: "state_update", state: "idle", stopReason: "end_turn" }
         ];
       }
+      /** A resumed turn with no rollout counts cannot separate its spend from earlier turns'. */
+      #usage(threadTotal) {
+        const context = { ...this.#tokens.context, costUsd: 0 };
+        if (this.#resumed && !this.#tokens.hasBaseline) {
+          return context.contextTokens === void 0 ? [] : [usageUpdate(context)];
+        }
+        return [codexUsageUpdate(this.#tokens.spend(threadTotal), context, "")];
+      }
       #failed(error62, fallback) {
         const message = errorText(error62?.message) || errorText(error62?.detail) || fallback.trim();
         const classified = message ? classifyCliError(normalizeCodexCliErrorMessage(message)) : this.#lastError ?? specForErrorKind("provider_error");
@@ -32254,6 +32494,14 @@ function resolveAlanCodeModelId(selectedModel, models) {
   if (requested && models.some((model) => model.id === requested)) return requested;
   return models.find((model) => model.isDefault)?.id ?? firstModel.id;
 }
+function disabledInheritedMcp(own2, inherited) {
+  const disabled = {};
+  for (const name of inherited ?? []) {
+    if (name in own2) continue;
+    disabled[name] = { enabled: false };
+  }
+  return disabled;
+}
 function parseExisting(existing) {
   if (!existing?.trim()) return {};
   try {
@@ -32281,6 +32529,8 @@ function alanCodeConfigContent(existing, input2) {
   const prompt = input2.prompt ?? ALAN_CODE_BASELINE_PROMPT;
   const hiddenSkills = { skill: { "customize-opencode": "deny" } };
   const plugins = Array.isArray(config2.plugin) ? config2.plugin : [];
+  const ownMcp = field(config2, "mcp");
+  const mcp = { ...ownMcp, ...disabledInheritedMcp(ownMcp, input2.inheritedMcpServers) };
   return JSON.stringify({
     $schema: "https://opencode.ai/config.json",
     ...config2,
@@ -32289,6 +32539,7 @@ function alanCodeConfigContent(existing, input2) {
     // 3.4 GB of a dev machine's engine database was these patches, against 82 sessions. Alan
     // does not use the engine's undo/revert, so the tracking stays off.
     snapshot: false,
+    ...Object.keys(mcp).length ? { mcp } : {},
     model: `${ALAN_CODE_ENGINE_PROVIDER_ID}/${input2.modelId}`,
     enabled_providers: [ALAN_CODE_ENGINE_PROVIDER_ID],
     provider: {
@@ -32607,6 +32858,77 @@ function alanCodeEngineEnv(input2) {
     [ALAN_CODE_CONVERSATION_ID_ENV]: input2.conversationId
   };
 }
+function openCodeGlobalConfigDirectory(env, home) {
+  const configHome = env.XDG_CONFIG_HOME?.trim() || (0, import_path9.join)(home, ".config");
+  return (0, import_path9.join)(configHome, "opencode");
+}
+function stripJsonc(text2) {
+  let out = "";
+  let index = 0;
+  while (index < text2.length) {
+    const skipTo = commentEnd(text2, index);
+    if (skipTo !== void 0) {
+      index = skipTo;
+      continue;
+    }
+    const char = text2[index];
+    if (char === "}" || char === "]") out = out.replace(/,\s*$/, "");
+    const end = char === '"' ? stringLiteralEnd(text2, index) : index + 1;
+    out += text2.slice(index, end);
+    index = end;
+  }
+  return out;
+}
+function commentEnd(text2, index) {
+  const pair = text2.slice(index, index + 2);
+  if (pair === "//") {
+    const newline = text2.indexOf("\n", index);
+    return newline === -1 ? text2.length : newline;
+  }
+  if (pair === "/*") {
+    const close = text2.indexOf("*/", index + 2);
+    return close === -1 ? text2.length : close + 2;
+  }
+  return void 0;
+}
+function stringLiteralEnd(text2, start) {
+  let index = start + 1;
+  while (index < text2.length) {
+    const char = text2[index];
+    if (char === "\\") {
+      index += 2;
+    } else if (char === '"') {
+      return index + 1;
+    } else {
+      index += 1;
+    }
+  }
+  return text2.length;
+}
+function parseJsonc(text2) {
+  try {
+    return JSON.parse(text2);
+  } catch {
+    try {
+      return JSON.parse(stripJsonc(text2));
+    } catch {
+      return void 0;
+    }
+  }
+}
+async function inheritedMcpServerNames(configDirectory) {
+  const names = /* @__PURE__ */ new Set();
+  for (const file2 of ["config.json", "opencode.json", "opencode.jsonc"]) {
+    const text2 = await (0, import_promises16.readFile)((0, import_path9.join)(configDirectory, file2), "utf8").catch(() => null);
+    if (text2 === null) continue;
+    const parsed = parseJsonc(text2);
+    const mcp = parsed !== null && typeof parsed === "object" ? parsed.mcp : void 0;
+    if (mcp !== null && typeof mcp === "object") {
+      for (const name of Object.keys(mcp)) names.add(name);
+    }
+  }
+  return [...names];
+}
 async function writePlugin(directory, apiOrigin) {
   const origin = (0, import_crypto13.createHash)("sha256").update(apiOrigin).digest("hex").slice(0, 12);
   const target = (0, import_path9.join)(directory, `engine-plugin-v${ALAN_CODE_ENGINE_PLUGIN_VERSION}-${origin}.mjs`);
@@ -32621,9 +32943,10 @@ async function prepareAlanCodeProfile(input2) {
   await Promise.all(
     directories.map((directory) => (0, import_promises16.mkdir)(directory, { recursive: true, mode: 448 }))
   );
-  const [pluginUrl, models] = await Promise.all([
+  const [pluginUrl, models, inheritedMcpServers] = await Promise.all([
     writePlugin((0, import_path9.join)(input2.engineRoot, "plugin"), input2.access.apiOrigin),
-    (input2.loadModels ?? fetchAlanCodeModels)(input2.access)
+    (input2.loadModels ?? fetchAlanCodeModels)(input2.access),
+    input2.globalConfigDirectory === void 0 ? Promise.resolve([]) : inheritedMcpServerNames(input2.globalConfigDirectory)
   ]);
   const modelId = resolveAlanCodeModelId(input2.requestedModel, models);
   return {
@@ -32631,7 +32954,8 @@ async function prepareAlanCodeProfile(input2) {
       baseURL: `${input2.access.apiOrigin}${ALAN_CODE_PROXY_PATH}`,
       modelId,
       models,
-      pluginUrl
+      pluginUrl,
+      inheritedMcpServers
     }),
     model: { providerID: ALAN_CODE_ENGINE_PROVIDER_ID, modelID: modelId }
   };
@@ -33269,8 +33593,8 @@ var require_Node = __commonJS({
         };
         const res = toJS.toJS(this, "", ctx);
         if (typeof onAnchor === "function")
-          for (const { count, res: res2 } of ctx.anchors.values())
-            onAnchor(res2, count);
+          for (const { count: count2, res: res2 } of ctx.anchors.values())
+            onAnchor(res2, count2);
         return typeof reviver === "function" ? applyReviver.applyReviver(reviver, { "": res }, "", res) : res;
       }
     };
@@ -33376,13 +33700,13 @@ var require_Alias = __commonJS({
         const anchor2 = anchors2 && source && anchors2.get(source);
         return anchor2 ? anchor2.count * anchor2.aliasCount : 0;
       } else if (identity.isCollection(node2)) {
-        let count = 0;
+        let count2 = 0;
         for (const item of node2.items) {
           const c = getAliasCount(doc, item, anchors2);
-          if (c > count)
-            count = c;
+          if (c > count2)
+            count2 = c;
         }
-        return count;
+        return count2;
       } else if (identity.isPair(node2)) {
         const kc = getAliasCount(doc, node2.key, anchors2);
         const vc = getAliasCount(doc, node2.value, anchors2);
@@ -36335,8 +36659,8 @@ var require_Document = __commonJS({
         };
         const res = toJS.toJS(this.contents, jsonArg ?? "", ctx);
         if (typeof onAnchor === "function")
-          for (const { count, res: res2 } of ctx.anchors.values())
-            onAnchor(res2, count);
+          for (const { count: count2, res: res2 } of ctx.anchors.values())
+            onAnchor(res2, count2);
         return typeof reviver === "function" ? applyReviver.applyReviver(reviver, { "": res }, "", res) : res;
       }
       /**
@@ -36413,12 +36737,12 @@ var require_errors = __commonJS({
         lineStr = prev + lineStr;
       }
       if (/[^ ]/.test(lineStr)) {
-        let count = 1;
+        let count2 = 1;
         const end = error62.linePos[1];
         if (end?.line === line && end.col > col) {
-          count = Math.max(1, Math.min(end.col - col, 80 - ci));
+          count2 = Math.max(1, Math.min(end.col - col, 80 - ci));
         }
-        const pointer = " ".repeat(ci) + "^".repeat(count);
+        const pointer = " ".repeat(ci) + "^".repeat(count2);
         error62.message += `:
 
 ${lineStr}
@@ -36660,7 +36984,7 @@ var require_resolve_block_map = __commonJS({
       if (ctx.atRoot)
         ctx.atRoot = false;
       let offset = bm.offset;
-      let commentEnd = null;
+      let commentEnd2 = null;
       for (const collItem of bm.items) {
         const { start, key, sep: sep4, value } = collItem;
         const keyProps = resolveProps.resolveProps(start, {
@@ -36680,7 +37004,7 @@ var require_resolve_block_map = __commonJS({
               onError(offset, "BAD_INDENT", startColMsg);
           }
           if (!keyProps.anchor && !keyProps.tag && !sep4) {
-            commentEnd = keyProps.end;
+            commentEnd2 = keyProps.end;
             if (keyProps.comment) {
               if (map2.comment)
                 map2.comment += "\n" + keyProps.comment;
@@ -36742,9 +37066,9 @@ var require_resolve_block_map = __commonJS({
           map2.items.push(pair);
         }
       }
-      if (commentEnd && commentEnd < offset)
-        onError(commentEnd, "IMPOSSIBLE", "Map comment with trailing content");
-      map2.range = [bm.offset, offset, commentEnd ?? offset];
+      if (commentEnd2 && commentEnd2 < offset)
+        onError(commentEnd2, "IMPOSSIBLE", "Map comment with trailing content");
+      map2.range = [bm.offset, offset, commentEnd2 ?? offset];
       return map2;
     }
     exports2.resolveBlockMap = resolveBlockMap;
@@ -36766,7 +37090,7 @@ var require_resolve_block_seq = __commonJS({
       if (ctx.atKey)
         ctx.atKey = false;
       let offset = bs.offset;
-      let commentEnd = null;
+      let commentEnd2 = null;
       for (const { start, value } of bs.items) {
         const props = resolveProps.resolveProps(start, {
           indicator: "seq-item-ind",
@@ -36783,7 +37107,7 @@ var require_resolve_block_seq = __commonJS({
             else
               onError(offset, "MISSING_CHAR", "Sequence item without - indicator");
           } else {
-            commentEnd = props.end;
+            commentEnd2 = props.end;
             if (props.comment)
               seq.comment = props.comment;
             continue;
@@ -36795,7 +37119,7 @@ var require_resolve_block_seq = __commonJS({
         offset = node2.range[2];
         seq.items.push(node2);
       }
-      seq.range = [bs.offset, offset, commentEnd ?? offset];
+      seq.range = [bs.offset, offset, commentEnd2 ?? offset];
       return seq;
     }
     exports2.resolveBlockSeq = resolveBlockSeq;
@@ -40032,8 +40356,8 @@ var require_dist = __commonJS({
 var init_dist = __esm({
   "../agent-core/dist/index.js"() {
     "use strict";
-    init_chunk_FYZKVT3E();
-    init_chunk_OUEMTEUX();
+    init_chunk_N2M5D7RS();
+    init_chunk_RBQC7XZH();
     init_chunk_ZCTKXKYY();
     init_chunk_6VWVDJ2A();
     init_chunk_YXWJW7I5();
@@ -40392,24 +40716,30 @@ function tokens(record2, ...keys) {
   }
   return void 0;
 }
-function promptUsage(result, fallbackModel) {
-  const usage = asRecord(result.usage) ?? asRecord(result._meta);
+function contextOf(update) {
+  const used = asFiniteNumber(update.used);
+  const size = asFiniteNumber(update.size);
+  if (used === void 0 || used <= 0) return void 0;
+  return { contextTokens: used, ...size !== void 0 && size > 0 ? { contextSize: size } : {} };
+}
+function promptSpend(result, profile) {
+  const meta3 = asRecord(result._meta);
+  const usage = asRecord(result.usage) ?? asRecord(meta3?.usage) ?? meta3;
   const input2 = tokens(usage, "inputTokens", "input_tokens");
   const output2 = tokens(usage, "outputTokens", "output_tokens");
   if (input2 === void 0 && output2 === void 0) return void 0;
   const thoughts = tokens(usage, "thoughtTokens", "reasoningTokens") ?? 0;
-  const meta3 = asRecord(result._meta);
-  return usageUpdate(
-    {
-      inputTokens: input2 ?? 0,
-      outputTokens: (output2 ?? 0) + thoughts,
-      cacheReadTokens: tokens(usage, "cachedReadTokens", "cacheReadTokens") ?? 0,
-      cacheCreationTokens: tokens(usage, "cachedWriteTokens", "cacheWriteTokens") ?? 0,
-      costUsd: 0,
-      ...asString(meta3?.modelId) ? { model: asString(meta3?.modelId) } : {}
-    },
-    fallbackModel
-  );
+  const cacheRead = tokens(usage, "cachedReadTokens", "cacheReadTokens") ?? 0;
+  const cacheWrite = tokens(usage, "cachedWriteTokens", "cacheWriteTokens") ?? 0;
+  const uncached = profile.promptInputIncludesCache ? Math.max((input2 ?? 0) - cacheRead - cacheWrite, 0) : input2 ?? 0;
+  return {
+    inputTokens: uncached,
+    outputTokens: (output2 ?? 0) + thoughts,
+    cacheReadTokens: cacheRead,
+    cacheCreationTokens: cacheWrite,
+    costUsd: 0,
+    ...asString(meta3?.modelId) ? { model: asString(meta3?.modelId) } : {}
+  };
 }
 function pendingAnswer2(pending, answer) {
   switch (pending.kind) {
@@ -40779,8 +41109,8 @@ var import_promises24, import_path10, import_crypto14, import_promises25, CURSOR
 var init_acp3 = __esm({
   "../agent-core/dist/providers/acp.js"() {
     "use strict";
-    init_chunk_FYZKVT3E();
-    init_chunk_OUEMTEUX();
+    init_chunk_N2M5D7RS();
+    init_chunk_RBQC7XZH();
     init_chunk_ZCTKXKYY();
     init_chunk_6VWVDJ2A();
     init_chunk_DLVRNIY5();
@@ -41010,9 +41340,52 @@ var init_acp3 = __esm({
       #bursts = /* @__PURE__ */ new Map();
       #counter = 0;
       #failure;
-      constructor(prefix, profile) {
+      #context;
+      #spend;
+      #onContext;
+      /** `context` is what the session's last turn left, until this turn reports its own. */
+      constructor(prefix, profile, context) {
         this.#prefix = prefix;
         this.#profile = profile;
+        this.#context = context;
+      }
+      get context() {
+        return this.#context;
+      }
+      /** The prompt's answer: what the turn spent, with the context so far, as one update. */
+      settle(result, fallbackModel) {
+        this.#spend = promptSpend(result, this.#profile);
+        return this.#usage(fallbackModel);
+      }
+      /** Resolves on the next `usage_update`, or after `ms`. */
+      async nextContext(ms, sleep) {
+        await Promise.race([
+          new Promise((resolve8) => {
+            this.#onContext = resolve8;
+          }),
+          sleep(ms)
+        ]);
+        this.#onContext = void 0;
+      }
+      /** Ends a `nextContext` wait at once: the turn is being cancelled. */
+      stopWaiting() {
+        this.#onContext?.();
+      }
+      /**
+       * The chat keeps a turn's last usage update, so each one carries both the spend and the
+       * context. An agent's own `usage_update` is context only and must not read as spend.
+       */
+      #noteContext(update) {
+        const context = contextOf(update);
+        if (!context) return [];
+        this.#context = context;
+        this.#onContext?.();
+        const usage = this.#usage(this.#spend?.model ?? "");
+        return usage ? [usage] : [];
+      }
+      #usage(fallbackModel) {
+        if (!this.#spend && !this.#context) return void 0;
+        return usageUpdate({ ...this.#spend, ...this.#context }, fallbackModel);
       }
       /** The first cause a vendor frame named; the prompt's own error is usually generic. */
       get failure() {
@@ -41042,6 +41415,8 @@ var init_acp3 = __esm({
                 entries: Array.isArray(update.entries) ? update.entries : []
               }
             ];
+          case "usage_update":
+            return this.#noteContext(update);
           case "current_mode_update":
             return [
               noticeUpdate("info", "mode_changed", asString(update.currentModeId) || "mode changed")
@@ -41167,7 +41542,13 @@ var init_acp3 = __esm({
           return active.done;
         }
         const prompt = this.#promptBlocks(input2);
-        this.#rpc.request("session/prompt", { sessionId, prompt }).then((result) => active.finish(this.#promptOutcome(active, asRecord(result) ?? {}))).catch((error62) => {
+        this.#rpc.request("session/prompt", { sessionId, prompt }).then(async (result) => {
+          const record2 = asRecord(result) ?? {};
+          const trailing = this.#profile.trailingUsageMs;
+          if (trailing && !active.cancelRequested)
+            await active.turn.nextContext(trailing, (ms) => this.#options.clock.sleep(ms));
+          active.finish(this.#promptOutcome(active, record2));
+        }).catch((error62) => {
           if (this.#state === "closed") return;
           active.finish(this.#errorOutcome(active, error62));
         });
@@ -41248,7 +41629,7 @@ var init_acp3 = __esm({
         ];
       }
       #promptOutcome(active, result) {
-        const usage = promptUsage(result, this.#config?.model ?? this.#profile.backendKind);
+        const usage = active.turn.settle(result, this.#config?.model ?? this.#profile.backendKind);
         if (usage) this.#emit({ type: "update", turnId: active.id, update: usage });
         const stopReason = asString(result.stopReason);
         const failure22 = active.turn.failure;
@@ -41282,6 +41663,7 @@ var init_acp3 = __esm({
       async #stopTurn(active) {
         if (active.cancelRequested) return active.done.then(() => void 0);
         active.cancelRequested = true;
+        active.turn.stopWaiting();
         const rung = await runCancelLadder({
           clock: this.#options.clock,
           graceMs: this.#options.interruptGraceMs,
@@ -41307,14 +41689,14 @@ var init_acp3 = __esm({
       }
       #startTurn(id) {
         this.#turns += 1;
-        const turn = new AcpTurn(`acp-${this.#turns}-${id}`, this.#profile);
+        const turn = new AcpTurn(`acp-${this.#turns}-${id}`, this.#profile, this.#idleTurn.context);
         let finish = () => {
         };
         const done = new Promise((resolve8) => {
           finish = (outcome2) => {
             if (this.#current?.id !== id) return;
             this.#current = void 0;
-            this.#idleTurn = new AcpTurn(`acp-between-${this.#turns}`, this.#profile);
+            this.#idleTurn = new AcpTurn(`acp-between-${this.#turns}`, this.#profile, turn.context);
             if (this.#state === "busy") this.#state = "idle";
             this.#host.scanDescendants(true);
             this.#emit({ type: "turn_ended", turnId: id, outcome: outcome2 });
@@ -41553,6 +41935,8 @@ var init_acp3 = __esm({
       }
     };
     grokAcpProfile = {
+      // Grok's ACP `inputTokens` is the full prompt; its own docs say only headless output subtracts cache.
+      promptInputIncludesCache: true,
       backendKind: "grok_cli",
       displayName: "Grok CLI",
       defaultCommand: "grok",
@@ -41583,7 +41967,9 @@ var init_acp3 = __esm({
       requirement: { cli: "kimi", feature: "`kimi acp`" },
       launchArgs: () => ["acp"],
       modelChannel: "session",
-      exitsOnStdinEof: true
+      exitsOnStdinEof: true,
+      // Kimi answers the prompt, then reads its context size and pushes `usage_update`.
+      trailingUsageMs: 1e3
     };
     ACP_PROFILES = {
       cursor_agent_cli: cursorAcpProfile,
@@ -41817,9 +42203,19 @@ function createPersistentDriver(provider4, options) {
         }
       };
       const media = new LocalMediaReader(spec.projectPath, clock);
+      const uploader = inputs.media;
+      let uploads = Promise.resolve();
       const recordWithMedia = (update) => {
         record2(update);
-        for (const found of media.read(update)) record2(found);
+        const found = media.find(update);
+        if (found.length === 0) return;
+        if (uploader === void 0) {
+          for (const item of found) record2(media.inline(item));
+          return;
+        }
+        uploads = uploads.then(async () => {
+          for (const item of found) record2(await media.publish(item, uploader, signal));
+        });
       };
       const forward = (event) => {
         if (event.type === "session_id") {
@@ -41913,6 +42309,7 @@ function createPersistentDriver(provider4, options) {
       } catch (error62) {
         return { outcome: "failed", message: errorMessage(error62) };
       } finally {
+        await uploads;
         signal.removeEventListener("abort", onAbort);
         if (live.turn === turn) live.turn = void 0;
       }
@@ -42409,8 +42806,22 @@ function codeModeChildUpdates(tool, metadata) {
     };
   });
 }
+function stepContextTokens(step, total) {
+  const sum = step.inputTokens + step.outputTokens + step.cacheReadTokens + step.cacheCreationTokens;
+  const tokens2 = total !== void 0 && total > 0 ? total : sum;
+  return tokens2 > 0 ? tokens2 : void 0;
+}
+function addStepUsage(turn, step) {
+  return {
+    inputTokens: turn.inputTokens + step.inputTokens,
+    outputTokens: turn.outputTokens + step.outputTokens,
+    cacheReadTokens: turn.cacheReadTokens + step.cacheReadTokens,
+    cacheCreationTokens: turn.cacheCreationTokens + step.cacheCreationTokens,
+    costUsd: turn.costUsd === void 0 && step.costUsd === void 0 ? void 0 : (turn.costUsd ?? 0) + (step.costUsd ?? 0)
+  };
+}
 function createOpenCodeSessionMemory() {
-  return { userMessageIds: /* @__PURE__ */ new Set() };
+  return { userMessageIds: /* @__PURE__ */ new Set(), contextWindows: /* @__PURE__ */ new Map() };
 }
 function only(updates) {
   return { updates, actions: [] };
@@ -42743,12 +43154,12 @@ function openCodeTurnInput(run, context) {
     ...images.length ? { imagePaths: images.map((image) => image.path) } : {}
   };
 }
-var import_crypto15, import_http4, import_crypto16, import_promises26, import_path11, import_path12, import_url2, import_crypto17, IDLE_SOCKET_MS2, OpenCodeHttpError, BASE62, messageIdClock, OpenCodeClient, OPENCODE_CONFIG_ENV, OPENCODE_ENGINE, TEXT_PARTS, STEP_PARTS, STOPPED_BY_USER, OpenCodeSubagents, NAMED_KINDS, OPENCODE_ABORTED_ERROR, PROVIDER_EVENT_META, TASK_TOOL_NAME, TASK_RESULT_TAG, TASK_ERROR_TAG, PERMISSION_DENIED, FILE_OPERATIONS, PartReader, NOTHING, NON_INTERACTIVE_PERMISSIONS, CONTENT_FILTER_FINISHES, TRUNCATED_FINISHES, OUTPUT_PARTS, OpenCodeTurn, LISTENING, OUTPUT_TAIL_LINES, IMAGE_TYPES, OpenCodeSession, OPENCODE_MIN_VERSION, OPENCODE_REQUIREMENT, OPENCODE_TESTED_LINE, OPENCODE_SUPPORTED_MAJOR, DEFAULTS4, STORE_LOCKED, NON_INTERACTIVE_RULES, TITLE_LENGTH, MAX_VARIANT_LENGTH;
+var import_crypto15, import_http4, import_crypto16, import_promises26, import_path11, import_path12, import_url2, import_crypto17, IDLE_SOCKET_MS2, OpenCodeHttpError, BASE62, messageIdClock, OpenCodeClient, OPENCODE_CONFIG_ENV, OPENCODE_ENGINE, TEXT_PARTS, STEP_PARTS, STOPPED_BY_USER, OpenCodeSubagents, NAMED_KINDS, OPENCODE_ABORTED_ERROR, PROVIDER_EVENT_META, TASK_TOOL_NAME, TASK_RESULT_TAG, TASK_ERROR_TAG, PERMISSION_DENIED, FILE_OPERATIONS, NO_USAGE, PartReader, NOTHING, NON_INTERACTIVE_PERMISSIONS, CONTENT_FILTER_FINISHES, TRUNCATED_FINISHES, OUTPUT_PARTS, OpenCodeTurn, LISTENING, OUTPUT_TAIL_LINES, IMAGE_TYPES, OpenCodeSession, OPENCODE_MIN_VERSION, OPENCODE_REQUIREMENT, OPENCODE_TESTED_LINE, OPENCODE_SUPPORTED_MAJOR, DEFAULTS4, STORE_LOCKED, NON_INTERACTIVE_RULES, TITLE_LENGTH, MAX_VARIANT_LENGTH;
 var init_opencode = __esm({
   "../agent-core/dist/providers/opencode.js"() {
     "use strict";
-    init_chunk_FYZKVT3E();
-    init_chunk_OUEMTEUX();
+    init_chunk_N2M5D7RS();
+    init_chunk_RBQC7XZH();
     init_chunk_ZCTKXKYY();
     init_chunk_6VWVDJ2A();
     init_chunk_DLVRNIY5();
@@ -42930,6 +43341,22 @@ var init_opencode = __esm({
         const providers = Array.isArray(body?.providers) ? body.providers : [];
         return providers.map((provider4) => asString(asRecord(provider4)?.id)).filter(Boolean);
       }
+      /** `provider/model` \u2192 the model's context limit; 0 (a custom model's unknown) is left out. */
+      async modelContextWindows() {
+        const body = asRecord(await this.#call("provider list", "GET", "/config/providers"));
+        const windows = /* @__PURE__ */ new Map();
+        for (const provider4 of Array.isArray(body?.providers) ? body.providers : []) {
+          const record2 = asRecord(provider4);
+          const providerId = asString(record2?.id);
+          for (const [modelId, model] of Object.entries(asRecord(record2?.models) ?? {})) {
+            const limit = asFiniteNumber(asRecord(asRecord(model)?.limit)?.context);
+            if (providerId && limit !== void 0 && limit > 0) {
+              windows.set(`${providerId}/${modelId}`, limit);
+            }
+          }
+        }
+        return windows;
+      }
       /** Asks emitted while disconnected must still get a reply. Older engines may lack these routes. */
       async pendingAsks() {
         const read = async (path, type) => {
@@ -43161,6 +43588,13 @@ var init_opencode = __esm({
       ["delete", "delete"],
       ["update", "modify"]
     ]);
+    NO_USAGE = {
+      inputTokens: 0,
+      outputTokens: 0,
+      cacheReadTokens: 0,
+      cacheCreationTokens: 0,
+      costUsd: void 0
+    };
     PartReader = class {
       /** messageID \u2192 part ids in arrival order, so a multi-part message keeps its order. */
       #order = /* @__PURE__ */ new Map();
@@ -43170,6 +43604,7 @@ var init_opencode = __esm({
       /** To-do calls already sent as a plan; the running and completed frames repeat the input. */
       #planned = /* @__PURE__ */ new Set();
       #steps = /* @__PURE__ */ new Set();
+      #turnUsage = NO_USAGE;
       #partIds = /* @__PURE__ */ new Set();
       #anonymous = 0;
       #retainedChars = 0;
@@ -43184,6 +43619,9 @@ var init_opencode = __esm({
       }
       /** `provider/model` from the assistant message; step-finish frames do not repeat it. */
       model;
+      /** The model's context limit, when the server listed it. */
+      contextWindow;
+      #contextTokens;
       part(part, parentToolCallId) {
         const id = asString(part.id);
         if (id) this.#partIds.add(id);
@@ -43192,7 +43630,7 @@ var init_opencode = __esm({
             "protocol_violation",
             "Alan Code exceeded the retained event limit. Continue in a new turn."
           );
-        return withParent(this.#read(part), parentToolCallId);
+        return withParent(this.#read(part, parentToolCallId !== void 0), parentToolCallId);
       }
       /** A delta names only its part; the role and message come from the part's opening snapshot. */
       delta(partId, field2, delta, parentToolCallId) {
@@ -43204,7 +43642,7 @@ var init_opencode = __esm({
         const update = role === "text" ? { sessionUpdate: "agent_message_chunk", messageId, content } : { sessionUpdate: "agent_thought_chunk", messageId: `${messageId}:reasoning`, content };
         return withParent([update], parentToolCallId);
       }
-      #read(part) {
+      #read(part, child) {
         const type = asString(part.type);
         switch (type) {
           case "step-start":
@@ -43220,7 +43658,7 @@ var init_opencode = __esm({
             return this.#tool(part);
           case "step-finish":
           case "step_finish":
-            return this.#stepFinish(part);
+            return this.#stepFinish(part, child);
           case "snapshot":
           case "patch":
             return [];
@@ -43286,6 +43724,31 @@ var init_opencode = __esm({
         }
         return updates;
       }
+      #stepUsage(part, tokens2, child) {
+        const cache = asRecord(tokens2.cache);
+        const step = {
+          inputTokens: asFiniteNumber(tokens2.input) ?? 0,
+          // OpenCode counts reasoning apart from output, and cache apart from input.
+          outputTokens: (asFiniteNumber(tokens2.output) ?? 0) + (asFiniteNumber(tokens2.reasoning) ?? 0),
+          cacheReadTokens: asFiniteNumber(cache?.read) ?? 0,
+          cacheCreationTokens: asFiniteNumber(cache?.write) ?? 0
+        };
+        if (!child) this.#contextTokens = stepContextTokens(step, asFiniteNumber(tokens2.total));
+        this.#turnUsage = addStepUsage(this.#turnUsage, {
+          ...step,
+          costUsd: asFiniteNumber(part.cost)
+        });
+        const { costUsd, ...turnTokens } = this.#turnUsage;
+        return usageUpdate(
+          {
+            ...turnTokens,
+            ...costUsd === void 0 ? {} : { costUsd },
+            ...this.#contextTokens === void 0 ? {} : { contextTokens: this.#contextTokens },
+            ...this.contextWindow === void 0 ? {} : { contextSize: this.contextWindow }
+          },
+          this.model
+        );
+      }
       /** OpenCode's to-do list is the plan, sent once per call although every frame repeats it. */
       #plan(toolCallId, name, toolState) {
         const todos = asRecord(toolState?.input)?.todos;
@@ -43294,28 +43757,12 @@ var init_opencode = __esm({
         this.#planned.add(toolCallId);
         return [todoPlanUpdate(toolCallId, todos)];
       }
-      #stepFinish(part) {
+      #stepFinish(part, child) {
         const id = asString(part.id);
         if (id && this.#steps.has(id)) return [];
         if (id) this.#steps.add(id);
-        const updates = [];
         const tokens2 = asRecord(part.tokens);
-        if (tokens2) {
-          const cache = asRecord(tokens2.cache);
-          const cost = asFiniteNumber(part.cost);
-          updates.push(
-            usageUpdate(
-              {
-                inputTokens: asFiniteNumber(tokens2.input) ?? 0,
-                outputTokens: asFiniteNumber(tokens2.output) ?? 0,
-                cacheReadTokens: asFiniteNumber(cache?.read) ?? 0,
-                cacheCreationTokens: asFiniteNumber(cache?.write) ?? 0,
-                ...cost === void 0 ? {} : { costUsd: cost }
-              },
-              this.model
-            )
-          );
-        }
+        const updates = tokens2 ? [this.#stepUsage(part, tokens2, child)] : [];
         const reason = asString(part.reason);
         if (reason === "stop") {
           updates.push({ sessionUpdate: "state_update", state: "idle", stopReason: "end_turn" });
@@ -43500,7 +43947,10 @@ var init_opencode = __esm({
         if (finish) this.#finish = finish;
         const provider4 = asString(info.providerID);
         const model = asString(info.modelID);
-        if (provider4 && model) this.#parts.model = `${provider4}/${model}`;
+        if (provider4 && model) {
+          this.#parts.model = `${provider4}/${model}`;
+          this.#parts.contextWindow = this.#memory.contextWindows.get(this.#parts.model);
+        }
         const error62 = asRecord(info.error);
         if (!error62 || isAbortError(error62) || this.#error) return [];
         return this.#fail(classifyOpenCodeError(error62, `${this.#engine.label} session error.`));
@@ -43705,6 +44155,9 @@ var init_opencode = __esm({
       /** Subscribes before the session exists, so `session.created` and early asks are seen. */
       async connect(client) {
         this.#client = client;
+        client.modelContextWindows().then((windows) => {
+          this.#memory.contextWindows = windows;
+        }).catch(() => void 0);
         this.#events?.close();
         this.#events = await client.events({
           onEvent: (event) => {
@@ -44113,7 +44566,9 @@ function createAlanCodeHolderDriver(options) {
   });
   const env = options.cliEnvironment;
   const engine = resolveAlanCodeEngine({ env, platform, packaged: [] });
-  const engineRoot = alanCodeEngineRoot(env.HOME?.trim() || (0, import_node_os3.homedir)());
+  const home = env.HOME?.trim() || (0, import_node_os3.homedir)();
+  const engineRoot = alanCodeEngineRoot(home);
+  const globalConfigDirectory = openCodeGlobalConfigDirectory(env, home);
   options.log.info("alan_code.engine", { command: engine.command, source: engine.source });
   const open4 = async (planned) => {
     if (planned.profile === void 0) throw refuseWithoutCredential();
@@ -44151,6 +44606,7 @@ function createAlanCodeHolderDriver(options) {
             conversationId: spec.conversationId
           },
           engineRoot,
+          globalConfigDirectory,
           requestedModel: spec.model
         };
         const skills = options.installedSkills?.() ?? null;
@@ -44798,8 +45254,8 @@ var import_crypto18, import_promises27, FACTORY_API_VERSION, FACTORY_PROTOCOL_VE
 var init_droid = __esm({
   "../agent-core/dist/providers/droid.js"() {
     "use strict";
-    init_chunk_FYZKVT3E();
-    init_chunk_OUEMTEUX();
+    init_chunk_N2M5D7RS();
+    init_chunk_RBQC7XZH();
     init_chunk_ZCTKXKYY();
     init_chunk_6VWVDJ2A();
     init_chunk_DLVRNIY5();
@@ -44844,7 +45300,10 @@ var init_droid = __esm({
         const notification = asRecord(params.notification);
         if (!notification) return [];
         const sessionId = asString(params.sessionId);
-        if (!sessionId || sessionId === this.#sessionId) return this.#read(notification);
+        if (!sessionId || sessionId === this.#sessionId) {
+          this.#noteContext(notification);
+          return this.#read(notification);
+        }
         const launcher = this.#memory.childLaunchers.get(sessionId);
         if (!launcher) return [];
         return this.#read(notification).map(
@@ -44854,6 +45313,14 @@ var init_droid = __esm({
           })
         );
       }
+      /** Droid's own context figure: the last call's input, cache reads and output. */
+      #noteContext(notification) {
+        if (asString(notification.type) !== "session_token_usage_changed") return;
+        const last = asRecord(notification.lastCallTokenUsage);
+        if (!last) return;
+        const tokens2 = (asFiniteNumber(last.inputTokens) ?? 0) + (asFiniteNumber(last.cacheReadTokens) ?? 0) + (asFiniteNumber(last.outputTokens) ?? 0);
+        if (tokens2 > 0) this.#memory.contextTokens = tokens2;
+      }
       #read(notification) {
         const type = asString(notification.type);
         if (SILENT2.has(type)) return [];
@@ -44928,6 +45395,7 @@ var init_droid = __esm({
               cacheCreationTokens: number4(usage?.cacheCreationTokens),
               numTurns: 1,
               ...duration3 === void 0 ? {} : { durationMs: duration3 },
+              ...this.#memory.contextTokens === void 0 ? {} : { contextTokens: this.#memory.contextTokens },
               costUsd: 0
             },
             this.#memory.model ?? "droid"
@@ -45736,6 +46204,23 @@ function providerError(_grammar, frame) {
 function spellings(types, handle) {
   return types.map((type) => [type, handle]);
 }
+function stepTokens(stats) {
+  return {
+    inputTokens: firstNumber2(stats.input_tokens, stats.input),
+    outputTokens: firstNumber2(stats.output_tokens) + firstNumber2(stats.thinking_tokens),
+    cacheReadTokens: firstNumber2(stats.cache_read_tokens, stats.cached_input_tokens, stats.cached),
+    cacheCreationTokens: 0
+  };
+}
+function addStepTokens(total, step) {
+  if (!total) return step;
+  return {
+    inputTokens: total.inputTokens + step.inputTokens,
+    outputTokens: total.outputTokens + step.outputTokens,
+    cacheReadTokens: total.cacheReadTokens + step.cacheReadTokens,
+    cacheCreationTokens: total.cacheCreationTokens + step.cacheCreationTokens
+  };
+}
 function firstNumber2(...values) {
   for (const value of values) {
     const number4 = asFiniteNumber(value);
@@ -45907,9 +46392,9 @@ var import_promises28, import_path13, import_fs9, import_path14, import_path15,
 var init_antigravity = __esm({
   "../agent-core/dist/providers/antigravity.js"() {
     "use strict";
-    init_chunk_D4TIXPWZ();
-    init_chunk_FYZKVT3E();
-    init_chunk_OUEMTEUX();
+    init_chunk_TFIO37PI();
+    init_chunk_N2M5D7RS();
+    init_chunk_RBQC7XZH();
     init_chunk_ZCTKXKYY();
     init_chunk_6VWVDJ2A();
     init_chunk_DLVRNIY5();
@@ -46267,6 +46752,11 @@ var init_antigravity = __esm({
       /** What `--conversation` takes: a frame's `conversation_id` wins over its `session_id`. */
       #conversationId;
       #forkReported = false;
+      /** The conversation this turn runs in; a subagent's steps come under another id. */
+      #rootConversation;
+      /** The sum of this turn's own steps: the result's usage is the whole conversation's. */
+      #stepSpend;
+      #contextTokens;
       constructor(options) {
         this.#options = options;
         this.#conversationId = options.resumeId;
@@ -46313,7 +46803,9 @@ var init_antigravity = __esm({
         const type = asString(frame.type);
         if (!type) return [];
         this.#conversationId = antigravityString(frame, "conversation_id") ?? antigravityString(frame, "session_id") ?? this.#conversationId;
+        this.#rootConversation ??= this.#conversationId;
         this.#track(type, frame);
+        this.#noteStep(type, frame);
         const forked = this.#silentFork();
         if (SESSION_START_TYPES.has(type)) {
           return [
@@ -46328,6 +46820,29 @@ var init_antigravity = __esm({
         if (RESULT_TYPES.has(type)) return [...forked, ...this.#onResult(type, frame)];
         return [...forked, ...this.#transcripts?.read() ?? []];
       }
+      /** A finished answer step of this conversation: one model call, with its own usage. */
+      #noteStep(type, frame) {
+        if (type !== "assistant_message" || asString(frame.state).toUpperCase() !== "DONE") return;
+        const usage = asRecord(frame.usage);
+        if (!usage) return;
+        const conversation = antigravityString(frame, "conversation_id");
+        if (conversation && this.#rootConversation && conversation !== this.#rootConversation) return;
+        const step = stepTokens(usage);
+        this.#stepSpend = addStepTokens(this.#stepSpend, step);
+        const context = step.inputTokens + step.cacheReadTokens + step.outputTokens;
+        if (context > 0) this.#contextTokens = context;
+      }
+      /**
+       * agy's result usage is cumulative over the conversation, so a resumed turn's spend comes
+       * from its steps; a first turn's result is its own.
+       */
+      #turnSpend(frame) {
+        const steps = this.#stepSpend;
+        this.#stepSpend = void 0;
+        if (steps) return steps;
+        if (this.#options.resumeId) return void 0;
+        return stepTokens(asRecord(frame.usage) ?? asRecord(frame.stats) ?? frame);
+      }
       #track(type, frame) {
         const transcripts = this.#transcripts;
         if (!transcripts) return;
@@ -46345,6 +46860,22 @@ var init_antigravity = __esm({
         this.#forkReported = true;
         return [noticeUpdate("warning", "session_resume_failed", RESUME_FORKED)];
       }
+      #resultUsage(frame) {
+        const spend = this.#turnSpend(frame);
+        const contextTokens = this.#contextTokens;
+        if (!spend && contextTokens === void 0) return [];
+        const stats = asRecord(frame.usage) ?? asRecord(frame.stats) ?? frame;
+        return [
+          usageUpdate({
+            model: formatAntigravityModelName(this.#model()),
+            numTurns: Math.max(this.#iterations, 1),
+            durationMs: asFiniteNumber(stats.duration_ms) ?? 0,
+            ...spend,
+            ...contextTokens === void 0 ? {} : { contextTokens },
+            costUsd: 0
+          })
+        ];
+      }
       #onResult(type, frame) {
         const updates = [];
         this.#iterations = Math.max(this.#iterations, asFiniteNumber(frame.num_turns) ?? 1);
@@ -46353,23 +46884,7 @@ var init_antigravity = __esm({
           updates.push(agentText(`antigravity-${this.#conversationId ?? "run"}-result`, resultText2));
           this.#resultShown = true;
         }
-        const stats = asRecord(frame.usage) ?? asRecord(frame.stats) ?? frame;
-        updates.push(
-          usageUpdate({
-            model: formatAntigravityModelName(this.#model()),
-            numTurns: Math.max(this.#iterations, 1),
-            durationMs: asFiniteNumber(stats.duration_ms) ?? 0,
-            inputTokens: firstNumber2(stats.input_tokens, stats.input),
-            outputTokens: firstNumber2(stats.output_tokens),
-            cacheReadTokens: firstNumber2(
-              stats.cache_read_tokens,
-              stats.cached_input_tokens,
-              stats.cached
-            ),
-            cacheCreationTokens: 0,
-            costUsd: 0
-          })
-        );
+        updates.push(...this.#resultUsage(frame));
         const status = asString(frame.status).toLowerCase();
         const succeeded = !status || SUCCESSFUL_STATUSES.has(status);
         if (succeeded) {
@@ -46612,8 +47127,8 @@ var import_promises29, import_path16, import_crypto20, COMMAND_CODE_GRAMMAR_NAME
 var init_command_code = __esm({
   "../agent-core/dist/providers/command-code.js"() {
     "use strict";
-    init_chunk_FYZKVT3E();
-    init_chunk_OUEMTEUX();
+    init_chunk_N2M5D7RS();
+    init_chunk_RBQC7XZH();
     init_chunk_ZCTKXKYY();
     init_chunk_6VWVDJ2A();
     init_chunk_DLVRNIY5();
@@ -46978,6 +47493,7 @@ var init_command_code = __esm({
       #streamed = false;
       #totals;
       #result;
+      #contextTokens;
       constructor(options) {
         this.#options = options;
         if (options.resumeId) this.#grammar.sessionId = options.resumeId;
@@ -47020,6 +47536,8 @@ var init_command_code = __esm({
       #onEvent(event) {
         switch (commandCodeString(event.type)) {
           case "model_request_end":
+            this.#noteContext(event.usage);
+            return this.#usage(event.usage);
           case "turn_end":
             return this.#usage(event.usage);
           case "run_end": {
@@ -47071,7 +47589,28 @@ var init_command_code = __esm({
           durationMs: durationMs ?? previous?.durationMs ?? 0
         };
         this.#totals = totals;
-        return [usageUpdate({ model: this.#model(), numTurns: 1, ...totals, costUsd: 0 })];
+        return [
+          usageUpdate({
+            model: this.#model(),
+            numTurns: 1,
+            ...totals,
+            // Command Code's own cost estimate takes cache out of inputTokens, which counts it.
+            inputTokens: Math.max(
+              totals.inputTokens - totals.cacheReadTokens - totals.cacheCreationTokens,
+              0
+            ),
+            ...this.#contextTokens === void 0 ? {} : { contextTokens: this.#contextTokens },
+            costUsd: 0
+          })
+        ];
+      }
+      /** One model call's prompt, cache included, plus its reply: what it left in the window. */
+      #noteContext(usage) {
+        const record2 = asRecord(usage);
+        const input2 = asFiniteNumber(record2?.inputTokens) ?? asFiniteNumber(record2?.input_tokens);
+        if (input2 === void 0 || input2 <= 0) return;
+        const output2 = asFiniteNumber(record2?.outputTokens) ?? asFiniteNumber(record2?.output_tokens);
+        this.#contextTokens = input2 + (output2 ?? 0);
       }
     };
     COMMAND_CODE_MAX_TURNS = 1e4;
@@ -47577,6 +48116,7 @@ function createHttpTransport() {
 init_runtime_v2();
 init_zod();
 var REQUEST_TIMEOUT_MS = 3e4;
+var MEDIA_PUT_TIMEOUT_MS = 3e5;
 var credentialRefusalSchema = external_exports.object({ message: external_exports.string().trim().min(1) });
 function credentialFailureMessage(response, fallback) {
   if (response.status !== 409) return fallback;
@@ -47645,6 +48185,33 @@ function createHolderApiClient({
         throw new RuntimeFault("io_failed", `MCP credential request failed: ${response.status}`);
       }
       return machineMcpCredentialSchema.parse(jsonBody(response));
+    },
+    uploadRunMedia: async (runId, media, data, signal) => {
+      const reserved = await request2("POST", runMediaPath(runId), signal, media);
+      if (!isOk(reserved)) {
+        throw new RuntimeFault("io_failed", `Media upload request failed: ${reserved.status}`);
+      }
+      const reservation = runMediaUploadResponseSchema.parse(jsonBody(reserved));
+      if (reservation.status === "ready") return;
+      const stored = await transport.send({
+        method: "PUT",
+        url: new URL(reservation.upload.url),
+        headers: {
+          ...reservation.upload.headers,
+          "content-length": String(data.byteLength)
+        },
+        body: data,
+        redirect: "error",
+        signal: AbortSignal.any([signal, AbortSignal.timeout(MEDIA_PUT_TIMEOUT_MS)])
+      });
+      if (!isOk(stored)) {
+        throw new RuntimeFault("io_failed", `Media upload failed: ${stored.status}`);
+      }
+      const completed = await request2("POST", runMediaCompletePath(runId, media.mediaId), signal);
+      if (!isOk(completed)) {
+        throw new RuntimeFault("io_failed", `Media upload completion failed: ${completed.status}`);
+      }
+      runMediaCompleteResponseSchema.parse(jsonBody(completed));
     }
   };
 }
@@ -48317,6 +48884,7 @@ function runtimePaths(stateDir) {
 
 // src/platform/process-memory.ts
 var import_node_child_process4 = require("child_process");
+var import_node_fs6 = require("fs");
 var import_promises12 = require("fs/promises");
 var import_node_os2 = require("os");
 var import_node_util3 = require("util");
@@ -48356,6 +48924,45 @@ async function readProcessRss(pid) {
     return null;
   }
 }
+function parseDarwinVmStat(output2) {
+  const pageSize = Number(/page size of (\d+) bytes/.exec(output2)?.[1]);
+  if (!Number.isFinite(pageSize) || pageSize <= 0) return null;
+  const pages = (name) => {
+    const match = new RegExp(`^Pages ${name}:\\s+(\\d+)\\.?$`, "m").exec(output2);
+    return match ? Number(match[1]) : null;
+  };
+  const free = pages("free");
+  if (free === null) return null;
+  return (free + (pages("inactive") ?? 0) + (pages("speculative") ?? 0)) * pageSize;
+}
+function parseLinuxMemInfo(output2) {
+  const kilobytes = /^MemAvailable:\s+(\d+)\s+kB$/m.exec(output2)?.[1];
+  return kilobytes === void 0 ? null : Number(kilobytes) * 1024;
+}
+var CAPACITY_PROBE_TTL_MS = 2e3;
+var AvailableMemoryProbe = class {
+  cached = null;
+  read(now) {
+    if (this.cached !== null && now - this.cached.at < CAPACITY_PROBE_TTL_MS) {
+      return this.cached.bytes;
+    }
+    let bytes = null;
+    try {
+      if (process.platform === "darwin") {
+        bytes = parseDarwinVmStat(
+          (0, import_node_child_process4.execFileSync)("vm_stat", { encoding: "utf8", timeout: PROBE_TIMEOUT_MS })
+        );
+      } else if (process.platform === "linux") {
+        bytes = parseLinuxMemInfo((0, import_node_fs6.readFileSync)("/proc/meminfo", "utf8"));
+      }
+    } catch {
+      bytes = null;
+    }
+    this.cached = { at: now, bytes };
+    return bytes;
+  }
+};
+var availableMemoryProbe = new AvailableMemoryProbe();
 async function processMemoryRows() {
   if (process.platform === "win32") {
     const { stdout: stdout2 } = await execFileAsync3(
@@ -48456,7 +49063,7 @@ var systemExec = (request2) => new Promise((resolve8) => {
 init_alan_code();
 
 // src/capabilities/providers/commands.ts
-var import_node_fs6 = require("fs");
+var import_node_fs7 = require("fs");
 var import_promises17 = require("fs/promises");
 var import_node_path9 = require("path");
 var PROVIDER_COMMANDS = [
@@ -48494,7 +49101,7 @@ function pathDelimiter(platform) {
 async function isRunnable(path, platform) {
   try {
     if (!(await (0, import_promises17.stat)(path)).isFile()) return false;
-    if (platform !== "win32") await (0, import_promises17.access)(path, import_node_fs6.constants.X_OK);
+    if (platform !== "win32") await (0, import_promises17.access)(path, import_node_fs7.constants.X_OK);
     return true;
   } catch {
     return false;
@@ -49144,7 +49751,7 @@ async function inspectIndexedSkill(directory, contentHash) {
 
 // src/capabilities/skills/native-index.ts
 var import_node_crypto10 = require("crypto");
-var import_node_fs7 = require("fs");
+var import_node_fs8 = require("fs");
 var import_promises21 = require("fs/promises");
 var import_node_path13 = require("path");
 var ALAN_SKILLS_PLUGIN_NAME = "alan";
@@ -49158,7 +49765,7 @@ var PLUGIN_MANIFEST = `${JSON.stringify(
 )}
 `;
 function installedSkillFolders(layout) {
-  return (0, import_node_fs7.existsSync)((0, import_node_path13.join)(layout.pluginDir, ".claude-plugin", "plugin.json")) ? { pluginDir: layout.pluginDir, skillsDir: layout.pluginSkillsDir } : null;
+  return (0, import_node_fs8.existsSync)((0, import_node_path13.join)(layout.pluginDir, ".claude-plugin", "plugin.json")) ? { pluginDir: layout.pluginDir, skillsDir: layout.pluginSkillsDir } : null;
 }
 
 // src/capabilities/workspace/index.ts
@@ -49725,6 +50332,13 @@ function attachmentPath(spec, attachment, index, runDir) {
   }
   return (0, import_node_path19.join)(runDir, `${index}-${safeFilename(attachment.filename)}`);
 }
+function runMediaUploader(source, runId) {
+  const upload = source.uploadMedia?.bind(source);
+  if (upload === void 0) return void 0;
+  return {
+    upload: ({ data, ...media }, signal) => upload(runId, { ...media, bytes: data.byteLength }, data, signal)
+  };
+}
 async function prepareRunInputs(spec, { source, tmpDir, signal, skills = [] }) {
   const dir = (0, import_node_path19.join)(tmpDir, "runs", spec.runId);
   const cleanup = async () => {
@@ -49751,9 +50365,11 @@ async function prepareRunInputs(spec, { source, tmpDir, signal, skills = [] }) {
         ...attachment.height === void 0 ? {} : { height: attachment.height }
       });
     }
+    const media = runMediaUploader(source, spec.runId);
     return {
       attachments,
       providerEnv: credential.env,
+      ...media === void 0 ? {} : { media },
       ...credential.codex === void 0 ? {} : { codex: credential.codex },
       skills,
       [Symbol.asyncDispose]: cleanup
@@ -49766,20 +50382,20 @@ async function prepareRunInputs(spec, { source, tmpDir, signal, skills = [] }) {
 
 // src/holder/serve.ts
 var import_node_crypto15 = require("crypto");
-var import_node_fs11 = require("fs");
+var import_node_fs12 = require("fs");
 var import_node_net2 = require("net");
 var import_node_path29 = require("path");
 init_runtime_v2();
 
 // src/holder/admission.ts
-var import_node_fs9 = require("fs");
+var import_node_fs10 = require("fs");
 var import_promises35 = require("fs/promises");
 var import_node_os6 = require("os");
 var import_node_path25 = require("path");
 init_constants();
 
 // ../shared/dist/node/local-workspace.js
-var import_node_fs8 = require("fs");
+var import_node_fs9 = require("fs");
 var import_node_os5 = require("os");
 var import_node_path20 = require("path");
 function resolveAlanDefaultWorkspacePath(homeDirectory = (0, import_node_os5.homedir)()) {
@@ -50199,7 +50815,7 @@ async function inspectReadiness(path) {
     if (!(await (0, import_promises35.stat)(path)).isDirectory()) {
       return { ready: false, missing: true, message: MESSAGES.missing };
     }
-    await (0, import_promises35.access)(path, import_node_fs9.constants.R_OK | import_node_fs9.constants.W_OK | import_node_fs9.constants.X_OK);
+    await (0, import_promises35.access)(path, import_node_fs10.constants.R_OK | import_node_fs10.constants.W_OK | import_node_fs10.constants.X_OK);
     return { ready: true };
   } catch (error62) {
     const code = errnoCode(error62) ?? "";
@@ -50244,7 +50860,7 @@ async function admitDefaultWorkspace(spec, context, skills) {
   const path = resolveAlanDefaultWorkspacePath(env.HOME || env.USERPROFILE || (0, import_node_os6.homedir)());
   try {
     await (0, import_promises35.mkdir)(path, { recursive: true, mode: 448 });
-    await (0, import_promises35.access)(path, import_node_fs9.constants.R_OK | import_node_fs9.constants.W_OK | import_node_fs9.constants.X_OK);
+    await (0, import_promises35.access)(path, import_node_fs10.constants.R_OK | import_node_fs10.constants.W_OK | import_node_fs10.constants.X_OK);
     return { kind: "admitted", spec: { ...spec, projectPath: path }, skills };
   } catch (error62) {
     const code = errnoCode(error62);
@@ -50583,13 +51199,13 @@ function runEnded(input2) {
 var decoder = new TextDecoder();
 
 // src/run-log/writer.ts
-var import_node_fs10 = require("fs");
+var import_node_fs11 = require("fs");
 var import_node_path28 = require("path");
 init_runtime_v2();
 function lastSeq(fd, size) {
   for (const length of tailWindows(size)) {
     const buffer = Buffer.alloc(length);
-    (0, import_node_fs10.readSync)(fd, buffer, 0, length, size - length);
+    (0, import_node_fs11.readSync)(fd, buffer, 0, length, size - length);
     const last = lastLine(buffer.toString("utf8").trimEnd(), length === size);
     if (last === void 0) continue;
     if (last.length === 0) return 0;
@@ -50600,13 +51216,13 @@ function lastSeq(fd, size) {
   throw new RuntimeFault("record_too_large", "Run log tail record is larger than any record");
 }
 function openRunLog(path, clock) {
-  (0, import_node_fs10.mkdirSync)((0, import_node_path28.dirname)(path), { recursive: true, mode: 448 });
-  const fd = (0, import_node_fs10.openSync)(path, "a+", 384);
-  let size = (0, import_node_fs10.fstatSync)(fd).size;
+  (0, import_node_fs11.mkdirSync)((0, import_node_path28.dirname)(path), { recursive: true, mode: 448 });
+  const fd = (0, import_node_fs11.openSync)(path, "a+", 384);
+  let size = (0, import_node_fs11.fstatSync)(fd).size;
   let seq = lastSeq(fd, size);
   let dirty = false;
   const sync = () => {
-    (0, import_node_fs10.fsyncSync)(fd);
+    (0, import_node_fs11.fsyncSync)(fd);
     dirty = false;
   };
   return {
@@ -50620,7 +51236,7 @@ function openRunLog(path, clock) {
       };
       const line = Buffer.from(`${JSON.stringify(record2)}
 `, "utf8");
-      (0, import_node_fs10.writeSync)(fd, line);
+      (0, import_node_fs11.writeSync)(fd, line);
       size += line.length;
       dirty = true;
       if (isRunLifecycleKind(update.sessionUpdate)) sync();
@@ -50632,7 +51248,7 @@ function openRunLog(path, clock) {
     },
     [Symbol.dispose]: () => {
       if (dirty) sync();
-      (0, import_node_fs10.closeSync)(fd);
+      (0, import_node_fs11.closeSync)(fd);
     }
   };
 }
@@ -51076,7 +51692,7 @@ async function runHolder({
     for (const client of holder.clients) client.end();
     await new Promise((resolve8) => server.close(() => resolve8()));
     await statusWrites;
-    (0, import_node_fs11.rmSync)(launch.statusPath, { force: true });
+    (0, import_node_fs12.rmSync)(launch.statusPath, { force: true });
     log.info("holder.suspended", { conversationId: launch.conversationId });
   } catch (_) {
     var _error = _, _hasError = true;
@@ -51087,6 +51703,7 @@ async function runHolder({
 
 // src/sessions/suspend-policy.ts
 var GIB = 1024 ** 3;
+var SESSION_MEMORY_CEILING_BYTES = 2.5 * GIB;
 var MEMORY_BUDGET_SHARE = 0.15;
 var MEMORY_BUDGET_MIN_BYTES = GIB;
 var MEMORY_BUDGET_MAX_BYTES = 4 * GIB;
@@ -51115,7 +51732,8 @@ var envSchema = external_exports.object({
   ALAN_RUNTIME_LOG_LEVEL: external_exports.enum(["debug", "info", "warn", "error"]).default("info"),
   ALAN_RUNTIME_SUSPEND_IDLE_MS: external_exports.coerce.number().int().positive().optional(),
   ALAN_RUNTIME_SUSPEND_CHECK_MS: external_exports.coerce.number().int().positive().default(3e4),
-  ALAN_RUNTIME_DESIRED_RESYNC_MS: external_exports.coerce.number().int().positive().default(6e5),
+  // A two-minute conditional GET bounds recovery after a lost poke; unchanged state returns 304.
+  ALAN_RUNTIME_DESIRED_RESYNC_MS: external_exports.coerce.number().int().positive().default(12e4),
   ALAN_MAX_ACTIVE_RUNS: external_exports.coerce.number().int().optional(),
   ALAN_RUNTIME_API_URL: external_exports.url().optional(),
   ALAN_RUNTIME_CREDENTIAL_STORE: external_exports.enum(CREDENTIAL_STORE_KINDS).optional(),
@@ -51362,7 +51980,8 @@ async function machineAccess(paths, log, conversationId, transport) {
     fetchProviderCredential: async (runId, signal) => {
       void managedMcp?.authorization(signal);
       return (await api()).fetchProviderCredential(runId, signal);
-    }
+    },
+    uploadMedia: async (runId, media, data, signal) => (await api()).uploadRunMedia(runId, media, data, signal)
   };
   const codexCredentials = {
     refresh: async (runId, rejectedAccessTokenSha256) => (await api()).refreshCodexCredential(