@skrr-ai/cli 0.1.104 → 0.1.105

package/dist/node_modules/@skrr-ai/auth-core/dist/cjs/telemetryRedaction.js

@@ -17,10 +17,30 @@
  * and `api/server/services/HostedPreview/__tests__/telemetryRedaction.spec.js` against tokens the issuer really
  * mints, so a change to either side fails there rather than in a trace nobody reads.
  *
+ * THE OTHER PATH CREDENTIALS (OSK-16174). Four more bearer credentials travel in a URL, and until they were added here
+ * only the request logger's path rewrite (`requestLogger.js`) knew them, so the same address that was scrubbed from a
+ * log line reached a trace and an error report in full: a workspace invitation (`wsi_`), a platform invitation
+ * (`pinv_`), a member's invitation link (`usr_`) and an operator's (`adm2_`, and the older `adm_`). Unlike `pvw_`, whose
+ * prefix is rare enough to match on its own, `usr_` and `adm_` begin ordinary words and identifiers (`/usr_local`,
+ * `adm_users`), so each of these is recognised by the SHAPE its minting code gives it, and a lookalike is left alone:
+ *
+ *   wsi_ / pinv_ / usr_ / adm2_   `<prefix>_<32 hex>.<version>.<key id>.<43 base64url>`, from `buildCredential` in
+ *                                 `api/models/WorkspaceInvite.js` and `PlatformInvitation.js` and `buildUserCode` and
+ *                                 `buildAdminCode` in `InvitationCode.js`. The older member link, `usr_<32 hex>.<24
+ *                                 base64url>`, has the same first two fields. Matched from the prefix to the end of the
+ *                                 token's characters once the 32-hex id and its dot are there, so a credential cut off
+ *                                 later in the log line is still redacted whole.
+ *   adm_                          `adm_<43 base64url>`, the older operator code (`generateCode`: 32 random bytes).
+ *                                 Exactly 43 characters, because that is the only length it has.
+ *
+ * `api/server/services/HostedPreview/__tests__/telemetryRedaction.spec.js` mints credentials with the real minting
+ * code and requires every one to come out as the marker, so a change to either side fails there.
+ *
  * WHAT IT DOES NOT. A prefix that is itself percent-encoded (`%70vw_`) is not recognised: nothing in this
- * repository writes one, and a scan that decoded every string first would cost every sink on every record. The
- * request log's own `/[credential]` rewrite (`requestLogger.js`) covers the other credential prefixes and
- * stays as it is.
+ * repository writes one, and a scan that decoded every string first would cost every sink on every record. A
+ * credential cut off before its id is whole (`pinv_0123abc`) is an identifier, not yet the secret, and is left as it
+ * is. The request log's own `/[credential]` rewrite stays as it is, and is looser (any `wsi_`, `pinv_`, `usr_`,
+ * `adm_`, `adm2_` or `pvw_` path segment), because a path segment is a place a credential is known to be.
  *
  * COST. Linear in the input. The only nested repetition is `%(?:25)*XX`, and `XX` is never `25`, so the engine
  * cannot read one run of `25`s two ways; the tests feed it a megabyte of the worst shapes.
@@ -49,11 +69,36 @@ const TOKEN_CHAR = '(?:[A-Za-z0-9._-]|%(?:25)*(?:2[DdEe]|3[0-9]|4[1-9A-Fa-f]|5[0
  * nothing and redacting twice changes nothing.
  */
 const PREVIEW_TOKEN = new RegExp(`pvw(?:_|%(?:25)*5[Ff])${TOKEN_CHAR}+`, 'g');
+/**
+ * A prefix's underscore, which (like the token's own characters) may be written as a percent-escape, once or several
+ * times; and the dot that ends an id.
+ */
+const UNDERSCORE = '(?:_|%(?:25)*5[Ff])';
+const DOT = '(?:\\.|%(?:25)*2[Ee])';
+/**
+ * `wsi`, `pinv`, `usr` or `adm2`, an underscore, and then a lookahead that insists on what the minting code writes
+ * next: 32 lowercase hex characters and the dot that ends them. Everything the credential is made of follows, and the
+ * prefix is captured so the marker can say which kind it was. `usr_<40 hex>`, `usr_00000001` and `/usr_profile` have no
+ * dot after exactly 32 hex characters, so they match nothing.
+ */
+const SIGNED_CREDENTIAL = new RegExp(`(wsi|pinv|usr|adm2)${UNDERSCORE}(?=[0-9a-f]{32}${DOT})${TOKEN_CHAR}+`, 'g');
+/**
+ * The older operator code: `adm_` and exactly 43 base64url characters (32 random bytes), not followed by another one.
+ * A shorter or longer run of letters is a name, not this credential. The characters are the plain alphabet and not
+ * `TOKEN_CHAR`, whose dot would swallow the full stop at the end of a sentence.
+ */
+const LEGACY_OPERATOR_CODE = new RegExp(`(adm)${UNDERSCORE}(?=[A-Za-z0-9_-]{43}(?![A-Za-z0-9_-]))[A-Za-z0-9_-]{43}`, 'g');
+/** Cheap test before any of the expressions: a string with none of these cannot hold a credential. */
+const CREDENTIAL_HINTS = ['pvw', 'wsi', 'pinv', 'usr', 'adm'];
+const credentialMarker = (_match, prefix) => `${prefix}_[redacted]`;
 function redactPreviewTokens(value) {
-    if (typeof value !== 'string' || value.indexOf('pvw') === -1) {
+    if (typeof value !== 'string' || !CREDENTIAL_HINTS.some((hint) => value.indexOf(hint) !== -1)) {
         return value;
     }
-    return value.replace(PREVIEW_TOKEN, exports.PREVIEW_TOKEN_REDACTION);
+    return value
+        .replace(PREVIEW_TOKEN, exports.PREVIEW_TOKEN_REDACTION)
+        .replace(SIGNED_CREDENTIAL, credentialMarker)
+        .replace(LEGACY_OPERATOR_CODE, credentialMarker);
 }
 const DEFAULT_MAX_NODES = 50_000;
 const DEFAULT_MAX_DEPTH = 32;

package/dist/node_modules/@skrr-ai/auth-core/dist/esm/cliHandoffWire.d.ts

@@ -133,3 +133,36 @@ export declare function parseCliHandoffDpopProofResponse(value: unknown): CliHan
 export declare const DELEGATED_AGENT_CLI_ID_PREFIX = "oversky-daemon-agent-cli-";
 export declare const WORKLOAD_CLI_ID_PREFIX = "oversky-daemon-workload-cli-";
 export declare function classifyCliFamilyId(id: unknown): 'agent' | 'workload' | 'person';
+/**
+ * Who keeps a daemon running, which decides how it is signed in again.
+ *  - `desktop`: the Skrr desktop app hosts it (Electron-as-Node under the
+ *    app's LaunchAgent). The app mints the daemon's credential itself at
+ *    `POST /api/daemons/token`, with a device proof, on every start of its
+ *    daemon client (OSK-15990), so reopening the app IS the sign-in. Neither
+ *    login command repairs it: `skrr daemon login` refuses an Electron-hosted
+ *    daemon (its program is the app, not a `skrrd`), and a `skrrd` on PATH is
+ *    usually not installed, or is a different build from the one running.
+ *  - `service`: `skrrd install` (launchd/systemd/schtasks) or a hand start;
+ *    `skrrd login` for that profile, server and working directory is the fix.
+ */
+export type DaemonSupervisor = 'desktop' | 'service';
+/**
+ * The ONE sentence for "only a new daemon sign-in repairs this hand-off
+ * refusal" (OSK-16216). The daemon fills it in with what it knows about
+ * itself and sends it as the loopback 503's `remedy`; the CLI uses it, with
+ * nothing filled in, when an older daemon sent none. Before this the two were
+ * written separately and disagreed — the CLI said `skrr daemon login`, the
+ * daemon said `skrrd --profile … login` — and neither was right for a daemon
+ * the desktop app runs.
+ *
+ * Returned without a leading capital or trailing period so callers can put it
+ * after "Fix: " or "— ".
+ */
+export declare function daemonSignInRemedy(opts?: {
+    /** How the daemon is run; absent when the caller cannot tell. */
+    supervisor?: DaemonSupervisor;
+    /** The exact `skrrd … login` for this profile, when the daemon knows it. */
+    loginCommand?: string;
+    /** The refusal was DEVICE_PROOF_PIN_MISMATCH: say that a sign-in re-pins. */
+    repinsDeviceKey?: boolean;
+}): string;

package/dist/node_modules/@skrr-ai/auth-core/dist/esm/cliHandoffWire.js

@@ -145,3 +145,29 @@ export function classifyCliFamilyId(id) {
         return 'workload';
     return 'person';
 }
+/**
+ * The ONE sentence for "only a new daemon sign-in repairs this hand-off
+ * refusal" (OSK-16216). The daemon fills it in with what it knows about
+ * itself and sends it as the loopback 503's `remedy`; the CLI uses it, with
+ * nothing filled in, when an older daemon sent none. Before this the two were
+ * written separately and disagreed — the CLI said `skrr daemon login`, the
+ * daemon said `skrrd --profile … login` — and neither was right for a daemon
+ * the desktop app runs.
+ *
+ * Returned without a leading capital or trailing period so callers can put it
+ * after "Fix: " or "— ".
+ */
+export function daemonSignInRemedy(opts = {}) {
+    const repin = opts.repinsDeviceKey === true;
+    if (opts.supervisor === 'desktop') {
+        return ('quit and reopen the Skrr desktop app on the machine running the daemon (install its update ' +
+            `first if one is offered): the app signs its daemon in again on start${repin ? ' and re-pins the device key' : ''}`);
+    }
+    if (opts.supervisor === 'service') {
+        const login = opts.loginCommand ? `\`${opts.loginCommand}\`` : '`skrr daemon login`';
+        return `run ${login}${repin ? ' — an interactive login re-pins the device key' : ''}`;
+    }
+    return ('sign the daemon in again on the machine running it: if the Skrr desktop app runs it, quit ' +
+        'and reopen the app; otherwise run `skrr daemon login`' +
+        (repin ? ' (either one re-pins the device key)' : ''));
+}

package/dist/node_modules/@skrr-ai/auth-core/dist/esm/telemetryRedaction.d.ts

@@ -16,10 +16,30 @@
  * and `api/server/services/HostedPreview/__tests__/telemetryRedaction.spec.js` against tokens the issuer really
  * mints, so a change to either side fails there rather than in a trace nobody reads.
  *
+ * THE OTHER PATH CREDENTIALS (OSK-16174). Four more bearer credentials travel in a URL, and until they were added here
+ * only the request logger's path rewrite (`requestLogger.js`) knew them, so the same address that was scrubbed from a
+ * log line reached a trace and an error report in full: a workspace invitation (`wsi_`), a platform invitation
+ * (`pinv_`), a member's invitation link (`usr_`) and an operator's (`adm2_`, and the older `adm_`). Unlike `pvw_`, whose
+ * prefix is rare enough to match on its own, `usr_` and `adm_` begin ordinary words and identifiers (`/usr_local`,
+ * `adm_users`), so each of these is recognised by the SHAPE its minting code gives it, and a lookalike is left alone:
+ *
+ *   wsi_ / pinv_ / usr_ / adm2_   `<prefix>_<32 hex>.<version>.<key id>.<43 base64url>`, from `buildCredential` in
+ *                                 `api/models/WorkspaceInvite.js` and `PlatformInvitation.js` and `buildUserCode` and
+ *                                 `buildAdminCode` in `InvitationCode.js`. The older member link, `usr_<32 hex>.<24
+ *                                 base64url>`, has the same first two fields. Matched from the prefix to the end of the
+ *                                 token's characters once the 32-hex id and its dot are there, so a credential cut off
+ *                                 later in the log line is still redacted whole.
+ *   adm_                          `adm_<43 base64url>`, the older operator code (`generateCode`: 32 random bytes).
+ *                                 Exactly 43 characters, because that is the only length it has.
+ *
+ * `api/server/services/HostedPreview/__tests__/telemetryRedaction.spec.js` mints credentials with the real minting
+ * code and requires every one to come out as the marker, so a change to either side fails there.
+ *
  * WHAT IT DOES NOT. A prefix that is itself percent-encoded (`%70vw_`) is not recognised: nothing in this
- * repository writes one, and a scan that decoded every string first would cost every sink on every record. The
- * request log's own `/[credential]` rewrite (`requestLogger.js`) covers the other credential prefixes and
- * stays as it is.
+ * repository writes one, and a scan that decoded every string first would cost every sink on every record. A
+ * credential cut off before its id is whole (`pinv_0123abc`) is an identifier, not yet the secret, and is left as it
+ * is. The request log's own `/[credential]` rewrite stays as it is, and is looser (any `wsi_`, `pinv_`, `usr_`,
+ * `adm_`, `adm2_` or `pvw_` path segment), because a path segment is a place a credential is known to be.
  *
  * COST. Linear in the input. The only nested repetition is `%(?:25)*XX`, and `XX` is never `25`, so the engine
  * cannot read one run of `25`s two ways; the tests feed it a megabyte of the worst shapes.
@@ -31,8 +51,11 @@
 /** What replaces a token. Fixed, so a trace can say a preview was involved but not which one. */
 export declare const PREVIEW_TOKEN_REDACTION: "pvw_[redacted]";
 /**
- * Replace every preview token in a string with {@link PREVIEW_TOKEN_REDACTION}. The rest of the string is
- * untouched, so a trace is still readable. Anything that is not a string comes back as it came.
+ * Replace every credential that travels in a URL with a marker: a Hosted Machine preview token with
+ * {@link PREVIEW_TOKEN_REDACTION}, and a workspace invitation, platform invitation, member link or operator code with
+ * its own prefix and `_[redacted]`. The rest of the string is untouched, so a trace is still readable. Anything
+ * that is not a string comes back as it came. (The name is the preview token's, which this began as; the sinks
+ * and the boundary specs import it by that name.)
  */
 export declare function redactPreviewTokens(value: string): string;
 export declare function redactPreviewTokens<T>(value: T): T;

package/dist/node_modules/@skrr-ai/auth-core/dist/esm/telemetryRedaction.js

@@ -16,10 +16,30 @@
  * and `api/server/services/HostedPreview/__tests__/telemetryRedaction.spec.js` against tokens the issuer really
  * mints, so a change to either side fails there rather than in a trace nobody reads.
  *
+ * THE OTHER PATH CREDENTIALS (OSK-16174). Four more bearer credentials travel in a URL, and until they were added here
+ * only the request logger's path rewrite (`requestLogger.js`) knew them, so the same address that was scrubbed from a
+ * log line reached a trace and an error report in full: a workspace invitation (`wsi_`), a platform invitation
+ * (`pinv_`), a member's invitation link (`usr_`) and an operator's (`adm2_`, and the older `adm_`). Unlike `pvw_`, whose
+ * prefix is rare enough to match on its own, `usr_` and `adm_` begin ordinary words and identifiers (`/usr_local`,
+ * `adm_users`), so each of these is recognised by the SHAPE its minting code gives it, and a lookalike is left alone:
+ *
+ *   wsi_ / pinv_ / usr_ / adm2_   `<prefix>_<32 hex>.<version>.<key id>.<43 base64url>`, from `buildCredential` in
+ *                                 `api/models/WorkspaceInvite.js` and `PlatformInvitation.js` and `buildUserCode` and
+ *                                 `buildAdminCode` in `InvitationCode.js`. The older member link, `usr_<32 hex>.<24
+ *                                 base64url>`, has the same first two fields. Matched from the prefix to the end of the
+ *                                 token's characters once the 32-hex id and its dot are there, so a credential cut off
+ *                                 later in the log line is still redacted whole.
+ *   adm_                          `adm_<43 base64url>`, the older operator code (`generateCode`: 32 random bytes).
+ *                                 Exactly 43 characters, because that is the only length it has.
+ *
+ * `api/server/services/HostedPreview/__tests__/telemetryRedaction.spec.js` mints credentials with the real minting
+ * code and requires every one to come out as the marker, so a change to either side fails there.
+ *
  * WHAT IT DOES NOT. A prefix that is itself percent-encoded (`%70vw_`) is not recognised: nothing in this
- * repository writes one, and a scan that decoded every string first would cost every sink on every record. The
- * request log's own `/[credential]` rewrite (`requestLogger.js`) covers the other credential prefixes and
- * stays as it is.
+ * repository writes one, and a scan that decoded every string first would cost every sink on every record. A
+ * credential cut off before its id is whole (`pinv_0123abc`) is an identifier, not yet the secret, and is left as it
+ * is. The request log's own `/[credential]` rewrite stays as it is, and is looser (any `wsi_`, `pinv_`, `usr_`,
+ * `adm_`, `adm2_` or `pvw_` path segment), because a path segment is a place a credential is known to be.
  *
  * COST. Linear in the input. The only nested repetition is `%(?:25)*XX`, and `XX` is never `25`, so the engine
  * cannot read one run of `25`s two ways; the tests feed it a megabyte of the worst shapes.
@@ -43,11 +63,36 @@ const TOKEN_CHAR = '(?:[A-Za-z0-9._-]|%(?:25)*(?:2[DdEe]|3[0-9]|4[1-9A-Fa-f]|5[0
  * nothing and redacting twice changes nothing.
  */
 const PREVIEW_TOKEN = new RegExp(`pvw(?:_|%(?:25)*5[Ff])${TOKEN_CHAR}+`, 'g');
+/**
+ * A prefix's underscore, which (like the token's own characters) may be written as a percent-escape, once or several
+ * times; and the dot that ends an id.
+ */
+const UNDERSCORE = '(?:_|%(?:25)*5[Ff])';
+const DOT = '(?:\\.|%(?:25)*2[Ee])';
+/**
+ * `wsi`, `pinv`, `usr` or `adm2`, an underscore, and then a lookahead that insists on what the minting code writes
+ * next: 32 lowercase hex characters and the dot that ends them. Everything the credential is made of follows, and the
+ * prefix is captured so the marker can say which kind it was. `usr_<40 hex>`, `usr_00000001` and `/usr_profile` have no
+ * dot after exactly 32 hex characters, so they match nothing.
+ */
+const SIGNED_CREDENTIAL = new RegExp(`(wsi|pinv|usr|adm2)${UNDERSCORE}(?=[0-9a-f]{32}${DOT})${TOKEN_CHAR}+`, 'g');
+/**
+ * The older operator code: `adm_` and exactly 43 base64url characters (32 random bytes), not followed by another one.
+ * A shorter or longer run of letters is a name, not this credential. The characters are the plain alphabet and not
+ * `TOKEN_CHAR`, whose dot would swallow the full stop at the end of a sentence.
+ */
+const LEGACY_OPERATOR_CODE = new RegExp(`(adm)${UNDERSCORE}(?=[A-Za-z0-9_-]{43}(?![A-Za-z0-9_-]))[A-Za-z0-9_-]{43}`, 'g');
+/** Cheap test before any of the expressions: a string with none of these cannot hold a credential. */
+const CREDENTIAL_HINTS = ['pvw', 'wsi', 'pinv', 'usr', 'adm'];
+const credentialMarker = (_match, prefix) => `${prefix}_[redacted]`;
 export function redactPreviewTokens(value) {
-    if (typeof value !== 'string' || value.indexOf('pvw') === -1) {
+    if (typeof value !== 'string' || !CREDENTIAL_HINTS.some((hint) => value.indexOf(hint) !== -1)) {
         return value;
     }
-    return value.replace(PREVIEW_TOKEN, PREVIEW_TOKEN_REDACTION);
+    return value
+        .replace(PREVIEW_TOKEN, PREVIEW_TOKEN_REDACTION)
+        .replace(SIGNED_CREDENTIAL, credentialMarker)
+        .replace(LEGACY_OPERATOR_CODE, credentialMarker);
 }
 const DEFAULT_MAX_NODES = 50_000;
 const DEFAULT_MAX_DEPTH = 32;

package/dist/node_modules/@skrr-ai/auth-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skrr-ai/auth-core",
-  "version": "0.4.23",
+  "version": "0.4.25",
   "main": "dist/cjs/index.js",
   "types": "dist/esm/index.d.ts",
   "exports": {