sessionpipe-conformance 0.11.0 → 0.13.0

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// sessionpipe-conformance 0.11.0 · Apache-2.0 · https://sessionpipe.org
+// sessionpipe-conformance 0.13.0 · Apache-2.0 · https://sessionpipe.org
 
 // src/cli.ts
 import { readdirSync as readdirSync5, realpathSync as realpathSync2, statSync as statSync5 } from "node:fs";
@@ -7,7 +7,7 @@ import path9 from "node:path";
 import { pathToFileURL } from "node:url";
 
 // src/index.ts
-import { readFileSync as readFileSync6 } from "node:fs";
+import { readFileSync as readFileSync7 } from "node:fs";
 
 // ../core/src/paths.ts
 import os from "node:os";
@@ -168,7 +168,14 @@ ${m.text}`;
         continue;
       }
       if (cur) turns.push(cur);
-      cur = { user: m.text, assistant: "", at: m.at, startLine: m.line, endLine: m.line };
+      cur = {
+        user: m.text,
+        assistant: "",
+        at: m.at,
+        startLine: m.line,
+        endLine: m.line,
+        ...m.injected ? { injected: true } : {}
+      };
     } else {
       if (!cur) cur = { user: "", assistant: "", at: m.at, startLine: m.line, endLine: m.line };
       cur.assistant += (cur.assistant ? "\n\n" : "") + m.text;
@@ -178,10 +185,17 @@ ${m.text}`;
   if (cur?.assistant) turns.push(cur);
   const line = cur && !cur.assistant ? cur.startLine : endLine;
   const out = {
-    turns: turns.map((t) => ({ user: t.user, assistant: t.assistant, at: t.at, endLine: t.endLine })),
+    turns: turns.map((t) => ({
+      user: t.user,
+      assistant: t.assistant,
+      at: t.at,
+      endLine: t.endLine,
+      ...t.injected ? { injected: true } : {}
+    })),
     line
   };
-  if (cur && !cur.assistant && cur.user) out.open = { user: cur.user, at: cur.at };
+  if (cur && !cur.assistant && cur.user)
+    out.open = { user: cur.user, at: cur.at, ...cur.injected ? { injected: true } : {} };
   return out;
 }
 var isInjected = (text) => /^<[a-z_-]+(?:\s[^>]*)?>/i.test(text) && /<\/[a-z_-]+>\s*$/i.test(text) || /^<!--\s/.test(text) || /^<command-/.test(text);
@@ -204,27 +218,51 @@ var textParts = (c, kinds) => {
     (b) => b && typeof b === "object" && kinds.includes(b.type ?? "") && typeof b.text === "string"
   ).map((b) => b.text).join("\n");
 };
+var SPOKEN = /* @__PURE__ */ new Set(["human", "peer"]);
+var PEER_INTRO = /sent a message[^\n]*:$/;
+var PEER_OUTRO = "\n\nThis came from another ";
+var ENVELOPE = /^<cross-session-message\b[^>]*>\n([\s\S]*)\n<\/cross-session-message>$/;
+function peerAsk(origin, text) {
+  const body = origin?.body;
+  let t = typeof body === "string" && body.trim() ? body : text;
+  if (t !== body) {
+    const nl = t.indexOf("\n");
+    if (nl > 0 && PEER_INTRO.test(t.slice(0, nl))) t = t.slice(nl + 1);
+    const outro = t.indexOf(PEER_OUTRO);
+    if (outro > 0) t = t.slice(0, outro);
+  }
+  return (ENVELOPE.exec(t.trim())?.[1] ?? t).trim();
+}
 var queuedPrompt = (a) => {
   if (!a || typeof a !== "object") return "";
   const q = a;
   if (q.type !== "queued_command" || (q.commandMode ?? "prompt") !== "prompt") return "";
-  if (q.origin?.kind && q.origin.kind !== "human") return "";
-  return textParts(q.prompt, ["text"]).trim();
+  const kind = q.origin?.kind ?? "human";
+  if (!SPOKEN.has(kind)) return "";
+  const text = textParts(q.prompt, ["text"]).trim();
+  return kind === "peer" ? peerAsk(q.origin, text) : text;
 };
+var channelText = (text) => /^<channel\b[^>]*>([\s\S]*)<\/channel>$/.exec(text)?.[1]?.trim() ?? "";
 function readClaude(lines, from) {
   const msgs = [];
   for (let i = from; i < lines.length; i++) {
     const j = lines[i] ? parse(lines[i]) : null;
     if (!j || j.isSidechain) continue;
     const origin = j.origin;
-    if (j.type === "user" && (j.isMeta || j.isCompactSummary || j.repeatsCompactSummary || origin?.kind && origin.kind !== "human"))
-      continue;
+    const channel = j.type === "user" && origin?.kind === "channel";
+    const peer = origin?.kind === "peer";
+    if (j.type === "user" && (j.isCompactSummary || j.repeatsCompactSummary)) continue;
+    if (j.type === "user" && !channel && !peer && (j.isMeta || origin?.kind && origin.kind !== "human")) continue;
     const at = Date.parse(String(j.timestamp ?? "")) || Date.now();
     const c = j.message?.content;
-    if (j.type === "user") {
-      const text = textParts(c, ["text"]).trim();
+    if (channel) {
+      const text = channelText(textParts(c, ["text"]).trim());
+      if (text) msgs.push({ role: "user", text, at, line: i, injected: true });
+    } else if (j.type === "user") {
+      const raw = textParts(c, ["text"]).trim();
+      const text = peer ? peerAsk(origin, raw) : raw;
       if (!text || isInjected(text)) continue;
-      msgs.push({ role: "user", text, at, line: i });
+      msgs.push({ role: "user", text, at, line: i, ...peer ? { injected: true } : {} });
     } else if (j.type === "assistant" && Array.isArray(c)) {
       const text = textParts(c, ["text"]).trim();
       if (text) msgs.push({ role: "assistant", text, at, line: i });
@@ -602,13 +640,7 @@ var claudeCode = {
         );
         break;
       case "Stop":
-        events.push(
-          ev("turn.ended", {
-            turn_id,
-            reason: "stop",
-            background: Array.isArray(s.background_tasks) ? s.background_tasks.length : void 0
-          })
-        );
+        events.push(ev("turn.ended", { turn_id, reason: "stop", background: backgroundCount(s.background_tasks) }));
         break;
       case "StopFailure":
         events.push(
@@ -631,7 +663,8 @@ var claudeCode = {
         events.push(
           ev("subagent.ended", {
             agent_id: String(s.agent_id ?? ""),
-            agent_type: typeof s.agent_type === "string" ? s.agent_type : void 0
+            agent_type: typeof s.agent_type === "string" ? s.agent_type : void 0,
+            background: backgroundCount(s.background_tasks, String(s.agent_id ?? ""))
           })
         );
         break;
@@ -706,6 +739,15 @@ var claudeCode = {
     return rows2;
   }
 };
+var WAITER_RE = /(?:^|[\s"'`/\\])sessionpipe(?:\.\w+)?["']?\s+wait(?:\s|$)/;
+function backgroundCount(tasks, ending) {
+  if (!Array.isArray(tasks)) return void 0;
+  return tasks.filter((t) => {
+    const task = t;
+    if (ending !== void 0 && task?.id === ending) return false;
+    return !(typeof task?.command === "string" && WAITER_RE.test(task.command));
+  }).length;
+}
 var LINE_REFRESH_S = 60;
 function statusLine(file, want, cmd) {
   const f = readJsonFile(file);
@@ -1134,8 +1176,36 @@ async function claudeAiTitle(bridge, token) {
 }
 
 // ../core/src/adapters/headless.ts
-import { accessSync, constants, statSync as statSync3 } from "node:fs";
+import { accessSync, constants, readFileSync as readFileSync3, statSync as statSync3 } from "node:fs";
 import path4 from "node:path";
+
+// ../core/src/launched-by.ts
+var LAUNCHED_BY_ENV = "SESSIONPIPE_LAUNCHED_BY";
+var DELEGATED_BY_ENV = "SESSIONPIPE_ASKED_BY";
+var SESSION_REF = /^[a-z][a-z0-9-]{0,39}:[A-Za-z0-9._:-]{1,128}$/;
+function refIn(env, name) {
+  const v = env[name]?.trim();
+  return v && SESSION_REF.test(v) ? v : void 0;
+}
+function launchedBy(env) {
+  return refIn(env, LAUNCHED_BY_ENV);
+}
+function delegatedBy(env) {
+  return refIn(env, DELEGATED_BY_ENV);
+}
+function readHook(adapter, input) {
+  const r = adapter.fromHook(input);
+  if (r && !r.session.parent_id) {
+    const self = `${adapter.name}:${r.session.id}`;
+    const launcher = launchedBy(input.env);
+    if (launcher && launcher !== self) r.session.launched_by = launcher;
+    const asker = delegatedBy(input.env);
+    if (asker && asker !== self) r.session.delegated_by = asker;
+  }
+  return r;
+}
+
+// ../core/src/adapters/headless.ts
 var JOB_TIMEOUT_MS = 30 * 6e4;
 var OUT_CAP = 1024 * 1024;
 function isExe(p) {
@@ -1156,13 +1226,38 @@ function findBinary(o) {
   for (const d of o.dirs) for (const n of o.names) if (isExe(path4.join(d, n))) return path4.join(d, n);
   return null;
 }
+function shimTarget(shim) {
+  let text = "";
+  try {
+    text = readFileSync3(shim, "utf8");
+  } catch {
+    return null;
+  }
+  const m = /"%(?:~dp0|dp0%)\\([^"]+)"\s+%\*/.exec(text);
+  if (!m) return null;
+  const target = path4.resolve(path4.dirname(shim), m[1].split("\\").join(path4.sep));
+  try {
+    return statSync3(target).isFile() ? target : null;
+  } catch {
+    return null;
+  }
+}
+function spawnable(bin, args) {
+  if (!/\.(cmd|bat)$/i.test(bin)) return { file: bin, args };
+  const target = shimTarget(bin);
+  return target ? { file: process.execPath, args: [target, ...args] } : null;
+}
+function probe(bin, args) {
+  const s = spawnable(bin, args);
+  return s ? { ...s, shell: false } : { file: [`"${bin}"`, ...args].join(" "), args: [], shell: true };
+}
 
 // ../core/src/adapters/antigravity.ts
 import {
   existsSync as existsSync3,
   mkdirSync as mkdirSync2,
   readdirSync as readdirSync3,
-  readFileSync as readFileSync3,
+  readFileSync as readFileSync4,
   realpathSync,
   statSync as statSync4,
   unlinkSync as unlinkSync2,
@@ -1291,7 +1386,7 @@ var antigravity = {
   readTranscript(file, fromLine) {
     let text = "";
     try {
-      text = readFileSync3(file, "utf8");
+      text = readFileSync4(file, "utf8");
     } catch {
       return { turns: [], line: fromLine };
     }
@@ -1370,7 +1465,7 @@ function agProjects(dir) {
     if (!ID_RE.test(id)) continue;
     let j;
     try {
-      j = JSON.parse(readFileSync3(path5.join(dir, n), "utf8"));
+      j = JSON.parse(readFileSync4(path5.join(dir, n), "utf8"));
     } catch {
       continue;
     }
@@ -1407,7 +1502,7 @@ function antigravityRemoteUrl(transcript, opts) {
   for (const d of dirs) {
     try {
       const m = /installation_uuid:\s*"([0-9a-f-]{36})"/i.exec(
-        readFileSync3(path5.join(d, "antigravity_state.pbtxt"), "utf8")
+        readFileSync4(path5.join(d, "antigravity_state.pbtxt"), "utf8")
       );
       if (!m) continue;
       const base = `https://antigravity.google.com/r/${m[1]}-v2`;
@@ -1446,7 +1541,7 @@ function antigravityFacts(file, opts) {
 }
 
 // ../core/src/adapters/codex.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync3, readdirSync as readdirSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "node:fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync3, readdirSync as readdirSync4, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "node:fs";
 import path6 from "node:path";
 
 // ../core/src/adapters/codex-config.ts
@@ -1603,7 +1698,7 @@ function installNotify(cmd, env) {
   const file = configFile(env);
   let text = "";
   try {
-    text = readFileSync4(file, "utf8");
+    text = readFileSync5(file, "utf8");
   } catch {
   }
   const argv = cmd([NAME3, "notify"]).argv;
@@ -1649,7 +1744,7 @@ function uninstallNotify(env) {
   const file = configFile(env);
   let text;
   try {
-    text = readFileSync4(file, "utf8");
+    text = readFileSync5(file, "utf8");
   } catch {
     return { file, changed: false };
   }
@@ -1721,7 +1816,7 @@ var codex = {
     ];
     let text = "";
     try {
-      text = readFileSync4(configFile(env), "utf8");
+      text = readFileSync5(configFile(env), "utf8");
     } catch {
     }
     const n = readNotify(text);
@@ -1848,7 +1943,7 @@ var codex = {
   readTranscript(file, fromLine) {
     let text = "";
     try {
-      text = readFileSync4(file, "utf8");
+      text = readFileSync5(file, "utf8");
     } catch {
       return { turns: [], line: fromLine };
     }
@@ -2369,7 +2464,7 @@ function devinAccount(env = process.env) {
 
 // ../core/src/adapters/gemini-cli.ts
 import { execFileSync as execFileSync4 } from "node:child_process";
-import { existsSync as existsSync7, readFileSync as readFileSync5 } from "node:fs";
+import { existsSync as existsSync7, readFileSync as readFileSync6 } from "node:fs";
 import path8 from "node:path";
 var NAME5 = "gemini-cli";
 var GEMINI_EVENTS = [
@@ -2391,14 +2486,14 @@ function geminiVersion(platform = process.platform, env = process.env) {
   const win = platform === "win32";
   const bin = win ? findBinary({ names: ["gemini.exe", "gemini.cmd"], dirs: [path8.dirname(process.execPath)], env }) : "gemini";
   if (!bin) throw new Error("no gemini on PATH");
-  const o = {
+  const c = probe(bin, ["--version"]);
+  return execFileSync4(c.file, c.args, {
     encoding: "utf8",
     timeout: 4e3,
     stdio: ["ignore", "pipe", "ignore"],
-    env
-  };
-  const out = /\.cmd$/i.test(bin) ? execFileSync4(`"${bin}" --version`, { ...o, shell: true }) : execFileSync4(bin, ["--version"], o);
-  return out.trim();
+    env,
+    shell: c.shell
+  }).trim();
 }
 function geminiHooksActive(settingsFile) {
   const tools = readJson(settingsFile).tools;
@@ -2523,7 +2618,7 @@ var geminiCli = {
   readTranscript(file, fromLine) {
     let text = "";
     try {
-      text = readFileSync5(file, "utf8");
+      text = readFileSync6(file, "utf8");
     } catch {
       return { turns: [], line: fromLine };
     }
@@ -2562,22 +2657,6 @@ function prune5(o) {
 var ADAPTERS = [claudeCode, codex, geminiCli, antigravity, devin];
 var adapterByName = (name) => ADAPTERS.find((a) => a.name === name);
 
-// ../core/src/launched-by.ts
-var LAUNCHED_BY_ENV = "SESSIONPIPE_LAUNCHED_BY";
-var LAUNCHED_BY = /^[a-z][a-z0-9-]{0,39}:[A-Za-z0-9._:-]{1,128}$/;
-function launchedBy(env) {
-  const v = env[LAUNCHED_BY_ENV]?.trim();
-  return v && LAUNCHED_BY.test(v) ? v : void 0;
-}
-function readHook(adapter, input) {
-  const r = adapter.fromHook(input);
-  if (r && !r.session.parent_id) {
-    const launcher = launchedBy(input.env);
-    if (launcher && launcher !== `${adapter.name}:${r.session.id}`) r.session.launched_by = launcher;
-  }
-  return r;
-}
-
 // src/index.ts
 function matches(expect, got, pathStr = "") {
   if (expect === "*") return null;
@@ -2602,7 +2681,7 @@ function matches(expect, got, pathStr = "") {
 async function runAdapterFixtures(files) {
   const results = [];
   for (const file of files) {
-    const fx = JSON.parse(readFileSync6(file, "utf8"));
+    const fx = JSON.parse(readFileSync7(file, "utf8"));
     const adapter = adapterByName(fx.harness);
     if (!adapter) {
       results.push({ file, ok: false, why: `no adapter ${fx.harness}` });