@zgeoff/atc 2.13.0 → 2.15.0

package/src/store/run-migrations.ts

@@ -48,6 +48,10 @@ interface EventsTable {
   // The id a remote session's reporter gave a report row, unique so a
   // resent report lands once; null on every other row.
   report_id: string | null;
+
+  // A report row's whole text, which detail previews; null on every other
+  // row, and on a report row written before the column existed.
+  report_text: string | null;
 }
 
 interface SpawnHistoryTable {
@@ -437,6 +441,11 @@ const MIGRATIONS: Record<string, Migration> = {
         .execute();
     },
   },
+  '023_add_events_report_text': {
+    async up(db: Kysely<StateStoreSchema>) {
+      await db.schema.alterTable('events').addColumn('report_text', 'text').execute();
+    },
+  },
 };
 
 const PROVIDER: MigrationProvider = {

package/src/store/state-store.ts

@@ -63,6 +63,23 @@ export interface StoredEvent {
   readonly label?: string;
 }
 
+/**
+ * One report as the trail holds it. A report recorded before the trail kept
+ * whole texts has only its preview, so its text is that preview and
+ * `complete` is false.
+ */
+export interface StoredReport {
+  readonly id: number;
+
+  // Epoch ms the report arrived.
+  readonly at: number;
+  readonly atcID: SessionID;
+  readonly agentSessionID: AgentSessionID | null;
+  readonly label: string;
+  readonly text: string;
+  readonly complete: boolean;
+}
+
 /**
  * Daemon state in one SQLite store: the restorable fleet, the event trail
  * (hook events, message status changes, and reports) that events.read and
@@ -224,12 +241,22 @@ export class StateStore {
     return recency;
   }
 
-  // Replaces this daemon's rows wholesale and leaves every other daemon's
-  // rows as they stand. A session another daemon owns, or one whose stored
-  // ownership epoch has moved past this daemon's, rejects the whole write
-  // with stale_epoch.
-  async writeFleet(entries: readonly FleetEntry[]): Promise<void> {
+  // Rewrites this daemon's rows for the given entries and drops its rows
+  // for the removed sessions, plus any row of its own that an entry
+  // replaces by holding the same agent session id. Every other row stays as
+  // it stands, so a row the daemon never loaded survives a write. A session
+  // another daemon owns, or one whose stored ownership epoch has moved past
+  // this daemon's, rejects the whole write with stale_epoch.
+  async writeFleet(
+    entries: readonly FleetEntry[],
+    removed: readonly SessionID[] = [],
+  ): Promise<void> {
     const kept = buildFleetWithoutReplacedRows(entries);
+    const sessionIDs = [...entries.map((entry) => entry.sessionID), ...removed];
+
+    const agentSessionIDs = entries.flatMap((entry) =>
+      entry.agentSessionID === undefined ? [] : [entry.agentSessionID],
+    );
 
     await this.db.transaction().execute(async (trx) => {
       await requireCurrentOwnership(
@@ -238,17 +265,35 @@ export class StateStore {
         entries.map((entry) => entry.sessionID),
       );
 
-      await trx
-        .deleteFrom('fleet')
-        .where('session_id', 'in', (eb) =>
-          eb
-            .selectFrom('session_owner')
-            .select('session_id')
-            .where('daemon_id', '=', this.daemonID),
-        )
-        .execute();
+      const replaced =
+        agentSessionIDs.length === 0
+          ? []
+          : await trx
+              .selectFrom('fleet')
+              .select(['session_id', 'agent_session_id'])
+              .where('agent_session_id', 'in', agentSessionIDs)
+              .execute();
+
+      const dropped = [...new Set([...sessionIDs, ...replaced.map((row) => row.session_id)])];
+
+      if (dropped.length > 0) {
+        await trx
+          .deleteFrom('fleet')
+          .where('session_id', 'in', dropped)
+          .where('session_id', 'in', (eb) =>
+            eb
+              .selectFrom('session_owner')
+              .select('session_id')
+              .where('daemon_id', '=', this.daemonID),
+          )
+          .execute();
 
-      await trx.deleteFrom('session_owner').where('daemon_id', '=', this.daemonID).execute();
+        await trx
+          .deleteFrom('session_owner')
+          .where('daemon_id', '=', this.daemonID)
+          .where('session_id', 'in', dropped)
+          .execute();
+      }
 
       const updatedAt = Date.now();
 
@@ -287,6 +332,38 @@ export class StateStore {
           })
           .execute();
       }
+
+      // A stored row this write leaves in place follows its replaced parent
+      // to the session that replaced it, or to that session's own parent
+      // when the replacement is itself a sub-session.
+      const survivors = new Map(
+        kept.flatMap((entry) =>
+          entry.agentSessionID === undefined ? [] : [[entry.agentSessionID, entry] as const],
+        ),
+      );
+
+      for (const row of replaced) {
+        const survivor =
+          row.agent_session_id === null
+            ? undefined
+            : survivors.get(toAgentSessionID(row.agent_session_id));
+
+        if (survivor === undefined || survivor.sessionID === row.session_id) {
+          continue;
+        }
+
+        await trx
+          .updateTable('fleet')
+          .set({ parent_session_id: survivor.parent ?? survivor.sessionID })
+          .where('parent_session_id', '=', row.session_id)
+          .where('session_id', 'in', (eb) =>
+            eb
+              .selectFrom('session_owner')
+              .select('session_id')
+              .where('daemon_id', '=', this.daemonID),
+          )
+          .execute();
+      }
     });
   }
 
@@ -347,6 +424,7 @@ export class StateStore {
         kind: entry.kind,
         detail: entry.detail,
         report_id: entry.kind === 'report' ? (entry.reportID ?? null) : null,
+        report_text: entry.kind === 'report' ? entry.text : null,
       })
       .onConflict((oc) => oc.column('report_id').doNothing())
       .executeTakeFirst();
@@ -372,6 +450,32 @@ export class StateStore {
     return buildStoredEvents(rows);
   }
 
+  // A row that is not a report, or that lies outside the scope, misses as a
+  // row the trail never held does.
+  async findReport(id: number, scope: EventScope | null = null): Promise<StoredReport | null> {
+    const row = await this.db
+      .selectFrom('events')
+      .select(['id', 'ts', 'atc_id', 'session_id', 'message', 'detail', 'report_text'])
+      .where('id', '=', id)
+      .where('kind', '=', 'report')
+      .where((eb) => buildScopeMatch(eb, scope))
+      .executeTakeFirst();
+
+    if (row === undefined) {
+      return null;
+    }
+
+    return {
+      id: row.id,
+      at: Date.parse(row.ts),
+      atcID: toSessionID(row.atc_id),
+      agentSessionID: row.session_id === null ? null : toAgentSessionID(row.session_id),
+      label: row.message ?? '',
+      text: row.report_text ?? row.detail ?? '',
+      complete: row.report_text !== null,
+    };
+  }
+
   async collectLatestEvents(
     limit: number,
     scope: EventScope | null = null,

package/src/store/trail-entry.ts

@@ -19,6 +19,9 @@ interface ReportTrailEntry extends TrailEntryBase {
   readonly kind: 'report';
   readonly label: string;
 
+  // The report's whole text, which the detail previews.
+  readonly text: string;
+
   // The id a remote session's reporter gave the report, so a resent
   // report is stored once; absent for a report that carries none.
   readonly reportID?: string;