@zgeoff/atc 2.10.3 → 2.11.0

package/src/store/run-migrations.ts

@@ -50,6 +50,10 @@ interface MessagesTable {
   delivered_at: number | null;
   answered_at: number | null;
   answer: string | null;
+
+  // The turn whose final reply is the answer; null for a message answered
+  // without one.
+  turn_id: string | null;
 }
 
 /**
@@ -67,8 +71,8 @@ export interface StateStoreSchema {
 // Every shape the fleet table has shipped with: the oldest carries only
 // agent_session_id under its Claude-era name plus name and cwd, and each
 // later step adds one column the daemon grew to depend on. events later gains
-// columns of its own, while spawn_history, prefs, and messages have carried one
-// shape since they were added.
+// columns of its own, as does messages, while spawn_history and prefs have
+// carried one shape since they were added.
 const MIGRATIONS: Record<string, Migration> = {
   '001_create_initial_schema': {
     async up(db: Kysely<StateStoreSchema>) {
@@ -216,6 +220,18 @@ const MIGRATIONS: Record<string, Migration> = {
         .execute();
     },
   },
+  '013_add_messages_turn_id': {
+    async up(db: Kysely<StateStoreSchema>) {
+      await db.schema.alterTable('messages').addColumn('turn_id', 'text').execute();
+
+      await db.schema
+        .createIndex('messages_turn_id')
+        .ifNotExists()
+        .on('messages')
+        .column('turn_id')
+        .execute();
+    },
+  },
 };
 
 const PROVIDER: MigrationProvider = {

package/src/store/state-store.ts

@@ -23,6 +23,16 @@ import type { TrailEntry } from './trail-entry';
 // Spelled as the partial index's predicate so SQLite can match them.
 const TRAIL_FILTER = sql<boolean>`kind IS NOT NULL AND kind != 'heartbeat'`;
 
+/**
+ * One session's slice of the event trail: rows under its atc id, plus rows
+ * under its agent session id, since a restore re-mints the atc id while the
+ * agent session id carries on.
+ */
+export interface EventScope {
+  readonly atcID: SessionID;
+  readonly agentSessionID: AgentSessionID | undefined;
+}
+
 export interface StoredEvent {
   readonly id: number;
 
@@ -238,12 +248,17 @@ export class StateStore {
       .execute();
   }
 
-  async collectEventsAfter(afterID: number, limit: number): Promise<StoredEvent[]> {
+  async collectEventsAfter(
+    afterID: number,
+    limit: number,
+    scope: EventScope | null = null,
+  ): Promise<StoredEvent[]> {
     const rows = await this.db
       .selectFrom('events')
       .select(['id', 'ts', 'atc_id', 'session_id', 'kind', 'detail', 'message'])
       .where('id', '>', afterID)
       .where(TRAIL_FILTER)
+      .where((eb) => buildScopeMatch(eb, scope))
       .orderBy('id', 'asc')
       .limit(limit)
       .execute();
@@ -251,11 +266,15 @@ export class StateStore {
     return buildStoredEvents(rows);
   }
 
-  async collectLatestEvents(limit: number): Promise<StoredEvent[]> {
+  async collectLatestEvents(
+    limit: number,
+    scope: EventScope | null = null,
+  ): Promise<StoredEvent[]> {
     const rows = await this.db
       .selectFrom('events')
       .select(['id', 'ts', 'atc_id', 'session_id', 'kind', 'detail', 'message'])
       .where(TRAIL_FILTER)
+      .where((eb) => buildScopeMatch(eb, scope))
       .orderBy('id', 'desc')
       .limit(limit)
       .execute();
@@ -375,6 +394,31 @@ export class StateStore {
     return row === undefined ? null : toMessageRecord(row);
   }
 
+  // The other messages of the same session the given message's turn
+  // answered, oldest first; none when the message has no turn.
+  async collectTurnSiblings(record: MessageRecord): Promise<MessageID[]> {
+    if (record.turn === undefined) {
+      return [];
+    }
+
+    const owner: MessageOwner =
+      record.agentSessionID === undefined
+        ? { atcID: record.atcID }
+        : { atcID: record.atcID, agentSessionID: record.agentSessionID };
+
+    const rows = await this.db
+      .selectFrom('messages')
+      .select('id')
+      .where('turn_id', '=', record.turn)
+      .where('id', '!=', record.id)
+      .where((eb) => buildOwnerFilter(eb, owner))
+      .orderBy('sent_at', 'asc')
+      .orderBy(sql`rowid`, 'asc')
+      .execute();
+
+    return rows.map((row) => toMessageID(row.id));
+  }
+
   async updateMessageDelivered(
     id: MessageID,
     owner: MessageOwner,
@@ -392,22 +436,30 @@ export class StateStore {
     return row === undefined ? null : toMessageRecord(row);
   }
 
-  async updateMessageAnswered(
-    id: MessageID,
+  // Answers every given message the owner holds unanswered in one statement,
+  // so a reader sees all of one turn's messages answered or none of them.
+  // Returns the messages it answered, oldest first.
+  async updateMessagesAnswered(
+    ids: readonly MessageID[],
     owner: MessageOwner,
     answer: string,
     at: number,
-  ): Promise<MessageRecord | null> {
-    const row = await this.db
+    turn: string | null = null,
+  ): Promise<MessageRecord[]> {
+    if (ids.length === 0) {
+      return [];
+    }
+
+    const rows = await this.db
       .updateTable('messages')
-      .set({ status: 'answered', answered_at: at, answer })
-      .where('id', '=', id)
+      .set({ status: 'answered', answered_at: at, answer, turn_id: turn })
+      .where('id', 'in', ids)
       .where('status', 'in', ['accepted', 'delivered'])
       .where((eb) => buildOwnerFilter(eb, owner))
       .returningAll()
-      .executeTakeFirst();
+      .execute();
 
-    return row === undefined ? null : toMessageRecord(row);
+    return rows.map((row) => toMessageRecord(row)).toSorted((a, b) => a.sentAt - b.sentAt);
   }
 
   // Messages sent before the agent reported its session id carry no agent
@@ -482,6 +534,20 @@ export class StateStore {
   }
 }
 
+function buildScopeMatch(
+  eb: ExpressionBuilder<StateStoreSchema, 'events'>, // oxlint-disable-line prefer-readonly-parameter-types -- a kysely expression builder bound to a live query; not meaningfully freezable
+  scope: EventScope | null,
+): Expression<SqlBool> {
+  if (scope === null) {
+    return eb.lit(true);
+  }
+
+  return eb.or([
+    eb('atc_id', '=', scope.atcID),
+    ...(scope.agentSessionID === undefined ? [] : [eb('session_id', '=', scope.agentSessionID)]),
+  ]);
+}
+
 interface EventRow {
   readonly id: number;
   readonly ts: string;
@@ -562,5 +628,6 @@ function toMessageRecord(row: Readonly<StateStoreSchema['messages']>): MessageRe
     ...(row.delivered_at === null ? {} : { deliveredAt: row.delivered_at }),
     ...(row.answered_at === null ? {} : { answeredAt: row.answered_at }),
     ...(row.answer === null ? {} : { answer: row.answer }),
+    ...(row.turn_id === null ? {} : { turn: row.turn_id }),
   };
 }