nolo-cli 0.211.0 → 0.213.0

package/{chunk-SCYQJPGA.js → chunk-X7SDOJUM.js}

@@ -4,22 +4,28 @@ import {
 import {
   getReadableCliDb
 } from "./chunk-J5JTMQIA.js";
+import {
+  BIGMODEL_PROVIDER_TARGET,
+  buildCredentialUseGrant,
+  verifyCredentialUseGrant
+} from "./chunk-XFYFMTOM.js";
+import {
+  clearCliLocalRuntimePreparedAgentCache
+} from "./chunk-UYD5HQ6T.js";
+import {
+  readCredentialAvailability
+} from "./chunk-YTF4WH7J.js";
 import {
   buildCreatedAgentRecord,
   buildUpdatedAgentRecord,
   normalizeAgentRecordForOutput,
   parseAgentUpdateArgs,
+  readBoundAgentCredential,
   refreshAgentRecordCache,
   resolveAgentRecordFromHybridStore,
   sanitizeAgentRecordForCliOutput,
   writeAgentRecord
-} from "./chunk-XDMGY5IU.js";
-import {
-  clearCliLocalRuntimePreparedAgentCache
-} from "./chunk-M4NTDZG3.js";
-import {
-  readCredentialAvailability
-} from "./chunk-GSQNH63I.js";
+} from "./chunk-MOIJOHA5.js";
 import {
   resolveCliAgentKeyInput
 } from "./chunk-NBTY7YJF.js";
@@ -150,7 +156,9 @@ async function runAgentUpdateCommand(args, deps = {}) {
       db,
       fetchImpl,
       fallbackFetchImpl,
-      authToken
+      authToken,
+      credentialBroker: deps.credentialBroker,
+      hostApproval: deps.hostApproval
     });
     await writeAgentRecord({
       agentKey: built.agentKey,
@@ -159,7 +167,8 @@ async function runAgentUpdateCommand(args, deps = {}) {
       fetchImpl,
       serverUrl: built.serverUrl,
       userId,
-      record: built.nextRecord
+      record: built.nextRecord,
+      remoteIncludeApiKey: !deps.hostApproval?.gateId
     });
     await refreshAgentRecordCache({
       db,
@@ -223,7 +232,9 @@ async function runAgentCreateCommand(args, deps = {}) {
       db,
       fetchImpl,
       fallbackFetchImpl,
-      authToken
+      authToken,
+      credentialBroker: deps.credentialBroker,
+      hostApproval: deps.hostApproval
     });
     await writeAgentRecord({
       agentKey: built.agentKey,
@@ -232,7 +243,8 @@ async function runAgentCreateCommand(args, deps = {}) {
       fetchImpl,
       serverUrl: built.serverUrl,
       userId,
-      record: built.nextRecord
+      record: built.nextRecord,
+      remoteIncludeApiKey: !deps.hostApproval?.gateId
     });
     await db.put(built.agentKey, {
       ...built.nextRecord,
@@ -244,16 +256,131 @@ async function runAgentCreateCommand(args, deps = {}) {
     let verifyResult;
     if (parsed.verify) {
       try {
-        const { verifyCustomProvider } = await import("./agentProviderCommands-MN3ABDME.js");
+        const { verifyCustomProvider } = await import("./agentProviderCommands-Q5O33MED.js");
         const rec = built.nextRecord;
-        verifyResult = await verifyCustomProvider({
-          providerUrl: rec.customProviderUrl,
-          apiKey: rec.apiKey,
-          apiKeyHeader: rec.apiKeyHeader,
-          model: rec.model,
-          prompt: parsed.verifyPrompt,
-          fetchImpl
-        });
+        const verifyCredentialRef = typeof rec.credentialRef === "string" && rec.credentialRef.trim() ? rec.credentialRef.trim() : "";
+        if (verifyCredentialRef) {
+          const providerUrl = rec.customProviderUrl ?? "";
+          const hostGateId = (deps.hostApproval?.gateId ?? "").trim();
+          const confirmCredentialUse = hostGateId ? void 0 : deps.confirmCredentialUse;
+          let grantReason = "host-grant-unavailable: no in-process host approval in this entry point; credential not sent";
+          let grantedOrigin;
+          if (hostGateId) {
+            const gate = {
+              id: hostGateId,
+              kind: "confirm",
+              title: "Use pasted API key for this agent?",
+              body: `Target: ${providerUrl}`,
+              payload: { agentKey: built.agentKey, credentialRef: verifyCredentialRef }
+            };
+            const builtGrant = buildCredentialUseGrant({
+              gate,
+              result: { gateId: hostGateId, status: "completed", output: "confirmed" },
+              credentialRef: verifyCredentialRef,
+              agentKey: built.agentKey,
+              deviceId: deps.deviceId ?? "",
+              providerId: BIGMODEL_PROVIDER_TARGET.providerId,
+              providerUrl,
+              operations: ["verify"],
+              persistence: "os-store"
+            });
+            if (builtGrant.ok) {
+              const granted = verifyCredentialUseGrant({
+                grant: builtGrant.grant,
+                credentialRef: verifyCredentialRef,
+                agentKey: built.agentKey,
+                requestUrl: providerUrl,
+                operation: "verify"
+              });
+              if (granted.ok) {
+                grantedOrigin = builtGrant.grant.allowedOrigin;
+              } else {
+                grantReason = `host-grant-rejected: ${granted.reason}; credential not sent`;
+              }
+            } else {
+              grantReason = `host-grant-rejected: ${builtGrant.reason}; credential not sent`;
+            }
+          }
+          if (confirmCredentialUse) {
+            const gate = {
+              id: `credential-use-${built.agentKey}`,
+              kind: "confirm",
+              title: "Use pasted API key for this agent?",
+              body: `Target: ${providerUrl}`,
+              payload: { agentKey: built.agentKey, credentialRef: verifyCredentialRef }
+            };
+            const gateResult = await confirmCredentialUse(gate);
+            const builtGrant = buildCredentialUseGrant({
+              gate,
+              result: gateResult,
+              credentialRef: verifyCredentialRef,
+              agentKey: built.agentKey,
+              deviceId: deps.deviceId ?? "",
+              providerId: BIGMODEL_PROVIDER_TARGET.providerId,
+              providerUrl,
+              operations: ["verify"],
+              persistence: "os-store"
+            });
+            if (builtGrant.ok) {
+              const granted = verifyCredentialUseGrant({
+                grant: builtGrant.grant,
+                credentialRef: verifyCredentialRef,
+                agentKey: built.agentKey,
+                requestUrl: providerUrl,
+                operation: "verify"
+              });
+              if (granted.ok) {
+                grantedOrigin = builtGrant.grant.allowedOrigin;
+              } else {
+                grantReason = `host-grant-rejected: ${granted.reason}; credential not sent`;
+              }
+            } else {
+              grantReason = `host-grant-rejected: ${builtGrant.reason}; credential not sent`;
+            }
+          }
+          if (!grantedOrigin) {
+            if (grantReason.startsWith("host-grant-unavailable")) {
+              grantReason = "host-grant-unavailable: no in-process host approval for this credential/target in this entry point; credential not sent";
+            }
+          }
+          if (!grantedOrigin) {
+            verifyResult = {
+              ok: false,
+              providerUrl,
+              model: rec.model,
+              reason: grantReason
+            };
+          } else {
+            const secret = await readBoundAgentCredential(
+              verifyCredentialRef,
+              deps.credentialBroker
+            );
+            verifyResult = secret ? await verifyCustomProvider({
+              providerUrl,
+              apiKey: secret,
+              apiKeyHeader: rec.apiKeyHeader,
+              model: rec.model,
+              prompt: parsed.verifyPrompt,
+              fetchImpl,
+              // 实际请求目标必须等于授权的 origin；重定向一律拒绝。
+              allowedOrigin: grantedOrigin
+            }) : {
+              ok: false,
+              providerUrl,
+              model: rec.model,
+              reason: "host-grant-ok but credential is not readable from the OS store"
+            };
+          }
+        } else {
+          verifyResult = await verifyCustomProvider({
+            providerUrl: rec.customProviderUrl,
+            apiKey: rec.apiKey,
+            apiKeyHeader: rec.apiKeyHeader,
+            model: rec.model,
+            prompt: parsed.verifyPrompt,
+            fetchImpl
+          });
+        }
       } catch (error) {
         verifyResult = {
           ok: false,

package/chunk-XFYFMTOM.js

@@ -0,0 +1,92 @@
+// packages/agent-runtime/credentialUseGrant.ts
+var BIGMODEL_PROVIDER_TARGET = {
+  providerId: "bigmodel",
+  /** 规范化 origin：协议 + 主机 + 端口，不含路径。 */
+  allowedOrigin: "https://open.bigmodel.cn"
+};
+function normalizeOrigin(url) {
+  const raw = typeof url === "string" ? url.trim() : "";
+  if (!raw) return null;
+  let parsed;
+  try {
+    parsed = new URL(raw);
+  } catch {
+    return null;
+  }
+  if (parsed.protocol !== "https:" && parsed.protocol !== "http:") return null;
+  if (parsed.username || parsed.password) return null;
+  return parsed.origin;
+}
+function buildCredentialUseGrant(input) {
+  const { gate, result } = input;
+  if (gate.kind !== "confirm") {
+    return { ok: false, reason: "grant-requires-confirm-gate" };
+  }
+  if (!result || result.gateId !== gate.id) {
+    return { ok: false, reason: "grant-result-does-not-match-gate" };
+  }
+  if (result.status !== "completed" || result.output !== "confirmed") {
+    return { ok: false, reason: "grant-not-confirmed-by-host" };
+  }
+  const providerId = (input.providerId ?? "").trim();
+  if (providerId !== BIGMODEL_PROVIDER_TARGET.providerId) {
+    return { ok: false, reason: "grant-provider-not-allowed" };
+  }
+  const origin = normalizeOrigin(input.providerUrl);
+  if (!origin || origin !== BIGMODEL_PROVIDER_TARGET.allowedOrigin) {
+    return { ok: false, reason: "grant-target-origin-not-allowed" };
+  }
+  const credentialRef = (input.credentialRef ?? "").trim();
+  const agentKey = (input.agentKey ?? "").trim();
+  const deviceId = (input.deviceId ?? "").trim();
+  if (!credentialRef || !agentKey || !deviceId) {
+    return { ok: false, reason: "grant-missing-identity" };
+  }
+  if (!input.operations.includes("verify")) {
+    return { ok: false, reason: "grant-missing-verify-operation" };
+  }
+  return {
+    ok: true,
+    grant: {
+      credentialRef,
+      deviceId,
+      agentKey,
+      providerId,
+      allowedOrigin: origin,
+      operations: [...input.operations],
+      persistence: input.persistence,
+      userAuthorizationEventId: gate.id
+    }
+  };
+}
+function verifyCredentialUseGrant(args) {
+  const { grant } = args;
+  if (!grant) return { ok: false, reason: "no-grant" };
+  if (grant.providerId !== BIGMODEL_PROVIDER_TARGET.providerId) {
+    return { ok: false, reason: "grant-provider-not-allowed" };
+  }
+  if (grant.allowedOrigin !== BIGMODEL_PROVIDER_TARGET.allowedOrigin) {
+    return { ok: false, reason: "grant-target-origin-not-allowed" };
+  }
+  if (grant.credentialRef !== args.credentialRef) {
+    return { ok: false, reason: "grant-credential-mismatch" };
+  }
+  if (grant.agentKey !== args.agentKey) {
+    return { ok: false, reason: "grant-agent-mismatch" };
+  }
+  if (!grant.operations.includes(args.operation)) {
+    return { ok: false, reason: "grant-operation-not-allowed" };
+  }
+  const requestOrigin = normalizeOrigin(args.requestUrl);
+  if (!requestOrigin || requestOrigin !== grant.allowedOrigin) {
+    return { ok: false, reason: "request-origin-not-allowed" };
+  }
+  return { ok: true };
+}
+
+export {
+  BIGMODEL_PROVIDER_TARGET,
+  normalizeOrigin,
+  buildCredentialUseGrant,
+  verifyCredentialUseGrant
+};