@agent-native/core 0.51.15 → 0.52.0

package/README.md

@@ -18,17 +18,17 @@ The agent and the UI are equal citizens of the same system. Every action works b
 - **Reusable integrations** — Connect a provider once in Dispatch, keep secret values in the vault, then grant apps like Brain, Analytics, Mail, and Dispatch access to the shared account metadata and credential refs.
 - **Apps that improve themselves** — Your apps get better on their own. The agent can add features, fix bugs, and refine the UI over time.
 - **Any database, any host** — Any SQL database Drizzle supports. Any hosting target Nitro supports. No lock-in.
-- **Any AI agent** — Claude Code, Codex, Gemini CLI, OpenCode, or Builder.io. Use whichever agent you prefer.
+- **Any AI agent** — Claude Code, Codex, Cursor, Pi, OpenCode, GitHub Copilot / VS Code, or Builder.io. Use whichever agent you prefer.
 
 ## Try it with a skill
 
-Don't want to scaffold a whole app yet? Add agent-native superpowers to a coding agent you already use — Claude Code, Codex, or Cursor — with one command:
+Don't want to scaffold a whole app yet? Add agent-native superpowers to a coding agent you already use — Claude Code, Codex, Cursor, Pi, OpenCode, GitHub Copilot / VS Code, and similar agents — with one command:
 
 ```bash
 npx @agent-native/core@latest skills add visual-plan
 ```
 
-It installs the skills, registers the hosted MCP connector, and signs in the selected local client(s) in one step. You get two slash commands that upgrade how your agent plans and reports its work:
+It installs the skills, writes shared `.agents` skill folders for agents that support them, registers the hosted MCP connector for supported local clients, and signs in the selected client(s) in one step. You get two slash commands that upgrade how your agent plans and reports its work:
 
 - **`/visual-plan`** — before the agent writes code, it opens a structured, reviewable plan document instead of a wall of text: inline diagrams, UI wireframes and prototypes, file-by-file implementation maps, and annotations you can comment on and approve.
 - **`/visual-recap`** — after changes land, it turns a PR or git diff into a high-altitude visual recap: schema, API, and file changes rendered as grounded before/after blocks with a shareable review link, instead of scrolling a raw diff.

package/dist/cli/connect.d.ts

@@ -1,12 +1,13 @@
 /**
- * `agent-native connect <url>` — wire your local Claude Code / Codex / Cowork
+ * `agent-native connect <url>` — wire your local MCP-capable coding agent
  * to a DEPLOYED agent-native app. OAuth-capable clients receive a standard
  * remote MCP URL entry and authenticate in the host. Fallback clients use the
  * browser device-code flow: open the verification URL, approve in the browser,
  * and the minted HTTP MCP server entry is written idempotently.
  *
  *   agent-native connect <url> [--client all|claude-code|claude-code-cli|
- *                               codex|cowork] [--scope user|project]
+ *                               codex|cowork|cursor|opencode|github-copilot]
+ *                               [--scope user|project]
  *                               [--name <serverName>]
  *   agent-native reconnect [<url>] [--client ...] [--name <serverName>]
  *   agent-native connect <url> --token <token>   (no-browser fallback)
@@ -34,7 +35,7 @@ export interface ParsedConnectArgs {
     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"). */
+    /** all | claude-code | claude-code-cli | codex | cowork | cursor | opencode | github-copilot (default "all"). */
     client: string;
     /** True when the user passed --client explicitly, so we skip the picker. */
     clientExplicit: boolean;

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":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAQH,OAAO,EAEL,QAAQ,EAOT,MAAM,yBAAyB,CAAC;AA+EjC,MAAM,WAAW,iBAAiB;IAChC,8EAA8E;IAC9E,IAAI,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,WAAW,CAAC;IAC/C,uEAAuE;IACvE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,iHAAiH;IACjH,MAAM,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,cAAc,EAAE,OAAO,CAAC;IACxB,uCAAuC;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,2CAA2C;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sEAAsE;IACtE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4CAA4C;IAC5C,GAAG,EAAE,OAAO,CAAC;IACb,uDAAuD;IACvD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kDAAkD;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,iBAAiB,CAwClE;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAqChD;AAED,0EAA0E;AAC1E,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE,CAWzD;AAWD,wBAAgB,sBAAsB,IAAI,MAAM,CAE/C;AAkBD,wBAAgB,4BAA4B,CAC1C,IAAI,GAAE,MAAiC,GACtC,QAAQ,EAAE,GAAG,IAAI,CAUnB;AAED,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,QAAQ,EAAE,EACnB,IAAI,GAAE,MAAiC,GACtC,IAAI,CAiBN;AAED,MAAM,WAAW,0BAA0B;IACzC,cAAc,EAAE,QAAQ,EAAE,CAAC;IAC3B,OAAO,EAAE;QAAE,KAAK,EAAE,QAAQ,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5D,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,8BAA8B;IAC7C,IAAI,EAAE,SAAS,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AA0ID,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,QAAQ,GAAG,OAAO,CAEhE;AAsLD,mEAAmE;AACnE,MAAM,WAAW,WAAW;IAC1B,gCAAgC;IAChC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,6DAA6D;IAC7D,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,0EAA0E;IAC1E,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,0EAA0E;IAC1E,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,2EAA2E;IAC3E,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC;IAC9B,wEAAwE;IACxE,aAAa,CAAC,EAAE,CACd,OAAO,EAAE,0BAA0B,KAChC,OAAO,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;IAChC,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,CACjB,OAAO,EAAE,8BAA8B,KACpC,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9B,uDAAuD;IACvD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gDAAgD;IAChD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kFAAkF;IAClF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAsHD;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,IAAI,GAAE,WAAgB,EACtB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACtC,OAAO,CAAC;IACT,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC,GAAG,IAAI,CAAC,CAyHR;AAWD;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,QAAQ,EAAE,EACnB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,MAAyB,EAClC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CAetC;AAiCD,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AA6sCD,8EAA8E;AAC9E,wBAAgB,UAAU,IAAI,SAAS,EAAE,CAQxC;AAoFD;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,iBAAiB,EACzB,IAAI,GAAE,WAAgB,GACrB,OAAO,CAAC,OAAO,CAAC,CA8FlB;AAgED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,GAAE,WAAgB,GACrB,OAAO,CAAC,IAAI,CAAC,CAyEf"}

package/dist/cli/connect.js

@@ -1,12 +1,13 @@
 /**
- * `agent-native connect <url>` — wire your local Claude Code / Codex / Cowork
+ * `agent-native connect <url>` — wire your local MCP-capable coding agent
  * to a DEPLOYED agent-native app. OAuth-capable clients receive a standard
  * remote MCP URL entry and authenticate in the host. Fallback clients use the
  * browser device-code flow: open the verification URL, approve in the browser,
  * and the minted HTTP MCP server entry is written idempotently.
  *
  *   agent-native connect <url> [--client all|claude-code|claude-code-cli|
- *                               codex|cowork] [--scope user|project]
+ *                               codex|cowork|cursor|opencode|github-copilot]
+ *                               [--scope user|project]
  *                               [--name <serverName>]
  *   agent-native reconnect [<url>] [--client ...] [--name <serverName>]
  *   agent-native connect <url> --token <token>   (no-browser fallback)
@@ -33,7 +34,7 @@ import os from "node:os";
 import { spawn } from "node:child_process";
 import path from "node:path";
 import { findWorkspaceRoot } from "../mcp/workspace-resolve.js";
-import { CLIENTS, configPathFor, removeSameUrlDuplicatesForClient, writeCodexBlock, writeHttpEntryForClient, writeJsonMcpEntry, } from "./mcp-config-writers.js";
+import { CLIENTS, configPathFor, jsonMcpConfigKeyForClient, removeSameUrlDuplicatesForClient, writeCodexBlock, writeHttpEntryForClient, writeJsonMcpEntryForClient, } from "./mcp-config-writers.js";
 import { isFirstPartyPlanHost, writePlanPublishAuth, } from "./plan-publish-store.js";
 import { TEMPLATES, visibleTemplates } from "./templates-meta.js";
 const DEVICE_START_PATH = "/_agent-native/mcp/connect/device/start";
@@ -66,16 +67,25 @@ const CLIENT_LABELS = {
     "claude-code-cli": "Claude Code CLI",
     codex: "Codex",
     cowork: "Claude Cowork",
+    cursor: "Cursor",
+    opencode: "OpenCode",
+    "github-copilot": "GitHub Copilot / VS Code",
 };
 const CLIENT_HINTS = {
     "claude-code": ".mcp.json or ~/.claude.json",
     "claude-code-cli": ".mcp.json or ~/.claude.json",
     codex: "$CODEX_HOME/config.toml or ~/.codex/config.toml",
     cowork: "~/.cowork/mcp.json",
+    cursor: ".cursor/mcp.json or ~/.cursor/mcp.json",
+    opencode: "opencode.json or ~/.config/opencode/opencode.json",
+    "github-copilot": ".vscode/mcp.json or VS Code user mcp.json",
 };
 const REMOTE_MCP_OAUTH_CLIENTS = new Set([
     "claude-code",
     "claude-code-cli",
+    "cursor",
+    "opencode",
+    "github-copilot",
 ]);
 let logOutImpl = (msg) => process.stdout.write(`${msg}\n`);
 let logErrImpl = (msg) => process.stderr.write(`${msg}\n`);
@@ -177,7 +187,7 @@ export function normalizeUrl(raw) {
 }
 /** Resolve the requested clients list. "all" → every supported client. */
 export function resolveClients(client) {
-    const c = (client ?? "all").toLowerCase();
+    const c = normalizeClientAlias(client ?? "all");
     if (c === "all" || c === "")
         return [...CLIENTS];
     if (c.includes(",")) {
@@ -189,6 +199,15 @@ export function resolveClients(client) {
         return [c];
     throw new Error(`Unknown --client "${client}". Use: all, ${CLIENTS.join(", ")}`);
 }
+function normalizeClientAlias(value) {
+    const id = value.trim().toLowerCase();
+    if (id === "claude" || id === "claude-code-desktop")
+        return "claude-code";
+    if (id === "copilot" || id === "vscode" || id === "vs-code") {
+        return "github-copilot";
+    }
+    return id;
+}
 export function connectPreferencesPath() {
     return path.join(os.homedir(), ".agent-native", "connect.json");
 }
@@ -200,7 +219,7 @@ function normalizeClientIds(values) {
     for (const value of values) {
         if (typeof value !== "string")
             continue;
-        const id = value.toLowerCase();
+        const id = normalizeClientAlias(value);
         if (!CLIENTS.includes(id))
             continue;
         const client = id;
@@ -361,6 +380,22 @@ function sentenceClientLabelList(clients) {
         return `${labels[0]} and ${labels[1]}`;
     return `${labels.slice(0, -1).join(", ")}, and ${labels[labels.length - 1]}`;
 }
+function oauthNextStepsForClients(clients, serverName) {
+    const lines = [];
+    if (clients.includes("claude-code") || clients.includes("claude-code-cli")) {
+        lines.push("Claude Code: restart Claude Code, run /mcp, and choose Authenticate.");
+    }
+    if (clients.includes("cursor")) {
+        lines.push("Cursor: restart or reload Cursor, then authenticate the MCP server from Cursor MCP settings if prompted.");
+    }
+    if (clients.includes("opencode")) {
+        lines.push(`OpenCode: run opencode mcp auth ${serverName ?? "<server-name>"} or authenticate on first use.`);
+    }
+    if (clients.includes("github-copilot")) {
+        lines.push("GitHub Copilot / VS Code: reload VS Code, open the MCP config, and use the Auth action above the server if prompted.");
+    }
+    return lines;
+}
 function clientsNotIn(requestedClients, effectiveClients) {
     const effective = new Set(effectiveClients);
     return requestedClients.filter((client) => !effective.has(client));
@@ -379,7 +414,7 @@ async function showReconnectSuccessOutro({ serverName, clients, }) {
     }
     const oauthClients = clients.filter((client) => supportsRemoteMcpOAuth(client));
     if (oauthClients.length > 0) {
-        lines.push(`${sentenceClientLabelList(oauthClients)}: restart, run /mcp, then choose Authenticate/Reconnect.`);
+        lines.push(...oauthNextStepsForClients(oauthClients, serverName));
     }
     if (!clients.includes("codex") && oauthClients.length === 0) {
         lines.push(`Restart or reload ${sentenceClientLabelList(clients)} before using the MCP tools.`);
@@ -707,10 +742,10 @@ function setSavedProfileEntry(profiles, serverName, client, file, entry) {
     profiles.prodEntries[serverName][client] ??= {};
     profiles.prodEntries[serverName][client][file] = entry;
 }
-function readJsonMcpServerEntry(file, serverName) {
+function readJsonMcpServerEntry(client, file, serverName) {
     try {
         const parsed = JSON.parse(fs.readFileSync(file, "utf-8"));
-        const entry = parsed?.mcpServers?.[serverName];
+        const entry = parsed?.[jsonMcpConfigKeyForClient(client)]?.[serverName];
         return entry && typeof entry === "object" ? entry : undefined;
     }
     catch {
@@ -760,7 +795,7 @@ function readCurrentMcpEntry(client, serverName, baseDir, scope) {
                 : undefined,
         };
     }
-    const entry = readJsonMcpServerEntry(file, serverName);
+    const entry = readJsonMcpServerEntry(client, file, serverName);
     return {
         file,
         saved: entry
@@ -777,7 +812,7 @@ function writeSavedMcpEntry(client, file, serverName, saved) {
     }
     if (saved.kind !== "json")
         return;
-    writeJsonMcpEntry(file, serverName, saved.entry);
+    writeJsonMcpEntryForClient(client, file, serverName, saved.entry);
 }
 function unescapeTomlString(value) {
     return value.replace(/\\"/g, '"').replace(/\\\\/g, "\\");
@@ -808,10 +843,10 @@ function savedEntryUrl(saved) {
     const match = saved.block.match(/^\s*url\s*=\s*"((?:\\.|[^"])*)"/m);
     return match ? unescapeTomlString(match[1]) : undefined;
 }
-function readJsonMcpServerEntries(file) {
+function readJsonMcpServerEntries(client, file) {
     try {
         const parsed = JSON.parse(fs.readFileSync(file, "utf-8"));
-        const servers = parsed?.mcpServers;
+        const servers = parsed?.[jsonMcpConfigKeyForClient(client)];
         if (!servers || typeof servers !== "object" || Array.isArray(servers)) {
             return [];
         }
@@ -881,7 +916,7 @@ function readExistingMcpEntries(clients, baseDir, scope) {
         const file = configPathFor(client, baseDir, scope);
         const rawEntries = client === "codex"
             ? readCodexMcpServerEntries(file)
-            : readJsonMcpServerEntries(file);
+            : readJsonMcpServerEntries(client, file);
         for (const { serverName, saved } of rawEntries) {
             const url = savedEntryUrl(saved);
             if (!url)
@@ -912,7 +947,12 @@ function savedEntryHeaders(saved) {
     if (!saved)
         return {};
     if (saved.kind === "json") {
-        const headers = saved.entry.headers;
+        const headers = saved.entry.headers ??
+            (saved.entry.requestInit &&
+                typeof saved.entry.requestInit === "object" &&
+                !Array.isArray(saved.entry.requestInit)
+                ? saved.entry.requestInit.headers
+                : undefined);
         return headers && typeof headers === "object"
             ? Object.fromEntries(Object.entries(headers)
                 .filter((entry) => {
@@ -1526,12 +1566,11 @@ async function connectOne(rawUrl, parsed, clients, deps) {
     // ADDITIONAL write alongside the per-client MCP config; Best-effort and
     // merge-not-clobber — never fails the connect.
     //
-    // OAuth clients (claude-code, claude-code-cli) authenticate in-host via
-    // standard MCP OAuth, so they never mint a local bearer token. To still
-    // populate the publish store for them, we run a supplemental device-flow
-    // mint using a non-OAuth client arg so the Plans server gets a usable token
-    // and `publish-visual-plan` doesn't send the user back to `agent-native
-    // connect` right after they just ran it.
+    // OAuth clients authenticate in-host via standard MCP OAuth, so they never
+    // mint a local bearer token. To still populate the publish store for them, we
+    // run a supplemental device-flow mint using a non-OAuth client arg so the
+    // Plans server gets a usable token and `publish-visual-plan` doesn't send the
+    // user back to `agent-native connect` right after they just ran it.
     let publishToken = token;
     if (!publishToken &&
         oauthClients.length > 0 &&
@@ -1579,7 +1618,9 @@ async function connectOne(rawUrl, parsed, clients, deps) {
             logOut(`  Replaced legacy bearer headers for ${clientLabelList(oauthMigrations)}; it will reconnect with standard MCP OAuth.`);
         }
         logOut(`  ${clientLabelList(oauthClients)}: wrote URL-only MCP config (no bearer headers).`);
-        logOut("  Next: restart Claude Code, run /mcp, and choose Authenticate.");
+        for (const line of oauthNextStepsForClients(oauthClients, serverName)) {
+            logOut(`  Next: ${line}`);
+        }
     }
     logOut("");
     logOut(`  Restart or reload ${sentenceClientLabelList(clients)} to pick up the new MCP server.`);
@@ -1762,16 +1803,16 @@ Usage:
 
   npx @agent-native/core@latest connect <url> [--client <c>] [--scope user|project] [--name <n>]
       Writes the HTTP MCP entry into your selected client config(s). Claude
-      Code / Claude Code CLI use standard remote MCP OAuth: restart Claude,
-      run /mcp, and choose Authenticate. Codex / Cowork use the browser
+      Code, Cursor, OpenCode, and GitHub Copilot / VS Code use standard remote
+      MCP OAuth and get URL-only config. Codex / Cowork use the browser
       device-code fallback: the command prints a code, opens the verification
       URL, polls until approved, then writes bearer headers. With no --client,
       opens a brief picker preselected from ~/.agent-native/connect.json, or
       all clients on first run. Idempotent — re-running replaces the same entry.
       Auth is stored per client config/session; restart or reload each selected
       client before expecting new tools to appear.
-      Re-running over an older Claude bearer entry upgrades it to URL-only
-      OAuth config and prompts you to authenticate with /mcp.
+      Re-running over an older OAuth-capable bearer entry upgrades it to
+      URL-only OAuth config and prompts you to authenticate in that host.
 
       For cross-app access, prefer the unified Dispatch gateway:
       npx @agent-native/core@latest connect https://dispatch.agent-native.com
@@ -1808,7 +1849,7 @@ Developer:
   npx @agent-native/core@latest connect prod [--apps mail,calendar] [--client <c>]
       Restore production MCP entries saved before the dev switch.
 
-Clients:  all (default), claude-code, claude-code-cli, codex, cowork
+Clients:  all (default), claude-code, claude-code-cli, codex, cowork, cursor, opencode, github-copilot
 Scope:    user (default, ~/.claude.json) or project (.mcp.json)`;
 /**
  * `agent-native connect` entry point. `deps` is injectable for tests; the