@haven_ai/connect 0.1.20-alpha.0 → 0.1.22-alpha.0

package/dist/cli.js

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 import crypto from 'crypto';
 import { Wallet } from 'ethers';
-import { mkdir, rm, chmod, access, writeFile, readFile } from 'fs/promises';
+import { mkdir, rm, chmod, access, writeFile, readFile, unlink } from 'fs/promises';
 import { homedir, platform } from 'os';
 import { join, resolve, dirname } from 'path';
 import { execFile, spawn } from 'child_process';
 import { promisify } from 'util';
+import { parseDocument, isMap, stringify } from 'yaml';
 import { registeredToolNames, MCP_VERSION, ensureConsent, computeConsentHash, loadCredentials, consentInputFromClient } from '@haven_ai/mcp';
 import { HAVEN_MINIMUM_NODE_VERSION, isSupportedNodeVersion, unsupportedNodeVersionMessage, SKILL_FOLDER_NAME, HAVEN_SKILL_MD } from '@haven_ai/sdk';
 import { ensureSignerConsent, computeSignerConsentHash, loadSignerCredentials, createEdgeSigner, toolSchemas } from '@haven_ai/signer';
@@ -230,9 +231,9 @@ var MCP_RUNTIME_MANIFEST = {
   mcpPackage: "@haven_ai/mcp",
   mcpVersion: MCP_VERSION,
   sdkPackage: "@haven_ai/sdk",
-  sdkVersion: "0.1.20-alpha.0",
+  sdkVersion: "0.1.22-alpha.0",
   signerPackage: "@haven_ai/signer",
-  signerVersion: "0.1.20-alpha.0",
+  signerVersion: "0.1.22-alpha.0",
   // Sourced from the SDK, never a literal (#1161). This field read '20.0.0'
   // while every package's `engines` said `>=24` and the docs said `>=24.0.0`,
   // so the guard that was supposed to enforce the floor waved Node v23 through
@@ -254,13 +255,20 @@ function signerPackageSpec() {
 }
 
 // src/config-writers.ts
+var HERMES_API_KEY_ENV = "MCP_HAVEN_API_KEY";
+var HermesConfigRecoveryError = class extends Error {
+  constructor() {
+    super("Hermes configuration recovery did not complete");
+    this.name = "HermesConfigRecoveryError";
+  }
+};
 var InvalidCodexTomlError = class extends Error {
   constructor(message) {
     super(message);
     this.name = "InvalidCodexTomlError";
   }
 };
-async function writeRuntimeConfig(input) {
+async function writeRuntimeConfig(input, deps = {}) {
   switch (input.runtime) {
     case "codex-cli":
     case "codex-desktop":
@@ -273,6 +281,8 @@ async function writeRuntimeConfig(input) {
       return writeJsonRuntimeConfig(input, vscodeInsidersConfigPath(input.homeDir), "servers");
     case "claude-desktop":
       return writeJsonRuntimeConfig(input, claudeDesktopConfigPath(input.homeDir), "mcpServers");
+    case "hermes":
+      return writeHermesConfig(input, deps);
     default:
       return {
         hostedConfigured: false,
@@ -326,6 +336,115 @@ function mergeJsonMcpConfig(existingJson, serverRoot, hostedServer, signerServer
   return `${JSON.stringify(config, null, 2)}
 `;
 }
+function mergeHermesYaml(existingYaml, hostedServer, signerServer) {
+  if (!existingYaml?.trim()) return renderHermesYaml({ haven: hostedServer, "haven-signer": signerServer });
+  const doc = parseDocument(existingYaml, { keepSourceTokens: true });
+  if (doc.errors.length > 0 || !isMap(doc.contents)) {
+    throw new Error("Hermes config must be a YAML object");
+  }
+  const mcpPair = doc.contents.items.find((item) => item.key?.toString() === "mcp_servers");
+  const existingServers = mcpPair && isMap(mcpPair.value) ? mcpPair.value.toJSON() : {};
+  const servers = isRecord(existingServers) ? existingServers : {};
+  const mergedServers = {
+    ...servers,
+    haven: hostedServer,
+    "haven-signer": signerServer
+  };
+  if (!mcpPair) {
+    return appendHermesMcpServers(existingYaml, mergedServers);
+  }
+  if (!mcpPair.value?.range) return replaceEmptyHermesMcpServers(existingYaml, mcpPair.key?.range, mergedServers);
+  return replaceHermesMcpServers(existingYaml, mcpPair.key?.range, mcpPair.value.range, mergedServers);
+}
+function mergeHermesEnv(existingEnv, apiKey) {
+  if (/[\r\n]/.test(apiKey)) throw new Error("Hermes API key must be a single line");
+  const assignment = `${HERMES_API_KEY_ENV}=${apiKey}`;
+  if (!existingEnv) return `${assignment}
+`;
+  const lineEnding = existingEnv.includes("\r\n") ? "\r\n" : "\n";
+  const hasTrailingNewline = /\r?\n$/.test(existingEnv);
+  const lines = existingEnv.split(/\r?\n/);
+  if (hasTrailingNewline) lines.pop();
+  let found = false;
+  const merged = lines.flatMap((line) => {
+    if (isHermesEnvAssignment(line)) {
+      if (found) return [];
+      found = true;
+      return [assignment];
+    }
+    if (isAmbiguousHermesEnvLine(line)) {
+      throw new Error("Hermes environment contains an ambiguous managed key");
+    }
+    return [line];
+  });
+  if (!found) {
+    return `${existingEnv}${hasTrailingNewline ? "" : lineEnding}${assignment}${lineEnding}`;
+  }
+  return `${merged.join(lineEnding)}${hasTrailingNewline ? lineEnding : ""}`;
+}
+function isHermesEnvAssignment(line) {
+  return /^\s*(?:export[ \t]+)?MCP_HAVEN_API_KEY[ \t]*=/.test(line);
+}
+function isAmbiguousHermesEnvLine(line) {
+  return /^\s*(?:export[ \t]+)?MCP_HAVEN_API_KEY\b/.test(line);
+}
+function appendHermesMcpServers(source, servers) {
+  const documentEnd = /(?:^|\n)[ \t]*\.\.\.[ \t]*(?:#[^\n]*)?\r?\n?$/.exec(source);
+  if (documentEnd) {
+    const markerStart = documentEnd.index + (documentEnd[0].startsWith("\n") ? 1 : 0);
+    const beforeMarker = source.slice(0, markerStart);
+    return `${beforeMarker}${beforeMarker.endsWith("\n") ? "" : "\n"}${renderHermesMcpServers(servers, "")}
+${source.slice(markerStart)}`;
+  }
+  const separator = source.endsWith("\n") ? "" : "\n";
+  return `${source}${separator}${renderHermesMcpServers(servers, "")}
+`;
+}
+function replaceHermesMcpServers(source, keyRange, valueRange, servers) {
+  const valueStart = valueRange[0];
+  const valueEnd = valueRange[1];
+  const valueLineStart = source.lastIndexOf("\n", valueStart - 1) + 1;
+  const keyStartsOnValueLine = keyRange?.[0] !== void 0 && keyRange[0] >= valueLineStart;
+  const nestedIndent = `${source.slice(valueLineStart, keyRange?.[0] ?? valueLineStart)}  `;
+  if (keyStartsOnValueLine) {
+    const keyStart = keyRange[0];
+    const keyEnd = keyRange[1];
+    const replacement2 = `${source.slice(keyStart, keyEnd)}:
+${renderHermesMcpServerEntries(servers, nestedIndent)}`;
+    const needsTrailingNewline2 = valueEnd < source.length && !source.slice(valueEnd).startsWith("\n");
+    return `${source.slice(0, keyStart)}${replacement2}${needsTrailingNewline2 ? "\n" : ""}${source.slice(valueEnd)}`;
+  }
+  const indent = source.slice(valueLineStart, valueStart);
+  const rendered = stringify(servers, { lineWidth: 120 }).trimEnd();
+  const replacement = rendered.split("\n").map((line, index) => index === 0 ? line : `${indent}${line}`).join("\n");
+  const needsTrailingNewline = valueEnd < source.length && !source.slice(valueEnd).startsWith("\n");
+  return `${source.slice(0, valueStart)}${replacement}${needsTrailingNewline ? "\n" : ""}${source.slice(valueEnd)}`;
+}
+function replaceEmptyHermesMcpServers(source, keyRange, servers) {
+  if (!keyRange) throw new Error("Hermes config mcp_servers key is invalid");
+  const keyStart = keyRange[0];
+  const keyEnd = keyRange[1];
+  const lineStart = source.lastIndexOf("\n", keyStart - 1) + 1;
+  const lineEnd = source.indexOf("\n", keyEnd);
+  const nestedIndent = `${source.slice(lineStart, keyStart)}  `;
+  const replacement = `${source.slice(keyStart, keyEnd)}:
+${renderHermesMcpServerEntries(servers, nestedIndent)}`;
+  return `${source.slice(0, keyStart)}${replacement}${lineEnd === -1 ? "\n" : source.slice(lineEnd)}`;
+}
+function renderHermesYaml(servers) {
+  return `${renderHermesMcpServers(servers, "")}
+`;
+}
+function renderHermesMcpServers(servers, indent) {
+  return `mcp_servers:
+${renderHermesMcpServerEntries(servers, `${indent}  `)}`;
+}
+function renderHermesMcpServerEntries(servers, indent) {
+  return stringify(servers, { lineWidth: 120 }).trimEnd().split("\n").map((line) => `${indent}${line}`).join("\n");
+}
+function isRecord(value) {
+  return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
 function mergeCodexToml(existingToml, localMcpCommand) {
   let next = removeTomlTableTree(removeTomlTableTree(existingToml, "mcp_servers.haven"), "mcp_servers.haven_signer");
   next = next.trimEnd();
@@ -396,6 +515,82 @@ async function writeJsonRuntimeConfig(input, target, serverRoot) {
     };
   }
 }
+async function writeHermesConfig(input, deps) {
+  const target = hermesConfigPath(input.homeDir);
+  const envTarget = hermesEnvPath(input.homeDir);
+  try {
+    const [existing, existingEnv] = await Promise.all([readOptional(target), readOptional(envTarget)]);
+    const hostedServer = {
+      ...buildHostedServer(input.hostedMcpUrl, `\${${HERMES_API_KEY_ENV}}`, input.runtime),
+      enabled: true
+    };
+    const signerServer = {
+      ...buildSignerServer(resolveSignerLaunchSpec(input), input.runtime),
+      enabled: true
+    };
+    const merged = mergeHermesYaml(
+      existing,
+      hostedServer,
+      signerServer
+    );
+    const mergedEnv = mergeHermesEnv(existingEnv, input.apiKey);
+    const writeText = deps.writeOwnerOnlyText ?? writeOwnerOnlyText;
+    await writeText(envTarget, mergedEnv);
+    try {
+      await writeText(target, merged);
+    } catch (err) {
+      const recovered = await restoreHermesFiles(target, existing, envTarget, existingEnv, writeText);
+      if (!recovered) throw new HermesConfigRecoveryError();
+      throw err;
+    }
+    return {
+      hostedConfigured: true,
+      signerConfigured: true,
+      localMcpConfigured: false,
+      runtimeMcpMode: "hosted_plus_signer",
+      target: "Hermes Agent config",
+      changed: existing !== merged || existingEnv !== mergedEnv,
+      restartRequired: true,
+      messages: [
+        `Updated Haven MCP entries in ${target}; stored the hosted MCP identity in ${envTarget}.`,
+        "Restart Hermes (start a new session; gateway users: /restart), then verify with `hermes mcp list`, `hermes mcp test haven`, and `hermes mcp test haven-signer`.",
+        "If no mcp_* tools appear after restart, ensure the MCP SDK is installed in Hermes: pip install mcp"
+      ]
+    };
+  } catch (err) {
+    const recoveryIncomplete = err instanceof HermesConfigRecoveryError;
+    return {
+      hostedConfigured: false,
+      signerConfigured: false,
+      localMcpConfigured: false,
+      runtimeMcpMode: "hosted_plus_signer",
+      target: "Hermes Agent config",
+      changed: false,
+      restartRequired: true,
+      messages: [recoveryIncomplete ? "Could not update Hermes Agent config. Recovery did not complete; inspect the Hermes configuration before retrying." : "Could not update Hermes Agent config. Existing configuration was left unchanged."],
+      errorCode: "runtime_config_write_failed"
+    };
+  }
+}
+async function restoreHermesFiles(configPath, existingConfig, envPath, existingEnv, writeText) {
+  const [envResult, configResult] = await Promise.allSettled([
+    restoreOptionalText(envPath, existingEnv, writeText),
+    restoreOptionalText(configPath, existingConfig, writeText)
+  ]);
+  return envResult.status === "fulfilled" && configResult.status === "fulfilled";
+}
+async function restoreOptionalText(path, existing, writeText) {
+  if (existing !== null) {
+    await writeText(path, existing);
+    return;
+  }
+  try {
+    await unlink(path);
+  } catch (err) {
+    if (err && typeof err === "object" && "code" in err && err.code === "ENOENT") return;
+    throw err;
+  }
+}
 async function writeCodexConfig(input) {
   const target = codexConfigPath(input.homeDir);
   const local = input.mode === "local";
@@ -686,6 +881,15 @@ function claudeDesktopConfigPath(homeDir = homedir()) {
   }
   return resolve(homeDir, ".config", "Claude", "claude_desktop_config.json");
 }
+function hermesConfigPath(homeDir) {
+  return join(hermesHomePath(homeDir), "config.yaml");
+}
+function hermesEnvPath(homeDir) {
+  return join(hermesHomePath(homeDir), ".env");
+}
+function hermesHomePath(homeDir) {
+  return process.env.HERMES_HOME ?? join(homeDir ?? homedir(), ".hermes");
+}
 function configTargetLabel(runtime) {
   switch (runtime) {
     case "codex-cli":
@@ -1229,6 +1433,12 @@ var RUNTIME_PROFILES = {
     restartMode: "restart-app",
     canWriteRuntimeConfig: true
   },
+  hermes: {
+    id: "hermes",
+    label: "Hermes Agent",
+    restartMode: "restart-session",
+    canWriteRuntimeConfig: true
+  },
   other: {
     id: "other",
     label: "Other agent runtime",
@@ -1266,6 +1476,10 @@ var RUNTIME_ALIASES = {
   "claude_desktop": "claude-desktop",
   claudesktop: "claude-desktop",
   desktop: "claude-desktop",
+  hermes: "hermes",
+  "hermes-agent": "hermes",
+  hermes_agent: "hermes",
+  hermesagent: "hermes",
   other: "other",
   manual: "other"
 };
@@ -1293,6 +1507,7 @@ function detectRuntime(env) {
   if (env.CLAUDECODE || env.CLAUDE_CODE || env.CLAUDECODE_CWD) return "claude-code";
   if (env.CODEX_SANDBOX || env.CODEX_HOME || env.CODEX_CWD) return "codex-cli";
   if (env.VSCODE_CWD || env.VSCODE_IPC_HOOK_CLI || env.TERM_PROGRAM === "vscode") return "vscode";
+  if (env.HERMES_HOME || env.HERMES_AGENT) return "hermes";
   return null;
 }
 async function acknowledgeLocalSignerConsent(signerPath, log) {
@@ -1702,7 +1917,7 @@ function localRuntimePrepareErrorCode(err) {
 }
 
 // src/runtime.ts
-var CONNECTOR_VERSION = "0.1.20-alpha.0";
+var CONNECTOR_VERSION = "0.1.22-alpha.0";
 async function runConnect(options, deps = {}) {
   assertSupportedNodeVersion(deps.nodeVersion, MCP_RUNTIME_MANIFEST.minimumNodeVersion);
   const connectorVersion = options.connectorVersion ?? CONNECTOR_VERSION;
@@ -1935,7 +2150,7 @@ function helpText() {
     "Options:",
     "  --setup <token>            Short-lived setup token from Haven.",
     "  --api <url>                Haven backend API URL. Defaults to HAVEN_API_URL or http://localhost:3001.",
-    "  --runtime <name>           Agent runtime hint, such as claude-code, codex-cli, codex-desktop, cursor, vscode, or claude-desktop.",
+    "  --runtime <name>           Agent runtime hint, such as claude-code, codex-cli, codex-desktop, cursor, vscode, claude-desktop, or hermes.",
     "  --credentials-dir <path>   Credential directory fallback. Defaults to ~/.haven/agents.",
     "  --environment-label <text> Non-sensitive label shown in Haven setup review.",
     "  --ack-local-tools          Write the one-time local Haven tools acknowledgement during setup.",