@cspeach/cli 1.1.50 → 1.1.52

package/dist/approvals/risk-floor.js

@@ -100,8 +100,13 @@ export function signatureChange(diff) {
         return false;
     let state = 'unknown';
     for (const raw of diff.split('\n')) {
-        if (raw.startsWith('+++') || raw.startsWith('---'))
+        // LT-10 (1A fix wave) — a file header starts another file (a diff can
+        // cover several includes): a declaration still open in the file before
+        // it never carries over.
+        if (raw.startsWith('+++') || raw.startsWith('---')) {
+            state = 'unknown';
             continue;
+        }
         if (raw.startsWith('@@')) {
             // Task 7 (R2) / fix round 1 — a header naming the block
             // (`@@ METHOD to_internal. @@`) hints that the hunk starts in its body.
@@ -157,6 +162,7 @@ export function effectiveRisk(declared, changes, ctx) {
     // a body-only change read "may alter a method signature" when activation
     // was the true reason.
     const applied = [];
+    let syntaxObjectWord;
     const raise = (r, label, always = false) => {
         applied.push({ r, label, always });
     };
@@ -176,6 +182,16 @@ export function effectiveRisk(declared, changes, ctx) {
             // Final review A M-4 — the reason is always shown, even when the floor
             // was already high (policy never, or declared high).
             raise('high', 'syntax_errors', true);
+            // LT-10 — "this class" / "this program" from the RECORDED keys' types
+            // for the hit names (the match is by name, so the row's type may not be
+            // what was checked). Only when they all agree on one known word.
+            const hitNames = new Set(changes.filter(hit).map((c) => c.object.trim().split(/\s+/)[0].toUpperCase()));
+            const words = new Set(ctx.syntaxErrorObjects
+                .filter((k) => hitNames.has(k.slice(k.lastIndexOf(':') + 1).toUpperCase()))
+                .map((k) => ctx.typeWord?.(k.slice(0, k.lastIndexOf(':')))));
+            const [only] = [...words];
+            if (words.size === 1 && only)
+                syntaxObjectWord = only;
         }
     }
     // Part 2b D7 — a BAdI implementation runs inside a standard SAP process:
@@ -231,7 +247,7 @@ export function effectiveRisk(declared, changes, ctx) {
         raisedBy.splice(act, 1);
         raisedBy.splice(sig, 0, 'activation');
     }
-    return { level: floor, raisedBy };
+    return syntaxObjectWord ? { level: floor, raisedBy, syntaxObjectWord } : { level: floor, raisedBy };
 }
 /** Plain words for each risk reason code — the codes stay in audit data only. */
 const RISK_REASON_TEXT = {
@@ -252,15 +268,17 @@ const RISK_REASON_TEXT = {
  * Task 7 (R2) — one sentence on every request_approval result (and once in
  * the journey fix block): the risk line is CSPeach's reading of the diff, so
  * the model relays it rather than telling the person it is wrong.
+ * LT-6 (1A fix wave): the card already shows it, so the model neither repeats
+ * nor explains it unless asked (live: "rated medium only because…").
  */
-export const RISK_NOTE = "The risk line is CSPeach's reading of the diff; relay it, and if you think it is off, say why.";
+export const RISK_NOTE = "The risk line is CSPeach's reading of the diff. Do not repeat, explain or dispute it unless the person asks.";
 /**
  * Task 7 (R2) — the risk fields of every request_approval result:
  * effective_risk and raised_by as before (older readers), plus risk { level,
  * reasons } in plain words and the note.
  */
 export function riskResultFields(eff) {
-    const reasons = eff.raisedBy.map(riskReasonText); // round 8 item 4: plain words, never codes
+    const reasons = eff.raisedBy.map((c) => reasonTextFor(c, eff)); // round 8 item 4: plain words, never codes
     return { effective_risk: eff.level, raised_by: reasons, risk: { level: eff.level, reasons: [...reasons] }, note: RISK_NOTE };
 }
 /** Round 8 item 4 — every code the floor can raise (each has plain words above). */
@@ -279,3 +297,13 @@ const NOT_A_RISK_REASON = new Set(['non_prod_override']);
 export function shownRiskReasons(raisedBy) {
     return raisedBy.filter((c) => !NOT_A_RISK_REASON.has(c));
 }
+/** LT-10 — one reason in plain words; the syntax-errors one names the kind of object when known. */
+function reasonTextFor(code, eff) {
+    if (code === 'syntax_errors' && eff.syntaxObjectWord)
+        return `the last syntax check of this ${eff.syntaxObjectWord} found errors`;
+    return riskReasonText(code);
+}
+/** LT-10 — the shown reasons of a result, in plain words (every approval surface). */
+export function riskReasonTexts(eff) {
+    return shownRiskReasons(eff.raisedBy).map((c) => reasonTextFor(c, eff));
+}

package/dist/approvals/visible-changes.js

@@ -21,6 +21,56 @@ export function collapseImplicitActivates(changes) {
         return !writeKeys.has(`${c.type}:${c.object}`);
     });
 }
+/**
+ * LT-12 (1A fix wave) — the rows a plan list shows. On top of the collapse
+ * above, a `modify` of an object that also has a `create` in the list is
+ * hidden: the create already covers its source write and activation
+ * (approvals/jwt.ts OP_COVERAGE), so "Create X" + "Change X" read as two
+ * changes for one new object. Fix round 1: only a modify with no diff of its
+ * own, or the same diff as the create, is hidden; a modify carrying other
+ * content stays, so the person sees it before "Apply all". When the create
+ * row has no behaviour (or affects) and a hidden modify has one, the row
+ * shows the modify's — a display copy, never the caller's object. Display
+ * only: the `changes[]` behind the card (approval ids, grants) and the gate
+ * count (collapseImplicitActivates) are untouched.
+ */
+export function planRows(changes) {
+    const rows = collapseImplicitActivates(changes);
+    const createOf = new Map();
+    for (const c of rows)
+        if (c.op === 'create' && !createOf.has(`${c.type}:${c.object}`))
+            createOf.set(`${c.type}:${c.object}`, c);
+    const hidden = new Set();
+    const hiddenOf = new Map();
+    for (const c of rows) {
+        if (c.op !== 'modify')
+            continue;
+        const key = `${c.type}:${c.object}`;
+        const cr = createOf.get(key);
+        if (cr && (!c.diff || c.diff === cr.diff)) {
+            hidden.add(c);
+            if (!hiddenOf.has(key))
+                hiddenOf.set(key, c);
+        }
+    }
+    const out = [];
+    for (const c of rows) {
+        if (hidden.has(c))
+            continue;
+        const m = c.op === 'create' ? hiddenOf.get(`${c.type}:${c.object}`) : undefined;
+        if (!m) {
+            out.push(c);
+            continue;
+        }
+        const row = { ...c };
+        if (row.behaviour === undefined && m.behaviour !== undefined)
+            row.behaviour = m.behaviour;
+        if (row.affects === undefined && m.affects !== undefined)
+            row.affects = m.affects;
+        out.push(row);
+    }
+    return out;
+}
 /**
  * Heuristic: a real unified diff has at least one line starting with `+`,
  * `-`, or `@@`. A summary or change description won't. Used to gate

package/dist/cli.js

@@ -157,12 +157,20 @@ export async function main(argv) {
             // Task 12 — the full dump ends with "# model set by your account admin"
             // when /v1/me/model-config says the admin's model is enforced. Capped at
             // 1.5 s and fail-open: offline / signed out ⇒ the output is unchanged.
-            const [{ loadConfig }, { getStore }, { loadCustomerModelConfig }] = await Promise.all([
+            const [{ loadConfig }, { getStore }, { loadCustomerModelConfig, loadServerModelConfig }] = await Promise.all([
                 import('./config/loader.js'),
                 import('./auth/api-key.js'),
                 import('./models/server-config.js'),
             ]);
-            await loadCustomerModelConfig(await loadConfig(), async () => (await (await getStore()).get()) ?? '', { timeoutMs: 1500 }).catch(() => { });
+            const showCfg = await loadConfig();
+            await Promise.all([
+                loadCustomerModelConfig(showCfg, async () => (await (await getStore()).get()) ?? '', { timeoutMs: 1500 }).catch(() => { }),
+                // Stage 1A — only a stored `assistant.skills = inline` needs the served
+                // flag (the "not active" comment). Managed only, same cap, fail-open.
+                showCfg.assistant?.skills === 'inline'
+                    ? loadServerModelConfig(showCfg, { timeoutMs: 1500 }).catch(() => { })
+                    : Promise.resolve(),
+            ]);
         }
         await runConfigShow(args.slice(2));
         return 0;
@@ -308,7 +316,7 @@ Usage:
   cspeach                           Start interactive REPL
   cspeach "<prompt>"                One-shot — runs one turn and exits
   cspeach --one-shot "<prompt>"     Same as above, explicit flag
-  cspeach export <file>.md --docx   Write a Word copy next to a saved review or handover
+  cspeach export <file>.md --docx   Write a Word copy next to a Markdown file
   cspeach --sap-alias <name>        Use a specific SAP alias (overrides default)
   cspeach --no-sap                  Start without a SAP system (paste-mode skills only)
   cspeach --continue, -c            Continue the latest session in this folder

package/dist/commands/compact.js

@@ -33,6 +33,8 @@ import { paint } from '../renderer/theme.js';
 import { getGlyphs } from '../renderer/glyphs.js';
 import { saveSession } from '../session/store.js';
 import { isUserPrompt } from '../session/user-prompt.js';
+import { stripSkillBlocksInMessage } from '../agent/inline-skill-block.js';
+import { rebuildCliMarksAfterCompact, COMPACT_LINE } from '../session/cli-record.js';
 import { getActiveDeployments } from '../models/model-identity.js';
 /** Keep this many recent user-prompt anchored turns verbatim. */
 export const KEEP_RECENT_TURNS = 5;
@@ -130,7 +132,11 @@ export function buildSummarisationPrompt() {
  */
 export function serialiseForSummariser(messages) {
     const out = [];
-    for (const msg of messages) {
+    for (const original of messages) {
+        // Stage 1A (S-A, M-3) — a playbook body never reaches the summariser: a
+        // hash-passing <skill> block in user text becomes [skill block: <name>].
+        // A message without one is the same object (byte-identical output).
+        const msg = stripSkillBlocksInMessage(original);
         if (typeof msg.content === 'string') {
             out.push({ role: msg.role, content: msg.content });
         }
@@ -305,7 +311,12 @@ export async function runCompact(opts) {
     // that produced it). The summary changed them, so the kept tail goes out
     // without thinking; text and tool calls stay. The backup above keeps all.
     const kept = plan.toKeep.map(stripThinking);
+    const oldMessages = session.messages;
     session.messages = [summaryMsg, ...kept];
+    // /export docx conversation: the summary is CSPeach's, not the developer's
+    // (one plain line there). The record is rebuilt in message order so the kept
+    // plan steps, continuations and steers keep their marks (final-review I-1).
+    rebuildCliMarksAfterCompact(session, oldMessages, plan.cutAt, summaryMsg.content, { kind: 'compact', line: COMPACT_LINE });
     // Task 19 — the recorded context size described the old history; the next
     // call records the new one. Clearing it keeps the auto-compact gate honest.
     delete session.last_context_tokens;

package/dist/commands/config-set.js

@@ -19,6 +19,7 @@ const MUTABLE_KEYS = new Set([
     'assistant.lane',
     'assistant.style',
     'assistant.level',
+    'assistant.skills',
     'local_build',
     'local_files', // deprecated alias for local_build (2026-06-13) — still accepted
     'show_cogs',
@@ -83,6 +84,7 @@ const PLAN_MODE_VALUES = ['step', 'guarded'];
 const PLAN_AUDIT_VALUES = ['on', 'off'];
 const USAGE_REPORTING_VALUES = ['on', 'off'];
 const ASSISTANT_LANE_VALUES = ['chat', 'skills'];
+const ASSISTANT_SKILLS_VALUES = ['system', 'inline'];
 const APPROVALS_VALUES = ['plan', 'per-write'];
 /**
  * Thrown on validation failure. The outer CLI dispatcher converts to
@@ -547,6 +549,15 @@ export async function runConfigSet(args) {
             cfg.assistant.lane = lane;
             break;
         }
+        // Stage 1A — explicit, like the lane. markExplicit below keeps the table.
+        case 'assistant.skills': {
+            const skills = value.trim().toLowerCase();
+            if (skills !== 'system' && skills !== 'inline') {
+                err(`assistant.skills must be one of: ${ASSISTANT_SKILLS_VALUES.join(', ')}`);
+            }
+            cfg.assistant.skills = skills;
+            break;
+        }
         case 'assistant.style': {
             const style = parseStyle(value);
             if (!style)
@@ -616,7 +627,7 @@ export async function runConfigSet(args) {
             if (b === null)
                 err(`${key} must be on/off (also accepts true/false, 1/0).`);
             cfg.word_copy = b;
-            console.log(chalk.dim(b ? '  → a Word copy is written with every saved review or handover.' : '  → CSPeach will not ask about Word copies.'));
+            console.log(chalk.dim(b ? '  → a Word copy is written with every document CSPeach saves.' : '  → CSPeach will not ask about Word copies.'));
             break;
         }
         case 'write_mode':
@@ -800,6 +811,8 @@ export function validateValue(key, value) {
             return value === 'true' || value === 'false';
         case 'assistant.lane':
             return ASSISTANT_LANE_VALUES.includes(value.trim().toLowerCase());
+        case 'assistant.skills':
+            return ASSISTANT_SKILLS_VALUES.includes(value.trim().toLowerCase());
         case 'assistant.style':
             return parseStyle(value) !== null;
         case 'assistant.level':

package/dist/commands/config-show.js

@@ -3,6 +3,7 @@ import { loadConfig } from '../config/loader.js';
 import { paint } from '../renderer/theme.js';
 import { formatAttention } from '../renderer/notice-shape.js';
 import { getCustomerModelConfig } from '../models/server-config.js';
+import { inlineInactiveReason, inlineServed } from '../repl/inline-mode.js';
 /**
  * Dotted paths of keys that must never appear in plaintext config output.
  * SAP passwords live in the keychain and should never land in config.toml,
@@ -74,7 +75,11 @@ function printLlmMissingHints(llm) {
         console.log(`ai_hub_router_model = ${paint('dim', '<not set — skill routing uses ai_hub_model_alias>')}`);
     }
 }
-function printConfigAsToml(cfg, prefix = '') {
+/**
+ * `notes` maps a dotted key to a trailing comment (Stage 1A: a stored
+ * `assistant.skills = inline` that would not be active).
+ */
+function printConfigAsToml(cfg, prefix = '', notes = {}) {
     // Emit scalars before nested objects — otherwise a top-level scalar that
     // follows a nested table (e.g. `write_mode` declared after `ui` in the
     // config shape) would render underneath `[ui]` in TOML, which reparses as
@@ -91,7 +96,8 @@ function printConfigAsToml(cfg, prefix = '') {
             console.log(`${k} = [REDACTED]`);
         }
         else {
-            console.log(`${k} = ${formatTomlValue(v)}`);
+            const note = notes[fullKey];
+            console.log(`${k} = ${formatTomlValue(v)}` + (note ? chalk.gray(`  # ${note}`) : ''));
             // Surface an explanatory hint for advisory-only mode so users understand
             // the implication (writes proposed, never executed) without having to
             // read the docs.
@@ -104,7 +110,7 @@ function printConfigAsToml(cfg, prefix = '') {
         const fullKey = prefix ? `${prefix}.${k}` : k;
         console.log('');
         console.log(chalk.bold(`[${fullKey}]`));
-        printConfigAsToml(v, fullKey);
+        printConfigAsToml(v, fullKey, notes);
         // Mode-aware extras for the `[llm]` section — print required keys that
         // are empty as `<not set>` so a user who ran `cspeach config set llm.mode
         // ai-hub` without also setting the base URL can see what is still
@@ -165,7 +171,13 @@ export async function runConfigShow(args) {
         // Full config dump
         console.log('');
         console.log(chalk.gray('# ~/.cspeach/config.toml'));
-        printConfigAsToml(cfg);
+        // Stage 1A — say when a stored `inline` would not be active in an
+        // interactive session (the served flag is loaded by cli.ts).
+        // Read defensively: a config without an [assistant] table means the defaults.
+        const inlineNote = cfg.assistant?.skills === 'inline'
+            ? inlineInactiveReason({ skills: 'inline', lane: cfg.assistant.lane, served: inlineServed(cfg.llm?.mode) })
+            : null;
+        printConfigAsToml(cfg, '', inlineNote ? { 'assistant.skills': inlineNote } : {});
         console.log('');
         // Task 12 — one trailing line when the account admin's model is enforced
         // by the proxy (/v1/me/model-config). No snapshot ⇒ output unchanged.

package/dist/commands/export-audit.js

@@ -17,10 +17,33 @@ import path from 'node:path';
 import { buildAuditReport } from '../session/audit-export.js';
 import { globalCredits } from '../cost/credits.js';
 import { readCostLog } from '../cost/cost-log.js';
-/** Parse the text after `/export` into a subcommand + optional filename. */
+/**
+ * The /export usage line (2026-10-23). Here, in the light audit module both
+ * REPL handlers already load, so `/export audit` and a mistyped `/export`
+ * never load the Word package (final-review I-2).
+ */
+export const EXPORT_REPL_USAGE = 'Usage: /export docx (the last answer to Word) · /export docx <name> · /export docx conversation · /export audit [file]';
+/**
+ * Parse the text after `/export` into a subcommand + optional filename.
+ *
+ * 2026-10-23 (a customer's screenshot): the Word forms people actually type
+ * all mean "Word": `/export docx x.docx`, `/export x.md --docx`,
+ * `/export x.docx`, `/export conversation`, `/export word`. A `--docx` or
+ * `--word` flag anywhere is dropped. For sub 'docx', `docxArgs` is the line
+ * to hand to runExportDocxRepl (" docx <rest>").
+ */
 export function parseExportArgs(rest) {
-    const parts = rest.trim().split(/\s+/).filter(Boolean);
-    return { sub: (parts[0] ?? '').toLowerCase(), filename: parts[1] };
+    let flag = false;
+    const cleaned = rest.replace(/(^|\s)--(?:docx|word)(?=\s|$)/gi, () => { flag = true; return ' '; }).trim();
+    const parts = cleaned.split(/\s+/).filter(Boolean);
+    const first = (parts[0] ?? '').toLowerCase();
+    if (first === 'docx' || first === 'word') {
+        return { sub: 'docx', docxArgs: ` docx ${cleaned.slice(parts[0].length).trim()}`.trimEnd() };
+    }
+    if (first !== 'audit' && (flag || first === 'conversation' || /\.(?:md|docx)["']?$/i.test(cleaned))) {
+        return { sub: 'docx', docxArgs: ` docx ${cleaned}`.trimEnd() };
+    }
+    return { sub: first, filename: parts[1] };
 }
 /** Deterministic default filename: date from session data, not now(). */
 export function defaultAuditFilename(session) {