@haven_ai/connect 0.0.0-dev.202610071327.3adb563 → 0.0.0-dev.202610071501.0ff4069

package/dist/cli.cjs

@@ -620,9 +620,9 @@ var init_runtime_manifest = __esm({
       mcpPackage: "@haven_ai/mcp",
       mcpVersion: mcp.MCP_VERSION,
       sdkPackage: "@haven_ai/sdk",
-      sdkVersion: "0.0.0-dev.202610071327.3adb563",
+      sdkVersion: "0.0.0-dev.202610071501.0ff4069",
       signerPackage: "@haven_ai/signer",
-      signerVersion: "0.0.0-dev.202610071327.3adb563",
+      signerVersion: "0.0.0-dev.202610071501.0ff4069",
       // 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
@@ -3003,9 +3003,23 @@ function installedClientTargets(homeDir = os.homedir(), cwd = process.cwd(), env
       runtime: "claude-code",
       label: "Claude Code",
       // Claude Code is configured through its own CLI (`claude mcp add-json`),
-      // not by writing a file this module owns — so its evidence is the
-      // client directory, never a config path.
+      // not by writing a file this module owns — so `configPath` stays null
+      // and the write still goes through the CLI. But a user-scope
+      // `~/.claude.json` carrying an `mcpServers` key IS config-file
+      // evidence: the user has already pointed Claude Code at some MCP
+      // server. It is not the file the connector would write, hence the
+      // separate evidence path (#3732): without it, a Codex config won by
+      // construction on any machine where the user runs Claude Code.
       configPath: null,
+      evidencePath: path.join(homeDir, ".claude.json"),
+      evidenceMatches: (contents) => {
+        try {
+          const parsed = JSON.parse(contents);
+          return typeof parsed === "object" && parsed !== null && "mcpServers" in parsed;
+        } catch {
+          return false;
+        }
+      },
       markers: [path.join(homeDir, ".claude"), path.join(homeDir, ".claude.json")]
     },
     {
@@ -3037,7 +3051,10 @@ function installedClientTargets(homeDir = os.homedir(), cwd = process.cwd(), env
     },
     {
       runtime: "claude-desktop",
-      label: "Claude Desktop",
+      // The chat app, a separate runtime from Claude Code. Named so a user in
+      // the desktop app's Code tab cannot read this row as "where I am" —
+      // it sorted above Claude Code whenever both had config (#3732).
+      label: "Claude Desktop (chat app)",
       configPath: runtimeConfigPathFor("claude-desktop", homeDir),
       markers: []
     },
@@ -3052,6 +3069,7 @@ function installedClientTargets(homeDir = os.homedir(), cwd = process.cwd(), env
 }
 async function scanInstalledClients(options = {}) {
   const exists = options.exists ?? pathExists;
+  const readFile15 = options.readFile ?? ((path) => promises.readFile(path, "utf8"));
   const targets = installedClientTargets(options.homeDir, options.cwd, options.env ?? process.env);
   const found = [];
   for (const target of targets) {
@@ -3061,6 +3079,18 @@ async function scanInstalledClients(options = {}) {
         label: target.label,
         detail: `MCP config found at ${target.configPath}`,
         configPath: target.configPath,
+        evidencePath: target.configPath,
+        evidence: "config-file"
+      });
+      continue;
+    }
+    if (target.evidencePath && await hasConfigEvidence(target, exists, readFile15)) {
+      found.push({
+        runtime: target.runtime,
+        label: target.label,
+        detail: `MCP config found at ${target.evidencePath}`,
+        configPath: target.configPath,
+        evidencePath: target.evidencePath,
         evidence: "config-file"
       });
       continue;
@@ -3072,6 +3102,7 @@ async function scanInstalledClients(options = {}) {
         label: target.label,
         detail: `installed (${marker})`,
         configPath: target.configPath,
+        evidencePath: null,
         evidence: "client-directory"
       });
       break;
@@ -3082,6 +3113,16 @@ async function scanInstalledClients(options = {}) {
     return SCAN_ORDER.indexOf(a.runtime) - SCAN_ORDER.indexOf(b.runtime);
   });
 }
+async function hasConfigEvidence(target, exists, readFile15) {
+  const path = target.evidencePath;
+  if (!await exists(path)) return false;
+  if (!target.evidenceMatches) return true;
+  try {
+    return target.evidenceMatches(await readFile15(path));
+  } catch {
+    return false;
+  }
+}
 function installedClientHint(candidates) {
   const installedClients = candidates.map((candidate) => candidate.runtime);
   if (candidates.length === 1) {
@@ -3092,18 +3133,24 @@ function installedClientHint(candidates) {
 }
 async function promptForInstalledClient(candidates, io = defaultPromptIo()) {
   if (candidates.length === 0) throw noInstalledClientsError();
+  const hint = installedClientHint(candidates);
   io.write("Haven could not detect which agent runtime this is.\n");
   io.write("These agent clients are installed on this machine:\n");
   candidates.forEach((candidate, index) => {
-    io.write(`  ${index + 1}) ${candidate.label} \u2014 ${candidate.detail}
+    const suggested = hint.suggestedRuntime === candidate.runtime ? " (suggested)" : "";
+    io.write(`  ${index + 1}) ${candidate.label}${suggested} \u2014 ${candidate.detail}
 `);
   });
   io.write("Haven writes an API key and a signing key into the client you pick, so pick the one your agent actually runs in.\n");
   for (let attempt = 0; attempt < MAX_PROMPT_ATTEMPTS; attempt += 1) {
-    const answer = await io.question(`Which one? [1-${candidates.length}] (default 1 \u2014 ${candidates[0].label}): `);
+    const answer = await io.question(`Which one? [1-${candidates.length}]: `);
     if (answer === null) throw promptAbortedError("the prompt was cancelled");
     const trimmed = answer.trim();
-    if (trimmed === "") return candidates[0].runtime;
+    if (trimmed === "") {
+      io.write(`Type the number of the client to configure (1-${candidates.length}).
+`);
+      continue;
+    }
     const picked = Number.parseInt(trimmed, 10);
     if (Number.isInteger(picked) && picked >= 1 && picked <= candidates.length) {
       return candidates[picked - 1].runtime;
@@ -4127,7 +4174,8 @@ function installedClientProse(hint) {
 }
 function runtimeSelectionPrompt(options, deps) {
   if (!interactivePromptAllowed(options, deps)) return void 0;
-  return deps.promptRuntime ?? (() => resolveRuntimeByInstalledClientPrompt());
+  if (deps.promptRuntime) return deps.promptRuntime;
+  return () => (deps.promptRuntimeByInstalledClient ?? resolveRuntimeByInstalledClientPrompt)({ env: deps.env });
 }
 function interactivePromptAllowed(options, deps) {
   if (options.interactive !== true) return false;
@@ -4451,7 +4499,7 @@ var init_runtime = __esm({
     init_tombstone();
     init_local_mcp_runtime();
     init_runtime_manifest();
-    CONNECTOR_VERSION = "0.0.0-dev.202610071327.3adb563";
+    CONNECTOR_VERSION = "0.0.0-dev.202610071501.0ff4069";
     CONNECTOR_CLIENT_IDENTITY = `@haven_ai/connect/${CONNECTOR_VERSION}`;
     CONNECT_OUTCOME_SCHEMA_VERSION = 1;
     failureOutcomesByError = /* @__PURE__ */ new WeakMap();