nolo-cli 0.32.0 → 0.33.0-alpha.3

package/{chunk-VMWR7VNI.js → chunk-7E72JMBB.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-6HYVJV7B.js";
 import {
   getDefaultCliLocalRuntimeDb
-} from "./chunk-Q3CSL43H.js";
+} from "./chunk-Q5ITEGIN.js";
 import {
   buildCliRuntimeEnv,
   clearProfileAuthToken,
@@ -18,21 +18,21 @@ import {
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
-import {
-  normalizeServerOrigin
-} from "./chunk-CF7PE763.js";
 import {
   createMemoryKey,
   createMemoryOwnerIndexKey,
   createMemorySubjectKindIndexKey,
   memoryOwnerRange
-} from "./chunk-WHLVPK32.js";
+} from "./chunk-KMSZPTM6.js";
+import {
+  asTrimmedNonEmptyStringArray
+} from "./chunk-I42VC5KR.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
 import {
-  asTrimmedNonEmptyStringArray
-} from "./chunk-I42VC5KR.js";
+  normalizeServerOrigin
+} from "./chunk-CF7PE763.js";
 
 // packages/cli/authCommands.ts
 import { createInterface } from "node:readline/promises";

package/{chunk-4PNU7W7K.js → chunk-AAGCMVFT.js}

@@ -6,10 +6,15 @@ import {
   resolveRawAgentInput,
   resolveServerUrl,
   writeUsage
-} from "./chunk-AOS5IN2I.js";
+} from "./chunk-ZHYK3N56.js";
 import {
-  resolveMachineId
-} from "./chunk-6HYVJV7B.js";
+  getReadableCliDb
+} from "./chunk-NUO3QFWD.js";
+import {
+  normalizeAgentHandle,
+  readDbRecord,
+  resolveAgentRecordFromHybridStore
+} from "./chunk-YDTYDA5W.js";
 import {
   agentRunCardLabels,
   createCliLocalRuntimeAdapter,
@@ -19,37 +24,38 @@ import {
   parseAgentRunEvent,
   t,
   toolLabel
-} from "./chunk-GAF5X6B7.js";
+} from "./chunk-O6GEBMIY.js";
 import {
-  createRunActivityTracker,
-  finalizeRunRecord,
-  spawnLocalBackgroundRun
-} from "./chunk-7KNERA53.js";
+  NOLO_PROJECT_MANAGER_AGENT_KEY,
+  isLocalCliAgentKey
+} from "./chunk-EKLRRZIN.js";
 import {
-  CliProviderQuotaError
-} from "./chunk-JDSUTNYY.js";
+  applyModelLayerOverride,
+  buildModelLayerOverride
+} from "./chunk-LTRXGFMS.js";
 import {
-  getDefaultCliLocalRuntimeDb
-} from "./chunk-Q3CSL43H.js";
+  resolveMachineId
+} from "./chunk-6HYVJV7B.js";
 import {
-  getReadableCliDb
-} from "./chunk-6YABCOFU.js";
+  formatAgentListCard
+} from "./chunk-HDKRSRYU.js";
 import {
-  normalizeAgentHandle,
-  readDbRecord,
-  resolveAgentRecordFromHybridStore
-} from "./chunk-V42OE5HT.js";
+  isGatewayHttpStatus
+} from "./chunk-RQSOAMPJ.js";
 import {
-  NOLO_PROJECT_MANAGER_AGENT_KEY,
-  isLocalCliAgentKey
-} from "./chunk-K6QEHQZ3.js";
+  getDefaultCliLocalRuntimeDb
+} from "./chunk-Q5ITEGIN.js";
 import {
-  buildSkillDiscoveryContextLayer
-} from "./chunk-PJ2DDQQM.js";
+  buildMemorySubjectsForAgent,
+  chooseMemoryOwners,
+  loadMemoryCandidatesFromDb,
+  resolveAgentMemoryPolicy
+} from "./chunk-6SXC35F4.js";
 import {
-  applyModelLayerOverride,
-  buildModelLayerOverride
-} from "./chunk-LTRXGFMS.js";
+  API_REPORTED_COST_MULTIPLIER,
+  normalizeUsage,
+  parseUiAskChoiceContent
+} from "./chunk-73GINUCW.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-OIQPORYI.js";
@@ -58,28 +64,47 @@ import {
   LOCAL_TURN_ABORTED_CODE,
   readActionGate,
   readCommandActionGatePayload
-} from "./chunk-AYMOSAHE.js";
+} from "./chunk-6PO2SYCS.js";
 import {
   createThinkParserState,
   flushThinkParser,
   processThinkChunk
 } from "./chunk-N7J63Q6C.js";
+import {
+  resolvePlatformAuthToken
+} from "./chunk-AFV4FOT2.js";
+import {
+  DEFAULT_CONTEXT_WINDOW,
+  getModelContextWindow
+} from "./chunk-2H3XIBY4.js";
+import {
+  clipCompactText
+} from "./chunk-AOXVOC6D.js";
+import {
+  findModelConfig
+} from "./chunk-DFUPZE6V.js";
+import {
+  buildSkillDiscoveryContextLayer
+} from "./chunk-ZURFOV5J.js";
 import {
   buildAgentsMdLayer,
   buildMemoryOverlayLayer,
   buildMemoryUseGuidanceLayer,
   partitionScopedBlocks,
   renderTurnContextBlocksWithScope
-} from "./chunk-DOISARTV.js";
+} from "./chunk-2UECQ7RE.js";
 import {
-  resolvePlatformAuthToken
-} from "./chunk-UDA3ZYLW.js";
+  parseExternalSkillMarkdown,
+  parseSkillDocProtocol
+} from "./chunk-AETZ7AD6.js";
 import {
-  formatAgentListCard
-} from "./chunk-MITD7CON.js";
+  compactWhitespace
+} from "./chunk-DWLEOOGR.js";
 import {
-  isGatewayHttpStatus
-} from "./chunk-Z5MXSEOJ.js";
+  createRunActivityTracker,
+  finalizeRunRecord,
+  spawnLocalBackgroundRun
+} from "./chunk-7KNERA53.js";
 import {
   formatFinishedRunCard,
   formatListRunsCard,
@@ -91,30 +116,11 @@ import {
   runShowsLogTail
 } from "./chunk-KXKQO4Q6.js";
 import {
-  buildMemorySubjectsForAgent,
-  chooseMemoryOwners,
-  loadMemoryCandidatesFromDb,
-  resolveAgentMemoryPolicy
-} from "./chunk-TA6EA2A3.js";
-import {
-  API_REPORTED_COST_MULTIPLIER,
-  DEFAULT_CONTEXT_WINDOW,
-  getModelContextWindow,
-  normalizeUsage,
-  parseUiAskChoiceContent
-} from "./chunk-3GZT3L6F.js";
-import {
-  clipCompactText
-} from "./chunk-BGTUGS3T.js";
+  CliProviderQuotaError
+} from "./chunk-SAQQLJZ5.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
-import {
-  compactWhitespace
-} from "./chunk-DWLEOOGR.js";
-import {
-  findModelConfig
-} from "./chunk-2K4NDPT5.js";
 import {
   readPipeText,
   spawnProcess
@@ -124,77 +130,54 @@ import {
 } from "./chunk-A7GB5UGH.js";
 import {
   parsePositiveFiniteNumberOrFallback
-} from "./chunk-G5GVZAXF.js";
+} from "./chunk-Y5GCAMGP.js";
+import {
+  createMemoryKey
+} from "./chunk-KMSZPTM6.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
 import {
   BUILTIN_NOLO_AGENT_KEY,
-  PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY
-} from "./chunk-ZJH3LKEW.js";
-import {
-  isLoopbackUrl
-} from "./chunk-4SN6J65J.js";
-import {
-  createMemoryKey
-} from "./chunk-WHLVPK32.js";
+  BUILTIN_NOLO_AGENT_NAME,
+  builtinAgentCatalogEntryById
+} from "./chunk-UK5JGQVU.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
 import {
-  parseExternalSkillMarkdown,
-  parseSkillDocProtocol
-} from "./chunk-ZWJOGMKH.js";
+  parsePublicAgentId
+} from "./chunk-BJIRLHJR.js";
+import {
+  isLoopbackUrl
+} from "./chunk-4SN6J65J.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
 
-// 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"
-};
-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;
-  }
-  return void 0;
-}
-function classifyCliAutoRoute(_text, options) {
-  return {
-    agentKey: CLI_AUTO_TIER_AGENT_KEYS.flash,
-    tier: "flash",
-    classified: true
-  };
-}
-
 // 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);
-  }
+function resolveEffectiveModel(opts) {
+  if (isUsableModelId(opts.model)) return 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 (!agentKey) return void 0;
+  return builtinAgentCatalogEntryById(parsePublicAgentId(agentKey))?.model;
+}
+function resolveAgentModelIdentity(opts) {
+  const model = resolveEffectiveModel(opts);
+  const useCatalogName = !isUsableModelId(opts.model) && opts.agentKey?.trim() === BUILTIN_NOLO_AGENT_KEY;
+  const agentName = useCatalogName ? BUILTIN_NOLO_AGENT_NAME : opts.agentName?.trim();
+  return {
+    ...agentName ? { agentName } : {},
+    ...model ? { model } : {}
+  };
+}
+function resolveAgentContextWindow(opts) {
+  const model = resolveEffectiveModel(opts);
+  if (model) return getModelContextWindow(model);
   if (opts.agentName?.trim()) {
     return getModelContextWindow(opts.agentName);
   }
@@ -3538,7 +3521,7 @@ function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
 // packages/cli/client/agentRun.ts
 import { ulid } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-ATGJY6WC.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-JX34G47Z.js");
   return runLocalAgentTurn;
 }
 async function resolveCurrentMachineId(options) {
@@ -4036,6 +4019,7 @@ async function runLocalAgentTurnForCli(options, settings) {
     const result = await runLocalAgentTurn({
       adapter,
       agentRef: options.agentKey,
+      userLanguage: options.userLanguage ?? options.env.NOLO_LANG ?? null,
       input: buildUserInputContent(options.message, options.imageUrls),
       ...expandedMessage !== options.message ? {
         persistedInput: buildUserInputContent(
@@ -4095,6 +4079,7 @@ async function runLocalAgentTurnForCli(options, settings) {
       exitCode: 0,
       dialogId: result.dialogId,
       title: result.title,
+      ...result.titlePatchPromise ? { titlePatchPromise: result.titlePatchPromise } : {},
       turnTokens: buildTurnTokenUsage(result.usage, result.model)
     };
   } catch (error) {
@@ -4139,6 +4124,7 @@ async function runAgentTurn(options) {
           exitCode: localResult.exitCode,
           ...localResult.dialogId ? { dialogId: localResult.dialogId } : {},
           title: localResult.title,
+          ...localResult.titlePatchPromise ? { titlePatchPromise: localResult.titlePatchPromise } : {},
           ...localResult.turnTokens ? { turnTokens: localResult.turnTokens } : {},
           ...localResult.streamInterrupted ? { streamInterrupted: localResult.streamInterrupted } : {},
           ...localResult.pendingToolName ? { pendingToolName: localResult.pendingToolName } : {}
@@ -4160,6 +4146,7 @@ async function runAgentTurn(options) {
                 exitCode: retriedLocalResult.exitCode,
                 ...retriedLocalResult.dialogId ? { dialogId: retriedLocalResult.dialogId } : {},
                 title: retriedLocalResult.title,
+                ...retriedLocalResult.titlePatchPromise ? { titlePatchPromise: retriedLocalResult.titlePatchPromise } : {},
                 ...retriedLocalResult.turnTokens ? { turnTokens: retriedLocalResult.turnTokens } : {}
               };
             }
@@ -4191,6 +4178,9 @@ async function runAgentTurn(options) {
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
 import { join as join2 } from "node:path";
 
+// packages/cli/client/autoModelRouter.ts
+var CLI_AUTO_ROUTE_AGENT_KEY = BUILTIN_NOLO_AGENT_KEY;
+
 // 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";
@@ -5048,21 +5038,13 @@ async function runAgentRunCommand(args, deps) {
   let modelOverride = null;
   const autoRouteRequested = deps.commandPath?.join(" ") === "chat" && !parsed.continueDialogId && (args.includes("--auto-route") || env.NOLO_AUTO_ROUTE === "1") && env.NOLO_AUTO_ROUTE !== "0";
   if (autoRouteRequested) {
-    const authToken = resolveAuthToken(args, env);
-    const serverUrl = resolveServerUrl(env);
     const hasExplicitAgent = Boolean(readFlagValue(args, "--agent"));
-    const route = await classifyCliAutoRoute(effectiveMessage, {
-      serverUrl,
-      authToken,
-      // 有图 → kimi vision 档；无图 → flash 档。漏传会永远走 flash。
-      hasImages: parsed.imageUrls.length > 0
-    });
     if (hasExplicitAgent) {
       modelOverride = buildModelLayerOverride(
         await readDbRecord({
           dbKey: agentKey,
-          authToken,
-          serverUrl,
+          authToken: resolveAuthToken(args, env),
+          serverUrl: resolveServerUrl(env),
           fetchImpl: fetch
         }).catch(() => null)
       );
@@ -5072,11 +5054,11 @@ async function runAgentRunCommand(args, deps) {
         "[nolo] auto-route: \u8986\u76D6\u6E90 agent \u8BFB\u53D6\u5931\u8D25\uFF0C\u6309\u539F\u6837\u76F4\u8DD1\u6240\u9009 agent\u3002\n"
       );
     } else {
-      effectiveAgentKey = route.agentKey;
-      output.write(
-        `[nolo] auto \u2192 ${route.tier}${modelOverride ? ` (model: ${agentKey})` : ""}
-`
-      );
+      effectiveAgentKey = CLI_AUTO_ROUTE_AGENT_KEY;
+      if (modelOverride) {
+        output.write(`[nolo] auto-route: model \u5C42\u8986\u76D6\u4E3A ${agentKey}
+`);
+      }
     }
   }
   let workflowReference;
@@ -5374,7 +5356,7 @@ function isBalanceExhaustedError(error) {
 }
 
 export {
-  classifyCliAutoRoute,
+  resolveAgentModelIdentity,
   resolveAgentContextWindow,
   formatTokenCount,
   renderTokenStatus,