sessionpipe 0.6.1 → 0.7.0

package/dist/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAeA,OAAO,EAGL,KAAK,KAAK,EACV,KAAK,UAAU,EAMf,MAAM,EAIN,KAAK,IAAI,EACT,KAAK,UAAU,EAOhB,MAAM,mBAAmB,CAAC;AAsB3B,QAAA,MAAM,OAAO,QAAkF,CAAC;AAEhG,MAAM,WAAW,GAAG;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,8EAA8E;AAC9E,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM,CAM1D;AAED;;;2BAG2B;AAC3B,wBAAsB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,SAAO,EAAE,KAAK,SAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAuB9F;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CASrD;AAED,yFAAyF;AACzF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAkBpD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,GAAE;IAAE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CAAO,GAAG,IAAI,EAAE,CAkBnG;AAED,mFAAmF;AACnF,wBAAsB,MAAM,CAC1B,GAAG,EAAE,GAAG,EACR,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAC1C,OAAO,CAAC;IAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC,CA6GjE;AAKD;;;;;4DAK4D;AAC5D,wBAAsB,KAAK,CACzB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,UAAU,EAAE,EACzB,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAqEjC;AAaD,OAAO,EAAE,OAAO,EAAE,CAAC;AACnB,eAAO,MAAM,WAAW,QAAO,MAAkC,CAAC;AAClE,eAAO,MAAM,OAAO,GAAI,OAAO,MAAM,KAAG,MAAkC,CAAC;AAC3E,eAAO,MAAM,OAAO,GAAI,OAAO,MAAM,KAAG,OAAqC,CAAC"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAeA,OAAO,EAGL,KAAK,KAAK,EACV,KAAK,UAAU,EAMf,MAAM,EAIN,KAAK,IAAI,EACT,KAAK,UAAU,EAOhB,MAAM,mBAAmB,CAAC;AA6B3B,QAAA,MAAM,OAAO,QAAkF,CAAC;AAEhG,MAAM,WAAW,GAAG;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,8EAA8E;AAC9E,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM,CAM1D;AAED;;;2BAG2B;AAC3B,wBAAsB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,SAAO,EAAE,KAAK,SAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAuB9F;AAED,wBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CASrD;AAED,yFAAyF;AACzF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAkBpD;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,GAAE;IAAE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CAAO,GAAG,IAAI,EAAE,CAkBnG;AAED,mFAAmF;AACnF,wBAAsB,MAAM,CAC1B,GAAG,EAAE,GAAG,EACR,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAC1C,OAAO,CAAC;IAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC,CAoHjE;AAKD;;;;;4DAK4D;AAC5D,wBAAsB,KAAK,CACzB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,UAAU,EAAE,EACzB,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC3C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAqEjC;AAaD,OAAO,EAAE,OAAO,EAAE,CAAC;AACnB,eAAO,MAAM,WAAW,QAAO,MAAkC,CAAC;AAClE,eAAO,MAAM,OAAO,GAAI,OAAO,MAAM,KAAG,MAAkC,CAAC;AAC3E,eAAO,MAAM,OAAO,GAAI,OAAO,MAAM,KAAG,OAAqC,CAAC"}

package/dist/worker.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-// sessionpipe 0.6.1 · Apache-2.0 · https://sessionpipe.org
+// sessionpipe 0.7.0 · Apache-2.0 · https://sessionpipe.org
 
 // src/worker.ts
-import { readFileSync as readFileSync9, unlinkSync as unlinkSync5 } from "node:fs";
+import { readFileSync as readFileSync10, unlinkSync as unlinkSync5 } from "node:fs";
 
 // ../core/src/adapters/antigravity.ts
 import {
@@ -190,6 +190,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++) {
@@ -201,7 +204,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 });
   }
@@ -1439,7 +1442,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 = [];
@@ -1450,7 +1454,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;
       }
@@ -1655,7 +1659,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";
@@ -2481,25 +2485,50 @@ var StdoutSink = 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";
+
+// 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) => {
@@ -2651,16 +2680,16 @@ function sinkWithSecrets(s, run = defaultRunner) {
 }
 
 // src/run.ts
-async function tellDaemon(state, job2, session, transcript) {
+async function tellDaemon(state, job2, session, cwd, transcript) {
   const sock = socketPath(state);
   if (process.platform !== "win32" && !existsSync8(sock)) return;
   await ask(
     sock,
     {
       op: "event",
-      session: `claude-code:${session}`,
+      session: `${job2.harness}:${session}`,
       event: job2.event,
-      cwd: job2.cwd,
+      ...cwd ? { cwd } : {},
       ...transcript ? { transcript } : {}
     },
     300
@@ -2668,9 +2697,9 @@ async function tellDaemon(state, job2, session, transcript) {
 }
 function enqueueJob(state, job2) {
   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(job2), { 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(job2), { mode: 384 });
   return f;
 }
 async function sweepJobs(state, olderThanMs = 3e3, limit = 20) {
@@ -2683,11 +2712,11 @@ async function sweepJobs(state, olderThanMs = 3e3, limit = 20) {
   }
   let ran = 0;
   for (const n of names.sort().slice(0, limit)) {
-    const f = path12.join(jobs, n);
+    const f = path13.join(jobs, n);
     let job2 = null;
     try {
       if (Date.now() - statSync5(f).mtimeMs < olderThanMs) continue;
-      job2 = JSON.parse(readFileSync8(f, "utf8"));
+      job2 = JSON.parse(readFileSync9(f, "utf8"));
       unlinkSync4(f);
     } catch {
       continue;
@@ -2700,10 +2729,10 @@ async function sweepJobs(state, olderThanMs = 3e3, limit = 20) {
 }
 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}
@@ -2712,11 +2741,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 {};
       }
@@ -2725,8 +2754,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 });
     }
   };
 }
@@ -2754,30 +2783,33 @@ async function runJob(job2, opts = {}) {
   if (!adapter) return { events: [], delivered: {} };
   const r = adapter.fromHook({ argv: job2.argv, stdin: job2.stdin, env: { ...process.env, ...job2.env }, cwd: job2.cwd });
   if (!r || !r.session.id) return { events: [], delivered: {} };
-  if (job2.harness === "claude-code") await tellDaemon(state, job2, r.session.id, r.transcript);
+  const id = receiverIdOf(readAliases(aliasFile(path13.join(state, "control"))), job2.harness, r.session.id) ?? r.session.id;
+  await tellDaemon(state, job2, id, r.session.cwd, r.transcript);
   const outbox = new Outbox(state);
-  const ref = { harness: job2.harness, session: r.session.id };
+  const ref = { harness: job2.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, `${job2.harness} ${job2.event}: session ${r.session.id} locked for 6 s, re-queued`);
+    log(state, `${job2.harness} ${job2.event}: session ${id} locked for 6 s, re-queued`);
     enqueueJob(state, job2);
     return { events: [], delivered: {} };
   }
   try {
     const facts = factsState(state);
-    const mem = facts.get(job2.harness, r.session.id);
+    const mem = facts.get(job2.harness, id);
     const heavy = !/^(PreToolUse|PostToolUse|PostToolUseFailure|BeforeTool|AfterTool|PostInvocation)$/.test(job2.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(job2.harness, r.session.id, { harness_version });
-      facts.save(job2.harness, r.session.id, { session: { ...mem.session, ...learned } });
+      if (harness_version) facts.save(job2.harness, id, { harness_version });
+      facts.save(job2.harness, id, { session: { ...mem.session, ...learned } });
+      if (job2.harness === "antigravity" && r.session.cwd && path13.isAbsolute(r.session.cwd))
+        facts.save(job2.harness, id, { cwd: r.session.cwd });
     }
     const known = mem.session ?? {};
     const cwdRaw = learned.cwd ?? r.session.cwd ?? known.cwd;
@@ -2787,13 +2819,13 @@ async function runJob(job2, 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(job2.harness, r.session.id).harness_version ?? void 0;
+    const version = facts.get(job2.harness, id).harness_version ?? void 0;
     const events = [];
     for (const a of r.events) {
       const e = makeEvent(a, {
@@ -2805,7 +2837,7 @@ async function runJob(job2, 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(job2.harness, r.session.id);
+      const cur = facts.get(job2.harness, id);
       const fromLine = Number(cur.transcript_line) || 0;
       let turnNo = Number(cur.transcript_turns) || 0;
       const read = adapter.readTranscript(r.transcript, fromLine);
@@ -2825,17 +2857,13 @@ async function runJob(job2, opts = {}) {
           )
         );
       }
-      if (read.turns.length)
-        facts.save(job2.harness, r.session.id, { transcript_line: read.line, transcript_turns: turnNo });
+      if (read.turns.length) facts.save(job2.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,
-      `${job2.harness} ${job2.event}: ${events.map((e) => e.type).join(",") || "nothing"} (${r.session.id.slice(0, 8)})`
-    );
+    log(state, `${job2.harness} ${job2.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 };
@@ -2926,14 +2954,14 @@ function applySinkVerdict(name, res) {
   } catch {
   }
 }
-var jobsDir = (state) => path12.join(state, "jobs");
+var jobsDir = (state) => path13.join(state, "jobs");
 
 // src/worker.ts
 var jobFile = process.argv[2];
 if (!jobFile) process.exit(0);
 var job = null;
 try {
-  job = JSON.parse(readFileSync9(jobFile, "utf8"));
+  job = JSON.parse(readFileSync10(jobFile, "utf8"));
 } catch {
 }
 try {