@haven_ai/connect 0.1.3-alpha → 0.1.4-alpha

package/dist/cli.js

@@ -6,7 +6,7 @@ import { homedir, platform } from 'os';
 import { join, resolve, dirname } from 'path';
 import { execFile, spawn } from 'child_process';
 import { promisify } from 'util';
-import { MCP_VERSION, ensureConsent, computeConsentHash, loadCredentials, consentInputFromClient, registeredToolNames } from '@haven_ai/mcp';
+import { registeredToolNames, MCP_VERSION, ensureConsent, computeConsentHash, loadCredentials, consentInputFromClient } from '@haven_ai/mcp';
 import { ensureSignerConsent, computeSignerConsentHash, loadSignerCredentials, createEdgeSigner, toolSchemas } from '@haven_ai/signer';
 
 // src/api.ts
@@ -206,24 +206,12 @@ var MCP_RUNTIME_MANIFEST = {
   mcpPackage: "@haven_ai/mcp",
   mcpVersion: MCP_VERSION,
   sdkPackage: "@haven_ai/sdk",
-  sdkVersion: "0.1.6",
+  sdkVersion: "0.1.7",
   signerPackage: "@haven_ai/signer",
   signerVersion: "0.1.0-alpha",
   minimumNodeVersion: "20.0.0",
   supportedClients: ["codex-cli", "codex-desktop", "claude-code"],
-  requiredTools: [
-    "haven_quote_x402",
-    "haven_pay_x402_quote",
-    "haven_resume_x402_payment",
-    "haven_quote_mpp",
-    "haven_pay_mpp_challenge",
-    "haven_resume_mpp_payment",
-    "haven_get_payment_status",
-    "haven_get_resume_state",
-    "haven_get_agent",
-    "haven_get_allowances",
-    "haven_list_receipts"
-  ]
+  requiredTools: registeredToolNames()
 };
 function mcpPackageSpec() {
   return `${MCP_RUNTIME_MANIFEST.mcpPackage}@${MCP_RUNTIME_MANIFEST.mcpVersion}`;
@@ -235,6 +223,117 @@ function signerPackageSpec() {
   return `${MCP_RUNTIME_MANIFEST.signerPackage}@${MCP_RUNTIME_MANIFEST.signerVersion}`;
 }
 
+// src/runtime-registry.ts
+var RUNTIME_PROFILES = {
+  "claude-code": {
+    id: "claude-code",
+    label: "Claude Code",
+    restartMode: "restart-session",
+    canWriteRuntimeConfig: true
+  },
+  "codex-cli": {
+    id: "codex-cli",
+    label: "Codex CLI",
+    restartMode: "restart-session",
+    canWriteRuntimeConfig: true
+  },
+  "codex-desktop": {
+    id: "codex-desktop",
+    label: "Codex Desktop",
+    restartMode: "restart-session",
+    canWriteRuntimeConfig: true
+  },
+  cursor: {
+    id: "cursor",
+    label: "Cursor",
+    restartMode: "hot-reload",
+    canWriteRuntimeConfig: true
+  },
+  vscode: {
+    id: "vscode",
+    label: "VS Code",
+    restartMode: "hot-reload",
+    canWriteRuntimeConfig: true
+  },
+  "vscode-insiders": {
+    id: "vscode-insiders",
+    label: "VS Code Insiders",
+    restartMode: "hot-reload",
+    canWriteRuntimeConfig: true
+  },
+  "claude-desktop": {
+    id: "claude-desktop",
+    label: "Claude Desktop",
+    restartMode: "restart-app",
+    canWriteRuntimeConfig: true
+  },
+  other: {
+    id: "other",
+    label: "Other agent runtime",
+    restartMode: "manual",
+    canWriteRuntimeConfig: false
+  }
+};
+var RUNTIME_ALIASES = {
+  claude: "claude-code",
+  "claude-code": "claude-code",
+  claudecode: "claude-code",
+  "claude_code": "claude-code",
+  codex: "codex-cli",
+  "codex-cli": "codex-cli",
+  codexcli: "codex-cli",
+  "codex_cli": "codex-cli",
+  "codex-desktop": "codex-desktop",
+  "codex_desktop": "codex-desktop",
+  codexdesktop: "codex-desktop",
+  "codex-app": "codex-desktop",
+  "codex_app": "codex-desktop",
+  codexapp: "codex-desktop",
+  cursor: "cursor",
+  vscode: "vscode",
+  "vs-code": "vscode",
+  "vs_code": "vscode",
+  code: "vscode",
+  "vscode-insiders": "vscode-insiders",
+  "vscode_insiders": "vscode-insiders",
+  vscodeinsiders: "vscode-insiders",
+  "vs-code-insiders": "vscode-insiders",
+  "code-insiders": "vscode-insiders",
+  insiders: "vscode-insiders",
+  "claude-desktop": "claude-desktop",
+  "claude_desktop": "claude-desktop",
+  claudesktop: "claude-desktop",
+  desktop: "claude-desktop",
+  other: "other",
+  manual: "other"
+};
+function runtimeProfile(runtime, env = process.env) {
+  return RUNTIME_PROFILES[normalizeRuntime(runtime, env)];
+}
+function normalizeRuntime(runtime, env = process.env) {
+  const explicit = normalizeRuntimeName(runtime);
+  if (explicit) return explicit;
+  return detectRuntime(env) ?? "other";
+}
+function restartRequiredForRuntime(runtime, env = process.env) {
+  const mode = runtimeProfile(runtime, env).restartMode;
+  return mode === "restart-session" || mode === "restart-app";
+}
+function runtimeRequiresHardRestart(runtime) {
+  return runtime === "claude-desktop" || runtime === "codex-desktop";
+}
+function normalizeRuntimeName(runtime) {
+  const key = runtime?.trim().toLowerCase();
+  if (!key) return null;
+  return RUNTIME_ALIASES[key.replace(/\s+/g, "-")] ?? null;
+}
+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";
+  return null;
+}
+
 // src/config-writers.ts
 var InvalidCodexTomlError = class extends Error {
   constructor(message) {
@@ -251,6 +350,8 @@ async function writeRuntimeConfig(input) {
       return writeJsonRuntimeConfig(input, cursorConfigPath(input.homeDir), "mcpServers");
     case "vscode":
       return writeJsonRuntimeConfig(input, vscodeConfigPath(input.homeDir), "servers");
+    case "vscode-insiders":
+      return writeJsonRuntimeConfig(input, vscodeInsidersConfigPath(input.homeDir), "servers");
     case "claude-desktop":
       return writeJsonRuntimeConfig(input, claudeDesktopConfigPath(input.homeDir), "mcpServers");
     default:
@@ -268,7 +369,7 @@ async function writeRuntimeConfig(input) {
   }
 }
 function buildHostedServer(hostedMcpUrl, apiKey, runtime) {
-  if (runtime === "vscode") {
+  if (runtime === "vscode" || runtime === "vscode-insiders") {
     return {
       type: "http",
       url: hostedMcpUrl,
@@ -285,7 +386,7 @@ function buildSignerServer(signerPath, runtime) {
     command: "npx",
     args: ["-y", signerPackageName(), "--credentials", signerPath]
   };
-  if (runtime === "vscode") return { type: "stdio", ...server };
+  if (runtime === "vscode" || runtime === "vscode-insiders") return { type: "stdio", ...server };
   return server;
 }
 function mergeJsonMcpConfig(existingJson, serverRoot, hostedServer, signerServer) {
@@ -369,7 +470,10 @@ async function writeCodexConfig(input) {
       restartRequired: true,
       messages: [
         `Updated local Haven MCP entry in ${configTargetLabel(input.runtime)}.`,
-        "After Haven approval, restart Codex normally so it can load Haven tools."
+        // Codex Desktop loads MCP servers at app launch; Codex CLI typically
+        // picks them up in the next session. Branch the copy so desktop users
+        // get the unambiguous instruction.
+        runtimeRequiresHardRestart(input.runtime) ? "After Haven approval, restart Codex Desktop so it can load Haven tools." : "After Haven approval, Haven tools should appear in your next Codex message. If they don't, restart Codex to load them."
       ]
     };
   } catch (err) {
@@ -608,6 +712,13 @@ function vscodeConfigPath(homeDir = homedir()) {
   }
   return resolve(homeDir, ".config", "Code", "User", "mcp.json");
 }
+function vscodeInsidersConfigPath(homeDir = homedir()) {
+  if (platform() === "darwin") return resolve(homeDir, "Library", "Application Support", "Code - Insiders", "User", "mcp.json");
+  if (platform() === "win32") {
+    return resolve(process.env.APPDATA ?? join(homeDir, "AppData", "Roaming"), "Code - Insiders", "User", "mcp.json");
+  }
+  return resolve(homeDir, ".config", "Code - Insiders", "User", "mcp.json");
+}
 function claudeDesktopConfigPath(homeDir = homedir()) {
   if (platform() === "darwin") {
     return resolve(homeDir, "Library", "Application Support", "Claude", "claude_desktop_config.json");
@@ -627,6 +738,8 @@ function configTargetLabel(runtime) {
       return "Cursor MCP config";
     case "vscode":
       return "VS Code MCP config";
+    case "vscode-insiders":
+      return "VS Code Insiders MCP config";
     case "claude-desktop":
       return "Claude Desktop config";
     default:
@@ -997,102 +1110,6 @@ async function assertFileExists(path, label) {
     throw new Error(`Missing ${label}: ${path}`);
   }
 }
-
-// src/runtime-registry.ts
-var RUNTIME_PROFILES = {
-  "claude-code": {
-    id: "claude-code",
-    label: "Claude Code",
-    restartMode: "restart-session",
-    canWriteRuntimeConfig: true
-  },
-  "codex-cli": {
-    id: "codex-cli",
-    label: "Codex CLI",
-    restartMode: "restart-session",
-    canWriteRuntimeConfig: true
-  },
-  "codex-desktop": {
-    id: "codex-desktop",
-    label: "Codex Desktop",
-    restartMode: "restart-session",
-    canWriteRuntimeConfig: true
-  },
-  cursor: {
-    id: "cursor",
-    label: "Cursor",
-    restartMode: "hot-reload",
-    canWriteRuntimeConfig: true
-  },
-  vscode: {
-    id: "vscode",
-    label: "VS Code",
-    restartMode: "hot-reload",
-    canWriteRuntimeConfig: true
-  },
-  "claude-desktop": {
-    id: "claude-desktop",
-    label: "Claude Desktop",
-    restartMode: "restart-app",
-    canWriteRuntimeConfig: true
-  },
-  other: {
-    id: "other",
-    label: "Other agent runtime",
-    restartMode: "manual",
-    canWriteRuntimeConfig: false
-  }
-};
-var RUNTIME_ALIASES = {
-  claude: "claude-code",
-  "claude-code": "claude-code",
-  claudecode: "claude-code",
-  "claude_code": "claude-code",
-  codex: "codex-cli",
-  "codex-cli": "codex-cli",
-  codexcli: "codex-cli",
-  "codex_cli": "codex-cli",
-  "codex-desktop": "codex-desktop",
-  "codex_desktop": "codex-desktop",
-  codexdesktop: "codex-desktop",
-  "codex-app": "codex-desktop",
-  "codex_app": "codex-desktop",
-  codexapp: "codex-desktop",
-  cursor: "cursor",
-  vscode: "vscode",
-  "vs-code": "vscode",
-  "vs_code": "vscode",
-  code: "vscode",
-  "claude-desktop": "claude-desktop",
-  "claude_desktop": "claude-desktop",
-  claudesktop: "claude-desktop",
-  desktop: "claude-desktop",
-  other: "other",
-  manual: "other"
-};
-function runtimeProfile(runtime, env = process.env) {
-  return RUNTIME_PROFILES[normalizeRuntime(runtime, env)];
-}
-function normalizeRuntime(runtime, env = process.env) {
-  const explicit = normalizeRuntimeName(runtime);
-  if (explicit) return explicit;
-  return detectRuntime(env) ?? "other";
-}
-function restartRequiredForRuntime(runtime, env = process.env) {
-  const mode = runtimeProfile(runtime, env).restartMode;
-  return mode === "restart-session" || mode === "restart-app";
-}
-function normalizeRuntimeName(runtime) {
-  const key = runtime?.trim().toLowerCase();
-  if (!key) return null;
-  return RUNTIME_ALIASES[key.replace(/\s+/g, "-")] ?? null;
-}
-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";
-  return null;
-}
 async function acknowledgeLocalSignerConsent(signerPath, log) {
   try {
     const input = await buildSignerConsentInput(signerPath);
@@ -1297,7 +1314,7 @@ async function configureClaudeCode(deps, localMcpCommand) {
       messages: [
         "Updated local Haven MCP entry with Claude Code.",
         ...verified ? ["Verified Claude Code MCP entry."] : [],
-        "After Haven approval, restart Claude Code normally so it can load Haven tools."
+        "After Haven approval, Haven tools should appear in your next Claude Code message. If they don't, restart the session to load them."
       ]
     };
   } catch (err) {
@@ -1497,7 +1514,11 @@ async function runConnect(options, deps = {}) {
   }
   log("Return to Haven to approve the agent rules.");
   if (runtimeInstall.restartRequired) {
-    log("After approval, restart this agent normally so it can load Haven tools.");
+    if (runtimeRequiresHardRestart(runtimeInstall.runtime)) {
+      log("After approval, restart this agent so it can load Haven tools.");
+    } else {
+      log("After approval, Haven tools should appear in your next message. If they don't, restart this agent to load them.");
+    }
   }
   return {
     setupId: registration.setup_id,