@tinycloud/mcp 0.7.4-beta.1 → 0.8.0-beta.3

package/dist/index.js

@@ -10,7 +10,7 @@ import { serveStdio } from "@modelcontextprotocol/server/stdio";
 import { createRequire } from "module";
 import { join } from "path";
 import { fromJsonSchema } from "@modelcontextprotocol/server";
-import { addFormats, Ajv, AjvJsonSchemaValidator } from "@modelcontextprotocol/server/validators/ajv";
+import { AjvJsonSchemaValidator } from "@modelcontextprotocol/server/validators/ajv";
 import { invokeOperation } from "@tinycloud/operations";
 
 // src/results.ts
@@ -24,7 +24,7 @@ function toMcpToolResult(result, bindings = [], options = {}) {
   let serialized;
   if (options.surface === "hosted") {
     serialized = JSON.stringify(canonical);
-    if (options.readOnly === true && serialized.length > 1e5) {
+    if ((options.readOnly === true || options.operationId === "tinycloud.apps.context" || options.operationId === "tinycloud.apps.query") && serialized.length > 1e5) {
       const sql = options.operationId?.startsWith("tinycloud.sql.") || options.operationId === "tinycloud.apps.query";
       canonical = {
         status: "error",
@@ -92,6 +92,44 @@ function logToolCall(tool, code, startedAt, replayedGrants) {
 `);
 }
 
+// src/schemas.ts
+var DRAFT_7 = "http://json-schema.org/draft-07/schema#";
+var DRAFT_2020_12 = "https://json-schema.org/draft/2020-12/schema";
+var schemaMaps = /* @__PURE__ */ new Set(["properties", "patternProperties", "definitions", "$defs"]);
+var schemaArrays = /* @__PURE__ */ new Set(["allOf", "anyOf", "oneOf"]);
+var schemaValues = /* @__PURE__ */ new Set([
+  "additionalProperties",
+  "items",
+  "contains",
+  "propertyNames",
+  "not",
+  "if",
+  "then",
+  "else"
+]);
+function toMcpJsonSchema(schema) {
+  if (typeof schema === "boolean") return schema;
+  if (Array.isArray(schema.items) || "additionalItems" in schema || "dependencies" in schema || "$ref" in schema && Object.keys(schema).some((key) => key !== "$ref")) {
+    throw new Error("The operations schema needs a semantic migration to JSON Schema 2020-12.");
+  }
+  const projected = {};
+  for (const [key, value] of Object.entries(schema)) {
+    if (key === "$schema") {
+      if (value !== DRAFT_7) throw new Error(`Unsupported operations schema dialect: ${String(value)}.`);
+      projected[key] = DRAFT_2020_12;
+    } else if (schemaMaps.has(key)) {
+      projected[key] = Object.fromEntries(Object.entries(value).map(([name, child]) => [name, toMcpJsonSchema(child)]));
+    } else if (schemaArrays.has(key)) {
+      projected[key] = value.map(toMcpJsonSchema);
+    } else if (schemaValues.has(key)) {
+      projected[key] = toMcpJsonSchema(value);
+    } else {
+      projected[key] = value;
+    }
+  }
+  return projected;
+}
+
 // src/tools.ts
 var TOOL_NAMES = [
   "tinycloud_status",
@@ -134,9 +172,9 @@ var generatedCatalog = packageRequire(
 var stableErrorCodes = Object.fromEntries(
   generatedCatalog.stableErrors.map((code) => [code, true])
 );
-var ALL_SURFACES = ["local", "hosted"];
+var PRIVATE_SURFACES = ["local", "hosted"];
 function bindingSurfaces(binding) {
-  return binding.surfaces ?? ALL_SURFACES;
+  return binding.surfaces ?? PRIVATE_SURFACES;
 }
 var TOOL_BINDINGS = [
   {
@@ -320,11 +358,11 @@ var TOOL_BINDINGS = [
     name: "tinycloud_apps_context",
     operationId: "tinycloud.apps.context",
     operationVersion: 1,
-    readOnlyHint: true,
+    readOnlyHint: false,
     idempotentHint: true,
-    destructiveHint: false,
-    openWorldHint: true,
-    surfaces: ["hosted"]
+    destructiveHint: true,
+    openWorldHint: false,
+    surfaces: ["hosted", "public"]
   },
   {
     name: "tinycloud_apps_read",
@@ -333,8 +371,8 @@ var TOOL_BINDINGS = [
     readOnlyHint: true,
     idempotentHint: true,
     destructiveHint: false,
-    openWorldHint: true,
-    surfaces: ["hosted"]
+    openWorldHint: false,
+    surfaces: ["hosted", "public"]
   },
   {
     name: "tinycloud_apps_write",
@@ -343,34 +381,34 @@ var TOOL_BINDINGS = [
     readOnlyHint: false,
     idempotentHint: false,
     destructiveHint: true,
-    openWorldHint: true,
-    surfaces: ["hosted"]
+    openWorldHint: false,
+    surfaces: ["hosted", "public"]
   },
   {
     name: "tinycloud_apps_query",
     operationId: "tinycloud.apps.query",
     operationVersion: 1,
-    readOnlyHint: true,
+    readOnlyHint: false,
     idempotentHint: true,
-    destructiveHint: false,
-    openWorldHint: true,
-    surfaces: ["hosted"]
+    destructiveHint: true,
+    openWorldHint: false,
+    surfaces: ["hosted", "public"]
   }
 ];
+var definitions = new Map(generatedCatalog.operations.map((operation) => [
+  `${operation.id}@${operation.version}`,
+  {
+    ...operation,
+    input: toMcpJsonSchema(operation.input),
+    result: toMcpJsonSchema(operation.result)
+  }
+]));
 function createJsonSchemaValidator() {
-  const ajv = new Ajv({ strict: false });
-  addFormats(ajv);
-  return new AjvJsonSchemaValidator(ajv);
+  return new AjvJsonSchemaValidator();
 }
 function registerTinyCloudTools(server, selection, validator) {
-  const definitions = new Map(
-    generatedCatalog.operations.map((operation) => [
-      `${operation.id}@${operation.version}`,
-      operation
-    ])
-  );
-  for (const binding of TOOL_BINDINGS) {
-    if (!bindingSurfaces(binding).includes(selection.surface)) continue;
+  const bindings = TOOL_BINDINGS.filter((binding) => bindingSurfaces(binding).includes(selection.surface));
+  for (const binding of bindings) {
     const operation = definitions.get(`${binding.operationId}@${binding.operationVersion}`);
     if (operation === void 0) {
       throw new Error(`Generated operations catalog is missing ${binding.operationId}@${binding.operationVersion}.`);
@@ -416,15 +454,15 @@ function registerTinyCloudTools(server, selection, validator) {
             operationVersion: binding.operationVersion,
             input
           });
-          const response = toMcpToolResult(projected, TOOL_BINDINGS, {
-            surface: selection.surface,
+          const response = toMcpToolResult(projected, bindings, {
+            surface: selection.surface === "local" ? "local" : "hosted",
             readOnly: binding.readOnlyHint,
             operationId: binding.operationId
           });
           code = outcomeCode(response.structuredContent);
           return response;
         } finally {
-          if (selection.surface === "hosted") {
+          if (selection.surface !== "local") {
             logToolCall(binding.name, code, startedAt, metrics.replayedGrants);
           }
         }
@@ -447,7 +485,7 @@ function outcomeCode(result) {
 // package.json
 var package_default = {
   name: "@tinycloud/mcp",
-  version: "0.7.4-beta.1",
+  version: "0.8.0-beta.3",
   description: "TinyCloud delegated operations MCP server",
   keywords: [
     "tinycloud",
@@ -518,9 +556,9 @@ var package_default = {
   dependencies: {
     "@modelcontextprotocol/node": "2.0.0-beta.5",
     "@modelcontextprotocol/server": "2.0.0-beta.5",
-    "@tinycloud/node-sdk": "3.6.0-beta.2",
+    "@tinycloud/node-sdk": "3.6.0-beta.3",
     "@tinycloud/node-sdk-wasm": "1.7.8",
-    "@tinycloud/operations": "0.7.4-beta.1",
+    "@tinycloud/operations": "0.7.4-beta.3",
     jose: "6.2.4"
   },
   devDependencies: {
@@ -659,6 +697,7 @@ if (isDirectInvocation()) {
 }
 
 // src/http.ts
+import { join as join3 } from "path";
 import {
   McpServer as McpServer2,
   createMcpHandler,
@@ -1001,7 +1040,7 @@ var RemoteTenantStore = class {
   async approvalRedirect(state) {
     const pending = await this.#readPending(state, false);
     const tenant = await this.#readTenant(pending.tenantId);
-    const callback = new URL("/connect/callback", this.#config.publicUrl);
+    const callback = new URL(`${this.#config.approvalPath ?? "/connect"}/callback`, this.#config.publicUrl);
     callback.searchParams.set("state", state);
     const params = new URLSearchParams({
       did: tenant.sessionDid,
@@ -1420,7 +1459,7 @@ var RemoteTenantStore = class {
     await rename(`${path}.processing`, path);
   }
   #connectUrl(pending) {
-    const url = new URL("/connect", this.#config.publicUrl);
+    const url = new URL(this.#config.approvalPath ?? "/connect", this.#config.publicUrl);
     url.searchParams.set("state", `${pending.tenantId}.${pending.nonce}.${this.#signState(pending.tenantId, pending.nonce)}`);
     return url.toString();
   }
@@ -1581,6 +1620,29 @@ function samePendingRequest(pending, expected) {
 var REQUIRED_SCOPE = "tinycloud:mcp";
 function createHostedMcpApp(config) {
   const resourceUrl = canonicalResourceUrl(config.publicUrl);
+  const pluginUrl = new URL("./chatgpt/mcp", resourceUrl);
+  const hosted = createHostedSurface(config, resourceUrl, "hosted");
+  const plugin = createHostedSurface({
+    ...config,
+    stateDir: join3(config.stateDir, "chatgpt"),
+    approvalPath: new URL("./connect", pluginUrl).pathname
+  }, pluginUrl, "public");
+  const pluginPaths = {
+    [pluginUrl.pathname]: true,
+    [new URL("./connect", pluginUrl).pathname]: true,
+    [new URL("./connect/callback", pluginUrl).pathname]: true,
+    [new URL(getOAuthProtectedResourceMetadataUrl(pluginUrl)).pathname]: true
+  };
+  return {
+    fetch: (request) => (pluginPaths[new URL(request.url).pathname] === true ? plugin : hosted).fetch(request),
+    close: async () => {
+      await Promise.all([hosted.close(), plugin.close()]);
+    }
+  };
+}
+function createHostedSurface(config, resourceUrl, surface) {
+  const connectPath = config.approvalPath ?? "/connect";
+  const callbackPath = `${connectPath}/callback`;
   const issuer = String(config.oauthMetadata.issuer);
   const jwksUri = String(config.oauthMetadata.jwks_uri);
   const verifier = createOpenKeyTokenVerifier({
@@ -1605,11 +1667,11 @@ function createHostedMcpApp(config) {
       { name: MCP_SERVER_NAME, version: MCP_VERSION },
       {
         jsonSchemaValidator: validator,
-        instructions: "Call tinycloud_connect first. If an operation returns authority_required, open approval.url, then retry that operation unchanged. For personal records such as weight, workouts, goals or todos, call tinycloud_apps_context first."
+        instructions: surface === "public" ? "Use TinyCloud only for the user's requested task. Call tinycloud_connect first. If an operation returns authority_required, present approval.url and wait for the user's approval before retrying. If approval is declined, stop that operation. For personal records, call tinycloud_apps_context first. Never request or store passwords, API keys, authentication codes, government identifiers, payment-card data, or protected health information." : "Call tinycloud_connect first. If an operation returns authority_required, open approval.url, then retry that operation unchanged. For personal records such as weight, workouts, goals or todos, call tinycloud_apps_context first."
       }
     );
     registerTinyCloudTools(server, {
-      surface: "hosted",
+      surface,
       profile: "agent",
       explicitProfile: true,
       allowOwnerProfile: false,
@@ -1617,7 +1679,7 @@ function createHostedMcpApp(config) {
       beforeOperation: () => store.validateTenant(subject, ownerDids),
       transformOperationResult: (result, invocation) => store.decorateAuthorityResult(subject, ownerDids, result, invocation)
     }, validator);
-    registerConnectTool(server, validator, store, identity);
+    registerConnectTool(server, validator, store, identity, surface);
     return server;
   }, {
     legacy: "stateless",
@@ -1628,7 +1690,7 @@ function createHostedMcpApp(config) {
     resourceServerUrl: resourceUrl,
     serviceDocumentationUrl: new URL("https://docs.tinycloud.xyz/cli/mcp"),
     scopesSupported: [REQUIRED_SCOPE],
-    resourceName: "TinyCloud hosted MCP"
+    resourceName: surface === "public" ? "TinyCloud personal records" : "TinyCloud hosted MCP"
   };
   const allowedHosts = [resourceUrl.hostname];
   return {
@@ -1641,16 +1703,32 @@ function createHostedMcpApp(config) {
       }
       const hostFailure = hostHeaderValidationResponse(request, allowedHosts);
       if (hostFailure !== void 0) return hostFailure;
-      if (url.pathname === "/connect") {
+      if (url.pathname === connectPath) {
         if (request.method !== "GET") return methodNotAllowed("GET");
         try {
           const destination = await store.approvalRedirect(requiredState(url));
           return Response.redirect(destination, 302);
         } catch {
+          if (request.headers.get("accept")?.includes("text/html")) {
+            return new Response(
+              '<!doctype html><html lang="en"><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>TinyCloud approval unavailable</title><main><h1>This approval link is unavailable</h1><p>It may have expired or already been used. No new approval was accepted through this link.</p><p>Return to the conversation that requested access. In ChatGPT, select @TinyCloud and ask it to continue your original request. If access is still needed, it can provide a fresh approval link.</p><p>If you declined access, no further approval is required. Never paste passwords, codes or approval links into support messages.</p></main></html>',
+              {
+                status: 400,
+                headers: {
+                  "content-type": "text/html; charset=utf-8",
+                  "cache-control": "no-store",
+                  "content-security-policy": "default-src 'none'; base-uri 'none'; frame-ancestors 'none'",
+                  "referrer-policy": "no-referrer",
+                  "x-content-type-options": "nosniff",
+                  vary: "Accept"
+                }
+              }
+            );
+          }
           return json({ error: "The approval link is invalid or expired." }, 400);
         }
       }
-      if (url.pathname === "/connect/callback") {
+      if (url.pathname === callbackPath) {
         if (request.method === "OPTIONS") return callbackCors(new Response(null, { status: 204 }), config.openkeyHost);
         if (request.method !== "POST") return methodNotAllowed("POST");
         const originFailure2 = validateCallbackOrigin(request, config.openkeyHost);
@@ -1690,17 +1768,17 @@ function createHostedMcpApp(config) {
     close: () => handler.close()
   };
 }
-function registerConnectTool(server, validator, store, identity) {
+function registerConnectTool(server, validator, store, identity, surface) {
   const inputSchema = fromJsonSchema2({ type: "object", properties: {}, additionalProperties: false }, validator);
   const outputSchema = fromJsonSchema2({
     type: "object",
     properties: {
       connected: { type: "boolean" },
-      sessionDid: { type: "string" },
+      ...surface === "hosted" ? { sessionDid: { type: "string" } } : {},
       approvalUrl: { type: "string", format: "uri" },
       expiresAt: { type: "string", format: "date-time" }
     },
-    required: ["connected", "sessionDid"],
+    required: surface === "hosted" ? ["connected", "sessionDid"] : ["connected"],
     additionalProperties: false
   }, validator);
   server.registerTool(
@@ -1714,7 +1792,7 @@ function registerConnectTool(server, validator, store, identity) {
         readOnlyHint: false,
         idempotentHint: true,
         destructiveHint: false,
-        openWorldHint: true
+        openWorldHint: false
       }
     },
     async () => {
@@ -1723,12 +1801,17 @@ function registerConnectTool(server, validator, store, identity) {
       try {
         const status = await store.connectStatus(identity.subject, identity.ownerDids);
         code = status.connected ? "ok" : "authority_required";
+        const visibleStatus = surface === "hosted" ? status : {
+          connected: status.connected,
+          ...status.approvalUrl === void 0 ? {} : { approvalUrl: status.approvalUrl },
+          ...status.expiresAt === void 0 ? {} : { expiresAt: status.expiresAt }
+        };
         return {
           content: [{
             type: "text",
             text: status.connected ? "TinyCloud is connected." : `TinyCloud approval is required. Open ${status.approvalUrl}, then call this tool again. This link expires at ${status.expiresAt}.`
           }],
-          structuredContent: status
+          structuredContent: visibleStatus
         };
       } finally {
         logToolCall("tinycloud_connect", code, startedAt, 0);