@skrr-ai/cli 0.1.32 → 0.1.34

package/dist/lib/{sky-code-agent.d.ts → first-party-harness-agent.d.ts}

@@ -1,10 +1,10 @@
 /**
- * OSK-3892 — which AGENT a locally-hosted skrr Code session belongs to.
+ * OSK-3892 — which AGENT a locally-hosted first-party harness session belongs to.
  *
  * ── Why a session needs an agent at all ────────────────────────────────────
  *
  * `skrr code` is the local arm of an agent's harness. The cloud dispatches to
- * sky-code AS an agent, and a human running it here runs the same harness against
+ * the first-party harness AS an agent, and a human running it here runs the same harness against
  * the same server contract — so the session is attributed to an agent the user
  * names.
  *
@@ -15,8 +15,8 @@
  *
  * ── Resolution order, and why it ends in a refusal ─────────────────────────
  *
- *   1. `--oversky-agent <id-or-name>`
- *   2. `skyCodeAgentId` in `~/.skrr/cli-config.json`
+ *   1. `--skrr-agent <id-or-name>` (or its older spelling, `--oversky-agent`)
+ *   2. `AGENT_CONFIG_KEY` in `~/.skrr/cli-config.json` (or the key earlier CLIs wrote)
  *   3. the user's single agent, when they have exactly one AND AUTHORED IT
  *   4. the user's own DEFAULT agent for this harness, created on first use
  *
@@ -48,11 +48,11 @@
  * `--oversky-agent` fail inside any daemon-spawned CLI child. Its error TYPE and
  * its habit of listing what it found are worth copying; its precedence is not.
  */
-export type SkyCodeAgentSource = 'flag' | 'config' | 'sole-agent' | 'default-agent';
-export interface SkyCodeAgent {
+export type FirstPartyHarnessAgentSource = 'flag' | 'config' | 'sole-agent' | 'default-agent';
+export interface FirstPartyHarnessAgent {
     id: string;
     name?: string;
-    source: SkyCodeAgentSource;
+    source: FirstPartyHarnessAgentSource;
     /**
      * True only on the run that actually minted the default agent, so the CLI can
      * say so once instead of on every session. The server reports it as 201 vs
@@ -60,10 +60,10 @@ export interface SkyCodeAgent {
      */
     createdNow?: boolean;
 }
-export type SkyCodeAgentFailure = 'agent-unknown' | 'agent-ambiguous' | 'agent-unset' | 'agent-lookup-failed';
-export declare class SkyCodeAgentError extends Error {
-    readonly code: SkyCodeAgentFailure;
-    constructor(code: SkyCodeAgentFailure, message: string);
+export type FirstPartyHarnessAgentFailure = 'agent-unknown' | 'agent-ambiguous' | 'agent-unset' | 'agent-lookup-failed';
+export declare class FirstPartyHarnessAgentError extends Error {
+    readonly code: FirstPartyHarnessAgentFailure;
+    constructor(code: FirstPartyHarnessAgentFailure, message: string);
 }
 interface AgentRow {
     id?: string;
@@ -77,11 +77,12 @@ interface AgentRow {
      * Set when this row IS the caller's auto-created default for a harness. Also
      * already on the wire, for the same reason — which is what lets a read-only
      * caller recognise an existing default without asking the get-or-create
-     * endpoint to establish one.
+     * endpoint to establish one. A stored row may carry any accepted spelling of
+     * the harness, so it is compared with `isFirstPartyHarnessProvider`, never `===`.
      */
     defaultForHarness?: string;
 }
-export interface SkyCodeAgentDeps {
+export interface FirstPartyHarnessAgentDeps {
     /** Agents this user may run. Bounded; see `ROSTER_LIMIT`. */
     listAgents?: (signal?: AbortSignal) => Promise<AgentRow[]>;
     /** Direct read, for an id outside the bounded roster. `null` when unreadable. */
@@ -99,7 +100,7 @@ interface DefaultAgentRow extends AgentRow {
     /** Whether THIS call created it (server 201) rather than found it (200). */
     created?: boolean;
 }
-export interface SkyCodeAgentOptions {
+export interface FirstPartyHarnessAgentOptions {
     /**
      * OSK-3892 — the CALLER's deadline for the whole managed acquisition.
      *
@@ -120,8 +121,8 @@ export interface SkyCodeAgentOptions {
     /**
      * How a refusal NAMES an explicitly-supplied reference.
      *
-     * Defaults to `--oversky-agent`, which is how a session receives one. `skrr code
-     * oversky-agent --set` passes its own spelling so a bad value does not send the
+     * Defaults to `--skrr-agent`, which is how a session receives one. `skrr code
+     * skrr-agent --set` passes its own spelling so a bad value does not send the
      * user to fix a flag they never typed.
      */
     explicitLabel?: string;
@@ -143,18 +144,18 @@ export interface SkyCodeAgentOptions {
  * a refusal listable. That is worth just as much care — a wrong pick is not a
  * breach, it is a bill someone else reads weeks later — but it is a different job.
  */
-export declare function resolveSkyCodeAgent(explicit?: string, deps?: SkyCodeAgentDeps, options?: SkyCodeAgentOptions): Promise<SkyCodeAgent>;
+export declare function resolveFirstPartyHarnessAgent(explicit?: string, deps?: FirstPartyHarnessAgentDeps, options?: FirstPartyHarnessAgentOptions): Promise<FirstPartyHarnessAgent>;
 /** The stored value, unresolved — for a `--show` that must report "unset" honestly. */
 export declare function readConfiguredAgentId(): string | undefined;
 /**
  * Persist the agent `skrr code` runs as when no flag is passed.
  *
- * Resolves through the SAME roster `resolveSkyCodeAgent` uses, for two reasons: a
+ * Resolves through the SAME roster `resolveFirstPartyHarnessAgent` uses, for two reasons: a
  * typo is refused while the user is still looking at it rather than at the start
  * of some later session, and what lands on disk is always a canonical id. Storing
  * the display name a user typed would silently break on the next rename.
  */
-export declare function setConfiguredAgentId(ref: string, deps?: SkyCodeAgentDeps, options?: SkyCodeAgentOptions): Promise<SkyCodeAgent>;
+export declare function setConfiguredAgentId(ref: string, deps?: FirstPartyHarnessAgentDeps, options?: FirstPartyHarnessAgentOptions): Promise<FirstPartyHarnessAgent>;
 /** Remove the setting. Returns what was there, so the caller can say so. */
 export declare function clearConfiguredAgentId(): string | undefined;
 export {};

package/dist/lib/{sky-code-agent.js → first-party-harness-agent.js}

@@ -1,11 +1,11 @@
 "use strict";
 /**
- * OSK-3892 — which AGENT a locally-hosted skrr Code session belongs to.
+ * OSK-3892 — which AGENT a locally-hosted first-party harness session belongs to.
  *
  * ── Why a session needs an agent at all ────────────────────────────────────
  *
  * `skrr code` is the local arm of an agent's harness. The cloud dispatches to
- * sky-code AS an agent, and a human running it here runs the same harness against
+ * the first-party harness AS an agent, and a human running it here runs the same harness against
  * the same server contract — so the session is attributed to an agent the user
  * names.
  *
@@ -16,8 +16,8 @@
  *
  * ── Resolution order, and why it ends in a refusal ─────────────────────────
  *
- *   1. `--oversky-agent <id-or-name>`
- *   2. `skyCodeAgentId` in `~/.skrr/cli-config.json`
+ *   1. `--skrr-agent <id-or-name>` (or its older spelling, `--oversky-agent`)
+ *   2. `AGENT_CONFIG_KEY` in `~/.skrr/cli-config.json` (or the key earlier CLIs wrote)
  *   3. the user's single agent, when they have exactly one AND AUTHORED IT
  *   4. the user's own DEFAULT agent for this harness, created on first use
  *
@@ -50,15 +50,16 @@
  * its habit of listing what it found are worth copying; its precedence is not.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SkyCodeAgentError = void 0;
-exports.resolveSkyCodeAgent = resolveSkyCodeAgent;
+exports.FirstPartyHarnessAgentError = void 0;
+exports.resolveFirstPartyHarnessAgent = resolveFirstPartyHarnessAgent;
 exports.readConfiguredAgentId = readConfiguredAgentId;
 exports.setConfiguredAgentId = setConfiguredAgentId;
 exports.clearConfiguredAgentId = clearConfiguredAgentId;
+const auth_core_1 = require("@skrr-ai/auth-core");
 const data_provider_1 = require("@skrr-ai/data-provider");
 const api_fetch_1 = require("./api-fetch");
 const config_1 = require("./config");
-const sky_code_managed_1 = require("./sky-code-managed");
+const first_party_harness_managed_1 = require("./first-party-harness-managed");
 /**
  * How many agents the refusal is allowed to look at.
  *
@@ -68,15 +69,15 @@ const sky_code_managed_1 = require("./sky-code-managed");
 const ROSTER_LIMIT = 100;
 /** How many candidates a refusal prints before it summarizes the rest. */
 const CANDIDATES_SHOWN = 12;
-class SkyCodeAgentError extends Error {
+class FirstPartyHarnessAgentError extends Error {
     code;
     constructor(code, message) {
         super(message);
-        this.name = 'SkyCodeAgentError';
+        this.name = 'FirstPartyHarnessAgentError';
         this.code = code;
     }
 }
-exports.SkyCodeAgentError = SkyCodeAgentError;
+exports.FirstPartyHarnessAgentError = FirstPartyHarnessAgentError;
 /**
  * Resolve the agent for this session, or refuse with something actionable.
  *
@@ -94,9 +95,20 @@ exports.SkyCodeAgentError = SkyCodeAgentError;
  * a refusal listable. That is worth just as much care — a wrong pick is not a
  * breach, it is a bill someone else reads weeks later — but it is a different job.
  */
-async function resolveSkyCodeAgent(explicit, deps = {}, options = {}) {
-    const configured = deps.configuredAgentId ?? (() => (0, config_1.loadConfig)().skyCodeAgentId);
-    const explicitLabel = options.explicitLabel ?? sky_code_managed_1.SKRR_AGENT_FLAG;
+async function resolveFirstPartyHarnessAgent(explicit, deps = {}, options = {}) {
+    // Lazy, as before: a session with an explicit flag must not fail on an
+    // unreadable config it never needed. The KEY travels with the value so a refusal
+    // names the key actually in the file, which is not always the one written today.
+    const configured = () => {
+        if (deps.configuredAgentId)
+            return { value: deps.configuredAgentId(), key: first_party_harness_managed_1.AGENT_CONFIG_KEY };
+        const setting = (0, first_party_harness_managed_1.readConfiguredAgentSetting)();
+        if (setting.legacy && migrateLegacyAgentSettingKey()) {
+            return { value: setting.value, key: first_party_harness_managed_1.AGENT_CONFIG_KEY };
+        }
+        return { value: setting.value, key: setting.key ?? first_party_harness_managed_1.AGENT_CONFIG_KEY };
+    };
+    const explicitLabel = options.explicitLabel ?? first_party_harness_managed_1.SKRR_AGENT_FLAG;
     let cached = null;
     const roster = async () => {
         if (cached)
@@ -105,11 +117,11 @@ async function resolveSkyCodeAgent(explicit, deps = {}, options = {}) {
             cached = (await (deps.listAgents ?? listAgents)(options.signal)).filter((row) => Boolean(row?.id));
         }
         catch (err) {
-            throw new SkyCodeAgentError('agent-lookup-failed', `could not read your agents — ${message(err)}`);
+            throw new FirstPartyHarnessAgentError('agent-lookup-failed', `could not read your agents — ${message(err)}`);
         }
         return cached;
     };
-    const named = async (ref, source) => {
+    const named = async (ref, source, configKey = first_party_harness_managed_1.AGENT_CONFIG_KEY) => {
         const rows = await roster();
         const byId = rows.find((row) => row.id === ref);
         if (byId)
@@ -122,8 +134,8 @@ async function resolveSkyCodeAgent(explicit, deps = {}, options = {}) {
             return { id: byName[0].id, ...(byName[0].name ? { name: byName[0].name } : {}), source };
         }
         if (byName.length > 1) {
-            throw new SkyCodeAgentError('agent-ambiguous', `${describeSource(source, ref, explicitLabel)} matches ${byName.length} agents. ` +
-                `Pass ${sky_code_managed_1.SKRR_AGENT_FLAG} with an id instead: ${candidates(byName)}`);
+            throw new FirstPartyHarnessAgentError('agent-ambiguous', `${describeSource(source, ref, explicitLabel, configKey)} matches ${byName.length} agents. ` +
+                `Pass ${first_party_harness_managed_1.SKRR_AGENT_FLAG} with an id instead: ${candidates(byName)}`);
         }
         // Not in the bounded roster. It may still be a real id belonging to a user with
         // more agents than the roster shows, so ask directly before refusing.
@@ -131,7 +143,7 @@ async function resolveSkyCodeAgent(explicit, deps = {}, options = {}) {
         if (direct?.id) {
             return { id: direct.id, ...(direct.name ? { name: direct.name } : {}), source };
         }
-        throw new SkyCodeAgentError('agent-unknown', `${describeSource(source, ref, explicitLabel)} is not an agent you can run. ` +
+        throw new FirstPartyHarnessAgentError('agent-unknown', `${describeSource(source, ref, explicitLabel, configKey)} is not an agent you can run. ` +
             (rows.length ? `Yours: ${candidates(rows)}` : 'You have no agents yet.'));
     };
     /**
@@ -153,9 +165,10 @@ async function resolveSkyCodeAgent(explicit, deps = {}, options = {}) {
     const flag = explicit?.trim();
     if (flag)
         return named(flag, 'flag');
-    const fromConfig = configured()?.trim();
-    if (fromConfig)
-        return named(fromConfig, 'config');
+    const fromConfig = configured();
+    const configuredRef = fromConfig.value?.trim();
+    if (configuredRef)
+        return named(configuredRef, 'config', fromConfig.key);
     const rows = await roster();
     if (rows.length === 1) {
         // AUTHORSHIP, not visibility. The roster is read at EDIT and `AGENT_EDITOR`
@@ -194,7 +207,7 @@ async function resolveSkyCodeAgent(explicit, deps = {}, options = {}) {
     //    hardest to notice: "do not create" is not "do not look", and `--show`
     //    would report "no default agent yet" while staring at the row.
     if (options.createDefault === false) {
-        const existing = rows.find((row) => row.defaultForHarness === sky_code_managed_1.SKY_CODE_HARNESS);
+        const existing = rows.find((row) => (0, auth_core_1.isFirstPartyHarnessProvider)(row.defaultForHarness));
         if (existing?.id) {
             return {
                 id: existing.id,
@@ -206,7 +219,9 @@ async function resolveSkyCodeAgent(explicit, deps = {}, options = {}) {
     try {
         const created = options.createDefault === false
             ? null
-            : await (deps.ensureDefaultAgent ?? ensureDefaultAgent)(sky_code_managed_1.SKY_CODE_HARNESS, options.signal);
+            : await (deps.ensureDefaultAgent ?? ensureDefaultAgent)(
+            // Canonical: what the server stores. It accepts every spelling.
+            auth_core_1.FIRST_PARTY_HARNESS.provider, options.signal);
         if (created?.id) {
             return {
                 id: created.id,
@@ -219,30 +234,30 @@ async function resolveSkyCodeAgent(explicit, deps = {}, options = {}) {
     catch (err) {
         if (isAbortError(err))
             throw err;
-        throw new SkyCodeAgentError('agent-unset', `could not establish your default skrr Code agent — ${message(err)}. ` +
-            `Pass ${sky_code_managed_1.SKRR_AGENT_FLAG} <id-or-name>, or set one with ` +
-            '`skrr code skrr-agent --set <id>`' +
+        throw new FirstPartyHarnessAgentError('agent-unset', `could not establish your default ${auth_core_1.FIRST_PARTY_HARNESS.displayName} agent — ${message(err)}. ` +
+            `Pass ${first_party_harness_managed_1.SKRR_AGENT_FLAG} <id-or-name>, or set one with ` +
+            `\`${auth_core_1.FIRST_PARTY_HARNESS.command} skrr-agent --set <id>\`` +
             (rows.length ? `. Yours: ${candidates(rows)}` : ''));
     }
     // Asked, not told: the caller opted out of creation, so "no default" is a fact
     // about this machine rather than a failure, and the remedy is a real command.
     if (options.createDefault === false) {
-        throw new SkyCodeAgentError('agent-unset', 'nothing is configured and you have no skrr Code default agent yet. ' +
+        throw new FirstPartyHarnessAgentError('agent-unset', `nothing is configured and you have no ${auth_core_1.FIRST_PARTY_HARNESS.displayName} default agent yet. ` +
             'One is created automatically the first time you run a managed session — ' +
-            'or make it now with `skrr code skrr-agent --create`' +
+            `or make it now with \`${auth_core_1.FIRST_PARTY_HARNESS.command} skrr-agent --create\`` +
             (rows.length ? `. Yours: ${candidates(rows)}` : ''));
     }
     // The endpoint answered without an agent. Nothing here can repair that, but
     // the user still has every ordinary way to name one.
-    throw new SkyCodeAgentError('agent-unset', rows.length
-        ? `skrr Code has no default agent for you and will not pick one of your ${rows.length}. ` +
-            `Pass ${sky_code_managed_1.SKRR_AGENT_FLAG} <id-or-name>, or set "${sky_code_managed_1.AGENT_CONFIG_KEY}" in ` +
+    throw new FirstPartyHarnessAgentError('agent-unset', rows.length
+        ? `${auth_core_1.FIRST_PARTY_HARNESS.displayName} has no default agent for you and will not pick one of your ${rows.length}. ` +
+            `Pass ${first_party_harness_managed_1.SKRR_AGENT_FLAG} <id-or-name>, or set "${first_party_harness_managed_1.AGENT_CONFIG_KEY}" in ` +
             `${configPathHint()}. Yours: ${candidates(rows)}`
-        : 'you have no agents and no default could be created, yet a managed skrr Code session ' +
+        : `you have no agents and no default could be created, yet a managed ${auth_core_1.FIRST_PARTY_HARNESS.displayName} session ` +
             'runs as one. Create an agent in the skrr app first');
 }
-function describeSource(source, ref, explicitLabel) {
-    return source === 'config' ? `"${sky_code_managed_1.AGENT_CONFIG_KEY}": "${ref}"` : `${explicitLabel} "${ref}"`;
+function describeSource(source, ref, explicitLabel, configKey) {
+    return source === 'config' ? `"${configKey}": "${ref}"` : `${explicitLabel} "${ref}"`;
 }
 function candidates(rows) {
     const shown = rows
@@ -263,22 +278,22 @@ function configPathHint() {
 }
 /** The stored value, unresolved — for a `--show` that must report "unset" honestly. */
 function readConfiguredAgentId() {
-    return (0, config_1.loadConfig)().skyCodeAgentId?.trim() || undefined;
+    return (0, first_party_harness_managed_1.readConfiguredAgentSetting)().value;
 }
 /**
  * Persist the agent `skrr code` runs as when no flag is passed.
  *
- * Resolves through the SAME roster `resolveSkyCodeAgent` uses, for two reasons: a
+ * Resolves through the SAME roster `resolveFirstPartyHarnessAgent` uses, for two reasons: a
  * typo is refused while the user is still looking at it rather than at the start
  * of some later session, and what lands on disk is always a canonical id. Storing
  * the display name a user typed would silently break on the next rename.
  */
 async function setConfiguredAgentId(ref, deps = {}, options = {}) {
-    const resolved = await resolveSkyCodeAgent(ref, deps, {
+    const resolved = await resolveFirstPartyHarnessAgent(ref, deps, {
         // Name the thing the user actually typed. Without this a bad `--set` value
-        // is refused with "--oversky-agent \"typo\" is not an agent you can run",
+        // is refused with "--skrr-agent \"typo\" is not an agent you can run",
         // pointing at a flag that was never on the command line.
-        explicitLabel: 'skrr code skrr-agent --set',
+        explicitLabel: `${auth_core_1.FIRST_PARTY_HARNESS.command} skrr-agent --set`,
         ...options,
     });
     writeConfigKey(resolved.id);
@@ -291,8 +306,7 @@ function clearConfiguredAgentId() {
     return previous;
 }
 function readRawConfigKey() {
-    const value = (0, config_1.loadRawConfig)()[sky_code_managed_1.AGENT_CONFIG_KEY];
-    return typeof value === 'string' && value.trim() ? value : undefined;
+    return (0, first_party_harness_managed_1.readAgentSetting)((0, config_1.loadRawConfig)()).value;
 }
 /**
  * Read-modify-write through the RAW accessors, never `loadConfig`/`saveConfig`.
@@ -304,13 +318,37 @@ function readRawConfigKey() {
  * that moved credentials to the keychain, on a command about an agent id. The raw
  * pair also preserves operator-added keys the typed shape does not enumerate.
  */
+/**
+ * Move an agent setting stored under an older key onto the neutral one, on the
+ * first real session read. Returns whether the file now holds it under the
+ * neutral key.
+ *
+ * Reading alone used to leave it where it was, which is safe only while that key
+ * is still an accepted spelling. The contract phase empties the identity's
+ * aliases, `legacyAgentConfigKeys()` then stops naming the old key, and a user
+ * who never ran `--set`, `--clear` or logout would silently lose their setting.
+ * Moving it here retires the old key long before that date.
+ *
+ * Only the session path calls this — `skrr code doctor` reports and never
+ * writes. Best-effort: an unwritable config is left alone and still read.
+ */
+function migrateLegacyAgentSettingKey() {
+    try {
+        const raw = (0, config_1.loadRawConfig)();
+        const stored = (0, first_party_harness_managed_1.readAgentSetting)(raw);
+        if (!stored.legacy || !stored.value)
+            return false;
+        (0, config_1.saveRawConfig)((0, first_party_harness_managed_1.withAgentSetting)(raw, stored.value));
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 function writeConfigKey(id) {
-    const raw = (0, config_1.loadRawConfig)();
-    if (id)
-        raw[sky_code_managed_1.AGENT_CONFIG_KEY] = id;
-    else
-        delete raw[sky_code_managed_1.AGENT_CONFIG_KEY];
-    (0, config_1.saveRawConfig)(raw);
+    // Every older key goes too, so the file ends holding the setting under one
+    // name — a clear that left an older key behind would un-clear on the next read.
+    (0, config_1.saveRawConfig)((0, first_party_harness_managed_1.withAgentSetting)((0, config_1.loadRawConfig)(), id));
 }
 /**
  * The roster, at EDIT.

package/dist/lib/{sky-code-broker.d.ts → first-party-harness-broker.d.ts}

@@ -59,8 +59,8 @@
  */
 import { buildManagedInferenceRelayCredential, startManagedInferenceBroker, type RenewalStopReason } from '@skrr-ai/inference-broker';
 import { type ApiFetchOptions } from './api-fetch';
-import { type EngineExitOutcome } from './sky-code';
-import { type SkyCodeAgent } from './sky-code-agent';
+import { type EngineExitOutcome } from './first-party-harness';
+import { type FirstPartyHarnessAgent } from './first-party-harness-agent';
 /**
  * Reasons the server accepts for a release. An ALLOW-LIST on its side, mirrored
  * here as a type so a typo becomes a compile error rather than a silent
@@ -88,7 +88,7 @@ export interface ManagedSessionHandle {
     env: Record<string, string>;
     socketPath: string;
     sessionId: string;
-    agent: SkyCodeAgent;
+    agent: FirstPartyHarnessAgent;
     reservationId: string;
     /** The ADMITTED model. After admission the reservation is the model authority. */
     model: string;
@@ -125,7 +125,7 @@ export interface ManagedSessionHandle {
 }
 type FetchLike = (url: string, init: RequestInit) => Promise<Response>;
 export interface AcquireManagedSessionInput {
-    /** `--oversky-agent` value, if the user passed one. */
+    /** `--skrr-agent` (or `--oversky-agent`) value, if the user passed one. */
     agentRef?: string;
     /** The model the user named to the engine, if any. */
     model?: string;
@@ -147,7 +147,7 @@ export interface AcquireManagedSessionDeps {
     prefetchAuth?: () => Promise<void>;
     hasCredential?: () => boolean;
     /** `signal` is the acquisition-wide deadline; an override that ignores it is unbounded. */
-    resolveAgent?: (ref?: string, signal?: AbortSignal) => Promise<SkyCodeAgent>;
+    resolveAgent?: (ref?: string, signal?: AbortSignal) => Promise<FirstPartyHarnessAgent>;
     /** The user-JWT call. Defaults to `apiFetch`. */
     api?: <T>(path: string, opts?: ApiFetchOptions) => Promise<T>;
     /** The session-token calls. Defaults to global `fetch`. */
@@ -226,7 +226,7 @@ export interface ManagedEngineHooks {
 }
 export interface ManagedEngineHooksInput {
     subcommand: string | null;
-    /** Argv bound for the engine, with `--oversky-agent` already removed. */
+    /** Argv bound for the engine, with `--skrr-agent` / `--oversky-agent` already removed. */
     passthrough: readonly string[];
     agentRef?: string;
     env?: NodeJS.ProcessEnv;

package/dist/lib/{sky-code-broker.js → first-party-harness-broker.js}

@@ -75,9 +75,9 @@ const auth_core_init_1 = require("./auth-core-init");
 const config_1 = require("./config");
 const cred_envelope_1 = require("./cred-envelope");
 const device_id_1 = require("./device-id");
-const sky_code_1 = require("./sky-code");
-const sky_code_agent_1 = require("./sky-code-agent");
-const sky_code_managed_1 = require("./sky-code-managed");
+const first_party_harness_1 = require("./first-party-harness");
+const first_party_harness_agent_1 = require("./first-party-harness-agent");
+const first_party_harness_managed_1 = require("./first-party-harness-managed");
 const task_execution_1 = require("./task-execution");
 /**
  * Harness selections the POLICY resolves, mirroring the server's own set.
@@ -173,7 +173,7 @@ async function acquireManagedSession(input = {}, deps = {}) {
     const newId = deps.newId ?? (() => (0, node_crypto_1.randomUUID)());
     const fetchImpl = deps.fetchImpl ?? ((url, init) => fetch(url, init));
     const api = deps.api ?? ((path, opts) => (0, api_fetch_1.apiFetch)(path, opts));
-    const serverUrl = (deps.serverUrl ?? (() => (0, sky_code_managed_1.skyCodeServerUrl)(input.env ?? process.env)))();
+    const serverUrl = (deps.serverUrl ?? (() => (0, first_party_harness_managed_1.configuredServerUrl)(input.env ?? process.env)))();
     // Envelope-wrapped credentials are unreadable until this has run: without it
     // `readFromBackend` returns a null plaintext and the whole bundle is dropped, so
     // a signed-in user looks signed out. `BaseCommand` awaits it for the same reason
@@ -236,7 +236,7 @@ async function acquireManagedSession(input = {}, deps = {}) {
     let lease;
     try {
         agent = await (deps.resolveAgent ??
-            ((ref, signal) => (0, sky_code_agent_1.resolveSkyCodeAgent)(ref, {}, signal ? { signal } : {})))(input.agentRef, acquisition.signal);
+            ((ref, signal) => (0, first_party_harness_agent_1.resolveFirstPartyHarnessAgent)(ref, {}, signal ? { signal } : {})))(input.agentRef, acquisition.signal);
         // Say it exactly once, on the run that actually minted it.
         //
         // A user who never chose an agent is about to have a new one appear in their
@@ -245,9 +245,9 @@ async function acquireManagedSession(input = {}, deps = {}) {
         // on every subsequent session, which is why the server distinguishes created
         // from found rather than the CLI guessing from a timestamp.
         if (agent.createdNow) {
-            input.log?.(`Created "${agent.name ?? agent.id}" as your default skrr Code agent — ` +
+            input.log?.(`Created "${agent.name ?? agent.id}" as your default ${auth_core_1.FIRST_PARTY_HARNESS.displayName} agent — ` +
                 'this session, and future ones, are attributed to it. ' +
-                'Change it with `skrr code skrr-agent --set <id-or-name>`.');
+                `Change it with \`${auth_core_1.FIRST_PARTY_HARNESS.command} skrr-agent --set <id-or-name>\`.`);
         }
         const minted = await mintSessionToken({ sessionId, processStartId, agentId: agent.id, actorId: newId() }, api, acquisition.signal);
         sessionToken = minted.token;
@@ -942,31 +942,31 @@ function localClock(atMs) {
  * wrong one of the three is the confusion, not a mitigation of it.
  *
  * The predicate is `hasProviderCredential`, the same one that decides what the
- * engine actually inherits (`sky-code.ts`), so the sentence and the spawn cannot
+ * engine actually inherits (`first-party-harness.ts`), so the sentence and the spawn cannot
  * disagree. `strippedProviderCredentialNames` covers the third case that
  * predicate cannot see: the machine HAS a provider credential and this run
  * removes it, which reads as absence and is not.
  */
 function fallbackTail(env) {
-    if ((0, sky_code_1.hasProviderCredential)(env))
+    if ((0, first_party_harness_1.hasProviderCredential)(env))
         return 'Continuing with your own provider credentials.';
     // Absence and removal are different problems, and the old sentence said the
     // first when the second was true: on a machine whose only credential is an AWS
     // profile the engine runs fine on its own and fails through `skrr code`,
     // because `AWS_*` is stripped on the way in. Being told "no provider
     // credential is set here" sends that user to buy a key they do not need.
-    const stripped = (0, sky_code_1.strippedProviderCredentialNames)(env);
+    const stripped = (0, first_party_harness_1.strippedProviderCredentialNames)(env);
     if (stripped.length > 0) {
         return (`${stripped.join(', ')} is set here, but this run does not pass it to the engine — ` +
             'it is stripped so a model-driven process opening other people\u2019s repositories cannot ' +
             'reuse a cloud credential. So the engine starts without one and its first request will ' +
             'fail. Export a provider key the engine may inherit (any `*_API_KEY`, e.g. ' +
             'OPENROUTER_API_KEY), resolve the reason above, or run the engine directly if you ' +
-            'intend to spend that credential (`skrr code doctor` shows where it is).');
+            `intend to spend that credential (\`${auth_core_1.FIRST_PARTY_HARNESS.command} doctor\` shows where it is).`);
     }
     return ('No provider credential is set here either, so the engine will start without one and ' +
         'its first request will fail — set OPENROUTER_API_KEY, or resolve the reason above ' +
-        '(`skrr code doctor`).');
+        `(\`${auth_core_1.FIRST_PARTY_HARNESS.command} doctor\`).`);
 }
 /**
  * Build the three `execEngine` hooks for one `skrr code` invocation.
@@ -992,7 +992,7 @@ function createManagedEngineHooks(input) {
     const env = input.env ?? process.env;
     const log = input.log ?? ((line) => process.stderr.write(`${line}\n`));
     const acquire = input.acquire ?? acquireManagedSession;
-    const requestedModel = (0, sky_code_managed_1.namedEngineModel)(input.passthrough);
+    const requestedModel = (0, first_party_harness_managed_1.namedEngineModel)(input.passthrough);
     let handle = null;
     /**
      * Set the instant teardown begins, so a renewal refusal our OWN release caused
@@ -1008,7 +1008,7 @@ function createManagedEngineHooks(input) {
         // user was told so.
         credentialMode: () => (handle ? 'managed' : 'byok'),
         prepare: async () => {
-            const skip = (0, sky_code_managed_1.managedSkipReason)(env);
+            const skip = (0, first_party_harness_managed_1.managedSkipReason)(env);
             if (skip) {
                 if (skip.announce)
                     log(`Managed inference not used: ${skip.detail}. ${fallbackTail(env)}`);
@@ -1061,14 +1061,14 @@ function createManagedEngineHooks(input) {
                 const failure = managedAcquisitionFailure(err, env);
                 log(failure.line);
                 if (failure.action === 'refuse') {
-                    throw new sky_code_1.EngineStartRefusedError(failure.code, failure.line);
+                    throw new first_party_harness_1.EngineStartRefusedError(failure.code, failure.line);
                 }
                 return {};
             }
         },
         finalizeArgs: (args) => 
         // Only when WE resolved the model. A user-named model is already in the argv.
-        (0, sky_code_managed_1.withManagedModel)(input.subcommand, args, handle && !requestedModel ? (handle.clientModelId ?? handle.model) : undefined),
+        (0, first_party_harness_managed_1.withManagedModel)(input.subcommand, args, handle && !requestedModel ? (handle.clientModelId ?? handle.model) : undefined),
         cleanup: async (outcome) => {
             const live = handle;
             handle = null;
@@ -1126,7 +1126,7 @@ function managedRenewalStoppedLine(reason, detail) {
             // the useful detail here is WHEN the window ended, not which rule fired.
             return ('Managed inference reached the limit this session was authorized for' +
                 `${detail ? ` (${detail})` : ''}. ` +
-                'It cannot be extended further — start a new `skrr code` session to continue.');
+                `It cannot be extended further — start a new \`${auth_core_1.FIRST_PARTY_HARNESS.command}\` session to continue.`);
         case 'expired':
             // Deliberately names the cause rather than only the fact. A user who was
             // told "renewal was refused" goes looking for a policy or budget problem;
@@ -1134,7 +1134,7 @@ function managedRenewalStoppedLine(reason, detail) {
             // and the fix is the same one-liner as the ceiling's.
             return ('Managed inference lost its session credential before it could be refreshed' +
                 `${detail ? ` (${detail})` : ''} — this usually means the machine slept. ` +
-                'Start a new `skrr code` session to continue.');
+                `Start a new \`${auth_core_1.FIRST_PARTY_HARNESS.command}\` session to continue.`);
         case 'exhausted': {
             // OSK-3932 — the money, which until now could only reach the user as
             // `denied` ("something is wrong with your access") or, worse, as nothing at
@@ -1155,7 +1155,7 @@ function managedRenewalStoppedLine(reason, detail) {
                     'or export OPENROUTER_API_KEY to continue on your own key.');
             }
             return ('Managed inference stopped: this session spent the budget it was authorized. ' +
-                'Waiting will not restore it — start a new `skrr code` session to continue, ' +
+                `Waiting will not restore it — start a new \`${auth_core_1.FIRST_PARTY_HARNESS.command}\` session to continue, ` +
                 'or export OPENROUTER_API_KEY to continue on your own key.');
         }
         case 'denied':
@@ -1175,7 +1175,7 @@ function managedRenewalStoppedLine(reason, detail) {
             return (`Managed inference renewal was refused (${reason}${because}). ` +
                 'This session will lose access to the model shortly. This is an answer about ' +
                 'your account rather than the clock, so a new session may get it again — run ' +
-                '`skrr code doctor`, or export OPENROUTER_API_KEY to continue on your own key.');
+                `\`${auth_core_1.FIRST_PARTY_HARNESS.command} doctor\`, or export OPENROUTER_API_KEY to continue on your own key.`);
         default:
             // `unavailable`, and any reason a future package version adds: the cautious
             // sentence is the right default for something this CLI does not recognise.
@@ -1185,7 +1185,7 @@ function managedRenewalStoppedLine(reason, detail) {
             // than the fix.
             return (`Managed inference could not renew its lease (${reason}${because}). ` +
                 'This session will lose access to the model shortly. If it does not recover, ' +
-                'start a new `skrr code` session, or export OPENROUTER_API_KEY to continue on ' +
+                `start a new \`${auth_core_1.FIRST_PARTY_HARNESS.command}\` session, or export OPENROUTER_API_KEY to continue on ` +
                 'your own key.');
     }
 }
@@ -1276,9 +1276,9 @@ function managedAcquisitionFailure(err, env = process.env) {
  * offered where there is no key to spend.
  */
 function refusalTail(env) {
-    if ((0, sky_code_1.hasProviderCredential)(env)) {
+    if ((0, first_party_harness_1.hasProviderCredential)(env)) {
         return ('`skrr code` did not start the engine; to run on your own provider key instead, ' +
-            `set ${sky_code_managed_1.MANAGED_ENV_FLAG}=0.`);
+            `set ${first_party_harness_managed_1.MANAGED_ENV_FLAG}=0.`);
     }
     return '`skrr code` did not start the engine.';
 }

package/dist/lib/{sky-code-doctor.d.ts → first-party-harness-doctor.d.ts}

@@ -1,5 +1,5 @@
 /**
- * WL-6.9 — skrr Code diagnostics.
+ * WL-6.9 — first-party harness diagnostics (`skrr code doctor`).
  *
  * The plan makes this a launch gate, phrased as: support must be able to
  * identify the product version, upstream base, config source, and runtime mode
@@ -20,6 +20,12 @@
  *    actions, and collapsing them into one red line is how a user spends an
  *    hour reinstalling something that was merely absent. Hence three statuses,
  *    not two.
+ *
+ * Every product-named value — display name, binary name, project directory, env
+ * var names — comes from the identity module in `@skrr-ai/auth-core`. A variable
+ * that was read under an OLDER name is reported by that name, with the neutral
+ * one to move to: the older names are still honoured, and a diagnostic that
+ * hid which one was in effect would send an operator to edit the wrong line.
  */
 export type CheckStatus = 'ok' | 'warn' | 'fail';
 export interface DoctorCheck {
@@ -35,7 +41,11 @@ export interface DoctorReport {
     /** `fail` if any check failed, else `warn` if any warned, else `ok`. */
     status: CheckStatus;
 }
-/** Project-level state dir. Basename deliberately differs from `~/.skrr`. */
+/**
+ * Project-level state dir — the ENGINE's own project marker
+ * (`FIRST_PARTY_HARNESS_ENGINE.projectDirectory`). Basename deliberately differs
+ * from `~/.skrr`.
+ */
 export declare function projectStateDir(cwd: string): string;
 export declare function runDoctor(cwd?: string, env?: NodeJS.ProcessEnv): DoctorReport;
 /** Render a report for a terminal. */