nolo-cli 0.33.0-alpha.8 → 0.34.0-alpha.1

package/chunk-6XG52ZQ6.js

@@ -0,0 +1,146 @@
+import {
+  mergeAvailabilityDeadline
+} from "./chunk-X2K2JSO4.js";
+
+// packages/cli/credentialAvailability.ts
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
+var FILE_NAME = "credential-availability.json";
+function resolveNoloHome(env = process.env) {
+  return env.NOLO_HOME?.trim() || join(homedir(), ".nolo");
+}
+function resolveCredentialAvailabilityPath(env = process.env) {
+  return join(resolveNoloHome(env), FILE_NAME);
+}
+function resolveCredentialKey(agent) {
+  if (!agent || typeof agent !== "object") return void 0;
+  for (const field of ["apiKeyRef", "credentialRef"]) {
+    const value = agent[field];
+    if (typeof value === "string") {
+      const trimmed = value.trim();
+      if (trimmed) return trimmed;
+    }
+  }
+  return void 0;
+}
+function parseFile(raw) {
+  const parsed = JSON.parse(raw);
+  if (!parsed || typeof parsed !== "object") return { entries: {} };
+  const entries = parsed.entries;
+  if (!entries || typeof entries !== "object") return { entries: {} };
+  return { entries };
+}
+async function readCredentialEntries(env = process.env, now = Date.now()) {
+  const path = resolveCredentialAvailabilityPath(env);
+  let raw;
+  try {
+    raw = await readFile(path, "utf8");
+  } catch {
+    return {};
+  }
+  let file;
+  try {
+    file = parseFile(raw);
+  } catch {
+    return {};
+  }
+  const live = {};
+  for (const [key, entry] of Object.entries(file.entries)) {
+    const normalized = normalizeEntry(entry);
+    if (normalized && normalized.nextAvailableAt > now) {
+      live[key] = normalized;
+    }
+  }
+  return live;
+}
+function normalizeEntry(entry) {
+  if (typeof entry === "number") {
+    return Number.isFinite(entry) ? { nextAvailableAt: entry } : void 0;
+  }
+  if (!entry || typeof entry !== "object") return void 0;
+  const at = entry.nextAvailableAt;
+  if (typeof at !== "number" || !Number.isFinite(at)) return void 0;
+  if ("lastProbeAt" in entry) {
+    const probe = entry.lastProbeAt;
+    if (typeof probe !== "number" || !Number.isFinite(probe)) return void 0;
+    return { nextAvailableAt: at, lastProbeAt: probe };
+  }
+  return { nextAvailableAt: at };
+}
+async function readCredentialAvailability(env = process.env, now = Date.now()) {
+  const entries = await readCredentialEntries(env, now);
+  return Object.fromEntries(
+    Object.entries(entries).map(([key, entry]) => [key, entry.nextAvailableAt])
+  );
+}
+async function readCredentialEntry(credentialKey, env = process.env, now = Date.now()) {
+  if (!credentialKey) return void 0;
+  const entries = await readCredentialEntries(env, now);
+  return entries[credentialKey];
+}
+async function writeCredentialAvailability(live, env = process.env) {
+  const path = resolveCredentialAvailabilityPath(env);
+  await mkdir(resolveNoloHome(env), { recursive: true }).catch(() => void 0);
+  const file = {
+    entries: live
+  };
+  const tmp = `${path}.tmp-${process.pid}-${Date.now()}`;
+  await writeFile(tmp, `${JSON.stringify(file, null, 2)}
+`, "utf8");
+  await rename(tmp, path);
+}
+async function markCredentialUnavailable(credentialKey, nextAvailableAt, env = process.env, now = Date.now()) {
+  if (!credentialKey) return;
+  const live = await readCredentialEntries(env, now);
+  const existing = live[credentialKey];
+  const merged = mergeAvailabilityDeadline(existing?.nextAvailableAt, nextAvailableAt);
+  if (typeof merged !== "number" || !Number.isFinite(merged)) return;
+  live[credentialKey] = {
+    nextAvailableAt: merged,
+    ...existing?.lastProbeAt !== void 0 ? { lastProbeAt: existing.lastProbeAt } : {}
+  };
+  await writeCredentialAvailability(live, env);
+}
+async function clearCredentialAvailability(credentialKey, env = process.env, now = Date.now()) {
+  if (!credentialKey) return;
+  const live = await readCredentialEntries(env, now);
+  if (!(credentialKey in live)) return;
+  delete live[credentialKey];
+  await writeCredentialAvailability(live, env);
+}
+async function recordCredentialProbe(credentialKey, env = process.env, now = Date.now()) {
+  if (!credentialKey) return;
+  const live = await readCredentialEntries(env, now);
+  const existing = live[credentialKey];
+  if (!existing) return;
+  live[credentialKey] = { ...existing, lastProbeAt: now };
+  await writeCredentialAvailability(live, env);
+}
+function applyCredentialAvailability(agents, credentialAvailability) {
+  if (Object.keys(credentialAvailability).length === 0) return agents;
+  return agents.map((agent) => {
+    const key = resolveCredentialKey(agent);
+    if (!key) return agent;
+    const at = credentialAvailability[key];
+    if (typeof at !== "number") return agent;
+    const merged = mergeAvailabilityDeadline(
+      agent.nextAvailableAt,
+      at
+    );
+    if (typeof merged !== "number" || merged === agent.nextAvailableAt) {
+      return agent;
+    }
+    return { ...agent, nextAvailableAt: merged };
+  });
+}
+
+export {
+  resolveCredentialKey,
+  readCredentialAvailability,
+  readCredentialEntry,
+  markCredentialUnavailable,
+  clearCredentialAvailability,
+  recordCredentialProbe,
+  applyCredentialAvailability
+};

package/{chunk-XFV2VK7O.js → chunk-74IQ5RRO.js}

@@ -1,6 +1,9 @@
+import {
+  clearCliLocalRuntimePreparedAgentCache
+} from "./chunk-YRP7LG4R.js";
 import {
   getReadableCliDb
-} from "./chunk-NUO3QFWD.js";
+} from "./chunk-UNHKVD2N.js";
 import {
   buildCreatedAgentRecord,
   buildUpdatedAgentRecord,
@@ -9,10 +12,7 @@ import {
   resolveAgentRecordFromHybridStore,
   sanitizeAgentRecordForCliOutput,
   writeAgentRecord
-} from "./chunk-YDTYDA5W.js";
-import {
-  clearCliLocalRuntimePreparedAgentCache
-} from "./chunk-YBPAQV37.js";
+} from "./chunk-GZRMWK5R.js";
 import {
   resolveCliAgentKeyInput
 } from "./chunk-EKLRRZIN.js";
@@ -94,7 +94,7 @@ async function runAgentUpdateCommand(args, deps = {}) {
   }
   if (!parsed) {
     output.write(
-      "Usage: nolo agent update <agent> [--model <id>] [--cli-provider <provider>] [--api-source <source>] [--max-concurrent <n>] [--expires-at <iso>] [--prompt <text> | --prompt-file <path> | --prompt-doc <pageKey>] [--tools <json>] [--copy-provider-from <agent>] [--field key=value]\n".replace("[--field key=value]", `[--handle <name>] [--field key=value]  (e.g. --field disabledTools='["exa_search"]' to disable default tools)`)
+      "Usage: nolo agent update <agent> [--model <id>] [--cli-provider <provider>] [--api-source <source>] [--max-concurrent <n>] [--expires-at <iso>] [--prompt <text> | --prompt-file <path> | --prompt-doc <pageKey>] [--tools <json>] [--copy-provider-from <agent>] [--name <name>] [--custom-provider-url <url>] [--api-key <key>|--provider-api-key <key>] [--field key=value]\n".replace("[--field key=value]", `[--handle <name>] [--field key=value]  (e.g. --field disabledTools='["exa_search"]' to disable default tools)`)
     );
     return args[0] ? 0 : 1;
   }
@@ -167,7 +167,7 @@ async function runAgentCreateCommand(args, deps = {}) {
   }
   if (!parsed) {
     output.write(
-      "Usage: nolo agent create <agent> [--model <id>] [--cli-provider <provider>] [--api-source <source>] [--max-concurrent <n>] [--expires-at <iso>] [--prompt <text> | --prompt-file <path> | --prompt-doc <pageKey>] [--tools <json>] [--copy-provider-from <agent>] [--name <name>] [--custom-provider-url <url>] [--provider-api-key <key>] [--field key=value]\n".replace("[--field key=value]", "[--handle <name>] [--field key=value]")
+      "Usage: nolo agent create <agent> [--model <id>] [--cli-provider <provider>] [--api-source <source>] [--max-concurrent <n>] [--expires-at <iso>] [--prompt <text> | --prompt-file <path> | --prompt-doc <pageKey>] [--tools <json>] [--copy-provider-from <agent>] [--name <name>] [--custom-provider-url <url>] [--api-key <key>|--provider-api-key <key>] [--verify] [--field key=value]\n".replace("[--field key=value]", "[--handle <name>] [--field key=value]")
     );
     return args[0] ? 0 : 1;
   }
@@ -210,12 +210,25 @@ async function runAgentCreateCommand(args, deps = {}) {
       serverOrigin: built.serverUrl
     });
     clearCliLocalRuntimePreparedAgentCache();
+    let verifyResult;
+    if (parsed.verify) {
+      const { verifyCustomProvider } = await import("./agentProviderCommands-65ZC2WB4.js");
+      const rec = built.nextRecord;
+      verifyResult = await verifyCustomProvider({
+        providerUrl: rec.customProviderUrl,
+        apiKey: rec.apiKey,
+        model: rec.model,
+        prompt: parsed.verifyPrompt,
+        fetchImpl
+      });
+    }
     output.write(JSON.stringify({
       ok: true,
       agentKey: built.agentKey,
       baseUrl: built.serverUrl,
       updates: sanitizeAgentRecordForCliOutput(built.updates),
-      record: sanitizeAgentRecordForCliOutput(built.nextRecord)
+      record: sanitizeAgentRecordForCliOutput(built.nextRecord),
+      ...verifyResult ? { verify: verifyResult } : {}
     }, null, 2));
     output.write("\n");
     return 0;

package/{chunk-FMEVI5TG.js → chunk-7CH6U3FL.js}

@@ -81,7 +81,7 @@ var MEMORY_USE_GUIDANCE = `--- \u8BB0\u5FC6\u4F7F\u7528\u65B9\u5F0F ---
 - \u63A8\u65AD\u578B\u8BB0\u5FC6\uFF08inferred\uFF09\u53EA\u7528\u4E8E\u628A\u63E1\u8BED\u6C14\u3001\u72B6\u6001\u548C\u672A\u5B8C\u6210\u4E8B\u9879\uFF0C\u4E0D\u8981\u8BF4\u6210\u201C\u4F60\u660E\u786E\u544A\u8BC9\u8FC7\u6211\u201D\u6216\u5F53\u6210\u7528\u6237\u5DF2\u6388\u6743\u4FDD\u5B58\u7684\u4E8B\u5B9E\u3002\u51B2\u7A81\u6216\u573A\u666F\u4E0D\u660E\u65F6\u8BF4\u660E\u4F9D\u636E\u6216\u7B80\u77ED\u786E\u8BA4\uFF0C\u4E0D\u8981\u786C\u5957\u3002
 - \u3010\u7F6E\u4FE1\u5EA6\u6765\u6E90\u3011\u6BCF\u6761\u8BB0\u5FC6\u6709\u6765\u6E90\uFF1Averified\uFF08\u5B9E\u6D4B\u9A8C\u8BC1\uFF0C\u9AD8\u7F6E\u4FE1\u5EA6\uFF09\u3001stated\uFF08\u7528\u6237\u9648\u8FF0\uFF0C\u4E2D\u9AD8\uFF09\u3001inferred\uFF08\u6A21\u578B\u63A8\u65AD\uFF0C\u4F4E\u2014\u2014\u5BB9\u6613\u7F16\u9020\uFF0C\u4F18\u5148\u5B58\u7591\uFF09\u3002\u53EC\u56DE\u65F6\u4F18\u5148\u4F7F\u7528 verified/stated\uFF0Cinferred \u9700\u9A8C\u8BC1\u540E\u518D\u91C7\u7EB3\u3002
 - \u3010\u53EC\u56DE\u89C4\u5219\u3011\u53EC\u56DE\u8BB0\u5FC6\u5FC5\u987B\u5E26\u5B8C\u6574\u5386\u53F2\u4E0A\u4E0B\u6587\uFF08\u6765\u6E90\u3001\u7F6E\u4FE1\u5EA6\u3001\u53D8\u66F4\u8BB0\u5F55\uFF09\uFF0C\u7981\u6B62\u81EA\u884C\u63A8\u7406\u586B\u8865\u3002\u4E0D\u8981\u51ED\u5370\u8C61\u62FC\u51FA\u672A\u9A8C\u8BC1\u7684\u4FE1\u606F\u3002
-- \u3010\u964D\u6743/\u5F52\u6863\u3011\u8BB0\u5FC6\u4E0D\u53EF\u7269\u7406\u5220\u9664\uFF0C\u53EA\u80FD\u964D\u6743/\u5F52\u6863\u3002\u9519\u8BEF\u7684\u8BB0\u5FC6\u5E94\u4FEE\u6B63\u5E76\u964D\u4F4E\u7F6E\u4FE1\u5EA6\uFF0C\u800C\u4E0D\u662F\u5220\u9664\u2014\u2014\u4FDD\u7559\u6863\u6848\u4F9B\u5BA1\u8BA1\u3002`;
+- \u3010\u964D\u6743\u4E0E\u5220\u9664\u3011\u65E5\u5E38\u9519\u8BEF\u8BB0\u5FC6\u4F18\u5148\u964D\u6743/\u5F52\u6863\u4E0E\u8986\u76D6\uFF08\u964D\u4F4E\u7F6E\u4FE1\u5EA6\uFF09\uFF0C\u4FDD\u7559\u6863\u6848\u4F9B\u5BA1\u8BA1\uFF1B\u82E5\u7528\u6237\u660E\u786E/\u5F3A\u5236\u8981\u6C42\u5220\u9664\uFF0C\u4E14\u5728\u7528\u6237\u81EA\u8EAB\u6743\u9650\u8303\u56F4\u5185\uFF0C\u5141\u8BB8\u7269\u7406\u5220\u9664\uFF08\u4EC5\u9650\u4E8E\u5F53\u524D\u7528\u6237\u62E5\u6709\u7684\u8BB0\u5FC6\uFF0C\u4E25\u7981\u8D8A\u6743\uFF09\u3002`;
 
 export {
   buildUserResponseLanguageContext,

package/{chunk-6FNS3SQF.js → chunk-7YDKVLAE.js}

@@ -1,16 +1,16 @@
 import {
   createCliLocalRuntimeAdapter,
   summarizeEndpoint
-} from "./chunk-YBPAQV37.js";
+} from "./chunk-YRP7LG4R.js";
 import {
   clipMultilineText
-} from "./chunk-MUCM2MZB.js";
+} from "./chunk-6KYCG5GW.js";
 import {
   runLocalAgentTurn
-} from "./chunk-OOK2ZT5F.js";
+} from "./chunk-LQ6PUHW6.js";
 import {
   resolveLocalRuntimeEnvFromPolicy
-} from "./chunk-5CS33IBL.js";
+} from "./chunk-NQ4N4IGO.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -30,18 +30,18 @@ import {
 import {
   asTrimmedNonEmptyStringArray
 } from "./chunk-I42VC5KR.js";
-import {
-  asTrimmedString
-} from "./chunk-3EUW3WEO.js";
-import {
-  asOptionalPositiveFiniteNumber
-} from "./chunk-U6VC4MU4.js";
 import {
   ownedAgentKey
 } from "./chunk-BJIRLHJR.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
+import {
+  asTrimmedString
+} from "./chunk-3EUW3WEO.js";
+import {
+  asOptionalPositiveFiniteNumber
+} from "./chunk-U6VC4MU4.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";

package/{chunk-LZC5YX6P.js → chunk-AUH2LTIY.js}

@@ -3,7 +3,7 @@ import {
   createFileCredentialBroker,
   migrateAgentSecrets,
   normalizeAgentRuntimeToolPolicy
-} from "./chunk-5CS33IBL.js";
+} from "./chunk-NQ4N4IGO.js";
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
@@ -11,16 +11,16 @@ import {
   patch,
   remove,
   write
-} from "./chunk-57QJXIB6.js";
+} from "./chunk-23KKIMD5.js";
 import {
   createAgentKey,
   toTrimmedString
-} from "./chunk-KMSZPTM6.js";
+} from "./chunk-2WKUUY2E.js";
 import {
   asyncThunkCreator,
   buildCreateSlice,
   getRuntimeServerContext
-} from "./chunk-X664KVEV.js";
+} from "./chunk-HHBXCRJS.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
@@ -304,7 +304,7 @@ var slice = createSliceWithThunks({
       const overrides = {};
       if (args.systemPromptOverride !== void 0) overrides.prompt = args.systemPromptOverride;
       if (args.toolsOverride !== void 0) overrides.tools = args.toolsOverride;
-      const { _executeModel } = await import("./_executeModel-RI6DRQTP.js");
+      const { _executeModel } = await import("./_executeModel-BUYCXZCQ.js");
       return _executeModel(
         {
           isStreaming: args.isStreaming ?? false,
@@ -325,7 +325,7 @@ var slice = createSliceWithThunks({
      * - 循环直到无工具调用或触发其他运行时停止条件
      */
     runAgent: create.asyncThunk(async (args, thunkApi) => {
-      const { runAgentClientLoop } = await import("./runAgentClientLoop-D2T2P36H.js");
+      const { runAgentClientLoop } = await import("./runAgentClientLoop-35GKZDOZ.js");
       const { content: loopContent, toolCallCount } = await runAgentClientLoop(
         {
           agentKey: args.agentKey,
@@ -341,7 +341,7 @@ var slice = createSliceWithThunks({
      * 聊天轮次流式 Agent 调用
      */
     streamAgentChatTurn: create.asyncThunk(async (args, thunkApi) => {
-      const { streamAgentChatTurnHandler } = await import("./streamAgentChatTurn-BBPSFMTZ.js");
+      const { streamAgentChatTurnHandler } = await import("./streamAgentChatTurn-D5IDHXMV.js");
       return streamAgentChatTurnHandler(args, thunkApi);
     }),
     /**

package/{chunk-CLP2K7U4.js → chunk-B6H5XCT2.js}

@@ -1,30 +1,30 @@
 import {
   parsePositiveFiniteNumberOrFallback
 } from "./chunk-Y5GCAMGP.js";
-import {
-  asRecordOrEmpty
-} from "./chunk-KX6YBIHG.js";
 import {
   DEFAULT_SYSTEM_AGENT_CAPABILITIES
 } from "./chunk-UZ6XXCVR.js";
+import {
+  asRecordOrEmpty
+} from "./chunk-KX6YBIHG.js";
 import {
   patch,
   readAndWait,
   toTimestampMs,
   upsert,
   write
-} from "./chunk-57QJXIB6.js";
+} from "./chunk-23KKIMD5.js";
 import {
   createUserKey,
   createUserPreferenceKey,
   ulid
-} from "./chunk-KMSZPTM6.js";
+} from "./chunk-2WKUUY2E.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
 import {
   BUILTIN_NOLO_AGENT_KEY
-} from "./chunk-UK5JGQVU.js";
+} from "./chunk-XT73C4VH.js";
 import {
   asyncThunkCreator,
   buildCreateSlice,
@@ -32,12 +32,12 @@ import {
   createAsyncThunk,
   createSelector,
   selectIdentityUserId
-} from "./chunk-X664KVEV.js";
+} from "./chunk-HHBXCRJS.js";
 import {
   getAllServers,
   getIsDesktopApp,
   isProduction
-} from "./chunk-WJSW43QZ.js";
+} from "./chunk-L3JWI7WX.js";
 import {
   SERVERS
 } from "./chunk-LCBAMY2M.js";

package/{chunk-NNWHHCVP.js → chunk-BMB563Y6.js}

@@ -27,14 +27,20 @@ var STREAM_USAGE_PROVIDERS = /* @__PURE__ */ new Set([
   // DeepSeek official and Ollama honor stream_options.include_usage on their
   // chat.completions endpoints. Without them, locally-configured agents lose
   // token statistics / local billing (the whitelist replaced the previous
-  // always-on include_usage).
+  // always-on include_usage). ollama-cloud is the Ollama Cloud subscription
+  // endpoint (https://ollama.com/v1), an OpenAI-compatible API that likewise
+  // honors stream_options.include_usage.
   "deepseek",
   "ollama",
-  // Platform Kimi K3 remap (provider=nolo + kimi-k3) routes to crof.ai, an
+  "ollama-cloud",
   // OpenAI-compatible /v1/chat/completions endpoint; the hosted branch passes
-  // "crof" as the usage provider so K3 streams request the terminal usage
+  // "upstream-k3" as the usage provider so K3 streams request the terminal usage
   // chunk (same capability decision as deepinfra/vultr).
-  "crof"
+  "upstream-k3",
+  // RunInfra hosted fallback channel: OpenAI-compatible chat.completions
+  // endpoint, supports stream_options.include_usage (measured to return
+  // prompt_tokens_details.cached_tokens).
+  "runinfra"
 ]);
 var EXTRA_USAGE_FIELD_PROVIDERS = /* @__PURE__ */ new Set(["openrouter"]);
 var normalizeProviderName = (providerName) => asTrimmedLowercaseString(providerName);