@bli-cockpit/cli 0.2.291 → 0.2.293

package/dist/commands/local-help-commands-tower.js

@@ -112,7 +112,7 @@ export const TOWER_COMMAND_HELP = [
             "dm <email> [<email>...] — with several addresses, opens (or re-opens) the group message with exactly those people plus you; the same set always resolves to the same channel. channel <channel> [--json] — the channel's details: name, description, kind, archived, audience (a public channel is everyone in the org, not a member count), source workspace label (where it came from; it grants no access), whether you can manage it, and whether you hid it. channel <channel> --rename <name> | --describe <text> | --archive | --unarchive — changes it (one update; --rename and --describe can go together). Only the person who made the channel, its owners and its moderators can; anyone else is refused channel_manage_refused, a name in use channel_name_taken, a direct message dm_not_editable. Archiving keeps every message and link and stops new posts (channel_archived); unarchive restores posting. members <channel> [--json] — who is in a private channel or a direct message; a public channel says everyone in the org can read it. members <channel> --add <email> | --remove <email> — private channels only, by the same people who can manage it; a removed person's next read is refused. A direct message keeps the people it started with (dm_not_editable): start a new group with `msg dm a@x b@y`. hide <channel> / unhide <channel> — drops a PUBLIC channel from your own sidebar, or puts it back; it changes nothing for anyone else and nothing about reading, search, mentions or notifications. A private channel or direct message is refused hide_not_public.",
             "read <channel> [--limit <n>] [--thread <id>] [--mark-read] — the channel's most recent top-level messages, oldest first; --thread <id> reads one thread's replies instead. The first page also says where the messages come from (for an imported Slack channel: how long ago the archive was checked, or that it is unknown) and where YOUR read line stands. Reading never moves the read line; --mark-read moves it to the newest message shown, and says plainly if that failed.",
             "unread <channel> --from <message-id> — marks that message and everything after it unread, so the web sidebar badge and the NEW MESSAGES line start there. Opening or reading a channel never clears unseen history.",
-            "send <channel> [--thread <id>] [--request-id <uuid>] — posts a message. The content is never accepted on the command line: pipe it in, e.g. `echo \"hello\" | cockpit msg send general`. Every send carries a request id (minted when you give none); retry a send whose answer was lost with the SAME --request-id and the same text and it posts once. The same id with different text is refused request_id_reused, not applied as an edit. send <channel> --file <id> [--file <id>...] — attaches up to 10 ready files (from `msg file upload`) to the message. The text is optional with a file; it is read from stdin only when something is piped in. file upload <channel> <path|-> [--name <name>] — uploads a file of 1 byte to 25 MB straight to storage (reserve, PUT, finalize) and prints its id and state; `-` reads stdin and needs --name. A file is ready, not sent: attach it with `msg send <channel> --file <id>`. file show <id> — the descriptor (state reserved, ready, attached, cancelled or abandoned). file download <id> [--out <path>] — saves the bytes (60-second signed link; never overwrites). file cancel <id> — ends an unattached file and removes its bytes. file list <channel> — your own unsent uploads there, with coverage. A file is readable only by readers of its channel, and only once attached to a live message. Refusals keep the door's reason: file_too_large, file_not_found_or_unreadable, file_not_uploaded, file_not_ready, file_already_attached, file_wrong_channel, storage_unreachable.",
+            "send <channel> [--thread <id>] [--request-id <uuid>] — posts a message. The content is never accepted on the command line: pipe it in, e.g. `echo \"hello\" | cockpit msg send general`. Every send carries a request id (minted when you give none); retry a send whose answer was lost with the SAME --request-id and the same text and it posts once. The same id with different text is refused request_id_reused, not applied as an edit. send <channel> --file <id> [--file <id>...] — attaches up to 10 ready files (from `msg file upload`) to the message. The text is optional with a file; it is read from stdin only when something is piped in. file upload <channel> <path|-> [--name <name>] — uploads a file of 1 byte to 25 MB straight to storage (reserve, PUT, finalize) and prints its id and state; `-` reads stdin and needs --name. A file is ready, not sent: attach it with `msg send <channel> --file <id>`. file show <id> — the descriptor (state reserved, ready, attached, cancelled or abandoned). file download <id> [--out <path>] — saves the bytes (60-second signed link; never overwrites). file cancel <id> — ends an unattached file and removes its bytes. file list <channel> — your own unsent uploads there, with coverage. A file is readable only by readers of its channel, and only once attached to a live message. Refusals keep the door's reason: file_too_large, file_not_found_or_unreadable, file_not_uploaded, file_not_ready, file_already_attached, file_wrong_channel, storage_unreachable (no answer: try again), storage_refused (storage said no: retrying will not help; the sentence names the step, HTTP status and class).",
             "edit <message-id> [--expected-revision <n>] [--request-id <uuid>] — replaces your own message's text (piped in). With --expected-revision, an edit of a message that has moved on is refused revision_conflict and nothing is saved over it; the current revision is printed. A message you did not write, or one that was deleted, is refused by name. delete <message-id> [--expected-revision <n>] [--request-id <uuid>] — deletes by tombstone: the text is cleared and every surface reads \"This message was deleted\", but the row stays so its thread, replies and reply count survive. Search and unread counts ignore it. A repeat answers already_deleted. outcome <request-uuid> — your own write receipt for a send, edit or delete: committed, not_committed (with the reason) or unknown_check_again. Run it after a timeout before retrying. draft [list|show|save|discard|restore|send] <channel> [--thread <id>] [--expected-revision <n>] [--request-id <uuid>] — the text you have not sent yet, one draft per channel and thread, the same drafts the browser autosaves. list shows all your unsent drafts (newest first, with coverage); show prints one; save takes the body on stdin (`echo \"half a thought\" | cockpit msg draft save general`) and with --expected-revision refuses draft_revision_conflict, naming the stored revision, instead of overwriting; discard keeps the text (state discarded) and restore brings it back; send posts the stored draft with a fresh request id (--request-id to retry the same send) and its revision, prints the receipt, and marks the draft sent only if it did not change meanwhile. Only you can read or change your drafts.",
             "thread <id> --channel <channel> [--before <cursor>] [--limit <n>] — one thread's replies by the parent message's id.",
             "show <message-id> — exact message, thread root and bounded neighbors. read/thread --before takes the preceding nextCursor; repeat until hasMore is false. activity [--mentions|--threads] [--unread] [--before <cursor>] [--limit <n>] [--mark-read] — your Mentions (messages that mention you) and Threads (replies in threads you follow: you started it, replied natively or followed it by hand), newest first, with unread counts and coverage; items whose message you can no longer read are left out and counted as dropped. Nothing is marked read by looking; --mark-read marks the unread items just printed, and the web marks one when its message is shown. Activity covers native Tower messages only, so the Slack import adds none. follow <message-id> / unfollow <message-id> — the id is the thread's top-level message; an explicit unfollow wins over a later auto follow, and earlier items stay. react <message-id> <emoji> [--remove] — adds or takes off your reaction (idempotent). Refusals: thread_root_not_found_or_unreadable, not_a_thread_root, reaction_not_found. notify — your message notification settings (the same ones the web header menu and Settings change): the default level (all, mentions or none; mentions is the default and covers direct messages, @mentions and replies in threads you follow), quiet hours and per-channel overrides. notify set --level <all|mentions|none> changes the default; add --channel <id|name> for one channel, with --mute / --unmute, or --clear to remove the override. notify quiet <HH:MM-HH:MM> [--timezone <zone>] sets quiet hours (24-hour, may wrap midnight; the zone defaults to this machine's) and notify quiet --off removes them. notify receipts [--message <id>] [--before <cursor>] [--limit <n>] lists what was delivered, suppressed or blocked and why (never message text): outcome shown means Tower told a browser tab to show a banner; push_accepted means the push service took the phone push, not that a phone showed it. Quiet hours and levels hold back banners and phone pushes, never the message or its unread badge. Refusals: invalid_notification_level, invalid_quiet_hours, invalid_timezone. search [words] [--from <email|me>]... [--in <channel>] [--since YYYY-MM-DD] [--until YYYY-MM-DD] [--timezone <IANA>] [--replies|--top-level] [--has-file] [--before <cursor>] [--limit <n>] — message search on your own access, newest first (not ranked; `cockpit search --kind msg` is the ranked bar). Each hit prints its id, channel, author, time and snippet, then `more: --before <cursor>` or `complete`; repeat with the cursor until complete. --from takes an email, a user id or me and repeats; --in takes a channel id or #name (exact after case folding, an ambiguous name is refused); --since and --until are whole local days in --timezone, both inclusive (this machine's zone when you give none). The words may be left out when a filter is set, so `msg search --has-file` finds attachment-only messages. Inline operators work in the words as in the web box: from:<email|me> in:#name after:<day> before:<day> (exclusive) on:<day> has:file is:reply is:root. Recognised but unsupported operators (has:link, has:pin, has:reaction, is:saved, is:dm, to:, with:, during:) are refused unsupported_search_operator, naming the operator; a bad day, zone, person or channel is refused invalid_search_filter. Messages imported from Slack carry no file links, so has:file does not find them. Deleted messages, channels you cannot read and files you cannot read never appear.",
@@ -480,7 +480,8 @@ export const TOWER_COMMAND_HELP = [
             "log appends an opinion to ~/.codex/AGENT-EXPERIENCE.md and posts it to Tower.",
             "Use --reason-stdin instead of a quoted reason; --json reports shipped status.",
             "Reasons: one line, max 500 characters; no prompts, memory bodies or secrets.",
-            "Markers: [bli] = BLI Memory, ◪ = Supermemory, [bli]+◪ = both.",
+            "--store is optional: bli (BLI Memory) is the only store. The retired supermemory and both",
+            "values are accepted and logged as retired: both records as bli, supermemory records nothing.",
             "Offline entries stay queued; the next collector sync retries with the same ID.",
         ],
     ],

package/dist/commands/local-help-commands.js

@@ -23,7 +23,7 @@ import { TOWER_COMMAND_HELP } from "./local-help-commands-tower.js";
 import { TOWER_OPS_COMMAND_HELP } from "./local-help-commands-tower-ops.js";
 /** One manual per collector command; the Tower nouns are spread in from their own file. */
 const COMMAND_HELP = new Map([
-    ["books", [BOOKS_USAGE, "Client Books: each engagement's record (timeline, actions, documents, meetings, ...). A member of a book reads it; a member with edit access, or a founder, writes it; only founders create books and manage members. put without --merge replaces the record's data; --merge changes only the fields given. --version <n> makes a write conditional: refused as version_conflict when someone changed the record since you read version n (0 = must not exist yet). delete is soft. export writes <dir>/<collection>/<doc_id>.json; import reads that layout and writes 50 records per batch. MCP twins: books_list, books_create, books_members, books_read, books_write, books_batch. Docs: docs/architecture/client-books.md."]],
+    ["books", [BOOKS_USAGE, "Client Books: each engagement's record (timeline, actions, documents, meetings, ...). A member of a book reads it; a member with edit access, or a founder, writes it; only founders create books and manage members. put without --merge replaces the record's data; --merge changes only the fields given. --version <n> makes a write conditional: refused as version_conflict when someone changed the record since you read version n (0 = must not exist yet). delete is soft. export writes <dir>/<collection>/<doc_id>.json; import reads that layout and writes 50 records per batch. archive hides a book from the Client Books page; archive --restore returns it; nothing is deleted. list marks archived books. MCP twins: books_list, books_archive, books_create, books_members, books_read, books_write, books_batch. Docs: docs/architecture/client-books.md."]],
     ["glossary", ["Usage: cockpit glossary list|add <wrong> --to <name>|remove <wrong> [--json]", "Quote phrases. Removing a form prevents future corrections of it."]],
     ["skills", ["Usage: cockpit skills library [--weeks <1-52>] [--json] | cockpit skills refresh [--weeks <1-104>] [--json]", "The Skill Library: every agent skill and command our GitHub repos define (name, description, repo, path, versions) with weekly use by person, from the sessions Tower already collects. Uses that match no scanned skill are listed as unmatched, never dropped. The first line is the coverage: repos scanned, skills, invocations matched of total. You see your own usage; Vee, Jeetesh and Ed see everyone's except a founder's. refresh scans the repos and recomputes the weekly totals now (super_admin only; a stale library also refreshes itself when read). MCP twins: skills_library, skills_refresh. Web: TEAM > Skills."]],
     ["push", ["Usage: cockpit push status | test [--dashboard-url <url>] [--json]", "Phone notifications. status lists your saved devices and whether the server has its push keys; test sends a test push to every saved device. Turn a phone on from Settings on the phone."]],
@@ -105,7 +105,7 @@ const COMMAND_HELP = new Map([
     [
         "doctor",
         [
-            "Usage: cockpit doctor [--workspace <path>] [--check | --no-repair] [--no-usage-telemetry] [--no-memory] [--lock-wait <seconds>] [--backfill-budget <seconds>] [--json]",
+            "Usage: cockpit doctor [--workspace <path>] [--check | --no-repair] [--no-usage-telemetry] [--no-memory] [--trust-codex-hooks] [--lock-wait <seconds>] [--backfill-budget <seconds>] [--json]",
             "",
             "Diagnose, repair, and verify this machine.",
             "Repairs CLI, background sync, sign-in, roots, memory and hooks, agent rules, catch-up, uploads, and cleanup.",
@@ -113,6 +113,7 @@ const COMMAND_HELP = new Map([
             "--no-usage-telemetry switches off Claude Code and Codex usage export, including later doctor runs.",
             "--no-memory turns BLI Memory off on this machine (same as `cockpit memory off`), including later runs and the background sync.",
             "In a terminal, the first doctor or onboard asks once whether BLI Memory may save your sessions; `cockpit memory on|off` changes the answer.",
+            "In a terminal, doctor also asks once \"Auto-trust the BLI Memory hooks in Codex? [Y/n]\" while Codex has not trusted them; yes (the default) writes them to Codex's system hooks folder with one sudo or Windows administrator prompt, so Codex never asks again. A no is remembered; --trust-codex-hooks trusts them without the question. Background and --json runs never ask.",
             "--check or --no-repair diagnoses without repairs. --dry-run previews repairs.",
             "--backfill-budget defaults to 900 seconds; catch-up repeats chunks until complete, with progress every 30 seconds.",
             "Doctor never waits for the background sync: a running sync is reported as running (with how long ago it started) and doctor finishes; a sync that stopped responding or made no progress for 15 minutes is ended and doctor carries on. --lock-wait is accepted and changes nothing. Progress prints at most every 30 seconds and says what changed.",

package/dist/commands/local-help-notes.js

@@ -3,7 +3,7 @@ export const NOTES_HELP = [
     [
         "notes",
         [
-            "Usage: cockpit notes [list|show <id>|shelf|shelves|folders|mkdir <path>|rmdir <path>|rename <path>|upload <paths...> [--wait]|paste|share <id>|unshare <id>|summarize <id>|move <id>|accounts|connect|detach <id>|sync <id>|sync-status [<id>]|recordings <note-id>|recording <id>|record start|stop|status|cancel|app install|uninstall|status|review [<note-id>] [--submit|--accept-all]] [flags]",
+            "Usage: cockpit notes [list|show <id>|shelf|shelves|folders|mkdir <path>|rmdir <path>|rename <path>|upload <paths...> [--wait]|paste|share <id>|unshare <id>|correct <id> --from <term> --to <term>|summarize <id>|move <id>|accounts|connect|detach <id>|sync <id>|sync-status [<id>]|recordings <note-id>|recording <id>|record start|stop|status|cancel|app install|uninstall|status|review [<note-id>] [--submit|--accept-all]] [flags]",
             "Audio uploads: MP3, M4A, WAV, WebM and OGG, up to 1 GB. Over 4 MB (a whole meeting) the file goes straight to storage and is transcribed in the background; --wait then polls for up to 4 hours and prints progress, otherwise for at most 330 seconds.",
             "",
             "record start|stop [<session-id>]|status|cancel — record a meeting in a room from this machine's microphone (Apple Silicon macOS and Windows; Linux says it is not supported). On Windows the microphone needs Settings > Privacy & security > Microphone on, including Let desktop apps access your microphone. Nothing leaves the machine while recording; the recorder stops by itself after 8 hours (under the 1 GB upload limit). `stop` uploads the whole original recording, silence included, and Tower writes a note with Speaker 1, Speaker 2... lines, or says no speech was detected (add --wait to watch the transcription). `cancel` stops and KEEPS the file; `status` lists what is recording and every session waiting for upload (`needs_upload`); `stop <session-id>` uploads a cancelled, crashed or auto-stopped session. The BLI Notetaker app uploads waiting sessions by itself. The recording also stays on this machine.",
@@ -24,6 +24,7 @@ export const NOTES_HELP = [
             "share <id> [--yes] — let everyone signed in read the statements that are safe to share. Asks first in a terminal; --yes is required without one, and --json implies --yes.",
             "summarize <id> — write a new summary (decisions, action items, key points) where every claim cites the speaker, timestamp and segment id (s12) it came from; claims the transcript does not support are dropped. Takes up to a minute; earlier summaries are kept. `show <id>` prints the newest one.",
             "unshare <id> — take it back. Never asks: it only ever narrows who can read.",
+            "correct <id> --from \"<misheard>\" --to \"<right>\" [--transcript] — fix a misheard term: every whole-word mention in the note's notes and summary in one write, the previous text kept. The transcript stays as recorded unless you pass --transcript, and then each fix is marked beside the words as heard. Owner or admin only. Then `cockpit glossary add` makes future transcripts and incoming notes spell it right.",
             "move <id> (--to \"<shelf>\"|--clear-shelf) — put it on a different shelf, or take the shelf off.",
             "place <id> [--apply] — say which shelf this note belongs on and why, from the meeting it is part of, who was in the room and its own name. Moves nothing without --apply, and never overrules a shelf somebody typed.",
             "",

package/dist/commands/local-help.js

@@ -152,7 +152,7 @@ const COMMAND_SUMMARY_LINES = [
     "  cockpit serve [--port <port>] [--workspace <path>]",
     "  cockpit autostart [install|uninstall|status] [--workspace <path>] [--dashboard-url <url>] [--interval-seconds <n>] [--json]",
     "  cockpit agent-rules [install|uninstall|status] [--host codex|claude|all] [--workspace <path>] [--json]",
-    "  cockpit memory [search \"<question>\"|save|update <id>|forget <id>|profile|on|off|install|uninstall|status|log <win|loss|noise> --store <bli|supermemory|both> \"<reason>\"] [--container <tag>] [--limit <n>] [--no-recent] [--include-originals|--no-originals] [--include-source|--no-source] [--custom-id <id>] [--extract] [--content-stdin] [--reason <label>] [--file <path>] [--dashboard-url <url>] [--dry-run] [--json]",
+    "  cockpit memory [search \"<question>\"|save|update <id>|forget <id>|profile|on|off|install|uninstall|status|log <win|loss|noise> [--store bli] \"<reason>\"] [--container <tag>] [--limit <n>] [--no-recent] [--include-originals|--no-originals] [--include-source|--no-source] [--custom-id <id>] [--extract] [--content-stdin] [--reason <label>] [--file <path>] [--dashboard-url <url>] [--dry-run] [--json]",
     "  cockpit clean [--dry-run] [--all-committed] [--reconcile] [--dashboard-url <url>] [--json]",
     "  cockpit sources check [--reconcile] [--older-than <days>] [--dashboard-url <url>] [--json]",
     "  cockpit docs [list|tree|read <id|slug>|create --title <t>|update <id>|delete <id|slug>|trash|versions <id|slug>|restore <id>] [--parent <id>|root|--clear-parent] [--query <text> [--word]] [--limit <n>] [--visibility org|private] [--file <path>|--body-stdin] [--allow-empty] [--dashboard-url <url>] [--json]",

package/dist/commands/memory-install-codex-hooks.js

@@ -38,7 +38,16 @@
  *     `needs_trust` exists to name — and it is the one step an intern has to
  *     do by hand.
  *
- * ## What is NOT verified
+ * ## Managed hooks (BLI-24349)
+ *
+ * Doctor's "Auto-trust the BLI Memory hooks in Codex?" puts the same hooks in
+ * Codex's SYSTEM folder (`codex-managed-hooks.ts`), where Codex runs them with
+ * no trust step. When that copy is there, the installer below takes the
+ * user-scope copy OUT instead of writing it (nothing runs twice), and the
+ * inspector reports the system file. Proven on a real Codex 0.166.0 run; see
+ * that module's header.
+ *
+ * ## What is NOT verified (user-scope route)
  *
  * Nobody has yet trusted these hooks on a real machine, so the wiring past the
  * write is unproven end to end: the file shape, the event names and the trust
@@ -59,14 +68,36 @@
  * A gauge that can only be too pessimistic is the right way round for this one.
  */
 import path from "node:path";
-import { applyHookGroups, applyJsonTarget, hookGroupsMatch, inspectJsonTarget, ourHookCount, } from "./memory-install-claude.js";
+import { applyHookGroups, applyJsonTarget, hookGroupsMatch, inspectJsonTarget, ourHookCount, parseJsonRecord, serializeJson, stripOurHooks, } from "./memory-install-claude.js";
+import { codexSystemHooksFile, readCodexManagedHooks, } from "./codex-managed-hooks.js";
 export function codexHooksFile(homeDir) {
     return path.join(homeDir, ".codex", "hooks.json");
 }
 export function codexConfigTomlFile(homeDir) {
     return path.join(homeDir, ".codex", "config.toml");
 }
+function systemHooksFileFor(options) {
+    return options.systemHooksFile === undefined ? codexSystemHooksFile(process.platform) : options.systemHooksFile;
+}
+/** The managed reading, or null when nobody asked to look. Never throws. */
+export async function readCodexManagedHooksFor(options) {
+    const file = systemHooksFileFor(options);
+    if (!file)
+        return null;
+    return readCodexManagedHooks({ config: options.config, io: options.io, file });
+}
 export async function installCodexMemoryHooks(options) {
+    // BLI-24349: once the hooks live in Codex's system folder (managed, run
+    // with no trust step), a user-scope copy would make every hook run twice
+    // the day somebody also trusts it in /hooks. So the user copy is taken out
+    // instead of written, and the target names the system file. A STALE
+    // system copy is treated the same way: the old managed hooks keep running,
+    // and doctor asks once to refresh them (the receipt says `needs_trust`,
+    // reason `managed_hooks_stale`).
+    const managed = await readCodexManagedHooksFor(options);
+    if (managed && (managed.state === "current" || managed.state === "stale")) {
+        return stripUserScopeCopy(options, managed);
+    }
     return applyJsonTarget({
         target: "codex_hooks",
         file: codexHooksFile(options.homeDir),
@@ -76,6 +107,15 @@ export async function installCodexMemoryHooks(options) {
     });
 }
 export async function inspectCodexMemoryHooks(options) {
+    const managed = await readCodexManagedHooksFor(options);
+    if (managed && (managed.state === "current" || managed.state === "stale")) {
+        return {
+            target: "codex_hooks",
+            status: "installed",
+            reason: managed.state === "current" ? "managed_by_system" : "managed_hooks_stale",
+            path: managed.file,
+        };
+    }
     return inspectJsonTarget({
         target: "codex_hooks",
         file: codexHooksFile(options.homeDir),
@@ -84,6 +124,59 @@ export async function inspectCodexMemoryHooks(options) {
         matches: (root) => hookGroupsMatch(root, options.config.hooks),
     });
 }
+/**
+ * Takes OUR groups out of `~/.codex/hooks.json` (a person's own hooks stay),
+ * because the system copy now carries them. Same read-back rule as every
+ * other write here.
+ */
+async function stripUserScopeCopy(options, managed) {
+    const reason = managed.state === "current" ? "managed_by_system" : "managed_hooks_stale";
+    const file = codexHooksFile(options.homeDir);
+    let raw;
+    try {
+        raw = await options.io.readText(file);
+    }
+    catch (error) {
+        return { target: "codex_hooks", status: "failed", reason: "user_copy_unreadable", path: file, detail: error instanceof Error ? error.name : "unknown" };
+    }
+    const root = raw === null || !raw.trim() ? null : parseJsonRecord(raw);
+    if (!root || ourHookCount(root) === 0) {
+        return { target: "codex_hooks", status: "already", reason, path: managed.file };
+    }
+    if (options.dryRun) {
+        return { target: "codex_hooks", status: "would_install", reason: "dry_run", path: file, detail: "would remove the user-scope copy; the system copy carries the hooks" };
+    }
+    const next = removeOurGroups(structuredClone(root));
+    try {
+        await options.io.writeText(file, serializeJson(next, raw ?? ""));
+    }
+    catch (error) {
+        return { target: "codex_hooks", status: "failed", reason: "user_copy_write_failed", path: file, detail: error instanceof Error ? error.name : "unknown" };
+    }
+    const storedRaw = await options.io.readText(file);
+    const stored = storedRaw === null ? null : parseJsonRecord(storedRaw);
+    if (!stored || ourHookCount(stored) > 0) {
+        return { target: "codex_hooks", status: "failed", reason: "read_back_mismatch", path: file, detail: "the user-scope copy is still there after the write" };
+    }
+    console.error("[codex-hooks-trust] user-scope copy removed; Codex runs the system copy", JSON.stringify({ reason: "user_copy_removed", managed_state: managed.state }));
+    return { target: "codex_hooks", status: "installed", reason, path: managed.file, detail: "user-scope copy removed" };
+}
+function removeOurGroups(root) {
+    const hooks = root["hooks"];
+    if (!hooks || typeof hooks !== "object" || Array.isArray(hooks))
+        return root;
+    const record = hooks;
+    for (const [event, groups] of Object.entries(record)) {
+        if (!Array.isArray(groups))
+            continue;
+        const kept = stripOurHooks(groups).groups;
+        if (kept.length === 0)
+            delete record[event];
+        else
+            record[event] = kept;
+    }
+    return root;
+}
 /**
  * Reads the trust state out of `~/.codex/config.toml` WITHOUT parsing the
  * whole file.

package/dist/commands/memory-install-receipt.js

@@ -86,6 +86,18 @@ function judgeCodexHooks(input, reasons) {
         reasons[key] = "hooks_disabled_in_config";
         return "unsupported";
     }
+    // BLI-24349: hooks in Codex's system folder are managed and run with no
+    // trust step. `ok` carries its reason so the board can say HOW it is ok.
+    if (input.codexManaged === "current") {
+        reasons[key] = "managed_by_system";
+        return "ok";
+    }
+    if (input.codexManaged === "stale") {
+        // The old managed copy may still run, but not today's hooks; doctor asks
+        // once to refresh it, so the action is the same as an untrusted machine's.
+        reasons[key] = "managed_hooks_stale";
+        return "needs_trust";
+    }
     const target = input.targets.find((entry) => entry.target === "codex_hooks");
     if (!target) {
         reasons[key] = input.binFound ? "target_not_checked" : "bin_missing";
@@ -105,7 +117,11 @@ function judgeCodexHooks(input, reasons) {
     if (input.codexTrust.trustedRows >= input.expectedTrustRows)
         return "ok";
     reasons[key] =
-        input.codexTrust.disabledRows > 0 ? "trust_rows_disabled" : "no_trust_rows";
+        input.codexTrust.disabledRows > 0
+            ? "trust_rows_disabled"
+            : input.codexTrustDeclined
+                ? "trust_declined"
+                : "no_trust_rows";
     return "needs_trust";
 }
 /**

package/dist/commands/memory-install-report.js

@@ -3,7 +3,7 @@
  * one outcome, and rendering that outcome for a log line or a terminal.
  * Sibling of `memory-install.ts`, named in its header.
  */
-import { CODEX_HOOKS_TRUST_GUIDE_URL, memoryInstallGaps } from "@bli-cockpit/telemetry-core";
+import { codexHooksTrustAction, memoryInstallGaps } from "@bli-cockpit/telemetry-core";
 import { memoryDaemonLine } from "./memory-daemon-probe.js";
 import { memoryReceiptLine } from "./memory-install-receipt.js";
 import { DEFAULT_DASHBOARD_URL, getCollectorRuntimePaths, readLocalCollectorConfig, } from "../local-state.js";
@@ -102,9 +102,10 @@ export function memoryOutcomeLines(outcome) {
     // The trust step is the one thing a person has to do by hand, so it is said
     // here in words rather than left as a status word they have to look up.
     if (outcome.receipt.codex.hooks === "needs_trust") {
-        lines.push("  Codex will NOT run these hooks until you trust them: open Codex in any folder, " +
-            "run /hooks, and trust every bli-memory entry. One time, per machine. " +
-            `Step by step, with pictures: ${CODEX_HOOKS_TRUST_GUIDE_URL}`);
+        lines.push(`  Codex will NOT run these hooks until they are trusted. ${codexHooksTrustAction(outcome.receipt.reasons?.["codex.hooks"])}`);
+    }
+    if (outcome.receipt.codex.hooks === "ok" && outcome.receipt.reasons?.["codex.hooks"] === "managed_by_system") {
+        lines.push("  Codex runs these hooks from its system hooks folder (managed), so no /hooks trust step is needed.");
     }
     if (outcome.receipt.codex.hooks === "unsupported") {
         lines.push("  Codex hooks are turned off in your ~/.codex/config.toml ([features] hooks = false), " +

package/dist/commands/memory-install.js

@@ -52,7 +52,9 @@ import { removeMemoryIntegration } from "./memory-uninstall.js";
 import { readEffectiveMemoryCapture, readMemoryCaptureChoice, writeMemoryCaptureChoice } from "../memory-capture-choice.js";
 import { envWithNodeRuntimeOnPath } from "../scheduled-self-update.js";
 import { probeMemoryDaemon } from "./memory-daemon-probe.js";
-import { expectedCodexTrustRows, readCodexHookTrustFromDisk, } from "./memory-install-codex-hooks.js";
+import { expectedCodexTrustRows, readCodexHookTrustFromDisk, readCodexManagedHooksFor, } from "./memory-install-codex-hooks.js";
+import { codexSystemHooksFileFor } from "./codex-managed-hooks.js";
+import { readCodexHooksTrustChoice } from "./codex-hooks-trust-choice.js";
 import { buildMemoryInstallReceipt, writeMemoryReceiptFile, } from "./memory-install-receipt.js";
 import { getCollectorRuntimePaths } from "../local-state.js";
 import { aggregate, logMemoryOutcome, memoryOutcomeLines, resolveDashboardUrl } from "./memory-install-report.js";
@@ -128,8 +130,9 @@ export async function installMemoryIntegration(command, io, deps = {}) {
     const targets = [resolved.binTarget];
     // `no_bin_no_write`: with no resolved server there is nothing safe to
     // register, so not one file is opened. The bin target carries the reason.
+    const systemHooksFile = codexSystemHooksFileFor(deps.codexSystemHooksFile, platform, io.env);
     if (resolved.config) {
-        const host = { homeDir, config: resolved.config, dryRun: command.dryRun, io: fileIo };
+        const host = { homeDir, config: resolved.config, dryRun: command.dryRun, io: fileIo, systemHooksFile };
         targets.push(...(await installClaudeMemoryIntegration(host)));
         targets.push(...(await installCodexMemoryIntegration(host)));
     }
@@ -142,7 +145,7 @@ export async function installMemoryIntegration(command, io, deps = {}) {
     const outcome = {
         action: "install",
         ...(capture.ignored ? { opt_out_ignored: "opt_out_ignored_not_founder" } : {}),
-        ...(await readBackOutcome(targets, resolved, homeDir, fileIo)),
+        ...(await readBackOutcome(targets, resolved, homeDir, fileIo, systemHooksFile)),
     };
     logMemoryOutcome(outcome, platform);
     // The heartbeat reads the cache, not the machine — see the receipt module's
@@ -223,7 +226,10 @@ async function installWhileOptedOut(command, io, deps, scope) {
     return outcome;
 }
 /** What both `install` and `status` report once the targets are known: their verdict and the receipt. */
-async function readBackOutcome(targets, resolved, homeDir, fileIo) {
+async function readBackOutcome(targets, resolved, homeDir, fileIo, systemHooksFile) {
+    // BLI-24349: the managed copy and the person's "no" both shape `codex.hooks`.
+    const managed = resolved.config ? await readCodexManagedHooksFor({ config: resolved.config, io: fileIo, systemHooksFile }) : null;
+    const choice = await readCodexHooksTrustChoice(getCollectorRuntimePaths(homeDir));
     return {
         ...aggregate(targets),
         config_source: resolved.source,
@@ -235,6 +241,8 @@ async function readBackOutcome(targets, resolved, homeDir, fileIo) {
             binFound: resolved.config !== null,
             codexTrust: await codexTrustFor(homeDir, fileIo),
             expectedTrustRows: resolved.config ? expectedCodexTrustRows(resolved.config) : 0,
+            codexManaged: managed?.state ?? null,
+            codexTrustDeclined: choice.choice === "declined",
         }),
     };
 }
@@ -274,8 +282,9 @@ export async function inspectMemoryIntegration(command, io, deps = {}) {
     // Without a resolved server there is no shape to compare the stored config
     // against, so `status` says the one true thing — the server is not here —
     // rather than reporting four targets against a shape we invented.
+    const systemHooksFile = codexSystemHooksFileFor(deps.codexSystemHooksFile, platform, io.env);
     if (resolved.config) {
-        const host = { homeDir, config: resolved.config, io: fileIo };
+        const host = { homeDir, config: resolved.config, io: fileIo, systemHooksFile };
         targets.push(...(await inspectClaudeMemoryIntegration(host)));
         targets.push(...(await inspectCodexMemoryIntegration(host)));
     }
@@ -302,7 +311,7 @@ export async function inspectMemoryIntegration(command, io, deps = {}) {
         // bounded, it opens nothing but a local socket, and a machine without one
         // is reported as exactly that rather than as a problem.
         daemon: await probeMemoryDaemon({ ...(homeDir ? { homeDir } : {}) }),
-        ...(await readBackOutcome(targets, resolved, homeDir, fileIo)),
+        ...(await readBackOutcome(targets, resolved, homeDir, fileIo, systemHooksFile)),
     };
     // `status` is a pure read and its reading is exactly as good as an install's
     // — both re-parse the stored files — so it refreshes the cache too. A person

package/dist/commands/memory-log.js

@@ -1,5 +1,5 @@
 import path from "node:path";
-import { appendExperience, drainExperiences, shipExperience, validateExperience } from "@bli-cockpit/telemetry-core/memory-experience";
+import { appendExperience, drainExperiences, normaliseExperienceStore, shipExperience, validateExperience } from "@bli-cockpit/telemetry-core/memory-experience";
 import { readPipedText, writeLine } from "./cli-io.js";
 import { callTower, openTower } from "./tower-command.js";
 function sender(command, io) {
@@ -25,7 +25,18 @@ export async function runMemoryLog(command, io) {
         ? (await readPipedText(io.stdin, { maxChars: 1002 })).trim()
         : command.reason;
     validateExperience(command.store, command.verdict, reason);
-    const entry = await appendExperience({ store: command.store, verdict: command.verdict, reason }, {
+    // BLI-24380: BLI Memory is the only store. A retired store is accepted and
+    // logged (the normaliser logs the line); `supermemory` records nothing.
+    const store = normaliseExperienceStore(command.store);
+    if (store.store === null) {
+        const receipt = { ok: true, recorded: false, reason: store.reason, given: store.given };
+        writeLine(io.stderr, `[memory experience] not recorded ${JSON.stringify(receipt)}`);
+        writeLine(io.stdout, command.json
+            ? JSON.stringify(receipt)
+            : "Not recorded: Supermemory is retired (store_retired). BLI Memory is the only store; use --store bli.");
+        return 0;
+    }
+    const entry = await appendExperience({ store: store.store, verdict: command.verdict, reason }, {
         homeDir: command.homeDir,
         agent: "cockpit",
         project: path.basename(process.cwd()),

package/dist/commands/memory-map.js

@@ -14,7 +14,7 @@ export async function runMemoryMap(door) {
     if (!answer.ok)
         return failAgentDoor(door, "[memory map cli]", answer.reason, answer.detail);
     const body = answer.body;
-    writeLine(door.io.stderr, `[memory map cli] answered ${JSON.stringify({ reason: body.capped ? "capped" : "exhausted", examined: body.examined, total: body.total })}`);
+    writeLine(door.io.stderr, `[memory map cli] answered ${JSON.stringify({ reason: body.capped ? "capped" : "exhausted", examined: body.examined, total: body.total, total_source: body.totalSource ?? null })}`);
     if (door.json)
         return emitAgentDoor(door, body);
     for (const project of body.projects) {
@@ -22,7 +22,11 @@ export async function runMemoryMap(door) {
         for (const topic of project.topics)
             writeLine(door.io.stdout, `  ${topic.label}: ${topic.count}${topic.averageImportance === null ? " (unscored)" : ` (importance ${Math.round(topic.averageImportance)}/100)`}`);
     }
-    writeLine(door.io.stdout, `${body.examined} of ${body.total} visible memories counted; as of ${body.computedAt}.${body.capped ? " Scan capped at 10,000." : ""}`);
+    // BLI-24124: the total is the stored count with its time, or the rows read when none is stored (an older server sends neither field).
+    // BLI-24122: a server that sends `words` is printed as-is, so the page, this command and MCP say one thing.
+    const totalAge = body.totalSource === "stored_count" && body.totalAsOf ? ` Total counted ${body.totalAsOf}.`
+        : body.totalSource === "rows_read" ? " No stored total yet, so the total is the memories read." : "";
+    writeLine(door.io.stdout, body.words ?? `${body.total.toLocaleString("en-US")} visible memories; the map draws ${body.examined.toLocaleString("en-US")} of them; as of ${body.computedAt}.${totalAge}`);
     if (!body.projects.length)
         writeLine(door.io.stdout, "No project knowledge yet.");
     return 0;

package/dist/commands/memory-verb-list.js

@@ -55,7 +55,7 @@ const VERB_LIST_LINES = [
     "  cockpit memory status [--json]                read the stored config back",
     "",
     "The experience log:",
-    "  cockpit memory log <win|loss|noise> --store <bli|supermemory|both> \"<reason>\"",
+    "  cockpit memory log <win|loss|noise> [--store bli] \"<reason>\"",
     "",
     "Search: --limit caps the MEMORIES (default 5, at most 20). Up to 3 Tower pages and",
     "tickets ride beside them whatever --limit says; for more, use `cockpit search`.",

package/dist/commands/notes-writes.js

@@ -223,6 +223,30 @@ export async function shareNote(command, door) {
     sayUpload(door, body);
     return 0;
 }
+/**
+ * `cockpit notes correct <note-id> --from <term> --to <term> [--transcript]` (BLI-24437): one call to
+ * `POST /api/notes/correct`, the door the browser, MCP and JARVIS use. The server counts; this prints its sentences.
+ * A refusal, including "nothing_to_correct" (no mention found, nothing changed), prints the server's sentence and exits 1.
+ */
+export async function correctNote(command, door) {
+    const scope = command.transcript ? "notes_and_transcript" : "notes";
+    const answer = await ask(door, {
+        path: "/api/notes/correct",
+        method: "POST",
+        label: "notes correct",
+        timeoutMs: READ_DEADLINE_MS,
+        body: { note_id: command.noteId, from: command.from, to: command.to, scope },
+    });
+    if (!answer.ok) {
+        return fail(door, answer.reason, answer.detail);
+    }
+    const body = answer.body;
+    writeLine(door.io.stderr, `${TAG} corrected ${JSON.stringify({ note_id: command.noteId ?? null, scope, notes: body.counts?.notes ?? null, transcript: body.counts?.transcript ?? null, summary: body.counts?.summary ?? null })}`);
+    if (door.json)
+        return emit(door, body);
+    sayUpload(door, body);
+    return 0;
+}
 /** A summary run is two model calls over a long transcript: give it room (BLI-20882). */
 const SUMMARIZE_DEADLINE_MS = 330_000;
 /**

package/dist/commands/notes.js

@@ -48,7 +48,7 @@
 import os from "node:os";
 import { loadPairedSession } from "../tower-client.js";
 import { listNotes, listShelves, showNote, showShelf } from "./notes-reads.js";
-import { uploadNotes, pasteNote, shareNote, summarizeNote, moveNote, placeNote } from "./notes-writes.js";
+import { uploadNotes, pasteNote, shareNote, summarizeNote, moveNote, placeNote, correctNote } from "./notes-writes.js";
 import { runFolderCommand } from "./notes-folders.js";
 import { armNotesWebhook, connectNotetaker, detachNotetaker, listNotesAccounts, showNotesWebhook, syncNotetaker, syncStatusNotetakers, } from "./notes-accounts.js";
 import { showBotUpcoming } from "./notes-bot-upcoming.js";
@@ -60,7 +60,7 @@ import { defaultRecordDeps, runNotesRecord } from "./notes-record.js";
 import { runNotesApp } from "./notes-app.js";
 import { defaultExec, errorMessage } from "./cli-io.js";
 export { listNotes, listShelves, showNote, showShelf } from "./notes-reads.js";
-export { uploadNotes, pasteNote, shareNote, summarizeNote, moveNote, placeNote } from "./notes-writes.js";
+export { uploadNotes, pasteNote, shareNote, summarizeNote, moveNote, placeNote, correctNote } from "./notes-writes.js";
 export { armNotesWebhook, connectNotetaker, detachNotetaker, listNotesAccounts, showNotesWebhook, syncNotetaker, syncStatusNotetakers, } from "./notes-accounts.js";
 export { showGranolaStatus } from "./notes-granola-status.js";
 export { showTranscriptionStats } from "./notes-transcription-stats.js";
@@ -80,6 +80,7 @@ const NOTES_VERBS = {
     paste: pasteNote,
     share: shareNote,
     unshare: shareNote,
+    correct: correctNote,
     summarize: summarizeNote,
     move: moveNote,
     place: placeNote,

package/dist/commands/public-root.js

@@ -21,7 +21,7 @@ export async function runCockpitCli(argv, io) {
   }
 
   if (command === "--version" || command === "-V" || command === "version") {
-    writeLine(io?.stdout ?? process.stdout, "0.2.291");
+    writeLine(io?.stdout ?? process.stdout, "0.2.293");
     return 0;
   }
 

package/dist/commands/session-sync-record.js

@@ -317,11 +317,13 @@ function recordSourceObservation(options, result) {
     const uploadedAt = uploadedThisSync
         ? options.now.toISOString()
         : (prior?.uploaded_at ?? (durableThisSync ? options.now.toISOString() : null));
-    const uploadedByteSize = uploadedThisSync
+    const uploadedByteSize = uploadedThisSync || (durableThisSync && options.source === "codex")
         ? result.byte_size
         : (prior?.uploaded_byte_size ?? (durableThisSync ? result.byte_size : null));
     const entry = {
         file_hash_sha256: result.content_hash_sha256,
+        uploaded_source_revision: durableThisSync && !isRedactionStubObjectKey(uploadedObjectKey)
+            ? result.content_hash_sha256 : prior?.uploaded_source_revision ?? null,
         file_mtime_ms: result.session_file_mtime_ms,
         byte_size: result.byte_size,
         // Durable byte offset reflects how many bytes are durable remotely (the

package/dist/commands/session-sync-scan.js

@@ -1,3 +1,4 @@
+import { nativeSessionRoots } from "../native-session-roots.js";
 /**
  * Reading both session stores, and settling what the reading owes.
  *
@@ -9,7 +10,7 @@
  */
 import path from "node:path";
 import { saveRootWorkScan } from "../root-work.js";
-import { CODEX_ATTRIBUTION_SCAN_WINDOW_SESSION_LIMIT, CODEX_ATTRIBUTION_SCAN_WINDOW_MINUTES, defaultCodexSessionDirs, scanAndAttributeCodexSessions, } from "../adapters/codex-attribution.js";
+import { CODEX_ATTRIBUTION_SCAN_WINDOW_SESSION_LIMIT, CODEX_ATTRIBUTION_SCAN_WINDOW_MINUTES, scanAndAttributeCodexSessions, } from "../adapters/codex-attribution.js";
 import { scanAndAttributeClaudeSessions, } from "../adapters/claude-attribution.js";
 import { CLAUDE_CURSOR_FILENAME } from "../cursors/raw-evidence-cursor.js";
 import { isRedactionStubObjectKey } from "../cursors/raw-evidence-stub-entry.js";
@@ -31,9 +32,10 @@ const CLAUDE_DEFAULT_WINDOW_MINUTES = 24 * 60;
  */
 export async function scanAndAttributeBothSources(options) {
     const { plan } = options;
+    const roots = nativeSessionRoots(options.homeDir);
     const codexScanned = await scanCodexSessionsForSync({
         codexEnabled: plan.codexEnabled,
-        homeDir: options.homeDir,
+        roots,
         worktrees: options.worktrees,
         now: options.now,
         collectionRoots: plan.collectionRoots,
@@ -48,7 +50,7 @@ export async function scanAndAttributeBothSources(options) {
     const firstRunBackfill = plan.claudeEnabled && !claudeCursorExists;
     const claudeScanned = await scanClaudeSessionsForSync({
         claudeEnabled: plan.claudeEnabled,
-        homeDir: options.homeDir,
+        roots,
         worktrees: options.worktrees,
         now: options.now,
         collectionRoots: plan.collectionRoots,
@@ -58,6 +60,10 @@ export async function scanAndAttributeBothSources(options) {
         outsideRootCatchUpPending: plan.outsideRootCatchUpPending,
         stateDir: options.paths.state_dir,
     });
+    if (roots.discoveryFailed) {
+        codexScanned.directory_read_failed_count += 1;
+        claudeScanned.project_dir_read_failed_count += 1;
+    }
     // BLI-23590: under `roots_only` a session outside every approved root leaves the result HERE, before the retry
     // bookkeeping, the local work scan, the upload, the report or the git scan can see it.
     let codexAttribution = codexScanned;
@@ -117,7 +123,7 @@ async function scanCodexSessionsForSync(options) {
     const readMemo = await openTranscriptReadMemo(options.stateDir, "codex_attribution").catch(() => undefined);
     try {
         let scan = await scanAndAttributeCodexSessions({
-            sessionsDirs: defaultCodexSessionDirs(options.homeDir),
+            sessionsDirs: options.roots.codex,
             worktrees: options.worktrees,
             now: options.now,
             sinceMinutes,
@@ -130,7 +136,7 @@ async function scanCodexSessionsForSync(options) {
             // capped scan still returns every session it found instead of silently
             // truncating at the window's default limit.
             scan = await scanAndAttributeCodexSessions({
-                sessionsDirs: defaultCodexSessionDirs(options.homeDir),
+                sessionsDirs: options.roots.codex,
                 worktrees: options.worktrees,
                 now: options.now,
                 sinceMinutes,
@@ -159,12 +165,13 @@ async function scanClaudeSessionsForSync(options) {
         : options.firstRunBackfill
             ? CLAUDE_FIRST_RUN_BACKFILL_MINUTES
             : undefined, options.outsideRootCatchUpPending, CLAUDE_DEFAULT_WINDOW_MINUTES);
-    const projectsDir = path.join(options.homeDir, ".claude", "projects");
+    const { claudeProjects: projectsDir, claudeProjectDirs: projectsDirs } = options.roots;
     // BLI-22797: one memo for both passes, settled once, so an unchanged file is never opened.
     const readMemo = await openTranscriptReadMemo(options.stateDir, "attribution").catch(() => undefined);
     try {
         let scan = await scanAndAttributeClaudeSessions({
             projectsDir,
+            projectsDirs,
             worktrees: options.worktrees,
             now: options.now,
             collectionRoots: options.collectionRoots,
@@ -174,6 +181,7 @@ async function scanClaudeSessionsForSync(options) {
         if (scan.session_limit_applied) {
             scan = await scanAndAttributeClaudeSessions({
                 projectsDir,
+                projectsDirs,
                 worktrees: options.worktrees,
                 now: options.now,
                 collectionRoots: options.collectionRoots,

package/dist/commands/session-sync-shelf.js

@@ -34,6 +34,8 @@ export function sessionShelf(result, rules) {
         return { shelf: "team", reason: "routing_inactive" };
     if (rules.failed)
         return { shelf: "drawer", reason: "shelf_resolve_failed" };
+    if (result.local_cwds && (result.local_cwds.length === 0 || result.local_cwds.some(cwd => !cwd || resolveShelfWith(rules, cwd).shelf !== "team")))
+        return { shelf: "drawer", reason: "shelf_identity_mismatch" };
     if (result.state === "ambiguous")
         return { shelf: "drawer", reason: "ambiguous_attribution" };
     const byWorktree = result.worktree && !isOutsideRootsWorkspace(result.worktree)

package/dist/commands/session-sync-upload.js

@@ -180,6 +180,7 @@ function ambientEnvelopeForWorktree(options) {
             .map((result) => ({
             local_path: result.file_path,
             codex_session_id: result.codex_session_id,
+            ...(result.segment_paths ? { segment_paths: result.segment_paths, revision_hash: result.content_hash_sha256 ?? undefined, revision_bytes: result.byte_size } : {}),
         })),
         codexAttributionScan: scan.codexAttribution,
         claudeSessionFiles,