nolo-cli 0.98.0-alpha.4 → 0.98.1

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

@@ -3,21 +3,28 @@ import {
 } from "./chunk-YYLHWIW6.js";
 import {
   compareAgentSelection
-} from "./chunk-IIVGDG4I.js";
+} from "./chunk-4YSOUKUR.js";
+import {
+  isAgentUnavailableNow
+} from "./chunk-H6A6X4EK.js";
+import {
+  isSubscriptionEndpoint,
+  isSubscriptionOAuthCredential
+} from "./chunk-EKPKW6RM.js";
 import {
   isAntigravityOAuthAgent
-} from "./chunk-UZGQNTVW.js";
+} from "./chunk-UA324D4O.js";
 import {
   getModelAbility
-} from "./chunk-ACTMNVHM.js";
+} from "./chunk-CYSYR67N.js";
+import {
+  fnv1a32Hex
+} from "./chunk-UJXNKP5V.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-UZGQNTVW.js → chunk-UA324D4O.js}

@@ -1,15 +1,15 @@
 import {
   trimTrailingSlash
-} from "./chunk-6OZ36FXI.js";
+} from "./chunk-27ONFIEY.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
-import {
-  asOptionalFiniteNumber
-} from "./chunk-WWC7I6TA.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
+import {
+  asOptionalFiniteNumber
+} from "./chunk-WWC7I6TA.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -41,7 +41,7 @@ var ANTIGRAVITY_CLOUD_CODE_BASE_URL = "https://daily-cloudcode-pa.googleapis.com
 var ANTIGRAVITY_CLOUD_CODE_HOST = "cloudcode-pa.googleapis.com";
 var ANTIGRAVITY_LEGACY_GENERIC_BASE_RE = /^https?:\/\/cloudcode-pa\.googleapis\.com$/i;
 function getAntigravityUserAgent() {
-  const version = process.env.NOLO_ANTIGRAVITY_VERSION || "2.1.4";
+  const version = process.env.NOLO_ANTIGRAVITY_VERSION || "2.18.1";
   const os = process.platform === "win32" ? "windows" : process.platform;
   const arch = process.arch === "x64" ? "amd64" : process.arch === "ia32" ? "386" : process.arch;
   return `antigravity/hub/${version} ${os}/${arch}`;
@@ -129,7 +129,9 @@ async function refreshAntigravityToken(credential, deps = {}) {
     payload = {};
   }
   if (!response.ok) {
-    const detail = typeof payload.error_description === "string" && payload.error_description.trim() ? payload.error_description.trim() : typeof payload.error === "string" && payload.error.trim() ? payload.error.trim() : rawBodyText.trim() || `HTTP ${response.status}`;
+    const errorCode = typeof payload.error === "string" && payload.error.trim() ? payload.error.trim() : void 0;
+    const errorDescription = typeof payload.error_description === "string" && payload.error_description.trim() ? payload.error_description.trim() : void 0;
+    const detail = (errorCode && errorDescription && errorDescription !== errorCode ? `${errorCode}: ${errorDescription}` : errorCode ?? errorDescription ?? rawBodyText.trim()) || `HTTP ${response.status}`;
     throw new Error(`Antigravity token refresh failed: ${detail}`);
   }
   if (typeof payload.access_token !== "string" || !payload.access_token.trim()) {

package/{chunk-V7BKTIF6.js → chunk-UFUTWXPR.js}

@@ -1,26 +1,25 @@
 import {
   createCliLocalRuntimeAdapter,
   summarizeEndpoint
-} from "./chunk-AJ3A3445.js";
+} from "./chunk-M6NBAHCD.js";
 import {
   clipMultilineText
-} from "./chunk-G4EBXCWF.js";
+} from "./chunk-IM6ZMFRL.js";
 import {
   runLocalAgentTurn
-} from "./chunk-6VFARHZW.js";
+} from "./chunk-KQQMCLDJ.js";
 import {
   applyToolSurfaceConstraints
-} from "./chunk-IIVGDG4I.js";
+} from "./chunk-4YSOUKUR.js";
 import {
   resolveLocalRuntimeEnvFromPolicy
-} from "./chunk-HVURBGF3.js";
+} from "./chunk-XFUBXRVI.js";
+import {
+  asRecordOrEmpty
+} from "./chunk-KX6YBIHG.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
-import {
-  readPipeText,
-  spawnProcess
-} from "./chunk-X7HHHIOZ.js";
 import {
   parseUserIdFromAuthToken
 } from "./chunk-A7GB5UGH.js";
@@ -28,11 +27,9 @@ import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
 import {
-  asRecordOrEmpty
-} from "./chunk-KX6YBIHG.js";
-import {
-  asTrimmedNonEmptyStringArray
-} from "./chunk-VMFTFOWF.js";
+  readPipeText,
+  spawnProcess
+} from "./chunk-Y6ROFCZO.js";
 import {
   ownedAgentKey
 } from "./chunk-M2EJHDJP.js";
@@ -40,11 +37,14 @@ import {
   isRecord
 } from "./chunk-KUG52IAP.js";
 import {
-  asTrimmedString
-} from "./chunk-3EUW3WEO.js";
+  asTrimmedNonEmptyStringArray
+} from "./chunk-3AH7LNUB.js";
 import {
   asOptionalPositiveFiniteNumber
 } from "./chunk-U6VC4MU4.js";
+import {
+  asTrimmedString
+} from "./chunk-3EUW3WEO.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -781,7 +781,9 @@ async function runChatgptWebImageLocalJob(input, deps = {}) {
     });
     assertOutputImage(outPath);
     const userAuthToken = input.userAuthToken?.trim() || "";
-    const userId = parseUserIdFromAuthToken(userAuthToken) || "default";
+    if (!userAuthToken) throw new Error("Cannot upload generated image without a user authentication token.");
+    const userId = parseUserIdFromAuthToken(userAuthToken);
+    if (!userId) throw new Error("Cannot determine authenticated user from the user authentication token.");
     const serverBase = (input.serverBase?.trim() || DEFAULT_NOLO_SERVER_URL).replace(/\/+$/, "");
     const uploaded = await uploadPngToNoloFs({
       outPath,