nolo-cli 0.97.0-alpha.2 → 0.97.1

package/{chunk-BLJWCTRL.js → chunk-AOPCEXTB.js}

@@ -2,7 +2,7 @@ import {
   deleteDbRecord,
   queryUserRecords,
   readDbRecord
-} from "./chunk-76WEAXJB.js";
+} from "./chunk-SACTCJAC.js";
 import {
   mergeAndDedupUserData
 } from "./chunk-KQHGZWSV.js";

package/{chunk-WGR3J4Q6.js → chunk-APMUYAPK.js}

@@ -1,6 +1,6 @@
 import {
   isAgentRunTerminalStatus
-} from "./chunk-3VNWWVKB.js";
+} from "./chunk-I3QNET24.js";
 import {
   isCompiledBinary,
   resolveCliEntrypointPath
@@ -1056,7 +1056,14 @@ function defaultGetProcessStartTime(pid) {
     const output = nodeExecFileSync("ps", ["-o", "lstart=", "-p", String(pid)], {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
-      timeout: 1e3
+      timeout: 1e3,
+      // `ps -o lstart` 的日期串随系统 locale 变化：
+      //   LANG=en_US.UTF-8 → "Thu Oct  8 08:54:18 2026"（new Date 可解析）
+      //   LANG=zh_CN.UTF-8 → "四 10月  8 08:54:18 2026"（new Date → NaN → null）
+      // 这会让 isPidReused 的结论依赖调用者环境：同一条 run 记录在英文
+      // locale 下被判 pid reused → orphaned，中文 locale 下不判。强制 C
+      // locale 让输出恒为可解析的英文格式，结果与 locale 无关。
+      env: { ...process.env, LC_ALL: "C", LANG: "C" }
     }).trim();
     if (!output) return null;
     const d = new Date(output);
@@ -1473,14 +1480,20 @@ async function terminateRunProcess(record, initialSignal, deps) {
   signalGroup(initialSignal);
   if (initialSignal === "SIGTERM") {
     const deadline = nowMs() + TERMINATE_GRACE_MS;
-    while (!isPidGone(pid, deps) && nowMs() < deadline) {
+    const maxIterations = Math.ceil(TERMINATE_GRACE_MS / TERMINATE_POLL_MS) + 1;
+    let iterations = 0;
+    while (!isPidGone(pid, deps) && nowMs() < deadline && iterations < maxIterations) {
+      iterations += 1;
       await sleep(TERMINATE_POLL_MS);
     }
   }
   if (!isPidGone(pid, deps)) {
     signalGroup("SIGKILL");
     const killDeadline = nowMs() + TERMINATE_KILL_GRACE_MS;
-    while (!isPidGone(pid, deps) && nowMs() < killDeadline) {
+    const maxIterations = Math.ceil(TERMINATE_KILL_GRACE_MS / TERMINATE_POLL_MS) + 1;
+    let iterations = 0;
+    while (!isPidGone(pid, deps) && nowMs() < killDeadline && iterations < maxIterations) {
+      iterations += 1;
       await sleep(TERMINATE_POLL_MS);
     }
   }

package/{chunk-Q554LLSI.js → chunk-AUDNYVRC.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-KHCLMKZZ.js";
 import {
   asTrimmedNonEmptyStringArray
-} from "./chunk-VMFTFOWF.js";
+} from "./chunk-3AH7LNUB.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";

package/{chunk-RG6JBBX5.js → chunk-AWF3WO5R.js}

@@ -1,23 +1,30 @@
+import {
+  isSubscriptionEndpoint,
+  isSubscriptionOAuthCredential
+} from "./chunk-DAWDCRIG.js";
 import {
   isOAuthApiKeyRef
 } from "./chunk-YYLHWIW6.js";
 import {
   compareAgentSelection
-} from "./chunk-IIVGDG4I.js";
+} from "./chunk-6PHKBY2Q.js";
+import {
+  isAgentUnavailableNow
+} from "./chunk-H6A6X4EK.js";
 import {
   isAntigravityOAuthAgent
-} from "./chunk-UZGQNTVW.js";
+} from "./chunk-S5XGT6GB.js";
 import {
   getModelAbility
-} from "./chunk-ACTMNVHM.js";
+} from "./chunk-CYSYR67N.js";
+import {
+  fnv1a32Hex
+} from "./chunk-WIWM4FE3.js";
 import {
   isOwnedAgentKey,
   ownedAgentKey,
   publicAgentKey
 } from "./chunk-M2EJHDJP.js";
-import {
-  fnv1a32Hex
-} from "./chunk-UKWGR5SS.js";
 
 // packages/ai/agent/agentBilling.ts
 function resolveBillingSource(candidate) {
@@ -36,6 +43,9 @@ function resolveBillingSource(candidate) {
   }
   if (candidate?.isOAuth === true || candidate?.billingSource === "user_subscription" || candidate?.apiSource === "oauth" || isOAuthApiKeyRef(candidate?.apiKeyRef)) return "user_subscription";
   if (candidate?.apiSource === "custom" || candidate?.billingSource === "user_api") {
+    if (isSubscriptionEndpoint(candidate?.customProviderUrl) || isSubscriptionOAuthCredential(candidate?.apiKeyRef)) {
+      return "user_subscription";
+    }
     return "user_api";
   }
   return "platform_credits";
@@ -227,6 +237,16 @@ function deriveCredentialGroup(ref) {
     credentialKind: "api-key"
   };
 }
+function deriveCustomProviderCredentialGroup(userId, customProviderUrl) {
+  if (typeof customProviderUrl !== "string" || !customProviderUrl.trim()) {
+    return void 0;
+  }
+  const basis = `${userId ?? ""}|${customProviderUrl.trim().toLowerCase()}`;
+  return {
+    credentialGroup: `custom-${fnv1a32Hex(basis)}`,
+    credentialKind: "api-key"
+  };
+}
 function summarizeCredentialGroups(agents, now = Date.now()) {
   const groups = /* @__PURE__ */ new Map();
   for (const agent of agents) {
@@ -327,6 +347,15 @@ function resolveFavoriteStatus(record, options) {
   }
   return { isFavorite: false, favoritedAt: null };
 }
+function isOwnedAgentRecord(record, userId) {
+  if (!userId) return false;
+  if (typeof record?.userId === "string" && record.userId === userId || typeof record?.ownerId === "string" && record.ownerId === userId) {
+    return true;
+  }
+  return [record?.dbKey, record?.privateKey].some(
+    (key) => isOwnedAgentKey(key, userId)
+  );
+}
 function toSafeAgentSummary(record, options) {
   const rawId = parseAgentRecordId(
     typeof record?.privateKey === "string" ? record.privateKey : record?.dbKey,
@@ -356,12 +385,13 @@ function toSafeAgentSummary(record, options) {
   const isPublic = record?.isPublic === true || record?.isPublicFlag === true || record?.publicRecordExists === true;
   const updatedAt = safeTimestamp(record?.updatedAt ?? record?.createdAt ?? record?.created);
   const nextAvailableAt = typeof record?.nextAvailableAt === "number" && Number.isFinite(record.nextAvailableAt) ? record.nextAvailableAt : void 0;
+  const rawQuota = record?.quota;
+  const quota = rawQuota && typeof rawQuota === "object" && Array.isArray(rawQuota.windows) && typeof rawQuota.observedAt === "number" && Number.isFinite(rawQuota.observedAt) ? rawQuota : void 0;
   const currentUserId = options?.userId;
-  const isOwnedByRecord = Boolean(currentUserId) && (typeof record?.userId === "string" && record.userId === currentUserId || typeof record?.ownerId === "string" && record.ownerId === currentUserId);
   const ownedKey = currentUserId ? [record?.dbKey, record?.privateKey].find(
     (key) => isOwnedAgentKey(key, currentUserId)
   ) : void 0;
-  const isOwned = isOwnedByRecord || Boolean(ownedKey);
+  const isOwned = isOwnedAgentRecord(record, currentUserId);
   const isOAuth = isOAuthApiKeyRef(record?.apiKeyRef);
   const billingSource = resolveBillingSource({
     ...record,
@@ -418,6 +448,7 @@ function toSafeAgentSummary(record, options) {
     isOwned,
     isOAuth,
     ...nextAvailableAt !== void 0 ? { nextAvailableAt } : {},
+    ...quota !== void 0 ? { quota } : {},
     ...credentialGroup !== void 0 ? { credentialGroup } : {},
     ...credentialKind !== void 0 ? { credentialKind } : {},
     // 「未知 ≠ 独立」：无 credentialGroup 时显式 credentialed:false，调用方
@@ -448,6 +479,8 @@ var COMPACT_AGENT_SUMMARY_FIELDS = [
   // 决策信息（CLI --show-unavailable 场景）；默认列表已把这类 agent 过滤掉，
   // 所以通常根本不占字节。
   "nextAvailableAt",
+  // 额度快照：只有上游真上报过窗口的 agent 才带（通常是小对象）。
+  "quota",
   "credentialGroup",
   "credentialKind",
   "credentialed"
@@ -481,6 +514,7 @@ var UNAVAILABLE_AGENT_SUMMARY_FIELDS = [
   "isOAuth",
   "isOwned",
   "nextAvailableAt",
+  "quota",
   "favoritedAt",
   "updatedAt"
 ];
@@ -500,12 +534,131 @@ function toUnavailableAgentSummary(summary) {
   return item;
 }
 
+// packages/ai/agent/agentDiscovery.ts
+function isPreferredAgent(agent) {
+  return agent.isFavorite === true || agent.isOwned === true || agent.isOAuth === true || agent.billingSource === "user_subscription" || agent.billingSource === "user_api" || agent.billingSource === "local";
+}
+function isPublicDiscoveryAgent(agent) {
+  return agent.isPublic === true && !isPreferredAgent(agent);
+}
+function resolveDiscoveryScope(args) {
+  const rawScope = typeof args?.scope === "string" ? args.scope.trim().toLowerCase() : void 0;
+  const hasScope = rawScope !== void 0 && rawScope !== "";
+  const hasPublicOnly = typeof args?.publicOnly === "boolean";
+  const publicOnly = args?.publicOnly === true;
+  if (hasScope) {
+    if (rawScope !== "preferred" && rawScope !== "public" && rawScope !== "all") {
+      throw new Error(`Invalid scope '${args?.scope}': must be 'preferred', 'public', or 'all'.`);
+    }
+    const scope = rawScope;
+    if (hasPublicOnly) {
+      if (publicOnly && scope !== "public") {
+        throw new Error(
+          `Conflicting arguments: scope='${args?.scope}' conflicts with publicOnly=true.`
+        );
+      }
+      if (!publicOnly && scope === "public") {
+        throw new Error(
+          `Conflicting arguments: scope='${args?.scope}' conflicts with publicOnly=false.`
+        );
+      }
+    }
+    return scope;
+  }
+  if (hasPublicOnly && publicOnly) {
+    return "public";
+  }
+  return "preferred";
+}
+function agentIdentityKeys(agent) {
+  return [agent.agentKey, agent.publicKey, agent.id].filter(
+    (key) => typeof key === "string" && key.length > 0
+  );
+}
+function deduplicateAgentSummaries(agents) {
+  const byIdentity = /* @__PURE__ */ new Map();
+  for (const agent of agents) {
+    const keys = agentIdentityKeys(agent);
+    const existing = keys.map((key) => byIdentity.get(key)).find(Boolean);
+    if (!existing) {
+      for (const key of keys) byIdentity.set(key, agent);
+      continue;
+    }
+    const winner = isPreferredAgent(agent) && !isPreferredAgent(existing) ? agent : existing;
+    for (const key of /* @__PURE__ */ new Set([...agentIdentityKeys(existing), ...keys])) byIdentity.set(key, winner);
+  }
+  return [...new Set(byIdentity.values())];
+}
+function filterAgentsByScope(agents, scope) {
+  const unique = deduplicateAgentSummaries(agents);
+  if (scope === "preferred") return unique.filter((agent) => isPreferredAgent(agent));
+  if (scope === "public") return unique.filter((agent) => isPublicDiscoveryAgent(agent));
+  return unique.filter((agent) => isPreferredAgent(agent) || agent.isPublic === true);
+}
+function matchesAgentQuery(agent, query) {
+  if (!query || typeof query !== "string") return true;
+  const q = query.trim().toLowerCase();
+  if (!q) return true;
+  const candidates = [
+    agent.name,
+    agent.model,
+    agent.provider,
+    agent.handle,
+    agent.agentKey,
+    agent.publicKey,
+    agent.id
+  ];
+  return candidates.some((text) => typeof text === "string" && text.toLowerCase().includes(q));
+}
+function buildAgentDiscoveryResult(options) {
+  const scope = resolveDiscoveryScope({
+    scope: options.scope,
+    publicOnly: options.publicOnly
+  });
+  const now = options.now ?? Date.now();
+  let scopedAgents = filterAgentsByScope(options.agents, scope);
+  if (options.query && typeof options.query === "string" && options.query.trim()) {
+    scopedAgents = scopedAgents.filter((a) => matchesAgentQuery(a, options.query));
+  }
+  const unavailableList = scopedAgents.filter((a) => isAgentUnavailableNow(a, now));
+  const unavailableCount = unavailableList.length;
+  const unavailableAgents = sortSafeAgentSummaries(unavailableList).map(toUnavailableAgentSummary);
+  const credentialGroups = summarizeCredentialGroups(scopedAgents, now);
+  if (options.showUnavailable !== true) {
+    scopedAgents = scopedAgents.filter((a) => !isAgentUnavailableNow(a, now));
+  }
+  const sortedAgents = sortSafeAgentSummaries(scopedAgents);
+  const projectedAgents = options.verbose === true ? sortedAgents.map(omitNullishAgentSummaryFields) : sortedAgents.map(toCompactAgentSummary);
+  return {
+    total: projectedAgents.length,
+    unavailableCount,
+    unavailableAgents,
+    credentialGroups,
+    agents: projectedAgents
+  };
+}
+function toDiscoverySafeAgentSummary(record, options) {
+  const mergedOptions = record?.publicRecordExists === true ? { ...options, publicRecordExists: true } : options;
+  return toSafeAgentSummary(record, mergedOptions);
+}
+function assembleAgentDiscoveryResult(options) {
+  const { records, summaryOptions, ...discoveryOptions } = options;
+  const agents = records.map(
+    (record) => toDiscoverySafeAgentSummary(
+      record,
+      typeof summaryOptions === "function" ? summaryOptions(record) : summaryOptions
+    )
+  );
+  return buildAgentDiscoveryResult({ ...discoveryOptions, agents });
+}
+
 export {
   deriveCredentialGroup,
+  deriveCustomProviderCredentialGroup,
   summarizeCredentialGroups,
-  toSafeAgentSummary,
-  sortSafeAgentSummaries,
-  omitNullishAgentSummaryFields,
-  toCompactAgentSummary,
-  toUnavailableAgentSummary
+  resolveDiscoveryScope,
+  matchesAgentQuery,
+  buildAgentDiscoveryResult,
+  toDiscoverySafeAgentSummary,
+  assembleAgentDiscoveryResult
 };

package/{chunk-GPCZ7UXG.js → chunk-AZRHIN5B.js}

@@ -1,7 +1,7 @@
 import {
   generatePkcePair,
   startCallbackServer
-} from "./chunk-53HEEOTT.js";
+} from "./chunk-O26PCYLS.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";

package/chunk-BMQ2MJUK.js

@@ -0,0 +1,153 @@
+import {
+  isRecord
+} from "./chunk-KUG52IAP.js";
+
+// packages/core/chat/validationUrl.ts
+function safeUrl(raw) {
+  if (typeof raw !== "string") return void 0;
+  const trimmed = raw.trim();
+  if (!/^https?:\/\//i.test(trimmed)) return void 0;
+  try {
+    const parsed = new URL(trimmed);
+    if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
+      return void 0;
+    }
+    return parsed.href;
+  } catch {
+    return void 0;
+  }
+}
+function scanValidationDetails(details) {
+  if (!Array.isArray(details)) return {};
+  let url;
+  let text;
+  let learnMoreUrl;
+  for (const detail of details) {
+    if (url && learnMoreUrl) break;
+    if (!isRecord(detail)) continue;
+    const metadata = isRecord(detail.metadata) ? detail.metadata : void 0;
+    if (metadata) {
+      url = url ?? safeUrl(metadata.validation_url);
+      text = text ?? (typeof metadata.validation_url_link_text === "string" ? metadata.validation_url_link_text : void 0);
+      learnMoreUrl = learnMoreUrl ?? safeUrl(metadata.validation_learn_more_url);
+    }
+    const links = Array.isArray(detail.links) ? detail.links : [];
+    for (const link of links) {
+      if (!isRecord(link)) continue;
+      const linkUrl = safeUrl(link.url);
+      if (!linkUrl) continue;
+      const desc = typeof link.description === "string" ? link.description : "";
+      if (!url && /verify|continue/i.test(desc)) {
+        url = linkUrl;
+        text = text ?? desc;
+      } else if (!learnMoreUrl && /learn more/i.test(desc)) {
+        learnMoreUrl = linkUrl;
+      }
+    }
+  }
+  return { url, text, learnMoreUrl };
+}
+function unescapeJsonString(text) {
+  return text.replace(
+    /\\(["\\/nrtbf]|u[0-9a-fA-F]{4})/g,
+    (_match, esc) => {
+      switch (esc[0]) {
+        case "n":
+          return "\n";
+        case "r":
+          return "\r";
+        case "t":
+          return "	";
+        case "b":
+          return "\b";
+        case "f":
+          return "\f";
+        case "u":
+          return String.fromCharCode(parseInt(esc.slice(1), 16));
+        default:
+          return esc;
+      }
+    }
+  );
+}
+function sliceBalancedJsonObject(text) {
+  const start = text.indexOf("{");
+  if (start < 0) return void 0;
+  let depth = 0;
+  let inString = false;
+  let escaped = false;
+  for (let i = start; i < text.length; i += 1) {
+    const ch = text[i];
+    if (inString) {
+      if (escaped) escaped = false;
+      else if (ch === "\\") escaped = true;
+      else if (ch === '"') inString = false;
+      continue;
+    }
+    if (ch === '"') inString = true;
+    else if (ch === "{") depth += 1;
+    else if (ch === "}") {
+      depth -= 1;
+      if (depth === 0) return text.slice(start, i + 1);
+    }
+  }
+  return void 0;
+}
+function parseBalancedJson(text) {
+  const slice = sliceBalancedJsonObject(text);
+  if (!slice) return void 0;
+  try {
+    return JSON.parse(slice);
+  } catch {
+    return void 0;
+  }
+}
+function findValidationInParsed(parsed, depth = 0) {
+  if (depth > 3 || !isRecord(parsed)) return {};
+  const err = isRecord(parsed.error) ? parsed.error : parsed;
+  const fromDetails = scanValidationDetails(isRecord(err) ? err.details : void 0);
+  if (fromDetails.url) return fromDetails;
+  const nested = isRecord(err) ? err.message : void 0;
+  if (typeof nested === "string" && nested.trim().startsWith("{")) {
+    try {
+      const reparsed = findValidationInParsed(JSON.parse(nested), depth + 1);
+      if (reparsed.url) return reparsed;
+    } catch {
+    }
+  }
+  return {};
+}
+function stripTerminalControlChars(raw) {
+  return raw.replace(/[\u0000-\u001f\u007f]/g, "");
+}
+function regexValidationFallback(text) {
+  const urlMatch = text.match(
+    /validation_url[^h]{0,10}(https?:\/\/[^\s"\\]+)/i
+  );
+  if (!urlMatch) return {};
+  const textMatch = text.match(
+    /validation_url_link_text[^A-Za-z]{0,10}([^"\\\n]{1,60})/i
+  );
+  return {
+    // safeUrl first (normalizes C0 into %XX); fall back to stripping controls
+    // so a truncated-but-real link is still emitted rather than dropped.
+    url: safeUrl(urlMatch[1]) ?? stripTerminalControlChars(urlMatch[1]),
+    text: textMatch?.[1] ? stripTerminalControlChars(textMatch[1].trim()) || void 0 : void 0
+  };
+}
+function extractGoogleValidationLink(errorText) {
+  for (const candidate of [
+    parseBalancedJson(errorText),
+    parseBalancedJson(unescapeJsonString(errorText))
+  ]) {
+    if (candidate === void 0) continue;
+    const found = findValidationInParsed(candidate);
+    if (found.url) return found;
+  }
+  return regexValidationFallback(errorText);
+}
+
+export {
+  scanValidationDetails,
+  extractGoogleValidationLink
+};