nolo-cli 0.19.0 → 0.24.0-alpha.6

package/{chunk-23FZYPLC.js → chunk-OJFYT3ZQ.js}

@@ -3,11 +3,11 @@ import {
   refreshAntigravityOAuthToken,
   refreshOpenAiCodexToken,
   refreshXaiOAuthToken
-} from "./chunk-OK6YSWLH.js";
+} from "./chunk-IICW77GI.js";
 import {
   buildLocalAgentLookupKeys,
   shouldReadAgentKeyRemotely
-} from "./chunk-SWDPIPOY.js";
+} from "./chunk-ZGVW7MSZ.js";
 import {
   LOCAL_CODEX_AGENT_ID,
   LOCAL_CODEX_AGENT_KEY,
@@ -16,57 +16,61 @@ import {
 } from "./chunk-VHBWHNVT.js";
 import {
   inferCaptureIntent
-} from "./chunk-MVQ4TBSD.js";
+} from "./chunk-54VHTARN.js";
 import {
   inlineImageUrlsForCustomProvider,
   prepareTools
-} from "./chunk-CZ6NYQTV.js";
+} from "./chunk-P4QWLZGU.js";
 import {
   getAntigravityUserAgent,
   isAntigravityOAuthAgent,
   readAntigravityProjectId,
   resolveAntigravityCloudCodeBaseUrl
-} from "./chunk-FXUSIQC2.js";
+} from "./chunk-SROR5TSM.js";
 import {
-  FORCED_TOOLS,
-  addDefaultLightWebToolsForConfiguredAgents,
-  addDefaultSystemCapabilityTools,
-  appendEnabledPackPromptPatches,
-  applyDisabledTools,
-  applySystemBuiltinSkillFilter,
-  expandEnabledPacks,
   readXPostFunc,
   readXPostFunctionSchema,
   readXhsProfileFunc,
   readXhsProfileFunctionSchema,
   rememberMemoryFunctionSchema,
-  resolveEffectiveEnabledPacks
-} from "./chunk-EDV7EBOI.js";
+  resolveAgentRequiredPackIds,
+  setTodoListFunc
+} from "./chunk-4ZH6GUJF.js";
 import {
   createDrainExhaustedResponse,
   isCoreDrainingBody,
   normalizeNonNegativeMs,
   parseRetryAfterHeaderMs
 } from "./chunk-RQSOAMPJ.js";
-import {
-  normalizeDialogTitle
-} from "./chunk-OWOHNGCN.js";
 import {
   getDefaultCliLocalRuntimeDb
 } from "./chunk-WJRJDX2W.js";
 import {
-  prepareTokenUsageData
-} from "./chunk-SCTYAHYK.js";
+  prepareTokenUsageData,
+  resolveBuiltinPlatformAgentConfig
+} from "./chunk-H2NAWOLH.js";
 import {
   BUILTIN_TITLE_LLM_CONFIG
 } from "./chunk-XOIF2TNF.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-REA4JLBH.js";
+} from "./chunk-M5OZCOBV.js";
+import {
+  FORCED_TOOLS,
+  addDefaultLightWebToolsForConfiguredAgents,
+  addDefaultSystemCapabilityTools,
+  appendEnabledPackPromptPatches,
+  applyDisabledTools,
+  applySystemBuiltinSkillFilter,
+  expandEnabledPacks,
+  resolveEffectiveEnabledPacks
+} from "./chunk-CF7S2RYZ.js";
 import {
   buildAgentRuntimeDialogWritePlan,
+  buildLoadSkillExecutor,
   buildLocalWorkspaceOpenAiTools,
   buildLocalWorkspaceToolset,
+  buildNoloWorkspaceCliToolExecutors,
   createHybridRecordStore,
   createLocalWorkspaceToolExecutors,
   dialogMessageRecordToAgentRuntimeMessage,
@@ -76,36 +80,39 @@ import {
   parseSseDataLineObject,
   readOpenAiCompatibleSseCompletion,
   resolveOpenAiCompatibleProviderConfig
-} from "./chunk-R35XMF6F.js";
+} from "./chunk-H73ZV2GL.js";
 import {
   buildPlatformChatCompletionRequest,
   canUsePlatformChatProvider,
+  hasDirectOpenAiCompatibleProvider,
   parsePlatformChatCompletionData,
   parsePlatformChatCompletionResponse,
   readSseDataValues,
   resolvePlatformChatProviderConfig,
   shouldUsePlatformChatProvider
-} from "./chunk-N54HIJVJ.js";
+} from "./chunk-KFUCLS7Z.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-OIQPORYI.js";
 import {
   summarizeToolArguments
-} from "./chunk-YGW4G5W5.js";
+} from "./chunk-X546QUDT.js";
 import {
   convertMessagesToResponsesInput,
   toResponsesTools
-} from "./chunk-KFEVY3ST.js";
+} from "./chunk-D34RI6NI.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-MHSGJW4Z.js";
+} from "./chunk-EHOYZRTI.js";
 import {
-  buildLoadSkillExecutor,
-  buildNoloWorkspaceCliToolExecutors,
   buildNoloWorkspaceOpenAiTools,
   parseNoloWorkspaceToolArguments,
   resolveRuntimeToolSurfaceForAgent
-} from "./chunk-DKZFOK24.js";
+} from "./chunk-UZH44DWK.js";
+import {
+  buildDialogFallbackTitleFromUserInput,
+  normalizeDialogTitle
+} from "./chunk-2MBTWINN.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
@@ -123,10 +130,7 @@ import {
 } from "./chunk-JZPBVBIY.js";
 import {
   isAdaptiveThinkingModelId
-} from "./chunk-UAIVG4J6.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
+} from "./chunk-CHSCAUZN.js";
 import {
   canonicalizeToolNames
 } from "./chunk-ZZ2MH7LE.js";
@@ -134,13 +138,14 @@ import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
 import {
+  ackRunRecord,
   checkStaleRun,
   finalizeRunRecord,
   findRunRecord,
   gcRunRecords,
   queryRunRecords,
   spawnLocalBackgroundRun
-} from "./chunk-VNAEBGDK.js";
+} from "./chunk-RZNYL4LW.js";
 import {
   TASK_PREVIEW_MAX,
   formatListRunsCard,
@@ -152,14 +157,17 @@ import {
   isAgentRunTerminalStatus,
   resolveRunLabel,
   shortRunId
-} from "./chunk-FQZZLA3C.js";
+} from "./chunk-KXKQO4Q6.js";
 import {
   CliProviderQuotaError,
   executeCli
-} from "./chunk-X7W4TNB4.js";
+} from "./chunk-CMKUBIGW.js";
 import {
   buildCliPrompt
 } from "./chunk-ATNTHIZI.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   isCompiledBinary,
   parseUserIdFromAuthToken
@@ -171,7 +179,7 @@ import {
   createTokenKey,
   createUserKey,
   dialogMessageRange
-} from "./chunk-6Y7A3OQQ.js";
+} from "./chunk-NRY4GCKJ.js";
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";
@@ -182,15 +190,8 @@ import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
 import {
-  BUILTIN_NOLO_AGENT_KEY,
-  PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
-  PUBLIC_DEEPSEEK_V4_PRO_AGENT_KEY,
-  PUBLIC_GLM_52_AGENT_KEY,
-  PUBLIC_KIMI_K26_IMAGE_AGENT_KEY
-} from "./chunk-3ND52WIL.js";
-import {
-  asTrimmedString
-} from "./chunk-3EUW3WEO.js";
+  isSystemBuiltinTrustedAgentKey
+} from "./chunk-ATWUOTJP.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
@@ -782,6 +783,18 @@ var STRINGS = {
     en: "Forked dialog {0} \u2192 {1} (no summary needed).",
     zh: "\u5DF2\u5206\u53C9\u5BF9\u8BDD {0} \u2192 {1}\uFF08\u65E0\u9700\u538B\u7F29\uFF09\u3002"
   },
+  compactSuccess: {
+    en: "\u2713 Compacted dialog {0} \u2192 {1} in {2}.",
+    zh: "\u2713 \u5DF2\u538B\u7F29\u5BF9\u8BDD {0} \u2192 {1}\uFF0C\u8017\u65F6 {2}\u3002"
+  },
+  compactSuccessWithCount: {
+    en: "\u2713 Compacted dialog {0} \u2192 {1} in {2} ({3} messages compressed).",
+    zh: "\u2713 \u5DF2\u538B\u7F29\u5BF9\u8BDD {0} \u2192 {1}\uFF0C\u8017\u65F6 {2}\uFF08\u538B\u7F29 {3} \u6761\u6D88\u606F\uFF09\u3002"
+  },
+  compactForked: {
+    en: "\u2713 Forked dialog {0} \u2192 {1} in {2} (no summary needed).",
+    zh: "\u2713 \u5DF2\u5206\u53C9\u5BF9\u8BDD {0} \u2192 {1}\uFF0C\u8017\u65F6 {2}\uFF08\u65E0\u9700\u538B\u7F29\uFF09\u3002"
+  },
   agentCurrent: { en: "Current agent: {0} ({1})", zh: "\u5F53\u524D agent\uFF1A{0}\uFF08{1}\uFF09" },
   agentUnknown: {
     en: `I don't know agent "{0}" yet.
@@ -915,6 +928,11 @@ var TOOL_LABELS = {
   captureVisualState: { en: "Capture", zh: "\u622A\u5C4F" },
   // Workspace / diagnostics
   searchWorkspace: { en: "Search workspace", zh: "\u641C\u7D22\u5DE5\u4F5C\u533A" },
+  // 同一工具在 web/server 工具面用 snake_case 命名（packages/ai/tools/index.ts）。
+  search_workspace: { en: "Search workspace", zh: "\u641C\u7D22\u5DE5\u4F5C\u533A" },
+  // 全空间搜索：内置 skill search-all-spaces 声明的工作区工具，loadSkill 后进入
+  // 工具面；同样需要中英文标签，避免回退成裸工具名。
+  search_all_spaces: { en: "Search all spaces", zh: "\u641C\u7D22\u5168\u90E8\u7A7A\u95F4" },
   cliDoctor: { en: "Doctor", zh: "\u81EA\u68C0" },
   cliWhoami: { en: "Whoami", zh: "\u67E5\u770B\u8EAB\u4EFD" },
   checkEnv: { en: "Check env", zh: "\u68C0\u67E5\u73AF\u5883" },
@@ -960,185 +978,6 @@ function agentRunCardLabels() {
   };
 }
 
-// packages/ai/tools/agent/quotaCircuitBreaker.ts
-var QUOTA_ERROR_PATTERNS = [
-  /429/,
-  /quota/i,
-  /rate\s*limit/i,
-  /too\s*many\s*requests/i,
-  /额度/,
-  /上限/,
-  /用尽/,
-  /CliProviderQuotaError/i
-];
-var AGENT_NOT_FOUND_PATTERNS = [
-  /agent[^\n]{0,80}not\s+found/i,
-  /agent[^\n]{0,80}not\s+exist/i,
-  /agent[^\n]{0,80}不存在/i,
-  /agent[^\n]{0,80}未找到/i,
-  /AGENT_NOT_FOUND/
-];
-var AUTH_ERROR_PATTERNS = [
-  /401/,
-  /403/,
-  /unauthori[sz]ed/i,
-  /authentication\s+failed/i,
-  /invalid\s+(api[-\s]?key|token|credential)/i,
-  /api[-\s]?key\s+(invalid|missing|not\s+found)/i,
-  /token\s*(invalid|expired|失效|过期)/i,
-  /未授权/,
-  /认证失败/,
-  /凭证/
-];
-var NETWORK_ERROR_PATTERNS = [
-  /ECONNREFUSED|ECONNRESET|ETIMEDOUT|ENOTFOUND|EHOSTUNREACH|EPIPE/i,
-  /getaddrinfo|DNS\s+(error|fail)/i,
-  /fetch\s+failed/i,
-  /network\s+(error|unreachable|down|disconnected)/i,
-  /socket\s+(hang|closed|error)/i,
-  /连接失败/,
-  /网络错误|网络异常|无法连接/
-];
-function findActiveBreaker(now, table, target) {
-  if (!Number.isFinite(now)) return void 0;
-  for (const entry of table) {
-    if (entry.target !== target) continue;
-    if (typeof entry.until === "number" && entry.until > now) return entry;
-  }
-  return void 0;
-}
-function isCliProviderQuotaErrorShape(error) {
-  if (!error || typeof error !== "object") return false;
-  const e = error;
-  return e.name === "CliProviderQuotaError" || typeof e.message === "string" && e.message.startsWith("[QUOTA_LIMITED:");
-}
-function isQuotaExhaustedError(error) {
-  if (!error) return false;
-  if (isCliProviderQuotaErrorShape(error)) return true;
-  if (error instanceof Error) {
-    return QUOTA_ERROR_PATTERNS.some((pattern) => pattern.test(error.message));
-  }
-  if (typeof error === "string") {
-    return QUOTA_ERROR_PATTERNS.some((pattern) => pattern.test(error));
-  }
-  const maybeStatus = error.status;
-  if (typeof maybeStatus === "number" && maybeStatus === 429) return true;
-  const maybeStatusCode = error.statusCode;
-  if (typeof maybeStatusCode === "number" && maybeStatusCode === 429) return true;
-  return false;
-}
-function isAgentNotFoundError(error) {
-  if (!error) return false;
-  const e = error;
-  if (e.code === "AGENT_NOT_FOUND") return true;
-  const message = typeof e.message === "string" ? e.message : typeof error === "string" ? error : "";
-  if (AGENT_NOT_FOUND_PATTERNS.some((pattern) => pattern.test(message))) return true;
-  if ((e.status === 404 || e.statusCode === 404) && /agent|不存在|未找到/i.test(message)) {
-    return true;
-  }
-  return false;
-}
-function extractMessage(error) {
-  if (typeof error === "string") return error;
-  if (error instanceof Error) return error.message;
-  if (error && typeof error === "object") {
-    const m = error.message;
-    return typeof m === "string" ? m : "";
-  }
-  return "";
-}
-function extractStatus(error) {
-  if (!error || typeof error !== "object") return void 0;
-  const e = error;
-  const s = typeof e.status === "number" ? e.status : void 0;
-  const sc = typeof e.statusCode === "number" ? e.statusCode : void 0;
-  return s ?? sc;
-}
-function parseResetsInMs(text) {
-  if (!text) return void 0;
-  const unitMs = (n, unit) => {
-    if (/^d/.test(unit)) return n * 24 * 3600 * 1e3;
-    if (/^h/.test(unit)) return n * 3600 * 1e3;
-    if (/^m/.test(unit)) return n * 60 * 1e3;
-    if (/^s/.test(unit)) return n * 1e3;
-    return NaN;
-  };
-  const re = /(\d+)\s*(d(?:ay|ays)?|h(?:r|rs|our|ours)?|m(?:in|ins|inute|inutes)?|s(?:ec|ecs|econd|econds)?)/gi;
-  let totalMs = 0;
-  let matched = false;
-  let m;
-  while ((m = re.exec(text)) !== null) {
-    const ms = unitMs(Number(m[1]), m[2]);
-    if (!Number.isFinite(ms)) continue;
-    totalMs += ms;
-    matched = true;
-  }
-  return matched ? totalMs : void 0;
-}
-function extractProvider(error) {
-  if (!error || typeof error !== "object") return void 0;
-  const p = error.provider;
-  if (typeof p === "string" && p.length > 0) return p;
-  const message = extractMessage(error);
-  const tag = /\[QUOTA_LIMITED:([^\]]+)\]/i.exec(message);
-  if (tag?.[1]) return tag[1];
-  return void 0;
-}
-function extractRetryAfterHeader(error) {
-  if (!error || typeof error !== "object") return void 0;
-  const headers = error.headers;
-  if (!headers || typeof headers !== "object") return void 0;
-  const raw = headers["retry-after"];
-  if (typeof raw !== "string" && typeof raw !== "number") return void 0;
-  const secs = Number(raw);
-  return Number.isFinite(secs) && secs > 0 ? secs * 1e3 : void 0;
-}
-function classifyRunFailure(error) {
-  const message = extractMessage(error);
-  const status = extractStatus(error);
-  const retryAfterMs = extractRetryAfterHeader(error) ?? parseResetsInMs(message);
-  if (isQuotaExhaustedError(error)) {
-    return {
-      reason: "quota",
-      provider: extractProvider(error),
-      // 纯函数不取时钟：resetsAt 由调用方用 now + retryAfterMs 计算后补齐
-      retryAfterMs,
-      message
-    };
-  }
-  if (isAgentNotFoundError(error)) {
-    return { reason: "agent-not-found", message };
-  }
-  if (isAuthError(error)) {
-    return { reason: "auth", message };
-  }
-  if (isNetworkError(error)) {
-    return { reason: "network", message };
-  }
-  return { reason: "other", message };
-}
-function isAuthError(error) {
-  const message = extractMessage(error);
-  const status = extractStatus(error);
-  if (status === 401 || status === 403) return true;
-  return AUTH_ERROR_PATTERNS.some((pattern) => pattern.test(message));
-}
-function isNetworkError(error) {
-  const message = extractMessage(error);
-  return NETWORK_ERROR_PATTERNS.some((pattern) => pattern.test(message));
-}
-var DEFAULT_QUOTA_BREAKER_MS = 6 * 3600 * 1e3;
-var DEFAULT_AGENT_NOT_FOUND_BREAKER_MS = 15 * 60 * 1e3;
-function buildBreakerEntry(now, target, kind, retryAfterMs) {
-  const ttl = kind === "quota" ? typeof retryAfterMs === "number" && retryAfterMs > 0 ? retryAfterMs : DEFAULT_QUOTA_BREAKER_MS : DEFAULT_AGENT_NOT_FOUND_BREAKER_MS;
-  return {
-    target,
-    kind,
-    until: now + ttl,
-    ...kind === "quota" && typeof retryAfterMs === "number" ? { resetsAt: now + retryAfterMs } : {}
-  };
-}
-
 // packages/cli/client/localRuntimeDiagnostics.ts
 import { ulid } from "ulid";
 var preparedAgentRuntimeCache = /* @__PURE__ */ new Map();
@@ -1177,6 +1016,36 @@ function summarizeOpenAiToolNames(tools) {
   }, []);
 }
 
+// packages/agent-runtime/agentRunIsolation.ts
+var ORCHESTRATION_TOOL_NAMES = /* @__PURE__ */ new Set([
+  "startAgentRun",
+  "controlAgentRun",
+  "listAgents",
+  "readAgent",
+  "startAgentDialog",
+  "runStreamingAgent",
+  "streamParallelAgents"
+]);
+var SUBTASK_REMOVED_GIT_TOOL_NAMES = /* @__PURE__ */ new Set([
+  "gitAdd",
+  "gitCommit",
+  "gitCreateBranch",
+  "commitWorkspace"
+]);
+var SUBTASK_REMOVED_TOOL_NAMES = /* @__PURE__ */ new Set([
+  ...ORCHESTRATION_TOOL_NAMES,
+  ...SUBTASK_REMOVED_GIT_TOOL_NAMES
+]);
+function isSubtaskRun(env) {
+  if (!env) return false;
+  const value = env.NOLO_AGENT_RUN_CHILD;
+  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));
+}
+
 // packages/cli/client/localRuntimeAdapter.ts
 import { dirname as dirname2, extname, join as join2 } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -1662,93 +1531,6 @@ function assertWithinLocalToolBudget(args) {
   );
 }
 
-// packages/agent-runtime/builtinPlatformAgentConfigs.ts
-var BUILTIN_PLATFORM_AGENT_CONFIGS = {
-  [PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY]: {
-    key: PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
-    name: "DeepSeek V4 Flash",
-    provider: "nolo",
-    model: "deepseek-v4-flash",
-    apiSource: "platform",
-    useServerProxy: true,
-    rawRecord: {
-      dbKey: PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
-      isPublic: true,
-      provider: "nolo",
-      model: "deepseek-v4-flash",
-      apiSource: "platform",
-      useServerProxy: true
-    }
-  },
-  [PUBLIC_DEEPSEEK_V4_PRO_AGENT_KEY]: {
-    key: PUBLIC_DEEPSEEK_V4_PRO_AGENT_KEY,
-    name: "DeepSeek V4 Pro",
-    provider: "nolo",
-    model: "deepseek-v4-pro",
-    apiSource: "platform",
-    useServerProxy: true,
-    rawRecord: {
-      dbKey: PUBLIC_DEEPSEEK_V4_PRO_AGENT_KEY,
-      isPublic: true,
-      provider: "nolo",
-      model: "deepseek-v4-pro",
-      apiSource: "platform",
-      useServerProxy: true
-    }
-  },
-  [PUBLIC_GLM_52_AGENT_KEY]: {
-    key: PUBLIC_GLM_52_AGENT_KEY,
-    name: "GLM 5.2",
-    provider: "nolo",
-    model: "glm-5.2",
-    apiSource: "platform",
-    useServerProxy: true,
-    rawRecord: {
-      dbKey: PUBLIC_GLM_52_AGENT_KEY,
-      isPublic: true,
-      provider: "nolo",
-      model: "glm-5.2",
-      apiSource: "platform",
-      useServerProxy: true
-    }
-  },
-  [PUBLIC_KIMI_K26_IMAGE_AGENT_KEY]: {
-    key: PUBLIC_KIMI_K26_IMAGE_AGENT_KEY,
-    name: "Kimi K2.6",
-    provider: "nolo",
-    model: "kimi-k2.6",
-    apiSource: "platform",
-    useServerProxy: true,
-    rawRecord: {
-      dbKey: PUBLIC_KIMI_K26_IMAGE_AGENT_KEY,
-      isPublic: true,
-      provider: "nolo",
-      model: "kimi-k2.6",
-      apiSource: "platform",
-      useServerProxy: true
-    }
-  },
-  [BUILTIN_NOLO_AGENT_KEY]: {
-    key: BUILTIN_NOLO_AGENT_KEY,
-    name: "Nolo",
-    provider: "nolo",
-    model: "deepseek-v4-flash",
-    apiSource: "platform",
-    useServerProxy: true,
-    rawRecord: {
-      dbKey: BUILTIN_NOLO_AGENT_KEY,
-      isPublic: true,
-      provider: "nolo",
-      model: "deepseek-v4-flash",
-      apiSource: "platform",
-      useServerProxy: true
-    }
-  }
-};
-function resolveBuiltinPlatformAgentConfig(agentRef) {
-  return BUILTIN_PLATFORM_AGENT_CONFIGS[agentRef] ?? null;
-}
-
 // packages/cli/client/localDialogRecords.ts
 var localDialogMessageRecordToRuntimeMessage = dialogMessageRecordToAgentRuntimeMessage;
 function buildLocalDialogWritePlan(args) {
@@ -1814,22 +1596,6 @@ async function readDialogMessages(args) {
 }
 
 // packages/cli/client/cliProviderHelpers.ts
-function buildDelegatedTaskContent(task, input) {
-  if (input === void 0 || input === null) {
-    return task;
-  }
-  if (typeof input === "string") {
-    return `${task}
-
---- INPUT (text) ---
-${input}`;
-  }
-  const jsonStr = JSON.stringify(input, null, 2);
-  return `${task}
-
---- INPUT (json) ---
-${jsonStr}`;
-}
 function isCliProviderAgent(agentConfig) {
   return Boolean(
     agentConfig.apiSource === "cli" || agentConfig.provider === "cli" || agentConfig.cliProvider
@@ -1890,7 +1656,7 @@ function collectCliProviderImageInputs(messages) {
 }
 
 // packages/cli/client/cliAgentConfigHelpers.ts
-var BUILTIN_NOLO_AGENT_KEY2 = NOLO_DEFAULT_AGENT_KEY;
+var BUILTIN_NOLO_AGENT_KEY = NOLO_DEFAULT_AGENT_KEY;
 var BUILTIN_NOLO_AGENT_ID = NOLO_DEFAULT_AGENT_ID;
 function resolveLocalUserId(env) {
   const explicitUserId = env.NOLO_LOCAL_USER_ID || env.NOLO_USER_ID;
@@ -1901,7 +1667,7 @@ function resolveLocalUserId(env) {
 function isBuiltinNoloAgentRef(ref) {
   if (typeof ref !== "string") return false;
   const normalized = ref.trim();
-  return normalized === BUILTIN_NOLO_AGENT_KEY2 || normalized === BUILTIN_NOLO_AGENT_ID || normalized.endsWith(`-${BUILTIN_NOLO_AGENT_ID}`);
+  return normalized === BUILTIN_NOLO_AGENT_KEY || normalized === BUILTIN_NOLO_AGENT_ID || normalized.endsWith(`-${BUILTIN_NOLO_AGENT_ID}`);
 }
 function isBuiltinNoloAgentConfig(agentConfig) {
   const key = agentConfig?.key || agentConfig?.rawRecord?.dbKey || agentConfig?.rawRecord?.agentKey;
@@ -1913,14 +1679,15 @@ function withResolvedRuntimeToolSurface(agentConfig, env) {
   const currentUserId = resolveLocalUserId(env);
   const rawRecord = agentConfig.rawRecord ?? {};
   const ownerId = asOptionalTrimmedString(rawRecord.userId) ?? null;
+  const agentKey = rawRecord.dbKey ?? agentConfig.key;
   const toolSurface = resolveRuntimeToolSurfaceForAgent({
     explicitToolNames: agentConfig.toolNames,
     currentUserId,
     agentOwnerId: ownerId,
-    agentKey: rawRecord.dbKey ?? agentConfig.key,
+    agentKey,
     isPublic: !isBuiltinNoloAgentConfig(agentConfig) && rawRecord.isPublic === true,
     sharingLevel: typeof rawRecord.sharingLevel === "string" ? rawRecord.sharingLevel : null,
-    trustedPrivateInvocation: isBuiltinNoloAgentConfig(agentConfig),
+    trustedPrivateInvocation: isBuiltinNoloAgentConfig(agentConfig) || isSystemBuiltinTrustedAgentKey(agentKey),
     runtimeHost: "cli"
   });
   return {
@@ -2439,54 +2206,29 @@ function aggregateBatch(input) {
   };
 }
 
-// packages/ai/tools/agent/runtimeTodo.ts
-var TODO_REVIEW_BLOCK = "BLOCK";
-function deriveTodoStatus(input) {
+// packages/ai/tools/agent/agentRunTodo.ts
+var SUCCESS_STATUSES = /* @__PURE__ */ new Set(["completed", "done", "success", "passed", "finished"]);
+var FAILED_STATUSES = /* @__PURE__ */ new Set(["failed", "error", "stopped", "cancelled", "orphaned", "blocked"]);
+function deriveAgentRunTodoStatus(input) {
   const { todo, runs } = input;
-  if (todo.status === "abandoned") {
-    return { status: "abandoned" };
-  }
-  if (runs.length === 0) {
-    return { status: todo.status };
-  }
-  if (runs.some((r) => !isAgentRunTerminalStatus(r.status))) {
-    return { status: "running", latestRun: latestRun(runs) };
+  if (!runs || runs.length === 0) {
+    return { status: todo.status ?? "pending" };
   }
-  const latest = latestRun(runs);
-  if (latest?.reviewVerdict === TODO_REVIEW_BLOCK) {
-    return {
-      status: "blocked",
-      latestRun: latest,
-      blockedReason: clipSummary(latest.reviewReason, MAX_ERROR_SUMMARY_CHARS)
-    };
+  const latestRun = runs[runs.length - 1];
+  const hasRunning = runs.some(
+    (r) => r.status === "running" || r.status === "in_progress" || r.status === "executing"
+  );
+  if (hasRunning) {
+    return { status: "running", latestRun };
   }
-  if (latest?.status === "done") {
-    return { status: "done", latestRun: latest };
+  const runStatus = (latestRun.status || "").toLowerCase();
+  if (SUCCESS_STATUSES.has(runStatus)) {
+    return { status: "done", latestRun };
   }
-  return { status: "pending", latestRun: latest };
-}
-function toEpochMs2(iso) {
-  if (!iso) return void 0;
-  const ms = Date.parse(iso);
-  return Number.isFinite(ms) ? ms : void 0;
-}
-function latestRun(runs) {
-  let latest;
-  let latestScore = -1;
-  for (const run of runs) {
-    const score = toEpochMs2(run.finishedAt) ?? toEpochMs2(run.startedAt) ?? -1;
-    if (latest === void 0 || score >= latestScore) {
-      latest = run;
-      latestScore = score;
-    }
+  if (FAILED_STATUSES.has(runStatus)) {
+    return { status: "failed", latestRun };
   }
-  return latest;
-}
-function clipSummary(text, max) {
-  if (!text) return void 0;
-  const folded = text.replace(/\s+/g, " ").trim();
-  if (folded.length === 0) return void 0;
-  return folded.length > max ? `${folded.slice(0, max - 1)}\u2026` : folded;
+  return { status: todo.status ?? "pending", latestRun };
 }
 
 // packages/cli/client/fileSystemStores.ts
@@ -2519,50 +2261,41 @@ function readJson(path, fs) {
 function writeJson(path, data, fs) {
   fs.writeFileSync(path, JSON.stringify(data, null, 2));
 }
-function createFileSystemCircuitBreakerStore(opts = {}) {
+function createFileSystemTodoStore(opts = {}) {
   const env = opts.env ?? process.env;
   const homedir = opts.homedir ?? nodeHomedir;
   const fs = opts.fs ?? nodeFs;
-  const filePath = opts.filePath ?? join(resolveNoloHome(env, homedir), "breakers.json");
+  const noloHome = resolveNoloHome(env, homedir);
+  const filePath = opts.filePath ?? join(noloHome, "agent_run_todos.json");
+  const oldFilePath = join(noloHome, "todos.json");
   const loadMap = () => {
-    const data = readJson(filePath, fs);
-    const map = /* @__PURE__ */ new Map();
-    if (data?.entries) {
-      for (const entry of data.entries) {
-        if (entry && typeof entry.target === "string") map.set(entry.target, entry);
+    if (!opts.filePath && !fs.existsSync(filePath) && fs.existsSync(oldFilePath)) {
+      const oldData = readJson(oldFilePath, fs);
+      const map2 = /* @__PURE__ */ new Map();
+      if (oldData?.todos) {
+        for (const item of oldData.todos) {
+          if (item && typeof item.id === "string") {
+            let status = "pending";
+            if (item.status === "running") status = "running";
+            else if (item.status === "done") status = "done";
+            else if (item.status === "blocked" || item.status === "abandoned" || item.status === "failed") status = "failed";
+            const rec = {
+              ...item,
+              id: item.id,
+              title: item.title || "Untitled Task",
+              status,
+              runIds: Array.isArray(item.runIds) ? item.runIds : [],
+              createdAt: item.createdAt || (/* @__PURE__ */ new Date()).toISOString(),
+              updatedAt: item.updatedAt || (/* @__PURE__ */ new Date()).toISOString()
+            };
+            map2.set(rec.id, rec);
+          }
+        }
       }
+      ensureDir(dirname(filePath), fs);
+      writeJson(filePath, { todos: [...map2.values()] }, fs);
+      return map2;
     }
-    return map;
-  };
-  const persist = (map) => {
-    ensureDir(dirname(filePath), fs);
-    writeJson(filePath, { entries: [...map.values()] }, fs);
-  };
-  return {
-    get(target) {
-      return loadMap().get(target);
-    },
-    set(entry) {
-      const map = loadMap();
-      map.set(entry.target, entry);
-      persist(map);
-    },
-    clear(target) {
-      const map = loadMap();
-      map.delete(target);
-      persist(map);
-    },
-    clearAll() {
-      persist(/* @__PURE__ */ new Map());
-    }
-  };
-}
-function createFileSystemTodoStore(opts = {}) {
-  const env = opts.env ?? process.env;
-  const homedir = opts.homedir ?? nodeHomedir;
-  const fs = opts.fs ?? nodeFs;
-  const filePath = opts.filePath ?? join(resolveNoloHome(env, homedir), "todos.json");
-  const loadMap = () => {
     const data = readJson(filePath, fs);
     const map = /* @__PURE__ */ new Map();
     if (data?.todos) {
@@ -2578,13 +2311,15 @@ function createFileSystemTodoStore(opts = {}) {
   };
   return {
     async getTodo(id) {
-      return loadMap().get(id);
+      return loadMap().get(id) ?? null;
     },
-    async listTodos(filter) {
-      const all = [...loadMap().values()];
-      if (!filter?.statuses || filter.statuses.length === 0) return all;
-      const wanted = new Set(filter.statuses);
-      return all.filter((t2) => wanted.has(t2.status));
+    async listTodos() {
+      return [...loadMap().values()];
+    },
+    async saveTodo(todo) {
+      const map = loadMap();
+      map.set(todo.id, todo);
+      persist(map);
     },
     async putTodo(todo) {
       const map = loadMap();
@@ -2593,8 +2328,10 @@ function createFileSystemTodoStore(opts = {}) {
     },
     async deleteTodo(id) {
       const map = loadMap();
+      const existed = map.has(id);
       map.delete(id);
       persist(map);
+      return existed;
     }
   };
 }
@@ -2621,10 +2358,8 @@ var tailFile = (logPath, tailLines, fs) => {
     return void 0;
   }
 };
-var resolveBreakerStore = (deps) => deps.breakerStore ?? createFileSystemCircuitBreakerStore({ env: deps.env, homedir: deps.homedir, fs: deps.fs });
 var resolveTodoStore = (deps) => deps.todoStore ?? createFileSystemTodoStore({ env: deps.env, homedir: deps.homedir, fs: deps.fs });
 var resolveNowMs = (deps) => typeof deps.nowMs === "function" ? deps.nowMs() : Date.now();
-var resolveTarget = (deps, agentKey) => typeof deps.resolveProviderTarget === "function" ? deps.resolveProviderTarget(agentKey) : agentKey;
 function buildProgressField(record, nowMs) {
   const activity = record.activity;
   if (!activity || isAgentRunTerminalStatus(record.status)) return {};
@@ -2642,6 +2377,55 @@ function buildProgressField(record, nowMs) {
   }
   return { progress };
 }
+var WAIT_POLL_INTERVAL_MS = 500;
+var DEFAULT_WAIT_TIMEOUT_MS = 1e5;
+function buildRunStatusPayload(reconciled, deps, opts = {}) {
+  const logLines = opts.logTail ? opts.logTail.split("\n") : void 0;
+  const name = resolveRunLabel(reconciled);
+  const labels = agentRunCardLabels();
+  return {
+    content: JSON.stringify({
+      runId: reconciled.runId,
+      found: true,
+      status: reconciled.status,
+      pid: reconciled.pid ?? null,
+      agentKey: reconciled.agentKey,
+      ...reconciled.agentName ? { agentName: reconciled.agentName } : {},
+      startedAt: reconciled.startedAt,
+      endedAt: reconciled.endedAt ?? null,
+      exitCode: reconciled.exitCode ?? null,
+      // Expose dialogId so the caller can read the agent's actual output
+      // via `nolo dialog read <dialogId>`. The dialog is the authoritative
+      // result store; the run log is the child process stdout/stderr,
+      // whose contents vary by provider (some stream tokens to stdout,
+      // some only emit startup + stderr). Because status does not carry
+      // logTail by default, a "done" run with an empty logTail is
+      // indistinguishable from a hung run without this field. Surfacing
+      // dialogId gives the caller a reliable way to fetch the result.
+      ...reconciled.dialogId ? { dialogId: reconciled.dialogId } : {},
+      // Progress is what makes tailLines:0 an actual answer to "is it
+      // stuck?". Without it a poll returns `running` and a pid, so the only
+      // way to tell a working run from a wedged one was to pull 30 lines of
+      // log — the exact thing the orchestration prompt tells the model not
+      // to do. The registry has been recording this all along and `nolo
+      // agent status` has been printing it; only the tool was blind.
+      ...buildProgressField(reconciled, resolveNowMs(deps)),
+      ...opts.logTail !== void 0 ? { logTail: opts.logTail } : {},
+      ...logLines ? { logLines } : {}
+    }),
+    metadata: {
+      displayData: formatStatusRunCard(name, reconciled.status, {
+        runId: reconciled.runId,
+        timing: {
+          startedAt: readTimestamp(reconciled.startedAt),
+          finishedAt: readTimestamp(reconciled.endedAt)
+        },
+        logLines,
+        labels
+      })
+    }
+  };
+}
 function createCliStartAgentRunExecutor(deps = {}) {
   return async (call) => {
     const args = parseCallArgs(call);
@@ -2649,29 +2433,7 @@ function createCliStartAgentRunExecutor(deps = {}) {
     const task = typeof args.task === "string" ? args.task.trim() : "";
     if (!agentKey) throw new Error("startAgentRun: \u7F3A\u5C11 agentKey \u53C2\u6570\u3002");
     if (!task) throw new Error("startAgentRun: \u7F3A\u5C11\u6709\u6548\u7684 task \u6587\u672C\u63CF\u8FF0\u3002");
-    const breakerStore = resolveBreakerStore(deps);
-    const target = resolveTarget(deps, agentKey);
     const nowMs = resolveNowMs(deps);
-    const activeBreaker = findActiveBreaker(
-      nowMs,
-      [breakerStore.get(target)].filter(Boolean),
-      target
-    );
-    if (activeBreaker) {
-      const resetsAt = activeBreaker.resetsAt;
-      return {
-        content: JSON.stringify({
-          rejected: true,
-          reason: "quota",
-          provider: target,
-          ...resetsAt !== void 0 ? { resetsAt } : {},
-          message: `provider ${target} \u5904\u4E8E\u7194\u65AD\u671F\uFF08\u914D\u989D\u8017\u5C3D\uFF09\uFF0C\u5EFA\u8BAE\u6539\u6D3E\u5176\u5B83 provider\u3002`
-        }),
-        metadata: {
-          displayData: `Run rejected \xB7 quota breaker active on ${target}`
-        }
-      };
-    }
     const message = typeof args.input === "undefined" ? task : `${task}
 
 --- \u9644\u52A0\u8F93\u5165 ---
@@ -2719,16 +2481,15 @@ ${JSON.stringify(args.input)}`;
           id: todoId,
           title: taskPreview || task.slice(0, 100),
           status: existing?.status ?? "pending",
-          ...existing?.specPath ? { specPath: existing.specPath } : {},
-          ...existing?.worktree ? { worktree: existing.worktree } : {},
-          ...existing?.branch ? { branch: existing.branch } : {},
-          ...deps.cwd ? { worktree: deps.cwd } : {},
           runIds,
-          deps: existing?.deps ?? [],
           createdAt: existing?.createdAt ?? nowIso,
           updatedAt: nowIso
         };
-        await todoStore.putTodo(todo);
+        if (typeof todoStore.saveTodo === "function") {
+          await todoStore.saveTodo(todo);
+        } else {
+          await todoStore.putTodo(todo);
+        }
       } catch {
       }
     }
@@ -2808,12 +2569,11 @@ function createCliControlAgentRunExecutor(deps = {}) {
         }
       };
     }
-    if (action === "todo") {
+    if (action === "todo" || action === "agentRunTodo" || action === "agent_run_todo") {
       const todoStore = resolveTodoStore(deps);
-      const statusesRaw = typeof args.status === "string" ? args.status.trim() : void 0;
-      const filter = statusesRaw && statusesRaw !== "all" ? { statuses: statusesRaw.split(",").map((s) => s.trim()).filter(Boolean) } : void 0;
-      const todos = await todoStore.listTodos(filter);
-      const enriched = await Promise.all(
+      const todos = await todoStore.listTodos();
+      const statusFilter = typeof args.status === "string" ? args.status.trim().toLowerCase() : void 0;
+      let enriched = await Promise.all(
         todos.map(async (todo) => {
           const runSummaries = [];
           for (const rid of todo.runIds) {
@@ -2822,26 +2582,29 @@ function createCliControlAgentRunExecutor(deps = {}) {
             runSummaries.push({
               runId: rec.runId,
               status: rec.status,
-              startedAt: rec.startedAt,
+              startedAt: readTimestamp(rec.startedAt)?.toString(),
+              finishedAt: readTimestamp(rec.endedAt)?.toString(),
               ...rec.agentName ? { agentName: rec.agentName } : {}
             });
           }
-          const derived = deriveTodoStatus({
+          const derived = deriveAgentRunTodoStatus({
             todo: { id: todo.id, status: todo.status },
-            runs: runSummaries,
-            now: new Date(resolveNowMs(deps)).toISOString()
+            runs: runSummaries
           });
           return {
             id: todo.id,
             title: todo.title,
             status: derived.status,
             runIds: todo.runIds,
-            ...derived.blockedReason ? { blockedReason: derived.blockedReason } : {},
             ...derived.latestRun ? { latestRunId: derived.latestRun.runId, latestRunStatus: derived.latestRun.status } : {},
             updatedAt: todo.updatedAt
           };
         })
       );
+      if (statusFilter && statusFilter !== "all") {
+        const wanted = new Set(statusFilter.split(",").map((s) => s.trim()).filter(Boolean));
+        enriched = enriched.filter((t2) => wanted.has(t2.status.toLowerCase()));
+      }
       return {
         content: JSON.stringify({ todos: enriched, count: enriched.length }),
         metadata: {
@@ -2855,7 +2618,7 @@ function createCliControlAgentRunExecutor(deps = {}) {
         }
       };
     }
-    if (action !== "status" && action !== "stop") {
+    if (action !== "status" && action !== "stop" && action !== "wait") {
       throw new Error(`controlAgentRun: \u672A\u77E5 action "${action}"\u3002`);
     }
     if (!args.runId) throw new Error(`controlAgentRun(action:"${action}"): \u7F3A\u5C11 runId\u3002`);
@@ -2870,70 +2633,43 @@ function createCliControlAgentRunExecutor(deps = {}) {
     if (action === "status") {
       const reconciled = checkStaleRun(record.runId, deps) ?? record;
       const logTail = tailLines > 0 ? tailFile(record.logPath, tailLines, resolveFs(deps)) : void 0;
-      const name = resolveRunLabel(reconciled);
-      const logLines = logTail ? logTail.split("\n") : void 0;
-      const labels2 = agentRunCardLabels();
-      if (reconciled.status === "failed" || reconciled.status === "orphaned") {
-        try {
-          const failureSource = logTail ?? reconciled.note ?? "";
-          const failureInfo = classifyRunFailure(
-            failureSource || reconciled.status
-          );
-          if (failureInfo.reason === "quota") {
-            const t2 = resolveTarget(deps, reconciled.agentKey);
-            const entry = buildBreakerEntry(
-              resolveNowMs(deps),
-              t2,
-              "quota",
-              failureInfo.retryAfterMs
-            );
-            resolveBreakerStore(deps).set(entry);
-          }
-        } catch {
+      return buildRunStatusPayload(reconciled, deps, { logTail });
+    }
+    if (action === "wait") {
+      const timeoutMs = typeof args.timeoutMs === "number" && args.timeoutMs > 0 ? args.timeoutMs : DEFAULT_WAIT_TIMEOUT_MS;
+      const startMs = resolveNowMs(deps);
+      const deadline = startMs + timeoutMs;
+      const sleep = deps.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+      let reconciled = record;
+      for (; ; ) {
+        reconciled = checkStaleRun(record.runId, deps) ?? record;
+        if (isAgentRunTerminalStatus(reconciled.status)) break;
+        const nowMs = resolveNowMs(deps);
+        const waitedMs = nowMs - startMs;
+        if (nowMs >= deadline) {
+          return {
+            content: JSON.stringify({
+              runId: reconciled.runId,
+              found: true,
+              status: "timeout",
+              runStatus: reconciled.status,
+              pid: reconciled.pid ?? null,
+              agentKey: reconciled.agentKey,
+              ...reconciled.agentName ? { agentName: reconciled.agentName } : {},
+              startedAt: reconciled.startedAt,
+              waitedMs,
+              timeoutMs,
+              ...buildProgressField(reconciled, nowMs)
+            }),
+            metadata: {
+              displayData: `\u23F3 wait \u8D85\u65F6\uFF08${Math.round(waitedMs / 1e3)}s\uFF09\uFF0Crun \u4ECD\u5728\u8FD0\u884C\uFF1A\u53EF\u7A0D\u540E\u518D wait\uFF0C\u6216\u6539\u7528 status/stop`
+            }
+          };
         }
+        await sleep(WAIT_POLL_INTERVAL_MS);
       }
-      return {
-        content: JSON.stringify({
-          runId: reconciled.runId,
-          found: true,
-          status: reconciled.status,
-          pid: reconciled.pid ?? null,
-          agentKey: reconciled.agentKey,
-          ...reconciled.agentName ? { agentName: reconciled.agentName } : {},
-          startedAt: reconciled.startedAt,
-          endedAt: reconciled.endedAt ?? null,
-          exitCode: reconciled.exitCode ?? null,
-          // Expose dialogId so the caller can read the agent's actual output
-          // via `nolo dialog read <dialogId>`. The dialog is the authoritative
-          // result store; the run log is the child process stdout/stderr,
-          // whose contents vary by provider (some stream tokens to stdout,
-          // some only emit startup + stderr). Because status does not carry
-          // logTail by default, a "done" run with an empty logTail is
-          // indistinguishable from a hung run without this field. Surfacing
-          // dialogId gives the caller a reliable way to fetch the result.
-          ...reconciled.dialogId ? { dialogId: reconciled.dialogId } : {},
-          // Progress is what makes tailLines:0 an actual answer to "is it
-          // stuck?". Without it a poll returns `running` and a pid, so the only
-          // way to tell a working run from a wedged one was to pull 30 lines of
-          // log — the exact thing the orchestration prompt tells the model not
-          // to do. The registry has been recording this all along and `nolo
-          // agent status` has been printing it; only the tool was blind.
-          ...buildProgressField(reconciled, resolveNowMs(deps)),
-          ...logTail !== void 0 ? { logTail } : {},
-          ...logLines ? { logLines } : {}
-        }),
-        metadata: {
-          displayData: formatStatusRunCard(name, reconciled.status, {
-            runId: reconciled.runId,
-            timing: {
-              startedAt: readTimestamp(reconciled.startedAt),
-              finishedAt: readTimestamp(reconciled.endedAt)
-            },
-            logLines,
-            labels: labels2
-          })
-        }
-      };
+      ackRunRecord(reconciled.runId, deps);
+      return buildRunStatusPayload(reconciled, deps);
     }
     if (typeof record.pid === "number") {
       try {
@@ -3168,6 +2904,20 @@ function buildLocalToolExecutors(args) {
     controlAgentRun: createCliControlAgentRunExecutor({
       env: args.env
     }),
+    setTodoList: async (call) => {
+      const parsedArgs = typeof call?.arguments === "string" ? (() => {
+        try {
+          return JSON.parse(call.arguments);
+        } catch {
+          return {};
+        }
+      })() : call?.arguments || {};
+      const res = await setTodoListFunc(parsedArgs);
+      return {
+        content: JSON.stringify(res.rawData),
+        metadata: { displayData: res.displayData }
+      };
+    },
     ...args.pastedTextStore ? { readPastedText: createReadPastedTextExecutor(args.pastedTextStore) } : {},
     ...args.localToolExecutors ?? {}
   };
@@ -3297,12 +3047,15 @@ function convertOpenAiMessagesToGemini(messages, options) {
     }
     if (role === "assistant") {
       flushPendingFunctionCalls();
-      const parts = [];
       const text = messageText(
         content
       );
-      if (text) parts.push({ text });
       const toolCalls = "tool_calls" in raw && Array.isArray(raw.tool_calls) ? raw.tool_calls ?? [] : [];
+      if (text) pushOrMergeContent("model", [{ text }]);
+      if (toolCalls.length > 0 && contents.length > 0 && contents[contents.length - 1]?.role !== "user") {
+        contents.push({ role: "user", parts: [{ text: "" }] });
+      }
+      const parts = [];
       for (const call of toolCalls) {
         const name = call?.function?.name?.trim();
         if (!name) continue;
@@ -3330,15 +3083,11 @@ function convertOpenAiMessagesToGemini(messages, options) {
     if (role === "tool") {
       const toolCallId = "tool_call_id" in raw && typeof raw.tool_call_id === "string" ? raw.tool_call_id : "";
       const rawName = "name" in raw && typeof raw.name === "string" ? raw.name.trim() : "";
-      const name = toolNamesById.get(toolCallId) || rawName || pendingFunctionCalls[0]?.name || "tool";
       const pendingIndex = pendingFunctionCalls.findIndex(
-        (p) => toolCallId ? p.id === toolCallId : p.name === name
+        (p) => toolCallId ? p.id === toolCallId : rawName ? p.name === rawName : true
       );
-      if (pendingIndex !== -1) {
-        pendingFunctionCalls.splice(pendingIndex, 1);
-      } else if (pendingFunctionCalls.length > 0) {
-        pendingFunctionCalls.shift();
-      }
+      if (pendingIndex === -1) continue;
+      const [{ name, id }] = pendingFunctionCalls.splice(pendingIndex, 1);
       const output = messageText(content) || "{}";
       pushOrMergeContent("user", [
         {
@@ -3349,7 +3098,7 @@ function convertOpenAiMessagesToGemini(messages, options) {
             // Gemini contents 转成 Claude messages 时需要 functionResponse →
             // tool_result 的 tool_use_id；缺 id 时网关报
             // "tool_result.tool_use_id: Field required"（HTTP 400）。
-            ...toolCallId ? { id: toolCallId } : {}
+            ...id ? { id } : {}
           }
         }
       ]);
@@ -10076,13 +9825,25 @@ function stablePromptCacheKey(parts) {
   }
   return `nolo-codex-${hash.toString(16).padStart(8, "0")}`;
 }
+function convertMessagesToCodexInput(messages) {
+  return convertMessagesToResponsesInput(messages).map((item) => {
+    if (item.type !== "reasoning") return item;
+    return {
+      type: "reasoning",
+      summary: item.content.map((part) => ({
+        type: "summary_text",
+        text: part.text
+      }))
+    };
+  });
+}
 function buildCodexRequestBody(args, identity = createCodexRequestIdentity()) {
   const rawMessages = Array.isArray(args.openAiBody.messages) ? args.openAiBody.messages : [];
   const nonSystem = rawMessages.filter((m) => {
     const role = m && typeof m === "object" ? String(m.role) : "";
     return role !== "system" && role !== "developer";
   });
-  const input = convertMessagesToResponsesInput(nonSystem);
+  const input = convertMessagesToCodexInput(nonSystem);
   const instructions = collectInstructions(rawMessages, args.agentConfig.prompt);
   const stableInstructions = collectStableInstructions(rawMessages, args.agentConfig.prompt);
   const model = asOptionalTrimmedString(args.openAiBody.model) ?? asOptionalTrimmedString(args.agentConfig.model) ?? "gpt-5.5";
@@ -10107,12 +9868,47 @@ function buildCodexRequestBody(args, identity = createCodexRequestIdentity()) {
   }
   return body;
 }
+function codexStreamFailureStatus(failure) {
+  const marker = `${failure.code ?? ""} ${failure.type ?? ""}`.toLowerCase();
+  if (marker.includes("overload") || marker.includes("service_unavailable")) return 503;
+  if (marker.includes("rate_limit") || marker.includes("usage_limit")) return 429;
+  return 502;
+}
+var RETRYABLE_CODEX_STREAM_STATUSES = /* @__PURE__ */ new Set([503]);
+var CODEX_STREAM_MAX_ATTEMPTS = 3;
+var CODEX_STREAM_RETRY_BASE_DELAY_MS = 500;
+function toStreamFailure(raw) {
+  if (!raw || typeof raw !== "object") return void 0;
+  const err = raw;
+  const reason = typeof err.reason === "string" ? err.reason : void 0;
+  const message = typeof err.message === "string" && err.message ? err.message : reason ? `Codex upstream ended incomplete: ${reason}.` : "";
+  if (!message) return void 0;
+  const code = typeof err.code === "string" ? err.code : reason;
+  return {
+    ...code ? { code } : {},
+    ...typeof err.type === "string" ? { type: err.type } : {},
+    message
+  };
+}
 function aggregateResponsesStream(events) {
   let text = "";
   const toolCalls = [];
   let usage;
+  let failure;
   for (const ev of events) {
     const type = String(ev.type ?? "");
+    if (type === "error") {
+      failure = failure ?? toStreamFailure(ev.error);
+      continue;
+    }
+    if (type === "response.failed" || type === "response.incomplete") {
+      const response = ev.response;
+      failure = failure ?? toStreamFailure(response?.error) ?? toStreamFailure(response?.incomplete_details) ?? {
+        code: type === "response.incomplete" ? "response_incomplete" : "response_failed",
+        message: `Codex upstream ended with ${type}.`
+      };
+      continue;
+    }
     if (type === "response.output_text.delta" && typeof ev.delta === "string") {
       text += ev.delta;
       continue;
@@ -10149,7 +9945,7 @@ function aggregateResponsesStream(events) {
       }
     }
   }
-  return { text, toolCalls, usage };
+  return { text, toolCalls, usage, failure };
 }
 async function readSseEvents(response) {
   return readSseDataValues(response, (line) => {
@@ -10157,19 +9953,9 @@ async function readSseEvents(response) {
     return ev && !Array.isArray(ev) ? ev : null;
   });
 }
-async function fetchCodexResponsesCompletion(args) {
+var defaultSleep2 = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+async function callCodexResponsesOnce(args, accountId) {
   const fetchImpl = args.fetchImpl ?? fetch;
-  const accountId = args.accountId?.trim() || decodeCodexAccountId(args.accessToken);
-  if (!accountId) {
-    return {
-      status: 401,
-      body: {
-        error: {
-          message: "ChatGPT Codex credential is missing chatgpt_account_id. Re-run `nolo auth chatgpt`."
-        }
-      }
-    };
-  }
   const identity = createCodexRequestIdentity();
   const body = buildCodexRequestBody(args, identity);
   const headers = buildCodexCompatibilityHeaders(identity, accountId);
@@ -10188,7 +9974,19 @@ async function fetchCodexResponsesCompletion(args) {
     };
   }
   const events = await readSseEvents(response);
-  const { text, toolCalls, usage } = aggregateResponsesStream(events);
+  const { text, toolCalls, usage, failure } = aggregateResponsesStream(events);
+  if (failure) {
+    return {
+      status: codexStreamFailureStatus(failure),
+      body: {
+        error: {
+          message: failure.message,
+          ...failure.code ? { code: failure.code } : {},
+          ...failure.type ? { type: failure.type } : {}
+        }
+      }
+    };
+  }
   const message = {
     role: "assistant",
     content: text || null
@@ -10208,6 +10006,30 @@ async function fetchCodexResponsesCompletion(args) {
     }
   };
 }
+async function fetchCodexResponsesCompletion(args) {
+  const accountId = args.accountId?.trim() || decodeCodexAccountId(args.accessToken);
+  if (!accountId) {
+    return {
+      status: 401,
+      body: {
+        error: {
+          message: "ChatGPT Codex credential is missing chatgpt_account_id. Re-run `nolo auth chatgpt`."
+        }
+      }
+    };
+  }
+  const sleep = args.sleep ?? defaultSleep2;
+  const requestedMaxAttempts = Number(args.maxAttempts);
+  const maxAttempts = Number.isFinite(requestedMaxAttempts) ? Math.min(10, Math.max(1, Math.floor(requestedMaxAttempts))) : CODEX_STREAM_MAX_ATTEMPTS;
+  let result = await callCodexResponsesOnce(args, accountId);
+  for (let attempt = 1; attempt < maxAttempts; attempt += 1) {
+    if (!RETRYABLE_CODEX_STREAM_STATUSES.has(result.status)) break;
+    if (args.signal?.aborted) break;
+    await sleep(CODEX_STREAM_RETRY_BASE_DELAY_MS * 2 ** (attempt - 1));
+    result = await callCodexResponsesOnce(args, accountId);
+  }
+  return result;
+}
 function isCodexOAuthAgent(agentConfig) {
   if (!agentConfig) return false;
   const apiKeyRef = asTrimmedLowercaseString(agentConfig.apiKeyRef);
@@ -10302,313 +10124,15 @@ function createOAuthApiKeyRefResolver(options = {}) {
   };
 }
 
-// packages/cli/client/hybridRecordStore.ts
-function resolveFallbackServers(env) {
-  const values = [
-    env.NOLO_SERVER_URL,
-    env.BASE_URL,
-    ...NOLO_CLUSTER_SERVERS
-  ].filter((value) => typeof value === "string" && value.trim().length > 0);
-  return [...new Set(values.map(normalizeServerOrigin))];
+// packages/cli/client/cliWorkspaceToolVariants.ts
+function shouldUseDeclaredOnlyLocalWorkspaceTools(env) {
+  const value = env.NOLO_LOCAL_WORKSPACE_TOOLSET || env.NOLO_LOCAL_TOOLSET_MODE || "";
+  return value === "declared-only" || value === "declared";
 }
-function resolveAuthToken(env) {
-  return resolvePlatformAuthToken(env);
-}
-function createCliHybridRecordStore(deps) {
-  return createHybridRecordStore({
-    db: deps.db,
-    defaultServer: normalizeServerOrigin(
-      deps.env.NOLO_SERVER || deps.env.BASE_URL || DEFAULT_NOLO_SERVER_URL
-    ),
-    fallbackServers: resolveFallbackServers(deps.env),
-    authToken: resolveAuthToken(deps.env),
-    fetchImpl: deps.fetchImpl
-  });
-}
-
-// packages/agent-runtime/dialogTitleLlm.ts
-async function generateLocalDialogTitle(input) {
-  const { env, messages, fallbackTitle } = input;
-  const timeoutMs = input.timeoutMs ?? 15e3;
-  const visibleMessages = messages.filter((m) => m.role === "user" || m.role === "assistant").slice(-12).map((m) => ({
-    role: m.role,
-    content: typeof m.content === "string" ? m.content : extractText(m.content)
-  }));
-  if (visibleMessages.length === 0) {
-    return { title: fallbackTitle, source: "fallback" };
-  }
-  try {
-    const providerConfig = await input.resolveProviderConfig({
-      agentConfig: { ...BUILTIN_TITLE_LLM_CONFIG, key: BUILTIN_TITLE_LLM_CONFIG.id },
-      env
-    });
-    if (!providerConfig?.authToken) {
-      return { title: fallbackTitle, source: "fallback" };
-    }
-    const request = input.buildRequest({
-      providerConfig,
-      messages: [
-        {
-          role: "user",
-          content: JSON.stringify(
-            visibleMessages.map((m) => ({ role: m.role, content: m.content }))
-          )
-        }
-      ],
-      stream: false
-    });
-    const res = await input.fetchImpl(request.url, {
-      ...request.init,
-      signal: AbortSignal.timeout(timeoutMs)
-    });
-    if (!res.ok) {
-      return { title: fallbackTitle, source: "fallback" };
-    }
-    const raw = await res.text().catch(() => "");
-    const data = safeParseJson(raw);
-    if (!data) {
-      return { title: fallbackTitle, source: "fallback" };
-    }
-    const parsed = input.parseResponse({ providerConfig, data });
-    const generated = normalizeDialogTitle(parsed.content);
-    if (!generated) {
-      return { title: fallbackTitle, source: "fallback" };
-    }
-    return { title: generated, source: "llm" };
-  } catch {
-    return { title: fallbackTitle, source: "fallback" };
-  }
-}
-function extractText(content) {
-  if (typeof content === "string") return content;
-  if (Array.isArray(content)) {
-    return content.filter((part) => part?.type === "text").map((part) => part.text ?? "").join(" ");
-  }
-  return "";
-}
-function safeParseJson(raw) {
-  try {
-    return JSON.parse(raw);
-  } catch {
-    return null;
-  }
-}
-
-// packages/cli/client/localRuntimeDialog.ts
-async function resolveStore(deps) {
-  if (deps.store) return deps.store;
-  return createCliHybridRecordStore({
-    db: deps.db ?? await defaultLocalRuntimeDb(),
-    env: deps.env,
-    fetchImpl: deps.fetchImpl
-  });
-}
-async function getOrCreateSharedStore(deps) {
-  if (deps.store) return deps.store;
-  const cacheKey = normalizeRuntimeCacheCwd(deps.cwd);
-  let storePromise = hybridStoreCache.get(cacheKey);
-  if (!storePromise) {
-    storePromise = resolveStore(deps);
-    hybridStoreCache.set(cacheKey, storePromise);
-  }
-  return storePromise;
-}
-function createLocalDialogTitleGenerator(deps, ctx) {
-  return async (input) => {
-    if (!canUsePlatformChatProvider(deps.env)) {
-      return null;
-    }
-    const result = await generateLocalDialogTitle({
-      messages: input.messages,
-      env: deps.env,
-      fetchImpl: async (url, init) => fetchWithTransientRetry(
-        deps.fetchImpl ?? fetch,
-        url,
-        init,
-        {
-          sleep: deps.sleep,
-          loopbackRequest: ctx.loopbackRequest
-        }
-      ),
-      resolveProviderConfig: async (args) => resolvePlatformChatProviderConfig({
-        agentConfig: args.agentConfig,
-        env: args.env,
-        apiKeyRefResolver: ctx.apiKeyRefResolver,
-        credentialBroker: ctx.credentialBroker
-      }),
-      buildRequest: (args) => buildPlatformChatCompletionRequest({
-        providerConfig: args.providerConfig,
-        messages: args.messages,
-        stream: false
-      }),
-      parseResponse: (args) => parsePlatformChatCompletionResponse({
-        providerConfig: args.providerConfig,
-        data: args.data,
-        trace: []
-      }),
-      fallbackTitle: input.fallbackTitle,
-      timeoutMs: 15e3
-    });
-    return result.source === "llm" ? result.title : null;
-  };
-}
-async function writeLocalTokenRecord(args) {
-  const rawUsage = args.input.result.usage;
-  if (!rawUsage || typeof rawUsage !== "object" || Object.keys(rawUsage).length === 0) {
-    return;
-  }
-  const timestamp = args.now();
-  const prepared = prepareTokenUsageData({
-    rawUsage,
-    agentConfig: {
-      model: args.input.result.model || "unknown",
-      provider: args.input.result.provider,
-      apiSource: "cli"
-    },
-    userId: args.userId,
-    agentId: args.input.agentKey,
-    dialogId: args.dialogId,
-    timestamp,
-    entry_path: "cli-local"
-  });
-  const recordKey = createTokenKey.record(args.userId, timestamp);
-  const tokenRecord = {
-    id: args.createId(),
-    type: "token",
-    ...prepared.tokenData
-  };
-  await args.store.write(recordKey, tokenRecord);
-}
-async function writeDialog(args) {
-  let existingDialog = null;
-  if (args.input.continueDialogId) {
-    const dialogKey = `dialog-${args.userId}-${args.input.continueDialogId}`;
-    existingDialog = await args.store.read(dialogKey);
-  }
-  const authToken = resolveRuntimeAuthToken(args.env);
-  const isLoggedIn = Boolean(
-    authToken && (parseUserIdFromAuthToken(authToken) || args.env.NOLO_MACHINE_API_KEY?.trim())
-  );
-  const hasExistingTitle = typeof existingDialog?.title === "string" && existingDialog.title.trim();
-  let titleOverride;
-  if (isLoggedIn && !hasExistingTitle && args.titleGenerator) {
-    const fallbackTitle = extractLastUserText(args.input.messages).trim().slice(0, 80) || "Local agent run";
-    try {
-      const generated = await args.titleGenerator({
-        messages: args.input.messages,
-        fallbackTitle
-      });
-      if (generated) {
-        titleOverride = generated;
-      }
-    } catch {
-    }
-  }
-  const plan = buildLocalDialogWritePlan({
-    input: args.input,
-    userId: args.userId,
-    now: args.now(),
-    createId: args.createId,
-    existingDialog,
-    cwd: args.cwd,
-    ...titleOverride ? { titleOverride } : {}
-  });
-  await args.store.batch(plan.ops);
-  try {
-    await writeLocalTokenRecord({
-      store: args.store,
-      input: args.input,
-      userId: args.userId,
-      dialogId: plan.dialogId,
-      now: args.now,
-      createId: args.createId,
-      output: args.output
-    });
-  } catch (error) {
-    args.output?.write(
-      `[nolo] Token usage record write failed (non-fatal): ${toErrorMessage(error)}
-`
-    );
-  }
-  const hasSubjectRefs = localTurnHasSubjectRefs(args.input);
-  const isLocalUser = args.userId === "local";
-  if (!isLocalUser) {
-    try {
-      const syncResult = await syncLocalDialogEvidenceToRemote({
-        env: args.env,
-        fetchImpl: args.fetchImpl,
-        input: args.input,
-        ops: plan.ops,
-        output: args.output,
-        userId: args.userId
-      });
-      if (!syncResult.attempted) {
-        if (hasSubjectRefs) {
-          args.output?.write(
-            "[nolo] Local dialog evidence is local-only; set NOLO_SERVER and AUTH_TOKEN to make subjectRefs remotely queryable.\n"
-          );
-        }
-      }
-    } catch (error) {
-      if (hasSubjectRefs) {
-        throw error;
-      }
-      args.output?.write(
-        `[nolo] Remote dialog evidence sync failed; local dialog only: ${toErrorMessage(
-          error
-        )}
-`
-      );
-    }
-  }
-  return { dialogId: plan.dialogId, title: plan.title };
-}
-function resolveCliDialogRecordKey(userId, dialogId) {
-  if (dialogId.startsWith("dialog-") && !dialogId.includes("-msg-")) {
-    return dialogId;
-  }
-  return `dialog-${userId}-${dialogId}`;
-}
-async function loadCliDialogSummary(args) {
-  const dialogKey = resolveCliDialogRecordKey(args.userId, args.dialogId);
-  const record = await args.store.read(dialogKey);
-  if (!record || typeof record !== "object") return null;
-  const summary = typeof record.summary === "string" ? record.summary.trim() : "";
-  if (!summary) return null;
-  const summarizedBeforeId = record.summarizedBeforeId;
-  return {
-    summary,
-    ...typeof summarizedBeforeId === "string" && summarizedBeforeId ? { summarizedBeforeId } : {}
-  };
-}
-async function saveCliDialogSummary(args) {
-  const dialogKey = resolveCliDialogRecordKey(args.userId, args.dialogId);
-  const existing = await args.store.read(dialogKey) ?? {};
-  const bareId = typeof existing.id === "string" && existing.id ? existing.id : args.dialogId.startsWith("dialog-") ? args.dialogId.slice(args.dialogId.lastIndexOf("-") + 1) : args.dialogId;
-  const compressionCount = typeof existing.compressionCount === "number" ? existing.compressionCount + 1 : 1;
-  await args.store.write(dialogKey, {
-    ...existing,
-    id: bareId,
-    dbKey: dialogKey,
-    type: "dialog",
-    userId: args.userId,
-    summary: args.summary,
-    ...args.summarizedBeforeId !== void 0 ? { summarizedBeforeId: args.summarizedBeforeId } : {},
-    compressionCount,
-    summaryPending: false,
-    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-  });
-}
-
-// packages/cli/client/cliWorkspaceToolVariants.ts
-function shouldUseDeclaredOnlyLocalWorkspaceTools(env) {
-  const value = env.NOLO_LOCAL_WORKSPACE_TOOLSET || env.NOLO_LOCAL_TOOLSET_MODE || "";
-  return value === "declared-only" || value === "declared";
-}
-function resolveGlobFilesDescriptionVariant(env) {
-  return resolveLocalWorkspaceDescriptionVariant(
-    env.NOLO_GLOBFILES_DESCRIPTION_VARIANT
-  );
+function resolveGlobFilesDescriptionVariant(env) {
+  return resolveLocalWorkspaceDescriptionVariant(
+    env.NOLO_GLOBFILES_DESCRIPTION_VARIANT
+  );
 }
 function resolveListFilesDescriptionVariant(env) {
   return resolveLocalWorkspaceDescriptionVariant(
@@ -10652,61 +10176,10 @@ function resolveLocalWorkspaceParameterVariant(value) {
   return value === "minimal" || value === "scoped" || value === "rich" ? value : "rich";
 }
 
-// packages/cli/client/cliChildDialogPersist.ts
-async function persistCliPendingChildDialog(args) {
-  const nowIso = new Date(args.now).toISOString();
-  const dialogKey = `dialog-${args.userId}-${args.dialogId}`;
-  const record = {
-    id: args.dialogId,
-    dbKey: dialogKey,
-    type: "dialog",
-    userId: args.userId,
-    cybots: [args.agentKey],
-    primaryAgentKey: args.agentKey,
-    title: args.title.slice(0, 80),
-    status: "pending",
-    triggerType: "cli-local",
-    executionMode: args.background ? "background" : "foreground",
-    createdAt: nowIso,
-    updatedAt: nowIso,
-    ...args.spaceId ? { spaceId: args.spaceId } : {},
-    ...args.parentDialogId ? { parentDialogId: args.parentDialogId } : {},
-    ...args.rootDialogId ? { rootDialogId: args.rootDialogId } : {},
-    localRuntime: {
-      host: "cli",
-      workspaceRoot: args.workspaceRoot,
-      workspaceKind: "current",
-      workspaceAccess: "inherited"
-    }
-  };
-  await args.store.batch([{ type: "put", key: dialogKey, value: record }]);
-}
-async function persistCliFailedChildDialog(args) {
-  const dialogKey = `dialog-${args.userId}-${args.dialogId}`;
-  const existing = await args.store.read(dialogKey);
-  const existingRecord = existing && typeof existing === "object" ? existing : {};
-  await args.store.batch([
-    {
-      type: "put",
-      key: dialogKey,
-      value: {
-        ...existingRecord,
-        id: args.dialogId,
-        dbKey: dialogKey,
-        status: "failed",
-        errorMessage: args.errorMessage,
-        updatedAt: new Date(args.now).toISOString(),
-        finishedAt: args.now
-      }
-    }
-  ]);
-}
-
 // packages/cli/client/localRuntimeTools.ts
 function buildOpenAiTools(args) {
   const toolset = buildLocalWorkspaceToolsetForEnv(args);
   const toolNameSet = new Set(args.toolNames ?? []);
-  const callAgentTools = toolNameSet.has("callAgent") ? prepareTools(["callAgent"]) : [];
   const uiAskChoiceTools = toolNameSet.has("ask_user") ? prepareTools(["ask_user"]) : [];
   const readPastedTextTools = toolNameSet.has("readPastedText") ? [
     {
@@ -10740,7 +10213,6 @@ function buildOpenAiTools(args) {
     }
   ] : [];
   return [
-    ...callAgentTools,
     ...uiAskChoiceTools,
     ...readPastedTextTools,
     ...buildLocalWorkspaceOpenAiTools({
@@ -10775,7 +10247,7 @@ function addDefaultCliCoreTools(toolNames, env, options) {
 }
 function resolveCliEffectiveEnabledPacks(args) {
   return resolveEffectiveEnabledPacks({
-    enabledPacks: args.enabledPacks,
+    enabledPacks: resolveAgentRequiredPackIds(args),
     declaredOnly: args.declaredOnly,
     emptyFallbackPacks: ["code"]
   });
@@ -10804,6 +10276,7 @@ function resolveCliRequestedToolNames(agentConfig, env, systemBuiltinSkills, opt
         expandEnabledPacks(
           resolveCliEffectiveEnabledPacks({
             enabledPacks: agentConfig?.enabledPacks,
+            skills: agentConfig?.skills,
             declaredOnly
           }),
           resolveRequestedRuntimeToolNames({ agentConfig })
@@ -10822,10 +10295,11 @@ function resolveCliRequestedToolNames(agentConfig, env, systemBuiltinSkills, opt
     declaredOnly ? expanded : addDefaultSystemCapabilityTools(expanded),
     systemBuiltinSkills
   );
-  return applyDisabledTools(
+  const afterDisabled = applyDisabledTools(
     filtered,
     agentConfig?.disabledTools
   );
+  return filterToolNamesForRunKind(afterDisabled, isSubtaskRun(env));
 }
 function resolveProviderOpenAiToolBundle(agentConfig, env, buildTools = buildOpenAiTools, additionalToolNames = [], options) {
   const requestedToolNames = [
@@ -10898,167 +10372,456 @@ function buildServerPlatformOpenAiTools(args) {
     ...webTools
   ];
 }
-function createCliCallAgentToolExecutor(deps, ctx) {
-  const userId = resolveLocalUserId(deps.env);
-  const workspaceRoot = deps.cwd ?? process.cwd();
-  const now = deps.now ?? Date.now;
-  const createId = deps.createId ?? createFallbackId;
-  return async (call) => {
-    const parsed = parseNoloWorkspaceToolArguments(call.arguments);
-    const agentKey = asTrimmedString(parsed.agentKey);
-    const task = asTrimmedString(parsed.task);
-    if (!agentKey) {
-      return {
-        content: JSON.stringify({ error: "callAgent: agentKey is required" }),
-        metadata: { callAgent: true }
-      };
-    }
-    if (!task) {
-      return {
-        content: JSON.stringify({ error: "callAgent: task is required" }),
-        metadata: { callAgent: true }
-      };
-    }
-    const allowedChildAgentKeys = asTrimmedNonEmptyStringArray(
-      ctx.runtimeContext?.allowedChildAgentKeys
-    );
-    if (allowedChildAgentKeys.length > 0 && !allowedChildAgentKeys.includes(agentKey)) {
-      return {
-        content: JSON.stringify({
-          error: "callAgent: agentKey is not allowed by parent runtimeContext.allowedChildAgentKeys",
-          agentKey,
-          allowedChildAgentKeys
-        }),
-        metadata: { callAgent: true }
-      };
-    }
-    const background = parsed.background === true;
-    const parentDialogId = asOptionalTrimmedString(ctx.dialogId);
-    const parentThreadId = parentDialogId ?? asOptionalTrimmedString(ctx.runtimeContext?.parentThreadId);
-    const rootThreadId = asOptionalTrimmedString(ctx.runtimeContext?.rootThreadId) ?? asOptionalTrimmedString(ctx.runtimeContext?.parentThreadId) ?? parentThreadId;
-    const presentationIntent = background ? "background_handoff" : "inline_result";
-    const threadKind = background ? "background" : "inline";
-    const childRuntimeContext = {
-      ...ctx.runtimeContext ?? {},
-      surface: "cli",
-      entrypoint: "agent-tool:callAgent",
-      threadKind,
-      presentationIntent,
-      ...parentThreadId ? { parentThreadId } : {},
-      ...rootThreadId ? { rootThreadId } : {},
-      workspaceRoot,
-      workspaceKind: "current",
-      workspaceAccess: "inherited"
-    };
-    const childDialogId = createId();
-    const store = await getOrCreateSharedStore(deps);
-    await persistCliPendingChildDialog({
-      store,
-      userId,
-      dialogId: childDialogId,
-      agentKey,
-      title: task,
-      spaceId: ctx.spaceId,
-      parentDialogId,
-      rootDialogId: rootThreadId,
-      workspaceRoot,
-      background,
-      now: now()
+
+// packages/cli/client/hybridRecordStore.ts
+function resolveFallbackServers(env) {
+  const values = [
+    env.NOLO_SERVER_URL,
+    env.BASE_URL,
+    ...NOLO_CLUSTER_SERVERS
+  ].filter((value) => typeof value === "string" && value.trim().length > 0);
+  return [...new Set(values.map(normalizeServerOrigin))];
+}
+function resolveAuthToken(env) {
+  return resolvePlatformAuthToken(env);
+}
+function createCliHybridRecordStore(deps) {
+  return createHybridRecordStore({
+    db: deps.db,
+    defaultServer: normalizeServerOrigin(
+      deps.env.NOLO_SERVER || deps.env.BASE_URL || DEFAULT_NOLO_SERVER_URL
+    ),
+    fallbackServers: resolveFallbackServers(deps.env),
+    authToken: resolveAuthToken(deps.env),
+    fetchImpl: deps.fetchImpl
+  });
+}
+
+// packages/agent-runtime/dialogTitleLlm.ts
+async function generateLocalDialogTitle(input) {
+  const { env, messages, fallbackTitle } = input;
+  const timeoutMs = input.timeoutMs ?? 15e3;
+  const normalized = messages.filter((m) => m.role === "user" || m.role === "assistant").map((m, index) => ({
+    id: m.id || `msg-${index}`,
+    role: m.role,
+    content: typeof m.content === "string" ? m.content : extractText(m.content)
+  })).filter((m) => Boolean(m.content.trim()));
+  if (normalized.length === 0) {
+    return { title: fallbackTitle, source: "fallback" };
+  }
+  const earlyUserTurns = normalized.filter((m) => m.role === "user").slice(0, 2);
+  const recentTurns = normalized.slice(-10);
+  const seen = /* @__PURE__ */ new Set();
+  const visibleMessages = [...earlyUserTurns, ...recentTurns].filter((m) => {
+    if (seen.has(m.id)) return false;
+    seen.add(m.id);
+    return true;
+  }).map((m) => {
+    const content = m.content.length > 500 ? `${m.content.slice(0, 500)}...` : m.content;
+    return { role: m.role, content };
+  });
+  while (visibleMessages.length > 1 && JSON.stringify(visibleMessages).length > 4e3) {
+    visibleMessages.shift();
+  }
+  if (visibleMessages.length === 0) {
+    return { title: fallbackTitle, source: "fallback" };
+  }
+  if (input.resolveProviderConfig && input.buildRequest && input.parseResponse) {
+    try {
+      const providerConfig = await input.resolveProviderConfig({
+        agentConfig: { ...BUILTIN_TITLE_LLM_CONFIG, key: BUILTIN_TITLE_LLM_CONFIG.id },
+        env
+      });
+      if (providerConfig?.authToken) {
+        const request = input.buildRequest({
+          providerConfig,
+          messages: [
+            {
+              role: "user",
+              content: JSON.stringify(visibleMessages)
+            }
+          ],
+          stream: false
+        });
+        const res = await input.fetchImpl(request.url, {
+          ...request.init,
+          signal: AbortSignal.timeout(timeoutMs)
+        });
+        if (res.ok) {
+          const raw = await res.text().catch(() => "");
+          const data = safeParseJson(raw);
+          if (data) {
+            const parsed = input.parseResponse({ providerConfig, data });
+            const generated = normalizeDialogTitle(parsed.content);
+            if (generated) {
+              return { title: generated, source: "llm" };
+            }
+          }
+        }
+      }
+    } catch {
+    }
+  }
+  if (input.resolveDirectProviderConfig) {
+    try {
+      const envApiKey = env.OPENAI_API_KEY || env.NOLO_LOCAL_OPENAI_API_KEY || "";
+      const directAgentConfig = input.agentConfig && input.agentConfig.apiSource !== "platform" ? {
+        ...input.agentConfig,
+        // Fill env key only when the caller's agentConfig has no key of
+        // its own; never overwrite an explicit agentConfig.apiKey.
+        ...envApiKey && !input.agentConfig.apiKey ? { apiKey: envApiKey } : {}
+      } : {
+        ...BUILTIN_TITLE_LLM_CONFIG,
+        apiSource: "custom",
+        useServerProxy: false,
+        key: BUILTIN_TITLE_LLM_CONFIG.id,
+        ...envApiKey ? { apiKey: envApiKey } : {}
+      };
+      const directConfig = await input.resolveDirectProviderConfig({
+        agentConfig: directAgentConfig,
+        env
+      });
+      if (directConfig?.endpoint) {
+        const apiKeyHeader = directConfig.apiKeyHeader || "Authorization";
+        const apiKey = directConfig.apiKey || "";
+        if (!apiKey && isRemoteAuthEndpoint(directConfig.endpoint)) {
+          return { title: fallbackTitle, source: "fallback" };
+        }
+        const authValue = apiKeyHeader.toLowerCase() === "authorization" && apiKey && !apiKey.startsWith("Bearer ") ? `Bearer ${apiKey}` : apiKey;
+        const headers = {
+          "content-type": "application/json",
+          ...apiKey ? { [apiKeyHeader]: authValue } : {}
+        };
+        const res = await input.fetchImpl(directConfig.endpoint, {
+          method: "POST",
+          headers,
+          body: JSON.stringify({
+            model: directConfig.model || input.agentConfig?.model || BUILTIN_TITLE_LLM_CONFIG.model,
+            messages: [
+              { role: "system", content: BUILTIN_TITLE_LLM_CONFIG.prompt },
+              { role: "user", content: JSON.stringify(visibleMessages) }
+            ],
+            stream: false
+          }),
+          signal: AbortSignal.timeout(timeoutMs)
+        });
+        if (res.ok) {
+          const raw = await res.text().catch(() => "");
+          const data = safeParseJson(raw);
+          const rawContent = data?.choices?.[0]?.message?.content ?? "";
+          const generated = normalizeDialogTitle(rawContent);
+          if (generated) {
+            return { title: generated, source: "llm" };
+          }
+        }
+      }
+    } catch {
+    }
+  }
+  return { title: fallbackTitle, source: "fallback" };
+}
+function extractText(content) {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    const parts = content.map((part) => {
+      if (!part) return "";
+      if (typeof part === "string") return part;
+      if (part.type === "text") return part.text ?? "";
+      return "[\u56FE\u7247]";
+    }).filter(Boolean);
+    return parts.join(" ");
+  }
+  if (content && typeof content === "object") {
+    const part = content;
+    if (part.type === "text") return part.text ?? "";
+    return "[\u56FE\u7247]";
+  }
+  return "";
+}
+function safeParseJson(raw) {
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+}
+function isRemoteAuthEndpoint(endpoint) {
+  let host;
+  try {
+    host = new URL(endpoint).hostname.toLowerCase();
+  } catch {
+    return false;
+  }
+  if (!host) return false;
+  if (host === "localhost" || host === "127.0.0.1" || host === "::1" || host.endsWith(".local") || host.startsWith("192.168.") || host.startsWith("10.") || /^172\.(1[6-9]|2\d|3[01])\./.test(host)) {
+    return false;
+  }
+  if (host === "api.openai.com" || host.endsWith(".openai.com") || host.endsWith(".openai.azure.com") || host === "api.deepseek.com" || host === "api.anthropic.com" || host === "generativelanguage.googleapis.com" || host === "api.together.xyz" || host === "api.groq.com" || host === "openrouter.ai" || host === "api.mistral.ai") {
+    return true;
+  }
+  return false;
+}
+
+// packages/cli/client/localRuntimeDialog.ts
+async function resolveStore(deps) {
+  if (deps.store) return deps.store;
+  return createCliHybridRecordStore({
+    db: deps.db ?? await defaultLocalRuntimeDb(),
+    env: deps.env,
+    fetchImpl: deps.fetchImpl
+  });
+}
+async function getOrCreateSharedStore(deps) {
+  if (deps.store) return deps.store;
+  const cacheKey = normalizeRuntimeCacheCwd(deps.cwd);
+  let storePromise = hybridStoreCache.get(cacheKey);
+  if (!storePromise) {
+    storePromise = resolveStore(deps);
+    hybridStoreCache.set(cacheKey, storePromise);
+  }
+  return storePromise;
+}
+function createLocalDialogTitleGenerator(deps, ctx) {
+  if (!canUsePlatformChatProvider(deps.env) && !hasDirectOpenAiCompatibleProvider(deps.env)) {
+    return null;
+  }
+  return async (input) => {
+    const result = await generateLocalDialogTitle({
+      messages: input.messages,
+      env: deps.env,
+      fetchImpl: async (url, init) => fetchWithTransientRetry(
+        deps.fetchImpl ?? fetch,
+        url,
+        init,
+        {
+          sleep: deps.sleep,
+          loopbackRequest: ctx.loopbackRequest,
+          maxAttempts: 1
+        }
+      ),
+      resolveProviderConfig: async (args) => resolvePlatformChatProviderConfig({
+        agentConfig: args.agentConfig,
+        env: args.env,
+        apiKeyRefResolver: ctx.apiKeyRefResolver,
+        credentialBroker: ctx.credentialBroker
+      }),
+      resolveDirectProviderConfig: async (args) => resolveOpenAiCompatibleProviderConfig({
+        agentConfig: args.agentConfig,
+        env: args.env,
+        apiKeyRefResolver: ctx.apiKeyRefResolver,
+        credentialBroker: ctx.credentialBroker
+      }),
+      buildRequest: (args) => buildPlatformChatCompletionRequest({
+        providerConfig: args.providerConfig,
+        messages: args.messages,
+        stream: false
+      }),
+      parseResponse: (args) => parsePlatformChatCompletionResponse({
+        providerConfig: args.providerConfig,
+        data: args.data,
+        trace: []
+      }),
+      fallbackTitle: input.fallbackTitle,
+      timeoutMs: 4e3
     });
-    const childAdapter = ctx.createChildAdapter({
-      dialogId: childDialogId,
-      spaceId: ctx.spaceId,
-      runtimeContext: childRuntimeContext
+    return result.source === "llm" ? result.title : null;
+  };
+}
+async function writeLocalTokenRecord(args) {
+  const usageRecords = args.input.usageRecords?.length ? args.input.usageRecords : args.input.result.usage ? [{
+    callId: typeof args.input.result.usage?.provider_call_id === "string" && args.input.result.usage.provider_call_id.trim() ? args.input.result.usage.provider_call_id.trim() : args.createId(),
+    usage: args.input.result.usage,
+    model: args.input.result.model,
+    ...args.input.result.provider ? { provider: args.input.result.provider } : {}
+  }] : [];
+  if (usageRecords.length === 0) {
+    return [];
+  }
+  const ops = [];
+  for (const item of usageRecords) {
+    if (!item.usage || Object.keys(item.usage).length === 0) continue;
+    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({
+      rawUsage: item.usage,
+      agentConfig: {
+        model: item.model || args.input.billingConfig?.model || "unknown",
+        provider: item.provider || args.input.billingConfig?.provider,
+        apiSource: args.input.billingConfig?.apiSource,
+        apiKeyRef: args.input.billingConfig?.apiKeyRef,
+        inputPrice: args.input.billingConfig?.inputPrice,
+        outputPrice: args.input.billingConfig?.outputPrice,
+        sharingLevel: args.input.billingConfig?.sharingLevel,
+        id: args.input.billingConfig?.id,
+        userId: args.input.billingConfig?.userId
+      },
+      userId: args.userId,
+      agentId: args.input.agentKey,
+      dialogId: args.dialogId,
+      timestamp,
+      entry_path: "cli-local"
     });
-    const childInputBase = {
-      adapter: childAdapter,
-      agentRef: agentKey,
-      input: buildDelegatedTaskContent(task, parsed.input),
-      runtimeContext: childRuntimeContext,
-      spaceId: ctx.spaceId,
-      continueDialogId: childDialogId,
-      parentDialogId
+    const recordKey = createTokenKey.recordForStableCall(args.userId, callId);
+    const tokenRecord = {
+      id: args.createId(),
+      type: "token",
+      ...prepared.tokenData
     };
-    if (background) {
-      void ctx.runChildTurn(childInputBase).catch(async (error) => {
-        const errorMessage = toErrorMessage(error);
-        try {
-          await persistCliFailedChildDialog({
-            store,
-            userId,
-            dialogId: childDialogId,
-            errorMessage,
-            now: now()
-          });
-        } catch (persistError) {
-          deps.output?.write(
-            `[nolo] failed to persist background child failure: ${toErrorMessage(
-              persistError
-            )}
+    await args.store.write(recordKey, tokenRecord);
+    ops.push({ type: "put", key: recordKey, value: tokenRecord });
+  }
+  return ops;
+}
+async function writeDialog(args) {
+  let existingDialog = null;
+  if (args.input.continueDialogId) {
+    const dialogKey = `dialog-${args.userId}-${args.input.continueDialogId}`;
+    existingDialog = await args.store.read(dialogKey);
+  }
+  const nowMs = args.now();
+  const existingTitle = typeof existingDialog?.title === "string" ? existingDialog.title.trim() : "";
+  const existingTitleSource = existingDialog?.titleSource;
+  const titleTimeoutMs = args.titleTimeoutMs ?? 2500;
+  let needsTitleUpdate = false;
+  if (existingTitleSource === "manual") {
+    needsTitleUpdate = false;
+  } else if (!existingTitle) {
+    needsTitleUpdate = true;
+  } else {
+    const titleUpdatedAtMs = parseTitleUpdatedAtMs(existingDialog);
+    if (titleUpdatedAtMs > 0) {
+      if (nowMs - titleUpdatedAtMs >= 30 * 60 * 1e3) {
+        needsTitleUpdate = true;
+      }
+    } else {
+      needsTitleUpdate = false;
+    }
+  }
+  let titlePromise;
+  if (needsTitleUpdate && args.titleGenerator) {
+    const rawLastUserText = extractLastUserText(args.input.messages);
+    const fallbackTitle = buildDialogFallbackTitleFromUserInput(rawLastUserText) || "Local agent run";
+    titlePromise = args.titleGenerator({ messages: args.input.messages, fallbackTitle }).catch(() => null);
+  }
+  let resolvedTitle = null;
+  if (titlePromise) {
+    let timeoutId;
+    const timeoutPromise = new Promise((resolve) => {
+      timeoutId = setTimeout(() => resolve(null), titleTimeoutMs);
+    });
+    try {
+      resolvedTitle = await Promise.race([titlePromise, timeoutPromise]);
+    } catch {
+      resolvedTitle = null;
+    } finally {
+      if (timeoutId) clearTimeout(timeoutId);
+    }
+  }
+  const plan = buildLocalDialogWritePlan({
+    input: args.input,
+    userId: args.userId,
+    now: nowMs,
+    createId: args.createId,
+    existingDialog,
+    cwd: args.cwd,
+    ...resolvedTitle ? { titleOverride: resolvedTitle } : {}
+  });
+  await args.store.batch(plan.ops);
+  let tokenOps = [];
+  try {
+    tokenOps = await writeLocalTokenRecord({
+      store: args.store,
+      input: args.input,
+      userId: args.userId,
+      dialogId: plan.dialogId,
+      now: args.now,
+      createId: args.createId,
+      output: args.output
+    });
+  } catch (error) {
+    args.output?.write(
+      `[nolo] Token usage record write failed (non-fatal): ${toErrorMessage(error)}
 `
+    );
+  }
+  const hasSubjectRefs = localTurnHasSubjectRefs(args.input);
+  const isLocalUser = args.userId === "local";
+  if (!isLocalUser) {
+    try {
+      const syncResult = await syncLocalDialogEvidenceToRemote({
+        env: args.env,
+        fetchImpl: args.fetchImpl,
+        input: args.input,
+        ops: [...plan.ops, ...tokenOps],
+        output: args.output,
+        userId: args.userId
+      });
+      if (!syncResult.attempted) {
+        if (hasSubjectRefs) {
+          args.output?.write(
+            "[nolo] Local dialog evidence is local-only; set NOLO_SERVER and AUTH_TOKEN to make subjectRefs remotely queryable.\n"
           );
         }
-      });
-      return {
-        content: JSON.stringify({
-          success: true,
-          status: "pending",
-          agentKey,
-          childDialogId,
-          ...parentDialogId ? { parentDialogId } : {}
-        }),
-        metadata: { callAgent: true, background: true, localRuntime: true }
-      };
-    }
-    try {
-      const childResult = await ctx.runChildTurn(childInputBase);
-      return {
-        content: JSON.stringify({
-          success: true,
-          agentKey,
-          dialogId: childDialogId,
-          model: childResult.model ?? null,
-          provider: childResult.provider ?? null,
-          content: childResult.content ?? "",
-          usage: childResult.usage ?? null
-        }),
-        metadata: { callAgent: true, background: false, localRuntime: true }
-      };
+      }
     } catch (error) {
-      const errorMessage = toErrorMessage(error);
-      try {
-        await persistCliFailedChildDialog({
-          store,
-          userId,
-          dialogId: childDialogId,
-          errorMessage,
-          now: now()
-        });
-      } catch (persistError) {
-        deps.output?.write(
-          `[nolo] failed to persist foreground child failure: ${toErrorMessage(
-            persistError
-          )}
-`
-        );
+      if (hasSubjectRefs) {
+        throw error;
       }
-      return {
-        content: JSON.stringify({
-          success: false,
-          agentKey,
-          dialogId: childDialogId,
-          error: errorMessage
-        }),
-        metadata: {
-          callAgent: true,
-          background: false,
-          localRuntime: true,
-          error: true
-        }
-      };
+      args.output?.write(
+        `[nolo] Remote dialog evidence sync failed; local dialog only: ${toErrorMessage(
+          error
+        )}
+`
+      );
     }
+  }
+  return { dialogId: plan.dialogId, title: plan.title };
+}
+function resolveCliDialogRecordKey(userId, dialogId) {
+  if (dialogId.startsWith("dialog-") && !dialogId.includes("-msg-")) {
+    return dialogId;
+  }
+  return `dialog-${userId}-${dialogId}`;
+}
+async function loadCliDialogSummary(args) {
+  const dialogKey = resolveCliDialogRecordKey(args.userId, args.dialogId);
+  const record = await args.store.read(dialogKey);
+  if (!record || typeof record !== "object") return null;
+  const summary = typeof record.summary === "string" ? record.summary.trim() : "";
+  if (!summary) return null;
+  const summarizedBeforeId = record.summarizedBeforeId;
+  return {
+    summary,
+    ...typeof summarizedBeforeId === "string" && summarizedBeforeId ? { summarizedBeforeId } : {}
   };
 }
+async function saveCliDialogSummary(args) {
+  const dialogKey = resolveCliDialogRecordKey(args.userId, args.dialogId);
+  const existing = await args.store.read(dialogKey) ?? {};
+  const bareId = typeof existing.id === "string" && existing.id ? existing.id : args.dialogId.startsWith("dialog-") ? args.dialogId.slice(args.dialogId.lastIndexOf("-") + 1) : args.dialogId;
+  const compressionCount = typeof existing.compressionCount === "number" ? existing.compressionCount + 1 : 1;
+  await args.store.write(dialogKey, {
+    ...existing,
+    id: bareId,
+    dbKey: dialogKey,
+    type: "dialog",
+    userId: args.userId,
+    summary: args.summary,
+    ...args.summarizedBeforeId !== void 0 ? { summarizedBeforeId: args.summarizedBeforeId } : {},
+    compressionCount,
+    summaryPending: false,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  });
+}
+function parseTitleUpdatedAtMs(existingDialog) {
+  const raw = existingDialog?.titleUpdatedAt;
+  if (typeof raw === "number" && !Number.isNaN(raw)) return raw;
+  if (typeof raw === "string" && raw.trim()) {
+    const parsed = Date.parse(raw);
+    if (!Number.isNaN(parsed)) return parsed;
+  }
+  return 0;
+}
 
 // packages/cli/client/localRuntimeAdapter.ts
 var currentMetaFile = fileURLToPath(import.meta.url);
@@ -11260,7 +11023,20 @@ function createCliLocalRuntimeAdapter(deps) {
       const credentialBroker = createFileCredentialBroker();
       const serverUrl = asOptionalTrimmedString(deps.env.NOLO_SERVER) ?? "https://us.nolo.chat";
       const authToken = asOptionalTrimmedString(deps.env.AUTH_TOKEN);
-      const syncFetcher = authToken ? (ref) => fetchServerSyncedCredential({ currentServer: serverUrl, authToken }, ref) : void 0;
+      const syncFetcher = authToken ? async (ref) => {
+        try {
+          return await fetchServerSyncedCredential(
+            { currentServer: serverUrl, authToken },
+            ref
+          );
+        } catch (error) {
+          logLocalRuntimeDiagnostic("credential.sync.unavailable", {
+            ref,
+            error: toErrorMessage(error)
+          });
+          return null;
+        }
+      } : void 0;
       if (isAntigravityOAuthAgent(agentConfig)) {
         const accessToken = await apiKeyRefResolver("antigravity");
         if (!accessToken) {
@@ -11474,6 +11250,14 @@ function createCliLocalRuntimeAdapter(deps) {
             return {
               content,
               ...tool_calls ? { tool_calls } : {},
+              // fetchCodexResponsesCompletion 已把 codex responses 流聚合完毕并归一化成
+              // OpenAI chat.completions 形状：choices[0].finish_reason（"stop"/"tool_calls"）
+              // + usage（prompt/completion/total_tokens）。必须透传，否则 localLoop 把正常走完
+              // 的空轮误判成 stream_truncated、TUI context chip 也拿不到 token 数更新。
+              finish_reason: typeof choice?.finish_reason === "string" ? choice.finish_reason : void 0,
+              stream_complete: true,
+              // body 类型是 Record<string, unknown>，透传 usage 需 cast 到 AgentRuntimeResult.usage。
+              usage: result.body?.usage,
               trace: messages
             };
           }
@@ -11923,9 +11707,7 @@ export {
   t,
   toolLabel,
   agentRunCardLabels,
-  QUOTA_ERROR_PATTERNS,
-  isQuotaExhaustedError,
   clearCliLocalRuntimePreparedAgentCache,
-  createCliCallAgentToolExecutor,
+  isSubtaskRun,
   createCliLocalRuntimeAdapter
 };