nolo-cli 0.54.0-alpha.2 → 0.54.0

package/{chunk-GV35EHNA.js → chunk-5FCIPEKT.js}

@@ -4,7 +4,7 @@ import {
   refreshAntigravityOAuthToken,
   refreshOpenAiCodexToken,
   xaiRefresh
-} from "./chunk-U5Z7LFZF.js";
+} from "./chunk-NFLA6GSU.js";
 import {
   defaultLoopbackRequest
 } from "./chunk-EADNWBAZ.js";
@@ -18,7 +18,7 @@ import {
 } from "./chunk-NI2BS6UD.js";
 import {
   buildLocalAgentLookupKeys
-} from "./chunk-OYNDYVSE.js";
+} from "./chunk-JON2PHYT.js";
 import {
   LOCAL_CODEX_AGENT_ID,
   LOCAL_CODEX_AGENT_KEY,
@@ -46,17 +46,17 @@ import {
   spawnLocalBackgroundRun,
   terminateRunProcess,
   withQueueLock
-} from "./chunk-WHVQA7PJ.js";
+} from "./chunk-SSXTSPSG.js";
 import {
   inferCaptureIntent
-} from "./chunk-4NN3EK7H.js";
+} from "./chunk-EICIFHVS.js";
 import {
   buildCliPrompt
 } from "./chunk-ATNTHIZI.js";
 import {
   inlineImageUrlsForCustomProvider,
   prepareTools
-} from "./chunk-UW4INMD2.js";
+} from "./chunk-RHMDMTDK.js";
 import {
   getServerProviderSecret
 } from "./chunk-HS7MLR74.js";
@@ -65,9 +65,13 @@ import {
   isAntigravityOAuthAgent,
   readAntigravityProjectId,
   resolveAntigravityCloudCodeBaseUrl
-} from "./chunk-757BGY6Y.js";
+} from "./chunk-BG7J6Y5X.js";
 import {
+  CONTROL_AGENT_RUN_ACTIONS,
+  buildControlAgentRunFunctionSchema,
+  buildStartAgentRunFunctionSchema,
   deleteMemoryFunctionSchema,
+  queryMemoryFunctionSchema,
   readXPostFunc,
   readXPostFunctionSchema,
   readXhsProfileFunc,
@@ -75,7 +79,7 @@ import {
   rememberMemoryFunctionSchema,
   resolveAgentRequiredPackIds,
   setTodoListFunc
-} from "./chunk-V4KZGLOI.js";
+} from "./chunk-TR4DXUYX.js";
 import {
   fetchWithTransientRetry,
   isTransientFetchError
@@ -98,13 +102,13 @@ import {
   prepareTokenUsageData,
   resolveBuiltinPlatformAgentConfig,
   runKeyed
-} from "./chunk-BJLYCOZK.js";
+} from "./chunk-YBFJQC2M.js";
 import {
   BUILTIN_TITLE_LLM_CONFIG
 } from "./chunk-EVBFYPDC.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-U2A47SVI.js";
+} from "./chunk-TC6P4NDR.js";
 import {
   require_date_fns
 } from "./chunk-M76ECQRD.js";
@@ -122,6 +126,7 @@ import {
   resolveEffectiveEnabledPacks
 } from "./chunk-O5FLGN2L.js";
 import {
+  DEFAULT_HYBRID_READ_TIMEOUT_MS,
   aggregateResponsesStream,
   buildLoadSkillExecutor,
   buildLocalDialogWritePlan,
@@ -144,10 +149,11 @@ import {
   parseSyncServersEnv,
   resolveOpenAiCompatibleProviderConfig,
   summarizeToolArguments
-} from "./chunk-6BGAQ3KR.js";
+} from "./chunk-EJE33XNR.js";
 import {
   buildPlatformChatCompletionRequest,
   canUsePlatformChatProvider,
+  collectStablePromptPrefix,
   hasDirectOpenAiCompatibleProvider,
   parsePlatformChatCompletionData,
   parsePlatformChatCompletionResponse,
@@ -155,24 +161,25 @@ import {
   readSseDataValues,
   resolvePlatformChatProviderConfig,
   shouldUsePlatformChatProvider,
+  stablePromptCacheKey,
   streamSseDataValues
-} from "./chunk-INXBNYCG.js";
+} from "./chunk-3Y2K5O2R.js";
 import {
   resolveAgentRuntimeConfigFromRecord,
   resolveHistoricalToolContentCap
-} from "./chunk-CVT7L2WZ.js";
+} from "./chunk-A65UV3M5.js";
 import {
   convertMessagesToResponsesInput,
   toResponsesTools
-} from "./chunk-6BYAXNH5.js";
+} from "./chunk-VZMUOPYG.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-SP3DPVBH.js";
+} from "./chunk-KLIBF3BY.js";
 import {
   buildNoloWorkspaceOpenAiTools,
   parseNoloWorkspaceToolArguments,
   resolveRuntimeToolSurfaceForAgent
-} from "./chunk-TNPCQNGQ.js";
+} from "./chunk-ZVOHVJI3.js";
 import {
   mergeAvailabilityDeadline,
   resolveAvailabilityAction,
@@ -184,25 +191,25 @@ import {
 } from "./chunk-2MBTWINN.js";
 import {
   clipCompactText
-} from "./chunk-H4RYESI6.js";
+} from "./chunk-BBTN4NQD.js";
+import {
+  isAdaptiveThinkingModelId
+} from "./chunk-SVDMVX4G.js";
+import {
+  compactWhitespace
+} from "./chunk-DWLEOOGR.js";
 import {
   createFileCredentialBroker,
   resolveCurrentRunRuntimeToolPolicy,
   resolveLocalWorkspaceExecutorOptionsFromPolicy,
   resolveRequestedRuntimeToolNames
-} from "./chunk-NQ4N4IGO.js";
+} from "./chunk-CS6TCJ7E.js";
 import {
   createOAuthTokenStore,
   isTokenExpired,
   readOAuthCredential,
   resolveFreshAccessToken
 } from "./chunk-FD36SCCD.js";
-import {
-  isAdaptiveThinkingModelId
-} from "./chunk-QDHZCAH3.js";
-import {
-  compactWhitespace
-} from "./chunk-DWLEOOGR.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -221,7 +228,7 @@ import {
   createTokenStatsKey,
   createUserKey,
   dialogMessageRange
-} from "./chunk-SVEUG45B.js";
+} from "./chunk-NHRQCXIQ.js";
 import {
   asTrimmedNonEmptyStringArray
 } from "./chunk-I42VC5KR.js";
@@ -230,7 +237,7 @@ import {
 } from "./chunk-QSJ3HFEF.js";
 import {
   isSystemBuiltinTrustedAgentKey
-} from "./chunk-VULELK4T.js";
+} from "./chunk-2WBFJHQA.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
@@ -305,6 +312,12 @@ function isSubtaskRun(env) {
   const value = env.NOLO_AGENT_RUN_CHILD;
   return typeof value === "string" && value.length > 0 && value !== "0";
 }
+var RUN_WAKE_CHANNEL_ENV = "NOLO_RUN_WAKE";
+function hasRunWakeChannel(env) {
+  if (!env) return false;
+  const value = env[RUN_WAKE_CHANNEL_ENV];
+  return typeof value === "string" && value.length > 0 && value !== "0";
+}
 function filterToolNamesForRunKind(toolNames, isSubtask) {
   if (!isSubtask) return [...toolNames];
   return toolNames.filter((name) => !SUBTASK_REMOVED_TOOL_NAMES.has(name));
@@ -651,10 +664,6 @@ var STRINGS = {
   },
   // Normal-mode safe projection: the raw errorMessage/logLines of a failed run
   // stay in pro/verbose; normal mode names the failure and points at pro.
-  runDiagnosticsHidden: {
-    en: "run failed \u2014 full diagnostics in pro mode",
-    zh: "\u8FD0\u884C\u5931\u8D25\u2014\u2014\u5B8C\u6574\u8BCA\u65AD\u89C1 pro \u6A21\u5F0F"
-  },
   runsListLabel: {
     en: "Runs ({0})",
     zh: "\u8FD0\u884C ({0})"
@@ -810,10 +819,6 @@ var STRINGS = {
     en: "runtime",
     zh: "\u8FD0\u884C\u65F6"
   },
-  contextFieldTools: {
-    en: "tools",
-    zh: "\u5DE5\u5177"
-  },
   contextFieldServer: {
     en: "server",
     zh: "\u670D\u52A1\u7AEF"
@@ -930,8 +935,8 @@ var STRINGS = {
   runtimeUsage: { en: "Usage: /runtime <auto|local|server>", zh: "\u7528\u6CD5\uFF1A/runtime <auto|local|server>" },
   runtimeSet: { en: "Runtime: {0}", zh: "\u8FD0\u884C\u6A21\u5F0F\uFF1A{0}" },
   displayFixedHint: {
-    en: "The TUI now ships a single built-in display default, no switching needed. Power users can fall back to environment variables (applied on restart): NOLO_CLI_TOOLS=normal|pro|verbose|hide controls the tool trace, NOLO_CLI_THINKING=show|hide controls reasoning visibility.",
-    zh: "TUI \u73B0\u5728\u53EA\u6709\u4E00\u5957\u5185\u7F6E\u9ED8\u8BA4\u663E\u793A\uFF0C\u65E0\u9700\u5207\u6362\u3002\u4E13\u4E1A\u7EC6\u8282\u53EF\u7528\u73AF\u5883\u53D8\u91CF\u515C\u5E95\uFF08\u91CD\u542F\u751F\u6548\uFF09\uFF1ANOLO_CLI_TOOLS=normal|pro|verbose|hide \u63A7\u5236\u5DE5\u5177\u8F68\u8FF9\uFF0CNOLO_CLI_THINKING=show|hide \u63A7\u5236\u601D\u8003\u8FC7\u7A0B\u3002"
+    en: "The TUI ships a single built-in tool display \u2014 no configuration needed. Thinking process visibility is still controlled independently via NOLO_CLI_THINKING=show|hide (applied on restart).",
+    zh: "TUI \u53EA\u6709\u4E00\u5957\u5185\u7F6E\u5DE5\u5177\u663E\u793A\uFF0C\u65E0\u9700\u914D\u7F6E\u3002\u601D\u8003\u8FC7\u7A0B\u4ECD\u53EF\u7528 NOLO_CLI_THINKING=show|hide \u72EC\u7ACB\u63A7\u5236\uFF08\u91CD\u542F\u751F\u6548\uFF09\u3002"
   },
   tasksRunning: { en: "Running processes ({0}):", zh: "\u8FD0\u884C\u4E2D\u7684\u8FDB\u7A0B\uFF08{0}\uFF09\uFF1A" },
   tasksStopped: { en: "Stopped/exited ({0}):", zh: "\u5DF2\u505C\u6B62/\u5DF2\u9000\u51FA\uFF08{0}\uFF09\uFF1A" },
@@ -1564,11 +1569,32 @@ function buildOpenAiTools(args) {
     }),
     ...buildServerPlatformOpenAiTools({ toolNames: args.toolNames }),
     ...buildNoloWorkspaceOpenAiTools({ toolNames: args.toolNames }),
-    ...prepareTools(
-      ["startAgentRun", "controlAgentRun"].filter((name) => toolNameSet.has(name))
-    )
+    ...buildOrchestrationOpenAiTools({
+      toolNameSet,
+      env: args.env
+    })
   ];
 }
+function buildOrchestrationOpenAiTools(args) {
+  const names = ["startAgentRun", "controlAgentRun"].filter(
+    (name) => args.toolNameSet.has(name)
+  );
+  if (names.length === 0) return [];
+  const waitCapableActions = CONTROL_AGENT_RUN_ACTIONS.filter(
+    (action) => action !== "wait"
+  );
+  const controlSchema = hasRunWakeChannel(args.env) ? buildControlAgentRunFunctionSchema({ actions: waitCapableActions }) : buildControlAgentRunFunctionSchema();
+  const startSchema = buildStartAgentRunFunctionSchema({ supportsWait: false });
+  return prepareTools(names).map((tool) => {
+    if (tool?.function?.name === "controlAgentRun") {
+      return { ...tool, function: controlSchema };
+    }
+    if (tool?.function?.name === "startAgentRun") {
+      return { ...tool, function: startSchema };
+    }
+    return tool;
+  });
+}
 var CLI_DEFAULT_TOOLS = ["exa_search", "fetchWebpage", "ask_user"];
 function addDefaultCliCoreTools(toolNames, env) {
   const declaredOnly = env && shouldUseDeclaredOnlyLocalWorkspaceTools(env);
@@ -1685,6 +1711,12 @@ function buildServerPlatformOpenAiTools(args) {
         function: rememberMemoryFunctionSchema
       }
     ] : [],
+    ...toolNameSet.has("queryMemory") ? [
+      {
+        type: "function",
+        function: queryMemoryFunctionSchema
+      }
+    ] : [],
     ...toolNameSet.has("deleteMemory") ? [
       {
         type: "function",
@@ -1750,7 +1782,8 @@ var resolveAnthropicOAuthTransport = async (ctx) => {
         });
         await recordLocalAvailability(result.status, result.body);
         if (result.status < 200 || result.status >= 300) {
-          const errMsg = result.body?.error && typeof result.body.error === "object" && typeof result.body.error.message === "string" ? result.body.error.message : JSON.stringify(result.body);
+          const errorObj = result.body?.error;
+          const errMsg = typeof errorObj?.message === "string" ? errorObj.message : JSON.stringify(result.body);
           throw new Error(
             `local Claude OAuth provider failed: HTTP ${result.status} ${errMsg}`
           );
@@ -1812,6 +1845,10 @@ var WIRE_PROFILES = {
   // The UI labels its effort variants (Low/Medium/High), but the literal
   // -medium/-high ids return 404 from streamGenerateContent.
   "gemini-3.7-flash-tiered": { modelEnum: "MODEL_PLACEHOLDER_M301", maxOutputTokens: 65536 },
+  // Gemini 3.8 Flash 沿用 3.7 的 tiered 兼容策略：仓库内暂无 Antigravity discovery
+  // 证据确认 3.8 的 wire modelEnum，禁止虚构，先只声明同档输出上限；enum 待
+  // discovery 证据到位后补齐。
+  "gemini-3.8-flash-tiered": { maxOutputTokens: 65536 },
   "gemini-3.6-flash-low": { maxOutputTokens: 65536 },
   "gemini-3.6-flash-medium": { maxOutputTokens: 65536 },
   "gemini-3.6-flash-high": { maxOutputTokens: 65536 },
@@ -1837,6 +1874,10 @@ function resolveAntigravityWireModel(logicalModelId) {
     const wireModelId = "gemini-3.7-flash-tiered";
     return { wireModelId, profile: WIRE_PROFILES[wireModelId] };
   }
+  if (lower === "gemini-3.8-flash" || ["gemini-3.8-flash-low", "gemini-3.8-flash-medium", "gemini-3.8-flash-high"].includes(lower)) {
+    const wireModelId = "gemini-3.8-flash-tiered";
+    return { wireModelId, profile: WIRE_PROFILES[wireModelId] };
+  }
   if (lower === "gemini-3.6-flash") {
     const wireModelId = "gemini-3.6-flash-low";
     return { wireModelId, profile: WIRE_PROFILES[wireModelId] };
@@ -1853,8 +1894,19 @@ function resolveAntigravityWireModel(logicalModelId) {
 
 // packages/agent-runtime/geminiNativeShared.ts
 var SKIP_THOUGHT_SIGNATURE = "skip_thought_signature_validator";
+function resolveGeminiModelQuirks(modelId) {
+  const lower = modelId.toLowerCase();
+  const isGemini3 = lower.includes("gemini-3");
+  const isStrictSignatureModel = lower.includes("gemini-3.5") || lower.includes("flash-preview");
+  const isClaude = lower.includes("claude");
+  return {
+    requiresThoughtSignature: isGemini3,
+    allowsThoughtSignatureSentinel: isGemini3 && !isStrictSignatureModel,
+    isClaudeCrossModel: isClaude
+  };
+}
 function isGemini3Model(modelId) {
-  return modelId.includes("gemini-3");
+  return resolveGeminiModelQuirks(modelId).requiresThoughtSignature;
 }
 function messageText(content) {
   if (typeof content === "string") return content;
@@ -2049,10 +2101,15 @@ function applyGeminiChunk(chunk, state, options) {
     const prompt = typeof meta.promptTokenCount === "number" ? meta.promptTokenCount : 0;
     const candidates2 = typeof meta.candidatesTokenCount === "number" ? meta.candidatesTokenCount : 0;
     const total = typeof meta.totalTokenCount === "number" ? meta.totalTokenCount : prompt + candidates2;
+    const cached = typeof meta.cachedContentTokenCount === "number" && Number.isFinite(meta.cachedContentTokenCount) ? (
+      // cached ⊆ prompt；对畸形上游防御性钳位，避免 cache_read > input 破坏归一化与计费
+      Math.min(Math.max(0, Math.floor(meta.cachedContentTokenCount)), prompt)
+    ) : 0;
     state.usage = {
       prompt_tokens: prompt,
       completion_tokens: candidates2,
-      total_tokens: total
+      total_tokens: total,
+      ...cached > 0 ? { cache_read_input_tokens: cached } : {}
     };
   }
   const candidates = Array.isArray(response.candidates) ? response.candidates : [];
@@ -2165,9 +2222,10 @@ function buildCloudCodeAssistPayload(args) {
   const logicalModel = asOptionalTrimmedString(args.openAiBody.model) ?? asOptionalTrimmedString(args.agentConfig.model) ?? "gemini-3.1-pro";
   const { wireModelId: model, profile } = resolveAntigravityWireModel(logicalModel);
   const rawMessages = Array.isArray(args.openAiBody.messages) ? args.openAiBody.messages : [];
-  const isClaude = model.toLowerCase().includes("claude");
+  const quirks = resolveGeminiModelQuirks(model);
+  const isClaude = quirks.isClaudeCrossModel;
   const { contents, systemTexts } = convertOpenAiMessagesToGemini(rawMessages, {
-    attachSkipThoughtSignature: isGemini3Model(model)
+    attachSkipThoughtSignature: quirks.allowsThoughtSignatureSentinel
   });
   if (contents.length === 0) {
     throw new Error("Antigravity Cloud Code Assist request has no user/model contents.");
@@ -2612,31 +2670,6 @@ function collectInstructions(messages, agentPrompt) {
   }
   return systemTexts.join("\n\n");
 }
-function collectStableInstructions(messages, fallbackPrompt) {
-  const systemTexts = [];
-  if (fallbackPrompt?.trim()) systemTexts.push(fallbackPrompt.trim());
-  for (const raw of messages) {
-    if (!raw || typeof raw !== "object") continue;
-    const message = raw;
-    const role = String(message.role ?? "");
-    if (role !== "system" && role !== "developer") continue;
-    if (typeof message.content === "string") {
-      const boundary = Number(message.stable_prefix_chars);
-      const text = Number.isFinite(boundary) && boundary > 0 ? message.content.slice(0, boundary) : message.content;
-      if (text.trim()) systemTexts.push(text.trim());
-    }
-  }
-  return systemTexts.join("\n\n");
-}
-function stablePromptCacheKey(parts) {
-  const value = JSON.stringify(parts);
-  let hash = 2166136261;
-  for (let index = 0; index < value.length; index += 1) {
-    hash ^= value.charCodeAt(index);
-    hash = Math.imul(hash, 16777619) >>> 0;
-  }
-  return `nolo-codex-${hash.toString(16).padStart(8, "0")}`;
-}
 function convertMessagesToCodexInput(messages) {
   return convertMessagesToResponsesInput(messages).map((item) => {
     if (item.type !== "reasoning") return item;
@@ -2657,7 +2690,7 @@ function buildCodexRequestBody(args, identity = createCodexRequestIdentity()) {
   });
   const input = convertMessagesToCodexInput(nonSystem);
   const instructions = collectInstructions(rawMessages, args.agentConfig.prompt);
-  const stableInstructions = collectStableInstructions(rawMessages, args.agentConfig.prompt);
+  const stableInstructions = collectStablePromptPrefix(rawMessages, args.agentConfig.prompt);
   const model = asOptionalTrimmedString(args.openAiBody.model) ?? asOptionalTrimmedString(args.agentConfig.model) ?? "gpt-5.5";
   const tools = toResponsesTools(
     Array.isArray(args.openAiBody.tools) ? args.openAiBody.tools : void 0
@@ -2669,7 +2702,7 @@ function buildCodexRequestBody(args, identity = createCodexRequestIdentity()) {
     store: false,
     // Keep routing stable across turns and request UUIDs. Growing input/history
     // is intentionally excluded; only stable request-prefix material belongs.
-    prompt_cache_key: stablePromptCacheKey([model, stableInstructions, tools ?? []]),
+    prompt_cache_key: stablePromptCacheKey([model, stableInstructions, tools ?? []], "nolo-codex"),
     client_metadata: identity.clientMetadata
   };
   if (instructions) body.instructions = instructions;
@@ -2817,7 +2850,8 @@ var resolveCodexOAuthTransport = async (ctx) => {
         });
         await recordLocalAvailability(result.status, result.body);
         if (result.status < 200 || result.status >= 300) {
-          const errMsg = result.body?.error && typeof result.body.error === "object" && typeof result.body.error.message === "string" ? result.body.error.message : JSON.stringify(result.body);
+          const errorObj = result.body?.error;
+          const errMsg = typeof errorObj?.message === "string" ? errorObj.message : JSON.stringify(result.body);
           throw new Error(
             `local Codex OAuth provider failed: HTTP ${result.status} ${errMsg}`
           );
@@ -2837,6 +2871,8 @@ var resolveCodexOAuthTransport = async (ctx) => {
         });
         return {
           content,
+          model: agentConfig.model || "gpt-5.6-sol",
+          provider: "openai",
           ...tool_calls ? { tool_calls } : {},
           // fetchCodexResponsesCompletion 已把 codex responses 流聚合完毕并归一化成
           // OpenAI chat.completions 形状：choices[0].finish_reason（"stop"/"tool_calls"）
@@ -9421,7 +9457,7 @@ async function resolveLocalProvider(ctx) {
 }
 
 // packages/cli/client/localRuntimeAdapter.ts
-import { dirname as dirname2, extname, join as join2 } from "node:path";
+import { dirname as dirname2, extname, join as join3 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // packages/cli/client/providerStreamRetry.ts
@@ -9550,6 +9586,11 @@ function clipLocalWakeEvidence(value, max = 1200) {
   const compact = clipCompactText(value, max);
   return compact || void 0;
 }
+function buildLocalWakeDisplayText(args) {
+  const failed = args.terminalStatus !== "done";
+  const duration = typeof args.durationMs === "number" && args.durationMs >= 0 ? ` \xB7 ${Math.floor(args.durationMs / 6e4)}m${Math.floor(args.durationMs / 1e3) % 60}s` : "";
+  return `1 \u6761\u540E\u53F0 run \u5DF2\u5B8C\u6210 \xB7 ${failed ? "\u2717" : "\u2713"} ${args.label || "\u540E\u53F0 run"}${failed ? ` ${args.terminalStatus}` : ""}${duration}`;
+}
 function buildLocalParentWakeMessage(args) {
   return [
     "A child agent dialog you started has reached a terminal status.",
@@ -9599,7 +9640,14 @@ async function postRemoteRecord(args) {
     },
     // evidence 写是 customKey 幂等覆盖写（同 key 重写结果相同），
     // 因此 502 重试安全：即便前一次已被服务端处理，重写结果不变。
-    { retryableStatuses: /* @__PURE__ */ new Set([429, 502, 503]) }
+    // 402（ledger append conflict）同样幂等可重试：token 记录同 key
+    // 覆盖写 + 扣费幂等键（token:<key>）在 prepare 阶段短路 duplicate，
+    // 重试不会双扣。服务端 chargeTokenUsageWithLedger 内部已带 conflict
+    // 重试，走到 402 说明多重冲突，客户端再退避重试一轮兜底。
+    // Effect v4 迁移锚点：白名单重试 ≈ Effect.retry({ while: res =>
+    // retryableStatuses.has(res.status), schedule: Schedule.exponential })，
+    // 退避/抖动由 Schedule 组合表达，测试用 TestClock 免真实 sleep。
+    { retryableStatuses: /* @__PURE__ */ new Set([402, 429, 502, 503]) }
   );
   if (!response.ok) {
     const text = await response.text().catch(() => "");
@@ -9676,6 +9724,12 @@ async function maybeWakeParentDialogAfterLocalSync(args) {
         host: "terminal",
         runtime: "bun",
         entrypoint: "agent-runtime:parent-child-terminal-wake",
+        wakeChildDialogKey: args.childDialogKey,
+        wakeTerminalStatus: "done",
+        wakeDisplayText: buildLocalWakeDisplayText({
+          label: args.childDialogRecord.taskLabel ?? args.childDialogRecord.title,
+          terminalStatus: "done"
+        }),
         subjectRefs,
         ...allowedChildAgentKeys.length ? { allowedChildAgentKeys } : {},
         ...allowedToolNames.length ? { allowedToolNames } : {},
@@ -10088,7 +10142,8 @@ function buildServerPlatformToolExecutors(args) {
           content,
           metadata: {
             serverPlatformTool: true,
-            webTool: toolName
+            webTool: toolName,
+            query: parsed.query
           }
         };
       }
@@ -10110,7 +10165,7 @@ function buildServerPlatformToolExecutors(args) {
     });
     return {
       content: raw,
-      metadata: { serverPlatformTool: true, memoryRead: true }
+      metadata: { serverPlatformTool: true, memoryRead: true, query }
     };
   };
   const rememberMemory = async (call) => {
@@ -10130,13 +10185,16 @@ function buildServerPlatformToolExecutors(args) {
       kind: parsed.kind ?? "episodic",
       source: "agent-inferred"
     };
+    if (typeof parsed.recurrenceEvidence === "string" && parsed.recurrenceEvidence.trim()) {
+      body.recurrenceEvidence = parsed.recurrenceEvidence.trim();
+    }
     if (args.agentKey) body.agentKey = args.agentKey;
     const raw = await postServer("/api/memory/remember", body, {
       retryTransient: true
     });
     return {
       content: raw,
-      metadata: { serverPlatformTool: true, memoryWrite: true }
+      metadata: { serverPlatformTool: true, memoryWrite: true, content }
     };
   };
   const deleteMemory = async (call) => {
@@ -10187,6 +10245,7 @@ function buildServerPlatformToolExecutors(args) {
 }
 
 // packages/cli/client/cliAgentRunToolExecutors.ts
+import * as nodeFs2 from "node:fs";
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
 
 // packages/cli/client/agentRunSnapshot.ts
@@ -10235,6 +10294,7 @@ function buildSnapshot(parsed, event) {
     ...typeof parsed.toolCallCount === "number" && Number.isFinite(parsed.toolCallCount) ? { toolCallCount: parsed.toolCallCount } : {},
     ...lastToolNames ? { lastToolNames } : {},
     ...lastAssistantText ? { lastAssistantText } : {},
+    ...typeof parsed.credits === "number" && Number.isFinite(parsed.credits) ? { credits: parsed.credits } : {},
     ...errorMessage ? { errorMessage } : {},
     ...startedAt !== void 0 ? { startedAt } : {},
     ...finishedAt !== void 0 ? { finishedAt } : {},
@@ -10413,18 +10473,18 @@ function deriveAgentRunTodoStatus(input) {
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir as nodeHomedir } from "node:os";
 import { dirname, join } from "node:path";
-var nodeFs2 = {
+var nodeFs = {
   mkdirSync,
   writeFileSync,
   readFileSync,
   existsSync
 };
-function resolveNoloHome(env, homedir) {
+function resolveNoloHome(env, homedir2) {
   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(homedir(), ".nolo");
+  return join(homedir2(), ".nolo");
 }
 function ensureDir(dir, fs) {
   fs.mkdirSync(dir, { recursive: true });
@@ -10443,9 +10503,9 @@ function writeJson(path, data, fs) {
 }
 function createFileSystemTodoStore(opts = {}) {
   const env = opts.env ?? process.env;
-  const homedir = opts.homedir ?? nodeHomedir;
-  const fs = opts.fs ?? nodeFs2;
-  const noloHome = resolveNoloHome(env, homedir);
+  const homedir2 = opts.homedir ?? nodeHomedir;
+  const fs = opts.fs ?? nodeFs;
+  const noloHome = resolveNoloHome(env, homedir2);
   const filePath = opts.filePath ?? join(noloHome, "agent_run_todos.json");
   const oldFilePath = join(noloHome, "todos.json");
   const loadMap = () => {
@@ -10898,7 +10958,7 @@ function createCliControlAgentRunExecutor(deps = {}) {
           if (!ourEntryFound) {
             if (remainingEntries.length > 0) {
               await withQueueLock(queuePath, deps, () => {
-                const fs = deps.fs ?? nodeFs;
+                const fs = deps.fs ?? nodeFs2;
                 const existing = fs.existsSync(queuePath) ? fs.readFileSync(queuePath, "utf8") : "";
                 fs.writeFileSync(queuePath, serializeQueueEntries(remainingEntries) + existing, "utf8");
               });
@@ -11057,6 +11117,7 @@ function createCliControlAgentRunExecutor(deps = {}) {
 // packages/cli/client/cliLocalToolExecutors.ts
 var MAX_PASTED_TEXT_LINES_PER_READ = 200;
 var PASTED_TEXT_EXPLICIT_OVERSHOOT_LINES = 20;
+var FULLY_DELIVERED_SEGMENT_LINES = MAX_PASTED_TEXT_LINES_PER_READ + PASTED_TEXT_EXPLICIT_OVERSHOOT_LINES;
 var PASTE_LEDGER_MAX_RECORDS = 64;
 function createReadPastedTextExecutor(store) {
   const ledger = /* @__PURE__ */ new Map();
@@ -11124,8 +11185,19 @@ function createReadPastedTextExecutor(store) {
     const clamped = explicitEnd !== void 0 && endLine < explicitEnd && endLine < lines.length;
     const paged = explicitEnd === void 0 && endLine < lines.length;
     const needsFooter = clamped || paged;
+    const nextStartLine = endLine + 1;
+    const remainingLines = lines.length - endLine;
+    const footer = !needsFooter ? void 0 : remainingLines <= FULLY_DELIVERED_SEGMENT_LINES ? `[readPastedText: returned lines ${startLine}-${endLine} of ${lines.length}. Continue with startLine=${nextStartLine}.]` : (() => {
+      const firstEnd = Math.min(
+        nextStartLine + FULLY_DELIVERED_SEGMENT_LINES - 1,
+        lines.length
+      );
+      const secondStart = firstEnd + 1;
+      const secondEnd = Math.min(secondStart + FULLY_DELIVERED_SEGMENT_LINES - 1, lines.length);
+      return `[readPastedText: returned lines ${startLine}-${endLine} of ${lines.length}. Continue with startLine=${nextStartLine}, or fetch the remaining ${remainingLines} lines in one turn with parallel calls (e.g. ${nextStartLine}-${firstEnd}, ${secondStart}-${secondEnd})]`;
+    })();
     const content = needsFooter ? `${delivered}
-[readPastedText: returned lines ${startLine}-${endLine} of ${lines.length}. Continue with startLine=${endLine + 1}.]` : delivered;
+${footer}` : delivered;
     const metadata = {
       pasteId,
       startLine,
@@ -11136,7 +11208,7 @@ function createReadPastedTextExecutor(store) {
       // Continuation pointer whenever more content exists, even when an
       // explicit request was honored in full — the schema contract says a
       // truncated read advertises the exact next startLine.
-      ...endLine < lines.length ? { nextStartLine: endLine + 1 } : {},
+      ...endLine < lines.length ? { nextStartLine: endLine + 1, remainingLines: lines.length - endLine } : {},
       source: "tui-paste-store"
     };
     const persistedChars = content.length + "\n\n[tool metadata]\n".length + JSON.stringify(metadata).length;
@@ -11382,6 +11454,15 @@ function resolveFallbackServers(env) {
 function resolveAuthToken(env) {
   return resolvePlatformAuthToken(env);
 }
+function resolveHybridReadTimeoutMs(env = process.env) {
+  const raw = env.NOLO_HYBRID_READ_TIMEOUT_MS?.trim();
+  if (!raw) return DEFAULT_HYBRID_READ_TIMEOUT_MS;
+  const parsed = Number(raw);
+  if (!Number.isFinite(parsed) || parsed < 0) {
+    return DEFAULT_HYBRID_READ_TIMEOUT_MS;
+  }
+  return parsed;
+}
 function createCliHybridRecordStore(deps) {
   return createHybridRecordStore({
     db: deps.db,
@@ -11390,7 +11471,8 @@ function createCliHybridRecordStore(deps) {
     ),
     fallbackServers: resolveFallbackServers(deps.env),
     authToken: resolveAuthToken(deps.env),
-    fetchImpl: deps.fetchImpl
+    fetchImpl: deps.fetchImpl,
+    requestTimeoutMs: resolveHybridReadTimeoutMs(deps.env)
   });
 }
 
@@ -11615,6 +11697,70 @@ function isRemoteAuthEndpoint(endpoint) {
 
 // packages/cli/client/localRuntimeDialog.ts
 var import_date_fns = __toESM(require_date_fns(), 1);
+import { appendFileSync, mkdirSync as mkdirSync2 } from "fs";
+import { homedir } from "os";
+import { join as join2 } from "path";
+var RAW_USAGE_SCALARS = [
+  "prompt_tokens",
+  "completion_tokens",
+  "total_tokens",
+  "input_tokens",
+  "output_tokens",
+  "cache_read_input_tokens",
+  "cache_creation_input_tokens",
+  "prompt_cache_hit_tokens",
+  "prompt_cache_miss_tokens",
+  "cost",
+  "cost_in_usd_ticks",
+  "provider_call_id"
+];
+var RAW_USAGE_DETAIL_OBJECTS = [
+  "prompt_tokens_details",
+  "completion_tokens_details",
+  "input_tokens_details",
+  "output_tokens_details",
+  "cost_details"
+];
+function projectRawUsage(usage) {
+  const out = {};
+  for (const key of RAW_USAGE_SCALARS) {
+    const value = usage[key];
+    if (typeof value === "number" && Number.isFinite(value)) {
+      out[key] = value;
+    } else if (key === "provider_call_id" && typeof value === "string" && value.trim()) {
+      out[key] = value;
+    }
+  }
+  for (const key of RAW_USAGE_DETAIL_OBJECTS) {
+    const value = usage[key];
+    if (!value || typeof value !== "object" || Array.isArray(value)) continue;
+    const numericLeaves = Object.fromEntries(
+      Object.entries(value).filter(
+        ([, leaf]) => typeof leaf === "number" && Number.isFinite(leaf)
+      )
+    );
+    if (Object.keys(numericLeaves).length > 0) out[key] = numericLeaves;
+  }
+  return out;
+}
+function debugCaptureRawUsage(item) {
+  if (!process.env.NOLO_DEBUG_RAW_USAGE) return;
+  try {
+    const noloHome = process.env.NOLO_HOME?.trim() || join2(homedir(), ".nolo");
+    const dir = join2(noloHome, "logs");
+    mkdirSync2(dir, { recursive: true });
+    appendFileSync(
+      join2(dir, "raw-usage.jsonl"),
+      JSON.stringify({
+        ts: Date.now(),
+        model: item.model,
+        provider: item.provider,
+        usage: projectRawUsage(item.usage)
+      }) + "\n"
+    );
+  } catch {
+  }
+}
 async function resolveStore(deps) {
   if (deps.store) return deps.store;
   return createCliHybridRecordStore({
@@ -11703,6 +11849,7 @@ async function writeLocalTokenRecord(args) {
   const ops = [];
   for (const item of usageRecords) {
     if (!item.usage || Object.keys(item.usage).length === 0) continue;
+    debugCaptureRawUsage(item);
     const timestamp = args.now();
     const callId = item.callId || typeof item.usage.provider_call_id === "string" && item.usage.provider_call_id.trim() || args.createId();
     const prepared = prepareTokenUsageData({
@@ -11722,7 +11869,11 @@ async function writeLocalTokenRecord(args) {
       agentId: args.input.agentKey,
       dialogId: args.dialogId,
       timestamp,
-      entry_path: "cli-local"
+      entry_path: "cli-local",
+      ...item.stablePrefixHash ? {
+        stable_prefix_hash: item.stablePrefixHash,
+        stable_prefix_estimated_tokens: item.stablePrefixEstimatedTokens
+      } : {}
     });
     const recordKey = createTokenKey.recordForStableCall(args.userId, callId);
     const existingToken = await args.store.read(recordKey, { remote: false }).catch(() => null);
@@ -11967,7 +12118,7 @@ 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 : join2(SOURCE_CLI_DIR, "index.ts");
+var CLI_ENTRYPOINT = isCompiledBinary() ? process.execPath : isJsBundle ? currentMetaFile : join3(SOURCE_CLI_DIR, "index.ts");
 async function recordLocalAvailabilityForAgent(args) {
   const now = args.now ?? Date.now;
   const { deps, status } = args;
@@ -12263,17 +12414,22 @@ function createCliLocalRuntimeAdapter(deps) {
     executeTool: async (call, opts) => {
       const contextualCall = opts?.runtimeContext ? { ...call, runtimeContext: opts.runtimeContext } : call;
       let injectedCall = contextualCall;
-      if (contextualCall.name === "startAgentRun" && deps.parentDialogId && typeof contextualCall.arguments === "string") {
+      let spawnedWithoutParent = false;
+      if (contextualCall.name === "startAgentRun" && typeof contextualCall.arguments === "string") {
         try {
           const args = JSON.parse(contextualCall.arguments);
           if (!args.parentDialogId) {
-            injectedCall = {
-              ...contextualCall,
-              arguments: JSON.stringify({
-                ...args,
-                parentDialogId: deps.parentDialogId
-              })
-            };
+            if (deps.parentDialogId) {
+              injectedCall = {
+                ...contextualCall,
+                arguments: JSON.stringify({
+                  ...args,
+                  parentDialogId: deps.parentDialogId
+                })
+              };
+            } else {
+              spawnedWithoutParent = true;
+            }
           }
         } catch {
         }
@@ -12292,6 +12448,15 @@ function createCliLocalRuntimeAdapter(deps) {
         detachMs: resolveExecShellDetachMs(deps.env),
         ...deps.confirmDestructiveAction ? { confirmDestructiveAction: deps.confirmDestructiveAction } : {}
       });
+      if (spawnedWithoutParent && deps.onBackgroundRunSpawned) {
+        try {
+          const payload = JSON.parse(result?.content ?? "");
+          if (payload && typeof payload.runId === "string" && payload.runId) {
+            deps.onBackgroundRunSpawned(payload.runId);
+          }
+        } catch {
+        }
+      }
       return {
         ...result,
         metadata: {
@@ -12330,6 +12495,7 @@ function createCliLocalRuntimeAdapter(deps) {
 export {
   clearCliLocalRuntimePreparedAgentCache,
   isSubtaskRun,
+  RUN_WAKE_CHANNEL_ENV,
   summarizeEndpoint,
   isBuiltinNoloAgentRef,
   readTimestamp,