kushi-agents 5.9.3 → 5.9.5

package/bin/cli.mjs

@@ -6,17 +6,15 @@ import { runMultiHost } from '../src/multi-host.mjs';
 const args = process.argv.slice(2);
 
 // ── bare invocation ──────────────────────────────────────────────────────────
-// Two bins share this cli: `kushi-agents` (the installer entry — npx target)
-// and `kushi` (the post-install user verb). Behavior diverges on no-args:
+// Two bins share this cli (via thin wrappers in bin/kushi.mjs and
+// bin/kushi-agents.mjs that set KUSHI_BIN_NAME). Behavior diverges on no-args:
 //   - `kushi-agents` (no args) on a TTY  → setup wizard (first-install ergonomics)
 //   - `kushi`        (no args) on a TTY  → Docker-style help (post-install verb)
 //   - Either, non-TTY                    → welcome card (no side effects)
 // Override env vars: KUSHI_FORCE_WIZARD=1 forces wizard; KUSHI_SKIP_WELCOME=1
 // forces the welcome card.
 if (args.length === 0) {
-  const path0 = await import('node:path');
-  const invokedAs = (process.argv[1] || '').toLowerCase();
-  const isInstallerBin = /kushi-agents(\.cmd|\.js|\.mjs)?$/.test(path0.basename(invokedAs));
+  const isInstallerBin = process.env.KUSHI_BIN_NAME === 'kushi-agents';
   const forceWelcome = process.env.KUSHI_SKIP_WELCOME === '1';
   const forceWizard  = process.env.KUSHI_FORCE_WIZARD === '1';
   const tty          = process.stdin.isTTY && !forceWelcome;
@@ -35,6 +33,22 @@ if (args.length === 0) {
   process.exit(0);
 }
 
+// ── version flag (v5.9.5+) ──────────────────────────────────────────────────
+// `kushi --version` / `-v` / `version` → print version and exit. Previously
+// these fell through to the installer's main() which printed the banner and
+// started the install flow.
+if (args.length > 0 && (args[0] === '--version' || args[0] === '-v' || args[0] === 'version')) {
+  const pathMod = await import('node:path');
+  const urlMod = await import('node:url');
+  const fsMod = await import('node:fs');
+  const here = pathMod.dirname(urlMod.fileURLToPath(import.meta.url));
+  const repoRoot = pathMod.resolve(here, '..');
+  let version = 'unknown';
+  try { version = JSON.parse(fsMod.readFileSync(pathMod.join(repoRoot, 'package.json'), 'utf-8')).version; } catch {}
+  console.log(version);
+  process.exit(0);
+}
+
 // ── doctor verb (v5.4.0+) ───────────────────────────────────────────────────
 if (args.length > 0 && args[0] === 'doctor') {
   const { spawnSync } = await import('node:child_process');
@@ -278,6 +292,7 @@ Install (run via npx — first-time / host install):
   WorkIQ:    --with-workiq | --workiq-path <abs> | --skip-workiq-check
 
 Run 'kushi <command> --help' for more information on a command (where supported).
+Run 'kushi --version' to print the installed version.
 Docs: https://gim-home.github.io/kushi/
 
 In VS Code Chat the prefix is "@Kushi". In Clawpilot just say "kushi <verb>".
@@ -340,12 +355,43 @@ if (args.length > 0 && args[0] === 'uninstall' && !args.includes('--clawpilot')
 
 if (args.length > 0 && args[0] === 'upgrade') {
   // Upgrade: npm i -g @latest, then re-seed assets in cwd preserving config.
+  // v5.9.5: capture stderr so users see WHY npm failed; detect Windows
+  // self-replacement (kushi.cmd locked because it's the running shell) and
+  // print a clear "rerun from a fresh shell" hint.
   const { spawnSync } = await import('node:child_process');
   console.log('\n  Upgrading kushi-agents globally via npm...\n');
   const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-  const r1 = spawnSync(npm, ['install', '-g', 'kushi-agents@latest'], { stdio: 'inherit' });
+  const r1 = spawnSync(npm, ['install', '-g', 'kushi-agents@latest'], {
+    stdio: ['inherit', 'inherit', 'pipe'],
+    encoding: 'utf-8',
+  });
   if (r1.status !== 0) {
-    console.error('\n  npm install failed.\n');
+    const stderr = (r1.stderr || '').toString();
+    if (stderr) {
+      console.error(stderr);
+    }
+    const looksLikeSelfReplace = process.platform === 'win32' && (
+      /EPERM|EBUSY|operation not permitted|kushi\.cmd|kushi-agents\.cmd|in use/i.test(stderr)
+    );
+    if (looksLikeSelfReplace) {
+      console.error([
+        '',
+        '  npm could not overwrite the running kushi.cmd shim.',
+        '  This is a known Windows limitation when `kushi upgrade` is launched from kushi itself.',
+        '',
+        '  Fix: open a NEW PowerShell window and run:',
+        '',
+        '      npm i -g kushi-agents@latest',
+        '',
+        '  Then re-seed your workspace:',
+        '',
+        '      cd ' + process.cwd(),
+        '      npx kushi-agents@latest --force',
+        '',
+      ].join('\n'));
+    } else if (!stderr) {
+      console.error('\n  npm install failed (no stderr captured). Try:\n      npm i -g kushi-agents@latest --foreground-scripts --loglevel=verbose\n');
+    }
     process.exit(r1.status ?? 1);
   }
   console.log('\n  Refreshing assets in cwd (config preserved)...\n');
@@ -359,6 +405,36 @@ if (args.length > 0 && args[0] === 'upgrade') {
   }
 }
 
+// ── chat-verb guard (v5.9.4+) ───────────────────────────────────────────────
+// These verbs are dispatched by Copilot Chat (`@Kushi <verb>`), not the CLI.
+// If a user types e.g. `kushi ask HCA "..."` in PowerShell, fall through to
+// installer used to silently run. Now we print a friendly redirect.
+const CHAT_ONLY_VERBS = new Set([
+  'ask', 'bootstrap', 'refresh', 'status', 'consolidate', 'tour', 'dashboard',
+  'aggregate', 'fde-intake', 'fde-report', 'fde-triage', 'link-entities',
+  'migrate-files', 'pull', 'schema-evolve', 'teach', 'vertex-link',
+  'emit-vertex',
+]);
+if (args.length > 0 && CHAT_ONLY_VERBS.has(args[0])) {
+  const verb = args[0];
+  const rest = args.slice(1).map(a => a.includes(' ') ? `"${a}"` : a).join(' ');
+  console.log(`
+  '${verb}' is a chat verb — run it from Copilot Chat, not PowerShell.
+
+  In VS Code Copilot Chat:
+      @Kushi ${verb}${rest ? ' ' + rest : ' <project> [args]'}
+
+  In Clawpilot:
+      kushi ${verb}${rest ? ' ' + rest : ' <project> [args]'}
+
+  CLI verbs (run from PowerShell): kushi help, kushi wiki, kushi doctor,
+                                   kushi upgrade, kushi uninstall, kushi setup,
+                                   kushi state, kushi promote, kushi global, kushi lint
+  See:  kushi help
+`);
+  process.exit(2);
+}
+
 // ── multi-host mode (v5.0.2+) ───────────────────────────────────────────────
 // Trigger when the user passes any of: --vscode, --all-hosts, --uninstall.
 // --clawpilot ALONE continues to route through the legacy main.mjs path so

package/bin/kushi-agents.mjs

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+// Installer entry point — `npx kushi-agents` lands here. Bare invocation on a
+// TTY launches the setup wizard for first-install ergonomics.
+process.env.KUSHI_BIN_NAME = 'kushi-agents';
+await import('./cli.mjs');

package/bin/kushi.mjs

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+// Post-install user verb. Bare `kushi` → grouped help. Unknown verbs → friendly redirect.
+process.env.KUSHI_BIN_NAME = 'kushi';
+await import('./cli.mjs');

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "kushi-agents",
-  "version": "5.9.3",
+  "version": "5.9.5",
   "description": "Install Kushi — multi-source project evidence agent with Comprehensive Structured Capture (CSC) into weekly-only files across Email, Teams, OneNote, Loop, SharePoint, Meetings, CRM, ADO. Meetings retain a sibling verbatim/ audit folder. WorkIQ-only for M365 sources (Graph / m365_* FORBIDDEN as fallbacks; user-paste is first-class). Host-agnostic.",
   "type": "module",
   "bin": {
-    "kushi": "./bin/cli.mjs",
-    "kushi-agents": "./bin/cli.mjs"
+    "kushi": "./bin/kushi.mjs",
+    "kushi-agents": "./bin/kushi-agents.mjs"
   },
   "files": [
     "bin/",