severally-mcp 2.3.1 → 2.4.0

package/scripts/install.mjs

@@ -27,24 +27,38 @@
 // client's own CLI rather than hand-edited, and every file this touches is
 // backed up first under ~/.severally/backups/<timestamp>/.
 //
-//   node scripts/install.mjs [--dry-run] [--manual] [--skip-global] [--force]
+// When the global npm install cannot be made (npm needs sudo, or npm's global
+// folder is not on PATH), plugin mode registers Codex directly instead, so the
+// install still finishes.
+//
+//   node scripts/install.mjs [--dry-run] [--manual] [--skip-global] [--force] [--allow-local-tools]
 
 import { copyTree, execCommandSync, findCommand } from '../src/platform.mjs';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import readline from 'node:readline/promises';
 import { fileURLToPath } from 'node:url';
 
+if (Number(process.versions.node.split('.')[0]) < 22) {
+  console.error(
+    `severally-install: Node.js 22 or newer is needed (this is ${process.versions.node}); update Node.js and run it again`,
+  );
+  process.exit(1);
+}
+
 const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
 const PLUGIN = path.join(root, 'plugins', 'severally');
-const FLAGS = ['--dry-run', '--manual', '--skip-global', '--force'];
+const FLAGS = ['--dry-run', '--manual', '--skip-global', '--force', '--allow-local-tools'];
 const argv = new Set(process.argv.slice(2));
 // A word the installer does not know is refused before anything changes: a
 // shell that passes a pasted "# add --dry-run ..." comment on as arguments
 // would otherwise turn an install into a silent dry run.
 const unknownArgs = [...argv].filter((a) => !FLAGS.includes(a));
 if (unknownArgs.length) {
-  console.error(`severally-install: unknown argument(s) ${unknownArgs.map((a) => JSON.stringify(a)).join(' ')}; it takes ${FLAGS.join(' ')}`);
+  console.error(
+    `severally-install: unknown argument(s) ${unknownArgs.map((a) => JSON.stringify(a)).join(' ')}; it takes ${FLAGS.join(' ')}`,
+  );
   process.exit(2);
 }
 const dryRun = argv.has('--dry-run');
@@ -98,7 +112,10 @@ function backupName(target) {
 
 function backup(file) {
   if (!fs.existsSync(file)) return null;
-  if (dryRun) { log(`   [dry-run] backup ${file}`); return null; }
+  if (dryRun) {
+    log(`   [dry-run] backup ${file}`);
+    return null;
+  }
   fs.mkdirSync(backupDir, { recursive: true, mode: 0o700 });
   const dest = path.join(backupDir, backupName(file));
   // Several client operations can touch the same config in one install.
@@ -110,7 +127,10 @@ function backup(file) {
 
 function backupTree(dir) {
   if (!fs.existsSync(dir)) return null;
-  if (dryRun) { log(`   [dry-run] backup ${dir}`); return null; }
+  if (dryRun) {
+    log(`   [dry-run] backup ${dir}`);
+    return null;
+  }
   fs.mkdirSync(backupDir, { recursive: true, mode: 0o700 });
   const dest = path.join(backupDir, backupName(dir));
   copyTree(dir, dest);
@@ -128,7 +148,8 @@ function which(bin) {
 // severally-mcp package, so they are not where the command is looked for.
 function runtimeCommand() {
   const key = Object.keys(process.env).find((k) => k.toUpperCase() === 'PATH') ?? 'PATH';
-  const dirs = (process.env[key] ?? '').split(path.delimiter)
+  const dirs = (process.env[key] ?? '')
+    .split(path.delimiter)
     .filter((dir) => !/(^|[\\/])node_modules[\\/]\.bin[\\/]?$/.test(dir.replace(/^"(.*)"$/, '$1')));
   return findCommand('severally-mcp', { env: { ...process.env, [key]: dirs.join(path.delimiter) } });
 }
@@ -153,7 +174,10 @@ function installRuntime() {
     run(process.execPath, ['--check', staged], { real: true });
     // The bundle carries other packages' code, so their licences travel with
     // it -- copied first, so a missing one fails before the runtime changes.
-    fs.copyFileSync(path.join(path.dirname(source), 'THIRD_PARTY_NOTICES'), path.join(path.dirname(installed), 'THIRD_PARTY_NOTICES'));
+    fs.copyFileSync(
+      path.join(path.dirname(source), 'THIRD_PARTY_NOTICES'),
+      path.join(path.dirname(installed), 'THIRD_PARTY_NOTICES'),
+    );
     fs.copyFileSync(path.join(PLUGIN, 'LICENSE'), path.join(path.dirname(installed), 'LICENSE'));
     backup(installed);
     fs.renameSync(staged, installed);
@@ -164,15 +188,28 @@ function installRuntime() {
   return installed;
 }
 
+const RUNTIME_PACKAGE = 'severally-runtime';
+// Why plugin mode registers Codex directly (no global command), or null.
+let codexDirect = null;
+let globalRoot = null;
 // Run from a global install of the npm package, the global install below
 // would replace the very package this script and its plugin files are read
 // from. Refused before anything changes.
 if (mode === 'plugin' && !skipGlobal) {
-  const globalRoot = tryRun('npm', ['root', '-g'], { real: true });
-  const inside = (dir) => { try { return fs.realpathSync(root).startsWith(fs.realpathSync(dir) + path.sep); } catch { return false; } };
-  if (globalRoot.ok && globalRoot.out.trim() && inside(globalRoot.out.trim())) {
-    throw new Error('severally-install was run from a global npm install of severally-mcp, which installing would replace. '
-      + 'Remove it (npm uninstall -g severally-mcp), then run npx -y severally-mcp@latest install, or install from a clone.');
+  const npmRoot = tryRun('npm', ['root', '-g'], { real: true });
+  globalRoot = npmRoot.ok ? npmRoot.out.trim() || null : null;
+  const inside = (dir) => {
+    try {
+      return fs.realpathSync(root).startsWith(fs.realpathSync(dir) + path.sep);
+    } catch {
+      return false;
+    }
+  };
+  if (globalRoot && inside(globalRoot)) {
+    throw new Error(
+      'severally-install was run from a global npm install of severally-mcp, which installing would replace. ' +
+        'Remove it (npm uninstall -g severally-mcp), then run npx -y severally-mcp@latest install, or install from a clone.',
+    );
   }
 }
 
@@ -184,29 +221,53 @@ const marketplaceRoot = path.join(home, '.severally', 'marketplace');
 if (mode === 'plugin') {
   // npm may symlink a directory install. Its source must therefore be the
   // persistent runtime, never the user's disposable checkout.
+  // The runtime goes global under a name of its own: under the npm package's
+  // name and version, npx would run this installer-less copy for
+  // `npx severally-mcp@<that version> install` instead of fetching the package.
   const packageFile = path.join(runtimeDir, 'package.json');
   const metadata = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8'));
   if (!dryRun) {
     backup(packageFile);
-    fs.writeFileSync(packageFile, `${JSON.stringify({ name: metadata.name, version: metadata.version,
-      type: 'module', bin: { 'severally-mcp': 'severally-mcp.mjs' } }, null, 2)}\n`);
+    fs.writeFileSync(
+      packageFile,
+      `${JSON.stringify(
+        { name: RUNTIME_PACKAGE, version: metadata.version, type: 'module', bin: { 'severally-mcp': 'severally-mcp.mjs' } },
+        null,
+        2,
+      )}\n`,
+    );
     fs.chmodSync(serverCommand[1], 0o755);
   }
   if (skipGlobal) {
     const existing = runtimeCommand();
     if (!dryRun && (!existing || fs.realpathSync(existing) !== fs.realpathSync(serverCommand[1]))) {
-      throw new Error('--skip-global requires severally-mcp on PATH to point to the installed runtime. Omit --skip-global or use --manual.');
+      throw new Error(
+        '--skip-global requires severally-mcp on PATH to point to the installed runtime. Omit --skip-global or use --manual.',
+      );
     }
     log('   --skip-global: using the existing runtime command');
   } else {
-    run('npm', ['install', '-g', runtimeDir, '--install-links=false'], { cwd: dryRun ? root : runtimeDir });
+    // Installs before the rename put the runtime there under the package's
+    // own name; its severally-mcp command would collide with the new one.
+    if (globalRoot && fs.existsSync(path.join(globalRoot, metadata.name))) {
+      const r = tryRun('npm', ['uninstall', '-g', metadata.name]);
+      log(
+        r.ok
+          ? `   removed the global ${metadata.name} package (the runtime is now ${RUNTIME_PACKAGE})`
+          : `   could not remove the global ${metadata.name} package: ${r.out}`,
+      );
+    }
+    const r = tryRun('npm', ['install', '-g', runtimeDir, '--install-links=false'], { cwd: dryRun ? root : runtimeDir });
     if (which('nodenv')) tryRun('nodenv', ['rehash']);
-    if (!dryRun) {
+    if (!r.ok) {
+      codexDirect = `npm could not install the severally-mcp command globally (${r.out.split('\n').find((l) => /ERR|EACCES|EPERM/.test(l)) ?? r.out.split('\n')[0]})`;
+    } else if (!dryRun) {
       const installedCommand = runtimeCommand();
       if (!installedCommand || fs.realpathSync(installedCommand) !== fs.realpathSync(serverCommand[1])) {
-        throw new Error('The installed severally-mcp runtime command is not first on PATH. Fix PATH and rerun, or use --manual.');
+        codexDirect = "npm's global severally-mcp command is not first on PATH";
       }
     }
+    if (codexDirect) log(`   ${codexDirect}; Codex will be registered directly instead, which needs no global command`);
   }
   if (dryRun) {
     backupTree(marketplaceRoot);
@@ -221,8 +282,10 @@ if (mode === 'plugin') {
     try {
       fs.mkdirSync(path.join(next, '.agents', 'plugins'), { recursive: true });
       copyTree(PLUGIN, path.join(next, 'plugins', 'severally'));
-      fs.copyFileSync(path.join(root, '.agents', 'plugins', 'marketplace.json'),
-        path.join(next, '.agents', 'plugins', 'marketplace.json'));
+      fs.copyFileSync(
+        path.join(root, '.agents', 'plugins', 'marketplace.json'),
+        path.join(next, '.agents', 'plugins', 'marketplace.json'),
+      );
       backupTree(marketplaceRoot);
       if (fs.existsSync(marketplaceRoot)) fs.renameSync(marketplaceRoot, previous);
       try {
@@ -266,14 +329,23 @@ let priorCodexTimeout;
 // that is not one of its own sub-tables (codex may put env in one).
 function codexTable() {
   let lines;
-  try { lines = fs.readFileSync(codexConfig, 'utf8').split('\n'); } catch (err) { return { reason: `cannot read ${codexConfig}: ${err.message}` }; }
+  try {
+    lines = fs.readFileSync(codexConfig, 'utf8').split('\n');
+  } catch (err) {
+    return { reason: `cannot read ${codexConfig}: ${err.message}` };
+  }
   const start = lines.findIndex((l) => /^\s*\[\s*mcp_servers\.severally\s*\]/.test(l));
   if (start < 0) return { reason: `${codexConfig} has no [mcp_servers.severally] table` };
   let end = lines.findIndex((l, i) => i > start && /^\s*\[/.test(l) && !/^\s*\[\s*mcp_servers\.severally\./.test(l));
   if (end < 0) end = lines.length;
   const block = lines.slice(start + 1, end).join('\n');
   const timeout = block.match(/^\s*tool_timeout_sec\s*=\s*(\d+(?:\.\d+)?)/m)?.[1];
-  return { lines, start, timeout: timeout === undefined ? undefined : Number(timeout), wait: /SEVERALLY_MAX_WAIT_MS\s*=\s*"?\d+/.test(block) };
+  return {
+    lines,
+    start,
+    timeout: timeout === undefined ? undefined : Number(timeout),
+    wait: /SEVERALLY_MAX_WAIT_MS\s*=\s*"?\d+/.test(block),
+  };
 }
 
 // The wait follows the timeout Codex will enforce: 15 s under the user's own
@@ -290,7 +362,11 @@ function writeCodexTimeout(sec) {
   if (t.reason) return t.reason;
   if (t.timeout !== undefined) return null; // never overwrite the user's value
   t.lines.splice(t.start + 1, 0, `tool_timeout_sec = ${sec}`);
-  try { fs.writeFileSync(codexConfig, t.lines.join('\n')); } catch (err) { return `cannot write ${codexConfig}: ${err.message}`; }
+  try {
+    fs.writeFileSync(codexConfig, t.lines.join('\n'));
+  } catch (err) {
+    return `cannot write ${codexConfig}: ${err.message}`;
+  }
   return null;
 }
 
@@ -348,7 +424,9 @@ const CLIENTS = [
     keptNote: () => {
       const t = codexTable();
       if (t.timeout === undefined || !t.wait) {
-        log(`   this registration lacks the long consult_get wait (45 s); --force adds it (SEVERALLY_MAX_WAIT_MS and tool_timeout_sec = ${CODEX_TIMEOUT_SEC})`);
+        log(
+          `   this registration lacks the long consult_get wait (45 s); --force adds it (SEVERALLY_MAX_WAIT_MS and tool_timeout_sec = ${CODEX_TIMEOUT_SEC})`,
+        );
       }
     },
     skillFrom: path.join(PLUGIN, 'skills', 'codex', 'severally'),
@@ -381,10 +459,7 @@ const CLIENTS = [
   {
     bin: 'opencode',
     label: 'OpenCode',
-    backup: [
-      path.join(xdgConfig, 'opencode', 'opencode.json'),
-      path.join(xdgConfig, 'opencode', 'opencode.jsonc'),
-    ],
+    backup: [path.join(xdgConfig, 'opencode', 'opencode.json'), path.join(xdgConfig, 'opencode', 'opencode.jsonc')],
     // opencode has no `mcp get`; list and look for the exact server name.
     // `mcp list` prints through the prompt library, but the per-server lines
     // still reach stdout when stdout is not a TTY ("✓ severally  connected").
@@ -405,24 +480,36 @@ const CLIENTS = [
     remove: () => ({ ok: true, out: 'opencode has no mcp remove; re-adding replaces the entry' }),
     // OpenCode sets no deadline of its own on a tool call (a 610 s call came
     // back), so it gets the long consult_get wait with no timeout to pair.
-    add: (bin) => tryRun('opencode', ['mcp', 'add', 'severally', '--global', '--env', LONG_WAIT, '--', ...bin]),
+    // opencode 1.19 (its npm release) has no --global and always writes the
+    // global config; it is asked again without the flag, from the home
+    // folder, and the check after the add confirms where it landed.
+    add: (bin) => {
+      const r = tryRun('opencode', ['mcp', 'add', 'severally', '--global', '--env', LONG_WAIT, '--', ...bin]);
+      return r.ok ? r : tryRun('opencode', ['mcp', 'add', 'severally', '--env', LONG_WAIT, '--', ...bin], { cwd: home });
+    },
     keptNote: () => {
       const text = [path.join(xdgConfig, 'opencode', 'opencode.json'), path.join(xdgConfig, 'opencode', 'opencode.jsonc')]
-        .map((f) => { try { return fs.readFileSync(f, 'utf8'); } catch { return ''; } }).join('\n');
-      if (!text.includes('SEVERALLY_MAX_WAIT_MS')) log('   this registration lacks the long consult_get wait (45 s); --force adds it (SEVERALLY_MAX_WAIT_MS)');
+        .map((f) => {
+          try {
+            return fs.readFileSync(f, 'utf8');
+          } catch {
+            return '';
+          }
+        })
+        .join('\n');
+      if (!text.includes('SEVERALLY_MAX_WAIT_MS'))
+        log('   this registration lacks the long consult_get wait (45 s); --force adds it (SEVERALLY_MAX_WAIT_MS)');
     },
     // A zero exit from `mcp add` can be a usage dump in disguise (see above),
     // so this client's registration is verified by listing after adding --
     // and the recorded command is compared against this install's.
     verifyAdd: true,
-    registrationConfig: [
-      path.join(xdgConfig, 'opencode', 'opencode.json'),
-      path.join(xdgConfig, 'opencode', 'opencode.jsonc'),
-    ],
+    registrationConfig: [path.join(xdgConfig, 'opencode', 'opencode.json'), path.join(xdgConfig, 'opencode', 'opencode.jsonc')],
     skillFrom: path.join(PLUGIN, 'skills', 'opencode', 'severally'),
     skillTo: path.join(xdgConfig, 'opencode', 'skills', 'severally'),
   },
 ];
+const codexClient = CLIENTS.find((c) => c.bin === 'codex');
 const antigravityClient = CLIENTS.find((c) => c.bin === 'agy');
 const opencodeClient = CLIENTS.find((c) => c.bin === 'opencode');
 
@@ -435,7 +522,9 @@ function registrationCommandMatches(client, bin) {
     let cfg;
     try {
       cfg = JSON.parse(fs.readFileSync(file, 'utf8').replace(/^\s*\/\/.*$/gm, ''));
-    } catch { continue; }
+    } catch {
+      continue;
+    }
     const entry = cfg.mcp?.servers?.severally ?? cfg.mcp?.severally;
     const command = entry?.command ?? entry;
     if (Array.isArray(command)) return JSON.stringify(command) === JSON.stringify(bin);
@@ -456,7 +545,8 @@ function listedAfterAdd(client) {
 // Registers one client's MCP server directly (through its own `mcp add`) and
 // copies its skill, backing up everything it touches first. Shared by plugin
 // mode (Antigravity only) and --manual mode (all three clients).
-function installClientDirectly(client, bin) {  step(`Registering with ${client.label}`);
+function installClientDirectly(client, bin) {
+  step(`Registering with ${client.label}`);
   if (!which(client.bin)) {
     log(`   ${client.bin} CLI not found on PATH — skipped`);
     return;
@@ -501,7 +591,10 @@ function installClientDirectly(client, bin) {  step(`Registering with ${client.l
   if (!fs.existsSync(parent) && !dryRun) fs.mkdirSync(parent, { recursive: true });
   const saved = backupTree(client.skillTo);
   if (saved) log(`   backed up the existing ${client.label} skill to ${saved}`);
-  if (dryRun) { log(`   [dry-run] copy ${client.skillFrom} -> ${client.skillTo}`); return; }
+  if (dryRun) {
+    log(`   [dry-run] copy ${client.skillFrom} -> ${client.skillTo}`);
+    return;
+  }
   fs.rmSync(client.skillTo, { recursive: true, force: true });
   copyTree(client.skillFrom, client.skillTo);
   log(`   skill: ${client.skillTo}`);
@@ -511,13 +604,17 @@ function installClientDirectly(client, bin) {  step(`Registering with ${client.l
 // severally@severally) loads that copy, and a skills-dir copy or user-scope
 // registration from this installer would load beside it as a second server
 // and skill (verified with claude 2.1.302). Claude Code is left to it.
+// Returns the plugin's id (severally@<marketplace>), or false.
 function claudeHasMarketplacePlugin() {
   if (!which('claude')) return false;
   const r = tryRun('claude', ['plugin', 'list', '--json'], { real: true });
   try {
-    return r.ok && JSON.parse(r.out).some((p) => /^severally@/.test(p.id) && p.id !== 'severally@skills-dir');
-  } catch { return false; }
+    return (r.ok && JSON.parse(r.out).find((p) => /^severally@/.test(p.id) && p.id !== 'severally@skills-dir')?.id) || false;
+  } catch {
+    return false;
+  }
 }
+const claudeMarketplace = claudeHasMarketplacePlugin();
 
 function leaveClaudeToMarketplace() {
   step('Claude Code has severally from the marketplace; leaving Claude Code to it');
@@ -532,9 +629,28 @@ function leaveClaudeToMarketplace() {
     const r = tryRun('claude', ['mcp', 'remove', '--scope', 'user', 'severally']);
     log(r.ok ? '   removed the user-scope MCP registration' : `   could not remove the user-scope registration: ${r.out}`);
   }
-  log('   update Claude Code with /plugin marketplace update severally, then restart it');
+  // Brought to this release too, so one install run updates every copy.
+  const updated =
+    tryRun('claude', ['plugin', 'marketplace', 'update', 'severally'], { timeout: 120_000 }).ok &&
+    tryRun('claude', ['plugin', 'update', claudeMarketplace], { timeout: 120_000 }).ok;
+  log(
+    updated
+      ? `   updated ${claudeMarketplace} from its marketplace`
+      : '   could not update it here; in Claude Code run /plugin marketplace update severally',
+  );
+}
+
+// A previous plugin installation would otherwise retain its old checkout
+// marketplace alongside a new direct server registration.
+function removeCodexLocalMarketplace() {
+  if (!which('codex')) return;
+  const known = tryRun('codex', ['plugin', 'marketplace', 'list'], { real: true });
+  if (known.ok && known.out.includes('severally-local')) {
+    backup(path.join(codexHome, 'config.toml'));
+    tryRun('codex', ['plugin', 'remove', 'severally', '--marketplace', 'severally-local']);
+    run('codex', ['plugin', 'marketplace', 'remove', 'severally-local']);
+  }
 }
-const claudeMarketplace = claudeHasMarketplacePlugin();
 
 if (mode === 'plugin') {
   // ------------------------------------------------------------- plugin mode
@@ -558,41 +674,54 @@ if (mode === 'plugin') {
       if (dup.ok) {
         backup(path.join(home, '.claude.json'));
         const r = tryRun('claude', ['mcp', 'remove', '--scope', 'user', 'severally']);
-        log(r.ok ? '   removed the duplicate user-scope MCP registration' : `   could not remove the duplicate registration: ${r.out}`);
+        log(
+          r.ok
+            ? '   removed the duplicate user-scope MCP registration'
+            : `   could not remove the duplicate registration: ${r.out}`,
+        );
       }
     }
   }
 
-  step('Installing the plugin into Codex (managed local marketplace)');
-  if (!which('codex')) {
-    log('   codex CLI not found on PATH — skipped');
+  if (codexDirect && which('codex')) {
+    removeCodexLocalMarketplace();
+    installClientDirectly(codexClient, serverCommand);
   } else {
-    backup(path.join(codexHome, 'config.toml'));
-    const marketplace = 'severally-local';
-    const known = tryRun('codex', ['plugin', 'marketplace', 'list'], { real: true });
-    if (!known.ok) throw new Error(`Could not inspect Codex marketplaces: ${known.out}`);
-    // Refresh our own registration even when already present: older installs
-    // registered the checkout here. Reusing it would retain that dependency.
-    if (known.out.includes(marketplace)) {
-      tryRun('codex', ['plugin', 'remove', 'severally', '--marketplace', marketplace]);
-      run('codex', ['plugin', 'marketplace', 'remove', marketplace]);
-    }
-    run('codex', ['plugin', 'marketplace', 'add', marketplaceRoot]);
-    log(`   marketplace added: ${marketplace} -> ${marketplaceRoot}`);
-    const r = tryRun('codex', ['plugin', 'add', `severally@${marketplace}`]);
-    log(r.ok ? '   plugin installed' : `   plugin install failed: ${r.out}`);
-    if (!r.ok) process.exitCode = 1;
-    // Same duplication concern on the Codex side.
-    const dup = tryRun('codex', ['mcp', 'get', 'severally'], { real: true });
-    if (dup.ok) {
-      const rm = tryRun('codex', ['mcp', 'remove', 'severally']);
-      log(rm.ok ? '   removed the duplicate global MCP registration' : `   could not remove the duplicate registration: ${rm.out}`);
-    }
-    const strayCodexSkill = path.join(codexHome, 'skills', 'severally');
-    if (fs.existsSync(strayCodexSkill)) {
-      const s2 = backupTree(strayCodexSkill);
-      if (!dryRun) fs.rmSync(strayCodexSkill, { recursive: true, force: true });
-      log(`   removed the hand-copied skill (the plugin supplies it); backup: ${s2}`);
+    step('Installing the plugin into Codex (managed local marketplace)');
+    if (!which('codex')) {
+      log('   codex CLI not found on PATH — skipped');
+    } else {
+      backup(path.join(codexHome, 'config.toml'));
+      const marketplace = 'severally-local';
+      const known = tryRun('codex', ['plugin', 'marketplace', 'list'], { real: true });
+      if (!known.ok) throw new Error(`Could not inspect Codex marketplaces: ${known.out}`);
+      // Refresh our own registration even when already present: older installs
+      // registered the checkout here. Reusing it would retain that dependency.
+      if (known.out.includes(marketplace)) {
+        tryRun('codex', ['plugin', 'remove', 'severally', '--marketplace', marketplace]);
+        run('codex', ['plugin', 'marketplace', 'remove', marketplace]);
+      }
+      run('codex', ['plugin', 'marketplace', 'add', marketplaceRoot]);
+      log(`   marketplace added: ${marketplace} -> ${marketplaceRoot}`);
+      const r = tryRun('codex', ['plugin', 'add', `severally@${marketplace}`]);
+      log(r.ok ? '   plugin installed' : `   plugin install failed: ${r.out}`);
+      if (!r.ok) process.exitCode = 1;
+      // Same duplication concern on the Codex side.
+      const dup = tryRun('codex', ['mcp', 'get', 'severally'], { real: true });
+      if (dup.ok) {
+        const rm = tryRun('codex', ['mcp', 'remove', 'severally']);
+        log(
+          rm.ok
+            ? '   removed the duplicate global MCP registration'
+            : `   could not remove the duplicate registration: ${rm.out}`,
+        );
+      }
+      const strayCodexSkill = path.join(codexHome, 'skills', 'severally');
+      if (fs.existsSync(strayCodexSkill)) {
+        const s2 = backupTree(strayCodexSkill);
+        if (!dryRun) fs.rmSync(strayCodexSkill, { recursive: true, force: true });
+        log(`   removed the hand-copied skill (the plugin supplies it); backup: ${s2}`);
+      }
     }
   }
 
@@ -605,22 +734,62 @@ if (mode === 'plugin') {
   installClientDirectly(opencodeClient, serverCommand);
 } else {
   // ------------------------------------------------------------- manual mode
-  // A previous plugin installation would otherwise retain its old checkout
-  // marketplace alongside the new direct server registration.
-  if (which('codex')) {
-    const known = tryRun('codex', ['plugin', 'marketplace', 'list'], { real: true });
-    if (known.ok && known.out.includes('severally-local')) {
-      backup(path.join(codexHome, 'config.toml'));
-      tryRun('codex', ['plugin', 'remove', 'severally', '--marketplace', 'severally-local']);
-      run('codex', ['plugin', 'marketplace', 'remove', 'severally-local']);
-    }
-  }
+  removeCodexLocalMarketplace();
   for (const client of CLIENTS) {
     if (client.bin === 'claude' && claudeMarketplace) leaveClaudeToMarketplace();
     else installClientDirectly(client, serverCommand);
   }
 }
 
+// ---------------------------------------------------------------- local tools
+// Five of the six tools stay on this machine; Claude Code asks before each
+// call unless they are allowed, so a first consultation can stop on prompt
+// after prompt. Offered here, never assumed: consult_start, which sends the
+// brief out, keeps asking.
+const LOCAL_TOOLS = ['consult_get', 'consult_list', 'consult_cancel', 'consult_record', 'consult_export'];
+async function allowLocalTools() {
+  if (!which('claude')) return;
+  const prefix = mode === 'plugin' || claudeMarketplace ? 'mcp__plugin_severally_severally__' : 'mcp__severally__';
+  const settingsFile = path.join(home, '.claude', 'settings.json');
+  let settings = {};
+  try {
+    settings = JSON.parse(fs.readFileSync(settingsFile, 'utf8'));
+  } catch (err) {
+    if (err.code !== 'ENOENT') {
+      log(`   could not read ${settingsFile} (${err.message}); left as it is`);
+      return;
+    }
+  }
+  const allow = settings.permissions?.allow ?? [];
+  const missing = LOCAL_TOOLS.map((t) => prefix + t).filter((t) => !allow.includes(t));
+  if (!missing.length) return;
+  step('Claude Code tool permissions');
+  let yes = argv.has('--allow-local-tools');
+  if (!yes && process.stdin.isTTY && process.stdout.isTTY && !dryRun) {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const answer = await rl.question(
+      `   Let Claude Code run ${LOCAL_TOOLS.join(', ')} without asking each time?\n` +
+        '   They send nothing off this machine; consult_start, which does, still asks. [Y/n] ',
+    );
+    rl.close();
+    yes = !/^\s*n/i.test(answer);
+  }
+  if (!yes) {
+    log(`   not changed; rerun with --allow-local-tools to allow them in ${settingsFile}`);
+    return;
+  }
+  if (dryRun) {
+    log(`   [dry-run] add ${missing.join(', ')} to permissions.allow in ${settingsFile}`);
+    return;
+  }
+  backup(settingsFile);
+  settings.permissions = { ...settings.permissions, allow: [...allow, ...missing] };
+  fs.mkdirSync(path.dirname(settingsFile), { recursive: true });
+  fs.writeFileSync(settingsFile, `${JSON.stringify(settings, null, 2)}\n`);
+  log(`   allowed in ${settingsFile}: ${missing.join(', ')}`);
+}
+await allowLocalTools();
+
 // ---------------------------------------------------------------- summary
 step('Done');
 if (fs.existsSync(backupDir)) log(`   backups: ${backupDir}`);
@@ -629,10 +798,12 @@ if (keptRegistrations) {
 } else if (!dryRun && !process.exitCode) {
   log('   The registered server and skills no longer depend on the source checkout.');
 }
-log(mode === 'plugin' ? `
+log(
+  mode === 'plugin'
+    ? `
 Verify with:
   claude plugin details severally
-  codex  plugin list
+  ${codexDirect ? 'codex  mcp get severally' : 'codex  plugin list'}
   agy    mcp list
   opencode mcp list
 
@@ -640,7 +811,8 @@ Restart any running client session to pick the plugin up. In Claude Code the too
 mcp__plugin_severally_severally__consult_start / _get / _cancel / _list.
 
 Re-run this after "npm run build" to push an updated plugin to ${claudeMarketplace ? 'Codex' : 'both clients'} (Antigravity and
-OpenCode are registered directly each run, so a re-run always refreshes them too).` : `
+OpenCode are registered directly each run, so a re-run always refreshes them too).`
+    : `
 Verify with:
   claude mcp get severally
   codex  mcp get severally
@@ -648,4 +820,5 @@ Verify with:
   opencode mcp list
 
 In a new Claude Code session the tools appear as mcp__severally__consult_start / _get / _cancel / _list.
-Restart any running client session to pick the server up.`);
+Restart any running client session to pick the server up.`,
+);