@skrr-ai/cli 0.1.22 → 0.1.23

package/dist/commands/convos/search.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const data_provider_1 = require("@skrr-ai/data-provider");
 const base_command_1 = require("../../base-command");
+const conversation_search_1 = require("../../lib/conversation-search");
 const format_1 = require("../../lib/format");
 /**
  * Message-level search across the caller's own conversations.
@@ -51,13 +52,14 @@ class ConvosSearch extends base_command_1.BaseCommand {
         }
         const hits = Array.isArray(response?.messages) ? response.messages : [];
         const shown = hits.slice(0, flags.limit);
+        const compactHits = shown.map((message) => (0, conversation_search_1.compactMessageSearchHit)(message, flags.snippet, query));
         if (flags.json) {
             this.log(JSON.stringify({
                 query,
                 total: hits.length,
                 shown: shown.length,
                 truncated: hits.length > shown.length,
-                hits: shown,
+                hits: compactHits,
             }, null, 2));
             return;
         }
@@ -65,13 +67,11 @@ class ConvosSearch extends base_command_1.BaseCommand {
             this.log(`No messages matched "${query}".`);
             return;
         }
-        (0, format_1.renderTable)(shown.map((m) => ({
+        (0, format_1.renderTable)(compactHits.map((m) => ({
             when: m.createdAt ? String(m.createdAt).slice(0, 10) : '-',
             who: m.isCreatedByUser === true ? 'you' : (0, format_1.formatCell)(m.sender, 'agent'),
             thread: (0, format_1.formatCell)(m.title, 'Untitled'),
-            snippet: String(m.text ?? '')
-                .replace(/\s+/g, ' ')
-                .slice(0, flags.snippet),
+            snippet: String(m.text ?? ''),
         })), [
             { key: 'when', header: 'WHEN' },
             { key: 'who', header: 'WHO', maxWidth: 14 },

package/dist/commands/harnesses/leases/list.d.ts

@@ -4,6 +4,9 @@ export default class HarnessesLeasesList extends BaseCommand {
     static examples: string[];
     static flags: {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        limit: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        state: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        product: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/harnesses/leases/list.js

@@ -14,18 +14,38 @@ const base_command_1 = require("../../../base-command");
 const format_1 = require("../../../lib/format");
 const harnesses_1 = require("../../../lib/harnesses");
 class HarnessesLeasesList extends base_command_1.BaseCommand {
-    static description = 'List your open harness leases';
+    static description = 'List your harness leases, newest first';
     static examples = [
         '<%= config.bin %> harnesses leases list',
+        '<%= config.bin %> harnesses leases list --state lost',
+        '<%= config.bin %> harnesses leases list --limit 100 --product hosted-machine',
         '<%= config.bin %> harnesses leases list --json',
     ];
-    static flags = { json: core_1.Flags.boolean({ description: 'Output as JSON' }) };
+    static flags = {
+        json: core_1.Flags.boolean({ description: 'Output as JSON' }),
+        limit: core_1.Flags.integer({
+            description: 'How many to return, newest first (1-100; the server defaults to 50)',
+            min: 1,
+            max: 100,
+        }),
+        state: core_1.Flags.string({
+            description: 'Only this lease state — e.g. active, paused, terminated, failed, lost. `lost` is the one worth asking for: it means the platform stopped tracking the machine, and it is billed for the whole gap.',
+        }),
+        product: core_1.Flags.string({
+            description: 'Only this machine product',
+            options: ['hosted-machine', 'hosted-job-machine'],
+        }),
+    };
     async run() {
         this.requireAuth();
         const { flags } = await this.parse(HarnessesLeasesList);
         let response;
         try {
-            response = await (0, harnesses_1.listHarnessLeases)();
+            response = await (0, harnesses_1.listHarnessLeases)({
+                limit: flags.limit,
+                state: flags.state,
+                machineProduct: flags.product,
+            });
         }
         catch (err) {
             this.handleApiError(err);
@@ -39,21 +59,48 @@ class HarnessesLeasesList extends base_command_1.BaseCommand {
         if (leases.length === 0) {
             // Say what empty MEANS. "No leases" reads as a failed query; the honest
             // reading is that nothing hosted is running, and nothing is being billed.
-            this.log('No open leases — nothing hosted is running, and nothing is accruing.');
+            // With a filter on, that reading would be a lie — the absence is about
+            // the filter, not the account.
+            const filters = [
+                flags.state ? `state ${flags.state}` : '',
+                flags.product ? `product ${flags.product}` : '',
+            ].filter(Boolean);
+            this.log(filters.length
+                ? `No leases matching ${filters.join(' and ')}. Without a filter this lists every lease, newest first.`
+                : 'No leases — nothing hosted is running, and nothing is accruing.');
             return;
         }
+        // The server caps at 100 and defaults to 50, so a full page is ambiguous:
+        // it may be all there is, or the newest of more. Say which rather than
+        // letting the reader assume.
+        if (!flags.json && leases.length === (flags.limit ?? 50)) {
+            this.log(`Showing the newest ${leases.length}. There may be more — raise \`--limit\` (max 100) or narrow with \`--state\`.`);
+        }
+        // Columns follow the payload, not a guess at it. PRODUCT is the one that
+        // tells a Hosted Machine lease from a Hosted Job Machine lease, and BILLING
+        // answers the question a lease list exists to answer: is this still
+        // charging me. There is no ENGINE or EXPIRES on a lease -- it carries no
+        // top-level runtime id and does not expire -- so those columns are gone
+        // rather than printed empty.
         (0, format_1.renderTable)(leases.map((lease) => ({
-            id: String(lease.leaseId ?? lease.id ?? ''),
-            product: String(lease.productId ?? ''),
-            state: String(lease.state ?? ''),
-            harness: String(lease.runtimeId ?? ''),
-            expires: String(lease.expiresAt ?? ''),
+            id: (0, format_1.formatCell)(lease.id),
+            product: (0, format_1.formatCell)(lease.machineProduct),
+            name: (0, format_1.formatCell)(lease.displayName),
+            state: (0, format_1.formatCell)(lease.stateReason && lease.stateReason !== lease.state
+                ? `${lease.state} (${lease.stateReason})`
+                : lease.state),
+            billing: (0, format_1.formatCell)(lease.billing?.billableState),
+            updated: (0, format_1.localStamp)(lease.updatedAt ?? lease.leaseTimestamps?.lastStateChangeAt),
         })), [
             { key: 'id', header: 'LEASE' },
             { key: 'product', header: 'PRODUCT' },
-            { key: 'state', header: 'STATE' },
-            { key: 'harness', header: 'ENGINE' },
-            { key: 'expires', header: 'EXPIRES' },
+            { key: 'name', header: 'NAME', maxWidth: 24 },
+            // The reason is the actionable half of a state, so it stays in the
+            // column rather than moving to `show` -- capped only so a long one
+            // cannot wrap the whole table on an 80-column terminal.
+            { key: 'state', header: 'STATE', maxWidth: 30 },
+            { key: 'billing', header: 'BILLING' },
+            { key: 'updated', header: 'UPDATED' },
         ], (line) => this.log(line));
     }
 }

package/dist/commands/harnesses/leases/show.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const base_command_1 = require("../../../base-command");
 const harnesses_1 = require("../../../lib/harnesses");
+const balance_1 = require("../../../lib/balance");
 class HarnessesLeasesShow extends base_command_1.BaseCommand {
     static description = 'Show one harness lease';
     static examples = ['<%= config.bin %> harnesses leases show <lease-id>'];
@@ -46,6 +47,8 @@ class HarnessesLeasesShow extends base_command_1.BaseCommand {
         const line = (label, value) => {
             if (value === undefined || value === null || value === '')
                 return;
+            // 14 columns. A longer label does not wrap, it collides with its own
+            // value — keep new labels inside it.
             this.log(`${label.padEnd(14)}${String(value)}`);
         };
         // Only ever a PRIMITIVE reaches `line`. Falling back to the parent object
@@ -77,6 +80,39 @@ class HarnessesLeasesShow extends base_command_1.BaseCommand {
         // Money last, and only when the server sent it — an absent billing block
         // and a zero are different states.
         line('Billing:', nested(lease.billing, 'billableState'));
+        // The monthly cap, which is what actually refuses a Hosted Machine.
+        //
+        // The server has computed and sent these on every lease read all along and
+        // the web renders them; the CLI printed only `billableState`. So a refusal
+        // said "spending limit exceeded" and the only number a CLI user could find
+        // was `skrr balance show`'s DAILY cap, sitting at full headroom — which
+        // made the refusal look like it was about something else (OSK-7920).
+        //
+        // Read through `nested` like every other sub-object here: these arrive on a
+        // permissive payload type, and the helper is what keeps a non-primitive
+        // from rendering as `[object Object]`.
+        const cents = (key) => {
+            const value = nested(lease.billing, key);
+            // `formatMicros` takes micro-dollars; these are cents.
+            return typeof value === 'number' ? (0, balance_1.formatMicros)(value * 10_000) : undefined;
+        };
+        if (nested(lease.billing, 'spendStatusUnavailable') === true) {
+            // Distinguish "we could not read it" from "you have headroom". Admission
+            // fails CLOSED on an unreadable status, so silence would be the most
+            // misleading thing to print.
+            line('Monthly cap:', 'unavailable — the spend status could not be read');
+        }
+        else if (cents('monthlySpendLimitCents')) {
+            line('Monthly cap:', cents('monthlySpendLimitCents'));
+            line('Spent:', cents('currentMonthSpendCents'));
+            line('Open leases:', cents('openUsageEstimateCents'));
+            // Projected is what admission compares against the cap, so it is the
+            // number that decides whether the next turn is refused.
+            const over = nested(lease.billing, 'spendingLimitExceeded') === true;
+            const projected = cents('projectedCurrentMonthSpendCents');
+            line('Projected:', projected ? `${projected}${over ? ' — over the cap' : ''}` : undefined);
+            line('Month began:', nested(lease.billing, 'monthStartedAt'));
+        }
         this.log('');
         this.log('Full record: --json');
     }

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

@@ -14,6 +14,10 @@ export type HarnessRow = {
     status?: string;
     harnessLocation?: string;
     lastSeenAt?: string;
+    metadata?: {
+        machineProduct?: string;
+        source?: string;
+    };
 };
 export type HarnessSelection = {
     /** Rows to print, after every filter and the `--limit` slice. */
@@ -33,6 +37,20 @@ export type HarnessSelection = {
  * cloud products never register through a daemon.  Treating the missing field
  * as cloud made a healthy, connected local harness disappear from the one CLI
  * command intended to discover it.
+ *
+ * "Cloud products never register through a daemon" is no longer true, and that
+ * is why the product identity is checked FIRST. The Hosted Machine boots a
+ * daemon inside itself and registers through the ordinary local path, so its
+ * row carries `harnessLocation: 'local'` on a machine whose `compute.ownership`
+ * is `oversky-managed` — and it therefore appeared in the DEFAULT, local-only
+ * listing. `--local`'s documented meaning ("Only show local (daemon-backed)
+ * harnesses … pass --no-local to include cloud/hosted rows") did not hold: a
+ * user filtering to their own machines was silently shown a cloud one, and the
+ * flag that separates them separated nothing (OSK-7636).
+ *
+ * Read-side rather than a stored-value migration on purpose: existing rows
+ * already carry the wrong `harnessLocation`, and rewriting it would have to
+ * move the registration identity filter with it.
  */
 export declare function isLocalHarnessRow(row: HarnessRow): boolean;
 /**

package/dist/commands/harnesses/list.js

@@ -7,14 +7,44 @@ const core_1 = require("@oclif/core");
 const base_command_1 = require("../../base-command");
 const api_fetch_1 = require("../../lib/api-fetch");
 const format_1 = require("../../lib/format");
+/**
+ * Products skrr provisions and owns. A row that says it is one of these is
+ * cloud, whatever `harnessLocation` reads.
+ */
+const MANAGED_MACHINE_PRODUCTS = new Set(['hosted-machine', 'hosted-job-machine']);
+const MANAGED_REGISTRATION_SOURCES = new Set([
+    'hosted-machine',
+    'hosted-job-machine',
+    'cloud-coding',
+]);
 /**
  * Harness rows created before `harnessLocation` was introduced do not carry that
  * field.  A daemon id is the durable discriminator for those legacy rows:
  * cloud products never register through a daemon.  Treating the missing field
  * as cloud made a healthy, connected local harness disappear from the one CLI
  * command intended to discover it.
+ *
+ * "Cloud products never register through a daemon" is no longer true, and that
+ * is why the product identity is checked FIRST. The Hosted Machine boots a
+ * daemon inside itself and registers through the ordinary local path, so its
+ * row carries `harnessLocation: 'local'` on a machine whose `compute.ownership`
+ * is `oversky-managed` — and it therefore appeared in the DEFAULT, local-only
+ * listing. `--local`'s documented meaning ("Only show local (daemon-backed)
+ * harnesses … pass --no-local to include cloud/hosted rows") did not hold: a
+ * user filtering to their own machines was silently shown a cloud one, and the
+ * flag that separates them separated nothing (OSK-7636).
+ *
+ * Read-side rather than a stored-value migration on purpose: existing rows
+ * already carry the wrong `harnessLocation`, and rewriting it would have to
+ * move the registration identity filter with it.
  */
 function isLocalHarnessRow(row) {
+    const product = row.metadata?.machineProduct?.trim() ?? '';
+    if (MANAGED_MACHINE_PRODUCTS.has(product))
+        return false;
+    const source = row.metadata?.source?.trim() ?? '';
+    if (MANAGED_REGISTRATION_SOURCES.has(source))
+        return false;
     return row.harnessLocation === 'local' || (row.harnessLocation == null && Boolean(row.daemonId));
 }
 /**

package/dist/commands/harnesses/products.js

@@ -4,6 +4,34 @@ const core_1 = require("@oclif/core");
 const base_command_1 = require("../../base-command");
 const format_1 = require("../../lib/format");
 const harnesses_1 = require("../../lib/harnesses");
+/**
+ * How you actually start each product FROM HERE.
+ *
+ * The server sends a `userAction` (`start-hosted-machine`, …) and the table
+ * used to print it. That token is a launch-context assertion the API validates
+ * against `launchSurfaces` — it is not a command, and printing it in a column
+ * headed ACTION told a reader to run something that does not exist (OSK-7779).
+ *
+ * So the column names a real command instead. The map lives here rather than on
+ * the server because only the CLI knows its own command names; a product with
+ * no entry prints `-` and is called out below the table, which is the honest
+ * rendering of "you cannot start this from a terminal".
+ */
+const START_COMMAND = {
+    'byo-machine': 'harnesses install-token',
+    'hosted-machine': 'machines hosted start',
+    // Not `machines …`: a Hosted Job Machine is one-shot compute that exists for
+    // the duration of one job, so the job is what you create.
+    //
+    // `code jobs run`, not `code handover`. Both start this product, and the
+    // difference is the one the finding was actually about: `handover` clones a
+    // repository, works it and opens a pull request, so it cannot start the bare
+    // one-shot the product describes — `"continuity": {"semantics": "one-shot"}`
+    // with `stateRetention: false` on filesystem, memory and processes. Pointing
+    // a reader who wants compute at the repository flow is a smaller version of
+    // pointing them at a verb nobody implements.
+    'hosted-job-machine': 'code jobs run',
+};
 /**
  * `availability` is a string on some rows and an object on others. The table
  * has to render both, and a `[object Object]` cell in a catalogue listing is
@@ -43,17 +71,34 @@ class HarnessesProducts extends base_command_1.BaseCommand {
             this.log('No harness products available.');
             return;
         }
+        const bin = this.config.bin;
         (0, format_1.renderTable)(products.map((p) => ({
             id: (0, format_1.formatCell)(p.id),
             label: (0, format_1.formatCell)(p.label),
-            action: (0, format_1.formatCell)(p.userAction),
+            // What you are buying: `one-shot` and `true-resume` are the difference
+            // between compute that forgets everything and a workspace that resumes.
+            lifecycle: (0, format_1.formatCell)(p.lifecycleSemantics),
+            start: p.id && START_COMMAND[p.id] ? `${bin} ${START_COMMAND[p.id]}` : '-',
             availability: availabilityLabel(p),
         })), [
             { key: 'id', header: 'ID' },
-            { key: 'label', header: 'LABEL', maxWidth: 30 },
-            { key: 'action', header: 'ACTION' },
+            { key: 'label', header: 'LABEL', maxWidth: 26 },
+            { key: 'lifecycle', header: 'LIFECYCLE' },
+            { key: 'start', header: 'START' },
             { key: 'availability', header: 'AVAILABILITY' },
         ], (line) => this.log(line));
+        // A product the CLI cannot start is worth one line. Silence here is what
+        // made the old ACTION column misleading: `available` beside a verb nobody
+        // implements reads as "run this", and the reader learns otherwise by
+        // failing.
+        const unreachable = products.filter((p) => p.id && !START_COMMAND[p.id]);
+        if (unreachable.length > 0) {
+            this.log('');
+            for (const p of unreachable) {
+                const where = p.catalog?.launchSurfaces?.join(', ') || 'unknown';
+                this.log(`${p.id}: not startable from the CLI — launch surfaces: ${where}`);
+            }
+        }
         // The full record carries contract, billing, compute and lifecycle blocks.
         // Pointing at --json is cheaper than a second table nobody asked for.
         this.log('');

package/dist/commands/harnesses/quota.d.ts

@@ -21,6 +21,22 @@ import { BaseCommand } from '../../base-command';
  * cannot: is this window going to run out before it resets, which days were
  * expensive, was last week's cap actually hit.
  */
+/**
+ * WHY this window is empty — without asserting a cause we cannot know.
+ *
+ * OSK-7616 — this used to read "Runs started outside skrr still move the
+ * provider meter above, but cannot be priced here", which names one
+ * explanation as though it were the only one. In the reported case it was the
+ * wrong one: three Codex turns were started THROUGH skrr, completed, and were
+ * recorded at zero tokens because the harness reported an empty usage envelope.
+ * The reader was told, by the one screen whose job is answering "what is my
+ * agent costing me", that the cause was something they had not done.
+ *
+ * The second sentence is the one that was missing, and it is the actionable
+ * half: a run skrr saw and could not price is a reportable defect, not a
+ * property of the user's habits.
+ */
+export declare function unpricedWindowLines(): string[];
 export default class HarnessesQuota extends BaseCommand {
     static description: string;
     static examples: string[];

package/dist/commands/harnesses/quota.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.unpricedWindowLines = unpricedWindowLines;
 const core_1 = require("@oclif/core");
 const base_command_1 = require("../../base-command");
 const data_provider_1 = require("@skrr-ai/data-provider");
@@ -28,6 +29,28 @@ const quota_render_1 = require("../../lib/quota-render");
  * cannot: is this window going to run out before it resets, which days were
  * expensive, was last week's cap actually hit.
  */
+/**
+ * WHY this window is empty — without asserting a cause we cannot know.
+ *
+ * OSK-7616 — this used to read "Runs started outside skrr still move the
+ * provider meter above, but cannot be priced here", which names one
+ * explanation as though it were the only one. In the reported case it was the
+ * wrong one: three Codex turns were started THROUGH skrr, completed, and were
+ * recorded at zero tokens because the harness reported an empty usage envelope.
+ * The reader was told, by the one screen whose job is answering "what is my
+ * agent costing me", that the cause was something they had not done.
+ *
+ * The second sentence is the one that was missing, and it is the actionable
+ * half: a run skrr saw and could not price is a reportable defect, not a
+ * property of the user's habits.
+ */
+function unpricedWindowLines() {
+    return [
+        'The provider meter above counts every run on this harness; this table counts only the runs skrr priced.',
+        'A run started outside skrr is never priced here. A run started THROUGH skrr should be — if one is missing, its harness reported no token usage, which is a bug worth reporting.',
+        '  skrr harnesses usage   # the runs skrr did see',
+    ];
+}
 class HarnessesQuota extends base_command_1.BaseCommand {
     static description = 'Claude Code / Codex subscription quota over time — windows, pace, and daily spend';
     static examples = [
@@ -180,7 +203,9 @@ class HarnessesQuota extends base_command_1.BaseCommand {
             // is a real and common state that must not read as "you spent nothing".
             this.log('');
             this.log('No skrr-recorded token spend in this window.');
-            this.log('Runs started outside skrr still move the provider meter above, but cannot be priced here.');
+            for (const line of unpricedWindowLines()) {
+                this.log(line);
+            }
             return;
         }
         this.log('');

package/dist/commands/harnesses/usage.js

@@ -122,6 +122,23 @@ class HarnessesUsage extends base_command_1.BaseCommand {
             this.log(`Total: ${count(totals.sessions)} sessions · ${usd(totals.totalCostUsd)} · ` +
                 `${count(totals.inputTokens)} in / ${count(totals.outputTokens)} out / ` +
                 `${count(totals.cachedInputTokens)} cached`);
+            // SAY WHICH PROVIDERS THAT TOTAL COVERS.
+            //
+            // It was presented as the account total and is not: the ingestion path is
+            // fed by the Claude account-telemetry reader, so five completed Codex
+            // runs on the SAME daemon as a reported Claude harness produced no row at
+            // all, and `grandTotals.sessions: 150` was the Claude-only figure with no
+            // qualifier. A user reading it to answer "what has my automation cost me"
+            // gets a confidently wrong answer, and nothing hints that entire
+            // providers are missing (OSK-7672). Naming the providers present is not
+            // the whole fix — the missing producers are — but it is the difference
+            // between an incomplete number and a wrong one.
+            const providers = [...new Set(rows.map((r) => r.provider).filter(Boolean))].sort();
+            if (!args.harness && providers.length > 0) {
+                this.log(`Covers ${providers.join(', ')} only — usage is recorded per provider, and a harness ` +
+                    'whose provider has no usage producer contributes nothing to this total. ' +
+                    'This is NOT necessarily your whole account.');
+            }
         }
     }
 }

package/dist/commands/inbox/index.d.ts

@@ -4,7 +4,8 @@ import { BaseCommand } from '../../base-command';
  *
  * Gap analysis §3.3 (b). The CLI's 50 command groups were entirely pull-shaped,
  * with nothing that surfaced an agent-initiated message. The reply direction
- * already closed the loop (`skrr agents chat --conversation <id>` stamps
+ * already closed the loop (`skrr agents chat <agent-id> --conversation <id>
+ * --prompt "…"` stamps
  * `Message.intentId` and wakes the originating run) — so the missing half was
  * literally "tell me it happened", and its absence is what made use case 3's
  * "the agent messages me a couple of times like a person" a terminal dead end.

package/dist/commands/inbox/index.js

@@ -6,12 +6,14 @@ const data_provider_1 = require("@skrr-ai/data-provider");
 const base_command_1 = require("../../base-command");
 const inbox_1 = require("../../lib/inbox");
 const format_1 = require("../../lib/format");
+const agentic_stream_1 = require("../../lib/agentic-stream");
 /**
  * `skrr inbox` / `skrr inbox --follow` — what have my agents said to me?
  *
  * Gap analysis §3.3 (b). The CLI's 50 command groups were entirely pull-shaped,
  * with nothing that surfaced an agent-initiated message. The reply direction
- * already closed the loop (`skrr agents chat --conversation <id>` stamps
+ * already closed the loop (`skrr agents chat <agent-id> --conversation <id>
+ * --prompt "…"` stamps
  * `Message.intentId` and wakes the originating run) — so the missing half was
  * literally "tell me it happened", and its absence is what made use case 3's
  * "the agent messages me a couple of times like a person" a terminal dead end.
@@ -77,19 +79,33 @@ class Inbox extends base_command_1.BaseCommand {
         }
         (0, format_1.renderTable)(selected.map((dm) => ({
             agent: dm.agentId,
+            // The reply command below needs this, and the row has carried it all
+            // along — it was simply never rendered, so the command printed under
+            // the table could not be completed from the table. `verbatim` because a
+            // clipped id is not an id (OSK-7621).
+            conversation: dm.conversationId,
             unread: String(dm.unreadCount),
             when: dm.lastMessageAt ? dm.lastMessageAt.slice(0, 19) : '-',
             preview: (dm.lastMessagePreview || '').replace(/\s+/g, ' ').trim(),
         })), [
             { key: 'agent', header: 'AGENT', verbatim: true },
+            { key: 'conversation', header: 'CONVERSATION', verbatim: true },
             { key: 'unread', header: 'UNREAD', maxWidth: 6 },
             { key: 'when', header: 'LAST', maxWidth: 20 },
-            { key: 'preview', header: 'PREVIEW', maxWidth: 80 },
+            { key: 'preview', header: 'PREVIEW', maxWidth: 48 },
         ], (line) => this.log(line));
         const totalUnread = selected.reduce((sum, dm) => sum + dm.unreadCount, 0);
         if (totalUnread > 0) {
+            // The reply command must be RUNNABLE (OSK-7585/7594/7597). `agents chat`
+            // takes the agent as a required positional and `--prompt` as a required
+            // flag, so the argument-less form this used to print here (and, at the
+            // time those findings were filed, on every detach) exits with
+            // "Missing 1 required arg". A command a reader copies and cannot run is
+            // worse than no command: it costs them a round trip to learn the surface
+            // does not work the way it was just told them it does.
             this.log(`\n${totalUnread} unread. \`skrr inbox --follow\` to watch, ` +
-                '`skrr agents chat --conversation <id>` to reply.');
+                '`skrr agents chat <agent-id> --conversation <id> --prompt "<your reply>"` to reply ' +
+                '(the AGENT and CONVERSATION columns above carry both ids).');
         }
     }
     /** The terminal projection reads the same Notification rows as the web task inbox. */
@@ -192,7 +208,14 @@ class Inbox extends base_command_1.BaseCommand {
                     cursors.set(dm.conversationId, newest);
             }
         };
-        const wsURL = this.cliConfig.baseURL.replace(/\/+$/, '');
+        // Hoist a web apex to its `api.` realtime host, exactly as the run-stream
+        // sibling does. Using `baseURL` raw sends the upgrade to the apex, which is
+        // CloudFront-fronted: it cannot carry a WebSocket, and its WAF refuses a
+        // handshake that sends no `User-Agent` — which `ws` never does. Measured:
+        // an upgrade to `skrr.ai` answers `403 Request blocked`, the same request
+        // to `api.skrr.ai` answers `101`. Nothing errors at the call site; the
+        // socket simply never connects, which reads as a network problem.
+        const wsURL = (0, agentic_stream_1.toWebSocketOrigin)(this.cliConfig.baseURL);
         const socket = (0, socket_io_client_1.io)(wsURL, {
             path: '/ws/agentic',
             auth: {

package/dist/commands/login.js

@@ -134,9 +134,12 @@ class Login extends base_command_1.BaseCommand {
                 // terminal through the daemon broker, which is the case that matters
                 // most on a headless box, and a confirmation would break it.
                 const profile = (0, keychain_1.getActiveProfile)();
+                const isolationGuidance = profile === 'default'
+                    ? 'Sign in with `--profile <name>` instead to keep both.'
+                    : `Only the named "${profile}" profile changes; the default and all other profiles remain untouched.`;
                 this.warn(`Pointing profile "${profile}" at ${(0, config_1.describeDeployment)(nextBaseURL)}. ` +
                     `Its ${(0, config_1.describeDeployment)(previousBaseURL)} session will be replaced — ` +
-                    `sign in with \`--profile <name>\` instead to keep both.`);
+                    isolationGuidance);
                 undoBaseURL = () => {
                     // Re-read rather than reusing `existing`: the flow may have persisted
                     // other fields (cliId, migration markers) before failing, and this

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

@@ -8,6 +8,7 @@ export default class MachinesList extends BaseCommand {
     static examples: string[];
     static flags: {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        all: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/machines/list.js

@@ -14,7 +14,19 @@ class MachinesList extends base_command_1.BaseCommand {
         '<%= config.bin %> machines list',
         '<%= config.bin %> machines list --json',
     ];
-    static flags = { json: core_1.Flags.boolean({ description: 'Output as JSON' }) };
+    static flags = {
+        json: core_1.Flags.boolean({ description: 'Output as JSON' }),
+        // `harnesses list` already learned this: "Offline rows accumulate forever,
+        // so they are hidden by default." The same reasoning was never applied
+        // here, and this listing returned 252 rows for one account — every
+        // ephemeral sandbox ever provisioned, months back, all rendered `offline`,
+        // with the one live machine at the top and a wall of dead ones after it
+        // (OSK-7639). A list exists so someone can pick a row.
+        all: core_1.Flags.boolean({
+            description: 'Include machines that are offline or terminated. Off by default — dead sandboxes ' +
+                'accumulate forever and bury the ones you can use.',
+        }),
+    };
     async run() {
         this.requireAuth();
         const { flags } = await this.parse(MachinesList);
@@ -33,10 +45,21 @@ class MachinesList extends base_command_1.BaseCommand {
             this.log('No machines. Install a daemon with `skrr harnesses install-token`.');
             return;
         }
-        (0, format_1.renderTable)(machines.map((m) => ({
-            id: (0, format_1.formatCell)(m.id).slice(0, 20),
+        const all = machines;
+        const shown = flags.all ? all : all.filter((m) => (0, machines_1.isReachableMachine)(m));
+        if (shown.length === 0) {
+            this.log(`No machine is reachable right now. ${all.length} offline/terminated — see them with --all.`);
+            return;
+        }
+        (0, format_1.renderTable)(shown.map((m) => ({
+            // Printed in full. A hard 20-character slice with no ellipsis made
+            // `machine:03548116-d36` read like a complete id and it is not — and
+            // two different hosted machines rendered as byte-identical rows,
+            // so the one column a list exists to be picked from could not
+            // distinguish them (OSK-7621).
+            id: (0, format_1.formatCell)(m.id),
             name: (0, format_1.formatCell)(m.preferences?.name || m.name),
-            status: (0, format_1.formatCell)(m.status),
+            status: (0, format_1.formatCell)((0, machines_1.machineStateLabel)(m)),
             // Both numbers matter: "2/7" is a machine that is up with most of its
             // harnesses signed out, which reads nothing like "7/7". The
             // denominator counts LIVE rows, matching the population
@@ -48,13 +71,18 @@ class MachinesList extends base_command_1.BaseCommand {
                 ? new Date(m.lastSeenAt).toISOString().slice(0, 16).replace('T', ' ')
                 : '-',
         })), [
-            { key: 'id', header: 'ID' },
+            { key: 'id', header: 'ID', verbatim: true },
             { key: 'name', header: 'NAME', maxWidth: 28 },
             { key: 'status', header: 'STATUS' },
             { key: 'harnesses', header: 'ONLINE' },
             { key: 'platform', header: 'PLATFORM' },
             { key: 'seen', header: 'LAST SEEN' },
         ], (line) => this.log(line));
+        const hidden = all.length - shown.length;
+        if (hidden > 0) {
+            this.log('');
+            this.log(`${hidden} offline or terminated machine(s) hidden — pass --all to include them.`);
+        }
     }
 }
 exports.default = MachinesList;