kushi-agents 5.8.1 → 5.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kushi-agents",
-  "version": "5.8.1",
+  "version": "5.8.3",
   "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/plugin/runners/lib/workiq.mjs

@@ -59,7 +59,11 @@ export async function ask(prompt, { bin, timeoutMs = 120_000, env = process.env,
     err.code = 'WORKIQ_NOT_FOUND';
     throw err;
   }
-  const { stdout, stderr, exitCode } = await runProcess(exe, ['ask', '-q', prompt], { timeoutMs, env, onHeartbeat, heartbeatMs });
+  // Pass prompt via stdin instead of `-q "<prompt>"` argument. Multi-line prompts
+  // with embedded quotes get mangled by cmd.exe's argument parser even with
+  // windowsVerbatimArguments, causing workiq to receive corrupted input and
+  // hang indefinitely. stdin is a clean byte channel.
+  const { stdout, stderr, exitCode } = await runProcess(exe, ['ask'], { timeoutMs, env, onHeartbeat, heartbeatMs, stdin: prompt });
   if (exitCode !== 0) {
     const err = new Error(`workiq exited ${exitCode}: ${stderr.slice(0, 1000)}`);
     err.code = 'WORKIQ_EXIT_NONZERO';
@@ -117,7 +121,7 @@ function parseKvLines(s) {
 
 async function pathExists(p) { try { await fs.access(p); return true; } catch { return false; } }
 
-function runProcess(exe, args, { timeoutMs, env, onHeartbeat = null, heartbeatMs = 10_000 }) {
+function runProcess(exe, args, { timeoutMs, env, onHeartbeat = null, heartbeatMs = 10_000, stdin = null }) {
   return new Promise((resolve, reject) => {
     // Node 20.12+ refuses to spawn .cmd/.bat on Windows without shell:true
     // (CVE-2024-27980). Detect and route through cmd.exe explicitly with
@@ -133,6 +137,10 @@ function runProcess(exe, args, { timeoutMs, env, onHeartbeat = null, heartbeatMs
       spawnOpts.windowsVerbatimArguments = true;
     }
     const child = spawn(spawnExe, spawnArgs, spawnOpts);
+    if (stdin != null) {
+      try { child.stdin.write(stdin); child.stdin.end(); }
+      catch (e) { /* if stdin already closed, child error handler will catch */ }
+    }
     let stdout = '';
     let stderr = '';
     let stdoutBytes = 0;

package/src/quickstart-m365.mjs

@@ -20,7 +20,7 @@ function isoDateNDaysAgo(n) {
 }
 
 /**
- * Run the 3-question quickstart. Returns a small report object:
+ * Run the 4-question quickstart. Returns a small report object:
  *   { ran: bool, reason?: string, file?: string, fields?: string[] }
  *
  * @param {object} opts
@@ -33,6 +33,7 @@ export async function runM365Quickstart({ destRoot, force = false, noPrompt = fa
   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;
@@ -44,12 +45,14 @@ export async function runM365Quickstart({ destRoot, force = false, noPrompt = fa
   m.teamsChatContext ??= {};
   m.calendarContext ??= {};
   m.oneNote ??= {};
+  m.sharePointContext ??= {};
 
-  // Skip silently if all 3 fields are already populated and --force not passed.
+  // 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);
-  if (foldersSet && floorSet && notebookSet && !force) {
+  const rootSet = !looksLikeSentinel(m.sharePointContext.localProjectsRoot);
+  if (foldersSet && floorSet && notebookSet && rootSet && !force) {
     return { ran: false, reason: 'already-populated' };
   }
 
@@ -60,21 +63,42 @@ export async function runM365Quickstart({ destRoot, force = false, noPrompt = fa
     return ans === '' ? def : ans;
   };
 
-  process.stderr.write('\n  ┌─ Quickstart: 3 questions that make `kushi discover` fast ──\n');
+  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 skip (you can always edit the file later).\n');
+  process.stderr.write('  │ Press Enter at any prompt to keep the shown default.\n');
   process.stderr.write('  └────────────────────────────────────────────────────────────\n\n');
 
   const fields = [];
 
-  // 1. Email folders
-  process.stderr.write('  [1/3] Which Outlook mail folders contain your project mail?\n');
+  // 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 foldersAns = await ask('        Comma-separated folder names', curFolders);
+  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;
@@ -85,8 +109,8 @@ export async function runM365Quickstart({ destRoot, force = false, noPrompt = fa
     process.stderr.write('        (skipped — discover will scan the whole mailbox, which can take minutes per source)\n');
   }
 
-  // 2. Look-back days
-  process.stderr.write('\n  [2/3] How many days back should discover scan? (smaller = faster)\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)
@@ -104,8 +128,8 @@ export async function runM365Quickstart({ destRoot, force = false, noPrompt = fa
     process.stderr.write(`        ⚠ "${daysAns}" is not a valid number 1–3650 — skipping dateFloor.\n`);
   }
 
-  // 3. OneNote notebook
-  process.stderr.write('\n  [3/3] Which OneNote notebook holds your project notes?\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');
@@ -122,7 +146,31 @@ export async function runM365Quickstart({ destRoot, force = false, noPrompt = fa
     return { ran: true, reason: 'no-changes', file: target, fields: [] };
   }
   fs.writeFileSync(target, JSON.stringify(parsed, null, 2) + '\n');
-  process.stderr.write(`\n  ✓ Wrote ${fields.length} field(s) to ${target}:\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 };