@skrr-ai/cli 0.1.108 → 0.1.110

package/dist/lib/machines.js

@@ -3,6 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.machineStateLabel = machineStateLabel;
 exports.hiddenMachinesSummary = hiddenMachinesSummary;
 exports.isReachableMachine = isReachableMachine;
+exports.isOwnComputer = isOwnComputer;
+exports.isListedByDefault = isListedByDefault;
+exports.parseDaemonId = parseDaemonId;
+exports.summarizeDaemons = summarizeDaemons;
+exports.isThisComputer = isThisComputer;
+exports.machineListView = machineListView;
 exports.liveHarnessCount = liveHarnessCount;
 exports.listMachines = listMachines;
 exports.getMachine = getMachine;
@@ -25,8 +31,20 @@ const api_fetch_1 = require("./api-fetch");
  * could come back says so, and a destroyed one cannot.
  */
 function machineStateLabel(machine) {
+    // `degraded` is the machine's status while a daemon is silent, and it reads the
+    // same as a sign-in problem or one provider being down. The server says which
+    // it is; the word a person reads is that one (OSK-16442).
+    if (machine.status === 'degraded' && machine.contact?.state === 'stale')
+        return 'stale';
     if (machine.status !== 'offline')
         return machine.status;
+    // A computer somebody installed a daemon on has no lease to resume and nothing
+    // to terminate, which is also exactly what a destroyed sandbox looks like, so
+    // the check below read every switched-off computer as `terminated`: the one
+    // word for "this can never come back", beside a machine that comes back the
+    // moment its daemon starts (OSK-16442).
+    if (isOwnComputer(machine))
+        return 'offline';
     const controls = machine.controls;
     if (controls && controls.canResume === false && controls.canTerminate === false) {
         return 'terminated';
@@ -65,6 +83,127 @@ function hiddenMachinesSummary(hidden) {
 function isReachableMachine(machine) {
     return machineStateLabel(machine) !== 'terminated' && machine.status !== 'offline';
 }
+/**
+ * A computer somebody installed a daemon on, as opposed to a hosted sandbox.
+ *
+ * A daemon launched on a person's own computer registers as
+ * `daemon_<hash>_<source>[_<profile>]` (`parseDaemonId`); a hosted or cloud
+ * machine's daemon carries an id minted by the control plane
+ * (`hosted-machine-…`, `cloud-coding-…`) that names no launch source. A lease
+ * decides a managed machine's own state, so it is never one of these.
+ */
+function isOwnComputer(machine) {
+    if (machine.lease)
+        return false;
+    return (machine.harnesses ?? []).some((row) => typeof row.daemonId === 'string' && parseDaemonId(row.daemonId) !== null);
+}
+/**
+ * What the default `machines list` keeps: everything reachable, and every one of
+ * the person's own computers while it is offline (OSK-16442).
+ *
+ * The default hides offline machines because hosted sandboxes accumulate by the
+ * hundreds and buried the one that was usable (OSK-7639). Applied to a computer
+ * it did something else: the moment its last daemon stopped, the whole row left
+ * the list, in text and in `--json`, so "my computer is offline" and "my computer
+ * is gone" read the same. A computer is a handful of rows however long it is
+ * kept, and `offline` with its last-seen time is the answer a person asks the
+ * list for, so it stays; only what can no longer be used is left behind `--all`.
+ */
+function isListedByDefault(machine) {
+    if (isReachableMachine(machine))
+        return true;
+    return isOwnComputer(machine) && machineStateLabel(machine) === 'offline';
+}
+/**
+ * `daemon_<hash>_<source>_<profile>` — the closed set of launch sources is what
+ * makes the profile recoverable, since a profile name may itself contain an
+ * underscore and a source never does (`HarnessService`'s runtime key parses the
+ * same id the same way). An id that predates profiles ends at the source.
+ */
+const DAEMON_ID_PATTERN = /^daemon_[0-9a-f]+_(cli|launchd|systemd|schtasks|electron)(?:_(.+))?$/;
+function parseDaemonId(daemonId) {
+    const match = DAEMON_ID_PATTERN.exec(daemonId);
+    return match ? { source: match[1], profile: match[2] ?? 'default' } : null;
+}
+function newerStamp(a, b) {
+    if (!a)
+        return b;
+    if (!b)
+        return a;
+    return new Date(b).getTime() > new Date(a).getTime() ? b : a;
+}
+function summarizeDaemons(harnesses, activeProfile) {
+    const byDaemon = new Map();
+    for (const row of harnesses) {
+        if (!row.daemonId)
+            continue;
+        const parsed = parseDaemonId(row.daemonId);
+        const existing = byDaemon.get(row.daemonId);
+        const entry = existing ?? {
+            daemonId: row.daemonId,
+            profile: parsed?.profile ?? null,
+            source: parsed?.source ?? null,
+            status: 'offline',
+            lastSeenAt: null,
+            harnessCount: 0,
+            supersededCount: 0,
+            activeProfile: parsed !== null && parsed.profile === activeProfile,
+        };
+        entry.harnessCount += 1;
+        if (row.superseded === true)
+            entry.supersededCount += 1;
+        if (row.status === 'online') {
+            if (row.stale !== true)
+                entry.status = 'online';
+            else if (entry.status === 'offline')
+                entry.status = 'stale';
+        }
+        entry.lastSeenAt = newerStamp(entry.lastSeenAt, row.lastSeenAt);
+        byDaemon.set(row.daemonId, entry);
+    }
+    // Connected first, then silent, then gone, each by most recently seen: the one a
+    // person is looking for is on top.
+    const rank = { online: 0, stale: 1, offline: 2 };
+    return [...byDaemon.values()].sort((a, b) => {
+        if (a.status !== b.status)
+            return rank[a.status] - rank[b.status];
+        return new Date(b.lastSeenAt ?? 0).getTime() - new Date(a.lastSeenAt ?? 0).getTime();
+    });
+}
+/** Whether the machine's identity is THIS computer's (the default profile's, or a profile qualified from it). */
+function isThisComputer(machine, hardwareMachineUuid) {
+    const uuid = machine.machineUuid;
+    if (!uuid || !hardwareMachineUuid)
+        return false;
+    return uuid === hardwareMachineUuid || uuid.startsWith(`${hardwareMachineUuid}:p-`);
+}
+/**
+ * What `machines list` shows of one machine (OSK-16440).
+ *
+ * The default list is "what is reachable now", and a machine's own history is
+ * not part of that. A machine row carries every harness registration it ever
+ * had; one of them being online made the whole 98-row history appear in a list
+ * that, a minute earlier, had held four rows — the same command, a different
+ * answer, for no reason a reader could see. So the default view keeps the
+ * registrations that still stand and says how many it left out; `--all` keeps
+ * everything.
+ */
+function machineListView(machine, options) {
+    const rows = machine.harnesses ?? [];
+    const daemons = summarizeDaemons(rows, options.activeProfile);
+    const visibleRows = options.all ? rows : rows.filter((row) => row.superseded !== true);
+    const visibleDaemons = options.all
+        ? daemons
+        : daemons.filter((daemon) => daemon.harnessCount > daemon.supersededCount);
+    const hidden = rows.length - visibleRows.length;
+    return {
+        ...machine,
+        thisComputer: isThisComputer(machine, options.hardwareMachineUuid),
+        daemons: visibleDaemons,
+        harnesses: visibleRows,
+        ...(hidden > 0 ? { hiddenHarnessCount: hidden } : {}),
+    };
+}
 /**
  * How many of a machine's harnesses still represent a capability it has.
  *

package/dist/lib/managed-instruction-local.d.ts

@@ -10,3 +10,5 @@ export declare function resolveLocalInstructionDaemon(options?: {
     waitMs?: number;
     log?: (message: string) => void;
 }): Promise<string | null>;
+/** One look at this profile's loopback identity endpoint: the daemon id when it is connected as this account. */
+export declare function inspectLocalInstructionDaemon(profile: string, serverUrl: string): Promise<string | null>;

package/dist/lib/managed-instruction-local.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveLocalInstructionDaemon = resolveLocalInstructionDaemon;
+exports.inspectLocalInstructionDaemon = inspectLocalInstructionDaemon;
 const loopback_http_1 = require("@skrr-ai/auth-core/loopback-http");
 const data_provider_1 = require("@skrr-ai/data-provider");
 const config_1 = require("./config");
@@ -25,6 +26,7 @@ async function resolveLocalInstructionDaemon(options = {}) {
         await new Promise((resolve) => setTimeout(resolve, Math.min(300, deadline - Date.now())));
     }
 }
+/** One look at this profile's loopback identity endpoint: the daemon id when it is connected as this account. */
 async function inspectLocalInstructionDaemon(profile, serverUrl) {
     for (const candidate of (0, daemonBroker_1.resolveExactProfileBootstrapPaths)(profile)) {
         const bootstrap = (0, daemonBroker_1.readBootstrap)(candidate);

package/dist/lib/profile-machine-identity-guard.d.ts

@@ -1,2 +1,20 @@
 /** An old profile may still share the default machine row and its device pin. */
 export declare function legacyProfileSharesDefaultMachine(): boolean;
+/**
+ * Why a sign-in on this profile stopped, and what to do instead (OSK-16436).
+ *
+ * This said the profile "was created before profiles had separate machine
+ * identities". For someone whose `skrr login --profile work` ran minutes ago,
+ * under a CLI that then updated itself, that is false in time and unhelpful in
+ * substance: the profile is new to them and old to the program. What is true is
+ * a fact about the VERSION that set it up — the older one gave every profile the
+ * computer's machine identity, and this profile still holds a credential bound
+ * to it — and a consequence: signing in again re-pins the default profile's
+ * device key and signs its daemon out.
+ *
+ * The one command is the CLI's own (`skrr login --profile NAME`), which signs
+ * the background service in as well; `skrrd --profile NAME login` is the
+ * daemon-only spelling and is named second. The suggested name is concrete so
+ * the line can be pasted.
+ */
+export declare function describeLegacySharedProfile(profile: string): string[];

package/dist/lib/profile-machine-identity-guard.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.legacyProfileSharesDefaultMachine = legacyProfileSharesDefaultMachine;
+exports.describeLegacySharedProfile = describeLegacySharedProfile;
 const machine_uuid_1 = require("@skrr-ai/auth-core/machine-uuid");
+const data_provider_1 = require("@skrr-ai/data-provider");
 const keychain_1 = require("./keychain");
 /** An old profile may still share the default machine row and its device pin. */
 function legacyProfileSharesDefaultMachine() {
@@ -11,3 +13,40 @@ function legacyProfileSharesDefaultMachine() {
         !(0, machine_uuid_1.hostedRuntimeIdOverride)('OVERSKY_MACHINE_UUID') &&
         (0, machine_uuid_1.getMachineUuid)() === (0, machine_uuid_1.getHardwareMachineUuid)());
 }
+/**
+ * Why a sign-in on this profile stopped, and what to do instead (OSK-16436).
+ *
+ * This said the profile "was created before profiles had separate machine
+ * identities". For someone whose `skrr login --profile work` ran minutes ago,
+ * under a CLI that then updated itself, that is false in time and unhelpful in
+ * substance: the profile is new to them and old to the program. What is true is
+ * a fact about the VERSION that set it up — the older one gave every profile the
+ * computer's machine identity, and this profile still holds a credential bound
+ * to it — and a consequence: signing in again re-pins the default profile's
+ * device key and signs its daemon out.
+ *
+ * The one command is the CLI's own (`skrr login --profile NAME`), which signs
+ * the background service in as well; `skrrd --profile NAME login` is the
+ * daemon-only spelling and is named second. The suggested name is concrete so
+ * the line can be pasted.
+ */
+function describeLegacySharedProfile(profile) {
+    const next = `${profile}-2`;
+    // WHY this profile is on the shared row, from the record that decided it: which
+    // file made it "already hold credentials", and when. Absent rather than guessed
+    // when the record cannot be read.
+    let why = '';
+    try {
+        why = `${(0, machine_uuid_1.describeMachineIdentity)().sentence} `;
+    }
+    catch {
+        why = '';
+    }
+    return [
+        `Profile '${profile}' was set up by an older ${data_provider_1.BRAND.displayName} version that gave every profile on this ` +
+            `computer the same machine identity, and it still has it. ${why}Signing in here would replace the default ` +
+            "profile's device-key pin and sign the default daemon out. Nothing was changed.",
+        `Use a new profile name instead: skrr login --profile ${next}`,
+        `(For the background service alone: skrrd --profile ${next} login)`,
+    ];
+}

package/dist/lib/request-field-flags.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Read a server refusal back in the words the person typed.
+ *
+ * The API validates the request BODY, so its messages name body paths:
+ * `execution.workflowSignal is required for mode "workflow_signal"`. A person who built that body
+ * from flags never typed `execution.workflowSignal`, and there is no flag of that name, so the
+ * message pointed at nothing they could change (OSK-15313). A command that builds its body from
+ * flags declares which flag writes which path, and `handleApiError` rewrites any path it finds in
+ * the server's message to that flag. The server keeps speaking its own contract; the CLI, which
+ * is the only party that knows how the body was built, does the translation.
+ *
+ * A command that sent a body the person wrote themselves (`--from-json`) declares nothing: then
+ * the path IS what they typed.
+ */
+/**
+ * Replace every declared body path in `message` with its flag. Longest path first, so
+ * `execution.workflowSignal.eventKey` is not half-rewritten by `execution.workflowSignal`; a
+ * path is only replaced as a whole token (not when followed by more of a longer path).
+ */
+export declare function translateRequestFieldPaths(message: string | undefined, fieldFlags: Readonly<Record<string, string>> | undefined): string | undefined;

package/dist/lib/request-field-flags.js

@@ -0,0 +1,34 @@
+"use strict";
+/**
+ * Read a server refusal back in the words the person typed.
+ *
+ * The API validates the request BODY, so its messages name body paths:
+ * `execution.workflowSignal is required for mode "workflow_signal"`. A person who built that body
+ * from flags never typed `execution.workflowSignal`, and there is no flag of that name, so the
+ * message pointed at nothing they could change (OSK-15313). A command that builds its body from
+ * flags declares which flag writes which path, and `handleApiError` rewrites any path it finds in
+ * the server's message to that flag. The server keeps speaking its own contract; the CLI, which
+ * is the only party that knows how the body was built, does the translation.
+ *
+ * A command that sent a body the person wrote themselves (`--from-json`) declares nothing: then
+ * the path IS what they typed.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.translateRequestFieldPaths = translateRequestFieldPaths;
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+/**
+ * Replace every declared body path in `message` with its flag. Longest path first, so
+ * `execution.workflowSignal.eventKey` is not half-rewritten by `execution.workflowSignal`; a
+ * path is only replaced as a whole token (not when followed by more of a longer path).
+ */
+function translateRequestFieldPaths(message, fieldFlags) {
+    if (!message || !fieldFlags)
+        return message;
+    const paths = Object.keys(fieldFlags).sort((a, b) => b.length - a.length);
+    if (paths.length === 0)
+        return message;
+    const pattern = new RegExp(`(?<![\\w.])(${paths.map(escapeRegExp).join('|')})(?![\\w.]*\\w)`, 'g');
+    return message.replace(pattern, (path) => fieldFlags[path] ?? path);
+}

package/dist/lib/stewardship-output.d.ts

@@ -1,4 +1,4 @@
 import type { WorkspaceGrantReport, WorkspaceStewardshipReport } from './workspaces';
 export declare function printStewardshipCoverage(report: WorkspaceGrantReport, log: (line: string) => void): void;
-export declare function printWorkspaceGrants(report: WorkspaceGrantReport, log: (line: string) => void): void;
+export declare function printWorkspaceGrants(report: WorkspaceGrantReport, log: (line: string) => void, members?: ReadonlyMap<string, string>): void;
 export declare function printWorkspaceStewardship(report: WorkspaceStewardshipReport, log: (line: string) => void): void;

package/dist/lib/stewardship-output.js

@@ -4,6 +4,7 @@ exports.printStewardshipCoverage = printStewardshipCoverage;
 exports.printWorkspaceGrants = printWorkspaceGrants;
 exports.printWorkspaceStewardship = printWorkspaceStewardship;
 const format_1 = require("./format");
+const grants_1 = require("./grants");
 function printStewardshipCoverage(report, log) {
     if (report.coverage.complete) {
         log('Coverage: complete within the bounded sources.');
@@ -41,23 +42,24 @@ function printStewardshipCoverage(report, log) {
         }
     }
 }
-/** Who holds the Grant, in the same `kind id` words `skrr grants list` uses. */
-function principalText(principal) {
-    const value = principal;
-    if (!value?.kind)
-        return '—';
-    const id = value.agentId ?? value.commitmentId;
-    return id ? `${value.kind} ${id}` : value.kind;
-}
-/** What the Grant allows: its capability names, or an honest dash when it lists none. */
-function accessText(capabilities) {
+/** What the Grant's capabilities name, or an honest dash when it lists none. */
+function capabilitiesText(capabilities) {
     return Array.isArray(capabilities) && capabilities.length ? capabilities.join(', ') : '—';
 }
-function printWorkspaceGrants(report, log) {
+/**
+ * The owner as a person reads it: `Name (id)` when the id belongs to a current
+ * member, the bare id otherwise — an owner who has left is not a member, and
+ * the id is still the thing to act on.
+ */
+function ownerText(ownerUserId, members) {
+    const name = members?.get(ownerUserId);
+    return name ? `${name} (${ownerUserId})` : ownerUserId;
+}
+function printWorkspaceGrants(report, log, members) {
     printStewardshipCoverage(report, log);
-    printGrantRows(report, log);
+    printGrantRows(report, log, members);
 }
-function printGrantRows(report, log) {
+function printGrantRows(report, log, members) {
     if (report.grants === null) {
         log('Grants: unavailable.');
         return;
@@ -69,30 +71,24 @@ function printGrantRows(report, log) {
             : 'No workspace Grants observed.');
         return;
     }
+    // The columns `skrr grants list` shows come from the same function, so a
+    // header means the same thing in both tables (OSK-15357); the workspace view
+    // adds who owns the Grant, its capabilities, its expiry and what uses it.
     (0, format_1.renderTable)(report.grants.map((row) => ({
-        id: row.id,
-        label: row.label,
-        provider: row.provider || '—',
-        principal: principalText(row.principal),
-        access: accessText(row.capabilities),
-        owner: row.ownerUserId,
-        active: row.active ? 'yes' : 'no',
+        ...(0, grants_1.grantTableCells)(row),
+        owner: ownerText(row.ownerUserId, members),
+        capabilities: capabilitiesText(row.capabilities),
         // No expiry is a fact about the Grant; a blank cell read as "not readable" (OSK-15357).
         expires: row.expiresAt ?? 'never',
-        envKeys: row.credential?.envKeys.length ? row.credential.envKeys.join(', ') : '—',
         referencedBy: row.referencedBy === null
             ? 'unavailable'
-            : `${row.referencedBy.join(', ')}${row.referencesTruncated ? ' (truncated)' : ''}`,
+            : `${row.referencedBy.join(', ') || '—'}${row.referencesTruncated ? ' (truncated)' : ''}`,
     })), [
-        { key: 'id', header: 'ID' },
-        { key: 'label', header: 'LABEL' },
-        { key: 'provider', header: 'PROVIDER' },
-        { key: 'principal', header: 'HELD BY' },
-        { key: 'access', header: 'ACCESS' },
+        { key: 'id', header: 'ID', verbatim: true },
+        ...grants_1.GRANT_TABLE_COLUMNS,
         { key: 'owner', header: 'OWNER' },
-        { key: 'active', header: 'ACTIVE' },
+        { key: 'capabilities', header: 'CAPABILITIES' },
         { key: 'expires', header: 'EXPIRES' },
-        { key: 'envKeys', header: 'ENV NAMES' },
         { key: 'referencedBy', header: 'REFERENCED BY' },
     ], log);
 }
@@ -101,7 +97,7 @@ function printWorkspaceStewardship(report, log) {
     log(`Membership: ${report.membership.status}${report.membership.role ? ` (${report.membership.role})` : ''}${
     // "Absent" is all the report knows: a removed member and an id that never existed read alike (OSK-15356).
     report.membership.status === 'absent'
-        ? ' — not a current member; this report cannot tell a removed member from an id that never existed'
+        ? ' — not a current member; this report cannot tell a removed member from an id that never existed (`skrr workspaces members <workspace-id>` lists current members)'
         : ''}`);
     const isCut = (source) => report.coverage.sources.some((entry) => entry.name === source && entry.truncated);
     const count = (rows, source) => rows === null

package/dist/lib/task-batch.d.ts

@@ -26,6 +26,12 @@ export declare function batchIdempotencyKey(kind: 'create' | 'patch', items: unk
 export type BatchCreateNode = {
     key: string;
     parentKey?: string;
+    /**
+     * Keys of other nodes that block this one. Each blocker must come BEFORE this
+     * node in the list; the batch resolves them to real ids on the server (same
+     * chunk) or from `mapping` (an earlier chunk, or a task that already existed).
+     */
+    blockerKeys?: string[];
     payload: Record<string, unknown>;
 };
 export type BatchCreatedRow = {
@@ -56,13 +62,64 @@ export type BatchCreateOutcome = {
     supported: true;
     rows: BatchCreatedRow[];
     failures: BatchCreateFailure[];
+    /** Requests made to the batch route, retries included. */
+    rounds: number;
+};
+/** What a long create reports between requests (the command decides whether anyone sees it). */
+export type BatchProgress = {
+    /** Nodes confirmed to exist so far, created now or found already there. */
+    confirmed: number;
+    total: number;
+    round: number;
+    elapsedMs: number;
+    /** Set while waiting before the next attempt, with why. */
+    waiting?: {
+        ms: number;
+        reason: string;
+    };
+};
+export type BatchCreateOptions = {
+    onProgress?: (progress: BatchProgress) => void;
+};
+/**
+ * How a create that is not finishing is retried. A seam rather than constants so
+ * a test can run the whole policy without waiting through it.
+ *
+ * Each round that confirms nothing waits the next interval and counts toward the
+ * limit; a round that confirms anything resets it. The total wait is bounded
+ * (about 15 s), on purpose: this is a courtesy to a server that is briefly slow
+ * or rate-limited, not a promise to outlast an outage — past it the command says
+ * what is unknown and how to continue.
+ */
+export declare const batchRetryPolicy: {
+    backoffMs: number[];
+    sleep: (ms: number) => Promise<void>;
 };
 /**
- * Create `nodes` (parents before children) in chunks. `mapping` holds key -> id
- * for nodes that already exist and is extended in place. Stops after the first
- * chunk that reports a failure, as the serial path stopped at its first failure.
+ * Create `nodes` — parents and blockers BEFORE what depends on them — until every
+ * one exists, or say precisely which do not and why.
+ *
+ * One request is a bounded unit of work, not the whole job: the server answers
+ * within a response budget, creating what it can and reporting the rest as not
+ * started (`BATCH_DEADLINE_EXCEEDED`) or still in flight (`pending`). That is a
+ * normal, successful answer, so this loop is what turns it into a finished tree:
+ * submit, record what is confirmed, submit what is left. It used to stop at the
+ * first row the server had not confirmed and hand the person a `--resume` to
+ * type — once per row or two, against a server that confirms a row or two per
+ * request (OSK-S-440 #1, #3, #4).
+ *
+ * The one rule that makes resubmitting safe is the one the server enforces: a
+ * node with a stable `externalKey` can be created once. A submitted write whose
+ * outcome is unknown is therefore READ first (`reconcileSubmittedNodes`), and only
+ * if the key is still absent is the node sent again — where, if the first write
+ * has landed in the meantime, the unique index turns it into `exists`. A node with
+ * no stable key is never resubmitted after an uncertain outcome, because nothing
+ * could tell the second write from a duplicate; that case stops and says so, as
+ * before.
+ *
+ * `mapping` holds key -> id for nodes that already exist and is extended in place.
  */
-export declare function createNodesViaBatch(nodes: BatchCreateNode[], mapping: Record<string, string>): Promise<BatchCreateOutcome>;
+export declare function createNodesViaBatch(nodes: BatchCreateNode[], mapping: Record<string, string>, options?: BatchCreateOptions): Promise<BatchCreateOutcome>;
 export type BatchPatchOutcome = {
     supported: false;
 } | {