sessionpipe 0.1.0 → 0.1.1

package/dist/index.js

@@ -1,4 +1,4 @@
-// sessionpipe 0.1.0 · Apache-2.0 · https://sessionpipe.org
+// sessionpipe 0.1.1 · Apache-2.0 · https://sessionpipe.org
 
 // src/http-sink.ts
 import { createHmac, randomUUID } from "node:crypto";
@@ -86,12 +86,31 @@ var HttpSink = class {
 };
 
 // src/run.ts
-import { appendFileSync as appendFileSync3, existsSync as existsSync8, mkdirSync as mkdirSync7, readFileSync as readFileSync8, renameSync as renameSync2, statSync as statSync5, writeFileSync as writeFileSync6 } from "node:fs";
+import {
+  appendFileSync as appendFileSync3,
+  existsSync as existsSync8,
+  mkdirSync as mkdirSync7,
+  readdirSync as readdirSync6,
+  readFileSync as readFileSync8,
+  renameSync as renameSync2,
+  statSync as statSync5,
+  unlinkSync as unlinkSync4,
+  writeFileSync as writeFileSync6
+} from "node:fs";
 import os2 from "node:os";
 import path11 from "node:path";
 
 // ../core/src/adapters/antigravity.ts
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, readdirSync as readdirSync2, readFileSync as readFileSync2, realpathSync, statSync as statSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import {
+  existsSync as existsSync2,
+  mkdirSync as mkdirSync2,
+  readdirSync as readdirSync2,
+  readFileSync as readFileSync2,
+  realpathSync,
+  statSync as statSync2,
+  unlinkSync as unlinkSync2,
+  writeFileSync as writeFileSync2
+} from "node:fs";
 import path4 from "node:path";
 
 // ../core/src/paths.ts
@@ -318,16 +337,42 @@ function readAntigravity(lines, from) {
 }
 
 // ../core/src/adapters/claude-shaped.ts
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import path3 from "node:path";
 var OURS = /sessionpipe[^"\n]*[\\/]hook\.js"?\s+[a-z][a-z-]*\s+[A-Za-z]+\s*$/;
 var isOurs = (h) => Array.isArray(h?.hooks) && h.hooks.some((x) => typeof x.command === "string" && OURS.test(x.command));
-function readJson(file) {
+function readJsonFile(file) {
+  let raw;
   try {
-    return JSON.parse(readFileSync(file, "utf8"));
+    raw = readFileSync(file, "utf8");
   } catch {
-    return {};
+    return { ok: true, existed: false, value: {}, raw: "", indent: "  ", eol: "\n", finalNewline: true };
   }
+  let value;
+  try {
+    value = JSON.parse(raw);
+  } catch {
+    const hint = /^\s*\/\/|\/\*/m.test(raw) ? "not plain JSON (it has comments)" : "not plain JSON";
+    return { ok: false, existed: true, reason: hint };
+  }
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return { ok: false, existed: true, reason: "not a JSON object" };
+  const eol = raw.includes("\r\n") ? "\r\n" : "\n";
+  const m = /^( +|\t+)\S/m.exec(raw);
+  const indent = m?.[1] ?? "  ";
+  return {
+    ok: true,
+    existed: true,
+    value,
+    raw,
+    indent,
+    eol,
+    finalNewline: /\r?\n$/.test(raw)
+  };
+}
+function formatJson(value, f) {
+  const text = JSON.stringify(value, null, f.indent).replace(/\n/g, f.eol);
+  return f.finalNewline ? text + f.eol : text;
 }
 function entryFor(event, harness, cmd, o) {
   const matcher = o.matcherFor(event);
@@ -337,9 +382,22 @@ function entryFor(event, harness, cmd, o) {
   };
 }
 function installClaudeShaped(file, harness, events, cmd, o) {
-  const settings2 = readJson(file);
+  const f = readJsonFile(file);
+  if (!f.ok) return { file, changed: false, skipped: true, note: `${f.reason}; not touched` };
+  const settings2 = f.value;
   const hooks = settings2.hooks && typeof settings2.hooks === "object" ? settings2.hooks : {};
   let changed = false;
+  const want = new Set(events);
+  for (const ev of Object.keys(hooks)) {
+    if (want.has(ev)) continue;
+    const list = Array.isArray(hooks[ev]) ? hooks[ev] : [];
+    const kept = list.filter((h) => !isOurs(h));
+    if (kept.length !== list.length) {
+      changed = true;
+      if (kept.length) hooks[ev] = kept;
+      else delete hooks[ev];
+    }
+  }
   for (const ev of events) {
     const list = Array.isArray(hooks[ev]) ? hooks[ev] : [];
     const entry2 = entryFor(ev, harness, cmd, o);
@@ -358,19 +416,19 @@ function installClaudeShaped(file, harness, events, cmd, o) {
   if (changed) {
     settings2.hooks = hooks;
     mkdirSync(path3.dirname(file), { recursive: true });
-    writeFileSync(file, `${JSON.stringify(settings2, null, 2)}
-`);
+    writeFileSync(file, formatJson(settings2, f));
   }
-  return { file, changed };
+  return { file, changed, created: !f.existed && changed };
 }
-function uninstallClaudeShaped(file, events) {
+function uninstallClaudeShaped(file, events, opts = {}) {
   if (!existsSync(file)) return { file, changed: false };
-  const raw = readFileSync(file, "utf8");
-  const settings2 = readJson(file);
+  const f = readJsonFile(file);
+  if (!f.ok) return { file, changed: false, skipped: true, note: `${f.reason}; not touched` };
+  const settings2 = f.value;
   const hooks = settings2.hooks;
   if (!hooks || typeof hooks !== "object") return { file, changed: false };
   let changed = false;
-  for (const ev of events) {
+  for (const ev of [...events, ...Object.keys(hooks)]) {
     const list = Array.isArray(hooks[ev]) ? hooks[ev] : [];
     const kept = list.filter((h) => !isOurs(h));
     if (kept.length !== list.length) {
@@ -381,13 +439,17 @@ function uninstallClaudeShaped(file, events) {
   }
   if (!changed) return { file, changed: false };
   if (!Object.keys(hooks).length) delete settings2.hooks;
-  const next = `${JSON.stringify(settings2, null, 2)}
-`;
-  if (next !== raw) writeFileSync(file, next);
+  if (opts.created && !Object.keys(settings2).length) {
+    unlinkSync(file);
+    return { file, changed: true, note: "removed (sessionpipe created it)" };
+  }
+  const next = formatJson(settings2, f);
+  if (next !== f.raw) writeFileSync(file, next);
   return { file, changed: true };
 }
 function installedClaudeShaped(file, harness, events, cmd, o) {
-  const hooks = readJson(file).hooks ?? {};
+  const f = readJsonFile(file);
+  const hooks = f.ok ? f.value.hooks ?? {} : {};
   let present = 0;
   let current = 0;
   for (const ev of events) {
@@ -396,6 +458,9 @@ function installedClaudeShaped(file, harness, events, cmd, o) {
     if (mine.length) present++;
     if (mine.length === 1 && JSON.stringify(mine[0]) === JSON.stringify(entryFor(ev, harness, cmd, o))) current++;
   }
+  for (const ev of Object.keys(hooks))
+    if (!events.includes(ev) && (Array.isArray(hooks[ev]) ? hooks[ev] : []).some((h) => isOurs(h)))
+      return "stale";
   if (!present) return "missing";
   return current === events.length ? "current" : "stale";
 }
@@ -410,10 +475,13 @@ var projectsDir = (env) => path4.join(gemini(env), "config", "projects");
 var dataDirs = (env) => ["antigravity", "antigravity-cli", "antigravity-ide"].map((d) => path4.join(gemini(env), d));
 var ID_RE = /^[A-Za-z0-9_-]{1,128}$/;
 var validTool = (n) => typeof n === "string" && /^[A-Za-z0-9_.:-]{1,120}$/.test(n);
-function entry(cmd) {
+function entry(cmd, lean) {
   const handler = (e) => ({ type: "command", command: cmd([NAME, e]).command, timeout: 5 });
   const out = { enabled: true };
-  for (const e of AG_EVENTS) out[e] = /Tool/.test(e) ? [{ matcher: "*", hooks: [handler(e)] }] : [handler(e)];
+  for (const e of AG_EVENTS) {
+    if (lean && e === "PreToolUse") continue;
+    out[e] = /Tool/.test(e) ? [{ matcher: "*", hooks: [handler(e)] }] : [handler(e)];
+  }
   return out;
 }
 var antigravity = {
@@ -421,34 +489,49 @@ var antigravity = {
   events: AG_EVENTS,
   detect: (env = process.env) => existsSync2(path4.join(gemini(env), "config")) || dataDirs(env).some((d) => existsSync2(d)),
   configFiles: (env = process.env) => [hooksFile(env)],
-  install(cmd, env = process.env) {
+  install(cmd, env = process.env, opts = {}) {
     const file = hooksFile(env);
-    const hooks = readJson(file);
-    const e = entry(cmd);
+    const f = readJsonFile(file);
+    if (!f.ok) return [{ file, changed: false, skipped: true, note: `${f.reason}; not touched` }];
+    const hooks = f.value;
+    const e = entry(cmd, opts.lean);
     if (JSON.stringify(hooks[HOOK_NAME]) === JSON.stringify(e)) return [{ file, changed: false }];
     hooks[HOOK_NAME] = e;
     mkdirSync2(path4.dirname(file), { recursive: true });
-    writeFileSync2(file, `${JSON.stringify(hooks, null, 2)}
-`);
+    writeFileSync2(file, formatJson(hooks, f));
     return [
-      { file, changed: true, note: "hooks.json is read when a conversation starts; open ones report after a restart" }
+      {
+        file,
+        changed: true,
+        created: !f.existed,
+        note: "hooks.json is read when a conversation starts; open ones report after a restart"
+      }
     ];
   },
-  uninstall(env = process.env) {
+  uninstall(env = process.env, opts = {}) {
     const file = hooksFile(env);
     if (!existsSync2(file)) return [{ file, changed: false }];
-    const hooks = readJson(file);
+    const f = readJsonFile(file);
+    if (!f.ok) return [{ file, changed: false, skipped: true, note: `${f.reason}; not touched` }];
+    const hooks = f.value;
     if (!(HOOK_NAME in hooks)) return [{ file, changed: false }];
     delete hooks[HOOK_NAME];
-    writeFileSync2(file, `${JSON.stringify(hooks, null, 2)}
-`);
+    if (opts.created?.includes(file) && !Object.keys(hooks).length) {
+      unlinkSync2(file);
+      return [{ file, changed: true, note: "removed (sessionpipe created it)" }];
+    }
+    writeFileSync2(file, formatJson(hooks, f));
     return [{ file, changed: true }];
   },
-  installed(cmd, env = process.env) {
+  installed(cmd, env = process.env, opts = {}) {
     const file = hooksFile(env);
-    const have = readJson(file)[HOOK_NAME];
+    const f = readJsonFile(file);
+    const have = f.ok ? f.value[HOOK_NAME] : void 0;
     return [
-      { file, state: !have ? "missing" : JSON.stringify(have) === JSON.stringify(entry(cmd)) ? "current" : "stale" }
+      {
+        file,
+        state: !have ? "missing" : JSON.stringify(have) === JSON.stringify(entry(cmd, opts.lean)) ? "current" : "stale"
+      }
     ];
   },
   fromHook(input) {
@@ -714,8 +797,11 @@ var CLAUDE_EVENTS = [
   "SubagentStop",
   "PreCompact",
   "PostCompact",
-  "SessionEnd"
+  "SessionEnd",
+  "StopFailure"
 ];
+var LEAN_SKIP = /* @__PURE__ */ new Set(["PreToolUse", "PostToolUseFailure"]);
+var eventsFor = (lean) => lean ? CLAUDE_EVENTS.filter((e) => !LEAN_SKIP.has(e)) : [...CLAUDE_EVENTS];
 var OPTS = { matcherFor: (e) => /Tool|Permission/.test(e) ? "" : void 0, timeout: 5 };
 var DESKTOP_ID = /^local_[A-Za-z0-9-]{1,64}$/;
 function claudeDirs(env = process.env, home = HOME) {
@@ -747,11 +833,13 @@ var claudeCode = {
   events: CLAUDE_EVENTS,
   detect: (env = process.env) => claudeDirs(env).some((d) => existsSync3(d)),
   configFiles: (env = process.env) => claudeDirs(env).map(settingsIn),
-  install: (cmd, env = process.env) => claudeDirs(env).map((d) => installClaudeShaped(settingsIn(d), NAME2, CLAUDE_EVENTS, cmd, OPTS)),
-  uninstall: (env = process.env) => claudeDirs(env).map((d) => uninstallClaudeShaped(settingsIn(d), CLAUDE_EVENTS)),
-  installed: (cmd, env = process.env) => claudeDirs(env).map((d) => ({
+  install: (cmd, env = process.env, opts = {}) => claudeDirs(env).map((d) => installClaudeShaped(settingsIn(d), NAME2, eventsFor(opts.lean), cmd, OPTS)),
+  uninstall: (env = process.env, opts = {}) => claudeDirs(env).map(
+    (d) => uninstallClaudeShaped(settingsIn(d), CLAUDE_EVENTS, { created: opts.created?.includes(settingsIn(d)) })
+  ),
+  installed: (cmd, env = process.env, opts = {}) => claudeDirs(env).map((d) => ({
     file: settingsIn(d),
-    state: installedClaudeShaped(settingsIn(d), NAME2, CLAUDE_EVENTS, cmd, OPTS)
+    state: installedClaudeShaped(settingsIn(d), NAME2, eventsFor(opts.lean), cmd, OPTS)
   })),
   fromHook(input) {
     const event = input.argv[1] ?? "";
@@ -842,6 +930,15 @@ var claudeCode = {
       case "Stop":
         events.push(ev("turn.ended", { turn_id, reason: "stop" }));
         break;
+      case "StopFailure":
+        events.push(
+          ev("turn.ended", {
+            turn_id,
+            reason: "error",
+            error: typeof s.error === "string" ? s.error.slice(0, 200) : void 0
+          })
+        );
+        break;
       case "SubagentStart":
         events.push(
           ev("subagent.started", {
@@ -1353,6 +1450,7 @@ var CODEX_EVENTS = [
   "SessionEnd"
 ];
 var OPTS2 = { matcherFor: (e) => /Tool|Permission/.test(e) ? "" : void 0, timeout: 5 };
+var eventsFor2 = (lean) => lean ? CODEX_EVENTS.filter((e) => e !== "PreToolUse") : [...CODEX_EVENTS];
 var codexHome = (env) => env.CODEX_HOME || path6.join(HOME, ".codex");
 var hooksFile2 = (env) => path6.join(codexHome(env), "hooks.json");
 var configFile2 = (env) => path6.join(codexHome(env), "config.toml");
@@ -1401,7 +1499,8 @@ function installNotify(cmd, env) {
     return {
       file,
       changed: false,
-      note: `left alone: notify runs ${n.raw.slice(0, 80)} (hooks.json carries the events; the notify fallback is off)`
+      skipped: true,
+      note: `notify belongs to ${(n.argv?.[0] ?? n.raw).replace(/^.*\//, "").slice(0, 40)}; left alone. Codex will report nothing until you approve the hooks: start \`codex\` and accept the hook review`
     };
   }
   write(withNotify(text, line));
@@ -1458,14 +1557,21 @@ var codex = {
   events: CODEX_EVENTS,
   detect: (env = process.env) => existsSync4(codexHome(env)),
   configFiles: (env = process.env) => [hooksFile2(env), configFile2(env)],
-  install: (cmd, env = process.env) => [
-    installClaudeShaped(hooksFile2(env), NAME3, CODEX_EVENTS, cmd, OPTS2),
+  install: (cmd, env = process.env, opts = {}) => [
+    installClaudeShaped(hooksFile2(env), NAME3, eventsFor2(opts.lean), cmd, OPTS2),
     installNotify(cmd, env)
   ],
-  uninstall: (env = process.env) => [uninstallClaudeShaped(hooksFile2(env), CODEX_EVENTS), uninstallNotify(env)],
-  installed: (cmd, env = process.env) => {
+  uninstall: (env = process.env, opts = {}) => [
+    uninstallClaudeShaped(hooksFile2(env), CODEX_EVENTS, { created: opts.created?.includes(hooksFile2(env)) }),
+    uninstallNotify(env)
+  ],
+  installed: (cmd, env = process.env, opts = {}) => {
     const out = [
-      { file: hooksFile2(env), state: installedClaudeShaped(hooksFile2(env), NAME3, CODEX_EVENTS, cmd, OPTS2) }
+      {
+        file: hooksFile2(env),
+        state: installedClaudeShaped(hooksFile2(env), NAME3, eventsFor2(opts.lean), cmd, OPTS2),
+        note: "Codex runs non-managed hooks only after the review in `codex` (/hooks); until then nothing is reported unless the notify fallback is ours"
+      }
     ];
     let text = "";
     try {
@@ -1653,6 +1759,7 @@ function codexFacts(file) {
 }
 
 // ../core/src/adapters/gemini-cli.ts
+import { execFileSync as execFileSync3 } from "node:child_process";
 import { existsSync as existsSync5, readFileSync as readFileSync5 } from "node:fs";
 import path7 from "node:path";
 var NAME4 = "gemini-cli";
@@ -1670,17 +1777,61 @@ var OPTS3 = { matcherFor: (e) => /Tool/.test(e) ? ".*" : void 0, timeout: 5e3 };
 var geminiDir = (env) => env.GEMINI_CLI_HOME || path7.join(HOME, ".gemini");
 var settings = (env) => path7.join(geminiDir(env), "settings.json");
 var validTool4 = (n) => typeof n === "string" && /^[A-Za-z0-9_.:-]{1,120}$/.test(n);
+var eventsFor3 = (lean) => lean ? GEMINI_EVENTS.filter((e) => e !== "BeforeTool") : [...GEMINI_EVENTS];
+function geminiHooksActive(settingsFile) {
+  let tools;
+  try {
+    tools = JSON.parse(readFileSync5(settingsFile, "utf8")).tools;
+  } catch {
+  }
+  if (tools?.enableHooks === true) return { active: true };
+  if (tools?.enableHooks === false)
+    return { active: false, note: "inactive: tools.enableHooks is false in settings.json" };
+  let version = "";
+  try {
+    version = execFileSync3("gemini", ["--version"], {
+      encoding: "utf8",
+      timeout: 4e3,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).trim();
+  } catch {
+    return {
+      active: true,
+      note: "could not run `gemini --version`; hooks need tools.enableHooks on versions before 0.46"
+    };
+  }
+  const m = /(\d+)\.(\d+)/.exec(version);
+  if (m && (Number(m[1]) > 0 || Number(m[2]) >= 46)) return { active: true };
+  return {
+    active: false,
+    note: `inactive: Gemini CLI ${version || "?"} runs hooks only with "tools": {"enableHooks": true} in settings.json`
+  };
+}
 var geminiCli = {
   name: NAME4,
   events: GEMINI_EVENTS,
   // ~/.gemini also belongs to Antigravity; Gemini CLI is here when its settings or its chat logs exist.
   detect: (env = process.env) => existsSync5(settings(env)) || existsSync5(path7.join(geminiDir(env), "tmp")),
   configFiles: (env = process.env) => [settings(env)],
-  install: (cmd, env = process.env) => [installClaudeShaped(settings(env), NAME4, GEMINI_EVENTS, cmd, OPTS3)],
-  uninstall: (env = process.env) => [uninstallClaudeShaped(settings(env), GEMINI_EVENTS)],
-  installed: (cmd, env = process.env) => [
-    { file: settings(env), state: installedClaudeShaped(settings(env), NAME4, GEMINI_EVENTS, cmd, OPTS3) }
+  install: (cmd, env = process.env, opts = {}) => {
+    const r = installClaudeShaped(settings(env), NAME4, eventsFor3(opts.lean), cmd, OPTS3);
+    const a = geminiHooksActive(settings(env));
+    return [a.note && !r.skipped ? { ...r, note: [r.note, a.note].filter(Boolean).join("; ") } : r];
+  },
+  uninstall: (env = process.env, opts = {}) => [
+    uninstallClaudeShaped(settings(env), GEMINI_EVENTS, { created: opts.created?.includes(settings(env)) })
   ],
+  installed: (cmd, env = process.env, opts = {}) => {
+    const state = installedClaudeShaped(settings(env), NAME4, eventsFor3(opts.lean), cmd, OPTS3);
+    const a = geminiHooksActive(settings(env));
+    return [
+      {
+        file: settings(env),
+        state: state === "current" && !a.active ? "inactive" : state,
+        ...a.note ? { note: a.note } : {}
+      }
+    ];
+  },
   fromHook(input) {
     const event = input.argv[1] ?? "";
     let s = {};
@@ -1891,7 +2042,7 @@ import {
   readSync as readSync2,
   renameSync,
   statSync as statSync4,
-  unlinkSync,
+  unlinkSync as unlinkSync3,
   writeFileSync as writeFileSync5
 } from "node:fs";
 import path9 from "node:path";
@@ -1919,8 +2070,8 @@ var Outbox = class {
     } catch {
       n = this.lastSeqInFile(ref) + 1;
     }
-    mkdirSync5(path9.dirname(f), { recursive: true });
-    writeFileSync5(f, String(n + 1));
+    mkdirSync5(path9.dirname(f), { recursive: true, mode: 448 });
+    writeFileSync5(f, String(n + 1), { mode: 384 });
     return n;
   }
   lastSeqInFile(ref) {
@@ -1938,9 +2089,9 @@ var Outbox = class {
   }
   append(ref, events) {
     if (!events.length) return;
-    mkdirSync5(this.dir(ref.harness), { recursive: true });
+    mkdirSync5(this.dir(ref.harness), { recursive: true, mode: 448 });
     appendFileSync(this.file(ref), `${events.map((e) => JSON.stringify(e)).join("\n")}
-`);
+`, { mode: 384 });
   }
   /** Every session file, newest first. */
   sessions() {
@@ -2004,9 +2155,9 @@ var Outbox = class {
       const f = this.file(ref);
       try {
         if (statSync4(f).mtimeMs < cutoff) {
-          unlinkSync(f);
+          unlinkSync3(f);
           try {
-            unlinkSync(this.seqFile(ref));
+            unlinkSync3(this.seqFile(ref));
           } catch {
           }
           n++;
@@ -2019,7 +2170,7 @@ var Outbox = class {
   delete(ref) {
     for (const f of [this.file(ref), this.seqFile(ref)]) {
       try {
-        unlinkSync(f);
+        unlinkSync3(f);
       } catch {
       }
     }
@@ -2044,9 +2195,9 @@ var Cursors = class {
   }
   write(c) {
     const f = this.file();
-    mkdirSync5(path9.dirname(f), { recursive: true });
+    mkdirSync5(path9.dirname(f), { recursive: true, mode: 448 });
     const tmp = `${f}.${process.pid}.tmp`;
-    writeFileSync5(tmp, JSON.stringify(c));
+    writeFileSync5(tmp, JSON.stringify(c), { mode: 384 });
     renameSync(tmp, f);
   }
   key(ref) {
@@ -2055,10 +2206,10 @@ var Cursors = class {
 };
 function takeLock(root, ref, staleMs = 5 * 6e4) {
   const dir = path9.join(root, "locks");
-  mkdirSync5(dir, { recursive: true });
+  mkdirSync5(dir, { recursive: true, mode: 448 });
   const f = path9.join(dir, `${safeId(ref.harness)}-${safeId(ref.session)}.lock`);
   try {
-    if (Date.now() - statSync4(f).mtimeMs > staleMs) unlinkSync(f);
+    if (Date.now() - statSync4(f).mtimeMs > staleMs) unlinkSync3(f);
     else return null;
   } catch {
   }
@@ -2069,7 +2220,7 @@ function takeLock(root, ref, staleMs = 5 * 6e4) {
   }
   return () => {
     try {
-      unlinkSync(f);
+      unlinkSync3(f);
     } catch {
     }
   };
@@ -2205,7 +2356,7 @@ function redactAssignments(text) {
 function isSecretName(name) {
   if (/^[A-Z0-9_]+_KEY$/.test(name)) return true;
   const flat = name.toLowerCase().replace(/[_-]/g, "");
-  return /(?:pass(?:word|wd|phrase|code)?|pwd|secret|secretkey|secretaccesskey|clientsecret|apikey|accesskey|accesstoken|authtoken|refreshtoken|privatekey|token|credential|creds)s?$/.test(
+  return /(?:pass(?:word|wd|phrase|code)|pwd|secret|secretkey|secretaccesskey|clientsecret|apikey|accesskey|accesstoken|authtoken|refreshtoken|privatekey|token|credential|creds)s?$/.test(
     flat
   );
 }
@@ -2294,7 +2445,7 @@ var DATA_ALLOW = {
   "session.backfill": { 0: ["started_at", "last_at", "turns"] },
   "session.forgotten": { 0: [] },
   "turn.started": { 0: ["turn_id"], 1: ["prompt_chars"] },
-  "turn.ended": { 0: ["turn_id", "reason", "ms"] },
+  "turn.ended": { 0: ["turn_id", "reason", "ms"], 1: ["error"] },
   "turn.transcript": { 2: ["turn", "user", "assistant", "at"] },
   "tool.started": { 1: ["tool", "call_id", "turn_id", "agent_id"], 3: ["input"] },
   "tool.ended": { 1: ["tool", "call_id", "turn_id", "agent_id", "ms", "ok", "error"], 3: ["input", "output"] },
@@ -2416,9 +2567,16 @@ var StdoutSink = class {
 };
 
 // src/run.ts
+function enqueueJob(state, job) {
+  const jobs = jobsDir(state);
+  mkdirSync7(jobs, { recursive: true, mode: 448 });
+  const f = path11.join(jobs, `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}.json`);
+  writeFileSync6(f, JSON.stringify(job), { mode: 384 });
+  return f;
+}
 function log(state, line) {
   try {
-    mkdirSync7(state, { recursive: true });
+    mkdirSync7(state, { recursive: true, mode: 448 });
     const f = path11.join(state, "log");
     try {
       if (statSync5(f).size > 1024 * 1024) renameSync2(f, `${f}.1`);
@@ -2443,8 +2601,8 @@ function factsState(state) {
       const cur = this.get(h, s);
       const next = { ...cur, ...patch };
       if (JSON.stringify(next) === JSON.stringify(cur)) return;
-      mkdirSync7(path11.dirname(file(h, s)), { recursive: true });
-      writeFileSync6(file(h, s), JSON.stringify(next));
+      mkdirSync7(path11.dirname(file(h, s)), { recursive: true, mode: 448 });
+      writeFileSync6(file(h, s), JSON.stringify(next), { mode: 384 });
     }
   };
 }
@@ -2469,12 +2627,14 @@ async function runJob(job, opts = {}) {
   if (!r || !r.session.id) return { events: [], delivered: {} };
   const outbox = new Outbox(state);
   const ref = { harness: job.harness, session: r.session.id };
-  const release = takeLock(state, ref);
+  let release = takeLock(state, ref);
+  for (let wait = 50; !release && wait <= 3200; wait *= 2) {
+    await new Promise((res) => setTimeout(res, wait));
+    release = takeLock(state, ref);
+  }
   if (!release) {
-    log(state, `${job.harness} ${job.event}: session ${r.session.id} locked, re-queued`);
-    const jobs = path11.join(state, "jobs");
-    mkdirSync7(jobs, { recursive: true });
-    writeFileSync6(path11.join(jobs, `${Date.now().toString(36)}-requeue.json`), JSON.stringify(job));
+    log(state, `${job.harness} ${job.event}: session ${r.session.id} locked for 6 s, re-queued`);
+    enqueueJob(state, job);
     return { events: [], delivered: {} };
   }
   try {
@@ -2538,7 +2698,10 @@ async function runJob(job, opts = {}) {
       if (read.turns.length)
         facts.save(job.harness, r.session.id, { transcript_line: read.line, transcript_turns: turnNo });
     }
-    outbox.append(ref, events);
+    outbox.append(
+      ref,
+      events.map((e) => ({ ...e, session: redactDeep(e.session), data: redactDeep(e.data) }))
+    );
     log(
       state,
       `${job.harness} ${job.event}: ${events.map((e) => e.type).join(",") || "nothing"} (${r.session.id.slice(0, 8)})`
@@ -2564,34 +2727,57 @@ async function flush(state, sinkConfigs, outbox, first) {
     const cursors = new Cursors(state, sink.name);
     const c = cursors.read();
     let sent = 0;
+    let stalled = false;
+    let batch = [];
+    let pending = {};
+    const send = async () => {
+      if (!batch.length) {
+        Object.assign(c, pending);
+        pending = {};
+        cursors.write(c);
+        return true;
+      }
+      const res = await sink.send(batch);
+      if (!res.ok) {
+        log(state, `sink ${sink.name}: ${res.status ?? ""} ${res.error ?? ""} \u2192 ${res.action ?? "retry"}`);
+        if (res.action === "pause" || res.action === "lower-tier") applySinkVerdict(sink.name, res);
+        if (res.action !== "drop") {
+          batch = [];
+          pending = {};
+          return false;
+        }
+      }
+      sent += batch.length;
+      Object.assign(c, pending);
+      cursors.write(c);
+      batch = [];
+      pending = {};
+      return true;
+    };
     for (const ref of refs) {
-      if (sent >= MAX_PER_RUN) break;
-      let offset = c[cursors.key(ref)] ?? 0;
-      let stalled = false;
-      while (sent < MAX_PER_RUN) {
-        const { events, offset: next } = outbox.read(ref, offset, BATCH);
+      if (stalled || sent >= MAX_PER_RUN) break;
+      let offset = pending[cursors.key(ref)] ?? c[cursors.key(ref)] ?? 0;
+      for (; ; ) {
+        const room = BATCH - batch.length;
+        const { events, offset: next } = outbox.read(ref, offset, room);
         if (!events.length) break;
-        const filtered = events.map((e) => filterEvent(e, sink.tier, sink.pii, { home: os2.homedir() })).filter((e) => !!e);
-        let ok = true;
-        if (filtered.length) {
-          const res = await sink.send(filtered);
-          ok = res.ok;
-          if (!ok) {
-            log(state, `sink ${sink.name}: ${res.status ?? ""} ${res.error ?? ""} \u2192 ${res.action ?? "retry"}`);
-            if (res.action === "pause" || res.action === "lower-tier") applySinkVerdict(sink.name, res);
-            if (res.action === "drop") ok = true;
-          }
-          if (ok) sent += filtered.length;
-        }
-        if (!ok) {
-          stalled = true;
-          break;
+        for (const e of events) {
+          const f = filterEvent(e, sink.tier, sink.pii, { home: os2.homedir() });
+          if (f) batch.push(f);
         }
         offset = next;
-        c[cursors.key(ref)] = offset;
-        cursors.write(c);
+        pending[cursors.key(ref)] = offset;
+        if (batch.length >= BATCH) {
+          if (!await send()) {
+            stalled = true;
+            break;
+          }
+          if (sent >= MAX_PER_RUN) break;
+        }
       }
-      if (stalled) break;
+    }
+    if (!stalled && (batch.length || Object.keys(pending).length)) {
+      if (!await send()) stalled = true;
     }
     delivered[sink.name] = sent;
   }
@@ -2608,6 +2794,7 @@ function applySinkVerdict(name, res) {
   } catch {
   }
 }
+var jobsDir = (state) => path11.join(state, "jobs");
 export {
   HttpSink,
   buildSinks,