carrick 0.3.82 → 0.3.84

package/README.md

@@ -25,30 +25,51 @@ the hooks deliver, the CI check and a `carrick.json` written by hand, is in the
 agent's shell, a pipe — the same lines are written as plain text, with no colour
 and no spinner.
 
-Existing users can initialise the local workspace against a named Carrick
-project:
+`init` runs in this order, and nothing is written — on this machine or in
+Carrick — until you accept what it proposes:
+
+1. **The repos this install covers.** In a folder of sibling repos it asks
+   which ones, with every repo chosen to begin with. A folder routinely holds a
+   repo that should not be indexed, and a repo you leave out gets no proposal
+   entry, no project assignment and no connection. Without a terminal, name
+   them: `--repo owner/repo`, repeated or comma-separated. A folder of repos
+   with neither a terminal nor `--repo` stops there, having written nothing;
+   add `--yes` to cover all of them. A single repository is not a choice and is
+   never asked about.
+2. **The project.** Which project the selected repos belong in.
+3. **The proposal**, which names the packages found, the repos covered, any
+   project to create, and any repo that would move out of the project it is in
+   now. Answering no, or ending any question with Ctrl-C, ends the run with
+   nothing written.
+
+Existing users can name the project on the command line:
 
 ```
-carrick init --project payments
+carrick init --project payments --allow-move
 ```
 
-The command shows the current project assignment for every proposed GitHub
-repo. When the project is not in the workspace yet, it lists the workspace's
-projects and offers to create the named one from the terminal; where the API
-has no such action it prints the project link instead. Connected repos are then
-put in the project from the terminal too, so the GitHub App grant is the only
-browser step; where the API has no assignment action, the command prints the
-repo-assignment link and, in an interactive terminal, opens the page. Either
-way the claim comes from a read. The CLI reads `resolve-repos` until every
-proposed repo reports `project_slug: "payments"`, and a repo connected to
+`--project` puts the selected repos in that project, creating it from the
+terminal where the API allows that and printing the project link where it does
+not. A repo that is already in another project is **moved** out of it, which
+changes what every agent querying either project can see, so the move is named
+in the proposal with the project it comes out of and asked about separately.
+`--yes` does not grant it: `--allow-move` does, and without either the run
+stops before anything is moved.
+
+Connected repos are placed from the terminal, so the GitHub App grant is the
+only browser step; where the API has no assignment action, the command prints
+the repo-assignment link and, in an interactive terminal, opens the page.
+Either way the claim comes from a read. The CLI reads `resolve-repos` until
+every covered repo reports `project_slug: "payments"`, and a repo connected to
 another project remains pending. A target it cannot meet does not stop the run.
 The hooks, the MCP connection and the proposal are written, and the command
 says which browser steps are left.
 
 Without `--project` the project step still runs: the command takes the project
 the repos are already in, and otherwise lists the workspace's projects for you
-to name one, which it creates from the terminal where the API allows that. An
-empty answer leaves the step to the browser.
+to name one. An empty answer leaves the step to the browser. Every project is
+printed as the dashboard shows it, display name and slug both — `Payments
+(payments)`.
 
 Each repository is identified by its `origin` remote. A remote written through
 a per-account SSH host alias (`git@github.com-work:owner/repo.git`) is resolved
@@ -56,7 +77,8 @@ with `ssh -G`, so an alias whose `HostName` is `github.com` is an ordinary
 GitHub repository here. When a repository still names none, `init` says which
 one it was and what it read, and leaves that repository out of the project and
 connection steps rather than dropping it quietly. `carrick init --repo
-owner/repo` names the repository in that case.
+owner/repo` names the repository in that case: a `--repo` value that matches no
+repo in the folder attaches to the one repo there that has no identity.
 
 Credentials live in `$XDG_CONFIG_HOME/carrick/credentials.json`, falling back
 to `~/.config/carrick/` on macOS and Linux or `%APPDATA%\carrick\` on Windows.
@@ -79,9 +101,14 @@ exists. It is the only scan a first run makes.
 
 Workspace detection handles a repo root or immediate sibling repositories.
 An optional `carrick-workspace.json` adds paths through `repos` and removes
-directory names through `exclude`; init preserves this file and does not
-create one. `carrick derive --workspace . --json` previews the Rust proposal
-without writing files or scanning.
+directory names through `exclude`. Where you leave a repo out of the selection,
+init writes that name into `exclude` and records it under a `carrick` key
+beside it: every later command reads the same answer, so the scans, the editor
+hooks and the next `init` all leave that repo alone, and `carrick remove` takes
+back the names init added and nothing you wrote yourself. `--repo` naming an
+excluded repo is refused and says which file excludes it. `carrick derive
+--workspace . --json` previews the Rust proposal without writing files or
+scanning.
 
 Deno projects use their existing `deno.json` or `deno.jsonc` and require Deno
 2.9.4 or newer on PATH. Before local indexing, prepare their dependencies with
@@ -114,7 +141,7 @@ types in a Node process.
 |---|---|
 | `carrick login` | Authorise a Carrick workspace in the browser, or verify `CARRICK_TOKEN` |
 | `carrick logout` | Remove the saved local credential |
-| `carrick init [--project SLUG] [--repo OWNER/REPO]` | The repo list, the project, the service proposal in `.carrick/`, the agent hooks, the MCP connection, and the prompt that writes `carrick.json` |
+| `carrick init [--repo OWNER/REPO]... [--project SLUG] [--allow-move]` | The repos this install covers, the project, the service proposal in `.carrick/`, the agent hooks, the MCP connection, and the prompt that writes `carrick.json` |
 | `carrick doctor` | Re-check that setup: the declared paths, the CI workflow against the current template, the hooks, the MCP connection and how far the index is behind |
 | `carrick remove [--keep-login]` | Undo all of that on this machine, and list the files the scaffold added to the repository |
 | `carrick index` | Derive the workspace, apply optional repo overrides and write `.carrick/`, with Carrick classifying what the deterministic passes could not |
@@ -180,17 +207,22 @@ runs on the local machine.
 Hosted queries cover connected, indexed repositories in the selected Carrick
 project, including repositories absent from this disk, using their most recent
 default-branch indexes. They are available over MCP, and `carrick init`
-connects the agent clients it finds on the machine: Claude Code through
-`claude mcp add`, and Cursor, Windsurf and VS Code by adding a `carrick` server
-to the client's own configuration file, leaving every other entry in it alone.
-Each entry carries an `X-Carrick-Install-Id` header: a UUID generated once,
-kept in `~/.carrick/install-id`, and sent with every MCP call so a slow session
-can be told apart from a busy one. It says nothing about the machine or the
-person — `carrick remove` deletes it, and the next `carrick init` mints
-another. A `carrick` entry that is already there keeps everything on it: the
-file clients have the header merged into their entry, and Claude Code, whose
-entry can only be replaced whole, is left as it is and told the two commands
-that add it. A machine with no client on it is given the line to run, with the
+connects Claude Code through `claude mcp add`. Cursor, Windsurf and VS Code
+keep their configuration outside the workspace, so each is asked about by the
+path of its file: the terminal offers the ones whose configuration directory
+exists, ticked where the editor itself is detected, and a run with no terminal
+writes one only when `--mcp EDITOR` names it. `--yes` does not cover them. A
+`carrick` server is added to the file and every other entry in it is left
+alone.
+An entry init writes carries an `X-Carrick-Install-Id` header: a UUID generated
+once, kept in `~/.carrick/install-id`, and sent with every MCP call so a slow
+session can be told apart from a busy one. It says nothing about the machine or
+the person — `carrick remove` deletes it, and the next `carrick init` mints
+another. A `carrick` entry that is already there is left exactly as it is, with
+or without the header: the header is part of what a client keys its sign-in on,
+and nothing a user sees depends on it, so neither `init` nor `doctor` mentions
+an entry that has none.
+A machine with no client on it is given the line to run, with the
 id already in it:
 
 ```

package/bin/carrick.mjs

@@ -38,11 +38,50 @@ if (nodeMajor() < NODE_FLOOR) {
 const HOOKS = {
   "post-edit": "../dist/hook/post-edit.js",
   "session-start": "../dist/hook/session-start.js",
+  stop: "../dist/hook/stop.js",
+  "user-prompt": "../dist/hook/user-prompt.js",
 };
 
 const argv = process.argv.slice(2);
 const [command, ...rest] = argv;
 
+/**
+ * The commands that say nothing about the state of the install (carrick#1333).
+ *
+ * `hook` and `lsp` are protocol channels — a line of prose on either is a line
+ * an agent reads as data — and `init`, `doctor` and `remove` are the commands
+ * that write, audit and undo the very files the notice would be about, so each
+ * of them says it better in its own words.
+ */
+const NO_NOTICE = new Set(["hook", "lsp", "init", "doctor", "remove"]);
+
+/**
+ * One line a day, on stderr, naming what an upgrade left behind here.
+ *
+ * `npm install -g carrick@latest` changes the binary and nothing else, so a
+ * repo keeps the hook entries and skill bodies of whichever version first ran
+ * `carrick init` in it. Nothing re-reads them, and nobody is told.
+ *
+ * It runs before the command, never instead of it, and cannot fail one: a
+ * throw, a workspace Carrick was never set up in, or an install that is
+ * current all leave it silent.
+ */
+async function refreshNoticeLine() {
+  if (command === undefined || NO_NOTICE.has(command)) return;
+  try {
+    const { initialisedRoot, refreshNotice } = await import("../dist/init/outdated.js");
+    const root = initialisedRoot(process.cwd());
+    if (root === null) return;
+    const line = refreshNotice(root);
+    if (line) process.stderr.write(`carrick: ${line}\n`);
+  } catch {
+    // A notice about the install must never be the reason a command did not
+    // run.
+  }
+}
+
+await refreshNoticeLine();
+
 /**
  * Run a build of the index and render it (carrick#1315).
  *
@@ -162,9 +201,13 @@ function extraHelp() {
     "INTEGRATION:",
     "    lsp --stdio                  the language server, for an editor or an agent",
     "                                 that speaks LSP",
-    "    hook post-edit               Claude Code PostToolUse hook (reads the tool",
-    "                                 payload on stdin)",
+    "    hook post-edit               PostToolUse hook for either host (reads the",
+    "                                 tool payload on stdin)",
     "    hook session-start           Claude Code SessionStart hook",
+    "    hook stop                    Claude Code Stop hook (one reuse nudge per",
+    "                                 task, silent when the task added no function)",
+    "    hook user-prompt             Codex UserPromptSubmit hook (the same nudge,",
+    "                                 delivered on the next prompt)",
     "    templates <name>             print a file to add to a repo: workflow, or",
     "                                 carrick.json",
     "    --version                    the version of this package",

package/dist/contract.d.ts

@@ -144,6 +144,23 @@ export type Recheck = {
     stale_since?: string;
     /** Why the re-check did not run. Only on a `none`. */
     reason?: string;
+    /**
+     * Functions the re-extracted file declares that the index does not hold
+     * under that name (carrick#1330). Absent on a `none`, which extracted
+     * nothing to compare, and absent when the edit added no function.
+     *
+     * A name comparison against `index_commit`, and both halves matter: the
+     * index holds no body hash, so a renamed function reads as new, and the
+     * commit is the one the last scan of that repo ran on.
+     */
+    new_functions?: NewFunction[];
+};
+/** One function the working tree declares and the index does not. */
+export type NewFunction = {
+    /** As the source spells it: `name`, or `Class.member`. */
+    name: string;
+    /** Where it starts, so a reader can open it without searching. */
+    line: number;
 };
 export declare const SCHEMA = "carrick.check/0";
 export declare const STATUS_SCHEMA = "carrick.status/0";

package/dist/contract.js.map

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

package/dist/hook/apply-patch.d.ts

@@ -0,0 +1,13 @@
+/** Whether a string is an `apply_patch` envelope at all. */
+export declare function looksLikePatch(text: string): boolean;
+/**
+ * The paths a patch leaves on disk, in the order it names them.
+ *
+ * Relative to the cwd the tool ran in, exactly as the patch spells them, and
+ * deduplicated: a caller turns them into workspace-relative paths because only
+ * it knows the root.
+ *
+ * Anything that is not a patch gives an empty list, so a caller can hand this
+ * whatever a `command` field held without asking first.
+ */
+export declare function patchedFiles(text: string): string[];

package/dist/hook/apply-patch.js

@@ -0,0 +1,100 @@
+// The files one `apply_patch` call leaves on disk (carrick#1335).
+//
+// Codex has no `Edit`/`Write` tool with a `file_path`. It edits through
+// `apply_patch`, whose PostToolUse payload is
+// `tool_input: { "command": "<the patch text>" }`
+// (`codex-rs/core/src/tools/handlers/apply_patch.rs`), and one patch can add,
+// update, delete and rename several files at once. So the recording half of
+// the reuse nudge needs this: the patch text in, the paths worth re-checking
+// out.
+//
+// The grammar is four header lines, each at the start of its own line, inside
+// a `*** Begin Patch` / `*** End Patch` envelope (`codex-rs/apply-patch`):
+//
+//     *** Add File: <path>
+//     *** Update File: <path>
+//     *** Delete File: <path>
+//     *** Move to: <path>        (only ever after an Update File)
+//
+// Body lines carry a `+`, `-` or space prefix, so a line beginning `*** ` is a
+// header and nothing else. `*** End of File` is a marker, not a path, and is
+// ignored with everything else that is not one of the four.
+//
+// Two of the four are not simply "a file that changed":
+//
+// * `Delete File` names a path that is GONE once the patch applies. Re-checking
+//   it asks the CLI about a file that is not there, so it is dropped here
+//   rather than filtered later.
+// * `Move to` renames the `Update File` above it. The file the index should be
+//   compared against is the destination, so the destination replaces the source
+//   rather than joining it.
+//
+// Reference: `docs/reference/task-skills.md`, "The reuse nudge".
+/** The header that opens a patch, used to tell a patch from any other string. */
+const ENVELOPE = "*** Begin Patch";
+const HEADERS = [
+    { marker: "*** Add File: ", kind: "add" },
+    { marker: "*** Update File: ", kind: "update" },
+    { marker: "*** Delete File: ", kind: "delete" },
+    { marker: "*** Move to: ", kind: "move" },
+];
+function header(line) {
+    for (const candidate of HEADERS) {
+        if (line.startsWith(candidate.marker)) {
+            const path = line.slice(candidate.marker.length).trim();
+            if (path !== "")
+                return { kind: candidate.kind, path };
+        }
+    }
+    return null;
+}
+/** Whether a string is an `apply_patch` envelope at all. */
+export function looksLikePatch(text) {
+    return text.includes(ENVELOPE);
+}
+/**
+ * The paths a patch leaves on disk, in the order it names them.
+ *
+ * Relative to the cwd the tool ran in, exactly as the patch spells them, and
+ * deduplicated: a caller turns them into workspace-relative paths because only
+ * it knows the root.
+ *
+ * Anything that is not a patch gives an empty list, so a caller can hand this
+ * whatever a `command` field held without asking first.
+ */
+export function patchedFiles(text) {
+    if (!looksLikePatch(text))
+        return [];
+    const files = [];
+    // Where the last `Update File` put its path, so a `Move to` under it replaces
+    // that entry instead of adding a second one for a file that no longer exists.
+    let lastUpdate = null;
+    for (const line of text.split("\n")) {
+        const found = header(line.trimEnd());
+        if (found === null)
+            continue;
+        switch (found.kind) {
+            case "delete":
+                lastUpdate = null;
+                break;
+            case "move":
+                if (lastUpdate === null) {
+                    files.push(found.path);
+                }
+                else {
+                    files[lastUpdate] = found.path;
+                }
+                lastUpdate = null;
+                break;
+            case "update":
+                lastUpdate = files.push(found.path) - 1;
+                break;
+            case "add":
+                files.push(found.path);
+                lastUpdate = null;
+                break;
+        }
+    }
+    return [...new Set(files)];
+}
+//# sourceMappingURL=apply-patch.js.map

package/dist/hook/apply-patch.js.map

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

package/dist/hook/post-edit.d.ts

@@ -1,13 +1,42 @@
 #!/usr/bin/env node
+import type { CheckResult } from "../contract.ts";
+import type { NewFunction } from "./reuse.ts";
 type Payload = {
     cwd?: string;
+    session_id?: string;
     tool_input?: {
         file_path?: string;
         filePath?: string;
         edits?: Array<{
             file_path?: string;
         }>;
+        /** Codex's `apply_patch`: the patch text itself. */
+        command?: unknown;
     };
 };
-export declare function fileFromPayload(payload: Payload): string | null;
+/**
+ * What the re-check said this file declares and the index does not
+ * (carrick#1330).
+ *
+ * Nothing is printed about it here. This hook fires on every edit and most
+ * edits add no function; the one line about the ones that did belongs at the
+ * end of the task, where it costs one model turn instead of one per edit. All
+ * this does is put the names somewhere the Stop hook can find them.
+ */
+export declare function newFunctions(result: CheckResult, file: string): NewFunction[];
+/**
+ * Every file one tool call left on disk, whichever host made it.
+ *
+ * A named file wins where there is one: that is Claude Code, and its path is
+ * absolute. Otherwise the `command` field is read as a patch, which is Codex's
+ * `apply_patch` — its paths are relative to the cwd the tool ran in, and a
+ * string that is not a patch gives nothing, so nothing here has to ask which
+ * host is calling.
+ *
+ * A shell command that is not a patch reaches the same branch and yields an
+ * empty list, which is why this does not test `tool_name`: the patch text
+ * recognises itself, and an `apply_patch` run through a shell is recorded on
+ * the same terms as one run as a tool.
+ */
+export declare function filesFromPayload(payload: Payload): string[];
 export {};

package/dist/hook/post-edit.js

@@ -1,10 +1,16 @@
 #!/usr/bin/env node
-// PostToolUse hook for Edit, Write and MultiEdit.
+// PostToolUse hook for a file edit, on either host.
 //
 // Reads the tool payload on stdin, runs `carrick check <file> --json` from the
-// workspace root and prints the verdicts as `additionalContext`, which Claude
-// Code attaches to the tool result. Attaching to the result rather than to the
-// next turn is why this channel has no "the run ended on the edit" hole.
+// workspace root and prints the verdicts as `additionalContext`, which the host
+// attaches to the tool result. Attaching to the result rather than to the next
+// turn is why this channel has no "the run ended on the edit" hole.
+//
+// Two payload shapes reach it, because the two hosts edit differently
+// (carrick#1335). Claude Code's `Edit`, `Write` and `MultiEdit` name one file
+// in `tool_input.file_path`. Codex's `apply_patch` carries a patch in
+// `tool_input.command`, and one patch can touch several files — so the file is
+// a list here, checked in the order the payload names them.
 //
 // It exits 0 whatever happens. An edit never fails because Carrick had nothing
 // to say, could not find its binary, or timed out.
@@ -14,12 +20,47 @@ import { resolveChannel } from "../channel.js";
 import { createLogger } from "../log.js";
 import { renderPostToolUse } from "../render.js";
 import { resolveRoot, rootNote } from "../root.js";
+import { patchedFiles } from "./apply-patch.js";
+import { record } from "./reuse.js";
 const log = createLogger("carrick-hook");
 /** The files the index has rows for. */
 const CHECKED = /\.(ts|tsx|mts|cts)$/;
-export function fileFromPayload(payload) {
+/**
+ * What the re-check said this file declares and the index does not
+ * (carrick#1330).
+ *
+ * Nothing is printed about it here. This hook fires on every edit and most
+ * edits add no function; the one line about the ones that did belongs at the
+ * end of the task, where it costs one model turn instead of one per edit. All
+ * this does is put the names somewhere the Stop hook can find them.
+ */
+export function newFunctions(result, file) {
+    return (result.recheck?.new_functions ?? []).map((entry) => ({
+        name: entry.name,
+        file: result.file ?? file,
+        indexCommit: result.index_commit ?? "",
+    }));
+}
+/**
+ * Every file one tool call left on disk, whichever host made it.
+ *
+ * A named file wins where there is one: that is Claude Code, and its path is
+ * absolute. Otherwise the `command` field is read as a patch, which is Codex's
+ * `apply_patch` — its paths are relative to the cwd the tool ran in, and a
+ * string that is not a patch gives nothing, so nothing here has to ask which
+ * host is calling.
+ *
+ * A shell command that is not a patch reaches the same branch and yields an
+ * empty list, which is why this does not test `tool_name`: the patch text
+ * recognises itself, and an `apply_patch` run through a shell is recorded on
+ * the same terms as one run as a tool.
+ */
+export function filesFromPayload(payload) {
     const input = payload.tool_input ?? {};
-    return input.file_path ?? input.filePath ?? input.edits?.[0]?.file_path ?? null;
+    const named = input.file_path ?? input.filePath ?? input.edits?.[0]?.file_path ?? null;
+    if (named)
+        return [named];
+    return typeof input.command === "string" ? patchedFiles(input.command) : [];
 }
 function emit(context) {
     process.stdout.write(JSON.stringify({
@@ -36,9 +77,13 @@ async function readStdin() {
     return Buffer.concat(chunks).toString("utf8");
 }
 async function main() {
+    // `off` stops the work as well as the printing. `lsp` stops only the
+    // printing: it decides which surface delivers a verdict, and the reuse
+    // record below is not a verdict — it is what the Stop hook speaks from, and
+    // the language server has no equivalent of that moment (carrick#1330).
     const channel = resolveChannel({ hooksInstalled: true });
-    if (channel.channel !== "hook") {
-        log(`the ${channel.channel} channel owns delivery in this install; printing nothing`);
+    if (channel.channel === "off") {
+        log("CARRICK_CHANNEL=off; doing nothing");
         return;
     }
     let payload;
@@ -49,31 +94,57 @@ async function main() {
         log("unparseable payload", String(error));
         return;
     }
-    const file = fileFromPayload(payload);
-    if (!file || !CHECKED.test(file))
+    // A patch can name a file this index has no rows for beside one it does, so
+    // the filter is per file rather than a reason to drop the call.
+    const cwd = payload.cwd ?? null;
+    const edited = filesFromPayload(payload)
+        .filter((file) => CHECKED.test(file))
+        .map((file) => (path.isAbsolute(file) ? file : path.resolve(cwd ?? process.cwd(), file)));
+    if (edited.length === 0)
         return;
+    // One root for the call: every file in one patch is in the workspace the tool
+    // ran in, and resolving it per file would ask the same question repeatedly.
     const choice = resolveRoot({
-        clientRoot: payload.cwd ?? null,
+        clientRoot: cwd,
         projectDir: process.env["CLAUDE_PROJECT_DIR"] ?? null,
-        filePath: file,
+        filePath: edited[0],
     });
     const note = rootNote(choice);
     if (note)
         log(note);
-    const relative = path.isAbsolute(file) ? path.relative(choice.root, file) : file;
-    // The edit just landed, so the index describes the file as it was before it.
-    // This is the one surface that asks for the file to be re-judged from the
-    // working tree; it fires once per completed edit, where the language server
-    // fires on every save (carrick#1036).
-    const outcome = await check(relative, { cwd: choice.root, recheck: true });
-    if (!outcome.result) {
-        log("no answer for", relative, outcome.failure ?? "");
+    const found = [];
+    const contexts = [];
+    for (const file of edited) {
+        const relative = path.relative(choice.root, file);
+        // The edit just landed, so the index describes the file as it was before
+        // it. This is the one surface that asks for the file to be re-judged from
+        // the working tree; it fires once per completed edit, where the language
+        // server fires on every save (carrick#1036).
+        const outcome = await check(relative, { cwd: choice.root, recheck: true });
+        if (!outcome.result) {
+            // One unreadable file in a patch of four is not a reason to say nothing
+            // about the other three.
+            log("no answer for", relative, outcome.failure ?? "");
+            continue;
+        }
+        found.push(...newFunctions(outcome.result, relative));
+        const context = renderPostToolUse(outcome.result, relative);
+        log(`check ${relative} -> ${context ? "context" : "nothing to say"} in ${outcome.ms}ms`);
+        if (context)
+            contexts.push(context);
+    }
+    // Silent and local: the names go to a file under the user's home directory
+    // and nothing about them is printed here.
+    if (found.length > 0 && payload.session_id) {
+        record(payload.session_id, found);
+        log(`recorded ${found.length} new function(s) for ${payload.session_id}`);
+    }
+    if (channel.channel !== "hook") {
+        log(`the ${channel.channel} channel owns delivery in this install; printing nothing`);
         return;
     }
-    const context = renderPostToolUse(outcome.result, relative);
-    log(`check ${relative} -> ${context ? "context" : "nothing to say"} in ${outcome.ms}ms`);
-    if (context)
-        emit(context);
+    if (contexts.length > 0)
+        emit(contexts.join("\n\n"));
 }
 await main();
 process.exit(0);

package/dist/hook/post-edit.js.map

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