baychat 0.22.0 → 0.23.0

package/README.md

@@ -187,6 +187,7 @@ baychat connect             # list the apps it can configure
 baychat connect claude      # refresh Claude Code's skill (no QR, no re-pairing)
 baychat connect codex       # configure Codex — restart Codex afterwards
 baychat connect dsh         # a DeepSeek Harness session the relay runs for you — see below
+baychat connect cursor-cli  # a Cursor CLI session the relay runs for you — see below
 baychat relay start         # the process that wakes your sessions
 baychat relay status        # transport, sessions, anything pending
 baychat doctor              # checks every link and prints what to type
@@ -487,6 +488,27 @@ It also needs its own API key on that computer, separate from BayChat: run `dsh
 it on the Models page. `baychat doctor` reports whether the key exists (never its contents) and
 whether the installed `dsh` matches the version BayChat was tested against.
 
+## `baychat connect cursor-cli` — Cursor's CLI, run by the relay
+
+```
+baychat connect cursor-cli [--folder <path>] [--max-mode <mode>] [--mode <mode>] [--session <name>]
+```
+
+The same relay path as `connect dsh`, for Cursor's CLI (`agent acp`). Log it in first with
+`agent login`; `connect cursor-cli` refuses until `agent status` says you are. Flags are as for
+`dsh` (default session name `Cursor`; no `--terminal`). This is **not** `baychat connect cursor`,
+which still configures the Cursor editor's MCP file.
+
+Modes: `chat` (default — BayChat tools only), `read` (+ reads; no shell, no writes), and on Linux
+only `ask` (edits files inside its folder without asking, edits outside it are refused, every
+command asks on your phone first). There is no `full` for Cursor. Every mode above `chat` can read
+anything your account can. BayChat keeps each session's Cursor config in its own folder under
+`~/.baychat/acp/`, never in your project. A `.cursor/cli.json` or `.cursor/hooks.json` in the
+session's folder or any folder above it stops the session (Cursor would let it override BayChat's
+limits): remove or rename it. Worked on Cursor's free Hobby plan when checked on
+19 Sep 2026; Pro is recommended for regular use. Detail: the Cursor section of
+[`docs/features/ACP_RELAY.md`](../../docs/features/ACP_RELAY.md).
+
 ## Group instructions
 
 Group conversations carry a short, server-authored **primer** — who's in the

package/dist/connect-acp.js

@@ -0,0 +1,165 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.realConnectAcpDeps = realConnectAcpDeps;
+exports.connectAcpAgent = connectAcpAgent;
+const readline = __importStar(require("readline"));
+const commands_1 = require("./commands");
+const config_1 = require("./config");
+const agents_1 = require("./relay/acp/agents");
+const modes_1 = require("./relay/acp/modes");
+const policy_1 = require("./relay/acp/policy");
+const presence_1 = require("./relay/acp/presence");
+const commands_2 = require("./relay/commands");
+const registry_1 = require("./relay/registry");
+const runtime_binary_1 = require("./runtime-binary");
+function askOnTerminal(question) {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    return new Promise((resolve) => rl.question(question, (answer) => (rl.close(), resolve(answer.trim()))));
+}
+/** The real world, for every ACP agent's `connect`. */
+function realConnectAcpDeps() {
+    return {
+        device: config_1.loadDeviceCredentials,
+        login: (base) => (0, commands_1.cmdLogin)({ base, hint: false }),
+        resolveBinary: (name) => (0, runtime_binary_1.resolveRuntimeBinary)(name, (0, runtime_binary_1.currentBinaryEnv)()),
+        join: async (session) => {
+            const device = (0, config_1.loadDeviceCredentials)();
+            if (!device)
+                throw new Error("not logged in");
+            await (0, presence_1.joinSession)((0, presence_1.deviceMcpCaller)(device), session);
+        },
+        registerWithRelay: commands_2.registerAcpSession,
+        ensureRelay: commands_2.ensureRelayInstalled,
+        ask: askOnTerminal,
+        print: (line) => console.log(line),
+        platform: process.platform,
+    };
+}
+/**
+ * `baychat connect <agent>` for a relay-run (ACP) agent.
+ *
+ * ORDER MATTERS: everything that can refuse (no login, no binary, the agent's own preflight, a
+ * bad folder, a bad mode, a session name already taken by something the relay does not run)
+ * refuses BEFORE anything is written, so a failed connect leaves no half-made rule file.
+ */
+async function connectAcpAgent(row, spec, opts, deps) {
+    const say = deps.print;
+    let device = deps.device();
+    if (!device) {
+        say(spec.greeting);
+        if (!(await deps.login(opts.base)))
+            return 2;
+        device = deps.device();
+    }
+    if (!device) {
+        say(`No device credential was saved. Retry \`${row.connectCommand}\`.`);
+        return 1;
+    }
+    const binary = deps.resolveBinary(row.bin);
+    if (!binary.ok) {
+        say(`${row.label} is not installed here. ${row.installHint}`);
+        return 1;
+    }
+    if (!(0, agents_1.binaryIdentified)(row, binary.version)) {
+        say((0, agents_1.unidentifiedBinary)(row, binary.path, binary.version));
+        return 1;
+    }
+    const refusal = await spec.preflight?.(binary.path);
+    if (refusal) {
+        say(refusal);
+        return 1;
+    }
+    const folderInput = opts.folder ?? ((await deps.ask(`Folder ${row.label} may work in [${process.cwd()}]: `)) || process.cwd());
+    const folder = (0, policy_1.validateNewRoot)(folderInput);
+    if (!folder.ok) {
+        say(folder.reason);
+        return 1;
+    }
+    const offered = row.modesFor(deps.platform);
+    const maxInput = opts.maxMode ?? ((await deps.ask(`Highest mode the chat may ever switch it to (${offered.join(" / ")}) [${offered.includes("ask") ? "ask" : offered.at(-1)}]: `)) || (offered.includes("ask") ? "ask" : offered.at(-1)));
+    if (!(0, modes_1.isAcpMode)(maxInput) || !offered.includes(maxInput)) {
+        say(`"${maxInput}" is not a mode offered on this computer. Choose one of: ${offered.join(", ")}.`);
+        return 1;
+    }
+    const mode = opts.agentMode ?? "chat";
+    if (!(0, modes_1.isAcpMode)(mode) || (0, modes_1.modeRank)(mode) > (0, modes_1.modeRank)(maxInput)) {
+        say(`The starting mode must be one of ${offered.join(", ")} and no higher than ${maxInput}.`);
+        return 1;
+    }
+    const session = opts.session?.trim() || spec.defaultSession;
+    const registry = new registry_1.SessionRegistry();
+    registry.load();
+    const existing = registry.get(session);
+    if (existing && !existing.acp) {
+        say(`A session named "${session}" already exists on this computer and is not run by the relay. Choose another name with --session <name>.`);
+        return 1;
+    }
+    const otherAgent = (0, agents_1.otherAgentRefusal)(row, session, existing?.acp?.agent);
+    if (otherAgent) {
+        say(otherAgent);
+        return 1;
+    }
+    try {
+        row.launch(mode, (0, agents_1.acpPatchDir)(), session); // a session name the agent's config cannot hold throws here
+    }
+    catch (err) {
+        say(err instanceof Error ? err.message : String(err));
+        return 1;
+    }
+    // ── Nothing above this line wrote anything. ─────────────────────────────────────────────
+    (0, policy_1.savePolicy)((0, policy_1.upsertRoot)((0, policy_1.loadPolicy)(), row.id, folder.path, maxInput));
+    (0, agents_1.writeModePatch)(row, mode, session, (0, agents_1.acpPatchDir)());
+    await deps.join(session);
+    const acp = { agent: row.id, cwd: folder.path, mode };
+    registry.upsert({ name: session, runtime: row.id, runtimeBin: binary.path, relayOwned: true, acp });
+    const live = await deps.registerWithRelay({ type: "acp-register", session, runtime: row.id, runtimeBin: binary.path, acp });
+    say("");
+    say(`  ${row.label}: ${binary.path} (${binary.version})`);
+    if (!(0, agents_1.matchesTestedVersion)(binary.version, row.testedVersion))
+        say(`  Note: BayChat was tested with ${row.testedVersion}. ${row.label} is a preview and changes often — if something misbehaves, run \`baychat doctor\`.`);
+    for (const line of spec.notes(maxInput))
+        say(`  ${line}`);
+    say(`  Folder:  ${folder.path}`);
+    say(`  Mode:    ${(0, agents_1.describeAgentMode)(row, mode)}`);
+    say(`  Ceiling: ${maxInput} — the chat can never switch it higher. Change it by running this command again.`);
+    for (const line of spec.extras(device))
+        say(`  ${line}`);
+    say(`  ${await deps.ensureRelay()}${live ? "" : " (it will pick this session up when it starts)"}`);
+    say("");
+    say(`  ${spec.firstMessage(session)}`);
+    say(`  From the chat (you, or anyone you gave command access): ${offered.map((m) => `/mode-${m}`).join(" ")} · /stop /new /status.`);
+    return 0;
+}

package/dist/connect-cursor.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cursorLoginState = cursorLoginState;
+exports.cmdConnectCursor = cmdConnectCursor;
+const child_process_1 = require("child_process");
+const connect_acp_1 = require("./connect-acp");
+const agents_1 = require("./relay/acp/agents");
+const modes_1 = require("./relay/acp/modes");
+const runtime_binary_1 = require("./runtime-binary");
+const STATUS_TIMEOUT_MS = 15_000;
+/** Colour codes, which a terminal-aware CLI may print even into a pipe. */
+const ANSI = /\u001b\[[0-9;]*[A-Za-z]/g;
+/**
+ * What `agent status` says about the Cursor login [run, CLI 2026.09.18-9a7762b: "Logged in" /
+ * "Not logged in"]. Anything else is `unknown` — Cursor changed its wording, or the `agent`
+ * found on PATH is some other program — and `connect` refuses rather than guess.
+ */
+function cursorLoginState(statusOutput) {
+    const text = statusOutput.replace(ANSI, "");
+    if (/not logged in/i.test(text))
+        return "logged-out"; // first: it contains "logged in"
+    if (/logged in/i.test(text))
+        return "logged-in";
+    return "unknown";
+}
+function runAgentStatus(binaryPath) {
+    // No shell: the path came from PATH resolution. A Windows `.cmd` shim needs its interpreter named.
+    const plan = (0, runtime_binary_1.spawnPlanFor)(binaryPath, process.platform);
+    return new Promise((resolve) => {
+        (0, child_process_1.execFile)(plan.file, [...plan.prefixArgs, "status"], { timeout: STATUS_TIMEOUT_MS, windowsHide: true, shell: false }, (err, stdout, stderr) => {
+            const said = `${stdout ?? ""}${stderr ?? ""}`;
+            // A failed run is still an answer: "Not logged in" may come with a non-zero exit.
+            resolve(said || (err ? err.message : ""));
+        });
+    });
+}
+function realDeps() {
+    return { ...(0, connect_acp_1.realConnectAcpDeps)(), loginStatus: runAgentStatus };
+}
+/** `baychat connect cursor-cli` — a Cursor CLI session the relay runs by itself. */
+async function cmdConnectCursor(opts = {}, deps = realDeps()) {
+    const row = (0, agents_1.acpAgent)("cursor");
+    return (0, connect_acp_1.connectAcpAgent)(row, {
+        greeting: "Connect Cursor — approve the QR in BayChat.",
+        defaultSession: "Cursor",
+        async preflight(binaryPath) {
+            const state = cursorLoginState(await deps.loginStatus(binaryPath));
+            if (state === "logged-in")
+                return undefined;
+            if (state === "logged-out")
+                return `Cursor is not logged in on this computer. Run \`agent login\`, then \`${row.connectCommand}\` again.`;
+            return `Could not tell whether Cursor is logged in: \`${binaryPath} status\` said neither "Logged in" nor "Not logged in". If that is not Cursor's CLI, install it with \`curl https://cursor.com/install -fsS | bash\`; if it is, run \`agent login\`, then \`${row.connectCommand}\` again.`;
+        },
+        notes: (ceiling) => [
+            "Plan: Works on Cursor's free Hobby plan as of 19 Sep 2026; Pro recommended for regular use.",
+            "Modes the chat can switch it to:",
+            ...row
+                .modesFor(deps.platform)
+                .filter((m) => (0, modes_1.modeRank)(m) <= (0, modes_1.modeRank)(ceiling))
+                .map((m) => `  ${(0, agents_1.describeAgentMode)(row, m)}`),
+        ],
+        extras: () => [],
+        firstMessage: (session) => `Message "${session}" in BayChat. It uses this computer's Cursor login (\`agent login\`).`,
+    }, opts, deps);
+}

package/dist/connect-dsh.js

@@ -1,68 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cmdConnectDsh = cmdConnectDsh;
-const readline = __importStar(require("readline"));
-const commands_1 = require("./commands");
-const config_1 = require("./config");
-const agents_1 = require("./relay/acp/agents");
-const modes_1 = require("./relay/acp/modes");
-const policy_1 = require("./relay/acp/policy");
-const presence_1 = require("./relay/acp/presence");
-const commands_2 = require("./relay/commands");
-const registry_1 = require("./relay/registry");
+const connect_acp_1 = require("./connect-acp");
 const dsh_config_1 = require("./dsh-config");
+const agents_1 = require("./relay/acp/agents");
 const runtime_install_1 = require("./runtime-install");
-const runtime_binary_1 = require("./runtime-binary");
-function askOnTerminal(question) {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    return new Promise((resolve) => rl.question(question, (answer) => (rl.close(), resolve(answer.trim()))));
-}
 function realDeps() {
     return {
-        device: config_1.loadDeviceCredentials,
-        login: (base) => (0, commands_1.cmdLogin)({ base, hint: false }),
-        resolveBinary: (name) => (0, runtime_binary_1.resolveRuntimeBinary)(name, (0, runtime_binary_1.currentBinaryEnv)()),
-        join: async (session) => {
-            const device = (0, config_1.loadDeviceCredentials)();
-            if (!device)
-                throw new Error("not logged in");
-            await (0, presence_1.joinSession)((0, presence_1.deviceMcpCaller)(device), session);
-        },
-        registerWithRelay: commands_2.registerAcpSession,
-        ensureRelay: commands_2.ensureRelayInstalled,
+        ...(0, connect_acp_1.realConnectAcpDeps)(),
         installTerminalPath: (device) => {
             const lines = (0, runtime_install_1.describeInstall)((0, runtime_install_1.installRuntimeCommand)("dsh"));
             // writeDshMcpEntry can throw (RULING R22: a damaged ~/.dsh/cordis.patch.yml block). By this
@@ -79,87 +24,22 @@ function realDeps() {
             }
             return lines;
         },
-        ask: askOnTerminal,
-        print: (line) => console.log(line),
-        platform: process.platform,
     };
 }
-/**
- * `baychat connect dsh` — a DeepSeek session the relay runs by itself.
- *
- * ORDER MATTERS: everything that can refuse (no login, no binary, a bad folder, a bad mode,
- * a session name already taken by something the relay does not run) refuses BEFORE anything
- * is written, so a failed connect leaves no half-made rule file.
- */
+/** `baychat connect dsh` — a DeepSeek session the relay runs by itself. */
 async function cmdConnectDsh(opts = {}, deps = realDeps()) {
     const row = (0, agents_1.acpAgent)("dsh");
-    const say = deps.print;
-    let device = deps.device();
-    if (!device) {
-        say("Connect DeepSeek — approve the QR in BayChat.");
-        if (!(await deps.login(opts.base)))
-            return 2;
-        device = deps.device();
-    }
-    if (!device) {
-        say("No device credential was saved. Retry `baychat connect dsh`.");
-        return 1;
-    }
-    const binary = deps.resolveBinary(row.bin);
-    if (!binary.ok) {
-        say(`${row.label} is not installed here. ${row.installHint}`);
-        return 1;
-    }
-    const folderInput = opts.folder ?? ((await deps.ask(`Folder ${row.label} may work in [${process.cwd()}]: `)) || process.cwd());
-    const folder = (0, policy_1.validateNewRoot)(folderInput);
-    if (!folder.ok) {
-        say(folder.reason);
-        return 1;
-    }
-    const offered = row.modesFor(deps.platform);
-    const maxInput = opts.maxMode ?? ((await deps.ask(`Highest mode the chat may ever switch it to (${offered.join(" / ")}) [${offered.includes("ask") ? "ask" : offered.at(-1)}]: `)) || (offered.includes("ask") ? "ask" : offered.at(-1)));
-    if (!(0, modes_1.isAcpMode)(maxInput) || !offered.includes(maxInput)) {
-        say(`"${maxInput}" is not a mode offered on this computer. Choose one of: ${offered.join(", ")}.`);
-        return 1;
-    }
-    const mode = opts.agentMode ?? "chat";
-    if (!(0, modes_1.isAcpMode)(mode) || (0, modes_1.modeRank)(mode) > (0, modes_1.modeRank)(maxInput)) {
-        say(`The starting mode must be one of ${offered.join(", ")} and no higher than ${maxInput}.`);
-        return 1;
-    }
-    const session = opts.session?.trim() || "DeepSeek";
-    const registry = new registry_1.SessionRegistry();
-    registry.load();
-    const existing = registry.get(session);
-    if (existing && !existing.acp) {
-        say(`A session named "${session}" already exists on this computer and is not run by the relay. Choose another name with --session <name>.`);
-        return 1;
-    }
-    // ── Nothing above this line wrote anything. ─────────────────────────────────────────────
-    (0, policy_1.savePolicy)((0, policy_1.upsertRoot)((0, policy_1.loadPolicy)(), row.id, folder.path, maxInput));
-    (0, agents_1.writeModePatches)(row, (0, agents_1.acpPatchDir)());
-    await deps.join(session);
-    const acp = { agent: row.id, cwd: folder.path, mode };
-    registry.upsert({ name: session, runtime: row.id, runtimeBin: binary.path, relayOwned: true, acp });
-    const live = await deps.registerWithRelay({ type: "acp-register", session, runtime: row.id, runtimeBin: binary.path, acp });
-    say("");
-    say(`  ${row.label}: ${binary.path} (${binary.version})`);
-    if (!(0, agents_1.matchesTestedVersion)(binary.version, row.testedVersion))
-        say(`  Note: BayChat was tested with ${row.testedVersion}. ${row.label} is a preview and changes often — if something misbehaves, run \`baychat doctor\`.`);
-    say(`  Safety: ${row.label} is experimental and has not been security-audited. DeepSeek recommends running it in a disposable VM or container, not on your everyday computer.`);
-    say(`  Folder:  ${folder.path}`);
-    say(`  Mode:    ${(0, modes_1.describeMode)(mode)}`);
-    say(`  Ceiling: ${maxInput} — the chat can never switch it higher. Change it by running this command again.`);
-    // Opt-in (Ruling R26): the terminal path writes the BayChat token into a file every dsh
-    // profile reads, and the relay-run path needs none of it.
-    if (opts.terminal)
-        for (const line of deps.installTerminalPath(device))
-            say(`  ${line}`);
-    else
-        say("  Terminal use: not set up (add --terminal to also use BayChat from dsh by hand — it writes your BayChat token into ~/.dsh/cordis.patch.yml, which applies to every dsh profile).");
-    say(`  ${await deps.ensureRelay()}${live ? "" : " (it will pick this session up when it starts)"}`);
-    say("");
-    say(`  Message "${session}" in BayChat. It needs a DeepSeek API key on this computer: run \`dsh web\` and add it on the Models page.`);
-    say("  From the chat (you, or anyone you gave command access): /mode-chat /mode-read /mode-ask /mode-full · /stop /new /status.");
-    return 0;
+    return (0, connect_acp_1.connectAcpAgent)(row, {
+        greeting: "Connect DeepSeek — approve the QR in BayChat.",
+        defaultSession: "DeepSeek",
+        notes: () => [
+            `Safety: ${row.label} is experimental and has not been security-audited. DeepSeek recommends running it in a disposable VM or container, not on your everyday computer.`,
+        ],
+        // Opt-in (Ruling R26): the terminal path writes the BayChat token into a file every dsh
+        // profile reads, and the relay-run path needs none of it.
+        extras: (device) => opts.terminal
+            ? deps.installTerminalPath(device)
+            : ["Terminal use: not set up (add --terminal to also use BayChat from dsh by hand — it writes your BayChat token into ~/.dsh/cordis.patch.yml, which applies to every dsh profile)."],
+        firstMessage: (session) => `Message "${session}" in BayChat. It needs a DeepSeek API key on this computer: run \`dsh web\` and add it on the Models page.`,
+    }, opts, deps);
 }

package/dist/connect.js

@@ -52,6 +52,7 @@ const runtime_binary_1 = require("./runtime-binary");
 const connect_claude_1 = require("./connect-claude");
 var connect_claude_2 = require("./connect-claude");
 Object.defineProperty(exports, "cmdConnectClaude", { enumerable: true, get: function () { return connect_claude_2.cmdConnectClaude; } });
+const connect_cursor_1 = require("./connect-cursor");
 const connect_dsh_1 = require("./connect-dsh");
 const connect_hermes_1 = require("./connect-hermes");
 /** Clients `connect` can configure. `claude` is an alias users reach for. */
@@ -71,6 +72,7 @@ function renderConnectMenu() {
         "  npx baychat connect claude  → Claude Code (login, MCP and skill)",
         "  npx baychat connect hermes  → Hermes (pair and enable its persistent agent)",
         "  npx baychat connect dsh     → DeepSeek Harness (the relay runs it; talk to it from the app)",
+        "  npx baychat connect cursor-cli → Cursor's CLI (the relay runs it; talk to it from the app)",
         "",
         "You approve a QR on your phone. After that, in any coding session:",
         "",
@@ -81,6 +83,8 @@ function renderConnectMenu() {
         "on its own: no QR, no re-pairing. Run it after every CLI upgrade.",
     ].join("\n");
 }
+/** Spellings of the relay-run Cursor CLI (`agent acp`) accepted by `connect`. */
+const CURSOR_CLI_ALIASES = new Set(["cursor-cli", "cursor-agent"]);
 /** Spellings of Claude Code accepted by `connect`. */
 const CLAUDE_CONNECT_ALIASES = new Set(["claude", "claude-code", "claudecode"]);
 /**
@@ -205,6 +209,12 @@ async function cmdConnect(clientArg, opts = {}) {
             throw new Error("DeepSeek setup does not support --start/--finish.");
         return (0, connect_dsh_1.cmdConnectDsh)(opts);
     }
+    // Before `parseConnectClient`: plain `cursor` is the Cursor EDITOR's MCP file and stays that.
+    if (CURSOR_CLI_ALIASES.has(clientArg.trim().toLowerCase())) {
+        if (opts.mode)
+            throw new Error("Cursor CLI setup does not support --start/--finish.");
+        return (0, connect_cursor_1.cmdConnectCursor)(opts);
+    }
     const client = parseConnectClient(clientArg);
     if (opts.mode === "finish") {
         // Let the pending approval select its server unless one was explicitly supplied.

package/dist/doctor.js

@@ -184,14 +184,15 @@ function mailboxCheck() {
  * running two dsh sessions in two folders can have one healthy and one not, and collapsing them
  * would hide whichever came second.
  *
- * DeepSeek Harness is experimental and has not been security-audited (R11/R17): every line that
- * gets far enough to say a version repeats DeepSeek's own recommendation to run it disposably —
- * one short clause, not a paragraph, because the reader has already seen it once from `connect`.
+ * An agent whose maker advises a precaution (dsh: experimental, not security-audited — R11/R17)
+ * has it repeated on every line that gets far enough to say a version — one short clause, not a
+ * paragraph, because the reader has already seen it once from `connect`.
  */
 function acpChecks(env) {
     const owned = env.targets.filter((t) => t.relayOwned && t.acp);
     if (owned.length === 0) {
-        return [{ name: "relay-run agents", status: "skip", detail: "none — `baychat connect dsh` sets one up" }];
+        const commands = agents_1.ACP_AGENTS.map((row) => `\`${row.connectCommand}\``).join(" or ");
+        return [{ name: "relay-run agents", status: "skip", detail: `none — ${commands} sets one up` }];
     }
     const policy = (0, policy_1.loadPolicy)();
     return owned.map((t) => {
@@ -202,7 +203,7 @@ function acpChecks(env) {
                 name,
                 status: "fail",
                 detail: `unknown agent "${t.acp.agent}"`,
-                remedy: "Update baychat, then run `baychat connect dsh` again.",
+                remedy: `Update baychat, then run \`${(0, agents_1.connectCommandFor)(t.acp.agent)}\` again.`,
             };
         }
         const bin = env.resolveBinary(row.bin);
@@ -220,22 +221,20 @@ function acpChecks(env) {
                 name,
                 status: "fail",
                 detail: folder.reason,
-                remedy: "Run `baychat connect dsh` in the folder it should work in.",
+                remedy: `Run \`${row.connectCommand}\` in the folder it should work in.`,
             };
         }
-        const home = env.homedir ?? os.homedir();
-        // EXISTENCE only. The key is dsh's; BayChat never opens the file that holds it, and never
-        // logs it — the check is "is there a file there", not "what does it say".
-        const keySeen = Boolean(process.env.DEEPSEEK_API_KEY) ||
-            fs.existsSync(path.join(process.env.DSH_HOME ?? path.join(home, ".dsh"), ".credentials.yaml"));
+        // EXISTENCE only, and only for an agent whose credential BayChat can see at all (the row
+        // says): the key is the agent's; BayChat never opens the file that holds it, and never logs it.
+        const keySeen = row.credentialSeen?.(env.homedir ?? os.homedir()) ?? true;
         const line = `${row.label} ${bin.version} · ${t.acp.cwd} · mode ${t.acp.mode} (ceiling ${folder.maxMode})` +
-            " — DeepSeek recommends a disposable VM or container";
+            (row.safetyNote ? ` — ${row.safetyNote}` : "");
         if (!keySeen) {
             return {
                 name,
                 status: "warn",
-                detail: `${line} — no DeepSeek key found`,
-                remedy: "Run `dsh web` and add the key on the Models page.",
+                detail: `${line} — no ${row.label} key found`,
+                remedy: row.keyHint,
             };
         }
         // R20: a substring check lets a later release ("0.1.5-rc.20") pass silently as the tested

package/dist/index.js

@@ -59,6 +59,11 @@ Usage:
                                         phone, and your client's MCP config is written for
                                         you. Then run /baychat <name> in any session to
                                         join as that session. No config blocks, no editing
+  baychat connect dsh|cursor-cli [--folder <path>] [--max-mode <mode>] [--mode <mode>] [--session <name>]
+                                        An agent the relay runs by itself (DeepSeek Harness,
+                                        Cursor's CLI): you talk to it from the app. The
+                                        folder and the highest mode are set here, never
+                                        from a chat
   baychat login [--start | --finish | --token <PAT>] [--base <url>]
                                         Log this laptop in to BayChat (QR) and add the
                                         BayChat MCP server to Claude Code. Creates a