salt-agent-sdk 0.1.0 → 0.18.0

package/dist/device/protocol.js

@@ -0,0 +1,435 @@
+"use strict";
+// The `[[SALT-DEVICE]]` wire grammar (salt-api docs/DEVICE_PROTOCOL.md).
+//
+// A device command or result is the PLAINTEXT of an ordinary end-to-end
+// encrypted lane message. Salt relays the ciphertext and never parses it;
+// everything in this file runs INSIDE the agent and INSIDE the device, on
+// plaintext that has already been decrypted (device client) or is about to be
+// encrypted (device host). Nothing here touches a screen, a keyboard, or a
+// network -- it only turns a command into a line of text and back.
+//
+// This module is pure: no I/O, no crypto, no transport. encode/decode/verify
+// only. client.ts (agent side) and host.ts (device side) wrap it with the
+// injected transports that do the encrypting, posting and dispatching.
+//
+// It is the single source of truth for the grammar on the TypeScript side; a
+// change to the grammar is made in DEVICE_PROTOCOL.md first, then mirrored
+// here, then announced -- never the other way round.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceProtocolError = exports.TASK_STEP_KINDS = exports.TASK_STATUSES = exports.TASK_CLIENT_GRACE_MS = exports.TASK_DEVICE_GRACE_MS = exports.PROGRESS_MIN_INTERVAL_MS = exports.TASK_ID_MAX = exports.TASK_CHECKED_WHAT_MAX = exports.TASK_RESULT_STEPS_MAX = exports.TASK_STEP_LINE_MAX = exports.TASK_SUMMARY_MAX = exports.PROGRESS_LINE_MAX = exports.TASK_TIMEOUT_S_DEFAULT = exports.TASK_TIMEOUT_S_MAX = exports.TASK_TIMEOUT_S_MIN = exports.TASK_MAX_STEPS_DEFAULT = exports.TASK_MAX_STEPS_MAX = exports.TASK_MAX_STEPS_MIN = exports.TASK_DONE_WHEN_MAX = exports.TASK_GOAL_MAX = exports.DEVICE_COUNT_CLASSES = exports.CAPABILITY_FOR_OP = exports.DEVICE_ERROR_CODES = exports.DEVICE_RESULT_OPS = exports.AGENT_OPS = exports.MUTATING_OPS = exports.RESULT_CACHE_SIZE = exports.COMMAND_TTL_MS = exports.MAX_OBSERVE_PER_SECOND = exports.MAX_COMMANDS_PER_SECOND = exports.MAX_DEVICE_PLAINTEXT_BYTES = exports.DEVICE_PROTOCOL_VERSION = void 0;
+exports.countClassForOp = countClassForOp;
+exports.parseTaskArgs = parseTaskArgs;
+exports.taskCommandBody = taskCommandBody;
+exports.normalizeProgress = normalizeProgress;
+exports.newTaskId = newTaskId;
+exports.normalizeTaskResult = normalizeTaskResult;
+exports.encodeDeviceMessage = encodeDeviceMessage;
+exports.decodeDeviceMessage = decodeDeviceMessage;
+exports.deviceMessageId = deviceMessageId;
+/** Grammar version. An incoming message with any other `v` is answered
+ *  `error { code: "unsupported" }`, never guessed at. */
+exports.DEVICE_PROTOCOL_VERSION = 1;
+/** A single lane message carries at most this much PLAINTEXT. Larger files or
+ *  images are refused with `too_large` (a later phase may chunk). Mirrors
+ *  salt-api's own per-message plaintext cap. */
+exports.MAX_DEVICE_PLAINTEXT_BYTES = 4 * 1024 * 1024;
+/** Per-session rate ceilings the device enforces. Over either, the device
+ *  answers `busy` and does not run the command. */
+exports.MAX_COMMANDS_PER_SECOND = 5;
+exports.MAX_OBSERVE_PER_SECOND = 1;
+// ---- one command in flight (device-locking contract §5) ---------------------
+// Every constant the client and host must agree on lives here.
+/** A command is valid for this long after the client built it. The client sets
+ *  `exp = now + COMMAND_TTL_MS` (epoch MILLISECONDS); the host refuses a
+ *  command whose `exp` has passed with `expired`, without executing it. */
+exports.COMMAND_TTL_MS = 30_000;
+/** The host remembers this many results per session, by command `id`; a
+ *  repeated `id` returns the stored result without executing. */
+exports.RESULT_CACHE_SIZE = 64;
+/** Ops that change what is on the machine's screen/input state. The host
+ *  serialises these device-wide (across every session on the machine) behind
+ *  one mutex. `observe`, `list_apps` and the file ops do not take it. */
+exports.MUTATING_OPS = ["click", "type", "key", "scroll", "submit", "focus_app", "task"];
+exports.AGENT_OPS = [
+    "observe",
+    "click",
+    "type",
+    "key",
+    "scroll",
+    "submit",
+    "focus_app",
+    "list_apps",
+    "read_file",
+    "write_file",
+    "task",
+    "stop",
+    "cancel",
+    "shell",
+];
+exports.DEVICE_RESULT_OPS = [
+    "ack",
+    "observation",
+    "apps",
+    "file",
+    "ask",
+    "error",
+    "ended",
+    "progress",
+    "task_result",
+];
+exports.DEVICE_ERROR_CODES = [
+    "forbidden",
+    "out_of_scope",
+    "needs_approval",
+    "unsupported",
+    "out_of_order",
+    "bad_args",
+    "too_large",
+    "busy",
+    "expired",
+    "clock_skew",
+    "paused",
+    "failed",
+];
+/** The `device.*` mandate capability each agent op requires. `stop` needs
+ *  none. `shell` maps to the reserved `device.shell`, which the server refuses
+ *  in P0, so a host answers it `forbidden` without consulting scope. */
+exports.CAPABILITY_FOR_OP = {
+    observe: "device.observe",
+    click: "device.act",
+    type: "device.act",
+    key: "device.act",
+    scroll: "device.act",
+    submit: "device.act",
+    focus_app: "device.apps",
+    list_apps: "device.apps",
+    read_file: "device.files.read",
+    write_file: "device.files.write",
+    task: "device.task",
+    stop: null,
+    cancel: null,
+    shell: "device.shell",
+};
+exports.DEVICE_COUNT_CLASSES = [
+    "observe",
+    "click",
+    "type",
+    "key",
+    "scroll",
+    "file_read",
+    "file_write",
+    "app_focus",
+    "task",
+    "command",
+    "look",
+    "error",
+];
+/** Map a successfully-run op to the metadata class it increments. `list_apps`
+ *  and `focus_app` both count as `app_focus`; file ops split read/write;
+ *  `stop`/`shell` have no count. Returns null when nothing should be counted. */
+function countClassForOp(op) {
+    switch (op) {
+        case "observe":
+            return "observe";
+        case "click":
+            return "click";
+        case "type":
+            return "type";
+        case "key":
+            return "key";
+        case "scroll":
+            return "scroll";
+        case "submit": // a confirm is a press of a control: counted with clicks
+            return "click";
+        case "read_file":
+            return "file_read";
+        case "write_file":
+            return "file_write";
+        case "focus_app":
+        case "list_apps":
+            return "app_focus";
+        case "task":
+            return "task";
+        case "stop":
+        case "cancel":
+        case "shell":
+            return null;
+    }
+}
+// ---- a whole task (op `task`, capability `device.task`) ---------------------
+// The agent hands the computer ONE job in plain words; a local agent on the
+// device does it (commands, screenshots, the screen reader, input), checks it,
+// and answers with a checked receipt. Command output and screenshots never
+// leave the computer: a TaskResult carries words and numbers only.
+/** Caps on what a task may say. The agent's side checks the same ones on what it
+ *  receives, so neither end trusts the other's limits. */
+exports.TASK_GOAL_MAX = 2000;
+exports.TASK_DONE_WHEN_MAX = 500;
+exports.TASK_MAX_STEPS_MIN = 1;
+exports.TASK_MAX_STEPS_MAX = 60;
+exports.TASK_MAX_STEPS_DEFAULT = 30;
+exports.TASK_TIMEOUT_S_MIN = 10;
+exports.TASK_TIMEOUT_S_MAX = 600;
+exports.TASK_TIMEOUT_S_DEFAULT = 180;
+exports.PROGRESS_LINE_MAX = 140;
+exports.TASK_SUMMARY_MAX = 500;
+exports.TASK_STEP_LINE_MAX = 140;
+exports.TASK_RESULT_STEPS_MAX = 60;
+exports.TASK_CHECKED_WHAT_MAX = 200;
+exports.TASK_ID_MAX = 64;
+/** The device sends `progress` at most this often (the host throttles). */
+exports.PROGRESS_MIN_INTERVAL_MS = 2_000;
+/** A task's command deadline on the device is `timeout_s` + this, not COMMAND_TTL_MS. */
+exports.TASK_DEVICE_GRACE_MS = 15_000;
+/** The agent waits `timeout_s` + this for the result before it cancels. */
+exports.TASK_CLIENT_GRACE_MS = 30_000;
+exports.TASK_STATUSES = ["done", "failed", "stopped", "denied", "timeout", "paused_out"];
+exports.TASK_STEP_KINDS = ["command", "look", "observe", "act", "apps", "ask", "check"];
+// A cap counts characters as people do (Unicode code points), not UTF-16 units, so an emoji
+// is never cut in half and the Python SDK (which counts code points) reads the same limits.
+function charCount(s) {
+    let n = 0;
+    for (const _ of s)
+        n += 1;
+    return n;
+}
+function clip(s, max) {
+    if (s.length <= max)
+        return s; // code points <= UTF-16 units: certainly within the cap
+    const chars = Array.from(s);
+    return chars.length > max ? chars.slice(0, max).join("") : s;
+}
+function isRecord(x) {
+    return typeof x === "object" && x !== null && !Array.isArray(x);
+}
+function wholeNumber(x) {
+    return typeof x === "number" && Number.isInteger(x) ? x : null;
+}
+/** The task arguments, checked and with defaults filled in; unknown keys are dropped.
+ *  A goal that is missing, empty or over 2000 characters, or a `done_when` over 500, is
+ *  `bad_args` (the sender fixes the words; nothing is cut off silently). `max_steps` and
+ *  `timeout_s` must be whole numbers and are clamped into their range. Throws
+ *  DeviceProtocolError("bad_args"). Used by the agent before it sends and by the device
+ *  before it runs. */
+function parseTaskArgs(body) {
+    if (!isRecord(body))
+        throw new DeviceProtocolError("bad_args", "task needs a goal");
+    const { goal, done_when, max_steps, timeout_s } = body;
+    if (typeof goal !== "string" || goal.trim().length === 0)
+        throw new DeviceProtocolError("bad_args", "goal must be a non-empty string");
+    if (charCount(goal) > exports.TASK_GOAL_MAX)
+        throw new DeviceProtocolError("bad_args", `goal is over ${exports.TASK_GOAL_MAX} characters`);
+    let doneWhen;
+    if (done_when !== undefined && done_when !== null) {
+        if (typeof done_when !== "string")
+            throw new DeviceProtocolError("bad_args", "done_when must be a string");
+        if (charCount(done_when) > exports.TASK_DONE_WHEN_MAX)
+            throw new DeviceProtocolError("bad_args", `done_when is over ${exports.TASK_DONE_WHEN_MAX} characters`);
+        doneWhen = done_when;
+    }
+    let steps = exports.TASK_MAX_STEPS_DEFAULT;
+    if (max_steps !== undefined && max_steps !== null) {
+        const n = wholeNumber(max_steps);
+        if (n === null)
+            throw new DeviceProtocolError("bad_args", "max_steps must be a whole number");
+        steps = Math.min(exports.TASK_MAX_STEPS_MAX, Math.max(exports.TASK_MAX_STEPS_MIN, n));
+    }
+    let timeout = exports.TASK_TIMEOUT_S_DEFAULT;
+    if (timeout_s !== undefined && timeout_s !== null) {
+        const n = wholeNumber(timeout_s);
+        if (n === null)
+            throw new DeviceProtocolError("bad_args", "timeout_s must be a whole number");
+        timeout = Math.min(exports.TASK_TIMEOUT_S_MAX, Math.max(exports.TASK_TIMEOUT_S_MIN, n));
+    }
+    const out = { goal, max_steps: steps, timeout_s: timeout };
+    if (doneWhen !== undefined && doneWhen !== "")
+        out.done_when = doneWhen;
+    return out;
+}
+/** The wire body of a `task` command: only the fields that were given. */
+function taskCommandBody(goal, opts = {}) {
+    const raw = { goal };
+    if (opts.doneWhen !== undefined)
+        raw.done_when = opts.doneWhen;
+    if (opts.maxSteps !== undefined)
+        raw.max_steps = opts.maxSteps;
+    if (opts.timeoutS !== undefined)
+        raw.timeout_s = opts.timeoutS;
+    const p = parseTaskArgs(raw); // refuses what the device would refuse
+    const out = { goal: p.goal };
+    if (p.done_when !== undefined)
+        out.done_when = p.done_when;
+    if (opts.maxSteps !== undefined)
+        out.max_steps = p.max_steps;
+    if (opts.timeoutS !== undefined)
+        out.timeout_s = p.timeout_s;
+    return out;
+}
+/** A `progress` body, allow-listed with the caps applied; null when it is not one (no
+ *  usable `step` or `line`). Nothing but `step`, `of`, `line` and `waiting` gets through. */
+function normalizeProgress(raw) {
+    if (!isRecord(raw))
+        return null;
+    const step = wholeNumber(raw.step);
+    if (step === null || step < 0 || typeof raw.line !== "string")
+        return null;
+    const out = { step, line: clip(raw.line, exports.PROGRESS_LINE_MAX) };
+    const of = wholeNumber(raw.of);
+    if (of !== null && of >= 1)
+        out.of = of;
+    if (typeof raw.waiting === "boolean")
+        out.waiting = raw.waiting;
+    return out;
+}
+/** A fresh local task id, `t_<hex>`. */
+function newTaskId(rand = Math.random) {
+    let hex = "";
+    for (let i = 0; i < 12; i++)
+        hex += Math.floor(rand() * 16).toString(16);
+    return `t_${hex}`;
+}
+/** A `task_result` body, allow-listed field by field with type checks and caps. Used by the
+ *  device on what its handler returned and by the agent on what the device sent, so extra
+ *  fields never travel and a malformed one becomes a safe default rather than a throw:
+ *  an unknown `status` reads `failed`, `steps` keeps the first 60 valid rows, strings are cut
+ *  to their caps, numbers must be whole and non-negative. `fallback` fills what is missing. */
+function normalizeTaskResult(raw, fallback = {}) {
+    const r = isRecord(raw) ? raw : {};
+    const task_id = typeof r.task_id === "string" && r.task_id.length > 0 ? clip(r.task_id, exports.TASK_ID_MAX) : (fallback.task_id ?? newTaskId());
+    const status = exports.TASK_STATUSES.includes(r.status) ? r.status : "failed";
+    const summary = typeof r.summary === "string" ? clip(r.summary, exports.TASK_SUMMARY_MAX) : "";
+    let checked = null;
+    if (isRecord(r.checked) && typeof r.checked.ok === "boolean") {
+        checked = { ok: r.checked.ok, what: typeof r.checked.what === "string" ? clip(r.checked.what, exports.TASK_CHECKED_WHAT_MAX) : "" };
+    }
+    const steps = [];
+    if (Array.isArray(r.steps)) {
+        for (const s of r.steps) {
+            if (steps.length >= exports.TASK_RESULT_STEPS_MAX)
+                break;
+            if (!isRecord(s) || !exports.TASK_STEP_KINDS.includes(s.kind) || typeof s.line !== "string")
+                continue;
+            const n = wholeNumber(s.n);
+            steps.push({
+                n: n !== null && n >= 0 ? n : steps.length + 1,
+                kind: s.kind,
+                line: clip(s.line, exports.TASK_STEP_LINE_MAX),
+                ok: s.ok === true,
+            });
+        }
+    }
+    const commands = wholeNumber(r.commands);
+    const duration = wholeNumber(r.duration_ms);
+    return {
+        task_id,
+        status,
+        summary,
+        checked,
+        steps,
+        commands: commands !== null && commands >= 0 ? commands : 0,
+        duration_ms: duration !== null && duration >= 0 ? duration : (fallback.duration_ms ?? 0),
+    };
+}
+const MARKER_RE = /^\[\[SALT-DEVICE ((?:[a-z_]+=[^\s\]]+ ?)+)\]\]\s*([\s\S]*)$/;
+/** Turn a header + optional body into the plaintext of one lane message. The
+ *  caller encrypts the returned string for the lane readers and posts it. */
+function encodeDeviceMessage(header, body) {
+    const parts = [
+        `v=${header.v}`,
+        `id=${header.id}`,
+        `seq=${header.seq}`,
+        `op=${header.op}`,
+        `session=${header.session}`,
+    ];
+    if (header.re !== undefined)
+        parts.push(`re=${header.re}`);
+    if (header.exp !== undefined)
+        parts.push(`exp=${header.exp}`);
+    const marker = `[[SALT-DEVICE ${parts.join(" ")}]]`;
+    if (body === undefined)
+        return marker;
+    return `${marker}\n${JSON.stringify(body)}`;
+}
+/** Parse the decrypted plaintext of a lane message. Returns the header + body,
+ *  or `null` when the text is not a device message at all (it may be a plain
+ *  chat line, which the caller ignores). Throws only on a message that LOOKS
+ *  like one but is structurally broken, so the caller can answer `bad_args`. */
+function decodeDeviceMessage(plaintext) {
+    const trimmed = plaintext.trimStart();
+    if (!trimmed.startsWith("[[SALT-DEVICE"))
+        return null;
+    const m = MARKER_RE.exec(trimmed);
+    if (!m)
+        throw new DeviceProtocolError("bad_args", "malformed SALT-DEVICE marker");
+    const fields = {};
+    for (const pair of m[1].trim().split(/\s+/)) {
+        const eq = pair.indexOf("=");
+        if (eq === -1)
+            throw new DeviceProtocolError("bad_args", `bad marker field: ${pair}`);
+        fields[pair.slice(0, eq)] = pair.slice(eq + 1);
+    }
+    for (const required of ["v", "id", "seq", "op", "session"]) {
+        if (fields[required] === undefined) {
+            throw new DeviceProtocolError("bad_args", `marker missing ${required}`);
+        }
+    }
+    const v = Number(fields.v);
+    const seq = Number(fields.seq);
+    if (!Number.isInteger(v) || !Number.isInteger(seq) || seq < 1) {
+        throw new DeviceProtocolError("bad_args", "v and seq must be positive integers");
+    }
+    const header = {
+        v,
+        id: fields.id,
+        seq,
+        op: fields.op,
+        session: fields.session,
+    };
+    if (fields.re !== undefined)
+        header.re = fields.re;
+    if (fields.exp !== undefined) {
+        const exp = Number(fields.exp);
+        if (!Number.isFinite(exp))
+            throw new DeviceProtocolError("bad_args", "exp must be a number");
+        header.exp = exp;
+    }
+    const rest = m[2];
+    let body;
+    if (rest.trim().length > 0) {
+        try {
+            body = JSON.parse(rest);
+        }
+        catch {
+            throw new DeviceProtocolError("bad_args", "SALT-DEVICE body is not JSON");
+        }
+    }
+    return { header, body };
+}
+class DeviceProtocolError extends Error {
+    code;
+    constructor(code, message) {
+        super(message ?? code);
+        this.name = "DeviceProtocolError";
+        this.code = code;
+    }
+}
+exports.DeviceProtocolError = DeviceProtocolError;
+// ---- a tiny ULID (time-sortable, opaque to the server) ----------------------
+const CROCKFORD = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
+/** A ULID-shaped id for a command. The server treats it as an opaque token;
+ *  the only property code here relies on is uniqueness. Sortable by time is a
+ *  convenience for logs and nothing more (ordering is enforced by `seq`). */
+function deviceMessageId(now = Date.now(), rand = Math.random) {
+    let time = "";
+    let t = now;
+    for (let i = 0; i < 10; i++) {
+        time = CROCKFORD[t % 32] + time;
+        t = Math.floor(t / 32);
+    }
+    let randPart = "";
+    for (let i = 0; i < 16; i++) {
+        randPart += CROCKFORD[Math.floor(rand() * 32)];
+    }
+    return time + randPart;
+}
+//# sourceMappingURL=protocol.js.map

package/dist/device/protocol.js.map

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

package/dist/identities.d.ts

@@ -1,5 +1,6 @@
+import { type SaltId } from "./ids.js";
 export interface AgentIdentity {
-    saltAppId: number;
+    saltAppId: SaltId;
     username: string;
     displayName?: string;
     apiKey: string;
@@ -10,8 +11,14 @@ export interface AgentIdentity {
 }
 export interface IdentityStore {
     register(identity: AgentIdentity): void;
-    get(saltAppId: number): AgentIdentity | undefined;
+    get(saltAppId: SaltId): AgentIdentity | undefined;
     all(): AgentIdentity[];
+    /**
+     * Move an identity from the id it was registered under to the id salt-api
+     * now uses for it (see reconcile.ts). Returns whatever is registered under
+     * `to` afterwards, or undefined when nothing was registered under `from`.
+     */
+    reassignId(from: SaltId, to: SaltId): AgentIdentity | undefined;
 }
 /**
  * Creates a JSON-file-backed identity store. Loads synchronously at

package/dist/identities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identities.d.ts","sourceRoot":"","sources":["../src/identities.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,yGAAyG;IACzG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,CAAC;IACxC,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;IAClD,GAAG,IAAI,aAAa,EAAE,CAAC;CACxB;AAID;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,GAAE,MAA2B,GAAG,aAAa,CA6CzF"}
+{"version":3,"file":"identities.d.ts","sourceRoot":"","sources":["../src/identities.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAU,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAE/C,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,yGAAyG;IACzG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,CAAC;IACxC,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;IAClD,GAAG,IAAI,aAAa,EAAE,CAAC;IACvB;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;CACjE;AAID;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,GAAE,MAA2B,GAAG,aAAa,CAwEzF"}

package/dist/identities.js

@@ -50,6 +50,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createIdentityStore = createIdentityStore;
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
+const ids_js_1 = require("./ids.js");
 const DEFAULT_STORE_PATH = path.join(process.cwd(), "data", "identities.json");
 /**
  * Creates a JSON-file-backed identity store. Loads synchronously at
@@ -60,7 +61,12 @@ const DEFAULT_STORE_PATH = path.join(process.cwd(), "data", "identities.json");
  * them).
  */
 function createIdentityStore(storePath = DEFAULT_STORE_PATH) {
+    // Keyed by the lowercased id. Ids arrive from webhook bodies, REST
+    // responses and env vars, and a uuid that differs only in case would
+    // otherwise register as a second, separate identity -- the process would
+    // hold two copies of one agent and route to whichever it looked up first.
     const identities = new Map();
+    const mapKey = (id) => String(id).toLowerCase();
     function load() {
         let raw;
         try {
@@ -74,7 +80,7 @@ function createIdentityStore(storePath = DEFAULT_STORE_PATH) {
         }
         try {
             for (const identity of JSON.parse(raw)) {
-                identities.set(identity.saltAppId, identity);
+                identities.set(mapKey(identity.saltAppId), identity);
             }
         }
         catch (err) {
@@ -93,15 +99,39 @@ function createIdentityStore(storePath = DEFAULT_STORE_PATH) {
     load();
     return {
         register(identity) {
-            identities.set(identity.saltAppId, identity);
+            identities.set(mapKey(identity.saltAppId), identity);
             persist();
         },
         get(saltAppId) {
-            return identities.get(saltAppId);
+            return identities.get(mapKey(saltAppId));
         },
         all() {
             return Array.from(identities.values());
         },
+        reassignId(from, to) {
+            const moving = identities.get(mapKey(from));
+            if (!moving)
+                return undefined;
+            if ((0, ids_js_1.sameId)(from, to))
+                return moving;
+            // Both entries name one agent -- that is what the API said when it
+            // answered `to` for `from`'s api key. It happens when the env var was
+            // corrected before the store was: boot registered the identity afresh
+            // under the new id while the old entry stayed on disk. Keep the entry
+            // already under `to` (it is what the process routes by, and the
+            // freshest config) and drop the stale duplicate rather than hold two
+            // copies of one agent.
+            const existing = identities.get(mapKey(to));
+            identities.delete(mapKey(from));
+            // Mutated in place rather than copied so a handler holding this
+            // identity mid-request sees the new id too.
+            if (!existing)
+                moving.saltAppId = to;
+            const survivor = existing ?? moving;
+            identities.set(mapKey(to), survivor);
+            persist();
+            return survivor;
+        },
     };
 }
 //# sourceMappingURL=identities.js.map

package/dist/identities.js.map

@@ -1 +1 @@
-{"version":3,"file":"identities.js","sourceRoot":"","sources":["../src/identities.ts"],"names":[],"mappings":";AAAA,wEAAwE;AACxE,0EAA0E;AAC1E,sEAAsE;AACtE,yEAAyE;AACzE,yEAAyE;AACzE,sCAAsC;AACtC,EAAE;AACF,uEAAuE;AACvE,0EAA0E;AAC1E,2EAA2E;AAC3E,kEAAkE;AAClE,0EAA0E;AAC1E,0EAA0E;AAC1E,mEAAmE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCnE,kDA6CC;AA3ED,4CAA8B;AAC9B,gDAAkC;AAmBlC,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;AAE/E;;;;;;;GAOG;AACH,SAAgB,mBAAmB,CAAC,YAAoB,kBAAkB;IACxE,MAAM,UAAU,GAAG,IAAI,GAAG,EAAyB,CAAC;IAEpD,SAAS,IAAI;QACX,IAAI,GAAW,CAAC;QAChB,IAAI,CAAC;YACH,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACrD,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;YAC9E,CAAC;YACD,OAAO;QACT,CAAC;QACD,IAAI,CAAC;YACH,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAoB,EAAE,CAAC;gBAC1D,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,qCAAqC,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAED,SAAS,OAAO;QACd,IAAI,CAAC;YACH,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACxF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,uCAAuC,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IAED,IAAI,EAAE,CAAC;IAEP,OAAO;QACL,QAAQ,CAAC,QAAuB;YAC9B,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAC7C,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,GAAG,CAAC,SAAiB;YACnB,OAAO,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnC,CAAC;QACD,GAAG;YACD,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QACzC,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"identities.js","sourceRoot":"","sources":["../src/identities.ts"],"names":[],"mappings":"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"}