@yemi33/minions 0.1.2379 → 0.1.2380

package/engine/projects.js

@@ -9,6 +9,7 @@ const fs = require('fs');
 const path = require('path');
 const shared = require('./shared');
 const dispatch = require('./dispatch');
+const queries = require('./queries');
 const projectDiscovery = require('./project-discovery');
 const { MINIONS_DIR } = shared;
 
@@ -86,9 +87,8 @@ function _centralDispatchDefaultedToProject(d, removedProject, projects) {
 }
 
 function _collectProjectlessCentralDispatchItemIds(removedProject, projects) {
-  const dispatchPath = path.join(MINIONS_DIR, 'engine', 'dispatch.json');
   const ids = new Set();
-  const state = shared.safeJsonObj(dispatchPath);
+  const state = queries.getDispatch();
   for (const queue of ['pending', 'active']) {
     for (const d of Array.isArray(state?.[queue]) ? state[queue] : []) {
       if (_centralDispatchDefaultedToProject(d, removedProject, projects)) ids.add(d.meta.item.id);
@@ -99,9 +99,8 @@ function _collectProjectlessCentralDispatchItemIds(removedProject, projects) {
 
 function _requeueProjectlessCentralWorkItems(itemIds) {
   if (!itemIds || itemIds.size === 0) return 0;
-  const wiPath = path.join(MINIONS_DIR, 'work-items.json');
   let requeued = 0;
-  shared.mutateWorkItems(wiPath, items => {
+  shared.mutateWorkItems('central', items => {
     if (!Array.isArray(items)) return items;
     for (const w of items) {
       if (!itemIds.has(w?.id) || w.status !== shared.WI_STATUS.DISPATCHED) continue;
@@ -124,10 +123,7 @@ function _requeueProjectlessCentralWorkItems(itemIds) {
  * @param {object} [options]
  * @param {'archive'|'keep'|'purge'} [options.dataMode='archive']
  *   archive: move projects/<name>/ to projects/.archived/<name>-YYYYMMDD/
- *   keep:    leave projects/<name>/ in place, but tombstone work-items.json /
- *            pull-requests.json into projects/<name>/.dropped/ so dropScope()
- *            (step 9) isn't immediately undone by the *-store.js resync-on-
- *            read path re-hydrating the still-present JSON (W-mr96oira000g979a)
+ *   keep:    leave projects/<name>/ in place
  *   purge:   rm -rf projects/<name>/
  * @returns {object} summary { ok, project, cancelledItems, killedAgents,
  *   drainedDispatches, cleanedWorktrees, disabledSchedules, archivedTo,
@@ -147,7 +143,6 @@ function removeProject(target, options = {}) {
     pipelineRefs: [],
     archivedTo: null,
     purgedDataDir: false,
-    tombstonedDataFiles: false,
     // P-bfa2d-remove-project-cleanup — soft-delete tag counts for entries in
     // the three central state files that survived the hard-cancel passes
     // (steps 1, 2). See step 7.5 for the orphan-tag policy rationale.
@@ -168,15 +163,14 @@ function removeProject(target, options = {}) {
   }
   summary.project = { name: project.name, localPath: project.localPath };
 
-  // 1. Cancel pending/queued work items linked to this project (project-local
-  //    file + central). Done items are preserved as history.
+  // 1. Cancel pending/queued work items linked to this project.
   summary.cancelledItems += dispatch.cancelPendingWorkItems(
-    shared.projectWorkItemsPath(project),
+    project,
     () => true,
     'project-removed',
   );
   summary.cancelledItems += dispatch.cancelPendingWorkItems(
-    path.join(MINIONS_DIR, 'work-items.json'),
+    'central',
     w => _workItemMatchesProject(w, project, projects),
     'project-removed',
   );
@@ -190,7 +184,7 @@ function removeProject(target, options = {}) {
   _requeueProjectlessCentralWorkItems(projectlessCentralItemIds);
 
   // 2.5. Managed-spawn cleanup (P-8a4d6f29). Centralised in managed-spawn.js
-  //      so no other module needs to know about engine/managed-processes.json.
+  //      so no other module needs to know the managed-process storage schema.
   //      Kills + unlinks every spec owned by this project, including the .log
   //      and .log.1 rotated sibling. Best-effort: failures only warn.
   try {
@@ -316,11 +310,8 @@ function removeProject(target, options = {}) {
   } catch (e) { writeError = e; }
   if (writeError) return { ...summary, error: 'Failed to write config: ' + writeError.message };
 
-  // 7.5. P-bfa2d-remove-project-cleanup — Tag dangling refs in the three
-  //      CENTRAL state files (`pull-requests.json`, `work-items.json`,
-  //      `engine/dispatch.json`) so downstream consumers can filter or sweep
-  //      them. Project-local files in `projects/<name>/` are handled by
-  //      step 8 (archive or purge), so this step only touches central state.
+  // 7.5. Tag dangling refs in central state so downstream consumers can filter
+  //      or sweep them. Project-scoped rows are removed in step 9.
   //
   //      Policy is soft-delete (`_orphaned_at` + `_orphaned_project` tags)
   //      rather than hard-delete: preserves history for debugging, lets users
@@ -330,17 +321,11 @@ function removeProject(target, options = {}) {
   //      survivors (non-pending WIs, central PRs, defense-in-depth dispatch
   //      survivors).
   //
-  //      Lock acquisition is sequential and uses the mutate-* helpers from
-  //      engine/dispatch.js and engine/shared.js so we never hold two file
-  //      locks simultaneously. Order: dispatch.json → pull-requests.json →
-  //      work-items.json (alphabetical by basename). Each helper acquires
-  //      its own lock, runs the synchronous mutator, then releases before
-  //      the next helper runs.
   try {
     const orphanedAt = new Date().toISOString();
     const orphanedProject = project.name;
 
-    // (a) engine/dispatch.json — defense-in-depth. cleanDispatchEntries in
+    // (a) Dispatch state — defense-in-depth. cleanDispatchEntries in
     //     step 2 should have already removed every matching entry; tag any
     //     survivor so the operator can see the residue.
     try {
@@ -361,11 +346,10 @@ function removeProject(target, options = {}) {
 
     // (b) Central PR registry. PRs in this scope lack an explicit project field; match by canonical scope
     //     (e.g. `github:owner/repo`) against the removed project's PR scope.
-    const centralPrPath = shared.centralPullRequestsPath();
     try {
       const projectScope = shared.getProjectPrScope(project);
       if (projectScope) {
-        shared.mutatePullRequests(centralPrPath, (prs) => {
+        shared.mutatePullRequests('central', (prs) => {
           for (const pr of prs) {
             if (!pr || pr._orphaned_at) continue;
             const canonical = shared.parseCanonicalPrId(pr.id);
@@ -383,9 +367,8 @@ function removeProject(target, options = {}) {
     //     were already CANCELLED by cancelPendingWorkItems in step 1; tag
     //     the remaining matchers (dispatched / done / failed / etc.) so
     //     downstream consumers can filter them.
-    const centralWiPath = path.join(MINIONS_DIR, 'work-items.json');
     try {
-      shared.mutateWorkItems(centralWiPath, (items) => {
+      shared.mutateWorkItems('central', (items) => {
         for (const w of items) {
           if (!w || w._orphaned_at) continue;
           if (w.status === shared.WI_STATUS.CANCELLED) continue;
@@ -424,40 +407,10 @@ function removeProject(target, options = {}) {
         summary.archiveError = e.code ? `${e.code}: ${e.message}` : e.message;
         summary.warnings.push('archive data dir: ' + e.message);
       }
-    } else if (dataMode === 'keep') {
-      // W-mr96oira000g979a — 'keep' leaves projects/<name>/ (and therefore
-      // work-items.json / pull-requests.json) at its normal, live-resolving
-      // path. dropScope() below DELETEs the SQL rows for this scope, but the
-      // *-store.js resync-on-read path (_resyncScopeIfJsonDiverged) treats a
-      // scope with an empty SQL table + a still-present JSON file as a
-      // fresh-install first-touch and re-hydrates straight from that JSON —
-      // silently undoing the drop the very next time anything reads this
-      // scope. Tombstone the two live-state files into a `.dropped/`
-      // subdirectory so `_filePathForScope(scope)` (and the read-side
-      // resync/fallback logic keyed off it) no longer resolves to them,
-      // while keeping the historical data on disk for manual inspection —
-      // exactly what 'keep' promises, minus the auto-resurrection.
-      try {
-        const droppedDir = path.join(dataDir, '.dropped');
-        const stamp = new Date().toISOString().replace(/[:.]/g, '-');
-        for (const fname of ['work-items.json', 'pull-requests.json']) {
-          const src = path.join(dataDir, fname);
-          if (!fs.existsSync(src)) continue;
-          fs.mkdirSync(droppedDir, { recursive: true });
-          let dest = path.join(droppedDir, `${fname}.${stamp}`);
-          let n = 1;
-          while (fs.existsSync(dest)) dest = path.join(droppedDir, `${fname}.${stamp}-${++n}`);
-          _renameWithRetry(src, dest);
-          summary.tombstonedDataFiles = true;
-        }
-      } catch (e) {
-        summary.warnings.push('tombstone kept data files: ' + e.message);
-      }
     }
   }
 
-  // 9. Drop SQL rows for the project's scope so safeJson shim reads no longer
-  //    surface the removed project after the JSON file is archived.
+  // 9. Drop SQL rows for the removed project scope.
   try { require('./work-items-store').dropScope(project.name); } catch { /* best-effort */ }
   try { require('./pull-requests-store').dropScope(project.name); } catch { /* best-effort */ }
 
@@ -571,7 +524,7 @@ async function addProject(target, options = {}) {
   assertProjectLinkOk(project);
 
   // 7. Ensure project state files (projects/<name>/...).
-  shared.ensureProjectStateFiles(project);
+  shared.initializeProjectState(project);
 
   // 8. Persist under config lock. Re-check inside the lock so a concurrent
   //    add can't insert a duplicate between our pre-check and the write.

package/engine/pull-requests-store.js

@@ -13,21 +13,6 @@ function _toMs(v) {
   return Number.isFinite(parsed) ? parsed : null;
 }
 
-function scopeForFilePath(filePath) {
-  const norm = String(filePath).replace(/\\/g, '/');
-  const m = norm.match(/projects\/([^/]+)\/pull-requests\.json$/);
-  if (m) return m[1];
-  return 'central';
-}
-
-// Compatibility adapter for callers that still pass a path-shaped scope token
-// into shared.mutatePullRequests. No file is read or written.
-function _filePathForScope(scope) {
-  const shared = require('./shared');
-  if (!scope || scope === 'central') return shared.centralPullRequestsPath(shared.MINIONS_DIR);
-  return require('path').join(shared.MINIONS_DIR, 'projects', scope, 'pull-requests.json');
-}
-
 function _parseRow(row) {
   if (!row || !row.data) return null;
   try { return JSON.parse(row.data); }
@@ -169,8 +154,6 @@ function dropScope(scope) {
 }
 
 module.exports = {
-  _filePathForScope,
-  scopeForFilePath,
   readPullRequestsForScope,
   readAllPullRequests,
   applyPullRequestsMutation,

package/engine/qa-runbooks.js

@@ -3,7 +3,7 @@
  *
  * Per-project QA runbook persistence + CRUD helpers. Runbooks are test plans
  * that travel with a project entry, mirroring the
- * projects/<name>/pull-requests.json precedent. Each runbook is one JSON file
+ * project-local definition precedent. Each runbook is one JSON file
  * at <MINIONS_DIR>/projects/<project>/runbooks/<id>.json.
  *
  * Pure persistence + validation only — this module does NOT spawn agents,
@@ -27,7 +27,7 @@ const _KEBAB_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 // keep this module self-contained for path-traversal hardening (review feedback
 // on PR #2694: id/project params previously flowed into path.join without
 // validation, so `..%2F..%2F..%2Fconfig` could read MINIONS_DIR/config.json
-// and DELETE could wipe dispatch.json).
+// and DELETE could wipe unrelated runtime state).
 const _PROJECT_NAME_RE = /^[a-zA-Z0-9_\-]{1,64}$/;
 
 const ARTIFACT_TYPES = ['screenshot', 'video', 'log', 'other'];

package/engine/qa-runs.js

@@ -33,7 +33,7 @@ const { mutateQaRuns, uid, ts, log } = shared;
 
 // Cap qa_runs so the table doesn't grow unboundedly
 // over months of nightly QA dispatch. Mirrors the 2500-entry cap on
-// engine/log.json. createRun trims oldest-by-createdAt when crossing the
+// the engine log. createRun trims oldest-by-createdAt when crossing the
 // threshold; terminal-status runs that have already shipped completion
 // notifications are safe to drop.
 const QA_RUNS_MAX_RECORDS = 2000;
@@ -80,12 +80,6 @@ const ALLOWED_TRANSITIONS = {
   [QA_RUN_STATUS.ERRORED]: new Set(),
 };
 
-// Dynamic paths — respect MINIONS_TEST_DIR for test isolation. Kept exported
-// for back-compat with tests that probe the JSON sidecar on disk.
-function qaRunsPath() {
-  return path.join(shared.MINIONS_DIR, 'engine', 'qa-runs.json');
-}
-
 function qaArtifactsDir() {
   return path.join(shared.MINIONS_DIR, 'engine', 'qa-artifacts');
 }
@@ -416,7 +410,6 @@ module.exports = {
   QA_RUN_STATUS,
   TERMINAL_STATUSES,
   ALLOWED_TRANSITIONS,
-  qaRunsPath,
   qaArtifactsDir,
   qaArtifactsDirForRun,
   createRun,

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