@cspeach/cli 1.1.29 → 1.1.31

package/dist/projects/save-command.js

@@ -7,6 +7,7 @@ import { extractUpgradeScan, extractUpgradeProgress, extractUpgradeReport } from
 import { extractCcaAssessment } from './extract-cca.js';
 import { extractModernizeResult } from './extract-modernize.js';
 import { extractTestCoverage } from './extract-test-coverage.js';
+import { extractCleanCoreDecision } from './extract-clean-core.js';
 import { extractPlan, laneConflictsWithPrior, LANE_NEW_FAMILY } from './extract-plan.js';
 import { buildEnvelope } from './build.js';
 import { buildPlanRevision } from './plan-run.js';
@@ -17,6 +18,7 @@ import { saveProject } from './save.js';
 import { formatSavedLines } from './saved-lines.js';
 import { writePlanHandover } from './handover-md.js';
 import { ensureWorkspace, resolveWorkspacePath } from './workspace.js';
+import { resolveProjectFolderSync, ensureProjectId } from './project-folder.js';
 import { askYesNo, isYes } from './yes-no.js';
 import { checkLaneConsistency, checkRequiredDeploy, LANE_CHANGED_AT_CREATE, readPlanLane } from './plan-lane.js';
 import { specGapRefForSave } from './plan-sources.js';
@@ -103,6 +105,14 @@ const SKILL_REGISTRY = {
         itemNoun: 'phases',
         manifestMarker: 'plan-manifest',
     },
+    'abap-clean-core': {
+        // 2026-10-06 (clean-core mission control): a triage table. The rows become
+        // team project decisions only after one Yes per row (clean-core-confirm.ts).
+        artefactType: 'clean-core-decision',
+        extract: (md) => extractCleanCoreDecision(md),
+        itemNoun: 'decisions',
+        manifestMarker: 'clean-core-manifest',
+    },
 };
 /**
  * C1 (2026-06-11, defect D22) — map an inline artifact-manifest block in the
@@ -128,6 +138,8 @@ export function detectArtifactSkill(markdown) {
         return 'abap-modernize';
     if (/<!--\s*(?:csforge|cspeach):test-coverage-manifest\b/.test(markdown))
         return 'abap-test';
+    if (/<!--\s*(?:csforge|cspeach):clean-core-manifest\b/.test(markdown))
+        return 'abap-clean-core';
     const up = /<!--\s*(?:csforge|cspeach):upgrade-manifest\s*\n([\s\S]*?)\n\s*-->/.exec(markdown);
     if (up) {
         const art = /(?:^|\n)\s*artefact:\s*(\S+)/.exec(up[1] ?? '');
@@ -360,22 +372,54 @@ export async function runSaveCommand(args) {
     }
     // C1 review fix — name the revision target BEFORE the confirm so the user
     // knows what a 'y' will do. Log line only, deliberately NOT a second
-    // question: the B5 headless contract (below) allows at most one prompt.
+    // question: the B5 headless contract (below) allows one `prompt` question.
     if (planExtract && prior) {
         const priorFilename = prior.path.split(/[\\\/]/).pop();
         args.log(`[save] this will save as v${prior.envelope.version + 1} of existing plan '${prior.envelope.title}' (${priorFilename})`);
     }
-    // CONTRACT (B5): runSaveCommand may ask the user at most ONE question —
-    // this save confirm. The headless path in loop.ts (maybeOfferSave) installs
-    // a prompt that blanket-answers 'y' to WHATEVER it is asked; any second
-    // question added here would silently receive 'y' too. If you need another
-    // prompt, give maybeOfferSave's headless prompt a question-aware answer
-    // first.
-    const answer = await askYesNo({ question: 'Save as project file?', confirm: args.confirm, prompt: args.prompt });
+    // CONTRACT (B5): runSaveCommand asks 1+N cards — this save confirm, then
+    // (clean-core decisions only) one card per row. Only the save confirm may
+    // fall back to `prompt`: the headless path in loop.ts (maybeOfferSave)
+    // installs a prompt that blanket-answers 'y' to WHATEVER it is asked, so
+    // the row cards go through `confirm` only (never `prompt`), and a headless
+    // run confirms no row. Any further question routed through `prompt` would
+    // silently receive 'y' too: give maybeOfferSave's headless prompt a
+    // question-aware answer first.
+    // Inside a journey a triage is saved without the question: the journey needs the rows.
+    const journey = spec.artefactType === 'clean-core-decision' ? args.journey : undefined;
+    const answer = journey ? 'y' : await askYesNo({ question: 'Save as project file?', confirm: args.confirm, prompt: args.prompt });
     if (!isYes(answer)) {
         args.onNotSaved?.('declined');
         return null;
     }
+    // 2026-10-06 — a clean-core triage becomes team project decisions only row by
+    // row, each on its own Yes. Without a joined team project nothing is asked.
+    let tally;
+    if (spec.artefactType === 'clean-core-decision') {
+        const { confirmCleanCoreRows, decideCleanCoreRows } = await import('./clean-core-confirm.js');
+        const { activeProject } = await import('../register/store.js');
+        const joined = activeProject() !== null;
+        if (journey && joined) {
+            // Guided journey: [Yes] [Keep as is] [Skip] per row.
+            const r = await decideCleanCoreRows(extract, {
+                card: journey.card, ask: journey.ask, skip: journey.skip, log: args.log,
+            });
+            extract = r.extract;
+            tally = r.tally;
+        }
+        else {
+            if (journey) {
+                // Inside a journey: no team words, no command to type (Task 7).
+                const { JOURNEY_NOT_IN_PROJECT_LINE } = await import('./clean-core-confirm.js');
+                args.log(JOURNEY_NOT_IN_PROJECT_LINE);
+            }
+            else {
+                extract = await confirmCleanCoreRows(extract, {
+                    ...(args.confirm ? { confirm: args.confirm } : {}), log: args.log, joined,
+                });
+            }
+        }
+    }
     let env;
     if (planExtract && prior) {
         // C1 (D30) — the 49dd duplicate: the generic save used to mint a fresh
@@ -414,6 +458,17 @@ export async function runSaveCommand(args) {
     let outDir;
     try {
         outDir = await ensureWorkspace();
+        // 2026-10-08 — the first save writes .cspeach/project.json (solo/home);
+        // a team folder uses its team id. Never fails the save.
+        try {
+            const pf = resolveProjectFolderSync(process.cwd());
+            const projectId = pf.kind === 'team' ? pf.projectId : ensureProjectId(pf.workDir);
+            try {
+                args.onProjectId?.(projectId);
+            }
+            catch { /* tagging is best-effort */ }
+        }
+        catch { /* id file is best-effort */ }
     }
     catch {
         outDir = args.cwd;
@@ -428,7 +483,9 @@ export async function runSaveCommand(args) {
         writePlanHandover(path, args.log);
     // 1.1.28 — two plain lines; the old suggested-email block is gone (saved-lines.ts).
     const [savedLine, reviewLine] = formatSavedLines(path, args.cwd);
-    args.log(savedLine);
+    // Inside a journey the file is plumbing: the closing lines say what was recorded.
+    if (!journey)
+        args.log(savedLine);
     // Project Register (2026-09-18): when this laptop has joined a project, a
     // decision / fix record is written to the LOCAL outbox as a by-product of the
     // save. No project joined → `activeProject()` is one missing-file read and
@@ -438,20 +495,63 @@ export async function runSaveCommand(args) {
         const joined = activeProject();
         if (joined) {
             const { recordFromEnvelope } = await import('../register/records.js');
-            const res = recordFromEnvelope(env, path, joined, { name: args.author.name }, args.cwd);
-            if (res?.file)
-                args.log(`Recorded for team project ${joined.projectId}: ${res.written} objects → ${res.file}`);
+            // Task 15 — detail files are read from where the skill wrote them: the
+            // seat work root in a team folder, the start folder otherwise. The
+            // record itself still goes to the shared outbox.
+            const res = recordFromEnvelope(env, path, joined, { name: joined.name ?? args.author.name }, resolveProjectFolderSync(args.cwd).workRoot);
+            if (tally) {
+                const { journeyRowLines } = await import('./clean-core-confirm.js');
+                for (const line of journeyRowLines(tally, res?.refused ?? []))
+                    args.log(line);
+            }
+            else if (res?.file)
+                args.log(`Recorded for team project ${joined.projectId}: ${res.written} objects → ${basename(res.file)}`);
+            if (res?.file) {
+                const { regenerateWorkingList } = await import('../register/workbooks.js');
+                // The name the team project knows this laptop by (init --lead), as the team verbs use.
+                const sheet = regenerateWorkingList(joined, joined.name ?? args.author.name);
+                if (journey) {
+                    const { journeyListLine } = await import('./clean-core-confirm.js');
+                    const line = journeyListLine(sheet.kind);
+                    if (line)
+                        args.log(line);
+                }
+                else if (sheet.line)
+                    args.log(sheet.line.trimStart());
+            }
             if (res?.refused.length) {
-                args.log(`Not recorded (${res.refused.length} not in the team project's object list): ${res.refused.slice(0, 5).join(', ')}${res.refused.length > 5 ? ', …' : ''}`);
+                args.log(`Not recorded (${res.refused.length} not in ${tally ? 'your project' : 'the team project'}'s object list): ${res.refused.slice(0, 5).join(', ')}${res.refused.length > 5 ? ', …' : ''}`);
             }
         }
     }
     catch (e) {
-        args.log(`(team project record not written: ${e instanceof Error ? e.message : String(e)})`);
+        if (journey) {
+            const { notRecordedLine } = await import('../journey/run.js');
+            args.log(notRecordedLine(e));
+        }
+        else
+            args.log(`(team project record not written: ${e instanceof Error ? e.message : String(e)})`);
     }
     if (planExtract && prior) {
         args.log(`(revision v${env.version} of the existing plan — version chain preserved, no new id)`);
     }
-    args.log(reviewLine);
+    if (!journey)
+        args.log(reviewLine);
+    if (journey && tally) {
+        if (tally.cancelled) {
+            journey.pause();
+        }
+        else if (journey.page?.length) {
+            // One triage per page: a row of the page the triage left out is put off
+            // until "carry on", so the journey moves on instead of asking it again — and says so.
+            const answered = new Set([...tally.yes, ...tally.kept.map((k) => k.key), ...tally.skipped]);
+            const left = journey.page.filter((k) => !answered.has(k.toUpperCase()));
+            if (left.length) {
+                journey.leaveForLater(left);
+                const { leftOutLine } = await import('./clean-core-confirm.js');
+                args.log(leftOutLine(left));
+            }
+        }
+    }
     return path;
 }

package/dist/projects/saved-lines.js

@@ -10,7 +10,8 @@
  *
  * Never prints a user name.
  */
-import { basename, dirname, join, resolve } from 'node:path';
+import { basename, dirname, resolve } from 'node:path';
+import { resolveProjectFolderSync } from './project-folder.js';
 function editorLabel() {
     const url = process.env.CSPEACH_EDITOR_URL?.trim();
     return url ? url : 'cspeach.dev/edit';
@@ -22,10 +23,23 @@ function sameDir(a, b) {
     };
     return norm(a) === norm(b);
 }
-/** `<file name> (in this project's .cspeach folder)` — or the folder, when elsewhere. */
+/**
+ * `<file name> (in <where>)` — names the folder kind (2026-10-08): this
+ * project's .cspeach folder (solo), your own working folder (team), or the
+ * home fallback folder with a hint. Anywhere else: the folder itself.
+ */
 export function savedLocation(savedPath, cwd) {
     const dir = dirname(savedPath);
-    const where = sameDir(dir, join(cwd, '.cspeach')) ? "this project's .cspeach folder" : dir;
+    const pf = resolveProjectFolderSync(cwd);
+    let where = dir;
+    if (sameDir(dir, pf.workDir)) {
+        if (pf.kind === 'solo')
+            where = "this project's .cspeach folder";
+        else if (pf.kind === 'team')
+            where = 'your own working folder for this team project, not shared';
+        else
+            where = `${dir} — start CSPeach in a project folder to keep projects apart`;
+    }
     return `${basename(savedPath)} (in ${where})`;
 }
 export function formatSavedLines(savedPath, cwd) {