@tinycloud/node-sdk 3.8.0-beta.9 → 3.8.1-beta.0

package/dist/core.cjs

@@ -58,6 +58,7 @@ __export(core_exports, {
   PermissionNotInManifestError: () => import_sdk_core14.PermissionNotInManifestError,
   PrefixedKVService: () => import_sdk_core15.PrefixedKVService,
   ProtocolMismatchError: () => import_sdk_core22.ProtocolMismatchError,
+  RuntimeDelegationRejectedError: () => RuntimeDelegationRejectedError,
   SECRET_NAME_RE: () => import_sdk_core18.SECRET_NAME_RE,
   SQLAction: () => import_sdk_core16.SQLAction,
   SQLService: () => import_sdk_core16.SQLService,
@@ -80,6 +81,7 @@ __export(core_exports, {
   VersionCheckError: () => import_sdk_core22.VersionCheckError,
   WasmKeyProvider: () => WasmKeyProvider,
   activateCompactRuntimeDelegation: () => activateCompactRuntimeDelegation,
+  activateValidatedRuntimeDelegation: () => activateValidatedRuntimeDelegation,
   addressStorageKey: () => import_sdk_core13.addressStorageKey,
   buildSpaceUri: () => import_sdk_core21.buildSpaceUri,
   canonicalizeAddress: () => import_sdk_core13.canonicalizeAddress,
@@ -109,6 +111,7 @@ __export(core_exports, {
   getNodeReplicationLoaders: () => getNodeReplicationLoaders,
   getTinyCloudDebugLogs: () => import_sdk_core13.getTinyCloudDebugLogs,
   installTinyCloudDebugGlobals: () => import_sdk_core13.installTinyCloudDebugGlobals,
+  isAppKeyHostBound: () => isAppKeyHostBound,
   isCapabilitySubset: () => import_sdk_core14.isCapabilitySubset,
   isEvmAddress: () => import_sdk_core13.isEvmAddress,
   loadManifest: () => import_sdk_core14.loadManifest,
@@ -130,7 +133,8 @@ __export(core_exports, {
   resourceCapabilitiesToSpaceAbilitiesMap: () => import_sdk_core14.resourceCapabilitiesToSpaceAbilitiesMap,
   serializeDelegation: () => serializeDelegation,
   tinyCloudDebugLogger: () => import_sdk_core13.tinyCloudDebugLogger,
-  validateManifest: () => import_sdk_core14.validateManifest
+  validateManifest: () => import_sdk_core14.validateManifest,
+  wireOpenKeyAuthorize: () => wireOpenKeyAuthorize
 });
 module.exports = __toCommonJS(core_exports);
 var import_sdk_core12 = require("@tinycloud/sdk-core");
@@ -371,6 +375,18 @@ function appKeyHostBinding(domain, appId) {
   const reversed = labels.reverse().join(".");
   return appId === reversed || appId.startsWith(`${reversed}.`);
 }
+function isAppKeyHostBound(keysAppId, origin) {
+  if (typeof origin === "string" && !origin.includes("://")) {
+    return appKeyHostBinding(origin, keysAppId);
+  }
+  let url;
+  try {
+    url = typeof origin === "string" ? new URL(origin) : origin;
+  } catch {
+    return false;
+  }
+  return appKeyHostBinding(url.host, keysAppId);
+}
 
 // src/replication/authority-sign-in.ts
 var import_sdk_core2 = require("@tinycloud/sdk-core");
@@ -502,6 +518,7 @@ function cloneAbilitiesMap(actions) {
 var NodeUserAuthorization = class {
   constructor(config) {
     this.activeSessionKeyId = "default";
+    this.preparedSessionCounter = 0;
     /** Incremented by resetSession; a sign-in started earlier publishes nothing. */
     this.sessionGeneration = 0;
     /**
@@ -1084,7 +1101,8 @@ var NodeUserAuthorization = class {
         return true;
       }
       const parsed = entry.path.includes("/") ? (0, import_resource.parseEncryptionResource)(entry.path) : { ...(0, import_sdk_services2.parseNetworkId)(entry.path), kind: "network" };
-      if (parsed.kind !== "network") {
+      const sharePrefix = parsed.kind === "prefix" && parsed.network === "default" && parsed.prefix === "share" && entry.actions.length === 1 && entry.actions[0] === DECRYPT_ACTION && didPrincipalMatches(parsed.ownerDid, currentDid);
+      if (parsed.kind !== "network" && !sharePrefix) {
         throw new import_sdk_core5.ManifestValidationError("named keys go in manifest.keys");
       }
       for (const action of entry.actions) {
@@ -1127,8 +1145,7 @@ var NodeUserAuthorization = class {
   /**
    * Build SIWE overrides from the top-level nonce and siweConfig.
    * - Top-level `nonce` is seeded first so `siweConfig.nonce` wins if both are set.
-   * - statement is prepended to the default statement
-   * - resources are appended to the default resources
+   * - resources are inserted after WASM preparation, before the final ReCap
    * - uri triggers a warning (overwriting delegation target)
    * - all other fields override directly
    * - per-call nonce overrides siweConfig.nonce when provided
@@ -1146,9 +1163,6 @@ var NodeUserAuthorization = class {
     if (statement) {
       overrides.statement = this.statement ? `${statement} ${this.statement}` : statement;
     }
-    if (resources && resources.length > 0) {
-      overrides.resources = resources;
-    }
     if (uri) {
       console.warn(
         "[tinycloud] siweConfig.uri is overwriting the delegation target URI. This may break delegation chain validation if the URI does not match the session key DID."
@@ -1160,6 +1174,29 @@ var NodeUserAuthorization = class {
     }
     return overrides;
   }
+  prepareSessionWithResources(params) {
+    const resources = this.siweConfig?.resources;
+    if (resources?.some((resource) => typeof resource !== "string" || !/^urn:tinycloud:recipients:[A-Za-z0-9_-]+$/.test(resource))) {
+      throw new Error("SIWE metadata resources must be base64url recipients URIs");
+    }
+    const prepared = this.wasm.prepareSession(params);
+    if (!resources?.length) return prepared;
+    const recapLines = /^- urn:recap:[^\r\n]+$/gim;
+    const recaps = prepared.siwe.match(recapLines);
+    const recap = recaps?.[0];
+    if (recaps?.length !== 1 || !prepared.siwe.endsWith(recap)) {
+      throw new Error("Prepared SIWE must end with exactly one ReCap");
+    }
+    const insertedLines = resources.map((resource) => `- ${resource}`);
+    const siwe = prepared.siwe.slice(0, -recap.length) + insertedLines.join("\n") + "\n" + recap;
+    const expectedFields = (0, import_sdk_core5.extractImmutableSiweFields)(prepared.siwe);
+    expectedFields.nonRecapResources = [expectedFields.nonRecapResources, ...insertedLines].filter(Boolean).join("\n");
+    const actualRecaps = siwe.match(recapLines);
+    if (actualRecaps?.length !== 1 || actualRecaps[0] !== recap || (0, import_sdk_core5.diffImmutableSiweFields)(expectedFields, (0, import_sdk_core5.extractImmutableSiweFields)(siwe)).length) {
+      throw new Error("SIWE metadata insertion changed the prepared message");
+    }
+    return { ...prepared, siwe };
+  }
   /**
    * Add an extension to the authorization flow.
    */
@@ -1407,7 +1444,7 @@ var NodeUserAuthorization = class {
       spaceAbilities[spaceId] = (0, import_sdk_core5.resourceCapabilitiesToAbilitiesMap)(resources);
     }
     const abilities = spaceAbilities[options.spaceId] ?? (0, import_sdk_core5.resourceCapabilitiesToAbilitiesMap)([]);
-    const prepared = this.wasm.prepareSession({
+    const prepared = this.prepareSessionWithResources({
       abilities,
       spaceAbilities,
       ...options.rawAbilities !== void 0 ? { rawAbilities: options.rawAbilities } : {},
@@ -1488,8 +1525,8 @@ var NodeUserAuthorization = class {
     this.assertSignInCurrent(generation);
     await this.refreshNamedKeyFeatureForSignIn(address, chainId);
     this.assertSignInCurrent(generation);
-    const keyId = `session-${Date.now()}`;
-    this.sessionManager.renameSessionKeyId(this.activeSessionKeyId, keyId);
+    const keyId = `session-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+    this.sessionManager.createSessionKey(keyId);
     this.activeSessionKeyId = keyId;
     const jwkString = this.sessionManager.jwk(keyId);
     if (!jwkString) {
@@ -1500,7 +1537,7 @@ var NodeUserAuthorization = class {
     const spaceId = capabilityPlan.spaceId;
     const now = /* @__PURE__ */ new Date();
     const expirationTime = new Date(now.getTime() + this.sessionExpirationMs);
-    const prepared = this.wasm.prepareSession({
+    const prepared = this.prepareSessionWithResources({
       abilities: capabilityPlan.abilities,
       ...capabilityPlan.spaceAbilities !== void 0 ? { spaceAbilities: capabilityPlan.spaceAbilities } : {},
       ...capabilityPlan.rawAbilities !== void 0 ? { rawAbilities: capabilityPlan.rawAbilities } : {},
@@ -1635,9 +1672,8 @@ var NodeUserAuthorization = class {
     const address = (0, import_sdk_core5.canonicalizeAddress)(await this.signer.getAddress());
     const chainId = await this.signer.getChainId();
     await this.refreshNamedKeyFeatureForSignIn(address, chainId);
-    const keyId = `session-${Date.now()}`;
-    this.sessionManager.renameSessionKeyId(this.activeSessionKeyId, keyId);
-    this.activeSessionKeyId = keyId;
+    const keyId = `openkey-session-${Date.now()}-${++this.preparedSessionCounter}`;
+    this.sessionManager.createSessionKey(keyId);
     const jwkString = this.sessionManager.jwk(keyId);
     if (!jwkString) {
       throw new Error("Failed to create session key");
@@ -1647,7 +1683,7 @@ var NodeUserAuthorization = class {
     const spaceId = capabilityPlan.spaceId;
     const now = /* @__PURE__ */ new Date();
     const expirationTime = new Date(now.getTime() + this.sessionExpirationMs);
-    const prepared = this.wasm.prepareSession({
+    const prepared = this.prepareSessionWithResources({
       abilities: capabilityPlan.abilities,
       ...capabilityPlan.spaceAbilities !== void 0 ? { spaceAbilities: capabilityPlan.spaceAbilities } : {},
       ...capabilityPlan.rawAbilities !== void 0 ? { rawAbilities: capabilityPlan.rawAbilities } : {},
@@ -1718,6 +1754,7 @@ var NodeUserAuthorization = class {
     await this.sessionStorage.save(address, persistedData);
     this._session = clientSession;
     this._tinyCloudSession = tinyCloudSession;
+    this.activeSessionKeyId = keyId;
     this._address = address;
     this._chainId = chainId;
     await this.refreshNodeInfo();
@@ -1764,6 +1801,11 @@ var NodeUserAuthorization = class {
    * @param options Optional overrides for the OpenKey request.
    */
   async signInWithOpenKey(authorizeFn, options) {
+    const pending = await this.prepareOpenKeySignIn(options);
+    return this.completeOpenKeySignIn(pending, authorizeFn(pending.request), options);
+  }
+  /** Finish address, host and SIWE preparation before an approval click. */
+  async prepareOpenKeySignIn(options) {
     refuseCaveated(this.getCapabilityRequest()?.manifests);
     if (options?.host !== void 0) {
       const overrideHost = options.host.trim();
@@ -1775,7 +1817,7 @@ var NodeUserAuthorization = class {
     const signingAddress = (0, import_sdk_core5.canonicalizeAddress)(await this.signer.getAddress());
     const signingChainId = await this.signer.getChainId();
     await this.resolveTinyCloudHostsForSignIn(signingAddress, signingChainId);
-    const { prepared, keyId, jwk } = await this.prepareSessionForSigning();
+    const { prepared, keyId, jwk, address, chainId } = await this.prepareSessionForSigning();
     const presentation = this.buildPresentationEnvelope(options?.reason);
     const hostHint = this.primaryTinyCloudHost;
     const originalRequest = {
@@ -1787,12 +1829,32 @@ var NodeUserAuthorization = class {
       keyId: options?.openkeyKeyId,
       presentation
     };
+    return {
+      request: originalRequest,
+      prepared,
+      keyId,
+      jwk,
+      address,
+      chainId,
+      generation: this.sessionGeneration,
+      createdAt: Date.now()
+    };
+  }
+  /** Complete a prepared approval. The caller starts authorization before awaiting this method. */
+  async completeOpenKeySignIn(pending, authorization, options) {
+    if (Date.now() - pending.createdAt > 5 * 6e4) {
+      throw new Error("Prepared OpenKey sign-in expired; prepare again");
+    }
+    if (pending.generation !== this.sessionGeneration) {
+      throw new Error("Prepared OpenKey sign-in expired after sign-out");
+    }
+    const { request: originalRequest, prepared, keyId, jwk } = pending;
     let result;
     let signed;
     let signature;
     for (let attempt = 0; ; ) {
       try {
-        result ?? (result = await authorizeFn(originalRequest));
+        result ?? (result = await authorization);
         signed = await this.verifyOpenKeyResult(result, prepared);
         signature = result.signature;
         break;
@@ -2213,6 +2275,50 @@ var NodeUserAuthorization = class {
   }
 };
 
+// src/authorization/openKeyBridge.ts
+function wireOpenKeyAuthorize(openkey, opts) {
+  return async (input) => {
+    const result = await openkey.authorizeTinyCloud({
+      protocolVersion: 1,
+      siwe: input.siwe,
+      keyId: input.keyId,
+      jwk: input.jwk,
+      host: input.host,
+      // Forward the presentation envelope verbatim — the OpenKey SDK
+      // validates and size-bounds it before use.
+      presentation: input.presentation
+    }, opts);
+    if (result.protocolVersion !== 1) {
+      throw new Error(
+        `wireOpenKeyAuthorize: OpenKey returned unsupported protocolVersion ${result.protocolVersion}`
+      );
+    }
+    if (typeof result.signedMessage !== "string" || !result.signedMessage) {
+      throw new Error(
+        "wireOpenKeyAuthorize: OpenKey returned no signedMessage \u2014 cannot complete a TinyCloud session"
+      );
+    }
+    if (!Array.isArray(result.selectedActionKeys)) {
+      throw new Error(
+        "wireOpenKeyAuthorize: OpenKey returned no selectedActionKeys"
+      );
+    }
+    if (!Array.isArray(result.permissions)) {
+      throw new Error(
+        "wireOpenKeyAuthorize: OpenKey returned no permissions"
+      );
+    }
+    return {
+      protocolVersion: 1,
+      address: result.address,
+      signature: result.signature,
+      signedMessage: result.signedMessage,
+      selectedActionKeys: result.selectedActionKeys,
+      permissions: result.permissions
+    };
+  };
+}
+
 // src/recordingServiceContext.ts
 var import_sdk_services3 = require("@tinycloud/sdk-services");
 var import_requestLog = require("@tinycloud/sdk-services/telemetry/requestLog");
@@ -2854,6 +2960,7 @@ function deserializeDelegation(data) {
 
 // src/TinyCloudNode.ts
 var import_siwe2 = require("siwe");
+var import_share_envelope = require("@tinycloud/share-envelope");
 var import_sdk_core11 = require("@tinycloud/sdk-core");
 var import_sdk_services4 = require("@tinycloud/sdk-services");
 var import_requestLog2 = require("@tinycloud/sdk-services/telemetry/requestLog");
@@ -3832,6 +3939,7 @@ var _TinyCloudNode = class _TinyCloudNode {
   constructor(config = {}) {
     this.signer = null;
     this.auth = null;
+    this.consumedOpenKeyPendings = /* @__PURE__ */ new WeakSet();
     this.tc = null;
     this._chainId = 1;
     this.replicaPurgeFailedHandlers = /* @__PURE__ */ new Set();
@@ -4772,6 +4880,37 @@ var _TinyCloudNode = class _TinyCloudNode {
     }
     await this.signInWith(() => this.auth.signInWithOpenKey(authorizeFn, options));
   }
+  /** Prepare the OpenKey request before the approval click. */
+  async prepareOpenKeySignIn() {
+    if (!this.signer || !this.tc || !this.auth) {
+      throw new Error("Cannot prepare OpenKey sign-in in session-only mode. Provide a signer in config.");
+    }
+    await this.signOutInFlight;
+    await this.accountRegistryTail;
+    await this.wasmBindings.ensureInitialized?.();
+    return this.auth.prepareOpenKeySignIn();
+  }
+  /** Start OpenKey authorization synchronously, then complete normal session setup. */
+  signInWithPreparedOpenKey(pending, authorizeFn) {
+    if (!this.signer || !this.tc || !this.auth || this.signOutInFlight) {
+      throw new Error("Prepared OpenKey sign-in is unavailable");
+    }
+    if (this.consumedOpenKeyPendings.has(pending)) {
+      throw new Error("Prepared OpenKey sign-in was already used");
+    }
+    if (Date.now() - pending.createdAt > 5 * 6e4) {
+      throw new Error("Prepared OpenKey sign-in expired; prepare again");
+    }
+    this.consumedOpenKeyPendings.add(pending);
+    const authorization = authorizeFn(pending.request);
+    void authorization.catch(() => void 0);
+    return this.signInWith(() => {
+      if (this._address !== pending.address || this._chainId !== pending.chainId) {
+        throw new Error("OpenKey account changed after sign-in preparation");
+      }
+      return this.auth.completeOpenKeySignIn(pending, authorization);
+    });
+  }
   async signInWith(performSignIn) {
     refuseCaveated(this.auth?.capabilityRequest?.manifests);
     const epoch = this.sessionEpoch;
@@ -6413,6 +6552,7 @@ var _TinyCloudNode = class _TinyCloudNode {
       invoke: graph.invoke,
       invokeAny: graph.invokeAny,
       signOwnerRevocation: this.signer ? (cid) => this.signOwnerRevocation(cid) : void 0,
+      sessionInvocationSigner: this.sessionInvocationSignerFor(input.serviceSession),
       fetch: graph.fetch
     });
     const keyProvider = new WasmKeyProvider({ sessionManager: input.manager });
@@ -6628,6 +6768,31 @@ var _TinyCloudNode = class _TinyCloudNode {
     if (session === void 0) throw new Error("Not signed in. Call signIn() first.");
     return signBytesWithJwk(bytes, session.jwk);
   }
+  /**
+   * Signs proofless invocations with `session`'s own did:key, for the node's
+   * issued-delegation list and revocation by the delegator. The audience is
+   * this Node's DID; each invocation lives 60 seconds.
+   */
+  sessionInvocationSignerFor(session) {
+    return {
+      did: () => session.verificationMethod.split("#", 1)[0],
+      sign: async (attenuation) => {
+        const now = Math.floor(Date.now() / 1e3);
+        const invocation = await (0, import_sdk_core11.signCompactUcanAuthorization)({
+          issuerDid: session.verificationMethod.split("#", 1)[0],
+          audienceDid: await this.fetchNodeId(),
+          attenuation,
+          facts: [{}],
+          proofs: [],
+          notBefore: now,
+          expiresAt: now + 60,
+          nonce: `urn:uuid:${crypto.randomUUID()}`,
+          sign: (bytes) => signBytesWithJwk(bytes, session.jwk)
+        });
+        return invocation.authorization;
+      }
+    };
+  }
   /** Author a proofless Policy/v3 owner root with the authenticated holder key. */
   async createUnifiedOwnerRoot(input) {
     const ownerDid = this.credentialHolderDid;
@@ -7162,7 +7327,7 @@ var _TinyCloudNode = class _TinyCloudNode {
           graph.assertActive();
           const signed = await this.signRawNetworkAuthorization({
             targetNode: input.targetNode,
-            networkId: input.networkId,
+            networkId: input.body.keyPath === void 0 ? input.networkId : `${input.networkId}/${input.body.keyPath}`,
             action: DECRYPT_ACTION2,
             facts: input.facts
           }, { graph, session });
@@ -7335,6 +7500,7 @@ var _TinyCloudNode = class _TinyCloudNode {
       invoke: graph.invoke,
       invokeAny: graph.invokeAny,
       signOwnerRevocation: this.signer ? (cid) => this.signOwnerRevocation(cid) : void 0,
+      sessionInvocationSigner: this.sessionInvocationSignerFor(serviceSession),
       fetch: graph.fetch
     });
     this._spaceService = new import_sdk_core11.SpaceService({
@@ -8118,7 +8284,7 @@ var _TinyCloudNode = class _TinyCloudNode {
     if (!session || !Array.isArray(permissions) || permissions.length === 0) {
       return false;
     }
-    const expanded = this.expandPermissionEntries(permissions);
+    const expanded = (0, import_sdk_core11.expandRuntimePermissionEntries)(permissions, (0, import_sdk_core11.pkhDid)(session.address, session.chainId));
     if (this.sessionCoversPermissionEntries(session, expanded)) {
       return true;
     }
@@ -8138,7 +8304,7 @@ var _TinyCloudNode = class _TinyCloudNode {
     if (!session || !Array.isArray(permissions) || permissions.length === 0) {
       return [];
     }
-    const expanded = this.expandPermissionEntries(permissions);
+    const expanded = (0, import_sdk_core11.expandRuntimePermissionEntries)(permissions, (0, import_sdk_core11.pkhDid)(session.address, session.chainId));
     return this.findRuntimeGrantsForPermissionEntries(expanded, session).map(
       (grant) => grant.delegation
     );
@@ -8313,7 +8479,28 @@ var _TinyCloudNode = class _TinyCloudNode {
         throw new import_sdk_core11.SessionExpiredError(sessionExpiry);
       }
     }
-    const expanded = this.expandPermissionEntries(permissions);
+    const expanded = (0, import_sdk_core11.expandRuntimePermissionEntries)(permissions, (0, import_sdk_core11.pkhDid)(session.address, session.chainId));
+    const bindsShareKey = expanded.some((entry) => entry.service === import_sdk_core11.ENCRYPTION_PERMISSION_SERVICE && entry.actions.includes("tinycloud.encryption/key.create"));
+    const captured = bindsShareKey ? { ...session, jwk: { ...options?.expectedSessionKey ?? session.jwk } } : session;
+    const assertCapturedKey = bindsShareKey ? () => {
+      const live = session.jwk;
+      const key = captured.jwk;
+      if (this.currentTinyCloudSession() !== session || session.verificationMethod !== captured.verificationMethod || session.delegationCid !== captured.delegationCid || session.spaceId !== captured.spaceId || session.address !== captured.address || session.chainId !== captured.chainId || live?.kty !== key.kty || live?.crv !== key.crv || live?.x !== key.x || live?.y !== key.y || live?.d !== key.d) {
+        throw new Error("Runtime permission request cancelled because the session key changed.");
+      }
+    } : void 0;
+    const sessionKeyDid = bindsShareKey ? this.sessionDid : void 0;
+    if (bindsShareKey) {
+      const key = captured.jwk;
+      if (key.kty !== "OKP" || key.crv !== "Ed25519" || typeof key.x !== "string") {
+        throw new Error("Runtime permission session key does not match its signed identity.");
+      }
+      const keyDid = (0, import_share_envelope.didKeyFromEd25519PublicKey)(base64UrlDecode(key.x));
+      if (!didPrincipalMatches2(keyDid, sessionKeyDid) || !didPrincipalMatches2(keyDid, captured.verificationMethod) || !didPrincipalMatches2(keyDid, new import_siwe2.SiweMessage(session.siwe).uri)) {
+        throw new Error("Runtime permission session key does not match its signed identity.");
+      }
+      assertCapturedKey();
+    }
     if (this.sessionCoversPermissionEntries(session, expanded)) {
       return [];
     }
@@ -8321,7 +8508,7 @@ var _TinyCloudNode = class _TinyCloudNode {
     if (existingGrants.length > 0) {
       return existingGrants.map((grant) => grant.delegation);
     }
-    if (!this.signer) {
+    if (!this.signer && options?.signMessage === void 0) {
       throw new Error(
         "grantRuntimePermissions requires wallet mode with a signer or privateKey."
       );
@@ -8363,13 +8550,13 @@ var _TinyCloudNode = class _TinyCloudNode {
           return this.wasmBindings.prepareSession({
             abilities,
             ...rawForDelegation.length > 0 ? { rawAbilities: this.permissionsToRawAbilities(rawForDelegation) } : {},
-            address: this.wasmBindings.ensureEip55(session.address),
-            chainId: session.chainId,
+            address: this.wasmBindings.ensureEip55(captured.address),
+            chainId: captured.chainId,
             domain: this.siweDomain,
             issuedAt: now.toISOString(),
             expirationTime: expiresAt.toISOString(),
             spaceId,
-            jwk: session.jwk
+            jwk: captured.jwk
           });
         } catch (error) {
           if (rawForDelegation.some((entry) => this.isRawRevocationPermissionEntry(entry)) && /invalid ReCap resource URI/i.test(error instanceof Error ? error.message : String(error))) {
@@ -8381,8 +8568,19 @@ var _TinyCloudNode = class _TinyCloudNode {
           throw error;
         }
       })();
-      const signature = await this.signer.signMessage(prepared.siwe);
+      if (bindsShareKey && !didPrincipalMatches2(new import_siwe2.SiweMessage(prepared.siwe).uri, sessionKeyDid)) {
+        throw new Error("Prepared runtime permission targets a different session key.");
+      }
+      assertCapturedKey?.();
+      if (options?.signMessage !== void 0) {
+        this.assertRuntimeGrantMessage(prepared.siwe, session);
+      }
+      const signature = options?.signMessage !== void 0 ? await options.signMessage(prepared.siwe) : await this.signer.signMessage(prepared.siwe);
+      if (options?.signMessage !== void 0 && !await (0, import_sdk_core11.verifyEip191MessageSignature)(prepared.siwe, signature, session.address)) {
+        throw new Error("The signature does not match the account that owns this session.");
+      }
       graph.assertActive();
+      assertCapturedKey?.();
       const delegatedSession = this.wasmBindings.completeSessionSetup({
         ...prepared,
         signature
@@ -8411,18 +8609,19 @@ var _TinyCloudNode = class _TinyCloudNode {
         delegatedSession,
         delegatedEntries,
         spaceId,
-        session,
+        captured,
         expiresAt,
         { siwe: prepared.siwe, signature }
       );
       graph.assertActive();
+      assertCapturedKey?.();
       this.runtimePermissionGrants.push({
         session: {
           delegationHeader: delegatedSession.delegationHeader,
           delegationCid: delegatedSession.delegationCid,
           spaceId,
-          verificationMethod: session.verificationMethod,
-          jwk: session.jwk
+          verificationMethod: captured.verificationMethod,
+          jwk: captured.jwk
         },
         delegation,
         operations: this.permissionOperations(delegatedEntries, spaceId),
@@ -8751,7 +8950,19 @@ var _TinyCloudNode = class _TinyCloudNode {
         "delegateTo requires a non-empty permissions array"
       );
     }
-    const expandedEntries = this.expandPermissionEntries(permissions);
+    const expandedEntries = (0, import_sdk_core11.expandDelegationPermissionEntries)(permissions);
+    const namedKeyEntries = expandedEntries.filter((entry) => entry.service === import_sdk_core11.ENCRYPTION_PERMISSION_SERVICE && entry.path.includes("/"));
+    if (namedKeyEntries.length > 0) {
+      if (expandedEntries.some((entry) => entry.service === import_sdk_core11.ENCRYPTION_PERMISSION_SERVICE && !entry.path.includes("/"))) {
+        throw new import_sdk_core11.ManifestValidationError("named-key delegation cannot include bare-network permissions");
+      }
+      if (options?.forceWalletSign) {
+        throw new import_sdk_core11.ManifestValidationError("named-key delegation requires a signed session grant");
+      }
+      const granted = this.projectSignedRecapCapabilities(session.siwe);
+      const { subset, missing } = this.signedCapabilitySubset(namedKeyEntries, granted);
+      if (!subset) throw new import_sdk_core11.PermissionNotInManifestError(missing, granted);
+    }
     const now = /* @__PURE__ */ new Date();
     const expiryMs = resolveExpiryMs(options?.expiry);
     const expirationTime = new Date(now.getTime() + expiryMs);
@@ -9185,6 +9396,25 @@ var _TinyCloudNode = class _TinyCloudNode {
   expandPermissionEntries(permissions) {
     return (0, import_sdk_core11.expandPermissionEntries)(permissions);
   }
+  /**
+   * Checks the SIWE text a caller-supplied signer is asked to sign: it must be in canonical form (parsing and
+   * re-serializing it gives the same bytes) and name the session's account and chain. The caller then checks the
+   * signature against these exact bytes.
+   */
+  assertRuntimeGrantMessage(siwe, session) {
+    let parsed;
+    try {
+      parsed = new import_siwe2.SiweMessage(siwe);
+    } catch {
+      throw new Error("The prepared sign-in message is not a valid SIWE message.");
+    }
+    if (parsed.prepareMessage() !== siwe) {
+      throw new Error("The prepared sign-in message is not in canonical form.");
+    }
+    if (parsed.chainId !== session.chainId || (0, import_sdk_core11.canonicalizeAddress)(parsed.address) !== (0, import_sdk_core11.canonicalizeAddress)(session.address)) {
+      throw new Error("The prepared sign-in message is for a different account or chain than this session.");
+    }
+  }
   /**
    * The current WASM child-delegation APIs accept action-only maps. Refuse any
    * constrained branch rather than signing a broader action-only child UCAN.
@@ -10167,6 +10397,7 @@ var import_sdk_core23 = require("@tinycloud/sdk-core");
   PermissionNotInManifestError,
   PrefixedKVService,
   ProtocolMismatchError,
+  RuntimeDelegationRejectedError,
   SECRET_NAME_RE,
   SQLAction,
   SQLService,
@@ -10189,6 +10420,7 @@ var import_sdk_core23 = require("@tinycloud/sdk-core");
   VersionCheckError,
   WasmKeyProvider,
   activateCompactRuntimeDelegation,
+  activateValidatedRuntimeDelegation,
   addressStorageKey,
   buildSpaceUri,
   canonicalizeAddress,
@@ -10218,6 +10450,7 @@ var import_sdk_core23 = require("@tinycloud/sdk-core");
   getNodeReplicationLoaders,
   getTinyCloudDebugLogs,
   installTinyCloudDebugGlobals,
+  isAppKeyHostBound,
   isCapabilitySubset,
   isEvmAddress,
   loadManifest,
@@ -10239,6 +10472,7 @@ var import_sdk_core23 = require("@tinycloud/sdk-core");
   resourceCapabilitiesToSpaceAbilitiesMap,
   serializeDelegation,
   tinyCloudDebugLogger,
-  validateManifest
+  validateManifest,
+  wireOpenKeyAuthorize
 });
 //# sourceMappingURL=core.cjs.map