ntfyx 0.1.4 → 0.1.6

package/README.md

@@ -1,37 +1,43 @@
 # Ntfyx
 
-End-to-end encrypted notifications and one-time replies for command-line tools and AI agents.
+Send task completion notifications and answer agent questions from your phone.
+Agent and CLI messages are end-to-end encrypted. A Ntfyx phone app and an approved
+phone pairing are required before sending messages or using the MCP tools.
 
-## Install
-
-Requires Node.js 24 or newer. Supports macOS and Linux with glibc on Apple Silicon/ARM64 and x64. Windows and Linux with musl are not supported by this release.
-
-```sh
-npm install -g ntfyx
-ntfyx --help
-ntfyx version --json
-```
-
-The npm package downloads the matching official binary from `https://ntfyx.me/releases/0.1.4/` during installation. It verifies the release manifest signature, download size, SHA-256 digest, and binary version before installing. An internet connection and permission to run the package's installation script are required. If installation scripts are disabled, follow the [standalone installation instructions](https://ntfyx.me/install).
-
-## Get started
-
-Install the Ntfyx phone app, then pair this computer by scanning the QR code and approving it on your phone:
+Requires Node.js 24 or later and macOS (Apple silicon or Intel) or Linux glibc
+(x64 or arm64). Windows and musl Linux are not supported. Installation downloads
+the version-pinned binary from ntfyx.me and verifies its release signature and hash.
 
 ```sh
+npm install -g ntfyx@0.1.6
 ntfyx connect
-ntfyx send "Build finished"
-ntfyx ask "Continue?" --allow-deny --async --json
+ntfyx send "Task finished"
+ntfyx ask "Continue?" --allow-deny
 ```
 
-Use the returned request ID to read a reply:
+Scan the connection QR code in Ntfyx and approve the connection on your phone.
+Keep the resulting local credentials on that machine.
 
-```sh
-ntfyx result REQUEST_ID --json
-```
+For an MCP client, first pair using `npx ntfyx@0.1.6 connect`, then configure:
 
-See the [documentation](https://ntfyx.me/docs/) for setup, agent integrations, and security details.
+```json
+{
+  "mcpServers": {
+    "ntfyx": {
+      "command": "npx",
+      "args": ["-y", "ntfyx@0.1.6", "mcp"]
+    }
+  }
+}
+```
 
-## License
+The MCP server uses local stdio and the local paired identity. It does not offer
+a hosted MCP endpoint. Native tool approval is separate from MCP questions:
+Apple silicon Mac validation covers Claude Code 2.1.303 and Codex 0.163.0 with
+CLI 0.1.5 or later; Intel Mac native approval remains unverified and returns to
+the terminal. Claude permission hooks require explicit `--permissions on` during
+setup. Codex requires interactive TUI and `/hooks` trust; `codex exec` does not
+trigger permission hooks.
 
-Ntfyx is distributed under the included proprietary [LICENSE](LICENSE). Third-party components retain their own licenses; see `THIRD_PARTY_NOTICES.txt` and `RELINKING.md`. The package includes `ntfyx-runtime-entry.mjs` for the runtime replacement described there.
+[Installation and signed downloads](https://ntfyx.me/install) ·
+[Agent setup and limits](https://ntfyx.me/docs/agents)

package/installer.mjs

@@ -208,7 +208,6 @@ var schemas = {
     }
   })
 };
-
 // packages/protocol/src/index.ts
 var LIMITS = Object.freeze({
   free_topics: 1,
@@ -218,6 +217,12 @@ var LIMITS = Object.freeze({
   sources_per_inbox: 100,
   browsers: 2,
   messages_per_day: 1000,
+  monitor_free_messages_per_day: 100,
+  monitor_ten_messages_per_day: 480,
+  monitor_unlimited_messages_per_day: 4800,
+  monitor_free_bytes: 1 * 1024 * 1024,
+  monitor_ten_bytes: 8 * 1024 * 1024,
+  monitor_unlimited_bytes: 64 * 1024 * 1024,
   requests_per_day: 200,
   pending: 50,
   payload_bytes: 16384,
@@ -292,24 +297,39 @@ async function installVerified(options) {
   await mkdir(dirname(options.target), { recursive: true });
   const directory = await mkdtemp(join(dirname(options.target), ".ntfyx-install-"));
   try {
-    const response = await (options.fetcher ?? fetch)(artifact.url, {
-      redirect: "error",
-      signal: AbortSignal.timeout(60000)
-    });
-    if (!response.ok)
-      throw new NtfyxError("network_error", 503);
-    const reader = response.body.getReader(), chunks = [];
-    let length = 0;
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done)
-        break;
-      length += value.length;
-      if (length > artifact.bytes) {
-        await reader.cancel();
-        throw new NtfyxError("invalid_signature");
+    const stalled = new AbortController, chunks = [];
+    let length = 0, timer;
+    const arm = () => {
+      clearTimeout(timer);
+      timer = setTimeout(() => stalled.abort(), 60000);
+    };
+    try {
+      arm();
+      const response = await (options.fetcher ?? fetch)(artifact.url, {
+        redirect: "error",
+        signal: AbortSignal.any([stalled.signal, AbortSignal.timeout(1800000)])
+      });
+      if (!response.ok)
+        throw new NtfyxError("network_error", 503);
+      const reader = response.body.getReader();
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done)
+          break;
+        arm();
+        length += value.length;
+        if (length > artifact.bytes) {
+          await reader.cancel();
+          throw new NtfyxError("invalid_signature");
+        }
+        chunks.push(value);
       }
-      chunks.push(value);
+    } catch (error) {
+      if (error instanceof NtfyxError)
+        throw error;
+      throw new NtfyxError("network_error", 503);
+    } finally {
+      clearTimeout(timer);
     }
     const binary = Buffer.concat(chunks);
     if (length !== artifact.bytes || createHash("sha256").update(binary).digest("hex") !== artifact.sha256)

package/ntfyx-runtime-entry.mjs

@@ -3285,6 +3285,11 @@ var init_schemas = __esm(() => {
   };
 });
 
+// packages/protocol/src/http-send-url.ts
+var init_http_send_url = __esm(() => {
+  init_src();
+});
+
 // packages/protocol/src/index.ts
 function validate(name, value) {
   if (!exports_validators[name]?.(value))
@@ -3333,6 +3338,7 @@ var LIMITS, NtfyxError, EXIT_CODES;
 var init_src = __esm(() => {
   init_validators();
   init_schemas();
+  init_http_send_url();
   LIMITS = Object.freeze({
     free_topics: 1,
     plus_topics: 20,
@@ -3341,6 +3347,12 @@ var init_src = __esm(() => {
     sources_per_inbox: 100,
     browsers: 2,
     messages_per_day: 1000,
+    monitor_free_messages_per_day: 100,
+    monitor_ten_messages_per_day: 480,
+    monitor_unlimited_messages_per_day: 4800,
+    monitor_free_bytes: 1 * 1024 * 1024,
+    monitor_ten_bytes: 8 * 1024 * 1024,
+    monitor_unlimited_bytes: 64 * 1024 * 1024,
     requests_per_day: 200,
     pending: 50,
     payload_bytes: 16384,
@@ -14239,24 +14251,39 @@ async function installVerified(options) {
   await mkdir6(dirname4(options.target), { recursive: true });
   const directory = await mkdtemp2(join8(dirname4(options.target), ".ntfyx-install-"));
   try {
-    const response = await (options.fetcher ?? fetch)(artifact.url, {
-      redirect: "error",
-      signal: AbortSignal.timeout(60000)
-    });
-    if (!response.ok)
-      throw new NtfyxError("network_error", 503);
-    const reader = response.body.getReader(), chunks = [];
-    let length = 0;
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done)
-        break;
-      length += value.length;
-      if (length > artifact.bytes) {
-        await reader.cancel();
-        throw new NtfyxError("invalid_signature");
+    const stalled = new AbortController, chunks = [];
+    let length = 0, timer;
+    const arm = () => {
+      clearTimeout(timer);
+      timer = setTimeout(() => stalled.abort(), 60000);
+    };
+    try {
+      arm();
+      const response = await (options.fetcher ?? fetch)(artifact.url, {
+        redirect: "error",
+        signal: AbortSignal.any([stalled.signal, AbortSignal.timeout(1800000)])
+      });
+      if (!response.ok)
+        throw new NtfyxError("network_error", 503);
+      const reader = response.body.getReader();
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done)
+          break;
+        arm();
+        length += value.length;
+        if (length > artifact.bytes) {
+          await reader.cancel();
+          throw new NtfyxError("invalid_signature");
+        }
+        chunks.push(value);
       }
-      chunks.push(value);
+    } catch (error) {
+      if (error instanceof NtfyxError)
+        throw error;
+      throw new NtfyxError("network_error", 503);
+    } finally {
+      clearTimeout(timer);
     }
     const binary = Buffer.concat(chunks);
     if (length !== artifact.bytes || createHash("sha256").update(binary).digest("hex") !== artifact.sha256)
@@ -14315,15 +14342,23 @@ async function upgrade() {
   if (!RELEASE_PUBLIC_KEY)
     throw new NtfyxError("release_unavailable", 503, "Production release signing key is not configured");
   const origin = "https://ntfyx.me/releases/stable";
-  const [m, s] = await Promise.all([
-    fetch(origin + "/manifest.json", { redirect: "error", signal: AbortSignal.timeout(30000) }),
-    fetch(origin + "/manifest.sig", { redirect: "error", signal: AbortSignal.timeout(30000) })
-  ]);
-  if (!m.ok || !s.ok)
+  let raw, signature;
+  try {
+    const [m, s] = await Promise.all([
+      fetch(origin + "/manifest.json", { redirect: "error", signal: AbortSignal.timeout(30000) }),
+      fetch(origin + "/manifest.sig", { redirect: "error", signal: AbortSignal.timeout(30000) })
+    ]);
+    if (!m.ok || !s.ok)
+      throw new NtfyxError("network_error", 503);
+    [raw, signature] = [await m.text(), (await s.text()).trim()];
+  } catch (error) {
+    if (error instanceof NtfyxError)
+      throw error;
     throw new NtfyxError("network_error", 503);
+  }
   return installVerified({
-    raw: await m.text(),
-    signature: (await s.text()).trim(),
+    raw,
+    signature,
     publicKey: RELEASE_PUBLIC_KEY,
     target: process.execPath,
     platform: process.platform + "-" + process.arch
@@ -14339,6 +14374,34 @@ var init_upgrade = __esm(() => {
   init_installer();
 });
 
+// packages/adapters/src/lifecycle.ts
+function hookTransaction(db, operation) {
+  db.exec("BEGIN IMMEDIATE");
+  try {
+    const result = operation();
+    db.exec("COMMIT");
+    return result;
+  } catch (error) {
+    db.exec("ROLLBACK");
+    throw error;
+  }
+}
+function ensureHookEpoch(db) {
+  hookTransaction(db, () => {
+    const columns = db.prepare("PRAGMA table_info(hook_sessions)").all();
+    if (!columns.some((column) => column.name === "epoch"))
+      db.exec("ALTER TABLE hook_sessions ADD COLUMN epoch INTEGER NOT NULL DEFAULT 0");
+  });
+}
+function hookEpoch(db, session) {
+  const row = db.prepare("SELECT epoch FROM hook_sessions WHERE session_hash=?").get(session);
+  return row.epoch;
+}
+function sameHookEpoch(db, session, epoch) {
+  const row = db.prepare("SELECT closed,epoch FROM hook_sessions WHERE session_hash=?").get(session);
+  return !!row && !row.closed && row.epoch === epoch;
+}
+
 // packages/client-core/src/stream.ts
 class SyncHints {
   socket;
@@ -16807,9 +16870,18 @@ async function api(origin, path, token, body, method, signal, inbox) {
 }
 async function createPairing(origin, role, intent, options = {}) {
   assertOrigin(origin);
+  if (options.identity) {
+    if (role !== "browser" || intent !== "web-connect" || options.extractable)
+      throw new NtfyxError("invalid_binding");
+    const { signing, hpke, principal_id, key_id } = options.identity;
+    if (signing?.privateKey?.extractable || hpke?.privateKey?.extractable)
+      throw new NtfyxError("private_key_exportable");
+    if (!/^[A-Za-z0-9_-]{22,80}$/.test(principal_id) || !/^[A-Za-z0-9_-]{22,80}$/.test(key_id) || signing?.privateKey?.type !== "private" || hpke?.privateKey?.type !== "private" || signing?.publicKey?.type !== "public" || hpke?.publicKey?.type !== "public" || signing.privateKey.algorithm.name !== "ECDSA" || hpke.privateKey.algorithm.name !== "ECDH" || signing.privateKey.algorithm.namedCurve !== "P-256" || hpke.privateKey.algorithm.namedCurve !== "P-256" || !signing.privateKey.usages.includes("sign") || !hpke.privateKey.usages.includes("deriveBits"))
+      throw new NtfyxError("invalid_identity");
+  }
   const config = await api(origin, "/service-config");
   const server_offset = config.server_time - Date.now();
-  const identity = await newIdentity(options.extractable ?? false);
+  const identity = options.identity ?? await newIdentity(options.extractable ?? false);
   const pub = await publicIdentity(identity);
   const ephemeral = await suite.kem.generateKeyPair();
   const qr = {
@@ -17454,7 +17526,7 @@ function hostAnswer(q, answer) {
   }
   return value;
 }
-async function handleClaudeQuestion(store, raw) {
+async function handleClaudeQuestion(store, raw, topic) {
   let ctx;
   let pending;
   let invocation;
@@ -17487,14 +17559,16 @@ async function handleClaudeQuestion(store, raw) {
       if (Buffer.byteLength(JSON.stringify(candidate)) > LIMITS.payload_bytes)
         return;
     }
-    ctx = await openClient(store);
+    ctx = await openClient(store, topic);
     const db = ctx.ledger.db, session = await hash(data.session_id);
     db.exec("CREATE TABLE IF NOT EXISTS hook_sessions(session_hash TEXT PRIMARY KEY,closed INTEGER NOT NULL DEFAULT 0); CREATE TABLE IF NOT EXISTS hook_invocations(invocation_id TEXT PRIMARY KEY,session_hash TEXT NOT NULL,request_id TEXT NOT NULL,pid INTEGER NOT NULL,parent_pid INTEGER NOT NULL,state TEXT NOT NULL); CREATE TABLE IF NOT EXISTS question_batches(invocation_id TEXT PRIMARY KEY);");
+    ensureHookEpoch(db);
     db.prepare("INSERT OR IGNORE INTO hook_sessions(session_hash,closed) VALUES(?,0)").run(session);
-    const batch = await hash(data.session_id + "\x00" + data.tool_use_id);
+    const epoch = hookEpoch(db, session);
+    const batch = await hash(data.session_id + "\x00" + data.tool_use_id + "\x00" + epoch);
     if (!db.prepare("INSERT OR IGNORE INTO question_batches VALUES(?)").run(batch).changes)
       return;
-    const active = () => alive() && !db.prepare("SELECT closed FROM hook_sessions WHERE session_hash=?").get(session)?.closed && (!invocation || db.prepare("SELECT state FROM hook_invocations WHERE invocation_id=?").get(invocation)?.state === "waiting");
+    const active = () => alive() && sameHookEpoch(db, session, epoch) && (!invocation || db.prepare("SELECT state FROM hook_invocations WHERE invocation_id=?").get(invocation)?.state === "waiting");
     monitor = setInterval(() => {
       if (!active())
         stop();
@@ -17517,7 +17591,9 @@ async function handleClaudeQuestion(store, raw) {
       if (value === null)
         return;
       answers[questions[i].question] = value;
-      db.prepare("UPDATE hook_invocations SET state='delivered' WHERE invocation_id=?").run(invocation);
+      const delivered = db.prepare("UPDATE hook_invocations SET state='delivered' WHERE invocation_id=? AND state='waiting'").run(invocation);
+      if (!delivered.changes || !sameHookEpoch(db, session, epoch))
+        return;
       pending = undefined;
       invocation = undefined;
     }
@@ -17900,7 +17976,7 @@ var MCP_TOOLS = [
 }));
 var inputValidator = new import_ajv.default({ strict: false });
 var inputSchemas = Object.fromEntries(MCP_TOOLS.map((t) => [t.name, inputValidator.compile(t.inputSchema)]));
-async function runMcp(store) {
+async function runMcp(store, defaultTopic) {
   const active = new Map;
   const output = (v) => process.stdout.write(JSON.stringify(v) + `
 `);
@@ -17934,7 +18010,7 @@ async function runMcp(store) {
         protocolVersion: "2025-11-25",
         capabilities: { tools: {} },
         instructions: "Use ntfyx_ask for user questions, choices and missing information when phone replies are enabled. Read pending requests with ntfyx_result(consume=true); continue only after an answered result with claim_acquired. Keep one session_id for the current host session. Respect the user\u2019s channel choice and existing authorization; do not ask again for an already authorized step.",
-        serverInfo: { name: "ntfyx", version: "0.1.4" }
+        serverInfo: { name: "ntfyx", version: "0.1.6" }
       });
       return;
     }
@@ -17965,7 +18041,7 @@ async function runMcp(store) {
       const seconds = a.wait_seconds ?? 30;
       if (!Number.isInteger(seconds) || seconds < 0 || seconds > 45)
         throw new NtfyxError("invalid_duration");
-      context = await openClient(store, a.topic);
+      context = await openClient(store, a.topic ?? defaultTopic);
       const { client, ledger } = context;
       const sessionId = a.session_id ?? process.env.NTFYX_SESSION_ID;
       const task = ["ntfyx_send", "ntfyx_ask"].includes(name) ? await sessionTask(sessionId, a.session_name ?? process.env.NTFYX_SESSION_NAME, a.task) : undefined;
@@ -18148,10 +18224,12 @@ var compatibility_default = {
       min_version: "2.1.283",
       verified_versions: [
         "2.1.283",
-        "2.1.284"
+        "2.1.284",
+        "2.1.303"
       ],
       os: [
-        "linux-x64"
+        "linux-x64",
+        "darwin-arm64"
       ],
       tools: [
         "Bash",
@@ -18167,21 +18245,24 @@ var compatibility_default = {
       unsupported: [
         "Interactive terminal-choice precedence and terminal UI takeover require a separate real interactive acceptance run."
       ],
-      tested_at: "2026-09-30",
+      tested_at: "2026-10-19",
       evidence: [
         "docs/native-agent-evidence.json",
         "docs/native-agent-regression-evidence.json",
-        "docs/evidence/native-hosts/claude-2.1.284-basic.json"
+        "docs/evidence/native-hosts/claude-2.1.284-basic.json",
+        "docs/evidence/native-hosts/claude-2.1.303-darwin-arm64.json"
       ]
     },
     {
       host: "codex",
       min_version: "0.158.0",
       verified_versions: [
-        "0.158.0"
+        "0.158.0",
+        "0.163.0"
       ],
       os: [
-        "linux-x64"
+        "linux-x64",
+        "darwin-arm64"
       ],
       tools: [
         "Bash",
@@ -18198,9 +18279,10 @@ var compatibility_default = {
         "codex exec disables approvals, so PermissionRequest hooks never run there.",
         "Codex requires the user to review and trust hooks with /hooks before they run."
       ],
-      tested_at: "2026-09-30",
+      tested_at: "2026-10-19",
       evidence: [
-        "docs/evidence/native-hosts/codex-0.158.0-basic.json"
+        "docs/evidence/native-hosts/codex-0.158.0-basic.json",
+        "docs/evidence/native-hosts/codex-0.163.0-darwin-arm64.json"
       ]
     }
   ],
@@ -18290,6 +18372,7 @@ function permissionContext(host, data) {
 // packages/adapters/src/claude.ts
 var quote = (s) => "'" + s.replace(/'/g, "'\\''") + "'";
 var CLAUDE_HOOKS = [
+  ["SessionStart", "session-start", ""],
   ["PreToolUse", "question", "AskUserQuestion"],
   ["PermissionRequest", "permission", "Bash|Edit|Write"],
   ["Notification", "notification", "permission_prompt|elicitation_dialog"],
@@ -18306,7 +18389,12 @@ function mergeHooks(settings, executable, remove = false, spec = CLAUDE_HOOKS, s
     const entries = updated.hooks[event] ?? [];
     if (!Array.isArray(entries))
       throw new NtfyxError("local_store");
-    updated.hooks[event] = entries.filter((x) => !(Array.isArray(x.hooks) && x.hooks.length === 1 && commands.includes(x.hooks[0].command)));
+    updated.hooks[event] = entries.map((entry) => {
+      if (!entry || !Array.isArray(entry.hooks))
+        return entry;
+      const hooks = entry.hooks.filter((hook) => !commands.includes(hook?.command));
+      return hooks.length ? { ...entry, hooks } : undefined;
+    }).filter((entry) => entry !== undefined);
     if (!remove)
       updated.hooks[event].push({
         ...matcher ? { matcher } : {},
@@ -18349,8 +18437,29 @@ async function setupClaude(options) {
     if (e.code !== "ENOENT")
       throw new NtfyxError("local_store", 400, "Cannot parse Claude settings");
   }
-  const suffix = options.config ? " --config " + quote(options.config) : "";
-  const updated = mergeHooks(settings, options.executable, options.remove, CLAUDE_HOOKS, suffix);
+  const suffix = (options.config ? " --config " + quote(options.config) : "") + (options.topic ? " --topic " + quote(options.topic) : "");
+  const permissions = options.permissions ?? false;
+  const questions = options.questions ?? true;
+  const notifications = options.notifications ?? true;
+  const lifecycle = permissions || questions;
+  const selected = CLAUDE_HOOKS.filter(([event]) => {
+    if (event === "PermissionRequest")
+      return permissions;
+    if (event === "PreToolUse")
+      return questions;
+    if (event === "SessionStart" || event === "SessionEnd")
+      return lifecycle;
+    if (event === "Stop")
+      return notifications || lifecycle;
+    return notifications;
+  }).map(([event, hook, matcher]) => [
+    event,
+    event === "Stop" && !notifications ? "stop-cleanup" : hook,
+    matcher
+  ]);
+  const managed = [...CLAUDE_HOOKS, ["Stop", "stop-cleanup", ""]];
+  const cleaned = mergeHooks(settings, options.executable, true, managed, suffix);
+  const updated = options.remove ? cleaned : mergeHooks(cleaned, options.executable, false, selected, suffix);
   const mcpPath = options.directory ? join5(directory, "mcp-test.json") : join5(homedir2(), ".claude.json");
   let mcp = {};
   try {
@@ -18360,7 +18469,7 @@ async function setupClaude(options) {
       throw new NtfyxError("local_store");
   }
   mcp.mcpServers ??= {};
-  const owned = { command: options.executable, args: ["mcp", ...options.config ? ["--config", options.config] : []] };
+  const owned = { command: options.executable, args: ["mcp", ...options.config ? ["--config", options.config] : [], ...options.topic ? ["--topic", options.topic] : []] };
   if (mcp.mcpServers.ntfyx && JSON.stringify(mcp.mcpServers.ntfyx) !== JSON.stringify(owned))
     throw new NtfyxError("local_store", 409, "Existing ntfyx MCP entry is not managed by this executable");
   if (options.remove)
@@ -18372,8 +18481,9 @@ async function setupClaude(options) {
     return {
       status: "dry_run",
       action: options.remove ? "remove" : "merge",
-      managed_hooks: mergeHooks({}, options.executable, false, CLAUDE_HOOKS, suffix).hooks,
+      managed_hooks: mergeHooks({}, options.executable, false, selected, suffix).hooks,
       managed_mcp: { ntfyx: owned },
+      components: { permissions, questions, notifications },
       preserves_existing_permissions: true,
       preserves_unrelated_hooks: true,
       preserves_unrelated_mcp: true
@@ -18387,10 +18497,11 @@ async function setupClaude(options) {
   await installGuidance(directory, options.remove);
   return {
     status: options.remove ? "removed" : "configured",
-    native_approval: "verified_noninteractive_experimental_interactive"
+    components: { permissions, questions, notifications },
+    native_approval: permissions ? "version_and_platform_gated" : "disabled"
   };
 }
-async function handleHook(store, event, input, host = "claude-code") {
+async function handleHook(store, event, input, host = "claude-code", topic) {
   const label = HOST_LABEL[host];
   let ctx;
   let request_id;
@@ -18418,13 +18529,30 @@ async function handleHook(store, event, input, host = "claude-code") {
     if (typeof data.session_id !== "string" || !data.session_id)
       return;
     const task = await sessionTask(data.session_id, label + " \xB7 " + data.session_id.slice(0, 8));
-    ctx = await openClient(store);
+    ctx = await openClient(store, topic);
     const db = ctx.ledger.db, session_hash = await hash(data.session_id);
     db.exec("CREATE TABLE IF NOT EXISTS hook_sessions(session_hash TEXT PRIMARY KEY,closed INTEGER NOT NULL DEFAULT 0); CREATE TABLE IF NOT EXISTS hook_invocations(invocation_id TEXT PRIMARY KEY,session_hash TEXT NOT NULL,request_id TEXT NOT NULL,pid INTEGER NOT NULL,parent_pid INTEGER NOT NULL,state TEXT NOT NULL);");
+    ensureHookEpoch(db);
     db.prepare("INSERT OR IGNORE INTO hook_sessions(session_hash,closed) VALUES(?,0)").run(session_hash);
-    if (event === "session-end" || event === "stop") {
-      if (event === "session-end")
-        db.prepare("UPDATE hook_sessions SET closed=1 WHERE session_hash=?").run(session_hash);
+    const epoch = hookEpoch(db, session_hash);
+    if (event === "session-start") {
+      const prior = hookTransaction(db, () => {
+        const waits = db.prepare("SELECT request_id FROM hook_invocations WHERE session_hash=? AND state='waiting'").all(session_hash);
+        db.prepare("UPDATE hook_invocations SET state='abandoned' WHERE session_hash=? AND state='waiting'").run(session_hash);
+        db.prepare("UPDATE hook_sessions SET closed=0,epoch=epoch+1 WHERE session_hash=?").run(session_hash);
+        return waits;
+      });
+      for (const old of prior) {
+        ctx.ledger.abandon(String(old.request_id));
+        await Promise.race([
+          ctx.client.cancel(String(old.request_id), "terminal_takeover").catch(() => {}),
+          new Promise((resolve) => setTimeout(resolve, 1000))
+        ]);
+      }
+      return;
+    }
+    if (event === "session-end" || event === "stop" || event === "stop-cleanup") {
+      db.prepare(event === "session-end" ? "UPDATE hook_sessions SET epoch=epoch+1,closed=1 WHERE session_hash=?" : "UPDATE hook_sessions SET epoch=epoch+1 WHERE session_hash=?").run(session_hash);
       const pending = db.prepare("SELECT request_id FROM hook_invocations WHERE session_hash=? AND state='waiting'").all(session_hash);
       db.prepare("UPDATE hook_invocations SET state='abandoned' WHERE session_hash=? AND state='waiting'").run(session_hash);
       for (const p of pending) {
@@ -18434,7 +18562,7 @@ async function handleHook(store, event, input, host = "claude-code") {
           new Promise((r) => setTimeout(r, 1000))
         ]);
       }
-      if (event === "session-end")
+      if (event === "session-end" || event === "stop-cleanup")
         return;
     }
     if (event !== "permission") {
@@ -18490,7 +18618,7 @@ async function handleHook(store, event, input, host = "claude-code") {
     }
     const q = validateQuestion(question);
     db.prepare("INSERT INTO hook_invocations VALUES(?,?,?,?,?,'waiting')").run(invocation_id, session_hash, request_id, process.pid, initialParent);
-    const active = () => parentAlive() && !abort.signal.aborted && !db.prepare("SELECT closed FROM hook_sessions WHERE session_hash=?").get(session_hash)?.closed && db.prepare("SELECT state FROM hook_invocations WHERE invocation_id=?").get(invocation_id)?.state === "waiting";
+    const active = () => parentAlive() && !abort.signal.aborted && sameHookEpoch(db, session_hash, epoch) && db.prepare("SELECT state FROM hook_invocations WHERE invocation_id=?").get(invocation_id)?.state === "waiting";
     monitor = setInterval(() => {
       if (!active())
         interrupted();
@@ -18502,8 +18630,8 @@ async function handleHook(store, event, input, host = "claude-code") {
       const decision = answer.response.value;
       if (decision !== "allow" && decision !== "deny")
         return;
-      db.prepare("UPDATE hook_invocations SET state='delivered' WHERE invocation_id=? AND state='waiting'").run(invocation_id);
-      if (!parentAlive() || abort.signal.aborted)
+      const deliveredRow = db.prepare("UPDATE hook_invocations SET state='delivered' WHERE invocation_id=? AND state='waiting'").run(invocation_id);
+      if (!deliveredRow.changes || !parentAlive() || abort.signal.aborted || !sameHookEpoch(db, session_hash, epoch))
         return;
       process.stdout.write(JSON.stringify({
         hookSpecificOutput: {
@@ -18564,8 +18692,9 @@ async function setupCodex(options) {
       throw new NtfyxError("local_store", 400, "Cannot parse Codex hooks.json");
   }
   const suffix = CODEX_SUFFIX + (options.config ? " --config " + "'" + options.config.replace(/'/g, "'\\''") + "'" : "");
-  const updated = mergeHooks(hooks, options.executable, options.remove, CODEX_HOOKS, suffix);
-  const owned = { command: options.executable, args: ["mcp", ...options.config ? ["--config", options.config] : []] };
+  const topicSuffix = options.topic ? " --topic " + "'" + options.topic.replace(/'/g, "'\\''") + "'" : "";
+  const updated = mergeHooks(hooks, options.executable, options.remove, CODEX_HOOKS, suffix + topicSuffix);
+  const owned = { command: options.executable, args: ["mcp", ...options.config ? ["--config", options.config] : [], ...options.topic ? ["--topic", options.topic] : []] };
   let existing;
   try {
     existing = JSON.parse(codex(["mcp", "get", "ntfyx", "--json"]));
@@ -18582,7 +18711,7 @@ async function setupCodex(options) {
     return {
       status: "dry_run",
       action: options.remove ? "remove" : "merge",
-      managed_hooks: mergeHooks({}, options.executable, false, CODEX_HOOKS, suffix).hooks,
+      managed_hooks: mergeHooks({}, options.executable, false, CODEX_HOOKS, suffix + topicSuffix).hooks,
       managed_mcp: { ntfyx: owned },
       preserves_unrelated_hooks: true,
       hook_trust: "Review and trust the ntfyx hooks in Codex with /hooks before they run."
@@ -18947,46 +19076,62 @@ function codexPath() {
   }
 }
 async function main(args = process.argv.slice(2)) {
-  const leadingRequestId = ["result", "cancel"].includes(args[0] ?? "") && /^-[A-Za-z0-9_-]{21,79}$/.test(args[1] ?? "") ? args[1] : undefined;
+  const options = {
+    json: bool,
+    "no-input": bool,
+    new: bool,
+    stdin: bool,
+    "allow-deny": bool,
+    text: bool,
+    "allow-text": bool,
+    async: bool,
+    "keep-pending": bool,
+    claim: bool,
+    "dry-run": bool,
+    remove: bool,
+    permissions: string,
+    questions: string,
+    notifications: string,
+    roundtrip: bool,
+    topic: string,
+    title: string,
+    task: string,
+    "session-id": string,
+    sessionid: string,
+    "session-name": string,
+    priority: string,
+    "dedupe-key": string,
+    expires: string,
+    wait: string,
+    config: string,
+    resume: string,
+    qr: string,
+    server: string,
+    host: string,
+    codex: string,
+    interval: string,
+    once: bool,
+    choice: { type: "string", multiple: true },
+    help: bool
+  };
+  let commandIndex = 0;
+  while (commandIndex < args.length && args[commandIndex].startsWith("--")) {
+    const token = args[commandIndex];
+    if (token === "--")
+      break;
+    const name = token.slice(2).split("=", 1)[0];
+    const option = options[name];
+    if (!option)
+      break;
+    commandIndex += option.type === "string" && !token.includes("=") ? 2 : 1;
+  }
+  const requestIndex = commandIndex + 1;
+  const leadingRequestId = ["result", "cancel"].includes(args[commandIndex] ?? "") && /^-[A-Za-z0-9_-]{21,79}$/.test(args[requestIndex] ?? "") ? args[requestIndex] : undefined;
   const parsed = parseArgs({
-    args: leadingRequestId ? [args[0], ...args.slice(2)] : args,
+    args: leadingRequestId ? args.filter((_, index) => index !== requestIndex) : args,
     allowPositionals: true,
     strict: true,
-    options: {
-      json: bool,
-      "no-input": bool,
-      new: bool,
-      stdin: bool,
-      "allow-deny": bool,
-      text: bool,
-      "allow-text": bool,
-      async: bool,
-      "keep-pending": bool,
-      claim: bool,
-      "dry-run": bool,
-      remove: bool,
-      roundtrip: bool,
-      topic: string,
-      title: string,
-      task: string,
-      "session-id": string,
-      sessionid: string,
-      "session-name": string,
-      priority: string,
-      "dedupe-key": string,
-      expires: string,
-      wait: string,
-      config: string,
-      resume: string,
-      qr: string,
-      server: string,
-      host: string,
-      codex: string,
-      interval: string,
-      once: bool,
-      choice: { type: "string", multiple: true },
-      help: bool
-    }
+    options
   });
   if (leadingRequestId)
     parsed.positionals.splice(1, 0, leadingRequestId);
@@ -18997,7 +19142,8 @@ async function main(args = process.argv.slice(2)) {
   if (f.help || !command || command === "help") {
     process.stdout.write(`ntfyx connect | create | send BODY | ask QUESTION --allow-deny|--choice id=label|--text
 ntfyx result ID [--claim] | cancel ID | topics | use ALIAS | sources | disconnect ALIAS
-ntfyx doctor | setup claude-code|codex|codex-usage [--dry-run|--remove] | mcp | version | upgrade
+ntfyx doctor | setup claude-code|codex|codex-usage [--dry-run|--remove]
+setup claude-code: --permissions on|off (default off) --questions on|off --notifications on|off; --config FILE --topic ALIAS | mcp | version | upgrade
 send/ask: --session-id ID [--session-name NAME] (or NTFYX_SESSION_ID)
 ntfyx watch codex-usage [--once] [--interval 15m] [--dry-run] [--topic ALIAS]
 ntfyx connect --new --topic NEW_ALIAS | connect --resume ID --topic NEW_ALIAS
@@ -19008,7 +19154,7 @@ connect/create: --qr auto|terminal|file (default: auto; compact QR or private lo
   if (command === "version") {
     output({
       application: "ntfyx",
-      version: "0.1.4",
+      version: "0.1.6",
       protocol: 1,
       build: "release",
       installation: process.env.NTFYX_INSTALL_METHOD === "npm" ? "npm" : process.versions.bun ? "binary" : "source"
@@ -19016,7 +19162,7 @@ connect/create: --qr auto|terminal|file (default: auto; compact QR or private lo
     return 0;
   }
   if (command === "mcp") {
-    await runMcp(store);
+    await runMcp(store, f.topic);
     return 0;
   }
   if (command === "hook") {
@@ -19026,9 +19172,9 @@ connect/create: --qr auto|terminal|file (default: auto; compact QR or private lo
     try {
       const input = await stdin(128 * 1024);
       if (rest[0] === "question" && host === "claude-code")
-        await handleClaudeQuestion(store, input);
+        await handleClaudeQuestion(store, input, f.topic);
       else
-        await handleHook(store, rest[0], input, host);
+        await handleHook(store, rest[0], input, host, f.topic);
     } catch {}
     return 0;
   }
@@ -19052,11 +19198,26 @@ connect/create: --qr auto|terminal|file (default: auto; compact QR or private lo
     const setup = rest[0] === "claude-code" ? setupClaude : rest[0] === "codex" ? setupCodex : undefined;
     if (!setup)
       throw new NtfyxError("invalid_schema");
+    const toggle = (value, fallback) => {
+      if (value === undefined)
+        return fallback;
+      if (value !== "on" && value !== "off")
+        throw new NtfyxError("invalid_schema");
+      return value === "on";
+    };
+    if (rest[0] !== "claude-code" && [f.permissions, f.questions, f.notifications].some((v) => v !== undefined))
+      throw new NtfyxError("invalid_schema");
     output(await setup({
       executable: resolve(process.execPath),
       dryRun: !!f["dry-run"],
       remove: !!f.remove,
-      ...f.config ? { config: store.path } : {}
+      ...f.config ? { config: store.path } : {},
+      ...f.topic ? { topic: f.topic } : {},
+      ...rest[0] === "claude-code" ? {
+        permissions: toggle(f.permissions, false),
+        questions: toggle(f.questions, true),
+        notifications: toggle(f.notifications, true)
+      } : {}
     }));
     return 0;
   }

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "ntfyx",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "type": "module",
   "private": false,
   "description": "End-to-end encrypted agent notifications and one-time replies",
+  "homepage": "https://ntfyx.me/docs/agents",
+  "mcpName": "me.ntfyx/ntfyx",
   "engines": {
     "node": ">=24"
   },
@@ -19,6 +21,7 @@
     "installer.mjs",
     "release-public-key.pem",
     "package.json",
+    "README.md",
     "LICENSE",
     "THIRD_PARTY_NOTICES.txt",
     "RELINKING.md",