@tinycloud/mcp 0.4.1-beta.1 → 0.5.0-beta.10

package/dist/http-cli.cjs

@@ -32,6 +32,7 @@ var import_server4 = require("@modelcontextprotocol/server");
 
 // src/oauth.ts
 var import_server = require("@modelcontextprotocol/server");
+var import_node_sdk = require("@tinycloud/node-sdk");
 var import_jose = require("jose");
 var OWNER_DIDS_CLAIM = "https://tinycloud.xyz/owner_dids";
 function createOpenKeyTokenVerifier(config) {
@@ -80,11 +81,11 @@ function authInfo(token, payload, config) {
     );
   }
   const clientId = firstString(payload.azp, payload.client_id) ?? "unknown";
-  const ownerDids = Array.isArray(payload[OWNER_DIDS_CLAIM]) ? payload[OWNER_DIDS_CLAIM].filter((value) => typeof value === "string") : [];
-  if (ownerDids.length === 0) {
+  const ownerDids = canonicalOwnerDids(payload[OWNER_DIDS_CLAIM]);
+  if (ownerDids === void 0) {
     throw new import_server.OAuthError(
       import_server.OAuthErrorCode.InvalidToken,
-      "The OpenKey access token has no TinyCloud owner identity."
+      "The OpenKey access token has no valid TinyCloud owner identity."
     );
   }
   return {
@@ -99,6 +100,21 @@ function authInfo(token, payload, config) {
     }
   };
 }
+var OWNER_DID = /^did:pkh:eip155:([1-9][0-9]{0,15}):(0x[0-9a-fA-F]{40})$/;
+function canonicalOwnerDids(claim) {
+  if (!Array.isArray(claim) || claim.length === 0) return void 0;
+  const ownerDids = [];
+  for (const value of claim) {
+    const match = typeof value === "string" ? OWNER_DID.exec(value) : null;
+    if (match === null) return void 0;
+    try {
+      ownerDids.push((0, import_node_sdk.pkhDid)(match[2], Number(match[1])));
+    } catch {
+      return void 0;
+    }
+  }
+  return [...new Set(ownerDids)];
+}
 function firstString(...values) {
   return values.find((value) => typeof value === "string" && value.length > 0);
 }
@@ -107,7 +123,7 @@ function firstString(...values) {
 var import_node_crypto = require("crypto");
 var import_promises = require("fs/promises");
 var import_node_path = require("path");
-var import_node_sdk = require("@tinycloud/node-sdk");
+var import_node_sdk2 = require("@tinycloud/node-sdk");
 var import_node_sdk_wasm = require("@tinycloud/node-sdk-wasm");
 var import_operations = require("@tinycloud/operations");
 var PROFILE = "agent";
@@ -221,8 +237,7 @@ var RemoteTenantStore = class {
     if (pending.ownerDids.length > 0 && !pending.ownerDids.some((did) => samePrincipal(node.did, did))) {
       throw new ApprovalOwnerMismatchError();
     }
-    const granted = [...node.getVerifiedSessionCapabilities()];
-    if (!permissionsCover(pending.permissions, granted)) {
+    if (!(0, import_node_sdk2.isCapabilitySubset)(pending.permissions, node.getVerifiedSessionCapabilities()).subset) {
       throw new Error("The approved delegation does not cover the requested account access.");
     }
     const profile = await readJson(this.#profilePath(tenant.stateRoot));
@@ -238,14 +253,25 @@ var RemoteTenantStore = class {
   }
   async #storeDelegation(tenant, pending, data) {
     if (pending.requestId === void 0) throw new Error("Authority request is missing.");
-    const { node } = await this.#restoreApproval(tenant, data);
+    const { node, session } = await this.#restoreApproval(tenant, data);
     if (!pending.ownerDids.some((did) => samePrincipal(node.did, did))) throw new ApprovalOwnerMismatchError();
-    const delegation = portableFromCallback(data, pending.permissions, this.#config.nodeHost);
+    const delegation = (0, import_node_sdk2.siweRuntimeDelegation)(node, {
+      authorization: session.delegationHeader.Authorization,
+      cid: session.delegationCid,
+      spaceId: session.spaceId,
+      ownerAddress: session.address,
+      chainId: session.chainId,
+      siwe: session.siwe,
+      signature: session.signature,
+      host: this.#config.nodeHost
+    });
     const result = await (0, import_operations.invokeOperation)(
       "tinycloud.auth.import",
       1,
       { profile: PROFILE, stateRoot: tenant.stateRoot },
       {
+        kind: "tinycloud.auth.delegation",
+        version: 1,
         requestId: pending.requestId,
         delegationCid: delegation.cid,
         delegation
@@ -255,12 +281,14 @@ var RemoteTenantStore = class {
   }
   /**
    * Verify the OpenKey callback as a SIWE session for this tenant's key. The
-   * WASM verifier binds the authorization bytes and CID to the signed SIWE, so
-   * `node.did` is the wallet that signed exactly the delegation being stored.
+   * callback must carry the full signed proof (SIWE, signature, address and
+   * chain), so the WASM verifier always runs: it binds the authorization bytes
+   * and CID to the signed SIWE, and `node.did` is the wallet that signed
+   * exactly the delegation being stored.
    */
   async #restoreApproval(tenant, data) {
     const session = sessionFromCallback(data, tenant.jwk);
-    const node = new import_node_sdk.TinyCloudNode({ host: this.#config.nodeHost });
+    const node = new import_node_sdk2.TinyCloudNode({ host: this.#config.nodeHost });
     await node.restoreSession(session);
     if (!samePrincipal(node.sessionDid, tenant.sessionDid)) {
       throw new Error("The approved delegation targets a different session.");
@@ -281,7 +309,7 @@ var RemoteTenantStore = class {
     const raw = await readJson(this.#sessionPath(tenant.stateRoot));
     if (raw === null) return false;
     try {
-      const node = new import_node_sdk.TinyCloudNode({ host: this.#config.nodeHost });
+      const node = new import_node_sdk2.TinyCloudNode({ host: this.#config.nodeHost });
       await node.restoreSession(raw);
       return samePrincipal(node.sessionDid, tenant.sessionDid) && ownerDids.some((did) => samePrincipal(node.did, did));
     } catch {
@@ -436,7 +464,7 @@ function ensureWasm() {
 }
 function sessionFromCallback(data, privateJwk) {
   const delegationHeader = data.delegationHeader;
-  if (!isRecord(delegationHeader) || typeof delegationHeader.Authorization !== "string" || typeof data.delegationCid !== "string" || typeof data.spaceId !== "string" || typeof data.verificationMethod !== "string") {
+  if (!isRecord(delegationHeader) || typeof delegationHeader.Authorization !== "string" || typeof data.delegationCid !== "string" || typeof data.spaceId !== "string" || typeof data.verificationMethod !== "string" || typeof data.address !== "string" || typeof data.chainId !== "number" || typeof data.siwe !== "string" || typeof data.signature !== "string") {
     throw new Error("OpenKey returned an incomplete delegation.");
   }
   return {
@@ -445,63 +473,12 @@ function sessionFromCallback(data, privateJwk) {
     spaceId: data.spaceId,
     jwk: privateJwk,
     verificationMethod: data.verificationMethod,
-    ...typeof data.address === "string" ? { address: data.address } : {},
-    ...typeof data.chainId === "number" ? { chainId: data.chainId } : {},
-    ...typeof data.siwe === "string" ? { siwe: data.siwe } : {},
-    ...typeof data.signature === "string" ? { signature: data.signature } : {}
-  };
-}
-function portableFromCallback(data, permissions, host) {
-  const primary = permissions.find((permission) => permission.service !== "tinycloud.encryption") ?? permissions[0];
-  if (primary === void 0) throw new Error("The authority request has no permissions.");
-  const session = sessionFromCallback(data, {});
-  const expiry = delegationExpiry(data);
-  return {
-    cid: session.delegationCid,
-    delegationHeader: session.delegationHeader,
-    spaceId: session.spaceId,
-    path: primary.path,
-    actions: [...primary.actions],
-    resources: permissions.map((permission) => ({
-      service: permission.service.startsWith("tinycloud.") ? permission.service.slice("tinycloud.".length) : permission.service,
-      space: permission.service === "tinycloud.encryption" ? requiredPermissionSpace(permission) : session.spaceId,
-      path: permission.path,
-      actions: [...permission.actions]
-    })),
-    expiry,
-    delegateDID: session.verificationMethod,
-    ownerAddress: typeof data.address === "string" ? data.address : "",
-    chainId: typeof data.chainId === "number" ? data.chainId : 1,
-    host
+    address: data.address,
+    chainId: data.chainId,
+    siwe: data.siwe,
+    signature: data.signature
   };
 }
-function delegationExpiry(data) {
-  for (const key of ["expiry", "expiresAt", "expirationTime"]) {
-    const parsed = parseDate(data[key]);
-    if (parsed !== void 0) return parsed;
-  }
-  if (typeof data.siwe === "string") {
-    const match = data.siwe.match(/^Expiration Time:\s*(.+)$/im);
-    const parsed = parseDate(match?.[1]?.trim());
-    if (parsed !== void 0) return parsed;
-  }
-  throw new Error("OpenKey did not return a delegation expiry.");
-}
-function permissionsCover(requested, granted) {
-  return requested.every((request) => granted.some(
-    (grant) => normalizeService(grant.service) === normalizeService(request.service) && typeof grant.space === "string" && typeof request.space === "string" && sameSpace(grant.space, request.space) && grant.path === request.path && request.actions.every((action) => grant.actions.includes(action))
-  ));
-}
-function sameSpace(granted, requested) {
-  return granted === requested || granted.endsWith(`:${requested}`);
-}
-function normalizeService(service) {
-  return service.startsWith("tinycloud.") ? service : `tinycloud.${service}`;
-}
-function requiredPermissionSpace(permission) {
-  if (typeof permission.space !== "string") throw new Error("The authority request has no space.");
-  return permission.space;
-}
 function publicJwk(jwk) {
   const copy = { ...jwk };
   for (const field of ["d", "p", "q", "dp", "dq", "qi", "oth", "k"]) delete copy[field];
@@ -510,7 +487,7 @@ function publicJwk(jwk) {
 function samePrincipal(left, right) {
   if (typeof left !== "string") return false;
   try {
-    return (0, import_node_sdk.principalDidEquals)(left, right);
+    return (0, import_node_sdk2.principalDidEquals)(left, right);
   } catch {
     return false;
   }
@@ -524,11 +501,6 @@ function isPermissionEntry(value) {
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function parseDate(value) {
-  if (typeof value !== "string" && typeof value !== "number") return void 0;
-  const date = new Date(typeof value === "number" && value < 1e10 ? value * 1e3 : value);
-  return Number.isNaN(date.getTime()) ? void 0 : date;
-}
 async function secureDirectory(path) {
   await (0, import_promises.mkdir)(path, { recursive: true, mode: 448 });
   await (0, import_promises.chmod)(path, 448);
@@ -598,8 +570,8 @@ var import_ajv = require("@modelcontextprotocol/server/validators/ajv");
 var import_operations2 = require("@tinycloud/operations");
 
 // src/results.ts
-function toMcpToolResult(result) {
-  const canonical = isCanonicalOperationResult(result) ? result : {
+function toMcpToolResult(result, bindings = []) {
+  const canonical = isCanonicalOperationResult(result) ? withRecoveryTool(result, bindings) : {
     status: "error",
     operation: {},
     context: {},
@@ -610,6 +582,18 @@ function toMcpToolResult(result) {
     structuredContent: canonical
   };
 }
+function withRecoveryTool(result, bindings) {
+  if (result.status !== "error") return result;
+  const error = result.error;
+  const recovery = error?.details?.recovery;
+  if (recovery?.action !== "complete_migration") return result;
+  const binding = bindings.find((candidate) => candidate.operationId === recovery.operationId);
+  if (binding === void 0) return result;
+  return {
+    ...result,
+    error: { ...error, details: { ...error?.details, recovery: { ...recovery, tool: binding.name } } }
+  };
+}
 function isCanonicalOperationResult(value) {
   if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
   const status = value.status;
@@ -643,6 +627,10 @@ var packageRequire = (0, import_node_module.createRequire)(
 var generatedCatalog = packageRequire(
   "@tinycloud/operations/operations.json"
 );
+var ALL_SURFACES = ["local", "hosted"];
+function bindingSurfaces(binding) {
+  return binding.surfaces ?? ALL_SURFACES;
+}
 var TOOL_BINDINGS = [
   {
     name: "tinycloud_status",
@@ -687,7 +675,10 @@ var TOOL_BINDINGS = [
     readOnlyHint: false,
     idempotentHint: true,
     destructiveHint: false,
-    openWorldHint: false
+    openWorldHint: false,
+    // Hosted delegations must arrive through the owner/request-bound OpenKey callback,
+    // not a caller-supplied import artifact.
+    surfaces: ["local"]
   },
   {
     name: "tinycloud_account_spaces_list",
@@ -787,6 +778,18 @@ var TOOL_BINDINGS = [
     idempotentHint: true,
     destructiveHint: false,
     openWorldHint: true
+  },
+  {
+    name: "tinycloud_secrets_status",
+    operationId: "tinycloud.secrets.status",
+    operationVersion: 1,
+    readOnlyHint: true,
+    idempotentHint: true,
+    destructiveHint: false,
+    openWorldHint: true,
+    // Hosted has no persistent reauthorization path for a revoked session
+    // yet (TC-896), so status is local/stdio only.
+    surfaces: ["local"]
   }
 ];
 function createJsonSchemaValidator() {
@@ -802,6 +805,7 @@ function registerTinyCloudTools(server, selection, validator) {
     ])
   );
   for (const binding of TOOL_BINDINGS) {
+    if (!bindingSurfaces(binding).includes(selection.surface)) continue;
     const operation = definitions.get(`${binding.operationId}@${binding.operationVersion}`);
     if (operation === void 0) {
       throw new Error(`Generated operations catalog is missing ${binding.operationId}@${binding.operationVersion}.`);
@@ -837,7 +841,7 @@ function registerTinyCloudTools(server, selection, validator) {
           input
         );
         const projected = selection.transformOperationResult === void 0 ? result : await selection.transformOperationResult(result);
-        return toMcpToolResult(projected);
+        return toMcpToolResult(projected, TOOL_BINDINGS);
       }
     );
   }
@@ -846,7 +850,7 @@ function registerTinyCloudTools(server, selection, validator) {
 // package.json
 var package_default = {
   name: "@tinycloud/mcp",
-  version: "0.4.1-beta.1",
+  version: "0.5.0-beta.10",
   description: "TinyCloud delegated operations MCP server",
   keywords: [
     "tinycloud",
@@ -917,9 +921,9 @@ var package_default = {
   dependencies: {
     "@modelcontextprotocol/node": "2.0.0-beta.4",
     "@modelcontextprotocol/server": "2.0.0-beta.4",
-    "@tinycloud/node-sdk": "3.2.0-beta.1",
+    "@tinycloud/node-sdk": "3.2.0-beta.9",
     "@tinycloud/node-sdk-wasm": "1.7.7",
-    "@tinycloud/operations": "0.5.0-beta.1",
+    "@tinycloud/operations": "0.5.0-beta.10",
     jose: "6.1.3"
   },
   devDependencies: {
@@ -973,6 +977,7 @@ function createHostedMcpApp(config) {
       }
     );
     registerTinyCloudTools(server, {
+      surface: "hosted",
       profile: "agent",
       explicitProfile: true,
       allowOwnerProfile: false,