agent-takkub 2.2.5 → 2.2.6

package/README.md

@@ -96,11 +96,12 @@ A role's own model wins over the provider default, so `backend` can run Codex on
 ## ⚡ Quick Start
 
 ```bash
-# 1. Install the cockpit globally  (isolated Python runtime + a Desktop icon)
+# 1. Install the cockpit, plus Claude and Codex CLIs if missing
 npm install -g agent-takkub
 
-# 2. Authenticate with your Claude account (if you haven't already)
+# 2. Authenticate with your Claude and OpenAI accounts
 claude login
+codex login
 
 # 3. Provision recommended plugins + browser-automation tools (idempotent)
 takkub provision
@@ -117,7 +118,7 @@ agent-takkub
 <table>
 <tr><td>
 
-**Requirements** — Node.js ≥ 18 and Python ≥ 3.11 already on your system. They're **detected, never reinstalled**. Everything else lives in an isolated `~/.agent-takkub`; your existing `claude` CLI, plugins, and config are left completely untouched.
+**Requirements** — Node.js ≥ 18 and Python ≥ 3.11 already on your system. The installer creates an isolated Python runtime and Desktop launcher, and installs missing Claude and Codex CLIs into your npm global prefix. Existing provider installations are reused. Authenticate with `claude login` and `codex login` before using those providers.
 
 **Optional: `graft` code-intelligence** needs Node ≥ 20 — stricter than the cockpit's own Node ≥ 18 floor. It's off until you run `takkub doctor --fix`; without it (or on Node 18–19), the cockpit runs exactly the same, just without the extra structural-search tools for code-reading roles.
 

package/npm/scripts/postinstall.js

@@ -3,12 +3,11 @@
 //
 // SAFETY MODEL — check first, never clobber:
 //   • Detects what's already present (preflight.js, non-mutating) and REPORTS it.
-//   • Provisions ONLY into the isolated AGENT_TAKKUB_HOME (default
+//   • Provisions the Python runtime into the isolated AGENT_TAKKUB_HOME (default
 //     ~/.agent-takkub) — never a repo `.venv`, never shared user state.
 //   • REUSES an existing cockpit venv (upgrade in place) instead of wiping it.
-//   • Does NOT touch the global claude CLI, ~/.claude plugins, or ~/.takkub
-//     config. Anything shared/missing is left for an explicit, detect-first
-//     `takkub doctor --fix` the user runs consciously.
+//   • Installs missing Claude and Codex CLIs; existing installations are reused.
+//     Plugins and account configuration are managed separately by provision/login.
 // Cross-platform (win32 + darwin); idempotent; fails loudly on missing Python
 // or a missing bundled wheel.
 
@@ -17,6 +16,7 @@ const fs = require('fs');
 const path = require('path');
 const { agentTakkubHome, venvDir, venvPython, findWheelForVersion } = require('./lib');
 const preflight = require('./preflight');
+const { ensureBaselineProviders } = require('./providers');
 
 // The wheel matching THIS install's declared version (#340) — not the
 // lexically-last filename in dist/. A string sort put "1.0.9" after
@@ -33,17 +33,6 @@ function run(cmd, args) {
   return spawnSync(cmd, args, { stdio: 'inherit' }).status === 0;
 }
 
-// Install the claude CLI only when it's missing — never overwrite an existing
-// (possibly version-pinned) global install. Returns true if claude is available
-// afterward. Best-effort: a failure just falls back to a "install it yourself"
-// hint in the next-steps.
-function ensureClaudeCli(present) {
-  if (present) return true;
-  const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-  console.log('[agent-takkub] claude CLI not found — installing @anthropic-ai/claude-code…');
-  return run(npm, ['install', '-g', '@anthropic-ai/claude-code']);
-}
-
 // A local (non-global) install leaves a package that cannot work: the `takkub`
 // / `agent-takkub` bin shims never land on PATH, and the PATH provisioning
 // below targets the npm GLOBAL bin dir. Without this guard that failure is
@@ -114,7 +103,7 @@ function main() {
   // already succeeded, so a hiccup here shouldn't fail the whole install.
   run(vpy, ['-m', 'pip', 'install', '--force-reinstall', '--no-deps', wheel]);
 
-  const claudeOk = ensureClaudeCli(env.claudeCli.present);
+  const providers = ensureBaselineProviders(env);
 
   // Keep the npm global bin dir on the persistent PATH — otherwise a broken
   // PATH makes claude/takkub/agent-takkub "command not found" in new shells
@@ -124,7 +113,7 @@ function main() {
     pathAdded = require('./pathfix').ensureGlobalBinOnPath();
     if (pathAdded) {
       console.log(
-        '[agent-takkub] ✓ npm global bin dir added to your PATH (open a NEW terminal to use takkub/claude).'
+        '[agent-takkub] ✓ npm global bin dir added to your PATH (open a NEW terminal to use takkub/claude/codex).'
       );
     }
   } catch (_e) {
@@ -148,12 +137,16 @@ function main() {
   );
   console.log('     it backs up everything first, so this is safe to let run.');
   console.log('\n   Next steps:');
-  if (!claudeOk) {
+  if (!providers.claude) {
     console.log('     • install the claude CLI: npm i -g @anthropic-ai/claude-code');
   }
-  console.log('     1) claude login          # authenticate (one-time, your account)');
-  console.log('     2) takkub provision      # install recommended plugins + browser MCPs (idempotent)');
-  console.log('     3) double-click "Takkub Cockpit" on the Desktop  (or run: agent-takkub)\n');
+  if (!providers.codex) {
+    console.log('     • install the codex CLI: npm i -g @openai/codex');
+  }
+  console.log('     1) claude login          # authenticate your Claude account');
+  console.log('     2) codex login           # authenticate your OpenAI account');
+  console.log('     3) takkub provision      # install recommended plugins + browser MCPs (idempotent)');
+  console.log('     4) double-click "Takkub Cockpit" on the Desktop  (or run: agent-takkub)\n');
 }
 
 try {

package/npm/scripts/preflight.js

@@ -2,12 +2,13 @@
 // Non-mutating environment detection. Runs ONLY `--version`-style probes and
 // filesystem existence checks — nothing here installs, writes, or overwrites.
 // This is what lets the installer "check first": report what's already present
-// and provision ONLY the gaps, so a machine that already has Python / claude /
+// and provision ONLY the gaps, so a machine that already has Python / Claude / Codex /
 // a cockpit venv is never clobbered.
 
 const { spawnSync } = require('child_process');
 const fs = require('fs');
 const { venvPython, agentTakkubHome } = require('./lib');
+const { probeCli } = require('./providers');
 
 function probe(cmd, args) {
   const r = spawnSync(cmd, args, { encoding: 'utf8' });
@@ -36,11 +37,13 @@ function detectPython() {
 
 // Detect the whole environment without mutating anything.
 function detect() {
-  const claude = probe('claude', ['--version']);
+  const claude = probeCli('claude');
+  const codex = probeCli('codex');
   return {
     python: detectPython(),
     node: probe('node', ['--version']),
     claudeCli: claude ? { present: true, version: claude } : { present: false },
+    codexCli: codex ? { present: true, version: codex } : { present: false },
     venv: { present: fs.existsSync(venvPython()), path: venvPython() },
     home: agentTakkubHome(),
   };
@@ -51,6 +54,7 @@ function report(d) {
   console.log(`    Python >=3.11 : ${d.python.present ? '✓ ' + d.python.version + ' (reuse existing)' : '· missing'}`);
   console.log(`    Node          : ${d.node ? '✓ ' + d.node : '· missing'}`);
   console.log(`    claude CLI    : ${d.claudeCli.present ? '✓ ' + d.claudeCli.version + ' (kept as-is)' : '· not found'}`);
+  console.log(`    codex CLI     : ${d.codexCli.present ? '✓ ' + d.codexCli.version + ' (kept as-is)' : '· not found'}`);
   console.log(`    cockpit venv  : ${d.venv.present ? '✓ exists (reuse/upgrade)' : '· will create'} — ${d.home}`);
 }
 

package/npm/scripts/providers.js

@@ -0,0 +1,80 @@
+'use strict';
+
+const { spawnSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+const BASELINE_PROVIDERS = {
+  claude: '@anthropic-ai/claude-code',
+  codex: '@openai/codex',
+};
+
+function providerEnv(env) {
+  const prefix = env.npm_config_prefix;
+  if (!prefix) return env;
+  const bin = process.platform === 'win32' ? prefix : path.join(prefix, 'bin');
+  const pathKey = Object.keys(env).find((key) => key.toUpperCase() === 'PATH') || 'PATH';
+  return { ...env, [pathKey]: bin + path.delimiter + (env[pathKey] || '') };
+}
+
+function probeCli(name, env = process.env) {
+  if (!Object.hasOwn(BASELINE_PROVIDERS, name)) throw new Error(`Unknown baseline provider: ${name}`);
+  // Node rejects direct .cmd execution on Windows (EINVAL). These commands
+  // are fixed provider names, with no user input interpolated into the shell.
+  const command = process.platform === 'win32' ? 'cmd.exe' : name;
+  const args = process.platform === 'win32' ? ['/d', '/s', '/c', `${name} --version`] : ['--version'];
+  const result = spawnSync(command, args, {
+    env: providerEnv(env), encoding: 'utf8', timeout: 30_000, windowsHide: true,
+  });
+  if (result.status !== 0) return null;
+  return ((result.stdout || '') + (result.stderr || '')).trim() || null;
+}
+
+function npmInvocation(env) {
+  // Use the npm CLI that started this lifecycle, through Node rather than a
+  // .cmd shim. This also preserves custom prefixes and paths with spaces.
+  if (env.npm_execpath && fs.existsSync(env.npm_execpath) && /\.[cm]?js$/i.test(env.npm_execpath)) {
+    return [process.execPath, [env.npm_execpath]];
+  }
+  if (process.platform !== 'win32') return ['npm', []];
+  // The cockpit's repair/update flow can run postinstall directly, outside
+  // npm. Find its JS entry point without executing a batch shim.
+  const pathValue = Object.entries(env).find(([key]) => key.toUpperCase() === 'PATH')?.[1] || '';
+  for (const dir of [path.dirname(process.execPath), ...pathValue.split(path.delimiter)]) {
+    if (!dir) continue;
+    const cli = path.join(dir, 'node_modules', 'npm', 'bin', 'npm-cli.js');
+    if (fs.existsSync(cli)) return [process.execPath, [cli]];
+  }
+  throw new Error('npm CLI not found');
+}
+
+function ensureBaselineProviders(detected, { env = process.env, log = console.log, warn = console.warn } = {}) {
+  const available = {};
+  for (const [name, packageName] of Object.entries(BASELINE_PROVIDERS)) {
+    if (detected[`${name}Cli`]?.present) {
+      available[name] = true;
+      continue;
+    }
+    log(`[agent-takkub] ${name} CLI not found — installing ${packageName}…`);
+    let failure;
+    try {
+      const [command, npmArgs] = npmInvocation(env);
+      const args = [...npmArgs, 'install', '-g', packageName];
+      if (env.npm_config_prefix) args.push('--prefix', env.npm_config_prefix);
+      const result = spawnSync(command, args, {
+        env: providerEnv(env), stdio: 'inherit', timeout: 300_000, windowsHide: true,
+      });
+      failure = result.error?.message || (result.status !== 0 ? `npm exited with status ${result.status}` : null);
+      available[name] = !failure && Boolean(probeCli(name, env));
+      if (!failure && !available[name]) failure = 'installed CLI could not be started';
+    } catch (error) {
+      failure = error.message;
+      available[name] = false;
+    }
+    if (available[name]) log(`[agent-takkub] ✓ ${name} CLI ready.`);
+    else warn(`[agent-takkub] ${name} installation failed: ${failure}. Retry: npm install -g ${packageName}`);
+  }
+  return available;
+}
+
+module.exports = { probeCli, ensureBaselineProviders };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-takkub",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "description": "Desktop cockpit for orchestrating a team of Claude Code agents (Windows + macOS). Install globally: npm i -g agent-takkub",
   "keywords": [
     "claude",