@tinycloud/mcp 0.8.0-beta.6 → 0.8.0-beta.7

package/dist/index.cjs

@@ -522,7 +522,7 @@ function outcomeCode(result) {
 // package.json
 var package_default = {
   name: "@tinycloud/mcp",
-  version: "0.8.0-beta.6",
+  version: "0.8.0-beta.7",
   description: "TinyCloud delegated operations MCP server",
   keywords: [
     "tinycloud",
@@ -895,9 +895,9 @@ var RemoteTenantStore = class {
   }
   async connectStatus(subject, ownerDids = []) {
     const tenant = await this.#ensureTenant(subject);
-    if (await this.#hasValidSession(tenant, ownerDids, true)) {
-      return { connected: true, sessionDid: tenant.sessionDid };
-    }
+    const state = await this.#sessionState(tenant, ownerDids, true);
+    if (state === "valid") return { connected: true, sessionDid: tenant.sessionDid };
+    if (state === "unknown") return { connected: false, sessionDid: tenant.sessionDid };
     const pending = await this.#createPending(subject, ownerDids, "bootstrap", BOOTSTRAP_PERMISSIONS);
     return {
       connected: false,
@@ -1237,7 +1237,10 @@ var RemoteTenantStore = class {
     return initializing;
   }
   async #hasValidSession(tenant, ownerDids, fresh = false) {
-    if (this.#renewalRequired.has(tenant.stateRoot)) return false;
+    return await this.#sessionState(tenant, ownerDids, fresh) !== "invalid";
+  }
+  async #sessionState(tenant, ownerDids, fresh = false) {
+    if (this.#renewalRequired.has(tenant.stateRoot)) return "invalid";
     const key = JSON.stringify([tenant.stateRoot, ownerDids.map(normalizeDid), fresh]);
     const current = this.#sessionChecks.get(key);
     if (current) return current;
@@ -1254,9 +1257,9 @@ var RemoteTenantStore = class {
     } catch (error) {
       if (!(error instanceof SyntaxError)) throw error;
       await this.#clearAuthority(tenant);
-      return false;
+      return "invalid";
     }
-    if (raw === null) return false;
+    if (raw === null) return "invalid";
     const node = new import_node_sdk2.TinyCloudNode({ host: this.#config.nodeHost });
     try {
       await node.restoreSession(raw);
@@ -1265,11 +1268,11 @@ var RemoteTenantStore = class {
       const signedExpiry = typeof header === "string" ? (0, import_node_sdk2.signedCompactUcanExpiry)(header) : void 0;
       const siweExpiry = typeof raw.siwe === "string" ? /^Expiration Time: ([^\r\n]+)\r?$/m.exec(raw.siwe)?.[1] : void 0;
       const expiry = signedExpiry ?? (siweExpiry === void 0 ? void 0 : new Date(siweExpiry));
-      if (expiry !== void 0 && expiry.getTime() <= Date.now()) return false;
+      if (expiry !== void 0 && expiry.getTime() <= Date.now()) return "invalid";
       await this.#clearAuthority(tenant);
-      return false;
+      return "invalid";
     }
-    if (!samePrincipal(node.sessionDid, tenant.sessionDid) || !ownerDids.some((did) => samePrincipal(node.did, did))) return false;
+    if (!samePrincipal(node.sessionDid, tenant.sessionDid) || !ownerDids.some((did) => samePrincipal(node.did, did))) return "invalid";
     const additional = await readJson(this.#additionalPath(tenant.stateRoot));
     const cids = [raw.delegationCid];
     if (additional !== null) {
@@ -1284,7 +1287,7 @@ var RemoteTenantStore = class {
     }
     const fingerprint = cids.join("\n");
     const cached = this.#activeSessions.get(tenant.stateRoot);
-    if (!fresh && cached?.cids === fingerprint && cached.until > Date.now()) return true;
+    if (!fresh && cached?.cids === fingerprint && cached.until > Date.now()) return "valid";
     let timer;
     const timeout = new Promise((resolve) => {
       timer = setTimeout(() => resolve(void 0), 2e3);
@@ -1297,13 +1300,14 @@ var RemoteTenantStore = class {
     const refusal = probe !== void 0 && !probe.ok ? (0, import_mcp_authority.nodeRevocationOf)(probe.error) : void 0;
     if (refusal !== void 0 && (refusal.revokedCid === raw.delegationCid || refusal.reason === "delegation_ancestor_revoked" && refusal.ancestorCid === raw.delegationCid)) {
       await this.#clearAuthority(tenant);
-      return false;
+      return "invalid";
     }
-    if (this.#renewalRequired.has(tenant.stateRoot)) return false;
+    if (this.#renewalRequired.has(tenant.stateRoot)) return "invalid";
     if (probe?.ok) {
       this.#activeSessions.set(tenant.stateRoot, { cids: fingerprint, until: Date.now() + 3e4 });
+      return "valid";
     }
-    return true;
+    return "unknown";
   }
   async #clearAuthority(tenant) {
     const current = this.#clearing.get(tenant.stateRoot);
@@ -1815,19 +1819,26 @@ function registerConnectTool(server, validator, store, identity, surface) {
     async () => {
       const startedAt = performance.now();
       let code = "INTERNAL_ERROR";
+      let text;
       try {
         const status = await store.connectStatus(identity.subject, identity.ownerDids);
-        code = status.connected ? "ok" : "authority_required";
+        if (status.connected) {
+          code = "ok";
+          text = "TinyCloud is connected.";
+        } else if (status.approvalUrl === void 0) {
+          code = "unavailable";
+          text = "TinyCloud is unavailable. Call this tool again shortly.";
+        } else {
+          code = "authority_required";
+          text = `TinyCloud approval is required. Open ${status.approvalUrl}, then call this tool again. This link expires at ${status.expiresAt}.`;
+        }
         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}.`
-          }],
+          content: [{ type: "text", text }],
           structuredContent: visibleStatus
         };
       } finally {