nolo-cli 0.62.0 → 0.63.0-alpha.2

package/{agentDeleteCommand-6GNQA4J4.js → agentDeleteCommand-6R6EXQOR.js}

@@ -15,7 +15,7 @@ import "./chunk-KQHGZWSV.js";
 import {
   Level
 } from "./chunk-UV6VISQJ.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{agentEmailCommands-HH67CYKD.js → agentEmailCommands-AKENZOKO.js}

@@ -8,8 +8,8 @@ import {
 } from "./chunk-JYYZCK2Z.js";
 import {
   runAgentCreateCommand
-} from "./chunk-NRRPKMM7.js";
-import "./chunk-Z5MHFBJZ.js";
+} from "./chunk-OOCYHKCV.js";
+import "./chunk-LJ6OKZ6D.js";
 import "./chunk-MXUDQZXQ.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-45YO6H7P.js";
@@ -68,7 +68,7 @@ import "./chunk-E3YVTQWT.js";
 import "./chunk-ZRSJ3JEH.js";
 import "./chunk-AETZ7AD6.js";
 import "./chunk-KHCLMKZZ.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{agentListCommands-23XW3OPZ.js → agentListCommands-XJU3JJQO.js}

@@ -38,7 +38,7 @@ import {
 } from "./chunk-3BLB7QKO.js";
 import "./chunk-KQHGZWSV.js";
 import "./chunk-YYLHWIW6.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{agentMachineCommands-HXHASEWO.js → agentMachineCommands-V7IJDPAY.js}

@@ -15,7 +15,7 @@ import {
 } from "./chunk-SPAQ4PVV.js";
 import "./chunk-NF64D32W.js";
 import "./chunk-3L2WKC3W.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";
@@ -89,7 +89,7 @@ async function defaultExecuteCli(provider, prompt, options) {
   return executeCli(provider, prompt, options);
 }
 async function forwardConnectorRunMessage(machine, message, pushMessage, executeCli, env, fetchImpl) {
-  const { handleConnectorRunMessage } = await import("./machineWsRunDispatch-O6RM2ECT.js");
+  const { handleConnectorRunMessage } = await import("./machineWsRunDispatch-EAH5VIEL.js");
   return handleConnectorRunMessage(message, pushMessage, executeCli, env, fetchImpl);
 }
 async function detectLaunchableMachineInfo() {

package/{agentRecordCommands-UHTQJVGC.js → agentRecordCommands-VIEINDIV.js}

@@ -2,8 +2,8 @@ import {
   runAgentCreateCommand,
   runAgentReadCommand,
   runAgentUpdateCommand
-} from "./chunk-NRRPKMM7.js";
-import "./chunk-Z5MHFBJZ.js";
+} from "./chunk-OOCYHKCV.js";
+import "./chunk-LJ6OKZ6D.js";
 import "./chunk-MXUDQZXQ.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-45YO6H7P.js";
@@ -55,7 +55,7 @@ import "./chunk-E3YVTQWT.js";
 import "./chunk-ZRSJ3JEH.js";
 import "./chunk-AETZ7AD6.js";
 import "./chunk-KHCLMKZZ.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{agentRunCommand-OAMT77EX.js → agentRunCommand-GT5ZTYRM.js}

@@ -8,12 +8,12 @@ import {
   resolveRunSettlementNote,
   resolveWorkflowReference,
   runAgentRunCommand
-} from "./chunk-VHO3TMQZ.js";
+} from "./chunk-BWIPK2PD.js";
 import "./chunk-S7Z2HMCN.js";
 import {
   parseAgentRunArgs
 } from "./chunk-JYYZCK2Z.js";
-import "./chunk-Z5MHFBJZ.js";
+import "./chunk-LJ6OKZ6D.js";
 import "./chunk-MXUDQZXQ.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-45YO6H7P.js";
@@ -70,7 +70,7 @@ import "./chunk-E3YVTQWT.js";
 import "./chunk-ZRSJ3JEH.js";
 import "./chunk-AETZ7AD6.js";
 import "./chunk-KHCLMKZZ.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{agentRuntimeLocal-QBK4H3T2.js → agentRuntimeLocal-HGJ4D3JF.js}

@@ -19,7 +19,7 @@ import {
   resolveOpenAiCompatibleProviderConfig,
   runLocalAgentTurn,
   shouldCacheHybridRemoteRecord
-} from "./chunk-KSCXMC6U.js";
+} from "./chunk-3ROJR3TG.js";
 import {
   buildPlatformChatCompletionRequest,
   canUsePlatformChatProvider,

package/{appDeleteCommands-AX2O6VDV.js → appDeleteCommands-VG2UVW4T.js}

@@ -13,7 +13,7 @@ import "./chunk-FHAGENAS.js";
 import "./chunk-CTCW7U7N.js";
 import "./chunk-SPAQ4PVV.js";
 import "./chunk-VF4K2QE6.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{appDeployCommands-L5ZR26CB.js → appDeployCommands-PABMVMN2.js}

@@ -14,7 +14,7 @@ import "./chunk-FHAGENAS.js";
 import "./chunk-CTCW7U7N.js";
 import "./chunk-SPAQ4PVV.js";
 import "./chunk-VF4K2QE6.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{appDeployStatusCommands-5HQHELRA.js → appDeployStatusCommands-X7WEU4TU.js}

@@ -13,7 +13,7 @@ import "./chunk-FHAGENAS.js";
 import "./chunk-CTCW7U7N.js";
 import "./chunk-SPAQ4PVV.js";
 import "./chunk-VF4K2QE6.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{appGetCommands-HVSYOS57.js → appGetCommands-NQYXHVJL.js}

@@ -14,7 +14,7 @@ import "./chunk-FHAGENAS.js";
 import "./chunk-CTCW7U7N.js";
 import "./chunk-SPAQ4PVV.js";
 import "./chunk-VF4K2QE6.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{appListCommands-XV2FPTWX.js → appListCommands-5NGZQ6IK.js}

@@ -14,7 +14,7 @@ import "./chunk-FHAGENAS.js";
 import "./chunk-CTCW7U7N.js";
 import "./chunk-SPAQ4PVV.js";
 import "./chunk-VF4K2QE6.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{chunk-KSCXMC6U.js → chunk-3ROJR3TG.js}

@@ -12491,7 +12491,8 @@ async function maybeAutoCompactLocalHistory(args2) {
     // 防死亡螺旋：用 summary 长度作为上次压缩后的基线。如果新内容没让
     // totalUsed 比 summary 本身增长超过 minNewTokens，不重复触发。
     lastCompactedTokenCount: existingSummary ? estimateTokenCount(existingSummary) : void 0,
-    ...coldResume ? { force: true, reason: "context_budget" } : {}
+    ...coldResume ? { force: true, reason: "context_budget" } : {},
+    ...args2.realContextUsagePercent !== void 0 ? { realContextUsagePercent: args2.realContextUsagePercent } : {}
   });
   const projectExisting = () => {
     if (!existingSummary.trim() && !storedStubbedBeforeId) return unchanged();
@@ -13603,6 +13604,24 @@ async function runLocalAgentTurn(input) {
       }
       return resolvedProvider;
     };
+    let realContextUsagePercent;
+    if (input.continueDialogId && typeof input.adapter.loadLastContextUsage === "function") {
+      try {
+        const usage = await input.adapter.loadLastContextUsage(
+          input.continueDialogId
+        );
+        const inputTokens = usage?.inputTokens;
+        const contextWindow = getModelContextWindow(agentConfig.model);
+        if (typeof inputTokens === "number" && Number.isFinite(inputTokens) && inputTokens > 0 && typeof contextWindow === "number" && Number.isFinite(contextWindow) && contextWindow > 0) {
+          realContextUsagePercent = Math.min(
+            1,
+            Math.max(0, inputTokens / contextWindow)
+          );
+        }
+      } catch (err) {
+        console.warn("[localLoop] loadLastContextUsage failed:", err);
+      }
+    }
     let compactionUsage;
     try {
       const compacted = await maybeAutoCompactLocalHistory({
@@ -13610,7 +13629,8 @@ async function runLocalAgentTurn(input) {
         dialogId: input.continueDialogId,
         history,
         model: agentConfig.model,
-        resolveProvider: resolveProviderOnce
+        resolveProvider: resolveProviderOnce,
+        realContextUsagePercent
       });
       history = compacted.history;
       compactionUsage = compacted.usage;
@@ -16314,8 +16334,16 @@ var ProcessRegistry = class {
     if (item.transient) return false;
     if (item.status === "running") {
       try {
-        process.kill(-item.pgid, signal);
+        if (process.platform === "win32") {
+          process.kill(item.pid, signal);
+        } else {
+          process.kill(-item.pgid, signal);
+        }
       } catch {
+        try {
+          process.kill(item.pid, signal);
+        } catch {
+        }
       }
       item.status = "stopped";
       this.eventLog.append({ taskId: item.taskId, pid, type: "killed" });
@@ -16335,8 +16363,16 @@ var ProcessRegistry = class {
       if (opts?.backgroundOnly && item.transient) continue;
       if (item.status === "running" && (opts?.includePersist || !item.persist)) {
         try {
-          process.kill(-item.pgid, signal);
+          if (process.platform === "win32") {
+            process.kill(item.pid, signal);
+          } else {
+            process.kill(-item.pgid, signal);
+          }
         } catch {
+          try {
+            process.kill(item.pid, signal);
+          } catch {
+          }
         }
         item.status = "stopped";
         this.eventLog.append({ taskId: item.taskId, pid: item.pid, type: "killed" });

package/{chunk-VHO3TMQZ.js → chunk-BWIPK2PD.js}

@@ -27,7 +27,7 @@ import {
   resolveLocalUserId,
   t,
   toolLabel
-} from "./chunk-Z5MHFBJZ.js";
+} from "./chunk-LJ6OKZ6D.js";
 import {
   createRunActivityTracker,
   popSingleQueueMessage,
@@ -112,7 +112,7 @@ import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
   readActionGate
-} from "./chunk-KSCXMC6U.js";
+} from "./chunk-3ROJR3TG.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-XOKOSO35.js";
@@ -5176,7 +5176,7 @@ function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
 // packages/cli/client/agentRun.ts
 import { ulid } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-QBK4H3T2.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-HGJ4D3JF.js");
   return runLocalAgentTurn;
 }
 var stripDebugNoise = (s) => s.replace(/\s*raw="[\s\S]*"/g, "").replace(/\s*raw=\S+/g, "").replace(/\s*headers=\[[^\]]*\]/g, "").replace(/\s*headers=\S+/g, "").trim();
@@ -5239,6 +5239,19 @@ function parseEmbeddedBalanceDetails(message) {
     return void 0;
   }
 }
+function parseContextLengthDetails(message) {
+  let max;
+  let requested;
+  const maxMatch = message.match(/maximum context length\s+(?:is|of)\s*(\d+)/i);
+  if (maxMatch) {
+    max = maxMatch[1];
+  }
+  const reqMatch = message.match(/(?:requested|resulted in|request of)\s*(\d+)/i);
+  if (reqMatch) {
+    requested = reqMatch[1];
+  }
+  return { requested, max };
+}
 async function resolveCurrentMachineId(options) {
   return options.currentMachineIdResolver ? options.currentMachineIdResolver(options.env) : detectCurrentMachineId(options.env);
 }
@@ -5522,6 +5535,12 @@ function describeLocalRunFailure(message, rawError) {
       balanceDetails.current
     ) : extractEmbeddedErrorMessage(cleanedMessage) ?? fallback;
     return `[nolo] ${shownMessage}
+`;
+  }
+  if (/maximum context length/i.test(message)) {
+    const details = parseContextLengthDetails(message);
+    const shownMessage = details.requested && details.max ? t("contextLengthExceeded", details.requested, details.max) : details.max ? t("contextLengthExceededLimitOnly", details.max) : t("contextLengthExceededGeneric");
+    return `[nolo] ${shownMessage}
 `;
   }
   if (isCliAuthorityBrokerTimeoutError(rawError) || /CLI authority broker .* timed out/i.test(message)) {

package/{chunk-Z5MHFBJZ.js → chunk-LJ6OKZ6D.js}

@@ -92,6 +92,7 @@ import {
 import {
   applyBuiltinAgentRuntimeOverride,
   applyTokenUsageToDayStats,
+  normalizeUsage,
   prepareTokenUsageData,
   resolveBuiltinPlatformAgentConfig,
   runKeyed
@@ -153,7 +154,7 @@ import {
   resolveOpenAiCompatibleProviderConfig,
   shouldUseGeminiNativeToolRoute,
   summarizeToolArguments
-} from "./chunk-KSCXMC6U.js";
+} from "./chunk-3ROJR3TG.js";
 import {
   PlatformStreamInterruptedError,
   buildPlatformChatCompletionRequest,
@@ -995,6 +996,38 @@ var STRINGS = {
     en: "Current dialog: new (nothing to compact yet)",
     zh: "\u5F53\u524D\u5BF9\u8BDD\u8FD8\u662F\u65B0\u7684\uFF08\u8FD8\u6CA1\u6709\u53EF\u538B\u7F29\u7684\u5185\u5BB9\uFF09"
   },
+  compactingDialog: {
+    en: "Compacting current dialog...",
+    zh: "\u6B63\u5728\u538B\u7F29\u5F53\u524D\u5BF9\u8BDD\u2026"
+  },
+  compactPhaseReading: {
+    en: "Reading dialog messages\u2026",
+    zh: "\u6B63\u5728\u8BFB\u53D6\u5BF9\u8BDD\u6D88\u606F\u2026"
+  },
+  compactPhaseSummarizing: {
+    en: "Generating summary\u2026",
+    zh: "\u6B63\u5728\u751F\u6210\u603B\u7ED3\u2026"
+  },
+  compactPhaseForking: {
+    en: "Forking dialog\u2026",
+    zh: "\u6B63\u5728\u5206\u53C9\u65B0\u5BF9\u8BDD\u2026"
+  },
+  compactFailed: {
+    en: "Compact failed: {0}",
+    zh: "\u538B\u7F29\u5931\u8D25\uFF1A{0}"
+  },
+  contextLengthExceeded: {
+    en: "Model context limit reached (requested {0} tokens / limit {1}). Suggest using /compact to compact current dialog, or /new to start a fresh dialog.",
+    zh: "\u5DF2\u8FBE\u6A21\u578B\u4E0A\u4E0B\u6587\u4E0A\u9650\uFF08\u8BF7\u6C42 {0} tokens / \u4E0A\u9650 {1}\uFF09\u3002\u5EFA\u8BAE\u4F7F\u7528 /compact \u538B\u7F29\u5F53\u524D\u5BF9\u8BDD\uFF0C\u6216\u4F7F\u7528 /new \u5F00\u59CB\u65B0\u5BF9\u8BDD\u3002"
+  },
+  contextLengthExceededLimitOnly: {
+    en: "Model context limit reached (limit {0}). Suggest using /compact to compact current dialog, or /new to start a fresh dialog.",
+    zh: "\u5DF2\u8FBE\u6A21\u578B\u4E0A\u4E0B\u6587\u4E0A\u9650\uFF08\u4E0A\u9650 {0}\uFF09\u3002\u5EFA\u8BAE\u4F7F\u7528 /compact \u538B\u7F29\u5F53\u524D\u5BF9\u8BDD\uFF0C\u6216\u4F7F\u7528 /new \u5F00\u59CB\u65B0\u5BF9\u8BDD\u3002"
+  },
+  contextLengthExceededGeneric: {
+    en: "Model context limit reached. Suggest using /compact to compact current dialog, or /new to start a fresh dialog.",
+    zh: "\u5DF2\u8FBE\u6A21\u578B\u4E0A\u4E0B\u6587\u4E0A\u9650\u3002\u5EFA\u8BAE\u4F7F\u7528 /compact \u538B\u7F29\u5F53\u524D\u5BF9\u8BDD\uFF0C\u6216\u4F7F\u7528 /new \u5F00\u59CB\u65B0\u5BF9\u8BDD\u3002"
+  },
   compactDone: {
     en: "Compacted dialog {0} \u2192 {1}.",
     zh: "\u5DF2\u538B\u7F29\u5BF9\u8BDD {0} \u2192 {1}\u3002"
@@ -9578,7 +9611,7 @@ async function resolveLocalProvider(ctx) {
 }
 
 // packages/cli/client/localRuntimeAdapter.ts
-import { dirname as dirname2, extname, join as join3 } from "node:path";
+import { dirname as dirname2, extname, join as join4 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // packages/cli/client/providerStreamRetry.ts
@@ -10589,12 +10622,12 @@ var nodeFs = {
   readFileSync,
   existsSync
 };
-function resolveNoloHome(env, homedir2) {
+function resolveNoloHome(env, homedir3) {
   const custom = env?.NOLO_HOME;
   if (custom && custom.trim()) return custom.trim();
   const ambient = process.env.NOLO_HOME?.trim();
   if (ambient) return ambient;
-  return join(homedir2(), ".nolo");
+  return join(homedir3(), ".nolo");
 }
 function ensureDir(dir, fs) {
   fs.mkdirSync(dir, { recursive: true });
@@ -10613,9 +10646,9 @@ function writeJson(path, data, fs) {
 }
 function createFileSystemTodoStore(opts = {}) {
   const env = opts.env ?? process.env;
-  const homedir2 = opts.homedir ?? nodeHomedir;
+  const homedir3 = opts.homedir ?? nodeHomedir;
   const fs = opts.fs ?? nodeFs;
-  const noloHome = resolveNoloHome(env, homedir2);
+  const noloHome = resolveNoloHome(env, homedir3);
   const filePath = opts.filePath ?? join(noloHome, "agent_run_todos.json");
   const oldFilePath = join(noloHome, "todos.json");
   const loadMap = () => {
@@ -12008,6 +12041,25 @@ async function writeLocalTokenRecord(args) {
   }
   return ops;
 }
+function extractLastProviderInputTokens(input) {
+  if (input.usageRecords && input.usageRecords.length > 0) {
+    for (let i = input.usageRecords.length - 1; i >= 0; i--) {
+      const record = input.usageRecords[i];
+      if (!record?.usage) continue;
+      const normalized = normalizeUsage(record.usage);
+      if (normalized.input_tokens > 0) {
+        return normalized.input_tokens;
+      }
+    }
+  }
+  if (input.result?.usage) {
+    const normalized = normalizeUsage(input.result.usage);
+    if (normalized.input_tokens > 0) {
+      return normalized.input_tokens;
+    }
+  }
+  return void 0;
+}
 async function writeDialog(args) {
   const __perfEnabled = args.env?.NOLO_CLI_PERF === "1";
   const __perfT0 = __perfEnabled ? performance.now() : 0;
@@ -12057,6 +12109,15 @@ async function writeDialog(args) {
     existingDialog,
     cwd: args.cwd
   });
+  const lastInputTokens = extractLastProviderInputTokens(args.input) ?? (typeof existingDialog?.lastInputTokens === "number" && Number.isFinite(existingDialog.lastInputTokens) && existingDialog.lastInputTokens > 0 ? existingDialog.lastInputTokens : void 0);
+  if (typeof lastInputTokens === "number" && lastInputTokens > 0) {
+    const dialogOp = plan.ops.find(
+      (op) => op.type === "put" && op.key === `dialog-${args.userId}-${plan.dialogId}`
+    );
+    if (dialogOp && dialogOp.value && typeof dialogOp.value === "object") {
+      dialogOp.value.lastInputTokens = lastInputTokens;
+    }
+  }
   await args.store.batch(plan.ops);
   if (__perfEnabled) {
     const ms = (performance.now() - __perfT0).toFixed(1);
@@ -12202,6 +12263,16 @@ async function saveCliDialogSummary(args) {
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
   });
 }
+async function loadCliDialogLastContextUsage(args) {
+  const dialogKey = resolveCliDialogRecordKey(args.userId, args.dialogId);
+  const record = await args.store.read(dialogKey);
+  if (!record || typeof record !== "object") return null;
+  const lastInputTokens = record.lastInputTokens;
+  if (typeof lastInputTokens === "number" && Number.isFinite(lastInputTokens) && lastInputTokens > 0) {
+    return { inputTokens: lastInputTokens };
+  }
+  return null;
+}
 function parseTitleUpdatedAtMs(existingDialog) {
   const raw = existingDialog?.titleUpdatedAt;
   if (typeof raw === "number" && !Number.isNaN(raw)) return raw;
@@ -12212,12 +12283,119 @@ function parseTitleUpdatedAtMs(existingDialog) {
   return 0;
 }
 
+// packages/cli/client/turnBillingAudit.ts
+import {
+  appendFileSync as appendFileSync2,
+  closeSync,
+  mkdirSync as mkdirSync3,
+  openSync,
+  readSync,
+  statSync
+} from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import { join as join3 } from "node:path";
+function projectUsageForAudit(usage) {
+  if (!usage || typeof usage !== "object") return null;
+  const normalized = normalizeUsage(usage);
+  const projected = {
+    input_tokens: normalized.input_tokens,
+    output_tokens: normalized.output_tokens,
+    cache_read_input_tokens: normalized.cache_read_input_tokens,
+    cache_creation_input_tokens: normalized.cache_creation_input_tokens
+  };
+  if (typeof usage.cost === "number" && Number.isFinite(usage.cost)) {
+    projected.cost = usage.cost;
+  }
+  if (typeof usage.billing_unit === "string" && usage.billing_unit.trim()) {
+    projected.billing_unit = usage.billing_unit;
+  }
+  if (typeof usage.provider_call_id === "string" && usage.provider_call_id.trim()) {
+    projected.provider_call_id = usage.provider_call_id.trim();
+  }
+  return projected;
+}
+function resolveTurnBillingAuditLogPath(env = process.env) {
+  const noloHome = env.NOLO_HOME?.trim() || join3(homedir2(), ".nolo");
+  return join3(noloHome, "logs", "turn-billing.jsonl");
+}
+function appendTurnBillingAudit(input) {
+  try {
+    if (process.env.NOLO_TURN_BILLING_AUDIT === "0") return;
+    const calls = (input.usageRecords ?? []).map((record) => {
+      const usage = projectUsageForAudit(record?.usage);
+      if (!usage) return null;
+      return {
+        ...record?.callId ? { callId: record.callId } : {},
+        ...record?.model ? { model: record.model } : {},
+        ...record?.provider ? { provider: record.provider } : {},
+        ...usage
+      };
+    }).filter((call) => call !== null);
+    if (calls.length === 0 && (input.turnCredits === void 0 || input.turnCredits === null)) {
+      return;
+    }
+    const row = {
+      ts: Date.now(),
+      ...input.dialogId ? { dialogId: input.dialogId } : {},
+      ...input.agentKey ? { agentKey: input.agentKey } : {},
+      ...input.turnCredits !== void 0 && input.turnCredits !== null ? { turnCredits: input.turnCredits } : {},
+      ...input.aborted ? { aborted: true } : {},
+      calls
+    };
+    const logPath = resolveTurnBillingAuditLogPath();
+    mkdirSync3(join3(logPath, ".."), { recursive: true });
+    appendFileSync2(logPath, `${JSON.stringify(row)}
+`);
+  } catch {
+  }
+}
+function readLastTurnBillingInputTokens(dialogId, env = process.env) {
+  if (!dialogId || typeof dialogId !== "string") return void 0;
+  try {
+    const logPath = resolveTurnBillingAuditLogPath(env);
+    const stat = statSync(logPath, { throwIfNoEntry: false });
+    if (!stat || !stat.isFile() || stat.size === 0) return void 0;
+    const maxBytesToRead = 64 * 1024;
+    const bytesToRead = Math.min(stat.size, maxBytesToRead);
+    const buffer = Buffer.alloc(bytesToRead);
+    const fd = openSync(logPath, "r");
+    try {
+      readSync(fd, buffer, 0, bytesToRead, stat.size - bytesToRead);
+    } finally {
+      closeSync(fd);
+    }
+    const text = buffer.toString("utf-8");
+    const lines = text.split("\n");
+    for (let i = lines.length - 1; i >= 0; i--) {
+      const line = lines[i].trim();
+      if (!line) continue;
+      try {
+        const parsed = JSON.parse(line);
+        if (parsed && typeof parsed === "object" && parsed.dialogId === dialogId) {
+          if (Array.isArray(parsed.calls) && parsed.calls.length > 0) {
+            for (let j = parsed.calls.length - 1; j >= 0; j--) {
+              const call = parsed.calls[j];
+              if (call && typeof call.input_tokens === "number" && Number.isFinite(call.input_tokens) && call.input_tokens > 0) {
+                return call.input_tokens;
+              }
+            }
+          }
+        }
+      } catch {
+      }
+    }
+    return void 0;
+  } catch {
+    return void 0;
+  }
+}
+
 // packages/cli/client/localRuntimeAdapter.ts
 var currentMetaFile = fileURLToPath(import.meta.url);
 var isJsBundle = extname(currentMetaFile) === ".js";
 var SOURCE_CLI_DIR = isJsBundle ? dirname2(currentMetaFile) : dirname2(dirname2(currentMetaFile));
 var CLI_DIR = isCompiledBinary() ? dirname2(process.execPath) : SOURCE_CLI_DIR;
-var CLI_ENTRYPOINT = isCompiledBinary() ? process.execPath : isJsBundle ? currentMetaFile : join3(SOURCE_CLI_DIR, "index.ts");
+var CLI_ENTRYPOINT = isCompiledBinary() ? process.execPath : isJsBundle ? currentMetaFile : join4(SOURCE_CLI_DIR, "index.ts");
 async function recordLocalAvailabilityForAgent(args) {
   const now = args.now ?? Date.now;
   const { deps, status } = args;
@@ -12415,6 +12593,21 @@ function createCliLocalRuntimeAdapter(deps) {
       sourceCount: input.sourceCount,
       schemaVersion: input.schemaVersion
     }),
+    loadLastContextUsage: async (dialogId) => {
+      const fromDialog = await loadCliDialogLastContextUsage({
+        store: await getOrCreateSharedStore(deps),
+        userId,
+        dialogId
+      });
+      if (fromDialog?.inputTokens) {
+        return fromDialog;
+      }
+      const fromAudit = readLastTurnBillingInputTokens(dialogId, deps.env);
+      if (typeof fromAudit === "number" && fromAudit > 0) {
+        return { inputTokens: fromAudit };
+      }
+      return null;
+    },
     saveTurn: async (input) => writeDialog({
       store: await getOrCreateSharedStore(deps),
       input,
@@ -12632,5 +12825,6 @@ export {
   t,
   toolLabel,
   agentRunCardLabels,
+  appendTurnBillingAudit,
   createCliLocalRuntimeAdapter
 };

package/{chunk-NRRPKMM7.js → chunk-OOCYHKCV.js}

@@ -1,6 +1,6 @@
 import {
   clearCliLocalRuntimePreparedAgentCache
-} from "./chunk-Z5MHFBJZ.js";
+} from "./chunk-LJ6OKZ6D.js";
 import {
   getReadableCliDb
 } from "./chunk-RXX4GDIH.js";

package/{chunk-SKIRVYEI.js → chunk-URHZKKK7.js}

@@ -1,13 +1,13 @@
 import {
   createCliLocalRuntimeAdapter,
   summarizeEndpoint
-} from "./chunk-Z5MHFBJZ.js";
+} from "./chunk-LJ6OKZ6D.js";
 import {
   clipMultilineText
 } from "./chunk-CQ2OZMLQ.js";
 import {
   runLocalAgentTurn
-} from "./chunk-KSCXMC6U.js";
+} from "./chunk-3ROJR3TG.js";
 import {
   applyToolSurfaceConstraints
 } from "./chunk-RJ2SAFB5.js";

package/{dialogCommands-WAFKC3KK.js → dialogCommands-HGMV4NQJ.js}

@@ -23,7 +23,7 @@ import "./chunk-KQHGZWSV.js";
 import "./chunk-HQUORJTM.js";
 import "./chunk-URMS4XY2.js";
 import "./chunk-GLKOYSRU.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{docCreateCommands-GHGB42S7.js → docCreateCommands-WQT5EZG2.js}

@@ -28,7 +28,7 @@ import "./chunk-SPAQ4PVV.js";
 import "./chunk-VF4K2QE6.js";
 import "./chunk-AETZ7AD6.js";
 import "./chunk-KHCLMKZZ.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{docDeleteCommands-Y5I7ZEX4.js → docDeleteCommands-GUMELBKM.js}

@@ -21,7 +21,7 @@ import "./chunk-KQHGZWSV.js";
 import "./chunk-VF4K2QE6.js";
 import "./chunk-AETZ7AD6.js";
 import "./chunk-KHCLMKZZ.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{docReadCommands-BMXM6J7T.js → docReadCommands-T6FDDKJ3.js}

@@ -16,7 +16,7 @@ import "./chunk-SPAQ4PVV.js";
 import "./chunk-VF4K2QE6.js";
 import "./chunk-AETZ7AD6.js";
 import "./chunk-KHCLMKZZ.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{docUpdateCommands-QNABH3M2.js → docUpdateCommands-GBWGXG2G.js}

@@ -30,7 +30,7 @@ import {
   resolvePageSkillMetadata
 } from "./chunk-AETZ7AD6.js";
 import "./chunk-KHCLMKZZ.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/index.js

@@ -127,7 +127,7 @@ function createDaemonShortcutCommand(path, description, command2) {
 // packages/cli/agentInternalCommandEntries.ts
 function getAgentInternalCommandEntries() {
   const createAgentRunCommand = (path, description) => createContextCommand(path, description, async (args2, ctx) => {
-    const { runAgentRunCommand } = await import("./agentRunCommand-OAMT77EX.js");
+    const { runAgentRunCommand } = await import("./agentRunCommand-GT5ZTYRM.js");
     return runAgentRunCommand(args2, {
       env: ctx.env,
       scriptDir: ctx.scriptDir,
@@ -139,11 +139,11 @@ function getAgentInternalCommandEntries() {
     createAgentRunCommand(["run"], "Run a no-login local agent in this workspace"),
     createAgentRunCommand(["chat"], "Chat with an agent"),
     createEnvCommand(["agent", "list"], "List owned agents", async (args2, deps) => {
-      const { runAgentListCommand } = await import("./agentListCommands-23XW3OPZ.js");
+      const { runAgentListCommand } = await import("./agentListCommands-XJU3JJQO.js");
       return runAgentListCommand(args2, deps);
     }),
     createEnvCommand(["agent", "create"], "Create a new agent", async (args2, deps) => {
-      const { runAgentCreateCommand } = await import("./agentRecordCommands-UHTQJVGC.js");
+      const { runAgentCreateCommand } = await import("./agentRecordCommands-VIEINDIV.js");
       return runAgentCreateCommand(args2, deps);
     }),
     createEnvCommand(["agent", "models"], "List models available on an OpenAI-compatible provider", async (args2, deps) => {
@@ -155,7 +155,7 @@ function getAgentInternalCommandEntries() {
       return runAgentPullCommand(args2, deps);
     }),
     createEnvCommand(["agent", "read"], "Read a single agent", async (args2, deps) => {
-      const { runAgentReadCommand } = await import("./agentRecordCommands-UHTQJVGC.js");
+      const { runAgentReadCommand } = await import("./agentRecordCommands-VIEINDIV.js");
       return runAgentReadCommand(args2, deps);
     }),
     createAgentRunCommand(["agent", "run"], "Run an agent"),
@@ -184,31 +184,31 @@ function getAgentInternalCommandEntries() {
       return runSetupOfflineMarxistsAgentCommand(args2, deps);
     }),
     createEnvCommand(["agent", "update"], "Update agent fields", async (args2, deps) => {
-      const { runAgentUpdateCommand } = await import("./agentRecordCommands-UHTQJVGC.js");
+      const { runAgentUpdateCommand } = await import("./agentRecordCommands-VIEINDIV.js");
       return runAgentUpdateCommand(args2, deps);
     }),
     createEnvCommand(["agent", "email", "provision"], "Provision a controlled inbox for an agent", async (args2, deps) => {
-      const { runAgentEmailProvisionCommand } = await import("./agentEmailCommands-HH67CYKD.js");
+      const { runAgentEmailProvisionCommand } = await import("./agentEmailCommands-AKENZOKO.js");
       return runAgentEmailProvisionCommand(args2, deps);
     }),
     createEnvCommand(["agent", "email", "bind"], "Bind an existing email address to an agent", async (args2, deps) => {
-      const { runAgentEmailBindCommand } = await import("./agentEmailCommands-HH67CYKD.js");
+      const { runAgentEmailBindCommand } = await import("./agentEmailCommands-AKENZOKO.js");
       return runAgentEmailBindCommand(args2, deps);
     }),
     createEnvCommand(["agent", "email", "transfer"], "Transfer an email identity from one agent to another (cross-account)", async (args2, deps) => {
-      const { runAgentEmailTransferCommand } = await import("./agentEmailCommands-HH67CYKD.js");
+      const { runAgentEmailTransferCommand } = await import("./agentEmailCommands-AKENZOKO.js");
       return runAgentEmailTransferCommand(args2, deps);
     }),
     createEnvCommand(
       ["agent", "email", "create-and-provision"],
       "Create an agent and provision its controlled inbox",
       async (args2, deps) => {
-        const { runAgentEmailCreateAndProvisionCommand } = await import("./agentEmailCommands-HH67CYKD.js");
+        const { runAgentEmailCreateAndProvisionCommand } = await import("./agentEmailCommands-AKENZOKO.js");
         return runAgentEmailCreateAndProvisionCommand(args2, deps);
       }
     ),
     createEnvCommand(["agent", "delete"], "Hard-delete an agent's private and public records", async (args2, deps) => {
-      const { runAgentDeleteCommand } = await import("./agentDeleteCommand-6GNQA4J4.js");
+      const { runAgentDeleteCommand } = await import("./agentDeleteCommand-6R6EXQOR.js");
       return runAgentDeleteCommand(args2, deps);
     }),
     createEnvCommand(["agent", "grant"], "Grant another user access to this agent's owner credentials", async (args2, deps) => {
@@ -224,15 +224,15 @@ function getAgentInternalCommandEntries() {
       return runAgentRevokeGrantCommand(args2, deps);
     }),
     createEnvCommand(["agent", "bind-current"], "Bind an agent to this machine", async (args2, deps) => {
-      const { runAgentBindCurrentCommand } = await import("./agentMachineCommands-HXHASEWO.js");
+      const { runAgentBindCurrentCommand } = await import("./agentMachineCommands-V7IJDPAY.js");
       return runAgentBindCurrentCommand(args2, deps);
     }),
     createEnvCommand(["agent", "smoke-current"], "Smoke test a bound agent through this machine", async (args2, deps) => {
-      const { runAgentSmokeCurrentCommand } = await import("./agentMachineCommands-HXHASEWO.js");
+      const { runAgentSmokeCurrentCommand } = await import("./agentMachineCommands-V7IJDPAY.js");
       return runAgentSmokeCurrentCommand(args2, deps);
     }),
     createEnvCommand(["agent", "runtime-doctor"], "Diagnose current machine runtime compatibility", async (args2, deps) => {
-      const { runAgentRuntimeDoctorCommand } = await import("./agentMachineCommands-HXHASEWO.js");
+      const { runAgentRuntimeDoctorCommand } = await import("./agentMachineCommands-V7IJDPAY.js");
       return runAgentRuntimeDoctorCommand(args2, deps);
     }),
     createAgentRunCommand(["agent", "chat"], "Chat with an agent")
@@ -243,23 +243,23 @@ function getAgentInternalCommandEntries() {
 function getAppInternalCommandEntries() {
   return [
     createEnvCommand(["app", "list"], "List your apps", async (args2, deps) => {
-      const { runAppListCommand } = await import("./appListCommands-XV2FPTWX.js");
+      const { runAppListCommand } = await import("./appListCommands-5NGZQ6IK.js");
       return runAppListCommand(args2, deps);
     }),
     createEnvCommand(["app", "get"], "Get app details", async (args2, deps) => {
-      const { runAppGetCommand } = await import("./appGetCommands-HVSYOS57.js");
+      const { runAppGetCommand } = await import("./appGetCommands-NQYXHVJL.js");
       return runAppGetCommand(args2, deps);
     }),
     createEnvCommand(["app", "deploy"], "Deploy an app", async (args2, deps) => {
-      const { runAppDeployCommand } = await import("./appDeployCommands-L5ZR26CB.js");
+      const { runAppDeployCommand } = await import("./appDeployCommands-PABMVMN2.js");
       return runAppDeployCommand(args2, deps);
     }),
     createEnvCommand(["app", "deploy", "status"], "Check app deploy status", async (args2, deps) => {
-      const { runAppDeployStatusCommand } = await import("./appDeployStatusCommands-5HQHELRA.js");
+      const { runAppDeployStatusCommand } = await import("./appDeployStatusCommands-X7WEU4TU.js");
       return runAppDeployStatusCommand(args2, deps);
     }),
     createEnvCommand(["app", "delete"], "Delete an app", async (args2, deps) => {
-      const { runAppDeleteCommand } = await import("./appDeleteCommands-AX2O6VDV.js");
+      const { runAppDeleteCommand } = await import("./appDeleteCommands-VG2UVW4T.js");
       return runAppDeleteCommand(args2, deps);
     })
   ];
@@ -269,23 +269,23 @@ function getAppInternalCommandEntries() {
 function getDialogInternalCommandEntries() {
   return [
     createEnvCommand(["dialog", "list"], "List dialogs (default --limit 50; --all/--limit 0 full; --jsonl streams)", async (args2, deps) => {
-      const { runDialogListCommand } = await import("./dialogCommands-WAFKC3KK.js");
+      const { runDialogListCommand } = await import("./dialogCommands-HGMV4NQJ.js");
       return runDialogListCommand(args2, deps);
     }),
     createEnvCommand(["dialog", "delete"], "Delete one or more dialogs", async (args2, deps) => {
-      const { runDialogDeleteCommand } = await import("./dialogCommands-WAFKC3KK.js");
+      const { runDialogDeleteCommand } = await import("./dialogCommands-HGMV4NQJ.js");
       return runDialogDeleteCommand(args2, deps);
     }),
     createEnvCommand(["dialog", "query"], "Query dialogs by subject refs (default --limit 50; --all full; --jsonl streams)", async (args2, deps) => {
-      const { runDialogQueryCommand } = await import("./dialogCommands-WAFKC3KK.js");
+      const { runDialogQueryCommand } = await import("./dialogCommands-HGMV4NQJ.js");
       return runDialogQueryCommand(args2, deps);
     }),
     createEnvCommand(["dialog", "read"], "Read a dialog", async (args2, deps) => {
-      const { runDialogReadCommand } = await import("./dialogCommands-WAFKC3KK.js");
+      const { runDialogReadCommand } = await import("./dialogCommands-HGMV4NQJ.js");
       return runDialogReadCommand(args2, deps);
     }),
     createEnvCommand(["dialog", "status"], "Read compact dialog status", async (args2, deps) => {
-      const { runDialogStatusCommand } = await import("./dialogCommands-WAFKC3KK.js");
+      const { runDialogStatusCommand } = await import("./dialogCommands-HGMV4NQJ.js");
       return runDialogStatusCommand(args2, deps);
     })
   ];
@@ -295,39 +295,39 @@ function getDialogInternalCommandEntries() {
 function getDocInternalCommandEntries() {
   return [
     createEnvCommand(["doc", "create"], "Create a normal doc", async (args2, deps) => {
-      const { runDocCreateCommand } = await import("./docCreateCommands-GHGB42S7.js");
+      const { runDocCreateCommand } = await import("./docCreateCommands-WQT5EZG2.js");
       return runDocCreateCommand(args2, deps);
     }),
     createEnvCommand(["doc", "read"], "Read a normal doc", async (args2, deps) => {
-      const { runDocReadCommand } = await import("./docReadCommands-BMXM6J7T.js");
+      const { runDocReadCommand } = await import("./docReadCommands-T6FDDKJ3.js");
       return runDocReadCommand(args2, deps);
     }),
     createEnvCommand(["doc", "update"], "Update a normal doc", async (args2, deps) => {
-      const { runDocUpdateCommand } = await import("./docUpdateCommands-QNABH3M2.js");
+      const { runDocUpdateCommand } = await import("./docUpdateCommands-GBWGXG2G.js");
       return runDocUpdateCommand(args2, deps);
     }),
     createEnvCommand(["doc", "delete"], "Delete a normal doc", async (args2, deps) => {
-      const { runDocDeleteCommand } = await import("./docDeleteCommands-Y5I7ZEX4.js");
+      const { runDocDeleteCommand } = await import("./docDeleteCommands-GUMELBKM.js");
       return runDocDeleteCommand(args2, deps);
     }),
     createEnvCommand(["skill-doc", "create"], "Create a skill-backed doc", async (args2, deps) => {
-      const { runSkillDocCreateCommand } = await import("./docCreateCommands-GHGB42S7.js");
+      const { runSkillDocCreateCommand } = await import("./docCreateCommands-WQT5EZG2.js");
       return runSkillDocCreateCommand(args2, deps);
     }),
     createEnvCommand(["skill", "create-doc"], "Create a skill-backed doc", async (args2, deps) => {
-      const { runSkillDocCreateCommand } = await import("./docCreateCommands-GHGB42S7.js");
+      const { runSkillDocCreateCommand } = await import("./docCreateCommands-WQT5EZG2.js");
       return runSkillDocCreateCommand(args2, deps);
     }),
     createEnvCommand(["skill-doc", "read"], "Read a skill doc", async (args2, deps) => {
-      const { runSkillDocReadCommand } = await import("./docReadCommands-BMXM6J7T.js");
+      const { runSkillDocReadCommand } = await import("./docReadCommands-T6FDDKJ3.js");
       return runSkillDocReadCommand(args2, deps);
     }),
     createEnvCommand(["skill-doc", "update"], "Update a skill doc", async (args2, deps) => {
-      const { runSkillDocUpdateCommand } = await import("./docUpdateCommands-QNABH3M2.js");
+      const { runSkillDocUpdateCommand } = await import("./docUpdateCommands-GBWGXG2G.js");
       return runSkillDocUpdateCommand(args2, deps);
     }),
     createEnvCommand(["skill-doc", "delete"], "Delete a skill doc", async (args2, deps) => {
-      const { runSkillDocDeleteCommand } = await import("./docDeleteCommands-Y5I7ZEX4.js");
+      const { runSkillDocDeleteCommand } = await import("./docDeleteCommands-GUMELBKM.js");
       return runSkillDocDeleteCommand(args2, deps);
     })
   ];
@@ -355,19 +355,19 @@ function getMemoryInternalCommandEntries() {
 function getSpaceInternalCommandEntries() {
   return [
     createEnvCommand(["space", "create"], "Create a space", async (args2, deps) => {
-      const { runSpaceCreateCommand } = await import("./spaceCommands-CLN45IE3.js");
+      const { runSpaceCreateCommand } = await import("./spaceCommands-76ECKNFH.js");
       return runSpaceCreateCommand(args2, deps);
     }),
     createEnvCommand(["space", "invite"], "Invite an existing user to a space", async (args2, deps) => {
-      const { runSpaceInviteCommand } = await import("./spaceCommands-CLN45IE3.js");
+      const { runSpaceInviteCommand } = await import("./spaceCommands-76ECKNFH.js");
       return runSpaceInviteCommand(args2, deps);
     }),
     createEnvCommand(["space", "accept-invite"], "Accept a space invite", async (args2, deps) => {
-      const { runSpaceAcceptInviteCommand } = await import("./spaceCommands-CLN45IE3.js");
+      const { runSpaceAcceptInviteCommand } = await import("./spaceCommands-76ECKNFH.js");
       return runSpaceAcceptInviteCommand(args2, deps);
     }),
     createEnvCommand(["space", "upload"], "Upload a file to a space", async (args2, deps) => {
-      const { runSpaceUploadCommand } = await import("./spaceCommands-CLN45IE3.js");
+      const { runSpaceUploadCommand } = await import("./spaceCommands-76ECKNFH.js");
       return runSpaceUploadCommand(args2, deps);
     })
   ];
@@ -417,15 +417,15 @@ function getSystemInternalCommandEntries(renderHelpText2) {
       return runWhoamiCommand({ args: args2, env: ctx.env });
     }),
     createEntrypointEnvCommand(["connect"], "Send machine heartbeats or hold a connector websocket", async (args2, deps) => {
-      const { runMachineConnectCommand } = await import("./machineCommands-YDAIPYU5.js");
+      const { runMachineConnectCommand } = await import("./machineCommands-SCGLQQCA.js");
       return runMachineConnectCommand(args2, deps);
     }),
     createDaemonShortcutCommand(["daemon"], "Run the connector daemon shortcut", async (args2, deps) => {
-      const { runMachineConnectCommand } = await import("./machineCommands-YDAIPYU5.js");
+      const { runMachineConnectCommand } = await import("./machineCommands-SCGLQQCA.js");
       return runMachineConnectCommand(args2, deps);
     }),
     createEnvCommand(["machine", "status"], "List machines registered to the current profile", async (args2, deps) => {
-      const { runMachineStatusCommand } = await import("./machineCommands-YDAIPYU5.js");
+      const { runMachineStatusCommand } = await import("./machineCommands-SCGLQQCA.js");
       return runMachineStatusCommand(args2, deps);
     }),
     createEnvCommand(["doctor", "runtime"], "Diagnose local-first agent runtime selection", async (args2, deps) => {
@@ -815,11 +815,13 @@ async function runScript(script, forwardedArgs, env) {
   return proc.exited;
 }
 async function launchTuiWorkspace(args2) {
-  const { startTuiWorkspace } = await import("./readlineWorkspace-5DP3AJWN.js");
+  const { startTuiWorkspace } = await import("./readlineWorkspace-PKOMYDRS.js");
   const { createTuiSummaryLlmCaller } = await import("./tuiSummaryLlmCaller-F3DPFFZM.js");
   return startTuiWorkspace({
     ...args2,
-    summaryLlmCaller: createTuiSummaryLlmCaller(args2.env)
+    // Big dialogs produce ~300KB+ summary prompts that routinely take 25–30s+;
+    // the old 30s abort made manual /compact silently degrade to fork-only.
+    summaryLlmCaller: createTuiSummaryLlmCaller(args2.env, { timeoutMs: 9e4 })
   });
 }
 var args = process.argv.slice(2);

package/{machineCommands-YDAIPYU5.js → machineCommands-SCGLQQCA.js}

@@ -2,13 +2,13 @@ import {
   buildMachinePermissionPromptBlock,
   handleConnectorRunMessage,
   resolveMachineRunPermissionPolicy
-} from "./chunk-SKIRVYEI.js";
+} from "./chunk-URHZKKK7.js";
 import {
   isConnectorWebSocketAuthError,
   isConnectorWebSocketRetryableError,
   resolveConnectorWebSocketTarget
 } from "./chunk-ALXHV7NK.js";
-import "./chunk-Z5MHFBJZ.js";
+import "./chunk-LJ6OKZ6D.js";
 import "./chunk-MXUDQZXQ.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-45YO6H7P.js";
@@ -66,7 +66,7 @@ import "./chunk-KHCLMKZZ.js";
 import {
   PATH_FIELD_ALIASES,
   createLocalWorkspaceToolExecutors
-} from "./chunk-KSCXMC6U.js";
+} from "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/{machineWsRunDispatch-O6RM2ECT.js → machineWsRunDispatch-EAH5VIEL.js}

@@ -11,8 +11,8 @@ import {
   runtimeWorkspacePermissionPolicy,
   scopePermissionPolicyToRuntimeWorkspace,
   summarizeAgentConfigForLogs
-} from "./chunk-SKIRVYEI.js";
-import "./chunk-Z5MHFBJZ.js";
+} from "./chunk-URHZKKK7.js";
+import "./chunk-LJ6OKZ6D.js";
 import "./chunk-MXUDQZXQ.js";
 import "./chunk-EADNWBAZ.js";
 import "./chunk-45YO6H7P.js";
@@ -62,7 +62,7 @@ import "./chunk-E3YVTQWT.js";
 import "./chunk-ZRSJ3JEH.js";
 import "./chunk-AETZ7AD6.js";
 import "./chunk-KHCLMKZZ.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolo-cli",
-  "version": "0.62.0",
+  "version": "0.63.0-alpha.2",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {

package/{readlineWorkspace-5DP3AJWN.js → readlineWorkspace-PKOMYDRS.js}

@@ -72,7 +72,7 @@ import {
   wrapTextToLines,
   wrapTranscriptLine,
   wrapTranscriptLineWithLayout
-} from "./chunk-VHO3TMQZ.js";
+} from "./chunk-BWIPK2PD.js";
 import "./chunk-S7Z2HMCN.js";
 import {
   listFavoriteAgentIdsAcrossServers,
@@ -89,6 +89,7 @@ import {
 import "./chunk-JYYZCK2Z.js";
 import {
   RUN_WAKE_CHANNEL_ENV,
+  appendTurnBillingAudit,
   createCliLocalRuntimeAdapter,
   dailyWelcomeTip,
   initCliLocale,
@@ -96,7 +97,7 @@ import {
   readTimestamp,
   setCliLocale,
   t
-} from "./chunk-Z5MHFBJZ.js";
+} from "./chunk-LJ6OKZ6D.js";
 import "./chunk-MXUDQZXQ.js";
 import "./chunk-EADNWBAZ.js";
 import {
@@ -170,8 +171,7 @@ import "./chunk-DWYSDNOH.js";
 import "./chunk-N6HLMLKE.js";
 import "./chunk-ZJ7UHBJS.js";
 import {
-  extractReferenceKeysFromMessage,
-  normalizeUsage
+  extractReferenceKeysFromMessage
 } from "./chunk-TBHAHL33.js";
 import "./chunk-EVBFYPDC.js";
 import "./chunk-HQUORJTM.js";
@@ -202,7 +202,7 @@ import {
   buildLocalWorkspaceToolset,
   getProcessRegistry,
   readCommandActionGatePayload
-} from "./chunk-KSCXMC6U.js";
+} from "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";
@@ -6241,7 +6241,7 @@ ${t("autoUsage")}`
       }
       return {
         nextState: state,
-        output: "Compacting current dialog...",
+        output: t("compactingDialog"),
         action: { type: "compact", dialogId: state.dialogId }
       };
     case "/agent":
@@ -6689,66 +6689,6 @@ function normalizeStatus(raw) {
   return "failed";
 }
 
-// packages/cli/client/turnBillingAudit.ts
-import { appendFileSync, mkdirSync as mkdirSync2 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
-import { join as join3 } from "node:path";
-function projectUsageForAudit(usage) {
-  if (!usage || typeof usage !== "object") return null;
-  const normalized = normalizeUsage(usage);
-  const projected = {
-    input_tokens: normalized.input_tokens,
-    output_tokens: normalized.output_tokens,
-    cache_read_input_tokens: normalized.cache_read_input_tokens,
-    cache_creation_input_tokens: normalized.cache_creation_input_tokens
-  };
-  if (typeof usage.cost === "number" && Number.isFinite(usage.cost)) {
-    projected.cost = usage.cost;
-  }
-  if (typeof usage.billing_unit === "string" && usage.billing_unit.trim()) {
-    projected.billing_unit = usage.billing_unit;
-  }
-  if (typeof usage.provider_call_id === "string" && usage.provider_call_id.trim()) {
-    projected.provider_call_id = usage.provider_call_id.trim();
-  }
-  return projected;
-}
-function resolveTurnBillingAuditLogPath(env = process.env) {
-  const noloHome = env.NOLO_HOME?.trim() || join3(homedir4(), ".nolo");
-  return join3(noloHome, "logs", "turn-billing.jsonl");
-}
-function appendTurnBillingAudit(input) {
-  try {
-    if (process.env.NOLO_TURN_BILLING_AUDIT === "0") return;
-    const calls = (input.usageRecords ?? []).map((record) => {
-      const usage = projectUsageForAudit(record?.usage);
-      if (!usage) return null;
-      return {
-        ...record?.callId ? { callId: record.callId } : {},
-        ...record?.model ? { model: record.model } : {},
-        ...record?.provider ? { provider: record.provider } : {},
-        ...usage
-      };
-    }).filter((call) => call !== null);
-    if (calls.length === 0 && (input.turnCredits === void 0 || input.turnCredits === null)) {
-      return;
-    }
-    const row = {
-      ts: Date.now(),
-      ...input.dialogId ? { dialogId: input.dialogId } : {},
-      ...input.agentKey ? { agentKey: input.agentKey } : {},
-      ...input.turnCredits !== void 0 && input.turnCredits !== null ? { turnCredits: input.turnCredits } : {},
-      ...input.aborted ? { aborted: true } : {},
-      calls
-    };
-    const logPath = resolveTurnBillingAuditLogPath();
-    mkdirSync2(join3(logPath, ".."), { recursive: true });
-    appendFileSync(logPath, `${JSON.stringify(row)}
-`);
-  } catch {
-  }
-}
-
 // packages/ai/tools/askChoiceState.ts
 function normalizeAskChoiceArgs(args) {
   const blocking = args.blocking !== false;
@@ -8282,17 +8222,8 @@ function createTuiRender(host) {
 import { ulid } from "ulid";
 var DB_PATH = "/api/v1/db";
 function parseTokenUserId(token) {
-  try {
-    const parts = token.split(".");
-    if (parts.length < 2) return null;
-    const payloadBase64 = parts[1];
-    const payload = JSON.parse(
-      Buffer.from(payloadBase64, "base64").toString("utf8")
-    );
-    return typeof payload?.userId === "string" ? payload.userId : null;
-  } catch {
-    return null;
-  }
+  const userId = parseUserIdFromAuthToken(token);
+  return userId || null;
 }
 async function readDialogRecord(fetchImpl, serverUrl, authToken, dialogKey) {
   const res = await fetchImpl(`${serverUrl}${DB_PATH}/read/${dialogKey}`, {
@@ -8327,7 +8258,7 @@ async function patchDialog(fetchImpl, serverUrl, authToken, dialogKey, changes)
       "Content-Type": "application/json",
       Authorization: `Bearer ${authToken}`
     },
-    body: JSON.stringify({ data: changes })
+    body: JSON.stringify(changes)
   });
   if (!res.ok) {
     throw new Error(`Failed to patch dialog "${dialogKey}": HTTP ${res.status}`);
@@ -8433,12 +8364,13 @@ async function resolveContextWindow(fetchImpl, serverUrl, authToken, agentKey) {
 }
 async function compactDialog(options) {
   const fetchImpl = options.fetchImpl ?? fetch;
-  const userId = parseTokenUserId(options.authToken);
+  const userId = options.userId || parseTokenUserId(options.authToken);
   if (!userId) {
     throw new Error(
       "[nolo] compact: cannot compact \u2014 invalid or missing auth token"
     );
   }
+  options.onProgress?.("reading");
   const dialogKey = `dialog-${userId}-${options.dialogId}`;
   const current = await readDialogRecord(
     fetchImpl,
@@ -8472,6 +8404,7 @@ async function compactDialog(options) {
         reason: "manual"
       });
       if (plan.shouldCompress && plan.msgsToCompress.length > 0) {
+        options.onProgress?.("summarizing");
         const previousSummary = current.summary || "";
         const messagesText = formatMessagesForSummaryWithTruncation(plan.msgsToCompress);
         const fileOpsText = formatFileOperationsFromMessages(
@@ -8520,6 +8453,7 @@ async function compactDialog(options) {
       }
     }
   }
+  options.onProgress?.("forking");
   const next = buildForkedDialogRecord(current, userId);
   await writeDialogRecord(fetchImpl, options.serverUrl, options.authToken, next);
   await addDialogToSpaceIfNeeded(
@@ -9483,7 +9417,13 @@ async function runSubmittedSlashLine(line, host, actionGateHandler, confirmDestr
         serverUrl: host.state.serverUrl,
         authToken,
         dialogId: result.action.dialogId,
-        summaryLlmCaller: options.summaryLlmCaller
+        summaryLlmCaller: options.summaryLlmCaller,
+        onProgress: (phase) => {
+          const phaseText = phase === "reading" ? t("compactPhaseReading") : phase === "summarizing" ? t("compactPhaseSummarizing") : phase === "forking" ? t("compactPhaseForking") : void 0;
+          if (phaseText) {
+            emitCommandOutput(phaseText);
+          }
+        }
       });
       const elapsedSec = ((Date.now() - compactStart) / 1e3).toFixed(1);
       host.state = {
@@ -9532,13 +9472,9 @@ async function runSubmittedSlashLine(line, host, actionGateHandler, confirmDestr
         compactResult.dialogId,
         elapsed
       );
-      output.write(`${message}
-`);
+      emitCommandOutput(message);
     } catch (error) {
-      output.write(
-        `[nolo] Compact failed: ${toErrorMessage(error)}
-`
-      );
+      emitCommandOutput(t("compactFailed", toErrorMessage(error)));
     }
   }
   if (result.action?.type === "self-update") {

package/{spaceCommands-CLN45IE3.js → spaceCommands-76ECKNFH.js}

@@ -11,7 +11,7 @@ import {
 import "./chunk-CTCW7U7N.js";
 import "./chunk-SPAQ4PVV.js";
 import "./chunk-KQHGZWSV.js";
-import "./chunk-KSCXMC6U.js";
+import "./chunk-3ROJR3TG.js";
 import "./chunk-7A3RRUCQ.js";
 import "./chunk-ZNFJWEN4.js";
 import "./chunk-XOKOSO35.js";