nolo-cli 0.10.0 → 0.12.0-alpha.1

package/{agentListCommands-UWVBT3LH.js → agentListCommands-ZFMS5ZLY.js}

@@ -1,74 +1,91 @@
 import {
   decorateAgentsWithPublicStatusAcrossServers,
+  listFavoriteAgentIdsAcrossServers,
   listLocalCachedAgents,
   listRemoteAgents,
   listRemoteAgentsAcrossServers,
-  parseAgentListArgs
-} from "./chunk-CL3IOKGK.js";
+  normalizeListedAgent,
+  parseAgentListArgs,
+  toSafeListedAgentSummary
+} from "./chunk-DE5BA4O6.js";
 import {
   buildSpaceLookup,
   getSpaceContentKeys
-} from "./chunk-4CQLVGRV.js";
+} from "./chunk-ID4G2MAR.js";
 import {
   readLiveDbRecordAfterTombstoneMerge
-} from "./chunk-WPE4F4Z6.js";
+} from "./chunk-OPKKB25T.js";
 import {
   getReadableCliDb
 } from "./chunk-W4NVOSFF.js";
 import {
   queryUserRecords,
   readDbRecord
-} from "./chunk-OR2XR25C.js";
-import "./chunk-CDTLMEB3.js";
+} from "./chunk-QCA3EPYK.js";
+import "./chunk-RNQ5BLR2.js";
 import "./chunk-VHBWHNVT.js";
-import "./chunk-KQHGZWSV.js";
-import "./chunk-IDZTNRP2.js";
 import {
-  parseUserIdFromAuthToken,
-  readOption,
-  resolveAuthToken,
-  resolveServerCandidates,
-  resolveServerUrl
-} from "./chunk-ISNCLGUZ.js";
-import "./chunk-OLZBQWZU.js";
-import "./chunk-6KUOUWMP.js";
-import "./chunk-5KLGBAAR.js";
+  sortSafeAgentSummaries,
+  toSafeAgentSummary
+} from "./chunk-OOIN7HSO.js";
+import "./chunk-KQHGZWSV.js";
+import "./chunk-DRMGJFGQ.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-TILFE6LV.js";
-import "./chunk-6SLCD4RB.js";
+import "./chunk-ZR4VHQ5D.js";
+import "./chunk-NCGFB7NN.js";
+import "./chunk-4BTHUYMY.js";
 import "./chunk-OPZYGHUC.js";
-import "./chunk-PAKN26FP.js";
-import "./chunk-JRKKFRAV.js";
-import "./chunk-AUQ747NZ.js";
-import "./chunk-5MMAK75Q.js";
-import "./chunk-BBYVOSU2.js";
-import "./chunk-5CS33IBL.js";
+import "./chunk-6OVCRC72.js";
+import "./chunk-TSKWE74T.js";
+import "./chunk-43UD5ZP7.js";
+import "./chunk-S73OEOHH.js";
+import "./chunk-S3UTETIC.js";
+import "./chunk-PDL2AV3E.js";
 import "./chunk-JZPBVBIY.js";
-import "./chunk-IWX4UW2E.js";
-import "./chunk-DWLEOOGR.js";
+import "./chunk-BYXBJQAS.js";
+import "./chunk-QLUFR47U.js";
+import "./chunk-KKY4B2Q2.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
+import "./chunk-DWLEOOGR.js";
+import "./chunk-IDZTNRP2.js";
+import "./chunk-IKXL2HZ3.js";
+import "./chunk-524BDL33.js";
 import "./chunk-KX6YBIHG.js";
+import "./chunk-3HHTVM6G.js";
+import "./chunk-NITP2JDG.js";
+import "./chunk-WPHL6ALY.js";
 import "./chunk-O4BU24WZ.js";
 import "./chunk-I42VC5KR.js";
 import "./chunk-WWC7I6TA.js";
 import "./chunk-QSJ3HFEF.js";
+import "./chunk-XHQWJUW4.js";
+import "./chunk-TSUJOM6N.js";
+import "./chunk-OOSFSFMA.js";
 import "./chunk-GBRG75BQ.js";
-import "./chunk-4SN6J65J.js";
-import "./chunk-LCBAMY2M.js";
+import "./chunk-KUG52IAP.js";
 import "./chunk-3EUW3WEO.js";
 import "./chunk-U6VC4MU4.js";
+import {
+  parseUserIdFromAuthToken,
+  readOption,
+  resolveAuthToken,
+  resolveServerCandidates,
+  resolveServerUrl
+} from "./chunk-5NBHQD4D.js";
+import "./chunk-OLZBQWZU.js";
+import "./chunk-LCBAMY2M.js";
+import "./chunk-4SN6J65J.js";
 import "./chunk-CF7PE763.js";
 import "./chunk-G3SUCT4W.js";
-import "./chunk-KUG52IAP.js";
 import "./chunk-4VNS5WPM.js";
 
 // packages/cli/agentListCommands.ts
 async function runAgentListCommand(args, deps = {}) {
   const env = deps.env ?? process.env;
   const output = deps.output ?? process.stdout;
-  const { wantJson, publicOnly, idsOnly } = parseAgentListArgs(args);
+  const { wantJson, wantSafe, publicOnly, idsOnly } = parseAgentListArgs(args);
   const spaceInput = readOption(args, "--space") ?? readOption(args, "--space-id");
   const authToken = resolveAuthToken(args, env);
   if (!authToken) {
@@ -119,6 +136,7 @@ async function runAgentListCommand(args, deps = {}) {
     }
     agents = agents.filter((agent) => agent.privateKey.startsWith("agent-"));
     let resolvedSpaceId = null;
+    let spaceContentKeys = null;
     if (spaceInput) {
       const { spaceId, spaceKey } = buildSpaceLookup(spaceInput);
       resolvedSpaceId = spaceId;
@@ -131,9 +149,10 @@ async function runAgentListCommand(args, deps = {}) {
       });
       serverFailures = [...serverFailures, ...spaceRead.failures];
       const spaceRecord = spaceRead.record;
-      const spaceContentKeys = getSpaceContentKeys(spaceRecord);
+      const currentSpaceContentKeys = getSpaceContentKeys(spaceRecord);
+      spaceContentKeys = currentSpaceContentKeys;
       agents = agents.filter(
-        (agent) => spaceContentKeys.has(agent.privateKey) || spaceContentKeys.has(agent.publicKey) || spaceContentKeys.has(agent.id)
+        (agent) => currentSpaceContentKeys.has(agent.privateKey) || currentSpaceContentKeys.has(agent.publicKey) || currentSpaceContentKeys.has(agent.id)
       );
     }
     if (source === "global-cache") {
@@ -153,6 +172,81 @@ async function runAgentListCommand(args, deps = {}) {
 `);
       return 0;
     }
+    if (wantSafe) {
+      const favoritesMap = await listFavoriteAgentIdsAcrossServers({
+        authToken,
+        fetchImpl,
+        serverUrls
+      }).catch(() => ({}));
+      const existingKeys = /* @__PURE__ */ new Set();
+      for (const agent of agents) {
+        existingKeys.add(agent.privateKey);
+        existingKeys.add(agent.publicKey);
+        existingKeys.add(agent.id);
+      }
+      const extraFavoriteRecords = [];
+      const hydratedFavoriteAgents = [];
+      for (const favKey of Object.keys(favoritesMap)) {
+        if (existingKeys.has(favKey)) continue;
+        try {
+          const favRead = await readLiveDbRecordAfterTombstoneMerge({
+            authToken,
+            dbKey: favKey,
+            fallbackFetchImpl,
+            fetchImpl,
+            serverUrls
+          });
+          const record = favRead.record;
+          if (!record || record.type && record.type !== "agent") continue;
+          const norm = normalizeListedAgent(record);
+          const candidateKeys = [record.dbKey, record.publicKey, record.id].filter((key) => typeof key === "string" && key.length > 0);
+          if (spaceContentKeys && !candidateKeys.some((key) => spaceContentKeys?.has(key))) {
+            continue;
+          }
+          if (norm) {
+            agents.push(norm);
+            hydratedFavoriteAgents.push(norm);
+            existingKeys.add(norm.privateKey);
+            existingKeys.add(norm.publicKey);
+            existingKeys.add(norm.id);
+          } else {
+            extraFavoriteRecords.push(record);
+            for (const key of candidateKeys) existingKeys.add(key);
+          }
+        } catch {
+        }
+      }
+      if (source === "global-cache" && hydratedFavoriteAgents.length > 0) {
+        await decorateAgentsWithPublicStatusAcrossServers({
+          agents: hydratedFavoriteAgents,
+          authToken,
+          fallbackFetchImpl,
+          fetchImpl,
+          serverUrls
+        });
+      }
+      let safeAgents = agents.map(
+        (agent) => toSafeListedAgentSummary(agent, { favoritesMap, userId })
+      );
+      safeAgents.push(
+        ...extraFavoriteRecords.map(
+          (record) => toSafeAgentSummary(record, { favoritesMap, userId })
+        )
+      );
+      if (publicOnly) {
+        safeAgents = safeAgents.filter((agent) => agent.isPublic);
+      }
+      safeAgents = sortSafeAgentSummaries(safeAgents);
+      output.write(JSON.stringify({
+        success: true,
+        userId,
+        ...resolvedSpaceId ? { spaceId: resolvedSpaceId } : {},
+        total: safeAgents.length,
+        agents: safeAgents
+      }, null, 2));
+      output.write("\n");
+      return 0;
+    }
     if (wantJson) {
       output.write(JSON.stringify({
         userId,
@@ -201,8 +295,11 @@ async function runAgentListCommand(args, deps = {}) {
           `type=${agent.type ?? "-"}`,
           `model=${agent.model}`,
           `updatedAt=${agent.updatedAt ?? "-"}`,
-          `privateKey=${agent.privateKey}`,
-          `publicKey=${agent.publicKey}${flagMismatch}`,
+          // 不输出 privateKey（dbKey 属敏感标识，与 web 端 listAgentsFunc 降权
+          // 对齐；需要完整记录请用 --json）。
+          // 私有 agent（publicRecordExists=false）的公开记录不存在，输出 "-" 而非
+          // 一个库里不存在的 agent-pub-<id>，避免误导调用方拿它去 readAgent。
+          `publicKey=${agent.publicRecordExists ? agent.publicKey : "-"}${flagMismatch}`,
           `tools=${agent.tools.join(", ") || "-"}`,
           credentialLine
         ].join("\n")

package/{agentMachineCommands-WOKMUG2Y.js → agentMachineCommands-ZJLYVV52.js}

@@ -1,6 +1,6 @@
 import {
   resolveConnectorWebSocketTarget
-} from "./chunk-AVMKZHBC.js";
+} from "./chunk-RSEUHW6T.js";
 import {
   getReadableCliDb
 } from "./chunk-W4NVOSFF.js";
@@ -8,63 +8,74 @@ import {
   readAgentRecord,
   resolveAgentRecordFromHybridStore,
   writeAgentRecord
-} from "./chunk-OR2XR25C.js";
-import "./chunk-CDTLMEB3.js";
+} from "./chunk-QCA3EPYK.js";
+import "./chunk-RNQ5BLR2.js";
 import {
   resolveCliAgentKeyInput
 } from "./chunk-VHBWHNVT.js";
-import "./chunk-GAKEBQD6.js";
-import "./chunk-IDZTNRP2.js";
-import {
-  parseUserIdFromAuthToken,
-  readOption,
-  resolveAuthToken,
-  resolveServerUrl
-} from "./chunk-ISNCLGUZ.js";
-import "./chunk-OLZBQWZU.js";
-import "./chunk-6KUOUWMP.js";
-import "./chunk-5KLGBAAR.js";
+import "./chunk-YDCZVUFP.js";
+import "./chunk-DRMGJFGQ.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-TILFE6LV.js";
-import "./chunk-6SLCD4RB.js";
+import "./chunk-ZR4VHQ5D.js";
+import "./chunk-NCGFB7NN.js";
+import "./chunk-4BTHUYMY.js";
 import "./chunk-OPZYGHUC.js";
-import "./chunk-PAKN26FP.js";
-import "./chunk-JRKKFRAV.js";
-import "./chunk-AUQ747NZ.js";
-import "./chunk-5MMAK75Q.js";
-import "./chunk-BBYVOSU2.js";
-import "./chunk-5CS33IBL.js";
+import "./chunk-6OVCRC72.js";
+import "./chunk-TSKWE74T.js";
+import "./chunk-43UD5ZP7.js";
+import "./chunk-S73OEOHH.js";
+import "./chunk-S3UTETIC.js";
+import "./chunk-PDL2AV3E.js";
 import "./chunk-JZPBVBIY.js";
-import "./chunk-IWX4UW2E.js";
-import "./chunk-DWLEOOGR.js";
+import "./chunk-BYXBJQAS.js";
+import "./chunk-QLUFR47U.js";
+import "./chunk-KKY4B2Q2.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
+import "./chunk-DWLEOOGR.js";
+import "./chunk-IDZTNRP2.js";
+import "./chunk-IKXL2HZ3.js";
+import "./chunk-524BDL33.js";
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
+import "./chunk-3HHTVM6G.js";
+import "./chunk-NITP2JDG.js";
+import "./chunk-WPHL6ALY.js";
 import "./chunk-O4BU24WZ.js";
 import "./chunk-I42VC5KR.js";
 import "./chunk-WWC7I6TA.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
-import "./chunk-4SN6J65J.js";
-import "./chunk-LCBAMY2M.js";
+import "./chunk-XHQWJUW4.js";
+import "./chunk-TSUJOM6N.js";
+import "./chunk-OOSFSFMA.js";
+import "./chunk-GBRG75BQ.js";
+import "./chunk-KUG52IAP.js";
 import "./chunk-3EUW3WEO.js";
 import "./chunk-U6VC4MU4.js";
+import {
+  parseUserIdFromAuthToken,
+  readOption,
+  resolveAuthToken,
+  resolveServerUrl
+} from "./chunk-5NBHQD4D.js";
+import "./chunk-OLZBQWZU.js";
+import "./chunk-LCBAMY2M.js";
+import "./chunk-4SN6J65J.js";
 import "./chunk-CF7PE763.js";
 import "./chunk-G3SUCT4W.js";
-import "./chunk-KUG52IAP.js";
 import "./chunk-4VNS5WPM.js";
 
 // packages/cli/agentMachineCommands.ts
 async function defaultExecuteCli(provider, prompt, options) {
-  const { executeCli } = await import("./cliExecutor-DNE7TCC4.js");
+  const { executeCli } = await import("./cliExecutor-K3F7DMRO.js");
   return executeCli(provider, prompt, options);
 }
 async function forwardConnectorRunMessage(machine, message, pushMessage, executeCli, env, fetchImpl) {
-  const { handleConnectorRunMessage } = await import("./machineWsRunDispatch-PIOIQRBW.js");
+  const { handleConnectorRunMessage } = await import("./machineWsRunDispatch-ZOEGTKHC.js");
   return handleConnectorRunMessage(message, pushMessage, executeCli, env, fetchImpl);
 }
 async function detectLaunchableMachineInfo() {

package/{agentPullCommand-O2MTUAFR.js → agentPullCommand-KRBRIFIY.js}

@@ -1,11 +1,6 @@
 import {
   resolveCliAgentKeyInput
 } from "./chunk-VHBWHNVT.js";
-import {
-  resolveAuthToken,
-  resolveServerUrl
-} from "./chunk-ISNCLGUZ.js";
-import "./chunk-OLZBQWZU.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
@@ -14,8 +9,13 @@ import {
 } from "./chunk-H33743XH.js";
 import "./chunk-LM6IYQ3F.js";
 import "./chunk-QSJ3HFEF.js";
-import "./chunk-4SN6J65J.js";
+import {
+  resolveAuthToken,
+  resolveServerUrl
+} from "./chunk-5NBHQD4D.js";
+import "./chunk-OLZBQWZU.js";
 import "./chunk-LCBAMY2M.js";
+import "./chunk-4SN6J65J.js";
 import "./chunk-CF7PE763.js";
 import "./chunk-G3SUCT4W.js";
 import "./chunk-4VNS5WPM.js";

package/{agentRecordCommands-MVNZRH3U.js → agentRecordCommands-DFS626TB.js}

@@ -2,90 +2,95 @@ import {
   runAgentCreateCommand,
   runAgentReadCommand,
   runAgentUpdateCommand
-} from "./chunk-QAALPJS7.js";
-import "./chunk-EXXFGKF7.js";
-import "./chunk-EHLHSX7R.js";
+} from "./chunk-EBH7G34M.js";
+import "./chunk-5ITRDSHY.js";
+import "./chunk-TOILAPLH.js";
+import "./chunk-CMKUBIGW.js";
+import "./chunk-JBTJAPUF.js";
 import "./chunk-W4NVOSFF.js";
-import "./chunk-OR2XR25C.js";
-import "./chunk-CDTLMEB3.js";
+import "./chunk-QCA3EPYK.js";
+import "./chunk-RNQ5BLR2.js";
 import "./chunk-VHBWHNVT.js";
-import "./chunk-A67QFHAA.js";
-import "./chunk-X7W4TNB4.js";
+import "./chunk-UG3WOFU6.js";
 import "./chunk-ATNTHIZI.js";
-import "./chunk-JBTJAPUF.js";
-import "./chunk-2O4IZNTG.js";
-import "./chunk-C3RUNRHT.js";
-import "./chunk-TYSCFY6S.js";
-import "./chunk-GAKEBQD6.js";
+import "./chunk-YTQLJYLB.js";
+import "./chunk-4GBNEA5B.js";
+import "./chunk-RZ735TLX.js";
+import "./chunk-YDCZVUFP.js";
+import "./chunk-OOIN7HSO.js";
 import "./chunk-KQHGZWSV.js";
-import "./chunk-AS4PVWA4.js";
+import "./chunk-IVAOVLM7.js";
 import "./chunk-3LY4F7SV.js";
 import "./chunk-VP4WJWKW.js";
 import "./chunk-63W5N6P3.js";
-import "./chunk-YIHFXH5Q.js";
-import "./chunk-HJGEVL7C.js";
-import "./chunk-ZQ2UM4KG.js";
+import "./chunk-VF4K2QE6.js";
+import "./chunk-MEVCDATU.js";
+import "./chunk-G3B356GF.js";
+import "./chunk-VC6OZXO5.js";
 import "./chunk-OWOHNGCN.js";
-import "./chunk-XENYHRUE.js";
-import "./chunk-PIVFPOW6.js";
-import "./chunk-4ZDM73SD.js";
+import "./chunk-AM53Q2SD.js";
+import "./chunk-V2J635L5.js";
 import "./chunk-MRC4Q34M.js";
 import "./chunk-MTU75CZ2.js";
 import "./chunk-CWMSB67P.js";
-import "./chunk-I5URP43I.js";
-import "./chunk-7KNKFIRO.js";
+import "./chunk-GPZM7QH6.js";
+import "./chunk-6LMFFG3K.js";
 import "./chunk-Z4NR32XR.js";
 import "./chunk-M76ECQRD.js";
-import "./chunk-SOTZ6RDN.js";
-import "./chunk-5JGGZCZL.js";
-import "./chunk-UAD2WT54.js";
-import "./chunk-DCOA4QSN.js";
-import "./chunk-IDZTNRP2.js";
-import "./chunk-ISNCLGUZ.js";
-import "./chunk-OLZBQWZU.js";
-import "./chunk-6KUOUWMP.js";
-import "./chunk-5KLGBAAR.js";
+import "./chunk-WZSRQNQG.js";
+import "./chunk-DRMGJFGQ.js";
 import "./chunk-ZNFJWEN4.js";
-import "./chunk-TILFE6LV.js";
-import "./chunk-6SLCD4RB.js";
+import "./chunk-ZR4VHQ5D.js";
+import "./chunk-NCGFB7NN.js";
+import "./chunk-4BTHUYMY.js";
 import "./chunk-OPZYGHUC.js";
-import "./chunk-PAKN26FP.js";
-import "./chunk-JRKKFRAV.js";
-import "./chunk-AUQ747NZ.js";
-import "./chunk-5MMAK75Q.js";
-import "./chunk-BBYVOSU2.js";
-import "./chunk-5CS33IBL.js";
+import "./chunk-6OVCRC72.js";
+import "./chunk-TSKWE74T.js";
+import "./chunk-43UD5ZP7.js";
+import "./chunk-S73OEOHH.js";
+import "./chunk-S3UTETIC.js";
+import "./chunk-PDL2AV3E.js";
 import "./chunk-JZPBVBIY.js";
-import "./chunk-IWX4UW2E.js";
+import "./chunk-BYXBJQAS.js";
+import "./chunk-QLUFR47U.js";
+import "./chunk-KKY4B2Q2.js";
 import "./chunk-5MIDPSSK.js";
 import "./chunk-DFFIZ25G.js";
 import "./chunk-3ASDTTEI.js";
-import "./chunk-DWLEOOGR.js";
+import "./chunk-4ON5AV72.js";
 import "./chunk-HNMXYYJR.js";
 import "./chunk-H33743XH.js";
 import "./chunk-LM6IYQ3F.js";
-import "./chunk-KBKYAONQ.js";
-import "./chunk-4SIMLBEU.js";
+import "./chunk-SOTZ6RDN.js";
+import "./chunk-XENYHRUE.js";
+import "./chunk-DWLEOOGR.js";
+import "./chunk-IDZTNRP2.js";
+import "./chunk-IKXL2HZ3.js";
+import "./chunk-524BDL33.js";
+import "./chunk-7MYHLZ3F.js";
+import "./chunk-WTYKCU4W.js";
 import "./chunk-Y5GCAMGP.js";
-import "./chunk-BE2OOJ5P.js";
-import "./chunk-AZPCASRE.js";
-import "./chunk-7U44LYTR.js";
 import "./chunk-KX6YBIHG.js";
+import "./chunk-3HHTVM6G.js";
+import "./chunk-NITP2JDG.js";
+import "./chunk-WPHL6ALY.js";
 import "./chunk-O4BU24WZ.js";
 import "./chunk-I42VC5KR.js";
 import "./chunk-WWC7I6TA.js";
 import "./chunk-QSJ3HFEF.js";
-import "./chunk-DSZUWUYB.js";
-import "./chunk-UTLZINAP.js";
+import "./chunk-XHQWJUW4.js";
+import "./chunk-TSUJOM6N.js";
 import "./chunk-OOSFSFMA.js";
 import "./chunk-GBRG75BQ.js";
-import "./chunk-4SN6J65J.js";
-import "./chunk-LCBAMY2M.js";
+import "./chunk-KUG52IAP.js";
 import "./chunk-3EUW3WEO.js";
 import "./chunk-U6VC4MU4.js";
+import "./chunk-5NBHQD4D.js";
+import "./chunk-OLZBQWZU.js";
+import "./chunk-LCBAMY2M.js";
+import "./chunk-4SN6J65J.js";
 import "./chunk-CF7PE763.js";
 import "./chunk-G3SUCT4W.js";
-import "./chunk-KUG52IAP.js";
 import "./chunk-4VNS5WPM.js";
 export {
   runAgentCreateCommand,