sessionpipe 0.6.0 → 0.7.0

package/dist/index.js

@@ -1,4 +1,4 @@
-// sessionpipe 0.6.0 · Apache-2.0 · https://sessionpipe.org
+// sessionpipe 0.7.0 · Apache-2.0 · https://sessionpipe.org
 
 // src/http-sink.ts
 import { createHash, createHmac } from "node:crypto";
@@ -92,16 +92,16 @@ var HttpSink = class {
 import {
   appendFileSync as appendFileSync3,
   existsSync as existsSync8,
-  mkdirSync as mkdirSync7,
+  mkdirSync as mkdirSync8,
   readdirSync as readdirSync6,
-  readFileSync as readFileSync8,
-  renameSync as renameSync2,
+  readFileSync as readFileSync9,
+  renameSync as renameSync3,
   statSync as statSync5,
   unlinkSync as unlinkSync4,
-  writeFileSync as writeFileSync6
+  writeFileSync as writeFileSync7
 } from "node:fs";
 import os3 from "node:os";
-import path12 from "node:path";
+import path13 from "node:path";
 
 // ../core/src/adapters/antigravity.ts
 import {
@@ -289,6 +289,9 @@ function readClaude(lines, from) {
   }
   return pairTurns(msgs, endOf(lines));
 }
+function codexInjected(text) {
+  return /^<[a-z_-]+>/i.test(text) || /^# AGENTS\.md instructions\b/i.test(text);
+}
 function readCodex(lines, from) {
   const msgs = [];
   for (let i = from; i < lines.length; i++) {
@@ -300,7 +303,7 @@ function readCodex(lines, from) {
     const text = textParts(p.content, ["input_text", "output_text"]).trim();
     if (!text) continue;
     if (p.role === "user") {
-      if (/^<[a-z_-]+>/i.test(text)) continue;
+      if (codexInjected(text)) continue;
       msgs.push({ role: "user", text, at, line: i });
     } else if (p.role === "assistant") msgs.push({ role: "assistant", text, at, line: i });
   }
@@ -471,20 +474,19 @@ function installedClaudeShaped(file, harness, events, cmd, o) {
 // ../core/src/adapters/antigravity.ts
 var NAME = "antigravity";
 var HOOK_NAME = "sessionpipe";
-var AG_EVENTS = ["PreInvocation", "PostInvocation", "PreToolUse", "PostToolUse", "Stop"];
+var AG_EVENTS = ["PreInvocation", "PostInvocation", "PostToolUse", "Stop"];
+var AG_STALE_PRETOOL = '{"decision":"ask","reason":"sessionpipe: an outdated PreToolUse hook is still loaded. Restart this conversation (or run sessionpipe install) to drop it."}\n';
+var antigravityAnswer = (event) => event === "PreToolUse" ? AG_STALE_PRETOOL : "{}\n";
 var gemini = (env) => env.GEMINI_CLI_HOME || path4.join(HOME, ".gemini");
 var hooksFile = (env) => path4.join(gemini(env), "config", "hooks.json");
 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, lean) {
+function entry(cmd) {
   const handler = (e) => ({ type: "command", command: cmd([NAME, e]).command, timeout: 5 });
   const out = { enabled: true };
-  for (const e of AG_EVENTS) {
-    if (lean && e === "PreToolUse") continue;
-    out[e] = /Tool/.test(e) ? [{ matcher: "*", hooks: [handler(e)] }] : [handler(e)];
-  }
+  for (const e of AG_EVENTS) out[e] = /Tool/.test(e) ? [{ matcher: "*", hooks: [handler(e)] }] : [handler(e)];
   return out;
 }
 var antigravity = {
@@ -492,12 +494,12 @@ 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, opts = {}) {
+  install(cmd, env = process.env) {
     const file = hooksFile(env);
     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);
+    const e = entry(cmd);
     if (JSON.stringify(hooks[HOOK_NAME]) === JSON.stringify(e)) return [{ file, changed: false }];
     hooks[HOOK_NAME] = e;
     mkdirSync2(path4.dirname(file), { recursive: true });
@@ -526,14 +528,14 @@ var antigravity = {
     writeFileSync2(file, formatJson(hooks, f));
     return [{ file, changed: true }];
   },
-  installed(cmd, env = process.env, opts = {}) {
+  installed(cmd, env = process.env) {
     const file = hooksFile(env);
     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, opts.lean)) ? "current" : "stale"
+        state: !have ? "missing" : JSON.stringify(have) === JSON.stringify(entry(cmd)) ? "current" : "stale"
       }
     ];
   },
@@ -545,7 +547,8 @@ var antigravity = {
     } catch {
     }
     const id = s.conversationId ?? s.session_id ?? s.sessionId;
-    if (!id) return { session: { id: "" }, events: [], stdout: "{}\n" };
+    const stdout = antigravityAnswer(event);
+    if (!id) return { session: { id: "" }, events: [], stdout };
     const workspaces = agWorkspaces(s.workspacePaths);
     const session = { id: String(id), cwd: workspaces[0] ?? input.cwd };
     if (typeof s.modelName === "string" && s.modelName !== "auto") session.model = s.modelName;
@@ -566,7 +569,8 @@ var antigravity = {
         if (tool) events.push(ev("tool.started", { tool, input: toolCall?.args }));
         break;
       case "PostToolUse":
-        if (tool)
+        if (!tool) events.push(ev("session.heartbeat", {}));
+        else
           events.push(
             ev("tool.ended", {
               tool,
@@ -580,9 +584,9 @@ var antigravity = {
         events.push(ev("turn.ended", { reason: s.error ? "error" : "stop" }));
         break;
       default:
-        return { session, events: [], stdout: "{}\n" };
+        return { session, events: [], stdout };
     }
-    const r = { session, events, stdout: "{}\n", hints: { workspaces } };
+    const r = { session, events, stdout, hints: { workspaces } };
     if (typeof s.transcriptPath === "string") r.transcript = s.transcriptPath;
     return r;
   },
@@ -1537,7 +1541,8 @@ function uninstallNotify(env) {
   }
   return { file, changed: false };
 }
-function findRollout(threadId, env) {
+function findRollout(threadId, env = process.env) {
+  if (!/^[A-Za-z0-9-]{8,128}$/.test(threadId)) return null;
   let best = null;
   const walk = (dir, depth) => {
     let names = [];
@@ -1548,7 +1553,7 @@ function findRollout(threadId, env) {
     }
     for (const n of names.sort().reverse()) {
       const p = path6.join(dir, n);
-      if (n.endsWith(".jsonl") && n.includes(threadId)) {
+      if (n.endsWith(`-${threadId}.jsonl`)) {
         best = p;
         return;
       }
@@ -1753,7 +1758,7 @@ function codexFacts(file) {
     const p = j.payload;
     if (j.type !== "response_item" || !p || p.type !== "message" || p.role !== "user") continue;
     const text = (p.content ?? []).filter((b) => b && b.type === "input_text" && typeof b.text === "string").map((b) => b.text).join("\n").trim();
-    if (!text || /^<[a-z_-]+>/i.test(text)) continue;
+    if (!text || codexInjected(text)) continue;
     const line = text.split("\n").find((l) => l.trim()) ?? "";
     out.title = line.length > 80 ? `${line.slice(0, 80).replace(/\s+\S*$/, "")}\u2026` : line;
     out.title_source = "first-ask";
@@ -2575,14 +2580,39 @@ var StdoutSink = class {
   }
 };
 
+// src/control/aliases.ts
+import { chmodSync as chmodSync2, mkdirSync as mkdirSync7, readFileSync as readFileSync8, renameSync as renameSync2, writeFileSync as writeFileSync6 } from "node:fs";
+import path11 from "node:path";
+var aliasFile = (controlDir) => path11.join(controlDir, "aliases.json");
+function readAliases(file) {
+  try {
+    const j = JSON.parse(readFileSync8(file, "utf8"));
+    if (!j || typeof j !== "object" || Array.isArray(j)) return {};
+    const out = {};
+    for (const [k, v] of Object.entries(j)) {
+      const a = v;
+      if (a && typeof a.id === "string" && a.id && typeof a.cwd === "string")
+        out[k] = { id: a.id, cwd: a.cwd, at: typeof a.at === "string" ? a.at : "" };
+    }
+    return out;
+  } catch {
+    return {};
+  }
+}
+function receiverIdOf(all, harness, id) {
+  const prefix = `${harness}:`;
+  for (const [k, a] of Object.entries(all)) if (a.id === id && k.startsWith(prefix)) return k.slice(prefix.length);
+  return null;
+}
+
 // src/control/local.ts
 import net from "node:net";
 import os2 from "node:os";
-import path11 from "node:path";
+import path12 from "node:path";
 function socketPath(state, env = process.env) {
   if (env.SESSIONPIPE_SOCKET) return env.SESSIONPIPE_SOCKET;
   if (process.platform === "win32") return `\\\\.\\pipe\\sessionpipe-control-${os2.userInfo().username}`;
-  return path11.join(state, "control.sock");
+  return path12.join(state, "control.sock");
 }
 function ask(sock, req, timeoutMs) {
   return new Promise((resolve) => {
@@ -2646,16 +2676,16 @@ function sinkWithSecrets(s, run = defaultRunner) {
 }
 
 // src/run.ts
-async function tellDaemon(state, job, session, transcript) {
+async function tellDaemon(state, job, session, cwd, transcript) {
   const sock = socketPath(state);
   if (process.platform !== "win32" && !existsSync8(sock)) return;
   await ask(
     sock,
     {
       op: "event",
-      session: `claude-code:${session}`,
+      session: `${job.harness}:${session}`,
       event: job.event,
-      cwd: job.cwd,
+      ...cwd ? { cwd } : {},
       ...transcript ? { transcript } : {}
     },
     300
@@ -2663,17 +2693,17 @@ async function tellDaemon(state, job, session, transcript) {
 }
 function enqueueJob(state, job) {
   const jobs = jobsDir(state);
-  mkdirSync7(jobs, { recursive: true, mode: 448 });
-  const f = path12.join(jobs, `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}.json`);
-  writeFileSync6(f, JSON.stringify(job), { mode: 384 });
+  mkdirSync8(jobs, { recursive: true, mode: 448 });
+  const f = path13.join(jobs, `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}.json`);
+  writeFileSync7(f, JSON.stringify(job), { mode: 384 });
   return f;
 }
 function log(state, line) {
   try {
-    mkdirSync7(state, { recursive: true, mode: 448 });
-    const f = path12.join(state, "log");
+    mkdirSync8(state, { recursive: true, mode: 448 });
+    const f = path13.join(state, "log");
     try {
-      if (statSync5(f).size > 1024 * 1024) renameSync2(f, `${f}.1`);
+      if (statSync5(f).size > 1024 * 1024) renameSync3(f, `${f}.1`);
     } catch {
     }
     appendFileSync3(f, `${(/* @__PURE__ */ new Date()).toISOString()} ${line}
@@ -2682,11 +2712,11 @@ function log(state, line) {
   }
 }
 function factsState(state) {
-  const file = (h, s) => path12.join(state, "facts", safeId(h), `${safeId(s)}.json`);
+  const file = (h, s) => path13.join(state, "facts", safeId(h), `${safeId(s)}.json`);
   return {
     get(h, s) {
       try {
-        return JSON.parse(readFileSync8(file(h, s), "utf8"));
+        return JSON.parse(readFileSync9(file(h, s), "utf8"));
       } catch {
         return {};
       }
@@ -2695,8 +2725,8 @@ function factsState(state) {
       const cur = this.get(h, s);
       const next = { ...cur, ...patch };
       if (JSON.stringify(next) === JSON.stringify(cur)) return;
-      mkdirSync7(path12.dirname(file(h, s)), { recursive: true, mode: 448 });
-      writeFileSync6(file(h, s), JSON.stringify(next), { mode: 384 });
+      mkdirSync8(path13.dirname(file(h, s)), { recursive: true, mode: 448 });
+      writeFileSync7(file(h, s), JSON.stringify(next), { mode: 384 });
     }
   };
 }
@@ -2724,30 +2754,33 @@ async function runJob(job, opts = {}) {
   if (!adapter) return { events: [], delivered: {} };
   const r = adapter.fromHook({ argv: job.argv, stdin: job.stdin, env: { ...process.env, ...job.env }, cwd: job.cwd });
   if (!r || !r.session.id) return { events: [], delivered: {} };
-  if (job.harness === "claude-code") await tellDaemon(state, job, r.session.id, r.transcript);
+  const id = receiverIdOf(readAliases(aliasFile(path13.join(state, "control"))), job.harness, r.session.id) ?? r.session.id;
+  await tellDaemon(state, job, id, r.session.cwd, r.transcript);
   const outbox = new Outbox(state);
-  const ref = { harness: job.harness, session: r.session.id };
+  const ref = { harness: job.harness, session: id };
   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 for 6 s, re-queued`);
+    log(state, `${job.harness} ${job.event}: session ${id} locked for 6 s, re-queued`);
     enqueueJob(state, job);
     return { events: [], delivered: {} };
   }
   try {
     const facts = factsState(state);
-    const mem = facts.get(job.harness, r.session.id);
+    const mem = facts.get(job.harness, id);
     const heavy = !/^(PreToolUse|PostToolUse|PostToolUseFailure|BeforeTool|AfterTool|PostInvocation)$/.test(job.event);
     let learned = {};
     if (heavy) {
       const f = adapter.facts(r.session, r.transcript, r.hints ?? {}, facts);
       const { started_at: _s, last_at: _l, first_ask: _fa, harness_version, ...rest } = f;
       learned = rest;
-      if (harness_version) facts.save(job.harness, r.session.id, { harness_version });
-      facts.save(job.harness, r.session.id, { session: { ...mem.session, ...learned } });
+      if (harness_version) facts.save(job.harness, id, { harness_version });
+      facts.save(job.harness, id, { session: { ...mem.session, ...learned } });
+      if (job.harness === "antigravity" && r.session.cwd && path13.isAbsolute(r.session.cwd))
+        facts.save(job.harness, id, { cwd: r.session.cwd });
     }
     const known = mem.session ?? {};
     const cwdRaw = learned.cwd ?? r.session.cwd ?? known.cwd;
@@ -2757,13 +2790,13 @@ async function runJob(job, opts = {}) {
       ...learned,
       ...git,
       ...learned.branch ? { branch: learned.branch } : {},
-      id: r.session.id,
+      id,
       seq: 0,
       machine: machineName(cfg, os3.hostname()),
       ...cwdRaw ? { cwd: tilde(cwdRaw) } : {},
       ...r.session.model ? { model: r.session.model } : {}
     };
-    const version = facts.get(job.harness, r.session.id).harness_version ?? void 0;
+    const version = facts.get(job.harness, id).harness_version ?? void 0;
     const events = [];
     for (const a of r.events) {
       const e = makeEvent(a, {
@@ -2775,7 +2808,7 @@ async function runJob(job, opts = {}) {
     }
     const wantsTranscript = cfg.sinks.some((s) => !s.paused && Math.min(s.tier, s.max_tier ?? 3) >= 2);
     if (wantsTranscript && r.transcript && r.events.some((e) => e.type === "turn.ended" || e.type === "session.ended")) {
-      const cur = facts.get(job.harness, r.session.id);
+      const cur = facts.get(job.harness, id);
       const fromLine = Number(cur.transcript_line) || 0;
       let turnNo = Number(cur.transcript_turns) || 0;
       const read = adapter.readTranscript(r.transcript, fromLine);
@@ -2795,17 +2828,13 @@ async function runJob(job, opts = {}) {
           )
         );
       }
-      if (read.turns.length)
-        facts.save(job.harness, r.session.id, { transcript_line: read.line, transcript_turns: turnNo });
+      if (read.turns.length) facts.save(job.harness, id, { transcript_line: read.line, transcript_turns: turnNo });
     }
     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)})`
-    );
+    log(state, `${job.harness} ${job.event}: ${events.map((e) => e.type).join(",") || "nothing"} (${id.slice(0, 8)})`);
     const delivered = await flush(state, cfg.sinks, outbox, ref);
     if (Math.random() < 0.02) outbox.prune(cfg.keep_days ?? 30);
     return { events, delivered };
@@ -2896,7 +2925,7 @@ function applySinkVerdict(name, res) {
   } catch {
   }
 }
-var jobsDir = (state) => path12.join(state, "jobs");
+var jobsDir = (state) => path13.join(state, "jobs");
 export {
   HttpSink,
   buildSinks,