@cspeach/cli 0.9.0 → 1.1.0

package/dist/session/recap.js

@@ -0,0 +1,160 @@
+// cspeach-cli/src/session/recap.ts
+//
+// UX Wave 2 / Task 6 — session recap: three lines that re-orient a developer
+// who just resumed (or typed /recap) without scrolling back through the
+// transcript.
+//
+//   ↩ last session: /abap-generate · 4 turns · 3h ago · "add a validation…"
+//   ▶ tasks: 2 done / 3 open — next: write the BDEF validation
+//   ▷ plan Maintenance Requests: phase 3/7 validated — next: /abap-plan --resume @…
+//
+// Line 1 always prints (unless the session has zero user turns → recap is
+// empty and callers print nothing). Line 2 only when the session's todo list
+// has non-completed entries. Line 3 only when the NEWEST plan family in the
+// workspace still has unsatisfied phases (audit-aware, same predicates the
+// plan DAG uses).
+//
+// PURE except the plan-envelope reads: no writes, no prompts, never throws —
+// a bad/missing workspace or a corrupt envelope silently drops line 3. The
+// workspace dir is injectable (opts.workspaceDir) so call sites can pass the
+// config-resolved path (resolveWorkspacePath) and tests can point at a temp
+// dir; the fallback is the project-rooted default for `cwd`.
+import { readdirSync, statSync } from 'node:fs';
+import { basename, join } from 'node:path';
+import { formatTimeAgo } from './time-ago.js';
+import { readProjectFile } from '../projects/status.js';
+import { parsePlanContent } from '../projects/plan-schema.js';
+import { statusesFromItems, isPhaseSatisfied } from '../projects/plan-run.js';
+import { defaultWorkspaceFor } from '../projects/workspace.js';
+/** Wave-1 truncation rule (see /reroute): ≤60 chars total, '...' suffix. */
+function truncatePrompt(s) {
+    return s.length > 60 ? s.slice(0, 57) + '...' : s;
+}
+/**
+ * Build the recap lines for a session. Returns [] for an empty session
+ * (zero user turns) — callers print nothing in that case.
+ */
+export function buildRecap(session, cwd, opts) {
+    const lines = [];
+    // ── line 1: session orientation ─────────────────────────────────────────
+    // "User turns" = plain-string user messages (tool_result rounds are arrays)
+    // — same counting rule as the resume picker (session/store.ts).
+    const userMessages = session.messages.filter((m) => m.role === 'user' && typeof m.content === 'string');
+    const turns = userMessages.length;
+    if (turns === 0)
+        return [];
+    const skillLabel = session.skill ? `/${session.skill}` : 'no skill';
+    // Last user prompt: prefer the persisted lastUserPrompt (user-typed prose;
+    // null after slash-only commands), fall back to the last string user
+    // message with the first-turn <session_context> wrapper stripped (same
+    // rule as the picker's promptSnippet).
+    let prompt = session.lastUserPrompt;
+    if (!prompt) {
+        const last = userMessages[userMessages.length - 1].content;
+        prompt = last.replace(/<session_context>[\s\S]*?<\/session_context>\s*/g, '').trim() || null;
+    }
+    const quoted = prompt ? `"${truncatePrompt(prompt)}"` : '(no prompt)';
+    const ago = formatTimeAgo(session.last_turn_at, opts?.now);
+    lines.push(`↩ last session: ${skillLabel} · ${turns} turn${turns === 1 ? '' : 's'} · ${ago} · ${quoted}`);
+    // ── line 2: todo list (Task 4's todo_set) — only when open work exists ──
+    const todos = session.todos ?? [];
+    const open = todos.filter((t) => t.status !== 'completed');
+    if (open.length > 0) {
+        const done = todos.length - open.length;
+        const next = todos.find((t) => t.status === 'in_progress') ?? todos.find((t) => t.status === 'pending');
+        lines.push(`▶ tasks: ${done} done / ${open.length} open — next: ${next.text}`);
+    }
+    // ── line 3: newest plan family with unsatisfied phases ──────────────────
+    // Never throws: any fs/parse problem silently drops the line.
+    try {
+        const planLine = buildPlanLine(opts?.workspaceDir ?? defaultWorkspaceFor(cwd));
+        if (planLine)
+            lines.push(planLine);
+    }
+    catch { /* recap must never throw */ }
+    return lines;
+}
+/**
+ * Scan `workspaceDir` for the newest plan family and, when it still has
+ * unsatisfied phases, produce the plan recap line. Returns null when there
+ * is no plan, the newest plan family is fully satisfied, or its envelope is
+ * invalid (silent skip by design).
+ *
+ * "Newest family": envelope files group into families by filename base
+ * (`<base>-v<N>[-<sub>].cspeach.json` — same convention as
+ * pickNewestPlanVersion / findNewestVersion in commands/plan-resume.ts);
+ * within a family the highest version wins; families rank by their newest
+ * file's mtime. Non-plan envelopes (design, spec-gap, …) are skipped so the
+ * newest PLAN family is found even when a newer non-plan artefact exists.
+ */
+function buildPlanLine(workspaceDir) {
+    let names;
+    try {
+        names = readdirSync(workspaceDir);
+    }
+    catch {
+        return null; // workspace missing — nothing to recap
+    }
+    const re = /^(.+)-v(\d+)(?:-(\d+))?\.cspeach\.json$/;
+    const cands = [];
+    for (const name of names) {
+        if (!name.endsWith('.cspeach.json'))
+            continue;
+        const path = join(workspaceDir, name);
+        let mtimeMs;
+        try {
+            mtimeMs = statSync(path).mtimeMs;
+        }
+        catch {
+            continue;
+        }
+        const m = re.exec(name);
+        if (m) {
+            cands.push({ path, family: m[1], version: Number(m[2]), sub: m[3] ? Number(m[3]) : 0, mtimeMs });
+        }
+        else {
+            // Hand-renamed / version-less envelope: its own single-file family.
+            cands.push({ path, family: name.slice(0, -'.cspeach.json'.length), version: 0, sub: 0, mtimeMs });
+        }
+    }
+    if (cands.length === 0)
+        return null;
+    // Newest version per family (version, then collision sub, then mtime).
+    const byFamily = new Map();
+    for (const c of cands) {
+        const cur = byFamily.get(c.family);
+        if (!cur
+            || c.version > cur.version
+            || (c.version === cur.version && (c.sub > cur.sub || (c.sub === cur.sub && c.mtimeMs > cur.mtimeMs)))) {
+            byFamily.set(c.family, c);
+        }
+    }
+    // Families newest-first by their representative file's mtime; the first
+    // family whose envelope IS a plan is "the newest plan family".
+    const familiesNewestFirst = [...byFamily.values()].sort((a, b) => b.mtimeMs - a.mtimeMs);
+    for (const cand of familiesNewestFirst) {
+        let env;
+        try {
+            env = readProjectFile(cand.path);
+        }
+        catch {
+            continue; // unreadable/invalid file — can't tell it's a plan; skip family
+        }
+        if (env.artefactType !== 'plan')
+            continue;
+        // This is the newest plan family. Invalid content → silent skip (no
+        // falling through to an older plan family — stale info is worse than none).
+        const pc = parsePlanContent(env.content);
+        if (!pc.ok)
+            return null;
+        const statuses = statusesFromItems(env.interaction.items, pc.content.phases);
+        const total = pc.content.phases.length;
+        // Audit-aware satisfaction — same predicate as the plan DAG (a
+        // validated-but-audit-failed phase is NOT done).
+        const validated = pc.content.phases.filter((p) => isPhaseSatisfied(statuses[p.id], p.audit)).length;
+        if (total === 0 || validated >= total)
+            return null; // fully satisfied — no line
+        return `▷ plan ${env.title}: phase ${validated}/${total} validated — next: /abap-plan --resume @${basename(cand.path)}`;
+    }
+    return null;
+}

package/dist/skill-catalog.js

@@ -1,8 +1,12 @@
 /**
  * Static skill catalog for CSPeach CLI v0.2.
  *
- * STALENESS RISK (spec §3.3): This constant is hardcoded against the 34 skills
- * in .claude/skills/ as of 2026-06-06 (abap-plan added). It will drift if skills are added or
+ * STALENESS RISK (spec §3.3): This constant is hardcoded against the 33 skills
+ * in .claude/skills/ as of 2026-07-03 (abap-dump-analyze + abap-dump-triage
+ * merged into abap-dump 2026-06-12; abap-extend-model added 2026-06-25;
+ * abap-radar/abap-document/abap-performance/abap-cloud-check merged into
+ * abap-explain/abap-handover/abap-review 2026-06-28 per
+ * plan 2026-06-28-skill-portfolio-merge; abap-clean-core added 2026-06-29). It will drift if skills are added or
  * removed. At Plan 4b kickoff decision the build-time generation option
  * (scripts/generate-skill-catalog.ts reads SKILL.md frontmatter) or runtime
  * fetch (/v1/skills endpoint) will be chosen to replace this file. Until then,
@@ -10,65 +14,41 @@
  */
 export const SKILL_CATALOG = [
     // ── Read / Analyze ───────────────────────────────────────────────────────
-    {
-        name: 'abap-radar',
-        category: 'Read / Analyze',
-        description: 'Understand an ABAP object quickly — dependencies, tables, risk areas, modernisation summary',
-        whenToUse: 'pick this for a 3-min cold read of an object (not /abap-review — no quality grade)',
-    },
     {
         name: 'abap-impact',
         category: 'Read / Analyze',
         description: 'Impact analysis before changes — traces usage, callers, transports',
-        whenToUse: 'pick this for blast radius before a change (not /abap-radar — radar = inside the object)',
+        whenToUse: 'pick this for blast radius before a change (not /abap-explain — explain = teach the code)',
     },
     {
         name: 'abap-explain',
         category: 'Read / Analyze',
-        description: 'Plain-language explanation of ABAP code for juniors, non-ABAP developers, or architects',
-        whenToUse: `pick this to teach code to a human (not /abap-document — that's a dev reference doc)`,
+        description: 'Understand an object — plain-language (default) or `technical` orientation (deps, tables, risks)',
+        whenToUse: `plain teaching, or technical=fast orientation (not /abap-impact = blast radius)`,
     },
     {
         name: 'abap-review',
         category: 'Read / Analyze',
-        description: 'Code review against 7 quality criteria: conventions, performance, security, error handling, tests, cloud-readiness, comments',
-        whenToUse: `pick this to grade SOURCE against 7 criteria (not a release gate — see /abap-preflight)`,
-    },
-    {
-        name: 'abap-performance',
-        category: 'Read / Analyze',
-        description: 'Identify N+1 queries, missing indexes, SELECT *, FOR ALL ENTRIES pitfalls',
-        whenToUse: 'pick this for deep SQL/loop bottleneck hunt (not /abap-review — review only skims perf)',
+        description: 'Read-only review across lenses: quality (default), performance, cloud-readiness',
+        whenToUse: `grade source: quality (default) + performance/cloud lenses`,
     },
     {
-        name: 'abap-cloud-check',
+        name: 'abap-clean-core',
         category: 'Read / Analyze',
-        description: 'ABAP Cloud / Clean Core readiness — restricted APIs, tier violations, released object alternatives',
-        whenToUse: `pick this for ABAP Cloud verdict on one object (not /abap-cca — that's whole-system)`,
+        description: 'Clean-core decision & defense — recommend the clean-core-correct approach, classify the level (A/B/C/D), produce citable evidence; verifies live when connected. Read-only.',
+        whenToUse: `pick this for "is this clean-core-OK?" decisions + defendable evidence (not /abap-review cloud lens — that grades code)`,
     },
     {
         name: 'abap-handover',
         category: 'Read / Analyze',
-        description: 'Generate technical documentation for ABAP objects or a complete development package',
-        whenToUse: `pick this for a whole-package handover dossier (not /abap-document — that's one object)`,
-    },
-    {
-        name: 'abap-document',
-        category: 'Read / Analyze',
-        description: 'Reference doc for ONE ABAP object — purpose, interface, logic flow, dependencies, where-used',
-        whenToUse: `pick this for a reference doc on ONE object (not /abap-handover — that's whole-package)`,
-    },
-    {
-        name: 'abap-dump-analyze',
-        category: 'Read / Analyze',
-        description: 'Analyze ABAP short dumps (ST22) — root cause, call stack, fix suggestions',
-        whenToUse: `pick this to diagnose an ST22 dump AND apply the fix (not /abap-dump-triage — read-only)`,
+        description: 'Documentation for one object (`object` scope) or a whole package (`package` scope)',
+        whenToUse: `object doc OR full package handover dossier`,
     },
     {
-        name: 'abap-dump-triage',
+        name: 'abap-dump',
         category: 'Read / Analyze',
-        description: 'Structured triage of a runtime dump — ranked hypotheses, what to inspect next, read-only',
-        whenToUse: `pick this for ranked dump hypotheses, read-only (not /abap-dump-analyze — that writes a fix)`,
+        description: 'Diagnose ABAP short dumps (ST22) and fix them — root cause, call stack, fix with approval; ask for "triage" for ranked read-only hypotheses',
+        whenToUse: `pick this for any ST22 dump — diagnose + fix by default, say "triage" for read-only ranking (not /abap-incident — that's the full dump-to-transport pipeline)`,
     },
     // ── Modify / Fix ─────────────────────────────────────────────────────────
     {
@@ -89,11 +69,17 @@ export const SKILL_CATALOG = [
         description: 'Extend SAP standard via BAdI implementations, enhancement spots, user exits',
         whenToUse: `pick this to hook into SAP-STANDARD code via BAdI/exit (not /abap-refactor — that's for YOUR Z code)`,
     },
+    {
+        name: 'abap-extend-model',
+        category: 'Modify / Fix',
+        description: 'Add a field or @UI column to an EXISTING custom CDS view / DDLX metadata extension in place — anchored insertion, snapshot, syntax-check, activate, republish-if-needed. The Fiori Elements column-add.',
+        whenToUse: `pick this to add a field/column to an EXISTING custom CDS/DDLX in place (not /abap-rap — that's a new stack; not /abap-refactor — that's ABAP code, not CDS)`,
+    },
     {
         name: 'abap-incident',
         category: 'Modify / Fix',
         description: 'End-to-end incident pipeline — dump to fix deployed to transport in one skill',
-        whenToUse: `pick this for full ST22-to-transport pipeline with formal report (not /abap-dump-analyze — single fix only)`,
+        whenToUse: `pick this for full ST22-to-transport pipeline with formal report (not /abap-dump — single fix only)`,
     },
     {
         name: 'abap-test',
@@ -126,6 +112,12 @@ export const SKILL_CATALOG = [
         description: 'Scaffold a complete RAP stack on S/4HANA 1909+ — table, CDS interface, projection, BDEF, BP class, SRVD, SRVB, DDLX, DCL. ECC/older S/4 → use /abap-segw.',
         whenToUse: `pick this for a full RAP stack on S/4 1909+ (10 objects, table → SRVB; not /abap-segw — that's ECC/older S/4 OData; not /abap-generate — that's one object)`,
     },
+    {
+        name: 'abap-fiori-build',
+        category: 'Create / Generate',
+        description: 'Build a working freestyle SAPUI5 app on the laptop from a published OData service — scaffold, pages, dialogs, chart, value help, local preview. Freestyle only, not Fiori Elements.',
+        whenToUse: `pick this for a freestyle UI5 frontend on a published OData service (not /abap-rap — that's the backend; produces local files, not ADT objects)`,
+    },
     {
         name: 'abap-data-model',
         category: 'Create / Generate',
@@ -226,3 +218,22 @@ export const SKILL_CATALOG = [
         whenToUse: `pick this when the work spans multiple sessions or components (not /abap-design — that's one design in one session; plan calls design per phase)`,
     },
 ];
+/**
+ * Portfolio-merge redirects (2026-06-12). Old skill names that were merged
+ * into a surviving skill keep routing for ONE release: `/abap-dump-analyze`
+ * resolves to `abap-dump` with a dim "renamed" notice instead of the
+ * unknown-skill error. Resolution happens in parseShortcut (slash input)
+ * and classifyPrompt (stale proxy-classifier outputs). Remove the entries
+ * — and the proxy-side alias seeds — one release after the rename ships.
+ */
+export const SKILL_ALIASES = {
+    'abap-dump-analyze': 'abap-dump',
+    'abap-dump-triage': 'abap-dump',
+};
+/**
+ * Resolve a (possibly retired) skill name to its current catalog name.
+ * Returns the input unchanged when it is not an alias.
+ */
+export function resolveSkillAlias(skill) {
+    return SKILL_ALIASES[skill] ?? skill;
+}