@skrr-ai/cli 0.1.105 → 0.1.107

package/dist/commands/agents/operating-plan.js

@@ -44,7 +44,7 @@ class AgentOperatingPlan extends base_command_1.BaseCommand {
                     this.log(`  Evaluation: ${w.status} — ${w.reason}${w.nextAt ? `; next ${w.nextAt}` : ''}`);
                 this.log(`  Next intervention: ${r.lifecycle !== 'active' ? 'inactive; requires activation' : r.nextIntervention?.nextAt || r.nextIntervention?.status || 'not recorded'}`);
                 if (r.blocker)
-                    this.log(`  Blocker: ${r.blocker.code} — ${r.blocker.remediation || ''}`);
+                    this.log(`  Blocker: ${r.blocker.code} — ${r.blocker.remediation || r.blocker.detail || ''}`);
             }
             for (const line of (0, operating_plan_loops_1.planningLoopLines)(plan.planning.loops, plan.planning.todos.length))
                 this.log(line);

package/dist/commands/commitments/doctor.js

@@ -16,7 +16,8 @@ function doctorVerdict(input) {
         const lifecycle = /^status_([a-z_]+)$/.exec(String(blocker.code));
         return {
             verdict: lifecycle ? lifecycle[1] : blocker.code === 'deleted' ? 'deleted' : 'blocked',
-            next: String(blocker.remediation || 'Inspect the Commitment'),
+            // A typed blocker carries no remedy, only what happened (OSK-16230).
+            next: String(blocker.remediation || blocker.detail || 'Inspect the Commitment'),
         };
     }
     if (operatingState.status === 'waiting_approval') {

package/dist/commands/daemon/logs.d.ts

@@ -124,6 +124,13 @@ export declare const LIVE_LOG_RESOLUTION_RUNTIME_VERSION = "0.8.119";
  * that file and its rotated siblings itself.
  */
 export declare const ROTATED_LOGS_RUNTIME_VERSION = "0.8.120";
+/**
+ * The first runtime whose `logs --rotated --lines N` says where a window that
+ * cut older lines starts, and whose `logs --path` names the rotated siblings
+ * on stderr (OSK-16228). 0.8.120 knows `--rotated` but says neither, so for it
+ * the CLI reads the files itself, exactly as it does for an older runtime.
+ */
+export declare const ROTATED_WINDOW_NOTE_RUNTIME_VERSION = "0.8.121";
 /**
  * Rotated siblings of a log, OLDEST FIRST (OSK-16214). The daemon's logger
  * renames `daemon.app.log` to `daemon.app.1.log`, `.1` to `.2` and so on at
@@ -146,6 +153,31 @@ export declare function readLastLines(filePath: string, maxLines: number): strin
  * file. A file renamed away between the listing and the read is skipped.
  */
 export declare function readLastLinesAcross(files: readonly string[], maxLines: number): string[];
+/**
+ * Where a `--rotated --lines N` window began when it left older lines out
+ * (OSK-16228). `startLine` is 1-based within `file`; `totalLines` counts the
+ * whole set. A copy of `daemon/src/rotated-log-files.ts`, like the helpers above.
+ */
+export interface LogWindowCut {
+    file: string;
+    startLine: number;
+    totalLines: number;
+}
+/** Lines in a file, split as `readLastLines` splits them; read in chunks. */
+export declare function countLines(filePath: string): number;
+/**
+ * `readLastLinesAcross`, plus where the window began when it cut older lines.
+ * Without it, `--rotated --lines 20000 | grep <id>` for an id 90k lines back
+ * printed nothing and said nothing, which reads as "never logged". Lines are
+ * counted only once the window is full, and only from the file it stopped in
+ * back.
+ */
+export declare function readLogWindow(files: readonly string[], maxLines: number): {
+    lines: string[];
+    cut: LogWindowCut | null;
+};
+/** The stderr sentence for a window that left older lines out. */
+export declare function describeLogWindowCut(cut: LogWindowCut, shown: number): string;
 /** Every byte of `files`, in order, to `out` — streamed, honouring back-pressure. */
 export declare function streamLogFiles(files: readonly string[], out: NodeJS.WritableStream): Promise<void>;
 /** `x.y.z` from a version string, or null. A prerelease suffix is ignored. */

package/dist/commands/daemon/logs.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STDERR_FLAG_DESCRIPTION = exports.ROTATED_LOGS_RUNTIME_VERSION = exports.LIVE_LOG_RESOLUTION_RUNTIME_VERSION = void 0;
+exports.STDERR_FLAG_DESCRIPTION = exports.ROTATED_WINDOW_NOTE_RUNTIME_VERSION = exports.ROTATED_LOGS_RUNTIME_VERSION = exports.LIVE_LOG_RESOLUTION_RUNTIME_VERSION = void 0;
 exports.describeLogAge = describeLogAge;
 exports.resolveLegacyDaemonLogPath = resolveLegacyDaemonLogPath;
 exports.resolveDaemonLogsProfile = resolveDaemonLogsProfile;
@@ -15,6 +15,9 @@ exports.rotatedLogSiblings = rotatedLogSiblings;
 exports.describeRotatedSiblings = describeRotatedSiblings;
 exports.readLastLines = readLastLines;
 exports.readLastLinesAcross = readLastLinesAcross;
+exports.countLines = countLines;
+exports.readLogWindow = readLogWindow;
+exports.describeLogWindowCut = describeLogWindowCut;
 exports.streamLogFiles = streamLogFiles;
 exports.parseRuntimeVersion = parseRuntimeVersion;
 exports.runtimeVersionAtLeast = runtimeVersionAtLeast;
@@ -228,6 +231,13 @@ exports.LIVE_LOG_RESOLUTION_RUNTIME_VERSION = '0.8.119';
  * that file and its rotated siblings itself.
  */
 exports.ROTATED_LOGS_RUNTIME_VERSION = '0.8.120';
+/**
+ * The first runtime whose `logs --rotated --lines N` says where a window that
+ * cut older lines starts, and whose `logs --path` names the rotated siblings
+ * on stderr (OSK-16228). 0.8.120 knows `--rotated` but says neither, so for it
+ * the CLI reads the files itself, exactly as it does for an older runtime.
+ */
+exports.ROTATED_WINDOW_NOTE_RUNTIME_VERSION = '0.8.121';
 /**
  * Rotated siblings of a log, OLDEST FIRST (OSK-16214). The daemon's logger
  * renames `daemon.app.log` to `daemon.app.1.log`, `.1` to `.2` and so on at
@@ -304,19 +314,90 @@ function readLastLines(filePath, maxLines) {
  * file. A file renamed away between the listing and the read is skipped.
  */
 function readLastLinesAcross(files, maxLines) {
+    return readLogWindow(files, maxLines).lines;
+}
+/** Lines in a file, split as `readLastLines` splits them; read in chunks. */
+function countLines(filePath) {
+    const descriptor = (0, node_fs_1.openSync)(filePath, 'r');
+    try {
+        const buffer = Buffer.alloc(64 * 1024);
+        let count = 0;
+        let last = -1;
+        let position = 0;
+        for (;;) {
+            const read = (0, node_fs_1.readSync)(descriptor, buffer, 0, buffer.length, position);
+            if (read === 0)
+                break;
+            position += read;
+            for (let i = 0; i < read; i += 1)
+                if (buffer[i] === 0x0a)
+                    count += 1;
+            last = buffer[read - 1];
+        }
+        return last === -1 || last === 0x0a ? count : count + 1;
+    }
+    finally {
+        (0, node_fs_1.closeSync)(descriptor);
+    }
+}
+/**
+ * `readLastLinesAcross`, plus where the window began when it cut older lines.
+ * Without it, `--rotated --lines 20000 | grep <id>` for an id 90k lines back
+ * printed nothing and said nothing, which reads as "never logged". Lines are
+ * counted only once the window is full, and only from the file it stopped in
+ * back.
+ */
+function readLogWindow(files, maxLines) {
     const collected = [];
     let remaining = maxLines;
+    let boundary = null;
     for (let i = files.length - 1; i >= 0 && remaining > 0; i -= 1) {
         try {
             const lines = readLastLines(files[i], remaining);
             collected.unshift(lines);
             remaining -= lines.length;
+            if (remaining <= 0)
+                boundary = { index: i, taken: lines.length };
         }
         catch {
             // Rotated away mid-read; the rest are still worth showing.
         }
     }
-    return collected.flat();
+    const lines = collected.flat();
+    if (boundary === null)
+        return { lines, cut: null };
+    let boundaryLines;
+    try {
+        boundaryLines = countLines(files[boundary.index]);
+    }
+    catch {
+        return { lines, cut: null };
+    }
+    let olderLines = 0;
+    for (const file of files.slice(0, boundary.index)) {
+        try {
+            olderLines += countLines(file);
+        }
+        catch {
+            // Rotated away since the read; it is not in the window either way.
+        }
+    }
+    const startLine = Math.max(1, boundaryLines - boundary.taken + 1);
+    if (startLine === 1 && olderLines === 0)
+        return { lines, cut: null };
+    return {
+        lines,
+        cut: {
+            file: files[boundary.index],
+            startLine,
+            totalLines: olderLines + (startLine - 1) + lines.length,
+        },
+    };
+}
+/** The stderr sentence for a window that left older lines out. */
+function describeLogWindowCut(cut, shown) {
+    return (`Showing the last ${shown} of ${cut.totalLines} lines; the window starts at line ` +
+        `${cut.startLine} of ${node_path_1.default.basename(cut.file)}. Drop --lines to read the full history.`);
 }
 /** Every byte of `files`, in order, to `out` — streamed, honouring back-pressure. */
 async function streamLogFiles(files, out) {
@@ -623,30 +704,46 @@ class DaemonLogs extends core_1.Command {
             const runtimeKnowsRotated = plan.kind === 'forward' &&
                 plan.runtimeVersion !== null &&
                 runtimeVersionAtLeast(plan.runtimeVersion, exports.ROTATED_LOGS_RUNTIME_VERSION) === true;
-            if (plan.kind === 'forward' && flags.rotated && !runtimeKnowsRotated) {
+            // OSK-16228: a `--rotated --lines N` window that cuts older lines, and
+            // `--path` with rotated siblings beside it, are said on stderr only from
+            // ROTATED_WINDOW_NOTE_RUNTIME_VERSION. Below it, read the files here.
+            const runtimeSaysWindow = plan.kind === 'forward' &&
+                plan.runtimeVersion !== null &&
+                runtimeVersionAtLeast(plan.runtimeVersion, exports.ROTATED_WINDOW_NOTE_RUNTIME_VERSION) === true;
+            if (plan.kind === 'forward' && !runtimeSaysWindow && (flags.rotated || flags.path)) {
                 const resolved = await resolveForwardedLogPath(flags);
-                if (!resolved) {
+                if (resolved) {
+                    plan = {
+                        kind: 'read',
+                        path: resolved,
+                        note: null,
+                        missingHint: 'The live daemon has not written it yet; `skrr daemon status` shows whether one is running.',
+                    };
+                }
+                else if (flags.rotated && !runtimeKnowsRotated) {
                     this.error(`The installed runtime${plan.runtimeVersion ? ` (${plan.runtimeVersion})` : ''} predates ` +
                         `--rotated (${exports.ROTATED_LOGS_RUNTIME_VERSION}) and did not name its log file, so its ` +
                         'rotated files cannot be found. Upgrade it (`skrr daemon update`), or list the ' +
                         'directory `skrr daemon logs --path` prints.', { exit: 1 });
                 }
-                plan = {
-                    kind: 'read',
-                    path: resolved,
-                    note: null,
-                    missingHint: 'The live daemon has not written it yet; `skrr daemon status` shows whether one is running.',
-                };
+                // Otherwise forward: the runtime still answers, just without the note.
             }
             if (plan.kind === 'read') {
                 const logPath = plan.path;
                 const siblings = rotatedLogSiblings(logPath);
-                // `--path` prints the one path and nothing else, on either stream —
-                // under --rotated, every file oldest first, the current one last.
+                // `--path` prints the one path and nothing else on stdout — under
+                // --rotated, every file oldest first, the current one last. Without
+                // --rotated, stderr names the siblings a grep of that path would miss
+                // (OSK-16228).
                 if (flags.path) {
                     for (const file of flags.rotated ? siblings : [])
                         this.log(file);
                     this.log(logPath);
+                    if (!flags.rotated) {
+                        const hint = describeRotatedSiblings(logPath, siblings);
+                        if (hint)
+                            this.logToStderr(hint);
+                    }
                     return;
                 }
                 if (plan.note)
@@ -668,11 +765,16 @@ class DaemonLogs extends core_1.Command {
                     await streamLogFiles([...siblings, logPath], process.stdout);
                 }
                 else {
-                    const lines = flags.rotated
-                        ? readLastLinesAcross([...siblings, logPath], flags.lines ?? 200)
-                        : readDaemonLogTail(logPath, flags.lines ?? 200);
+                    const window = flags.rotated
+                        ? readLogWindow([...siblings, logPath], flags.lines ?? 200)
+                        : null;
+                    const lines = window ? window.lines : readDaemonLogTail(logPath, flags.lines ?? 200);
                     if (lines.length > 0)
                         this.log(lines.join('\n'));
+                    // OSK-16228: after the content, so it is the last thing a terminal
+                    // shows, and on stderr, so a grep over stdout is unchanged.
+                    if (window?.cut)
+                        this.logToStderr(describeLogWindowCut(window.cut, lines.length));
                 }
                 if (flags.follow) {
                     let position = (0, node_fs_1.statSync)(logPath).size;

package/dist/commands/proposals/list.d.ts

@@ -1,3 +1,4 @@
+import type { ProposalView } from '@skrr-ai/data-provider';
 import { BaseCommand } from '../../base-command';
 /**
  * What an empty page means. With a filter AND a next cursor it does NOT mean "none": the inbox reads a
@@ -6,6 +7,12 @@ import { BaseCommand } from '../../base-command';
  * Without a cursor the inbox is exhausted and "none" is true.
  */
 export declare function emptyPageLines(narrowed: boolean, nextCursor: string | null | undefined): string[];
+/**
+ * What the row is ABOUT: the Commitment and the Agent behind it, in the order the web inbox shows them. 51 distinct titles covered 747 decidable
+ * initiatives, so the title alone could not tell two rows apart (OSK-15378). A dash is "not named" (an id the
+ * server could not read for this viewer is in `--json`), never "none".
+ */
+export declare function aboutFor(row: ProposalView): string;
 export default class ProposalsList extends BaseCommand {
     static description: string;
     static flags: {

package/dist/commands/proposals/list.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.emptyPageLines = emptyPageLines;
+exports.aboutFor = aboutFor;
 const core_1 = require("@oclif/core");
 const data_provider_1 = require("@skrr-ai/data-provider");
 const base_command_1 = require("../../base-command");
@@ -23,6 +24,14 @@ function emptyPageLines(narrowed, nextCursor) {
         ]
         : ['No proposals on this page; the cursor below continues.'];
 }
+/**
+ * What the row is ABOUT: the Commitment and the Agent behind it, in the order the web inbox shows them. 51 distinct titles covered 747 decidable
+ * initiatives, so the title alone could not tell two rows apart (OSK-15378). A dash is "not named" (an id the
+ * server could not read for this viewer is in `--json`), never "none".
+ */
+function aboutFor(row) {
+    return [row.commitmentTitle, row.agent?.name].filter(Boolean).join(' · ') || '—';
+}
 /** A snoozed proposal reads `proposed` in its disposition; the wake time is what tells them apart. */
 function noteFor(row) {
     if (row.sourceStatus === 'snoozed' && row.snoozedUntil)
@@ -77,6 +86,7 @@ class ProposalsList extends base_command_1.BaseCommand {
         (0, format_1.renderTable)(result.data.map((row) => ({
             id: row.id,
             title: row.title,
+            about: aboutFor(row),
             disposition: row.disposition,
             // Most proposals carry no estimate; "unknown" read as a failure to determine one (OSK-15377).
             basis: row.economics?.basis || '—',
@@ -85,6 +95,7 @@ class ProposalsList extends base_command_1.BaseCommand {
         })), [
             { key: 'id', header: 'PROPOSAL', verbatim: true },
             { key: 'title', header: 'TITLE' },
+            { key: 'about', header: 'ABOUT', maxWidth: 48 },
             { key: 'disposition', header: 'DISPOSITION' },
             { key: 'basis', header: 'BASIS' },
             { key: 'deadline', header: 'DEADLINE' },

package/dist/commands/tasks/retry-schedule.js

@@ -40,7 +40,17 @@ class TasksRetrySchedule extends base_command_1.BaseCommand {
         const t = result;
         const ref = t.identifier ?? (t.taskNumber ? `#${t.taskNumber}` : '');
         const when = flags.at ?? t.scheduledFor ?? '(server default)';
-        this.log(`Re-armed schedule for task ${t.id ?? t._id ?? taskRef}${ref ? ` (${ref})` : ''} → ${when}`);
+        const retry = t.scheduleRetry;
+        const subject = `task ${t.id ?? t._id ?? taskRef}${ref ? ` (${ref})` : ''}`;
+        if (retry?.changed === false) {
+            this.log(`Schedule for ${subject} is already armed for ${when}; nothing changed.`);
+        }
+        else if (retry?.armedFirstSchedule) {
+            this.log(`Armed a first schedule for ${subject} → ${when} (it had none; \`tasks schedule\` is the command for that).`);
+        }
+        else {
+            this.log(`Re-armed schedule for ${subject} → ${when}`);
+        }
     }
 }
 exports.default = TasksRetrySchedule;

package/dist/lib/commitment-product.js

@@ -65,6 +65,12 @@ function renderExecutionReceipt(receipt, log, verbose = false) {
         for (const evidenceRef of receipt.blocker.evidenceRefs || [])
             log(`  Evidence: ${evidenceRef}`);
     }
+    // A source gap beside this episode, not the reason it stopped (OSK-16230).
+    if (receipt.standingBlocker) {
+        log(`Standing: ${receipt.standingBlocker.code} — ${receipt.standingBlocker.summary} (${receipt.standingBlocker.owner.label})`);
+        for (const evidenceRef of receipt.standingBlocker.evidenceRefs || [])
+            log(`  Evidence: ${evidenceRef}`);
+    }
     if (verbose)
         log(`Diagnostics:\n${JSON.stringify({ id: receipt.id, revision: receipt.revision, evidence: receipt.evidence, diagnostics: receipt.diagnostics }, null, 2)}`);
 }

package/dist/lib/commitments.d.ts

@@ -818,8 +818,16 @@ export declare function describeOperation(operation: string | null | undefined,
  * 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.
- */
-export declare function describeOperationFix(commitment: CommitmentView, operation: string | null | undefined): string | null;
+ *
+ * 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.
+ */
+export declare function describeOperationFix(commitment: CommitmentView, operation: string | null | undefined): Array<{
+    label: 'Fix' | 'Blocker';
+    text: string;
+}>;
 /**
  * Who stopped a Commitment, and when and why, in one line. The server stores it as `stoppedBy`;
  * `show` printed neither (OSK-15423), so a Commitment you paused did not say you had.

package/dist/lib/commitments.js

@@ -955,20 +955,32 @@ function describeOperation(operation, reason) {
  * 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 null;
+        return [];
     const blocker = commitment.firstActionableBlocker;
-    const remediation = blocker && typeof blocker.remediation === 'string' ? blocker.remediation.trim() : '';
-    if (!remediation)
-        return null;
-    const who = typeof blocker?.ownerLabel === 'string' && blocker.ownerLabel
+    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
+        : typeof blocker.owner === 'string' && blocker.owner
             ? blocker.owner
             : '';
-    return `${remediation}${who ? ` (${who})` : ''}`;
+    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})` : ''}` });
+    return lines;
 }
 /**
  * Who stopped a Commitment, and when and why, in one line. The server stores it as `stoppedBy`;
@@ -1082,9 +1094,8 @@ scheduleIssues) {
     log(`Assessment: ${assessment?.label ?? 'Unknown'}`);
     log(`Evidence:   ${assessment?.evidence ?? 'unavailable'}`);
     log(`Operation:  ${describeOperation(assessment?.operation, assessment?.operationReason)}`);
-    const fix = describeOperationFix(commitment, assessment?.operation);
-    if (fix)
-        log(`            Fix: ${fix}`);
+    for (const line of describeOperationFix(commitment, assessment?.operation))
+        log(`            ${line.label}: ${line.text}`);
     if (commitment.state?.lastCheckedAt)
         log(`Checked:   ${commitment.state.lastCheckedAt}`);
     if (typeof commitment.state?.consecutiveUnresolvedChecks === 'number') {

package/dist/node_modules/@skrr-ai/data-provider/index.js

@@ -42386,7 +42386,7 @@ var RA = tA.map(function(e3) {
   return e3.kind;
 }).join(", ");
 var CA = "ui_widget";
-var OA = { titleMax: 120, fallbackTextMax: 600, cssMax: 4e4, htmlMax: 12e4, jsMax: 12e4, totalMax: 2e5, idMax: 64, heightMin: 80, heightInlineMax: 720, heightHardMax: 4e3, perMessageMax: 6 };
+var OA = { titleMax: 120, fallbackTextMax: 600, cssMax: 4e4, htmlMax: 12e4, jsMax: 12e4, totalMax: 2e5, idMax: 64, heightMin: 80, heightInlineMax: 4e3, heightHardMax: 4e3, perMessageMax: 6 };
 var PA = e.z.string().min(1).max(OA.idMax).regex(/^[A-Za-z0-9_-]+$/, 'id may contain letters, digits, "_" and "-" only');
 var NA = e.z.object({ transport: e.z.enum(["fence", "tool", "cli"]), harness: e.z.string().max(64).optional() }).strict();
 var MA = { v: e.z.literal(1), id: PA, title: e.z.string().trim().min(1).max(OA.titleMax), initialHeight: e.z.number().int().min(OA.heightMin).max(OA.heightHardMax).optional(), css: e.z.string().max(OA.cssMax), html: e.z.string().max(OA.htmlMax), js: e.z.string().max(OA.jsMax), source: NA.optional() };

package/oclif.manifest.json

@@ -132497,5 +132497,5 @@
       ]
     }
   },
-  "version": "0.1.105"
+  "version": "0.1.107"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skrr-ai/cli",
-  "version": "0.1.105",
+  "version": "0.1.107",
   "description": "Command-line interface for skrr",
   "license": "ISC",
   "author": "skrr",