moflo 4.9.20 → 4.9.21

package/.claude/helpers/prompt-hook.mjs

@@ -33,43 +33,9 @@ try {
   });
 } catch (err) { output = (err && err.stdout) || ''; }
 
-// Classify prompt for namespace hint
-var lower = userPrompt.toLowerCase();
-
-var LEARNINGS_HINTS = /\b(remember|recall|insight|lesson learned|gotcha|post.?mortem)\b|we (decid|agree|chose|said)/;
-var TEST_HINTS = /\b(test|spec|coverage|tested|test case|test cases|tests for|spec for)\b/;
-var EXPLICIT_NS = [
-  { pattern: /\b(pattern|convention|best practice|style|coding rule)\b/, ns: 'patterns', label: 'code patterns and conventions' },
-  { pattern: /\b(code.?map|file structure|project structure|directory)\b/, ns: 'code-map', label: 'codebase navigation' },
-];
-var PATTERN_HINTS = [/\b(template|example|similar to|how do we|how should)\b/];
-var DOMAIN_HINTS = [
-  /\b(guidance|guide|docs|documentation|rules|how-to)\b/,
-  /\b(architecture|design|domain|tenant|migrat|schema|deploy)/,
-  /\b(rule|requirement|constraint|compliance)\b/,
-];
-var NAV_PATTERNS = [
-  /\b(find|where|which file|look up|locate|endpoint|route|url|path)\b/,
-  /\b(class|function|method|component|service|entity|module)\b/,
-];
-
-var nsHint = '';
-if (TEST_HINTS.test(lower)) {
-  nsHint = 'Memory namespace hint: use "tests" for test inventory and coverage lookups.';
-} else if (LEARNINGS_HINTS.test(lower)) {
-  nsHint = 'Memory namespace hint: use "learnings" for user-directed decisions and distilled insights.';
-} else {
-  var found = EXPLICIT_NS.find(function(e) { return e.pattern.test(lower); });
-  if (found) {
-    nsHint = 'Memory namespace hint: use "' + found.ns + '" for ' + found.label + '.';
-  } else if (DOMAIN_HINTS.some(function(p) { return p.test(lower); })) {
-    nsHint = 'Memory namespace hint: search "guidance" and "learnings" for domain rules and project decisions.';
-  } else if (PATTERN_HINTS.some(function(p) { return p.test(lower); })) {
-    nsHint = 'Memory namespace hint: use "patterns" for code patterns and conventions.';
-  } else if (NAV_PATTERNS.some(function(p) { return p.test(lower); })) {
-    nsHint = 'Memory namespace hint: use "code-map" for codebase navigation.';
-  }
-}
+// #931 — Namespace hint classification moved into gate.cjs (computed by
+// prompt-reminder, stored on workflow-state.json, emitted once by
+// check-before-agent at Agent-spawn time). No per-prompt token leak now.
 
 // #867 — surface post-install restart notice. File is written by
 // scripts/post-install-notice.mjs and cleared by the SessionStart launcher
@@ -84,6 +50,6 @@ try {
   }
 } catch (e) { /* ENOENT or malformed — silent fast-path */ }
 
-var parts = [restartNotice, output.trim(), nsHint].filter(Boolean);
+var parts = [restartNotice, output.trim()].filter(Boolean);
 if (parts.length) process.stdout.write(parts.join('\n\n') + '\n');
 process.exit(0);

package/.claude/helpers/simplify-classify.cjs

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 /**
- * /simplify diff classifier — issue #908.
+ * /flo-simplify diff classifier.
  *
  * Decides which review tier the current diff warrants and returns a JSON
- * dispatch decision. The /simplify skill MUST call this first so routing is
+ * dispatch decision. The /flo-simplify skill MUST call this first so routing is
  * deterministic and unit-testable instead of a prose decision Claude makes
  * over and over per run.
  *
- * Rule (per user direction): default to single-agent Sonnet review. Only
- * escalate to a 3-agent fan-out when diff signals genuinely warrant it.
- * Opus is never selected — the existing skill already documents that.
+ * Rule: default to single-agent Sonnet review. Only escalate to a 3-agent
+ * fan-out when diff signals genuinely warrant it. Opus is never selected —
+ * the existing skill already documents that.
  *
  * Outputs JSON:
  *   {
@@ -21,7 +21,8 @@
  *   }
  *
  * Usage:
- *   node bin/simplify-classify.cjs [--base main]
+ *   node bin/simplify-classify.cjs                  # auto-detects default branch
+ *   node bin/simplify-classify.cjs --base develop   # explicit override
  *   node bin/simplify-classify.cjs --diff <unified-diff-on-stdin>
  *
  * The --diff stdin form exists so unit tests can drive the classifier
@@ -31,7 +32,7 @@
 
 const { execSync } = require('child_process');
 
-// Paths where new logic warrants the 3-agent fan-out (issue #908).
+// Paths where new logic warrants the 3-agent fan-out.
 // Mechanical edits inside these paths are still SMALL; only adding/removing
 // declarations triggers escalation.
 const SECURITY_PATHS = [
@@ -49,6 +50,25 @@ function safeExec(cmd) {
   catch { return ''; }
 }
 
+// Detect the consumer's default branch. Hardcoding 'main' silently miscalibrates
+// classification on repos that use 'master', 'develop', etc. — empty diff →
+// TRIVIAL → gate stamps clean without any real review.
+let _cachedDefaultBranch = null;
+function detectDefaultBranch() {
+  if (_cachedDefaultBranch !== null) return _cachedDefaultBranch;
+
+  // Preferred: origin/HEAD points to whatever the remote considers default.
+  const symbolic = safeExec('git symbolic-ref --short refs/remotes/origin/HEAD').trim();
+  if (symbolic.startsWith('origin/')) return (_cachedDefaultBranch = symbolic.slice('origin/'.length));
+
+  // Fallback: local init.defaultBranch (set by `git init -b <name>` or config).
+  const configured = safeExec('git config --get init.defaultBranch').trim();
+  if (configured) return (_cachedDefaultBranch = configured);
+
+  // Last resort: 'main' (most common modern default).
+  return (_cachedDefaultBranch = 'main');
+}
+
 function readDiffFromGit(base) {
   // Combined diff: committed-since-base + working-tree
   const committed = safeExec(`git diff ${base}...HEAD`);
@@ -186,14 +206,15 @@ function classifyDiff(diffText) {
   return decide(parseDiff(diffText));
 }
 
-function classifyFromGit(base = 'main') {
-  return classifyDiff(readDiffFromGit(base));
+function classifyFromGit(base) {
+  const resolved = base || detectDefaultBranch();
+  return classifyDiff(readDiffFromGit(resolved));
 }
 
 if (require.main === module) {
   const args = process.argv.slice(2);
   const baseIdx = args.indexOf('--base');
-  const base = baseIdx >= 0 ? args[baseIdx + 1] : 'main';
+  const base = baseIdx >= 0 ? args[baseIdx + 1] : detectDefaultBranch();
   const stdinDiff = args.includes('--diff') || args.includes('--stdin');
 
   let result;
@@ -211,4 +232,4 @@ if (require.main === module) {
   }
 }
 
-module.exports = { parseDiff, decide, classifyDiff, classifyFromGit };
+module.exports = { parseDiff, decide, classifyDiff, classifyFromGit, detectDefaultBranch };

package/.claude/helpers/subagent-bootstrap.json

@@ -1,3 +1,3 @@
 {
-  "directive": "MANDATORY FIRST ACTION: Your very first tool call MUST be mcp__moflo__memory_search (any query, any namespace). The memory-first gate WILL BLOCK all Glob, Grep, and Read calls until you do this. After memory search, follow `.claude/guidance/shipped/moflo-subagents.md` protocol."
+  "directive": "MANDATORY FIRST ACTION: Your very first tool call MUST be mcp__moflo__memory_search (any query, any namespace). The memory-first gate WILL BLOCK all Glob, Grep, and Read calls until you do this. After memory search, follow `.claude/guidance/moflo-subagents.md` protocol."
 }

package/.claude/helpers/subagent-start.cjs

@@ -22,7 +22,7 @@ const path = require('path');
 // Defense-in-depth copy of the canonical directive in subagent-bootstrap.json.
 // Kept as a single-line literal so the parity test in tests/bin/subagent-start.test.ts
 // can verify it matches the JSON via plain substring containment.
-const FALLBACK_DIRECTIVE = 'MANDATORY FIRST ACTION: Your very first tool call MUST be mcp__moflo__memory_search (any query, any namespace). The memory-first gate WILL BLOCK all Glob, Grep, and Read calls until you do this. After memory search, follow `.claude/guidance/shipped/moflo-subagents.md` protocol.';
+const FALLBACK_DIRECTIVE = 'MANDATORY FIRST ACTION: Your very first tool call MUST be mcp__moflo__memory_search (any query, any namespace). The memory-first gate WILL BLOCK all Glob, Grep, and Read calls until you do this. After memory search, follow `.claude/guidance/moflo-subagents.md` protocol.';
 
 function loadDirective() {
   const jsonPath = path.join(__dirname, 'subagent-bootstrap.json');