kushi-agents 5.8.2 → 5.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kushi-agents",
-  "version": "5.8.2",
+  "version": "5.8.4",
   "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/runners/discover.mjs

@@ -89,16 +89,29 @@ function buildPrompt(source, projectName, scope = null) {
         ? 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);
+      // matchingPolicy.mode drives whether we search by subfolder name, by mail content, or both.
+      // Recognized values: 'subfolder-only', 'keyword-only', 'hybrid' (default).
+      const mode = (scope.matchMode || 'hybrid').toLowerCase();
+      const doFolder = mode !== 'keyword-only';
+      const doKeyword = mode !== 'subfolder-only';
       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):');
-      }
+      lines.push('SCOPE BOUNDARY — search ONLY within these Outlook parent folders and ALL nested descendants:');
       for (const f of folders) {
-        lines.push(`  • "${f}"${scope.includeSubfolders ? ' (and all subfolders)' : ''}`);
+        lines.push(`  • "${f}"${scope.includeSubfolders !== false ? ' (recursively include every subfolder underneath)' : ' (this folder only)'}`);
+      }
+      lines.push('Parent folder name match: case-insensitive, fuzzy contains (so "1. FDE" matches "1. FDE", "01. FDE", "1 FDE").');
+      lines.push('Do NOT look outside this boundary.');
+      lines.push('');
+      lines.push(`SEARCH STRATEGY for project "${projectName}" (matchingPolicy.mode = "${mode}"):`);
+      if (doFolder && doKeyword) {
+        lines.push(`  1. Subfolder match: look for any subfolder whose name fuzzy-contains "${projectName}" (e.g. "${projectName}", "102. ${projectName}", "${projectName} - Engagement"). Emit each as a match.`);
+        lines.push(`  2. Mail-content match: also search email subjects, bodies, sender/recipient names within the boundary for "${projectName}" (case-insensitive). Group matching mail by folder and emit each folder.`);
+        lines.push(`  Run BOTH and merge results — do not stop at step 1.`);
+      } else if (doFolder) {
+        lines.push(`  Subfolder match only: emit subfolders whose name fuzzy-contains "${projectName}".`);
+      } else {
+        lines.push(`  Mail-content match only: search email subjects, bodies, sender/recipient names within the boundary for "${projectName}" (case-insensitive). Group matching mail by folder and emit each folder.`);
       }
-      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.)');
       }

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/plugin/templates/init/m365-auth.template.json

@@ -41,6 +41,7 @@
       "sourceCoverageLabel": "",
       "matchingPolicy": {
         "mode": "hybrid",
+        "_mode_note": "How to find project-related mail within the SCOPE BOUNDARY (folders[] + dateFloor). One of: 'subfolder-only' (only match subfolder names containing the project name), 'keyword-only' (only search mail subjects/bodies for the project name), 'hybrid' (do both and merge — recommended default).",
         "rankingOrder": ["exact", "prefix", "contains"],
         "minConfidenceForFolderScopedSearch": "high",
         "fallbackToFullRootScanWhenAmbiguous": true,