nolo-cli 0.98.0-alpha.3 → 0.98.0

package/chunk-NWENLDMM.js

@@ -0,0 +1,42 @@
+import {
+  createSelector
+} from "./chunk-VY6VFGKR.js";
+import {
+  getAllServers,
+  getIsDesktopApp
+} from "./chunk-HIM3FCLF.js";
+import {
+  SERVERS
+} from "./chunk-LCBAMY2M.js";
+import {
+  isLocalServerUrl
+} from "./chunk-4SN6J65J.js";
+
+// packages/app/settings/serverSelectors.ts
+var resolveDesktopSafeServer = (value) => {
+  if (!getIsDesktopApp()) return value || SERVERS.MAIN;
+  return isLocalServerUrl(value) ? SERVERS.MAIN : value || SERVERS.MAIN;
+};
+var selectSettings = (state) => state.settings;
+var selectCurrentServer = createSelector(
+  [selectSettings],
+  (settings) => resolveDesktopSafeServer(settings.currentServer)
+);
+var selectSyncServers = createSelector(
+  [selectSettings],
+  (settings) => (settings.syncServers || []).filter(
+    (server) => !getIsDesktopApp() || !isLocalServerUrl(server)
+  )
+);
+var selectRemoteServer = selectCurrentServer;
+var selectRemoteSyncServers = selectSyncServers;
+var selectRemoteServers = createSelector(
+  [selectRemoteServer, selectRemoteSyncServers],
+  (currentServer, syncServers) => getAllServers(currentServer, syncServers)
+);
+
+export {
+  selectCurrentServer,
+  selectSyncServers,
+  selectRemoteServers
+};

package/{chunk-76WEAXJB.js → chunk-NZWAO6LH.js}

@@ -1,17 +1,13 @@
 import {
   buildLocalAgentLookupKeys,
   shouldReadAgentKeyRemotely
-} from "./chunk-Z77CRGTW.js";
+} from "./chunk-TVCAR26G.js";
 import {
   resolveCliAgentKeyInput
 } from "./chunk-SV5IJK6K.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
-import {
-  readPipeText,
-  spawnProcess
-} from "./chunk-X7HHHIOZ.js";
 import {
   parseUserIdFromAuthToken,
   readOption,
@@ -19,9 +15,13 @@ import {
   resolveServerCandidates,
   resolveServerUrl
 } from "./chunk-A7GB5UGH.js";
+import {
+  readPipeText,
+  spawnProcess
+} from "./chunk-Y6ROFCZO.js";
 import {
   createAgentKey
-} from "./chunk-VMFTFOWF.js";
+} from "./chunk-3AH7LNUB.js";
 
 // packages/cli/agentRecordHelpers.ts
 import { readFileSync } from "node:fs";
@@ -277,12 +277,17 @@ async function resolveAgentRecordFromHybridStore(args) {
             });
             if (fresh) {
               try {
-                await args.db.put(key, { ...fresh, dbKey: key, cachedAt: Date.now() });
+                await args.db.put(key, {
+                  ...fresh,
+                  dbKey: key,
+                  serverOrigin: record.serverOrigin,
+                  cachedAt: Date.now()
+                });
               } catch {
               }
               return {
                 agentKey: key,
-                record: fresh,
+                record: { ...fresh, serverOrigin: record.serverOrigin },
                 source: record?.serverOrigin ? "remote-cache" : "local-cache",
                 cacheHit: false
               };
@@ -479,7 +484,7 @@ function parseAgentUpdateArgs(args) {
   );
   const expiresAt = parseIsoTimestampOption(readOption(args, "--expires-at"), "--expires-at");
   const handle = readOption(args, "--handle")?.trim();
-  const promptSources = [prompt, promptFile, promptDoc].filter(Boolean);
+  const promptSources = [prompt, promptFile, promptDoc].filter((value) => value !== void 0);
   if (promptSources.length > 1) {
     throw new Error("--prompt / --prompt-file / --prompt-doc are mutually exclusive.");
   }
@@ -487,7 +492,7 @@ function parseAgentUpdateArgs(args) {
   if (cliProvider) updates.cliProvider = cliProvider;
   if (apiSource) updates.apiSource = apiSource;
   if (provider) updates.provider = provider;
-  if (prompt) updates.prompt = prompt;
+  if (prompt !== void 0) updates.prompt = prompt;
   if (promptFile) updates.prompt = readFileSync(promptFile, "utf8");
   if (tools) updates.tools = parseJsonishValue(tools);
   if (name) updates.name = name;
@@ -506,7 +511,7 @@ function parseAgentUpdateArgs(args) {
     updates[entry.slice(0, index)] = parseJsonishValue(entry.slice(index + 1));
   }
   if (Object.keys(updates).length === 0) {
-    if (!promptDoc && !copyProviderFrom) {
+    if (!promptDoc && !copyProviderFrom && !presetId) {
       throw new Error("No updates provided. Use --model / --cli-provider / --api-source / --field key=value.");
     }
   }
@@ -518,21 +523,19 @@ async function buildCreatedAgentRecord(args) {
   const resolvedAgentInput = resolveCliAgentKeyInput(args.parsed.agentInput);
   const agentKey = resolvedAgentInput.startsWith("agent-") ? resolvedAgentInput : createAgentKey.private(userId || "local", resolvedAgentInput);
   if (args.parsed.presetId) {
-    const { resolveProviderPresetFields } = await import("./providerPresetApply-FG6NZ57W.js");
+    const { resolveProviderPresetFields } = await import("./providerPresetApply-TEBH7FDX.js");
     const fields = resolveProviderPresetFields(args.parsed.presetId);
     if (fields.kind === "manual") {
       throw new Error(
         `unknown --preset "${args.parsed.presetId}". Run \`nolo agent providers\` to list preset ids.`
       );
     }
-    if (fields.kind === "oauth" || fields.requiresDesktopOAuth) {
-      throw new Error(
-        `--preset "${args.parsed.presetId}" is an OAuth subscription; create it in Nolo Desktop (OAuth login required).`
-      );
-    }
     const u = args.parsed.updates;
     u.apiSource = "custom";
     u.provider = u.provider ?? fields.provider;
+    if (fields.apiKeyRef && !u.apiKeyRef) {
+      u.apiKeyRef = fields.apiKeyRef;
+    }
     if (fields.customProviderUrl && !u.customProviderUrl) {
       u.customProviderUrl = fields.customProviderUrl;
     }

package/chunk-OCZKATRC.js

@@ -0,0 +1,129 @@
+// packages/ai/chat/parseApiError.ts
+var CONTEXT_OVERFLOW_ACTIONS = [
+  "compact-and-retry",
+  "new-dialog",
+  "switch-model",
+  "retry"
+];
+var CONTEXT_TOO_LARGE_ACTIONS = [
+  "new-dialog",
+  "switch-model",
+  "retry"
+];
+var truncateErrorMessage = (message, maxChars = 320) => message.length <= maxChars ? message : `${message.slice(0, maxChars)}\u2026`;
+var isContextOverflowText = (message) => /maximum context|context (length|window|overflow|limit)|context_length_exceed\w*|requested about .*tokens|too many tokens|prompt is too long|exceeds? (the )?(model|max)/i.test(
+  message
+);
+function classifyApiError(input) {
+  const { status, message, body, code } = input;
+  const errorMessage = message;
+  let defaultMessage = `\u72B6\u6001\u7801 ${status} ${input.statusText ?? ""}`;
+  switch (status) {
+    case 400:
+      if (isContextOverflowText(errorMessage) || isContextOverflowText(body) || code === "UPSTREAM_400") {
+        return {
+          kind: "context_overflow",
+          message: "\u4E0A\u4E0B\u6587\u8FC7\u957F\uFF1A\u672C\u8F6E\u6D88\u606F\u6216\u5DE5\u5177\u7ED3\u679C\u592A\u5927\u3002\u8BF7\u7F29\u5C0F\u8303\u56F4\uFF0C\u6216\u5148\u8BFB\u53D6\u66F4\u5C0F\u7247\u6BB5\u540E\u518D\u7EE7\u7EED\u3002",
+          code,
+          status,
+          retryable: true,
+          actions: [...CONTEXT_OVERFLOW_ACTIONS]
+        };
+      }
+      if (code === "MISSING_PROVIDER_API_KEY") {
+        return {
+          kind: "generic",
+          message: truncateErrorMessage(errorMessage),
+          code,
+          status,
+          retryable: false
+        };
+      }
+      if (errorMessage && errorMessage !== defaultMessage) {
+        return {
+          kind: "generic",
+          message: `\u8BF7\u6C42\u53C2\u6570\u9519\u8BEF: ${truncateErrorMessage(errorMessage)}`,
+          code,
+          status,
+          retryable: false
+        };
+      }
+      return { kind: "generic", message: "\u8BF7\u6C42\u53C2\u6570\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u8F93\u5165", code, status, retryable: false };
+    case 413:
+      return {
+        kind: "context_too_large",
+        message: "\u8BF7\u6C42\u5185\u5BB9\u8FC7\u5927\uFF1A\u8BF7\u51CF\u5C11\u4E00\u6B21\u53D1\u9001\u7684\u6D88\u606F\u3001\u6587\u4EF6\u6216\u5DE5\u5177\u7ED3\u679C\u3002",
+        code,
+        status,
+        retryable: true,
+        actions: [...CONTEXT_TOO_LARGE_ACTIONS]
+      };
+    case 401:
+      return {
+        kind: "auth",
+        message: code === "AUTH_TOKEN_EXPIRED" ? "\u767B\u5F55\u72B6\u6001\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u5148\u767B\u51FA\u540E\u91CD\u65B0\u767B\u5F55" : code === "AUTH_ACCOUNT_INVALID" ? "\u8D26\u6237\u65E0\u6548\u6216\u5DF2\u88AB\u505C\u7528\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458" : code === "AUTH_NO_TOKEN" ? "\u672A\u68C0\u6D4B\u5230\u767B\u5F55\u72B6\u6001\uFF0C\u8BF7\u5148\u767B\u5F55" : code === "AUTH_INVALID_TOKEN" ? "\u767B\u5F55\u51ED\u8BC1\u65E0\u6548\uFF0C\u8BF7\u5148\u767B\u51FA\u540E\u91CD\u65B0\u767B\u5F55" : code === "AUTH_TOKEN_NOT_ACTIVE" ? "\u4EE4\u724C\u5C1A\u672A\u751F\u6548\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5" : errorMessage && errorMessage !== `\u72B6\u6001\u7801 401 Unauthorized` ? `\u8BA4\u8BC1\u9519\u8BEF: ${truncateErrorMessage(errorMessage)}` : "\u8EAB\u4EFD\u9A8C\u8BC1\u5931\u8D25\uFF0C\u8BF7\u5148\u767B\u51FA\u540E\u91CD\u65B0\u767B\u5F55",
+        code,
+        status,
+        retryable: true,
+        actions: ["retry"]
+      };
+    case 503:
+      return {
+        kind: "server",
+        message: errorMessage && errorMessage !== `\u72B6\u6001\u7801 503 Service Unavailable` ? truncateErrorMessage(errorMessage) : "\u670D\u52A1\u6682\u65F6\u4E0D\u53EF\u7528\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5",
+        code,
+        status,
+        retryable: true,
+        actions: ["retry"]
+      };
+    case 504:
+      return {
+        kind: "timeout",
+        message: "\u8BF7\u6C42\u8D85\u65F6\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5",
+        code,
+        status,
+        retryable: true,
+        actions: ["retry"]
+      };
+    default:
+      return {
+        kind: "generic",
+        message: `API\u8BF7\u6C42\u5931\u8D25: ${truncateErrorMessage(errorMessage)}`,
+        code,
+        status,
+        retryable: true,
+        actions: ["retry"]
+      };
+  }
+}
+async function parseApiErrorInfo(response) {
+  const errorBody = await response.text();
+  let errorMessage = `\u72B6\u6001\u7801 ${response.status} ${response.statusText}`;
+  let errorCode = `E${response.status}`;
+  try {
+    const errorJson = JSON.parse(errorBody);
+    errorMessage = errorJson?.error?.message || errorJson?.message || errorJson?.msg || errorBody || errorMessage;
+    errorCode = errorJson?.error?.code || errorJson?.code || errorCode;
+  } catch (_e) {
+    if (errorBody) {
+      errorMessage = errorBody;
+    }
+  }
+  return classifyApiError({
+    status: response.status,
+    statusText: response.statusText,
+    message: errorMessage,
+    body: errorBody,
+    code: errorCode
+  });
+}
+async function parseApiError(response) {
+  return (await parseApiErrorInfo(response)).message;
+}
+
+export {
+  CONTEXT_OVERFLOW_ACTIONS,
+  CONTEXT_TOO_LARGE_ACTIONS,
+  isContextOverflowText,
+  parseApiError
+};

package/{chunk-N2WELJE7.js → chunk-OU36O6OR.js}

@@ -1,28 +1,35 @@
 import {
   addContentToSpace
-} from "./chunk-D2QT5FW4.js";
+} from "./chunk-6XDD7N7P.js";
 import {
+  format,
   prepareAndPersistMessage,
   uiAskChoiceFunc,
   uiAskChoiceFunctionSchema
-} from "./chunk-DHDVZFNC.js";
+} from "./chunk-C4DVDM72.js";
 import {
-  require_date_fns
-} from "./chunk-M76ECQRD.js";
+  formatISO
+} from "./chunk-ZRAU6T47.js";
 import {
   buildBuiltinObjectSkillReference
-} from "./chunk-DHDMC6FO.js";
-import {
-  PLATFORM_HOSTED_DEEPSEEK_FLASH_MODEL,
-  PLATFORM_HOSTED_KIMI_PROVIDER
-} from "./chunk-Q67DOFOO.js";
+} from "./chunk-WCGC6S77.js";
 import {
   read,
   readAndWait,
   removeCachedEntity,
   upsertSSREntity,
   write
-} from "./chunk-H62HCIUP.js";
+} from "./chunk-4FFUDT6D.js";
+import {
+  PLATFORM_HOSTED_DEEPSEEK_FLASH_MODEL,
+  PLATFORM_HOSTED_KIMI_PROVIDER
+} from "./chunk-Y3PMXGLH.js";
+import {
+  extractCustomId
+} from "./chunk-M2EJHDJP.js";
+import {
+  isRecord
+} from "./chunk-KUG52IAP.js";
 import {
   createAgentKey,
   createDialogKey,
@@ -30,34 +37,22 @@ import {
   dialogMessageRange,
   memoryOwnerRange,
   memorySubjectKindRange
-} from "./chunk-VMFTFOWF.js";
-import {
-  extractCustomId
-} from "./chunk-M2EJHDJP.js";
+} from "./chunk-3AH7LNUB.js";
 import {
   isDevelopment
-} from "./chunk-QOKAKDPE.js";
+} from "./chunk-HIM3FCLF.js";
 import {
   selectIdentityUserId
 } from "./chunk-SEJ5OS6F.js";
 import {
-  isRecord
-} from "./chunk-KUG52IAP.js";
+  asOptionalPositiveFiniteNumber
+} from "./chunk-U6VC4MU4.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
-import {
-  asOptionalPositiveFiniteNumber
-} from "./chunk-U6VC4MU4.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
-import {
-  __toESM
-} from "./chunk-4VNS5WPM.js";
-
-// packages/chat/dialog/actions/createDialogAction.ts
-var import_date_fns = __toESM(require_date_fns());
 
 // packages/chat/dialog/objectAssistantRegistry.ts
 var OBJECT_ASSISTANT_TO_SKILL = {
@@ -811,7 +806,7 @@ var createDialogAction = async (args, thunkApi) => {
       preview: recentRelationshipRecapResolution.recap ?? null
     });
   }
-  const time = (0, import_date_fns.format)(/* @__PURE__ */ new Date(), "MM-dd HH:mm");
+  const time = format(/* @__PURE__ */ new Date(), "MM-dd HH:mm");
   const title = titleOverride || (agentMode === "auto" ? "\u65B0\u5BF9\u8BDD" : agentConfig?.name || "Agent") + "  " + time;
   const spaceId = explicitSpaceId;
   const dialogPath = createDialogKey(userId);
@@ -853,7 +848,7 @@ var createDialogAction = async (args, thunkApi) => {
     ...agentMode === "auto" && autoRoute ? { autoRoute } : {},
     title,
     type: "dialog" /* DIALOG */,
-    createdAt: (0, import_date_fns.formatISO)(/* @__PURE__ */ new Date()),
+    createdAt: formatISO(/* @__PURE__ */ new Date()),
     ...spaceId && { spaceId },
     category,
     referenceKeys,