@agent-native/core 0.44.3 → 0.45.0

package/dist/cli/connect.d.ts

@@ -8,6 +8,7 @@
  *   agent-native connect <url> [--client all|claude-code|claude-code-cli|
  *                               codex|cowork] [--scope user|project]
  *                               [--name <serverName>]
+ *   agent-native reconnect [<url>] [--client ...] [--name <serverName>]
  *   agent-native connect <url> --token <token>   (no-browser fallback)
  *   agent-native connect        [--client ...]   (pick first-party apps)
  *   agent-native connect --all  [--client ...]   (separate first-party app MCP resources)
@@ -30,7 +31,7 @@
 import { ClientId } from "./mcp-config-writers.js";
 export interface ParsedConnectArgs {
     /** Developer profile switch: local dev gateway or saved production config. */
-    mode?: "dev" | "prod";
+    mode?: "dev" | "prod" | "reauth" | "reconnect";
     /** Positional URL (the deployed app origin). Undefined for `--all`. */
     url?: string;
     /** all | claude-code | claude-code-cli | codex | cowork (default "all"). */

package/dist/cli/connect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/cli/connect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/cli/connect.ts"],"names":[],"mappings":"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"}

package/dist/cli/connect.js

@@ -8,6 +8,7 @@
  *   agent-native connect <url> [--client all|claude-code|claude-code-cli|
  *                               codex|cowork] [--scope user|project]
  *                               [--name <serverName>]
+ *   agent-native reconnect [<url>] [--client ...] [--name <serverName>]
  *   agent-native connect <url> --token <token>   (no-browser fallback)
  *   agent-native connect        [--client ...]   (pick first-party apps)
  *   agent-native connect --all  [--client ...]   (separate first-party app MCP resources)
@@ -105,8 +106,10 @@ export function parseConnectArgs(argv) {
         else if ((v = eat("--token")) !== undefined)
             out.token = v;
         else if (!a.startsWith("-") && !out.url) {
-            if (!out.mode && (a === "dev" || a === "prod"))
+            if (!out.mode &&
+                (a === "dev" || a === "prod" || a === "reauth" || a === "reconnect")) {
                 out.mode = a;
+            }
             else
                 out.url = a;
         }
@@ -713,6 +716,106 @@ function savedEntryUrl(saved) {
     const match = saved.block.match(/^\s*url\s*=\s*"((?:\\.|[^"])*)"/m);
     return match ? unescapeTomlString(match[1]) : undefined;
 }
+function readJsonMcpServerEntries(file) {
+    try {
+        const parsed = JSON.parse(fs.readFileSync(file, "utf-8"));
+        const servers = parsed?.mcpServers;
+        if (!servers || typeof servers !== "object" || Array.isArray(servers)) {
+            return [];
+        }
+        return Object.entries(servers).flatMap(([serverName, entry]) => {
+            if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
+                return [];
+            }
+            return [
+                {
+                    serverName,
+                    saved: {
+                        kind: "json",
+                        entry: entry,
+                        savedAt: new Date().toISOString(),
+                    },
+                },
+            ];
+        });
+    }
+    catch {
+        return [];
+    }
+}
+function parseCodexMcpServerName(line) {
+    const trimmed = line.trim();
+    const quoted = trimmed.match(/^\[mcp_servers\."((?:\\.|[^"])*)"\]$/);
+    if (quoted)
+        return unescapeTomlString(quoted[1]);
+    const bare = trimmed.match(/^\[mcp_servers\.([A-Za-z0-9_-]+)\]$/);
+    return bare?.[1];
+}
+function readCodexMcpServerEntries(file) {
+    let content = "";
+    try {
+        content = fs.readFileSync(file, "utf-8");
+    }
+    catch {
+        return [];
+    }
+    const lines = content.split(/\r?\n/);
+    const entries = [];
+    for (let i = 0; i < lines.length; i++) {
+        const serverName = parseCodexMcpServerName(lines[i]);
+        if (!serverName)
+            continue;
+        const block = [lines[i]];
+        i++;
+        while (i < lines.length && !/^\s*\[/.test(lines[i])) {
+            block.push(lines[i]);
+            i++;
+        }
+        i--;
+        entries.push({
+            serverName,
+            saved: {
+                kind: "codex",
+                block: block.join("\n").replace(/\n*$/, "") + "\n",
+                savedAt: new Date().toISOString(),
+            },
+        });
+    }
+    return entries;
+}
+function readExistingMcpEntries(clients, baseDir, scope) {
+    const entries = [];
+    for (const client of clients) {
+        const file = configPathFor(client, baseDir, scope);
+        const rawEntries = client === "codex"
+            ? readCodexMcpServerEntries(file)
+            : readJsonMcpServerEntries(file);
+        for (const { serverName, saved } of rawEntries) {
+            const url = savedEntryUrl(saved);
+            if (!url)
+                continue;
+            entries.push({ client, serverName, file, saved, url });
+        }
+    }
+    return entries;
+}
+function canonicalMcpUrl(value) {
+    if (!value)
+        return undefined;
+    try {
+        const url = new URL(value);
+        url.hash = "";
+        return url.toString().replace(/\/+$/, "");
+    }
+    catch {
+        return undefined;
+    }
+}
+function sameMcpUrl(a, b) {
+    const left = canonicalMcpUrl(a);
+    const right = canonicalMcpUrl(b);
+    return !!left && !!right && left === right;
+}
 function savedEntryHeaders(saved) {
     if (!saved)
         return {};
@@ -1031,9 +1134,77 @@ async function connectProdProfile(parsed, clients, deps) {
     logOut("  Restart your coding agent to pick up the production MCP servers.");
     return missing.length === 0;
 }
-// ---------------------------------------------------------------------------
-// Single-app connect
-// ---------------------------------------------------------------------------
+function distinctReconnectEntries(entries) {
+    const seen = new Set();
+    const out = [];
+    for (const entry of entries) {
+        const key = `${entry.serverName}\0${canonicalMcpUrl(entry.url) ?? entry.url}`;
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        out.push(entry);
+    }
+    return out;
+}
+function describeReconnectEntry(entry) {
+    return `${entry.serverName} (${entry.url}) in ${entry.client}`;
+}
+function resolveReconnectTarget(parsed, clients) {
+    const baseDir = projectBaseDir();
+    const scope = parsed.scope === "user" ? "user" : "project";
+    const entries = readExistingMcpEntries(clients, baseDir, scope);
+    if (parsed.url) {
+        const normalizedUrl = normalizeUrl(parsed.url);
+        const mcpUrl = mcpUrlForBaseUrl(normalizedUrl);
+        if (parsed.name) {
+            return { rawUrl: parsed.url, serverName: parsed.name };
+        }
+        const matches = distinctReconnectEntries(entries.filter((entry) => sameMcpUrl(entry.url, mcpUrl)));
+        const names = [...new Set(matches.map((entry) => entry.serverName))];
+        if (names.length === 1) {
+            return { rawUrl: parsed.url, serverName: names[0] };
+        }
+        if (names.length > 1) {
+            logErr(`  Found multiple MCP entries for ${mcpUrl}: ${names.join(", ")}.`);
+            logErr("  Re-run with --name <serverName> to choose one.");
+            return null;
+        }
+        return { rawUrl: parsed.url };
+    }
+    const candidates = distinctReconnectEntries(parsed.name
+        ? entries.filter((entry) => entry.serverName === parsed.name)
+        : entries.filter((entry) => entry.serverName.startsWith(`${SERVER_NAME_PREFIX}-`)));
+    if (candidates.length === 0) {
+        logErr("  No existing Agent Native MCP entry found to reconnect.");
+        logErr("  Pass a URL, or use --name <serverName> if the entry has a custom name.");
+        logErr("  First-time setup still uses: agent-native connect <url> --client <client>");
+        return null;
+    }
+    if (candidates.length > 1) {
+        logErr("  Found multiple Agent Native MCP entries:");
+        for (const entry of candidates) {
+            logErr(`    ${describeReconnectEntry(entry)}`);
+        }
+        logErr("  Re-run with a URL or --name <serverName>.");
+        return null;
+    }
+    const [entry] = candidates;
+    return { rawUrl: entry.url, serverName: entry.serverName };
+}
+async function reconnectOne(parsed, clients, deps) {
+    const target = resolveReconnectTarget(parsed, clients);
+    if (!target)
+        return false;
+    const effectiveParsed = {
+        ...parsed,
+        url: target.rawUrl,
+        name: target.serverName ?? parsed.name,
+    };
+    logOut("");
+    logOut(`  Reconnecting${effectiveParsed.name ? ` "${effectiveParsed.name}"` : ""}...`);
+    const res = await connectOne(target.rawUrl, effectiveParsed, clients, deps);
+    return res.ok;
+}
 async function connectOne(rawUrl, parsed, clients, deps) {
     const normalizedUrl = normalizeUrl(rawUrl);
     const baseUrl = stripMcpPath(normalizedUrl);
@@ -1200,6 +1371,13 @@ Usage:
       No-browser fallback. Skip the device flow and write the entry with
       the supplied token (get it from the app's Connect page).
 
+  agent-native reconnect [<url>] [--client <c>] [--scope user|project]
+  agent-native connect reconnect [<url>] [--client <c>] [--scope user|project]
+      Re-authenticate an existing MCP entry without reinstalling apps/skills.
+      With a URL, it reuses the existing server name for that MCP URL when
+      possible. Without a URL, it reconnects the only matching Agent Native
+      entry in the selected client config. Use --name for custom server names.
+
   agent-native connect --all [--client <c>] [--scope user|project]
       Connect every first-party hosted app as separate MCP resources.
 
@@ -1234,7 +1412,9 @@ export async function runConnect(args, deps = {}) {
                 return;
             const ok = parsed.mode === "dev"
                 ? await connectDevProfile(parsed, clients, deps)
-                : await connectProdProfile(parsed, clients, deps);
+                : parsed.mode === "prod"
+                    ? await connectProdProfile(parsed, clients, deps)
+                    : await reconnectOne(parsed, clients, deps);
             if (!ok)
                 process.exitCode = 1;
             return;