@nonbot/cli 0.10.15 → 0.10.17

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 What changed for the person running the CLI, newest first. Update with
 `npm i -g @nonbot/cli@latest`.
 
+## 0.10.17 (2026-11-11)
+
+- Typing `nonbot` alone now shows who you're signed in as and whether the daemon is running (or "not signed in — start with: nonbot login"). The login row says "switch account" when you're already signed in.
+- `nonbot help` and `nonbot -h` open with the gradient wordmark.
+- Under the wordmark: "non.bot CLI v… · non.bot MCP v…" — both versions side by side (the MCP's is read from this machine, so the screen stays instant).
+- Help and error messages say "To use" instead of "Usage", which read like a page of your account usage.
+
+## 0.10.16 (2026-11-11)
+
+- New: `nonbot mcp` shows the non.bot MCP in one place: its version and what's new since, every Claude app and config file it's set up in (and duplicates), a live start with its tool count by group, how much of each conversation its tool list uses, which tools your apps switch off, the token it uses (last four characters only), whether that token is valid and what it may do, and which tools Claude runs without asking. `--quick` skips the live start.
+- Typing `nonbot` alone now has a **help** option under update: click it (or press h) and the full command list prints right below; any other key exits. Outside a real terminal it never waits. `nonbot help` also works.
+- `nonbot doctor` opens with the gradient wordmark and reads as one tidy grid. It now starts the MCP too and shows the result ("170 tools in 281ms"), lists retired MCP servers on one row with `nonbot mcp clean`, and points at `nonbot mcp` for the full check.
+- A project's own `.mcp.json` is never started until you approve it once (`nonbot mcp test --include-project` shows the exact command and asks). The approval is remembered for that exact command only, so a repo that later changes it has to be approved again.
+- New: `nonbot mcp test` starts every configured copy and checks it answers; `nonbot mcp add` registers it in Claude Code; `nonbot mcp clean` removes retired MCP servers from the files they're in (it asks first, and keeps a backup of Claude Desktop's config).
+
 ## 0.10.15 (2026-11-11)
 
 - New: `nonbot logout` signs you out on this machine and stops the daemon.

package/LICENSE

@@ -6,24 +6,35 @@ This software (the "@nonbot/cli" package and all of its contents, the
 "Software") is the proprietary and confidential property of non.bot. It is
 published to the npm registry for the sole purpose of allowing authorized
 non.bot account holders to install and run it as the local host for the
-non.bot "Run" feature.
+non.bot "Run" feature. Publication on the npm registry, or on any mirror, cache
+or CDN that copies it, does not make the Software open source, does not place
+it in the public domain, and grants no right beyond the limited license below.
 
 PERMITTED USE
 
-Subject to your compliance with the non.bot Terms of Service, you are granted
-a limited, non-exclusive, non-transferable, revocable license to download,
-install, and execute unmodified copies of the Software on machines you control,
-solely to connect to and operate the non.bot service.
+Subject to your compliance with the non.bot Terms of Service
+(https://non.bot/terms-of-service), you are granted a limited, non-exclusive,
+non-transferable, non-sublicensable, revocable license to download, install,
+and execute unmodified copies of the Software on machines you control, solely
+to connect to and operate the non.bot service. This license ends automatically
+if you breach it or the Terms of Service, or when your non.bot account ends;
+you must then stop using the Software and delete every copy of it.
 
 PROHIBITED WITHOUT PRIOR WRITTEN PERMISSION FROM non.bot
 
-  - Copying, redistributing, sublicensing, selling, or publishing the Software
-    or any portion of it;
+  - Copying, redistributing, sublicensing, selling, renting, or publishing the
+    Software or any portion of it;
   - Modifying, adapting, translating, or creating derivative works;
-  - Reverse-engineering, decompiling, or disassembling the Software except to
-    the limited extent such restriction is prohibited by applicable law;
-  - Using the Software, or any technique, method, or design embodied in it, to
-    build, train, or operate a competing product or service.
+  - Reverse-engineering, decompiling, or disassembling the Software, except to
+    the limited extent applicable law expressly permits despite this
+    restriction;
+  - Using the Software, or any technique, method, prompt, or design embodied in
+    it, to build, train, or operate a competing product or service;
+  - Using the Software, or any part or output of it, to train, fine-tune,
+    evaluate, or otherwise improve any machine-learning or artificial-
+    intelligence model, dataset, or system;
+  - Removing, obscuring, or altering any copyright, license, or proprietary
+    notice.
 
 NO PATENT OR OTHER IP LICENSE
 

package/README.md

@@ -78,8 +78,14 @@ nonbot daemon           Run the poll loop and launch terminals (the main command
 nonbot run <id>         Launch a single Run by id, then exit
 nonbot status           Show login + daemon status
 nonbot doctor           Health check — platform, auth, server, providers, terminal, MCP
+nonbot mcp              The non.bot MCP: version, where it's set up, a live start, tools,
+                        your token's permissions (add --quick to skip starting it)
+nonbot mcp test         Start every configured copy of the MCP and check it answers
+nonbot mcp add          Register the MCP in Claude Code (claude mcp add … @nonbot/mcp)
+nonbot mcp clean        Remove retired MCP servers (portfolio-mcp, context-graph, jobshop-mcp)
 nonbot logs             Show recent local Run launches
 nonbot update           Install the latest version (npm i -g @nonbot/cli@latest)
+nonbot update mcp       Show the MCP's version and update it
 nonbot profiles         List configured accounts
 nonbot choir <session>  Coordinated-run engine — one agent per git worktree, merged back by hand
 nonbot run-mcp          Per-pane MCP server over stdio (launched by .mcp.json, not by hand)
@@ -135,7 +141,7 @@ daemon asks the npm registry for the latest `@nonbot/cli`. If it is newer than t
 running, it prints a single line:
 
 ```
-Update available: @nonbot/cli 0.9.13 → 0.9.14  (npm i -g @nonbot/cli)
+Update available: @nonbot/cli 0.9.13 → 0.9.14  (run: nonbot update)
 ```
 
 The probe has a 3-second timeout and any failure is silent. Set
@@ -183,6 +189,13 @@ are redacted. Redaction is pattern-based; treat a snapshot as terminal output.
 saved end-of-run output in the local history (`nonbot logs`). A cloud runner
 (`--cloud`) additionally registers its machine id and its allowed repository origins.
 
+**When you run `nonbot mcp` or `nonbot update mcp`:** your token goes to non.bot to
+check it is valid and read its permissions and which apps are on; the CLI asks the npm
+registry for `@nonbot/mcp`'s versions and fetches the mcp.non.bot home page to read
+its version. `nonbot mcp` (not `--quick`) also starts the MCP the way Claude does,
+which makes the MCP's own requests to non.bot. The token is shown only as its last
+four characters.
+
 To show a neutral name instead of the host name, set `NONBOT_MACHINE_NAME` before
 starting the daemon (up to 64 characters):
 

package/dist/commands/doctor.js

@@ -3,15 +3,18 @@ import { readFileSync, readdirSync, existsSync, statSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { loadAuth } from '../lib/auth.js';
-import { scanMcpConfigs, describeNonbotMcp } from '../lib/mcp-config.js';
+import { scanMcpConfigs, describeNonbotMcp, LEGACY_MCP_NAMES } from '../lib/mcp-config.js';
 import { nonbotMcpStatuses, mcpRow } from '../lib/mcp-status.js';
+import { launchSpecOf } from '../lib/mcp-config.js';
+import { probeMcp } from '../lib/mcp-probe.js';
+import { mayStartEntry } from '../lib/mcp-trust.js';
 import { resolveTerminal } from '../lib/terminal.js';
 import { VERSION } from '../version.js';
-import { header, statusRow, errorBlock, isTTY, ANSI } from '../lib/output.js';
+import { header, statusRow, errorBlock, isTTY, ANSI, wordmarkArt, WORDMARK_WIDTH } from '../lib/output.js';
 const HEARTBEAT_FRESH_MS = 35_000;
 const PROVIDER_CLIS = ['claude', 'codex', 'gemini'];
 export const NONBOT_MCP_ADD_HINT = 'claude mcp add nonbot -- npx -y @nonbot/mcp';
-const LEGACY_MCPS = ['portfolio-mcp', 'context-graph', 'jobshop-mcp'];
+const LEGACY_MCPS = LEGACY_MCP_NAMES;
 const EXPECTED_SKILLS = [];
 function isSkillInstalled(skillName) {
     const base = join(homedir(), '.claude');
@@ -137,7 +140,15 @@ export async function runDoctorCommand(args = [], deps = {}) {
     const errRow = (sig, label, detail = '') => errLog(statusRow(sig, label, detail, { labelWidth: LABEL_WIDTH, stream: process.stderr }) + '\n');
     const hint = (text) => log(' '.repeat(HINT_INDENT) + paintDim(text) + '\n');
     const section = (title) => log('\n' + paintSection(title) + '\n');
-    log(header('non.bot doctor', `v${VERSION}  ·  ${process.platform}/${process.arch}`) + '\n');
+    const cols = deps.columns ?? process.stdout.columns ?? 0;
+    const sub = `doctor  ·  v${VERSION}  ·  ${process.platform}/${process.arch}`;
+    if (cols === 0 || cols >= WORDMARK_WIDTH + 4) {
+        log('\n' + wordmarkArt({ indent: '  ' }) + '\n\n');
+        log(`  ${paintDim(sub)}\n`);
+    }
+    else {
+        log(header('non.bot doctor', `v${VERSION}  ·  ${process.platform}/${process.arch}`) + '\n');
+    }
     const auth = await loader();
     if (!auth) {
         log('\n');
@@ -154,7 +165,7 @@ export async function runDoctorCommand(args = [], deps = {}) {
     try {
         const res = await fetchImpl(`${auth.baseUrl}/api/auth/me`, { headers });
         if (res.ok) {
-            row('✓', 'Server', `${auth.baseUrl} · token accepted`);
+            row('✓', 'Server', `${auth.baseUrl.replace(/^https?:\/\//, '')} · token accepted`);
         }
         else if (res.status === 401) {
             errRow('✗', 'Server', 'token rejected (HTTP 401) — sign in again: nonbot login');
@@ -196,7 +207,7 @@ export async function runDoctorCommand(args = [], deps = {}) {
             }
             const storeUrl = `${auth.baseUrl}/whygraph/store?tab=apps&app=${gate.app ?? 'run'}`;
             if (gate.error === 'app_disabled') {
-                row('✗', 'Run app', 'switched off — the daemon gets no runs until it is on');
+                row('✗', 'Run app', 'switched off — the daemon gets no runs');
                 hint(`turn it on: ${storeUrl}`);
             }
             else if (gate.error === 'app_not_installed') {
@@ -217,7 +228,8 @@ export async function runDoctorCommand(args = [], deps = {}) {
     section('AGENTS');
     const providers = PROVIDER_CLIS.map((bin) => ({ bin, r: checkBinary(bin) }));
     const anyProvider = providers.some((p) => p.r.installed);
-    for (const { bin, r } of providers) {
+    const ordered = [...providers.filter((p) => p.r.installed), ...providers.filter((p) => !p.r.installed)];
+    for (const { bin, r } of ordered) {
         if (r.installed)
             row('✓', bin, bareVersion(r.version));
         else if (anyProvider)
@@ -232,7 +244,7 @@ export async function runDoctorCommand(args = [], deps = {}) {
     const { cmd } = profile.launch('/tmp/nonbot-doctor-probe.sh');
     const launcher = checkBinary(cmd);
     if (launcher.installed) {
-        row('✓', 'Opens runs in', `${profile.displayName} · via ${cmd}`);
+        row('✓', 'Opens runs in', `${profile.displayName} (via ${cmd})`);
     }
     else {
         row('⚠', 'Terminal', `${profile.displayName} — launcher "${cmd}" not found on PATH`);
@@ -253,7 +265,7 @@ export async function runDoctorCommand(args = [], deps = {}) {
             const appl = checkBinary('iterm-applescript');
             if (appl.installed) {
                 const v = bareVersion(appl.version);
-                row('✓', 'iTerm', v ? `${v} · running · AppleScript reachable` : 'running · AppleScript reachable');
+                row('✓', 'iTerm', v ? `${v} · AppleScript OK` : 'AppleScript OK');
             }
             else {
                 row('⚠', 'iTerm', appl.version ? `AppleScript blocked: ${appl.version}` : 'AppleScript blocked');
@@ -261,29 +273,60 @@ export async function runDoctorCommand(args = [], deps = {}) {
             }
         }
     }
-    section('CLAUDE CODE');
+    section('MCP');
     const statusSource = deps.nonbotMcp ?? (deps.checkBinary ? null : () => nonbotMcpStatuses({ fetchImpl: deps.fetchImpl }));
     const statuses = statusSource ? await statusSource().catch(() => []) : null;
     const nonbotMcp = statuses ? { installed: statuses.length > 0 } : checkBinary('mcp:nonbot');
     if (statuses && statuses.length > 0) {
-        const r = mcpRow(statuses[0]);
-        row(r.sigil, 'nonbot MCP', r.detail);
+        const primary = statuses.find((s) => s.entry.scope && s.entry.scope !== 'desktop') ?? statuses[0];
+        const r = mcpRow(primary);
+        row(r.sigil, 'Installed', r.detail);
         if (r.hint)
             hint(r.hint);
+        const startSource = deps.mcpStart ??
+            (deps.checkBinary
+                ? null
+                : async (entry) => {
+                    const spec = launchSpecOf(entry);
+                    if (!spec)
+                        return { state: 'unknown' };
+                    if (!mayStartEntry(entry, spec))
+                        return { state: 'unapproved' };
+                    return { state: 'started', result: await probeMcp(spec, { fetchImpl: deps.fetchImpl, fallbackBearer: auth.pat, timeoutMs: 20_000 }) };
+                });
+        if (startSource) {
+            const s = await startSource(primary.entry).catch(() => ({ state: 'unknown' }));
+            if (s.state === 'started' && s.result.ok) {
+                const took = s.result.ms < 1000 ? `${s.result.ms}ms` : `${(s.result.ms / 1000).toFixed(1)}s`;
+                const v = s.result.serverVersion;
+                const differs = v && primary.installed && v !== primary.installed ? ` · but reports v${v}` : '';
+                row(differs ? '⚠' : '✓', 'Starts', `${s.result.tools.length} tools in ${took}${differs}`);
+            }
+            else if (s.state === 'started') {
+                row('✗', 'Starts', s.result.error ?? 'it did not answer');
+                hint('see it fail: nonbot mcp test');
+            }
+            else if (s.state === 'unapproved') {
+                row('ℹ', 'Starts', `not started — ${primary.entry.source} is a project file`);
+                hint('approve it once: nonbot mcp test --include-project');
+            }
+            else {
+                row('ℹ', 'Starts', 'not checked — could not read how it is launched');
+            }
+        }
     }
     else if (nonbotMcp.installed) {
         const how = nonbotMcp.version ?? 'configured (@nonbot/mcp)';
-        row(/pinned/.test(how) ? '⚠' : '✓', 'nonbot MCP', how);
+        row(/pinned/.test(how) ? '⚠' : '✓', 'Installed', how);
     }
     else {
-        row('⚠', 'nonbot MCP', 'not set up — runs cannot report back without it');
-        hint(`add it: ${NONBOT_MCP_ADD_HINT}`);
+        row('⚠', 'Not set up', 'runs cannot report back without the non.bot MCP');
+        hint('add it: nonbot mcp add');
     }
-    for (const name of LEGACY_MCPS) {
-        const legacy = checkBinary(`mcp:${name}`);
-        if (legacy.installed) {
-            row('ℹ', name, legacy.version ? `retired — safe to delete from ${legacy.version}` : 'retired — safe to remove');
-        }
+    const legacy = LEGACY_MCPS.map((name) => ({ name, r: checkBinary(`mcp:${name}`) })).filter((l) => l.r.installed);
+    if (legacy.length) {
+        const files = [...new Set(legacy.map((l) => l.r.version).filter((v) => !!v))];
+        row('ℹ', 'Retired', `${legacy.map((l) => l.name).join(', ')}${files.length === 1 ? ` in ${files[0]}` : ''} · remove: nonbot mcp clean`);
     }
     for (const name of EXPECTED_SKILLS) {
         const r = checkBinary(`skill:${name}`);
@@ -294,9 +337,9 @@ export async function runDoctorCommand(args = [], deps = {}) {
     }
     section('COMMANDS');
     log(commandRow('nonbot daemon', 'start listening for runs'));
-    log(commandRow('Ctrl-C', 'stop the daemon (in its window)'));
-    log(commandRow('nonbot daemon stop', 'stop it from any other terminal'));
-    log(commandRow('nonbot logout', 'sign out on this machine and stop the daemon'));
+    log(commandRow('Ctrl-C', 'stop it · from another terminal: nonbot daemon stop'));
+    log(commandRow('nonbot mcp', 'the full MCP check'));
+    log(commandRow('nonbot logout', 'sign out and stop the daemon'));
     return exitCode;
 }
 const LABEL_WIDTH = 14;
@@ -308,7 +351,7 @@ function paintSection(title) {
     return isTTY(process.stdout) ? `   ${ANSI.bold}${title}${ANSI.reset}` : `   ${title}`;
 }
 function commandRow(cmd, what) {
-    const padded = cmd.padEnd(LABEL_WIDTH + 6, ' ');
+    const padded = cmd.padEnd(LABEL_WIDTH + 1, ' ');
     if (!isTTY(process.stdout))
         return `      ${padded}${what}\n`;
     return `      ${ANSI.cyan}${padded}${ANSI.reset}${ANSI.dim}${what}${ANSI.reset}\n`;

package/dist/commands/logs.js

@@ -73,7 +73,7 @@ export async function runLogsCommand(args = [], deps = {}) {
     const opts = parseArgs(args);
     if (opts.error) {
         errLog(statusRow('✗', 'nonbot logs', opts.error, { stream: process.stderr }) + '\n');
-        errLog('      Usage: nonbot logs [--limit <n>] [--json] [--follow|-f]\n');
+        errLog('      To use: nonbot logs [--limit <n>] [--json] [--follow|-f]\n');
         return 1;
     }
     const entries = await readActivityLog(opts.limit);