@skrr-ai/cli 0.1.39 → 0.1.41

package/dist/commands/harnesses/install.js

@@ -47,7 +47,7 @@ class HarnessesInstall extends base_command_1.BaseCommand {
     static flags = {
         json: core_1.Flags.boolean({ description: 'Output as JSON' }),
         daemon: core_1.Flags.string({
-            description: 'Which machine to install on. Defaults to your only active daemon; required when several are active.',
+            description: 'Which machine to install on. Defaults to your only connected daemon; required when several are connected.',
         }),
     };
     async run() {
@@ -63,7 +63,7 @@ class HarnessesInstall extends base_command_1.BaseCommand {
         const target = await (0, daemon_target_1.resolveDaemonTarget)({
             explicit: flags.daemon,
             local: (0, daemon_target_1.localMachine)(),
-            listActiveDaemons: () => (0, daemon_target_1.listActiveDaemons)(this.resolvedCredential),
+            listActiveDaemons: () => (0, daemon_target_1.listConnectedDaemons)(this.resolvedCredential),
         });
         const daemonId = this.daemonIdFor(target);
         let start;
@@ -152,14 +152,26 @@ class HarnessesInstall extends base_command_1.BaseCommand {
             this.error('This machine is a Dedicated Runtime whose daemon has not published an id this process can read. Name a machine with --daemon.', { exit: 1 });
         }
         if (target.kind === 'none') {
-            this.error(`No active daemon is registered for this account, so nothing can perform the install. Start the local runtime with \`${this.config.bin} daemon start\`.`, { exit: 1 });
+            this.failWithCliError({
+                message: `No daemon is connected for this account, so nothing can perform the install. Start the background service on this computer with \`${this.config.bin} daemon start\`.`,
+                code: 'NO_DAEMON',
+                exit: 1,
+                retryable: false,
+            });
         }
         const choices = target.daemons
             .slice(0, 10)
-            .map((d) => `  ${(0, daemon_ref_1.formatDaemonRef)(d.id)}  ${d.name || '—'}`)
+            // Full ids: they are what `--daemon` takes (OSK-9993).
+            .map((d) => `  ${d.id}  ${d.name || '—'}`)
             .join('\n');
-        this.error(`${target.daemons.length} active daemons — say which machine to install on:\n${choices}\n` +
-            `Pass one with --daemon, or see them all with \`${this.config.bin} list-daemons\`.`, { exit: 1 });
+        // The same refusal, and the same code, as \`code install\` (OSK-9993 verifier).
+        this.failWithCliError({
+            message: `${target.daemons.length} connected daemons — say which machine to install on:\n${choices}\n` +
+                `Pass one with --daemon, or see each daemon id in the DAEMON ID column of \`${this.config.bin} harnesses list\`.`,
+            code: 'AMBIGUOUS_DAEMON',
+            exit: 1,
+            retryable: false,
+        });
     }
 }
 exports.default = HarnessesInstall;

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

@@ -11,7 +11,7 @@ import { BaseCommand } from '../../base-command';
  *
  * That gap is not cosmetic, because `skrr harnesses list` answers a DIFFERENT
  * question and looks like it answers this one. Its `status` is the daemon's
- * socket, so on this account `skrr-code` read `online` with no binary installed
+ * socket, so on this account the first-party harness read `online` with no binary installed
  * at all, and `harnesses ping` answered it in 78ms — the daemon was there, the
  * harness was not. A user could not discover that from inside the product; it
  * took `command -v` in a shell.

package/dist/commands/harnesses/installers.js

@@ -4,7 +4,6 @@ const core_1 = require("@oclif/core");
 const base_command_1 = require("../../base-command");
 const data_provider_1 = require("@skrr-ai/data-provider");
 const cli_installers_1 = require("../../lib/cli-installers");
-const daemon_ref_1 = require("../../lib/daemon-ref");
 const daemon_target_1 = require("../../lib/daemon-target");
 const format_1 = require("../../lib/format");
 /**
@@ -19,7 +18,7 @@ const format_1 = require("../../lib/format");
  *
  * That gap is not cosmetic, because `skrr harnesses list` answers a DIFFERENT
  * question and looks like it answers this one. Its `status` is the daemon's
- * socket, so on this account `skrr-code` read `online` with no binary installed
+ * socket, so on this account the first-party harness read `online` with no binary installed
  * at all, and `harnesses ping` answered it in 78ms — the daemon was there, the
  * harness was not. A user could not discover that from inside the product; it
  * took `command -v` in a shell.
@@ -44,7 +43,7 @@ class HarnessesInstallers extends base_command_1.BaseCommand {
     static flags = {
         json: core_1.Flags.boolean({ description: 'Output as JSON' }),
         daemon: core_1.Flags.string({
-            description: 'Which machine to ask. Defaults to your only active daemon; required when several are active.',
+            description: 'Which machine to ask. Defaults to your only connected daemon; required when several are connected.',
         }),
     };
     async run() {
@@ -53,7 +52,7 @@ class HarnessesInstallers extends base_command_1.BaseCommand {
         const target = await (0, daemon_target_1.resolveDaemonTarget)({
             explicit: flags.daemon,
             local: (0, daemon_target_1.localMachine)(),
-            listActiveDaemons: () => (0, daemon_target_1.listActiveDaemons)(this.resolvedCredential),
+            listActiveDaemons: () => (0, daemon_target_1.listConnectedDaemons)(this.resolvedCredential),
         });
         const daemonId = this.daemonIdFor(target);
         let res;
@@ -65,8 +64,21 @@ class HarnessesInstallers extends base_command_1.BaseCommand {
             return;
         }
         const providers = res.providers ?? [];
+        // Computed before the output mode splits: a JSON reader needs the same
+        // "this daemon is older than that provider" signal the table prints, and
+        // the daemon version the header shows (OSK-9537 verifier).
+        const notOffered = providers.length > 0 ? (0, cli_installers_1.providersNotOffered)(providers, data_provider_1.MANAGED_CLI_PROVIDER_IDS) : [];
         if (flags.json) {
-            this.log(JSON.stringify({ daemonId, platform: res.platform, providers }, null, 2));
+            this.log(JSON.stringify({
+                daemonId,
+                platform: res.platform,
+                daemonVersion: res.daemonVersion ?? null,
+                providers,
+                notOffered: notOffered.map((provider) => ({
+                    provider,
+                    addedInDaemon: cli_installers_1.MANAGED_CLI_PROVIDER_SINCE[(0, cli_installers_1.readinessKey)(provider)] ?? null,
+                })),
+            }, null, 2));
             return;
         }
         if (providers.length === 0) {
@@ -116,12 +128,12 @@ class HarnessesInstallers extends base_command_1.BaseCommand {
         }
         // A provider the platform knows and this daemon did not mention. Without
         // this it simply is not on the list, which reads as dropped support rather
-        // than as an older daemon — `devin` arrived in daemon 0.8.43, so 0.8.35
+        // than as an older daemon — `devin` arrived in the 0.8.45 daemon release, so 0.8.35
         // answers with six providers and says nothing about the seventh.
-        const missing = (0, cli_installers_1.providersNotOffered)(providers, data_provider_1.MANAGED_CLI_PROVIDER_IDS);
+        const missing = notOffered;
         if (missing.length > 0) {
             this.log('');
-            this.log(`  Not offered by this daemon: ${missing.join(', ')}. ` +
+            this.log(`  Not offered by this daemon: ${(0, cli_installers_1.describeProvidersNotOffered)(missing)}. ` +
                 'That usually means the daemon is older than the provider — ' +
                 'check `skrr daemon status` for its version and how to update it.');
         }
@@ -142,14 +154,26 @@ class HarnessesInstallers extends base_command_1.BaseCommand {
             this.error('This machine is a Dedicated Runtime whose daemon has not published an id this process can read. Name a machine with --daemon.', { exit: 1 });
         }
         if (target.kind === 'none') {
-            this.error(`No active daemon is registered for this account, so nothing can report on it. Start the local runtime with \`${this.config.bin} daemon start\`.`, { exit: 1 });
+            this.failWithCliError({
+                message: `No daemon is connected for this account, so nothing can report on it. Start the background service on this computer with \`${this.config.bin} daemon start\`.`,
+                code: 'NO_DAEMON',
+                exit: 1,
+                retryable: false,
+            });
         }
         const choices = target.daemons
             .slice(0, 10)
-            .map((d) => `  ${(0, daemon_ref_1.formatDaemonRef)(d.id)}  ${d.name || '—'}`)
+            // Full ids: they are what `--daemon` takes (OSK-9993).
+            .map((d) => `  ${d.id}  ${d.name || '—'}`)
             .join('\n');
-        this.error(`${target.daemons.length} active daemons — say which machine to report on:\n${choices}\n` +
-            `Pass one with --daemon, or see them all with \`${this.config.bin} list-daemons\`.`, { exit: 1 });
+        // The same refusal, and the same code, as \`code install\` (OSK-9993 verifier).
+        this.failWithCliError({
+            message: `${target.daemons.length} connected daemons — say which machine to report on:\n${choices}\n` +
+                `Pass one with --daemon, or see each daemon id in the DAEMON ID column of \`${this.config.bin} harnesses list\`.`,
+            code: 'AMBIGUOUS_DAEMON',
+            exit: 1,
+            retryable: false,
+        });
     }
 }
 exports.default = HarnessesInstallers;

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

@@ -1,4 +1,5 @@
 import { BaseCommand } from '../../base-command';
+import { type ProviderReadiness } from '../../lib/cli-installers';
 /**
  * Minimal shape of a provider Harness row as returned by
  * `GET /api/harnesses` (`{ harnesses: WireHarness[] }`). Only the
@@ -71,6 +72,25 @@ export declare function shortMachineLabel(machineUuid?: string): string;
 export declare function emptyListMessage(input: {
     provider: string | null;
     local: boolean;
+    /** `--all` was passed, so suggesting it is noise (OSK-9285). */
+    all?: boolean;
+    /**
+     * Every provider this account has a row for, whatever its status, when the
+     * caller could read it. Absent or null: unknown, and nothing is claimed.
+     */
+    accountProviders?: readonly string[] | null;
+}): string;
+/**
+ * The NAME cell. `show` and `--json` said when YOUR alias covers the shared
+ * name; this table printed the alias as if it were the name everyone sees
+ * (OSK-10004). The marker leads because the column truncates from the right,
+ * and a trailing one is the first thing a long name would cut.
+ */
+export declare const ALIAS_MARKER = "*";
+export declare function harnessNameCell(row: {
+    name?: string;
+    sharedName?: string;
+    aliased?: boolean;
 }): string;
 /**
  * What the DEFAULT column says for one row.
@@ -89,9 +109,33 @@ export type HarnessSelection = {
     hiddenOffline: number;
     /** Rows dropped by `--limit` alone. */
     hiddenByLimit: number;
+    /**
+     * Superseded rows a status filter dropped — the ones `--status offline`
+     * leaves to `--status superseded`. Only superseded rows are counted: online
+     * rows the same filter drops were never offline, so they are not "hidden".
+     */
+    hiddenSuperseded: number;
     /** Rows that survived every filter, before the online-only default and `--limit`. */
     matched: number;
 };
+/**
+ * What `--status` accepts: exactly what the STATUS column prints (OSK-10005).
+ *
+ * The column says `superseded` for a row a later registration on the same
+ * machine replaced; the filter accepted only online|offline, so the one value
+ * that says "never coming back" could be read and never selected.
+ */
+export declare const HARNESS_STATUS_FILTERS: readonly ["online", "offline", "superseded"];
+/**
+ * The status to ask the SERVER for. Only `online` narrows there.
+ *
+ * Supersession is judged among the rows in one response — a row is superseded
+ * when a newer row for the same provider on the same machine exists. Asked for
+ * `offline` only, the server cannot see the live row that replaced an offline
+ * one, so it labelled that row `offline` while `--all` called it `superseded`.
+ * Online rows are never superseded, so that one filter is safe to push down.
+ */
+export declare function serverStatusParam(status: string | undefined): string | undefined;
 /**
  * Harness rows created before `harnessLocation` was introduced do not carry that
  * field.  A daemon id is the durable discriminator for those legacy rows:
@@ -145,6 +189,8 @@ export declare function selectHarnessRows(rows: HarnessRow[], options: {
     local: boolean;
     daemon?: string;
     limit?: number;
+    /** Keep only rows whose STATUS column reads this (`harnessStatusLabel`). */
+    status?: string;
     /** Hide offline rows (the human-readable default). */
     onlineOnly: boolean;
 }): HarnessSelection;
@@ -177,7 +223,9 @@ export type HarnessDefaults = {
     workspaceDefaultHarnessId?: string | null;
 };
 export type HarnessesJson = {
-    harnesses: HarnessRow[];
+    harnesses: Array<HarnessRow & {
+        readiness?: ProviderReadiness | null;
+    }>;
     filters: HarnessesFilters;
     defaults: HarnessDefaults;
     counts: {
@@ -189,6 +237,8 @@ export type HarnessesJson = {
         hiddenByLocal: number;
         /** Rows `--limit` dropped — raise `--limit` to get them back. */
         hiddenByLimit: number;
+        /** Superseded rows `--status` dropped — `--status superseded` lists them. */
+        hiddenSuperseded: number;
         /**
          * OSK-3385 — how many of the returned rows are `status: 'online'`.
          *
@@ -213,7 +263,22 @@ export type HarnessesJson = {
  * (`compareHarnessRows`), not in server order. Round 1 introduced that sort;
  * it is deliberate, so `.harnesses[0]` is the row you almost always want.
  */
-export declare function buildHarnessesJson(selection: HarnessSelection, filters: HarnessesFilters, defaults?: HarnessDefaults): HarnessesJson;
+export declare function buildHarnessesJson(selection: HarnessSelection, filters: HarnessesFilters, defaults?: HarnessDefaults, readiness?: (row: HarnessRow) => ProviderReadiness | undefined): HarnessesJson;
+/**
+ * What the READINESS column's non-answers mean, counted from the rows shown.
+ *
+ * Each footnote names a different next step, so they are not merged: a `-` on
+ * an offline row wants `--all`/a started daemon, a `-` on a provider the daemon
+ * does not manage (hermes, gemini) wants nothing, `unknown` is installed but
+ * unverifiable, and only a definite not-ready label (interactive-required,
+ * not-installed, …) has something to fix. Counting `unknown` as not ready
+ * would send the reader to fix eleven rows that are fine as far as anyone can
+ * tell.
+ */
+export declare function readinessFootnotes(rows: readonly HarnessRow[], readiness: {
+    lookup: (row: HarnessRow) => ProviderReadiness | undefined;
+    daemonAnswered: (row: HarnessRow) => boolean;
+}): string[];
 /**
  * Rows with the provider in its CANONICAL spelling.
  *
@@ -246,6 +311,13 @@ export default class HarnessesList extends BaseCommand {
         daemon: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         limit: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         local: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        readiness: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
+    /**
+     * The canonical providers this account has any row for, or null when that
+     * cannot be read. Asked only when a --provider filter came back empty, so
+     * the ordinary path pays nothing for it.
+     */
+    private accountProviders;
 }