sphica 0.6.16 → 0.6.18

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://anthropic.com/claude-code/plugin.schema.json",
   "name": "sphica",
-  "version": "0.6.16",
+  "version": "0.6.18",
   "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.16",
+  "version": "0.6.18",
   "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/migrations/0007.sql

@@ -0,0 +1,49 @@
+-- Revision 6 → 7 of generation 2: capture prunes the deliveries of sessions idle past a cutoff, so delivery_unit loses its cascade from
+-- delivery (capture may not delete through one) and delivery_ad removes the units. Runs in one transaction with foreign keys off; every
+-- statement matches db/schema.sql at revision 7, and server/test/migrate.test.ts compares the two.
+
+drop trigger capture_delivery_insert;
+drop trigger capture_delivery_scoped_insert;
+create table delivery_unit_new (
+  delivery_id integer not null references delivery (id),
+  unit_id integer not null references unit (id) on delete cascade,
+  primary key (delivery_id, unit_id)
+) strict;
+insert into delivery_unit_new (delivery_id, unit_id) select delivery_id, unit_id from delivery_unit;
+drop table delivery_unit;
+alter table delivery_unit_new rename to delivery_unit;
+create index delivery_unit_unit on delivery_unit (unit_id);
+create trigger delivery_ad after delete on delivery begin
+  delete from delivery_unit where delivery_id = old.id;
+end;
+create index delivery_at on delivery (at);
+create trigger capture_delivery_insert instead of insert on capture_delivery 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, event, outcome, reason, path, eligible, omitted, chars, at)
+  values (new.session_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;
+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;
+create view capture_delivery_prune as select null as cutoff, null as session_id;
+create trigger capture_delivery_prune_insert instead of insert on capture_delivery_prune begin
+  delete from delivery where session_id = new.session_id
+    and not exists (select 1 from delivery n where n.session_id = new.session_id and n.at >= new.cutoff);
+  delete from delivery where id in (select d.id from delivery d where d.at < new.cutoff
+    and (d.session_id is null or not exists (select 1 from delivery n where n.session_id = d.session_id and n.at >= new.cutoff))
+    order by d.at, d.id limit 200);
+end;
+
+pragma user_version = 7;

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,14 +948,19 @@ 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 index delivery_at on delivery (at);
+-- A delivery's units go by delivery_ad, not a cascade: capture prunes deliveries, and its authorizer passes a delete only from a named trigger
 create table delivery_unit (
-  delivery_id integer not null references delivery (id) on delete cascade,
+  delivery_id integer not null references delivery (id),
   unit_id integer not null references unit (id) on delete cascade,
   primary key (delivery_id, unit_id)
 ) strict;
 create index delivery_unit_unit on delivery_unit (unit_id);
+create trigger delivery_ad after delete on delivery begin
+  delete from delivery_unit where delivery_id = old.id;
+end;
 
 -- The one way the record server writes a source. It has no session columns, so it can never write a session message: those are the
 -- owner's own words, and only capture writes them. A view insert returns no id; the writer looks the row up by its item key
@@ -1024,5 +1030,29 @@ 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;
+-- Deletes the deliveries of sessions whose last delivery is before cutoff: all of session_id's, then up to 200 of the oldest others (a row
+-- without a session goes by its own time). Capture inserts here before each delivery it logs, naming that delivery's session
+create view capture_delivery_prune as select null as cutoff, null as session_id;
+create trigger capture_delivery_prune_insert instead of insert on capture_delivery_prune begin
+  delete from delivery where session_id = new.session_id
+    and not exists (select 1 from delivery n where n.session_id = new.session_id and n.at >= new.cutoff);
+  delete from delivery where id in (select d.id from delivery d where d.at < new.cutoff
+    and (d.session_id is null or not exists (select 1 from delivery n where n.session_id = d.session_id and n.at >= new.cutoff))
+    order by d.at, d.id limit 200);
+end;
 
-pragma user_version = 5;
+pragma user_version = 7;

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 = 7;
 var sphicaHome = () => process.env.SPHICA_HOME || path2.join(os.homedir(), ".sphica");
 var dbFile = () => process.env.SPHICA_DB || path2.join(sphicaHome(), "sphica.db");
 function requireRuntime() {
@@ -11245,16 +11245,29 @@ 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",
+  "capture_delivery_prune"
+]);
 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_DELETES = {
+  capture_delivery_prune_insert: new Set(["delivery"]),
+  delivery_ad: new Set(["delivery_unit"])
+};
 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"]),
@@ -11271,6 +11284,8 @@ function captureAuthorizer(own, action, p1, p2, triggerOrView) {
       return C2.SQLITE_OK;
     return fts ? C2.SQLITE_OK : C2.SQLITE_DENY;
   }
+  if (action === C2.SQLITE_DELETE && triggerOrView !== null && TRIGGER_DELETES[triggerOrView]?.has(table))
+    return C2.SQLITE_OK;
   if (action === C2.SQLITE_UPDATE || action === C2.SQLITE_DELETE)
     return fts ? C2.SQLITE_OK : C2.SQLITE_DENY;
   if (action === C2.SQLITE_READ) {
@@ -11327,6 +11342,7 @@ var INGEST_TRIGGER_WRITES = {
   source_fts_ad: ["delete source_fts"],
   unit_state_apply: ["update unit"],
   unit_state_restore: ["insert unit_state"],
+  delivery_ad: ["delete delivery_unit"],
   ...Object.fromEntries([
     "evidence_i",
     "evidence_u",

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 = 7;
 var sphicaHome = () => process.env.SPHICA_HOME || path3.join(os2.homedir(), ".sphica");
 var dbFile = () => process.env.SPHICA_DB || path3.join(sphicaHome(), "sphica.db");
 function requireRuntime() {
@@ -14712,16 +14712,29 @@ 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",
+  "capture_delivery_prune"
+]);
 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_DELETES = {
+  capture_delivery_prune_insert: new Set(["delivery"]),
+  delivery_ad: new Set(["delivery_unit"])
+};
 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"]),
@@ -14738,6 +14751,8 @@ function captureAuthorizer(own, action, p1, p2, triggerOrView) {
       return C2.SQLITE_OK;
     return fts ? C2.SQLITE_OK : C2.SQLITE_DENY;
   }
+  if (action === C2.SQLITE_DELETE && triggerOrView !== null && TRIGGER_DELETES[triggerOrView]?.has(table))
+    return C2.SQLITE_OK;
   if (action === C2.SQLITE_UPDATE || action === C2.SQLITE_DELETE)
     return fts ? C2.SQLITE_OK : C2.SQLITE_DENY;
   if (action === C2.SQLITE_READ) {
@@ -14794,6 +14809,7 @@ var INGEST_TRIGGER_WRITES = {
   source_fts_ad: ["delete source_fts"],
   unit_state_apply: ["update unit"],
   unit_state_restore: ["insert unit_state"],
+  delivery_ad: ["delete delivery_unit"],
   ...Object.fromEntries([
     "evidence_i",
     "evidence_u",

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 = 7;
 var sphicaHome = () => process.env.SPHICA_HOME || path3.join(os.homedir(), ".sphica");
 var dbFile = () => process.env.SPHICA_DB || path3.join(sphicaHome(), "sphica.db");
 function requireRuntime() {
@@ -11294,16 +11294,29 @@ 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",
+  "capture_delivery_prune"
+]);
 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_DELETES = {
+  capture_delivery_prune_insert: new Set(["delivery"]),
+  delivery_ad: new Set(["delivery_unit"])
+};
 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"]),
@@ -11320,6 +11333,8 @@ function captureAuthorizer(own, action, p1, p2, triggerOrView) {
       return C2.SQLITE_OK;
     return fts ? C2.SQLITE_OK : C2.SQLITE_DENY;
   }
+  if (action === C2.SQLITE_DELETE && triggerOrView !== null && TRIGGER_DELETES[triggerOrView]?.has(table))
+    return C2.SQLITE_OK;
   if (action === C2.SQLITE_UPDATE || action === C2.SQLITE_DELETE)
     return fts ? C2.SQLITE_OK : C2.SQLITE_DENY;
   if (action === C2.SQLITE_READ) {
@@ -11376,6 +11391,7 @@ var INGEST_TRIGGER_WRITES = {
   source_fts_ad: ["delete source_fts"],
   unit_state_apply: ["update unit"],
   unit_state_restore: ["insert unit_state"],
+  delivery_ad: ["delete delivery_unit"],
   ...Object.fromEntries([
     "evidence_i",
     "evidence_u",
@@ -31836,10 +31852,12 @@ var LIMITS = {
   review: { units: 5, chars: 1500 }
 };
 var LOG_WAIT_MS = 250;
+var RETAIN_MS = 90 * 24 * 60 * 60 * 1000;
 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) => `
@@ -31920,9 +31938,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));
@@ -32052,7 +32076,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,
@@ -32120,34 +32149,64 @@ function markOnce(kind, key) {
 function onceUnavailable(session) {
   return markOnce("unavailable", session);
 }
-async function log(file2, projectId2, host, external2, event, plan, outcome, branch) {
+async function write2(trx, e, plan) {
+  const id = sessionId(e.projectId, e.host, e.external);
+  const t = Date.now();
+  const now = iso(t);
+  await trx.insertInto("capture_delivery_prune").values({ cutoff: iso(t - RETAIN_MS), session_id: id }).execute();
+  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 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) => {
-      await trx.insertInto("capture_session").values({ id, project_id: projectId2, host, external_id: external2, branch, started_at: now }).execute();
-      await trx.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();
+      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))
@@ -32181,21 +32240,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, place.root, 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 "";
-    if (onPath && !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 = 7;
 var sphicaHome = () => process.env.SPHICA_HOME || path2.join(os.homedir(), ".sphica");
 var dbFile = () => process.env.SPHICA_DB || path2.join(sphicaHome(), "sphica.db");
 function requireRuntime() {
@@ -46005,16 +46005,29 @@ 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",
+  "capture_delivery_prune"
+]);
 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_DELETES = {
+  capture_delivery_prune_insert: new Set(["delivery"]),
+  delivery_ad: new Set(["delivery_unit"])
+};
 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"]),
@@ -46031,6 +46044,8 @@ function captureAuthorizer(own2, action, p1, p2, triggerOrView) {
       return C2.SQLITE_OK;
     return fts ? C2.SQLITE_OK : C2.SQLITE_DENY;
   }
+  if (action === C2.SQLITE_DELETE && triggerOrView !== null && TRIGGER_DELETES[triggerOrView]?.has(table))
+    return C2.SQLITE_OK;
   if (action === C2.SQLITE_UPDATE || action === C2.SQLITE_DELETE)
     return fts ? C2.SQLITE_OK : C2.SQLITE_DENY;
   if (action === C2.SQLITE_READ) {
@@ -46087,6 +46102,7 @@ var INGEST_TRIGGER_WRITES = {
   source_fts_ad: ["delete source_fts"],
   unit_state_apply: ["update unit"],
   unit_state_restore: ["insert unit_state"],
+  delivery_ad: ["delete delivery_unit"],
   ...Object.fromEntries([
     "evidence_i",
     "evidence_u",

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 = 7;
 var sphicaHome = () => process.env.SPHICA_HOME || path2.join(os.homedir(), ".sphica");
 var dbFile = () => process.env.SPHICA_DB || path2.join(sphicaHome(), "sphica.db");
 function requireRuntime() {

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.16",
+  "version": "0.6.18",
   "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",