nolo-cli 0.32.0 → 0.33.0-alpha.11

package/{chunk-TOW4E763.js → chunk-BJIRLHJR.js}

@@ -25,6 +25,7 @@ var extractCustomId = (key) => {
 };
 var PUBLIC_AGENT_KEY_PREFIX = "agent-pub-";
 var publicAgentKey = (id) => `${PUBLIC_AGENT_KEY_PREFIX}${id}`;
+var parsePublicAgentId = (key) => key.startsWith(PUBLIC_AGENT_KEY_PREFIX) ? key.slice(PUBLIC_AGENT_KEY_PREFIX.length) : null;
 var ownedAgentKeyPrefix = (userId) => `agent-${userId}-`;
 var ownedAgentKey = (userId, id) => id.startsWith(ownedAgentKeyPrefix(userId)) ? id : `${ownedAgentKeyPrefix(userId)}${id}`;
 var isOwnedAgentKey = (key, userId) => typeof key === "string" && key.startsWith(ownedAgentKeyPrefix(userId));
@@ -35,6 +36,7 @@ export {
   extractCustomId,
   PUBLIC_AGENT_KEY_PREFIX,
   publicAgentKey,
+  parsePublicAgentId,
   ownedAgentKey,
   isOwnedAgentKey,
   parseOwnedAgentId

package/{chunk-ZJ2WITOO.js → chunk-BQXOGBFN.js}

@@ -1,10 +1,10 @@
 import {
   getRuntimeServerContext,
   scheduleDeleteReplication
-} from "./chunk-2IJAKBK2.js";
+} from "./chunk-X664KVEV.js";
 import {
   fetchFromClientDb
-} from "./chunk-5RDLGLAP.js";
+} from "./chunk-WJSW43QZ.js";
 import {
   buildTombstoneRecord
 } from "./chunk-GBRG75BQ.js";

package/{chunk-4PNU7W7K.js → chunk-C7H5GMXT.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-UNHKVD2N.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-5QW3O3ET.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-ESHYE7WU.js";
 import {
-  getReadableCliDb
-} from "./chunk-6YABCOFU.js";
+  formatAgentListCard
+} from "./chunk-MDIAECHA.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-N4XRDM26.js";
 import {
-  buildSkillDiscoveryContextLayer
-} from "./chunk-PJ2DDQQM.js";
+  buildMemorySubjectsForAgent,
+  chooseMemoryOwners,
+  loadMemoryCandidatesFromDb,
+  resolveAgentMemoryPolicy
+} from "./chunk-TFK3HUNQ.js";
 import {
-  applyModelLayerOverride,
-  buildModelLayerOverride
-} from "./chunk-LTRXGFMS.js";
+  API_REPORTED_COST_MULTIPLIER,
+  normalizeUsage,
+  parseUiAskChoiceContent
+} from "./chunk-DDVIBKIB.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-OIQPORYI.js";
@@ -58,28 +64,47 @@ import {
   LOCAL_TURN_ABORTED_CODE,
   readActionGate,
   readCommandActionGatePayload
-} from "./chunk-AYMOSAHE.js";
+} from "./chunk-BFPSVRCQ.js";
 import {
   createThinkParserState,
   flushThinkParser,
   processThinkChunk
 } from "./chunk-N7J63Q6C.js";
+import {
+  resolvePlatformAuthToken
+} from "./chunk-7YYHKBJP.js";
+import {
+  DEFAULT_CONTEXT_WINDOW,
+  getModelContextWindow
+} from "./chunk-GJXRIOLS.js";
+import {
+  clipCompactText
+} from "./chunk-DKMOY3QI.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-IR6W62Q6.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);
   }
@@ -3321,7 +3304,7 @@ async function detectCurrentMachineId(env) {
   const fromEnv = (env.NOLO_CURRENT_MACHINE_ID || env.NOLO_MACHINE_ID || "").trim();
   if (fromEnv) return fromEnv;
   try {
-    const { detectMachineInfo } = await import("./machineInfo-M6KB6HZN.js");
+    const { detectMachineInfo } = await import("./machineInfo-66ZFUMLE.js");
     const machine = await detectMachineInfo({ probeLaunchable: true });
     return asOptionalTrimmedString(machine?.machineId);
   } catch {
@@ -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-4PSBNUOE.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,

package/chunk-CPYYM4RJ.js

@@ -0,0 +1,98 @@
+import {
+  getModelConfig
+} from "./chunk-DFUPZE6V.js";
+import {
+  PLATFORM_HOSTED_KIMI_K3_MODEL,
+  isPlatformHostedClaudeModel,
+  isPlatformHostedDeepseekModel,
+  isPlatformHostedGeminiModel,
+  isPlatformHostedGlmModel,
+  isPlatformHostedGrokModel,
+  isPlatformHostedKimiK26Model,
+  isPlatformHostedQwen37FlashModel
+} from "./chunk-OR2HNLVO.js";
+import {
+  asTrimmedLowercaseString
+} from "./chunk-QSJ3HFEF.js";
+
+// packages/agent-runtime/platformProviderEndpoints.ts
+var OPENAI_RESPONSES_ENDPOINT = "https://api.openai.com/v1/responses";
+var DEEPSEEK_RESPONSES_ENDPOINT = "https://api.deepseek.com/responses";
+var XAI_CHAT_COMPLETIONS_ENDPOINT = "https://api.x.ai/v1/chat/completions";
+var PLATFORM_CHAT_COMPLETIONS_ENDPOINTS = {
+  deepinfra: "https://api.deepinfra.com/v1/openai/chat/completions",
+  fireworks: "https://api.fireworks.ai/inference/v1/chat/completions",
+  google: "https://generativelanguage.googleapis.com/v1beta/openai/chat/completions",
+  openai: "https://api.openai.com/v1/chat/completions",
+  openrouter: "https://openrouter.ai/api/v1/chat/completions",
+  // 千问 AI 平台 OpenAI 兼容模式
+  qwen: "https://dashscope.aliyuncs.com/compatible-mode/v1/chat/completions",
+  // Moonshot AI（月之暗面）开放平台 OpenAI 兼容模式（按量计费）
+  moonshot: "https://api.moonshot.cn/v1/chat/completions",
+  // 平台托管 Kimi K3 的实际上游
+  crof: "https://crof.ai/v1/chat/completions"
+  // 无 nolo 默认上游：平台托管模型全部显式分流，未识别模型返回 undefined
+};
+function isOpenAiResponsesModel(args) {
+  const provider = asTrimmedLowercaseString(args.provider);
+  if (provider === "openai") {
+    if (args.endpointKey === "responses") return true;
+    if (!args.model) return false;
+    try {
+      return getModelConfig("openai", args.model).endpointKey === "responses";
+    } catch {
+      return false;
+    }
+  }
+  if (provider === "deepseek" || provider === "nolo" || provider === "ollama-cloud") {
+    if (isPlatformHostedDeepseekModel(args.model)) return true;
+  }
+  return false;
+}
+function resolvePlatformResponsesEndpoint(provider, model) {
+  const normalized = asTrimmedLowercaseString(provider);
+  if (normalized === "openai") return OPENAI_RESPONSES_ENDPOINT;
+  if (normalized === "deepseek" || normalized === "nolo" || normalized === "ollama-cloud") {
+    if (!model || isPlatformHostedDeepseekModel(model)) {
+      return DEEPSEEK_RESPONSES_ENDPOINT;
+    }
+  }
+  return void 0;
+}
+var PLATFORM_PROVIDER_ENDPOINT_ALIASES = {
+  "ollama-cloud": "nolo",
+  deepseek: "nolo"
+};
+function resolvePlatformChatCompletionsEndpoint(provider, model) {
+  const key = asTrimmedLowercaseString(provider);
+  if (!key) return void 0;
+  const aliased = PLATFORM_PROVIDER_ENDPOINT_ALIASES[key] ?? key;
+  if (aliased === "nolo" && isPlatformHostedClaudeModel(model)) {
+    return PLATFORM_CHAT_COMPLETIONS_ENDPOINTS.deepinfra;
+  }
+  if (aliased === "nolo" && isPlatformHostedGrokModel(model)) {
+    return XAI_CHAT_COMPLETIONS_ENDPOINT;
+  }
+  if (aliased === "nolo" && (isPlatformHostedKimiK26Model(model) || isPlatformHostedGlmModel(model))) {
+    return PLATFORM_CHAT_COMPLETIONS_ENDPOINTS.openrouter;
+  }
+  if (aliased === "nolo" && asTrimmedLowercaseString(model) === PLATFORM_HOSTED_KIMI_K3_MODEL) {
+    return PLATFORM_CHAT_COMPLETIONS_ENDPOINTS.crof;
+  }
+  if (aliased === "nolo" && (isPlatformHostedGeminiModel(model) || isPlatformHostedQwen37FlashModel(model))) {
+    return PLATFORM_CHAT_COMPLETIONS_ENDPOINTS.google;
+  }
+  if (aliased === "nolo" && isPlatformHostedDeepseekModel(model)) {
+    return void 0;
+  }
+  if (aliased === "nolo") {
+    return void 0;
+  }
+  return PLATFORM_CHAT_COMPLETIONS_ENDPOINTS[aliased];
+}
+
+export {
+  isOpenAiResponsesModel,
+  resolvePlatformResponsesEndpoint,
+  resolvePlatformChatCompletionsEndpoint
+};