@yemi33/minions 0.1.2448 → 0.1.2449

package/engine/{memory-retrieval.js → memory/memory-retrieval.js}

@@ -1,4 +1,4 @@
-// engine/memory-retrieval.js — deterministic task-aware memory selection.
+// engine/memory/memory-retrieval.js — deterministic task-aware memory selection.
 
 const memoryStore = require('./memory-store');
 const reviewLearning = require('./review-learning');
@@ -242,6 +242,40 @@ function _reviewLexTokens(text) {
   return new Set(tokens.filter(token => !REVIEW_LEX_STOP.has(token)));
 }
 
+// Branch-name segments that carry no feature meaning (naming conventions and
+// work-item / PR / dispatch identifiers) so a shared `work/` prefix or WI id
+// never counts as feature affinity.
+const REVIEW_BRANCH_NOISE_RE = /^(?:work|user|users|feature|feat|fix|bugfix|hotfix|chore|release|wip|dev|main|master|draft|pr|topic)$/;
+// Work-item / PR / dispatch identifiers: a 1–2 letter prefix, a MANDATORY
+// hyphen, then a 5+ char alnum id (e.g. `W-abc12345`, `P-a6137579`,
+// `PL-mryta89f002y9ca5`). The hyphen is required so ordinary feature words that
+// merely start with w/p/d (`dashboard`, `pipeline`, `dispatch`) are NOT mistaken
+// for ids, and the prefix spans 1–2 letters so two-letter plan ids (`PL-…`) are
+// caught. `REVIEW_LEADING_WORKITEM_ID_RE` strips such an id from the FRONT of a
+// compound segment (`W-abc123-fix-login`) so the id fragment cannot bypass the
+// whole-segment check and leak as a feature token.
+const REVIEW_WORKITEM_ID_RE = /^[a-z]{1,2}-[0-9a-z]{5,}$/;
+const REVIEW_LEADING_WORKITEM_ID_RE = /^[a-z]{1,2}-[0-9a-z]{5,}(?=[-_.]|$)/;
+
+// Feature-affinity tokens: the "same branch / similar feature" signal, derived
+// only from the current dispatch's PR branch and PR title (not the full task
+// text). The branch is split into path segments first so naming-convention
+// prefixes and whole work-item ids are dropped; a leading id is then stripped
+// from any compound segment before the remaining descriptive segments are broken
+// into words. Ranked above generic lexical relevance so a lesson from a prior PR
+// on the same branch/feature outranks one that merely shares an incidental token.
+function _reviewFeatureTokens(context = {}) {
+  const words = [];
+  for (const seg of String(context.prBranch || '').split(/[/\s]+/)) {
+    const s = seg.trim().toLowerCase();
+    if (!s || REVIEW_BRANCH_NOISE_RE.test(s) || REVIEW_WORKITEM_ID_RE.test(s)) continue;
+    for (const word of s.replace(REVIEW_LEADING_WORKITEM_ID_RE, '').split(/[-_.]+/)) {
+      if (word) words.push(word);
+    }
+  }
+  return _reviewLexTokens([context.prTitle, words.join(' ')].filter(Boolean).join(' '));
+}
+
 function _overlapCount(a, b) {
   if (!a.length || !b.length) return 0;
   const other = new Set(b);
@@ -264,6 +298,7 @@ function _lessonFacets(record) {
 // lexically unrelated task touching the same file/symbol still recalls it.
 function rankApplicableReviewLearnings(records, hints, options = {}) {
   const hintTokens = options.hintTokens || _reviewLexTokens(options.queryText || '');
+  const featureTokens = options.featureTokens instanceof Set ? options.featureTokens : new Set();
   const scored = (Array.isArray(records) ? records : []).map(record => {
     const facets = _lessonFacets(record);
     const symbolOverlap = _overlapCount(hints.symbols, facets.symbols);
@@ -272,6 +307,8 @@ function rankApplicableReviewLearnings(records, hints, options = {}) {
     const lessonTokens = _reviewLexTokens(
       `${record.title || ''}\n${record.body || ''}\n${(record.tags || []).join(' ')}`,
     );
+    let featureOverlap = 0;
+    for (const token of featureTokens) if (lessonTokens.has(token)) featureOverlap += 1;
     let lexical = 0;
     for (const token of hintTokens) if (lessonTokens.has(token)) lexical += 1;
     const confidence = Math.max(0, Math.min(1, Number(record.confidence) || 0));
@@ -279,21 +316,24 @@ function rankApplicableReviewLearnings(records, hints, options = {}) {
     if (symbolOverlap) reasons.push('exact-symbol');
     if (fileOverlap) reasons.push('exact-file');
     if (tagOverlap) reasons.push('exact-tag');
+    if (featureOverlap) reasons.push('feature-branch');
     if (lexical) reasons.push('lexical');
-    const applicable = (symbolOverlap + fileOverlap + tagOverlap) > 0 || lexical > 0;
+    const applicable = (symbolOverlap + fileOverlap + tagOverlap + featureOverlap) > 0 || lexical > 0;
     if (!applicable) reasons.push('not-applicable');
     const score =
       (symbolOverlap * 1000000) +
       (fileOverlap * 10000) +
       (tagOverlap * 100) +
+      Math.min(90, featureOverlap * 30) +
       Math.min(50, lexical) +
       confidence;
-    return { record, facets, symbolOverlap, fileOverlap, tagOverlap, lexical, confidence, applicable, score, reasons };
+    return { record, facets, symbolOverlap, fileOverlap, tagOverlap, featureOverlap, lexical, confidence, applicable, score, reasons };
   });
   return scored.sort((a, b) =>
     b.symbolOverlap - a.symbolOverlap ||
     b.fileOverlap - a.fileOverlap ||
     b.tagOverlap - a.tagOverlap ||
+    b.featureOverlap - a.featureOverlap ||
     b.lexical - a.lexical ||
     b.confidence - a.confidence ||
     Number(b.record.updatedAt || 0) - Number(a.record.updatedAt || 0) ||
@@ -371,7 +411,8 @@ function retrieveApplicableReviewLearnings(context = {}, options = {}) {
   });
 
   const hintTokens = _reviewLexTokens(_reviewContextText(context));
-  const ranked = rankApplicableReviewLearnings(audienceFiltered, hints, { hintTokens });
+  const featureTokens = _reviewFeatureTokens(context);
+  const ranked = rankApplicableReviewLearnings(audienceFiltered, hints, { hintTokens, featureTokens });
 
   const selected = [];
   const decisionTrace = [];
@@ -441,5 +482,6 @@ module.exports = {
   deriveReviewFacetHints,
   rankApplicableReviewLearnings,
   retrieveApplicableReviewLearnings,
+  _reviewFeatureTokens,
   _truncateUtf8,
 };

package/engine/{memory-store.js → memory/memory-store.js}

@@ -1,8 +1,8 @@
-// engine/memory-store.js — SQL-backed long-term memory records and retrieval.
+// engine/memory/memory-store.js — SQL-backed long-term memory records and retrieval.
 
 const crypto = require('crypto');
-const { getDb, withTransaction, prepareCached } = require('./db');
-const { emitStateEvent } = require('./db-events');
+const { getDb, withTransaction, prepareCached } = require('../db');
+const { emitStateEvent } = require('../persistence/db-events');
 const reviewLearning = require('./review-learning');
 
 const MEMORY_TYPES = new Set(['semantic', 'episodic', 'procedural']);

package/engine/{promotion.js → memory/promotion.js}

@@ -1,4 +1,4 @@
-// engine/promotion.js — human-approved promotion of verified review lessons into
+// engine/memory/promotion.js — human-approved promotion of verified review lessons into
 // repository guidance (project skills or allowlisted instruction files) and the
 // shared project-bound skill work-item queueing logic reused by skill
 // extraction. Promotion NEVER edits an operator checkout: every path queues a
@@ -7,7 +7,7 @@
 // merges through native instruction/skill discovery (P-192d3660).
 
 const crypto = require('crypto');
-const shared = require('./shared');
+const shared = require('../core/shared');
 const reviewLearning = require('./review-learning');
 
 const { WI_STATUS, WORK_TYPE } = shared;
@@ -191,7 +191,7 @@ function buildPromotionWorkItemFields({ lesson, memoryIds, rules, targetKind, pr
 }
 
 // Shared project-bound skill work-item queueing extracted from
-// engine/lifecycle.js#extractSkillsFromOutput. Resolves a real (non-central)
+// engine/orchestration/lifecycle.js#extractSkillsFromOutput. Resolves a real (non-central)
 // project, deduplicates on the "Add skill: <name>" title, and queues an
 // implementation work item. Returns { created, workItemId, duplicateOf } or null
 // when the project cannot be resolved.

package/engine/{review-learning-backfill.js → memory/review-learning-backfill.js}

@@ -1,4 +1,4 @@
-// engine/review-learning-backfill.js — strict, offline backfill of durable
+// engine/memory/review-learning-backfill.js — strict, offline backfill of durable
 // review-learning lessons from legacy artifacts.
 //
 // The backfill scans deterministic, bounded slices of legacy sources and imports
@@ -16,7 +16,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const shared = require('./shared');
+const shared = require('../core/shared');
 const reviewLearning = require('./review-learning');
 
 const REASON_BUCKETS = Object.freeze([
@@ -82,7 +82,7 @@ function _normalizeContext(context = {}) {
   return { project, prId, authorAgent, allowedSourceKeys };
 }
 
-// Mirrors engine/lifecycle.js#_groupReviewLearningEntries: collapse normalized
+// Mirrors engine/orchestration/lifecycle.js#_groupReviewLearningEntries: collapse normalized
 // completion entries into one lesson group per finding key, flagging conflicting
 // dispositions/audiences so they are rejected rather than silently merged.
 function _groupEntries(entries) {
@@ -303,7 +303,7 @@ function scanCompletionArtifacts(dir, { project } = {}) {
   if (files.length === 0) return [];
 
   let dispatch = { pending: [], active: [], completed: [] };
-  try { dispatch = require('./dispatch-store').readDispatchSectioned() || dispatch; } catch {}
+  try { dispatch = require('../persistence/dispatch-store').readDispatchSectioned() || dispatch; } catch {}
   const entriesById = new Map();
   for (const list of ['completed', 'active', 'pending']) {
     for (const entry of (dispatch[list] || [])) {
@@ -312,7 +312,7 @@ function scanCompletionArtifacts(dir, { project } = {}) {
   }
 
   let buildContext = null;
-  try { buildContext = require('./lifecycle').buildReviewLearningCompletionContext; } catch {}
+  try { buildContext = require('../orchestration/lifecycle').buildReviewLearningCompletionContext; } catch {}
 
   const records = [];
   for (const file of files) {
@@ -384,7 +384,7 @@ function scanLegacyFeedbackFiles(dir) {
 function scanTrackedPrRecords(dir) {
   let prs = [];
   try {
-    const prStore = require('./pull-requests-store');
+    const prStore = require('../persistence/pull-requests-store');
     prs = (prStore.readAllPullRequests ? prStore.readAllPullRequests() : prStore.readPullRequests?.()) || [];
   } catch { prs = []; }
   return prs

package/engine/{review-learning.js → memory/review-learning.js}

@@ -1,4 +1,4 @@
-// engine/review-learning.js — bounded domain primitives for review-derived memory.
+// engine/memory/review-learning.js — bounded domain primitives for review-derived memory.
 
 const crypto = require('crypto');
 const {
@@ -6,7 +6,7 @@ const {
   parseCanonicalPrId,
   redactSecrets,
   truncateTextBytes,
-} = require('./shared');
+} = require('../core/shared');
 
 const REVIEW_LEARNING_SOURCE_TYPE = 'review-learning';
 const REVIEW_LEARNING_DISPOSITIONS = Object.freeze({
@@ -166,9 +166,9 @@ function _boundedIdentifier(value, maxBytes, label, pattern = /^[a-z0-9][a-z0-9.
   return text;
 }
 
-function _optionalIdentifier(value, maxBytes, label) {
+function _optionalIdentifier(value, maxBytes, label, pattern) {
   if (value == null || String(value).trim() === '') return null;
-  return _boundedIdentifier(value, maxBytes, label);
+  return _boundedIdentifier(value, maxBytes, label, pattern);
 }
 
 function _shortHash(value) {
@@ -1167,7 +1167,12 @@ function normalizeLifecycleEvent(input = {}) {
     area: normalizeReviewArea(input.area || 'general'),
     disposition,
     workItemId: _optionalIdentifier(input.workItemId, REVIEW_LEARNING_BOUNDS.refBytes, 'event work item id'),
-    dispatchId: _optionalIdentifier(input.dispatchId, REVIEW_LEARNING_BOUNDS.refBytes, 'event dispatch id'),
+    dispatchId: _optionalIdentifier(
+      input.dispatchId,
+      REVIEW_LEARNING_BOUNDS.refBytes,
+      'event dispatch id',
+      /^(?:[a-z0-9]|_any_)[a-z0-9._:/#|@+-]*$/i,
+    ),
     identity: _optionalIdentifier(input.identity, REVIEW_LEARNING_BOUNDS.refBytes, 'event identity'),
     metadata: normalizeReviewMetadata(input.metadata || {}),
     createdAt: Number.isFinite(Number(input.createdAt)) ? Number(input.createdAt) : Date.now(),

package/engine/{diagnostics-memory.js → observability/diagnostics-memory.js}

@@ -1,5 +1,5 @@
 /**
- * engine/diagnostics-memory.js — In-process memory + event-loop + GC sampler.
+ * engine/observability/diagnostics-memory.js — Memory/event-loop/GC sampler.
  *
  * P-a1b2c3d4 (memory + perf audit plan). Importable from both engine.js and
  * dashboard.js — each Node process gets its own module-scope state (event-loop

package/engine/{logs-store.js → observability/logs-store.js}

@@ -1,4 +1,4 @@
-// engine/logs-store.js — SQL-backed engine logs.
+// engine/observability/logs-store.js — SQL-backed engine logs.
 //
 // Logs differ from work_items / pull_requests / dispatches: they are
 // pure append-only with a tail-cap, so the store exposes a different
@@ -48,7 +48,7 @@ function _openWriter(dbFilePath) {
   db.exec('PRAGMA foreign_keys = ON');
   db.exec('PRAGMA synchronous = NORMAL');
   db.exec('PRAGMA busy_timeout = 5000');
-  const { runMigrations } = require('./db/migrate');
+  const { runMigrations } = require('../db/migrate');
   runMigrations(db);
   conn = {
     db,
@@ -96,7 +96,7 @@ function appendLogsToDbFile(dbFilePath, entries) {
     return 0;
   }
 
-  const shared = require('./shared');
+  const shared = require('../core/shared');
   const cap = (shared.ENGINE_DEFAULTS && shared.ENGINE_DEFAULTS.logCapEntries) || 2500;
   const trimTo = (shared.ENGINE_DEFAULTS && shared.ENGINE_DEFAULTS.logCapTrimTo) || 2000;
 
@@ -132,7 +132,7 @@ function appendLogsToDbFile(dbFilePath, entries) {
   // once per batch instead of per entry. Routed against the singleton
   // (not per-dbPath) because events are a cross-cutting concern keyed
   // off the engine's active state.db.
-  try { require('./db-events').emitStateEvent('logs', { batch: inserted }); } catch { /* optional */ }
+  try { require('../persistence/db-events').emitStateEvent('logs', { batch: inserted }); } catch { /* optional */ }
   return inserted;
 }
 
@@ -145,7 +145,7 @@ function appendLogsToDbFile(dbFilePath, entries) {
 function readRecentLogs(n, opts) {
   const limit = Math.max(1, Math.min(10000, Number(n) || 50));
   const level = opts && opts.level ? String(opts.level) : null;
-  const { getDb } = require('./db');
+  const { getDb } = require('../db');
   let db;
   try { db = getDb(); }
   catch { return []; }

package/engine/{metrics-store.js → observability/metrics-store.js}

@@ -1,4 +1,4 @@
-// engine/metrics-store.js — SQL-backed engine metrics.
+// engine/observability/metrics-store.js — SQL-backed engine metrics.
 //
 // Metrics expose a flat object whose top-level keys mix
 // per-agent counters with reserved keys (`_engine`, `_daily`,
@@ -84,7 +84,7 @@ function _readAllRows(db) {
 
 // Read the full legacy-shape metrics object from SQL.
 function readMetrics() {
-  const { getDb } = require('./db');
+  const { getDb } = require('../db');
   const db = getDb();
 
   migrateWatchCcTriageKeysOnce();
@@ -138,7 +138,7 @@ function _applyMetricsDiff(db, diff) {
 }
 
 function applyMetricsMutation(mutator) {
-  const { getDb, withTransaction } = require('./db');
+  const { getDb, withTransaction } = require('../db');
   let db;
   try { db = getDb(); }
   catch (e) {
@@ -160,7 +160,7 @@ function applyMetricsMutation(mutator) {
 }
 
 function _resetMetricsTableForTest() {
-  const { getDb } = require('./db');
+  const { getDb } = require('../db');
   try { getDb().exec('DELETE FROM metrics'); } catch { /* not initialized */ }
 }
 

package/engine/{check-status.js → operations/check-status.js}

@@ -1,16 +1,16 @@
 const fs = require('fs');
 const path = require('path');
-const { safeJson, MINIONS_DIR, DONE_STATUSES } = require('./shared');
+const { safeJson, MINIONS_DIR, DONE_STATUSES } = require('../core/shared');
 
 console.log('=== Work Items (non-done) ===');
 let items = [];
-try { items = require('./queries').getWorkItems() || []; } catch {}
+try { items = require('../core/queries').getWorkItems() || []; } catch {}
 items.filter(i => !DONE_STATUSES.has(i.status)).forEach(i => {
   console.log(i.id, (i.status || '').padEnd(12), (i.type || '').padEnd(12), (i.title || '').slice(0, 60));
 });
 
 console.log('\n=== Agent Status (derived from dispatch) ===');
-const { getAgentStatus } = require('./queries');
+const { getAgentStatus } = require('../core/queries');
 const config = safeJson(path.join(MINIONS_DIR, 'config.json')) || {};
 const agents = Object.keys(config.agents || {});
 if (agents.length === 0) {