phewsh 0.14.5 → 0.14.6

package/README.md

@@ -31,14 +31,14 @@ phewsh ai providers                           # see what's installed
 API keys (OpenRouter, Anthropic, Groq, …) and PHEWSH pooled credits remain
 available as alternatives — `phewsh login --set-key`.
 
-## Two packages, one system
-
-- **`phewsh`** (this package) — the CLI: intent authoring, sync, bridges,
-  receipts, dispatch.
-- **`phewsh-mcp-server`** — the MCP server that `phewsh mcp setup` wires into
-  Claude Code / Cursor / any MCP client. It gives an *interactive* agent
-  session your project's briefing, task queue, and enforcement gate over
-  stdio, and shares state with the bridges (`~/.phewsh/`).
+## One package, one system
+
+Everything ships in `phewsh` — the CLI (intent authoring, sync, bridges,
+receipts, dispatch) *and* the MCP server. `phewsh mcp setup` wires the
+bundled server into Claude Code / Cursor / any MCP client via
+`phewsh mcp serve --stdio`: an *interactive* agent session gets your
+project's briefing, task queue, and enforcement gate over stdio, and shares
+state with the bridges (`~/.phewsh/`). No second install.
 
 Rule of thumb: `phewsh serve` = dispatch tasks *to* your agents.
 `phewsh mcp setup` = your agents pull tasks *from* PHEWSH mid-session.

package/commands/clarify.js

@@ -82,7 +82,7 @@ ${isRefine ? '\nThis is a refinement of existing intent. The previous goal was:
       'content-type': 'application/json',
     },
     body: JSON.stringify({
-      model: 'claude-sonnet-4-6',
+      model: require('../lib/providers').DEFAULT_ANTHROPIC_MODEL,
       max_tokens: 1024,
       system: systemPrompt,
       messages: [{ role: 'user', content: raw }],

package/commands/gate.js

@@ -237,7 +237,7 @@ ${(plan || 'No plan yet').slice(0, 1500)}`;
       'content-type': 'application/json',
     },
     body: JSON.stringify({
-      model: 'claude-sonnet-4-6',
+      model: require('../lib/providers').DEFAULT_ANTHROPIC_MODEL,
       max_tokens: 1024,
       messages: [{ role: 'user', content: prompt }],
     }),

package/commands/intent.js

@@ -261,7 +261,7 @@ ${(next || 'No next actions yet').slice(0, 2000)}`;
         'content-type': 'application/json',
       },
       body: JSON.stringify({
-        model: 'claude-sonnet-4-6',
+        model: require('../lib/providers').DEFAULT_ANTHROPIC_MODEL,
         max_tokens: 4096,
         system: systemPrompt,
         messages: [{ role: 'user', content: userPrompt }],

package/commands/mcp.js

@@ -1,15 +1,19 @@
 // phewsh mcp — Set up and sync the PHEWSH MCP coordination layer.
 //
+// The MCP server ships inside this package (mcp/ — ESM subtree).
+// No second install, no phewsh-mcp-server package.
+//
 // Usage:
-//   phewsh mcp setup    — Install MCP server deps + configure Claude Code
-//   phewsh mcp sync     — Sync local .intent/ + cloud projects → ~/.phewsh/projects.json
-//   phewsh mcp status   — Check what agents can see right now
-//   phewsh mcp serve    — Start the HTTP transport for the web bridge (:7483)
+//   phewsh mcp setup           — Configure Claude Code to use the bundled server
+//   phewsh mcp sync            — Sync local .intent/ + cloud projects → ~/.phewsh/projects.json
+//   phewsh mcp status          — Check what agents can see right now
+//   phewsh mcp serve           — Start the HTTP transport for the web bridge (:7483)
+//   phewsh mcp serve --stdio   — Run the stdio MCP server (what agent configs point at)
 
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const { execSync, spawn } = require('child_process');
+const { spawn } = require('child_process');
 
 const PHEWSH_DIR = path.join(os.homedir(), '.phewsh');
 const PROJECTS_FILE = path.join(PHEWSH_DIR, 'projects.json');
@@ -130,30 +134,16 @@ async function loadCloudProjects() {
   }
 }
 
-function findMcpServerPath() {
-  // Check common locations
-  const candidates = [
-    path.join(__dirname, '..', '..', 'mcp', 'src', 'index.js'),  // monorepo sibling
-    path.join(process.cwd(), 'mcp', 'src', 'index.js'),           // cwd
-  ];
-
-  // Also check if phewsh-mcp-server is globally installed
-  try {
-    const globalPath = execSync('npm root -g', { encoding: 'utf-8' }).trim();
-    candidates.push(path.join(globalPath, 'phewsh-mcp-server', 'src', 'index.js'));
-  } catch { /* not installed globally */ }
+// The server is bundled with this package — no hunting.
+const MCP_SERVER_PATH = path.join(__dirname, '..', 'mcp', 'index.js');
+const MCP_HTTP_PATH = path.join(__dirname, '..', 'mcp', 'http-server.js');
 
-  for (const p of candidates) {
-    if (fs.existsSync(p)) return path.resolve(p);
-  }
-  return null;
+function findMcpServerPath() {
+  return fs.existsSync(MCP_SERVER_PATH) ? MCP_SERVER_PATH : null;
 }
 
 function findHttpServerPath() {
-  const stdioPath = findMcpServerPath();
-  if (!stdioPath) return null;
-  const httpPath = path.join(path.dirname(stdioPath), 'http-server.js');
-  return fs.existsSync(httpPath) ? httpPath : null;
+  return fs.existsSync(MCP_HTTP_PATH) ? MCP_HTTP_PATH : null;
 }
 
 const DEFAULT_HTTP_PORT = 7483;
@@ -170,7 +160,25 @@ async function probeHttp(port = DEFAULT_HTTP_PORT) {
   }
 }
 
+function serveStdio() {
+  // stdio MCP server: stdout IS the protocol — print nothing here.
+  ensureDirs();
+  const child = spawn(process.execPath, [MCP_SERVER_PATH], {
+    stdio: 'inherit',
+    env: { ...process.env },
+  });
+  child.on('exit', (code) => process.exit(code ?? 0));
+  const shutdown = () => { if (!child.killed) child.kill('SIGTERM'); };
+  process.on('SIGINT', shutdown);
+  process.on('SIGTERM', shutdown);
+}
+
 async function serve() {
+  if (process.argv.includes('--stdio')) {
+    serveStdio();
+    return;
+  }
+
   console.log('');
   console.log(`  ${b(w('PHEWSH MCP HTTP transport'))}`);
   console.log('');
@@ -179,8 +187,8 @@ async function serve() {
 
   const httpPath = findHttpServerPath();
   if (!httpPath) {
-    console.log(`  ${yellow('HTTP transport not found.')} Expected at mcp/src/http-server.js`);
-    console.log(`  ${g('Make sure you have the latest phewsh monorepo or reinstall the MCP package.')}`);
+    console.log(`  ${yellow('HTTP transport not found.')} Expected bundled at ${g(MCP_HTTP_PATH)}`);
+    console.log(`  ${g('Reinstall: npm i -g phewsh')}`);
     return;
   }
 
@@ -222,42 +230,24 @@ async function setup() {
 
   ensureDirs();
 
-  // 1. Find or install MCP server
-  let serverPath = findMcpServerPath();
+  // 1. Confirm the bundled server is present
+  const serverPath = findMcpServerPath();
 
   if (!serverPath) {
-    console.log(`  ${yellow('MCP server not found locally.')}`);
-    console.log(`  ${g('Install it:')}`);
-    console.log(`    npm install -g phewsh-mcp-server`);
-    console.log('');
-    console.log(`  ${g('Or if you have the phewsh repo:')}`);
-    console.log(`    cd mcp && npm install`);
+    console.log(`  ${yellow('Bundled MCP server missing.')} Reinstall: ${w('npm i -g phewsh')}`);
     console.log('');
     return;
   }
 
-  console.log(`  ${green('Found MCP server:')} ${g(serverPath)}`);
-
-  // 2. Check if deps are installed
-  const mcpDir = path.dirname(path.dirname(serverPath));
-  const nodeModules = path.join(mcpDir, 'node_modules');
-  if (!fs.existsSync(nodeModules)) {
-    console.log(`  ${yellow('Installing dependencies...')}`);
-    try {
-      execSync('npm install', { cwd: mcpDir, stdio: 'pipe' });
-      console.log(`  ${green('Dependencies installed.')}`);
-    } catch (err) {
-      console.log(`  ${yellow('Failed to install deps.')} Run manually: cd ${mcpDir} && npm install`);
-    }
-  }
+  console.log(`  ${green('MCP server:')} ${g('bundled with phewsh — no separate install')}`);
 
-  // 3. Generate settings.json snippet
+  // 2. Generate settings.json snippet — points at phewsh itself, survives upgrades
   const claudeSettingsPath = path.join(os.homedir(), '.claude', 'settings.json');
   const snippet = {
     mcpServers: {
       phewsh: {
-        command: 'node',
-        args: [serverPath],
+        command: 'phewsh',
+        args: ['mcp', 'serve', '--stdio'],
       },
     },
   };
@@ -268,12 +258,16 @@ async function setup() {
   console.log(g('  ' + JSON.stringify(snippet, null, 2).split('\n').join('\n  ')));
   console.log('');
 
-  // Check if already configured
+  // Check if already configured — and flag stale configs from the two-package era
   if (fs.existsSync(claudeSettingsPath)) {
     try {
       const existing = JSON.parse(fs.readFileSync(claudeSettingsPath, 'utf-8'));
-      if (existing.mcpServers?.phewsh) {
+      const current = existing.mcpServers?.phewsh;
+      if (current?.command === 'phewsh') {
         console.log(`  ${green('Already configured in Claude Code settings.')}`);
+      } else if (current) {
+        console.log(`  ${yellow('Configured the old way')} (${g(current.command + ' ' + (current.args || []).join(' '))}).`);
+        console.log(`  ${g('Update it to the snippet above — the server now ships inside phewsh.')}`);
       } else {
         console.log(`  ${yellow('Not yet configured.')} Add the snippet above to your settings.`);
       }
@@ -442,10 +436,11 @@ async function main() {
       break;
     default:
       console.log(`\n  ${b('phewsh mcp')} — Connect AI agents to your project intelligence\n`);
-      console.log(`  ${w('setup')}    Install and configure the MCP server`);
-      console.log(`  ${w('sync')}     Sync projects → ~/.phewsh/projects.json`);
-      console.log(`  ${w('status')}   Check what agents can see right now`);
-      console.log(`  ${w('serve')}    Run the HTTP bridge for the web app (:7483)`);
+      console.log(`  ${w('setup')}            Configure agents to use the bundled MCP server`);
+      console.log(`  ${w('sync')}             Sync projects → ~/.phewsh/projects.json`);
+      console.log(`  ${w('status')}           Check what agents can see right now`);
+      console.log(`  ${w('serve')}            Run the HTTP bridge for the web app (:7483)`);
+      console.log(`  ${w('serve --stdio')}    Run the stdio MCP server (for agent configs)`);
       console.log('');
   }
 }

package/commands/session.js

@@ -95,14 +95,23 @@ function formatAgo(ms) {
   return `${days}d ago`;
 }
 
+// Shortcuts, not a gate. Any string the user types that doesn't match an
+// alias is passed through verbatim — the provider/harness validates it.
+// PHEWSH must never block a model it hasn't heard of (it WILL go stale
+// faster than the providers ship).
 const MODELS = {
+  'claude-fable': { id: 'claude-fable-5', name: 'Claude Fable 5', provider: 'anthropic' },
+  'claude-opus': { id: 'claude-opus-4-8', name: 'Claude Opus 4.8', provider: 'anthropic' },
   'claude-sonnet': { id: 'claude-sonnet-4-6', name: 'Claude Sonnet 4.6', provider: 'anthropic' },
-  'claude-opus': { id: 'claude-opus-4-6', name: 'Claude Opus 4.6', provider: 'anthropic' },
   'claude-haiku': { id: 'claude-haiku-4-5-20251001', name: 'Claude Haiku 4.5', provider: 'anthropic' },
 };
 
 const DEFAULT_MODEL = 'claude-sonnet';
 
+// currentModel may be an alias key OR a raw model id the user passed through.
+function modelId(m) { return MODELS[m]?.id || m; }
+function modelName(m) { return MODELS[m]?.name || m; }
+
 // ── Routing: where plain typed input goes ─────────────────────────────────
 // A route is either an installed harness (your existing subscription — no
 // API key needed in phewsh) or the direct API (your key). Precedence:
@@ -264,6 +273,7 @@ async function main() {
     try { recordProject(process.cwd()); } catch { /* index is best-effort */ }
   }
   let currentModel = DEFAULT_MODEL;
+  let harnessModel = null; // pass-through preference; the harness validates it
   let totalPromptTokens = 0;
   let totalCompletionTokens = 0;
 
@@ -456,7 +466,7 @@ async function main() {
     });
     decisionsThisSession++;
     try {
-      const output = await runViaHarness(harnessId, fullSystem, buildHarnessPrompt(messages, input));
+      const output = await runViaHarness(harnessId, fullSystem, buildHarnessPrompt(messages, input), { model: harnessModel });
       messages.push({ role: 'user', content: input });
       messages.push({ role: 'assistant', content: (output || '').trim() });
       recordSessionEvent(harnessId, projectName, 'task_complete', {
@@ -484,18 +494,18 @@ async function main() {
     messages.push({ role: 'user', content: input });
     console.log('');
     try {
-      const result = await streamChat(config.apiKey, messages, fullSystem, MODELS[currentModel].id);
+      const result = await streamChat(config.apiKey, messages, fullSystem, modelId(currentModel));
       messages.push({ role: 'assistant', content: result.content });
       if (result.promptTokens) totalPromptTokens += result.promptTokens;
       if (result.completionTokens) totalCompletionTokens += result.completionTokens;
       if (result.promptTokens || result.completionTokens) {
-        console.log(slate(`  ${result.promptTokens || '?'}→${result.completionTokens || '?'} tokens · ${MODELS[currentModel].name} · outcome? 1-4 or keep typing`));
+        console.log(slate(`  ${result.promptTokens || '?'}→${result.completionTokens || '?'} tokens · ${modelName(currentModel)} · outcome? 1-4 or keep typing`));
       }
       awaitingOutcome = decisionId;
       trackSap({
         userId: config.supabaseUserId,
         source: 'cli',
-        model: MODELS[currentModel].id,
+        model: modelId(currentModel),
         promptTokens: result.promptTokens,
         completionTokens: result.completionTokens,
         accessToken: config.supabaseAccessToken,
@@ -720,6 +730,8 @@ async function main() {
         console.log('');
         console.log(`  ${cream('route — where your typing goes')}`);
         console.log(`    ${teal('/use')} ${slate('<route>')}  ${sage('Switch: claude-code, codex, gemini, cursor, opencode, api')}`);
+        console.log(`    ${teal('@name')} ${slate('<msg>')}  ${sage('One message to one harness — @codex review this — context stays shared')}`);
+        console.log(`    ${teal('/council')} ${slate('<q>')} ${sage('Ask ALL installed harnesses in parallel; keep the best answer')}`);
         console.log(`    ${teal('/harnesses')}   ${sage('Agent CLIs detected on this machine')}`);
         console.log(`    ${teal('/provider')}    ${sage('Current route + what\'s available')}`);
         console.log(`    ${teal('/fallback')}    ${sage('What happens at a usage wall: ask or auto-switch')}`);
@@ -735,7 +747,7 @@ async function main() {
         console.log(`  ${cream('configure')}`);
         console.log(`    ${teal('/key')}         ${sage('Set API key (optional — harnesses need none)')}`);
         console.log(`    ${teal('/login')}       ${sage('Identity + cloud sync')}`);
-        console.log(`    ${teal('/model')} ${slate('<name>')} ${sage('Switch API model (sonnet, opus, haiku)')}`);
+        console.log(`    ${teal('/model')} ${slate('<name>')} ${sage('Switch model — passed through, the provider validates')}`);
         console.log(`    ${teal('/update')}      ${sage('Update phewsh')}`);
         console.log(`    ${teal('/tour')}        ${sage('Quick walkthrough')}`);
         console.log('');
@@ -1079,19 +1091,51 @@ async function main() {
           const active = key === currentModel ? ` ${teal('●')}` : '';
           console.log(`    ${cream(key.padEnd(16))} ${sage(model.name)}${active}`);
         }
-        console.log(`\n  ${sage('Switch with:')} ${cream('/model <name>')}\n`);
+        if (!MODELS[currentModel] && route?.type !== 'harness') {
+          console.log(`    ${cream(String(currentModel).padEnd(16))} ${sage('(pass-through)')} ${teal('●')}`);
+        }
+        console.log(`\n  ${sage('Switch with:')} ${cream('/model <name>')} ${slate('— aliases above, or any model id (passed through)')}\n`);
         rl.prompt();
         return;
       }
 
       if (cmd === 'model') {
+        // Harness route: the harness owns its model list — we pass the
+        // preference through and let IT validate. No stale gate here.
+        if (route?.type === 'harness') {
+          const h = HARNESSES[route.id];
+          if (!cmdArg) {
+            console.log(`  ${sage('Route:')} ${cream(h.label)} ${sage('— model:')} ${cream(harnessModel || h.label + ' default')}`);
+            console.log(`  ${sage('Usage:')} ${cream('/model <anything ' + h.label + ' accepts>')}${h.models ? '' : sage(' — not supported for this harness; set it in ' + h.label + ' itself')}`);
+            console.log(`  ${slate('/model default to clear')}`);
+            rl.prompt();
+            return;
+          }
+          if (!h.models) {
+            console.log(`  ${sage(h.label + ' doesn\'t take a model flag from phewsh — set the model in ' + h.label + ' itself.')}`);
+            rl.prompt();
+            return;
+          }
+          if (cmdArg.toLowerCase() === 'default') {
+            harnessModel = null;
+            console.log(`  ${teal('●')} ${sage('Cleared — ' + h.label + ' uses its own default.')}`);
+          } else {
+            harnessModel = cmdArg.trim().replace(/\s+/g, '-');
+            console.log(`  ${teal('●')} ${sage('Model preference:')} ${cream(harnessModel)} ${slate('— ' + h.label + ' validates it on your next message')}`);
+          }
+          rl.prompt();
+          return;
+        }
+
+        // API route: aliases are shortcuts; anything else passes through
+        // verbatim and the provider validates it.
         if (!cmdArg) {
-          console.log(`  ${sage('Current:')} ${cream(MODELS[currentModel].name)}`);
-          console.log(`  ${sage('Usage:')} ${cream('/model <sonnet|opus|haiku>')}`);
+          console.log(`  ${sage('Current:')} ${cream(modelName(currentModel))}`);
+          console.log(`  ${sage('Usage:')} ${cream('/model <' + Object.keys(MODELS).map(k => k.replace('claude-', '')).join('|') + '|any model id>')}`);
           rl.prompt();
           return;
         }
-        const query = cmdArg.toLowerCase().replace('claude-', '').replace('claude', '');
+        const query = cmdArg.toLowerCase().replace('claude-', '').replace('claude', '').trim();
         const match = Object.keys(MODELS).find(k =>
           k.includes(query) || MODELS[k].name.toLowerCase().includes(query)
         );
@@ -1099,8 +1143,75 @@ async function main() {
           currentModel = match;
           console.log(`  ${teal('●')} ${sage('Switched to')} ${cream(MODELS[match].name)}`);
         } else {
-          console.log(`  ${sage('Unknown model. Available:')} ${cream(Object.keys(MODELS).join(', '))}`);
+          currentModel = cmdArg.trim();
+          console.log(`  ${teal('●')} ${sage('Switched to')} ${cream(currentModel)} ${slate('— passed through as-is; the provider validates it')}`);
+        }
+        rl.prompt();
+        return;
+      }
+
+      if (cmd === 'council' || cmd === 'all') {
+        // One prompt, every installed harness, in parallel. Different
+        // models disagreeing is the signal — and which answer you KEEP
+        // is the outcome data.
+        const members = harnesses.filter(h => h.installed && h.headless);
+        if (!cmdArg) {
+          console.log(`  ${sage('Usage:')} ${cream('/council <question>')} ${sage('— asks all ' + members.length + ' installed harnesses in parallel')}`);
+          console.log(`  ${slate(members.map(m => m.label).join(' · '))}`);
+          rl.prompt();
+          return;
+        }
+        if (members.length < 2) {
+          console.log(`  ${sage('Council needs at least 2 installed harnesses — you have ' + members.length + '.')}`);
+          rl.prompt();
+          return;
+        }
+        const councilHint = sessionMode
+          ? Object.values(INTENT_MODES).find(m => m.id === sessionMode)?.hint
+          : null;
+        const councilSystem = councilHint ? `${systemPrompt}\n\n${councilHint}` : systemPrompt;
+        const decisionId = recordDecision({
+          project: projectName, route: 'council:' + members.map(m => m.id).join('+'),
+          mode: sessionMode, summary: cmdArg,
+        });
+        decisionsThisSession++;
+        console.log('');
+        console.log(`  ${b(cream('Council'))} ${sage('— asking')} ${cream(String(members.length))} ${sage('harnesses in parallel. Where they disagree is the insight.')}`);
+        console.log(`  ${slate(members.map(m => m.label).join(' · '))}`);
+
+        const prompt = buildHarnessPrompt(messages, cmdArg);
+        const settled = await Promise.allSettled(members.map(m =>
+          runViaHarness(m.id, councilSystem, prompt, { quiet: true })
+        ));
+
+        const answers = [];
+        settled.forEach((r, i) => {
+          const m = members[i];
+          console.log('');
+          ui.divider('line');
+          if (r.status === 'fulfilled') {
+            const text = (r.value || '').trim();
+            console.log(`  ${b(cream(m.label))} ${slate('(' + m.role + ')')}`);
+            console.log('');
+            console.log(text.split('\n').map(l => '  ' + l).join('\n'));
+            answers.push(`### ${m.label}\n${text}`);
+          } else {
+            console.log(`  ${b(cream(m.label))} ${sage('failed')} ${slate('— ' + r.reason.message.split('\n')[0])}`);
+          }
+        });
+        console.log('');
+        ui.divider('line');
+
+        if (answers.length > 0) {
+          messages.push({ role: 'user', content: cmdArg });
+          messages.push({ role: 'assistant', content: `[council of ${answers.length}]\n\n${answers.join('\n\n')}` });
+          awaitingOutcome = decisionId;
+          console.log(slate(`  council of ${answers.length} · outcome? 1 kept · 2 reverted · 3 superseded · 4 failed · or keep typing`));
+        } else {
+          try { labelOutcome(decisionId, 'failed'); } catch { /* keep going */ }
+          console.log(`  ${sage('Every council member failed — check')} ${cream('/provider')}`);
         }
+        console.log('');
         rl.prompt();
         return;
       }
@@ -1120,7 +1231,8 @@ async function main() {
         }
         rows.push(['API key', config?.apiKey ? config.apiKey.slice(0, 8) + '... (' + (config.provider || 'anthropic') + ')' : 'not set — optional', config?.apiKey ? 'green' : 'yellow']);
         rows.push(['Fallback', (config?.fallback === 'auto' ? 'auto-switch on failure' : 'ask before switching') + ' — /fallback to change', 'peach']);
-        if (route?.type === 'api') rows.push(['Model', MODELS[currentModel].name, 'cyan']);
+        if (route?.type === 'api') rows.push(['Model', modelName(currentModel), 'cyan']);
+        if (route?.type === 'harness' && harnessModel) rows.push(['Model', `${harnessModel} — passed to ${HARNESSES[route.id].label}`, 'cyan']);
         ui.statusPanel('Provider', rows);
         console.log(`  ${sage('One terminal. Every AI worker. Shared project memory.')}`);
         console.log(`  ${slate('switch:')} ${cream('/use <' + useOptions().join('|') + '>')} ${slate('· interactive tools: /work <hermes|pi>')}`);
@@ -1348,7 +1460,7 @@ async function main() {
             config.apiKey,
             [{ role: 'user', content: cmdArg }],
             systemPrompt,
-            MODELS[currentModel].id
+            modelId(currentModel)
           );
           if (result.promptTokens || result.completionTokens) {
             console.log(slate(`  ${result.promptTokens || '?'}→${result.completionTokens || '?'} tokens`));
@@ -1356,7 +1468,7 @@ async function main() {
           trackSap({
             userId: config.supabaseUserId,
             source: 'cli',
-            model: MODELS[currentModel].id,
+            model: modelId(currentModel),
             promptTokens: result.promptTokens,
             completionTokens: result.completionTokens,
             accessToken: config.supabaseAccessToken,
@@ -1390,6 +1502,26 @@ async function main() {
       : null;
     const fullSystem = modeHint ? `${systemPrompt}\n\n${modeHint}` : systemPrompt;
 
+    // @mention: route ONE message to a specific harness without switching.
+    // The answer lands in the shared history, so the next turn — on any
+    // route — knows what was said. "@codex review this" mid-claude-session.
+    const mention = input.match(/^@([\w-]+)\s+([\s\S]+)/);
+    if (mention) {
+      const q = mention[1].toLowerCase();
+      const target = harnesses.find(h => h.installed && h.headless &&
+        (h.id === q || h.id.startsWith(q) || h.label.toLowerCase().replace(/\s+/g, '-').startsWith(q)));
+      if (!target) {
+        console.log(`  ${sage('No installed harness matches')} ${cream('@' + q)} ${sage('—')} ${cream('/provider')} ${sage('shows who\'s here.')}`);
+        rl.prompt();
+        return;
+      }
+      const okMention = await runHarnessTurn(mention[2], target.id, fullSystem);
+      if (!okMention) await offerFallbacks(mention[2], fullSystem, target.id);
+      console.log('');
+      rl.prompt();
+      return;
+    }
+
     const ok = route.type === 'harness'
       ? await runHarnessTurn(input, route.id, fullSystem)
       : await runApiTurn(input, fullSystem);

package/lib/harnesses.js

@@ -14,15 +14,23 @@ const { execSync, spawn } = require('child_process');
 // args: how to run a one-shot prompt headlessly. args: null = we only know
 // how to launch it interactively (detection + /work still fully supported —
 // never guess flags; a wrong invocation looks like phewsh being broken).
+//
+// args takes (prompt, model). model is passed straight through to the
+// harness's own flag and validated BY the harness — phewsh keeps no model
+// list of its own, so it can never go stale. Harnesses without a known
+// model flag ignore the preference and use their own config.
 const HARNESSES = {
-  'claude-code': { bin: 'claude',       label: 'Claude Code',  role: 'writes code',          auth: 'Claude subscription / Console', args: (p) => ['-p', p, '--output-format', 'text'] },
-  'codex':       { bin: 'codex',        label: 'Codex CLI',    role: 'reasons & reviews',    auth: 'ChatGPT plan',                  args: (p) => ['exec', p] },
-  'gemini':      { bin: 'gemini',       label: 'Gemini CLI',   role: "another model's take", auth: 'Google login',                  args: (p) => ['-p', p] },
-  'cursor':      { bin: 'cursor-agent', label: 'Cursor Agent', role: 'edits files',          auth: 'Cursor account',                args: (p) => ['-p', p, '--output-format', 'text'] },
+  'claude-code': { bin: 'claude',       label: 'Claude Code',  role: 'writes code',          auth: 'Claude subscription / Console', models: true, args: (p, m) => ['-p', p, '--output-format', 'text', ...(m ? ['--model', m] : [])] },
+  'codex':       { bin: 'codex',        label: 'Codex CLI',    role: 'reasons & reviews',    auth: 'ChatGPT plan',                  models: true, args: (p, m) => ['exec', ...(m ? ['-m', m] : []), p] },
+  'gemini':      { bin: 'gemini',       label: 'Gemini CLI',   role: "another model's take", auth: 'Google login',                  models: true, args: (p, m) => ['-p', p, ...(m ? ['-m', m] : [])] },
+  'cursor':      { bin: 'cursor-agent', label: 'Cursor Agent', role: 'edits files',          auth: 'Cursor account',                models: true, args: (p, m) => ['-p', p, '--output-format', 'text', ...(m ? ['--model', m] : [])] },
   'opencode':    { bin: 'opencode',     label: 'OpenCode',     role: 'general agent',        auth: 'OpenCode Zen / configured',     args: (p) => ['run', p] },
+  'grok':        { bin: 'grok',         label: 'Grok Build',   role: "xAI's take",           auth: 'SuperGrok / X Premium+',        args: (p) => ['-p', p] },
+  'kiro':        { bin: 'kiro-cli',     label: 'Kiro CLI',     role: 'spec-driven dev',      auth: 'Kiro / AWS account',            args: (p) => ['chat', '--no-interactive', p] },
+  'copilot':     { bin: 'copilot',      label: 'Copilot CLI',  role: 'github-native',        auth: 'GitHub Copilot plan',           args: (p) => ['-p', p] },
   'hermes':      { bin: 'hermes',       label: 'Hermes',       role: 'runs loops',           auth: 'Nous account',                  args: null },
   'pi':          { bin: 'pi',           label: 'Pi',           role: 'conversation',         auth: 'Pi login',                      args: null },
-  'aider':       { bin: 'aider',        label: 'Aider',        role: 'pair-codes',           auth: 'configured keys',               args: (p) => ['--message', p] },
+  'aider':       { bin: 'aider',        label: 'Aider',        role: 'pair-codes',           auth: 'configured keys',               models: true, args: (p, m) => ['--message', p, ...(m ? ['--model', m] : [])] },
   'goose':       { bin: 'goose',        label: 'Goose',        role: 'automates tasks',      auth: 'Block / configured',            args: (p) => ['run', '-t', p] },
   'amp':         { bin: 'amp',          label: 'Amp',          role: 'agentic coding',       auth: 'Sourcegraph account',           args: (p) => ['-x', p] },
   'droid':       { bin: 'droid',        label: 'Droid',        role: 'agentic coding',       auth: 'Factory account',               args: (p) => ['exec', p] },
@@ -51,24 +59,27 @@ function listHarnesses() {
  * stderr is buffered and only surfaced on failure (codex/gemini chat on it).
  * Resolves with the full stdout text so callers can keep conversation history.
  */
-function runViaHarness(id, systemPrompt, userPrompt) {
+function runViaHarness(id, systemPrompt, userPrompt, opts = {}) {
   const h = HARNESSES[id];
   if (!h) return Promise.reject(new Error(`Unknown harness: ${id}`));
   if (!h.args) return Promise.reject(new Error(`${h.label} is interactive-only here — launch it with /work ${id}`));
   const prompt = systemPrompt ? `${systemPrompt}\n\n---\n\n${userPrompt}` : userPrompt;
+  const model = h.models ? opts.model : undefined;
 
   return new Promise((resolve, reject) => {
-    const child = spawn(h.bin, h.args(prompt), { stdio: ['pipe', 'pipe', 'pipe'] });
+    const child = spawn(h.bin, h.args(prompt, model), { stdio: ['pipe', 'pipe', 'pipe'] });
     // Some harnesses (codex exec, gemini) wait for stdin EOF before running.
     child.stdin.end();
 
     let stdout = '';
     let stderr = '';
-    process.stdout.write('\n');
-    child.stdout.on('data', (d) => { process.stdout.write(d); stdout += d.toString(); });
+    // quiet: collect without streaming — parallel runs (council) would
+    // interleave live output into soup.
+    if (!opts.quiet) process.stdout.write('\n');
+    child.stdout.on('data', (d) => { if (!opts.quiet) process.stdout.write(d); stdout += d.toString(); });
     child.stderr.on('data', (d) => { stderr += d.toString(); });
     child.on('close', (code) => {
-      process.stdout.write('\n');
+      if (!opts.quiet) process.stdout.write('\n');
       if (code === 0) resolve(stdout);
       else reject(new Error(`${h.label} exited ${code}${stderr ? `\n  ${stderr.trim().split('\n').slice(-3).join('\n  ')}` : ''}`));
     });

package/lib/providers.js

@@ -253,8 +253,12 @@ function streamParser(provider) {
   return provider.format === 'anthropic' ? streamAnthropicResponse : streamOpenAIResponse;
 }
 
+// One place for the Anthropic default — commands must not pin their own.
+const DEFAULT_ANTHROPIC_MODEL = PROVIDERS.anthropic.defaultModel;
+
 module.exports = {
   PROVIDERS,
+  DEFAULT_ANTHROPIC_MODEL,
   getProvider,
   listProviders,
   detectProvider,