sphica 0.6.15 → 0.6.17

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://anthropic.com/claude-code/plugin.schema.json",
   "name": "sphica",
-  "version": "0.6.15",
+  "version": "0.6.17",
   "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.15",
+  "version": "0.6.17",
   "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/db/migrations/0006.sql

@@ -0,0 +1,20 @@
+-- Revision 5 → 6 of generation 2: the subagent a delivery ran in (existing rows keep null, the main conversation), and a capture view
+-- that writes it while capture_delivery keeps its columns. `sphica init` runs this in one transaction with foreign keys off, then checks
+-- foreign_key_check. Every statement matches db/schema.sql at revision 6; server/test/migrate.test.ts compares the two.
+
+alter table delivery add column agent_id text check (length(agent_id) between 1 and 200);
+
+create view capture_delivery_scoped as
+  select session_id, agent_id, event, outcome, reason, path, eligible, omitted, chars, at, null as units from delivery;
+create trigger capture_delivery_scoped_insert instead of insert on capture_delivery_scoped begin
+  select raise(abort, 'the unit and the delivered session belong to different projects')
+  where exists (select 1 from json_each(coalesce(new.units, '[]')) j
+    where (select project_id from unit where id = j.value) is not (select project_id from session where id = new.session_id));
+  insert into delivery (session_id, agent_id, event, outcome, reason, path, eligible, omitted, chars, at)
+  values (new.session_id, new.agent_id, new.event, new.outcome, new.reason, new.path, coalesce(new.eligible, 0),
+    coalesce(new.omitted, 0), coalesce(new.chars, 0), new.at);
+  insert into delivery_unit (delivery_id, unit_id)
+  select last_insert_rowid(), j.value from json_each(coalesce(new.units, '[]')) j where true on conflict do nothing;
+end;
+
+pragma user_version = 6;

package/db/schema.sql

@@ -934,8 +934,9 @@ create table work (
 create index work_open on work (project_id, updated_at desc) where status in ('active', 'blocked', 'paused');
 create index work_run on work (run_id) where run_id is not null;
 
--- What a delivery hook emitted or suppressed, and how many eligible units it left out. No source text is copied here.
--- chars is the delivered length without the omission note (Sphica's own text), since the read budget adds it up.
+-- What a delivery hook emitted or suppressed, and how many eligible units it left out (no source text). chars leaves out the omission note,
+-- since the read budget adds it up. A session_start's reason is the start source or 'subagent'; agent_id is the subagent (null: main),
+-- written the way SQLite stores a column ALTER TABLE added, so a migrated database has the same definition.
 create table delivery (
   id integer primary key autoincrement not null,
   session_id text references session (id) on delete cascade,
@@ -947,7 +948,7 @@ create table delivery (
   omitted integer not null default 0 check (omitted >= 0 and omitted <= eligible),
   chars integer not null default 0 check (chars >= 0),
   at text not null check (strftime('%Y-%m-%dT%H:%M:%fZ', at) is at)
-) strict;
+, agent_id text check (length(agent_id) between 1 and 200)) strict;
 create index delivery_session on delivery (session_id, at);
 create table delivery_unit (
   delivery_id integer not null references delivery (id) on delete cascade,
@@ -1024,5 +1025,19 @@ create trigger capture_delivery_insert instead of insert on capture_delivery beg
   insert into delivery_unit (delivery_id, unit_id)
   select last_insert_rowid(), j.value from json_each(coalesce(new.units, '[]')) j where true on conflict do nothing;
 end;
+-- The same as capture_delivery with the subagent the delivery ran in. capture_delivery keeps its columns, since an older plugin's
+-- capture writes through it into a database of this revision
+create view capture_delivery_scoped as
+  select session_id, agent_id, event, outcome, reason, path, eligible, omitted, chars, at, null as units from delivery;
+create trigger capture_delivery_scoped_insert instead of insert on capture_delivery_scoped begin
+  select raise(abort, 'the unit and the delivered session belong to different projects')
+  where exists (select 1 from json_each(coalesce(new.units, '[]')) j
+    where (select project_id from unit where id = j.value) is not (select project_id from session where id = new.session_id));
+  insert into delivery (session_id, agent_id, event, outcome, reason, path, eligible, omitted, chars, at)
+  values (new.session_id, new.agent_id, new.event, new.outcome, new.reason, new.path, coalesce(new.eligible, 0),
+    coalesce(new.omitted, 0), coalesce(new.chars, 0), new.at);
+  insert into delivery_unit (delivery_id, unit_id)
+  select last_insert_rowid(), j.value from json_each(coalesce(new.units, '[]')) j where true on conflict do nothing;
+end;
 
-pragma user_version = 5;
+pragma user_version = 6;

package/dist/capture.js

@@ -11109,7 +11109,7 @@ var HOST_MARKS = new Set([".orphaned_at", ".in_use"]);
 
 // server/src/sqlite.ts
 var SCHEMA_GENERATION = 2;
-var SCHEMA_REVISION = 5;
+var SCHEMA_REVISION = 6;
 var sphicaHome = () => process.env.SPHICA_HOME || path2.join(os.homedir(), ".sphica");
 var dbFile = () => process.env.SPHICA_DB || path2.join(sphicaHome(), "sphica.db");
 function requireRuntime() {
@@ -11121,10 +11121,10 @@ function requireFile(file) {
   if (!fs2.existsSync(file))
     throw new Error(`No database at ${file}. Create it with \`sphica init\`.`);
 }
-function prepare(raw, check) {
+function prepare(raw, check, busyMs = 5000) {
   raw.enableDefensive(true);
   raw.exec("pragma foreign_keys = on");
-  raw.exec("pragma busy_timeout = 5000");
+  raw.exec(`pragma busy_timeout = ${Math.trunc(busyMs)}`);
   if (check === "none")
     return;
   checkGeneration(raw);
@@ -11245,16 +11245,24 @@ var DDL = () => ddl ??= new Set([
   return code;
 }));
 var readsDataVersion = (p1, p2) => p1 === "data_version" && p2 === null;
-var CAPTURE_VIEWS = new Set(["capture_session", "capture_message", "capture_edit", "capture_delivery"]);
+var CAPTURE_VIEWS = new Set([
+  "capture_session",
+  "capture_message",
+  "capture_edit",
+  "capture_delivery",
+  "capture_delivery_scoped"
+]);
 var TRIGGER_WRITES = {
   capture_session_insert: new Set(["session"]),
   capture_message_insert: new Set(["source"]),
   capture_edit_insert: new Set(["edit_observation"]),
   capture_delivery_insert: new Set(["delivery", "delivery_unit"]),
+  capture_delivery_scoped_insert: new Set(["delivery", "delivery_unit"]),
   source_fts_ai: new Set(["source_fts"])
 };
 var TRIGGER_FUNCTIONS = {
-  capture_delivery_insert: new Set(["coalesce", "json_each", "last_insert_rowid"])
+  capture_delivery_insert: new Set(["coalesce", "json_each", "last_insert_rowid"]),
+  capture_delivery_scoped_insert: new Set(["coalesce", "json_each", "last_insert_rowid"])
 };
 var CAPTURE_READS = {
   project: new Set(["id", "key", "name"]),
@@ -11399,13 +11407,13 @@ function forgetAuthorizer(action, p1, p2) {
     return C2.SQLITE_OK;
   return C2.SQLITE_DENY;
 }
-function connectWriter(role, file = dbFile(), create = false) {
+function connectWriter(role, file = dbFile(), create = false, busyMs) {
   requireRuntime();
   if (!create)
     requireFile(file);
   const raw = new DatabaseSync2(file);
   try {
-    prepare(raw, create ? "none" : role === "ingest" || role === "forget" ? "revision" : "generation");
+    prepare(raw, create ? "none" : role === "ingest" || role === "forget" ? "revision" : "generation", busyMs);
     raw.function("sphica_terms", { deterministic: true }, (text) => terms(String(text ?? "")).join(" "));
   } catch (e) {
     raw.close();
@@ -11433,8 +11441,8 @@ function connectWriter(role, file = dbFile(), create = false) {
   }
   return raw;
 }
-function openWriter(role, file = dbFile()) {
-  return kyselyOn(() => connectWriter(role, file));
+function openWriter(role, file = dbFile(), busyMs) {
+  return kyselyOn(() => connectWriter(role, file, false, busyMs));
 }
 
 // server/src/knowledge.ts

package/dist/cli.js

@@ -3625,7 +3625,7 @@ ${indent}${caution(note)}` : ""}`);
 
 // server/src/sqlite.ts
 var SCHEMA_GENERATION = 2;
-var SCHEMA_REVISION = 5;
+var SCHEMA_REVISION = 6;
 var sphicaHome = () => process.env.SPHICA_HOME || path3.join(os2.homedir(), ".sphica");
 var dbFile = () => process.env.SPHICA_DB || path3.join(sphicaHome(), "sphica.db");
 function requireRuntime() {
@@ -3637,10 +3637,10 @@ function requireFile(file) {
   if (!fs3.existsSync(file))
     throw new Error(`No database at ${file}. Create it with \`sphica init\`.`);
 }
-function prepare(raw, check) {
+function prepare(raw, check, busyMs = 5000) {
   raw.enableDefensive(true);
   raw.exec("pragma foreign_keys = on");
-  raw.exec("pragma busy_timeout = 5000");
+  raw.exec(`pragma busy_timeout = ${Math.trunc(busyMs)}`);
   if (check === "none")
     return;
   checkGeneration(raw);
@@ -14712,16 +14712,24 @@ var DDL = () => ddl ??= new Set([
   return code;
 }));
 var readsDataVersion = (p1, p2) => p1 === "data_version" && p2 === null;
-var CAPTURE_VIEWS = new Set(["capture_session", "capture_message", "capture_edit", "capture_delivery"]);
+var CAPTURE_VIEWS = new Set([
+  "capture_session",
+  "capture_message",
+  "capture_edit",
+  "capture_delivery",
+  "capture_delivery_scoped"
+]);
 var TRIGGER_WRITES = {
   capture_session_insert: new Set(["session"]),
   capture_message_insert: new Set(["source"]),
   capture_edit_insert: new Set(["edit_observation"]),
   capture_delivery_insert: new Set(["delivery", "delivery_unit"]),
+  capture_delivery_scoped_insert: new Set(["delivery", "delivery_unit"]),
   source_fts_ai: new Set(["source_fts"])
 };
 var TRIGGER_FUNCTIONS = {
-  capture_delivery_insert: new Set(["coalesce", "json_each", "last_insert_rowid"])
+  capture_delivery_insert: new Set(["coalesce", "json_each", "last_insert_rowid"]),
+  capture_delivery_scoped_insert: new Set(["coalesce", "json_each", "last_insert_rowid"])
 };
 var CAPTURE_READS = {
   project: new Set(["id", "key", "name"]),
@@ -14866,13 +14874,13 @@ function forgetAuthorizer(action, p1, p2) {
     return C2.SQLITE_OK;
   return C2.SQLITE_DENY;
 }
-function connectWriter(role, file = dbFile(), create = false) {
+function connectWriter(role, file = dbFile(), create = false, busyMs) {
   requireRuntime();
   if (!create)
     requireFile(file);
   const raw = new DatabaseSync2(file);
   try {
-    prepare(raw, create ? "none" : role === "ingest" || role === "forget" ? "revision" : "generation");
+    prepare(raw, create ? "none" : role === "ingest" || role === "forget" ? "revision" : "generation", busyMs);
     raw.function("sphica_terms", { deterministic: true }, (text) => terms(String(text ?? "")).join(" "));
   } catch (e) {
     raw.close();
@@ -14900,8 +14908,8 @@ function connectWriter(role, file = dbFile(), create = false) {
   }
   return raw;
 }
-function openWriter(role, file = dbFile()) {
-  return kyselyOn(() => connectWriter(role, file));
+function openWriter(role, file = dbFile(), busyMs) {
+  return kyselyOn(() => connectWriter(role, file, false, busyMs));
 }
 
 // server/src/admin.ts

package/dist/deliver.js

@@ -11134,7 +11134,7 @@ var HOST_MARKS = new Set([".orphaned_at", ".in_use"]);
 
 // server/src/sqlite.ts
 var SCHEMA_GENERATION = 2;
-var SCHEMA_REVISION = 5;
+var SCHEMA_REVISION = 6;
 var sphicaHome = () => process.env.SPHICA_HOME || path3.join(os.homedir(), ".sphica");
 var dbFile = () => process.env.SPHICA_DB || path3.join(sphicaHome(), "sphica.db");
 function requireRuntime() {
@@ -11146,10 +11146,10 @@ function requireFile(file) {
   if (!fs2.existsSync(file))
     throw new Error(`No database at ${file}. Create it with \`sphica init\`.`);
 }
-function prepare(raw, check) {
+function prepare(raw, check, busyMs = 5000) {
   raw.enableDefensive(true);
   raw.exec("pragma foreign_keys = on");
-  raw.exec("pragma busy_timeout = 5000");
+  raw.exec(`pragma busy_timeout = ${Math.trunc(busyMs)}`);
   if (check === "none")
     return;
   checkGeneration(raw);
@@ -11294,16 +11294,24 @@ var DDL = () => ddl ??= new Set([
   return code;
 }));
 var readsDataVersion = (p1, p2) => p1 === "data_version" && p2 === null;
-var CAPTURE_VIEWS = new Set(["capture_session", "capture_message", "capture_edit", "capture_delivery"]);
+var CAPTURE_VIEWS = new Set([
+  "capture_session",
+  "capture_message",
+  "capture_edit",
+  "capture_delivery",
+  "capture_delivery_scoped"
+]);
 var TRIGGER_WRITES = {
   capture_session_insert: new Set(["session"]),
   capture_message_insert: new Set(["source"]),
   capture_edit_insert: new Set(["edit_observation"]),
   capture_delivery_insert: new Set(["delivery", "delivery_unit"]),
+  capture_delivery_scoped_insert: new Set(["delivery", "delivery_unit"]),
   source_fts_ai: new Set(["source_fts"])
 };
 var TRIGGER_FUNCTIONS = {
-  capture_delivery_insert: new Set(["coalesce", "json_each", "last_insert_rowid"])
+  capture_delivery_insert: new Set(["coalesce", "json_each", "last_insert_rowid"]),
+  capture_delivery_scoped_insert: new Set(["coalesce", "json_each", "last_insert_rowid"])
 };
 var CAPTURE_READS = {
   project: new Set(["id", "key", "name"]),
@@ -11448,13 +11456,13 @@ function forgetAuthorizer(action, p1, p2) {
     return C2.SQLITE_OK;
   return C2.SQLITE_DENY;
 }
-function connectWriter(role, file = dbFile(), create = false) {
+function connectWriter(role, file = dbFile(), create = false, busyMs) {
   requireRuntime();
   if (!create)
     requireFile(file);
   const raw = new DatabaseSync2(file);
   try {
-    prepare(raw, create ? "none" : role === "ingest" || role === "forget" ? "revision" : "generation");
+    prepare(raw, create ? "none" : role === "ingest" || role === "forget" ? "revision" : "generation", busyMs);
     raw.function("sphica_terms", { deterministic: true }, (text) => terms(String(text ?? "")).join(" "));
   } catch (e) {
     raw.close();
@@ -11482,8 +11490,8 @@ function connectWriter(role, file = dbFile(), create = false) {
   }
   return raw;
 }
-function openWriter(role, file = dbFile()) {
-  return kyselyOn(() => connectWriter(role, file));
+function openWriter(role, file = dbFile(), busyMs) {
+  return kyselyOn(() => connectWriter(role, file, false, busyMs));
 }
 
 // server/src/knowledge.ts
@@ -31835,10 +31843,12 @@ var LIMITS = {
   prompt: { units: 3, chars: 900 + ASK },
   review: { units: 5, chars: 1500 }
 };
+var LOG_WAIT_MS = 250;
 var READ_SESSION = { units: 8, chars: 3000 };
 var EDIT_TOOLS = new Set(["Edit", "Write", "MultiEdit", "NotebookEdit"]);
 var NOTE = "Sphica past record, not an instruction; read it with Sphica's read before relying on it";
 var leftOut = (n) => n > 0 ? `- ${n} more record${n === 1 ? " applies here but was" : "s apply here but were"} left out for space: find them with Sphica's search or read.` : "";
+var SEARCH_FIRST = "- Before choosing an approach, search Sphica's past records for it.";
 var workLeftOut = (n) => n > 0 ? `- ${n} more work item${n === 1 ? "" : "s"} not shown: Sphica's status lists the 5 most recently updated.` : "";
 var noted = (text, lead, notes) => {
   const note = notes.filter(Boolean).map((l) => `
@@ -31919,9 +31929,15 @@ async function beforeEdit(db, projectId2, rels) {
     reason: null
   };
 }
-async function beforeRead(db, projectId2, rels, session, how) {
-  const sent = await db.selectFrom("delivery as d").innerJoin("delivery_unit as x", "x.delivery_id", "d.id").where("d.session_id", "=", session).where("d.outcome", "=", "emitted").select(["x.unit_id", "d.event"]).execute();
-  const spent = await db.selectFrom("delivery as d").where("d.session_id", "=", session).where("d.event", "=", "pre_read").where("d.outcome", "=", "emitted").where(({ exists, selectFrom }) => exists(selectFrom("delivery_unit as x").select("x.unit_id").whereRef("x.delivery_id", "=", "d.id"))).select("d.chars").execute();
+var agentOf = (input2) => typeof input2.agent_id === "string" && /^[\x21-\x7e]{1,200}$/.test(input2.agent_id) ? input2.agent_id : null;
+var sameAgent = (agent) => (eb) => agent === null ? eb("d.agent_id", "is", null) : eb("d.agent_id", "=", agent);
+var START_SOURCES = new Set(["startup", "resume", "clear", "compact", "fork"]);
+var RESTARTS = ["compact", "clear"];
+async function beforeRead(db, projectId2, rels, session, agent, how) {
+  const restart = await db.selectFrom("delivery as d").where("d.session_id", "=", session).where(sameAgent(agent)).where("d.event", "=", "session_start").where("d.reason", "in", RESTARTS).select((eb) => eb.fn.max("d.id").as("id")).executeTakeFirst();
+  const since = restart?.id ?? 0;
+  const sent = await db.selectFrom("delivery as d").innerJoin("delivery_unit as x", "x.delivery_id", "d.id").where("d.session_id", "=", session).where(sameAgent(agent)).where("d.id", ">", since).where("d.outcome", "=", "emitted").select(["x.unit_id", "d.event"]).execute();
+  const spent = await db.selectFrom("delivery as d").where("d.session_id", "=", session).where(sameAgent(agent)).where("d.id", ">", since).where("d.event", "=", "pre_read").where("d.outcome", "=", "emitted").where(({ exists, selectFrom }) => exists(selectFrom("delivery_unit as x").select("x.unit_id").whereRef("x.delivery_id", "=", "d.id"))).select("d.chars").execute();
   const seen = new Set(sent.map((r) => r.unit_id));
   const readUnits = sent.filter((r) => r.event === "pre_read").length;
   const rows = (await anchoredTo(db, projectId2, rels).where("u.kind", "in", ["decision", "constraint"]).execute()).filter((u) => !seen.has(u.id));
@@ -31973,7 +31989,11 @@ async function namedInCommand(db, projectId2, root, cwd, command) {
   };
   return paths.map((r) => r.path).filter((p) => forms(p).some((t) => new RegExp(`(?:^|[${edge}])${esc2(t)}(?:$|[${edge}:])`).test(command)));
 }
-async function onPrompt(db, projectId2, prompt) {
+function pathNamed(prompt, root, rel) {
+  const steps = (p) => p.split(/[\\/]/).map((s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("[\\\\/]");
+  return new RegExp(`(?<![A-Za-z0-9_$.\\-/\\\\])(?:(?:\\.[\\\\/])?${steps(rel)}|${steps(path8.join(root, rel))})(?![A-Za-z0-9_$\\-/\\\\]|\\.[A-Za-z0-9_$])`).test(prompt);
+}
+async function onPrompt(db, projectId2, root, prompt) {
   const text = prompt.normalize("NFKC");
   const lower = text.toLowerCase();
   const word = (w, s) => new RegExp(`(?<![\\p{L}\\p{N}_$])${w.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(?![\\p{L}\\p{N}_$])`, "u").test(s);
@@ -31986,7 +32006,7 @@ async function onPrompt(db, projectId2, prompt) {
   ]) : [[], []];
   const hits = [];
   for (const u of units) {
-    const a = anchors.find((x) => x.unit_id === u.id && (x.symbol && named2(x.symbol) || text.includes(x.path)));
+    const a = anchors.find((x) => x.unit_id === u.id && (x.symbol && named2(x.symbol) || pathNamed(prompt, root, x.path)));
     const o = options.find((x) => x.unit_id === u.id && x.text.length >= 3 && word(x.text.normalize("NFKC").toLowerCase(), lower));
     if (a)
       hits.push({ u, why: ` [names ${a.symbol && named2(a.symbol) ? a.symbol : a.path}]` });
@@ -32047,7 +32067,12 @@ async function atStart(db, projectId2, branch, place) {
   const workLeft = Math.max((workTotal ?? 0) - f.kept.filter((i) => i < work.length).length, 0);
   const broadLeft = Math.max((broadTotal ?? 0) - shownUnits.length, 0);
   return {
-    ...noted(f.text, lead, [leftOut(broadLeft), workLeftOut(workLeft), await waiting(db, projectId2, place)]),
+    ...noted(f.text, lead, [
+      leftOut(broadLeft),
+      workLeftOut(workLeft),
+      await waiting(db, projectId2, place),
+      place.subagent ? SEARCH_FIRST : ""
+    ]),
     units: shownUnits,
     eligible: (workTotal ?? 0) + (broadTotal ?? 0),
     omitted: workLeft + broadLeft,
@@ -32115,32 +32140,62 @@ function markOnce(kind, key) {
 function onceUnavailable(session) {
   return markOnce("unavailable", session);
 }
-async function log(file2, projectId2, host, external2, event, plan, outcome, branch) {
-  const cap = openWriter("capture", file2);
+async function write2(trx, e, plan) {
+  const id = sessionId(e.projectId, e.host, e.external);
+  const now = iso(Date.now());
+  await trx.insertInto("capture_session").values({
+    id,
+    project_id: e.projectId,
+    host: e.host,
+    external_id: e.external,
+    branch: e.branch,
+    started_at: now
+  }).execute();
+  await trx.insertInto("capture_delivery_scoped").values({
+    session_id: id,
+    agent_id: e.agent,
+    event: e.event,
+    outcome: plan.text ? "emitted" : "nothing",
+    reason: plan.reason,
+    path: plan.path,
+    eligible: plan.eligible,
+    omitted: plan.omitted,
+    chars: plan.text.length - plan.note.length,
+    at: now,
+    units: JSON.stringify(plan.units)
+  }).execute();
+}
+async function log(file2, e, plan) {
+  const cap = openWriter("capture", file2, LOG_WAIT_MS);
   try {
-    const id = sessionId(projectId2, host, external2);
-    const now = iso(Date.now());
-    await cap.insertInto("capture_session").values({ id, project_id: projectId2, host, external_id: external2, branch, started_at: now }).execute();
-    await cap.insertInto("capture_delivery").values({
-      session_id: id,
-      event,
-      outcome,
-      reason: plan.reason,
-      path: plan.path,
-      eligible: plan.eligible,
-      omitted: plan.omitted,
-      chars: plan.text.length - plan.note.length,
-      at: now,
-      units: JSON.stringify(plan.units)
-    }).execute();
+    await inTransaction(cap, (trx) => write2(trx, e, plan));
+  } finally {
+    await cap.destroy().catch(() => {});
+  }
+}
+async function lockedPlan(file2, e, make, keep) {
+  const cap = openWriter("capture", file2, LOG_WAIT_MS);
+  let held = false;
+  let plan = null;
+  try {
+    await inTransaction(cap, async (trx) => {
+      held = true;
+      plan = await make();
+      if (keep(plan))
+        await write2(trx, e, plan);
+    });
+  } catch (err) {
+    if (held && !plan)
+      throw err;
   } finally {
     await cap.destroy().catch(() => {});
   }
+  return plan ?? make();
 }
 async function deliver(input2, host = "claude-code", file2 = dbFile()) {
   const name = input2.hook_event_name;
   const call = reviewCall(input2);
-  const event = call ? "review" : name === "SessionStart" ? "session_start" : name === "UserPromptSubmit" ? "prompt" : name === "PreToolUse" ? input2.tool_name === "Read" || input2.tool_name === "Bash" && !(host === "codex" && shellPatch(input2)) ? "pre_read" : "pre_edit" : null;
+  const event = call ? "review" : name === "SessionStart" || name === "SubagentStart" ? "session_start" : name === "UserPromptSubmit" ? "prompt" : name === "PreToolUse" ? input2.tool_name === "Read" || input2.tool_name === "Bash" && !(host === "codex" && shellPatch(input2)) ? "pre_read" : "pre_edit" : null;
   if (!event || !input2.session_id)
     return "";
   if (event === "prompt" && !isOwnerTurn(input2, undefined, undefined, host === "codex" ? process.env.CODEX_THREAD_ID : undefined))
@@ -32174,19 +32229,38 @@ async function deliver(input2, host = "claude-code", file2 = dbFile()) {
         return "";
     }
     if (event === "session_start" && input2.source === "resume") {
-      const said = await db.selectFrom("delivery").select("id").where("session_id", "=", sessionId(pid, host, input2.session_id)).where("event", "=", "session_start").where("outcome", "=", "emitted").executeTakeFirst();
+      const said = await db.selectFrom("delivery").select("id").where("session_id", "=", sessionId(pid, host, input2.session_id)).where("agent_id", "is", null).where("event", "=", "session_start").where((eb) => eb.or([eb("reason", "is", null), eb("reason", "!=", "subagent")])).where("outcome", "=", "emitted").executeTakeFirst();
       if (said)
         return "";
     }
-    const plan = event === "pre_edit" ? await beforeEdit(db, pid, rels) : event === "pre_read" ? await beforeRead(db, pid, rels, sessionId(pid, host, input2.session_id), shell ? "named" : "reading") : event === "prompt" ? await onPrompt(db, pid, input2.prompt ?? "") : call ? await beforeReview(db, pid, place.root, call) : await atStart(db, pid, branchOf(place.root), {
-      file: file2,
-      key: place.key,
+    const reader = db;
+    const session = input2.session_id;
+    const make = async () => event === "pre_edit" ? await beforeEdit(reader, pid, rels) : event === "pre_read" ? await beforeRead(reader, pid, rels, sessionId(pid, host, session), agentOf(input2), shell ? "named" : "reading") : event === "prompt" ? await onPrompt(reader, pid, place.root, input2.prompt ?? "") : call ? await beforeReview(reader, pid, place.root, call) : {
+      ...await atStart(reader, pid, branchOf(place.root), {
+        file: file2,
+        key: place.key,
+        host,
+        subagent: name === "SubagentStart",
+        owner: name !== "SubagentStart" && isOwnerTurn(input2, undefined, undefined, host === "codex" ? process.env.CODEX_THREAD_ID : undefined)
+      }),
+      reason: name === "SubagentStart" ? "subagent" : input2.source && START_SOURCES.has(input2.source) ? input2.source : null
+    };
+    const entry = {
+      projectId: pid,
       host,
-      owner: isOwnerTurn(input2, undefined, undefined, host === "codex" ? process.env.CODEX_THREAD_ID : undefined)
-    });
+      external: session,
+      agent: agentOf(input2),
+      event,
+      branch: branchOf(place.root)
+    };
+    const keep = (p) => !(onPath && !p.text);
+    if (event === "pre_read" || event === "session_start")
+      return (await lockedPlan(file2, entry, make, keep)).text;
+    const plan = await make();
     if (call && plan.text && toldBefore(`${host}\x00${input2.session_id}`, plan.once ?? plan.text))
       return "";
-    await log(file2, pid, host, input2.session_id, event, plan, plan.text ? "emitted" : "nothing", branchOf(place.root)).catch(() => {});
+    if (keep(plan))
+      await log(file2, entry, plan).catch(() => {});
     return plan.text;
   } catch (e) {
     if (e instanceof RevisionMismatch)

package/dist/mcp-record.js

@@ -45869,7 +45869,7 @@ var HOST_MARKS = new Set([".orphaned_at", ".in_use"]);
 
 // server/src/sqlite.ts
 var SCHEMA_GENERATION = 2;
-var SCHEMA_REVISION = 5;
+var SCHEMA_REVISION = 6;
 var sphicaHome = () => process.env.SPHICA_HOME || path2.join(os.homedir(), ".sphica");
 var dbFile = () => process.env.SPHICA_DB || path2.join(sphicaHome(), "sphica.db");
 function requireRuntime() {
@@ -45881,10 +45881,10 @@ function requireFile(file2) {
   if (!fs2.existsSync(file2))
     throw new Error(`No database at ${file2}. Create it with \`sphica init\`.`);
 }
-function prepare(raw, check2) {
+function prepare(raw, check2, busyMs = 5000) {
   raw.enableDefensive(true);
   raw.exec("pragma foreign_keys = on");
-  raw.exec("pragma busy_timeout = 5000");
+  raw.exec(`pragma busy_timeout = ${Math.trunc(busyMs)}`);
   if (check2 === "none")
     return;
   checkGeneration(raw);
@@ -46005,16 +46005,24 @@ var DDL = () => ddl ??= new Set([
   return code;
 }));
 var readsDataVersion = (p1, p2) => p1 === "data_version" && p2 === null;
-var CAPTURE_VIEWS = new Set(["capture_session", "capture_message", "capture_edit", "capture_delivery"]);
+var CAPTURE_VIEWS = new Set([
+  "capture_session",
+  "capture_message",
+  "capture_edit",
+  "capture_delivery",
+  "capture_delivery_scoped"
+]);
 var TRIGGER_WRITES = {
   capture_session_insert: new Set(["session"]),
   capture_message_insert: new Set(["source"]),
   capture_edit_insert: new Set(["edit_observation"]),
   capture_delivery_insert: new Set(["delivery", "delivery_unit"]),
+  capture_delivery_scoped_insert: new Set(["delivery", "delivery_unit"]),
   source_fts_ai: new Set(["source_fts"])
 };
 var TRIGGER_FUNCTIONS = {
-  capture_delivery_insert: new Set(["coalesce", "json_each", "last_insert_rowid"])
+  capture_delivery_insert: new Set(["coalesce", "json_each", "last_insert_rowid"]),
+  capture_delivery_scoped_insert: new Set(["coalesce", "json_each", "last_insert_rowid"])
 };
 var CAPTURE_READS = {
   project: new Set(["id", "key", "name"]),
@@ -46159,13 +46167,13 @@ function forgetAuthorizer(action, p1, p2) {
     return C2.SQLITE_OK;
   return C2.SQLITE_DENY;
 }
-function connectWriter(role, file2 = dbFile(), create = false) {
+function connectWriter(role, file2 = dbFile(), create = false, busyMs) {
   requireRuntime();
   if (!create)
     requireFile(file2);
   const raw = new DatabaseSync2(file2);
   try {
-    prepare(raw, create ? "none" : role === "ingest" || role === "forget" ? "revision" : "generation");
+    prepare(raw, create ? "none" : role === "ingest" || role === "forget" ? "revision" : "generation", busyMs);
     raw.function("sphica_terms", { deterministic: true }, (text) => terms(String(text ?? "")).join(" "));
   } catch (e) {
     raw.close();
@@ -46193,8 +46201,8 @@ function connectWriter(role, file2 = dbFile(), create = false) {
   }
   return raw;
 }
-function openWriter(role, file2 = dbFile()) {
-  return kyselyOn(() => connectWriter(role, file2));
+function openWriter(role, file2 = dbFile(), busyMs) {
+  return kyselyOn(() => connectWriter(role, file2, false, busyMs));
 }
 
 // server/src/extract.ts

package/dist/mcp.js

@@ -46030,7 +46030,7 @@ var HOST_MARKS = new Set([".orphaned_at", ".in_use"]);
 
 // server/src/sqlite.ts
 var SCHEMA_GENERATION = 2;
-var SCHEMA_REVISION = 5;
+var SCHEMA_REVISION = 6;
 var sphicaHome = () => process.env.SPHICA_HOME || path2.join(os.homedir(), ".sphica");
 var dbFile = () => process.env.SPHICA_DB || path2.join(sphicaHome(), "sphica.db");
 function requireRuntime() {
@@ -46042,10 +46042,10 @@ function requireFile(file2) {
   if (!fs2.existsSync(file2))
     throw new Error(`No database at ${file2}. Create it with \`sphica init\`.`);
 }
-function prepare(raw, check2) {
+function prepare(raw, check2, busyMs = 5000) {
   raw.enableDefensive(true);
   raw.exec("pragma foreign_keys = on");
-  raw.exec("pragma busy_timeout = 5000");
+  raw.exec(`pragma busy_timeout = ${Math.trunc(busyMs)}`);
   if (check2 === "none")
     return;
   checkGeneration(raw);

package/hooks/codex.json

@@ -18,6 +18,18 @@
         ]
       }
     ],
+    "SubagentStart": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "node \"${PLUGIN_ROOT}/dist/deliver.js\" codex",
+            "commandWindows": "powershell.exe -NoProfile -NonInteractive -Command node $env:PLUGIN_ROOT/dist/deliver.js codex",
+            "timeout": 10
+          }
+        ]
+      }
+    ],
     "UserPromptSubmit": [
       {
         "hooks": [

package/hooks/hooks.json

@@ -20,6 +20,17 @@
         ]
       }
     ],
+    "SubagentStart": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "node \"${CLAUDE_PLUGIN_ROOT}/dist/deliver.js\"",
+            "timeout": 5
+          }
+        ]
+      }
+    ],
     "UserPromptSubmit": [
       {
         "hooks": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sphica",
-  "version": "0.6.15",
+  "version": "0.6.17",
   "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",