kushi-agents 5.8.0 → 5.8.2

package/bin/cli.mjs

@@ -206,6 +206,8 @@ if (args.includes('--help') || args.includes('-h')) {
     --yes, -y           Skip the project-root check
     --no-settings       Skip .vscode/settings.json update (vscode workspace target only)
     --no-instructions   Skip .github/copilot-instructions.md merge   (vscode workspace target only)
+    --no-prompt         Skip the post-install m365-auth quickstart (3 fields that
+                        make 'kushi discover' fast). Also disabled by KUSHI_NO_PROMPT=1.
 
   WorkIQ (REQUIRED — Kushi cannot pull evidence without it):
     --with-workiq           Auto-install WorkIQ via winget (Windows) / brew (macOS)
@@ -281,6 +283,7 @@ if (wantsVscode || wantsAllHosts || wantsUninstall) {
     uninstall: wantsUninstall,
     profile: getFlag('--profile'),
     includeWorkspace: !args.includes('--no-workspace'),
+    noPrompt: args.includes('--no-prompt'),
   }).catch((err) => {
     console.error(`\n  ${err.message}\n`);
     process.exit(1);
@@ -300,6 +303,7 @@ if (wantsVscode || wantsAllHosts || wantsUninstall) {
     yes: args.includes('--yes') || args.includes('-y'),
     noSettings: args.includes('--no-settings'),
     noInstructions: args.includes('--no-instructions'),
+    noPrompt: args.includes('--no-prompt'),
     target,
     profile: getFlag('--profile'),
     withWorkiq: args.includes('--with-workiq'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kushi-agents",
-  "version": "5.8.0",
+  "version": "5.8.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": {

package/plugin/lib/Get-KushiConfig.ps1

@@ -61,9 +61,7 @@ $script:RequiredFields = @{
   'm365-auth' = @(
     'm365Auth.defaultTenantId',
     'm365Auth.oneNote.defaultNotebookName',
-    'm365Auth.oneNote.defaultNotebookId',
     'm365Auth.oneNote.defaultLinkOwner',
-    'm365Auth.emailContext.folders',
     'm365Auth.sharePointContext.localProjectsRoot'
   )
   'project-evidence' = @(

package/plugin/runners/discover.mjs

@@ -49,7 +49,10 @@ function emit(obj) { process.stdout.write(JSON.stringify(obj) + '\n'); }
 function describeScope(source, scope) {
   if (!scope || scope.enabled === false) return null;
   const parts = [];
-  if (source === 'email' && scope.folders?.length) parts.push(`${scope.folders.length} folder(s)`);
+  if (source === 'email') {
+    if (scope.folders?.length) parts.push(`${scope.folders.length} folder(s)`);
+    else parts.push('default Inbox+subfolders');
+  }
   if (scope.dateFloor) parts.push(`from ${scope.dateFloor}`);
   if (source === 'onenote' && scope.notebookName) parts.push(`notebook "${scope.notebookName}"`);
   return parts.length ? 'scope: ' + parts.join(', ') : null;
@@ -82,13 +85,22 @@ function buildPrompt(source, projectName, scope = null) {
   // search, typically dropping query time from 60–180s to 5–15s.
   if (scope && scope.enabled !== false) {
     if (source === 'email') {
-      if (Array.isArray(scope.folders) && scope.folders.length > 0) {
-        lines.push('');
-        lines.push('Restrict your search to ONLY these Outlook mail folders:');
-        for (const f of scope.folders) {
-          lines.push(`  • "${f}"${scope.includeSubfolders ? ' (and all subfolders)' : ''}`);
-        }
-        lines.push('Do NOT scan any other mailbox folders.');
+      const folders = (Array.isArray(scope.folders) && scope.folders.length > 0)
+        ? scope.folders
+        : ['Inbox']; // safe default — bounds the query so WorkIQ uses Graph filter, not mailbox-wide semantic search
+      const isDefault = !(Array.isArray(scope.folders) && scope.folders.length > 0);
+      lines.push('');
+      if (scope.fuzzy !== false) {
+        lines.push('Restrict your search to Outlook mail folders whose name CONTAINS any of these tokens (case-insensitive, fuzzy substring match — e.g. "FDE" matches "1. FDE", "01 FDE Active", "FDE-archive"):');
+      } else {
+        lines.push('Restrict your search to ONLY these Outlook mail folders (exact name match):');
+      }
+      for (const f of folders) {
+        lines.push(`  • "${f}"${scope.includeSubfolders ? ' (and all subfolders)' : ''}`);
+      }
+      lines.push('Do NOT scan any other mailbox folders.');
+      if (isDefault) {
+        lines.push('(Note: no project-specific folders configured — defaulting to Inbox+subfolders. For faster, more accurate results, populate emailContext.folders in m365-auth.json.)');
       }
       if (scope.dateFloor) lines.push(`Only consider mail received on or after ${scope.dateFloor}.`);
     } else if (source === 'teams') {

package/plugin/runners/lib/m365-auth.mjs

@@ -62,11 +62,14 @@ export function scopeForSource(m365Auth, source) {
     case 'email': {
       const ec = m365Auth.emailContext || {};
       if (ec.enabled === false) return { enabled: false };
+      const mp = ec.matchingPolicy || {};
       return {
         enabled: true,
         folders: cleanArr(ec.folders),
         includeSubfolders: ec.includeSubfolders !== false,
         dateFloor: cleanStr(ec.dateFloor),
+        fuzzy: mp.alwaysFuzzy !== false,
+        matchMode: mp.mode || 'hybrid',
       };
     }
     case 'teams': {

package/src/main.mjs

@@ -17,6 +17,7 @@ import { installRunnerDeps } from './install-runner-deps.mjs';
 import { mergeSettings } from './settings.mjs';
 import { mergeCopilotInstructions } from './copilot-instructions.mjs';
 import { seedConfig } from './seed-config.mjs';
+import { runM365Quickstart } from './quickstart-m365.mjs';
 import { checkWorkIQ, pingWorkIQ, tryInstallWorkIQ } from './check-workiq.mjs';
 import {
   resolveProfile,
@@ -115,6 +116,15 @@ async function installVscode(options, resolved, version) {
   const seedRes = seedConfig(PKG_ROOT, fullDest);
   printSeedReport(seedRes, `${dest}/`);
 
+  // v5.8.1: prompt for the 3 fields that most affect discover speed.
+  // Skips silently when --no-prompt is set, when not running in a TTY, or
+  // when all 3 fields are already populated (re-install case).
+  const noPrompt = options.noPrompt || process.env.KUSHI_NO_PROMPT === '1';
+  const qs = await runM365Quickstart({ destRoot: fullDest, noPrompt });
+  if (qs.ran === false && qs.reason && !['already-populated', 'no-prompt-flag'].includes(qs.reason)) {
+    console.log(`  Quickstart skipped: ${qs.reason}`);
+  }
+
   if (!options.noSettings) {
     const { created, keysAdded, keysUnchanged } = mergeSettings(
       projectRoot,

package/src/multi-host.mjs

@@ -299,6 +299,7 @@ export async function runMultiHost(opts) {
           force: true,
           profile: opts.profile,
           skipWorkiqCheck: true,
+          noPrompt: opts.noPrompt,
         });
       } catch (err) {
         console.error(`  Workspace install failed: ${err.message}`);

package/src/quickstart-m365.mjs

@@ -0,0 +1,177 @@
+// src/quickstart-m365.mjs
+// Post-install interactive prompt for the 3 fields that most affect kushi
+// `discover` wall time (folders, dateFloor via lookback-days, OneNote notebook).
+// Runs at the end of `installWorkspace()` when the destination just got a fresh
+// m365-auth.json seed. Skips silently when not a TTY or when --no-prompt is set.
+
+import fs from 'node:fs';
+import path from 'node:path';
+
+const SENTINELS = [/__FILL_ME_IN__/, /^<[A-Za-z][^>]*>$/, /^<auto>$/];
+function looksLikeSentinel(s) {
+  if (!s) return true;
+  return SENTINELS.some((re) => re.test(s));
+}
+
+function isoDateNDaysAgo(n) {
+  const d = new Date();
+  d.setDate(d.getDate() - n);
+  return d.toISOString().slice(0, 10);
+}
+
+/**
+ * Run the 4-question quickstart. Returns a small report object:
+ *   { ran: bool, reason?: string, file?: string, fields?: string[] }
+ *
+ * @param {object} opts
+ * @param {string} opts.destRoot   - absolute path to .kushi/ (the workspace install root)
+ * @param {boolean} [opts.force]   - overwrite existing non-empty values
+ * @param {boolean} [opts.noPrompt]- skip prompting (CI / scripted installs)
+ */
+export async function runM365Quickstart({ destRoot, force = false, noPrompt = false } = {}) {
+  if (noPrompt) return { ran: false, reason: 'no-prompt-flag' };
+  if (!process.stdin.isTTY || !process.stderr.isTTY) return { ran: false, reason: 'not-a-tty' };
+
+  const target = path.join(destRoot, 'config', 'user', 'm365-auth.json');
+  const projectEvidenceTarget = path.join(destRoot, 'config', 'user', 'project-evidence.yml');
+  if (!fs.existsSync(target)) return { ran: false, reason: 'm365-auth-not-found' };
+
+  let parsed;
+  try { parsed = JSON.parse(fs.readFileSync(target, 'utf8')); }
+  catch (e) { return { ran: false, reason: `parse-error: ${e.message}` }; }
+  parsed.m365Auth ??= {};
+  const m = parsed.m365Auth;
+  m.emailContext ??= {};
+  m.teamsChatContext ??= {};
+  m.calendarContext ??= {};
+  m.oneNote ??= {};
+  m.sharePointContext ??= {};
+
+  // Skip silently if all 4 fields are already populated and --force not passed.
+  const foldersSet = Array.isArray(m.emailContext.folders) && m.emailContext.folders.length > 0;
+  const floorSet = !looksLikeSentinel(m.emailContext.dateFloor);
+  const notebookSet = !looksLikeSentinel(m.oneNote.defaultNotebookName);
+  const rootSet = !looksLikeSentinel(m.sharePointContext.localProjectsRoot);
+  if (foldersSet && floorSet && notebookSet && rootSet && !force) {
+    return { ran: false, reason: 'already-populated' };
+  }
+
+  const readline = await import('node:readline/promises');
+  const rl = readline.createInterface({ input: process.stdin, output: process.stderr, terminal: true });
+  const ask = async (q, def) => {
+    const ans = (await rl.question(`${q} ${def != null && def !== '' ? `[${def}]` : ''} > `)).trim();
+    return ans === '' ? def : ans;
+  };
+
+  process.stderr.write('\n  ┌─ Quickstart: 4 questions that make `kushi discover` fast ──\n');
+  process.stderr.write(`  │ Editing: ${target}\n`);
+  process.stderr.write('  │ Press Enter at any prompt to keep the shown default.\n');
+  process.stderr.write('  └────────────────────────────────────────────────────────────\n\n');
+
+  const fields = [];
+
+  // 1. Engagement root (where projects live on disk)
+  process.stderr.write('  [1/4] Where do your engagement project folders live on disk?\n');
+  process.stderr.write('        This is the parent folder containing each <project>/ directory.\n');
+  process.stderr.write('        Example: C:\\Users\\<you>\\OneDrive - Microsoft\\ISE\\Engagement Assets\n');
+  const curRoot = m.sharePointContext.localProjectsRoot || '';
+  const rootAns = await ask('        Engagement root', curRoot);
+  let engagementRoot = null;
+  if (rootAns) {
+    if (!fs.existsSync(rootAns)) {
+      process.stderr.write(`        ⚠ Path does not exist: ${rootAns}\n`);
+      process.stderr.write('          Saving anyway — create it before your first bootstrap, or re-run --force to change.\n');
+    }
+    if (rootAns !== curRoot) {
+      m.sharePointContext.localProjectsRoot = rootAns;
+      if (m.sharePointContext.enabled == null) m.sharePointContext.enabled = true;
+      fields.push(`sharePointContext.localProjectsRoot=${rootAns}`);
+    }
+    engagementRoot = rootAns;
+  }
+
+  // 2. Email folders
+  process.stderr.write('\n  [2/4] Which Outlook mail folders contain your project mail?\n');
+  process.stderr.write('        Examples:\n');
+  process.stderr.write('          • "1. FDE, 99. FDE Not Active"  (Microsoft FDE consultant)\n');
+  process.stderr.write('          • "Inbox, Archive, Projects"     (generic)\n');
+  process.stderr.write('          • "Inbox"                        (everything in inbox)\n');
+  const curFolders = Array.isArray(m.emailContext.folders) ? m.emailContext.folders.join(', ') : '';
+  const foldersDefault = curFolders || '1. FDE, 99. FDE Not Active';
+  const foldersAns = await ask('        Comma-separated folder names', foldersDefault);
+  if (foldersAns && foldersAns !== curFolders) {
+    const arr = foldersAns.split(',').map(s => s.trim()).filter(Boolean);
+    m.emailContext.folders = arr;
+    if (m.emailContext.includeSubfolders == null) m.emailContext.includeSubfolders = true;
+    if (m.emailContext.enabled == null) m.emailContext.enabled = true;
+    fields.push(`emailContext.folders=[${arr.join(', ')}]`);
+  } else if (!foldersAns) {
+    process.stderr.write('        (skipped — discover will scan the whole mailbox, which can take minutes per source)\n');
+  }
+
+  // 3. Look-back days
+  process.stderr.write('\n  [3/4] How many days back should discover scan? (smaller = faster)\n');
+  process.stderr.write('        Recommended: 60 for active engagements, 90 for setup.\n');
+  const curFloor = m.emailContext.dateFloor;
+  const defaultDays = curFloor && /^\d{4}-\d{2}-\d{2}$/.test(curFloor)
+    ? Math.max(1, Math.round((Date.now() - Date.parse(curFloor)) / 86400000))
+    : 60;
+  const daysAns = await ask('        Look-back days', defaultDays);
+  const days = Number(daysAns);
+  if (Number.isFinite(days) && days > 0 && days <= 3650) {
+    const floor = isoDateNDaysAgo(days);
+    m.emailContext.dateFloor = floor;
+    m.teamsChatContext.dateFloor = floor;
+    m.calendarContext.dateFloor = floor;
+    fields.push(`dateFloor=${floor} (${days} days)`);
+  } else {
+    process.stderr.write(`        ⚠ "${daysAns}" is not a valid number 1–3650 — skipping dateFloor.\n`);
+  }
+
+  // 4. OneNote notebook
+  process.stderr.write('\n  [4/4] Which OneNote notebook holds your project notes?\n');
+  process.stderr.write('        Default for Microsoft consultants: "ISE Work"\n');
+  const curNb = m.oneNote.defaultNotebookName || '';
+  const nbAns = await ask('        Notebook name', curNb || 'ISE Work');
+  if (nbAns && nbAns !== curNb) {
+    m.oneNote.defaultNotebookName = nbAns;
+    if (m.oneNote.enabled == null) m.oneNote.enabled = true;
+    fields.push(`oneNote.defaultNotebookName="${nbAns}"`);
+  }
+
+  rl.close();
+
+  if (fields.length === 0) {
+    process.stderr.write('\n  ⓘ No changes — m365-auth.json left as seeded. Edit it later to enable bounded discover.\n\n');
+    return { ran: true, reason: 'no-changes', file: target, fields: [] };
+  }
+  fs.writeFileSync(target, JSON.stringify(parsed, null, 2) + '\n');
+
+  // Mirror engagement root into project-evidence.yml#projects_root so bootstrap
+  // and the resolver agree. Best-effort: if file is missing or unparseable we
+  // skip silently — m365-auth is the canonical source for sharePoint scoping.
+  if (engagementRoot && fs.existsSync(projectEvidenceTarget)) {
+    try {
+      const txt = fs.readFileSync(projectEvidenceTarget, 'utf8');
+      // Simple line replacement to avoid pulling in YAML lib at install time.
+      // The seed file ships with `projects_root: <value>` on its own line.
+      if (/^projects_root:/m.test(txt)) {
+        const updated = txt.replace(/^projects_root:.*$/m, `projects_root: ${JSON.stringify(engagementRoot)}`);
+        if (updated !== txt) {
+          fs.writeFileSync(projectEvidenceTarget, updated);
+          fields.push(`project-evidence.yml#projects_root=${engagementRoot}`);
+        }
+      } else {
+        fs.appendFileSync(projectEvidenceTarget, `\nprojects_root: ${JSON.stringify(engagementRoot)}\n`);
+        fields.push(`project-evidence.yml#projects_root=${engagementRoot} (appended)`);
+      }
+    } catch (e) {
+      process.stderr.write(`  ⚠ Could not update project-evidence.yml: ${e.message}\n`);
+    }
+  }
+
+  process.stderr.write(`\n  ✓ Wrote ${fields.length} field(s):\n`);
+  for (const f of fields) process.stderr.write(`      • ${f}\n`);
+  process.stderr.write('\n');
+  return { ran: true, file: target, fields };
+}