@yemi33/minions 0.1.2378 → 0.1.2380

package/engine/qa-sessions.js

@@ -164,13 +164,6 @@ function _isSafeSessionId(id) {
   return _isNonEmptyString(id) && id.length <= LIMITS.idMax && _KEBAB_RE.test(id);
 }
 
-// Dynamic paths — respect MINIONS_TEST_DIR for test isolation. shared.MINIONS_DIR
-// resolves at every call so MINIONS_TEST_DIR=foo flips the resolution
-// without re-requiring this module (mirrors qa-runs.js pattern).
-function qaSessionsPath() {
-  return path.join(shared.MINIONS_DIR, 'engine', 'qa-sessions.json');
-}
-
 function qaTestsDir() {
   return path.join(shared.MINIONS_DIR, 'engine', 'qa-tests');
 }
@@ -332,11 +325,11 @@ function validateSpec(spec) {
 // ── CRUD ────────────────────────────────────────────────────────────────────
 
 /**
- * Create a session in `pending` state and persist it to qa-sessions.json.
+ * Create a session in `pending` state and persist it to SQL.
  *
  * The caller (POST /api/qa/session handler) is responsible for queuing the
  * SETUP work item via buildSetupWorkItem() + the standard work-items/dispatch
- * flow. createSession() intentionally does NOT touch dispatch.json so the
+ * flow. createSession() intentionally does not touch dispatch state so the
  * pure persistence layer stays unit-testable without standing up the whole
  * engine.
  *
@@ -407,10 +400,8 @@ function createSession(spec) {
     // 1 (multi-project fan-out). Single-project sessions skip this map and
     // use session.state directly.
     setupStatus: null,
-    // primaryWiPath is stamped at queueSetup time so handleSetupComplete can
-    // queue DRAFT on the right work-items file without re-resolving the
-    // project through dashboard config.
-    primaryWiPath: null,
+    // Stamped at queueSetup time so DRAFT stays in the primary scope.
+    primaryScope: null,
     // Per-phase WI links — back-filled by setSessionWorkItem when the
     // dashboard endpoint or lifecycle hook queues the next phase.
     workItems: { setup: null, draft: null, execute: null },
@@ -641,10 +632,10 @@ function transitionSession(id, toState, patch = {}) {
     if (patch && typeof patch === 'object' && !Array.isArray(patch)) {
       // Whitelist mutable fields to keep transitionSession from rewriting
       // immutable spec/createdAt fields by mistake.
-      // W-mpq6xqzj000606d0 — added `setupStatus` and `primaryWiPath` so the
+      // W-mpq6xqzj000606d0 — `setupStatus` and `primaryScope` let the
       // multi-project fan-in handler can stamp per-project completion state
       // through the same locked path used by every other mutation.
-      for (const field of ['summary', 'error', 'failureClass', 'testFile', 'qaRunId', 'managedSpawnHealth', 'setupStatus', 'primaryWiPath']) {
+      for (const field of ['summary', 'error', 'failureClass', 'testFile', 'qaRunId', 'managedSpawnHealth', 'setupStatus', 'primaryScope']) {
         if (Object.prototype.hasOwnProperty.call(patch, field)) {
           session[field] = patch[field];
         }
@@ -761,7 +752,7 @@ function _baseWorkItem(session, phase, { title, description, project, primary, c
  * W-mpq6xqzj000606d0 — When the session has multiple projects (fan-out),
  * `primary` distinguishes the orchestrator WI (true; carries the full
  * coServices list) from each co-service WI (false; coServices === []). The
- * session's DRAFT phase keys off the primary's wiPath.
+ * session's DRAFT phase keys off the primary scope.
  */
 function buildSetupWorkItem(session, { project, primary, coServices, primaryProject } = {}) {
   const isPrimary = primary === undefined ? true : !!primary;
@@ -881,12 +872,8 @@ function _summarizeTarget(target) {
 // dispatch + work-items are lazy-required inside _queueWorkItem to keep
 // `require('./qa-sessions')` cycle-safe at the top of lifecycle.js.
 
-function _queueWorkItem(wi, wiPath) {
-  // Append the WI to the project (or central) work-items file, then queue a
-  // dispatch entry that wraps it. Mirrors the qa-validate flow at
-  // dashboard.js handleQaRunbookRun (line 9985+). Both writes go through their
-  // module-internal locks so concurrent dashboard calls don't lose entries.
-  shared.mutateWorkItems(wiPath, (items) => {
+function _queueWorkItem(wi, scope) {
+  shared.mutateWorkItems(scope, (items) => {
     if (!Array.isArray(items)) items = [];
     if (!items.some(i => i && i.id === wi.id)) items.push(wi);
     return items;
@@ -905,35 +892,27 @@ function _queueWorkItem(wi, wiPath) {
  * Validates pending → spawning, queues the SETUP WI(s), returns the queued
  * primary WI id (back-compat).
  *
- * W-mpq6xqzj000606d0 — multi-project fan-out. Two calling shapes are
- * accepted:
- *   1. Legacy single-target: `{ wiPath, project }` (project may be null for
- *      central). Builds and queues one SETUP WI exactly like before.
- *   2. Multi-target: `{ resolvedTargets: [{ project, wiPath }, ...] }`. The
- *      FIRST entry is treated as the primary (drives DRAFT/EXECUTE later);
- *      the rest are co-services. One SETUP WI is queued per entry, and
- *      `session.setupStatus` is initialized with a `pending` entry per
- *      project so handleSetupComplete can fan-in.
+ * W-mpq6xqzj000606d0 — multi-project fan-out. The first target drives
+ * DRAFT/EXECUTE; the rest are co-services.
  *
  * @param {string} sessionId
  * @param {object} opts
- * @param {string} [opts.wiPath]            - legacy single-target wiPath
- * @param {string} [opts.project]           - legacy single-target project name
- * @param {Array<{project:?string, wiPath:string}>} [opts.resolvedTargets]
+ * @param {string} [opts.scope]
+ * @param {string} [opts.project]
+ * @param {Array<{project:?string, scope:string}>} [opts.resolvedTargets]
  * @returns {string} the queued PRIMARY SETUP WI id
  */
 function queueSetup(sessionId, opts = {}) {
   let targets = Array.isArray(opts.resolvedTargets) ? opts.resolvedTargets.slice() : null;
   if (!targets || targets.length === 0) {
-    if (!_isNonEmptyString(opts.wiPath)) {
-      throw new Error('qa-sessions: queueSetup requires wiPath or resolvedTargets');
+    if (!_isNonEmptyString(opts.scope)) {
+      throw new Error('qa-sessions: queueSetup requires scope or resolvedTargets');
     }
-    targets = [{ project: opts.project || null, wiPath: opts.wiPath }];
+    targets = [{ project: opts.project || null, scope: opts.scope }];
   }
-  // Defensive: each target needs a wiPath. project may be null for central.
   for (const t of targets) {
-    if (!t || !_isNonEmptyString(t.wiPath)) {
-      throw new Error('qa-sessions: queueSetup target missing wiPath');
+    if (!t || !_isNonEmptyString(t.scope)) {
+      throw new Error('qa-sessions: queueSetup target missing scope');
     }
   }
   if (targets.length > LIMITS.projectsMax) {
@@ -947,7 +926,7 @@ function queueSetup(sessionId, opts = {}) {
   const coServiceProjects = targets.slice(1).map(t => t.project || null).filter(Boolean);
   const isMulti = targets.length > 1;
 
-  // Initialize setupStatus + primaryWiPath BEFORE transitioning so the
+  // Initialize setupStatus + primaryScope BEFORE transitioning so the
   // fan-in handler sees the full project list even on a racing completion.
   // Single-project sessions skip the map to keep blast radius minimal.
   const setupStatusPatch = isMulti
@@ -964,7 +943,7 @@ function queueSetup(sessionId, opts = {}) {
   // double-queueing.
   markSpawning(sessionId, {
     setupStatus: setupStatusPatch,
-    primaryWiPath: primaryTarget.wiPath,
+    primaryScope: primaryTarget.scope,
   });
 
   // Build + queue one WI per target. Primary is index 0; coServices is the
@@ -981,7 +960,7 @@ function queueSetup(sessionId, opts = {}) {
       coServices: isPrimary ? coServiceProjects : [],
       primaryProject: primaryTarget.project || null,
     });
-    _queueWorkItem(wi, t.wiPath);
+    _queueWorkItem(wi, t.scope);
     builtWiIds[t.project || '__central__'] = wi.id;
     if (isPrimary) primaryWiId = wi.id;
   }
@@ -1026,7 +1005,7 @@ function queueSetup(sessionId, opts = {}) {
  * @param {string} sessionId
  * @param {object} opts
  * @param {boolean} opts.success
- * @param {string}  [opts.wiPath]      - required when success=true (single-project) OR for the PRIMARY target on multi-project DRAFT queueing
+ * @param {string}  [opts.scope]       - required when success=true
  * @param {string}  [opts.project]     - which project the completing WI was for (multi-project routing key)
  * @param {string}  [opts.failureClass]
  * @param {string}  [opts.reason]
@@ -1043,13 +1022,13 @@ function handleSetupComplete(sessionId, opts = {}) {
   // ── Single-project fast path: original behavior, untouched semantics ──
   if (!isMulti) {
     if (opts.success) {
-      if (!_isNonEmptyString(opts.wiPath)) {
-        throw new Error('qa-sessions: handleSetupComplete success requires wiPath');
+      if (!_isNonEmptyString(opts.scope)) {
+        throw new Error('qa-sessions: handleSetupComplete success requires scope');
       }
       markDrafting(sessionId, { managedSpawnHealth: 'healthy' });
       const updated = getSession(sessionId);
       const wi = buildDraftWorkItem(updated, { project: opts.project || updated.spec.project || null });
-      _queueWorkItem(wi, opts.wiPath);
+      _queueWorkItem(wi, opts.scope);
       setSessionWorkItem(sessionId, SESSION_PHASE.DRAFT, wi.id);
       return wi.id;
     }
@@ -1112,17 +1091,16 @@ function handleSetupComplete(sessionId, opts = {}) {
     return null;
   }
 
-  // All success → advance to drafting and queue DRAFT on the PRIMARY's
-  // wiPath (captured at queueSetup time).
+  // All success → queue DRAFT on the primary scope captured by queueSetup.
   const fresh = getSession(sessionId);
-  const draftWiPath = fresh && fresh.primaryWiPath;
-  if (!_isNonEmptyString(draftWiPath)) {
-    throw new Error('qa-sessions: handleSetupComplete multi-project missing session.primaryWiPath');
+  const draftScope = fresh && fresh.primaryScope;
+  if (!_isNonEmptyString(draftScope)) {
+    throw new Error('qa-sessions: handleSetupComplete multi-project missing session.primaryScope');
   }
   markDrafting(sessionId, { managedSpawnHealth: 'healthy' });
   const updated = getSession(sessionId);
   const wi = buildDraftWorkItem(updated, { project: updated.primaryProject || updated.spec.project || null });
-  _queueWorkItem(wi, draftWiPath);
+  _queueWorkItem(wi, draftScope);
   setSessionWorkItem(sessionId, SESSION_PHASE.DRAFT, wi.id);
   return wi.id;
 }
@@ -1136,7 +1114,7 @@ function handleSetupComplete(sessionId, opts = {}) {
  * @param {object} opts
  * @param {boolean} opts.success
  * @param {string}  [opts.testFile] - relative path under qa-tests/<id>/, captured for EXECUTE
- * @param {string}  [opts.wiPath]   - required when success=true and mode=auto
+ * @param {string}  [opts.scope]    - required when success=true and mode=auto
  * @param {string}  [opts.project]
  * @param {string}  [opts.qaRunId]  - required when success=true and mode=auto (caller creates the qa-runs record)
  * @param {string}  [opts.reason]
@@ -1158,8 +1136,8 @@ function handleDraftComplete(sessionId, opts = {}) {
   }
   const testFilePatch = opts.testFile ? { testFile: opts.testFile } : {};
   if (session.spec.mode === 'auto') {
-    if (!_isNonEmptyString(opts.wiPath)) {
-      throw new Error('qa-sessions: handleDraftComplete (auto) requires wiPath');
+    if (!_isNonEmptyString(opts.scope)) {
+      throw new Error('qa-sessions: handleDraftComplete (auto) requires scope');
     }
     if (!_isNonEmptyString(opts.qaRunId)) {
       throw new Error('qa-sessions: handleDraftComplete (auto) requires qaRunId');
@@ -1170,7 +1148,7 @@ function handleDraftComplete(sessionId, opts = {}) {
       qaRunId: opts.qaRunId,
       project: opts.project || updated.spec.project || null,
     });
-    _queueWorkItem(wi, opts.wiPath);
+    _queueWorkItem(wi, opts.scope);
     setSessionWorkItem(sessionId, SESSION_PHASE.EXECUTE, wi.id);
     return { nextState: QA_SESSION_STATE.EXECUTING, queuedExecuteWi: wi.id };
   }
@@ -1227,8 +1205,8 @@ function handleExecuteComplete(sessionId, opts = {}) {
  * POST /api/qa/sessions/<id>/approve — awaiting-approval → executing, queues
  * the EXECUTE WI. Caller creates the qa-runs record and passes its id.
  */
-function approveDraft(sessionId, { wiPath, qaRunId, project } = {}) {
-  if (!_isNonEmptyString(wiPath)) throw new Error('qa-sessions: approveDraft requires wiPath');
+function approveDraft(sessionId, { scope, qaRunId, project } = {}) {
+  if (!_isNonEmptyString(scope)) throw new Error('qa-sessions: approveDraft requires scope');
   if (!_isNonEmptyString(qaRunId)) throw new Error('qa-sessions: approveDraft requires qaRunId');
   const session = getSession(sessionId);
   if (!session) throw new Error('qa-sessions: session not found: ' + sessionId);
@@ -1241,7 +1219,7 @@ function approveDraft(sessionId, { wiPath, qaRunId, project } = {}) {
     qaRunId,
     project: project || updated.spec.project || null,
   });
-  _queueWorkItem(wi, wiPath);
+  _queueWorkItem(wi, scope);
   setSessionWorkItem(sessionId, SESSION_PHASE.EXECUTE, wi.id);
   return wi.id;
 }
@@ -1250,8 +1228,8 @@ function approveDraft(sessionId, { wiPath, qaRunId, project } = {}) {
  * POST /api/qa/sessions/<id>/edit — awaiting-approval → drafting, re-queue the
  * DRAFT WI with the user's natural-language feedback threaded into the prompt.
  */
-function editDraft(sessionId, { wiPath, feedback, project } = {}) {
-  if (!_isNonEmptyString(wiPath)) throw new Error('qa-sessions: editDraft requires wiPath');
+function editDraft(sessionId, { scope, feedback, project } = {}) {
+  if (!_isNonEmptyString(scope)) throw new Error('qa-sessions: editDraft requires scope');
   if (!_isNonEmptyString(feedback)) throw new Error('qa-sessions: editDraft requires feedback');
   if (feedback.length > LIMITS.feedbackMax) {
     throw new Error(`qa-sessions: editDraft feedback exceeds ${LIMITS.feedbackMax} chars`);
@@ -1267,7 +1245,7 @@ function editDraft(sessionId, { wiPath, feedback, project } = {}) {
     project: project || updated.spec.project || null,
     feedback,
   });
-  _queueWorkItem(wi, wiPath);
+  _queueWorkItem(wi, scope);
   setSessionWorkItem(sessionId, SESSION_PHASE.DRAFT, wi.id);
   return wi.id;
 }
@@ -1365,7 +1343,6 @@ module.exports = {
   LIMITS,
   QA_SESSIONS_MAX_RECORDS,
   // Paths
-  qaSessionsPath,
   qaTestsDir,
   qaTestsDirForSession,
   // Validation