@suveren/gateway 0.2.9 → 0.2.11

package/dist/control-plane/index.mjs

@@ -270,6 +270,12 @@ async function resyncGates() {
   }
   return res.json();
 }
+async function runCommittedProposals() {
+  await fetch(`${MCP_BASE}/internal/run-committed`, {
+    method: "POST",
+    headers: internalHeaders()
+  });
+}
 async function getIntegrations() {
   const res = await fetch(`${MCP_BASE}/internal/integrations`, {
     headers: internalHeaders()
@@ -1935,6 +1941,8 @@ app.use(
           eventBus.emit("proposal-added");
         } else if (method === "POST" && /^\/api\/proposals\/[^/]+\/resolve$/.test(path)) {
           eventBus.emit("proposal-resolved");
+          void runCommittedProposals().catch(() => {
+          });
         } else if (method === "POST" && /^\/api\/proposals\/[^/]+\/approve$/.test(path)) {
           eventBus.emit("proposal-approved");
         } else if (method === "POST" && /^\/api\/proposals\/[^/]+\/reject$/.test(path)) {

package/dist/mcp-server/http.mjs

@@ -902,12 +902,12 @@ function buildMandateBrief(opts) {
 }
 
 // src/tools/authorizations.ts
-import { getProfile as getProfile2 } from "@hap/core";
+import { getProfile as getProfile3 } from "@hap/core";
 
 // src/lib/receipt-footer.ts
 var AS_BASE = (process.env.SUVEREN_AS_URL ?? "https://www.suveren.ai").replace(/\/$/, "");
 var FOOTER_PROFILES = /* @__PURE__ */ new Set(["email", "calendar", "publish"]);
-var CONTENT_FIELD_CANDIDATES = ["body", "text", "description"];
+var CONTENT_FIELD_CANDIDATES = ["body", "text", "description", "content"];
 var FOOTER_MARKER = "\u2014 Sent by an AI agent via Suveren";
 function shouldAttachFooter() {
   return true;
@@ -940,18 +940,51 @@ function stripFooter(value) {
 function appendVerificationFooter(tool, args, receiptId) {
   const profile = tool.gating?.profile;
   if (!profile || !FOOTER_PROFILES.has(profile)) return args;
-  if (typeof args.raw === "string" && args.raw.trim().length > 0) {
-    console.error(
-      `[Suveren MCP] ${tool.namespacedName}: 'raw' message present \u2014 skipping verification footer.`
-    );
-    return args;
-  }
   const field = detectContentField(tool);
   if (!field) return args;
   const current = typeof args[field] === "string" ? args[field] : "";
   return { ...args, [field]: stripFooter(current) + footerText(receiptId) };
 }
 
+// src/lib/content-binding.ts
+import { createHash } from "crypto";
+import { canonicalize, getProfile as getProfile2 } from "@hap/core";
+function canonicalizeText(input) {
+  const nfc = input.normalize("NFC");
+  const lf = nfc.replace(/\r\n?/g, "\n");
+  const lines = lf.split("\n").map((line) => line.replace(/[ \t]+$/, ""));
+  return lines.join("\n").replace(/\n+$/, "");
+}
+function sha256Hex(bytes) {
+  return createHash("sha256").update(bytes, "utf8").digest("hex");
+}
+function getContentBinding(profileId) {
+  const profile = getProfile2(profileId);
+  return profile?.content_binding;
+}
+function computeContentBinding(profileId, tool, toolArgs) {
+  const binding = getContentBinding(profileId);
+  if (!binding) return void 0;
+  let canonicalBytes;
+  if (binding.kind === "jcs") {
+    canonicalBytes = canonicalize(toolArgs);
+  } else {
+    const field = tool ? detectContentField(tool) : null;
+    if (!field) return void 0;
+    const raw = typeof toolArgs[field] === "string" ? toolArgs[field] : "";
+    canonicalBytes = canonicalizeText(raw);
+  }
+  return {
+    contentHash: `sha256:${sha256Hex(canonicalBytes)}`,
+    contentBinding: { version: binding.version, kind: binding.kind }
+  };
+}
+function attachReceiptId(tool, args, receiptId) {
+  const schema = tool.inputSchema;
+  if (!schema?.properties || !("receipt_id" in schema.properties)) return args;
+  return { ...args, receipt_id: receiptId };
+}
+
 // src/lib/tool-proxy.ts
 import { readFile } from "fs/promises";
 import { extname } from "path";
@@ -1120,6 +1153,7 @@ Proposal ID: ${proposal.id}. Check status with check-pending-commitments(proposa
               `[Suveren MCP] Warning: tool ${tool.namespacedName} has no action_type in staticExecution. Bounds check may be skipped. Fix the integration manifest.`
             );
           }
+          const binding = computeContentBinding(auth.profileId, tool, args);
           const { receipt } = await state2.spClient.postReceipt({
             // v0.5: send the bare content address; the AS reconstructs the
             // per-user storage key. Fall back to frameHash only for legacy
@@ -1130,7 +1164,8 @@ Proposal ID: ${proposal.id}. Check status with check-pending-commitments(proposa
             actionType,
             executionContext: { ...execution },
             amount: typeof execution.amount === "number" ? execution.amount : void 0,
-            idempotencyKey: randomUUID()
+            idempotencyKey: randomUUID(),
+            ...binding ?? {}
           });
           receiptId = typeof receipt?.id === "string" ? receipt.id : void 0;
         } catch (err) {
@@ -1210,7 +1245,8 @@ Proposal ID: ${proposal.id}. Use check-pending-commitments to track status.`
           execution: { ...execution },
           timestamp: Math.floor(Date.now() / 1e3)
         });
-        const outgoingArgs = shouldAttachFooter() && receiptId ? appendVerificationFooter(tool, args, receiptId) : args;
+        let outgoingArgs = shouldAttachFooter() && receiptId ? appendVerificationFooter(tool, args, receiptId) : args;
+        if (receiptId) outgoingArgs = attachReceiptId(tool, outgoingArgs, receiptId);
         return integrationManager2.callTool(tool.integrationId, tool.originalName, outgoingArgs);
       }
       const reasons = result.errors.map((e) => {
@@ -1287,7 +1323,9 @@ function buildCapabilityMap(profileId, toolGating, integrationManager2) {
     } else if (override !== void 0) {
       const mappingDesc = Object.entries(override.executionMapping ?? {}).map(([arg, mapping]) => {
         if (typeof mapping === "string") return `${mapping} from ${arg}`;
-        return `${mapping.field} from ${arg} (/${mapping.divisor})`;
+        if (Array.isArray(mapping)) return `${mapping.map((m) => m.field).join("+")} from ${arg}`;
+        if ("divisor" in mapping) return `${mapping.field} from ${arg} (/${mapping.divisor})`;
+        return `${mapping.field} from ${arg}`;
       }).join(", ");
       const actionType = override.staticExecution?.action_type ?? "unknown";
       gated.push(`      - ${tool.originalName}: ${actionType}${mappingDesc ? `, ${mappingDesc}` : ""}`);
@@ -1353,7 +1391,7 @@ function listAuthorizationsHandler(state2, integrationManager2, contextDir) {
         output2.push("");
         output2.push(`  Bounds: ${boundsDesc}`);
         const shortName = shortProfileName2(auth.profileId);
-        const profile = getProfile2(auth.profileId) ?? getProfile2(shortName);
+        const profile = getProfile3(auth.profileId) ?? getProfile3(shortName);
         if (profile) {
           const consumption = getConsumptionState(auth, state2.executionLog, profile);
           const consumptionText = formatConsumptionFull(consumption);
@@ -1406,7 +1444,7 @@ function listAuthorizationsHandler(state2, integrationManager2, contextDir) {
         const lines = [`  [${auth.path}] ${auth.profileId} \u2014 ${remainingMin} min remaining`];
         lines.push(`    Bounds: ${boundsDesc}`);
         const shortName = shortProfileName2(auth.profileId);
-        const profile = getProfile2(auth.profileId) ?? getProfile2(shortName);
+        const profile = getProfile3(auth.profileId) ?? getProfile3(shortName);
         if (profile) {
           const consumption = getConsumptionState(auth, state2.executionLog, profile);
           const compact = formatConsumptionCompact(consumption);
@@ -1547,15 +1585,18 @@ async function executeCommitted(proposal, state2, integrationManager2) {
   }
   const integrationId = proposal.tool.slice(0, sep);
   const toolName = proposal.tool.slice(sep + 2);
+  const discovered = integrationManager2.getAllTools().find((t) => t.integrationId === integrationId && t.originalName === toolName);
   const proposalActionType = typeof proposal.executionContext.action_type === "string" ? proposal.executionContext.action_type : void 0;
   if (!proposalActionType) {
     console.error(
       `[Suveren MCP] Warning: proposal ${proposal.id} has no action_type in executionContext. Bounds check may be skipped. Fix the integration manifest for ${proposal.tool}.`
     );
   }
+  let receiptId;
   try {
     const boundsHash = proposal.frameHash.split(":").slice(0, 2).join(":");
-    await state2.spClient.postReceipt({
+    const binding = computeContentBinding(proposal.profileId, discovered, proposal.toolArgs);
+    const { receipt } = await state2.spClient.postReceipt({
       boundsHash,
       profileId: proposal.profileId,
       action: proposal.tool,
@@ -1563,8 +1604,10 @@ async function executeCommitted(proposal, state2, integrationManager2) {
       executionContext: proposal.executionContext,
       amount: typeof proposal.executionContext.amount === "number" ? proposal.executionContext.amount : void 0,
       proposalId: proposal.id,
-      toolArgs: proposal.toolArgs
+      toolArgs: proposal.toolArgs,
+      ...binding ?? {}
     });
+    receiptId = typeof receipt?.id === "string" ? receipt.id : void 0;
   } catch (err) {
     if (err instanceof SPReceiptError) {
       const code = err.body.errors?.[0]?.code;
@@ -1584,7 +1627,20 @@ async function executeCommitted(proposal, state2, integrationManager2) {
     };
   }
   try {
-    const result = await integrationManager2.callTool(integrationId, toolName, proposal.toolArgs);
+    let outgoingArgs = proposal.toolArgs;
+    if (discovered && receiptId) {
+      if (shouldAttachFooter()) {
+        outgoingArgs = appendVerificationFooter(discovered, outgoingArgs, receiptId);
+      }
+      outgoingArgs = attachReceiptId(discovered, outgoingArgs, receiptId);
+    }
+    const result = await integrationManager2.callTool(integrationId, toolName, outgoingArgs);
+    state2.executionLog.record({
+      profileId: proposal.profileId,
+      path: proposal.path,
+      execution: proposal.executionContext,
+      timestamp: Math.floor(Date.now() / 1e3)
+    });
     const resultText = result.content?.[0]?.text ?? JSON.stringify(result);
     return { text: `Proposal ${proposal.id} committed and executed.
 Result: ${resultText}` };
@@ -1810,10 +1866,10 @@ function createMcpServer(state2, integrationManager2) {
 }
 
 // src/lib/gate-content.ts
-import { createHash } from "crypto";
+import { createHash as createHash2 } from "crypto";
 import { decodeAttestationBlob } from "@hap/core";
 function hashGateContent(text) {
-  const hex = createHash("sha256").update(text, "utf-8").digest("hex");
+  const hex = createHash2("sha256").update(text, "utf-8").digest("hex");
   return `sha256:${hex}`;
 }
 function verifyGateContentHashes(content, auth) {
@@ -1887,15 +1943,14 @@ var IntegrationRegistry = class {
       const migrated = data.integrations.map((i) => {
         if ("toolGating" in i && !("profile" in i)) {
           const old = i;
-          const toolGating = old.toolGating;
           const config = {
-            id: i.id,
-            name: i.name,
-            command: i.command,
-            args: i.args,
-            envKeys: i.envKeys,
-            profile: toolGating?.profile ?? null,
-            enabled: i.enabled
+            id: old.id,
+            name: old.name,
+            command: old.command,
+            args: old.args,
+            envKeys: old.envKeys,
+            profile: old.toolGating?.profile ?? null,
+            enabled: old.enabled
           };
           return config;
         }
@@ -1924,7 +1979,7 @@ import { existsSync as existsSync5, writeFileSync as writeFileSync4, mkdirSync a
 import { execSync } from "child_process";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
-import { getProfile as getProfile3 } from "@hap/core";
+import { getProfile as getProfile4 } from "@hap/core";
 var DEFAULT_DATA_DIR2 = process.env.SUVEREN_DATA_DIR ?? join5(homedir5(), ".suveren");
 var INTEGRATIONS_DIR = process.env.SUVEREN_INTEGRATIONS_DIR ?? join5(DEFAULT_DATA_DIR2, "integrations");
 var INTEGRATIONS_BIN = join5(INTEGRATIONS_DIR, "node_modules", ".bin");
@@ -2009,7 +2064,7 @@ var IntegrationManager = class {
     await client.connect(transport);
     console.error(`[IntegrationManager] Connected to ${config.id} (${config.command} ${config.args.join(" ")})`);
     const toolsResult = await client.listTools();
-    const profileGating = config.toolGating ?? (config.profile ? getProfile3(config.profile)?.toolGating ?? null : null);
+    const profileGating = config.toolGating ?? (config.profile ? getProfile4(config.profile)?.toolGating ?? null : null);
     const tools = (toolsResult.tools ?? []).map((tool) => {
       const gating = this.resolveToolGating(config.profile, profileGating, tool.name);
       return {
@@ -2406,7 +2461,8 @@ app.post("/internal/gate-content", internalOnly, async (req, res) => {
     const { frameHash, boundsHash, contextHash, context, path: rawPath, gateContent } = req.body;
     const storageHash = frameHash ?? boundsHash;
     const hasIntent = !!gateContent?.intent;
-    const hasLegacy = !!gateContent?.problem && !!gateContent?.objective && !!gateContent?.tradeoffs;
+    const legacy = gateContent;
+    const hasLegacy = !!legacy?.problem && !!legacy?.objective && !!legacy?.tradeoffs;
     if (!storageHash || !hasIntent && !hasLegacy) {
       res.status(400).json({ error: "Missing required fields: frameHash (or boundsHash), gateContent.{intent} or gateContent.{problem,objective,tradeoffs}" });
       return;
@@ -2462,6 +2518,12 @@ app.post("/internal/start-pending-integrations", internalOnly, async (_req, res)
     res.status(500).json({ error: err instanceof Error ? err.message : String(err) });
   }
 });
+var triggerCommittedExecution = () => {
+};
+app.post("/internal/run-committed", internalOnly, (_req, res) => {
+  triggerCommittedExecution();
+  res.json({ ok: true });
+});
 app.post("/internal/resync-gates", internalOnly, async (_req, res) => {
   const gates = state.gateStore.getAll();
   if (gates.length === 0) {
@@ -2763,59 +2825,10 @@ app.listen(port, "0.0.0.0", () => {
       const committed = await state.spClient.getCommittedProposals();
       for (const proposal of committed) {
         try {
-          let integrationId;
-          let toolName;
-          if (proposal.tool.includes("___")) {
-            const parts = proposal.tool.split("___");
-            if (parts.length !== 2) {
-              console.error(`[Suveren MCP] Invalid tool name in proposal ${proposal.id}: ${proposal.tool}`);
-              continue;
-            }
-            [integrationId, toolName] = parts;
-          } else {
-            const sep = proposal.tool.indexOf("__");
-            if (sep < 0) {
-              console.error(`[Suveren MCP] Invalid tool name in proposal ${proposal.id}: ${proposal.tool}`);
-              continue;
-            }
-            integrationId = proposal.tool.slice(0, sep);
-            toolName = proposal.tool.slice(sep + 2);
-          }
-          const proposalActionType = typeof proposal.executionContext.action_type === "string" ? proposal.executionContext.action_type : void 0;
-          if (!proposalActionType) {
-            console.error(
-              `[Suveren MCP] Warning: proposal ${proposal.id} has no action_type in executionContext. Bounds check may be skipped. Fix the integration manifest for ${proposal.tool}.`
-            );
-          }
-          try {
-            await state.spClient.postReceipt({
-              attestationHash: proposal.frameHash,
-              profileId: proposal.profileId,
-              path: proposal.path,
-              action: proposal.tool,
-              actionType: proposalActionType,
-              executionContext: proposal.executionContext,
-              amount: typeof proposal.executionContext.amount === "number" ? proposal.executionContext.amount : void 0,
-              proposalId: proposal.id,
-              toolArgs: proposal.toolArgs
-            });
-          } catch (err) {
-            console.error(`[Suveren MCP] Receipt failed for proposal ${proposal.id}:`, err instanceof Error ? err.message : err);
-            continue;
-          }
-          try {
-            await integrationManager.callTool(integrationId, toolName, proposal.toolArgs);
-          } catch (err) {
-            console.error(`[Suveren MCP] Tool execution failed for proposal ${proposal.id} after receipt issued:`, err);
-            continue;
-          }
-          state.executionLog.record({
-            profileId: proposal.profileId,
-            path: proposal.path,
-            execution: proposal.executionContext,
-            timestamp: Math.floor(Date.now() / 1e3)
-          });
-          console.error(`[Suveren MCP] Auto-executed proposal ${proposal.id}: ${proposal.tool}`);
+          const { text, isError } = await executeCommitted(proposal, state, integrationManager);
+          console.error(
+            isError ? `[Suveren MCP] Auto-exec proposal ${proposal.id}: ${text}` : `[Suveren MCP] Auto-executed proposal ${proposal.id}: ${proposal.tool}`
+          );
         } catch (err) {
           console.error(`[Suveren MCP] Failed to execute proposal ${proposal.id}:`, err);
         }
@@ -2824,4 +2837,7 @@ app.listen(port, "0.0.0.0", () => {
     }
   }
   setInterval(executeCommittedProposals, PROPOSAL_POLL_INTERVAL);
+  triggerCommittedExecution = () => {
+    void executeCommittedProposals();
+  };
 });