@cspeach/cli 1.1.50 → 1.1.52

package/dist/agent/providers/ai-hub-provider.js

@@ -1,7 +1,7 @@
 import Anthropic from '@anthropic-ai/sdk';
 import keychain from '../../auth/keychain.js';
 import { createAuthedSkillSource, defaultBearer } from '../../skills/source-authed.js';
-import { delegateSkillName, requireSkillName, toLegacyShape, withoutRoleHeader } from '../provider-shape.js';
+import { delegateSkillName, requireSkillName, skillInlineFromHeaders, toLegacyShape, withoutRoleHeader } from '../provider-shape.js';
 import { systemPromptForSkill } from '../system-prompt.js';
 import { styleFromHeaders } from '../style.js';
 import { levelFromHeaders } from '../level.js';
@@ -28,7 +28,7 @@ export function createAiHubProvider(cfg, getBearer = defaultBearer) {
             const skillName = requireSkillName(options, 'AI Hub');
             const token = await getToken();
             // Task 18 — the `_reader` header uses the pinned reader prompt, no lookup.
-            const system = await systemPromptForSkill(skillName, skillSource, { cacheMarkers: AI_HUB_PROFILE.cacheMarkers }, delegateSkillName(options), styleFromHeaders(options.headers), levelFromHeaders(options.headers));
+            const system = await systemPromptForSkill(skillName, skillSource, { cacheMarkers: AI_HUB_PROFILE.cacheMarkers, inline: skillInlineFromHeaders(options) }, delegateSkillName(options), styleFromHeaders(options.headers), levelFromHeaders(options.headers));
             const request = {
                 ...toLegacyShape(params),
                 system,

package/dist/agent/providers/azure-provider.js

@@ -15,7 +15,7 @@ import Anthropic from '@anthropic-ai/sdk';
 import { sendsEffortFor } from '../connection-profile.js';
 import { AZURE_PROFILE } from '../azure-profile.js';
 import { createAuthedSkillSource, defaultBearer } from '../../skills/source-authed.js';
-import { delegateSkillName, headersForProfile, requireSkillName, withoutToolChanges, withSkillPrompt } from '../provider-shape.js';
+import { delegateSkillName, headersForProfile, requireSkillName, skillInlineFromHeaders, withoutToolChanges, withSkillPrompt } from '../provider-shape.js';
 import { systemPromptForSkill } from '../system-prompt.js';
 import { styleFromHeaders } from '../style.js';
 import { levelFromHeaders } from '../level.js';
@@ -66,7 +66,7 @@ export function createAzureProvider(cfg, getBearer = defaultBearer, deps = {}) {
             throw new AzureConnectionRefusedError(v.message);
         const conn = cached.connection;
         const skillName = requireSkillName(options, 'Azure');
-        const system = await systemPromptForSkill(skillName, skillSource, { cacheMarkers: profile.cacheMarkers }, delegateSkillName(options), styleFromHeaders(options.headers), levelFromHeaders(options.headers));
+        const system = await systemPromptForSkill(skillName, skillSource, { cacheMarkers: profile.cacheMarkers, inline: skillInlineFromHeaders(options) }, delegateSkillName(options), styleFromHeaders(options.headers), levelFromHeaders(options.headers));
         const base = profile.toolChanges ? params : withoutToolChanges(params);
         const family = familyFromTable(params.model, conn.deployments);
         const body = withAzureEffort(shapeForAzure(withSkillPrompt(base, system, { cacheMarkers: profile.cacheMarkers }), profile), profile, roleOf(options.headers), family);

package/dist/agent/providers/byok-provider.js

@@ -1,7 +1,7 @@
 import Anthropic from '@anthropic-ai/sdk';
 import keychain from '../../auth/keychain.js';
 import { createAuthedSkillSource, defaultBearer } from '../../skills/source-authed.js';
-import { delegateSkillName, modelAcceptsFallbacks, requiredBetas, requireSkillName, withoutInternalHeaders, withSkillPrompt } from '../provider-shape.js';
+import { delegateSkillName, skillInlineFromHeaders, modelAcceptsFallbacks, requiredBetas, requireSkillName, withoutInternalHeaders, withSkillPrompt } from '../provider-shape.js';
 import { systemPromptForSkill } from '../system-prompt.js';
 import { styleFromHeaders } from '../style.js';
 import { levelFromHeaders } from '../level.js';
@@ -21,7 +21,7 @@ export function createByokProvider(cfg, getBearer = defaultBearer) {
         const skillName = requireSkillName(options, 'BYOK');
         const key = await getKey();
         // Task 18 — the `_reader` header uses the pinned reader prompt, no lookup.
-        const system = await systemPromptForSkill(skillName, skillSource, { cacheMarkers: BYOK_PROFILE.cacheMarkers }, delegateSkillName(options), styleFromHeaders(options.headers), levelFromHeaders(options.headers));
+        const system = await systemPromptForSkill(skillName, skillSource, { cacheMarkers: BYOK_PROFILE.cacheMarkers, inline: skillInlineFromHeaders(options) }, delegateSkillName(options), styleFromHeaders(options.headers), levelFromHeaders(options.headers));
         // Task 6 — opt into server-side fallback, only for the families probe
         // P3 proved (allow-list); requiredBetas adds its beta.
         const prompted = withSkillPrompt(params, system, { cacheMarkers: BYOK_PROFILE.cacheMarkers });

package/dist/agent/providers/local-provider.js

@@ -2,7 +2,7 @@
 const loadOpenAI = async () => (await import('openai')).default;
 import crypto from 'node:crypto';
 import { createAuthedSkillSource, defaultBearer } from '../../skills/source-authed.js';
-import { delegateSkillName, requireSkillName } from '../provider-shape.js';
+import { delegateSkillName, requireSkillName, skillInlineFromHeaders } from '../provider-shape.js';
 import { systemPromptForSkill } from '../system-prompt.js';
 import { styleFromHeaders } from '../style.js';
 import { levelFromHeaders } from '../level.js';
@@ -29,7 +29,7 @@ export function createLocalProvider(cfg, getBearer = defaultBearer) {
             // message (no cache markers). anthropicParamsToOpenAI copies only
             // max_tokens / messages / system, so newer fields never reach the endpoint.
             const skillName = requireSkillName(options, 'Local');
-            const system = await systemPromptForSkill(skillName, skillSource, { cacheMarkers: false }, delegateSkillName(options), styleFromHeaders(options.headers), levelFromHeaders(options.headers));
+            const system = await systemPromptForSkill(skillName, skillSource, { cacheMarkers: false, inline: skillInlineFromHeaders(options) }, delegateSkillName(options), styleFromHeaders(options.headers), levelFromHeaders(options.headers));
             const OpenAI = await loadOpenAI();
             const sdk = new OpenAI({ apiKey: 'local-ignored', baseURL });
             const openAiParams = anthropicParamsToOpenAI({ ...params, system }, model);

package/dist/agent/repair-partial.js

@@ -204,6 +204,18 @@ export function isPartialJsonApiError(err) {
 /** Result text for a tool call whose real result was lost to an interruption. */
 export const INTERRUPTED_TOOL_RESULT = 'This tool call did not complete — the turn was interrupted before its result was recorded. ' +
     'Its effect is unknown: check before relying on it, and re-run it if needed.';
+/**
+ * LT-15 D6 — result text for a tool call stopped (Esc / Ctrl+C) at a point
+ * where the tool KNOWS nothing ran yet: before its card, its WAL entry and any
+ * 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.';
+/**
+ * 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),
+ * but the change itself was not made. Same shape and flags.
+ */
+export const STOPPED_BEFORE_WRITE_RESULT = 'This tool call was stopped before the change was made — nothing was written to SAP. Ask again if it is still needed.';
 /**
  * 2026-09-24 — heal tool_use blocks that have no tool_result after them.
  *

package/dist/agent/skill-block-key.js

@@ -0,0 +1,134 @@
+/**
+ * Stage 1A, Task 1A.2 fix round 1 — the per-install key that proves a
+ * `<skill>` block in the history was written by this CLI.
+ *
+ * A content hash proves only that a block agrees with itself: anyone can
+ * compute sha256(body). So each block the loop writes also carries an
+ * HMAC-SHA256 tag keyed by a random 32-byte secret kept under the CSPeach
+ * home (`<home>/skill-block.key`, 0600 on POSIX, CSPEACH_HOME respected).
+ * Only a block whose tag verifies counts as loaded.
+ *
+ * - The key is created on the first WRITE of a block (`skillBlockKeyForWrite`),
+ *   never by a read: a process that never runs inline creates no file.
+ * - A missing or unreadable key means nothing verifies: the body is simply
+ *   sent again (cost only, never a failed turn).
+ * - A resumed session on the same install still verifies. On another machine
+ *   (another key) every block reads as not loaded, is neutralised in place,
+ *   and each body is sent once more.
+ */
+import { createHmac, randomBytes, timingSafeEqual } from 'node:crypto';
+import fs from 'node:fs';
+import path from 'node:path';
+import { cspeachRoot } from '../config/paths.js';
+const KEY_FILE = 'skill-block.key';
+const KEY_HEX = /^[0-9a-f]{64}$/;
+/** Keys found or made in this process, by the file they live in. */
+const cache = new Map();
+/** Test seam: a fixed key (Buffer), no key (null), or the real file (undefined). */
+let override;
+function keyPath() {
+    return path.join(cspeachRoot(), KEY_FILE);
+}
+function readKeyFile(p) {
+    try {
+        const hex = fs.readFileSync(p, 'utf-8').trim();
+        return KEY_HEX.test(hex) ? Buffer.from(hex, 'hex') : null;
+    }
+    catch {
+        return null;
+    }
+}
+/** The key, if this install has one. Never creates it. */
+export function skillBlockKeyForRead() {
+    if (override !== undefined)
+        return override;
+    const p = keyPath();
+    const hit = cache.get(p);
+    if (hit)
+        return hit;
+    const k = readKeyFile(p);
+    if (k)
+        cache.set(p, k);
+    return k;
+}
+function chmod600(p) {
+    if (process.platform === 'win32')
+        return;
+    try {
+        fs.chmodSync(p, 0o600);
+    }
+    catch { /* best effort */ }
+}
+/**
+ * The key, made on first use. A key file that exists but is not a 32-byte hex
+ * key (corrupt, truncated) is REPLACED here, atomically (temp file + rename),
+ * with one debug line, so inline turns do not re-send bodies forever. Only
+ * this write path creates or replaces the file; reads never do. null when it
+ * cannot be written (the block then never verifies: cost only).
+ */
+export function skillBlockKeyForWrite() {
+    if (override !== undefined)
+        return override;
+    const existing = skillBlockKeyForRead();
+    if (existing)
+        return existing;
+    const p = keyPath();
+    const fresh = `${randomBytes(32).toString('hex')}\n`;
+    try {
+        fs.mkdirSync(path.dirname(p), { recursive: true });
+        if (!fs.existsSync(p)) {
+            // First use. 'wx': another process making it at the same time wins.
+            fs.writeFileSync(p, fresh, { encoding: 'utf-8', mode: 0o600, flag: 'wx' });
+            chmod600(p);
+        }
+        else {
+            const tmp = `${p}.${process.pid}.${randomBytes(4).toString('hex')}.tmp`;
+            try {
+                fs.writeFileSync(tmp, fresh, { encoding: 'utf-8', mode: 0o600 });
+                chmod600(tmp);
+                fs.renameSync(tmp, p);
+            }
+            finally {
+                try {
+                    fs.unlinkSync(tmp);
+                }
+                catch { /* renamed */ }
+            }
+            if (process.env['CSPEACH_DEBUG'] === '1') {
+                process.stderr.write(`[inline] the skill block key at ${p} was not readable; a new key replaced it (earlier blocks are sent again once)\n`);
+            }
+        }
+    }
+    catch {
+        // Another process made it first (EEXIST), or the home is not writable:
+        // read whatever is there now.
+    }
+    return skillBlockKeyForRead();
+}
+/** HMAC-SHA256 (hex) of the parts, joined with NUL. '' when there is no key. */
+export function skillBlockTag(key, parts) {
+    if (!key)
+        return '';
+    return createHmac('sha256', key).update(parts.join('\0'), 'utf8').digest('hex');
+}
+/** Constant-time comparison of two hex tags; a length difference (or a missing tag) is simply false. */
+export function skillBlockTagsEqual(a, b) {
+    const x = Buffer.from(a, 'hex');
+    const y = Buffer.from(b, 'hex');
+    if (x.length === 0 || x.length !== y.length)
+        return false;
+    return timingSafeEqual(x, y);
+}
+/** A short id of the key in use ('none' without one), so a saved scan is redone when the key changes. */
+export function skillBlockKeyId(key) {
+    return key ? createHmac('sha256', key).update('id').digest('hex').slice(0, 16) : 'none';
+}
+/** Test seam. */
+export function __setSkillBlockKeyForTests(k) {
+    override = k;
+    cache.clear();
+}
+/** Test seam: forget keys read in this process (the file stays). */
+export function __clearSkillBlockKeyCache() {
+    cache.clear();
+}

package/dist/agent/steering-queue.js

@@ -1,27 +1,63 @@
-/**
- * Mid-turn steering queue (2026-06-08).
- *
- * While a turn is in flight the user can type a correction and press Enter;
- * the Footer enqueues it here instead of bouncing it. The agent loop drains
- * this at each round boundary and injects the text as a user message before
- * the next createStream, so the model reads the correction and adapts —
- * CC-style "type any time". Module-level singleton, mirroring the
- * pendingDispatch accessor pattern; there is exactly one interactive REPL
- * turn loop at a time.
- */
 const queue = [];
+const listeners = new Set();
+/** Tell every listener the queue changed. A listener that throws is ignored. */
+function notify() {
+    if (listeners.size === 0)
+        return;
+    const snap = steeringSnapshot();
+    for (const fn of [...listeners]) {
+        try {
+            fn(snap);
+        }
+        catch { /* a UI listener must never break the queue */ }
+    }
+}
 /** Add a steer. Trims; ignores empty / whitespace-only input. */
-export function enqueueSteering(text) {
+export function enqueueSteering(text, opts) {
     const t = text.trim();
     if (t.length === 0)
         return;
-    queue.push(t);
+    queue.push({ text: t, alreadyRead: opts?.alreadyRead === true });
+    notify();
 }
 /** Return all queued steers (FIFO) and clear the queue. */
 export function drainSteering() {
-    return queue.splice(0, queue.length);
+    return drainSteeringEntries().map((e) => e.text);
+}
+/** LT-15 Task 4 — drain with each message's already-read mark (the loop's round top). */
+export function drainSteeringEntries() {
+    const out = queue.splice(0, queue.length);
+    if (out.length > 0)
+        notify();
+    return out;
+}
+/** LT-15 Task 4 — drain every waiting message as one text (joined with newlines), or null. */
+export function drainSteeringText() {
+    const all = drainSteering();
+    return all.length > 0 ? all.join('\n') : null;
 }
 /** True when at least one steer is queued. */
 export function hasSteering() {
     return queue.length > 0;
 }
+/** A copy of the waiting messages (FIFO). Changing it never changes the queue. */
+export function steeringSnapshot() {
+    return queue.map((e) => e.text);
+}
+/** Take back the LAST waiting message, or null when nothing waits. */
+export function withdrawLastSteering() {
+    if (queue.length === 0)
+        return null;
+    const t = queue.pop();
+    notify();
+    return t.text;
+}
+/**
+ * Call `fn` with a fresh snapshot after every change (enqueue, drain,
+ * withdraw). Not called for a change that changed nothing. Returns the
+ * unsubscribe function.
+ */
+export function subscribeSteering(fn) {
+    listeners.add(fn);
+    return () => { listeners.delete(fn); };
+}

package/dist/agent/system-prompt.js

@@ -12,8 +12,15 @@ import { READER_SKILL, READER_SYSTEM_PROMPT } from '../tools/subagent/reader-pro
 import { CHAT_SKILL, CHAT_SYSTEM_PROMPT } from './chat-prompt.js';
 import { appendStyleText, DEFAULT_STYLE } from './style.js';
 import { appendLevelText, DEFAULT_LEVEL } from './level.js';
+import { CONVERSATION_SYSTEM_PROMPT } from './conversation-prompt.js';
 /** 2026-10-04 (continuous run) — the phase's delegate skill travels as this header. */
 export const DELEGATE_SKILL_HEADER = 'X-CSPeach-Delegate-Skill';
+/**
+ * Stage 1A, Task 1A.2 — '1' on a main call of an inline session: the system
+ * block is the one conversation prompt and the playbook rides in the
+ * conversation as a <skill> block (agent/inline-skill-block.ts).
+ */
+export const SKILL_INLINE_HEADER = 'X-CSPeach-Skill-Inline';
 /** The line that tells the model how the two bodies relate. Same text in cspeach-proxy. */
 export function delegatePreface(name) {
     return `This plan step is delegated to the ${name} playbook below. Follow it for HOW to build. `
@@ -54,6 +61,14 @@ export function buildChatSystemPrompt(opts, style = DEFAULT_STYLE, level = DEFAU
     // D-K order: style, then level, one block.
     return appendLevelText(appendStyleText([{ type: 'text', text: CHAT_SYSTEM_PROMPT, ...marker }], style), level);
 }
+/**
+ * Stage 1A — the inline session's one system block: the conversation prompt,
+ * then style, then level, in one block (the same order as the chat prompt).
+ */
+export function buildConversationSystemPrompt(opts, style = DEFAULT_STYLE, level = DEFAULT_LEVEL) {
+    const marker = opts.cacheMarkers ? { cache_control: { type: 'ephemeral' } } : {};
+    return appendLevelText(appendStyleText([{ type: 'text', text: CONVERSATION_SYSTEM_PROMPT, ...marker }], style), level);
+}
 /**
  * The system prompt for the skill named in the X-CSForge-Skill header, plus —
  * on a plan phase turn — the delegate playbook named in X-CSPeach-Delegate-Skill.
@@ -65,10 +80,17 @@ export function buildChatSystemPrompt(opts, style = DEFAULT_STYLE, level = DEFAU
  * reader (which reports facts) never gets style. A non-default `level`
  * (§10 D14) follows the style text; developer changes nothing; a reader never
  * gets it.
+ *
+ * Stage 1A — `opts.inline` (the call carried X-CSPeach-Skill-Inline): one
+ * block, the conversation prompt, plus style and level, for every skill name
+ * but `_reader`. No body is fetched (the loop put it in the conversation) and
+ * the delegate is not composed. Absent or false: today's three cases.
  */
 export async function systemPromptForSkill(skillName, skillSource, opts, delegateName, style = DEFAULT_STYLE, level = DEFAULT_LEVEL) {
     if (skillName === READER_SKILL)
         return buildReaderSystemPrompt(opts);
+    if (opts.inline === true)
+        return buildConversationSystemPrompt(opts, style, level);
     if (skillName === CHAT_SKILL)
         return buildChatSystemPrompt(opts, style, level);
     const skill = await skillSource.getSkillBody(skillName);

package/dist/agent/tool-dispatch.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import { getTool, isStandalone } from '../tools/index.js';
 import { NOT_CONNECTED_MESSAGE } from '../sap/offline-adt-client.js';
 import { unreachableCode } from '../sap/unreachable.js';
-import { noteSapUnreachable, unreachableCodeInText, SAP_UNREACHABLE_DIRECTIVE } from '../sap/reachability-state.js';
+import { noteSapUnreachable, unreachableCodeInText, SAP_UNREACHABLE_DIRECTIVE, SAP_UNREACHABLE_NOTE } from '../sap/reachability-state.js';
 import { isPlanPhaseActive } from '../commands/plan-gate.js';
 import { presentSafetyConfirmation } from '../repl/safety-confirm.js';
 import { shouldGateRule8, recordWriteOp, renderPlanSummary, getWriteOpsThisTurn, } from '../repl/rule8-detector.js';
@@ -10,7 +10,7 @@ import { isCredentialHandoverApproved, markCredentialHandoverApproved, } from '.
 import { READER_TOOLS } from '../tools/subagent/reader-prompt.js';
 import { riskOf } from './risk-gate.js';
 import { NOT_ON_THIS_RELEASE, gateWithVerify } from '../sap/profile-gate.js';
-import { INTERRUPTED_TOOL_RESULT } from './repair-partial.js';
+import { INTERRUPTED_TOOL_RESULT, STOPPED_BEFORE_START_RESULT } from './repair-partial.js';
 import { WRITE_TOOLS } from '../tools/write-mode.js';
 const READER_TOOL_SET = new Set(READER_TOOLS);
 /** Chat lane (spec 2026-10-17 D4) — the model-facing reason; names hand_off. */
@@ -133,6 +133,11 @@ export async function dispatchTool(name, args, ctx) {
             is_error: true,
         };
     }
+    // LT-15 D6 (review M1) — the handover check above can await file reads; a
+    // stop there opens no handover, risky-command or Rule 8 card, and the
+    // handler never runs.
+    if (ctx.signal?.aborted)
+        return { content: STOPPED_BEFORE_START_RESULT, is_error: true };
     const sessionId = ctx.session?.id;
     if (handover && !isCredentialHandoverApproved(sessionId, handover.alias, handover.scope)) {
         const r = await presentSafetyConfirmation({
@@ -210,22 +215,29 @@ export async function dispatchTool(name, args, ctx) {
         // 2026-10-04 (continuous run, spec §3.5) — a SAP tool that failed because
         // SAP is not reachable from this machine: note it (the REPL pauses the
         // plan after the turn) and tell the model to stop without a manifest.
-        // Only inside a plan step: elsewhere the error text stays as it is.
-        if (tool.requiresSap && (result.is_error ?? false) && isPlanPhaseActive()) {
+        // Only inside a plan step. LT-14 (1A fix wave): elsewhere a short note
+        // rides on the error (no pause, no flag), so the model never invents
+        // network advice for the person.
+        if (tool.requiresSap && (result.is_error ?? false)) {
             const code = unreachableCodeInText(result.content);
-            if (code) {
+            if (code && isPlanPhaseActive()) {
                 noteSapUnreachable(code);
                 return { content: `${result.content}\n\n${SAP_UNREACHABLE_DIRECTIVE}`, is_error: true };
             }
+            if (code)
+                return { content: `${result.content}\n\n${SAP_UNREACHABLE_NOTE}`, is_error: true };
         }
         return { content: result.content, is_error: result.is_error ?? false };
     }
     catch (err) {
-        const code = tool.requiresSap && isPlanPhaseActive() ? (unreachableCode(err) ?? unreachableCodeInText(String(err))) : null;
-        if (code) {
+        const code = tool.requiresSap ? (unreachableCode(err) ?? unreachableCodeInText(String(err))) : null;
+        if (code && isPlanPhaseActive()) {
             noteSapUnreachable(code);
             return { content: JSON.stringify({ error: String(err), sap_unreachable: true, directive: SAP_UNREACHABLE_DIRECTIVE }), is_error: true };
         }
+        // LT-14 — outside a plan step: the short note only.
+        if (code)
+            return { content: JSON.stringify({ error: String(err), note: SAP_UNREACHABLE_NOTE }), is_error: true };
         return { content: JSON.stringify({ error: String(err) }), is_error: true };
     }
 }

package/dist/agent/turn-watchdog.js

@@ -42,7 +42,7 @@ export function evaluateWatchdog(input, now = Date.now()) {
     if (!input.config.enabled || input.alreadyWarned) {
         return { shouldWarn: false, reason: '', message: '' };
     }
-    const elapsedMs = Math.max(0, now - input.startedAt);
+    const elapsedMs = Math.max(0, now - input.startedAt - Math.max(0, input.pausedMs ?? 0));
     const wallExceeded = elapsedMs >= input.config.wallBudgetMs;
     const tokensExceeded = input.outputTokensThisTurn >= input.config.tokenBudget;
     if (!wallExceeded && !tokensExceeded) {

package/dist/approvals/advisory-render.js

@@ -2,6 +2,7 @@ import chalk from 'chalk';
 import { paint } from '../renderer/theme.js';
 import { uiWidth } from '../renderer/ui-width.js';
 import { sanitizeControlChars as clean } from '../renderer/sanitize.js';
+import { getBoxChars, DOUBLE_BOX } from '../ui/ascii-chars.js';
 const ADVISORY_TITLE = ' ADVISORY MODE — proposed change (no SAP write will occur) ';
 export const ADVISORY_KEY_HINT = 'Press c to copy to clipboard, y when applied, s to skip, n to abort.';
 export function renderAdvisoryProposal(args, opts = {}) {
@@ -12,9 +13,11 @@ export function renderAdvisoryProposal(args, opts = {}) {
     // Borders line up: top and bottom share one width (§1.4 rule, widened
     // only if the title itself would not fit).
     const w = Math.max(uiWidth(), ADVISORY_TITLE.length + 6);
-    const top = '╔══' + ADVISORY_TITLE + '═'.repeat(w - 4 - ADVISORY_TITLE.length) + '╗';
-    const bottom = '╚' + '═'.repeat(w - 2) + '╝';
-    const rule = paint('dim', '─'.repeat(w));
+    // Old Windows console: the classic ASCII frame (getBoxChars), same width.
+    const b = getBoxChars(DOUBLE_BOX);
+    const top = b.tl + b.h + b.h + ADVISORY_TITLE + b.h.repeat(w - 4 - ADVISORY_TITLE.length) + b.tr;
+    const bottom = b.bl + b.h.repeat(w - 2) + b.br;
+    const rule = paint('dim', getBoxChars().h.repeat(w));
     displayParts.push(chalk.bold(paint('warn', top)));
     displayParts.push(chalk.bold(`Summary: ${clean(args.summary)}`));
     displayParts.push(`Risk: ${args.risk}`);

package/dist/approvals/approval-prompt.js

@@ -6,14 +6,19 @@ import { uiWidth } from '../renderer/ui-width.js';
 import { paint } from '../renderer/theme.js';
 import { emitTrace } from '../renderer/trace.js';
 import { askConfirm } from '../ui/confirm-request.js';
+import { getBoxChars, SQUARE_BOX } from '../ui/ascii-chars.js';
 // Classic box: width from the §1.4 rule (was a fixed 62); padding counts
 // VISIBLE cells (string-width ignores ANSI) so coloured rows line up with
 // plain ones. (strip-ansi is a devDependency only — not usable here.)
+// Old Windows console: the classic ASCII frame (getBoxChars), same width.
 const boxWidth = () => uiWidth() - 2;
-const top = () => '┌' + '─'.repeat(boxWidth()) + '┐';
-const bottom = () => '└' + '─'.repeat(boxWidth()) + '┘';
-const pad = (s) => '│  ' + s + ' '.repeat(Math.max(0, boxWidth() - 2 - stringWidth(s))) + '│';
-const blank = () => '│' + ' '.repeat(boxWidth()) + '│';
+const top = () => { const b = getBoxChars(SQUARE_BOX); return b.tl + b.h.repeat(boxWidth()) + b.tr; };
+const bottom = () => { const b = getBoxChars(SQUARE_BOX); return b.bl + b.h.repeat(boxWidth()) + b.br; };
+const pad = (s) => {
+    const b = getBoxChars(SQUARE_BOX);
+    return b.v + '  ' + s + ' '.repeat(Math.max(0, boxWidth() - 2 - stringWidth(s))) + b.v;
+};
+const blank = () => { const b = getBoxChars(SQUARE_BOX); return b.v + ' '.repeat(boxWidth()) + b.v; };
 /**
  * Capture a single keypress for the y/n/d answer. Raw-mode readline so the
  * hand-drawn box stays the only visible affordance.

package/dist/approvals/op-labels.js

@@ -71,6 +71,20 @@ export function humanType(type) {
         return type;
     return type.toLowerCase();
 }
+/** LT-10 (1A fix wave) — the word for a known type code ('CLAS/OC' -> 'class'); undefined otherwise. */
+export function knownTypeWord(type) {
+    return Object.prototype.hasOwnProperty.call(TYPE_WORDS, typeCode(type)) ? TYPE_WORDS[typeCode(type)] : undefined;
+}
+/**
+ * LT-11 (1A fix wave) — the types that share their view's name on SAP's
+ * generator path. A write to one names its kind ("access control ZR_X"), so
+ * it never reads as a write to the view. Every other type: the name alone.
+ */
+const SHARES_VIEW_NAME = new Set(['DDLX', 'DCLS', 'BDEF']);
+export function writtenObjectName(type, name) {
+    const code = typeCode(type);
+    return SHARES_VIEW_NAME.has(code) ? `${TYPE_WORDS[code]} ${name}` : name;
+}
 /** e.g. "Create table ZMNT_NOTE", "Change class ZCL_X", "Delete table ZOLD". */
 export function verbLine(change) {
     return [humanVerb(change.op), humanType(change.type), change.object]

package/dist/approvals/plan-grant.js

@@ -103,6 +103,14 @@ export function getPlanGrant() { return active; }
 export function isPlanGrantInScope() {
     return active !== null && approvalsMode === 'plan' && inScope(active);
 }
+/**
+ * 2026-10-23 — the grant of THIS plan is in force: installed, not expired, and
+ * approvals = plan. The same test as isPlanGrantInScope without "a step of the
+ * plan is running": the step prompt is built just before its step starts.
+ */
+export function isPlanGrantInForceFor(planId) {
+    return active !== null && active.planId === planId && approvalsMode === 'plan' && isLive(active);
+}
 /**
  * The claims a grant-minted id carries for one covered change: the listed
  * type, the listed row's package, and the bound transport.

package/dist/approvals/render.js

@@ -1,6 +1,6 @@
 import { select, input } from '@inquirer/prompts';
 import chalk from 'chalk';
-import { riskReasonText, shownRiskReasons } from './risk-floor.js';
+import { riskReasonTexts, shownRiskReasons } from './risk-floor.js';
 import { verbLine, viewAffordance, toSourceLines, affectsLine, releaseLines, behaviourText, behaviourLines } from './op-labels.js';
 import { uiWidth } from '../renderer/ui-width.js';
 import { shouldUseInk } from '../renderer/tty.js';
@@ -12,7 +12,7 @@ import { emitTrace } from '../renderer/trace.js';
 import { getGlyphs } from '../renderer/glyphs.js';
 import { paint } from '../renderer/theme.js';
 import { sanitizeControlChars } from '../renderer/sanitize.js';
-import { collapseImplicitActivates, looksLikeUnifiedDiff } from './visible-changes.js';
+import { planRows, looksLikeUnifiedDiff } from './visible-changes.js';
 import { withSpinnerSuspended } from '../renderer/tool-widget.js';
 // Piece 2 §1.1 — the brand accent comes from the theme role, not a legacy hex.
 const peach = (s) => paint('brand', s);
@@ -75,11 +75,21 @@ function colorizeDiff(diff) {
  * compressed. This is what fixes the "what 2 changes?" complaint when the
  * model declares modify+activate of the same object.
  */
-// collapseImplicitActivates lives in ./visible-changes.ts (Task 9: request_approval uses it too).
+// collapseImplicitActivates and planRows (LT-12) live in ./visible-changes.ts (Task 9: request_approval uses the first for its gate count).
+/**
+ * LT-12 fix round 1 — the apply choice. One shown row (a create + modify of
+ * one object, the gate still opens on the raw count) reads "Apply this
+ * change", never "Apply all 1 change".
+ */
+function applyAllLabel(visibleCount, noun) {
+    return visibleCount === 1 ? 'Apply this change' : `Apply all ${visibleCount} ${noun}`;
+}
 export async function renderPlanGate(summary, changes, transport, effectiveRisk, system) {
-    const visibleChanges = collapseImplicitActivates(changes);
+    // LT-12: one row per new object (display only; the changes behind the card are untouched).
+    const visibleChanges = planRows(changes);
     const visibleCount = visibleChanges.length;
     const noun = visibleCount === 1 ? 'change' : 'changes';
+    const applyLabel = applyAllLabel(visibleCount, noun);
     // Ink path (piece 2 §5): the plan gate is an APPROVAL confirm card in the
     // card slot. Same three values, same order, cursor on Apply all; anything
     // else (Esc, no listener) is 'cancel'. Digits pick on an APPROVAL card
@@ -102,7 +112,7 @@ export async function renderPlanGate(summary, changes, transport, effectiveRisk,
         ];
         const shownReasons = shownRiskReasons(effectiveRisk.raisedBy);
         if (shownReasons.length > 0) {
-            facts.push(`Risk raised to ${effectiveRisk.level}: ${shownReasons.map(riskReasonText).join('; ')}`);
+            facts.push(`Risk raised to ${effectiveRisk.level}: ${riskReasonTexts(effectiveRisk).join('; ')}`);
         }
         // Part 2b D7 — a step that names the process it runs in (a BAdI
         // implementation) carries its "Affects:" row right under it. The card's
@@ -158,7 +168,7 @@ export async function renderPlanGate(summary, changes, transport, effectiveRisk,
             title: system ? `Apply this plan on ${system}?` : 'Apply this plan?',
             facts,
             choices: [
-                { value: 'apply_all', label: `Apply all ${visibleCount} ${noun}` },
+                { value: 'apply_all', label: applyLabel },
                 { value: 'review', label: 'Review each change one by one' },
                 { value: 'cancel', label: 'Cancel' },
             ],
@@ -178,6 +188,7 @@ export async function renderPlanGate(summary, changes, transport, effectiveRisk,
 async function classicPlanGate(summary, visibleChanges, transport, effectiveRisk) {
     const visibleCount = visibleChanges.length;
     const noun = visibleCount === 1 ? 'change' : 'changes';
+    const applyLabel = applyAllLabel(visibleCount, noun);
     console.log('');
     console.log(`${peach('Plan')}  ${summary}`);
     const meta = [`${visibleCount} ${noun}`, riskTag(effectiveRisk.level)];
@@ -186,7 +197,7 @@ async function classicPlanGate(summary, visibleChanges, transport, effectiveRisk
     console.log(`      ${chalk.dim(meta.join(' · '))}`);
     const shownReasons = shownRiskReasons(effectiveRisk.raisedBy);
     if (shownReasons.length > 0) {
-        console.log(`      ${chalk.dim(`(risk raised: ${shownReasons.map(riskReasonText).join('; ')})`)}`);
+        console.log(`      ${chalk.dim(`(risk raised: ${riskReasonTexts(effectiveRisk).join('; ')})`)}`);
     }
     visibleChanges.forEach((c, i) => {
         console.log(`        ${chalk.dim(`${i + 1}.`)} ${verbLine(c)}`);
@@ -207,7 +218,7 @@ async function classicPlanGate(summary, visibleChanges, transport, effectiveRisk
         default: 'apply_all',
         theme: inquirerTheme,
         choices: [
-            { value: 'apply_all', name: `Apply all ${visibleCount} ${noun}` },
+            { value: 'apply_all', name: applyLabel },
             { value: 'review', name: 'Review each change individually' },
             { value: 'cancel', name: 'Cancel' },
         ],