@m2canvas/connect 0.2.0 → 0.3.1

package/README.md

@@ -10,18 +10,18 @@ It finds the supported clients you have installed, shows what it will change, an
 
 **In a terminal**, it asks before changing anything and opens each client's browser sign-in, so one command finishes the whole setup.
 
-**Run by an agent** (no interactive terminal, e.g. pasted from M2's "Copy to agent"), it adds the server to every client without asking, skips the sign-ins it can't run there, and prints the remaining steps: a command to run (Codex, Cursor, OpenCode) or a place to click in the app (Claude Code, Qoder). The agent can run the commands or pass the steps on to you. Running it again lists the sign-in steps for clients that were already added.
+**Run by an agent** (no interactive terminal, e.g. pasted from M2's "Copy to agent"), the agent passes `--client <id>` (`claude-code`, `codex`, `cursor`, `opencode`, `qoder`) so only its own client is touched. It adds the server without asking, skips the sign-ins it can't run there, and prints the remaining steps: a command to run (Codex, Cursor, OpenCode) or a place to click in the app (Claude Code, Qoder). The agent can run the commands or pass the steps on to you. Running it again lists the sign-in steps for clients that were already added.
 
 | Client | How it is set up | Sign-in |
 |---|---|---|
 | Claude Code | `claude mcp add --transport http --scope user m2 …` | `claude mcp login m2` |
-| Codex (CLI or the desktop app's bundled CLI) | `codex mcp add m2 --url …` | `codex mcp login m2` |
+| Codex (CLI or the desktop app's bundled CLI) | appends `[mcp_servers.m2]` to `~/.codex/config.toml` | `codex mcp login m2` |
 | Cursor | merges `m2` into `~/.cursor/mcp.json`, then `cursor-agent mcp enable m2` | `cursor-agent mcp login m2` |
 | OpenCode | merges `m2` into `~/.config/opencode/opencode.json`, keeping the file's existing format | `opencode mcp auth m2` |
 | Qoder (CLI + desktop app) | `qodercli mcp add -s user -t http m2 …` | in Qoder: Extensions → Connectors → m2 → Authorize |
 
 Clients that already have an entry pointing at `mcp.m2ui.ai`, under any name, are skipped. Before a config file is edited, the original is copied to `<file>.bak-m2canvas`.
 
-Options: `--dry-run` shows the plan without changing anything; `--yes` skips the confirmation.
+Options: `--client <id>` sets up only that client; `--dry-run` shows the plan without changing anything; `--yes` skips the confirmation.
 
 After setup, restart each client so it loads the new server.

package/dist/cli.js

@@ -8,9 +8,10 @@
 //     所以只写入配置，把剩余授权步骤打印成 agent 可以照做 / 转述给用户的清单。
 import { createInterface } from 'node:readline/promises';
 import { M2_MCP_URL, SERVER_NAME } from './config-files.js';
-import { detectClients } from './clients.js';
+import { CLIENTS, detectClients, isClientId } from './clients.js';
 import { run } from './system.js';
-const HELP = `Usage: npx @m2canvas/connect [--yes] [--dry-run]
+const CLIENT_IDS = Object.keys(CLIENTS).join(', ');
+const HELP = `Usage: npx @m2canvas/connect [--client <id>] [--yes] [--dry-run]
 
 Adds M2 Canvas (${M2_MCP_URL}) to every agent client found on this machine
 (Claude Code, Codex, Cursor, OpenCode, Qoder), then signs each one in.
@@ -19,6 +20,7 @@ In a terminal it asks before changing anything and opens each sign-in in your br
 When run by an agent (no terminal), it only adds the server and prints the remaining
 sign-in steps.
 
+  --client <id>  only set up this client (${CLIENT_IDS})
   -y, --yes      skip the confirmation prompt
   --dry-run      only show what would change
   -h, --help     show this help`;
@@ -59,13 +61,27 @@ function describePending(step) {
     return step.manual ?? '';
 }
 async function main() {
-    const args = new Set(process.argv.slice(2));
+    const argv = process.argv.slice(2);
+    const args = new Set(argv);
     if (args.has('-h') || args.has('--help')) {
         console.log(HELP);
         return 0;
     }
     const interactive = Boolean(process.stdin.isTTY);
-    const plans = detectClients();
+    // agent 代跑时由起手式带上自己的 --client：只处理这一家，其他客户端不动、不提 ——
+    // 用户只是在一个客户端里粘了一段话，不该顺带改掉、也不该被列出别的客户端。
+    const clientIndex = argv.indexOf('--client');
+    const requested = clientIndex >= 0 ? (argv[clientIndex + 1] ?? '') : null;
+    if (requested !== null && !isClientId(requested)) {
+        console.error(`Unknown --client "${requested}". Use one of: ${CLIENT_IDS}.`);
+        return 2;
+    }
+    const only = requested ?? undefined;
+    const plans = detectClients(only);
+    if (only && plans.length === 0) {
+        console.log(`Couldn't find a working ${only} CLI on this machine.\nAdd this MCP server by hand instead: ${M2_MCP_URL} (streamable HTTP, OAuth sign-in).`);
+        return 1;
+    }
     if (plans.length === 0) {
         console.log(`No supported agent client found.\nAdd this MCP server in your client by hand: ${M2_MCP_URL} (streamable HTTP, OAuth sign-in).`);
         return 1;

package/dist/clients.js

@@ -1,8 +1,7 @@
 // 各客户端的探测 / 写入 / 登录。每家的命令与坑位都经本机逐一实测，见 README。
-import { mkdirSync } from 'node:fs';
 import { join } from 'node:path';
-import { M2_MCP_URL, SERVER_NAME, findInClaudeConfig, findInCodexToml, findInQoderSettings, mergeCursorConfig, mergeOpencodeConfig, } from './config-files.js';
-import { existsSync, firstExecutable, firstRunnable, home, readJson, readText, run, which, writeJsonWithBackup } from './system.js';
+import { M2_MCP_URL, SERVER_NAME, findInClaudeConfig, findInCodexToml, findInQoderSettings, appendCodexServer, mergeCursorConfig, mergeOpencodeConfig, } from './config-files.js';
+import { existsSync, firstExecutable, firstRunnable, home, readJson, readText, run, which, writeJsonWithBackup, writeTextWithBackup, } from './system.js';
 function jsonExisting(path, find) {
     const read = readJson(path);
     return read.kind === 'ok' ? find(read.value) : null;
@@ -34,19 +33,20 @@ function codex() {
     if (!bin)
         return null;
     const codexHome = process.env.CODEX_HOME ?? join(home, '.codex');
-    const toml = readText(join(codexHome, 'config.toml'));
+    const path = join(codexHome, 'config.toml');
+    const toml = readText(path);
     return {
         label: 'Codex',
         existing: toml ? findInCodexToml(toml) : null,
         blocked: null,
-        actions: [`codex mcp add ${SERVER_NAME} --url ${M2_MCP_URL}`],
+        actions: [`add [mcp_servers.${SERVER_NAME}] to ${path}`],
         // 顺序敏感：login 的本地回调端口挂在 login 进程上，必须授权完成后再重启 Codex。
         restart: 'Fully quit and reopen Codex (after signing in).',
         signIn: (_interactive, name) => ({ login: { command: bin, args: ['mcp', 'login', name] }, manual: null }),
         add() {
-            // codex 在 CODEX_HOME 目录不存在时直接报 "failed to load configuration"，不会自己建。
-            mkdirSync(codexHome, { recursive: true });
-            return addWith(bin, ['mcp', 'add', SERVER_NAME, '--url', M2_MCP_URL]);
+            // 直接追加 config.toml，不用 `codex mcp add`（会自己拉起 OAuth 并阻塞，见 appendCodexServer）。
+            writeTextWithBackup(path, appendCodexServer(toml));
+            return { ok: true };
         },
     };
 }
@@ -136,6 +136,18 @@ function cursor() {
         },
     };
 }
-export function detectClients() {
-    return [claudeCode(), codex(), cursor(), opencode(), qoder()].filter((plan) => plan !== null);
+/** `--client` 的取值 → 探测函数。探测会真跑 `--version`，所以按需只跑被点名的那家。 */
+export const CLIENTS = {
+    'claude-code': claudeCode,
+    codex,
+    cursor,
+    opencode,
+    qoder,
+};
+export function isClientId(value) {
+    return Object.hasOwn(CLIENTS, value);
+}
+export function detectClients(only) {
+    const ids = only ? [only] : Object.keys(CLIENTS);
+    return ids.map((id) => CLIENTS[id]()).filter((plan) => plan !== null);
 }

package/dist/config-files.js

@@ -88,3 +88,13 @@ export function mergeOpencodeConfig(config) {
         : { ...mcp, [SERVER_NAME]: { type: 'remote', url: M2_MCP_URL, enabled: true } };
     return { existing: null, config: { ...base, mcp: nextMcp } };
 }
+/**
+ * Codex `config.toml` 追加 m2 段。不走 `codex mcp add`：它在没有已存 token 时会顺手启动 OAuth
+ * 并阻塞等浏览器回调（实测），agent 代跑时输出被捕获、链接不可见，命令永远不返回。
+ * 只做追加、不解析重写，用户原有内容与注释逐字保留；调用方先用 findInCodexToml 判重。
+ */
+export function appendCodexServer(toml) {
+    const base = toml ?? '';
+    const separator = base === '' || base.endsWith('\n\n') ? '' : base.endsWith('\n') ? '\n' : '\n\n';
+    return `${base}${separator}[mcp_servers.${SERVER_NAME}]\nurl = "${M2_MCP_URL}"\n`;
+}

package/dist/system.js

@@ -57,16 +57,19 @@ export function readText(path) {
     return existsSync(path) ? readFileSync(path, 'utf8') : null;
 }
 /** 覆写前先备份到同目录 `<file>.bak-m2canvas`，返回备份路径（新建文件时为 null）。 */
-export function writeJsonWithBackup(path, value) {
+export function writeTextWithBackup(path, text) {
     mkdirSync(dirname(path), { recursive: true });
     let backup = null;
     if (existsSync(path)) {
         backup = `${path}.bak-m2canvas`;
         copyFileSync(path, backup);
     }
-    writeFileSync(path, `${JSON.stringify(value, null, 2)}\n`);
+    writeFileSync(path, text);
     return backup;
 }
+export function writeJsonWithBackup(path, value) {
+    return writeTextWithBackup(path, `${JSON.stringify(value, null, 2)}\n`);
+}
 /**
  * 跑子进程。`interactive` 时继承当前终端 —— login / auth 要开浏览器并等回调，
  * Claude Code 的 `mcp login` 还硬性要求 TTY（stdin 不是终端时直接失败），所以必须 inherit。
@@ -75,6 +78,9 @@ export function run(command, args, interactive = false) {
     const result = spawnSync(command, args, {
         stdio: interactive ? 'inherit' : 'pipe',
         encoding: 'utf8',
+        // 非交互命令给上限：客户端 CLI 可能在写配置时自己拉起 OAuth 并阻塞等回调（实测 codex mcp add），
+        // 输出被 pipe 吞掉时用户看不到链接，没有上限就会永远挂住。交互 login 等用户操作，不设上限。
+        timeout: interactive ? undefined : 60_000,
     });
     const output = interactive ? '' : `${result.stdout ?? ''}${result.stderr ?? ''}`.trim();
     return { status: result.error ? null : result.status, output: result.error ? result.error.message : output };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m2canvas/connect",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Connect your local agent clients (Claude Code, Codex, Cursor, OpenCode, Qoder) to M2 Canvas over MCP in one command.",
   "type": "module",
   "bin": {