sphica 0.6.27 → 0.6.29

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://anthropic.com/claude-code/plugin.schema.json",
   "name": "sphica",
-  "version": "0.6.27",
+  "version": "0.6.29",
   "description": "Records Claude Code and Codex sessions on your machine and keeps past implementation and decisions, with their sources, for your agent to find.",
   "author": {
     "name": "iroha924",

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "sphica",
-  "version": "0.6.27",
+  "version": "0.6.29",
   "description": "Records Claude Code and Codex sessions on your machine and keeps past implementation and decisions, with their sources, for your agent to find.",
   "author": {
     "name": "iroha924",

package/dist/capture.js

@@ -11774,32 +11774,103 @@ function captureNotice(file = dbFile()) {
     return panel(`sphica: the database rejected ${plural(s.rejected, "record")}`, [rejectedDir(), `Move them back to ${spoolDir()} to resend`], "Fix them first, then check with sphica doctor");
   return null;
 }
-var baselineFile = (host, session) => path6.join(baselineDir(), `${digest(`${host}\x00${session}`)}.json`);
-function readBaseline(file) {
+var turnDir = (host, session) => path6.join(baselineDir(), digest(`${host}\x00${session}`));
+var startFile = (dir, turn) => path6.join(dir, `${digest(turn)}.json`);
+var isStart = (v) => {
+  const s = v;
+  return !!s && typeof s === "object" && typeof s.turn === "string" && typeof s.running === "boolean" && (s.seq === null || Number.isSafeInteger(s.seq)) && (s.entries === null || typeof s.entries === "object" && !Array.isArray(s.entries)) && (s.head === null || typeof s.head === "string");
+};
+function readStart(file) {
   try {
-    return JSON.parse(fs5.readFileSync(file, "utf8"));
+    const s = JSON.parse(fs5.readFileSync(file, "utf8"));
+    return isStart(s) ? s : null;
   } catch {
     return null;
   }
 }
-function writeBaseline(file, b) {
-  fs5.mkdirSync(path6.dirname(file), { recursive: true, mode: 448 });
-  const tmp = `${file}.${process.pid}.tmp`;
-  fs5.writeFileSync(tmp, JSON.stringify(b), { mode: 384 });
+function readStarts(dir) {
+  let names;
+  try {
+    names = fs5.readdirSync(dir);
+  } catch (e) {
+    return e.code === "ENOENT" ? [] : null;
+  }
+  const starts = [];
+  for (const name of names) {
+    if (name.startsWith("."))
+      continue;
+    const s = readStart(path6.join(dir, name));
+    if (!s)
+      return null;
+    starts.push(s);
+  }
+  return starts;
+}
+function newestTurn(starts) {
+  if (!starts?.length || starts.some((s) => s.seq === null))
+    return null;
+  const top = Math.max(...starts.map((s) => s.seq));
+  const at = starts.filter((s) => s.seq === top);
+  return at.length === 1 ? at[0]?.turn ?? null : null;
+}
+function writeStart(dir, s, file = startFile(dir, s.turn)) {
+  fs5.mkdirSync(dir, { recursive: true, mode: 448 });
+  const tmp = path6.join(dir, `.${path6.basename(file)}.${process.pid}.tmp`);
+  fs5.writeFileSync(tmp, JSON.stringify(s), { mode: 384 });
   fs5.renameSync(tmp, file);
 }
+function openTurn(dir, turn, root) {
+  if (readStart(startFile(dir, turn))?.running)
+    return null;
+  const starts = readStarts(dir);
+  const seq = starts && !starts.some((s) => s.seq === null) ? Math.max(0, ...starts.map((s) => s.seq)) + 1 : null;
+  const now = snapshot(root);
+  return () => writeStart(dir, { head: now?.head ?? null, entries: now?.entries ?? null, running: true, turn, seq });
+}
+function closeTurn(dir, turn, root) {
+  const own = readStart(startFile(dir, turn));
+  if (!own?.entries)
+    return null;
+  const before = { head: own.head, entries: own.entries };
+  const now = snapshot(root);
+  return () => {
+    if (newestTurn(readStarts(dir)) !== turn || JSON.stringify(readStart(startFile(dir, turn))) !== JSON.stringify(own))
+      return [];
+    writeStart(dir, { ...own, ...now ?? {}, running: false });
+    return now ? changed(root, before, now) : [];
+  };
+}
+function stopTurn(dir, turn) {
+  const own = readStart(startFile(dir, turn));
+  if (own?.entries || own?.running)
+    writeStart(dir, { ...own, head: null, entries: null, running: false });
+}
 function pruneBaselines() {
   const cutoff = Date.now() - HOLD_DAYS * 24 * 60 * 60 * 1000;
-  let files;
+  const fresh = (file) => (fs5.statSync(file, { throwIfNoEntry: false })?.mtimeMs ?? Date.now()) >= cutoff;
+  let names;
   try {
-    files = fs5.readdirSync(baselineDir());
+    names = fs5.readdirSync(baselineDir());
   } catch {
     return;
   }
-  for (const f of files) {
-    const file = path6.join(baselineDir(), f);
-    if ((fs5.statSync(file, { throwIfNoEntry: false })?.mtimeMs ?? Date.now()) < cutoff)
-      fs5.rmSync(file, { force: true });
+  for (const name of names) {
+    const at = path6.join(baselineDir(), name);
+    if (!fs5.statSync(at, { throwIfNoEntry: false })?.isDirectory()) {
+      if (!fresh(at))
+        fs5.rmSync(at, { force: true });
+    } else {
+      const files = fs5.readdirSync(at);
+      if (files.length && !files.some((f) => fresh(path6.join(at, f))))
+        fs5.rmSync(at, { recursive: true, force: true });
+    }
+  }
+}
+function attempt(fn) {
+  try {
+    return fn();
+  } catch {
+    return;
   }
 }
 function onHook(host, input) {
@@ -11813,17 +11884,17 @@ function onHook(host, input) {
       fs5.appendFileSync(file, `export SPHICA_PARENT_SESSION=${input.session_id}
 `);
     }
-    const place2 = identify(input.cwd ?? process.cwd());
-    const now = place2 && snapshot(place2.root);
-    if (now)
-      writeBaseline(baselineFile(host, String(input.session_id)), { ...now, running: false });
-    pruneBaselines();
+    attempt(pruneBaselines);
     return { flush: false, notice: captureNotice() };
   }
   if (!owner())
     return { flush: false };
-  if (event === "Interrupt")
+  if (event === "Interrupt") {
+    const turn2 = input.prompt_id ?? input.turn_id;
+    if (turn2)
+      attempt(() => stopTurn(turnDir(host, String(input.session_id)), turn2));
     return { flush: true };
+  }
   const place = identify(input.cwd ?? process.cwd());
   if (!place)
     return { flush: false };
@@ -11847,30 +11918,26 @@ function onHook(host, input) {
     const id = `${key}:${digest(kept.body)}`;
     spool({ ...base, at: when, kind: "message", id, speaker, ...kept });
   };
-  const baseline = baselineFile(host, base.session);
-  if (event === "UserPromptSubmit") {
-    if (!readBaseline(baseline)?.running) {
-      const now = snapshot(place.root);
-      if (now)
-        writeBaseline(baseline, { ...now, running: true });
-    }
-  }
+  const dir = turnDir(host, base.session);
   if (event === "UserPromptSubmit" && input.prompt) {
     const prompt = input.prompt.trimStart();
     if (!INJECTED.some((r) => r.test(prompt)))
       say(`${turn}:owner`, "owner", prompt);
   }
+  if (event === "UserPromptSubmit")
+    attempt(() => openTurn(dir, turn, place.root)?.());
   if (event === "Stop") {
     if (input.last_assistant_message)
       say(`${turn}:assistant`, "assistant", input.last_assistant_message);
-    const now = snapshot(place.root);
-    if (now) {
-      const before = readBaseline(baseline);
-      if (before)
-        for (const p of changed(place.root, before, now))
-          spool({ ...base, kind: "edit", event: null, path: p, via: "status" });
-      writeBaseline(baseline, { ...now, running: false });
-    }
+    const paths = attempt(() => {
+      const finish = closeTurn(dir, turn, place.root);
+      if (finish)
+        return finish();
+      stopTurn(dir, turn);
+      return [];
+    });
+    for (const p of paths ?? [])
+      spool({ ...base, kind: "edit", event: null, path: p, via: "status" });
     return { flush: true };
   }
   if (event === "PostToolUse") {
@@ -11930,7 +11997,7 @@ function readState() {
 function lock() {
   const file = path6.join(spoolDir(), ".lock");
   fs5.mkdirSync(spoolDir(), { recursive: true, mode: 448 });
-  for (let attempt = 0;attempt < 2; attempt++) {
+  for (let attempt2 = 0;attempt2 < 2; attempt2++) {
     try {
       fs5.writeFileSync(file, String(process.pid), { flag: "wx", mode: 384 });
       return () => {
@@ -12228,15 +12295,18 @@ export {
   answersOf,
   branchOf,
   captureNotice,
+  closeTurn,
   current,
   fit,
   flush,
   isOwnerTurn,
   onHook,
+  openTurn,
   readInput,
   readState,
   rejectedDir,
   spoolDir,
+  turnDir,
   unregisteredDir,
   write
 };

package/dist/cli.js

@@ -15237,32 +15237,103 @@ function captureNotice(file = dbFile()) {
     return panel(`sphica: the database rejected ${plural(s.rejected, "record")}`, [rejectedDir(), `Move them back to ${spoolDir()} to resend`], "Fix them first, then check with sphica doctor");
   return null;
 }
-var baselineFile = (host, session) => path8.join(baselineDir(), `${digest(`${host}\x00${session}`)}.json`);
-function readBaseline(file) {
+var turnDir = (host, session) => path8.join(baselineDir(), digest(`${host}\x00${session}`));
+var startFile = (dir, turn) => path8.join(dir, `${digest(turn)}.json`);
+var isStart = (v) => {
+  const s = v;
+  return !!s && typeof s === "object" && typeof s.turn === "string" && typeof s.running === "boolean" && (s.seq === null || Number.isSafeInteger(s.seq)) && (s.entries === null || typeof s.entries === "object" && !Array.isArray(s.entries)) && (s.head === null || typeof s.head === "string");
+};
+function readStart(file) {
   try {
-    return JSON.parse(fs7.readFileSync(file, "utf8"));
+    const s = JSON.parse(fs7.readFileSync(file, "utf8"));
+    return isStart(s) ? s : null;
   } catch {
     return null;
   }
 }
-function writeBaseline(file, b) {
-  fs7.mkdirSync(path8.dirname(file), { recursive: true, mode: 448 });
-  const tmp = `${file}.${process.pid}.tmp`;
-  fs7.writeFileSync(tmp, JSON.stringify(b), { mode: 384 });
+function readStarts(dir) {
+  let names;
+  try {
+    names = fs7.readdirSync(dir);
+  } catch (e) {
+    return e.code === "ENOENT" ? [] : null;
+  }
+  const starts = [];
+  for (const name of names) {
+    if (name.startsWith("."))
+      continue;
+    const s = readStart(path8.join(dir, name));
+    if (!s)
+      return null;
+    starts.push(s);
+  }
+  return starts;
+}
+function newestTurn(starts) {
+  if (!starts?.length || starts.some((s) => s.seq === null))
+    return null;
+  const top = Math.max(...starts.map((s) => s.seq));
+  const at = starts.filter((s) => s.seq === top);
+  return at.length === 1 ? at[0]?.turn ?? null : null;
+}
+function writeStart(dir, s, file = startFile(dir, s.turn)) {
+  fs7.mkdirSync(dir, { recursive: true, mode: 448 });
+  const tmp = path8.join(dir, `.${path8.basename(file)}.${process.pid}.tmp`);
+  fs7.writeFileSync(tmp, JSON.stringify(s), { mode: 384 });
   fs7.renameSync(tmp, file);
 }
+function openTurn(dir, turn, root) {
+  if (readStart(startFile(dir, turn))?.running)
+    return null;
+  const starts = readStarts(dir);
+  const seq = starts && !starts.some((s) => s.seq === null) ? Math.max(0, ...starts.map((s) => s.seq)) + 1 : null;
+  const now = snapshot(root);
+  return () => writeStart(dir, { head: now?.head ?? null, entries: now?.entries ?? null, running: true, turn, seq });
+}
+function closeTurn(dir, turn, root) {
+  const own = readStart(startFile(dir, turn));
+  if (!own?.entries)
+    return null;
+  const before = { head: own.head, entries: own.entries };
+  const now = snapshot(root);
+  return () => {
+    if (newestTurn(readStarts(dir)) !== turn || JSON.stringify(readStart(startFile(dir, turn))) !== JSON.stringify(own))
+      return [];
+    writeStart(dir, { ...own, ...now ?? {}, running: false });
+    return now ? changed(root, before, now) : [];
+  };
+}
+function stopTurn(dir, turn) {
+  const own = readStart(startFile(dir, turn));
+  if (own?.entries || own?.running)
+    writeStart(dir, { ...own, head: null, entries: null, running: false });
+}
 function pruneBaselines() {
   const cutoff = Date.now() - HOLD_DAYS * 24 * 60 * 60 * 1000;
-  let files;
+  const fresh = (file) => (fs7.statSync(file, { throwIfNoEntry: false })?.mtimeMs ?? Date.now()) >= cutoff;
+  let names;
   try {
-    files = fs7.readdirSync(baselineDir());
+    names = fs7.readdirSync(baselineDir());
   } catch {
     return;
   }
-  for (const f of files) {
-    const file = path8.join(baselineDir(), f);
-    if ((fs7.statSync(file, { throwIfNoEntry: false })?.mtimeMs ?? Date.now()) < cutoff)
-      fs7.rmSync(file, { force: true });
+  for (const name of names) {
+    const at = path8.join(baselineDir(), name);
+    if (!fs7.statSync(at, { throwIfNoEntry: false })?.isDirectory()) {
+      if (!fresh(at))
+        fs7.rmSync(at, { force: true });
+    } else {
+      const files = fs7.readdirSync(at);
+      if (files.length && !files.some((f) => fresh(path8.join(at, f))))
+        fs7.rmSync(at, { recursive: true, force: true });
+    }
+  }
+}
+function attempt(fn) {
+  try {
+    return fn();
+  } catch {
+    return;
   }
 }
 function onHook(host, input) {
@@ -15276,17 +15347,17 @@ function onHook(host, input) {
       fs7.appendFileSync(file, `export SPHICA_PARENT_SESSION=${input.session_id}
 `);
     }
-    const place2 = identify(input.cwd ?? process.cwd());
-    const now = place2 && snapshot(place2.root);
-    if (now)
-      writeBaseline(baselineFile(host, String(input.session_id)), { ...now, running: false });
-    pruneBaselines();
+    attempt(pruneBaselines);
     return { flush: false, notice: captureNotice() };
   }
   if (!owner())
     return { flush: false };
-  if (event === "Interrupt")
+  if (event === "Interrupt") {
+    const turn2 = input.prompt_id ?? input.turn_id;
+    if (turn2)
+      attempt(() => stopTurn(turnDir(host, String(input.session_id)), turn2));
     return { flush: true };
+  }
   const place = identify(input.cwd ?? process.cwd());
   if (!place)
     return { flush: false };
@@ -15310,30 +15381,26 @@ function onHook(host, input) {
     const id = `${key}:${digest(kept.body)}`;
     spool({ ...base, at: when, kind: "message", id, speaker, ...kept });
   };
-  const baseline = baselineFile(host, base.session);
-  if (event === "UserPromptSubmit") {
-    if (!readBaseline(baseline)?.running) {
-      const now = snapshot(place.root);
-      if (now)
-        writeBaseline(baseline, { ...now, running: true });
-    }
-  }
+  const dir = turnDir(host, base.session);
   if (event === "UserPromptSubmit" && input.prompt) {
     const prompt = input.prompt.trimStart();
     if (!INJECTED.some((r2) => r2.test(prompt)))
       say(`${turn}:owner`, "owner", prompt);
   }
+  if (event === "UserPromptSubmit")
+    attempt(() => openTurn(dir, turn, place.root)?.());
   if (event === "Stop") {
     if (input.last_assistant_message)
       say(`${turn}:assistant`, "assistant", input.last_assistant_message);
-    const now = snapshot(place.root);
-    if (now) {
-      const before = readBaseline(baseline);
-      if (before)
-        for (const p of changed(place.root, before, now))
-          spool({ ...base, kind: "edit", event: null, path: p, via: "status" });
-      writeBaseline(baseline, { ...now, running: false });
-    }
+    const paths = attempt(() => {
+      const finish = closeTurn(dir, turn, place.root);
+      if (finish)
+        return finish();
+      stopTurn(dir, turn);
+      return [];
+    });
+    for (const p of paths ?? [])
+      spool({ ...base, kind: "edit", event: null, path: p, via: "status" });
     return { flush: true };
   }
   if (event === "PostToolUse") {
@@ -15393,7 +15460,7 @@ function readState() {
 function lock() {
   const file = path8.join(spoolDir(), ".lock");
   fs7.mkdirSync(spoolDir(), { recursive: true, mode: 448 });
-  for (let attempt = 0;attempt < 2; attempt++) {
+  for (let attempt2 = 0;attempt2 < 2; attempt2++) {
     try {
       fs7.writeFileSync(file, String(process.pid), { flag: "wx", mode: 384 });
       return () => {

package/dist/deliver.js

@@ -11806,32 +11806,103 @@ function captureNotice(file = dbFile()) {
     return panel(`sphica: the database rejected ${plural(s.rejected, "record")}`, [rejectedDir(), `Move them back to ${spoolDir()} to resend`], "Fix them first, then check with sphica doctor");
   return null;
 }
-var baselineFile = (host, session) => path6.join(baselineDir(), `${digest(`${host}\x00${session}`)}.json`);
-function readBaseline(file) {
+var turnDir = (host, session) => path6.join(baselineDir(), digest(`${host}\x00${session}`));
+var startFile = (dir, turn) => path6.join(dir, `${digest(turn)}.json`);
+var isStart = (v) => {
+  const s = v;
+  return !!s && typeof s === "object" && typeof s.turn === "string" && typeof s.running === "boolean" && (s.seq === null || Number.isSafeInteger(s.seq)) && (s.entries === null || typeof s.entries === "object" && !Array.isArray(s.entries)) && (s.head === null || typeof s.head === "string");
+};
+function readStart(file) {
   try {
-    return JSON.parse(fs5.readFileSync(file, "utf8"));
+    const s = JSON.parse(fs5.readFileSync(file, "utf8"));
+    return isStart(s) ? s : null;
   } catch {
     return null;
   }
 }
-function writeBaseline(file, b) {
-  fs5.mkdirSync(path6.dirname(file), { recursive: true, mode: 448 });
-  const tmp = `${file}.${process.pid}.tmp`;
-  fs5.writeFileSync(tmp, JSON.stringify(b), { mode: 384 });
+function readStarts(dir) {
+  let names;
+  try {
+    names = fs5.readdirSync(dir);
+  } catch (e) {
+    return e.code === "ENOENT" ? [] : null;
+  }
+  const starts = [];
+  for (const name of names) {
+    if (name.startsWith("."))
+      continue;
+    const s = readStart(path6.join(dir, name));
+    if (!s)
+      return null;
+    starts.push(s);
+  }
+  return starts;
+}
+function newestTurn(starts) {
+  if (!starts?.length || starts.some((s) => s.seq === null))
+    return null;
+  const top = Math.max(...starts.map((s) => s.seq));
+  const at = starts.filter((s) => s.seq === top);
+  return at.length === 1 ? at[0]?.turn ?? null : null;
+}
+function writeStart(dir, s, file = startFile(dir, s.turn)) {
+  fs5.mkdirSync(dir, { recursive: true, mode: 448 });
+  const tmp = path6.join(dir, `.${path6.basename(file)}.${process.pid}.tmp`);
+  fs5.writeFileSync(tmp, JSON.stringify(s), { mode: 384 });
   fs5.renameSync(tmp, file);
 }
+function openTurn(dir, turn, root) {
+  if (readStart(startFile(dir, turn))?.running)
+    return null;
+  const starts = readStarts(dir);
+  const seq = starts && !starts.some((s) => s.seq === null) ? Math.max(0, ...starts.map((s) => s.seq)) + 1 : null;
+  const now = snapshot(root);
+  return () => writeStart(dir, { head: now?.head ?? null, entries: now?.entries ?? null, running: true, turn, seq });
+}
+function closeTurn(dir, turn, root) {
+  const own = readStart(startFile(dir, turn));
+  if (!own?.entries)
+    return null;
+  const before = { head: own.head, entries: own.entries };
+  const now = snapshot(root);
+  return () => {
+    if (newestTurn(readStarts(dir)) !== turn || JSON.stringify(readStart(startFile(dir, turn))) !== JSON.stringify(own))
+      return [];
+    writeStart(dir, { ...own, ...now ?? {}, running: false });
+    return now ? changed(root, before, now) : [];
+  };
+}
+function stopTurn(dir, turn) {
+  const own = readStart(startFile(dir, turn));
+  if (own?.entries || own?.running)
+    writeStart(dir, { ...own, head: null, entries: null, running: false });
+}
 function pruneBaselines() {
   const cutoff = Date.now() - HOLD_DAYS * 24 * 60 * 60 * 1000;
-  let files;
+  const fresh = (file) => (fs5.statSync(file, { throwIfNoEntry: false })?.mtimeMs ?? Date.now()) >= cutoff;
+  let names;
   try {
-    files = fs5.readdirSync(baselineDir());
+    names = fs5.readdirSync(baselineDir());
   } catch {
     return;
   }
-  for (const f of files) {
-    const file = path6.join(baselineDir(), f);
-    if ((fs5.statSync(file, { throwIfNoEntry: false })?.mtimeMs ?? Date.now()) < cutoff)
-      fs5.rmSync(file, { force: true });
+  for (const name of names) {
+    const at = path6.join(baselineDir(), name);
+    if (!fs5.statSync(at, { throwIfNoEntry: false })?.isDirectory()) {
+      if (!fresh(at))
+        fs5.rmSync(at, { force: true });
+    } else {
+      const files = fs5.readdirSync(at);
+      if (files.length && !files.some((f) => fresh(path6.join(at, f))))
+        fs5.rmSync(at, { recursive: true, force: true });
+    }
+  }
+}
+function attempt(fn) {
+  try {
+    return fn();
+  } catch {
+    return;
   }
 }
 function onHook(host, input) {
@@ -11845,17 +11916,17 @@ function onHook(host, input) {
       fs5.appendFileSync(file, `export SPHICA_PARENT_SESSION=${input.session_id}
 `);
     }
-    const place2 = identify(input.cwd ?? process.cwd());
-    const now = place2 && snapshot(place2.root);
-    if (now)
-      writeBaseline(baselineFile(host, String(input.session_id)), { ...now, running: false });
-    pruneBaselines();
+    attempt(pruneBaselines);
     return { flush: false, notice: captureNotice() };
   }
   if (!owner())
     return { flush: false };
-  if (event === "Interrupt")
+  if (event === "Interrupt") {
+    const turn2 = input.prompt_id ?? input.turn_id;
+    if (turn2)
+      attempt(() => stopTurn(turnDir(host, String(input.session_id)), turn2));
     return { flush: true };
+  }
   const place = identify(input.cwd ?? process.cwd());
   if (!place)
     return { flush: false };
@@ -11879,30 +11950,26 @@ function onHook(host, input) {
     const id = `${key}:${digest(kept.body)}`;
     spool({ ...base, at: when, kind: "message", id, speaker, ...kept });
   };
-  const baseline = baselineFile(host, base.session);
-  if (event === "UserPromptSubmit") {
-    if (!readBaseline(baseline)?.running) {
-      const now = snapshot(place.root);
-      if (now)
-        writeBaseline(baseline, { ...now, running: true });
-    }
-  }
+  const dir = turnDir(host, base.session);
   if (event === "UserPromptSubmit" && input.prompt) {
     const prompt = input.prompt.trimStart();
     if (!INJECTED.some((r) => r.test(prompt)))
       say(`${turn}:owner`, "owner", prompt);
   }
+  if (event === "UserPromptSubmit")
+    attempt(() => openTurn(dir, turn, place.root)?.());
   if (event === "Stop") {
     if (input.last_assistant_message)
       say(`${turn}:assistant`, "assistant", input.last_assistant_message);
-    const now = snapshot(place.root);
-    if (now) {
-      const before = readBaseline(baseline);
-      if (before)
-        for (const p of changed(place.root, before, now))
-          spool({ ...base, kind: "edit", event: null, path: p, via: "status" });
-      writeBaseline(baseline, { ...now, running: false });
-    }
+    const paths = attempt(() => {
+      const finish = closeTurn(dir, turn, place.root);
+      if (finish)
+        return finish();
+      stopTurn(dir, turn);
+      return [];
+    });
+    for (const p of paths ?? [])
+      spool({ ...base, kind: "edit", event: null, path: p, via: "status" });
     return { flush: true };
   }
   if (event === "PostToolUse") {
@@ -11962,7 +12029,7 @@ function readState() {
 function lock() {
   const file = path6.join(spoolDir(), ".lock");
   fs5.mkdirSync(spoolDir(), { recursive: true, mode: 448 });
-  for (let attempt = 0;attempt < 2; attempt++) {
+  for (let attempt2 = 0;attempt2 < 2; attempt2++) {
     try {
       fs5.writeFileSync(file, String(process.pid), { flag: "wx", mode: 384 });
       return () => {

package/dist/mcp-record.js

@@ -46723,32 +46723,103 @@ function captureNotice(file2 = dbFile()) {
     return panel(`sphica: the database rejected ${plural2(s.rejected, "record")}`, [rejectedDir(), `Move them back to ${spoolDir()} to resend`], "Fix them first, then check with sphica doctor");
   return null;
 }
-var baselineFile = (host, session) => path6.join(baselineDir(), `${digest(`${host}\x00${session}`)}.json`);
-function readBaseline(file2) {
+var turnDir = (host, session) => path6.join(baselineDir(), digest(`${host}\x00${session}`));
+var startFile = (dir, turn) => path6.join(dir, `${digest(turn)}.json`);
+var isStart = (v) => {
+  const s = v;
+  return !!s && typeof s === "object" && typeof s.turn === "string" && typeof s.running === "boolean" && (s.seq === null || Number.isSafeInteger(s.seq)) && (s.entries === null || typeof s.entries === "object" && !Array.isArray(s.entries)) && (s.head === null || typeof s.head === "string");
+};
+function readStart(file2) {
   try {
-    return JSON.parse(fs6.readFileSync(file2, "utf8"));
+    const s = JSON.parse(fs6.readFileSync(file2, "utf8"));
+    return isStart(s) ? s : null;
   } catch {
     return null;
   }
 }
-function writeBaseline(file2, b) {
-  fs6.mkdirSync(path6.dirname(file2), { recursive: true, mode: 448 });
-  const tmp = `${file2}.${process.pid}.tmp`;
-  fs6.writeFileSync(tmp, JSON.stringify(b), { mode: 384 });
+function readStarts(dir) {
+  let names;
+  try {
+    names = fs6.readdirSync(dir);
+  } catch (e) {
+    return e.code === "ENOENT" ? [] : null;
+  }
+  const starts2 = [];
+  for (const name of names) {
+    if (name.startsWith("."))
+      continue;
+    const s = readStart(path6.join(dir, name));
+    if (!s)
+      return null;
+    starts2.push(s);
+  }
+  return starts2;
+}
+function newestTurn(starts2) {
+  if (!starts2?.length || starts2.some((s) => s.seq === null))
+    return null;
+  const top = Math.max(...starts2.map((s) => s.seq));
+  const at = starts2.filter((s) => s.seq === top);
+  return at.length === 1 ? at[0]?.turn ?? null : null;
+}
+function writeStart(dir, s, file2 = startFile(dir, s.turn)) {
+  fs6.mkdirSync(dir, { recursive: true, mode: 448 });
+  const tmp = path6.join(dir, `.${path6.basename(file2)}.${process.pid}.tmp`);
+  fs6.writeFileSync(tmp, JSON.stringify(s), { mode: 384 });
   fs6.renameSync(tmp, file2);
 }
+function openTurn(dir, turn, root) {
+  if (readStart(startFile(dir, turn))?.running)
+    return null;
+  const starts2 = readStarts(dir);
+  const seq = starts2 && !starts2.some((s) => s.seq === null) ? Math.max(0, ...starts2.map((s) => s.seq)) + 1 : null;
+  const now = snapshot(root);
+  return () => writeStart(dir, { head: now?.head ?? null, entries: now?.entries ?? null, running: true, turn, seq });
+}
+function closeTurn(dir, turn, root) {
+  const own2 = readStart(startFile(dir, turn));
+  if (!own2?.entries)
+    return null;
+  const before = { head: own2.head, entries: own2.entries };
+  const now = snapshot(root);
+  return () => {
+    if (newestTurn(readStarts(dir)) !== turn || JSON.stringify(readStart(startFile(dir, turn))) !== JSON.stringify(own2))
+      return [];
+    writeStart(dir, { ...own2, ...now ?? {}, running: false });
+    return now ? changed(root, before, now) : [];
+  };
+}
+function stopTurn(dir, turn) {
+  const own2 = readStart(startFile(dir, turn));
+  if (own2?.entries || own2?.running)
+    writeStart(dir, { ...own2, head: null, entries: null, running: false });
+}
 function pruneBaselines() {
   const cutoff = Date.now() - HOLD_DAYS * 24 * 60 * 60 * 1000;
-  let files;
+  const fresh = (file2) => (fs6.statSync(file2, { throwIfNoEntry: false })?.mtimeMs ?? Date.now()) >= cutoff;
+  let names;
   try {
-    files = fs6.readdirSync(baselineDir());
+    names = fs6.readdirSync(baselineDir());
   } catch {
     return;
   }
-  for (const f of files) {
-    const file2 = path6.join(baselineDir(), f);
-    if ((fs6.statSync(file2, { throwIfNoEntry: false })?.mtimeMs ?? Date.now()) < cutoff)
-      fs6.rmSync(file2, { force: true });
+  for (const name of names) {
+    const at = path6.join(baselineDir(), name);
+    if (!fs6.statSync(at, { throwIfNoEntry: false })?.isDirectory()) {
+      if (!fresh(at))
+        fs6.rmSync(at, { force: true });
+    } else {
+      const files = fs6.readdirSync(at);
+      if (files.length && !files.some((f) => fresh(path6.join(at, f))))
+        fs6.rmSync(at, { recursive: true, force: true });
+    }
+  }
+}
+function attempt(fn) {
+  try {
+    return fn();
+  } catch {
+    return;
   }
 }
 function onHook(host, input2) {
@@ -46762,17 +46833,17 @@ function onHook(host, input2) {
       fs6.appendFileSync(file2, `export SPHICA_PARENT_SESSION=${input2.session_id}
 `);
     }
-    const place2 = identify(input2.cwd ?? process.cwd());
-    const now = place2 && snapshot(place2.root);
-    if (now)
-      writeBaseline(baselineFile(host, String(input2.session_id)), { ...now, running: false });
-    pruneBaselines();
+    attempt(pruneBaselines);
     return { flush: false, notice: captureNotice() };
   }
   if (!owner())
     return { flush: false };
-  if (event === "Interrupt")
+  if (event === "Interrupt") {
+    const turn2 = input2.prompt_id ?? input2.turn_id;
+    if (turn2)
+      attempt(() => stopTurn(turnDir(host, String(input2.session_id)), turn2));
     return { flush: true };
+  }
   const place = identify(input2.cwd ?? process.cwd());
   if (!place)
     return { flush: false };
@@ -46796,30 +46867,26 @@ function onHook(host, input2) {
     const id = `${key}:${digest(kept.body)}`;
     spool({ ...base, at: when, kind: "message", id, speaker, ...kept });
   };
-  const baseline = baselineFile(host, base.session);
-  if (event === "UserPromptSubmit") {
-    if (!readBaseline(baseline)?.running) {
-      const now = snapshot(place.root);
-      if (now)
-        writeBaseline(baseline, { ...now, running: true });
-    }
-  }
+  const dir = turnDir(host, base.session);
   if (event === "UserPromptSubmit" && input2.prompt) {
     const prompt = input2.prompt.trimStart();
     if (!INJECTED.some((r) => r.test(prompt)))
       say(`${turn}:owner`, "owner", prompt);
   }
+  if (event === "UserPromptSubmit")
+    attempt(() => openTurn(dir, turn, place.root)?.());
   if (event === "Stop") {
     if (input2.last_assistant_message)
       say(`${turn}:assistant`, "assistant", input2.last_assistant_message);
-    const now = snapshot(place.root);
-    if (now) {
-      const before = readBaseline(baseline);
-      if (before)
-        for (const p of changed(place.root, before, now))
-          spool({ ...base, kind: "edit", event: null, path: p, via: "status" });
-      writeBaseline(baseline, { ...now, running: false });
-    }
+    const paths = attempt(() => {
+      const finish = closeTurn(dir, turn, place.root);
+      if (finish)
+        return finish();
+      stopTurn(dir, turn);
+      return [];
+    });
+    for (const p of paths ?? [])
+      spool({ ...base, kind: "edit", event: null, path: p, via: "status" });
     return { flush: true };
   }
   if (event === "PostToolUse") {
@@ -46879,7 +46946,7 @@ function readState() {
 function lock() {
   const file2 = path6.join(spoolDir(), ".lock");
   fs6.mkdirSync(spoolDir(), { recursive: true, mode: 448 });
-  for (let attempt = 0;attempt < 2; attempt++) {
+  for (let attempt2 = 0;attempt2 < 2; attempt2++) {
     try {
       fs6.writeFileSync(file2, String(process.pid), { flag: "wx", mode: 384 });
       return () => {
@@ -47810,7 +47877,6 @@ async function checkRecord(db, target, raw, facts = prepareRecord(target.root, r
   ];
   const others = new Map((linked.length ? await db.selectFrom("unit").select(["id", "key", "kind", "lifecycle"]).where("project_id", "=", target.projectId).where("key", "in", linked).execute() : []).map((u) => [u.key, u]));
   const holders = new Map((others.size ? await db.selectFrom("unit_link as l").innerJoin("unit as n", "n.id", "l.from_unit").select(["l.to_unit", "n.key", "n.lifecycle"]).where("l.kind", "=", "supersedes").where("l.to_unit", "in", [...others.values()].map((o) => o.id)).where("n.lifecycle", "<>", "withdrawn").where("n.extraction", "=", "supported").where("n.unsourced", "=", 0).execute() : []).map((h) => [h.to_unit, h]));
-  const maintainers = new Set(record3.units.some((u) => u.supersedes || u.conflicts.length) ? (await db.selectFrom("source").select("author_login").distinct().where("project_id", "=", target.projectId).where("author_association", "in", [...MAINTAINERS]).execute()).flatMap((r) => r.author_login ? [r.author_login] : []) : []);
   const units = [];
   const claimed = new Set;
   for (const [i, u] of record3.units.entries()) {
@@ -47866,7 +47932,7 @@ async function checkRecord(db, target, raw, facts = prepareRecord(target.root, r
     if (target.origin !== "trace" && (u.supersedes || u.conflicts.length)) {
       const trusted = [...u.evidence, ...u.adoption].some((q) => {
         const s = sources.get(Number(q.source.slice(1)));
-        return s && (s.kind === "session_message" || s.author_kind === "owner" || MAINTAINERS.has(s.author_association ?? "") || s.author_login !== null && maintainers.has(s.author_login));
+        return s && (s.kind === "session_message" || s.author_kind === "owner" || MAINTAINERS.has(s.author_association ?? ""));
       });
       if (!trusted)
         errors3.push(`${key}: supersedes and conflicts from ${target.origin} need the owner's or a maintainer's words, or the owner's session`);
@@ -49488,7 +49554,7 @@ var reply = (t, isError = false) => ({
   ...isError ? { isError: true } : {}
 });
 async function projectOf(cwd, meta3) {
-  const workspace = process.env.CLAUDE_PROJECT_DIR || hostWorkspace(meta3);
+  const workspace = hostWorkspace(meta3) || process.env.CLAUDE_PROJECT_DIR;
   if (!workspace)
     throw new Error("The host did not say which workspace this session is in, so nothing is written (update Claude Code or Codex)");
   const place = writePlace(workspace, cwd);

package/hooks/hooks.json

@@ -49,7 +49,7 @@
             "args": [
               "${CLAUDE_PLUGIN_ROOT}/dist/capture.js"
             ],
-            "async": true
+            "timeout": 30
           }
         ]
       },
@@ -90,7 +90,7 @@
             "args": [
               "${CLAUDE_PLUGIN_ROOT}/dist/capture.js"
             ],
-            "async": true
+            "timeout": 30
           }
         ]
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sphica",
-  "version": "0.6.27",
+  "version": "0.6.29",
   "description": "Records Claude Code and Codex sessions on your machine and keeps past implementation and decisions, with their sources, for your agent to find.",
   "license": "MIT",
   "type": "module",