nolo-cli 0.149.0-alpha.1 → 0.151.0-alpha.3

package/chunk-VHGD6FHV.js

@@ -0,0 +1,116 @@
+// packages/cli/tui/ciStatus.ts
+import { execFile } from "node:child_process";
+var DEFAULT_SSH_HOST = "alpha-raw";
+var DEFAULT_CI_PORT = "3900";
+function resolveSshTarget() {
+  const alias = process.env.NOLO_ALPHA_SSH_CONFIG_HOST?.trim();
+  if (alias) return alias;
+  const raw = process.env.NOLO_ALPHA_RAW_HOST?.trim();
+  if (raw) {
+    const user = process.env.NOLO_ALPHA_SSH_USER?.trim() || "root";
+    return `${user}@${raw}`;
+  }
+  return DEFAULT_SSH_HOST;
+}
+function asRecord(value) {
+  return typeof value === "object" && value !== null ? value : void 0;
+}
+function asString(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : void 0;
+}
+function extractFailedPhase(raw) {
+  if (!Array.isArray(raw)) return void 0;
+  for (const entry of raw) {
+    const timing = asRecord(entry);
+    if (!timing) continue;
+    const status = timing.status;
+    const phase = asString(timing.phase);
+    if (phase && typeof status === "number" && status !== 0) return phase;
+  }
+  return void 0;
+}
+function toCiJob(value) {
+  const record = asRecord(value);
+  if (!record) return void 0;
+  const jobId = asString(record.jobId);
+  const status = asString(record.status);
+  if (!jobId || !status) return void 0;
+  const durationMs = typeof record.durationMs === "number" ? record.durationMs : void 0;
+  return {
+    jobId,
+    kind: asString(record.kind) ?? "unknown",
+    status,
+    shortSha: asString(record.shortSha) ?? asString(record.sha) ?? "",
+    startedAt: asString(record.startedAt),
+    durationMs,
+    failedPhase: extractFailedPhase(record.phaseTimings)
+  };
+}
+function parseCiStatusPayload(raw) {
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return void 0;
+  }
+  const root = asRecord(parsed);
+  if (!root) return void 0;
+  const jobs = root.jobs;
+  if (Array.isArray(jobs)) {
+    return jobs.map(toCiJob).filter((job) => job !== void 0);
+  }
+  const single = toCiJob(parsed);
+  return single ? [single] : void 0;
+}
+function buildRemoteCommand(limit) {
+  const rawPort = process.env.NOLO_CI_PORT?.trim() ?? "";
+  const port = /^\d{1,5}$/.test(rawPort) && Number(rawPort) > 0 && Number(rawPort) <= 65535 ? rawPort : DEFAULT_CI_PORT;
+  const safeLimit = Math.max(1, Math.min(20, Math.trunc(limit) || 5));
+  return `curl -s -m 3 "http://127.0.0.1:${port}/status?limit=${safeLimit}"`;
+}
+function fetchCiStatus(limit = 5, timeoutMs = 4e3) {
+  return new Promise((resolve) => {
+    let settled = false;
+    let guard;
+    const finish = (value) => {
+      if (settled) return;
+      settled = true;
+      if (guard) clearTimeout(guard);
+      resolve(value);
+    };
+    guard = setTimeout(() => finish(void 0), timeoutMs + 500);
+    guard.unref?.();
+    try {
+      execFile(
+        "ssh",
+        ["-o", "BatchMode=yes", "-o", `ConnectTimeout=3`, resolveSshTarget(), buildRemoteCommand(limit)],
+        { timeout: timeoutMs, encoding: "utf8", maxBuffer: 1024 * 1024 },
+        (error, stdout) => {
+          if (error) {
+            finish(void 0);
+            return;
+          }
+          finish(parseCiStatusPayload(stdout ?? ""));
+        }
+      );
+    } catch {
+      finish(void 0);
+    }
+  });
+}
+function summarizeLatest(jobs) {
+  const latest = jobs?.[0];
+  if (!latest) return void 0;
+  const sha = latest.shortSha ? latest.shortSha.slice(0, 7) : "???????";
+  if (latest.status === "running") return `ci:${sha} \u2026`;
+  if (latest.status === "succeeded") return `ci:${sha} \u2713`;
+  if (latest.status === "failed" || latest.status === "orphaned") {
+    return `ci:${sha} \u2717${latest.failedPhase ? ` ${latest.failedPhase}` : ""}`;
+  }
+  return `ci:${sha} ${latest.status}`;
+}
+
+export {
+  fetchCiStatus,
+  summarizeLatest
+};

package/chunk-VIWDGTDA.js

@@ -0,0 +1,8 @@
+// packages/agent-runtime/cursor/isCursorOAuthAgent.ts
+function isCursorOAuthAgent(agent) {
+  return agent.apiKeyRef?.trim().toLowerCase() === "cursor";
+}
+
+export {
+  isCursorOAuthAgent
+};

package/{chunk-GOH6RW6F.js → chunk-VJXHL6MH.js}

@@ -1,13 +1,16 @@
 import {
   listUserRecordsFromServers,
   readLiveDbRecordAfterTombstoneMerge
-} from "./chunk-XISEYOGH.js";
+} from "./chunk-USHQX6VT.js";
 import {
   agentRecordHasConfiguredCredential
-} from "./chunk-ALGORS6Y.js";
+} from "./chunk-ZF6526IQ.js";
 import {
   deriveCredentialGroup
-} from "./chunk-DY7ANLKG.js";
+} from "./chunk-JKMLSTZK.js";
+import {
+  isTombstoneRecord
+} from "./chunk-D2MDMY2M.js";
 import {
   PUBLIC_AGENT_KEY_PREFIX,
   isOwnedAgentKey,
@@ -30,6 +33,7 @@ function buildCompanionKeys(rawId, userId) {
   };
 }
 function normalizeListedAgent(record) {
+  if (isTombstoneRecord(record)) return null;
   const privateKey = typeof record?.dbKey === "string" ? record.dbKey : "";
   const explicitId = typeof record?.id === "string" && record.id ? record.id : void 0;
   const ownerUserId = typeof record?.userId === "string" ? record.userId : "";
@@ -52,6 +56,9 @@ function normalizeListedAgent(record) {
     ...typeof record?.handle === "string" && record.handle ? { handle: record.handle } : {},
     ...typeof record?.introduction === "string" && record.introduction ? { introduction: record.introduction } : typeof record?.description === "string" && record.description ? { introduction: record.description } : {},
     ...typeof record?.provider === "string" && record.provider ? { provider: record.provider } : {},
+    // 仅供 resolveBillingSource 判定订阅端点（Step Plan / OpenCode Go 等），
+    // safe 投影不输出它。缺了它本地 agent list 会把订阅端点全报成 user_api。
+    ...typeof record?.customProviderUrl === "string" && record.customProviderUrl ? { customProviderUrl: record.customProviderUrl } : {},
     ...typeof record?.inputPrice === "number" && Number.isFinite(record.inputPrice) ? { inputPrice: record.inputPrice } : {},
     ...typeof record?.outputPrice === "number" && Number.isFinite(record.outputPrice) ? { outputPrice: record.outputPrice } : {},
     updatedAt: typeof record?.updatedAt === "string" || typeof record?.updatedAt === "number" ? record.updatedAt : typeof record?.createdAt === "string" || typeof record?.createdAt === "number" ? record.createdAt : typeof record?.created === "string" || typeof record?.created === "number" ? record.created : null,
@@ -104,6 +111,7 @@ async function listLocalCachedAgents(args) {
   for (const prefix of [ownedPrefix, PUBLIC_AGENT_KEY_PREFIX]) {
     for await (const [key, value] of args.db.iterator({ gte: prefix, lte: `${prefix}\uFFFF` })) {
       if (typeof key !== "string" || !value || typeof value !== "object") continue;
+      if (isTombstoneRecord(value)) continue;
       if (isOwnedAgentKey(key, args.userId)) {
         privateRecords.set(key, { ...value, dbKey: key });
         continue;
@@ -187,8 +195,11 @@ async function listFavoriteAgentIdsAcrossServers(args) {
           },
           body: JSON.stringify({ targetType: "agent" })
         });
-        if (!res.ok) return;
-        const data = await res.json().catch(() => ({}));
+        if (!res.ok) throw new Error("favorites request failed");
+        const data = await res.json();
+        if (!Array.isArray(data?.items) && !Array.isArray(data?.ids)) {
+          throw new Error("invalid favorites response");
+        }
         const items = Array.isArray(data?.items) ? data.items : [];
         for (const item of items) {
           const id = typeof item?.id === "string" ? item.id : "";
@@ -206,6 +217,7 @@ async function listFavoriteAgentIdsAcrossServers(args) {
           }
         }
       } catch {
+        args.onFailure?.(serverUrl);
       }
     })
   );
@@ -258,9 +270,11 @@ function findTightestQuotaWindow(quota, now = Date.now()) {
   return best ?? quota.windows[0];
 }
 function formatQuotaSummary(quota, now = Date.now(), options) {
-  const tightest = findTightestQuotaWindow(quota, now);
-  if (!tightest) return void 0;
   const compact = options?.compact === true;
+  const planText = formatPlanLabel(quota?.plan);
+  const planName = typeof quota?.plan?.name === "string" ? quota.plan.name.trim() : "";
+  const tightest = findTightestQuotaWindow(quota, now);
+  if (!tightest) return compact ? planName || void 0 : planText;
   const parts = [];
   if (typeof tightest.utilization === "number") {
     const pct = Math.round(tightest.utilization * 100);
@@ -272,7 +286,10 @@ function formatQuotaSummary(quota, now = Date.now(), options) {
       parts.push(`\u4F59${tightest.remaining}${tightest.unit ? ` ${tightest.unit}` : ""}`);
     }
   }
-  if (compact) return parts.length > 0 ? parts[0] : void 0;
+  if (compact) {
+    const head = parts.length > 0 ? parts[0] : void 0;
+    return [planName || void 0, head].filter(Boolean).join(" \xB7 ") || void 0;
+  }
   if (tightest.scope && tightest.scope !== "user" && tightest.scope !== "project" && tightest.scope !== tightest.unit) {
     parts.push(tightest.scope);
   }
@@ -290,9 +307,15 @@ function formatQuotaSummary(quota, now = Date.now(), options) {
       parts.push(`${days}d\u540E\u91CD\u7F6E`);
     }
   }
-  if (parts.length === 0) return void 0;
-  if (parts.length === 1 && parts[0] === tightest.scope) return void 0;
-  return parts.join(" \xB7 ");
+  const onlyScope = parts.length === 0 || parts.length === 1 && parts[0] === tightest.scope;
+  if (onlyScope) return planText;
+  return [planText, ...parts].filter(Boolean).join(" \xB7 ");
+}
+function formatPlanLabel(plan) {
+  const name = typeof plan?.name === "string" ? plan.name.trim() : "";
+  if (!name) return void 0;
+  const credits = typeof plan?.monthlyCreditsUsd === "number" && Number.isFinite(plan.monthlyCreditsUsd) && plan.monthlyCreditsUsd > 0 ? `\u6708\u5EA6\u989D\u5EA6 $${plan.monthlyCreditsUsd}` : void 0;
+  return [`${name} \u5957\u9910`, credits].filter(Boolean).join(" \xB7 ");
 }
 
 export {