nolo-cli 0.11.0 → 0.12.0-alpha.1

package/{chunk-ZEYDOXHF.js → chunk-ZPFRLGIZ.js}

@@ -1,6 +1,3 @@
-import {
-  resolveMachineId
-} from "./chunk-6HYVJV7B.js";
 import {
   buildLocalRunEnv,
   isFullstackCodingAgentRef,
@@ -11,10 +8,17 @@ import {
   writeUsage
 } from "./chunk-3QAF2LTL.js";
 import {
+  resolveMachineId
+} from "./chunk-6HYVJV7B.js";
+import {
+  agentRunCardLabels,
   createCliCallAgentToolExecutor,
   createCliLocalRuntimeAdapter,
-  isBuiltinNoloAgentRef
-} from "./chunk-X2S7JTIG.js";
+  getCliLocale,
+  isBuiltinNoloAgentRef,
+  t,
+  toolLabel
+} from "./chunk-5ITRDSHY.js";
 import {
   CliProviderQuotaError
 } from "./chunk-CMKUBIGW.js";
@@ -24,10 +28,10 @@ import {
 import {
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-AEZAORLG.js";
+} from "./chunk-QCA3EPYK.js";
 import {
   normalizeAgentHandle
-} from "./chunk-C2MDQQ4O.js";
+} from "./chunk-RNQ5BLR2.js";
 import {
   NOLO_PROJECT_MANAGER_AGENT_KEY,
   isLocalCliAgentKey
@@ -36,78 +40,67 @@ import {
   applyModelLayerOverride,
   buildModelLayerOverride
 } from "./chunk-LTRXGFMS.js";
+import {
+  formatAgentListCard,
+  formatListRunsCard,
+  formatNotFoundRunCard,
+  formatStartRunCard,
+  formatStatusRunCard,
+  formatStopRunCard,
+  isAgentRunTerminalStatus
+} from "./chunk-RZ735TLX.js";
 import {
   isGatewayHttpStatus
-} from "./chunk-D6OQHXVG.js";
+} from "./chunk-YDCZVUFP.js";
 import {
   buildMemorySubjectsForAgent,
   resolveAgentMemoryPolicy
-} from "./chunk-E4HNJSHC.js";
+} from "./chunk-G3B356GF.js";
 import {
   parseExternalSkillMarkdown,
   parseSkillDocProtocol
 } from "./chunk-VC6OZXO5.js";
 import {
-  getModelContextWindow,
+  API_REPORTED_COST_MULTIPLIER,
+  normalizeUsage,
   parseUiAskChoiceContent
-} from "./chunk-5MOUAAMK.js";
-import {
-  parsePositiveFiniteNumberOrFallback
-} from "./chunk-Y5GCAMGP.js";
-import {
-  touchMemoryItemsInDb
-} from "./chunk-HNW7IJSK.js";
-import {
-  chooseMemoryOwners,
-  loadMemoryCandidatesFromDb
-} from "./chunk-XENYHRUE.js";
-import {
-  readPipeText,
-  spawnProcess
-} from "./chunk-IDZTNRP2.js";
+} from "./chunk-AM53Q2SD.js";
 import {
   buildSkillDiscoveryContextBlock
-} from "./chunk-AFON4QUU.js";
-import {
-  buildMemoryOverlayLayer,
-  buildMemoryUseGuidanceLayer
-} from "./chunk-C4FTUXVF.js";
+} from "./chunk-3QKO4EHV.js";
 import {
   buildPlatformChatCompletionRequest,
   parsePlatformChatCompletionData
-} from "./chunk-ZPRK73XY.js";
+} from "./chunk-ZR4VHQ5D.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-YOCHZD7D.js";
+} from "./chunk-NCGFB7NN.js";
 import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
   readActionGate,
   readCommandActionGatePayload
-} from "./chunk-S3GS2PRL.js";
+} from "./chunk-4BTHUYMY.js";
 import {
   resolvePlatformChatCompletionsEndpoint
-} from "./chunk-YTBMA7NO.js";
+} from "./chunk-TSKWE74T.js";
 import {
-  clipCompactText
-} from "./chunk-5MMAK75Q.js";
+  DEFAULT_CONTEXT_WINDOW,
+  clipCompactText,
+  getModelContextWindow
+} from "./chunk-S73OEOHH.js";
 import {
   findModelConfig
-} from "./chunk-BBYVOSU2.js";
+} from "./chunk-S3UTETIC.js";
 import {
-  asTrimmedLowercaseString
-} from "./chunk-QSJ3HFEF.js";
-import {
-  compactWhitespace
-} from "./chunk-DWLEOOGR.js";
+  buildMemoryOverlayLayer,
+  buildMemoryUseGuidanceLayer
+} from "./chunk-QLUFR47U.js";
 import {
   createRunActivityTracker,
   finalizeRunRecord,
   spawnLocalBackgroundRun
-} from "./chunk-2FTTDCD4.js";
-import {
-  resolveAuthToken
-} from "./chunk-ISNCLGUZ.js";
+} from "./chunk-4ON5AV72.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -115,14 +108,36 @@ import {
   getDefaultCliLocalRuntimeDb
 } from "./chunk-H33743XH.js";
 import {
+  touchMemoryItemsInDb
+} from "./chunk-HNW7IJSK.js";
+import {
+  chooseMemoryOwners,
+  loadMemoryCandidatesFromDb
+} from "./chunk-XENYHRUE.js";
+import {
+  compactWhitespace
+} from "./chunk-DWLEOOGR.js";
+import {
+  readPipeText,
+  spawnProcess
+} from "./chunk-IDZTNRP2.js";
+import {
+  parsePositiveFiniteNumberOrFallback
+} from "./chunk-Y5GCAMGP.js";
+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-XFOLQLDN.js";
+} from "./chunk-XHQWJUW4.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
+import {
+  resolveAuthToken
+} from "./chunk-5NBHQD4D.js";
 import {
   isLoopbackUrl
 } from "./chunk-4SN6J65J.js";
@@ -130,7 +145,235 @@ import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
 
+// packages/agent-runtime/quickChatIntentCore.ts
+var INTENT_MODEL = "deepseek-v4-flash";
+var INTENT_PROVIDER = "deepseek";
+var QUICK_CHAT_INTENT_TIMEOUT_MS = 4e3;
+var SHORT_GREETING_MAX_LENGTH = 20;
+var SHORT_GREETING_PATTERN = /^(?:hi|hello|hey|hiya|yo|sup|howdy|嗨|哈喽|哈囉|你好|您好|在吗|在嘛|喂|早上好|中午好|下午好|晚上好|拜拜|再见|谢谢|thanks|thx|ok|好的|收到|了解)[!.。，、~～]?$/iu;
+function isShortGreeting(text) {
+  const trimmed = text.trim();
+  if (!trimmed) return false;
+  if (trimmed.length > SHORT_GREETING_MAX_LENGTH) return false;
+  return SHORT_GREETING_PATTERN.test(trimmed);
+}
+var COMPLEXITY_SIMPLE_MAX_LENGTH = 80;
+var COMPLEXITY_MEDIUM_MAX_LENGTH = 500;
+var COMPLEXITY_KEYWORDS = /为什么|如何|分析|对比|比较|设计|架构|实现|原理|推导|评价|区别|关系|影响|优化|重构/;
+var COMPLEXITY_CODE_BLOCK = /```[\s\S]*```/;
+function estimateComplexity(text) {
+  const trimmed = text.trim();
+  const len = trimmed.length;
+  if (len > COMPLEXITY_MEDIUM_MAX_LENGTH) return "complex";
+  if (COMPLEXITY_CODE_BLOCK.test(trimmed)) return "complex";
+  if (len > COMPLEXITY_SIMPLE_MAX_LENGTH) return "medium";
+  if (COMPLEXITY_KEYWORDS.test(trimmed)) return "medium";
+  return "simple";
+}
+var TIER_DESCRIPTIONS = {
+  flash: "\u5FEB\u901F\u7B80\u5355\uFF1A\u95EE\u5019\u3001\u95F2\u804A\u3001\u5FEB\u901F\u95EE\u7B54\u3001\u7FFB\u8BD1\u3001\u77ED\u6587",
+  balanced: "\u5E73\u8861\u63A8\u7406\uFF1A\u5206\u6790\u3001\u4E2D\u7B49\u957F\u5EA6\u5199\u4F5C\u3001\u4EE3\u7801\u3001\u63A8\u7406\uFF08\u5F53\u524D\u8DEF\u7531\u81F3 DeepSeek V4 Flash\uFF09",
+  quality: "\u9AD8\u8D28\u91CF\u6DF1\u5EA6\uFF1A\u590D\u6742\u63A8\u7406\u3001\u957F\u6587\u3001\u67B6\u6784\u8BBE\u8BA1\u3001\u6DF1\u5EA6\u5206\u6790\uFF08\u5F53\u524D\u8DEF\u7531\u81F3 DeepSeek V4 Flash\uFF09"
+};
+function buildQuickChatIntentSystemPrompt(tierAgents) {
+  const agentList = tierAgents.map((t2) => `  - "${t2.agentKey}"\uFF1A${t2.description}`).join("\n");
+  return `\u4F60\u662F\u4E00\u4E2A\u610F\u56FE\u8DEF\u7531\u5668\u3002\u6839\u636E\u7528\u6237\u6D88\u606F\uFF0C\u5224\u65AD\u5E94\u8BE5\u4EA4\u7ED9\u54EA\u4E2A agent \u5904\u7406\u3002
+
+\u53EF\u9009 agent \u5217\u8868\uFF08agentKey \u4E0E\u63CF\u8FF0\uFF09\uFF1A
+${agentList}
+
+\u5224\u65AD\u539F\u5219\uFF08\u9ED8\u8BA4\u504F\u5411\u901A\u7528\u6863\u4F4D\uFF1B\u4E13\u804C agent \u5728\u660E\u786E\u5339\u914D\u65F6\u4F7F\u7528\uFF1B**\u7F16\u7801/\u672C\u5730\u4ED3\u5E93\u4EFB\u52A1\u8D70\u901A\u7528\u6863 + needsWorkspace=true**\uFF09\uFF1A
+- \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C**\u9664\u975E\u7528\u6237\u660E\u786E\u8868\u8FBE\u8981\u5EFA\u5E94\u7528/\u5EFA Agent/\u63D0\u4EA4\u53CD\u9988/\u591A Agent \u7F16\u6392**\uFF0C\u5426\u5219\u9009\u901A\u7528\u6863\u4F4D\uFF08flash/balanced/quality\uFF09\uFF1A
+  - \u7B80\u5355\u95EE\u5019\u3001\u95F2\u804A\u3001\u5FEB\u901F\u95EE\u7B54\u3001\u7FFB\u8BD1\u3001\u77ED\u6587 \u2192 \u9009 flash \u6863
+  - \u9700\u8981\u63A8\u7406\u3001\u5206\u6790\u3001\u4E2D\u7B49\u957F\u5EA6\u5199\u4F5C\u3001\u666E\u901A\u4EE3\u7801\u89E3\u91CA/\u67B6\u6784\u95EE\u7B54 \u2192 \u9009 balanced \u6863
+  - \u590D\u6742\u63A8\u7406\u3001\u957F\u6587\u3001\u67B6\u6784\u8BBE\u8BA1\u3001\u6DF1\u5EA6\u5206\u6790 \u2192 \u9009 quality \u6863
+  - **\u660E\u786E\u7F16\u7801\u4EFB\u52A1\uFF08\u5B9E\u73B0\u529F\u80FD\u3001\u4FEE bug\u3001refactor\u3001\u5199/\u8865\u6D4B\u8BD5\u3001\u8DD1 build/tests/ci\uFF09\u6216\u67E5\u770B\u672C\u673A\u4ED3\u5E93/\u4EE3\u7801\u72B6\u6001\uFF08git/\u5206\u652F/commit/\u672C\u5730\u4E0E\u8FDC\u7A0B\u5DEE\u8DDD/\u672A\u63D0\u4EA4\u6539\u52A8\u7B49\uFF09** \u2192 \u9009 balanced \u6216 quality \u6863\uFF08\u6309\u590D\u6742\u5EA6\uFF1B**\u4E0D\u8981\u9009 flash**\uFF09\uFF0C\u4E14 needsWorkspace=true
+- \u4E13\u804C agent \u8DEF\u7531\u89C4\u5219\uFF08\u6709\u660E\u786E\u5339\u914D\u65F6\u4F7F\u7528\uFF09\uFF1A
+  - \u8981\u63D0\u4EA4/\u8BB0\u5F55 bug\u3001\u4F53\u9A8C\u95EE\u9898\u3001\u6570\u636E\u5F02\u5E38\u3001\u4EA7\u54C1\u5EFA\u8BAE\uFF0C\u6216\u53E3\u8BED\u5982\u300C\u60F3\u53CD\u9988\u4E00\u4E9B\u95EE\u9898\u300D\u300C\u53CD\u9988\u4E00\u4E0B\u300D\u2192 \u9009\u610F\u89C1\u53CD\u9988\u4E13\u804C agent
+  - \u8981\u65B0\u5EFA\u6216\u5B9A\u5236 AI/Agent/\u667A\u80FD\u4F53\u52A9\u624B\uFF08\u542B\u914D\u7F6E\u5DE5\u5177\u3001\u77E5\u8BC6\u3001\u786E\u8BA4\u521B\u5EFA\uFF09\u2192 \u9009\u521B\u5EFA Agent \u4E13\u804C agent
+  - \u8981\u505A/\u6539/\u53D1\u5E03\u7F51\u7AD9\u3001\u7F51\u9875\u3001\u5C0F\u5E94\u7528\u3001\u9884\u7EA6\u9875\u3001\u535A\u5BA2\u3001\u770B\u677F \u2192 \u9009\u5E94\u7528\u6784\u5EFA\u4E13\u804C agent
+  - \u8981\u6D3E\u591A\u4E2A agent\u3001\u591A agent \u5E76\u884C\u3001\u62C6\u6210\u4EFB\u52A1\u540E\u53F0\u6267\u884C\u3001\u591A\u4E2A agent review\u3001\u8BA9\u4E0D\u540C agent \u8BA8\u8BBA/\u4F1A\u5546 \u2192 \u9009\u591A Agent \u7F16\u6392\u4E13\u804C agent\uFF08\u663E\u5F0F multi-agent \u4F18\u5148\uFF09
+- **\u62FF\u4E0D\u51C6\u65F6**\uFF1A\u7EAF\u95F2\u804A\u9009 flash\uFF1B**\u82E5\u6CBE\u8FB9\u672C\u5730\u4ED3\u5E93/\u5F53\u524D\u4EE3\u7801\u72B6\u6001\uFF0C\u9009 balanced/quality + needsWorkspace=true**\u3002
+
+\u540C\u65F6\u5224\u65AD\u672C\u8F6E\u662F\u5426\u9700\u8981\u6CE8\u5165\u300C\u5DE5\u4F5C\u533A\u53EA\u8BFB\u5DE5\u5177\u300D\uFF08listFiles/globFiles/searchFiles/readFile/execShell \u7B49\uFF09\uFF1A
+- needsWorkspace=true \u7684\u573A\u666F\uFF1A\u7528\u6237\u8981\u8BFB/\u6539/\u5206\u6790\u6587\u4EF6\u6216\u4EE3\u7801\u3001\u63D0\u5230\u4E86\u6587\u4EF6\u8DEF\u5F84/\u6269\u5C55\u540D\uFF08.md/.csv/.ts \u7B49\uFF09\u3001\u63D0\u5230\u5DE5\u4F5C\u533A/\u4EE3\u7801\u5E93/\u4ED3\u5E93/\u76EE\u5F55/git/\u5206\u652F\u3001\u8981\u770B\u5F53\u524D\u4EE3\u7801\u6216\u4ED3\u5E93\u72B6\u6001\u3001\u672C\u5730\u641C\u7D22/\u67E5\u770B\u4EE3\u7801\u3002
+- needsWorkspace=false \u7684\u573A\u666F\uFF1A\u901A\u7528\u77E5\u8BC6\u95EE\u7B54\uFF08\u5982\u300C\u5E7F\u4E1C\u7ECF\u6D4E\u6570\u636E\u300D\u300C\u5199\u4E00\u9996\u8BD7\u300D\uFF09\u3001\u7EAF\u95F2\u804A\u95EE\u5019\u3001\u7FFB\u8BD1\u3001\u4E0D\u6D89\u53CA\u672C\u5730\u6587\u4EF6/\u4ED3\u5E93\u3002
+- \u6F0F\u5224\uFF08\u7528\u6237\u8981\u6587\u4EF6\u800C\u6CA1\u5E26\u5DE5\u5177\uFF09\u6BD4\u8BEF\u5224\uFF08\u767D\u641C\u51E0\u8F6E\uFF09\u4EE3\u4EF7\u66F4\u9AD8\uFF0C\u5B81\u53EF\u504F\u5BBD\u5224 true\u3002
+
+\u5728\u7ED9\u51FA agentKey \u4E4B\u524D\uFF0C\u5148\u5728\u5FC3\u91CC\u533A\u5206\u5019\u9009\u6863\u4F4D\u7684\u8FB9\u754C\u518D\u7ED9\u7F6E\u4FE1\u5EA6\uFF1Abalanced \u4E0E quality \u7684\u8FB9\u754C\u5728\u4E8E\u590D\u6742\u5EA6/\u7BC7\u5E45/\u662F\u5426\u9700\u8981\u6DF1\u5EA6\u5206\u6790\uFF0C\u62FF\u4E0D\u51C6\u5C31\u7ED9\u4F4E confidence\u3002
+
+\u540C\u65F6\u5224\u65AD\u672C\u8F6E\u6D88\u606F\u662F\u5426\u9700\u8981\u6302\u8F7D\u5BF9\u8C61\u64CD\u4F5C\u6280\u80FD\uFF08skills \u6570\u7EC4\uFF0C\u672A\u547D\u4E2D\u7ED9 []\uFF09\uFF1A
+- \u7528\u6237\u8981\u65B0\u5EFA/\u6574\u7406/\u5F55\u5165/\u6279\u91CF\u5904\u7406\u8868\u683C\u6570\u636E\uFF08\u5EFA\u8868\u3001\u52A0\u884C\u3001\u6539\u5217\u3001\u6309\u6761\u4EF6\u6574\u7406\u6570\u636E\uFF09\u2192 skills \u542B "table"
+- \u7528\u6237\u8981\u5199/\u6DA6\u8272/\u6539\u5199/\u7EED\u5199/\u6392\u7248\u4E00\u7BC7\u6587\u6863\u6216\u6587\u7AE0 \u2192 skills \u542B "doc"
+- \u7528\u6237\u8981\u5199/\u6539/\u5B9E\u73B0/\u4FEE bug/refactor/\u8865\u6D4B\u8BD5/\u5BA1\u67E5\u5E76\u4FEE\u6539\u4EE3\u7801 \u2192 skills \u542B "code"\uFF08\u4EC5\u95EE\u901A\u7528\u77E5\u8BC6\u3001\u7EAF\u95F2\u804A\u3001\u53EA\u67E5\u770B git/\u4ED3\u5E93\u72B6\u6001\u800C\u4E0D\u4FEE\u6539\u4EE3\u7801\u65F6\u4E0D\u6302 "code"\uFF09
+- \u666E\u901A\u95EE\u7B54/\u7EAF\u95F2\u804A/\u5EFA\u5E94\u7528 \u2192 skills \u4E3A []
+
+\u53EA\u8F93\u51FA JSON\uFF0C\u4E0D\u8981\u8F93\u51FA\u5176\u4ED6\u5185\u5BB9\uFF1A
+{"confidence": <0\u52301\u4E4B\u95F4\u7684\u5C0F\u6570\uFF0C\u8868\u793A\u4F60\u5BF9\u8FD9\u4E2A\u5206\u7C7B\u5224\u65AD\u7684\u628A\u63E1\u7A0B\u5EA6>, "agentKey": "<\u4ECE\u5217\u8868\u4E2D\u9009\u62E9\u7684 agentKey>", "needsWorkspace": <true \u6216 false>, "skills": <\u5B57\u7B26\u4E32\u6570\u7EC4\uFF0C\u5143\u7D20\u53EA\u80FD\u662F "table" | "doc" | "code"\uFF0C\u672A\u547D\u4E2D\u7ED9 []>}`;
+}
+function parseQuickChatIntentResult(content, tierAgents) {
+  try {
+    const parsed = JSON.parse(content.trim());
+    if (typeof parsed !== "object" || parsed === null || !("agentKey" in parsed)) return null;
+    const key = parsed.agentKey;
+    if (typeof key !== "string") return null;
+    if (!tierAgents.some((t2) => t2.agentKey === key)) return null;
+    const rawNeedsWorkspace = parsed.needsWorkspace;
+    const needsWorkspace = rawNeedsWorkspace === true;
+    const rawConfidence = parsed.confidence;
+    const confidence = typeof rawConfidence === "number" && Number.isFinite(rawConfidence) && rawConfidence >= 0 && rawConfidence <= 1 ? rawConfidence : void 0;
+    const rawSkills = parsed.skills;
+    let skills;
+    if (Array.isArray(rawSkills)) {
+      const filtered = [...new Set(rawSkills)].filter(
+        (s) => s === "table" || s === "doc" || s === "code"
+      );
+      if (filtered.length > 0) skills = filtered;
+    }
+    return { agentKey: key, needsWorkspace, confidence, skills };
+  } catch {
+    return null;
+  }
+}
+
+// packages/cli/client/autoModelRouter.ts
+var CLI_AUTO_TIER_AGENT_KEYS = {
+  flash: PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
+  balanced: PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
+  quality: PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY
+};
+var CLI_AUTO_TIER_MODELS = {
+  flash: "deepseek-v4-flash",
+  balanced: "deepseek-v4-flash",
+  quality: "deepseek-v4-flash"
+};
+var CLI_IMAGE_AGENT_KEY = PUBLIC_KIMI_K26_IMAGE_AGENT_KEY;
+var CLI_IMAGE_AGENT_MODEL = "kimi-k2.6";
+var CLI_AUTO_TIER_AGENT_KEY_TABLE = {
+  [CLI_AUTO_TIER_AGENT_KEYS.flash]: true,
+  [CLI_AUTO_TIER_AGENT_KEYS.balanced]: true,
+  [CLI_AUTO_TIER_AGENT_KEYS.quality]: true
+};
+function resolveCliAutoAgentModel(agentKey) {
+  if (agentKey === CLI_AUTO_TIER_AGENT_KEYS.flash) return CLI_AUTO_TIER_MODELS.flash;
+  if (agentKey === CLI_AUTO_TIER_AGENT_KEYS.balanced) {
+    return CLI_AUTO_TIER_MODELS.balanced;
+  }
+  if (agentKey === CLI_AUTO_TIER_AGENT_KEYS.quality) {
+    return CLI_AUTO_TIER_MODELS.quality;
+  }
+  if (agentKey === CLI_IMAGE_AGENT_KEY) return CLI_IMAGE_AGENT_MODEL;
+  return void 0;
+}
+var buildRouteOptions = () => ["flash", "balanced", "quality"].map((tier) => ({
+  tier,
+  agentKey: CLI_AUTO_TIER_AGENT_KEYS[tier],
+  description: TIER_DESCRIPTIONS[tier]
+}));
+var tierForAgentKey = (agentKey) => {
+  for (const tier of ["flash", "balanced", "quality"]) {
+    if (CLI_AUTO_TIER_AGENT_KEYS[tier] === agentKey) return tier;
+  }
+  return null;
+};
+function resolveCliAutoFallbackTier(text) {
+  switch (estimateComplexity(text)) {
+    case "complex":
+      return "quality";
+    case "medium":
+      return "balanced";
+    case "simple":
+    default:
+      return "flash";
+  }
+}
+async function classifyCliAutoRoute(text, options) {
+  const timeoutMs = options.timeoutMs ?? QUICK_CHAT_INTENT_TIMEOUT_MS;
+  const fallbackTier = resolveCliAutoFallbackTier(text);
+  const fallback = () => ({
+    agentKey: CLI_AUTO_TIER_AGENT_KEYS[fallbackTier],
+    tier: fallbackTier,
+    classified: false
+  });
+  if (!text.trim()) return fallback();
+  if (isShortGreeting(text)) {
+    return {
+      agentKey: CLI_AUTO_TIER_AGENT_KEYS.flash,
+      tier: "flash",
+      classified: true
+    };
+  }
+  if (!options.authToken) return fallback();
+  const fetchImpl = options.fetchImpl ?? globalThis.fetch;
+  const controller = new AbortController();
+  const timeoutHandle = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const routeOptions = buildRouteOptions();
+    const messages = [
+      { role: "system", content: buildQuickChatIntentSystemPrompt(routeOptions) },
+      { role: "user", content: text }
+    ];
+    const { url, init } = buildPlatformChatCompletionRequest({
+      providerConfig: {
+        serverUrl: options.serverUrl,
+        authToken: options.authToken,
+        agentKey: CLI_AUTO_TIER_AGENT_KEYS.flash,
+        model: INTENT_MODEL,
+        provider: INTENT_PROVIDER,
+        endpoint: resolvePlatformChatCompletionsEndpoint(INTENT_PROVIDER) ?? "",
+        requestOptions: {}
+      },
+      messages,
+      stream: false
+    });
+    const response = await fetchImpl(url, {
+      ...init,
+      signal: controller.signal
+    });
+    if (!response.ok) return fallback();
+    const data = parsePlatformChatCompletionData(await response.text());
+    const content = data?.choices?.[0]?.message?.content;
+    if (typeof content !== "string" || !content.trim()) return fallback();
+    const parsed = parseQuickChatIntentResult(content, routeOptions);
+    if (!parsed) return fallback();
+    const tier = tierForAgentKey(parsed.agentKey) ?? fallbackTier;
+    return {
+      agentKey: parsed.agentKey,
+      tier,
+      classified: true,
+      confidence: parsed.confidence,
+      needsWorkspace: parsed.needsWorkspace,
+      skills: parsed.skills
+    };
+  } catch {
+    return fallback();
+  } finally {
+    clearTimeout(timeoutHandle);
+  }
+}
+
 // packages/cli/client/tokenUsage.ts
+var isUsableModelId = (model) => {
+  const raw = model?.trim();
+  return Boolean(raw) && raw !== "-" && raw !== "auto";
+};
+function resolveAgentContextWindow(opts) {
+  if (isUsableModelId(opts.model)) {
+    return getModelContextWindow(opts.model);
+  }
+  const agentKey = opts.agentKey?.trim();
+  if (agentKey) {
+    const tierModel = resolveCliAutoAgentModel(agentKey);
+    if (tierModel) return getModelContextWindow(tierModel);
+    if (opts.autoRouteDefault !== false && agentKey === BUILTIN_NOLO_AGENT_KEY) {
+      return getModelContextWindow(CLI_AUTO_TIER_MODELS.flash);
+    }
+  }
+  if (opts.agentName?.trim()) {
+    return getModelContextWindow(opts.agentName);
+  }
+  return DEFAULT_CONTEXT_WINDOW;
+}
 var PROVIDER_LOOKUP_ORDER = [
   "openrouter",
   "fireworks",
@@ -150,7 +393,15 @@ function parseUsageRecord(usage) {
   const output = Number(usage.output_tokens ?? usage.completion_tokens ?? 0);
   if (!Number.isFinite(input) || !Number.isFinite(output)) return void 0;
   if (!input && !output) return void 0;
-  return { input, output };
+  const normalized = normalizeUsage(usage);
+  const cacheRead = normalized.cache_read_input_tokens || void 0;
+  const cacheWrite = normalized.cache_creation_input_tokens || void 0;
+  return {
+    input,
+    output,
+    ...cacheRead === void 0 ? {} : { cacheRead },
+    ...cacheWrite === void 0 ? {} : { cacheWrite }
+  };
 }
 function resolveContextWindow(model) {
   const raw = model?.trim();
@@ -166,10 +417,13 @@ function buildTurnTokenUsage(usage, model) {
   if (!parsed) return void 0;
   const contextWindow = resolveContextWindow(model);
   const remaining = contextWindow && parsed.input > 0 ? Math.max(0, contextWindow - parsed.input) : void 0;
+  const rawCost = typeof usage?.cost === "number" ? usage.cost : void 0;
+  const credits = rawCost !== void 0 && rawCost > 0 ? rawCost * API_REPORTED_COST_MULTIPLIER : void 0;
   return {
     ...parsed,
     ...contextWindow ? { contextWindow } : {},
-    ...remaining != null ? { remaining } : {}
+    ...remaining != null ? { remaining } : {},
+    ...credits !== void 0 ? { credits } : {}
   };
 }
 function formatTokenCount(value) {
@@ -186,7 +440,8 @@ function formatTokenCount(value) {
 function renderTokenStatus(tokens) {
   if (!tokens) return "in \u2014 out \u2014 left \u2014";
   const left = tokens.remaining != null ? formatTokenCount(tokens.remaining) : tokens.contextWindow ? "\u2014" : "\u2014";
-  return `in ${formatTokenCount(tokens.input)} out ${formatTokenCount(tokens.output)} left ${left}`;
+  const cache = tokens.cacheRead != null && tokens.cacheRead > 0 ? ` (cache ${formatTokenCount(tokens.cacheRead)})` : "";
+  return `in ${formatTokenCount(tokens.input)}${cache} out ${formatTokenCount(tokens.output)} left ${left}`;
 }
 function shouldShowUsage(env) {
   return env.NOLO_DEBUG === "1" || env.NOLO_SHOW_USAGE === "1";
@@ -232,14 +487,283 @@ function resolveCliColorEnabled(env = process.env, isTTY = Boolean(process.stdou
   if (setting === "1" || setting === "true" || setting === "on") return true;
   return isTTY;
 }
-function styleCliText(text, style, enabled = resolveCliColorEnabled()) {
-  if (!enabled || !text) return text;
-  const code = ANSI_FG[style] ?? ANSI_BG[style];
-  if (!code) return text;
-  return `${code}${text}${RESET}`;
+function styleCliText(text, style, enabled = resolveCliColorEnabled()) {
+  if (!enabled || !text) return text;
+  const code = ANSI_FG[style] ?? ANSI_BG[style];
+  if (!code) return text;
+  return `${code}${text}${RESET}`;
+}
+function dimCliText(text, enabled = resolveCliColorEnabled()) {
+  return styleCliText(text, "dim", enabled);
+}
+
+// packages/cli/tui/tuiAnsi.ts
+var ANSI_ESCAPE_REGEX = /\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]/g;
+var OSC_HYPERLINK_REGEX = /\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)\x1b\]8;;(?:\x07|\x1b\\)|\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)/g;
+function stripAnsi(text) {
+  return text.replace(OSC_HYPERLINK_REGEX, "").replace(ANSI_ESCAPE_REGEX, "");
+}
+var SGR_SEQUENCE_REGEX = /^\x1b\[[0-9;]*m/;
+var TRAILING_SGR_REGEX = /(?:\x1b\[[0-9;]*m)+$/;
+function applyTerminalOutputToText(existing, chunk) {
+  if (!chunk) return existing;
+  let text = existing;
+  let index = 0;
+  while (index < chunk.length) {
+    if (chunk[index] === "\x1B") {
+      const sgr = SGR_SEQUENCE_REGEX.exec(chunk.slice(index));
+      if (sgr) {
+        text += sgr[0];
+        index += sgr[0].length;
+        continue;
+      }
+      const osc = chunk.slice(index).match(/^\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)/);
+      if (osc) {
+        index += osc[0].length;
+        continue;
+      }
+      const csi = chunk.slice(index).match(/^\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]/);
+      if (csi) {
+        index += csi[0].length;
+        continue;
+      }
+      index += 1;
+      continue;
+    }
+    const ch = chunk[index];
+    if (ch === "\r") {
+      const lastNl = text.lastIndexOf("\n");
+      text = lastNl === -1 ? "" : text.slice(0, lastNl + 1);
+      index += 1;
+      continue;
+    }
+    if (ch === "\n") {
+      text += "\n";
+      index += 1;
+      continue;
+    }
+    if (ch === "\b") {
+      const trailing = TRAILING_SGR_REGEX.exec(text);
+      const sgrTail = trailing ? trailing[0] : "";
+      const head = sgrTail ? text.slice(0, -sgrTail.length) : text;
+      if (head.length > 0 && head[head.length - 1] !== "\n") {
+        text = head.slice(0, -1) + sgrTail;
+      }
+      index += 1;
+      continue;
+    }
+    const code = ch.charCodeAt(0);
+    if (code < 32 && ch !== "	" || code === 127) {
+      index += 1;
+      continue;
+    }
+    text += ch;
+    index += 1;
+  }
+  return text;
+}
+function displayWidth(str) {
+  let width = 0;
+  for (const char of str) {
+    const code = char.codePointAt(0) ?? 0;
+    if (code < 32 || code === 127) continue;
+    if (code >= 4352 && code <= 4447 || // 0x2768-0x2775 (ornamental brackets, incl. the ❯ prompt at U+276F)
+    // render narrow in terminals; counting them wide drifts the cursor.
+    code >= 9728 && code <= 10175 && !(code >= 10088 && code <= 10101) || // 0x2B00-0x2BFF (Misc Symbols and Arrows, incl. ⬢ U+2B22 used as the
+    // status-line agent icon) render double-wide in common monospace fonts;
+    // counting ⬢ as width 1 drifts the whole status line right of the icon.
+    code >= 11008 && code <= 11263 || code >= 11904 && code <= 12350 || code >= 12352 && code <= 13247 || code >= 13312 && code <= 19903 || code >= 19968 && code <= 42191 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65072 && code <= 65135 || code >= 65281 && code <= 65376 || code >= 65504 && code <= 65510 || code >= 127744 && code <= 129791 || code >= 131072 && code <= 196605 || code >= 196608 && code <= 262141 || // East Asian Ambiguous CJK quotation marks (U+201C/D “ ”, U+2018/9 ‘ ’).
+    // In CJK locale + CJK fonts these render double-wide like 全角 punctuation;
+    // in English fonts they stay width 1. Follow the active locale so Chinese
+    // replies align correctly without breaking English terminal output.
+    getCliLocale() === "zh" && (code === 8220 || code === 8221 || code === 8216 || code === 8217)) {
+      width += 2;
+    } else {
+      width += 1;
+    }
+  }
+  return width;
+}
+function visibleWidth(str) {
+  return displayWidth(stripAnsi(str));
+}
+function truncateAnsi(text, maxWidth) {
+  if (maxWidth <= 0) return "";
+  if (visibleWidth(text) <= maxWidth) return text;
+  let width = 0;
+  let out = "";
+  let i = 0;
+  let sawAnsi = false;
+  while (i < text.length) {
+    if (text[i] === "\x1B" && text[i + 1] === "[") {
+      sawAnsi = true;
+      let j = i + 2;
+      while (j < text.length) {
+        const code = text.charCodeAt(j);
+        j += 1;
+        if (code >= 64 && code <= 126) break;
+      }
+      out += text.slice(i, j);
+      i = j;
+      continue;
+    }
+    const codePoint = text.codePointAt(i) ?? 0;
+    const char = String.fromCodePoint(codePoint);
+    const charWidth = displayWidth(char);
+    if (width + charWidth > maxWidth) break;
+    out += char;
+    width += charWidth;
+    i += char.length;
+  }
+  return sawAnsi ? `${out}\x1B[0m` : out;
+}
+function fitAnsiLine(text, width, ellipsis = "\u2026") {
+  if (width <= 0) return "";
+  if (visibleWidth(text) <= width) return text;
+  const ellipsisWidth = displayWidth(ellipsis);
+  if (width < ellipsisWidth) return truncateAnsi(text, width);
+  if (width === ellipsisWidth) return truncateAnsi(ellipsis, width) || truncateAnsi(text, width);
+  return `${truncateAnsi(text, width - ellipsisWidth)}${ellipsis}`;
+}
+function countPhysicalLines(text, columns) {
+  const lines = text.split("\n");
+  let total = 0;
+  for (const line of lines) {
+    const width = displayWidth(line);
+    total += Math.max(1, Math.ceil(width / columns));
+  }
+  return Math.max(total, 1);
+}
+function takeDisplayWidth(text, width) {
+  let used = 0;
+  let index = 0;
+  for (const char of text) {
+    const charWidth = displayWidth(char);
+    if (used + charWidth > width && used > 0) break;
+    used += charWidth;
+    index += char.length;
+  }
+  return { prefix: text.slice(0, index), rest: text.slice(index) };
+}
+function padOrTruncateToWidth(text, width) {
+  const textWidth = visibleWidth(text);
+  if (textWidth > width) {
+    return truncateAnsi(text, width);
+  }
+  return `${text}${" ".repeat(width - textWidth)}`;
+}
+var SGR_RESET_REGEX = /^\x1b\[0?m$/;
+function tokenizeAnsiLine(line) {
+  const tokens = [];
+  let index = 0;
+  while (index < line.length) {
+    if (line[index] === "\x1B") {
+      const osc = line.slice(index).match(/^\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)/);
+      if (osc) {
+        tokens.push({ kind: "sgr", value: osc[0], width: 0 });
+        index += osc[0].length;
+        continue;
+      }
+      const sgr = SGR_SEQUENCE_REGEX.exec(line.slice(index));
+      if (sgr) {
+        tokens.push({ kind: "sgr", value: sgr[0], width: 0 });
+        index += sgr[0].length;
+        continue;
+      }
+    }
+    const codePoint = line.codePointAt(index) ?? 0;
+    const value = String.fromCodePoint(codePoint);
+    tokens.push({ kind: "char", value, width: displayWidth(value) });
+    index += value.length;
+  }
+  return tokens;
+}
+function wrapTranscriptLine(line, columns, hangingIndent = "") {
+  if (line === "") return [""];
+  const tokens = tokenizeAnsiLine(line);
+  const result = [];
+  let activeStyles = [];
+  const applyStyleToken = (value) => {
+    if (SGR_RESET_REGEX.test(value)) {
+      activeStyles = [];
+    } else {
+      activeStyles.push(value);
+    }
+  };
+  let start = 0;
+  while (start < tokens.length) {
+    if (tokens.slice(start).every((token) => token.kind === "sgr")) {
+      if (result.length > 0) break;
+    }
+    const openingStyles = [...activeStyles];
+    const isContinuation = result.length > 0 && hangingIndent.length > 0;
+    const indentWidth = isContinuation ? displayWidth(hangingIndent) : 0;
+    const maxSegmentWidth = Math.max(1, columns - indentWidth);
+    let width = 0;
+    let end = start;
+    let lastBreak = -1;
+    while (end < tokens.length) {
+      const token = tokens[end];
+      if (token.kind === "sgr") {
+        end += 1;
+        continue;
+      }
+      if (width + token.width > maxSegmentWidth && width > 0) break;
+      width += token.width;
+      end += 1;
+      if (token.value === " " || token.value === "	") {
+        lastBreak = end;
+      }
+    }
+    let segmentEnd = end;
+    if (end < tokens.length && lastBreak > start) {
+      const overflowToken = tokens[end];
+      if (overflowToken.kind === "char" && overflowToken.value !== " " && overflowToken.width === 1) {
+        segmentEnd = lastBreak;
+      }
+    }
+    if (segmentEnd === start) segmentEnd = start + 1;
+    let segment = "";
+    let sawStyle = openingStyles.length > 0;
+    for (let i = start; i < segmentEnd; i += 1) {
+      const token = tokens[i];
+      segment += token.value;
+      if (token.kind === "sgr") {
+        sawStyle = true;
+        applyStyleToken(token.value);
+      }
+    }
+    const prefix = openingStyles.join("");
+    const needsReset = (sawStyle || activeStyles.length > 0) && !segment.endsWith("\x1B[0m");
+    const lineContent = `${prefix}${segment}${needsReset ? "\x1B[0m" : ""}`;
+    result.push(isContinuation ? `${hangingIndent}${lineContent}` : lineContent);
+    start = segmentEnd;
+    while (start < tokens.length) {
+      const token = tokens[start];
+      if (token.kind === "char" && token.value === " ") {
+        start += 1;
+        continue;
+      }
+      break;
+    }
+  }
+  return result.length > 0 ? result : [""];
 }
-function dimCliText(text, enabled = resolveCliColorEnabled()) {
-  return styleCliText(text, "dim", enabled);
+function wrapTextToLines(text, columns) {
+  const result = [];
+  for (const logicalLine of text.split("\n")) {
+    if (logicalLine === "") {
+      result.push("");
+      continue;
+    }
+    let remaining = logicalLine;
+    while (remaining.length > 0) {
+      const { prefix, rest } = takeDisplayWidth(remaining, columns);
+      result.push(prefix);
+      remaining = rest;
+    }
+  }
+  return result;
 }
 
 // packages/cli/tui/theme.ts
@@ -402,8 +926,24 @@ function getActiveDensity() {
 function setActiveDensity(density) {
   activeDensity = density;
 }
+var TRUECOLOR_TERM_PROGRAMS = /* @__PURE__ */ new Set([
+  "iterm.app",
+  "wezterm",
+  "ghostty",
+  "vscode",
+  "hyper",
+  "tabby",
+  "rio",
+  "warpterminal"
+]);
 function supportsTruecolor(env = process.env) {
-  return /truecolor|24bit/i.test(env.COLORTERM ?? "");
+  const explicit = (env.NOLO_TUI_TRUECOLOR ?? "").trim().toLowerCase();
+  if (explicit === "1" || explicit === "true") return true;
+  if (explicit === "0" || explicit === "false") return false;
+  if (/truecolor|24bit/i.test(env.COLORTERM ?? "")) return true;
+  if (/direct|24bit/i.test(env.TERM ?? "")) return true;
+  const program = (env.TERM_PROGRAM ?? "").toLowerCase();
+  return TRUECOLOR_TERM_PROGRAMS.has(program);
 }
 function resolveTuiBrightness(env = process.env) {
   const explicit = (env.NOLO_TUI_THEME ?? "").trim().toLowerCase();
@@ -437,6 +977,17 @@ var TERMINAL_BASE = {
   dark: "1E1E2E",
   light: "FFFFFF"
 };
+var activeTerminalBaseHex = null;
+function setActiveTerminalBaseHex(hex) {
+  if (hex === null) {
+    activeTerminalBaseHex = null;
+    return;
+  }
+  activeTerminalBaseHex = readHexChannels(hex.replace(/^#/, "").toUpperCase()) ? hex.replace(/^#/, "").toUpperCase() : null;
+}
+function resolveTerminalBaseHex(brightness) {
+  return activeTerminalBaseHex ?? TERMINAL_BASE[brightness];
+}
 function readHexChannels(hex) {
   if (!/^[0-9A-F]{6}$/.test(hex)) return null;
   return [
@@ -474,21 +1025,49 @@ function diffLineSequences(env = process.env, brightness = resolveTuiBrightness(
   const palette = THEME_PALETTES[activeThemeName] ?? THEME_PALETTES.trail;
   const successHex = palette[brightness].success.hex;
   const dangerHex = palette[brightness].danger.hex;
-  const weight = brightness === "dark" ? 0.14 : 0.1;
-  const baseHex = TERMINAL_BASE[brightness];
+  const infoHex = palette[brightness].info.hex;
+  const weight = brightness === "dark" ? 0.18 : 0.12;
+  const baseHex = resolveTerminalBaseHex(brightness);
   const addedBgHex = blendHex(successHex, baseHex, weight);
   const removedBgHex = blendHex(dangerHex, baseHex, weight);
+  const hunkBgHex = blendHex(infoHex, baseHex, weight * 0.6);
+  const successSgr = hexToSgr(successHex);
+  const dangerSgr = hexToSgr(dangerHex);
+  const infoSgr = hexToSgr(infoHex);
   return {
     added: {
-      fg: hexToSgr(successHex),
-      bg: hexToBgSgr(addedBgHex)
+      fg: successSgr,
+      bg: hexToBgSgr(addedBgHex),
+      bar: `${successSgr}\u258C\x1B[39m`
     },
     removed: {
-      fg: hexToSgr(dangerHex),
-      bg: hexToBgSgr(removedBgHex)
-    }
+      fg: dangerSgr,
+      bg: hexToBgSgr(removedBgHex),
+      bar: `${dangerSgr}\u258C\x1B[39m`
+    },
+    hunk: {
+      fg: infoSgr,
+      bg: hexToBgSgr(hunkBgHex),
+      bar: " "
+    },
+    context: { fg: "", bg: "", bar: " " }
   };
 }
+function renderDiffLine(args) {
+  const { kind, text } = args;
+  const env = args.env ?? process.env;
+  const colorEnabled = args.colorEnabled ?? resolveCliColorEnabled();
+  if (!colorEnabled) return text;
+  const seqs = diffLineSequences(env);
+  if (!seqs) {
+    if (kind === "context") return text;
+    const token = kind === "added" ? "success" : kind === "removed" ? "danger" : "info";
+    return `${themeColorSequence(token, env)}${text}\x1B[39m`;
+  }
+  const seq = seqs[kind];
+  const padding = args.padTo === void 0 ? "" : " ".repeat(Math.max(0, args.padTo - displayWidth(text)));
+  return `${seq.bar}${seq.bg}${seq.fg}${text}${padding}\x1B[0m`;
+}
 function surfaceBackgroundSequence(env = process.env, brightness = resolveTuiBrightness(env)) {
   if (!supportsTruecolor(env)) return "";
   return hexToBgSgr((SURFACE_HEX[activeThemeName] ?? SURFACE_HEX.trail)[brightness]);
@@ -502,69 +1081,11 @@ function themeText(text, token, colorEnabled = resolveCliColorEnabled(), env = p
   if (!colorEnabled) return text;
   return `${themeColorSequence(token, env)}${text}\x1B[39m`;
 }
-function renderDiffCodeBlock(code, env = process.env) {
-  const border = themeText("\u2502", "chrome", true, env);
-  const addedColor = themeColorSequence("success", env);
-  const deletedColor = themeColorSequence("danger", env);
-  const hunkColor = themeColorSequence("info", env);
-  const contextColor = themeColorSequence("chrome", env);
-  const reset = "\x1B[0m";
-  const lines = code.split("\n").map((line) => {
-    let color = contextColor;
-    if (line.startsWith("@@")) {
-      color = hunkColor;
-    } else if (line.startsWith("+") && !line.startsWith("+++")) {
-      color = addedColor;
-    } else if (line.startsWith("-") && !line.startsWith("---")) {
-      color = deletedColor;
-    }
-    return ` ${border}  ${color}${line}${reset}`;
-  });
-  return ` ${themeText("\u250C\u2500\u2500\u2500", "chrome", true, env)}
-${lines.join("\n")}
- ${themeText("\u2514\u2500\u2500\u2500", "chrome", true, env)}`;
-}
-function highlightMarkdown(text, colorEnabled = resolveCliColorEnabled(), env = process.env) {
-  if (!colorEnabled) return text;
-  let result = text;
-  result = result.replace(/```([a-zA-Z-]*)\n([\s\S]*?)\n```/g, (match, lang, code) => {
-    if (lang.toLowerCase() === "diff") {
-      return renderDiffCodeBlock(code, env);
-    }
-    const infoColor = themeColorSequence("info", env);
-    const reset2 = "\x1B[39m\x1B[22m";
-    const border = themeText("\u2502", "chrome", true, env);
-    const formattedCode = code.split("\n").map((line) => ` ${border}  ${infoColor}${line}${reset2}`).join("\n");
-    return ` ${themeText("\u250C\u2500\u2500\u2500", "chrome", true, env)}
-${formattedCode}
- ${themeText("\u2514\u2500\u2500\u2500", "chrome", true, env)}`;
-  });
-  result = result.replace(/^(#{1,3})\s+(.+)$/gm, (match, hashes, title) => {
-    const level = hashes.length;
-    const reset2 = "\x1B[0m";
-    if (level === 1) {
-      return `\x1B[1m\x1B[4m${themeColorSequence("accent", env)}${title}${reset2}`;
-    }
-    if (level === 2) {
-      return `\x1B[1m${themeColorSequence("warning", env)}${title}${reset2}`;
-    }
-    return `\x1B[1m${themeColorSequence("info", env)}${title}${reset2}`;
-  });
-  result = result.replace(
-    /^(进入 nolo-plan[^\n]*)$/gm,
-    (match, content) => `${themeColorSequence("chrome", env)}\x1B[2m${content}\x1B[0m`
-  );
-  result = result.replace(/^>\s?(.*)$/gm, (match, content) => {
-    const border = themeColorSequence("chrome", env);
-    return `${border}\u2502\x1B[39m \x1B[2m${content}\x1B[22m`;
-  });
-  result = result.replace(/\*\*([\s\S]*?)\*\*/g, "\x1B[1m$1\x1B[22m");
-  const mutedColor = themeColorSequence("muted", env);
-  const reset = "\x1B[39m";
-  result = result.replace(/`([^`\n]+)`/g, `${mutedColor}$1${reset}`);
-  result = result.replace(/(?<!\*)\*([^*\n]+?)\*(?!\*)/g, `\x1B[2m$1\x1B[22m`);
-  result = result.replace(/~~([^~\n]+?)~~/g, `\x1B[2m\x1B[9m$1\x1B[29m\x1B[22m`);
-  return result;
+function classifyDiffLine(line) {
+  if (line.startsWith("@@")) return "hunk";
+  if (line.startsWith("+") && !line.startsWith("+++")) return "added";
+  if (line.startsWith("-") && !line.startsWith("---")) return "removed";
+  return "context";
 }
 
 // packages/cli/client/assistantOutput.ts
@@ -743,20 +1264,7 @@ function highlightCodeLine(line, lang, brightness) {
     return `${info}${line}${STYLE.reset}`;
   }
   if (lang === "diff") {
-    const added = colorSeq("success", brightness);
-    const deleted = colorSeq("danger", brightness);
-    const hunk = colorSeq("info", brightness);
-    const context = colorSeq("chrome", brightness);
-    const reset2 = STYLE.reset;
-    let color = context;
-    if (line.startsWith("@@")) {
-      color = hunk;
-    } else if (line.startsWith("+") && !line.startsWith("+++")) {
-      color = added;
-    } else if (line.startsWith("-") && !line.startsWith("---")) {
-      color = deleted;
-    }
-    return `${color}${line}${reset2}`;
+    return renderDiffLine({ kind: classifyDiffLine(line), text: line, colorEnabled: true });
   }
   const regions = scanStringCommentRegions(line, lang);
   const keywords = KEYWORDS[lang];
@@ -953,7 +1461,7 @@ function styleRichMarkdownLine(line, brightness) {
   const ordered = line.match(/^(\s*)(\d+\.)\s(.+)$/);
   if (ordered) {
     const styled = styleInlineMarkdown(ordered[3], brightness);
-    return `${ordered[1]}${colorSeq("accent", brightness)}${ordered[2]}${STYLE.reset} ${styled}`;
+    return `${ordered[1]}${colorSeq("chrome", brightness)}${ordered[2]}${STYLE.reset} ${styled}`;
   }
   const task = line.match(/^(\s*)(☐|☑)\s(.+)$/);
   if (task) {
@@ -1354,456 +1862,254 @@ function formatFetchTreeLines(items) {
   return { header, count, lines };
 }
 
-// packages/cli/tui/i18n.ts
-var ZH_PATTERNS = /^zh/i;
-function parseCliLocale(raw) {
-  const normalized = raw?.trim().toLowerCase();
-  if (!normalized) return null;
-  if (ZH_PATTERNS.test(normalized)) return "zh";
-  if (normalized === "en" || normalized.startsWith("en")) return "en";
-  return null;
-}
-function detectLocaleFromEnv(env) {
-  const explicit = parseCliLocale(env.NOLO_LANG);
-  if (explicit) return explicit;
-  const candidates = [env.LC_ALL, env.LC_CTYPE, env.LANG].filter(Boolean);
-  for (const candidate of candidates) {
-    if (ZH_PATTERNS.test(candidate)) return "zh";
-    if (candidate && !candidate.startsWith("C.") && !candidate.startsWith("POSIX")) {
-      return "en";
+// packages/cli/node_modules/diff/libesm/diff/base.js
+var Diff = class {
+  diff(oldStr, newStr, options = {}) {
+    let callback;
+    if (typeof options === "function") {
+      callback = options;
+      options = {};
+    } else if ("callback" in options) {
+      callback = options.callback;
+    }
+    const oldString = this.castInput(oldStr, options);
+    const newString = this.castInput(newStr, options);
+    const oldTokens = this.removeEmpty(this.tokenize(oldString, options));
+    const newTokens = this.removeEmpty(this.tokenize(newString, options));
+    return this.diffWithOptionsObj(oldTokens, newTokens, options, callback);
+  }
+  diffWithOptionsObj(oldTokens, newTokens, options, callback) {
+    var _a;
+    const done = (value) => {
+      value = this.postProcess(value, options);
+      if (callback) {
+        setTimeout(function() {
+          callback(value);
+        }, 0);
+        return void 0;
+      } else {
+        return value;
+      }
+    };
+    const newLen = newTokens.length, oldLen = oldTokens.length;
+    let editLength = 1;
+    let maxEditLength = newLen + oldLen;
+    if (options.maxEditLength != null) {
+      maxEditLength = Math.min(maxEditLength, options.maxEditLength);
+    }
+    const maxExecutionTime = (_a = options.timeout) !== null && _a !== void 0 ? _a : Infinity;
+    const abortAfterTimestamp = Date.now() + maxExecutionTime;
+    const bestPath = [{ oldPos: -1, lastComponent: void 0 }];
+    let newPos = this.extractCommon(bestPath[0], newTokens, oldTokens, 0, options);
+    if (bestPath[0].oldPos + 1 >= oldLen && newPos + 1 >= newLen) {
+      return done(this.buildValues(bestPath[0].lastComponent, newTokens, oldTokens));
+    }
+    let minDiagonalToConsider = -Infinity, maxDiagonalToConsider = Infinity;
+    const execEditLength = () => {
+      for (let diagonalPath = Math.max(minDiagonalToConsider, -editLength); diagonalPath <= Math.min(maxDiagonalToConsider, editLength); diagonalPath += 2) {
+        let basePath;
+        const removePath = bestPath[diagonalPath - 1], addPath = bestPath[diagonalPath + 1];
+        if (removePath) {
+          bestPath[diagonalPath - 1] = void 0;
+        }
+        let canAdd = false;
+        if (addPath) {
+          const addPathNewPos = addPath.oldPos - diagonalPath;
+          canAdd = addPath && 0 <= addPathNewPos && addPathNewPos < newLen;
+        }
+        const canRemove = removePath && removePath.oldPos + 1 < oldLen;
+        if (!canAdd && !canRemove) {
+          bestPath[diagonalPath] = void 0;
+          continue;
+        }
+        if (!canRemove || canAdd && removePath.oldPos < addPath.oldPos) {
+          basePath = this.addToPath(addPath, true, false, 0, options);
+        } else {
+          basePath = this.addToPath(removePath, false, true, 1, options);
+        }
+        newPos = this.extractCommon(basePath, newTokens, oldTokens, diagonalPath, options);
+        if (basePath.oldPos + 1 >= oldLen && newPos + 1 >= newLen) {
+          return done(this.buildValues(basePath.lastComponent, newTokens, oldTokens)) || true;
+        } else {
+          bestPath[diagonalPath] = basePath;
+          if (basePath.oldPos + 1 >= oldLen) {
+            maxDiagonalToConsider = Math.min(maxDiagonalToConsider, diagonalPath - 1);
+          }
+          if (newPos + 1 >= newLen) {
+            minDiagonalToConsider = Math.max(minDiagonalToConsider, diagonalPath + 1);
+          }
+        }
+      }
+      editLength++;
+    };
+    if (callback) {
+      (function exec() {
+        setTimeout(function() {
+          if (editLength > maxEditLength || Date.now() > abortAfterTimestamp) {
+            return callback(void 0);
+          }
+          if (!execEditLength()) {
+            exec();
+          }
+        }, 0);
+      })();
+    } else {
+      while (editLength <= maxEditLength && Date.now() <= abortAfterTimestamp) {
+        const ret = execEditLength();
+        if (ret) {
+          return ret;
+        }
+      }
     }
   }
-  return null;
-}
-function detectLocale(env) {
-  return detectLocaleFromEnv(env) ?? "zh";
-}
-var currentLocale = detectLocale(process.env);
-function getCliLocale() {
-  return currentLocale;
-}
-function setCliLocale(locale) {
-  currentLocale = locale;
-}
-function initCliLocale(env = process.env) {
-  currentLocale = detectLocale(env);
-}
-var STRINGS = {
-  welcomeHint: {
-    en: "Tell nolo what you want. Use /help for commands. Shift+Enter for newline.",
-    zh: "\u544A\u8BC9 nolo \u4F60\u60F3\u8981\u4EC0\u4E48\u3002\u8F93\u5165 /help \u67E5\u770B\u547D\u4EE4\u3002Shift+Enter \u6362\u884C\u3002"
-  },
-  promptLabel: {
-    en: "\u276F ",
-    zh: "\u276F "
-  },
-  continueLabel: {
-    en: "\u2502 ",
-    zh: "\u2502 "
-  },
-  placeholder: {
-    en: "Type a message or / for commands...",
-    zh: "\u8F93\u5165\u6D88\u606F\uFF0C\u6216\u7528 / \u67E5\u770B\u547D\u4EE4\u2026"
-  },
-  newDialog: {
-    en: "new dialog",
-    zh: "\u65B0\u5BF9\u8BDD"
-  },
-  startedFreshDialog: {
-    en: "Started a fresh dialog.",
-    zh: "\u5DF2\u5F00\u59CB\u65B0\u5BF9\u8BDD\u3002"
-  },
-  bye: {
-    en: "Bye.",
-    zh: "\u518D\u89C1\u3002"
-  },
-  resumedDialogPrefix: {
-    en: "Resumed dialog",
-    zh: "\u5DF2\u6062\u590D\u5BF9\u8BDD"
-  },
-  resumeInvalidId: {
-    en: "does not look like a dialog id. Use /history to pick one.",
-    zh: "\u770B\u8D77\u6765\u4E0D\u662F dialog id\u3002\u7528 /history \u4ECE\u5217\u8868\u91CC\u9009\u4E00\u4E2A\u3002"
-  },
-  dialogResumeCancelled: {
-    en: "Dialog resume cancelled.",
-    zh: "\u5DF2\u53D6\u6D88\u6062\u590D\u5BF9\u8BDD\u3002"
-  },
-  agentSwitchCancelled: {
-    en: "Agent switch cancelled.",
-    zh: "\u5DF2\u53D6\u6D88\u5207\u6362 agent\u3002"
-  },
-  historyPickerTitle: {
-    en: "Resume dialog (\u2191\u2193 Enter Esc)",
-    zh: "\u6062\u590D\u5BF9\u8BDD\uFF08\u2191\u2193 \u79FB\u52A8 \xB7 Enter \u9009\u62E9 \xB7 Esc \u53D6\u6D88\uFF09"
-  },
-  noDialogsYet: {
-    en: "No dialogs yet.",
-    zh: "\u8FD8\u6CA1\u6709\u5386\u53F2\u5BF9\u8BDD\u3002"
-  },
-  langUsage: {
-    en: "Usage: /lang <zh|en>",
-    zh: "\u7528\u6CD5\uFF1A/lang <zh|en>"
-  },
-  stopHint: {
-    en: "Esc to stop",
-    zh: "Esc \u505C\u6B62\u56DE\u590D"
-  },
-  queuedHint: {
-    en: "queued",
-    zh: "\u6392\u961F"
-  },
-  turnStopped: {
-    en: "Stopped this reply.",
-    zh: "\u5DF2\u505C\u6B62\u672C\u6B21\u56DE\u590D\u3002"
-  },
-  turnFailed: {
-    en: "This reply failed. Queued messages are kept \u2014 press Enter to resend.",
-    zh: "\u672C\u6B21\u56DE\u590D\u51FA\u9519\u3002\u5DF2\u6392\u961F\u7684\u6D88\u606F\u4ECD\u4FDD\u7559\uFF0C\u6309 Enter \u53EF\u91CD\u65B0\u53D1\u9001\u3002"
-  },
-  quotaExhaustedHint: {
-    en: "[nolo] This agent seems to have hit a quota/rate limit (HTTP 429).\nUse /agent to switch to another agent and keep going \u2014 the dialog context is preserved.",
-    zh: "[nolo] \u5F53\u524D agent \u4F3C\u4E4E\u989D\u5EA6/\u901F\u7387\u53D7\u9650\uFF08429\uFF09\u3002\n\u53EF\u4EE5\u7528 /agent \u5207\u6362\u5230\u5176\u4ED6 agent \u540E\u7EE7\u7EED\uFF0C\u540C\u4E00\u5BF9\u8BDD\u4F1A\u4FDD\u7559\u4E0A\u4E0B\u6587\u3002"
-  },
-  balanceExhaustedHint: {
-    en: '[nolo] Insufficient balance. Your message is saved in this dialog \u2014 top up, then send again or say "continue".',
-    zh: "[nolo] \u4F59\u989D\u4E0D\u8DB3\u3002\u4F60\u521A\u53D1\u7684\u8BDD\u5DF2\u4FDD\u5B58\u5728\u5F53\u524D\u5BF9\u8BDD\u91CC\u2014\u2014\u5145\u503C\u540E\u76F4\u63A5\u518D\u8BF4\u4E00\u53E5\u6216\u8BF4\u300C\u7EE7\u7EED\u300D\u5373\u53EF\uFF0C\u4E0D\u4F1A\u4E22\u4E0A\u4E0B\u6587\u3002"
-  },
-  dialogPreservedHint: {
-    en: '[nolo] This turn failed, but the dialog is kept. Send another message (or say "continue") to keep going in the same conversation.',
-    zh: "[nolo] \u672C\u8F6E\u5931\u8D25\u4E86\uFF0C\u4F46\u5BF9\u8BDD\u5DF2\u4FDD\u7559\u3002\u76F4\u63A5\u518D\u8BF4\u4E00\u53E5\uFF08\u6216\u8BF4\u300C\u7EE7\u7EED\u300D\uFF09\u5373\u53EF\u5728\u540C\u4E00\u5BF9\u8BDD\u91CC\u63A5\u7740\u804A\u3002"
-  },
-  dialogNotSavedHint: {
-    en: "[nolo] This turn did not create a dialog. Your next message will start a new conversation \u2014 restate what you need.",
-    zh: "[nolo] \u672C\u8F6E\u6CA1\u6709\u5EFA\u6210\u5BF9\u8BDD\u3002\u4E0B\u4E00\u53E5\u4F1A\u662F\u65B0\u5BF9\u8BDD\u2014\u2014\u8BF7\u628A\u4F60\u60F3\u505A\u7684\u4E8B\u518D\u8BF4\u4E00\u904D\u3002"
-  },
-  copiedLastReply: {
-    en: "Copied the last reply to the clipboard.",
-    zh: "\u5DF2\u590D\u5236\u6700\u540E\u4E00\u6761\u56DE\u590D\u5230\u526A\u8D34\u677F\u3002"
-  },
-  copyNothing: {
-    en: "Nothing to copy yet.",
-    zh: "\u8FD8\u6CA1\u6709\u53EF\u590D\u5236\u7684\u5185\u5BB9\u3002"
-  },
-  copyFailed: {
-    en: "Copy failed",
-    zh: "\u590D\u5236\u5931\u8D25"
-  },
-  copyUnavailable: {
-    en: "Clipboard is unavailable in this environment. The last reply was printed above for manual copy.",
-    zh: "\u5F53\u524D\u73AF\u5883\u6CA1\u6709\u53EF\u7528\u7684\u526A\u8D34\u677F\u3002\u6700\u540E\u4E00\u6761\u56DE\u590D\u5DF2\u6253\u5370\u5728\u4E0A\u65B9\uFF0C\u53EF\u624B\u52A8\u590D\u5236\u3002"
-  },
-  copyUsage: {
-    en: "Usage: /copy or /copy view",
-    zh: "\u7528\u6CD5\uFF1A/copy \u6216 /copy view"
-  },
-  copyViewTitle: {
-    en: "Copy view \u2014 latest AI reply",
-    zh: "\u590D\u5236\u89C6\u56FE \u2014 \u6700\u65B0 AI \u56DE\u590D"
-  },
-  copyViewHint: {
-    en: "Drag to select; edge scrolling uses native terminal scrollback. Press Esc or Enter to return.",
-    zh: "\u76F4\u63A5\u62D6\u9009\uFF0C\u62D6\u5230\u8FB9\u7F18\u53EF\u7528\u7EC8\u7AEF\u539F\u751F\u56DE\u6EDA\u8DE8\u5C4F\u9009\u62E9\u3002\u6309 Esc \u6216 Enter \u8FD4\u56DE\u3002"
-  },
-  historyNoToken: {
-    en: "History requires an auth token. Run `nolo login` or set AUTH_TOKEN.",
-    zh: "\u67E5\u770B\u5386\u53F2\u5BF9\u8BDD\u9700\u8981\u767B\u5F55\u51ED\u8BC1\u3002\u8BF7\u8FD0\u884C `nolo login` \u6216\u8BBE\u7F6E AUTH_TOKEN\u3002"
-  },
-  historyBadToken: {
-    en: "Could not read a user id from AUTH_TOKEN. Run `nolo login` again.",
-    zh: "\u65E0\u6CD5\u4ECE AUTH_TOKEN \u89E3\u6790\u51FA\u7528\u6237 id\uFF0C\u8BF7\u91CD\u65B0\u8FD0\u884C `nolo login`\u3002"
-  },
-  mouseOn: {
-    en: "Mouse mode on: wheel scrolls the transcript; hold Shift (or Option/Fn) to select text.",
-    zh: "\u9F20\u6807\u6A21\u5F0F\u5DF2\u5F00\u542F\uFF1A\u6EDA\u8F6E\u6EDA\u52A8\u5BF9\u8BDD\u8BB0\u5F55\uFF1B\u6309\u4F4F Shift\uFF08\u6216 Option/Fn\uFF09\u53EF\u62D6\u9009\u590D\u5236\u3002"
-  },
-  mouseOff: {
-    en: "Mouse mode off: drag to select/copy freely; scroll with PageUp/PageDown.",
-    zh: "\u9F20\u6807\u6A21\u5F0F\u5DF2\u5173\u95ED\uFF1A\u53EF\u76F4\u63A5\u62D6\u9009\u590D\u5236\uFF1B\u7528 PageUp/PageDown \u6EDA\u52A8\u5BF9\u8BDD\u8BB0\u5F55\u3002"
-  },
-  mouseUsage: {
-    en: "Usage: /mouse <on|off>",
-    zh: "\u7528\u6CD5\uFF1A/mouse <on|off>"
-  },
-  langSwitched: {
-    en: "Language switched to English.",
-    zh: "\u5DF2\u5207\u6362\u4E3A\u4E2D\u6587\u3002"
-  },
-  // --- Tool trace copy ------------------------------------------------------
-  // The compact trace shows only status, never timing or output size: a line
-  // count told the user nothing actionable and the ms figure read as noise.
-  toolNeedsAction: {
-    en: "needs action",
-    zh: "\u5F85\u786E\u8BA4"
-  },
-  toolTimedOut: {
-    en: "timed out",
-    zh: "\u5DF2\u8D85\u65F6"
-  },
-  toolExitCode: {
-    en: "exit",
-    zh: "\u9000\u51FA\u7801"
-  },
-  toolFailed: {
-    en: "failed",
-    zh: "\u5931\u8D25"
-  },
-  // --- Dialog (picker / confirm) copy --------------------------------------
-  // Key-hint wording is unified across select / multi-select / confirm so the
-  // three dialogs read as one family: "<Label>  <↑↓ move · Enter choose ·
-  // Esc cancel>  <count>". Connectors are "·" between keys, two spaces between
-  // the label, hint, and count. zh uses full-width parentheses to match the
-  // existing historyPickerTitle; en uses ASCII parentheses.
-  dialogSelectLabel: {
-    en: "Select",
-    zh: "\u9009\u62E9"
-  },
-  dialogSelectHint: {
-    en: "(\u2191\u2193 move \xB7 Enter choose \xB7 Esc cancel)",
-    zh: "\uFF08\u2191\u2193 \u79FB\u52A8 \xB7 Enter \u9009\u62E9 \xB7 Esc \u53D6\u6D88\uFF09"
-  },
-  dialogMultiSelectLabel: {
-    en: "Select",
-    zh: "\u9009\u62E9"
-  },
-  dialogMultiSelectHint: {
-    en: "(\u2191\u2193 move \xB7 Space toggle \xB7 Enter submit \xB7 Esc cancel)",
-    zh: "\uFF08\u2191\u2193 \u79FB\u52A8 \xB7 Space \u5207\u6362 \xB7 Enter \u63D0\u4EA4 \xB7 Esc \u53D6\u6D88\uFF09"
-  },
-  dialogMultiSelectSelected: {
-    en: "selected",
-    zh: "\u5DF2\u9009"
-  },
-  dialogConfirmHint: {
-    en: "(\u2191\u2193 move \xB7 Enter choose \xB7 Esc cancel)",
-    zh: "\uFF08\u2191\u2193 \u79FB\u52A8 \xB7 Enter \u9009\u62E9 \xB7 Esc \u53D6\u6D88\uFF09"
-  },
-  dialogConfirmTitle: {
-    en: "Confirm destructive shell command",
-    zh: "\u786E\u8BA4\u6267\u884C\u7834\u574F\u6027 shell \u547D\u4EE4"
-  },
-  dialogConfirmBody: {
-    en: "This command may delete or reset user content and needs explicit confirmation before it runs.",
-    zh: "\u8BE5\u547D\u4EE4\u53EF\u80FD\u5220\u9664\u6216\u91CD\u7F6E\u7528\u6237\u5185\u5BB9\uFF0C\u9700\u8981\u7528\u6237\u660E\u786E\u786E\u8BA4\u540E\u624D\u80FD\u6267\u884C\u3002"
-  },
-  dialogConfirmCommandLabel: {
-    en: "Command",
-    zh: "\u547D\u4EE4"
-  },
-  dialogConfirmCommandTruncated: {
-    en: "(truncated)",
-    zh: "\uFF08\u5DF2\u622A\u65AD\uFF09"
-  },
-  dialogConfirmAllowLabel: {
-    en: "Allow",
-    zh: "\u5141\u8BB8"
-  },
-  dialogConfirmAllowDetail: {
-    en: "execute this time",
-    zh: "\u672C\u6B21\u6267\u884C"
-  },
-  dialogConfirmCancelLabel: {
-    en: "Cancel",
-    zh: "\u53D6\u6D88"
-  },
-  dialogConfirmCancelDetail: {
-    en: "abort the operation",
-    zh: "\u4E2D\u6B62\u64CD\u4F5C"
-  },
-  contextTitle: {
-    en: "Workspace context",
-    zh: "\u5DE5\u4F5C\u533A\u4E0A\u4E0B\u6587"
-  },
-  contextNext: {
-    en: "Next:",
-    zh: "\u4E0B\u4E00\u6B65\uFF1A"
-  },
-  contextFieldAgent: {
-    en: "agent",
-    zh: "\u667A\u80FD\u4F53"
-  },
-  contextFieldTokens: {
-    en: "tokens",
-    zh: "\u4EE4\u724C"
-  },
-  contextFieldDialog: {
-    en: "dialog",
-    zh: "\u5BF9\u8BDD"
-  },
-  contextFieldDocs: {
-    en: "docs",
-    zh: "\u6587\u6863"
-  },
-  contextFieldSkills: {
-    en: "skills",
-    zh: "\u6280\u80FD"
-  },
-  contextFieldProfile: {
-    en: "profile",
-    zh: "\u914D\u7F6E"
-  },
-  contextFieldRuntime: {
-    en: "runtime",
-    zh: "\u8FD0\u884C\u65F6"
-  },
-  contextFieldTools: {
-    en: "tools",
-    zh: "\u5DE5\u5177"
-  },
-  contextFieldThinking: {
-    en: "thinking",
-    zh: "\u601D\u8003"
-  },
-  contextFieldServer: {
-    en: "server",
-    zh: "\u670D\u52A1\u7AEF"
-  },
-  contextNextAgents: {
-    en: "see specialist shortcuts",
-    zh: "\u67E5\u770B\u4E13\u7528\u667A\u80FD\u4F53\u5FEB\u6377\u65B9\u5F0F"
-  },
-  contextNextDoc: {
-    en: "add working context",
-    zh: "\u6DFB\u52A0\u5DE5\u4F5C\u4E0A\u4E0B\u6587"
-  },
-  contextNextSkill: {
-    en: "attach a skill to this workspace",
-    zh: "\u4E3A\u8BE5\u5DE5\u4F5C\u533A\u6302\u8F7D\u6280\u80FD"
-  },
-  contextNextNew: {
-    en: "start a clean dialog",
-    zh: "\u5F00\u59CB\u4E00\u4E2A\u5E72\u51C0\u7684\u5BF9\u8BDD"
-  },
-  agentsTitle: {
-    en: "Agents:",
-    zh: "\u667A\u80FD\u4F53\uFF1A"
-  },
-  agentsTip: {
-    en: "Tip: run /switch for the full picker, or /switch list for your private agents too.",
-    zh: "\u63D0\u793A\uFF1A\u7528 /switch \u6253\u5F00\u5B8C\u6574\u9009\u62E9\u5668\uFF0C\u6216 /switch list \u8FDE\u4F60\u7684\u79C1\u6709\u667A\u80FD\u4F53\u4E00\u8D77\u5217\u51FA\u3002"
-  },
-  helpText: {
-    en: [
-      "Commands:",
-      "  /help                 Show this help",
-      "  /new                  Clear screen and start a fresh dialog",
-      "  /compact              Compact current dialog and fork a new one",
-      "  /context              Show workspace context and next actions",
-      "  /runtime <mode>       Use auto, local, or server runtime",
-      "  /tools <mode>         Control tool trace: hide, compact, verbose",
-      "  /thinking <mode>      Control thinking output: hide, marker, show",
-      "  /switch               Pick an agent interactively (\u2191\u2193, Enter)",
-      "  /switch list          List agents as text",
-      "  /switch <name>        Switch directly by name, alias, or key (alias: /agent)",
-      "  /agents               List platform agent shortcuts",
-      "  /history              Pick a recent dialog to resume (\u2191\u2193, Enter)",
-      "  /resume <dialogId>    Resume a dialog directly by id",
-      "  /lang <zh|en>         Switch interface language",
-      "  /copy                 Copy the last reply to the clipboard",
-      "  /copy view            Open native scrollback for partial selection (Ctrl+O)",
-      "  /mouse <on|off>       Toggle mouse mode (off = drag to select text)",
-      "  /doc                  List attached docs",
-      "  /doc attach <doc>     Attach a doc to this workspace",
-      "  /skill                List attached skills",
-      "  /skill attach <ref>   Attach a skill (dbKey, name, or SKILL.md path)",
-      "  /skill detach <ref>   Detach a skill",
-      "  /skill clear          Detach all skills",
-      "  /customize            Describe how you want to tune nolo",
-      "  /tasks                List background process tasks (aliases: /jobs, /procs)",
-      "  /stop <pid|all>       Stop background process tasks",
-      "  /login                Show login/profile hint",
-      "  /profile              Show active profile",
-      "  /update               Update the nolo CLI install",
-      "  /version              Show version/update hint",
-      "  /exit                 Leave the workspace",
-      "",
-      "You can also type normally. nolo routes simple read/status requests to CLI commands and sends the rest to the current agent."
-    ].join("\n"),
-    zh: [
-      "\u547D\u4EE4\uFF1A",
-      "  /help                 \u663E\u793A\u672C\u5E2E\u52A9",
-      "  /new                  \u6E05\u5C4F\u5E76\u5F00\u59CB\u65B0\u5BF9\u8BDD",
-      "  /compact              \u538B\u7F29\u5F53\u524D\u5BF9\u8BDD\u5E76\u5206\u53C9\u51FA\u65B0\u5BF9\u8BDD",
-      "  /context              \u67E5\u770B\u5DE5\u4F5C\u533A\u4E0A\u4E0B\u6587\u4E0E\u540E\u7EED\u64CD\u4F5C",
-      "  /runtime <mode>       \u5207\u6362 runtime\uFF1Aauto\u3001local\u3001server",
-      "  /tools <mode>         \u5DE5\u5177\u8F68\u8FF9\u663E\u793A\uFF1Ahide\u3001compact\u3001verbose",
-      "  /thinking <mode>      \u601D\u8003\u8FC7\u7A0B\u663E\u793A\uFF1Ahide\u3001marker\u3001show",
-      "  /switch               \u4EA4\u4E92\u5F0F\u9009\u62E9 agent\uFF08\u2191\u2193 \u79FB\u52A8\uFF0CEnter \u786E\u8BA4\uFF09",
-      "  /switch list          \u4EE5\u6587\u672C\u5217\u51FA\u5168\u90E8 agent",
-      "  /switch <name>        \u6309\u540D\u79F0\u3001\u522B\u540D\u6216 key \u76F4\u63A5\u5207\u6362\uFF08\u522B\u540D\uFF1A/agent\uFF09",
-      "  /agents               \u5217\u51FA\u5E73\u53F0 agent \u5FEB\u6377\u65B9\u5F0F",
-      "  /history              \u4ECE\u6700\u8FD1\u5BF9\u8BDD\u4E2D\u9009\u62E9\u5E76\u6062\u590D\uFF08\u2191\u2193\uFF0CEnter\uFF09",
-      "  /resume <dialogId>    \u6309 id \u76F4\u63A5\u6062\u590D\u5BF9\u8BDD",
-      "  /lang <zh|en>         \u5207\u6362\u754C\u9762\u8BED\u8A00",
-      "  /copy                 \u590D\u5236\u6700\u540E\u4E00\u6761\u56DE\u590D\u5230\u526A\u8D34\u677F",
-      "  /copy view            \u6253\u5F00\u539F\u751F\u56DE\u6EDA\u8FDB\u884C\u8DE8\u5C4F\u62D6\u9009\uFF08Ctrl+O\uFF09",
-      "  /mouse <on|off>       \u5207\u6362\u9F20\u6807\u6A21\u5F0F\uFF08off \u540E\u53EF\u76F4\u63A5\u62D6\u9009\u6587\u672C\uFF09",
-      "  /doc                  \u5217\u51FA\u5DF2\u6302\u8F7D\u7684\u6587\u6863",
-      "  /doc attach <doc>     \u6302\u8F7D\u6587\u6863\u5230\u5F53\u524D\u5DE5\u4F5C\u533A",
-      "  /skill                \u5217\u51FA\u5DF2\u6302\u8F7D\u7684\u6280\u80FD",
-      "  /skill attach <ref>   \u6302\u8F7D\u6280\u80FD\uFF08dbKey\u3001\u540D\u79F0\u6216 SKILL.md \u8DEF\u5F84\uFF09",
-      "  /skill detach <ref>   \u5378\u8F7D\u6307\u5B9A\u6280\u80FD",
-      "  /skill clear          \u5378\u8F7D\u5168\u90E8\u6280\u80FD",
-      "  /customize            \u63CF\u8FF0\u4F60\u60F3\u600E\u4E48\u8C03\u6559 nolo",
-      "  /tasks                \u5217\u51FA\u540E\u53F0\u5B50\u8FDB\u7A0B\u4EFB\u52A1\uFF08\u522B\u540D\uFF1A/jobs, /procs\uFF09",
-      "  /stop <pid|all>       \u505C\u6B62\u6307\u5B9A\u7684\u540E\u53F0\u4EFB\u52A1",
-      "  /login                \u67E5\u770B\u767B\u5F55 / \u914D\u7F6E\u63D0\u793A",
-      "  /profile              \u67E5\u770B\u5F53\u524D\u914D\u7F6E\u73AF\u5883",
-      "  /update               \u66F4\u65B0 nolo CLI",
-      "  /version              \u67E5\u770B\u7248\u672C\u4E0E\u66F4\u65B0\u63D0\u793A",
-      "  /exit                 \u9000\u51FA\u5DE5\u4F5C\u533A",
-      "",
-      "\u4E5F\u53EF\u4EE5\u76F4\u63A5\u8F93\u5165\u81EA\u7136\u8BED\u8A00\u3002\u7B80\u5355\u7684\u8BFB\u53D6/\u72B6\u6001\u8BF7\u6C42\u4F1A\u8D70 CLI \u547D\u4EE4\uFF0C\u5176\u4F59\u4EA4\u7ED9\u5F53\u524D agent\u3002"
-    ].join("\n")
+  addToPath(path, added, removed, oldPosInc, options) {
+    const last = path.lastComponent;
+    if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
+      return {
+        oldPos: path.oldPos + oldPosInc,
+        lastComponent: { count: last.count + 1, added, removed, previousComponent: last.previousComponent }
+      };
+    } else {
+      return {
+        oldPos: path.oldPos + oldPosInc,
+        lastComponent: { count: 1, added, removed, previousComponent: last }
+      };
+    }
+  }
+  extractCommon(basePath, newTokens, oldTokens, diagonalPath, options) {
+    const newLen = newTokens.length, oldLen = oldTokens.length;
+    let oldPos = basePath.oldPos, newPos = oldPos - diagonalPath, commonCount = 0;
+    while (newPos + 1 < newLen && oldPos + 1 < oldLen && this.equals(oldTokens[oldPos + 1], newTokens[newPos + 1], options)) {
+      newPos++;
+      oldPos++;
+      commonCount++;
+      if (options.oneChangePerToken) {
+        basePath.lastComponent = { count: 1, previousComponent: basePath.lastComponent, added: false, removed: false };
+      }
+    }
+    if (commonCount && !options.oneChangePerToken) {
+      basePath.lastComponent = { count: commonCount, previousComponent: basePath.lastComponent, added: false, removed: false };
+    }
+    basePath.oldPos = oldPos;
+    return newPos;
+  }
+  equals(left, right, options) {
+    if (options.comparator) {
+      return options.comparator(left, right);
+    } else {
+      return left === right || !!options.ignoreCase && left.toLowerCase() === right.toLowerCase();
+    }
+  }
+  removeEmpty(array) {
+    const ret = [];
+    for (let i = 0; i < array.length; i++) {
+      if (array[i]) {
+        ret.push(array[i]);
+      }
+    }
+    return ret;
+  }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  castInput(value, options) {
+    return value;
+  }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  tokenize(value, options) {
+    return Array.from(value);
+  }
+  join(chars) {
+    return chars.join("");
+  }
+  postProcess(changeObjects, options) {
+    return changeObjects;
+  }
+  get useLongestToken() {
+    return false;
+  }
+  buildValues(lastComponent, newTokens, oldTokens) {
+    const components = [];
+    let nextComponent;
+    while (lastComponent) {
+      components.push(lastComponent);
+      nextComponent = lastComponent.previousComponent;
+      delete lastComponent.previousComponent;
+      lastComponent = nextComponent;
+    }
+    components.reverse();
+    const componentLen = components.length;
+    let componentPos = 0, newPos = 0, oldPos = 0;
+    for (; componentPos < componentLen; componentPos++) {
+      const component = components[componentPos];
+      if (!component.removed) {
+        if (!component.added && this.useLongestToken) {
+          let value = newTokens.slice(newPos, newPos + component.count);
+          value = value.map(function(value2, i) {
+            const oldValue = oldTokens[oldPos + i];
+            return oldValue.length > value2.length ? oldValue : value2;
+          });
+          component.value = this.join(value);
+        } else {
+          component.value = this.join(newTokens.slice(newPos, newPos + component.count));
+        }
+        newPos += component.count;
+        if (!component.added) {
+          oldPos += component.count;
+        }
+      } else {
+        component.value = this.join(oldTokens.slice(oldPos, oldPos + component.count));
+        oldPos += component.count;
+      }
+    }
+    return components;
   }
 };
-function t(key) {
-  return STRINGS[key][currentLocale];
-}
-var TOOL_LABELS = {
-  // Local workspace tools (packages/agent-runtime/localWorkspaceTools.ts)
-  readFile: { en: "Read", zh: "\u8BFB\u53D6" },
-  writeFile: { en: "Write", zh: "\u5199\u5165" },
-  editFile: { en: "Edit", zh: "\u7F16\u8F91" },
-  listFiles: { en: "List", zh: "\u5217\u51FA" },
-  searchFiles: { en: "Search", zh: "\u641C\u7D22" },
-  globFiles: { en: "Glob", zh: "\u5339\u914D" },
-  execShell: { en: "Run", zh: "\u6267\u884C" },
-  runCommand: { en: "Run", zh: "\u6267\u884C" },
-  captureVisualState: { en: "Capture", zh: "\u622A\u5C4F" },
-  // Workspace / diagnostics
-  searchWorkspace: { en: "Search workspace", zh: "\u641C\u7D22\u5DE5\u4F5C\u533A" },
-  cliDoctor: { en: "Doctor", zh: "\u81EA\u68C0" },
-  cliWhoami: { en: "Whoami", zh: "\u67E5\u770B\u8EAB\u4EFD" },
-  checkEnv: { en: "Check env", zh: "\u68C0\u67E5\u73AF\u5883" },
-  configure: { en: "Configure", zh: "\u914D\u7F6E" },
-  notifyUser: { en: "Notify", zh: "\u901A\u77E5" },
-  // Docs / dialogs / spaces
-  readDoc: { en: "Read doc", zh: "\u8BFB\u53D6\u6587\u6863" },
-  createDoc: { en: "Create doc", zh: "\u65B0\u5EFA\u6587\u6863" },
-  updateDoc: { en: "Update doc", zh: "\u66F4\u65B0\u6587\u6863" },
-  readDialog: { en: "Read dialog", zh: "\u8BFB\u53D6\u5BF9\u8BDD" },
-  listDialogs: { en: "List dialogs", zh: "\u5217\u51FA\u5BF9\u8BDD" },
-  queryDialogsBySubjectRef: { en: "Query dialogs", zh: "\u67E5\u8BE2\u5BF9\u8BDD" },
-  searchDialogMessages: { en: "Search messages", zh: "\u641C\u7D22\u6D88\u606F" },
-  listSpaces: { en: "List spaces", zh: "\u5217\u51FA\u7A7A\u95F4" },
-  readSpace: { en: "Read space", zh: "\u8BFB\u53D6\u7A7A\u95F4" },
-  // Tables
-  createTable: { en: "Create table", zh: "\u521B\u5EFA\u8868" },
-  queryTableRows: { en: "Query rows", zh: "\u67E5\u8BE2\u8868\u884C" },
-  addTableRow: { en: "Add row", zh: "\u65B0\u589E\u8868\u884C" },
-  addTableRows: { en: "Add rows", zh: "\u65B0\u589E\u8868\u884C" },
-  updateTableRow: { en: "Update row", zh: "\u66F4\u65B0\u8868\u884C" },
-  deleteTableRow: { en: "Delete row", zh: "\u5220\u9664\u8868\u884C" },
-  // Web
-  fetchWebpage: { en: "Fetch page", zh: "\u6293\u53D6\u7F51\u9875" },
-  readPage: { en: "Read page", zh: "\u8BFB\u53D6\u7F51\u9875" },
-  exaSearch: { en: "Web search", zh: "\u8054\u7F51\u641C\u7D22" },
-  // Skill loading
-  loadSkill: { en: "Used Skill", zh: "\u4F7F\u7528\u6280\u80FD" }
+
+// packages/cli/node_modules/diff/libesm/diff/line.js
+var LineDiff = class extends Diff {
+  constructor() {
+    super(...arguments);
+    this.tokenize = tokenize;
+  }
+  equals(left, right, options) {
+    if (options.ignoreWhitespace) {
+      if (!options.newlineIsToken || !left.includes("\n")) {
+        left = left.trim();
+      }
+      if (!options.newlineIsToken || !right.includes("\n")) {
+        right = right.trim();
+      }
+    } else if (options.ignoreNewlineAtEof && !options.newlineIsToken) {
+      if (left.endsWith("\n")) {
+        left = left.slice(0, -1);
+      }
+      if (right.endsWith("\n")) {
+        right = right.slice(0, -1);
+      }
+    }
+    return super.equals(left, right, options);
+  }
 };
-function toolLabel(name) {
-  return TOOL_LABELS[name]?.[currentLocale] ?? name;
+var lineDiff = new LineDiff();
+function diffLines(oldStr, newStr, options) {
+  return lineDiff.diff(oldStr, newStr, options);
+}
+function tokenize(value, options) {
+  if (options.stripTrailingCr) {
+    value = value.replace(/\r\n/g, "\n");
+  }
+  const retLines = [], linesAndNewlines = value.split(/(\n|\r\n)/);
+  if (!linesAndNewlines[linesAndNewlines.length - 1]) {
+    linesAndNewlines.pop();
+  }
+  for (let i = 0; i < linesAndNewlines.length; i++) {
+    const line = linesAndNewlines[i];
+    if (i % 2 && !options.newlineIsToken) {
+      retLines[retLines.length - 1] += line;
+    } else {
+      retLines.push(line);
+    }
+  }
+  return retLines;
 }
 
 // packages/cli/client/toolOutput.ts
@@ -1876,25 +2182,65 @@ function readReadFileRange(metadata) {
   if (!truncated && startLine === 1 && endLine === totalLines) return void 0;
   return `${startLine}-${endLine}/${totalLines}`;
 }
-var EDIT_SNIPPET_MAX_LINES = 5;
+var EDIT_SNIPPET_MAX_LINES = 10;
 var EDIT_SNIPPET_MAX_WIDTH = 96;
 function formatEditFileSnippet(metadata) {
   const oldSnippet = typeof metadata.oldSnippet === "string" ? metadata.oldSnippet : void 0;
   const newSnippet = typeof metadata.newSnippet === "string" ? metadata.newSnippet : void 0;
   if (!oldSnippet && !newSnippet) return void 0;
-  const lines = [];
-  if (oldSnippet) {
-    for (const line of snippetLines(oldSnippet)) lines.push(`- ${line}`);
+  if (oldSnippet && !newSnippet) {
+    return snippetLinesWithKind(oldSnippet, "removed");
   }
-  if (newSnippet) {
-    for (const line of snippetLines(newSnippet)) lines.push(`+ ${line}`);
+  if (newSnippet && !oldSnippet) {
+    return snippetLinesWithKind(newSnippet, "added");
   }
-  return lines.length ? lines.join("\n") : void 0;
+  const parts = diffLines(oldSnippet, newSnippet);
+  const all = [];
+  for (const part of parts) {
+    const kind = part.added ? "added" : part.removed ? "removed" : "context";
+    const raw = part.value.split("\n");
+    if (raw.length > 0 && raw[raw.length - 1] === "") raw.pop();
+    for (const line of raw) all.push(buildEditLine(kind, line));
+  }
+  const changeCount = all.filter((l) => l.kind !== "context").length;
+  if (changeCount === 0) return void 0;
+  return windowAndTruncate(all, EDIT_SNIPPET_MAX_LINES);
+}
+function prefixFor(kind) {
+  return kind === "added" ? "+ " : kind === "removed" ? "- " : "  ";
 }
-function snippetLines(snippet) {
+function buildEditLine(kind, body) {
+  return { kind, text: prefixFor(kind) + truncateByDisplayWidth(body, EDIT_SNIPPET_MAX_WIDTH) };
+}
+function snippetLinesWithKind(snippet, kind) {
   const lines = snippet.split(/\r?\n/).filter((line) => line.length > 0);
-  const shown = lines.slice(0, EDIT_SNIPPET_MAX_LINES);
-  return shown.map((line) => line.length > EDIT_SNIPPET_MAX_WIDTH ? `${line.slice(0, EDIT_SNIPPET_MAX_WIDTH)}\u2026` : line);
+  return lines.slice(0, EDIT_SNIPPET_MAX_LINES).map((line) => buildEditLine(kind, line));
+}
+function truncateByDisplayWidth(line, maxWidth) {
+  if (displayWidth(line) <= maxWidth) return line;
+  let width = 0;
+  let kept = "";
+  for (const char of line) {
+    const w = displayWidth(char);
+    if (width + w + 1 > maxWidth) break;
+    kept += char;
+    width += w;
+  }
+  return `${kept}\u2026`;
+}
+function windowAndTruncate(lines, maxLines) {
+  if (lines.length <= maxLines) return lines;
+  const firstChange = lines.findIndex((l) => l.kind !== "context");
+  if (firstChange === -1) return lines.slice(0, maxLines);
+  const half = Math.floor(maxLines / 2);
+  let start = Math.max(0, firstChange - half);
+  if (start + maxLines > lines.length) start = Math.max(0, lines.length - maxLines);
+  const kept = lines.slice(start, start + maxLines);
+  const omitted = lines.length - kept.length;
+  if (omitted > 0) {
+    kept.push({ kind: "context", text: `  \u2026 +${omitted} more lines` });
+  }
+  return kept;
 }
 function isFailedToolResult(event) {
   const exitCode = event.metadata?.exitCode;
@@ -1905,6 +2251,22 @@ function isFailedToolResult(event) {
 function isNeedsActionToolResult(event) {
   return Boolean(event.metadata?.actionGate);
 }
+function readRunAgentName(parsed) {
+  const agentName = typeof parsed.agentName === "string" ? parsed.agentName.trim() : "";
+  if (agentName) return agentName;
+  const name = typeof parsed.name === "string" ? parsed.name.trim() : "";
+  return name || "agent";
+}
+function readRunLogLines(parsed) {
+  if (Array.isArray(parsed.logLines)) return parsed.logLines;
+  if (typeof parsed.logTail === "string" && parsed.logTail.trim()) {
+    return parsed.logTail.split("\n");
+  }
+  return void 0;
+}
+function readRunErrorMessage(parsed) {
+  return typeof parsed.errorMessage === "string" ? parsed.errorMessage : void 0;
+}
 function parseUiAskChoiceForCli(event) {
   if (event.toolName !== "ui_ask_choice" && !event.metadata?.uiAskChoice) {
     return null;
@@ -1916,18 +2278,66 @@ function parseUiAskChoiceForCli(event) {
     label: String(c.label ?? "").trim(),
     userMessage: typeof c.userMessage === "string" ? c.userMessage : void 0
   })).filter((c) => c.label.length > 0);
-  if (!question || choices.length === 0) return null;
-  return { question, choices };
+  const selected = parsed.selected && typeof parsed.selected === "object" ? {
+    label: String(parsed.selected.label ?? "").trim(),
+    userMessage: String(parsed.selected.userMessage ?? "").trim()
+  } : void 0;
+  const answers = Array.isArray(parsed.answers) ? parsed.answers : void 0;
+  const cancelled = Boolean(parsed.cancelled);
+  const resolved = Boolean(
+    event.metadata?.resolved || selected || cancelled || answers && answers.length > 0
+  );
+  if (!resolved && (!question || choices.length === 0)) return null;
+  if (!question && !selected && !cancelled) return null;
+  return {
+    question,
+    choices,
+    ...selected ? { selected } : {},
+    ...answers ? { answers } : {},
+    ...cancelled ? { cancelled: true } : {},
+    resolved
+  };
 }
 function formatUiAskChoiceBlock(event, colorEnabled) {
   const parsed = parseUiAskChoiceForCli(event);
   if (!parsed) return null;
   const lines = [];
   lines.push("");
+  const questionText = parsed.question || "";
   if (colorEnabled) {
-    lines.push(`${themeText("\u2753 ", "info", true)}${styleCliText(parsed.question, "cyan", true)}`);
+    lines.push(`${themeText("\u2753 ", "info", true)}${styleCliText(questionText, "cyan", true)}`);
   } else {
-    lines.push(`\u2753 ${parsed.question}`);
+    lines.push(`\u2753 ${questionText}`);
+  }
+  if (parsed.resolved) {
+    if (parsed.cancelled) {
+      const cancelled = t("askChoiceHistoryCancelled");
+      lines.push(
+        colorEnabled ? `  ${themeText("\xB7", "chrome", true)} ${themeText(cancelled, "muted", true)}` : `  \xB7 ${cancelled}`
+      );
+      return `${lines.join("\n")}
+`;
+    }
+    const selectedLabel = parsed.selected?.label || parsed.selected?.userMessage || (parsed.answers ? parsed.answers.map((a) => a.userMessage).filter(Boolean).join(", ") : "");
+    const marker = t("askChoiceHistorySelected");
+    const displayLabel = selectedLabel || "\u2014";
+    if (colorEnabled) {
+      lines.push(
+        `  ${themeText("\u2713", "success", true)} ${themeText(marker, "muted", true)} ${displayLabel}`
+      );
+    } else {
+      lines.push(`  \u2713 ${marker} ${displayLabel}`);
+    }
+    if (parsed.answers && parsed.answers.length > 1) {
+      for (const answer of parsed.answers) {
+        if (!answer.userMessage) continue;
+        lines.push(
+          colorEnabled ? `    ${themeText("\xB7", "chrome", true)} ${answer.userMessage}` : `    \xB7 ${answer.userMessage}`
+        );
+      }
+    }
+    return `${lines.join("\n")}
+`;
   }
   parsed.choices.forEach((choice, i) => {
     const num = String(i + 1);
@@ -1940,7 +2350,7 @@ function formatUiAskChoiceBlock(event, colorEnabled) {
       lines.push(`  ${num}. ${label}`);
     }
   });
-  const hint = "\u8BF7\u8F93\u5165\u5E8F\u53F7\u9009\u62E9\uFF0C\u6216\u76F4\u63A5\u56DE\u590D\uFF1A";
+  const hint = t("askChoiceHistoryHint");
   if (colorEnabled) {
     lines.push(`  ${dimCliText(hint, true)}`);
   } else {
@@ -1956,8 +2366,131 @@ function formatToolTraceLine(text, colorEnabled, accent = "none") {
     return `${themeText(text, "danger", true)}
 `;
   }
-  return `${dimCliText(text, true)}
-`;
+  return `${dimCliText(text, true)}
+`;
+}
+function recoverOrchestrationDisplayFromContent(toolName, content) {
+  const trimmed = content.trim();
+  if (!trimmed.startsWith("{") && !trimmed.startsWith("[")) return content;
+  const labels = agentRunCardLabels();
+  try {
+    const parsed = JSON.parse(trimmed);
+    if (toolName === "listAgents") {
+      const agents = Array.isArray(parsed.agents) ? parsed.agents : [];
+      return formatAgentListCard(agents);
+    }
+    if (toolName === "startAgentRun") {
+      const name = typeof parsed.agentName === "string" && parsed.agentName.trim() ? parsed.agentName.trim() : typeof parsed.name === "string" && parsed.name.trim() ? parsed.name.trim() : "agent";
+      const status = typeof parsed.status === "string" ? parsed.status : "running";
+      return formatStartRunCard(name, status, labels);
+    }
+    if (toolName === "controlAgentRun") {
+      if (Array.isArray(parsed.runs)) {
+        const runs = parsed.runs;
+        return formatListRunsCard(runs, labels);
+      }
+      const status = typeof parsed.status === "string" ? parsed.status : void 0;
+      if (parsed.found === false || status === "not_found") {
+        return formatNotFoundRunCard(labels);
+      }
+      if (status === "killed" || status === "cancelled" || status === "cancelling") {
+        return formatStopRunCard(status, labels);
+      }
+      return formatStatusRunCard(readRunAgentName(parsed), status ?? "\u2014", {
+        errorMessage: readRunErrorMessage(parsed),
+        logLines: readRunLogLines(parsed),
+        labels
+      });
+    }
+  } catch {
+  }
+  return content;
+}
+function parseControlAgentRunStatusEvent(event) {
+  const raw = typeof event.content === "string" && event.content.trim() ? event.content.trim() : "";
+  if (!raw.startsWith("{")) return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (Array.isArray(parsed.runs)) return null;
+    const status = typeof parsed.status === "string" ? parsed.status : void 0;
+    if (parsed.found === false || status === "not_found") return null;
+    if (status === "killed" || status === "cancelled" || status === "cancelling") return null;
+    if (!status) return null;
+    const runId = typeof parsed.runId === "string" && parsed.runId.trim() ? parsed.runId.trim() : typeof event.metadata?.runId === "string" ? event.metadata.runId : "";
+    if (!runId) return null;
+    const agentName = readRunAgentName(parsed);
+    const errorMessage = readRunErrorMessage(parsed);
+    const logLines = readRunLogLines(parsed);
+    const logKey = logLines && logLines.length > 0 ? logLines.join("\n") : "";
+    return { runId, status, agentName, errorMessage, logLines, logKey };
+  } catch {
+    return null;
+  }
+}
+function formatOrchestrationCardBlock(event, toolName, colorEnabled) {
+  const rawLabel = toolLabel(toolName);
+  let rawDataStr = typeof event.metadata?.displayData === "string" && event.metadata.displayData.trim() ? event.metadata.displayData : typeof event.content === "string" ? event.content : "";
+  if (typeof event.metadata?.displayData !== "string" && typeof event.content === "string" && event.content.trim()) {
+    rawDataStr = recoverOrchestrationDisplayFromContent(toolName, event.content);
+  }
+  const failed = event.type === "tool-error" || isFailedToolResult(event) || Boolean(event.metadata?.failed) || /^Error:/i.test(rawDataStr.trim());
+  if (failed) {
+    const firstLine = rawDataStr.trim().split("\n")[0] || event.summary || event.message || t("toolFailed");
+    const message = clip(firstLine, 96);
+    if (!colorEnabled) {
+      return `\u2717 ${rawLabel}  ${message}
+`;
+    }
+    const cross = themeText("\u2717", "danger", true);
+    const labelPart2 = themeText(rawLabel, "muted", true);
+    const msgPart = themeText(message, "danger", true);
+    return `${cross} ${labelPart2}  ${msgPart}
+`;
+  }
+  const displayData = rawDataStr.trim();
+  const lines = displayData ? displayData.split("\n").filter((line) => !/^\s*agent\s+agent\s*$/.test(line)) : [];
+  if (!colorEnabled) {
+    let out2 = `\u25CF ${rawLabel}
+`;
+    for (const line of lines) {
+      out2 += `  ${line}
+`;
+    }
+    return out2;
+  }
+  const bullet = themeText("\u25CF", "success", true);
+  const labelPart = themeText(rawLabel, "muted", true);
+  let out = `${bullet} ${labelPart}
+`;
+  for (const line of lines) {
+    out += `  ${themeText(line, "muted", true)}
+`;
+  }
+  return out;
+}
+function formatFoldedControlStatusCard(snapshot, colorEnabled) {
+  const labels = agentRunCardLabels();
+  const body = formatStatusRunCard(snapshot.agentName, snapshot.status, {
+    errorMessage: snapshot.errorMessage,
+    logLines: snapshot.logLines,
+    pollCount: snapshot.pollCount,
+    elapsedMs: snapshot.elapsedMs,
+    includeLogTail: snapshot.includeLogTail,
+    labels
+  });
+  return formatOrchestrationCardBlock(
+    {
+      type: "tool-result",
+      round: 0,
+      toolCallId: `fold-${snapshot.runId}`,
+      toolName: "controlAgentRun",
+      content: "",
+      metadata: { displayData: body },
+      elapsedMs: snapshot.elapsedMs
+    },
+    "controlAgentRun",
+    colorEnabled
+  );
 }
 function formatVerboseToolEvent(event, colorEnabled) {
   const round = event.round + 1;
@@ -2006,15 +2539,16 @@ function isRunResultFoldable(event) {
 function formatSearchTreeBlockForCli(items, colorEnabled) {
   if (items.length === 0) return "";
   const { count, lines } = formatSearchTreeLines(items);
+  const titleText = toolLabel("searchFiles");
   if (!colorEnabled) {
-    const headerLine2 = `\u2022 Search (${count})
+    const headerLine2 = `\u2022 ${titleText} (${count})
 `;
     const treeLines2 = lines.map((l) => `  ${l.connector}${l.queryText}`).join("\n");
     return `${headerLine2}${treeLines2}
 `;
   }
   const bullet = themeText("\u2022", "chrome", true);
-  const title = styleCliText("Search", "bold", true);
+  const title = styleCliText(titleText, "bold", true);
   const countText = themeText(`(${count})`, "muted", true);
   const headerLine = `${bullet} ${title} ${countText}
 `;
@@ -2029,15 +2563,16 @@ function formatSearchTreeBlockForCli(items, colorEnabled) {
 function formatReadTreeBlockForCli(items, colorEnabled) {
   if (items.length === 0) return "";
   const { count, lines } = formatReadTreeLines(items);
+  const titleText = toolLabel("readFile");
   if (!colorEnabled) {
-    const headerLine2 = `\u2022 Read (${count})
+    const headerLine2 = `\u2022 ${titleText} (${count})
 `;
     const treeLines2 = lines.map((l) => `  ${l.connector}${l.pathWithRange}`).join("\n");
     return `${headerLine2}${treeLines2}
 `;
   }
   const bullet = themeText("\u2022", "chrome", true);
-  const title = styleCliText("Read", "bold", true);
+  const title = styleCliText(titleText, "bold", true);
   const countText = themeText(`(${count})`, "muted", true);
   const headerLine = `${bullet} ${title} ${countText}
 `;
@@ -2052,15 +2587,16 @@ function formatReadTreeBlockForCli(items, colorEnabled) {
 function formatRunTreeBlockForCli(items, colorEnabled) {
   if (items.length === 0) return "";
   const { count, lines } = formatRunTreeLines(items);
+  const titleText = toolLabel("execShell");
   if (!colorEnabled) {
-    const headerLine2 = `\u2022 Run (${count})
+    const headerLine2 = `\u2022 ${titleText} (${count})
 `;
     const treeLines2 = lines.map((l) => `  ${l.connector}${l.commandText}`).join("\n");
     return `${headerLine2}${treeLines2}
 `;
   }
   const bullet = themeText("\u2022", "chrome", true);
-  const title = styleCliText("Run", "bold", true);
+  const title = styleCliText(titleText, "bold", true);
   const countText = themeText(`(${count})`, "muted", true);
   const headerLine = `${bullet} ${title} ${countText}
 `;
@@ -2075,15 +2611,16 @@ function formatRunTreeBlockForCli(items, colorEnabled) {
 function formatFetchTreeBlockForCli(items, colorEnabled) {
   if (items.length === 0) return "";
   const { count, lines } = formatFetchTreeLines(items);
+  const titleText = toolLabel("fetchWebpage");
   if (!colorEnabled) {
-    const headerLine2 = `\u2022 Fetch (${count})
+    const headerLine2 = `\u2022 ${titleText} (${count})
 `;
     const treeLines2 = lines.map((l) => `  ${l.connector}${l.urlText}`).join("\n");
     return `${headerLine2}${treeLines2}
 `;
   }
   const bullet = themeText("\u2022", "chrome", true);
-  const title = styleCliText("Fetch", "bold", true);
+  const title = styleCliText(titleText, "bold", true);
   const countText = themeText(`(${count})`, "muted", true);
   const headerLine = `${bullet} ${title} ${countText}
 `;
@@ -2137,24 +2674,24 @@ function formatCompactToolLine(event, pending, colorEnabled) {
     const skillName = resolveLoadSkillName(event);
     const content = typeof event.content === "string" ? event.content : "";
     const failed2 = /^Skill\s+"[^"]*"\s+not found/.test(content) || isFailedToolResult(event);
+    const labelText = t("usedSkillLabel");
     if (failed2) {
       const message = clip(content.split("\n")[0] || t("toolFailed"), 96);
-      return formatToolTraceLine(`\u25B8 Used Skill (${skillName})  \u2717 ${message}`, colorEnabled, "error");
+      return formatToolTraceLine(`\u25B8 ${labelText} (${skillName})  \u2717 ${message}`, colorEnabled, "error");
     }
-    const resultLine = `Skill "${skillName}" loaded inline. Follow its instructions.`;
     if (!colorEnabled) {
-      return `\u25CF Used Skill (${skillName})
-  ${resultLine}
+      return `\u2726 ${labelText}: ${skillName}
 `;
     }
-    const bullet = themeText("\u25CF", "success", true);
-    const labelPart = themeText("Used Skill", "muted", true);
-    const namePart = themeText(`(${skillName})`, "chrome", true);
-    const detail = themeText(`  ${resultLine}`, "muted", true);
-    return `${bullet} ${labelPart} ${namePart}
-${detail}
+    const star = themeText("\u2726", "success", true);
+    const labelPart = themeText(labelText, "muted", true);
+    const namePart = themeText(skillName, "chrome", true);
+    return `${star} ${labelPart}: ${namePart}
 `;
   }
+  if (event.type === "tool-result" && (toolName === "listAgents" || toolName === "startAgentRun" || toolName === "controlAgentRun")) {
+    return formatOrchestrationCardBlock(event, toolName, colorEnabled);
+  }
   if (event.type === "tool-result" && (event.toolName === "ui_ask_choice" || event.metadata?.uiAskChoice)) {
     const block = formatUiAskChoiceBlock(event, colorEnabled);
     if (block) return block;
@@ -2176,36 +2713,17 @@ ${detail}
     mainLine = `${chromePointer} ${mutedLabel}${argsPart}  ${statusToken}${suffixPart}
 `;
   }
-  if (!hint.detail) return mainLine;
-  const detailLines = hint.detail.split("\n").map((line) => formatEditDetailLine(line, colorEnabled)).join("");
-  return `${mainLine}${detailLines}`;
+  if (!hint.detail?.length) return mainLine;
+  return `${mainLine}${formatEditDetailBlock(hint.detail, colorEnabled)}`;
 }
-function formatEditDetailLine(line, colorEnabled) {
-  const marker = line.slice(0, 2);
-  const rest = line.slice(2);
-  if (!colorEnabled) return `  ${line}
-`;
-  const diff = diffLineSequences();
-  if (!diff) {
-    const color = marker === "- " ? "red" : marker === "+ " ? "green" : void 0;
-    if (color) {
-      return `  ${styleCliText(marker, color, true)}${dimCliText(rest, true)}
-`;
-    }
-    return `  ${dimCliText(line, true)}
-`;
-  }
-  const RESET2 = "\x1B[0m";
-  if (marker === "- ") {
-    return `  ${diff.removed.bg}${diff.removed.fg}- ${rest}${RESET2}
-`;
-  }
-  if (marker === "+ ") {
-    return `  ${diff.added.bg}${diff.added.fg}+ ${rest}${RESET2}
-`;
+function formatEditDetailBlock(lines, colorEnabled) {
+  if (!colorEnabled) {
+    return lines.map((line) => `  ${line.text}
+`).join("");
   }
-  return `  ${dimCliText(line, true)}
-`;
+  const padTo = Math.max(...lines.map((line) => displayWidth(line.text))) + 1;
+  return lines.map((line) => `  ${renderDiffLine({ kind: line.kind, text: line.text, padTo, colorEnabled: true })}
+`).join("");
 }
 function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled()) {
   const pending = /* @__PURE__ */ new Map();
@@ -2213,8 +2731,33 @@ function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled())
   let searchBuffer = [];
   let runBuffer = [];
   let fetchBuffer = [];
+  let statusFold = null;
+  const lastEmittedLogByRunId = /* @__PURE__ */ new Map();
+  const flushStatusFold = () => {
+    if (!statusFold) return "";
+    const fold = statusFold;
+    statusFold = null;
+    const prevLog = lastEmittedLogByRunId.get(fold.runId);
+    const includeLogTail = Boolean(fold.logKey) && fold.logKey !== prevLog;
+    if (fold.logKey) {
+      lastEmittedLogByRunId.set(fold.runId, fold.logKey);
+    }
+    return formatFoldedControlStatusCard(
+      {
+        runId: fold.runId,
+        status: fold.status,
+        agentName: fold.agentName,
+        errorMessage: fold.errorMessage,
+        logLines: fold.logLines,
+        pollCount: fold.pollCount,
+        elapsedMs: fold.elapsedMs,
+        includeLogTail
+      },
+      colorEnabled
+    );
+  };
   const flushBuffers = () => {
-    let out = "";
+    let out = flushStatusFold();
     if (readBuffer.length > 0) {
       const items = readBuffer.map((evt) => {
         const call = pending.get(evt.toolCallId);
@@ -2263,6 +2806,51 @@ function createToolEventFormatter(mode, colorEnabled = resolveCliColorEnabled())
   const formatter = (event) => {
     if (mode === "hide") return "";
     if (mode === "verbose") return formatVerboseToolEvent(event, colorEnabled);
+    if (event.toolName === "controlAgentRun") {
+      if (event.type === "tool-call") {
+        pending.set(event.toolCallId, {
+          toolName: event.toolName,
+          argumentsPreview: event.argumentsPreview
+        });
+        return "";
+      }
+      if (event.type === "tool-result") {
+        const snapshot = parseControlAgentRunStatusEvent(event);
+        if (snapshot) {
+          let out = "";
+          if (statusFold && statusFold.runId !== snapshot.runId) {
+            out += flushStatusFold();
+          }
+          if (!statusFold) {
+            statusFold = {
+              ...snapshot,
+              pollCount: 1,
+              elapsedMs: event.elapsedMs
+            };
+          } else {
+            statusFold = {
+              runId: snapshot.runId,
+              status: snapshot.status,
+              agentName: snapshot.agentName,
+              errorMessage: snapshot.errorMessage ?? statusFold.errorMessage,
+              logLines: snapshot.logLines ?? statusFold.logLines,
+              logKey: snapshot.logKey || statusFold.logKey,
+              pollCount: statusFold.pollCount + 1,
+              elapsedMs: event.elapsedMs
+            };
+          }
+          pending.delete(event.toolCallId);
+          if (isAgentRunTerminalStatus(snapshot.status)) {
+            out += flushBuffers();
+          }
+          return out;
+        }
+        const flushed2 = flushBuffers();
+        const call2 = pending.get(event.toolCallId);
+        pending.delete(event.toolCallId);
+        return `${flushed2}${formatCompactToolLine(event, call2, colorEnabled)}`;
+      }
+    }
     if (isReadToolName(event.toolName)) {
       if (event.type === "tool-call") {
         pending.set(event.toolCallId, {
@@ -2835,10 +3423,165 @@ function isKnownServerPlatformAgent(options) {
   );
 }
 
+// packages/core/collapsedPaste.ts
+var COLLAPSE_PASTE_MIN_LINES = 8;
+var COLLAPSE_PASTE_MIN_CHARS = 400;
+var COLLAPSED_PASTE_PLACEHOLDER_RE = /\[paste #(\d+) · (\d+) lines\]/g;
+var COLLAPSED_PASTE_MODEL_REFERENCE_RE = /\[paste #(\d+)(?: scope:([a-zA-Z0-9_-]+))? · [^\]]+; full content available via readPastedText\(pasteId=(\d+)\)\]/g;
+function countTextLines(text) {
+  if (text.length === 0) return 0;
+  let lines = 1;
+  for (let i = 0; i < text.length; i += 1) {
+    if (text.charCodeAt(i) === 10) lines += 1;
+  }
+  return lines;
+}
+function shouldCollapsePaste(text, threshold = {}) {
+  const minLines = threshold.minLines ?? COLLAPSE_PASTE_MIN_LINES;
+  const minChars = threshold.minChars ?? COLLAPSE_PASTE_MIN_CHARS;
+  if (text.length === 0) return false;
+  if (text.length >= minChars) return true;
+  return countTextLines(text) >= minLines;
+}
+function formatPasteByteSize(bytes) {
+  if (!Number.isFinite(bytes) || bytes < 0) return "0 B";
+  if (bytes < 1024) return `${Math.round(bytes)} B`;
+  if (bytes < 1024 * 1024) {
+    const kb = bytes / 1024;
+    return `${kb >= 10 ? kb.toFixed(0) : kb.toFixed(1)} KB`;
+  }
+  const mb = bytes / (1024 * 1024);
+  return `${mb >= 10 ? mb.toFixed(0) : mb.toFixed(1)} MB`;
+}
+function estimatePasteBytes(text) {
+  let bytes = 0;
+  for (let i = 0; i < text.length; i += 1) {
+    const code = text.charCodeAt(i);
+    if (code <= 127) bytes += 1;
+    else if (code <= 2047) bytes += 2;
+    else if (code >= 55296 && code <= 56319) {
+      bytes += 4;
+      i += 1;
+    } else bytes += 3;
+  }
+  return bytes;
+}
+function formatCollapsedPastePlaceholder(id, text) {
+  const lines = countTextLines(text);
+  return `[paste #${id} \xB7 ${lines} lines]`;
+}
+function generatePasteScope() {
+  if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+    return crypto.randomUUID().slice(0, 8);
+  }
+  return Math.random().toString(36).slice(2, 10);
+}
+function formatCollapsedPasteModelReference(id, text, scope) {
+  const lines = countTextLines(text);
+  const size = formatPasteByteSize(estimatePasteBytes(text));
+  const scopeAttr = scope ? ` scope:${scope}` : "";
+  return `[paste #${id}${scopeAttr} \xB7 ${lines} lines \xB7 ${size}; full content available via readPastedText(pasteId=${id})]`;
+}
+function createCollapsedPasteStore(scope) {
+  return { scope: scope ?? generatePasteScope(), nextId: 1, items: /* @__PURE__ */ new Map() };
+}
+function allocateCollapsedPaste(store, text) {
+  const id = store.nextId;
+  store.nextId += 1;
+  store.items.set(id, text);
+  return { id, placeholder: formatCollapsedPastePlaceholder(id, text) };
+}
+function releaseCollapsedPaste(store, id) {
+  store.items.delete(id);
+}
+function clearCollapsedPasteStore(store) {
+  store.items.clear();
+  store.nextId = 1;
+  store.scope = generatePasteScope();
+}
+function expandCollapsedPastes(buffer, store) {
+  COLLAPSED_PASTE_MODEL_REFERENCE_RE.lastIndex = 0;
+  const expandedReferences = buffer.replace(
+    COLLAPSED_PASTE_MODEL_REFERENCE_RE,
+    (match, _displayIdRaw, scopeRaw, idRaw) => {
+      if (scopeRaw && scopeRaw === store.scope) {
+        const full = store.items.get(Number(idRaw));
+        return full === void 0 ? match : full;
+      }
+      return match;
+    }
+  );
+  if (store.items.size === 0) return expandedReferences;
+  COLLAPSED_PASTE_PLACEHOLDER_RE.lastIndex = 0;
+  return expandedReferences.replace(COLLAPSED_PASTE_PLACEHOLDER_RE, (match, idRaw) => {
+    const id = Number(idRaw);
+    const full = store.items.get(id);
+    return full === void 0 ? match : full;
+  });
+}
+function replaceCollapsedPastesWithReferences(buffer, store) {
+  if (store.items.size === 0) return buffer;
+  COLLAPSED_PASTE_PLACEHOLDER_RE.lastIndex = 0;
+  return buffer.replace(COLLAPSED_PASTE_PLACEHOLDER_RE, (match, idRaw) => {
+    const id = Number(idRaw);
+    const full = store.items.get(id);
+    return full === void 0 ? match : formatCollapsedPasteModelReference(id, full, store.scope);
+  });
+}
+function releaseCollapsedPasteReferences(buffer, store) {
+  const ids = /* @__PURE__ */ new Set();
+  COLLAPSED_PASTE_MODEL_REFERENCE_RE.lastIndex = 0;
+  let modelMatch;
+  while ((modelMatch = COLLAPSED_PASTE_MODEL_REFERENCE_RE.exec(buffer)) !== null) {
+    const id = Number(modelMatch[3]);
+    const scope = modelMatch[2];
+    if (scope && scope === store.scope) {
+      ids.add(id);
+    }
+  }
+  COLLAPSED_PASTE_PLACEHOLDER_RE.lastIndex = 0;
+  let placeholderMatch;
+  while ((placeholderMatch = COLLAPSED_PASTE_PLACEHOLDER_RE.exec(buffer)) !== null) {
+    ids.add(Number(placeholderMatch[1]));
+  }
+  for (const id of ids) releaseCollapsedPaste(store, id);
+}
+function expandRangeToCollapsedPasteChips(buffer, start, end) {
+  let s = Math.max(0, Math.min(start, end));
+  let e = Math.max(s, Math.max(start, end));
+  if (s === e) return { start: s, end: e };
+  COLLAPSED_PASTE_PLACEHOLDER_RE.lastIndex = 0;
+  let match;
+  while ((match = COLLAPSED_PASTE_PLACEHOLDER_RE.exec(buffer)) !== null) {
+    const chipStart = match.index;
+    const chipEnd = chipStart + match[0].length;
+    if (chipStart < e && chipEnd > s) {
+      if (chipStart < s) s = chipStart;
+      if (chipEnd > e) e = chipEnd;
+    }
+  }
+  return { start: s, end: e };
+}
+function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
+  COLLAPSED_PASTE_PLACEHOLDER_RE.lastIndex = 0;
+  let match;
+  while ((match = COLLAPSED_PASTE_PLACEHOLDER_RE.exec(buffer)) !== null) {
+    const start = match.index;
+    const end = start + match[0].length;
+    const inside = pos > start && pos < end;
+    const atEnd = opts.preferLeft && pos === end;
+    const atStart = !opts.preferLeft && pos === start;
+    if (inside || atEnd || atStart) {
+      return { id: Number(match[1]), start, end };
+    }
+  }
+  return null;
+}
+
 // packages/cli/client/agentRun.ts
 import { ulid } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-UQBMQI2M.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-YNZSHMZC.js");
   return runLocalAgentTurn;
 }
 async function resolveCurrentMachineId(options) {
@@ -2851,6 +3594,12 @@ function resolveRequestedRuntimeMode(options) {
     return envMode;
   return "auto";
 }
+function canResolveCollapsedPasteReference(store, content) {
+  const expand = (text) => expandCollapsedPastes(text, store) !== text;
+  if (typeof content === "string") return expand(content);
+  if (!Array.isArray(content)) return false;
+  return content.some((part) => part.type === "text" && expand(part.text));
+}
 function buildDefaultLocalRuntimeAdapter(options) {
   return createCliLocalRuntimeAdapter({
     env: options.env,
@@ -2858,7 +3607,8 @@ function buildDefaultLocalRuntimeAdapter(options) {
     cwd: options.localRuntimeCwd,
     output: options.output,
     ...options.confirmDestructiveAction ? { confirmDestructiveAction: options.confirmDestructiveAction } : {},
-    ...options.requestUserChoice ? { requestUserChoice: options.requestUserChoice } : {}
+    ...options.requestUserChoice ? { requestUserChoice: options.requestUserChoice } : {},
+    ...options.pastedTextStore?.items.size ? { pastedTextStore: options.pastedTextStore } : {}
   });
 }
 function resolveLocalRuntimeAdapter(options) {
@@ -3083,12 +3833,14 @@ async function runHttpAgentTurn(options, authToken) {
     (name) => name.trim()
   );
   const shouldStream = !options.noStream && !options.background;
+  const expandedMessage = options.pastedTextStore?.items.size ? expandCollapsedPastes(options.message, options.pastedTextStore) : options.message;
+  const serverContextBlockScopes = options.contextBlockScopes && options.contextBlockScopes.length > 0 ? options.contextBlockScopes : options.extraContextBlocks && options.extraContextBlocks.length > 0 ? options.extraContextBlocks.map((block) => ({
+    content: block,
+    cacheScope: "turn"
+  })) : void 0;
   const buildRequestBody = (stream) => JSON.stringify({
     agentKey: options.agentKey,
-    userInput: buildUserInputContent(
-      options.extraContextBlocks?.length ? [...options.extraContextBlocks, "", options.message].join("\n") : options.message,
-      options.imageUrls
-    ),
+    userInput: buildUserInputContent(expandedMessage, options.imageUrls),
     runtimeContext: {
       surface: "cli",
       host: "terminal",
@@ -3108,6 +3860,7 @@ async function runHttpAgentTurn(options, authToken) {
     ...options.background ? { background: true } : {},
     ...typeof options.timeoutMs === "number" ? { timeoutMs: options.timeoutMs } : {},
     ...options.modelOverride ? { runtimeOptions: { quickChatModelOverride: options.modelOverride } } : {},
+    ...serverContextBlockScopes ? { contextBlockScopes: serverContextBlockScopes } : {},
     stream
   });
   const postAgentRun = (stream) => fetchImpl(`${options.serverUrl}/api/agent/run`, {
@@ -3265,7 +4018,7 @@ async function runLocalAgentTurnForCli(options, settings) {
   } : void 0;
   const currentDialogId = options.continueDialogId ?? ulid();
   const runChildTurn = async (input) => {
-    const { runLocalAgentTurn } = await import("./agentRuntimeLocal-UQBMQI2M.js");
+    const { runLocalAgentTurn } = await import("./agentRuntimeLocal-YNZSHMZC.js");
     return runLocalAgentTurn(input);
   };
   const createFreshChildBaseAdapter = () => {
@@ -3313,6 +4066,7 @@ async function runLocalAgentTurnForCli(options, settings) {
     spaceId: options.spaceId,
     runtimeContext
   });
+  const expandedMessage = options.pastedTextStore?.items.size ? expandCollapsedPastes(options.message, options.pastedTextStore) : options.message;
   const workingLabel = `${options.agentName} -> working locally`;
   const turnOutput = createCliTurnOutput({
     options,
@@ -3325,6 +4079,19 @@ async function runLocalAgentTurnForCli(options, settings) {
       adapter,
       agentRef: options.agentKey,
       input: buildUserInputContent(options.message, options.imageUrls),
+      ...expandedMessage !== options.message ? {
+        persistedInput: buildUserInputContent(
+          expandedMessage,
+          options.imageUrls
+        ),
+        persistedInputReference: buildUserInputContent(
+          options.message,
+          options.imageUrls
+        )
+      } : {},
+      ...options.pastedTextStore ? {
+        contextReferenceResolver: (reference) => canResolveCollapsedPasteReference(options.pastedTextStore, reference)
+      } : {},
       continueDialogId: currentDialogId,
       spaceId: options.spaceId,
       category: options.category,
@@ -3333,8 +4100,7 @@ async function runLocalAgentTurnForCli(options, settings) {
       background: options.background,
       noStream: options.noStream,
       ...runtimeContext ? { runtimeContext } : {},
-      ...options.extraContextBlocks?.length ? { contextBlocks: options.extraContextBlocks } : {},
-      ...options.contextBlockScopes?.length ? { contextBlockScopes: options.contextBlockScopes } : {},
+      ...options.contextBlockScopes?.length ? { contextBlockScopes: options.contextBlockScopes } : options.extraContextBlocks?.length ? { contextBlocks: options.extraContextBlocks } : {},
       ...typeof options.timeoutMs === "number" ? { timeoutMs: options.timeoutMs } : {},
       ...options.actionGateHandler ? { onActionGate: options.actionGateHandler } : {},
       onLoopEvent: (event) => {
@@ -3370,10 +4136,12 @@ async function runLocalAgentTurnForCli(options, settings) {
     turnOutput.spinner.stop();
     const savedDialogId = error?.dialogId;
     if (error?.code === LOCAL_TURN_ABORTED_CODE || options.abortSignal?.aborted) {
+      const pendingToolName = error?.pendingToolName;
       return {
         exitCode: 0,
         streamInterrupted: true,
-        ...savedDialogId ? { dialogId: savedDialogId } : {}
+        ...savedDialogId ? { dialogId: savedDialogId } : {},
+        ...pendingToolName ? { pendingToolName } : {}
       };
     }
     if (settings.reportFailure) {
@@ -3406,7 +4174,8 @@ async function runAgentTurn(options) {
           exitCode: localResult.exitCode,
           ...localResult.dialogId ? { dialogId: localResult.dialogId } : {},
           ...localResult.turnTokens ? { turnTokens: localResult.turnTokens } : {},
-          ...localResult.streamInterrupted ? { streamInterrupted: localResult.streamInterrupted } : {}
+          ...localResult.streamInterrupted ? { streamInterrupted: localResult.streamInterrupted } : {},
+          ...localResult.pendingToolName ? { pendingToolName: localResult.pendingToolName } : {}
         };
       }
       if (isMissingLocalAgentConfigError(localResult.localError, options.agentKey)) {
@@ -3460,196 +4229,6 @@ async function runAgentTurn(options) {
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
 import { join as join2 } from "node:path";
 
-// packages/agent-runtime/quickChatIntentCore.ts
-var INTENT_MODEL = "deepseek-v4-flash";
-var INTENT_PROVIDER = "deepseek";
-var QUICK_CHAT_INTENT_TIMEOUT_MS = 4e3;
-var SHORT_GREETING_MAX_LENGTH = 20;
-var SHORT_GREETING_PATTERN = /^(?:hi|hello|hey|hiya|yo|sup|howdy|嗨|哈喽|哈囉|你好|您好|在吗|在嘛|喂|早上好|中午好|下午好|晚上好|拜拜|再见|谢谢|thanks|thx|ok|好的|收到|了解)[!.。，、~～]?$/iu;
-function isShortGreeting(text) {
-  const trimmed = text.trim();
-  if (!trimmed) return false;
-  if (trimmed.length > SHORT_GREETING_MAX_LENGTH) return false;
-  return SHORT_GREETING_PATTERN.test(trimmed);
-}
-var COMPLEXITY_SIMPLE_MAX_LENGTH = 80;
-var COMPLEXITY_MEDIUM_MAX_LENGTH = 500;
-var COMPLEXITY_KEYWORDS = /为什么|如何|分析|对比|比较|设计|架构|实现|原理|推导|评价|区别|关系|影响|优化|重构/;
-var COMPLEXITY_CODE_BLOCK = /```[\s\S]*```/;
-function estimateComplexity(text) {
-  const trimmed = text.trim();
-  const len = trimmed.length;
-  if (len > COMPLEXITY_MEDIUM_MAX_LENGTH) return "complex";
-  if (COMPLEXITY_CODE_BLOCK.test(trimmed)) return "complex";
-  if (len > COMPLEXITY_SIMPLE_MAX_LENGTH) return "medium";
-  if (COMPLEXITY_KEYWORDS.test(trimmed)) return "medium";
-  return "simple";
-}
-var TIER_DESCRIPTIONS = {
-  flash: "\u5FEB\u901F\u7B80\u5355\uFF1A\u95EE\u5019\u3001\u95F2\u804A\u3001\u5FEB\u901F\u95EE\u7B54\u3001\u7FFB\u8BD1\u3001\u77ED\u6587",
-  balanced: "\u5E73\u8861\u63A8\u7406\uFF1A\u5206\u6790\u3001\u4E2D\u7B49\u957F\u5EA6\u5199\u4F5C\u3001\u4EE3\u7801\u3001\u63A8\u7406",
-  quality: "\u9AD8\u8D28\u91CF\u6DF1\u5EA6\uFF1A\u590D\u6742\u63A8\u7406\u3001\u957F\u6587\u3001\u67B6\u6784\u8BBE\u8BA1\u3001\u6DF1\u5EA6\u5206\u6790"
-};
-function buildQuickChatIntentSystemPrompt(tierAgents) {
-  const agentList = tierAgents.map((t2) => `  - "${t2.agentKey}"\uFF1A${t2.description}`).join("\n");
-  return `\u4F60\u662F\u4E00\u4E2A\u610F\u56FE\u8DEF\u7531\u5668\u3002\u6839\u636E\u7528\u6237\u6D88\u606F\uFF0C\u5224\u65AD\u5E94\u8BE5\u4EA4\u7ED9\u54EA\u4E2A agent \u5904\u7406\u3002
-
-\u53EF\u9009 agent \u5217\u8868\uFF08agentKey \u4E0E\u63CF\u8FF0\uFF09\uFF1A
-${agentList}
-
-\u5224\u65AD\u539F\u5219\uFF08\u9ED8\u8BA4\u504F\u5411\u901A\u7528\u6863\u4F4D\uFF1B\u4E13\u804C agent \u5728\u660E\u786E\u5339\u914D\u65F6\u4F7F\u7528\uFF1B**\u7F16\u7801/\u672C\u5730\u4ED3\u5E93\u4EFB\u52A1\u8D70\u901A\u7528\u6863 + needsWorkspace=true**\uFF09\uFF1A
-- \u9ED8\u8BA4\u60C5\u51B5\u4E0B\uFF0C**\u9664\u975E\u7528\u6237\u660E\u786E\u8868\u8FBE\u8981\u5EFA\u5E94\u7528/\u5EFA Agent/\u63D0\u4EA4\u53CD\u9988/\u591A Agent \u7F16\u6392**\uFF0C\u5426\u5219\u9009\u901A\u7528\u6863\u4F4D\uFF08flash/balanced/quality\uFF09\uFF1A
-  - \u7B80\u5355\u95EE\u5019\u3001\u95F2\u804A\u3001\u5FEB\u901F\u95EE\u7B54\u3001\u7FFB\u8BD1\u3001\u77ED\u6587 \u2192 \u9009 flash \u6863
-  - \u9700\u8981\u63A8\u7406\u3001\u5206\u6790\u3001\u4E2D\u7B49\u957F\u5EA6\u5199\u4F5C\u3001\u666E\u901A\u4EE3\u7801\u89E3\u91CA/\u67B6\u6784\u95EE\u7B54 \u2192 \u9009 balanced \u6863
-  - \u590D\u6742\u63A8\u7406\u3001\u957F\u6587\u3001\u67B6\u6784\u8BBE\u8BA1\u3001\u6DF1\u5EA6\u5206\u6790 \u2192 \u9009 quality \u6863
-  - **\u660E\u786E\u7F16\u7801\u4EFB\u52A1\uFF08\u5B9E\u73B0\u529F\u80FD\u3001\u4FEE bug\u3001refactor\u3001\u5199/\u8865\u6D4B\u8BD5\u3001\u8DD1 build/tests/ci\uFF09\u6216\u67E5\u770B\u672C\u673A\u4ED3\u5E93/\u4EE3\u7801\u72B6\u6001\uFF08git/\u5206\u652F/commit/\u672C\u5730\u4E0E\u8FDC\u7A0B\u5DEE\u8DDD/\u672A\u63D0\u4EA4\u6539\u52A8\u7B49\uFF09** \u2192 \u9009 balanced \u6216 quality \u6863\uFF08\u6309\u590D\u6742\u5EA6\uFF1B**\u4E0D\u8981\u9009 flash**\uFF09\uFF0C\u4E14 needsWorkspace=true
-- \u4E13\u804C agent \u8DEF\u7531\u89C4\u5219\uFF08\u6709\u660E\u786E\u5339\u914D\u65F6\u4F7F\u7528\uFF09\uFF1A
-  - \u8981\u63D0\u4EA4/\u8BB0\u5F55 bug\u3001\u4F53\u9A8C\u95EE\u9898\u3001\u6570\u636E\u5F02\u5E38\u3001\u4EA7\u54C1\u5EFA\u8BAE\uFF0C\u6216\u53E3\u8BED\u5982\u300C\u60F3\u53CD\u9988\u4E00\u4E9B\u95EE\u9898\u300D\u300C\u53CD\u9988\u4E00\u4E0B\u300D\u2192 \u9009\u610F\u89C1\u53CD\u9988\u4E13\u804C agent
-  - \u8981\u65B0\u5EFA\u6216\u5B9A\u5236 AI/Agent/\u667A\u80FD\u4F53\u52A9\u624B\uFF08\u542B\u914D\u7F6E\u5DE5\u5177\u3001\u77E5\u8BC6\u3001\u786E\u8BA4\u521B\u5EFA\uFF09\u2192 \u9009\u521B\u5EFA Agent \u4E13\u804C agent
-  - \u8981\u505A/\u6539/\u53D1\u5E03\u7F51\u7AD9\u3001\u7F51\u9875\u3001\u5C0F\u5E94\u7528\u3001\u9884\u7EA6\u9875\u3001\u535A\u5BA2\u3001\u770B\u677F \u2192 \u9009\u5E94\u7528\u6784\u5EFA\u4E13\u804C agent
-  - \u8981\u6D3E\u591A\u4E2A agent\u3001\u591A agent \u5E76\u884C\u3001\u62C6\u6210\u4EFB\u52A1\u540E\u53F0\u6267\u884C\u3001\u591A\u4E2A agent review\u3001\u8BA9\u4E0D\u540C agent \u8BA8\u8BBA/\u4F1A\u5546 \u2192 \u9009\u591A Agent \u7F16\u6392\u4E13\u804C agent\uFF08\u663E\u5F0F multi-agent \u4F18\u5148\uFF09
-- **\u62FF\u4E0D\u51C6\u65F6**\uFF1A\u7EAF\u95F2\u804A\u9009 flash\uFF1B**\u82E5\u6CBE\u8FB9\u672C\u5730\u4ED3\u5E93/\u5F53\u524D\u4EE3\u7801\u72B6\u6001\uFF0C\u9009 balanced/quality + needsWorkspace=true**\u3002
-
-\u540C\u65F6\u5224\u65AD\u672C\u8F6E\u662F\u5426\u9700\u8981\u6CE8\u5165\u300C\u5DE5\u4F5C\u533A\u53EA\u8BFB\u5DE5\u5177\u300D\uFF08listFiles/globFiles/searchFiles/readFile/execShell \u7B49\uFF09\uFF1A
-- needsWorkspace=true \u7684\u573A\u666F\uFF1A\u7528\u6237\u8981\u8BFB/\u6539/\u5206\u6790\u6587\u4EF6\u6216\u4EE3\u7801\u3001\u63D0\u5230\u4E86\u6587\u4EF6\u8DEF\u5F84/\u6269\u5C55\u540D\uFF08.md/.csv/.ts \u7B49\uFF09\u3001\u63D0\u5230\u5DE5\u4F5C\u533A/\u4EE3\u7801\u5E93/\u4ED3\u5E93/\u76EE\u5F55/git/\u5206\u652F\u3001\u8981\u770B\u5F53\u524D\u4EE3\u7801\u6216\u4ED3\u5E93\u72B6\u6001\u3001\u672C\u5730\u641C\u7D22/\u67E5\u770B\u4EE3\u7801\u3002
-- needsWorkspace=false \u7684\u573A\u666F\uFF1A\u901A\u7528\u77E5\u8BC6\u95EE\u7B54\uFF08\u5982\u300C\u5E7F\u4E1C\u7ECF\u6D4E\u6570\u636E\u300D\u300C\u5199\u4E00\u9996\u8BD7\u300D\uFF09\u3001\u7EAF\u95F2\u804A\u95EE\u5019\u3001\u7FFB\u8BD1\u3001\u4E0D\u6D89\u53CA\u672C\u5730\u6587\u4EF6/\u4ED3\u5E93\u3002
-- \u6F0F\u5224\uFF08\u7528\u6237\u8981\u6587\u4EF6\u800C\u6CA1\u5E26\u5DE5\u5177\uFF09\u6BD4\u8BEF\u5224\uFF08\u767D\u641C\u51E0\u8F6E\uFF09\u4EE3\u4EF7\u66F4\u9AD8\uFF0C\u5B81\u53EF\u504F\u5BBD\u5224 true\u3002
-
-\u5728\u7ED9\u51FA agentKey \u4E4B\u524D\uFF0C\u5148\u5728\u5FC3\u91CC\u533A\u5206\u5019\u9009\u6863\u4F4D\u7684\u8FB9\u754C\u518D\u7ED9\u7F6E\u4FE1\u5EA6\uFF1Abalanced \u4E0E quality \u7684\u8FB9\u754C\u5728\u4E8E\u590D\u6742\u5EA6/\u7BC7\u5E45/\u662F\u5426\u9700\u8981\u6DF1\u5EA6\u5206\u6790\uFF0C\u62FF\u4E0D\u51C6\u5C31\u7ED9\u4F4E confidence\u3002
-
-\u540C\u65F6\u5224\u65AD\u672C\u8F6E\u6D88\u606F\u662F\u5426\u9700\u8981\u6302\u8F7D\u5BF9\u8C61\u64CD\u4F5C\u6280\u80FD\uFF08skills \u6570\u7EC4\uFF0C\u672A\u547D\u4E2D\u7ED9 []\uFF09\uFF1A
-- \u7528\u6237\u8981\u65B0\u5EFA/\u6574\u7406/\u5F55\u5165/\u6279\u91CF\u5904\u7406\u8868\u683C\u6570\u636E\uFF08\u5EFA\u8868\u3001\u52A0\u884C\u3001\u6539\u5217\u3001\u6309\u6761\u4EF6\u6574\u7406\u6570\u636E\uFF09\u2192 skills \u542B "table"
-- \u7528\u6237\u8981\u5199/\u6DA6\u8272/\u6539\u5199/\u7EED\u5199/\u6392\u7248\u4E00\u7BC7\u6587\u6863\u6216\u6587\u7AE0 \u2192 skills \u542B "doc"
-- \u7528\u6237\u8981\u5199/\u6539/\u5B9E\u73B0/\u4FEE bug/refactor/\u8865\u6D4B\u8BD5/\u5BA1\u67E5\u5E76\u4FEE\u6539\u4EE3\u7801 \u2192 skills \u542B "code"\uFF08\u4EC5\u95EE\u901A\u7528\u77E5\u8BC6\u3001\u7EAF\u95F2\u804A\u3001\u53EA\u67E5\u770B git/\u4ED3\u5E93\u72B6\u6001\u800C\u4E0D\u4FEE\u6539\u4EE3\u7801\u65F6\u4E0D\u6302 "code"\uFF09
-- \u666E\u901A\u95EE\u7B54/\u7EAF\u95F2\u804A/\u5EFA\u5E94\u7528 \u2192 skills \u4E3A []
-
-\u53EA\u8F93\u51FA JSON\uFF0C\u4E0D\u8981\u8F93\u51FA\u5176\u4ED6\u5185\u5BB9\uFF1A
-{"confidence": <0\u52301\u4E4B\u95F4\u7684\u5C0F\u6570\uFF0C\u8868\u793A\u4F60\u5BF9\u8FD9\u4E2A\u5206\u7C7B\u5224\u65AD\u7684\u628A\u63E1\u7A0B\u5EA6>, "agentKey": "<\u4ECE\u5217\u8868\u4E2D\u9009\u62E9\u7684 agentKey>", "needsWorkspace": <true \u6216 false>, "skills": <\u5B57\u7B26\u4E32\u6570\u7EC4\uFF0C\u5143\u7D20\u53EA\u80FD\u662F "table" | "doc" | "code"\uFF0C\u672A\u547D\u4E2D\u7ED9 []>}`;
-}
-function parseQuickChatIntentResult(content, tierAgents) {
-  try {
-    const parsed = JSON.parse(content.trim());
-    if (typeof parsed !== "object" || parsed === null || !("agentKey" in parsed)) return null;
-    const key = parsed.agentKey;
-    if (typeof key !== "string") return null;
-    if (!tierAgents.some((t2) => t2.agentKey === key)) return null;
-    const rawNeedsWorkspace = parsed.needsWorkspace;
-    const needsWorkspace = rawNeedsWorkspace === true;
-    const rawConfidence = parsed.confidence;
-    const confidence = typeof rawConfidence === "number" && Number.isFinite(rawConfidence) && rawConfidence >= 0 && rawConfidence <= 1 ? rawConfidence : void 0;
-    const rawSkills = parsed.skills;
-    let skills;
-    if (Array.isArray(rawSkills)) {
-      const filtered = [...new Set(rawSkills)].filter(
-        (s) => s === "table" || s === "doc" || s === "code"
-      );
-      if (filtered.length > 0) skills = filtered;
-    }
-    return { agentKey: key, needsWorkspace, confidence, skills };
-  } catch {
-    return null;
-  }
-}
-
-// packages/cli/client/autoModelRouter.ts
-var CLI_AUTO_TIER_AGENT_KEYS = {
-  flash: PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
-  balanced: PUBLIC_DEEPSEEK_V4_PRO_AGENT_KEY,
-  quality: PUBLIC_GLM_52_AGENT_KEY
-};
-var CLI_IMAGE_AGENT_KEY = PUBLIC_KIMI_K26_IMAGE_AGENT_KEY;
-var CLI_AUTO_TIER_AGENT_KEY_TABLE = {
-  [CLI_AUTO_TIER_AGENT_KEYS.flash]: true,
-  [CLI_AUTO_TIER_AGENT_KEYS.balanced]: true,
-  [CLI_AUTO_TIER_AGENT_KEYS.quality]: true
-};
-var buildRouteOptions = () => ["flash", "balanced", "quality"].map((tier) => ({
-  tier,
-  agentKey: CLI_AUTO_TIER_AGENT_KEYS[tier],
-  description: TIER_DESCRIPTIONS[tier]
-}));
-var tierForAgentKey = (agentKey) => {
-  for (const tier of ["flash", "balanced", "quality"]) {
-    if (CLI_AUTO_TIER_AGENT_KEYS[tier] === agentKey) return tier;
-  }
-  return null;
-};
-function resolveCliAutoFallbackTier(text) {
-  switch (estimateComplexity(text)) {
-    case "complex":
-      return "quality";
-    case "medium":
-      return "balanced";
-    case "simple":
-    default:
-      return "flash";
-  }
-}
-async function classifyCliAutoRoute(text, options) {
-  const timeoutMs = options.timeoutMs ?? QUICK_CHAT_INTENT_TIMEOUT_MS;
-  const fallbackTier = resolveCliAutoFallbackTier(text);
-  const fallback = () => ({
-    agentKey: CLI_AUTO_TIER_AGENT_KEYS[fallbackTier],
-    tier: fallbackTier,
-    classified: false
-  });
-  if (!text.trim()) return fallback();
-  if (isShortGreeting(text)) {
-    return {
-      agentKey: CLI_AUTO_TIER_AGENT_KEYS.flash,
-      tier: "flash",
-      classified: true
-    };
-  }
-  if (!options.authToken) return fallback();
-  const fetchImpl = options.fetchImpl ?? globalThis.fetch;
-  const controller = new AbortController();
-  const timeoutHandle = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const routeOptions = buildRouteOptions();
-    const messages = [
-      { role: "system", content: buildQuickChatIntentSystemPrompt(routeOptions) },
-      { role: "user", content: text }
-    ];
-    const { url, init } = buildPlatformChatCompletionRequest({
-      providerConfig: {
-        serverUrl: options.serverUrl,
-        authToken: options.authToken,
-        agentKey: CLI_AUTO_TIER_AGENT_KEYS.flash,
-        model: INTENT_MODEL,
-        provider: INTENT_PROVIDER,
-        endpoint: resolvePlatformChatCompletionsEndpoint(INTENT_PROVIDER) ?? "",
-        requestOptions: {}
-      },
-      messages,
-      stream: false
-    });
-    const response = await fetchImpl(url, {
-      ...init,
-      signal: controller.signal
-    });
-    if (!response.ok) return fallback();
-    const data = parsePlatformChatCompletionData(await response.text());
-    const content = data?.choices?.[0]?.message?.content;
-    if (typeof content !== "string" || !content.trim()) return fallback();
-    const parsed = parseQuickChatIntentResult(content, routeOptions);
-    if (!parsed) return fallback();
-    const tier = tierForAgentKey(parsed.agentKey) ?? fallbackTier;
-    return {
-      agentKey: parsed.agentKey,
-      tier,
-      classified: true,
-      confidence: parsed.confidence,
-      needsWorkspace: parsed.needsWorkspace,
-      skills: parsed.skills
-    };
-  } catch {
-    return fallback();
-  } finally {
-    clearTimeout(timeoutHandle);
-  }
-}
-
 // packages/cli/agentRunPrompts.ts
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { dirname, extname, isAbsolute, join, relative as relativePath, resolve, sep } from "node:path";
@@ -3993,16 +4572,16 @@ var buildCjkTokens = (text) => {
   }
   return tokens;
 };
-var tokenize = (text) => {
+var tokenize2 = (text) => {
   const normalized = text.toLowerCase();
   const wordTokens = normalized.split(/[\s,.;:!?()[\]{}"'`，。！？：；、]+/).map((token) => token.trim()).filter((token) => token.length >= 2);
   return [...wordTokens, ...buildCjkTokens(normalized)];
 };
 var keywordScore = (query, item) => {
-  const queryTokens = new Set(tokenize(query));
+  const queryTokens = new Set(tokenize2(query));
   if (queryTokens.size === 0) return 0;
   const haystack = /* @__PURE__ */ new Set([
-    ...tokenize(item.content),
+    ...tokenize2(item.content),
     ...(item.tags ?? []).map((tag) => tag.toLowerCase()),
     item.patternKey?.toLowerCase() ?? ""
   ]);
@@ -4616,8 +5195,7 @@ ${mdContent}`);
     traceTools: parsed.traceTools,
     ...parsed.eventsMode ? { eventsMode: parsed.eventsMode } : {},
     ...parsed.taskEvidence ? { taskEvidence: parsed.taskEvidence } : {},
-    ...extraContextBlocks.length > 0 ? { extraContextBlocks } : {},
-    ...contextBlockScopes.length > 0 ? { contextBlockScopes } : {}
+    ...contextBlockScopes.length > 0 ? { contextBlockScopes } : extraContextBlocks.length > 0 ? { extraContextBlocks } : {}
   });
   let result = await raceWithWatchdog(
     runner({
@@ -4748,10 +5326,28 @@ function isBalanceExhaustedError(error) {
 }
 
 export {
+  CLI_AUTO_TIER_AGENT_KEYS,
+  CLI_IMAGE_AGENT_KEY,
+  CLI_AUTO_TIER_AGENT_KEY_TABLE,
+  resolveCliAutoFallbackTier,
+  classifyCliAutoRoute,
+  resolveAgentContextWindow,
   formatTokenCount,
   renderTokenStatus,
   resolveCliColorEnabled,
   dimCliText,
+  ANSI_ESCAPE_REGEX,
+  stripAnsi,
+  applyTerminalOutputToText,
+  displayWidth,
+  visibleWidth,
+  truncateAnsi,
+  fitAnsiLine,
+  countPhysicalLines,
+  takeDisplayWidth,
+  padOrTruncateToWidth,
+  wrapTranscriptLine,
+  wrapTextToLines,
   THEME_PALETTES,
   getActiveThemeName,
   setActiveThemeName,
@@ -4760,22 +5356,24 @@ export {
   getActiveDensity,
   setActiveDensity,
   resolveTuiBrightness,
+  setActiveTerminalBaseHex,
   surfaceBackgroundSequence,
   themeColorSequence,
   themeText,
-  highlightMarkdown,
   formatAssistantDisplay,
   normalizeThinkingDisplayMode,
-  parseCliLocale,
-  getCliLocale,
-  setCliLocale,
-  initCliLocale,
-  t,
   normalizeToolDisplayMode,
+  COLLAPSED_PASTE_PLACEHOLDER_RE,
+  shouldCollapsePaste,
+  createCollapsedPasteStore,
+  allocateCollapsedPaste,
+  releaseCollapsedPaste,
+  clearCollapsedPasteStore,
+  replaceCollapsedPastesWithReferences,
+  releaseCollapsedPasteReferences,
+  expandRangeToCollapsedPasteChips,
+  findCollapsedPasteSpanAt,
   runAgentTurn,
-  CLI_IMAGE_AGENT_KEY,
-  CLI_AUTO_TIER_AGENT_KEY_TABLE,
-  classifyCliAutoRoute,
   resolveWorkflowReference,
   resolveSkillReference,
   buildSkillContextBlocks,