@cspeach/cli 1.1.52 → 1.1.53

package/dist/agent/conversation-prompt.js

@@ -26,6 +26,7 @@ How you talk
 - Plain words, short sentences. Use headings, tables or lists only when they make the answer easier to read.
 - Have a view. If something is a bad idea, say so and say why. If you're not sure, say what you'd check.
 - When there is a next step, say what you would do in your own words. Do not end a reply with a word, phrase or command for the person to type to go on. If they ask which command does something, name it. If the next step is a workflow and they have asked for it, call hand_off now: the workflow shows its plan and asks before it writes. If it is a real choice, ask the question.
+- When there is a clear next step, end with it as one question card (next step recommended + 'Not now'). A step that only saves local files or plans runs on yes without asking again. SAP writes still show their approval card. Use ask_question for the card.
 - A playbook's report header (## [abap-x] — object, TL;DR, Headline, Top 3, Verdict, Next) goes only in a saved document and in the workflow's report after the person typed an /abap-… command. Not after your own hand_off, and not in other turns: there, answer as you would in conversation.
 - After a write, say what changed and what is next. Do not explain approvals, risk ratings or activation mechanics unless asked. If something failed or stayed inactive, say so.
 - No flattery. Apologise only when you got something wrong.

package/dist/agent/loop.js

@@ -9,7 +9,7 @@ import { loadConfig } from '../config/loader.js';
 import { resolveModelRole, resolveEffort, modelAcceptsEffort, resolveAutoCompactThreshold, callModelFor } from '../models/resolve.js';
 import { getCustomerModelConfig, managedProxyServesNewShapes, servedToolLoading } from '../models/server-config.js';
 import { familyOf, familyAcceptsEffort } from '../models/model-identity.js';
-import { buildToolList, buildSkillToolAddition, placeSystemMessagesInPlace, resolveToolLoading, } from '../tools/tool-loading.js';
+import { buildToolList, buildSkillToolAddition, buildToolAdditionMessage, deferredNames, surfacedToolNames, placeSystemMessagesInPlace, resolveToolLoading, } from '../tools/tool-loading.js';
 import { settleSessionToolLoading } from './tool-loading-pin.js';
 import { resolveSkillAlias } from '../skill-catalog.js';
 import { retryWithBackoff } from './retry.js';
@@ -46,6 +46,7 @@ import { enrichUserMessage } from '../router/intent-extractor.js';
 import { resetRule8State, shouldGateRule8 } from '../repl/rule8-detector.js';
 import { consumeTodoSetThisTurn } from '../ui/todo-emitter.js';
 import { runSaveCommand, runPromoteCommand, detectArtifactSkill, offerAnswerBlockers } from '../projects/index.js';
+import { blockerAnswersNote, SPEC_ANSWERS_RECORD_TOOL } from '../projects/blocker-answers-note.js';
 import { planLaneBlockForTurn } from '../projects/plan-lane.js';
 import { DOCUMENT_SKILLS, WORD_AFTER_ARTIFACT_SAVE } from '../projects/document-skills.js';
 import { metaFromMarkdown } from '../docx/doc-meta.js';
@@ -70,7 +71,7 @@ import { renderStandaloneContextBlock } from '../sap/standalone-profile.js';
 import { renderStandardsBlock } from '../standards/standards-file.js';
 import { composeSessionContextBlock } from './session-context.js';
 import { objectKeyFromInput } from './retry-key.js';
-import { repairPartialBlocks, stripPreFallbackBlocks, healSessionMessagesInPlace, healOrphanToolUses, isPartialJsonApiError, stripUnsignedThinking, isThinkingOnly, dropTrailingThinkingOnly } from './repair-partial.js';
+import { repairPartialBlocks, stripPreFallbackBlocks, healSessionMessagesInPlace, healOrphanToolUses, isPartialJsonApiError, stripUnsignedThinking, isThinkingOnly, dropTrailingThinkingOnly, closedOffStepsLine } from './repair-partial.js';
 import { drainSteeringEntries, enqueueSteering } from './steering-queue.js';
 import { steeringReadLine } from '../renderer/steering-echo.js';
 import { TurnStreamWriter } from './turn-stream.js';
@@ -448,9 +449,51 @@ async function offerWordAfterArtifactSave(p, saveSkill, savedPath, confirm) {
         p.emit(formatInfo(`Word copy not written: ${e.message}`).trimEnd());
     }
 }
+/**
+ * Change options (2026-10-23) — an answer carrying the change-options marker
+ * pair gets its marked part saved (every complete pair, in order: a level
+ * picked in session adds the decided document), whatever the skill and even when the turn
+ * ends on the level question. Never on a sub-agent turn or inside a guided
+ * flow. Returns true when the marker check handled the turn (the question was
+ * asked or the document saved), so maybeOfferSave runs nothing else. An answer
+ * with no complete marker pair returns false and takes today's path unchanged.
+ */
+async function maybeOfferChangeOptions(p, confirm) {
+    if (p.subagent || p.guided || p.assistantText.includes('<!-- guided-run:'))
+        return false;
+    if (!p.assistantText.includes('csforge:change-options'))
+        return false;
+    const { extractChangeOptions } = await import('../projects/change-options.js');
+    // Every complete pair, in order: a level picked in session shows the
+    // document again with the decision, and that one is saved too (last).
+    const docs = extractChangeOptions(p.assistantText).filter((d) => d.markdown.trim().length > 0);
+    if (docs.length === 0)
+        return false;
+    // Set before the save question, so a declined save still routes the level reply.
+    if (p.session && !p.subagent)
+        p.session.lastChangeOptions = { object: docs[docs.length - 1].object, skill: p.skill };
+    try {
+        const { offerChangeOptionsSave } = await import('../projects/document-save.js');
+        const { loadConfig, resolveWordCopy } = await import('../config/loader.js');
+        await offerChangeOptionsSave({
+            docs: docs.map((d) => ({ object: d.object, markdown: d.markdown })), cwd: process.cwd(), today: localToday(),
+            sapSystem: p.sapSystem ?? null,
+            ...(p.sessionId ? { sessionId: p.sessionId } : {}),
+            ...(p.operator ? { operator: p.operator } : {}),
+            headless: isHeadless(), wordCopy: resolveWordCopy(await loadConfig()), confirm, emit: p.emit,
+        });
+    }
+    catch (e) {
+        p.emit(formatInfo(`Not saved. ${e.message}`).trimEnd());
+    }
+    return true;
+}
 export async function maybeOfferSave(p) {
     if (p.assistantText.trim().length === 0)
         return;
+    // Change options (2026-10-23): the marker check runs first, for every skill.
+    if (await maybeOfferChangeOptions(p, p.confirm ?? inkAwareConfirm))
+        return;
     // Word export (2026-10-19): reviews and handovers are prose documents, not
     // envelopes. They get a Markdown save under cspeach-out and the Word
     // question (projects/document-save.ts). Nothing below this branch changes
@@ -577,7 +620,12 @@ export async function maybeOfferSave(p) {
         // business questions stay open for a consultant to answer in the viewer.
         // Uses inkAwarePrompt directly (NOT the save hook's blanket-'y' headless
         // prompt): in headless it returns '' → declined, so nothing is written.
+        // Task 16 (F-M): what the form recorded reaches the model as one note on
+        // its next call (session.blockerAnswersNote, sent by runTurn). Main turns
+        // with a session only; declined / not offered / not saved → no note.
         if (savedPath && saveSkill === 'abap-spec-gap') {
+            const noteSession = p.session && !p.subagent ? p.session : undefined;
+            let outcomes;
             await offerAnswerBlockers({
                 path: savedPath,
                 identity: getAuthorIdentity(),
@@ -585,7 +633,14 @@ export async function maybeOfferSave(p) {
                 confirm: inkAwareConfirm,
                 choose: inkAwareChoose,
                 log: (...lines) => lines.forEach((l) => p.emit(l)),
+                ...(noteSession ? { onOutcomes: (o) => { outcomes = o; } } : {}),
             });
+            if (noteSession && outcomes) {
+                // The path is shown against the read tool's base (ctx.cwd), so the model opens it with file_read.
+                const note = blockerAnswersNote({ path: savedPath, cwd: p.readCwd ?? process.cwd(), outcomes });
+                if (note)
+                    noteSession.blockerAnswersNote = note;
+            }
         }
         // App lane routing (Task 7) — the harness-owned /abap-app chain. Built
         // from the exact saved path, never from model text. Outside an app flow
@@ -1068,7 +1123,12 @@ ${imageExpansion.error}`));
     if (mainTurn && !inlineTurn && historyHoldsInline(session.messages)) {
         playbookLine = isChatSkill(params.skill) ? playbookLineSystemChat() : playbookLineSystem(params.skill);
     }
-    const sessionContextBlock = composeSessionContextBlock([sapSystemBlock, sapProfileBlock, standardsBlock, switchNote, playbookLine]);
+    // Task 16 (F-M) — what the blocker form recorded after the last turn: once,
+    // on the next main turn (never a sub-agent or reader child), then dropped.
+    const blockerNote = mainTurn && session.blockerAnswersNote
+        ? `<blocker_answers>\n${session.blockerAnswersNote}\n</blocker_answers>`
+        : '';
+    const sessionContextBlock = composeSessionContextBlock([sapSystemBlock, sapProfileBlock, standardsBlock, switchNote, blockerNote, playbookLine]);
     // Deterministically extract structured facts from the user's prompt
     // (package, transport, object names, environment hint, create intent)
     // and prepend them as an XML `<session_context>` block. The model reads
@@ -1084,11 +1144,12 @@ ${imageExpansion.error}`));
     // Final batch 1 — a caller-enriched message still gets the switch note,
     // inside its own <session_context> block.
     // Stage 1A — the <playbook> line rides the same way ('' ⇒ unchanged).
-    const callerNotes = composeSessionContextBlock([switchNote, playbookLine]);
+    const callerNotes = composeSessionContextBlock([switchNote, blockerNote, playbookLine]);
     const enriched = userMessageForLLM.startsWith('<session_context>')
         ? (callerNotes ? userMessageForLLM.replace('<session_context>', `<session_context>\n  ${callerNotes}`) : userMessageForLLM)
         : enrichUserMessage(userMessageForLLM, sessionContextBlock);
     const switchNoteUsed = switchNote !== '' && enriched.includes(switchNote);
+    const blockerNoteUsed = blockerNote !== '' && enriched.includes(blockerNote);
     // Phase 2 of Track B — opt-in project-context enrichment, gated by
     // CSPEACH_PROJECT_CONTEXT=on. Default OFF: production behavior is
     // identical to today. When on, the rendered <project_context> block
@@ -1116,6 +1177,7 @@ ${imageExpansion.error}`));
         projectContextBlock = await maybeBuildProjectContext({
             cwd: params.ctx.cwd,
             sapConnection,
+            emit: (line) => emit(chalk.dim(line)),
         });
     }
     const contextualContent = projectContextBlock
@@ -1137,6 +1199,9 @@ ${imageExpansion.error}`));
         lane: session.lane,
         tool_set_skill: session.tool_set_skill,
         turn_seq: session.turn_seq,
+        // Task 16 fix round 1 (I-1, R17): the one-time notes this turn consumes.
+        systemSwitchNote: session.systemSwitchNote,
+        blockerAnswersNote: session.blockerAnswersNote,
     };
     let round0Steers = [];
     // Images (if any) ride as blocks ahead of the text; with none this is the
@@ -1152,6 +1217,8 @@ ${imageExpansion.error}`));
     // it is in a pushed user message.
     if (switchNoteUsed)
         delete session.systemSwitchNote;
+    if (blockerNoteUsed)
+        delete session.blockerAnswersNote;
     if (imageExpansion.images.length > 0 && params.provider.name === 'local-openai-compat') {
         // The local (OpenAI-compatible) provider keeps text blocks only.
         emit(chalk.dim('(local model: the image is not sent — the model gets the text only)'));
@@ -1196,9 +1263,14 @@ ${imageExpansion.error}`));
     const contextTools = withoutTools(toolsForContext(listTools(), params.ctx), hiddenSapTools);
     // Task 18 fixes M4 / M5 — no read_agent for an agent_run child, and none
     // when a reader would have no real read tool (standalone, file tools off).
-    const visibleTools = params.ctx.subagent || !hasReaderReadTools(new Set(contextTools.map((t) => t.name)))
+    const readerVisible = params.ctx.subagent || !hasReaderReadTools(new Set(contextTools.map((t) => t.name)))
         ? contextTools.filter((t) => t.name !== READ_AGENT)
         : contextTools;
+    // Task 18 fix round 1 (item 5) — an agent_run child never records spec
+    // answers: it could race the blocker form on the same file.
+    const visibleTools = params.ctx.subagent
+        ? readerVisible.filter((t) => t.name !== SPEC_ANSWERS_RECORD_TOOL)
+        : readerVisible;
     // Final review C1 (controller ruling) — deferred shapes only for a model on
     // the probe-proven allow-list, decided by the model actually sent on the
     // call (a plan-tier sonnet override, a haiku child or claude-opus-4-8 ⇒
@@ -1254,13 +1326,7 @@ ${imageExpansion.error}`));
     // Stage 1A — skill_appended goes on the turn's first cost line (a call
     // retried after a prompt-too-long recovery logs no line of its own).
     let skillAppendedLogged = false;
-    const surfaceStarters = (skill) => {
-        const msg = buildSkillToolAddition({
-            skill,
-            toolLoading: session.tool_loading,
-            toolList: turnTools,
-            messages: session.messages,
-        });
+    const pushToolAddition = (msg) => {
         if (msg)
             session.messages.push(msg);
         if (msg && inlineTurn) {
@@ -1270,10 +1336,24 @@ ${imageExpansion.error}`));
             }
         }
     };
+    const surfaceStarters = (skill) => {
+        pushToolAddition(buildSkillToolAddition({
+            skill,
+            toolLoading: session.tool_loading,
+            toolList: turnTools,
+            messages: session.messages,
+        }));
+    };
     // A turn on a different skill than the one the array was built for: the
     // user message was just pushed, so the system message follows it.
     if (params.skill !== session.tool_set_skill)
         surfaceStarters(params.skill);
+    // Task 18 fix round 1 (item 7) — the blocker note names spec_answers_record:
+    // on the turn that carries it, surface the tool when this list defers it
+    // (loaded already, static, or surfaced before: nothing is added).
+    if (blockerNoteUsed && session.tool_loading !== 'static' && !surfacedToolNames(session.messages).has(SPEC_ANSWERS_RECORD_TOOL)) {
+        pushToolAddition(buildToolAdditionMessage([SPEC_ANSWERS_RECORD_TOOL], deferredNames(turnTools)));
+    }
     /**
      * key: `${tool_name}:${object}` — consecutive failures per (tool, target).
      * For object-identifying tools (sap_set_source / sap_activate / etc.) the
@@ -1446,6 +1526,11 @@ ${imageExpansion.error}`));
             session.lane = preTurnState.lane;
             session.tool_set_skill = preTurnState.tool_set_skill;
             session.turn_seq = preTurnState.turn_seq;
+            // The re-run turn still gets the one-time notes (they were dropped on push).
+            if (preTurnState.systemSwitchNote !== undefined)
+                session.systemSwitchNote = preTurnState.systemSwitchNote;
+            if (preTurnState.blockerAnswersNote !== undefined)
+                session.blockerAnswersNote = preTurnState.blockerAnswersNote;
             // Steering drained in round 0 goes back to the queue, ahead of any
             // typed since, so the re-run turn still sees it.
             // LT-15 Task 4 — the round-0 ones were shown as "↳ read": marked, so the
@@ -1551,7 +1636,7 @@ ${imageExpansion.error}`));
                 // that ended before the model answered the tool_addition.
                 placeSystemMessagesInPlace(session.messages);
                 if (healedOrphans > 0) {
-                    emit(chalk.dim(`(repaired ${healedOrphans} tool call(s) cut off by an interruption — the model will redo them)`));
+                    emit(chalk.dim(closedOffStepsLine(healedOrphans)));
                 }
                 // Task 4 — effort only from an explicit act (ruling F2); never to a
                 // model that rejects it (probe P1: claude-haiku-4-5* ⇒ 400).
@@ -2281,10 +2366,13 @@ ${imageExpansion.error}`));
                         model: params.modelOverride ?? resolveModelRole('session_default', cfg) ?? session.model ?? 'unknown',
                         emit,
                         sapSystem: session.sap_system,
+                        ...(params.operator ? { operator: params.operator } : {}),
+                        sessionId: session.id,
                         ...(params.ctx.subagent ? { subagent: true } : {}),
                         ...(session.awaitingSkillAnswer === true ? { awaitingAnswer: true } : {}),
                         ...(getJourneyFlow(session) || getAppFlow(session) ? { guided: true } : {}),
                         session,
+                        readCwd: params.ctx.cwd,
                         promotedFrom: promotedFromForSave,
                         ...(promotedFromPathForSave ? { promotedFromPath: promotedFromPathForSave } : {}),
                         ...(() => {

package/dist/agent/maybe-build-project-context.js

@@ -30,7 +30,7 @@
  *    Phase 3. Today the cache is process-lifetime; users get a fresh
  *    context next CLI invocation.
  */
-import { getProjectContext, renderProjectContext } from '../project-context/index.js';
+import { getProjectContext, renderProjectContextCapped } from '../project-context/index.js';
 /**
  * The env-var name that gates this enrichment. Treated case-insensitively
  * but value comparison is exact ("on" only — anything else is OFF).
@@ -70,6 +70,8 @@ export function resetProjectContextCache() {
 export function __resetProjectContextCacheForTests() {
     resetProjectContextCache();
 }
+/** The one plain line shown when the folder picture was shortened. */
+export const PROJECT_CONTEXT_CUT_LINE = 'This folder is very large, so we work from a shortened picture of it.';
 /**
  * Returns the rendered <project_context> block for splicing into the
  * user message, or '' when the flag is off / no context was detectable.
@@ -94,7 +96,14 @@ export async function maybeBuildProjectContext(options) {
         const ctx = await getProjectContext(options.cwd, {
             sapConnection: options.sapConnection ?? null,
         });
-        cachedBlock = ctx ? renderProjectContext(ctx) : '';
+        const rendered = ctx ? renderProjectContextCapped(ctx) : { block: '', cut: false };
+        cachedBlock = rendered.block;
+        if (rendered.cut) {
+            try {
+                options.emit?.(PROJECT_CONTEXT_CUT_LINE);
+            }
+            catch { /* a display failure never drops the block */ }
+        }
     }
     catch (err) {
         // getProjectContext is documented as never-throws; reaching this

package/dist/agent/repair-partial.js

@@ -210,6 +210,15 @@ export const INTERRUPTED_TOOL_RESULT = 'This tool call did not complete — the
  * SAP change. Same shape and flags as INTERRUPTED_TOOL_RESULT (is_error: true).
  */
 export const STOPPED_BEFORE_START_RESULT = 'This tool call was stopped before anything ran — no change was made in SAP. Ask again if it is still needed.';
+/**
+ * 1.1.53 item 10 — the dim line shown when healOrphanToolUses closed off steps
+ * cut by an earlier stop. Plain words for the person; no internals.
+ */
+export function closedOffStepsLine(n) {
+    return n === 1
+        ? '(we closed off a step that was stopped earlier)'
+        : `(we closed off ${n} steps that were stopped earlier)`;
+}
 /**
  * LT-15 D6 (review M5) — the same, for the write pipeline's second guard: by
  * then the approval was spent and SAP was read (a local snapshot may exist),

package/dist/agent/tool-dispatch.js

@@ -113,8 +113,12 @@ export async function dispatchTool(name, args, ctx) {
     }
     // Final review I-3 — the D11 re-check can take seconds of SAP reads; an Esc
     // in that window must stop the call here, not let the handler run "as unknown".
-    if (ctx.signal?.aborted)
-        return { content: INTERRUPTED_TOOL_RESULT, is_error: true };
+    // 1.1.53 item 10 — the handler has not run (the gate only reads). A tool
+    // that cannot change SAP (hand_off, reads, local files) says so plainly; a
+    // tool that can change SAP keeps the "effect unknown, check" safety text.
+    if (ctx.signal?.aborted) {
+        return { content: isChatRefusedTool(tool) ? INTERRUPTED_TOOL_RESULT : STOPPED_BEFORE_START_RESULT, is_error: true };
+    }
     // L1-6 R1-6 (owner decision 2026-09-21) — a call that hands the stored SAP
     // login to a local child process ALWAYS asks a human, once per session per
     // alias, even as the first mutating call of a turn (where Rule 8 below stays

package/dist/approvals/op-labels.js

@@ -3,6 +3,7 @@ import { sanitizeControlChars } from '../renderer/sanitize.js';
 import { wrapRows } from '../renderer/wrap-rows.js';
 import { shownUpTo } from '../register/atc-file.js';
 import { transportForWrite } from '../register/project-transport.js';
+import { decodeDisplayEntities, decodeDisplayBlock } from '../renderer/html-entities.js';
 /**
  * Human-readable operation + object labels for the approval surfaces.
  *
@@ -103,7 +104,7 @@ export function affectsLine(change) {
     // line comes from the change's op and type, never from a model-supplied field.
     if (change.op === 'delete' && typeCode(change.type) === 'FUGR')
         return FUGR_DELETE_LINE;
-    const t = sanitizeControlChars(String(change.affects ?? '')).trim();
+    const t = decodeDisplayEntities(sanitizeControlChars(String(change.affects ?? ''))).trim();
     return t ? `Affects: ${t}` : null;
 }
 /** Task 7 — the longest behaviour text a card shows, and the most rows it takes. */
@@ -121,7 +122,8 @@ export function behaviourText(change) {
     // shownUpTo drops whole escape sequences first (a lone sanitizeControlChars
     // pass would leave their '[31m' tails), then every control character.
     // The cut counts code points, so it never leaves half a surrogate pair.
-    const flat = Array.from(shownUpTo(String(change.behaviour ?? ''), Number.POSITIVE_INFINITY));
+    // 1.1.53 item 5: entities decode before the cut, so the cut counts what shows.
+    const flat = Array.from(decodeDisplayEntities(shownUpTo(String(change.behaviour ?? ''), Number.POSITIVE_INFINITY)));
     const t = flat.length > BEHAVIOUR_MAX ? `${flat.slice(0, BEHAVIOUR_MAX).join('')}…` : flat.join('');
     if (!t || NOTHING_CHANGES.test(t))
         return null;
@@ -209,7 +211,8 @@ export function displayTransport(op, explicit, session, owning, project) {
  * modal's [v] view and the classic prompt's View source branch.
  */
 export function toSourceLines(content) {
-    return content
+    // 1.1.53 item 5: display decode of the whole block (kept as written when it has a raw field symbol or markup).
+    return decodeDisplayBlock(content)
         .split('\n')
         .filter((l) => !l.startsWith('@@') && !l.startsWith('+++') && !l.startsWith('---'))
         .map((l) => l.replace(/^[+-] ?/, ''));

package/dist/approvals/render.js

@@ -14,6 +14,7 @@ import { paint } from '../renderer/theme.js';
 import { sanitizeControlChars } from '../renderer/sanitize.js';
 import { planRows, looksLikeUnifiedDiff } from './visible-changes.js';
 import { withSpinnerSuspended } from '../renderer/tool-widget.js';
+import { decodeDisplayEntities, decodeDisplayBlock } from '../renderer/html-entities.js';
 // Piece 2 §1.1 — the brand accent comes from the theme role, not a legacy hex.
 const peach = (s) => paint('brand', s);
 /**
@@ -294,11 +295,11 @@ export async function renderPerChangeApproval(change, effectiveRisk, transport)
     // proper diff content.
     if (change.diff) {
         if (looksLikeUnifiedDiff(change.diff)) {
-            console.log('\n' + colorizeDiff(change.diff) + '\n');
+            console.log('\n' + colorizeDiff(decodeDisplayBlock(change.diff)) + '\n');
         }
         else {
             console.log('\n' + chalk.yellow(`${getGlyphs().attention}  Model did not provide a unified diff — only a description:`));
-            console.log(chalk.dim(change.diff) + '\n');
+            console.log(chalk.dim(decodeDisplayEntities(change.diff)) + '\n');
         }
     }
     else {

package/dist/commands/plan-chain.js

@@ -34,7 +34,7 @@ import { collectPlannedObjects, plannedObjectFacts } from '../projects/plan-obje
 import { isDeployPhase } from '../projects/plan-lane.js';
 import { askDeployCard } from './deploy-card.js';
 import { decideNextPhaseGate, getAndResetPlanPhaseSubagentDispatches, getAndResetPlanDeviation, } from './plan-gate.js';
-import { applyAuditResult, applyPhaseResolution, buildResumeCommand, offerNextPhaseAutoRun, } from './plan-resume.js';
+import { applyAuditResult, applyPhaseResolution, buildResumeCommand, offerNextPhaseAutoRun, planBuildTransport, } from './plan-resume.js';
 import { formatFailure, formatInfo } from '../renderer/notice-shape.js';
 import { clean } from '../renderer/tool-labels.js';
 import { runBatchAudit, pendingAuditPhaseIds, selectPlanCardAction, } from './plan-batch-audit.js';
@@ -251,7 +251,7 @@ async function postPhaseChain(args) {
             const built = after.content.phases.every((q) => isPhaseSatisfiedForRun(st[q.id], q.audit));
             const nextAfter = computeNextPhaseForRun(after.content.phases, st);
             if (built && !nextAfter) {
-                args.log('', ...planCompletionLines(after.content.phases));
+                args.log('', ...planCompletionLines(after.content.phases, undefined, planBuildTransport(after.content.phases)));
                 // Step 2 (C5): a rebuild whose plan this is now reads "built, not yet checked".
                 await afterPlanComplete(cur);
                 args.log(`Plan file: ${savedLocation(cur, args.cwd)}`);

package/dist/commands/plan-resume.js

@@ -521,7 +521,7 @@ export async function preparePlanResume(args) {
             // C2 (D24): a finished UI-less backend stack chains to /abap-fiori-build
             // with the exact binding name — the marketed idea→app story must not
             // silently end at the service binding.
-            args.log(...planCompletionLines(content.phases));
+            args.log(...planCompletionLines(content.phases, undefined, planBuildTransport(content.phases)));
         }
         else {
             const blocked = content.phases.filter((p) => statuses[p.id] === 'blocked').map((p) => titleOfId(p.id));
@@ -1102,7 +1102,7 @@ export async function finishPlanResume(args) {
         args.log(renderPlanProgressLine({ content: { ...extract.content, phases: provisionalPhases }, statuses, currentId: null }));
         if (!next && provisionalPhases.every((p) => isPhaseSatisfied(statuses[p.id], p.audit))) {
             // C2 (D24): same chain as preparePlanResume — single source in plan-run.ts.
-            args.log(...planCompletionLines(provisionalPhases));
+            args.log(...planCompletionLines(provisionalPhases, undefined, planBuildTransport(provisionalPhases)));
             // Step 2 (C5): the live run finished — a rebuild whose plan this is reads built.
             // Not at the re-opened complete plan above (preparePlanResume).
             await afterPlanComplete(args.prepared.path);

package/dist/commands/plan-startup.js

@@ -17,7 +17,7 @@ import { basename, dirname } from 'node:path';
 import { readProjectFile } from '../projects/status.js';
 import { parsePlanContent } from '../projects/plan-schema.js';
 import { computeNextPhaseForRun, isPhaseSatisfiedForRun, phaseDisplayTitle, statusesFromItems, } from '../projects/plan-run.js';
-import { collectPlannedObjects, plannedObjectFacts, planGrantFactLines } from '../projects/plan-objects.js';
+import { collectPlannedObjects, plannedObjectFacts, planGrantCoversWrites, planGrantFactLines, planTransportFact, } from '../projects/plan-objects.js';
 import { adoptPlanTransportOnResume, buildResumeCommand, planBuildTransport } from './plan-resume.js';
 import { newestPlanFamilyFiles } from '../session/recap.js';
 import { recordCliCard } from '../session/cli-record.js';
@@ -100,8 +100,8 @@ function objectListFacts(objects, transport, grantable) {
     return [
         `It will create or change these ${objects.length} SAP object${objects.length === 1 ? '' : 's'}:`,
         ...plannedObjectFacts(objects).map((r) => `  ${r}`),
-        `Transport: ${transport ?? 'a new one for this build'}`,
-        ...(grantable ? planGrantFactLines() : ['CSPeach asks before each write.']),
+        planTransportFact(transport, objects),
+        ...(grantable && planGrantCoversWrites(transport, objects) ? planGrantFactLines() : ['CSPeach asks before each write.']),
     ];
 }
 const OBJECT_LIST_FAILED = 'The object list could not be approved. Each SAP write asks first.';

package/dist/docx/doc-meta.js

@@ -11,6 +11,7 @@ const KIND_TITLE = {
     'spec-gap': 'Spec gaps', design: 'Design', estimate: 'Estimate', plan: 'Plan',
     'upgrade-scan': 'Upgrade scan', 'upgrade-report': 'Upgrade report',
     answer: 'CSPeach answer', conversation: 'CSPeach conversation',
+    'change-options': 'Change options',
 };
 /** Z/Y objects, SAP-style names: ZCL_X, ZFI_DUP_INVOICE_CHECK, Z_REPORT, /NS/ZCL_X. */
 const OBJECT_RE = /(?<![\w/])((?:\/[A-Z0-9]+\/)?[ZY][A-Z0-9_]{2,39})\b/;

package/dist/docx/markdown-to-docx.js

@@ -67,6 +67,8 @@ function titlePage(meta) {
         facts.push(`Session: ${meta.session}`);
     if (meta.person)
         facts.push(`Signed in as: ${meta.person}`);
+    if (meta.preparedFor)
+        facts.push(`Prepared for: ${meta.preparedFor}`);
     return [
         new Paragraph({ text: meta.title, heading: HeadingLevel.TITLE, spacing: { before: 2400 } }),
         ...facts.map((f) => new Paragraph({ text: f })),

package/dist/lane/app-chain.js

@@ -18,7 +18,7 @@ import { readProjectFile } from '../projects/status.js';
 import { looksLikeSpecGap } from '../projects/extract-spec-gap.js';
 import { parsePlanContent } from '../projects/plan-schema.js';
 import { adoptPlanTransportOnResume, buildResumeCommand, planBuildTransport } from '../commands/plan-resume.js';
-import { collectPlannedObjects, plannedObjectFacts, planGrantFactLines } from '../projects/plan-objects.js';
+import { collectPlannedObjects, plannedObjectFacts, planGrantCoversWrites, planGrantFactLines, planTransportFact, } from '../projects/plan-objects.js';
 import { phaseDisplayTitle } from '../projects/plan-run.js';
 import { isDeployPhase } from '../projects/plan-lane.js';
 import { installPlanGrant, planGrantAllowed } from '../approvals/plan-grant.js';
@@ -255,12 +255,15 @@ export function buildStartCardFacts(content, opts = {}) {
     // The plan's recorded transport, else the session's current one: the grant
     // is minted with it bound, so the card names it.
     const transport = planBuildTransport(content.phases);
+    // A local-only plan with no transport: the grant covers no write (it needs
+    // a bound transport), so the card says each write asks.
+    const covers = opts.grant !== false && planGrantCoversWrites(transport, objects);
     const facts = [`Steps: ${content.phases.map((p) => phaseDisplayTitle(p, content.phases)).join(' · ')}`];
     if (objects.length > 0) {
         facts.push(`It will create or change these ${objects.length} SAP object${objects.length === 1 ? '' : 's'}:`);
         facts.push(...plannedObjectFacts(objects).map((r) => `  ${r}`));
-        facts.push(`Transport: ${transport ?? 'a new one for this build'}`);
-        if (opts.grant === false)
+        facts.push(planTransportFact(transport, objects));
+        if (!covers)
             facts.push('CSPeach asks before each write.');
         else
             facts.push(...planGrantFactLines());
@@ -273,7 +276,7 @@ export function buildStartCardFacts(content, opts = {}) {
     }
     // The closing fact follows what was granted: with no object-list approval
     // every SAP write asks, so it never promises "only a write not on the list".
-    facts.push(opts.grant !== false && objects.length > 0
+    facts.push(covers && objects.length > 0
         ? 'It runs every step and stops only for your answers, a write not on the list, a failed check, or the deploy.'
         : 'It runs every step and stops for your answers, each SAP write, a failed check, or the deploy.');
     return { facts, objects, ...(transport ? { transport } : {}) };
@@ -314,8 +317,12 @@ export async function afterSpecGapSave(h, savedPath) {
     h.queueNext(cmd, APP_ORIGIN);
     h.emit(STEP_2);
 }
-/** The result was written but could not be read as a spec-gap: the flow waits at step 1. */
-export const SPEC_GAP_NOT_SAVED_LINE = (specToken) => `The /abap-app run is paused at step 1: the spec-gap result could not be saved. Ask CSPeach to "re-issue the spec gap in the standard structure", or run /abap-app ${shownToken(specToken, 'spec file')} again.`;
+/**
+ * The result was written but could not be read as a spec-gap: the flow waits at step 1.
+ * Task 17 fix round 1: it follows the save step's plain "We couldn't save this…"
+ * line, so it says the same thing in the same voice, with no phrase to type.
+ */
+export const SPEC_GAP_NOT_SAVED_LINE = (specToken) => `The /abap-app run is paused at step 1 until the spec-gap result is saved. When we write it again in the usual layout, the run goes on. To start over, run /abap-app ${shownToken(specToken, 'spec file')}.`;
 /** The user said No to the save: the run ends here. */
 export const SPEC_GAP_DECLINED_LINE = (specToken) => `The /abap-app run stopped at step 1 because the spec-gap result was not saved. To start again, run /abap-app ${shownToken(specToken, 'spec file')}.`;
 /**

package/dist/one-shot.js

@@ -82,6 +82,7 @@ import './tools/project/upgrade_merge_progress.js';
 import './tools/project/team_findings.js';
 import './tools/project/team_estate.js';
 import './tools/project/team_lane_move.js';
+import './tools/project/spec_answers_record.js';
 import './tools/subagent/_background-shared.js';
 import './tools/subagent/background_run.js';
 import './tools/subagent/monitor_emit.js';

package/dist/project-context/conventions.js

@@ -25,6 +25,7 @@
  */
 import { promises as fs } from 'node:fs';
 import * as path from 'node:path';
+import { MAX_ENTRIES_VISITED } from './index-files.js';
 /**
  * Default conventions used when no source has anything to say. Picked
  * to match the most common conventions in modern SAP / web projects:
@@ -268,8 +269,11 @@ async function inferStyleFromExistingFiles(cwd) {
  * node_modules, .git, dist, build, .cspeach output dirs. Prefers files
  * likely to reflect human-authored style (ts, js, abap, cds, xml).
  */
-async function findSampleFiles(cwd, limit) {
+export async function findSampleFiles(cwd, limit, maxEntries = MAX_ENTRIES_VISITED) {
     const out = [];
+    // 1.1.53 item 12 — the same entries budget as the index walk: a folder of
+    // ~283,000 empty folders held no sample file and was walked to the end.
+    let entriesLeft = maxEntries;
     const TEXT_EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx', '.abap', '.cds', '.xml', '.yaml', '.yml'];
     const SKIP_DIRS = new Set(['node_modules', '.git', 'dist', 'build', '.cspeach', '.abapforge']);
     async function walk(d) {
@@ -285,6 +289,9 @@ async function findSampleFiles(cwd, limit) {
         for (const ent of entries) {
             if (out.length >= limit)
                 return;
+            if (entriesLeft <= 0)
+                return;
+            entriesLeft--;
             if (ent.isFile()) {
                 if (TEXT_EXTENSIONS.some((ext) => ent.name.endsWith(ext))) {
                     out.push(path.join(d, ent.name));