@cello-protocol/daemon 0.0.227 → 0.0.228

package/dist/contact-handlers.js

@@ -0,0 +1,343 @@
+/**
+ * The address book: the contact / tier / moniker / settings / telegram-token IPC handlers.
+ *
+ * These ten handlers lived inside startDaemon's body, where they reached the daemon's state by
+ * closing over it. Here they must NAME what they need — that is the whole point of the move, and
+ * the list turns out to be short: the session store, the per-connection agent selection, a logger,
+ * and one callback to restart the Telegram poller. Nothing about sessions, seals, transport or
+ * ceremonies. The address book never needed any of it; you just couldn't tell from inside the
+ * closure.
+ *
+ * Behavior is preserved exactly. The only type that changed is `connState`, widened to include
+ * `clearedAgent` — it was always there at runtime (TS types are erased, and resolveCurrentAgent
+ * reads it), so the old narrower type was a fiction, not a constraint.
+ */
+import { MONIKER_RE, validateMoniker } from "@cello-protocol/protocol-types";
+import { whoLabel } from "./who-label.js";
+import { isKnownTierValue, TIER } from "./contacts-tier-migration.js";
+import { isValidSettingKey, allSettingKeys, validateSettingValue, AWAY_MESSAGE_MAX_LEN, } from "./agent-settings-keys.js";
+import { resolveNamedAgent } from "./resolve-named-agent.js";
+/**
+ * Review finding 7 — a contact pubkey must LOOK like a pubkey, or the row can never work.
+ *
+ * The address-book handlers took `params.pubkey` as any string and stored it. So
+ * `cello contact tier add` — a plausible slip under the `contact <pubkey> <op>` shape, where the
+ * FIRST positional is the pubkey — persisted a contact whose pubkey is the literal text "tier",
+ * and answered ok:true. Nothing would ever match it: it is not a key, so it can never be a
+ * counterparty. The operator is told they added someone; they added a typo.
+ *
+ * A key is 32 bytes, hex: 64 characters. Anything else is refused, loudly, with the value echoed
+ * so the slip is obvious. Returns null when the pubkey is absent — the caller's own missing_params
+ * check owns that case and says something more useful.
+ */
+export function invalidPubkey(pubkey) {
+    if (pubkey === undefined)
+        return null; // absent → the caller's missing_params check owns it
+    if (/^[0-9a-fA-F]{64}$/.test(pubkey))
+        return null;
+    return {
+        ok: false,
+        reason: "invalid_pubkey",
+        guidance: `'${pubkey}' is not a public key. A CELLO public key is 64 hex characters (32 bytes). Nothing was changed — storing it would create an address-book entry that can never match anyone. Note the argument order is 'cello contact <pubkey> <operation>'.`,
+    };
+}
+export function registerContactHandlers(deps) {
+    const { handlers, sessionNodeManager, getConnState, resolveCurrentAgent, agents, setAgentMoniker, logger, startTelegramPollerIfConfigured, } = deps;
+    // M8C-CONTACT-1: every address-book handler resolves the target agent the SAME way — an explicit
+    // params.agent, else this connection's current/sole-online agent (F18) — so a CLI or AI operator
+    // gets the same no_current_agent guidance INBOX already uses.
+    function resolveContactAgent(connState, params) {
+        // DOD-INBOX-AGENT-1 (review PE1): this carried BOTH holes the inbox handler just closed, and
+        // here they are worse, because these handlers WRITE. `{ agent: "" }` is falsy but not nullish,
+        // so a bare truthiness test filed the contact under whatever desk the connection happened to
+        // hold; `{ agent: "carol" }` with no carol wrote a row keyed to an agent that does not exist
+        // (addContact does not validate the name). Both returned ok:true. One shared guard now, so the
+        // third copy of this never gets written.
+        const named = resolveNamedAgent(params?.agent, agents);
+        if (!named.ok)
+            return named;
+        if (named.agent !== null)
+            return { ok: true, agent: named.agent };
+        const current = resolveCurrentAgent(connState);
+        if (!current) {
+            return {
+                ok: false,
+                reason: "no_current_agent",
+                guidance: "No current agent for this connection. Pass --agent <name>, or call cello_use_agent to select one first.",
+            };
+        }
+        return { ok: true, agent: current };
+    }
+    handlers.set("cello_contact_add", async (params, connectionId) => {
+        const pubkey = typeof params?.pubkey === "string" ? params.pubkey : undefined;
+        const badPubkey = invalidPubkey(pubkey);
+        if (badPubkey)
+            return badPubkey;
+        if (!pubkey) {
+            return { ok: false, reason: "missing_params", guidance: "Provide 'pubkey' (hex) — the contact to add." };
+        }
+        const resolved = resolveContactAgent(getConnState(connectionId), params);
+        if (!resolved.ok)
+            return resolved;
+        // MONIKER-3 AC3: optional pet name. Invalid → reject the request WHOLE (no contact row
+        // either) — a half-applied add would store trust without the name the operator asked for.
+        let moniker;
+        if (params && "moniker" in params && params.moniker !== undefined && params.moniker !== null) {
+            moniker = validateMoniker(params.moniker);
+            if (moniker === null) {
+                return {
+                    ok: false,
+                    reason: "invalid_moniker",
+                    guidance: `A moniker is 1-64 chars: letters, digits, '-' or '_' (regex ${MONIKER_RE.source}).`,
+                };
+            }
+        }
+        // DOD-TIER-4 / DEC-AB-1: an explicit cello_contact_add is a deliberate operator vouch → KNOWN
+        // (still not auto-accept; that is a separate cello_contact_set_tier to whitelisted). provenance
+        // stays null — this relationship formed by neither initiating nor accepting a session (AC5).
+        sessionNodeManager.addContact(resolved.agent, pubkey, moniker, null, TIER.KNOWN);
+        logger.info("contact.added", { agent: resolved.agent, pubkey });
+        if (moniker !== undefined) {
+            logger.info("contact.moniker.set", { agentName: resolved.agent, pubkey });
+        }
+        // Review F3: echo the moniker ONLY when one rode this request — a re-add without a moniker
+        // must not report null while an earlier pet name is still stored.
+        return moniker !== undefined
+            ? { ok: true, agent: resolved.agent, pubkey, moniker }
+            : { ok: true, agent: resolved.agent, pubkey };
+    });
+    // MONIKER-3 AC3: rename (string) or clear (null) an existing contact's pet name. Absence of the
+    // key is NOT a clear (Entry-66-F3): a request that omits it is malformed and rejected.
+    handlers.set("cello_contact_set_moniker", async (params, connectionId) => {
+        const pubkey = typeof params?.pubkey === "string" ? params.pubkey : undefined;
+        const badPubkey = invalidPubkey(pubkey);
+        if (badPubkey)
+            return badPubkey;
+        if (!pubkey || !params || !("moniker" in params)) {
+            return { ok: false, reason: "missing_params", guidance: "Provide 'pubkey' (hex) and 'moniker' — a string to set the pet name, or null to clear it." };
+        }
+        const resolved = resolveContactAgent(getConnState(connectionId), params);
+        if (!resolved.ok)
+            return resolved;
+        const raw = params.moniker ?? null;
+        const moniker = raw === null ? null : validateMoniker(raw);
+        if (raw !== null && moniker === null) {
+            return {
+                ok: false,
+                reason: "invalid_moniker",
+                guidance: `A moniker is 1-64 chars: letters, digits, '-' or '_' (regex ${MONIKER_RE.source}). Pass null to clear.`,
+            };
+        }
+        if (!sessionNodeManager.setContactMoniker(resolved.agent, pubkey, moniker)) {
+            return { ok: false, reason: "contact_not_found", guidance: `No contact ${pubkey.slice(0, 16)}… for agent '${resolved.agent}'. Add it first with cello_contact_add.` };
+        }
+        logger.info("contact.moniker.set", { agentName: resolved.agent, pubkey, cleared: moniker === null });
+        return { ok: true, agent: resolved.agent, pubkey, moniker };
+    });
+    // DOD-CONTACT-VIEW-1 AC1: set a contact's reachability tier. Validates the tier is a known constant
+    // (0..4) — an unknown value is REFUSED, never coerced. Emits contact.tier.changed (old→new).
+    handlers.set("cello_contact_set_tier", async (params, connectionId) => {
+        const pubkey = typeof params?.pubkey === "string" ? params.pubkey : undefined;
+        const badPubkey = invalidPubkey(pubkey);
+        if (badPubkey)
+            return badPubkey;
+        const tier = typeof params?.tier === "number" ? params.tier : undefined;
+        if (!pubkey || tier === undefined) {
+            return { ok: false, reason: "missing_params", guidance: "Provide 'pubkey' (hex) and 'tier' (0=blocked, 1=unknown, 2=known, 3=whitelisted, 4=vip)." };
+        }
+        if (!isKnownTierValue(tier)) {
+            return { ok: false, reason: "invalid_tier", guidance: "tier must be one of 0 (blocked), 1 (unknown), 2 (known), 3 (whitelisted), 4 (vip)." };
+        }
+        const resolved = resolveContactAgent(getConnState(connectionId), params);
+        if (!resolved.ok)
+            return resolved;
+        const oldTier = sessionNodeManager.getTier(resolved.agent, pubkey);
+        if (!sessionNodeManager.setContactTier(resolved.agent, pubkey, tier)) {
+            return { ok: false, reason: "contact_not_found", guidance: `No contact ${pubkey.slice(0, 16)}… for agent '${resolved.agent}'. Add it first with cello_contact_add.` };
+        }
+        // Only an actual change is an audit event — a no-op re-set must not pollute the trail (review F4).
+        if (oldTier !== tier) {
+            logger.info("contact.tier.changed", { agentName: resolved.agent, pubkey, oldTier, newTier: tier });
+        }
+        return { ok: true, agent: resolved.agent, pubkey, tier };
+    });
+    // DOD-AWAY-TIER-1 AC2: set (or clear, with null) a contact's per-contact away message — the most
+    // specific level of the away-text resolution. Validated as a string-or-null; the text is screened
+    // on the outbound path at send time (SI), never here.
+    handlers.set("cello_contact_set_away", async (params, connectionId) => {
+        const pubkey = typeof params?.pubkey === "string" ? params.pubkey : undefined;
+        const badPubkey = invalidPubkey(pubkey);
+        if (badPubkey)
+            return badPubkey;
+        if (!pubkey || !params || !("message" in params)) {
+            return { ok: false, reason: "missing_params", guidance: "Provide 'pubkey' (hex) and 'message' — a string away text, or null to clear it." };
+        }
+        const rawMessage = params.message === null ? null : typeof params.message === "string" ? params.message : undefined;
+        if (rawMessage === undefined) {
+            return { ok: false, reason: "invalid_message", guidance: "'message' must be a string (the away text) or null (to clear)." };
+        }
+        // Review F2/F3: an empty / whitespace-only message CLEARS (consistent with the CLI + null), never
+        // stores a blank away reply; a valid message is length-bounded.
+        const message = rawMessage !== null && rawMessage.trim().length === 0 ? null : rawMessage;
+        if (message !== null && message.length > AWAY_MESSAGE_MAX_LEN) {
+            return { ok: false, reason: "invalid_message", guidance: `The away message must be <= ${AWAY_MESSAGE_MAX_LEN} characters.` };
+        }
+        const resolved = resolveContactAgent(getConnState(connectionId), params);
+        if (!resolved.ok)
+            return resolved;
+        if (!sessionNodeManager.setContactAwayMessage(resolved.agent, pubkey, message)) {
+            return { ok: false, reason: "contact_not_found", guidance: `No contact ${pubkey.slice(0, 16)}… for agent '${resolved.agent}'. Add it first with cello_contact_add.` };
+        }
+        logger.info("contact.away.set", { agentName: resolved.agent, pubkey, cleared: message === null });
+        return { ok: true, agent: resolved.agent, pubkey };
+    });
+    handlers.set("cello_contact_remove", async (params, connectionId) => {
+        // Deliberately NOT shape-gated. `remove` is the ESCAPE HATCH, and gating it would trap the very
+        // rows the gate exists to prevent: a junk contact written by the older, unvalidated code (pubkey
+        // = the literal text "tier") could never be deleted, because deleting it requires naming it.
+        // Validation belongs on the paths that CREATE or MUTATE a row, never on the one that removes it.
+        // Removing a key that was never stored is a harmless not_found.
+        const pubkey = typeof params?.pubkey === "string" ? params.pubkey : undefined;
+        if (!pubkey) {
+            return { ok: false, reason: "missing_params", guidance: "Provide 'pubkey' (hex) — the contact to remove." };
+        }
+        const resolved = resolveContactAgent(getConnState(connectionId), params);
+        if (!resolved.ok)
+            return resolved;
+        const removed = sessionNodeManager.removeContact(resolved.agent, pubkey);
+        logger.info("contact.removed", { agent: resolved.agent, pubkey, removed });
+        return { ok: true, agent: resolved.agent, pubkey, removed };
+    });
+    handlers.set("cello_contact_list", async (params, connectionId) => {
+        const resolved = resolveContactAgent(getConnState(connectionId), params);
+        if (!resolved.ok)
+            return resolved;
+        // MONIKER-5 AC1: each row shows the resolved who (a contact has no session, so the offered
+        // tier doesn't apply — pet name ?? fingerprint).
+        const contacts = sessionNodeManager.listContacts(resolved.agent).map((c) => ({
+            ...c,
+            ...whoLabel({ localMoniker: c.moniker, offeredMoniker: null, pubkeyHex: c.pubkey }),
+        }));
+        return { ok: true, agent: resolved.agent, contacts };
+    });
+    // DOD-SETTINGS-1 AC2: read a per-agent reachability-policy setting (or all set ones). An unset key
+    // returns value:null — the CONSUMER applies the hardcoded default (the daemon runs on defaults alone).
+    handlers.set("cello_settings_get", async (params, connectionId) => {
+        const resolved = resolveContactAgent(getConnState(connectionId), params);
+        if (!resolved.ok)
+            return resolved;
+        // A key was PROVIDED (present and non-null) → it must be a valid string key. Distinguish "key
+        // absent" (list all) from "key present but malformed/unknown" (review F1/F3) — a typo'd read must
+        // NOT masquerade as "unset", the exact invisibility this store exists to prevent.
+        if (params && "key" in params && params.key !== undefined && params.key !== null) {
+            if (typeof params.key !== "string") {
+                return { ok: false, reason: "missing_params", guidance: "'key' must be a string setting key, or omit it to list every set value." };
+            }
+            if (!isValidSettingKey(params.key)) {
+                return { ok: false, reason: "invalid_key", guidance: `Unknown setting key '${params.key}'. Valid keys: ${allSettingKeys().join(", ")}` };
+            }
+            return { ok: true, agent: resolved.agent, key: params.key, value: sessionNodeManager.getSetting(resolved.agent, params.key) };
+        }
+        return { ok: true, agent: resolved.agent, settings: sessionNodeManager.getAllSettings(resolved.agent) };
+    });
+    // DOD-SETTINGS-1 AC2: write a per-agent setting. The KEY is validated against the known namespace —
+    // an unknown key is REFUSED (a typo'd key that persisted would be a setting that never takes effect,
+    // invisible to the operator). Per-key VALUE validation (finite bounds, etc.) lives with the consumer.
+    handlers.set("cello_settings_set", async (params, connectionId) => {
+        const key = typeof params?.key === "string" ? params.key : undefined;
+        const rawValue = params?.value;
+        // NULL CLEARS THE SETTING, matching cello_contact_set_away, which has always taken
+        // `string | null`. This handler's own guidance told callers to "pass null to clear" while
+        // coercing null to undefined and rejecting it as missing_params — so there was NO way to unset a
+        // setting from either surface. A caller following that advice from the CLI stored the literal
+        // text "null", which for an away message meant the agent greeted every caller with "null".
+        const isClear = rawValue === null;
+        const value = typeof rawValue === "string" ? rawValue : typeof rawValue === "number" ? String(rawValue) : undefined;
+        if (!key || (value === undefined && !isClear)) {
+            return { ok: false, reason: "missing_params", guidance: `Provide 'key' and 'value' (string or number), or value null to clear the setting. Valid keys: ${allSettingKeys().join(", ")}` };
+        }
+        if (!isValidSettingKey(key)) {
+            return { ok: false, reason: "invalid_key", guidance: `Unknown setting key '${key}'. Valid keys: ${allSettingKeys().join(", ")}` };
+        }
+        if (isClear) {
+            // Reported honestly: `cleared` says whether a row actually went away, so clearing an already
+            // unset key reads as the no-op it is instead of implying something was removed.
+            const resolvedClear = resolveContactAgent(getConnState(connectionId), params);
+            if (!resolvedClear.ok)
+                return resolvedClear;
+            const removed = sessionNodeManager.deleteSetting(resolvedClear.agent, key);
+            logger.info("setting.cleared", { agentName: resolvedClear.agent, key, removed });
+            return {
+                ok: true,
+                agent: resolvedClear.agent,
+                key,
+                value: null,
+                cleared: removed,
+                guidance: removed
+                    ? `'${key}' is unset — the built-in default applies again.`
+                    : `'${key}' was already unset; nothing to clear. The built-in default applies.`,
+            };
+        }
+        // Past the clear branch, so this is a real set. The guard above already rejected an undefined
+        // value on this path; re-check rather than assert, so a future edit to that guard cannot let an
+        // undefined reach setSetting behind a cast that silently agreed with it.
+        if (value === undefined) {
+            return { ok: false, reason: "missing_params", guidance: `Provide 'value' (string or number), or null to clear. Valid keys: ${allSettingKeys().join(", ")}` };
+        }
+        // DOD-TIER-BOUNDS-SETTINGS AC2: a bound value must be a finite positive integer (INV-TIER-BOUND —
+        // a setting cannot REMOVE a bound). Away-text values are free-form.
+        const valueCheck = validateSettingValue(key, value);
+        if (!valueCheck.ok) {
+            return { ok: false, reason: "invalid_value", guidance: valueCheck.reason };
+        }
+        const resolved = resolveContactAgent(getConnState(connectionId), params);
+        if (!resolved.ok)
+            return resolved;
+        sessionNodeManager.setSetting(resolved.agent, key, value);
+        logger.info("setting.changed", { agentName: resolved.agent, key });
+        return { ok: true, agent: resolved.agent, key, value };
+    });
+    // MONIKER-1 AC2/AC3: cello_set_moniker — set (or clear, via explicit null) an agent's outbound-name
+    // override on the agents table. Validated at set-time with the shared MONIKER-0 rule; an invalid
+    // value is rejected here AND at the store (backstop) — it can never be stored. Local-only: the
+    // name is never sent to the directory (AC4).
+    handlers.set("cello_set_moniker", async (params, connectionId) => {
+        const resolved = resolveContactAgent(getConnState(connectionId), params);
+        if (!resolved.ok)
+            return resolved;
+        // Absence is NOT a clear (review Finding 3): JSON preserves explicit null, so a request
+        // that omits the key is malformed — rejecting it keeps a dropped field from silently
+        // deleting a stored override while reporting success.
+        if (!params || !("moniker" in params)) {
+            return { ok: false, reason: "missing_params", guidance: "Provide 'moniker' — a string to set the outbound name, or null to clear the override." };
+        }
+        const raw = params.moniker ?? null;
+        const moniker = raw === null ? null : validateMoniker(raw);
+        if (raw !== null && moniker === null) {
+            return {
+                ok: false,
+                reason: "invalid_moniker",
+                guidance: `A moniker is 1-64 chars: letters, digits, '-' or '_' (regex ${MONIKER_RE.source}). Pass null to clear the override.`,
+            };
+        }
+        if (!setAgentMoniker(resolved.agent, moniker)) {
+            return { ok: false, reason: "agent_not_found", guidance: `No active agent named '${resolved.agent}'. See cello_agents.` };
+        }
+        logger.info("agent.moniker.set", { agentName: resolved.agent, cleared: moniker === null });
+        return { ok: true, agent: resolved.agent, moniker };
+    });
+    // M8C-TGDOOR-1: cello_telegram_set_token — persist the daemon-wide bot token + allowlisted
+    // operator chat ID, then start the poller immediately (no restart needed).
+    handlers.set("cello_telegram_set_token", async (params, _connectionId) => {
+        const botToken = typeof params?.bot_token === "string" ? params.bot_token : undefined;
+        const chatId = typeof params?.allowlisted_chat_id === "string" ? params.allowlisted_chat_id : undefined;
+        if (!botToken || !chatId) {
+            return { ok: false, reason: "missing_params", guidance: "Provide 'bot_token' and 'allowlisted_chat_id'." };
+        }
+        sessionNodeManager.setTelegramSettings(botToken, chatId);
+        startTelegramPollerIfConfigured(); // always bumps the generation — restarts even if already running
+        logger.info("telegram.settings.updated", {});
+        return { ok: true };
+    });
+}
+//# sourceMappingURL=contact-handlers.js.map

package/dist/contact-handlers.js.map

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

package/dist/contact-pubkey-case.d.ts

@@ -0,0 +1,65 @@
+/**
+ * A PUBLIC KEY IS BYTES. ITS HEX CASE IS NOT PART OF ITS IDENTITY.
+ *
+ * ─── The defect, from the operator's chair ─────────────────────────────────────────────────────
+ *
+ * You paste a counterparty's public key with any uppercase in it — which is what half the tools in
+ * the world hand you — and CELLO stores that string verbatim. From then on the address book holds a
+ * contact you can SEE in `cello_contacts` and that every behavioural read treats as a stranger:
+ *
+ *  - `getTier` returns UNKNOWN, so the tighter inbound bounds apply and they are never auto-accepted;
+ *  - `isKnown` is false, so they get the stranger wording;
+ *  - a per-contact away message, a pet name, a trust-signal disclosure choice — all set against one
+ *    spelling and read against the other, so none of them ever apply;
+ *  - and **a key you BLOCKED in one spelling is unblocked in the other**, which is the direction
+ *    that matters.
+ *
+ * Nothing errors, nothing logs, and the row is right there on screen. Found by review while ruling
+ * on `024-ORPHANTRIAGE`, which had worked around it locally with its own `lower(pubkey)` lookup
+ * rather than changing a predicate several callers depend on.
+ *
+ * ─── The fix is BOTH halves, and either alone leaves the bug ───────────────────────────────────
+ *
+ * 1. **Normalize at the accessor**, so a caller may pass either spelling and always reach one row —
+ *    and so two spellings can never create two rows through the `(agent_id, pubkey)` primary key.
+ * 2. **Fold the rows that already exist**, because normalizing reads alone strands every mixed-case
+ *    row already on an operator's disk: it becomes unreachable rather than merely wrong.
+ *
+ * ⚠️ **THE WIRE BOUNDARY STILL ACCEPTS EITHER SPELLING, DELIBERATELY.** `invalidPubkey` validates
+ * `[0-9a-fA-F]{64}`, and tightening it to lowercase would reject a key the operator pasted correctly
+ * from a tool that happens to upper-case. The answer is to accept what they paste and store one form,
+ * not to argue with them about capitals.
+ */
+import type { Logger } from "./types.js";
+/** Minimal surface: what these two functions need from a SQLCipher handle. */
+interface MigrationDb {
+    exec(sql: string): unknown;
+    prepare(sql: string): {
+        run(...params: unknown[]): {
+            changes: number | bigint;
+        };
+    };
+}
+/**
+ * The one spelling every contact-keyed table stores and every accessor compares against.
+ *
+ * Hex, so lowercase is the conventional form and the one `Buffer.toString("hex")` produces — which
+ * matters, because keys arriving from the wire come through that call and keys arriving from an
+ * operator's paste do not.
+ */
+export declare function normalizeContactPubkey(pubkey: string): string;
+/**
+ * Fold every mixed-case contact row to one spelling. Idempotent; a no-op on a clean database.
+ *
+ * ⚠️ **ON A COLLISION THE MOST RESTRICTIVE SETTING WINS, and that is the whole reason this is not a
+ * two-line UPDATE.** When both spellings exist they are two halves of one relationship, and merging
+ * them by taking either one at random can silently UNBLOCK a key the operator blocked, or disclose a
+ * trust signal they withheld. `MIN` over the tier and over the disclosure flag makes the merge fail
+ * in the safe direction every time: BLOCKED(0) beats anything, withheld(0) beats presented(1).
+ *
+ * The operator can always loosen a setting afterwards; they cannot recover from a permission they
+ * did not know had been widened.
+ */
+export declare function foldContactPubkeyCase(db: MigrationDb, logger: Logger): void;
+export {};
+//# sourceMappingURL=contact-pubkey-case.d.ts.map

package/dist/contact-pubkey-case.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contact-pubkey-case.d.ts","sourceRoot":"","sources":["../src/contact-pubkey-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAGzC,8EAA8E;AAC9E,UAAU,WAAW;IACnB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,GAAG,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,GAAG;YAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CACnF;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAiG3E"}

package/dist/contact-pubkey-case.js

@@ -0,0 +1,136 @@
+/**
+ * A PUBLIC KEY IS BYTES. ITS HEX CASE IS NOT PART OF ITS IDENTITY.
+ *
+ * ─── The defect, from the operator's chair ─────────────────────────────────────────────────────
+ *
+ * You paste a counterparty's public key with any uppercase in it — which is what half the tools in
+ * the world hand you — and CELLO stores that string verbatim. From then on the address book holds a
+ * contact you can SEE in `cello_contacts` and that every behavioural read treats as a stranger:
+ *
+ *  - `getTier` returns UNKNOWN, so the tighter inbound bounds apply and they are never auto-accepted;
+ *  - `isKnown` is false, so they get the stranger wording;
+ *  - a per-contact away message, a pet name, a trust-signal disclosure choice — all set against one
+ *    spelling and read against the other, so none of them ever apply;
+ *  - and **a key you BLOCKED in one spelling is unblocked in the other**, which is the direction
+ *    that matters.
+ *
+ * Nothing errors, nothing logs, and the row is right there on screen. Found by review while ruling
+ * on `024-ORPHANTRIAGE`, which had worked around it locally with its own `lower(pubkey)` lookup
+ * rather than changing a predicate several callers depend on.
+ *
+ * ─── The fix is BOTH halves, and either alone leaves the bug ───────────────────────────────────
+ *
+ * 1. **Normalize at the accessor**, so a caller may pass either spelling and always reach one row —
+ *    and so two spellings can never create two rows through the `(agent_id, pubkey)` primary key.
+ * 2. **Fold the rows that already exist**, because normalizing reads alone strands every mixed-case
+ *    row already on an operator's disk: it becomes unreachable rather than merely wrong.
+ *
+ * ⚠️ **THE WIRE BOUNDARY STILL ACCEPTS EITHER SPELLING, DELIBERATELY.** `invalidPubkey` validates
+ * `[0-9a-fA-F]{64}`, and tightening it to lowercase would reject a key the operator pasted correctly
+ * from a tool that happens to upper-case. The answer is to accept what they paste and store one form,
+ * not to argue with them about capitals.
+ */
+import { extractErrorMessage } from "./error-message.js";
+/**
+ * The one spelling every contact-keyed table stores and every accessor compares against.
+ *
+ * Hex, so lowercase is the conventional form and the one `Buffer.toString("hex")` produces — which
+ * matters, because keys arriving from the wire come through that call and keys arriving from an
+ * operator's paste do not.
+ */
+export function normalizeContactPubkey(pubkey) {
+    return pubkey.toLowerCase();
+}
+/**
+ * Fold every mixed-case contact row to one spelling. Idempotent; a no-op on a clean database.
+ *
+ * ⚠️ **ON A COLLISION THE MOST RESTRICTIVE SETTING WINS, and that is the whole reason this is not a
+ * two-line UPDATE.** When both spellings exist they are two halves of one relationship, and merging
+ * them by taking either one at random can silently UNBLOCK a key the operator blocked, or disclose a
+ * trust signal they withheld. `MIN` over the tier and over the disclosure flag makes the merge fail
+ * in the safe direction every time: BLOCKED(0) beats anything, withheld(0) beats presented(1).
+ *
+ * The operator can always loosen a setting afterwards; they cannot recover from a permission they
+ * did not know had been widened.
+ */
+export function foldContactPubkeyCase(db, logger) {
+    db.exec("BEGIN");
+    try {
+        // ── contacts ──────────────────────────────────────────────────────────────────────────────
+        //
+        // Step 1 must run BEFORE the delete: once the duplicate is gone there is nothing left to take
+        // the restrictive value from.
+        const tightened = Number(db.prepare(`UPDATE contacts SET tier = (
+         SELECT MIN(COALESCE(c2.tier, 1)) FROM contacts c2
+          WHERE c2.agent_id = contacts.agent_id AND lower(c2.pubkey) = contacts.pubkey)
+       WHERE pubkey = lower(pubkey)
+         AND EXISTS (SELECT 1 FROM contacts c3
+                      WHERE c3.agent_id = contacts.agent_id
+                        AND lower(c3.pubkey) = contacts.pubkey
+                        AND c3.pubkey <> contacts.pubkey)`).run().changes);
+        const droppedContacts = Number(db.prepare(`DELETE FROM contacts WHERE pubkey <> lower(pubkey)
+         AND EXISTS (SELECT 1 FROM contacts c2
+                      WHERE c2.agent_id = contacts.agent_id AND c2.pubkey = lower(contacts.pubkey))`).run().changes);
+        const foldedContacts = Number(db.prepare("UPDATE contacts SET pubkey = lower(pubkey) WHERE pubkey <> lower(pubkey)").run().changes);
+        // ── contact_signal_prefs ──────────────────────────────────────────────────────────────────
+        //
+        // `present` is a disclosure choice, so 0 (withhold) is the restrictive value and wins the merge.
+        const tightenedPrefs = Number(db.prepare(`UPDATE contact_signal_prefs SET present = (
+         SELECT MIN(p2.present) FROM contact_signal_prefs p2
+          WHERE p2.agent_id = contact_signal_prefs.agent_id
+            AND lower(p2.contact_pubkey) = contact_signal_prefs.contact_pubkey
+            AND p2.signal_hash = contact_signal_prefs.signal_hash)
+       WHERE contact_pubkey = lower(contact_pubkey)
+         AND EXISTS (SELECT 1 FROM contact_signal_prefs p3
+                      WHERE p3.agent_id = contact_signal_prefs.agent_id
+                        AND lower(p3.contact_pubkey) = contact_signal_prefs.contact_pubkey
+                        AND p3.signal_hash = contact_signal_prefs.signal_hash
+                        AND p3.contact_pubkey <> contact_signal_prefs.contact_pubkey)`).run().changes);
+        db.prepare(`DELETE FROM contact_signal_prefs WHERE contact_pubkey <> lower(contact_pubkey)
+         AND EXISTS (SELECT 1 FROM contact_signal_prefs p2
+                      WHERE p2.agent_id = contact_signal_prefs.agent_id
+                        AND p2.contact_pubkey = lower(contact_signal_prefs.contact_pubkey)
+                        AND p2.signal_hash = contact_signal_prefs.signal_hash)`).run();
+        const foldedPrefs = Number(db.prepare("UPDATE contact_signal_prefs SET contact_pubkey = lower(contact_pubkey) WHERE contact_pubkey <> lower(contact_pubkey)").run().changes);
+        // ── contact_rename_notices ────────────────────────────────────────────────────────────────
+        //
+        // A queued display notice, with nothing to merge: the lowercase row is kept and the duplicate
+        // dropped. Worst case the operator is offered a name once instead of twice.
+        db.prepare(`DELETE FROM contact_rename_notices WHERE pubkey <> lower(pubkey)
+         AND EXISTS (SELECT 1 FROM contact_rename_notices n2
+                      WHERE n2.agent_id = contact_rename_notices.agent_id
+                        AND n2.pubkey = lower(contact_rename_notices.pubkey))`).run();
+        const foldedNotices = Number(db.prepare("UPDATE contact_rename_notices SET pubkey = lower(pubkey) WHERE pubkey <> lower(pubkey)").run().changes);
+        db.exec("COMMIT");
+        // Silent on a clean database — this runs at every open, and a line per boot saying "nothing to
+        // do" is how a log stops being read.
+        if (foldedContacts + droppedContacts + foldedPrefs + foldedNotices > 0) {
+            logger.info("contacts.pubkey.case.folded", {
+                contacts: foldedContacts,
+                duplicatesMerged: droppedContacts,
+                tiersTightened: tightened,
+                signalPrefs: foldedPrefs,
+                signalPrefsTightened: tightenedPrefs,
+                renameNotices: foldedNotices,
+                impact: "contacts stored under a mixed-case public key were unreachable to every behavioural read — " +
+                    "tier, away message, pet name and disclosure choice — and are now one row. Where both " +
+                    "spellings existed, the more restrictive setting was kept.",
+            });
+        }
+    }
+    catch (err) {
+        // SQLite may have already aborted the transaction; a failing ROLLBACK must not mask the cause.
+        try {
+            db.exec("ROLLBACK");
+        }
+        catch { /* the failing statement may have aborted it already */ }
+        logger.error("contacts.pubkey.case.fold.failed", {
+            reason: extractErrorMessage(err),
+            impact: "contacts stored under a mixed-case public key stay split across two rows, so a tier, block " +
+                "or away message set against one spelling does not apply to the other. Reads are still " +
+                "normalized, so a mixed-case row is now unreachable rather than merely wrong.",
+        });
+        throw err;
+    }
+}
+//# sourceMappingURL=contact-pubkey-case.js.map

package/dist/contact-pubkey-case.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contact-pubkey-case.js","sourceRoot":"","sources":["../src/contact-pubkey-case.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAGH,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAQzD;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAAc;IACnD,OAAO,MAAM,CAAC,WAAW,EAAE,CAAC;AAC9B,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,qBAAqB,CAAC,EAAe,EAAE,MAAc;IACnE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjB,IAAI,CAAC;QACH,6FAA6F;QAC7F,EAAE;QACF,8FAA8F;QAC9F,8BAA8B;QAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,OAAO,CACjC;;;;;;;0DAOoD,CACrD,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QACjB,MAAM,eAAe,GAAG,MAAM,CAAC,EAAE,CAAC,OAAO,CACvC;;oGAE8F,CAC/F,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QACjB,MAAM,cAAc,GAAG,MAAM,CAAC,EAAE,CAAC,OAAO,CACtC,0EAA0E,CAC3E,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QAEjB,6FAA6F;QAC7F,EAAE;QACF,iGAAiG;QACjG,MAAM,cAAc,GAAG,MAAM,CAAC,EAAE,CAAC,OAAO,CACtC;;;;;;;;;;sFAUgF,CACjF,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QACjB,EAAE,CAAC,OAAO,CACR;;;;+EAIyE,CAC1E,CAAC,GAAG,EAAE,CAAC;QACR,MAAM,WAAW,GAAG,MAAM,CAAC,EAAE,CAAC,OAAO,CACnC,sHAAsH,CACvH,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QAEjB,6FAA6F;QAC7F,EAAE;QACF,8FAA8F;QAC9F,4EAA4E;QAC5E,EAAE,CAAC,OAAO,CACR;;;8EAGwE,CACzE,CAAC,GAAG,EAAE,CAAC;QACR,MAAM,aAAa,GAAG,MAAM,CAAC,EAAE,CAAC,OAAO,CACrC,wFAAwF,CACzF,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QAEjB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAElB,+FAA+F;QAC/F,qCAAqC;QACrC,IAAI,cAAc,GAAG,eAAe,GAAG,WAAW,GAAG,aAAa,GAAG,CAAC,EAAE,CAAC;YACvE,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE;gBACzC,QAAQ,EAAE,cAAc;gBACxB,gBAAgB,EAAE,eAAe;gBACjC,cAAc,EAAE,SAAS;gBACzB,WAAW,EAAE,WAAW;gBACxB,oBAAoB,EAAE,cAAc;gBACpC,aAAa,EAAE,aAAa;gBAC5B,MAAM,EACJ,6FAA6F;oBAC7F,uFAAuF;oBACvF,2DAA2D;aAC9D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,+FAA+F;QAC/F,IAAI,CAAC;YAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,uDAAuD,CAAC,CAAC;QAC9F,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE;YAC/C,MAAM,EAAE,mBAAmB,CAAC,GAAG,CAAC;YAChC,MAAM,EACJ,6FAA6F;gBAC7F,wFAAwF;gBACxF,8EAA8E;SACjF,CAAC,CAAC;QACH,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC"}