@suveren/gateway 0.35.2 → 0.36.0

package/bin/suveren-gateway.js

@@ -16,7 +16,7 @@ import { existsSync, mkdirSync, openSync, readFileSync, readdirSync, writeFileSy
 import { homedir, platform, userInfo } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-import { buildLaunchAgentPlist, buildMacLauncher, buildSystemdUnit, buildWindowsTaskXml } from '../lib/autostart-templates.mjs';
+import { buildLaunchAgentPlist, buildMacLauncher, buildSystemdUnit, buildWindowsTaskXml, serviceOwnsInstall } from '../lib/autostart-templates.mjs';
 import { DEFAULT_AS_URL, readConfig, writeConfig, validateAsUrl, validateCaFile, validateProxyUrl, validatePinTls, resolveAsUrl, resolvePinTls, resolvePinTlsExpectedFingerprint, resolveSimulation } from '../lib/config.mjs';
 import { createInterface } from 'node:readline/promises';
 import { readPairing as readAsPairing, recordTlsPin, formatFingerprint, normalizeFingerprint } from '../lib/as-pairing.mjs';
@@ -1038,7 +1038,27 @@ const LAUNCH_AGENT_LABEL = 'ai.suveren.gateway';
  * it could not see. Every command has to know about the service the same CLI
  * installs.
  */
+function serviceDefinitionText() {
+  const os = platform();
+  const file = os === 'darwin' ? launchAgentPath() : os === 'linux' ? systemdUnitPath() : null;
+  if (!file) return null;
+  try { return existsSync(file) ? readFileSync(file, 'utf8') : null; } catch { return null; }
+}
+
+/** The login service runs this CLI's installation — see serviceOwnsInstall. */
+function serviceIsOurs() {
+  return serviceOwnsInstall({
+    definitionText: serviceDefinitionText(),
+    dataDir: DATA_DIR,
+    envDataDir: process.env.SUVEREN_DATA_DIR,
+    same: (a, b) => resolve(a) === resolve(b),
+  });
+}
+
 function serviceRunning() {
+  // Another installation's service (a second gateway under this OS user) is
+  // not "running" for this CLI — never stop, restart or report it as ours.
+  if (!serviceIsOurs()) return false;
   const os = platform();
   if (os === 'darwin') {
     const p = runQuiet('launchctl', ['print', `gui/${process.getuid()}/${LAUNCH_AGENT_LABEL}`]);
@@ -1104,6 +1124,13 @@ async function service(args) {
     process.exit(2);
   }
 
+  if ((sub === 'install' || sub === 'uninstall') && !serviceIsOurs()) {
+    console.error('The login service on this account belongs to another Suveren gateway installation');
+    console.error(`(a different data folder than ${DATA_DIR}). Refusing to change it.`);
+    console.error('Run this installation in the background with:  suveren-gateway start --detach');
+    process.exit(2);
+  }
+
   switch (sub) {
     case 'install':   await impl.install(); break;
     case 'uninstall': await impl.uninstall(); break;

package/content/integrations/calendar.json

@@ -122,6 +122,7 @@
         }
       },
       "create_event": {
+        "message": { "text": "description", "verb": "Sent" },
         "summary": "Event: {summary|short}[ on {start.dateTime,start.date|date}]",
         "executionMapping": {
           "duration_minutes": "duration",
@@ -144,6 +145,7 @@
         "actionLabel": "Event created"
       },
       "update_event": {
+        "message": { "text": "description", "verb": "Sent" },
         "summary": "Update event[: {summary|short}]",
         "executionMapping": {
           "attendees": [

package/content/integrations/erp.json

@@ -6,7 +6,7 @@
   "icon": "briefcase",
   "profile": "sales",
   "npmPackage": "@humanagencyp/erp-mcp",
-  "npmVersion": "0.9.1",
+  "npmVersion": "0.9.2",
   "mcp": {
     "command": "erp-mcp",
     "args": [],
@@ -276,7 +276,7 @@
         ],
         "display": {
           "order": ["customer_id", "order_id", "number", "document_date", "service_period", "lines", "net_total", "currency", "payment_term_days", "memo"],
-          "money": ["net_total", "customer_id.credit_limit", "customer_id.open_balance", "customer_id.available_credit"],
+          "money": ["net_total", "lines[].unit_price", "customer_id.credit_limit", "customer_id.open_balance", "customer_id.available_credit"],
           "currencyField": "currency",
           "labels": {
             "customer_id": "Customer",
@@ -311,7 +311,7 @@
         },
         "display": {
           "order": ["invoice_id", "number", "document_date", "credit_total", "currency", "reason", "service_period", "lines"],
-          "money": ["credit_total"],
+          "money": ["credit_total", "lines[].unit_price"],
           "currencyField": "currency",
           "labels": {
             "invoice_id": "Invoice",

package/content/integrations/gmail.json

@@ -84,6 +84,7 @@
     },
     "overrides": {
       "send_message": {
+        "message": { "text": "body", "to": "to", "cc": "cc", "subject": "subject", "verb": "Sent" },
         "summary": "Email to {to|list}: {subject|short}",
         "executionMapping": {
           "to": [
@@ -116,6 +117,7 @@
         "display": { "aiText": "body" }
       },
       "create_draft": {
+        "message": { "text": "body", "to": "to", "cc": "cc", "subject": "subject", "verb": "Sent" },
         "summary": "Draft email to {to|list}[: {subject|short}]",
         "executionMapping": {
           "to": [

package/content/integrations/linkedin.json

@@ -62,6 +62,7 @@
     },
     "overrides": {
       "create_post": {
+        "message": { "text": "text", "verb": "Published" },
         "summary": "LinkedIn post: {text|short}",
         "executionMapping": {
           "visibility": "audience"
@@ -74,6 +75,7 @@
         "actionLabel": "Post published"
       },
       "create_image_post": {
+        "message": { "text": "text", "verb": "Published" },
         "summary": "LinkedIn image post: {text|short}",
         "executionMapping": {
           "visibility": "audience"
@@ -86,6 +88,7 @@
         "actionLabel": "Image post published"
       },
       "create_article_post": {
+        "message": { "text": "text", "verb": "Published" },
         "summary": "LinkedIn article: {title,articleUrl|short}",
         "executionMapping": {
           "visibility": "audience"

package/content/integrations/mail.json

@@ -85,7 +85,16 @@
           "resultDatePath": "received_at"
         }
       },
+      "get_attachment": {
+        "category": "read",
+        "boundField": "read_access",
+        "requiredValue": "unlimited",
+        "read": {
+          "ageField": "read_age_days"
+        }
+      },
       "send_message": {
+        "message": { "text": "body", "to": "to", "cc": "cc", "subject": "subject", "verb": "Sent" },
         "summary": "Email to {to|list}: {subject|short}",
         "executionMapping": {
           "to": [

package/dist/mcp-server/http.mjs

@@ -3601,8 +3601,6 @@ function setAsBaseUrl(url) {
 }
 var OPERATOR_NAME = process.env.SUVEREN_OPERATOR_NAME ?? "Suveren";
 var HAP_URL = "https://www.humanagencyprotocol.org/";
-var FOOTER_PROFILES = /* @__PURE__ */ new Set(["email", "calendar", "publish"]);
-var CONTENT_FIELD_CANDIDATES = ["body", "text", "description", "content"];
 var FOOTER_RE = /\n*(?:—|--) (?:Sent|Published) by (?:an AI agent|[^\n]+?'s AI agent)[\s\S]*$/;
 function shouldAttachFooter() {
   return true;
@@ -3610,9 +3608,6 @@ function shouldAttachFooter() {
 function receiptUrl(receiptId) {
   return `${AS_BASE}/t/${receiptId}`;
 }
-function verbForProfile(profile) {
-  return profile === "publish" ? "Published" : "Sent";
-}
 function hapLine() {
   return `-- ${OPERATOR_NAME} implements HAP, the open Human Agency Protocol: ${HAP_URL}`;
 }
@@ -3620,32 +3615,22 @@ function footerText(receiptId, verb, subject) {
   const identity = deriveIdentityLine(subject, { operatorName: OPERATOR_NAME }).replace(/^Sent\b/, verb);
   return `
 
--- ${identity}. Receipt: ${receiptUrl(receiptId)}
+-- ${identity}. Ticket: ${receiptUrl(receiptId)}
 
 ${hapLine()}`;
 }
-function isStringType(t) {
-  return t === "string" || Array.isArray(t) && t.includes("string");
-}
 function detectContentField(tool) {
-  const schema = tool.inputSchema;
-  const props = schema?.properties ?? {};
-  for (const candidate of CONTENT_FIELD_CANDIDATES) {
-    const prop = props[candidate];
-    if (prop && isStringType(prop.type)) return candidate;
-  }
-  return null;
+  return tool.gating?.message?.text ?? null;
 }
 function stripFooter(value) {
   return value.replace(FOOTER_RE, "").replace(/\n+$/, "");
 }
 function appendVerificationFooter(tool, args, receiptId, subject) {
-  const profile = tool.gating?.profile;
-  if (!profile || !FOOTER_PROFILES.has(profile)) return args;
-  const field = detectContentField(tool);
-  if (!field) return args;
+  const message = tool.gating?.message;
+  if (!message) return args;
+  const field = message.text;
   const current = typeof args[field] === "string" ? args[field] : "";
-  return { ...args, [field]: stripFooter(current) + footerText(receiptId, verbForProfile(profile), subject) };
+  return { ...args, [field]: stripFooter(current) + footerText(receiptId, message.verb, subject) };
 }
 
 // src/lib/content-binding.ts
@@ -4059,6 +4044,37 @@ function invalidManifestInternalReason(manifest) {
   }
   return null;
 }
+var VALID_MESSAGE_VERBS = ["Sent", "Published"];
+function invalidMessageReason(toolName, entry) {
+  if (entry === null || typeof entry !== "object") return null;
+  const message = entry.message;
+  if (message === void 0) return null;
+  if (message === null || typeof message !== "object") {
+    return `override "${toolName}".message must be an object`;
+  }
+  const m = message;
+  const at = `override "${toolName}".message`;
+  if (typeof m.text !== "string" || m.text.length === 0) {
+    return `${at}.text must be a non-empty string`;
+  }
+  if (typeof m.verb !== "string" || !VALID_MESSAGE_VERBS.includes(m.verb)) {
+    return `${at}.verb must be one of ${VALID_MESSAGE_VERBS.join(", ")}`;
+  }
+  for (const key of ["to", "cc", "subject"]) {
+    if (m[key] !== void 0 && (typeof m[key] !== "string" || m[key].length === 0)) {
+      return `${at}.${key} must be a non-empty string`;
+    }
+  }
+  return null;
+}
+function invalidManifestMessageReason(manifest) {
+  const overrides = manifest.toolGating?.overrides ?? {};
+  for (const [toolName, entry] of Object.entries(overrides)) {
+    const reason = invalidMessageReason(toolName, entry);
+    if (reason) return reason;
+  }
+  return null;
+}
 function invalidManifestPreviewReason(manifest) {
   const overrides = manifest.toolGating?.overrides ?? {};
   for (const [toolName, entry] of Object.entries(overrides)) {
@@ -4488,6 +4504,11 @@ function loadManifests(integrationsDir) {
         console.error(`[ManifestLoader] Refusing manifest ${id} (${manifestPath}): ${internalReason}`);
         continue;
       }
+      const messageReason = invalidManifestMessageReason(manifest);
+      if (messageReason) {
+        console.error(`[ManifestLoader] Refusing manifest ${id} (${manifestPath}): ${messageReason}`);
+        continue;
+      }
       const contextReason = invalidManifestContextReason(manifest);
       if (contextReason) {
         console.error(`[ManifestLoader] Refusing manifest ${id} (${manifestPath}): ${contextReason}`);
@@ -5698,7 +5719,7 @@ function toStringArray(value) {
   if (typeof value === "string" && value) return [value];
   return [];
 }
-async function finalizeAttachmentsForExecution(integrationManager2, integrationId, args) {
+async function finalizeAttachmentsForExecution(integrationManager2, integrationId, args, message) {
   const sealed = args[ATTACHMENTS_SEALED_META_KEY];
   if (!sealed || sealed.attachments.length === 0 && sealed.inserts.length === 0) {
     return { ok: true, args };
@@ -5749,15 +5770,23 @@ async function finalizeAttachmentsForExecution(integrationManager2, integrationI
         contentBase64: d.contentBase64
       }));
     } else {
+      if (!message?.to) {
+        return {
+          ok: false,
+          message: `Refused: "${integrationId}" sends attachments as one built message, but this tool declares no message fields (manifest \`message.text\` and \`message.to\`) \u2014 nothing was sent.`
+        };
+      }
+      const decl = message;
       const arg = transport.arg;
       const attachments = resolvedDocs.map((d) => ({ filename: d.filename, contentType: d.contentType, contentBase64: d.contentBase64 }));
+      const str = (a, name) => name && typeof a[name] === "string" ? a[name] : "";
       const withRaw = (a) => ({
         ...a,
         [arg]: toBase64Url(buildMimeMessage({
-          to: toStringArray(a.to),
-          cc: toStringArray(a.cc),
-          subject: typeof a.subject === "string" ? a.subject : "",
-          bodyText: typeof a.body === "string" ? a.body : "",
+          to: toStringArray(a[decl.to]),
+          cc: decl.cc ? toStringArray(a[decl.cc]) : [],
+          subject: str(a, decl.subject),
+          bodyText: str(a, decl.text),
           attachments
         }))
       });
@@ -5790,10 +5819,11 @@ function computeContentBinding(profileId, tool, toolArgs, actionType) {
       return void 0;
     }
     let effectiveArgs = toolArgs;
-    if (binding.fields?.includes("attachments")) {
+    const attachmentsArg = tool?.gating?.attachmentsArg;
+    if (attachmentsArg && binding.fields?.includes(attachmentsArg)) {
       const sealed = toolArgs[ATTACHMENTS_SEALED_META_KEY];
       const fingerprints = (sealed?.attachments ?? []).map((a) => ({ filename: a.filename, sha256: a.sha256 }));
-      effectiveArgs = { ...toolArgs, attachments: fingerprints };
+      effectiveArgs = { ...toolArgs, [attachmentsArg]: fingerprints };
     }
     const bound = selectBoundFields(binding, effectiveArgs);
     return {
@@ -6798,7 +6828,7 @@ Proposal ID: ${proposal.id}. Check status with check-pending-commitments(proposa
       let finalArgs = callArgs;
       let rebuildTransport;
       if (tool.gating?.attachmentsArg || tool.gating?.insertFields?.length) {
-        const finalized = await finalizeAttachmentsForExecution(integrationManager2, tool.integrationId, callArgs);
+        const finalized = await finalizeAttachmentsForExecution(integrationManager2, tool.integrationId, callArgs, tool.gating?.message);
         if (!finalized.ok) {
           return { content: [{ type: "text", text: finalized.message }], isError: true };
         }
@@ -7887,8 +7917,9 @@ async function executeCommitted(proposal, state2, integrationManager2) {
     }
   }
   let finalToolArgs = toolArgs;
+  let rebuildTransport;
   {
-    const finalized = await finalizeAttachmentsForExecution(integrationManager2, integrationId, toolArgs);
+    const finalized = await finalizeAttachmentsForExecution(integrationManager2, integrationId, toolArgs, discovered?.gating?.message);
     if (!finalized.ok) {
       state2.executionJournal.complete(receiptId, "failed", "changed", finalized.message);
       recordExecutionOutcome(state2, proposal.id, receiptId, false, finalized.message);
@@ -7900,6 +7931,7 @@ async function executeCommitted(proposal, state2, integrationManager2) {
       };
     }
     finalToolArgs = finalized.args;
+    rebuildTransport = finalized.rebuildTransport;
   }
   try {
     let outgoingArgs = finalToolArgs;
@@ -7908,6 +7940,7 @@ async function executeCommitted(proposal, state2, integrationManager2) {
         outgoingArgs = appendVerificationFooter(discovered, outgoingArgs, receiptId, cachedAuth?.subjects?.[0]);
       }
       outgoingArgs = attachTicketId(discovered, outgoingArgs, receiptId);
+      if (rebuildTransport) outgoingArgs = rebuildTransport(outgoingArgs);
       outgoingArgs = encodeOutgoingArgs(discovered, outgoingArgs);
     }
     outgoingArgs = stripSourceLink(outgoingArgs);
@@ -9542,7 +9575,8 @@ var IntegrationManager = class {
         internal: ext.internal,
         attachmentsArg: ext.attachmentsArg,
         insertFields: ext.insertFields,
-        aiTextArg: ext.display?.aiText
+        aiTextArg: ext.display?.aiText,
+        message: ext.message
       };
     }
     return {
@@ -11733,12 +11767,11 @@ async function startIntegrationForService(serviceId) {
     (c) => c.id === serviceId || Object.values(c.envKeys ?? {}).some((ref) => typeof ref === "string" && ref.startsWith(`${serviceId}.`))
   );
   for (const config of candidates) {
+    await startOneIntegration(config);
     if (integrationManager.isRunning(config.id) && integrationManager.credentialsChangedSinceStart(config)) {
       console.error(`[Suveren MCP] ${config.id}: credentials changed since start \u2014 restarting`);
       await startOneIntegration(config, { restart: true });
-      continue;
     }
-    await startOneIntegration(config);
   }
 }
 async function startOneIntegration(config, opts = {}) {