kushi-agents 5.4.0 → 5.4.2

package/bin/cli.mjs

@@ -5,8 +5,20 @@ import { runMultiHost } from '../src/multi-host.mjs';
 
 const args = process.argv.slice(2);
 
-// ── bare invocation (v5.4.0+) → welcome screen ──────────────────────────────
-if (args.length === 0 && !process.env.KUSHI_SKIP_WELCOME) {
+// ── bare invocation (v5.4.0+) ────────────────────────────────────────────────
+// v5.4.1: on an interactive TTY, auto-launch the setup wizard (matches the
+// ergonomics of `npx create-*`). Non-TTY (CI, scripts, piped stdin) and the
+// explicit KUSHI_SKIP_WELCOME=1 still print the welcome card and exit 0, so
+// nothing is installed by side-effect.
+if (args.length === 0) {
+  const forceWelcome = process.env.KUSHI_SKIP_WELCOME === '1';
+  const forceWizard  = process.env.KUSHI_FORCE_WIZARD === '1';
+  const interactive  = forceWizard || (process.stdin.isTTY && !forceWelcome);
+  if (interactive) {
+    const { runSetupWizard } = await import('../src/setup-wizard.mjs');
+    await runSetupWizard({ args: [] });
+    process.exit(0);
+  }
   await printWelcome();
   process.exit(0);
 }
@@ -50,10 +62,13 @@ async function printWelcome() {
   console.log(`
   kushi v${version} — multi-source M365 project evidence agent
 
+  (non-interactive shell — nothing was installed)
+
   First time?         kushi doctor
   Bootstrap a project: kushi setup <project>
   Ask a question:      kushi ask <project> "..."
   Wizard install:      npx kushi-agents --setup-wizard
+  Host install:        npx kushi-agents --clawpilot | --vscode | --all-hosts
 
   Docs:   https://gim-home.github.io/kushi/
   Skills: ${skillCount} installed in plugin/skills/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kushi-agents",
-  "version": "5.4.0",
+  "version": "5.4.2",
   "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": {
@@ -41,7 +41,7 @@
   },
   "license": "MIT",
   "scripts": {
-    "test": "node --test src/check-workiq.test.mjs src/seed-config.test.mjs src/sanitize-workiq-input.test.mjs src/detect-vertex-repo.test.mjs src/vertex-validate.test.mjs src/emit-vertex.e2e.test.mjs src/config-root-resolve.test.mjs src/forbidden-workiq-phrasings.test.mjs src/multi-host-install.test.mjs src/eval-aggregator.test.mjs src/eval-runner.test.mjs src/skill-creator.test.mjs src/skill-checker.test.mjs src/hooks-dispatcher.test.mjs src/parallel-refresh.test.mjs src/otel-emit.test.mjs src/teach.test.mjs src/schema-evolve.test.mjs src/global-wiki.test.mjs src/promote.test.mjs src/doctor.test.mjs src/setup-wizard.test.mjs src/cli-no-args.test.mjs",
+    "test": "node --test src/check-workiq.test.mjs src/seed-config.test.mjs src/sanitize-workiq-input.test.mjs src/detect-vertex-repo.test.mjs src/vertex-validate.test.mjs src/emit-vertex.e2e.test.mjs src/config-root-resolve.test.mjs src/forbidden-workiq-phrasings.test.mjs src/multi-host-install.test.mjs src/eval-aggregator.test.mjs src/eval-runner.test.mjs src/skill-creator.test.mjs src/skill-checker.test.mjs src/hooks-dispatcher.test.mjs src/parallel-refresh.test.mjs src/otel-emit.test.mjs src/teach.test.mjs src/schema-evolve.test.mjs src/global-wiki.test.mjs src/promote.test.mjs src/doctor.test.mjs src/setup-wizard.test.mjs src/cli-no-args.test.mjs src/cli-no-args-tty.test.mjs",
     "test:integration:bootstrap": "node src/bootstrap-dryrun.integration.test.mjs",
     "smoke": "node scripts/smoke.mjs",
     "eval": "pwsh plugin/skills/eval/run-evals.ps1 -Skill",

package/src/cli-no-args-tty.test.mjs

@@ -0,0 +1,59 @@
+// kushi v5.4.1 — bare `kushi` on an interactive TTY auto-runs the setup
+// wizard. Non-TTY (covered by cli-no-args.test.mjs) still prints the welcome
+// card and never installs anything. We can't easily fake a real PTY inside
+// node:test, so this test uses KUSHI_FORCE_WIZARD=1 as the documented escape
+// hatch that mirrors the TTY branch.
+
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import path from 'node:path';
+import os from 'node:os';
+import fs from 'node:fs';
+import { spawnSync } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
+
+const repoRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+const cli = path.join(repoRoot, 'bin', 'cli.mjs');
+
+function mkTmp() {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'kushi-cli-tty-'));
+  return dir;
+}
+
+test('cli no-args + KUSHI_FORCE_WIZARD=1: routes through setup-wizard, not welcome card', () => {
+  const installRoot = mkTmp();
+  const wizardRoot  = mkTmp();
+  try {
+    const r = spawnSync(process.execPath, [cli], {
+      encoding: 'utf-8',
+      timeout: 30_000,
+      env: {
+        ...process.env,
+        KUSHI_FORCE_WIZARD: '1',
+        KUSHI_SKIP_INSTALL: '1',
+        KUSHI_INSTALL_ROOT: installRoot,
+        KUSHI_WIZARD_ROOT: wizardRoot,
+        KUSHI_WIZARD_HOSTS: 'clawpilot',
+        KUSHI_WIZARD_GLOBAL: 'n',
+      },
+    });
+    const out = (r.stdout || '') + (r.stderr || '');
+    assert.equal(r.status, 0, `wizard exits 0\nout=${out}`);
+    assert.ok(!/non-interactive shell/.test(out), 'should not print welcome banner when wizard branch is taken');
+    assert.ok(/KUSHI_SKIP_INSTALL=1/.test(out) || /wizard complete/i.test(out) || /engagement root/i.test(out),
+      `expected wizard output, got:\n${out}`);
+  } finally {
+    fs.rmSync(installRoot, { recursive: true, force: true });
+    fs.rmSync(wizardRoot,  { recursive: true, force: true });
+  }
+});
+
+test('cli no-args + KUSHI_SKIP_WELCOME=1: still prints welcome even on TTY override', () => {
+  const r = spawnSync(process.execPath, [cli], {
+    encoding: 'utf-8',
+    timeout: 30_000,
+    env: { ...process.env, KUSHI_SKIP_WELCOME: '1', KUSHI_FORCE_WIZARD: '' },
+  });
+  assert.equal(r.status, 0);
+  assert.match(r.stdout, /kushi v\d+\.\d+\.\d+/);
+});

package/src/setup-wizard.mjs

@@ -1,10 +1,11 @@
-// kushi v5.4.0 — interactive setup wizard.
+// kushi v5.4.2 — interactive setup wizard.
 // Non-interactive overrides (used by tests + CI):
-//   KUSHI_WIZARD_ROOT     — engagement root path
-//   KUSHI_WIZARD_HOSTS    — comma list: clawpilot,vscode  (or "both")
-//   KUSHI_WIZARD_GLOBAL   — "y" or "n"
-//   KUSHI_INSTALL_ROOT    — override ~/.copilot/ for install target (test isolation)
-//   KUSHI_SKIP_INSTALL    — "1" to skip the actual install step (tests)
+//   KUSHI_WIZARD_ROOT      — engagement root path
+//   KUSHI_WIZARD_HOSTS     — comma list: clawpilot,vscode  (or "both")
+//   KUSHI_WIZARD_GLOBAL    — "y" or "n"
+//   KUSHI_WIZARD_WORKSPACE — "y" or "n" — scaffold cwd as a kushi workspace
+//   KUSHI_INSTALL_ROOT     — override ~/.copilot/ for install target (test isolation)
+//   KUSHI_SKIP_INSTALL     — "1" to skip the actual install step (tests)
 
 import fs from 'node:fs';
 import path from 'node:path';
@@ -41,7 +42,7 @@ function makePrompter() {
     const v = process.env[key];
     return (typeof v === 'string' && v.length > 0) ? v : null;
   };
-  if (fromEnv('KUSHI_WIZARD_ROOT') || fromEnv('KUSHI_WIZARD_HOSTS') || fromEnv('KUSHI_WIZARD_GLOBAL')) {
+  if (fromEnv('KUSHI_WIZARD_ROOT') || fromEnv('KUSHI_WIZARD_HOSTS') || fromEnv('KUSHI_WIZARD_GLOBAL') || fromEnv('KUSHI_WIZARD_WORKSPACE')) {
     return { interactive: false, ask: async (_q, _def, envKey) => fromEnv(envKey) };
   }
   if (!process.stdin.isTTY) {
@@ -60,15 +61,23 @@ function makePrompter() {
 export async function runSetupWizard({ args = [] } = {}) {
   const detectedRoot  = detectEngagementRoot();
   const detectedHosts = detectHosts();
+  const cwd           = process.cwd();
+  const cwdHasKushi   = fs.existsSync(path.join(cwd, '.kushi'));
+  const defaultWorkspace = cwdHasKushi ? 'n' : 'y';
   const p = makePrompter();
 
   console.log('');
-  console.log('  kushi setup wizard — 3 questions, then I install.');
+  console.log('  kushi setup wizard — 4 questions, then I install.');
   console.log('');
 
   const root  = (await p.ask('  Where is your engagement root?', detectedRoot, 'KUSHI_WIZARD_ROOT')) || detectedRoot;
   const hosts = (await p.ask('  Install for clawpilot / vscode / both?', detectedHosts, 'KUSHI_WIZARD_HOSTS')) || detectedHosts;
   const wantGlobal = (await p.ask('  Enable global wiki at ~/.kushi-global/?', 'y', 'KUSHI_WIZARD_GLOBAL')) || 'y';
+  const wantWorkspace = (await p.ask(
+    `  Scaffold current directory (${cwd}) as a kushi workspace?${cwdHasKushi ? ' (already present)' : ''}`,
+    defaultWorkspace,
+    'KUSHI_WIZARD_WORKSPACE',
+  )) || defaultWorkspace;
 
   if (p.close) p.close();
 
@@ -76,6 +85,8 @@ export async function runSetupWizard({ args = [] } = {}) {
     engagementRoot: root,
     hosts: hosts.toLowerCase(),
     globalWiki: /^y/i.test(wantGlobal),
+    workspaceInstall: /^y/i.test(wantWorkspace),
+    workspacePath: cwd,
   };
 
   console.log('');
@@ -83,6 +94,7 @@ export async function runSetupWizard({ args = [] } = {}) {
   console.log(`    engagement root: ${answers.engagementRoot}`);
   console.log(`    hosts:           ${answers.hosts}`);
   console.log(`    global wiki:     ${answers.globalWiki ? 'yes' : 'no'}`);
+  console.log(`    workspace:       ${answers.workspaceInstall ? `yes (${cwd})` : 'no'}`);
   console.log('');
 
   if (process.env.KUSHI_SKIP_INSTALL === '1') {
@@ -122,6 +134,25 @@ export async function runSetupWizard({ args = [] } = {}) {
     }
   }
 
+  if (answers.workspaceInstall) {
+    try {
+      const { main } = await import('./main.mjs');
+      await main({
+        force: false,
+        yes: true,
+        noSettings: false,
+        noInstructions: false,
+        target: 'vscode',
+        profile: undefined,
+        withWorkiq: false,
+        workiqPath: undefined,
+        skipWorkiqCheck: true,
+      });
+    } catch (err) {
+      console.error(`  workspace install skipped: ${err.message}`);
+    }
+  }
+
   console.log('');
   console.log('  ✅ wizard complete — next steps:');
   console.log('    kushi doctor');

package/src/setup-wizard.test.mjs

@@ -31,18 +31,20 @@ async function withEnv(envOverrides, fn) {
 }
 
 test('setup-wizard: env-driven cases (sequential to avoid env race)', async (t) => {
-  await t.test('case 1: env overrides resolve all three prompts', async () => {
+  await t.test('case 1: env overrides resolve all four prompts', async () => {
     const root = path.join(TESTTMP, `wizard-root-${Date.now()}-1`);
     fs.mkdirSync(root, { recursive: true });
     const result = await withEnv({
       KUSHI_WIZARD_ROOT: root,
       KUSHI_WIZARD_HOSTS: 'clawpilot',
       KUSHI_WIZARD_GLOBAL: 'n',
+      KUSHI_WIZARD_WORKSPACE: 'n',
       KUSHI_SKIP_INSTALL: '1',
     }, () => runSetupWizard());
     assert.equal(result.engagementRoot, root, 'root from env');
     assert.equal(result.hosts, 'clawpilot', 'host from env');
     assert.equal(result.globalWiki, false, 'global wiki off');
+    assert.equal(result.workspaceInstall, false, 'workspace off');
   });
 
   await t.test('case 2: "both" hosts retained in answers', async () => {
@@ -52,6 +54,7 @@ test('setup-wizard: env-driven cases (sequential to avoid env race)', async (t)
       KUSHI_WIZARD_ROOT: root,
       KUSHI_WIZARD_HOSTS: 'both',
       KUSHI_WIZARD_GLOBAL: 'n',
+      KUSHI_WIZARD_WORKSPACE: 'n',
       KUSHI_SKIP_INSTALL: '1',
     }, () => runSetupWizard());
     assert.equal(result.hosts, 'both');
@@ -64,6 +67,7 @@ test('setup-wizard: env-driven cases (sequential to avoid env race)', async (t)
       KUSHI_WIZARD_ROOT: installRoot,
       KUSHI_WIZARD_HOSTS: 'clawpilot',
       KUSHI_WIZARD_GLOBAL: 'y',
+      KUSHI_WIZARD_WORKSPACE: 'n',
       KUSHI_SKIP_INSTALL: '1',
       KUSHI_INSTALL_ROOT: installRoot,
     }, () => runSetupWizard());
@@ -71,4 +75,18 @@ test('setup-wizard: env-driven cases (sequential to avoid env race)', async (t)
     assert.equal(result.globalWiki, true);
     assert.equal(result.engagementRoot, installRoot);
   });
+
+  await t.test('case 4: workspace scaffold opt-in records cwd', async () => {
+    const root = path.join(TESTTMP, `wizard-root-${Date.now()}-4`);
+    fs.mkdirSync(root, { recursive: true });
+    const result = await withEnv({
+      KUSHI_WIZARD_ROOT: root,
+      KUSHI_WIZARD_HOSTS: 'clawpilot',
+      KUSHI_WIZARD_GLOBAL: 'n',
+      KUSHI_WIZARD_WORKSPACE: 'y',
+      KUSHI_SKIP_INSTALL: '1',
+    }, () => runSetupWizard());
+    assert.equal(result.workspaceInstall, true, 'workspace install requested');
+    assert.equal(result.workspacePath, process.cwd(), 'workspace path = cwd');
+  });
 });