@skrr-ai/cli 0.1.108 → 0.1.110

package/dist/lib/command-miss.js

@@ -24,7 +24,11 @@ exports.editDistance = editDistance;
 exports.nearestCommands = nearestCommands;
 exports.helpSubjectId = helpSubjectId;
 exports.describeCommandMiss = describeCommandMiss;
+exports.analyzeCommandMiss = analyzeCommandMiss;
 exports.lookupFromConfig = lookupFromConfig;
+exports.resolveVerbSynonym = resolveVerbSynonym;
+exports.typedCommandWords = typedCommandWords;
+exports.commandMissEnvelope = commandMissEnvelope;
 /** A uuid-ish token, which is what a stray space id looks like. */
 const LOOKS_LIKE_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 const DAEMON_READINESS = [
@@ -57,8 +61,49 @@ function describeAnsweredElsewhere(config, resolved, extras) {
     if (targets.length === 0)
         return null;
     const spoken = `${config.bin} ${resolved.split(':').join(' ')}`;
-    return (`\`${spoken}\` has no \`${extras[0]}\`. Depending on what you want to know:\n` +
-        targets.map((t) => `  \`${config.bin} ${t.usage}\` — ${t.answers}`).join('\n'));
+    return {
+        message: `\`${spoken}\` has no \`${extras[0]}\`. Depending on what you want to know:`,
+        fix: targets.map((t) => `  \`${config.bin} ${t.usage}\` — ${t.answers}`).join('\n'),
+        suggestions: targets.map((t) => `${config.bin} ${t.usage}`),
+    };
+}
+const WHOAMI = {
+    id: 'whoami',
+    answers: 'who you are signed in as, which server, and where the credential came from',
+};
+const LOGIN = { id: 'login', answers: 'sign in' };
+const LOGOUT = { id: 'logout', answers: 'sign out' };
+const FLAT_COMMAND_FOR_TOPIC = {
+    auth: {
+        '*': [WHOAMI, LOGIN, LOGOUT],
+        status: [WHOAMI],
+        whoami: [WHOAMI],
+        me: [WHOAMI],
+        user: [WHOAMI],
+        account: [WHOAMI],
+        info: [WHOAMI],
+        show: [WHOAMI],
+        login: [LOGIN],
+        signin: [LOGIN],
+        'sign-in': [LOGIN],
+        logout: [LOGOUT],
+        signout: [LOGOUT],
+        'sign-out': [LOGOUT],
+    },
+};
+function describeFlatRedirect(config, parts, spokenId) {
+    const topic = FLAT_COMMAND_FOR_TOPIC[parts[0]?.toLowerCase() ?? ''];
+    // A real topic or command of that name answers for itself.
+    if (!topic || config.topicNames.includes(parts[0]) || config.findCommand(parts[0]))
+        return null;
+    const targets = (topic[(parts[1] ?? '*').toLowerCase()] ?? []).filter((target) => config.findCommand(target.id) !== undefined);
+    if (targets.length === 0)
+        return null;
+    return {
+        message: `\`${spokenId}\` is not a command; this CLI has no \`${parts[0]}\` topic.`,
+        fix: targets.map((t) => `  \`${config.bin} ${t.id}\` — ${t.answers}`).join('\n'),
+        suggestions: targets.map((t) => `${config.bin} ${t.id}`),
+    };
 }
 /** Cheap edit distance, bounded — this runs only on a miss. */
 function editDistance(a, b) {
@@ -135,8 +180,13 @@ function helpSubjectId(tokens, config) {
     }
     return taken.join(':');
 }
+/** The text form: exactly what a miss has always printed. */
+function describeCommandMiss(config, id) {
+    const miss = analyzeCommandMiss(config, id);
+    return miss.fix ? `${miss.message}\n${miss.fix}` : miss.message;
+}
 /**
- * The message for a colon-joined id that did not resolve.
+ * The miss for a colon-joined id that did not resolve.
  *
  * Two shapes, in order:
  *
@@ -147,7 +197,7 @@ function helpSubjectId(tokens, config) {
  *     suggest the nearest siblings under the same topic before falling back to
  *     the whole command list.
  */
-function describeCommandMiss(config, id) {
+function analyzeCommandMiss(config, id) {
     const parts = String(id ?? '')
         .split(':')
         .filter(Boolean);
@@ -169,9 +219,12 @@ function describeCommandMiss(config, id) {
                 ? ' It takes `--space <id>`.'
                 : '';
         const plural = extras.length === 1 ? 'argument' : 'arguments';
-        return (`\`${spoken}\` exists, but does not take the positional ${plural} ` +
-            `${extras.map((e) => `\`${e}\``).join(' ')}.${hint}\n` +
-            `See \`${spoken} --help\`.`);
+        return {
+            message: `\`${spoken}\` exists, but does not take the positional ${plural} ` +
+                `${extras.map((e) => `\`${e}\``).join(' ')}.${hint}`,
+            fix: `See \`${spoken} --help\`.`,
+            suggestions: [spoken],
+        };
     }
     // Topic names are candidates too, so a near-miss on a bare topic gets routed
     // to the topic rather than nothing (OSK-4869): `skrr harness` (singular) is
@@ -200,10 +253,16 @@ function describeCommandMiss(config, id) {
     // the honest thing to report is the disagreement, which has a known cause and
     // a next step.
     if (config.commandIDs.includes(typedId) || config.topicNames.includes(typedId)) {
-        return (`\`${spokenId}\` is registered but could not be loaded from this build.\n` +
-            `Its compiled output is missing or stale — run \`npm --prefix cli run build\` in a ` +
-            `development checkout, or reinstall the CLI.`);
+        return {
+            message: `\`${spokenId}\` is registered but could not be loaded from this build.`,
+            fix: `Its compiled output is missing or stale — run \`npm --prefix cli run build\` in a ` +
+                `development checkout, or reinstall the CLI.`,
+            suggestions: [],
+        };
     }
+    const flat = describeFlatRedirect(config, parts, spokenId);
+    if (flat)
+        return flat;
     const siblings = config.commandIDs.filter((c) => c.startsWith(`${parts[0]}:`));
     const suggestions = (siblings.length
         ? nearestCommands(parts.slice(0, 2).join(':'), siblings)
@@ -213,10 +272,12 @@ function describeCommandMiss(config, id) {
         // than the id, so it costs a suggestion slot as well as the reader's trust.
         .filter((candidate) => candidate !== typedId);
     if (suggestions.length) {
-        return (`\`${spokenId}\` is not a command.` +
-            `\nDid you mean: ${suggestions
-                .map((s) => `\`${config.bin} ${s.split(':').join(' ')}\``)
-                .join(', ')}?`);
+        const spoken = suggestions.map((s) => `${config.bin} ${s.split(':').join(' ')}`);
+        return {
+            message: `\`${spokenId}\` is not a command.`,
+            fix: `Did you mean: ${spoken.map((s) => `\`${s}\``).join(', ')}?`,
+            suggestions: spoken,
+        };
     }
     // The topic the reader typed is real, and nothing in it is spelled like what
     // they asked for — a different word for it, not a typo. "See the topics"
@@ -233,11 +294,18 @@ function describeCommandMiss(config, id) {
             .sort()
             .slice(0, MAX_TOPIC_LISTING);
         const more = siblings.length > shown.length ? ', …' : '';
-        return (`\`${spokenId}\` is not a command.\n` +
-            `\`${config.bin} ${topic}\` has: ${shown.map((c) => `\`${c}\``).join(', ')}${more}.\n` +
-            `See \`${config.bin} ${topic} --help\`.`);
+        return {
+            message: `\`${spokenId}\` is not a command.`,
+            fix: `\`${config.bin} ${topic}\` has: ${shown.map((c) => `\`${c}\``).join(', ')}${more}.\n` +
+                `See \`${config.bin} ${topic} --help\`.`,
+            suggestions: shown.map((c) => `${config.bin} ${topic} ${c}`),
+        };
     }
-    return `\`${spokenId}\` is not a command.\nRun \`${config.bin} --help\` to see the topics.`;
+    return {
+        message: `\`${spokenId}\` is not a command.`,
+        fix: `Run \`${config.bin} --help\` to see the topics.`,
+        suggestions: [],
+    };
 }
 /** Enough to scan at a glance; the topic's own `--help` has the rest. */
 const MAX_TOPIC_LISTING = 10;
@@ -252,3 +320,104 @@ function lookupFromConfig(config) {
             : [],
     };
 }
+/**
+ * Verbs this CLI spells two ways across its topics (OSK-16434).
+ *
+ * `skrr tasks` and `skrr machines` say `list` and `show`; `skrr wiki` and
+ * `skrr machines dedicated` say `ls`, and `get` is what most CLIs call `show`.
+ * Which a topic uses is history, not meaning, so a reader who guessed the other
+ * spelling was refused with a suggestion list that did not contain the command
+ * they meant (`tasks get` answered "did you mean tasks chat, tasks list, tasks
+ * open" — no `show`).
+ *
+ * Read-only verbs only, and only as a fallback: a spelling a topic really has
+ * always wins, and nothing here can run a command that changes anything.
+ */
+const VERB_SYNONYMS = [
+    ['list', 'ls'],
+    ['show', 'get'],
+];
+function synonymsOf(verb) {
+    const lower = verb.toLowerCase();
+    const group = VERB_SYNONYMS.find((g) => g.includes(lower));
+    return group ? group.filter((v) => v !== lower) : [];
+}
+/**
+ * The real command a mis-spelled READ verb means, when a synonym of it exists
+ * under the same topic path.
+ *
+ * `words` are the leading, non-flag tokens as the reader typed them. The scan
+ * walks down the real topic path; at the first word that is not part of it, that
+ * word is the verb, and only a synonym that is itself a command qualifies. A
+ * word that is a real command, or a prefix of one, is never reinterpreted.
+ */
+function resolveVerbSynonym(config, words) {
+    const usable = new Set();
+    for (const id of [...config.commandIDs, ...config.topicNames]) {
+        const parts = id.split(':');
+        for (let i = 1; i <= parts.length; i += 1)
+            usable.add(parts.slice(0, i).join(':'));
+    }
+    for (let i = 1; i < words.length; i += 1) {
+        const prefix = words.slice(0, i).join(':');
+        if (!usable.has(prefix))
+            return null;
+        if (usable.has(`${prefix}:${words[i]}`))
+            continue;
+        for (const synonym of synonymsOf(words[i])) {
+            const candidate = `${prefix}:${synonym}`;
+            if (config.findCommand(candidate) === undefined)
+                continue;
+            const spoken = (verb) => `${config.bin} ${[...words.slice(0, i), verb].join(' ')}`;
+            return {
+                id: candidate,
+                rest: words.slice(i + 1),
+                typed: spoken(words[i]),
+                resolved: spoken(synonym),
+            };
+        }
+        return null;
+    }
+    return null;
+}
+/**
+ * The words a person typed for the command, recovered from the process argv.
+ *
+ * oclif joins the words it takes for a command with `:`, so a positional that
+ * itself contains a colon cannot be told apart from two words in the id. The
+ * raw argv can: its leading tokens, joined, are the id.
+ */
+function typedCommandWords(id, rawArgv) {
+    const words = [];
+    for (const token of rawArgv) {
+        if (token.startsWith('-'))
+            break;
+        words.push(token);
+        if (words.join(':') === id)
+            return words;
+    }
+    return String(id ?? '')
+        .split(':')
+        .filter(Boolean);
+}
+/**
+ * What `--json` prints for a miss: the same `{ok:false, error}` every other
+ * refusal prints, so a script that parses refusals parses this one — instead of
+ * `jq` reading prose and failing with "Invalid numeric literal", which is how
+ * the report found it.
+ */
+function commandMissEnvelope(config, id, words) {
+    const miss = analyzeCommandMiss(config, id);
+    return {
+        ok: false,
+        error: {
+            code: 'COMMAND_NOT_FOUND',
+            message: miss.message,
+            retryable: false,
+            command: null,
+            typed: `${config.bin} ${words.join(' ')}`.trim(),
+            ...(miss.fix ? { fix: miss.fix } : {}),
+            ...(miss.suggestions.length > 0 ? { suggestions: miss.suggestions } : {}),
+        },
+    };
+}

package/dist/lib/commitment-loop-status.d.ts

@@ -12,5 +12,13 @@ import { type CommitmentLoopStatus, type CommitmentRoster } from '@skrr-ai/data-
 export declare function loopStateLabel(state: unknown): string;
 /** Roster table: one row per Commitment. */
 export declare function formatCommitmentRoster(roster: Partial<CommitmentRoster>): string[];
+/**
+ * One loop in a few lines, for a surface that lists many (`commitments operating-review`). It carries
+ * the same facts as `formatCommitmentLoopStatus` but in the order an owner asks them: is it armed,
+ * when does it next wake, why did it last stop, can it read what it watches, what did it run today.
+ * Every line is present when its fact is unknown, because "cannot see" must not read as "nothing to
+ * report" (OSK-15438, OSK-15412). Lines are returned unindented; the caller indents them.
+ */
+export declare function formatLoopSummary(status: CommitmentLoopStatus): string[];
 /** One Commitment's loop, in full. */
 export declare function formatCommitmentLoopStatus(status: CommitmentLoopStatus): string[];

package/dist/lib/commitment-loop-status.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loopStateLabel = loopStateLabel;
 exports.formatCommitmentRoster = formatCommitmentRoster;
+exports.formatLoopSummary = formatLoopSummary;
 exports.formatCommitmentLoopStatus = formatCommitmentLoopStatus;
 /**
  * Text rendering for `skrr commitments roster` / `skrr commitments status`.
@@ -111,6 +112,50 @@ function formatCommitmentRoster(roster) {
     }
     return lines;
 }
+/**
+ * One loop in a few lines, for a surface that lists many (`commitments operating-review`). It carries
+ * the same facts as `formatCommitmentLoopStatus` but in the order an owner asks them: is it armed,
+ * when does it next wake, why did it last stop, can it read what it watches, what did it run today.
+ * Every line is present when its fact is unknown, because "cannot see" must not read as "nothing to
+ * report" (OSK-15438, OSK-15412). Lines are returned unindented; the caller indents them.
+ */
+function formatLoopSummary(status) {
+    const lines = [];
+    const detail = status.loopDetail || (0, data_provider_1.describeCommitmentLoopState)(status.loopState);
+    lines.push(`loop:      ${loopStateLabel(status.loopState)} — ${detail}${status.loopReason ? ` (${status.loopReason})` : ''}`);
+    const wake = status.nextWakes?.[0];
+    lines.push(`next wake: ${wake
+        ? `${when(wake.at)} ${wake.kind}`
+        : status.loopState === 'unknown'
+            ? 'could not be read'
+            : 'none — nothing is scheduled to wake it'}`);
+    if (status.lastStop) {
+        const stop = status.lastStop;
+        lines.push(`last stop: ${stop.question}${stop.reason ? ` — ${stop.reason}` : ''}${stop.detail ? `: ${stop.detail}` : ''}`);
+        if (stop.fix)
+            lines.push(`fix:       ${stop.fix}`);
+    }
+    else {
+        lines.push('last stop: none recorded');
+    }
+    const watching = Array.isArray(status.watching) ? status.watching : [];
+    const trouble = watching
+        .filter((row) => row.access !== 'readable' || row.completeness === 'partial')
+        .map((row) => {
+        const access = row.access === 'blocked'
+            ? 'CANNOT READ'
+            : row.access === 'unknown'
+                ? 'not known'
+                : 'PARTIAL read';
+        return `${row.source} ${access}${row.reason ? ` (${row.reason})` : ''}`;
+    });
+    lines.push(`sources:   ${!watching.length ? 'none declared' : trouble.length ? trouble.join('; ') : 'all readable'}`);
+    lines.push(`today:     ${runs(status)} runs · spend ${spend(status)}`);
+    if (status.readErrors?.length) {
+        lines.push(`unread:    ${status.readErrors.join(', ')} could not be read; treat the above as unknown`);
+    }
+    return lines;
+}
 /** One Commitment's loop, in full. */
 function formatCommitmentLoopStatus(status) {
     const lines = [];

package/dist/lib/commitment-product.js

@@ -62,9 +62,12 @@ function renderExecutionReceipt(receipt, log, verbose = false) {
     // restates what happened (a typed blocker's summary, which servers before
     // OSK-16429 sent as the reason) is narrative, not something to do: the actor
     // is printed without it and the narrative stays with the blocker.
+    // A bare reason code (servers before OSK-16451 sent `runtime_connection_unverifiable`
+    // there) is not an action either: the actor is printed alone.
     const narrative = [receipt.summary, receipt.blocker?.summary].filter(Boolean);
-    const action = receipt.nextActor?.reason && !narrative.includes(receipt.nextActor.reason)
-        ? receipt.nextActor.reason
+    const reason = receipt.nextActor?.reason;
+    const action = reason && !narrative.includes(reason) && !/^[A-Za-z0-9_.:-]+$/.test(reason.trim())
+        ? reason
         : '';
     if (receipt.nextActor)
         log(`Next: ${receipt.nextActor.label || receipt.nextActor.kind}${action ? ` — ${action}` : ''}`);

package/dist/lib/commitments.d.ts

@@ -18,7 +18,7 @@ import { type CommitmentObservationsQuery, type CommitmentObservationsResponse }
  * "hold this state", derived from a Compass invariant — not authored here).
  */
 import { COMMITMENT_WATCHED_SOURCES, COMMITMENT_TEMPLATE_IDS, COMMITMENT_CADENCE_MODES, COMMITMENT_CADENCE_TIME_PATTERN, COMMITMENT_CADENCE_MAX_TIMES, COMMITMENT_EXECUTION_ISOLATION_MODES, COMMITMENT_STATUSES, COMMITMENT_KIND_VALUES } from '@skrr-ai/data-provider';
-import type { CommitmentCheck, CommitmentChecksResponse, Commitment, CommitmentActionProposal, CommitmentListResponse, CommitmentPlanResponse, CommitmentScheduleIssue, CommitmentStatusResponse, CommitmentWorkLink, CommitmentExecutionReceiptListResponse, CommitmentExecutionReceiptQuarterlyMetricsResponse, CommitmentCapabilitySource, CommitmentDeliveryPatchResponse, CommitmentDeliveryBundleResponse, CommitmentCyclesResponse, CommitmentExplanationResponse, CommitmentRunPermissions, CommitmentLoopStatus, CommitmentRoster } from '@skrr-ai/data-provider';
+import type { CommitmentCheck, CommitmentChecksResponse, Commitment, CommitmentRevisionReceipt, CommitmentUpdateResponse, CommitmentActionProposal, CommitmentListResponse, CommitmentPlanResponse, CommitmentScheduleIssue, CommitmentStatusResponse, CommitmentWorkLink, CommitmentExecutionReceiptListResponse, CommitmentExecutionReceiptQuarterlyMetricsResponse, CommitmentCapabilitySource, CommitmentDeliveryPatchResponse, CommitmentDeliveryBundleResponse, CommitmentCyclesResponse, CommitmentExplanationResponse, CommitmentRunPermissions, CommitmentLoopStatus, CommitmentRoster } from '@skrr-ai/data-provider';
 import { withQuery } from './triggers';
 export { COMMITMENT_WATCHED_SOURCES, COMMITMENT_TEMPLATE_IDS, COMMITMENT_CADENCE_MODES, COMMITMENT_CADENCE_TIME_PATTERN, COMMITMENT_CADENCE_MAX_TIMES, COMMITMENT_STATUSES, COMMITMENT_KIND_VALUES, };
 export type { CommitmentCheck, CommitmentChecksResponse, Commitment, CommitmentActionProposal, CommitmentListResponse, CommitmentPlanResponse, CommitmentStatusResponse, CommitmentWorkLink, };
@@ -276,7 +276,7 @@ export declare const commitmentApi: {
     }) => Promise<Record<string, unknown>>;
     readinessReceipt: (id: string, receiptId: string) => Promise<Record<string, unknown>>;
     create: (body: Record<string, unknown>) => Promise<Commitment>;
-    update: (id: string, body: Record<string, unknown>) => Promise<Commitment>;
+    update: (id: string, body: Record<string, unknown>) => Promise<CommitmentUpdateResponse>;
     draftPreflight: (body: Record<string, unknown>) => Promise<CommitmentPreflightReport>;
     workLinks: (id: string, includeInactive?: boolean) => Promise<{
         object: "commitment_work_link_list";
@@ -553,6 +553,10 @@ export interface CommitmentAccountingReadout {
     costRunCount?: number;
     costReportedRunCount?: number;
     costUnavailableRunCount?: number;
+    /** Runs refused before any model turn: they cost nothing (OSK-15500). */
+    costNoSpendRunCount?: number;
+    /** …of which the verdict rests on inference, not a recorded refusal. */
+    costNoSpendInferredRunCount?: number;
     costStatus?: 'reported' | 'partial' | 'unavailable' | 'not_applicable';
     recommendedAttemptMultiplier?: number | null;
     multiplierDerivation?: string;
@@ -573,6 +577,10 @@ export interface CommitmentCostWindow {
     runCount?: number;
     reportedRunCount?: number;
     unavailableRunCount?: number;
+    /** Runs refused before any model turn: they cost nothing (OSK-15500). */
+    noSpendRunCount?: number;
+    /** …of which the verdict rests on inference, not a recorded refusal. */
+    noSpendInferredRunCount?: number;
     costStatus?: 'reported' | 'partial' | 'unavailable' | 'not_applicable';
 }
 /**
@@ -824,8 +832,9 @@ export declare function describeOperation(operation: string | null | undefined,
  * under "Fix:" read as a remedy nobody wrote (OSK-16230). That narrative is
  * labelled `Blocker:` instead, and no remedy is made up for it.
  */
+type OperationFixLabel = 'Fix' | 'Blocker' | 'Last run';
 export declare function describeOperationFix(commitment: CommitmentView, operation: string | null | undefined): Array<{
-    label: 'Fix' | 'Blocker';
+    label: OperationFixLabel;
     text: string;
 }>;
 /**
@@ -846,6 +855,12 @@ export declare function withLiveAssessment(commitment: CommitmentView, operating
     executorBlocked?: unknown;
     firstActionableBlocker?: unknown;
 } | null): CommitmentView;
+/**
+ * The first line of `commitments update` text output. An update that changed
+ * nothing says so and names the version it left alone (OSK-16199); a server
+ * that predates the receipt is reported as updated, exactly as before.
+ */
+export declare function describeCommitmentRevision(revision: CommitmentRevisionReceipt | undefined): string;
 export declare function renderCommitmentSummary(commitment: CommitmentView, log: (line: string) => void, 
 /**
  * The most recent check, when the caller has one. Optional because pause /

package/dist/lib/commitments.js

@@ -25,6 +25,7 @@ exports.describeOperation = describeOperation;
 exports.describeOperationFix = describeOperationFix;
 exports.describeStoppedBy = describeStoppedBy;
 exports.withLiveAssessment = withLiveAssessment;
+exports.describeCommitmentRevision = describeCommitmentRevision;
 exports.renderCommitmentSummary = renderCommitmentSummary;
 exports.describeWakeDecision = describeWakeDecision;
 exports.renderCheckList = renderCheckList;
@@ -661,6 +662,17 @@ function buildWatchedSources(inputs) {
     }
     return normalizeWatchedSourceDeclarations(rows);
 }
+/**
+ * The assessment's evidence state as one line. `unconfigured` read as if a source were broken (OSK-15412); it
+ * means no required success criterion is set, so nothing is being measured, which is a different thing to fix.
+ * The other states keep their one word.
+ */
+function describeAssessmentEvidence(evidence) {
+    if (evidence === 'unconfigured') {
+        return 'unconfigured — no required success criterion is set, so nothing is being measured (not a failing source)';
+    }
+    return evidence ?? 'unavailable';
+}
 /**
  * One line an author can act on, or nothing.
  *
@@ -946,40 +958,38 @@ function describeOperation(operation, reason) {
     };
     return `not running — ${meaning[status] ?? status}`;
 }
-/**
- * What to do about an operation that is not running, from the operating state's
- * first actionable blocker (`withLiveAssessment` carries it onto the view).
- *
- * `show` printed `Operation: blocked — typed_external_blocker` and nothing else,
- * so the one line a reader acts on was a code; the remediation the server
- * already composed sat only in `--json` and `doctor` (OSK-16212). Nothing is
- * printed while the operation is ready or working, where a fix would contradict
- * the line above it.
- *
- * Returns one or two lines. `Fix:` only when the blocker carries an action; a
- * typed blocker an agent returned carries only what happened, which printed
- * under "Fix:" read as a remedy nobody wrote (OSK-16230). That narrative is
- * labelled `Blocker:` instead, and no remedy is made up for it.
- */
 function describeOperationFix(commitment, operation) {
     if (operation === 'ready' || operation === 'working')
         return [];
     const blocker = commitment.firstActionableBlocker;
-    if (!blocker)
-        return [];
-    const remediation = typeof blocker.remediation === 'string' ? blocker.remediation.trim() : '';
-    const detail = typeof blocker.detail === 'string' ? blocker.detail.trim() : '';
-    const who = typeof blocker.ownerLabel === 'string' && blocker.ownerLabel
-        ? blocker.ownerLabel
-        : typeof blocker.owner === 'string' && blocker.owner
-            ? blocker.owner
-            : '';
     const lines = [];
-    // The detail is shown only when the fix does not already say it.
-    if (detail && detail !== remediation)
-        lines.push({ label: 'Blocker', text: `${detail}${!remediation && who ? ` (${who})` : ''}` });
-    if (remediation)
-        lines.push({ label: 'Fix', text: `${remediation}${who ? ` (${who})` : ''}` });
+    let remediation = '';
+    if (blocker) {
+        remediation = typeof blocker.remediation === 'string' ? blocker.remediation.trim() : '';
+        const detail = typeof blocker.detail === 'string' ? blocker.detail.trim() : '';
+        const who = typeof blocker.ownerLabel === 'string' && blocker.ownerLabel
+            ? blocker.ownerLabel
+            : typeof blocker.owner === 'string' && blocker.owner
+                ? blocker.owner
+                : '';
+        // The detail is shown only when the fix does not already say it.
+        if (detail && detail !== remediation)
+            lines.push({ label: 'Blocker', text: `${detail}${!remediation && who ? ` (${who})` : ''}` });
+        if (remediation)
+            lines.push({ label: 'Fix', text: `${remediation}${who ? ` (${who})` : ''}` });
+    }
+    // What refused the last Run is a second fact, not an alternative to the
+    // blocker: a paused Commitment whose Run was refused needs both a resume and
+    // the fix, or resuming only fails again (OSK-15389). The sentence is the
+    // server's, derived on read from the failure code; it is printed whenever it
+    // exists and says something the blocker's fix does not.
+    const liveness = commitment.state?.liveness;
+    const lastRunFix = liveness && liveness.current !== false && typeof liveness.diagnosisFix === 'string'
+        ? liveness.diagnosisFix.trim()
+        : '';
+    if (lastRunFix && lastRunFix !== remediation) {
+        lines.push({ label: lines.length ? 'Last run' : 'Fix', text: lastRunFix });
+    }
     return lines;
 }
 /**
@@ -1036,6 +1046,19 @@ function withLiveAssessment(commitment, operatingState) {
         assessment: live,
     };
 }
+/**
+ * The first line of `commitments update` text output. An update that changed
+ * nothing says so and names the version it left alone (OSK-16199); a server
+ * that predates the receipt is reported as updated, exactly as before.
+ */
+function describeCommitmentRevision(revision) {
+    if (!revision || typeof revision.changed !== 'boolean')
+        return 'Updated commitment:';
+    if (!revision.changed) {
+        return `No change: the commitment already matches; it stays at version ${revision.version}.`;
+    }
+    return `Updated commitment (version ${revision.previousVersion} -> ${revision.version}):`;
+}
 function renderCommitmentSummary(commitment, log, 
 /**
  * The most recent check, when the caller has one. Optional because pause /
@@ -1092,7 +1115,7 @@ scheduleIssues) {
         ? (0, data_provider_2.readCommitmentAssessment)(commitment.assessment)
         : undefined;
     log(`Assessment: ${assessment?.label ?? 'Unknown'}`);
-    log(`Evidence:   ${assessment?.evidence ?? 'unavailable'}`);
+    log(`Evidence:   ${describeAssessmentEvidence(assessment?.evidence)}`);
     log(`Operation:  ${describeOperation(assessment?.operation, assessment?.operationReason)}`);
     for (const line of describeOperationFix(commitment, assessment?.operation))
         log(`            ${line.label}: ${line.text}`);
@@ -1237,15 +1260,22 @@ function renderCheckList(checks, log) {
         log('No checks recorded.');
         return;
     }
+    // A compacted Check's open loops and action plan were stripped, so an empty
+    // list there is "not retained", never "none" (OSK-15148). Its retained
+    // explanation stands in for the stripped `whyNow`.
+    const retainedCount = (c, list) => c.historyDetail && !list?.length ? '-' : String(list?.length ?? 0);
     (0, format_1.renderTable)(checks.map((c) => ({
         started: c.startedAt ?? '-',
         kind: c.checkKind ?? '-',
         status: c.status ?? '-',
         posture: c.decision?.posture ?? '-',
-        loops: String(c.openLoops?.length ?? 0),
-        actions: String(c.actionPlan?.length ?? 0),
+        loops: retainedCount(c, c.openLoops),
+        actions: retainedCount(c, c.actionPlan),
         woke: describeWakeDecision(c),
-        why: c.decision?.whyNow ?? c.reason ?? '',
+        why: c.decision?.whyNow ??
+            c.decision?.summary ??
+            c.reason ??
+            (c.historyDetail ? '(detail not retained)' : ''),
         id: c.id ?? '-',
     })), [
         { key: 'started', header: 'STARTED', maxWidth: 24 },
@@ -1261,6 +1291,16 @@ function renderCheckList(checks, log) {
         // meant re-running the command with `--json` (OSK-6175).
         { key: 'id', header: 'ID', verbatim: true },
     ], log);
+    // The legend states each distinct reason the server recorded, in the same
+    // words explain and cycles use; it never guesses "compacted" for a Check
+    // whose history is merely missing (OSK-15148).
+    const reasons = [
+        ...new Set(checks
+            .map((c) => (0, data_provider_2.describeCommitmentHistoryDetail)(c.historyDetail))
+            .filter((sentence) => Boolean(sentence))),
+    ];
+    if (reasons.length > 0)
+        log(`'-' = not retained. ${reasons.join(' ')}`);
 }
 function records(value) {
     return Array.isArray(value)
@@ -1628,18 +1668,18 @@ function formatCommitmentCycles(page) {
  */
 function formatCycleLatency(cycle) {
     const latency = cycle.latency;
-    const history = cycle.historyDetail;
-    const disclosure = history?.state === 'compacted'
-        ? [
-            `             Detailed history was compacted${history.at ? ` at ${history.at}` : ''}; available reason and source timestamps were retained.`,
-        ]
-        : history?.state === 'unavailable'
-            ? ['             Detailed history is unavailable; why it is missing was not recorded.']
-            : [];
-    const missingFor = (stage) => (latency?.pendingStages ? latency.pendingStages.includes(stage) : latency?.pending)
-        ? 'pending'
-        : 'unmeasurable';
-    if (latency?.measured === false) {
+    // One sentence for every surface, from the server's own record (OSK-15148).
+    const historySentence = (0, data_provider_2.describeCommitmentHistoryDetail)(cycle.historyDetail);
+    const disclosure = historySentence ? [`             ${historySentence}`] : [];
+    // A hop whose inputs were compacted away without a retained projection is
+    // "not retained": it may have been measured and shown before (OSK-15148).
+    const unretained = new Set(latency?.unretainedStages || []);
+    const missingFor = (stage) => unretained.has(stage)
+        ? 'not retained'
+        : (latency?.pendingStages ? latency.pendingStages.includes(stage) : latency?.pending)
+            ? 'pending'
+            : 'unmeasurable';
+    if (latency?.measured === false && unretained.size === 0) {
         return [...disclosure, `             latency: ${latency.pending ? 'pending' : 'unmeasurable'}`];
     }
     return [

package/dist/lib/daemon-command-hint.d.ts

@@ -0,0 +1,15 @@
+/**
+ * `skrr daemon <verb> [args]` as a person can paste it for THIS profile.
+ *
+ * `skrr daemon login` with no `--profile` acts on whichever profile the shell it
+ * is typed in resolves, which is the default one unless something says
+ * otherwise. So a hint printed after `skrr login --profile expd` that said only
+ * `skrr daemon login` sent people to sign a different daemon in and leave the
+ * one they had just set up exactly as it was (OSK-16435). The profile is named
+ * only when it is not the default, the way every other hint here spells it.
+ */
+export declare function daemonCommandHint(verb: string, options?: {
+    bin?: string;
+    extraArgs?: string;
+    profile?: string;
+}): string;

package/dist/lib/daemon-command-hint.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.daemonCommandHint = daemonCommandHint;
+const keychain_1 = require("./keychain");
+/**
+ * `skrr daemon <verb> [args]` as a person can paste it for THIS profile.
+ *
+ * `skrr daemon login` with no `--profile` acts on whichever profile the shell it
+ * is typed in resolves, which is the default one unless something says
+ * otherwise. So a hint printed after `skrr login --profile expd` that said only
+ * `skrr daemon login` sent people to sign a different daemon in and leave the
+ * one they had just set up exactly as it was (OSK-16435). The profile is named
+ * only when it is not the default, the way every other hint here spells it.
+ */
+function daemonCommandHint(verb, options = {}) {
+    const bin = options.bin ?? 'skrr';
+    const profile = options.profile ?? (0, keychain_1.getActiveProfile)();
+    const scoped = profile && profile !== keychain_1.DEFAULT_PROFILE ? ` --profile ${profile}` : '';
+    const extra = options.extraArgs ? ` ${options.extraArgs}` : '';
+    return `${bin} daemon ${verb}${scoped}${extra}`;
+}