@haven_ai/connect 0.1.16-alpha.0 → 0.1.18-alpha.0

package/dist/cli.cjs

@@ -236,9 +236,9 @@ var MCP_RUNTIME_MANIFEST = {
   mcpPackage: "@haven_ai/mcp",
   mcpVersion: mcp.MCP_VERSION,
   sdkPackage: "@haven_ai/sdk",
-  sdkVersion: "0.1.16-alpha.0",
+  sdkVersion: "0.1.18-alpha.0",
   signerPackage: "@haven_ai/signer",
-  signerVersion: "0.1.16-alpha.0",
+  signerVersion: "0.1.18-alpha.0",
   minimumNodeVersion: "20.0.0",
   supportedClients: ["codex-cli", "codex-desktop", "claude-code"],
   requiredTools: mcp.registeredToolNames()
@@ -253,117 +253,6 @@ 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) {
@@ -510,7 +399,6 @@ async function writeJsonRuntimeConfig(input, target, serverRoot) {
 async function writeCodexConfig(input) {
   const target = codexConfigPath(input.homeDir);
   const local = input.mode === "local";
-  const restartMessage = 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.";
   try {
     const existing = await readOptional(target);
     if (local) {
@@ -528,11 +416,7 @@ async function writeCodexConfig(input) {
         changed: existing !== merged2,
         restartRequired: true,
         messages: [
-          `Updated local Haven MCP entry in ${configTargetLabel(input.runtime)}.`,
-          // 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.
-          restartMessage
+          `Updated local Haven MCP entry in ${configTargetLabel(input.runtime)}.`
         ]
       };
     }
@@ -547,8 +431,7 @@ async function writeCodexConfig(input) {
       changed: existing !== merged,
       restartRequired: true,
       messages: [
-        `Updated Haven MCP entries in ${configTargetLabel(input.runtime)}.`,
-        restartMessage
+        `Updated Haven MCP entries in ${configTargetLabel(input.runtime)}.`
       ]
     };
   } catch (err) {
@@ -1101,23 +984,29 @@ function parseNodeVersion(value) {
   ];
 }
 async function installRuntimePackages(runtimeDirectory, npmCacheDirectory, runCommand) {
-  const args = [
+  const baseArgs = [
     "install",
     "--prefix",
     runtimeDirectory,
-    "--cache",
-    npmCacheDirectory,
     "--no-audit",
     "--no-fund",
     "--omit=dev",
+    "--prefer-offline",
     mcpPackageSpec(),
     sdkPackageSpec()
   ];
-  try {
+  const run = async (args) => {
     if (runCommand) await runCommand("npm", args);
     else await execFileAsync("npm", args, { timeout: 12e4, maxBuffer: 1024 * 1024 });
-  } catch (err) {
-    throw new Error(`Could not install local Haven MCP runtime ${mcpPackageSpec()}: ${err instanceof Error ? err.message : String(err)}`);
+  };
+  try {
+    await run(baseArgs);
+  } catch {
+    try {
+      await run([...baseArgs, "--cache", npmCacheDirectory]);
+    } catch (err) {
+      throw new Error(`Could not install local Haven MCP runtime ${mcpPackageSpec()}: ${err instanceof Error ? err.message : String(err)}`);
+    }
   }
 }
 async function installedRuntimeMatches(runtimeDirectory, cliPath) {
@@ -1221,25 +1110,31 @@ async function prepareSignerRuntime(input, deps = {}) {
   };
 }
 async function installRuntimePackages2(runtimeDirectory, npmCacheDirectory, runCommand) {
-  const args = [
+  const baseArgs = [
     "install",
     "--prefix",
     runtimeDirectory,
-    "--cache",
-    npmCacheDirectory,
     "--no-audit",
     "--no-fund",
     "--omit=dev",
+    "--prefer-offline",
     signerPackageSpec(),
     sdkPackageSpec()
   ];
-  try {
+  const run = async (args) => {
     if (runCommand) await runCommand("npm", args);
     else await execFileAsync2("npm", args, { timeout: 12e4, maxBuffer: 1024 * 1024 });
-  } catch (err) {
-    throw new Error(
-      `Could not install local Haven signer runtime ${signerPackageSpec()}: ${err instanceof Error ? err.message : String(err)}`
-    );
+  };
+  try {
+    await run(baseArgs);
+  } catch {
+    try {
+      await run([...baseArgs, "--cache", npmCacheDirectory]);
+    } catch (err) {
+      throw new Error(
+        `Could not install local Haven signer runtime ${signerPackageSpec()}: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
   }
 }
 async function installedRuntimeMatches2(runtimeDirectory, cliPath) {
@@ -1302,6 +1197,117 @@ async function assertFileExists2(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
+  },
+  "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;
+}
 async function acknowledgeLocalSignerConsent(signerPath, log) {
   try {
     const input = await buildSignerConsentInput(signerPath);
@@ -1377,6 +1383,7 @@ var execFileAsync3 = util.promisify(child_process.execFile);
 async function installRuntime(input, deps = {}) {
   const runtime = normalizeRuntime(input.runtime, deps.env);
   const profile = runtimeProfile(runtime, deps.env);
+  const progress = deps.onProgress ?? (() => void 0);
   const localRuntime = input.localMcp === true && supportsLocalMcp(runtime);
   const consentMessages = [];
   const localMcpConsent = localRuntime ? await resolveLocalMcpConsent(input, consentMessages) : void 0;
@@ -1399,7 +1406,12 @@ async function installRuntime(input, deps = {}) {
       localMcpAcknowledged: false,
       messages: [
         ...consentMessages,
-        "Runtime was not recognized. Keep the local credentials and add Haven MCP entries manually after wallet approval."
+        "Custom runtime: Haven did not auto-configure it. Your credentials are on disk (chmod 600) \u2014 read them at runtime; never paste a key into the agent prompt, memory, or logs.",
+        `  identity (hosted MCP Bearer): ${input.identityPath}`,
+        `  signer (local signing key):   ${input.signerPath}`,
+        "After wallet approval, wire the runtime to Haven by reference:",
+        `  Hosted MCP + local signer: point your MCP client at ${input.hostedMcpUrl} with the api_key from identity.json, then run  npx -y ${signerPackageSpec()} --credentials ${input.signerPath}`,
+        `  Fully local MCP (no hosted dependency):  npx -y ${mcpPackageSpec()} --identity ${input.identityPath} --signer ${input.signerPath}`
       ]
     };
   }
@@ -1436,6 +1448,7 @@ async function installRuntime(input, deps = {}) {
   }
   let signerCommand;
   if (!localRuntime) {
+    progress("Getting the signer ready\u2026");
     try {
       const signerRuntime = await prepareSignerForRuntime(input, deps);
       signerCommand = { command: signerRuntime.command, args: signerRuntime.args };
@@ -1447,6 +1460,7 @@ async function installRuntime(input, deps = {}) {
     }
   }
   const signerRuntimePrepared = localRuntime ? void 0 : signerCommand !== void 0;
+  progress("Setting up your Haven tools\u2026");
   const configResult = runtime === "claude-code" ? localRuntime ? await configureClaudeCode(deps, localRuntimeInstall?.command ?? "") : await configureClaudeCodeHosted(deps, input, signerCommand) : await writeRuntimeConfig({
     runtime,
     hostedMcpUrl: input.hostedMcpUrl,
@@ -1459,6 +1473,7 @@ async function installRuntime(input, deps = {}) {
     homeDir: deps.homeDir,
     mode: localRuntime ? "local" : "hosted"
   });
+  progress("Almost there \u2014 just confirming everything connects\u2026");
   const localProbePromise = configResult.runtimeMcpMode === "local_stdio" && localRuntimeInstall ? runLocalMcpProbe(localRuntimeInstall, deps) : Promise.resolve(void 0);
   const [hostedProbe, signerCredentialReady, localMcpProbe] = await Promise.all([
     configResult.hostedConfigured ? probeHostedMcpTools(input.apiKey, input.hostedMcpUrl, deps.fetch) : Promise.resolve({ status: "bad_response" }),
@@ -1523,8 +1538,7 @@ async function configureClaudeCode(deps, localMcpCommand) {
       restartRequired: true,
       messages: [
         "Updated local Haven MCP entry with Claude Code.",
-        ...verified ? ["Verified Claude Code MCP entry."] : [],
-        "After Haven approval, Haven tools should appear in your next Claude Code message. If they don't, restart the session to load them."
+        ...verified ? ["Verified Claude Code MCP entry."] : []
       ]
     };
   } catch (err) {
@@ -1573,8 +1587,7 @@ async function configureClaudeCodeHosted(deps, input, signerCommand) {
       restartRequired: true,
       messages: [
         "Updated hosted Haven MCP and local signer entries with Claude Code.",
-        ...verified ? ["Verified Claude Code MCP entry."] : [],
-        "After Haven approval, Haven tools should appear in your next Claude Code message. If they don't, restart the session to load them."
+        ...verified ? ["Verified Claude Code MCP entry."] : []
       ]
     };
   } catch (err) {
@@ -1702,7 +1715,7 @@ function localRuntimePrepareErrorCode(err) {
 }
 
 // src/runtime.ts
-var CONNECTOR_VERSION = "0.1.16-alpha.0";
+var CONNECTOR_VERSION = "0.1.18-alpha.0";
 async function runConnect(options, deps = {}) {
   const connectorVersion = options.connectorVersion ?? CONNECTOR_VERSION;
   const api = deps.api ?? createConnectApiClient(options.apiBaseUrl);
@@ -1722,6 +1735,7 @@ async function runConnect(options, deps = {}) {
       );
     }
   }
+  log("Warming up your connection to Haven\u2026");
   const setup = await api.resolveSetup({
     setupToken: options.setupToken,
     connectorVersion,
@@ -1729,12 +1743,12 @@ async function runConnect(options, deps = {}) {
   });
   printSetupSummary(setup, log);
   await preflightStorage({ baseDir: options.credentialsDir, warn: log });
-  log("Checked local credential storage.");
+  log("Checked local credential storage \u2014 all clear.");
   const localKey = generateKey();
   const localApiKey = generateLocalApiKey();
-  log("Generated local signing key.");
-  log("Generated local Haven API key.");
+  log("Minting a fresh signing key and API key \u2014 both stay on this machine.");
   const proofSignature = await localKey.signChallenge(setup.challenge.message);
+  log("Introducing your agent to Haven\u2026");
   const registration = await api.registerSetup({
     setupToken: options.setupToken,
     connectorVersion,
@@ -1751,6 +1765,7 @@ async function runConnect(options, deps = {}) {
     installCapabilities
   });
   log(`Registered signing address with Haven: ${shortAddress(registration.delegate_address)}.`);
+  log("Tucking your credentials away safely on disk\u2026");
   const credentialPaths = await writeCredentials({
     baseDir: options.credentialsDir,
     agentId: registration.agent_id,
@@ -1791,8 +1806,14 @@ async function runConnect(options, deps = {}) {
     ackSigner: options.ackSigner,
     ackLocalTools: options.ackLocalTools,
     localMcp: options.localMcp
-  });
+  }, { onProgress: log });
   printRuntimeInstall(runtimeInstall, log);
+  if (runtimeInstall.errorCode) {
+    log("Haven setup needs a couple more steps on this machine \u2014 see the notes above.");
+  } else {
+    log("Haven setup on this machine is complete.");
+  }
+  printNextSteps(runtimeInstall, log);
   try {
     await api.updateInstallStatus(registration.setup_id, localApiKey, {
       runtime: runtimeInstall.runtime,
@@ -1815,14 +1836,6 @@ async function runConnect(options, deps = {}) {
   } catch (err) {
     log(`Could not report install status to Haven: ${err instanceof Error ? err.message : String(err)}`);
   }
-  log("Return to Haven to approve the agent rules.");
-  if (runtimeInstall.restartRequired) {
-    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,
     agentId: registration.agent_id,
@@ -1860,6 +1873,18 @@ function printRuntimeInstall(result, log) {
     log("Local Haven signer still needs runtime setup.");
   }
 }
+function printNextSteps(result, log) {
+  log("Next: approve the agent rules in Haven. No Haven tools appear until you approve \u2014 restart or not.");
+  if (result.restartRequired) {
+    if (runtimeRequiresHardRestart(result.runtime)) {
+      log("After you approve, restart this agent so it can load Haven tools.");
+    } else {
+      log("After you approve, restart this agent \u2014 your current session won't load the Haven tools until you do.");
+    }
+  } else {
+    log("After you approve, the Haven tools should appear in this runtime shortly.");
+  }
+}
 
 // src/args.ts
 function parseArgs(argv, env = process.env) {