@songsid/agend 2.2.0-beta.1 → 2.2.0-beta.10

package/dist/update-preflight.d.ts

@@ -0,0 +1,100 @@
+export interface RuntimeHost {
+    platform: string;
+    arch: string;
+    id: string;
+    glibc: string | null;
+    darwinRelease: string | null;
+}
+export interface RuntimePlatform {
+    hostPlatform(probe?: Partial<RuntimeHost>): RuntimeHost;
+    runtimeSupport(host: RuntimeHost): {
+        supported: boolean;
+        reason: string | null;
+    };
+}
+/** The one answer to "can this host run AgEnD's bundled Node?", shared with preinstall, postinstall and the launcher. */
+export declare const runtimePlatform: RuntimePlatform;
+/** What the release about to be installed asks for: its Node range, and the runtime it pins per host id. */
+export interface TargetManifest {
+    version: string;
+    engines: string | null;
+    runtimePins: Record<string, string>;
+}
+/** The npm arguments that read a release's requirements; the caller runs them with the npm that installs it. */
+export declare function manifestQuery(spec: string): string[];
+/**
+ * The target's own requirements, read by `read` — which runs `npm <manifestQuery(spec)>` with the npm, environment and
+ * registry the install uses and returns its stdout, or null when it fails. The spec must be the one npm installs, and
+ * it must name the exact version (`@songsid/agend@<version>`); the answer must be that version. Otherwise: null.
+ */
+export declare function lookupTargetManifest(spec: string, version: string, read: (args: string[]) => string | null): TargetManifest | null;
+/** The Node the release would run on when its bundled runtime does not apply. */
+export type SystemNode = {
+    kind: "version";
+    version: string;
+    path?: string | null;
+    label: string;
+} | {
+    kind: "none";
+} | {
+    kind: "unknown";
+    note: string;
+};
+export type UpdateTargetVerdict = {
+    kind: "runtime";
+    host: string;
+    pin: string;
+} | {
+    kind: "system";
+    node: string;
+    label: string;
+} | {
+    kind: "refuse";
+    message: string;
+    summary: string;
+} | {
+    kind: "unknown";
+    note: string;
+};
+/** Which Node the target will run on here, and whether that Node satisfies the target's engines. */
+export declare function evaluateUpdateTarget(input: {
+    manifest: TargetManifest | null;
+    host: RuntimeHost;
+    platform?: RuntimePlatform;
+    system: SystemNode;
+}): UpdateTargetVerdict;
+/** Where the update runs its commands: the install environment (`run`) and the npm binary the install invokes. */
+export interface PreflightEnv {
+    run(argv: string[], timeoutMs: number): {
+        status: number | null;
+        stdout: string;
+    };
+    npm: string;
+}
+/** The version and path of the `node` the environment resolves; exit 127 when there is none. */
+export declare const NODE_PROBE_SCRIPT = "command -v node >/dev/null 2>&1 || exit 127; exec node -p \"process.versions.node + ' ' + process.execPath\"";
+/** The Node the release's `#!/usr/bin/env node` resolves to in `env` (`label` names it in messages). */
+export declare function probeSystemNode(env: PreflightEnv, label: string): SystemNode;
+/**
+ * The whole check, run where the install runs: the requirements of `spec` (which must be `@songsid/agend@<version>`)
+ * from `env.npm`, and the Node `env` resolves — both read the way the install that follows reads them.
+ */
+export declare function preflightUpdate(env: PreflightEnv, spec: string, version: string, label: string, host?: RuntimeHost): UpdateTargetVerdict;
+/**
+ * The check an nvm install runs once nvm has selected its Node 22 (UpdateInstallPlan.preflight): on that Node, with that
+ * Node's npm. A refusal is printed in full and returned as the update's outcome; unknown is a note and the install goes on.
+ */
+export declare function installPreflight(spec: string, version: string, label: string, out: {
+    log(message: string): void;
+    error(message: string): void;
+}, host?: RuntimeHost): (env: PreflightEnv) => {
+    ok: true;
+} | {
+    ok: false;
+    message: string;
+};
+/**
+ * Does Node `version` (stable x.y.z) satisfy npm range `range`? true/false as semver would answer, or null when the
+ * version or the range is outside what this parser reads exactly.
+ */
+export declare function satisfiesNodeRange(version: string, range: string): boolean | null;

package/dist/update-preflight.js

@@ -0,0 +1,264 @@
+/**
+ * #1441 part B: before `agend update` installs a release, decide whether that release can run on this host — on the
+ * Node it will actually run on. That is the target's bundled runtime where the target pins one for this host and the
+ * host can run it (#1450: then the system Node does not matter), and otherwise the system Node: the `node` on PATH for a
+ * direct install, or the exact Node 22 nvm selected for an nvm install. Which host can run the bundled runtime comes from
+ * the helper the preinstall guard, the postinstall and the launcher share (launcher/runtime-platform.cjs).
+ *
+ * Design baseline: #1441 issuecomment-6108441160. Every input to a definite verdict is read from what the install will
+ * actually run (#1623 review): the release's requirements from the npm that installs it, for the exact spec it
+ * installs, and the Node version from the interpreter the release will start on. Anything that cannot be read or
+ * proven — an unreadable requirement, a range this parser does not understand, a Node not chosen yet — is "unknown":
+ * never "compatible" and never invented into a refusal. The update then goes on, and the target's own preinstall guard
+ * still refuses inside npm (the previous package stays).
+ */
+import { createRequire } from "node:module";
+const require = createRequire(import.meta.url);
+/** The one answer to "can this host run AgEnD's bundled Node?", shared with preinstall, postinstall and the launcher. */
+export const runtimePlatform = require("../launcher/runtime-platform.cjs");
+/** A published package version (semver 2.0, no leading zeros). */
+const PACKAGE_VERSION = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$/;
+/** A runtime pin as the launcher and postinstall accept it (launcher/runtime-select.cjs): Node x.y.z, optionally -agend.N. */
+const RUNTIME_PIN = /^(\d+\.\d+\.\d+)(-agend\.\d+)?$/;
+/** The npm arguments that read a release's requirements; the caller runs them with the npm that installs it. */
+export function manifestQuery(spec) {
+    return ["view", spec, "version", "engines", "optionalDependencies", "--json"];
+}
+/**
+ * The target's own requirements, read by `read` — which runs `npm <manifestQuery(spec)>` with the npm, environment and
+ * registry the install uses and returns its stdout, or null when it fails. The spec must be the one npm installs, and
+ * it must name the exact version (`@songsid/agend@<version>`); the answer must be that version. Otherwise: null.
+ */
+export function lookupTargetManifest(spec, version, read) {
+    if (!PACKAGE_VERSION.test(version) || spec !== `@songsid/agend@${version}`)
+        return null;
+    const raw = read(manifestQuery(spec));
+    if (raw === null)
+        return null;
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch {
+        return null;
+    }
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+        return null;
+    const m = parsed;
+    // The registry answered for another version (or with something that is not one): it says nothing about this one.
+    if (typeof m.version !== "string" || m.version !== version)
+        return null;
+    const engines = m.engines && typeof m.engines === "object" && typeof m.engines.node === "string"
+        ? m.engines.node : null;
+    const runtimePins = Object.create(null);
+    if (m.optionalDependencies && typeof m.optionalDependencies === "object") {
+        for (const [name, pin] of Object.entries(m.optionalDependencies)) {
+            const id = /^@songsid\/agend-node-(.+)$/.exec(name)?.[1];
+            if (id && typeof pin === "string")
+                runtimePins[id] = pin;
+        }
+    }
+    return { version: m.version, engines, runtimePins };
+}
+const UNREADABLE = "  Note: the release's Node requirements could not be read; its own install check still applies (a refusal there keeps this version installed).";
+const unparsed = (range) => `  Note: the release asks for Node ${range}, which this check cannot evaluate; its own install check still applies (a refusal there keeps this version installed).`;
+/** Which Node the target will run on here, and whether that Node satisfies the target's engines. */
+export function evaluateUpdateTarget(input) {
+    const p = input.platform ?? runtimePlatform;
+    const m = input.manifest;
+    if (!m || !m.engines)
+        return { kind: "unknown", note: UNREADABLE };
+    const pin = Object.prototype.hasOwnProperty.call(m.runtimePins, input.host.id) ? m.runtimePins[input.host.id] : null;
+    const support = p.runtimeSupport(input.host);
+    if (pin && support.supported) {
+        // The pin keeps its identity (22.23.3-agend.1); the Node it installs is the one judged (postinstall: 22.23.3).
+        const node = RUNTIME_PIN.exec(pin)?.[1];
+        if (!node)
+            return { kind: "unknown", note: `  Note: the release pins its bundled Node as ${JSON.stringify(pin)}, which this check cannot read; its own install check still applies.` };
+        const fits = satisfiesNodeRange(node, m.engines);
+        if (fits === null)
+            return { kind: "unknown", note: unparsed(m.engines) };
+        if (fits)
+            return { kind: "runtime", host: input.host.id, pin };
+        const summary = `v${m.version} pins Node ${pin} for ${input.host.id}, which is outside its own range ${m.engines}`;
+        return { kind: "refuse", summary, message: refusal(m, `${summary}.`, false) };
+    }
+    const why = !pin ? `v${m.version} ships no bundled Node for ${input.host.id}` : `this host cannot use AgEnD's bundled Node: ${support.reason}`;
+    const s = input.system;
+    if (s.kind === "unknown")
+        return { kind: "unknown", note: s.note };
+    if (s.kind === "version") {
+        const fits = satisfiesNodeRange(s.version, m.engines);
+        if (fits === null)
+            return { kind: "unknown", note: unparsed(m.engines) };
+        if (fits)
+            return { kind: "system", node: s.version, label: s.label };
+    }
+    const runsOn = s.kind === "none" ? "there is no usable `node` on PATH" : `it would run on ${s.label} (Node ${s.version}${s.path ? `, ${s.path}` : ""})`;
+    const summary = `v${m.version} needs Node ${m.engines}; ${why}, and ${runsOn}`;
+    return { kind: "refuse", summary, message: refusal(m, `${why}, and ${runsOn}.`, true) };
+}
+/** The version and path of the `node` the environment resolves; exit 127 when there is none. */
+export const NODE_PROBE_SCRIPT = `command -v node >/dev/null 2>&1 || exit 127; exec node -p "process.versions.node + ' ' + process.execPath"`;
+/** The Node the release's `#!/usr/bin/env node` resolves to in `env` (`label` names it in messages). */
+export function probeSystemNode(env, label) {
+    const r = env.run(["sh", "-c", NODE_PROBE_SCRIPT], 10_000);
+    if (r.status === 127)
+        return { kind: "none" };
+    const m = r.status === 0 ? /^(\d+\.\d+\.\d+) (\/.*)$/.exec(r.stdout.trim().split("\n").pop()?.trim() ?? "") : null;
+    if (!m)
+        return { kind: "unknown", note: `  Note: could not read the version of ${label}; the release's own install check still applies (a refusal there keeps this version installed).` };
+    return { kind: "version", version: m[1], path: m[2], label };
+}
+/**
+ * The whole check, run where the install runs: the requirements of `spec` (which must be `@songsid/agend@<version>`)
+ * from `env.npm`, and the Node `env` resolves — both read the way the install that follows reads them.
+ */
+export function preflightUpdate(env, spec, version, label, host = runtimePlatform.hostPlatform()) {
+    const manifest = lookupTargetManifest(spec, version, args => {
+        const r = env.run([env.npm, ...args], 15_000);
+        return r.status === 0 ? r.stdout : null;
+    });
+    if (!manifest)
+        return { kind: "unknown", note: UNREADABLE };
+    return evaluateUpdateTarget({ manifest, host, system: probeSystemNode(env, label) });
+}
+/**
+ * The check an nvm install runs once nvm has selected its Node 22 (UpdateInstallPlan.preflight): on that Node, with that
+ * Node's npm. A refusal is printed in full and returned as the update's outcome; unknown is a note and the install goes on.
+ */
+export function installPreflight(spec, version, label, out, host) {
+    return (env) => {
+        const verdict = preflightUpdate(env, spec, version, label, host);
+        if (verdict.kind === "unknown")
+            out.log(verdict.note);
+        if (verdict.kind !== "refuse")
+            return { ok: true };
+        out.error(`\n${verdict.message}\n`);
+        return { ok: false, message: `  Not updated: ${verdict.summary}. The installed AgEnD was not changed.` };
+    };
+}
+function refusal(m, why, installable) {
+    return [
+        `  ✗ AgEnD v${m.version} cannot run on this host's Node — AgEnD was not changed.`,
+        "",
+        `    v${m.version} needs Node ${m.engines}.`,
+        `    ${why}`,
+        "",
+        installable
+            ? `    Install a Node that satisfies ${m.engines} and put it first on PATH, then run: agend update`
+            : "    This release cannot be installed here; wait for the next one.",
+    ].join("\n");
+}
+const NUM = "(?:0|[1-9]\\d*)";
+const PART = `(?:${NUM}|[xX*])`;
+const PARTIAL = new RegExp(`^v?(${PART})(?:\\.(${PART})(?:\\.(${PART}))?)?$`);
+/** Matches nothing: no stable version is below 0.0.0. */
+const NEVER = [{ op: "<", v: [0, 0, 0] }];
+/** `[major, minor, patch]` with null for a wildcard or missing part; null when it is not a partial version. */
+function partial(text) {
+    const m = PARTIAL.exec(text);
+    if (!m)
+        return null;
+    const parts = [m[1], m[2], m[3]].map(x => (x === undefined || /^[xX*]$/.test(x) ? null : Number(x)));
+    // `1.x.3`: a number after a wildcard is not something this check guesses at.
+    for (let i = 1; i < 3; i++)
+        if (parts[i] !== null && parts[i - 1] === null)
+            return null;
+    return parts;
+}
+function comparators(op, text) {
+    const pv = partial(text);
+    if (!pv)
+        return null;
+    const [M, m, pt] = pv;
+    if (M === null)
+        return op === "<" || op === ">" ? NEVER : [];
+    const lo = [M, m ?? 0, pt ?? 0];
+    const nextMajor = [M + 1, 0, 0];
+    const next = m === null ? nextMajor : pt === null ? [M, m + 1, 0] : [M, m, pt];
+    switch (op) {
+        case "":
+        case "=":
+            return m === null || pt === null ? [{ op: ">=", v: lo }, { op: "<", v: next }] : [{ op: ">=", v: lo }, { op: "<=", v: lo }];
+        case ">": return m === null || pt === null ? [{ op: ">=", v: next }] : [{ op: ">", v: lo }];
+        case ">=": return [{ op: ">=", v: lo }];
+        case "<": return [{ op: "<", v: lo }];
+        case "<=": return m === null || pt === null ? [{ op: "<", v: next }] : [{ op: "<=", v: lo }];
+        case "~": return [{ op: ">=", v: lo }, { op: "<", v: m === null ? nextMajor : [M, m + 1, 0] }];
+        case "^": {
+            if (m === null)
+                return [{ op: ">=", v: lo }, { op: "<", v: nextMajor }];
+            const upper = M > 0 ? nextMajor : pt === null || m > 0 ? [0, m + 1, 0] : [0, 0, pt + 1];
+            return [{ op: ">=", v: lo }, { op: "<", v: upper }];
+        }
+        default: return null;
+    }
+}
+function hyphen(from, to) {
+    const a = partial(from), b = partial(to);
+    if (!a || !b)
+        return null;
+    const out = [];
+    if (a[0] !== null)
+        out.push({ op: ">=", v: [a[0], a[1] ?? 0, a[2] ?? 0] });
+    if (b[0] !== null) {
+        if (b[1] === null)
+            out.push({ op: "<", v: [b[0] + 1, 0, 0] });
+        else if (b[2] === null)
+            out.push({ op: "<", v: [b[0], b[1] + 1, 0] });
+        else
+            out.push({ op: "<=", v: [b[0], b[1], b[2]] });
+    }
+    return out;
+}
+function compare(a, b) {
+    return a[0] - b[0] || a[1] - b[1] || a[2] - b[2];
+}
+/**
+ * Does Node `version` (stable x.y.z) satisfy npm range `range`? true/false as semver would answer, or null when the
+ * version or the range is outside what this parser reads exactly.
+ */
+export function satisfiesNodeRange(version, range) {
+    const vm = /^v?(\d+)\.(\d+)\.(\d+)$/.exec(version.trim());
+    if (!vm)
+        return null;
+    const v = [Number(vm[1]), Number(vm[2]), Number(vm[3])];
+    if (v.some(n => !Number.isSafeInteger(n)))
+        return null;
+    const alternatives = range.trim().split("||").map(a => a.trim());
+    if (alternatives.length === 1 && alternatives[0] === "")
+        return true;
+    let any = false;
+    for (const alt of alternatives) {
+        if (alt === "")
+            return null;
+        let set;
+        const h = /^(\S+)\s+-\s+(\S+)$/.exec(alt);
+        if (h)
+            set = hyphen(h[1], h[2]);
+        else {
+            set = [];
+            for (const token of alt.replace(/(<=|>=|<|>|=|~|\^)\s+/g, "$1").split(/\s+/)) {
+                const t = /^(<=|>=|<|>|=|~|\^)?(.*)$/.exec(token);
+                const c = comparators(t[1] ?? "", t[2]);
+                if (!c) {
+                    set = null;
+                    break;
+                }
+                set.push(...c);
+            }
+        }
+        // semver refuses any version part above Number.MAX_SAFE_INTEGER — written, or produced by expanding x/~/^/hyphen
+        // upper bounds (`^9007199254740991` → <9007199254740992.0.0) — so such a range has no npm meaning: cannot tell.
+        if (!set || set.some(c => c.v.some(n => !Number.isSafeInteger(n))))
+            return null;
+        if (set.every(c => {
+            const d = compare(v, c.v);
+            return c.op === "<" ? d < 0 : c.op === "<=" ? d <= 0 : c.op === ">" ? d > 0 : d >= 0;
+        }))
+            any = true;
+    }
+    return any;
+}
+//# sourceMappingURL=update-preflight.js.map

package/dist/update-preflight.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-preflight.js","sourceRoot":"","sources":["../src/update-preflight.ts"],"names":[],"mappings":"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"}

package/dist/updater-caller.d.ts

@@ -0,0 +1,31 @@
+/** How far up the process tree the updater may be: updater → (bash for nvm) → launcher sh/exec → this process. */
+export declare const UPDATER_ANCESTOR_DEPTH = 3;
+export interface UpdaterCallerProbe {
+    now(): number;
+    /** mtime of update-in-progress.json, or null when it is absent or unreadable. */
+    markerMtimeMs(): number | null;
+    /** Its parsed content, or null. */
+    marker(): {
+        pid?: unknown;
+        progress?: {
+            version?: unknown;
+        };
+        [field: string]: unknown;
+    } | null;
+    /** The parent pid of `pid`, or null when it cannot be read. */
+    parentOf(pid: number): number | null;
+    alive(pid: number): boolean;
+    /** When `pid` started (ms since the epoch), or null. */
+    startMs(pid: number): number | null;
+    selfPid: number;
+    selfVersion: string;
+}
+export type UpdaterCallerVerdict = {
+    updater: true;
+    pid: number;
+} | {
+    updater: false;
+    reason: string;
+};
+export declare function startedByUpdater(p: UpdaterCallerProbe): UpdaterCallerVerdict;
+export declare function systemUpdaterCallerProbe(dataDir: string, selfVersion: string): UpdaterCallerProbe;

package/dist/updater-caller.js

@@ -0,0 +1,109 @@
+/**
+ * #1631 part B: is this `agend install --no-activate` the activation refresh of an `agend update` in flight — the
+ * updater of an OLDER version (2.2.0-beta.1 and before), which still refreshes a hand-started fleet's service and so
+ * would create a unit or plist where none existed? Then the install writes nothing (see the install command).
+ *
+ * The answer is "yes" only when it is certain; any doubt or failed probe is "no", and a manual install creates the
+ * service as always. Certain means all of:
+ * - update-in-progress.json is readable and fresh: its mtime is within the update marker's own budget
+ *   (UPDATE_MARKER_MAX_AGE_MS), never in the future — a marker left by a crashed update does not count;
+ * - its pid (markUpdateInProgress writes the updater's own pid) is alive, is this process's parent, grandparent or
+ *   great-grandparent (an nvm install adds a `bash` layer), and started no later than the marker was written — a
+ *   reused pid started after it;
+ * - if the marker records a target version, it is the version doing the install.
+ */
+import { execFileSync } from "node:child_process";
+import { readFileSync, statSync } from "node:fs";
+import { join } from "node:path";
+import { UPDATE_MARKER_MAX_AGE_MS } from "./update-marker.js";
+import { processStartMs } from "./update-check.js";
+/** How far up the process tree the updater may be: updater → (bash for nvm) → launcher sh/exec → this process. */
+export const UPDATER_ANCESTOR_DEPTH = 3;
+/** `ps -o lstart=` has one-second resolution. */
+const START_SLACK_MS = 1_000;
+export function startedByUpdater(p) {
+    const no = (reason) => ({ updater: false, reason });
+    const mtime = p.markerMtimeMs();
+    if (mtime === null)
+        return no("no update marker");
+    const age = p.now() - mtime;
+    if (!(age >= 0 && age < UPDATE_MARKER_MAX_AGE_MS))
+        return no("the update marker is not fresh");
+    const marker = p.marker();
+    const pid = marker?.pid;
+    if (typeof pid !== "number" || !Number.isInteger(pid) || pid <= 1)
+        return no("the update marker names no updater pid");
+    const version = marker?.progress?.version;
+    if (version !== undefined && version !== p.selfVersion)
+        return no("the update marker names another version");
+    if (!p.alive(pid))
+        return no("the marker's updater is not running");
+    let at = p.selfPid;
+    let found = false;
+    for (let depth = 0; depth < UPDATER_ANCESTOR_DEPTH; depth++) {
+        const parent = p.parentOf(at);
+        if (parent === null || parent <= 1 || parent === at)
+            break;
+        if (parent === pid) {
+            found = true;
+            break;
+        }
+        at = parent;
+    }
+    if (!found)
+        return no("the marker's updater is not an ancestor of this process");
+    const started = p.startMs(pid);
+    if (started === null || started > mtime + START_SLACK_MS)
+        return no("the marker's pid started after the marker was written (reused)");
+    return { updater: true, pid };
+}
+/** Parent pid: /proc on Linux, `ps -o ppid=` elsewhere (macOS). */
+function parentOf(pid) {
+    try {
+        if (process.platform === "linux") {
+            const stat = readFileSync(`/proc/${pid}/stat`, "utf8");
+            const rest = stat.slice(stat.lastIndexOf(")") + 2).split(" ");
+            const ppid = Number.parseInt(rest[1] ?? "", 10);
+            return Number.isInteger(ppid) ? ppid : null;
+        }
+        const out = execFileSync("ps", ["-o", "ppid=", "-p", String(pid)], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5_000 }).trim();
+        const ppid = Number.parseInt(out, 10);
+        return Number.isInteger(ppid) ? ppid : null;
+    }
+    catch {
+        return null;
+    }
+}
+function alive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (error) {
+        return error.code === "EPERM";
+    }
+}
+export function systemUpdaterCallerProbe(dataDir, selfVersion) {
+    const path = join(dataDir, "update-in-progress.json");
+    return {
+        now: () => Date.now(),
+        markerMtimeMs: () => { try {
+            return statSync(path).mtimeMs;
+        }
+        catch {
+            return null;
+        } },
+        marker: () => { try {
+            return JSON.parse(readFileSync(path, "utf8"));
+        }
+        catch {
+            return null;
+        } },
+        parentOf,
+        alive,
+        startMs: pid => processStartMs(pid),
+        selfPid: process.pid,
+        selfVersion,
+    };
+}
+//# sourceMappingURL=updater-caller.js.map

package/dist/updater-caller.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"updater-caller.js","sourceRoot":"","sources":["../src/updater-caller.ts"],"names":[],"mappings":"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"}

package/dist/usage/i18n-keys.d.ts

@@ -3,5 +3,5 @@
  * Keep this list explicit: the parity test rejects a key missing from either
  * locale surface before a mixed-language release can ship.
  */
-export declare const USAGE_I18N_KEYS: readonly ["usage.title", "usage.title_plain", "usage.empty_active", "usage.not_logged_in", "usage.error_fallback", "usage.no_data", "usage.reset.in", "usage.reset.soon", "usage.duration.days_hours", "usage.duration.hours_minutes", "usage.duration.minutes", "usage.metric.session", "usage.metric.weekly", "usage.metric.monthly", "usage.metric.days_window", "usage.metric.named", "usage.metric.named_session", "usage.metric.named_weekly", "usage.metric.named_monthly", "usage.metric.named_days", "usage.metric.extra_usage", "usage.metric.rate_limit_resets", "usage.ticket_expiry", "usage.metric.credits", "usage.metric.weekly_limit", "usage.metric.pay_as_you_go", "usage.metric.bonus_credits", "usage.metric.overage_charges", "usage.metric.pay_per_use", "usage.unit.available", "usage.unit.credits", "usage.metric.usage_monthly", "usage.note.used_limit_unit", "usage.note.bonus_codes", "usage.value.disabled", "usage.value.cap", "usage.value.unlimited", "usage.note.binding", "usage.note.binding_severity", "usage.note.busiest_model", "usage.note.busiest_models", "usage.metric.agy_claude_others", "usage.metric.agy_claude_others_session", "usage.metric.agy_claude_others_weekly", "usage.hint.statusline_now", "usage.hint.statusline_minutes", "usage.hint.claude_api_key", "usage.hint.login_claude", "usage.hint.login_agy", "usage.hint.no_quota", "usage.hint.login_codex", "usage.hint.codex_no_oauth", "usage.hint.login_grok", "usage.hint.grok_no_login", "usage.hint.login_kiro", "usage.hint.kiro_signed_out", "usage.hint.token_refreshing", "usage.hint.subscription_no_credit", "usage.hint.no_quota_account", "usage.error.unreachable", "usage.error.token_rejected", "usage.error.rate_limited", "usage.error.rate_limited_transient", "usage.stale_rate_limited", "usage.error.http", "usage.error.billing_http", "usage.error.invalid_response", "usage.error.invalid_billing_response", "usage.error.invalid_kiro_response", "usage.error.claude_token_expired", "usage.error.codex_token_expired", "usage.error.grok_expired", "usage.error.grok_response_changed", "usage.error.agy_cap", "usage.error.agy_no_refresh", "usage.error.agy_token_expired", "usage.error.agy_login_expired", "usage.error.agy_refresh_empty", "usage.error.grok_auth_readonly", "usage.error.grok_no_refresh", "usage.error.grok_refresh_unreachable", "usage.error.grok_invalid_refresh", "usage.error.grok_persist"];
+export declare const USAGE_I18N_KEYS: readonly ["usage.title", "usage.title_plain", "usage.empty_active", "usage.not_logged_in", "usage.error_fallback", "usage.no_data", "usage.reset.in", "usage.reset.soon", "usage.duration.days_hours", "usage.duration.hours_minutes", "usage.duration.minutes", "usage.metric.session", "usage.metric.weekly", "usage.metric.monthly", "usage.metric.days_window", "usage.metric.named", "usage.metric.named_session", "usage.metric.named_weekly", "usage.metric.named_monthly", "usage.metric.named_days", "usage.metric.extra_usage", "usage.metric.rate_limit_resets", "usage.ticket_expiry", "usage.metric.credits", "usage.metric.weekly_limit", "usage.metric.pay_as_you_go", "usage.metric.bonus_credits", "usage.metric.overage_charges", "usage.metric.pay_per_use", "usage.unit.available", "usage.unit.credits", "usage.metric.usage_monthly", "usage.note.used_limit_unit", "usage.note.bonus_codes", "usage.value.disabled", "usage.value.cap", "usage.value.unlimited", "usage.note.binding", "usage.note.binding_severity", "usage.note.busiest_model", "usage.note.busiest_models", "usage.metric.agy_claude_others", "usage.metric.agy_claude_others_session", "usage.metric.agy_claude_others_weekly", "usage.hint.statusline_now", "usage.hint.statusline_minutes", "usage.hint.claude_api_key", "usage.hint.login_claude", "usage.hint.login_agy", "usage.hint.no_quota", "usage.hint.login_codex", "usage.hint.codex_no_oauth", "usage.hint.login_grok", "usage.hint.grok_no_login", "usage.hint.login_kiro", "usage.hint.kiro_signed_out", "usage.hint.claude_profile_signed_out", "usage.hint.claude_profile_signed_out_chat", "usage.hint.token_refreshing", "usage.hint.subscription_no_credit", "usage.hint.no_quota_account", "usage.error.unreachable", "usage.error.token_rejected", "usage.error.rate_limited", "usage.error.rate_limited_transient", "usage.stale_rate_limited", "usage.error.http", "usage.error.billing_http", "usage.error.invalid_response", "usage.error.invalid_billing_response", "usage.error.invalid_kiro_response", "usage.error.claude_token_expired", "usage.error.codex_token_expired", "usage.error.grok_expired", "usage.error.grok_response_changed", "usage.error.agy_cap", "usage.error.agy_no_refresh", "usage.error.agy_token_expired", "usage.error.agy_login_expired", "usage.error.agy_refresh_empty", "usage.error.grok_auth_readonly", "usage.error.grok_no_refresh", "usage.error.grok_refresh_unreachable", "usage.error.grok_invalid_refresh", "usage.error.grok_persist"];
 export type UsageI18nKey = typeof USAGE_I18N_KEYS[number];

package/dist/usage/i18n-keys.js

@@ -20,7 +20,7 @@ export const USAGE_I18N_KEYS = [
     "usage.hint.statusline_now", "usage.hint.statusline_minutes", "usage.hint.claude_api_key",
     "usage.hint.login_claude", "usage.hint.login_agy", "usage.hint.no_quota",
     "usage.hint.login_codex", "usage.hint.codex_no_oauth", "usage.hint.login_grok",
-    "usage.hint.grok_no_login", "usage.hint.login_kiro", "usage.hint.kiro_signed_out",
+    "usage.hint.grok_no_login", "usage.hint.login_kiro", "usage.hint.kiro_signed_out", "usage.hint.claude_profile_signed_out", "usage.hint.claude_profile_signed_out_chat",
     "usage.hint.token_refreshing", "usage.hint.subscription_no_credit", "usage.hint.no_quota_account",
     "usage.error.unreachable", "usage.error.token_rejected", "usage.error.rate_limited", "usage.error.rate_limited_transient", "usage.stale_rate_limited",
     "usage.error.http", "usage.error.billing_http", "usage.error.invalid_response",

package/dist/usage/i18n-keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"i18n-keys.js","sourceRoot":"","sources":["../../src/usage/i18n-keys.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,aAAa,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,qBAAqB;IAC/E,sBAAsB,EAAE,eAAe,EAAE,gBAAgB,EAAE,kBAAkB;IAC7E,2BAA2B,EAAE,8BAA8B,EAAE,wBAAwB;IACrF,sBAAsB,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,0BAA0B;IACjG,oBAAoB,EAAE,4BAA4B,EAAE,2BAA2B;IAC/E,4BAA4B,EAAE,yBAAyB,EAAE,0BAA0B;IACnF,gCAAgC,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,2BAA2B;IAC5G,4BAA4B,EAAE,4BAA4B,EAAE,8BAA8B;IAC1F,0BAA0B,EAAE,sBAAsB,EAAE,oBAAoB;IACxE,4BAA4B,EAAE,4BAA4B,EAAE,wBAAwB;IACpF,sBAAsB,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,oBAAoB;IACxF,6BAA6B,EAAE,0BAA0B,EAAE,2BAA2B;IACtF,gCAAgC,EAAE,wCAAwC,EAAE,uCAAuC;IACnH,2BAA2B,EAAE,+BAA+B,EAAE,2BAA2B;IACzF,yBAAyB,EAAE,sBAAsB,EAAE,qBAAqB;IACxE,wBAAwB,EAAE,2BAA2B,EAAE,uBAAuB;IAC9E,0BAA0B,EAAE,uBAAuB,EAAE,4BAA4B;IACjF,6BAA6B,EAAE,mCAAmC,EAAE,6BAA6B;IACjG,yBAAyB,EAAE,4BAA4B,EAAE,0BAA0B,EAAE,oCAAoC,EAAE,0BAA0B;IACrJ,kBAAkB,EAAE,0BAA0B,EAAE,8BAA8B;IAC9E,sCAAsC,EAAE,mCAAmC;IAC3E,kCAAkC,EAAE,iCAAiC;IACrE,0BAA0B,EAAE,mCAAmC,EAAE,qBAAqB;IACtF,4BAA4B,EAAE,+BAA+B,EAAE,+BAA+B;IAC9F,+BAA+B,EAAE,gCAAgC,EAAE,6BAA6B;IAChG,sCAAsC,EAAE,kCAAkC,EAAE,0BAA0B;CAC9F,CAAC"}
+{"version":3,"file":"i18n-keys.js","sourceRoot":"","sources":["../../src/usage/i18n-keys.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,aAAa,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,qBAAqB;IAC/E,sBAAsB,EAAE,eAAe,EAAE,gBAAgB,EAAE,kBAAkB;IAC7E,2BAA2B,EAAE,8BAA8B,EAAE,wBAAwB;IACrF,sBAAsB,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,0BAA0B;IACjG,oBAAoB,EAAE,4BAA4B,EAAE,2BAA2B;IAC/E,4BAA4B,EAAE,yBAAyB,EAAE,0BAA0B;IACnF,gCAAgC,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,2BAA2B;IAC5G,4BAA4B,EAAE,4BAA4B,EAAE,8BAA8B;IAC1F,0BAA0B,EAAE,sBAAsB,EAAE,oBAAoB;IACxE,4BAA4B,EAAE,4BAA4B,EAAE,wBAAwB;IACpF,sBAAsB,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,oBAAoB;IACxF,6BAA6B,EAAE,0BAA0B,EAAE,2BAA2B;IACtF,gCAAgC,EAAE,wCAAwC,EAAE,uCAAuC;IACnH,2BAA2B,EAAE,+BAA+B,EAAE,2BAA2B;IACzF,yBAAyB,EAAE,sBAAsB,EAAE,qBAAqB;IACxE,wBAAwB,EAAE,2BAA2B,EAAE,uBAAuB;IAC9E,0BAA0B,EAAE,uBAAuB,EAAE,4BAA4B,EAAE,sCAAsC,EAAE,2CAA2C;IACtK,6BAA6B,EAAE,mCAAmC,EAAE,6BAA6B;IACjG,yBAAyB,EAAE,4BAA4B,EAAE,0BAA0B,EAAE,oCAAoC,EAAE,0BAA0B;IACrJ,kBAAkB,EAAE,0BAA0B,EAAE,8BAA8B;IAC9E,sCAAsC,EAAE,mCAAmC;IAC3E,kCAAkC,EAAE,iCAAiC;IACrE,0BAA0B,EAAE,mCAAmC,EAAE,qBAAqB;IACtF,4BAA4B,EAAE,+BAA+B,EAAE,+BAA+B;IAC9F,+BAA+B,EAAE,gCAAgC,EAAE,6BAA6B;IAChG,sCAAsC,EAAE,kCAAkC,EAAE,0BAA0B;CAC9F,CAAC"}

package/dist/usage/providers.d.ts

@@ -106,14 +106,43 @@ export declare function resolveClaudeAuth(file: {
  * even live?".
  */
 export declare function statuslineUsage(reading: StatuslineRateLimits, plan: string | null, now?: number): Omit<ProviderUsage, "id" | "name">;
+/** `security find-generic-password -w`: the item's secret, or null (no such item, locked, not macOS). */
+type KeychainRead = (service: string, account: string) => Promise<string | null>;
+declare let claudeKeychain: {
+    platform: NodeJS.Platform;
+    read: KeychainRead;
+    username: () => string;
+};
+/** Test seam (#1699): the platform, the Keychain read and the OS user name; null restores all three. */
+export declare function setClaudeKeychainForTests(seam: Partial<typeof claudeKeychain> | null): void;
+/**
+ * Whether a shell rc sets `CLAUDE_CODE_OAUTH_TOKEN` at all — any assignment, export or declaration that is not a
+ * comment, whatever its value: `"$OTHER"` or `${OTHER}` is a token once the pane's shell expands it, so unlike
+ * tokenFromShellRc (which must hand the API a literal bearer) this never discounts one it cannot read (#1713 review).
+ * Files those rcs `source` are not followed.
+ */
+export declare function shellRcSetsClaudeToken(read: (path: string) => string, home?: string, files?: readonly string[]): boolean;
 /**
  * Best-effort OAuth access token for direct Anthropic API calls (the /model
  * catalog probe). Same resolution order as the usage panel: credentials file →
- * CLAUDE_CODE_OAUTH_TOKEN → shell rc. Null when nothing usable exists.
+ * CLAUDE_CODE_OAUTH_TOKEN → shell rc. Null when nothing usable exists. With
+ * `storeHome` (a credential profile's config dir, #1699): that profile's login only.
+ */
+export declare function getClaudeOAuthToken(storeHome?: string): Promise<string | null>;
+/** Which subscription a Claude row is (#1699): a profile's (with its name), or the shared one beside profiles. */
+export interface ClaudeUsageScope {
+    profile?: string;
+    besideProfiles?: boolean;
+}
+/**
+ * Exported for tests — the statusline/API preference order is the subject.
+ *
+ * `storeHome` (#1699): a credential profile's config dir — the row reads that profile's login and only the rate
+ * limits its own instances wrote (their conversations are under its `projects/`); a profile with no login says so,
+ * with the line that signs it in, and never shows the shared account's numbers. Without it: the shared login as
+ * always; beside profiles (`besideProfiles`), its statusline fallback leaves the profiles' instances out.
  */
-export declare function getClaudeOAuthToken(): Promise<string | null>;
-/** Exported for tests — the statusline/API preference order is the subject. */
-export declare function fetchClaudeUsage(): Promise<Omit<ProviderUsage, "id" | "name">>;
+export declare function fetchClaudeUsage(storeHome?: string, scope?: ClaudeUsageScope): Promise<Omit<ProviderUsage, "id" | "name">>;
 interface AgyBucket {
     bucketId?: string;
     displayName?: string;
@@ -172,7 +201,7 @@ export declare function fetchKiroUsage(storeHome?: string): Promise<Omit<Provide
 type UsageProvider = {
     id: string;
     name: string;
-    fetch: (storeHome?: string) => Promise<Omit<ProviderUsage, "id" | "name">>;
+    fetch: (storeHome?: string, scope?: ClaudeUsageScope) => Promise<Omit<ProviderUsage, "id" | "name">>;
 };
 type UsageFleetConfig = Parameters<typeof listConfiguredProfiles>[0];
 /** Read the daemon-written, token-free Muse relay snapshot for active Muse instances. */