@wirecat/cli-core 0.470.0 → 0.472.0

package/dist/cli/messenger/mcp-command.js

@@ -66,13 +66,42 @@ export const servedProfiles = (self, messenger, { settings, env }, given, words)
 const withProfiles = (command) => command.option("--profiles <names|all>", "serve several profiles from one server instead of one: names, comma-separated, or all for every profile");
 /** Where `mcp serve --http` keeps the hashes of the tokens it issued — per profile, in the state folder. */
 export const httpTokenFile = (app, profile, env) => join(resolvePaths({ appName: app.appName, prefix: app.envPrefix, env }).state, "mcp-http", `${profile}.json`);
-const withFlags = (command) => command.option("--permission <key=level>", "make a permission stricter for this server only, like messages.send=deny; it never loosens the profile; repeat for more keys", (value, previous = []) => [...previous, value]);
-export const mcpCommand = (messenger) => {
-    const { app } = messenger;
+const withFlags = (command, example) => command.option("--permission <key=level>", `make a permission stricter for this server only, like ${example}; it never loosens the profile; repeat for more keys`, (value, previous = []) => [...previous, value]);
+const messengerHost = (messenger) => ({
+    app: messenger.app,
+    name: messenger.name ?? messenger.app.command,
+    resolveSettings: messenger.resolveSettings,
+    ...(messenger.profileState ? { profileState: messenger.profileState } : {}),
+    context: (self, options) => messengerContext(self, messenger, options),
+    permissionExample: "messages.send=deny",
+    serveStdio: async (self, context) => {
+        // Loaded here, not at the top: every other command would otherwise pay for the SDK.
+        const { serveOverStdio } = await import("../../mcp/server.js");
+        await serveOverStdio(self, context, messenger, {});
+    },
+    serveHttp: async (self, context, http) => {
+        const { serveOverHttpUntilStopped } = await import("../../mcp/server.js");
+        await serveOverHttpUntilStopped(self, context, messenger, {}, http);
+    },
+    instructions: async (profiles) => {
+        const { instructions } = await import("../../mcp/instructions.js");
+        return instructions({
+            command: messenger.app.command,
+            name: messenger.name ?? messenger.app.command,
+            profile: profiles,
+            writes: [],
+        });
+    },
+    signedIn: (self, profile, env) => (messenger.accountOf?.(self) ?? recalledAccount(messenger.app, messenger.provider, profile, env)) !== undefined,
+});
+export const mcpCommand = (messenger) => mcpGroup(messengerHost(messenger));
+export const mcpGroup = (host) => {
+    const { app } = host;
+    const flagged = (command) => withFlags(command, host.permissionExample);
     const command = annotate(new Command("mcp"), { effects: LOCAL_READ, mcp: false })
         .summary("serve this profile's commands to an AI agent, and set that up")
         .description(`serve this profile to an agent over MCP and set it up — \`claude mcp add ${app.command} -- ${app.command} <profile> mcp serve\``);
-    command.addCommand(withProfiles(withFlags(annotate(new Command("serve"), {
+    command.addCommand(withProfiles(flagged(annotate(new Command("serve"), {
         effects: REMOTE_WRITE,
         lifetime: "persistent",
         mcp: false,
@@ -89,10 +118,10 @@ export const mcpCommand = (messenger) => {
         .option("--public-url <url>", "the tunnel's https address the browser apps use, e.g. https://<name>.ts.net or https://<name>.ts.net/tg")
         .action(async function () {
         const flags = this.optsWithGlobals();
-        const context = messengerContext(this, messenger, { needsProfile: false });
-        const served = servedProfiles(this, messenger, context, flags.profiles, "mcp serve");
+        const context = host.context(this, { needsProfile: false });
+        const served = servedProfiles(this, host, context, flags.profiles, "mcp serve");
         if ("set" in served)
-            return serveProfiles(this, context, messenger, flags, served.set);
+            return serveProfiles(this, context, host, flags, served.set);
         const { profile } = served;
         if (flags.http) {
             const publicUrl = publicUrlOf(flags.publicUrl, {
@@ -100,9 +129,8 @@ export const mcpCommand = (messenger) => {
                 reaches: `the browser apps reach ${app.command}`,
                 path: true,
             });
-            const { serveOverHttpUntilStopped } = await import("../../mcp/server.js");
             const tokenFile = httpTokenFile(app, profile, context.env);
-            await serveOverHttpUntilStopped(this, context, messenger, {}, {
+            await host.serveHttp(this, context, {
                 publicUrl,
                 port: portOf(flags.port, DEFAULT_PORT),
                 tokenFile,
@@ -111,9 +139,7 @@ export const mcpCommand = (messenger) => {
             });
             return;
         }
-        // Loaded here, not at the top: every other command would otherwise pay for the SDK.
-        const { serveOverStdio } = await import("../../mcp/server.js");
-        await serveOverStdio(this, context, messenger, {});
+        await host.serveStdio(this, context);
     }));
     command.addCommand(withProfiles(annotate(new Command("revoke"), {
         effects: LOCAL_WRITE,
@@ -122,8 +148,8 @@ export const mcpCommand = (messenger) => {
     })
         .summary("forget every login given to a browser app")
         .description("forget every login `mcp serve --http` gave a browser app, of this profile or of the server `--profiles` names; each app must log in again")).action(async function () {
-        const context = messengerContext(this, messenger, { needsProfile: false });
-        const served = servedProfiles(this, messenger, context, this.opts().profiles, "mcp revoke");
+        const context = host.context(this, { needsProfile: false });
+        const served = servedProfiles(this, host, context, this.opts().profiles, "mcp revoke");
         const { revokeAll } = await import("../../mcp/http/oauth.js");
         revokeAll(httpTokenFile(app, "set" in served ? served.set.key : served.profile, context.env));
         renderAnswer(this, context, itemOf("set" in served
@@ -135,9 +161,9 @@ export const mcpCommand = (messenger) => {
         permission: true,
         profiles: true,
         target: (self) => {
-            const context = messengerContext(self, messenger, { needsProfile: false });
+            const context = host.context(self, { needsProfile: false });
             const { env } = context;
-            const served = servedProfiles(self, messenger, context, self.opts().profiles, `mcp server ${self.name()}`);
+            const served = servedProfiles(self, host, context, self.opts().profiles, `mcp server ${self.name()}`);
             if ("set" in served) {
                 const { set } = served;
                 return {
@@ -162,20 +188,20 @@ export const mcpCommand = (messenger) => {
                 version: app.version,
             };
         },
-        answer: (self, item, lines) => renderAnswer(self, messengerContext(self, messenger, { needsProfile: false }), itemOf(item), () => lines.join("\n")),
+        answer: (self, item, lines) => renderAnswer(self, host.context(self, { needsProfile: false }), itemOf(item), () => lines.join("\n")),
         system: (self) => environmentOf(self).system,
     }));
-    command.addCommand(withProfiles(withFlags(annotate(new Command("config"), {
+    command.addCommand(withProfiles(flagged(annotate(new Command("config"), {
         effects: LOCAL_READ,
         examples: [`${app.command} personal mcp config`, `${app.command} mcp config --profiles all`],
     })
         .summary("print the local MCP configuration of this profile, or of those --profiles names")
         .description("print the mcpServers entry for Claude Desktop, Cursor and others, with full paths; writes nothing"))).action(async function () {
         const flags = this.optsWithGlobals();
-        const context = messengerContext(this, messenger, { needsProfile: false });
+        const context = host.context(this, { needsProfile: false });
         const { env } = context;
         const given = environmentOf(this).mcp ?? {};
-        const served = servedProfiles(this, messenger, context, flags.profiles, "mcp config");
+        const served = servedProfiles(this, host, context, flags.profiles, "mcp config");
         const entry = serverEntry(app, {
             ...("set" in served ? { profiles: served.set.option } : { profile: served.profile }),
             flags,
@@ -190,7 +216,7 @@ export const mcpCommand = (messenger) => {
                 : [],
         }), () => JSON.stringify(entry.config, null, 2));
     }));
-    command.addCommand(withFlags(grantsAuthority(annotate(new Command("add"), {
+    command.addCommand(flagged(grantsAuthority(annotate(new Command("add"), {
         effects: LOCAL_WRITE,
         examples: [`${app.command} personal mcp add codex --allow-writes`],
     }))
@@ -199,7 +225,7 @@ export const mcpCommand = (messenger) => {
         .option("--allow-writes", "acknowledge that this profile offers writing tools")).action(async function (client) {
         if (client !== "codex" && client !== "claude-code")
             throw new CliError("validation_error", "choose codex or claude-code");
-        const context = messengerContext(this, messenger);
+        const context = host.context(this);
         const { settings, env } = context;
         const given = environmentOf(this).mcp ?? {};
         const configuration = serverEntry(app, {
@@ -224,11 +250,11 @@ export const mcpCommand = (messenger) => {
             throw new CliError("validation_error", error instanceof Error ? error.message : "MCP setup failed");
         }
     }));
-    command.addCommand(withFlags(annotate(new Command("check"), {
+    command.addCommand(flagged(annotate(new Command("check"), {
         effects: LOCAL_READ,
         examples: [`${app.command} personal mcp check`],
     }).description("check this profile's local MCP handshake and tool list")).action(async function () {
-        const context = messengerContext(this, messenger);
+        const context = host.context(this);
         const { settings, env } = context;
         const given = environmentOf(this).mcp ?? {};
         const configuration = serverEntry(app, {
@@ -247,8 +273,8 @@ export const mcpCommand = (messenger) => {
             const { tools, potentialWrites } = await probeStdio(entry, {
                 start: stderr.start,
             });
-            const account = messenger.accountOf?.(this) ?? recalledAccount(app, messenger.provider, settings.profile, env);
-            if (!account) {
+            const signedIn = host.signedIn(this, settings.profile, env);
+            if (signedIn === false) {
                 const setup = rootOf(this).commands.some((one) => one.name() === "setup")
                     ? ` — log in with \`${app.command} ${settings.profile} setup\``
                     : "";
@@ -256,9 +282,9 @@ export const mcpCommand = (messenger) => {
                     `tools will fail${setup}`);
             }
             renderAnswer(this, context, itemOf({
-                healthy: account !== undefined,
+                healthy: signedIn !== false,
                 profile: settings.profile,
-                signed_in: account !== undefined,
+                signed_in: signedIn ?? null,
                 tools: tools.length,
                 potential_writes: potentialWrites.length,
             }));
@@ -282,11 +308,11 @@ export const profileSetLabel = (set) => {
  * `<tool> <profile> mcp serve` (`src/mcp/all-profiles.ts`). Nothing picks a profile: each tool takes one, and the
  * agent is told to ask.
  */
-const serveProfiles = async (self, context, messenger, flags, set) => {
-    const { app } = messenger;
+const serveProfiles = async (self, context, host, flags, set) => {
+    const { app } = host;
     const { env } = context;
     const tokenFile = httpTokenFile(app, set.key, env);
-    const state = (profile) => messenger.profileState?.(profile, env) ?? "signed-in";
+    const state = (profile) => host.profileState?.(profile, env) ?? "signed-in";
     const bots = set.option === EVERY_PROFILE ? [] : set.profiles().filter((profile) => state(profile) === "bot");
     if (bots.length > 0)
         throw new CliError("validation_error", `${bots.join(", ")} ${bots.length === 1 ? "is a bot profile" : "are bot profiles"}, served by \`${app.command} <profile> bot mcp serve\``);
@@ -298,22 +324,16 @@ const serveProfiles = async (self, context, messenger, flags, set) => {
     const execPath = given.execPath ?? process.execPath;
     const scriptPath = given.scriptPath ?? realpathSync(process.argv[1] ?? "");
     const tightened = (flags.permission ?? []).flatMap((entry) => ["--permission", entry]);
-    const { instructions } = await import("../../mcp/instructions.js");
     const options = {
         command: app.command,
         version: app.version,
-        name: messenger.name ?? app.command,
+        name: host.name,
         profiles,
         signedIn: (profile) => state(profile) === "signed-in",
         signIn: (profile) => `profile ${profile} is not signed in — run \`${app.command} ${profile} setup\`, or sign in from WireCat Desktop, ` +
             "then try again. If the owner did not choose this profile, ask which one.",
         child: (profile) => ({ command: execPath, args: [scriptPath, profile, "mcp", "serve", ...tightened], env }),
-        instructions: instructions({
-            command: app.command,
-            name: messenger.name ?? app.command,
-            profile: profiles(),
-            writes: [],
-        }),
+        instructions: await host.instructions(profiles()),
         note: (line) => context.renderer.note(line),
     };
     if (flags.http) {