@skrr-ai/cli 0.1.43 → 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/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/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/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/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/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: {

package/dist/commands/instructions/install.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.conflictingTargetOf = conflictingTargetOf;
+exports.describeTargetConflict = describeTargetConflict;
 const core_1 = require("@oclif/core");
 const auth_core_1 = require("@skrr-ai/auth-core");
 const data_provider_1 = require("@skrr-ai/data-provider");
@@ -9,6 +11,41 @@ const harness_provider_input_1 = require("../../lib/harness-provider-input");
 const prompt_1 = require("../../lib/prompt");
 /** The providers a managed instruction can target, canonical spellings. */
 const MANAGED_INSTRUCTION_PROVIDERS = ['claude', 'codex', auth_core_1.FIRST_PARTY_HARNESS.provider];
+function conflictingTargetOf(body) {
+    const value = body?.conflictingTarget;
+    return value && typeof value.id === 'string' && value.id ? value : 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.
+ */
+function describeTargetConflict(target, { bin, placement, created }) {
+    const state = [target.desiredState, target.status].filter(Boolean).join(', ');
+    const lines = target.desiredState === 'removed'
+        ? [
+            `Target ${target.id} already holds ${placement} on that machine and is being removed${state ? ` (${state})` : ''}.`,
+            `Bring it back with \`${bin} instructions restore-target ${target.id}\`, or install again ` +
+                `after its daemon confirms cleanup and \`${bin} instructions purge-target ${target.id}\`.`,
+        ]
+        : [
+            `Target ${target.id} already manages ${placement} on that machine${state ? ` (${state})` : ''}.`,
+            ...(target.status === 'error'
+                ? [`Its last sync failed; \`${bin} instructions status\` shows why.`]
+                : []),
+            `Change what it applies with \`${bin} instructions update-target ${target.id} --bundle <id>\`, ` +
+                `or drop it with \`${bin} instructions remove ${target.id}\`.`,
+        ];
+    lines.push(created.length
+        ? `Created before this refusal: ${created.join(', ')}.`
+        : 'No target was created by this command.');
+    return lines.join(' ');
+}
 class InstructionsInstall extends base_command_1.BaseCommand {
     static description = 'Opt in a daemon target to ongoing managed instruction reconciliation';
     static flags = {
@@ -32,7 +69,13 @@ class InstructionsInstall extends base_command_1.BaseCommand {
             default: MANAGED_INSTRUCTION_PROVIDERS,
         }),
         scope: core_1.Flags.string({ description: 'global or project', options: ['global', 'project'] }),
-        project: core_1.Flags.string({ description: 'Absolute project path on the daemon machine' }),
+        project: core_1.Flags.string({
+            // The daemon writes a project target at the repository root, so a path
+            // outside any Git repository is accepted here and then fails on the
+            // machine. Saying so is the only warning this command can give: the path
+            // is checked where it lives, not here (OSK-4626).
+            description: "Absolute project path on the daemon's machine, inside a Git repository (the block is written at its root)",
+        }),
         mode: core_1.Flags.string({
             description: 'Project footprint',
             options: ['local', 'team'],
@@ -87,12 +130,20 @@ class InstructionsInstall extends base_command_1.BaseCommand {
         if (providers.includes('codex') && Buffer.byteLength(previewBody, 'utf8') > 30 * 1024) {
             this.error('Codex managed instruction bodies are limited to 30 KiB; no targets were created', { exit: 2 });
         }
-        if (!flags.json) {
+        // The body is shown so the confirmation below is informed. With `--yes`
+        // there is no confirmation to inform, and printing a ~9 KB body anyway put
+        // the command's actual outcome — often a refusal — a screen of scrollback
+        // away (OSK-4631). Say what was authorized, and where to read it.
+        if (!flags.json && !flags.yes) {
             this.log('Exact managed instruction body:');
             this.log('---');
             this.log(previewBody);
             this.log('---');
         }
+        else if (!flags.json) {
+            this.log(`Authorizing ${Buffer.byteLength(previewBody, 'utf8').toLocaleString()} bytes of instruction ` +
+                `${flags.bundle}; \`${this.config.bin} instructions show ${flags.bundle}\` prints them.`);
+        }
         const teamWarning = scope === 'project' && flags.mode === 'team'
             ? ' Team mode writes to repository files and may affect every contributor.'
             : '';
@@ -101,8 +152,8 @@ class InstructionsInstall extends base_command_1.BaseCommand {
             return this.log('Aborted.');
         const daemonId = await this.resolveDaemon(flags.daemon);
         const results = [];
-        try {
-            for (const provider of providers) {
+        for (const provider of providers) {
+            try {
                 results.push(await data_provider_1.dataService.createManagedInstructionTarget({
                     daemonId,
                     bundleId: flags.bundle,
@@ -115,15 +166,40 @@ class InstructionsInstall extends base_command_1.BaseCommand {
                     label: flags.label,
                 }));
             }
-        }
-        catch (error) {
-            this.handleApiError(error);
+            catch (error) {
+                // One target per provider, created in turn, so a refusal part-way
+                // through leaves the earlier ones in place. Say which.
+                const created = results.map((result) => `${(0, harness_provider_input_1.canonicalHarnessInput)(result.target.provider)} (${result.target.id})`);
+                const refusal = (0, base_command_1.apiRefusal)(error);
+                const conflict = refusal.code === 'TARGET_CONFLICT' ? conflictingTargetOf(refusal.body) : null;
+                if (conflict) {
+                    this.failWithCliError({
+                        message: describeTargetConflict(conflict, {
+                            bin: this.config.bin,
+                            placement: `${(0, harness_provider_input_1.canonicalHarnessInput)(provider)} ${scope}${flags.project ? ` ${flags.project}` : ''}`,
+                            created,
+                        }),
+                        code: 'TARGET_CONFLICT',
+                        status: 409,
+                        exit: 1,
+                        retryable: false,
+                        details: { ...refusal.body, created: results.map((result) => result.target) },
+                    });
+                }
+                if (created.length) {
+                    this.warn(`Created before this failure: ${created.join(', ')}.`);
+                }
+                this.handleApiError(error);
+            }
         }
         if (flags.json)
             return this.log(JSON.stringify(results, null, 2));
         for (const result of results) {
             this.log(`Install queued: ${(0, harness_provider_input_1.canonicalHarnessInput)(result.target.provider)} ${result.target.scope}${result.target.projectPath ? ` ${result.target.projectPath}` : ''} (${result.target.id})`);
         }
+        // Queued is not applied: the daemon checks the placement when it writes, and
+        // a path it cannot use fails there, after this command has exited 0.
+        this.log(`The daemon applies these on its next sync; \`${this.config.bin} instructions status\` shows when, or why not.`);
     }
     /**
      * The daemon the targets are created on, by the rule every daemon-picking

package/dist/commands/instructions/list.js

@@ -4,6 +4,7 @@ const core_1 = require("@oclif/core");
 const data_provider_1 = require("@skrr-ai/data-provider");
 const base_command_1 = require("../../base-command");
 const format_1 = require("../../lib/format");
+const instruction_provenance_1 = require("../../lib/instruction-provenance");
 class InstructionsList extends base_command_1.BaseCommand {
     static description = 'List version-controlled instruction prompts';
     static flags = {
@@ -32,12 +33,16 @@ class InstructionsList extends base_command_1.BaseCommand {
             id: bundle.id,
             name: bundle.name,
             version: String(bundle.currentVersionNumber),
+            // The built-in release the CURRENT body is, if any — a separate counter
+            // from VERSION, which is this prompt's own (OSK-4647).
+            template: (0, instruction_provenance_1.builtInLabel)(bundle.currentVersion),
             status: bundle.deletedAt ? 'deleted' : bundle.status,
             updated: bundle.updatedAt,
         })), [
             { key: 'id', header: 'ID' },
             { key: 'name', header: 'NAME', maxWidth: 32 },
             { key: 'version', header: 'VERSION' },
+            { key: 'template', header: 'TEMPLATE' },
             { key: 'status', header: 'STATUS' },
             { key: 'updated', header: 'UPDATED' },
         ], (line) => this.log(line));

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

@@ -9,4 +9,10 @@ export default class InstructionsShow extends BaseCommand {
         versions: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
+    /**
+     * The built-in release this server would install today, or undefined. Read
+     * from the offer, which already reports it as `templateVersion`; a failure
+     * costs only the "is there a newer one" clause, never the command.
+     */
+    private latestTemplateVersion;
 }

package/dist/commands/instructions/show.js

@@ -4,6 +4,7 @@ const core_1 = require("@oclif/core");
 const data_provider_1 = require("@skrr-ai/data-provider");
 const base_command_1 = require("../../base-command");
 const format_1 = require("../../lib/format");
+const instruction_provenance_1 = require("../../lib/instruction-provenance");
 class InstructionsShow extends base_command_1.BaseCommand {
     static description = 'Show exact prompt content and version history';
     static args = {
@@ -38,6 +39,9 @@ class InstructionsShow extends base_command_1.BaseCommand {
                 (0, format_1.renderTable)(response.versions.map((version) => ({
                     id: version.id,
                     version: String(version.versionNumber),
+                    // Its own column, never folded into VERSION: the prompt's counter
+                    // and the built-in release are different numbers (OSK-4647).
+                    template: (0, instruction_provenance_1.builtInLabel)(version),
                     hash: version.hash.slice(0, 12),
                     status: version.archivedAt
                         ? 'archived'
@@ -48,10 +52,20 @@ class InstructionsShow extends base_command_1.BaseCommand {
                 })), [
                     { key: 'id', header: 'ID' },
                     { key: 'version', header: 'VERSION' },
-                    { key: 'hash', header: 'HASH' },
+                    { key: 'hash', header: 'BODY HASH' },
                     { key: 'status', header: 'STATUS' },
+                    { key: 'template', header: 'TEMPLATE' },
                     { key: 'message', header: 'MESSAGE', maxWidth: 48 },
                 ], (line) => this.log(line));
+                // Three hashes answer "is my file current?", and this table shows one.
+                // A file's `v=` is the body as rendered for its target, so beside an
+                // agent-identity section it matches none of these (OSK-4644).
+                this.log('');
+                this.log("BODY HASH is the version as written. A managed file's `v=` is the body as");
+                this.log('rendered for its target, which differs when it fills in an agent identity;');
+                this.log(`compare it with FILE HASH in \`${this.config.bin} instructions status\`.`);
+                this.log("VERSION counts this prompt's saved bodies; TEMPLATE is the built-in release a");
+                this.log('body was taken from, which is a separate number.');
                 return;
             }
             const response = await data_provider_1.dataService.getManagedInstructionBundle(args.id);
@@ -61,6 +75,9 @@ class InstructionsShow extends base_command_1.BaseCommand {
             this.log(`${bundle.name} (${bundle.id}) — v${bundle.currentVersionNumber} — ${bundle.status}`);
             if (bundle.description)
                 this.log(bundle.description);
+            const provenance = (0, instruction_provenance_1.describeTemplateProvenance)(bundle, await this.latestTemplateVersion(bundle.sourceTemplateKey));
+            if (provenance)
+                this.log(provenance);
             this.log('');
             this.log(bundle.currentVersion?.body || '(no active content)');
         }
@@ -84,5 +101,21 @@ class InstructionsShow extends base_command_1.BaseCommand {
             this.handleApiError(error);
         }
     }
+    /**
+     * The built-in release this server would install today, or undefined. Read
+     * from the offer, which already reports it as `templateVersion`; a failure
+     * costs only the "is there a newer one" clause, never the command.
+     */
+    async latestTemplateVersion(templateKey) {
+        if (!templateKey)
+            return undefined;
+        try {
+            const offer = await data_provider_1.dataService.getManagedInstructionOffer(templateKey);
+            return offer?.preset?.templateVersion;
+        }
+        catch {
+            return undefined;
+        }
+    }
 }
 exports.default = InstructionsShow;

package/dist/commands/instructions/status.js

@@ -5,6 +5,7 @@ const data_provider_1 = require("@skrr-ai/data-provider");
 const base_command_1 = require("../../base-command");
 const format_1 = require("../../lib/format");
 const instruction_input_1 = require("../../lib/instruction-input");
+const instruction_provenance_1 = require("../../lib/instruction-provenance");
 class InstructionsStatus extends base_command_1.BaseCommand {
     static description = 'Show managed targets, applied versions, paths, and reconciliation errors';
     static flags = {
@@ -42,12 +43,14 @@ class InstructionsStatus extends base_command_1.BaseCommand {
             // Leave it empty.
         }
         let bundleNames = new Map();
+        let bundlesById = new Map();
         try {
             const bundleResponse = await data_provider_1.dataService.listManagedInstructionBundles({
                 includeArchived: true,
                 includeDeleted: true,
             });
             bundleNames = (0, instruction_input_1.buildBundleNameIndex)(bundleResponse.bundles);
+            bundlesById = new Map(bundleResponse.bundles.map((bundle) => [bundle.id, bundle]));
         }
         catch {
             // Leave the index empty — rows show the full bundle id instead.
@@ -73,7 +76,17 @@ class InstructionsStatus extends base_command_1.BaseCommand {
             target: target.appliedPath ||
                 (target.scope === 'global' ? 'global' : target.projectPath || 'project'),
             desired: target.desiredState,
-            applied: target.appliedVersionNumber ? `v${target.appliedVersionNumber}` : '-',
+            // `v3 (built-in v5)`: the prompt's version, and the built-in release
+            // it is when that is known. `APPLIED v3` alone read as two releases
+            // behind a preset announced as v5 (OSK-4647).
+            applied: (0, instruction_provenance_1.appliedVersionLabel)(target.appliedVersionNumber, bundlesById.get(target.bundleId)),
+            // The hash the managed block in the file starts with (`v=`), cut to the
+            // same 12 characters `show --versions` prints. It is the body as
+            // rendered for THIS target, so it matches a version's hash only when
+            // nothing was filled in — and was `--json` only, which made "is the
+            // block in my CLAUDE.md current?" read as "my machine is running a body
+            // the server never heard of" (OSK-4644).
+            fileHash: target.appliedHash ? target.appliedHash.slice(0, 12) : '-',
             status: (0, instruction_input_1.describeTargetSync)(target, Date.now(), liveDaemonIds),
         })), [
             { key: 'id', header: 'TARGET ID' },
@@ -88,6 +101,7 @@ class InstructionsStatus extends base_command_1.BaseCommand {
             { key: 'target', header: 'PATH', maxWidth: 36 },
             { key: 'desired', header: 'DESIRED' },
             { key: 'applied', header: 'APPLIED' },
+            { key: 'fileHash', header: 'FILE HASH' },
             // Wide enough for the stall note to keep its remedy. Truncating at 48
             // cut `purge-target` off the end, which hid the one actionable half of
             // the sentence.
@@ -106,6 +120,8 @@ class InstructionsStatus extends base_command_1.BaseCommand {
             for (const command of rebinds)
                 this.log(`  ${command}`);
         }
+        for (const line of (0, instruction_input_1.failedTargetLines)(response.targets, this.config.bin))
+            this.log(line);
         // Where the text went.
         //
         // The count in the STATUS column says skrr overwrote something you

package/dist/commands/payments/wallet.js

@@ -52,8 +52,8 @@ class PaymentsWallet extends base_command_1.BaseCommand {
         // CLI — so anyone looking for "my balance" found USDC and drew the wrong
         // conclusion about their usage ceiling. Name the other one.
         this.log('');
-        this.log('This is the x402 crypto wallet, in USDC. Your hosted USAGE balance —');
-        this.log('the ceiling that refuses a turn — is `skrr balance show`.');
+        this.log('This is the x402 crypto wallet, in USDC. Your hosted USAGE balance and');
+        this.log('plan limits — the ceilings that refuse a turn — are `skrr balance show`.');
         const payments = history.payments ?? [];
         if (payments.length === 0) {
             this.log('');