@skrr-ai/cli 0.1.42 → 0.1.44

package/dist/base-command.d.ts

@@ -346,6 +346,8 @@ export declare function parseGlobalFlags(argv: readonly string[]): ParsedGlobals
 export declare function apiRefusal(err: unknown): {
     code?: string;
     message?: string;
+    /** The parsed JSON body, for a refusal that carries structured context. */
+    body?: Record<string, unknown>;
 };
 /**
  * Prefix a failure message with the resource it is about.

package/dist/base-command.js

@@ -1368,6 +1368,7 @@ function apiRefusal(err) {
     return {
         code: stringProp(body, 'code') || stringProp(body, 'errorType'),
         message: stringProp(body, 'message') || stringProp(body, 'error'),
+        ...(body ? { body } : {}),
     };
 }
 /**

package/dist/commands/balance/index.js

@@ -18,7 +18,7 @@ const show_1 = __importDefault(require("./show"));
  * lists every subcommand, which is where a menu belongs.
  */
 class Balance extends show_1.default {
-    static description = 'Show your hosted usage balance — the ceiling that refuses a turn (not the x402 wallet). ' +
+    static description = 'Show your hosted usage balance and plan limits — the ceilings that refuse a turn (not the x402 wallet). ' +
         'See `balance usage`, `balance overage`, `balance statement` and `balance history` for the detail behind it.';
     static examples = [
         '<%= config.bin %> balance',

package/dist/commands/balance/overage.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
+const auth_core_1 = require("@skrr-ai/auth-core");
 const base_command_1 = require("../../base-command");
 const balance_1 = require("../../lib/balance");
 class BalanceOverage extends base_command_1.BaseCommand {
-    static description = 'Enable or disable personal Sky Code overage after included allowance is exhausted';
+    static description = `Enable or disable personal ${auth_core_1.FIRST_PARTY_HARNESS.displayName} overage after included allowance is exhausted`;
     static examples = [
         '<%= config.bin %> balance overage enabled',
         '<%= config.bin %> balance overage disabled',
@@ -12,7 +13,7 @@ class BalanceOverage extends base_command_1.BaseCommand {
     ];
     static args = {
         state: core_1.Args.string({
-            description: 'Whether personal stored balance may pay for Sky Code overage',
+            description: `Whether personal stored balance may pay for ${auth_core_1.FIRST_PARTY_HARNESS.displayName} overage`,
             required: true,
             options: ['enabled', 'disabled'],
             ignoreStdin: true,
@@ -34,7 +35,7 @@ class BalanceOverage extends base_command_1.BaseCommand {
             this.log(JSON.stringify({ ownerType: 'user', overageEnabled: result?.enabled === true }, null, 2));
             return;
         }
-        this.log(`Sky Code overage ${result?.enabled ? 'enabled' : 'disabled'} for your personal billing account.`);
+        this.log(`${auth_core_1.FIRST_PARTY_HARNESS.displayName} overage ${result?.enabled ? 'enabled' : 'disabled'} for your personal billing account.`);
         this.log(result?.enabled
             ? 'New admissions may use stored balance after included allowance is exhausted.'
             : 'New admissions will stop when included allowance is exhausted.');

package/dist/commands/balance/plan.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderSkyCodePlan = renderSkyCodePlan;
 const core_1 = require("@oclif/core");
+const auth_core_1 = require("@skrr-ai/auth-core");
 const data_provider_1 = require("@skrr-ai/data-provider");
 const base_command_1 = require("../../base-command");
 const balance_1 = require("../../lib/balance");
 const web_url_1 = require("../../lib/web-url");
 class BalancePlan extends base_command_1.BaseCommand {
-    static description = 'Show your Sky Code plan, renewal state, available tiers, and the matching lifecycle page';
+    static description = `Show your ${auth_core_1.FIRST_PARTY_HARNESS.displayName} plan, renewal state, available tiers, and the matching lifecycle page`;
     static examples = [
         '<%= config.bin %> balance plan',
         '<%= config.bin %> balance plan --json',
@@ -33,7 +34,7 @@ class BalancePlan extends base_command_1.BaseCommand {
 }
 exports.default = BalancePlan;
 function renderSkyCodePlan(subscription, lifecycleUrl, log) {
-    log(`Sky Code plan — ${subscription.tierName}`);
+    log(`${auth_core_1.FIRST_PARTY_HARNESS.displayName} plan — ${subscription.tierName}`);
     log(`  Status                  ${subscription.status}`);
     log(`  Price                   $${subscription.monthlyPriceUsd}/month`);
     log(`  Current period          ${subscription.currentPeriodStart ?? 'not started'}`);
@@ -43,10 +44,13 @@ function renderSkyCodePlan(subscription, lifecycleUrl, log) {
     log(`  Concurrent sessions     ${subscription.concurrentSessions ?? 'not reported'}`);
     log(`  Requests per minute     ${subscription.rateLimitPerMin}`);
     log('');
-    log('Available Sky Code plans:');
-    for (const key of data_provider_1.SKY_CODE_PLAN_KEYS.filter((plan) => plan !== 'free')) {
-        const plan = data_provider_1.SKY_CODE_PLAN_CATALOG[key];
-        log(`  ${plan.displayName.padEnd(18)} $${plan.monthlyPriceUsd}/month · ` +
+    log(`Available ${auth_core_1.FIRST_PARTY_HARNESS.displayName} plans:`);
+    const paidPlans = data_provider_1.SKY_CODE_PLAN_KEYS.filter((plan) => plan !== 'free').map((key) => data_provider_1.SKY_CODE_PLAN_CATALOG[key]);
+    // Padded to the longest name rather than a fixed width: plan names embed the
+    // product's display name, whose length is not this renderer's to assume.
+    const nameWidth = Math.max(...paidPlans.map((plan) => plan.displayName.length)) + 1;
+    for (const plan of paidPlans) {
+        log(`  ${plan.displayName.padEnd(nameWidth)} $${plan.monthlyPriceUsd}/month · ` +
             `${(0, data_provider_1.usageMicrosToDisplayCredits)(plan.includedUsageMicros).toLocaleString()} monthly credits · ` +
             `${(0, data_provider_1.usageMicrosToDisplayCredits)(plan.fiveHourUsageMicros).toLocaleString()} per 5 hours · ` +
             `${plan.concurrentSessions} sessions · ${plan.requestsPerMinute} RPM`);

package/dist/commands/balance/show.d.ts

@@ -1,3 +1,4 @@
+import type { TSkyCodeUsageSnapshot } from '@skrr-ai/data-provider';
 import { BaseCommand } from '../../base-command';
 import { type RuntimeMonthlySpend } from '../../lib/harnesses';
 /**
@@ -7,6 +8,30 @@ import { type RuntimeMonthlySpend } from '../../lib/harnesses';
  * the wording is part of the observable contract and is pinned directly.
  */
 export declare function renderRuntimeSpend(spend: RuntimeMonthlySpend[], log: (line: string) => void): void;
+/**
+ * Your plan's ceilings, as lines.
+ *
+ * This screen showed the credits and the spend cap under a footer that called
+ * them "the ceiling that refuses a turn" — while the plan's monthly allowance,
+ * its five-hour window and its concurrent-session limit, each of which refuses a
+ * turn with its own message ("plan allowance is used up", "five-hour usage
+ * window is used up", "concurrent-session limit is reached"), were only on
+ * `balance usage` (OSK-4638). A refusal that names a ceiling should find that
+ * ceiling here, in the same words.
+ *
+ * The allowance is spent before the credits above; past it, overage consent
+ * decides whether the credits pay or the turn is refused. The five-hour window
+ * and the session limit are enforced together or not at all (admission needs
+ * both to be set), and what is left of the window is what admission computes:
+ * limit less used less reserved.
+ *
+ * Personal only. The workspace read does not report the workspace's overage
+ * terms, so rendering this for a workspace would state a refusal rule it cannot
+ * see.
+ *
+ * Pure so the wording is pinned directly, like `renderRuntimeSpend`.
+ */
+export declare function renderPlanCeilings(usage: TSkyCodeUsageSnapshot, log: (line: string) => void, bin?: string): void;
 /**
  * YOUR hosted usage balance — the personal account, and only that one.
  *
@@ -41,6 +66,13 @@ export default class BalanceShow extends BaseCommand {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
+    /**
+     * Your plan's ceilings, beside the balance they are spent before.
+     *
+     * Best-effort, like the runtime cap below it: a failed read prints one line
+     * and leaves the balance intact rather than failing the command.
+     */
+    private renderPlanCeilings;
     /**
      * The OTHER cap — the one that actually refuses a Hosted Machine.
      *

package/dist/commands/balance/show.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderRuntimeSpend = renderRuntimeSpend;
+exports.renderPlanCeilings = renderPlanCeilings;
 const core_1 = require("@oclif/core");
+const auth_core_1 = require("@skrr-ai/auth-core");
 const base_command_1 = require("../../base-command");
 const balance_1 = require("../../lib/balance");
 const workspaces_1 = require("../../lib/workspaces");
@@ -35,6 +37,52 @@ function renderRuntimeSpend(spend, log) {
         }
     }
 }
+/**
+ * Your plan's ceilings, as lines.
+ *
+ * This screen showed the credits and the spend cap under a footer that called
+ * them "the ceiling that refuses a turn" — while the plan's monthly allowance,
+ * its five-hour window and its concurrent-session limit, each of which refuses a
+ * turn with its own message ("plan allowance is used up", "five-hour usage
+ * window is used up", "concurrent-session limit is reached"), were only on
+ * `balance usage` (OSK-4638). A refusal that names a ceiling should find that
+ * ceiling here, in the same words.
+ *
+ * The allowance is spent before the credits above; past it, overage consent
+ * decides whether the credits pay or the turn is refused. The five-hour window
+ * and the session limit are enforced together or not at all (admission needs
+ * both to be set), and what is left of the window is what admission computes:
+ * limit less used less reserved.
+ *
+ * Personal only. The workspace read does not report the workspace's overage
+ * terms, so rendering this for a workspace would state a refusal rule it cannot
+ * see.
+ *
+ * Pure so the wording is pinned directly, like `renderRuntimeSpend`.
+ */
+function renderPlanCeilings(usage, log, bin = 'skrr') {
+    const resets = (at) => (at ? ` — resets ${(0, balance_1.formatBalanceTimestamp)(at)}` : '');
+    const window = usage.fiveHour;
+    log('');
+    log(`${auth_core_1.FIRST_PARTY_HARNESS.displayName} ${usage.plan ?? 'current'} plan — spent before the credits, and each limit refuses a turn:`);
+    log(`  Plan monthly:   ${(0, balance_1.formatCreditsWithUsd)(usage.monthly.remainingUsageMicros)} left${resets(usage.monthly.resetsAt)}`);
+    if (window.limitUsageMicros > 0 && window.maxConcurrentSessions > 0) {
+        const windowLeft = Math.max(0, window.limitUsageMicros - window.usedUsageMicros - window.reservedUsageMicros);
+        log(`  Plan 5-hour:    ${(0, balance_1.formatCreditsWithUsd)(windowLeft)} left of ${(0, balance_1.formatCreditsWithUsd)(window.limitUsageMicros)}${resets(window.resetsAt)}`);
+        log(`  Plan sessions:  ${window.activeSessions} of ${window.maxConcurrentSessions} running`);
+    }
+    else {
+        log('  Plan 5-hour:    no five-hour or concurrent-session limit');
+    }
+    log(usage.overageEnabled
+        ? '  Past the plan:  paid from the credits (overage on)'
+        : `  Past the plan:  refused — overage is off (\`${bin} balance overage enabled\`)`);
+    if (usage.partialReasons?.includes('missing_entitlement_period')) {
+        // Catalog defaults, not this account's period: say so rather than present
+        // them as measured.
+        log('                  (plan period unavailable; catalog limits shown)');
+    }
+}
 /**
  * YOUR hosted usage balance — the personal account, and only that one.
  *
@@ -171,17 +219,40 @@ class BalanceShow extends base_command_1.BaseCommand {
         else {
             this.log('  Auto-refill:    off');
         }
+        await this.renderPlanCeilings();
         await this.renderRuntimeSpend();
         this.log('');
         this.log('A credit is a micro-dollar: 1,000,000 credits = $1.00. The spend cap');
         this.log('is a per-period ceiling, not a second balance. `skrr balance statement`');
         this.log('itemises this same account and says what each charge was for.');
         this.log('');
-        this.log('This is the ceiling that refuses a turn for work you own. A session');
-        this.log("carrying a workspace is refused against the WORKSPACE's balance —");
-        this.log('see `skrr balance show --workspace <id>`. `skrr payments wallet` is the');
+        // Plural, because they are: a turn you own can be refused by the credits,
+        // the spend cap, a plan limit or a hosted runtime's monthly cap, and the
+        // refusal names which (OSK-4638).
+        this.log('These are the ceilings that refuse a turn for work you own; a refusal');
+        this.log('names the one that ran out. A session carrying a workspace is refused');
+        this.log("against the WORKSPACE's balance instead — see");
+        this.log('`skrr balance show --workspace <id>`. `skrr payments wallet` is the');
         this.log('separate x402 crypto wallet, in USDC — not this balance.');
     }
+    /**
+     * Your plan's ceilings, beside the balance they are spent before.
+     *
+     * Best-effort, like the runtime cap below it: a failed read prints one line
+     * and leaves the balance intact rather than failing the command.
+     */
+    async renderPlanCeilings() {
+        let usage;
+        try {
+            usage = await (0, balance_1.getSkyCodeUsage)();
+        }
+        catch {
+            this.log('');
+            this.log(`  Plan limits:    unavailable (\`${this.config.bin} balance usage\` to retry)`);
+            return;
+        }
+        renderPlanCeilings(usage, (line) => this.log(line), this.config.bin);
+    }
     /**
      * The OTHER cap — the one that actually refuses a Hosted Machine.
      *

package/dist/commands/balance/usage/events.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderSkyCodeUsageEvents = renderSkyCodeUsageEvents;
 const core_1 = require("@oclif/core");
+const auth_core_1 = require("@skrr-ai/auth-core");
 const base_command_1 = require("../../../base-command");
 const balance_1 = require("../../../lib/balance");
 class BalanceUsageEvents extends base_command_1.BaseCommand {
-    static description = 'List the Sky Code charges and run/session attribution behind aggregate allowance usage';
+    static description = `List the ${auth_core_1.FIRST_PARTY_HARNESS.displayName} charges and run/session attribution behind aggregate allowance usage`;
     static examples = [
         '<%= config.bin %> balance usage events',
         '<%= config.bin %> balance usage events --limit 20 --json',
@@ -44,7 +45,7 @@ class BalanceUsageEvents extends base_command_1.BaseCommand {
 }
 exports.default = BalanceUsageEvents;
 function renderSkyCodeUsageEvents(events, log) {
-    log(`Sky Code usage events · ${events.ownerType} ${events.ownerId}`);
+    log(`${auth_core_1.FIRST_PARTY_HARNESS.displayName} usage events · ${events.ownerType} ${events.ownerId}`);
     log(`  Window ${events.from} to ${events.to}`);
     if (events.items.length === 0) {
         log('  No usage events in this window.');

package/dist/commands/balance/usage.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderSkyCodeUsage = renderSkyCodeUsage;
 const core_1 = require("@oclif/core");
+const auth_core_1 = require("@skrr-ai/auth-core");
 const base_command_1 = require("../../base-command");
 const balance_1 = require("../../lib/balance");
 /**
@@ -40,7 +41,7 @@ class BalanceUsage extends base_command_1.BaseCommand {
 }
 exports.default = BalanceUsage;
 function renderSkyCodeUsage(usage, log) {
-    log(`Sky Code ${usage.plan ?? 'current'} plan · ${usage.ownerType} ${usage.ownerId}`);
+    log(`${auth_core_1.FIRST_PARTY_HARNESS.displayName} ${usage.plan ?? 'current'} plan · ${usage.ownerType} ${usage.ownerId}`);
     log(`  Monthly used            ${(0, balance_1.formatCreditsWithUsd)(usage.monthly.usedUsageMicros)}`);
     log(`  Monthly reserved        ${(0, balance_1.formatCreditsWithUsd)(usage.monthly.reservedUsageMicros)}`);
     log(`  Monthly remaining       ${(0, balance_1.formatCreditsWithUsd)(usage.monthly.remainingUsageMicros)}`);

package/dist/commands/browser/install.js

@@ -23,8 +23,9 @@ class BrowserInstall extends core_1.Command {
     async run() {
         const { flags } = await this.parse(BrowserInstall);
         const args = ['install'];
-        // Any spelling of the first-party harness is accepted here and handed to the
-        // daemon in the spelling every installed daemon understands.
+        // Any ACCEPTED spelling of the first-party harness is handed to the daemon in
+        // the wire spelling; anything else — a retired spelling included — is forwarded
+        // unchanged for the daemon's own parser to accept or refuse.
         if (flags.harness)
             args.push('--harness', (0, harness_provider_input_1.daemonHarnessArgument)(flags.harness));
         if (flags.config)

package/dist/commands/browser/uninstall.js

@@ -23,8 +23,9 @@ class BrowserUninstall extends core_1.Command {
     async run() {
         const { flags } = await this.parse(BrowserUninstall);
         const args = ['uninstall'];
-        // Any spelling of the first-party harness is accepted here and handed to the
-        // daemon in the spelling every installed daemon understands.
+        // Any ACCEPTED spelling of the first-party harness is handed to the daemon in
+        // the wire spelling; anything else — a retired spelling included — is forwarded
+        // unchanged for the daemon's own parser to accept or refuse.
         if (flags.harness)
             args.push('--harness', (0, harness_provider_input_1.daemonHarnessArgument)(flags.harness));
         if (flags.config)

package/dist/commands/code/handover.d.ts

@@ -37,6 +37,7 @@ export default class CodeHandover extends BaseCommand {
         repo: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         base: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'allow-dirty': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        browser: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     /** Run git, returning null rather than throwing — every caller has a fallback. */

package/dist/commands/code/handover.js

@@ -61,6 +61,9 @@ class CodeHandover extends base_command_1.BaseCommand {
             description: 'Hand over anyway when the working tree is dirty or the branch is unpushed. The cloud agent will NOT see that work.',
             default: false,
         }),
+        browser: core_1.Flags.boolean({
+            description: 'Give the receiving agent a browser. Refused where the deployment has no browser runtime, never run without one.',
+        }),
         json: core_1.Flags.boolean({ description: 'Output the created task as JSON' }),
     };
     /** Run git, returning null rather than throwing — every caller has a fallback. */
@@ -152,6 +155,7 @@ class CodeHandover extends base_command_1.BaseCommand {
                 baseBranch: branch,
                 prompt,
                 machineProduct: 'hosted-job-machine',
+                ...(flags.browser ? { browser: true } : {}),
                 clientRequestId: (0, node_crypto_1.randomUUID)(),
             });
         }

package/dist/commands/code/install.js

@@ -201,8 +201,9 @@ class CodeInstall extends base_command_1.BaseCommand {
     async installerNote(daemonId) {
         try {
             const res = await (0, api_fetch_1.apiFetch)(`/api/daemons/${encodeURIComponent(daemonId)}/cli-installers`, { credential: this.resolvedCredential });
-            // Any spelling: a daemon lists the provider the way it registered it, and
-            // one that predates or postdates a rename spells it differently.
+            // Any accepted spelling: a daemon lists the provider the way it registered it,
+            // and during a rename's alias window one that predates or postdates the flip
+            // spells it differently.
             const row = (res.providers ?? []).find((p) => (0, auth_core_1.isFirstPartyHarnessProvider)(p.provider));
             const reason = row?.installDisabledReason?.trim();
             if (!reason)

package/dist/commands/code/jobs/run.d.ts

@@ -22,6 +22,7 @@ export default class CodeJobsRun extends BaseCommand {
         prompt: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'prompt-file': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         egress: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        browser: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         wait: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         interval: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
         timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;

package/dist/commands/code/jobs/run.js

@@ -40,6 +40,9 @@ class CodeJobsRun extends base_command_1.BaseCommand {
             description: 'Network reach. Default `isolated` — the control plane only, nothing else.',
             options: ['isolated', 'allowlist', 'open'],
         }),
+        browser: core_1.Flags.boolean({
+            description: 'Run the job with a browser. Refused where the deployment has no browser runtime, never run without one.',
+        }),
         wait: core_1.Flags.boolean({ description: 'Wait for the job to finish and print its result' }),
         interval: core_1.Flags.integer({ description: 'Poll interval in seconds while waiting', default: 5 }),
         timeout: core_1.Flags.integer({ description: 'Give up waiting after this many minutes', default: 30 }),
@@ -88,6 +91,7 @@ class CodeJobsRun extends base_command_1.BaseCommand {
                 mode: 'bare',
                 machineProduct: 'hosted-job-machine',
                 ...(flags.egress ? { egressPolicy: flags.egress } : {}),
+                ...(flags.browser ? { browser: true } : {}),
                 clientRequestId: (0, node_crypto_1.randomUUID)(),
             });
             task = res?.task;

package/dist/commands/daemon/install.js

@@ -4,6 +4,7 @@ const core_1 = require("@oclif/core");
 const exec_runtime_binary_1 = require("../../lib/exec-runtime-binary");
 const daemon_binding_1 = require("../../lib/daemon-binding");
 const daemon_installer_1 = require("../../lib/daemon-installer");
+const daemon_setup_1 = require("../../lib/daemon-setup");
 /**
  * `skrr daemon install` — install the local runtime's OS service.
  *
@@ -52,6 +53,12 @@ class DaemonInstall extends core_1.Command {
         // own comment records `skrr code run -m <model>` dying the same way. Same
         // mistake, one directory over.
         const argv = this.argv;
+        // Before fetching anything: a machine still carrying the previous product
+        // identity's state is refused by the runtime's own install, so downloading a
+        // release first only delays the same refusal (OSK-6895).
+        if ((0, daemon_setup_1.refuseOnLegacyLocalState)((line) => this.logToStderr(line))) {
+            this.exit(1);
+        }
         // Bootstrap only when there is nothing to forward to. An existing runtime —
         // brew, the script installer, a dev checkout — is left exactly alone; this
         // is a floor under the missing case, not a second update channel competing

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

@@ -46,6 +46,17 @@ export default class HarnessesInstall extends BaseCommand {
      * reason the daemon already words. Both are answered before anything runs.
      */
     private update;
+    /**
+     * Start an install or update, and survive a gateway that cut the request off.
+     *
+     * The relay holds the request while the daemon answers, and a gateway can end
+     * it first: an update returned HTTP 504 after 21.9s while the job it started
+     * ran to success, and the caller was told the outcome was unknown (OSK-10096
+     * verifier). The daemon is the only party that knows whether the request
+     * arrived, so on a server-side failure we ask it, and follow the job it
+     * started rather than reporting a result we do not have.
+     */
+    private start;
     /** Follow a job to its end, or report why it could not be followed (and return nothing). */
     private follow;
     /** What the daemon says about this provider right now, best effort. */

package/dist/commands/harnesses/install.js

@@ -74,14 +74,9 @@ class HarnessesInstall extends base_command_1.BaseCommand {
             await this.update(daemonId, provider, Boolean(flags.json));
             return;
         }
-        let start;
-        try {
-            start = await (0, cli_installers_1.startManagedCliInstall)(daemonId, provider, this.resolvedCredential);
-        }
-        catch (err) {
-            this.handleApiError(err);
+        const start = await this.start(daemonId, provider, () => (0, cli_installers_1.startManagedCliInstall)(daemonId, provider, this.resolvedCredential), Boolean(flags.json));
+        if (!start)
             return;
-        }
         const jobId = start.job?.id;
         if (!start.started || !jobId) {
             // The daemon declined and already knows why. Read its own reason off the
@@ -163,14 +158,9 @@ class HarnessesInstall extends base_command_1.BaseCommand {
             });
             return;
         }
-        let start;
-        try {
-            start = await (0, cli_installers_1.startManagedCliUpdate)(daemonId, provider, this.resolvedCredential);
-        }
-        catch (err) {
-            this.handleApiError(err);
+        const start = await this.start(daemonId, provider, () => (0, cli_installers_1.startManagedCliUpdate)(daemonId, provider, this.resolvedCredential), json);
+        if (!start)
             return;
-        }
         const jobId = start.job?.id;
         if (!start.started || !jobId) {
             this.log(start.alreadyRunning
@@ -199,6 +189,35 @@ class HarnessesInstall extends base_command_1.BaseCommand {
         this.log((0, cli_installers_1.updateOutcomeLine)(job) ??
             `${provider} updated${job.installedVersion ? ` to ${job.installedVersion}` : ''}.`);
     }
+    /**
+     * Start an install or update, and survive a gateway that cut the request off.
+     *
+     * The relay holds the request while the daemon answers, and a gateway can end
+     * it first: an update returned HTTP 504 after 21.9s while the job it started
+     * ran to success, and the caller was told the outcome was unknown (OSK-10096
+     * verifier). The daemon is the only party that knows whether the request
+     * arrived, so on a server-side failure we ask it, and follow the job it
+     * started rather than reporting a result we do not have.
+     */
+    async start(daemonId, provider, begin, json) {
+        try {
+            return await begin();
+        }
+        catch (err) {
+            const status = err.status ?? 0;
+            if (status >= 500 || status === 408) {
+                const job = await (0, cli_installers_1.jobStartedDespiteTimeout)(daemonId, provider, this.resolvedCredential);
+                if (job?.id) {
+                    if (!json) {
+                        this.logToStderr(`The request to ${daemonId} did not come back (HTTP ${status}), but the daemon started job ${job.id}. Following it.`);
+                    }
+                    return { started: true, job };
+                }
+            }
+            this.handleApiError(err);
+            return undefined;
+        }
+    }
     /** Follow a job to its end, or report why it could not be followed (and return nothing). */
     async follow(daemonId, jobId, verb, json) {
         const outcome = await (0, cli_installers_1.followManagedCliInstallJob)({

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

@@ -1,4 +1,5 @@
 import { BaseCommand } from '../../base-command';
+import { type ManagedCliProviderState } from '../../lib/cli-installers';
 /**
  * What each managed provider's state is on one machine.
  *
@@ -43,3 +44,12 @@ export default class HarnessesInstallers extends BaseCommand {
      */
     private daemonIdFor;
 }
+/**
+ * What each installed CLI's update story is, as sentences under the table.
+ *
+ * Sentences, not a column: an update reason is "the copy inside Devin.app
+ * updates with that app", which no column fits. Silent for a daemon that
+ * reports no update fields at all — it cannot say, and inventing "no" for it
+ * would be worse than nothing.
+ */
+export declare function updateNotes(providers: readonly ManagedCliProviderState[], bin: string): string[];

package/dist/commands/harnesses/installers.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateNotes = updateNotes;
 const core_1 = require("@oclif/core");
 const base_command_1 = require("../../base-command");
 const data_provider_1 = require("@skrr-ai/data-provider");
@@ -126,6 +127,14 @@ class HarnessesInstallers extends base_command_1.BaseCommand {
             for (const note of notes)
                 this.log(`  ${note.provider}: ${note.detail}`);
         }
+        // The VERSION column is where a reader asks "can I get a newer one", and
+        // the answer lived only in `--json` (OSK-10096 verifier).
+        const updateLines = updateNotes(providers, this.config.bin);
+        if (updateLines.length > 0) {
+            this.log('');
+            for (const line of updateLines)
+                this.log(`  ${line}`);
+        }
         // 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 the 0.8.45 daemon release, so 0.8.35
@@ -177,3 +186,25 @@ class HarnessesInstallers extends base_command_1.BaseCommand {
     }
 }
 exports.default = HarnessesInstallers;
+/**
+ * What each installed CLI's update story is, as sentences under the table.
+ *
+ * Sentences, not a column: an update reason is "the copy inside Devin.app
+ * updates with that app", which no column fits. Silent for a daemon that
+ * reports no update fields at all — it cannot say, and inventing "no" for it
+ * would be worse than nothing.
+ */
+function updateNotes(providers, bin) {
+    const lines = [];
+    for (const provider of providers) {
+        if (provider.updatable === true) {
+            lines.push(`${provider.provider}: update it with \`${bin} harnesses install ${provider.provider} --update\``);
+        }
+    }
+    for (const provider of providers) {
+        if (provider.updatable === false && provider.installed && provider.updateDisabledReason) {
+            lines.push(`${provider.provider}: ${provider.updateDisabledReason}`);
+        }
+    }
+    return lines;
+}

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

@@ -82,6 +82,20 @@ class HarnessesLeasesShow extends base_command_1.BaseCommand {
         line('Updated:', lease.updatedAt);
         // Money last, and only when the server sent it — an absent billing block
         // and a zero are different states.
+        //
+        // Who pays comes first. `harnesses leases billing` used to be "change who
+        // pays", so there was a way to move the payer (which never worked) and no
+        // way to read it (OSK-4628). The payer is fixed at create, and the lease
+        // carries it as `workspaceId`: the workspace account it bills, or `null`
+        // for the owner's personal account — the same scope the monthly cap below
+        // is counted in. A server that does not send the key says nothing here,
+        // because a missing field is not evidence of a personal lease.
+        if (Object.prototype.hasOwnProperty.call(lease, 'workspaceId')) {
+            const workspaceId = typeof lease.workspaceId === 'string' ? lease.workspaceId.trim() : '';
+            line('Billed to:', workspaceId
+                ? `workspace ${workspaceId} (\`${this.config.bin} balance show --workspace ${workspaceId}\`)`
+                : 'your personal account');
+        }
         line('Billing:', nested(lease.billing, 'billableState'));
         // The monthly cap, which is what actually refuses a Hosted Machine.
         //

package/dist/commands/harnesses/list.js

@@ -421,8 +421,9 @@ class HarnessesList extends base_command_1.BaseCommand {
         // mode. Materialize that default before the request so JSON cannot quietly
         // return every historical offline row while the table shows seven live ones.
         const status = flags.online ? 'online' : (flags.status ?? (flags.all ? undefined : 'online'));
-        // Any spelling of the first-party harness filters the same rows; the server is
-        // asked for the canonical one, which it matches against every stored spelling.
+        // Any accepted spelling of the first-party harness filters the same rows; the
+        // server is asked for the canonical one, which it matches against every
+        // accepted stored spelling.
         const provider = flags.provider ? (0, harness_provider_input_1.canonicalHarnessInput)(flags.provider) : undefined;
         const params = new URLSearchParams();
         const serverStatus = serverStatusParam(status);

package/dist/commands/instructions/install.d.ts

@@ -1,4 +1,26 @@
 import { BaseCommand } from '../../base-command';
+/** The target a `TARGET_CONFLICT` refusal names, as the API sends it. */
+export interface ConflictingTarget {
+    id: string;
+    desiredState?: string;
+    status?: string;
+}
+export declare function conflictingTargetOf(body: Record<string, unknown> | undefined): ConflictingTarget | null;
+/**
+ * What to do about a placement that already has a target, as commands.
+ *
+ * Re-running an install whose first attempt had failed printed "An unexpected
+ * error occurred. Code: TARGET_CONFLICT" (OSK-4631): no target, no path, no next
+ * step, and no word on whether the re-run had partly applied. The API now names
+ * the target in the way; this turns that into the commands for its state. A live
+ * target is changed or removed, never installed twice; one being removed can be
+ * restored, or purged once its daemon confirms cleanup.
+ */
+export declare function describeTargetConflict(target: ConflictingTarget, { bin, placement, created }: {
+    bin: string;
+    placement: string;
+    created: string[];
+}): string;
 export default class InstructionsInstall extends BaseCommand {
     static description: string;
     static flags: {