@cspeach/cli 1.1.33 → 1.1.35

package/dist/projects/answer-blockers.js

@@ -59,6 +59,9 @@ export function applyBlockerAnswers(env, answers, answerer, nowIso) {
         lastEditedBy: answerer,
     };
 }
+function plural(n, word) {
+    return `${n} ${word}${n === 1 ? '' : 's'}`;
+}
 function affirmative(reply) {
     const v = reply.trim().toLowerCase();
     return v === 'y' || v === 'yes';
@@ -83,7 +86,9 @@ export async function offerAnswerBlockers(args) {
     if (blockers.length === 0)
         return null;
     const reply = await askYesNo({
-        question: `Answer the ${blockers.length} unanswered blocker(s) now?`,
+        question: blockers.length === 1
+            ? 'Answer the open blocker now?'
+            : `Answer the ${blockers.length} open blockers now?`,
         confirm: args.confirm,
         prompt: args.prompt,
     });
@@ -92,16 +97,15 @@ export async function offerAnswerBlockers(args) {
     const answers = new Map();
     for (let i = 0; i < blockers.length; i++) {
         const b = blockers[i];
-        // 2026-09-17 — the "Blocker i/n: …" line is printed only on the free-text
-        // path below. When a picker handles the question it shows the same text
-        // itself, and printing it here too showed every blocker twice.
-        // Choices first, where the question has them and a picker is available.
+        // The "Blocker i of n: …" line is printed only on the free-text fallback
+        // below. The picker shows the question itself and leaves its own trace.
+        // The picker first, for every blocker (options or free text).
         // 'write' falls through to the text box; 'skip' leaves the blocker open.
         let askText = true;
-        if (b.options && b.options.length > 0 && args.choose) {
+        if (args.choose) {
             const c = await args.choose({
                 question: b.text,
-                options: b.options,
+                options: b.options ?? [],
                 multiSelect: !!b.multiSelect,
                 index: i,
                 total: blockers.length,
@@ -114,19 +118,26 @@ export async function offerAnswerBlockers(args) {
             else if (c.kind === 'skip') {
                 askText = false;
             }
+            else if (c.kind === 'stop') {
+                // Ctrl+C (Task 4, m2): ask none of the rest. Answers already given
+                // are kept and saved below; the others stay open.
+                break;
+            }
             // c.kind === 'write' → askText stays true
         }
         if (askText) {
             args.log('');
-            args.log(`Blocker ${i + 1}/${blockers.length}: ${b.text}`);
-            const a = (await args.prompt('  Your answer (Enter to skip): ')).trim();
+            args.log(`Blocker ${i + 1} of ${blockers.length}: ${b.text}`);
+            const a = (await args.prompt('Your answer (Enter to skip): ')).trim();
             if (a.length > 0)
                 answers.set(b.id, a);
         }
     }
     if (answers.size === 0) {
         args.log('');
-        args.log('No answers entered — all blockers left open for the viewer.');
+        args.log(blockers.length === 1
+            ? 'No answer entered. The blocker stays open. Answer it later at cspeach.dev/edit.'
+            : `No answers entered. The ${blockers.length} blockers stay open. Answer them later at cspeach.dev/edit.`);
         return null;
     }
     const nowIso = (args.now ?? (() => new Date().toISOString()))();
@@ -139,7 +150,9 @@ export async function offerAnswerBlockers(args) {
     writeFileSync(args.path, JSON.stringify(revised, null, 2), 'utf8');
     const stillOpen = blockers.length - answers.size;
     args.log('');
-    args.log(`Recorded ${answers.size} answer(s) in the file`
-        + (stillOpen > 0 ? ` — ${stillOpen} blocker(s) still open for the viewer.` : '.'));
+    args.log(`Recorded ${plural(answers.size, 'answer')} in the file.`
+        + (stillOpen === 0 ? ''
+            : stillOpen === 1 ? ' 1 blocker is still open. Answer it later at cspeach.dev/edit.'
+                : ` ${stillOpen} blockers are still open. Answer them later at cspeach.dev/edit.`));
     return answers.size;
 }

package/dist/renderer/change-card.js

@@ -6,10 +6,11 @@
 import { diffLines } from 'diff';
 import { paint } from './theme.js';
 import { getBoxChars } from '../ui/ascii-chars.js';
+import { ERROR_DETAIL_ROWS, SNAPSHOT_DETAIL_ROWS } from './verify-chain.js';
 import { ANSI_RE } from './tool-labels.js';
+import { wrapRows } from './wrap-rows.js';
 export const MIN_CARD_WIDTH = 40;
 const DIFF_LINES = 6;
-const DETAIL_MAX = 60;
 /** Myers diff is O(N·D) and synchronous: past this budget we show no diff
  *  at all (object + footer only), never a partial one. */
 const DIFF_TIMEOUT_MS = 200;
@@ -33,7 +34,7 @@ function footerParts(input) {
     else if (input.snapshot === 'new_object')
         parts.push(paint('dim', '– snapshot (new object)'));
     else if (input.snapshot === 'source_read_failed')
-        parts.push(paint('dim', `– snapshot (no source read${input.snapshotDetail ? ': ' + cut(flat(clean(input.snapshotDetail)), 40) : ''})`));
+        parts.push(paint('dim', '– snapshot (no source read)'));
     else
         parts.push(paint('dim', '– snapshot (skipped)'));
     parts.push(input.written ? `${paint('ok', '✓')} written` : `${paint('bad', '✗')} written`);
@@ -54,15 +55,35 @@ function footerParts(input) {
         else if (a.state === 'unverified')
             parts.push(paint('warn', '· activation unverified'));
         else
-            parts.push(`${paint('bad', '✗')} activation${a.detail ? ' ' + paint('bad', `(${cut(flat(clean(a.detail)), DETAIL_MAX)})`) : ''}`);
+            parts.push(`${paint('bad', '✗')} activation`);
     }
     else {
         // Activation is blocked — say so; a pending step would lie.
-        parts.push(`${paint('bad', '✗')} syntax ${paint('bad', `(${cut(flat(clean(input.syntax.errors[0] ?? 'syntax errors')), DETAIL_MAX)})`)}`);
+        parts.push(`${paint('bad', '✗')} syntax`);
         parts.push(paint('dim', '· activation blocked'));
     }
     return parts;
 }
+/**
+ * Fix batch 2026-10-12 (Task 2): the reasons behind a failed step — the
+ * snapshot read failure, the first syntax error, SAP's activation refusal —
+ * are what the user needs, so they are rows of their own (wrapped at word
+ * breaks to `cells`, up to the verify-chain caps), never cut on the footer.
+ */
+function detailLines(input, cells) {
+    const out = [];
+    const wrap = (text, rows) => wrapRows(flat(clean(text)), Math.max(1, cells), rows);
+    if (input.snapshot === 'source_read_failed' && input.snapshotDetail) {
+        out.push(...wrap(`No source read: ${input.snapshotDetail}`, SNAPSHOT_DETAIL_ROWS).map((r) => paint('dim', r)));
+    }
+    if (input.syntax !== 'not_checked' && !input.syntax.ok) {
+        out.push(...wrap(input.syntax.errors[0] ?? 'syntax errors', ERROR_DETAIL_ROWS).map((r) => paint('bad', r)));
+    }
+    else if (input.syntax !== 'not_checked' && input.activation?.state === 'failed' && input.activation.detail) {
+        out.push(...wrap(input.activation.detail, ERROR_DETAIL_ROWS).map((r) => paint('bad', r)));
+    }
+    return out;
+}
 /** Changed lines for the card. Exported for tests only. */
 export function diffBody(card, differ = defaultDiffer) {
     if (card.oldSource === undefined || card.newSource === undefined)
@@ -99,6 +120,7 @@ export function buildChangeCard(input, width, box = getBoxChars()) {
         // cut to the width so nothing wraps (colour dropped only on a cut part).
         for (const p of parts)
             out.push(visibleLen(p) > width ? cut(p.replace(ANSI, ''), width) : p);
+        out.push(...detailLines(input, width));
         if (card.transport)
             out.push(paint('dim', cut(`· ${clean(card.transport)}`, width)));
         return out.join('\n');
@@ -117,6 +139,8 @@ export function buildChangeCard(input, width, box = getBoxChars()) {
         lines.push(row(paint(l.startsWith('+') ? 'ok' : 'bad', cut(l, inner))));
     if (body.hidden > 0)
         lines.push(row(paint('dim', `  … +${body.hidden} lines`)));
+    for (const d of detailLines(input, inner))
+        lines.push(row(d));
     lines.push(...footerLines(parts, chain, transportText, width, b, row));
     return lines.join('\n');
 }

package/dist/renderer/footer-line.js

@@ -8,7 +8,8 @@ import { paint } from './theme.js';
 import { truncateToWidth } from './ui-width.js';
 import { sanitizeControlChars } from './sanitize.js';
 import { formatCost } from '../cost/pricing.js';
-import { formatCredits, CREDITS_PENDING, creditsActive } from '../cost/credits.js';
+import { formatCredits, CREDITS_PENDING, creditsActive, tokensOnlyActive } from '../cost/credits.js';
+import { AZURE_INVOICE_LINE } from '../cost/display-mode.js';
 export const SHORTCUTS_HINT = '? shortcuts';
 const SEP = ' · ';
 /**
@@ -17,6 +18,9 @@ const SEP = ' · ';
  * total, BYOK/local see the session dollars — never the other.
  */
 export function formatSpendSegment(s) {
+    // Azure (Task 5b): the customer's own Azure bill — no price of ours to show.
+    if (tokensOnlyActive())
+        return AZURE_INVOICE_LINE;
     if (!s.creditsMode)
         return `$${s.dollarSpendToday.toFixed(2)}`;
     if (s.creditsPending && s.creditsSessionTotal === 0)
@@ -78,6 +82,8 @@ export function formatFooterLine(s, width) {
  * cost otherwise, '' when there is none.
  */
 export function turnSpendText(p) {
+    if (tokensOnlyActive())
+        return '';
     if (creditsActive()) {
         const c = p.credits;
         // 2026-10-02: the whole user request (every model round), not its last round.

package/dist/renderer/notices.js

@@ -36,13 +36,18 @@ import stringWidth from 'string-width';
 import { getLook } from './look.js';
 import { getGlyphs } from './glyphs.js';
 import { truncateToWidth, uiWidth } from './ui-width.js';
+import { wrapRows } from './wrap-rows.js';
+import { paint } from './theme.js';
+import chalk from 'chalk';
 import { getNoticeLogPath, recordFullNotice } from './notice-log.js';
 import { getEffectiveBodyWidth, isDeclaredOneShot } from './tty.js';
 import { EventEmitter } from 'node:events';
+/** Fix batch 2026-10-12 — a panels notice wraps onto at most this many rows. */
+export const NOTICE_MAX_ROWS = 3;
 /**
- * Format one notice as a single terminal line (trailing newline included).
- * Multi-line messages are collapsed to one line — notices are glanceable
- * margin notes, not documents; anything long belongs in the tool result.
+ * Format one notice (trailing newline included). Multi-line messages are
+ * collapsed to one line of text; in the panels look that text then wraps
+ * onto up to NOTICE_MAX_ROWS screen rows (fix batch 2026-10-12).
  *
  * Piece 2 §9: warn → the attention shape ("! message"), info → the info
  * shape ("· message", dim). Same glyphs as every other notice.
@@ -50,10 +55,11 @@ import { EventEmitter } from 'node:events';
 export function formatNoticeLine(level, message) {
     // Live fix 2026-09-26: a SAP HTML error page must never leak tags/CSS here.
     const readable = looksLikeMarkup(message) ? cleanErrorText(message, 400) : message;
-    let oneLine = readable.replace(/\s*\r?\n\s*/g, ' ').trim();
-    // Live fix 2026-09-26 (panels): never wrap mid-word — cut to one screen
-    // line ("<glyph> " + text ≤ uiWidth) and keep the full text in the
-    // session's notice log. Legacy stays byte-identical.
+    const oneLine = readable.replace(/\s*\r?\n\s*/g, ' ').trim();
+    // Live fix 2026-09-26 (panels): never let the terminal wrap mid-word —
+    // the text is pre-wrapped at word breaks inside uiWidth (below) and a cut
+    // notice keeps its full text in the session's notice log. Legacy stays
+    // byte-identical.
     // Review I3: only when a screen is there to wrap (stdout is a TTY) or the
     // full text has somewhere to go (a notice log). One-shot / piped output
     // keeps the whole single line — nothing else would record it.
@@ -61,15 +67,23 @@ export function formatNoticeLine(level, message) {
     // keeps the whole line too.
     const wrapsOnScreen = process.stdout.isTTY === true && !isDeclaredOneShot();
     if (getLook() === 'panels' && (wrapsOnScreen || getNoticeLogPath() !== undefined)) {
+        // Fix batch 2026-10-12 (Task 2): a notice may carry what the user must
+        // act on (a transport number, SAP's reason), so it wraps at word breaks
+        // onto up to NOTICE_MAX_ROWS rows — further rows indented two spaces, the
+        // notice shape — instead of being cut to one. Only a longer notice is
+        // cut; its full text goes to the notice log and the screen says so.
         const g = getGlyphs();
         const room = Math.min(uiWidth(), getEffectiveBodyWidth()) - stringWidth(level === 'warn' ? g.attention : g.info) - 1;
-        const cut = truncateToWidth(oneLine, room);
-        // Review M10: truncateToWidth turns tabs into two spaces — compare against
-        // the same normalisation so only a real cut is logged.
-        if (cut !== oneLine.replace(/\t/g, '  ')) {
+        const rows = wrapRows(oneLine, room, NOTICE_MAX_ROWS);
+        const cut = wrapRows(oneLine, room, NOTICE_MAX_ROWS + 1).length > NOTICE_MAX_ROWS;
+        const logPath = getNoticeLogPath();
+        if (cut)
             recordFullNotice(level, message);
-            oneLine = cut;
-        }
+        const head = level === 'warn' ? formatAttention({ text: rows[0] }) : formatInfo(rows[0]);
+        const more = rows.slice(1).map((r) => (level === 'warn' ? `  ${chalk.bold(r)}` : paint('dim', `  ${r}`)));
+        if (cut && logPath)
+            more.push(paint('dim', truncateToWidth(`  Full text: ${logPath}`, room + 2)));
+        return head + more.map((r) => `${r}\n`).join('');
     }
     return level === 'warn' ? formatAttention({ text: oneLine }) : formatInfo(oneLine);
 }

package/dist/renderer/progress-chatter.js

@@ -165,7 +165,9 @@ const MESSAGES = {
         'Walking enhancement spots…',
     ],
     sap_message_maintain: [
-        '(stub — short-circuit)',
+        'Reading the message class…',
+        'Writing the messages…',
+        'Reading the messages back…',
     ],
     sap_number_range_intervals: [
         '(stub — short-circuit)',

package/dist/renderer/status-footer.js

@@ -1,5 +1,6 @@
 import { formatCost } from '../cost/pricing.js';
-import { creditsActive, formatCreditsLine, CREDITS_PENDING } from '../cost/credits.js';
+import { creditsActive, tokensOnlyActive, formatCreditsLine, CREDITS_PENDING } from '../cost/credits.js';
+import { AZURE_INVOICE_LINE } from '../cost/display-mode.js';
 import { formatTurnReceipt, turnSpendText } from './footer-line.js';
 import { formatAttention } from './notice-shape.js';
 import { paint } from './theme.js';
@@ -79,12 +80,18 @@ export function formatStatusFooter(params) {
     const tokStr = inCredits ? '' : tokens.toLocaleString() + ' tok this turn';
     const cachedStr = !inCredits && cachedTokens > 0 ? `${cachedTokens.toLocaleString()} cached` : '';
     const elapsed = elapsedMs > 0 ? `${(elapsedMs / 1000).toFixed(1)}s` : '';
-    const costTurnStr = inCredits
-        ? (credits ? formatCreditsLine(credits) : CREDITS_PENDING)
-        : (costThisTurn != null ? formatCost(costThisTurn) : '');
-    const costSessStr = inCredits
+    // Azure (Task 5b): tokens only, the price line says where the bill is.
+    const tokensOnly = tokensOnlyActive();
+    const costTurnStr = tokensOnly
         ? ''
-        : (costSession != null ? `session: ${formatCost(costSession)}` : '');
+        : inCredits
+            ? (credits ? formatCreditsLine(credits) : CREDITS_PENDING)
+            : (costThisTurn != null ? formatCost(costThisTurn) : '');
+    const costSessStr = tokensOnly
+        ? AZURE_INVOICE_LINE
+        : inCredits
+            ? ''
+            : (costSession != null ? `session: ${formatCost(costSession)}` : '');
     // Classic full receipt (piece 2 restyle — same facts, reviewed pin):
     // rules at uiWidth() in the frame role, ' · ' separators, the large-session
     // advisory as a `!` notice (largeSessionNotice).

package/dist/renderer/tool-labels.js

@@ -177,7 +177,13 @@ const RULES = {
     sap_unlock: sapObject('Unlocked'),
     sap_service_binding_publish: sapObject('Published'),
     sap_service_binding_unpublish: sapObject('Unpublished'),
-    sap_message_maintain: (a) => ({ verb: 'Message', object: shortRight([str(a['messageClass']), str(a['messageNumber'])].filter(Boolean).join(' ')) }),
+    sap_message_maintain: (a) => {
+        const n = Array.isArray(a['messages']) ? a['messages'].length : 0;
+        if (n > 0) {
+            return { verb: 'Messages', object: shortRight(str(a['messageClass']) ?? ''), detail: n === 1 ? '1 message' : `${n} messages` };
+        }
+        return { verb: 'Messages', object: shortRight([str(a['messageClass']), str(a['messageNumber'])].filter(Boolean).join(' ')) };
+    },
     sap_number_range_intervals: (a) => ({ verb: 'Number range', object: shortRight(str(a['nrObject']) ?? '') }),
     ask_question: (a) => ({ verb: 'Question', object: shortRight(str(a['question']) ?? '') }),
     todo_set: () => ({ verb: 'Updated todos', object: '' }),
@@ -257,7 +263,7 @@ const PRESENT = {
     'Created transport': 'Creating transport', 'Transport for': 'Finding transport for',
     'Listed transports': 'Listing transports', Released: 'Releasing', 'Created domain': 'Creating domain',
     'Created data element': 'Creating data element', Locked: 'Locking', Unlocked: 'Unlocking',
-    Published: 'Publishing', Unpublished: 'Unpublishing', Message: 'Maintaining message',
+    Published: 'Publishing', Unpublished: 'Unpublishing', Messages: 'Maintaining messages in',
     'Number range': 'Maintaining number range', Question: 'Asking', 'Updated todos': 'Updating todos',
     'Ran skill': 'Running skill', 'Read document': 'Reading document', Fetched: 'Fetching',
     'Searched web': 'Searching web', 'Read project context': 'Reading project context',

package/dist/renderer/verify-chain.js

@@ -8,13 +8,15 @@
  * never synthesized. States render truthfully:
  *   - snapshot 'new_object'  → "① snapshot – (new object)" (genuine ADT 404 —
  *     nothing to save; NEVER used for other read failures)
- *   - snapshot 'source_read_failed' → "① snapshot – (no source read: <msg>)" —
+ *   - snapshot 'source_read_failed' → "① snapshot – (no source read)" and the
+ *     reason on its own row under the chain —
  *     the pre-write read failed for a non-404 reason; the object may exist
  *     but there is no recovery copy. Hard-gate tools block instead of
  *     emitting this; it only appears on soft (best-effort) gates.
  *   - snapshot 'best_effort_failed' → "① snapshot – (skipped)" (write tools
  *     where the gate is soft, e.g. class includes)
- *   - syntax fail → "③ syntax ✗ (L12: MESSAGE …)" AND no ④ at all —
+ *   - syntax fail → "③ syntax ✗", the first error whole on the rows under
+ *     the chain (fix batch 2026-10-12: no 60-character cut) AND no ④ at all —
  *     activation is blocked, so we don't show a fake pending step
  *   - syntax 'not_checked' → "③ syntax – (checked at activation)" —
  *     sap_set_class_include has no standalone syntax gate
@@ -28,21 +30,43 @@
  * result row in both renderers.
  */
 import chalk from 'chalk';
+import { wrapRows } from './wrap-rows.js';
+import { uiWidth } from './ui-width.js';
 const pass = (s) => `${s} ${chalk.green('✓')}`;
 const fail = (s, detail) => `${s} ${chalk.red('✗')}${detail ? ' ' + chalk.red(`(${detail})`) : ''}`;
 const skip = (s, why) => chalk.dim(`${s} – (${why})`);
-const ERROR_DETAIL_MAX = 60;
-const SNAPSHOT_DETAIL_MAX = 40;
-const truncate = (s, max) => {
-    const flat = s.replace(/\s+/g, ' ').trim();
-    return flat.length > max ? flat.substring(0, max - 1) + '…' : flat;
-};
+/**
+ * Fix batch 2026-10-12 (Task 2): the SAP error is what the user needs, so it
+ * is never cut to a few characters. Details go on their own rows under the
+ * chain, wrapped at word breaks inside the width, up to these many rows (the
+ * last ends with … only when even that is not enough; the model gets the
+ * full text in the tool result).
+ */
+export const ERROR_DETAIL_ROWS = 4;
+export const SNAPSHOT_DETAIL_ROWS = 2;
+/** Detail rows sit under the chain: its two-space indent plus two. */
+const DETAIL_INDENT = '    ';
+const flatDetail = (s) => s.replace(/\s+/g, ' ').trim();
+/** Detail rows: indented, wrapped inside `width`, at most `maxRows`. */
+export function detailRows(text, width, maxRows) {
+    return wrapRows(flatDetail(text), Math.max(1, width - DETAIL_INDENT.length), maxRows).map((r) => `${DETAIL_INDENT}${r}`);
+}
+/**
+ * Detail-row width: the UI width less the Ink body's 4-cell border overhead
+ * (tty.ts BORDER_OVERHEAD), so a row never reaches the body edge in either
+ * renderer. Pure (no tty import): many tool tests mock tty.js partially.
+ */
+export function chainWidth() {
+    return Math.max(20, uiWidth() - 4);
+}
 /**
  * Build the chain line (no trailing newline). Returns the full line
- * including the two-space indent that aligns with the ⎿ result row.
+ * including the two-space indent that aligns with the ⎿ result row, then
+ * any detail rows (snapshot read failure, first syntax error) under it.
  */
-export function buildWriteChainLine(input) {
+export function buildWriteChainLine(input, width = chainWidth()) {
     const parts = [];
+    const details = [];
     // ① snapshot
     if (input.snapshot === 'taken')
         parts.push(pass('① snapshot'));
@@ -51,10 +75,10 @@ export function buildWriteChainLine(input) {
     else if (input.snapshot === 'source_read_failed') {
         // Honest: the read failed — we do NOT know the object is new, and there
         // is no recovery copy. Never render this as "(new object)".
-        const why = input.snapshotDetail
-            ? `no source read: ${truncate(input.snapshotDetail, SNAPSHOT_DETAIL_MAX)}`
-            : 'no source read';
-        parts.push(skip('① snapshot', why));
+        parts.push(skip('① snapshot', 'no source read'));
+        if (input.snapshotDetail) {
+            details.push(...detailRows(`No source read: ${input.snapshotDetail}`, width, SNAPSHOT_DETAIL_ROWS).map((r) => chalk.dim(r)));
+        }
     }
     else
         parts.push(skip('① snapshot', 'skipped'));
@@ -70,10 +94,9 @@ export function buildWriteChainLine(input) {
         parts.push(chalk.dim('④ activate pending'));
     }
     else {
-        const first = (input.syntax.errors[0] ?? 'syntax errors').replace(/\s+/g, ' ').trim();
-        const detail = first.length > ERROR_DETAIL_MAX ? first.substring(0, ERROR_DETAIL_MAX - 1) + '…' : first;
-        parts.push(fail('③ syntax', detail));
+        parts.push(fail('③ syntax'));
+        details.push(...detailRows(input.syntax.errors[0] ?? 'syntax errors', width, ERROR_DETAIL_ROWS).map((r) => chalk.red(r)));
         // No ④ — activation is blocked; rendering a pending step would lie.
     }
-    return '  ' + parts.join('  ');
+    return ['  ' + parts.join('  '), ...details].join('\n');
 }

package/dist/renderer/wrap-rows.js

@@ -0,0 +1,87 @@
+// src/renderer/wrap-rows.ts
+//
+// The one wrap helper for card content (fix batch 2026-10-12, Task 2).
+//
+// THE RULE: card content wraps; chrome may cut. Text a person reads to make
+// a decision — card titles, facts, option labels and descriptions, risk and
+// failure reasons, SAP error details — is pre-wrapped here into a KNOWN
+// number of rows. Ink never soft-wraps a live-frame row (its erase
+// accounting counts rows), so callers draw each returned row as its own
+// truncate-end <Text> and count every row in their height estimate. Status
+// rows, hints, palettes, spinners, traces and "… N more" counters stay one
+// row and cut with truncateToWidth.
+//
+// Replaces factRows (confirm-card) and wrapCardText (ask-card), which did the
+// same job twice.
+import stringWidth from 'string-width';
+import { truncateToWidth } from './ui-width.js';
+import { sanitizeControlChars } from './sanitize.js';
+const GRAPHEMES = new Intl.Segmenter(undefined, { granularity: 'grapheme' });
+/** The longest grapheme-whole prefix of `word` that fits `cells` (at least one grapheme). */
+function takeCells(word, cells) {
+    let out = '';
+    let used = 0;
+    for (const { segment } of GRAPHEMES.segment(word)) {
+        const w = stringWidth(segment);
+        if (used + w > cells && out.length > 0)
+            break;
+        out += segment;
+        used += w;
+        if (used >= cells)
+            break;
+    }
+    return out;
+}
+/**
+ * `text` as the rows it is drawn on, each at most `cells` terminal cells.
+ * Control characters are neutralised, tabs become two spaces and newlines
+ * one space. Text that fits is one row, unchanged. Otherwise it wraps at
+ * spaces (a word wider than the row is cut where it must be; wide characters
+ * count two cells and are never split) onto at most `maxRows` rows; when
+ * more is left, the last row ends with the `more` glyph (… / ...). With
+ * `maxRows` 1 this is truncateToWidth: one row, cut.
+ */
+export function wrapRows(text, cells, maxRows = 1) {
+    const flat = sanitizeControlChars(text).replace(/\t/g, '  ').replace(/\r?\n/g, ' ');
+    const width = Math.max(1, cells);
+    const max = Math.max(1, Math.floor(maxRows));
+    if (stringWidth(flat) <= width)
+        return [flat];
+    if (max === 1)
+        return [truncateToWidth(flat, width)];
+    const indent = /^ */.exec(flat)[0].slice(0, Math.max(0, width - 1));
+    const rows = [];
+    let cur = indent;
+    const curEmpty = () => cur.length === 0 || cur === indent;
+    for (let word of flat.trim().split(/ +/).filter((w) => w.length > 0)) {
+        while (stringWidth(word) > width) {
+            if (!curEmpty()) {
+                rows.push(cur);
+                cur = '';
+            }
+            const head = takeCells(word, width - stringWidth(cur));
+            rows.push(cur + head);
+            cur = '';
+            word = word.slice(head.length);
+        }
+        if (word.length === 0)
+            continue;
+        if (curEmpty())
+            cur += word;
+        else if (stringWidth(cur) + 1 + stringWidth(word) <= width)
+            cur += ` ${word}`;
+        else {
+            rows.push(cur);
+            cur = word;
+        }
+    }
+    if (!curEmpty() || rows.length === 0)
+        rows.push(cur);
+    if (rows.length <= max)
+        return rows;
+    const kept = rows.slice(0, max);
+    // The trailing space guarantees a cut (and so the more glyph) even when the
+    // joined rest would happen to fit.
+    kept[max - 1] = truncateToWidth(`${rows.slice(max - 1).join(' ')} `, width);
+    return kept;
+}

package/dist/repl/ask-or-no.js

@@ -0,0 +1,18 @@
+/**
+ * Azure tenant mode, Task 6b fix round 1 — a yes/no question at REPL start
+ * (the endpoint confirmation, "Sign in to Microsoft now?"). Ctrl+C there makes
+ * inquirer reject with ExitPromptError; that is the person's "no", never an
+ * unhandled error that ends the CLI with a stack. Any other error still throws.
+ */
+export function askOrNo(ask) {
+    return async (q) => {
+        try {
+            return await ask(q);
+        }
+        catch (err) {
+            if (err?.name === 'ExitPromptError')
+                return false;
+            throw err;
+        }
+    };
+}

package/dist/repl/builtin-commands.js

@@ -8,22 +8,30 @@
  * read of the process-wide cost display mode (cost/credits.ts); no
  * inquirer, so the router can import it.
  */
-import { creditsActive } from '../cost/credits.js';
+import { creditsActive, tokensOnlyActive } from '../cost/credits.js';
 // Pure generated data (type-only import inside), so this file stays light.
 import { BUNDLED_RUNS } from '../runs/bundled-runs.js';
 export const COST_DESCRIPTION_USD = 'Show this session\'s spend so far ($ and tokens)';
 export const COST_DESCRIPTION_CREDITS = 'Show the credits this session has used so far';
+/** Azure tenant mode (Task 7, ruling 5): tokens only — never "$" or credits. */
+export const COST_DESCRIPTION_TOKENS = "Show this session's tokens so far";
 /** Piece 2 §10: managed customers see credits, never "$" (cost/display-mode.ts). */
 /** /usage (2026-10-09): this month in credits — see commands/usage.ts. */
 export const USAGE_DESCRIPTION = 'Show this month’s credits, your balance and the top skills';
+export const USAGE_DESCRIPTION_TOKENS = "Show where your usage is: your company's Azure invoice";
 export function costCommandDescription() {
+    if (tokensOnlyActive())
+        return COST_DESCRIPTION_TOKENS;
     return creditsActive() ? COST_DESCRIPTION_CREDITS : COST_DESCRIPTION_USD;
 }
+export function usageCommandDescription() {
+    return tokensOnlyActive() ? USAGE_DESCRIPTION_TOKENS : USAGE_DESCRIPTION;
+}
 export const BUILTIN_ENTRIES = [
     // Piece 2: /cancel is not listed — it exists only in the classic loop
     // (repl.tsx), and Esc / Ctrl+C already cancel under Ink.
     { name: '/cost', get description() { return costCommandDescription(); } },
-    { name: '/usage', description: USAGE_DESCRIPTION },
+    { name: '/usage', get description() { return usageCommandDescription(); } },
     { name: '/compact', description: 'Shrink a long session and keep the facts (later turns cost far less)' },
     { name: '/export', description: 'Export the signable session audit record — /export audit [filename]' },
     { name: '/context', description: 'Show what fills the model context window — a composition grid of bars' },

package/dist/repl/post-turn-status.js

@@ -21,7 +21,7 @@ import { computeCost } from '../cost/pricing.js';
 import { computeSessionCost } from '../cost/session-cost.js';
 import { globalStore } from '../ui/sap-state-store.js';
 import { turnStatusEmitter } from '../ui/turn-status-emitter.js';
-import { globalCredits } from '../cost/credits.js';
+import { globalCredits, tokensOnlyActive } from '../cost/credits.js';
 import { printStatusFooter, formatStatusFooter } from '../renderer/status-footer.js';
 import { shouldUseInk } from '../renderer/tty.js';
 import { isUserPrompt } from '../session/user-prompt.js';
@@ -49,7 +49,8 @@ export function computeTurnFacts(session, snapshot, turnModel) {
     const userTurns = session.messages.filter(isUserPrompt).length;
     const lifetimeAfter = session.usage.input_tokens + session.usage.output_tokens;
     const turnTokens = Math.max(0, lifetimeAfter - (snapshot.input + snapshot.output));
-    const turnCost = computeCost(turnModel ?? session.model, {
+    // Azure: no price for the customer's deployment — never consult one.
+    const turnCost = tokensOnlyActive() ? 0 : computeCost(turnModel ?? session.model, {
         input: session.usage.input_tokens - snapshot.input,
         output: session.usage.output_tokens - snapshot.output,
         cacheRead: session.usage.cache_read_input_tokens - snapshot.cacheRead,