@agent-marshal/marshal-prime-agent 0.55.0 → 0.55.2

package/package.json

@@ -50,5 +50,5 @@
     "test": "bun test"
   },
   "type": "module",
-  "version": "0.55.0"
+  "version": "0.55.2"
 }

package/src/generated/Message.ts

@@ -26,28 +26,30 @@ export type Message = {
  * pull it. In the pull-via-hook model the recipient reads on its
  * next turn — which can be after the sender's SessionEnd — so
  * cascading on the sender would silently delete unread messages in
- * that window. The message's lifetime is governed by the *recipient*
- * instead (the `to_session_id` / `to_room_id` cascades below).
+ * that window. No recipient-session cascade either (see `to_session_id`).
  */
 fromSessionId: SessionId, 
 /**
  * Direct recipient — set for 1:1 sends, `None` for broadcasts.
- * Cascade-DELs the message when the recipient session is DEL'd.
+ * NOT a `belongs_to(Session)` cascade: a recipient's session row is DEL'd
+ * and re-SET under the same id on a reload, a resume or a reaped pull
+ * session's next hook, and its direct messages must still be there. A
+ * message lives until the daemon's TTL sweep prunes it.
  */
 toSessionId?: SessionId | null, 
 /**
  * Broadcast recipient — set for room sends, `None` for direct
  * sends. Cascade-DELs when the room is DEL'd. (Auto-rooms like
  * `everyone` and `host:*` are never DEL'd, so broadcasts to them
- * effectively persist forever.)
+ * persist until the daemon's TTL sweep prunes them.)
  */
 toRoomId?: RoomId | null, 
 /**
  * When this direct message was addressed to a *human* — via their operator
  * identity (the `op:`/`human:`/email tier of recipient resolution) rather
  * than to one specific agent — this holds that operator string (e.g.
- * `max@lucid.rocks`). The message is still routed to, and cascades on, the
- * operator's most-active session via `to_session_id`; this marks it as
+ * `max@lucid.rocks`). The message is still routed to the operator's
+ * most-active session via `to_session_id`; this marks it as
  * human-addressed so the receiving agent surfaces it to its operator
  * instead of treating it as ordinary peer chatter, and the UI console can
  * toast it for that operator regardless of which agent it landed on. `None`

package/src/generated/MessageRead.ts

@@ -3,7 +3,24 @@ import type { MessageId } from "./MessageId";
 import type { MessageReadId } from "./MessageReadId";
 import type { SessionId } from "./SessionId";
 
-export type MessageRead = { messageId: MessageId, sessionId: SessionId, 
+export type MessageRead = { 
+/**
+ * Cascade on the *message*: an ack is meaningless once its message is gone,
+ * so it dies with the message. This is the ack's primary lifetime owner.
+ * The TTL prune deletes messages without cascading, so the daemon's
+ * cleanup also sweeps acks whose message is gone (`sweep_orphan_reads`).
+ */
+messageId: MessageId, 
+/**
+ * NOT a `belongs_to(Session)` cascade: an ack is a fact about (message,
+ * reader) and outlives the reader's session row. Harnesses re-register
+ * under the same session id after a reload or resume (marshal-pi across
+ * `/reload`, the Claude shim on `--resume`, a pull session repaired after
+ * the reap backstop), so a session DEL is often a reconnect. Cascading
+ * here made every re-registration see the direct messages it had already
+ * read as unread, and the inbox handed them over again.
+ */
+sessionId: SessionId, 
 /**
  * Wall-clock millis when this session marked the message read.
  */

package/src/generated/Session.ts

@@ -127,4 +127,16 @@ project?: string | null,
  * channels OFF still can't render a push, so the message is queued to
  * the inbox (delivered_live = false) rather than claimed as live.
  */
-channelsEnabled?: boolean | null, id: SessionId, };
+channelsEnabled?: boolean | null, 
+/**
+ * Whether this session's client acks each live push itself, once it has
+ * passed it on (the Claude shim: once it has flushed it to Claude's
+ * stdin). When set, `SendMessage` leaves a pushed message unread until
+ * that ack instead of marking it read as soon as the push is handed to
+ * the connection, so a push lost before the client gets it (a connection
+ * that stops being read and then dies) comes back in the next inbox
+ * pull. What happens after the client's ack is past the daemon's view.
+ * `None` = a client that doesn't ack pushes; the daemon marks them read
+ * for it.
+ */
+acksPushes?: boolean | null, id: SessionId, };

package/src/generated/SessionQuery.ts

@@ -6,4 +6,4 @@ import type { SessionId } from "./SessionId";
 import type { StringFilter } from "./StringFilter";
 import type { Unfilterable } from "./Unfilterable";
 
-export type SessionQuery = { clientId?: IdFilter<ClientId> | null, pid?: NumericFilter<number> | null, cwd?: StringFilter | null, gitBranch?: StringFilter | null, currentTask?: StringFilter | null, sessionName?: StringFilter | null, activity?: StringFilter | null, kind?: StringFilter | null, connectedAt?: NumericFilter<bigint> | null, lastActivityAt?: NumericFilter<bigint> | null, lastTool?: StringFilter | null, lastToolAt?: NumericFilter<bigint> | null, operator?: StringFilter | null, host?: Unfilterable | null, project?: StringFilter | null, channelsEnabled?: boolean | null, id?: IdFilter<SessionId> | null, };
+export type SessionQuery = { clientId?: IdFilter<ClientId> | null, pid?: NumericFilter<number> | null, cwd?: StringFilter | null, gitBranch?: StringFilter | null, currentTask?: StringFilter | null, sessionName?: StringFilter | null, activity?: StringFilter | null, kind?: StringFilter | null, connectedAt?: NumericFilter<bigint> | null, lastActivityAt?: NumericFilter<bigint> | null, lastTool?: StringFilter | null, lastToolAt?: NumericFilter<bigint> | null, operator?: StringFilter | null, host?: Unfilterable | null, project?: StringFilter | null, channelsEnabled?: boolean | null, acksPushes?: boolean | null, id?: IdFilter<SessionId> | null, };

package/src/generated/index.ts

@@ -217,80 +217,80 @@ import type { SetSessionLastToolAt as _SetSessionLastToolAt } from "./SetSession
 import type { SetSessionSessionName as _SetSessionSessionName } from "./SetSessionSessionName";
 
 // Query classes
-export class GetSessionsByQuery {
-  static readonly queryId = "GetSessionsByQuery" as const;
-  static readonly queryItemType = "Session" as const;
-  readonly queryId = "GetSessionsByQuery" as const;
-  readonly queryItemType = "Session" as const;
-  readonly query: Omit<_GetSessionsByQuery, "tx" | "createdAt">;
-  declare readonly $res: () => Session[];
+export class GetSandboxRunsByQuery {
+  static readonly queryId = "GetSandboxRunsByQuery" as const;
+  static readonly queryItemType = "SandboxRun" as const;
+  readonly queryId = "GetSandboxRunsByQuery" as const;
+  readonly queryItemType = "SandboxRun" as const;
+  readonly query: Omit<_GetSandboxRunsByQuery, "tx" | "createdAt">;
+  declare readonly $res: () => SandboxRun[];
 
-  constructor(args: Omit<_GetSessionsByQuery, "tx" | "createdAt">) {
+  constructor(args: Omit<_GetSandboxRunsByQuery, "tx" | "createdAt">) {
     this.query = args;
   }
 }
 
-export class GetSessionsByIds {
-  static readonly queryId = "GetSessionsByIds" as const;
-  static readonly queryItemType = "Session" as const;
-  readonly queryId = "GetSessionsByIds" as const;
-  readonly queryItemType = "Session" as const;
-  readonly query: Omit<_GetSessionsByIds, "tx" | "createdAt">;
-  declare readonly $res: () => Session[];
+export class GetSandboxRunsByIds {
+  static readonly queryId = "GetSandboxRunsByIds" as const;
+  static readonly queryItemType = "SandboxRun" as const;
+  readonly queryId = "GetSandboxRunsByIds" as const;
+  readonly queryItemType = "SandboxRun" as const;
+  readonly query: Omit<_GetSandboxRunsByIds, "tx" | "createdAt">;
+  declare readonly $res: () => SandboxRun[];
 
-  constructor(args: Omit<_GetSessionsByIds, "tx" | "createdAt">) {
+  constructor(args: Omit<_GetSandboxRunsByIds, "tx" | "createdAt">) {
     this.query = args;
   }
 }
 
-export class GetAllSessions {
-  static readonly queryId = "GetAllSessions" as const;
-  static readonly queryItemType = "Session" as const;
-  readonly queryId = "GetAllSessions" as const;
-  readonly queryItemType = "Session" as const;
-  readonly query: Omit<_GetAllSessions, "tx" | "createdAt">;
-  declare readonly $res: () => Session[];
+export class GetAllSandboxRuns {
+  static readonly queryId = "GetAllSandboxRuns" as const;
+  static readonly queryItemType = "SandboxRun" as const;
+  readonly queryId = "GetAllSandboxRuns" as const;
+  readonly queryItemType = "SandboxRun" as const;
+  readonly query: Omit<_GetAllSandboxRuns, "tx" | "createdAt">;
+  declare readonly $res: () => SandboxRun[];
 
-  constructor(args: Omit<_GetAllSessions, "tx" | "createdAt">) {
+  constructor(args: Omit<_GetAllSandboxRuns, "tx" | "createdAt">) {
     this.query = args;
   }
 }
 
-export class GetMessageReadsByQuery {
-  static readonly queryId = "GetMessageReadsByQuery" as const;
-  static readonly queryItemType = "MessageRead" as const;
-  readonly queryId = "GetMessageReadsByQuery" as const;
-  readonly queryItemType = "MessageRead" as const;
-  readonly query: Omit<_GetMessageReadsByQuery, "tx" | "createdAt">;
-  declare readonly $res: () => MessageRead[];
+export class GetMessagesByQuery {
+  static readonly queryId = "GetMessagesByQuery" as const;
+  static readonly queryItemType = "Message" as const;
+  readonly queryId = "GetMessagesByQuery" as const;
+  readonly queryItemType = "Message" as const;
+  readonly query: Omit<_GetMessagesByQuery, "tx" | "createdAt">;
+  declare readonly $res: () => Message[];
 
-  constructor(args: Omit<_GetMessageReadsByQuery, "tx" | "createdAt">) {
+  constructor(args: Omit<_GetMessagesByQuery, "tx" | "createdAt">) {
     this.query = args;
   }
 }
 
-export class GetMessageReadsByIds {
-  static readonly queryId = "GetMessageReadsByIds" as const;
-  static readonly queryItemType = "MessageRead" as const;
-  readonly queryId = "GetMessageReadsByIds" as const;
-  readonly queryItemType = "MessageRead" as const;
-  readonly query: Omit<_GetMessageReadsByIds, "tx" | "createdAt">;
-  declare readonly $res: () => MessageRead[];
+export class GetMessagesByIds {
+  static readonly queryId = "GetMessagesByIds" as const;
+  static readonly queryItemType = "Message" as const;
+  readonly queryId = "GetMessagesByIds" as const;
+  readonly queryItemType = "Message" as const;
+  readonly query: Omit<_GetMessagesByIds, "tx" | "createdAt">;
+  declare readonly $res: () => Message[];
 
-  constructor(args: Omit<_GetMessageReadsByIds, "tx" | "createdAt">) {
+  constructor(args: Omit<_GetMessagesByIds, "tx" | "createdAt">) {
     this.query = args;
   }
 }
 
-export class GetAllMessageReads {
-  static readonly queryId = "GetAllMessageReads" as const;
-  static readonly queryItemType = "MessageRead" as const;
-  readonly queryId = "GetAllMessageReads" as const;
-  readonly queryItemType = "MessageRead" as const;
-  readonly query: Omit<_GetAllMessageReads, "tx" | "createdAt">;
-  declare readonly $res: () => MessageRead[];
+export class GetAllMessages {
+  static readonly queryId = "GetAllMessages" as const;
+  static readonly queryItemType = "Message" as const;
+  readonly queryId = "GetAllMessages" as const;
+  readonly queryItemType = "Message" as const;
+  readonly query: Omit<_GetAllMessages, "tx" | "createdAt">;
+  declare readonly $res: () => Message[];
 
-  constructor(args: Omit<_GetAllMessageReads, "tx" | "createdAt">) {
+  constructor(args: Omit<_GetAllMessages, "tx" | "createdAt">) {
     this.query = args;
   }
 }
@@ -412,80 +412,80 @@ export class GetAllRooms {
   }
 }
 
-export class GetSandboxRunsByQuery {
-  static readonly queryId = "GetSandboxRunsByQuery" as const;
-  static readonly queryItemType = "SandboxRun" as const;
-  readonly queryId = "GetSandboxRunsByQuery" as const;
-  readonly queryItemType = "SandboxRun" as const;
-  readonly query: Omit<_GetSandboxRunsByQuery, "tx" | "createdAt">;
-  declare readonly $res: () => SandboxRun[];
+export class GetSessionsByQuery {
+  static readonly queryId = "GetSessionsByQuery" as const;
+  static readonly queryItemType = "Session" as const;
+  readonly queryId = "GetSessionsByQuery" as const;
+  readonly queryItemType = "Session" as const;
+  readonly query: Omit<_GetSessionsByQuery, "tx" | "createdAt">;
+  declare readonly $res: () => Session[];
 
-  constructor(args: Omit<_GetSandboxRunsByQuery, "tx" | "createdAt">) {
+  constructor(args: Omit<_GetSessionsByQuery, "tx" | "createdAt">) {
     this.query = args;
   }
 }
 
-export class GetSandboxRunsByIds {
-  static readonly queryId = "GetSandboxRunsByIds" as const;
-  static readonly queryItemType = "SandboxRun" as const;
-  readonly queryId = "GetSandboxRunsByIds" as const;
-  readonly queryItemType = "SandboxRun" as const;
-  readonly query: Omit<_GetSandboxRunsByIds, "tx" | "createdAt">;
-  declare readonly $res: () => SandboxRun[];
+export class GetSessionsByIds {
+  static readonly queryId = "GetSessionsByIds" as const;
+  static readonly queryItemType = "Session" as const;
+  readonly queryId = "GetSessionsByIds" as const;
+  readonly queryItemType = "Session" as const;
+  readonly query: Omit<_GetSessionsByIds, "tx" | "createdAt">;
+  declare readonly $res: () => Session[];
 
-  constructor(args: Omit<_GetSandboxRunsByIds, "tx" | "createdAt">) {
+  constructor(args: Omit<_GetSessionsByIds, "tx" | "createdAt">) {
     this.query = args;
   }
 }
 
-export class GetAllSandboxRuns {
-  static readonly queryId = "GetAllSandboxRuns" as const;
-  static readonly queryItemType = "SandboxRun" as const;
-  readonly queryId = "GetAllSandboxRuns" as const;
-  readonly queryItemType = "SandboxRun" as const;
-  readonly query: Omit<_GetAllSandboxRuns, "tx" | "createdAt">;
-  declare readonly $res: () => SandboxRun[];
+export class GetAllSessions {
+  static readonly queryId = "GetAllSessions" as const;
+  static readonly queryItemType = "Session" as const;
+  readonly queryId = "GetAllSessions" as const;
+  readonly queryItemType = "Session" as const;
+  readonly query: Omit<_GetAllSessions, "tx" | "createdAt">;
+  declare readonly $res: () => Session[];
 
-  constructor(args: Omit<_GetAllSandboxRuns, "tx" | "createdAt">) {
+  constructor(args: Omit<_GetAllSessions, "tx" | "createdAt">) {
     this.query = args;
   }
 }
 
-export class GetMessagesByQuery {
-  static readonly queryId = "GetMessagesByQuery" as const;
-  static readonly queryItemType = "Message" as const;
-  readonly queryId = "GetMessagesByQuery" as const;
-  readonly queryItemType = "Message" as const;
-  readonly query: Omit<_GetMessagesByQuery, "tx" | "createdAt">;
-  declare readonly $res: () => Message[];
+export class GetMessageReadsByQuery {
+  static readonly queryId = "GetMessageReadsByQuery" as const;
+  static readonly queryItemType = "MessageRead" as const;
+  readonly queryId = "GetMessageReadsByQuery" as const;
+  readonly queryItemType = "MessageRead" as const;
+  readonly query: Omit<_GetMessageReadsByQuery, "tx" | "createdAt">;
+  declare readonly $res: () => MessageRead[];
 
-  constructor(args: Omit<_GetMessagesByQuery, "tx" | "createdAt">) {
+  constructor(args: Omit<_GetMessageReadsByQuery, "tx" | "createdAt">) {
     this.query = args;
   }
 }
 
-export class GetMessagesByIds {
-  static readonly queryId = "GetMessagesByIds" as const;
-  static readonly queryItemType = "Message" as const;
-  readonly queryId = "GetMessagesByIds" as const;
-  readonly queryItemType = "Message" as const;
-  readonly query: Omit<_GetMessagesByIds, "tx" | "createdAt">;
-  declare readonly $res: () => Message[];
+export class GetMessageReadsByIds {
+  static readonly queryId = "GetMessageReadsByIds" as const;
+  static readonly queryItemType = "MessageRead" as const;
+  readonly queryId = "GetMessageReadsByIds" as const;
+  readonly queryItemType = "MessageRead" as const;
+  readonly query: Omit<_GetMessageReadsByIds, "tx" | "createdAt">;
+  declare readonly $res: () => MessageRead[];
 
-  constructor(args: Omit<_GetMessagesByIds, "tx" | "createdAt">) {
+  constructor(args: Omit<_GetMessageReadsByIds, "tx" | "createdAt">) {
     this.query = args;
   }
 }
 
-export class GetAllMessages {
-  static readonly queryId = "GetAllMessages" as const;
-  static readonly queryItemType = "Message" as const;
-  readonly queryId = "GetAllMessages" as const;
-  readonly queryItemType = "Message" as const;
-  readonly query: Omit<_GetAllMessages, "tx" | "createdAt">;
-  declare readonly $res: () => Message[];
+export class GetAllMessageReads {
+  static readonly queryId = "GetAllMessageReads" as const;
+  static readonly queryItemType = "MessageRead" as const;
+  readonly queryId = "GetAllMessageReads" as const;
+  readonly queryItemType = "MessageRead" as const;
+  readonly query: Omit<_GetAllMessageReads, "tx" | "createdAt">;
+  declare readonly $res: () => MessageRead[];
 
-  constructor(args: Omit<_GetAllMessages, "tx" | "createdAt">) {
+  constructor(args: Omit<_GetAllMessageReads, "tx" | "createdAt">) {
     this.query = args;
   }
 }
@@ -493,68 +493,68 @@ export class GetAllMessages {
 // View classes
 
 // Report classes
-export class GetSessionById {
-  static readonly reportId = "GetSessionById" as const;
-  readonly reportId = "GetSessionById" as const;
-  readonly report: Omit<_GetSessionById, "tx">;
-  declare readonly $res: () => Session | null;
+export class GetSandboxRunById {
+  static readonly reportId = "GetSandboxRunById" as const;
+  readonly reportId = "GetSandboxRunById" as const;
+  readonly report: Omit<_GetSandboxRunById, "tx">;
+  declare readonly $res: () => SandboxRun | null;
 
-  constructor(args: Omit<_GetSessionById, "tx">) {
+  constructor(args: Omit<_GetSandboxRunById, "tx">) {
     this.report = args;
   }
 }
 
-export class CountSessions {
-  static readonly reportId = "CountSessions" as const;
-  readonly reportId = "CountSessions" as const;
-  readonly report: Omit<_CountSessions, "tx">;
-  declare readonly $res: () => SessionCount;
+export class CountSandboxRuns {
+  static readonly reportId = "CountSandboxRuns" as const;
+  readonly reportId = "CountSandboxRuns" as const;
+  readonly report: Omit<_CountSandboxRuns, "tx">;
+  declare readonly $res: () => SandboxRunCount;
 
-  constructor(args: Omit<_CountSessions, "tx">) {
+  constructor(args: Omit<_CountSandboxRuns, "tx">) {
     this.report = args;
   }
 }
 
-export class CountAllSessions {
-  static readonly reportId = "CountAllSessions" as const;
-  readonly reportId = "CountAllSessions" as const;
-  readonly report: Omit<_CountAllSessions, "tx">;
-  declare readonly $res: () => SessionCount;
+export class CountAllSandboxRuns {
+  static readonly reportId = "CountAllSandboxRuns" as const;
+  readonly reportId = "CountAllSandboxRuns" as const;
+  readonly report: Omit<_CountAllSandboxRuns, "tx">;
+  declare readonly $res: () => SandboxRunCount;
 
-  constructor(args: Omit<_CountAllSessions, "tx">) {
+  constructor(args: Omit<_CountAllSandboxRuns, "tx">) {
     this.report = args;
   }
 }
 
-export class GetMessageReadById {
-  static readonly reportId = "GetMessageReadById" as const;
-  readonly reportId = "GetMessageReadById" as const;
-  readonly report: Omit<_GetMessageReadById, "tx">;
-  declare readonly $res: () => MessageRead | null;
+export class GetMessageById {
+  static readonly reportId = "GetMessageById" as const;
+  readonly reportId = "GetMessageById" as const;
+  readonly report: Omit<_GetMessageById, "tx">;
+  declare readonly $res: () => Message | null;
 
-  constructor(args: Omit<_GetMessageReadById, "tx">) {
+  constructor(args: Omit<_GetMessageById, "tx">) {
     this.report = args;
   }
 }
 
-export class CountMessageReads {
-  static readonly reportId = "CountMessageReads" as const;
-  readonly reportId = "CountMessageReads" as const;
-  readonly report: Omit<_CountMessageReads, "tx">;
-  declare readonly $res: () => MessageReadCount;
+export class CountMessages {
+  static readonly reportId = "CountMessages" as const;
+  readonly reportId = "CountMessages" as const;
+  readonly report: Omit<_CountMessages, "tx">;
+  declare readonly $res: () => MessageCount;
 
-  constructor(args: Omit<_CountMessageReads, "tx">) {
+  constructor(args: Omit<_CountMessages, "tx">) {
     this.report = args;
   }
 }
 
-export class CountAllMessageReads {
-  static readonly reportId = "CountAllMessageReads" as const;
-  readonly reportId = "CountAllMessageReads" as const;
-  readonly report: Omit<_CountAllMessageReads, "tx">;
-  declare readonly $res: () => MessageReadCount;
+export class CountAllMessages {
+  static readonly reportId = "CountAllMessages" as const;
+  readonly reportId = "CountAllMessages" as const;
+  readonly report: Omit<_CountAllMessages, "tx">;
+  declare readonly $res: () => MessageCount;
 
-  constructor(args: Omit<_CountAllMessageReads, "tx">) {
+  constructor(args: Omit<_CountAllMessages, "tx">) {
     this.report = args;
   }
 }
@@ -658,212 +658,135 @@ export class CountAllRooms {
   }
 }
 
-export class GetSandboxRunById {
-  static readonly reportId = "GetSandboxRunById" as const;
-  readonly reportId = "GetSandboxRunById" as const;
-  readonly report: Omit<_GetSandboxRunById, "tx">;
-  declare readonly $res: () => SandboxRun | null;
+export class GetSessionById {
+  static readonly reportId = "GetSessionById" as const;
+  readonly reportId = "GetSessionById" as const;
+  readonly report: Omit<_GetSessionById, "tx">;
+  declare readonly $res: () => Session | null;
 
-  constructor(args: Omit<_GetSandboxRunById, "tx">) {
+  constructor(args: Omit<_GetSessionById, "tx">) {
     this.report = args;
   }
 }
 
-export class CountSandboxRuns {
-  static readonly reportId = "CountSandboxRuns" as const;
-  readonly reportId = "CountSandboxRuns" as const;
-  readonly report: Omit<_CountSandboxRuns, "tx">;
-  declare readonly $res: () => SandboxRunCount;
+export class CountSessions {
+  static readonly reportId = "CountSessions" as const;
+  readonly reportId = "CountSessions" as const;
+  readonly report: Omit<_CountSessions, "tx">;
+  declare readonly $res: () => SessionCount;
 
-  constructor(args: Omit<_CountSandboxRuns, "tx">) {
+  constructor(args: Omit<_CountSessions, "tx">) {
     this.report = args;
   }
 }
 
-export class CountAllSandboxRuns {
-  static readonly reportId = "CountAllSandboxRuns" as const;
-  readonly reportId = "CountAllSandboxRuns" as const;
-  readonly report: Omit<_CountAllSandboxRuns, "tx">;
-  declare readonly $res: () => SandboxRunCount;
+export class CountAllSessions {
+  static readonly reportId = "CountAllSessions" as const;
+  readonly reportId = "CountAllSessions" as const;
+  readonly report: Omit<_CountAllSessions, "tx">;
+  declare readonly $res: () => SessionCount;
 
-  constructor(args: Omit<_CountAllSandboxRuns, "tx">) {
+  constructor(args: Omit<_CountAllSessions, "tx">) {
     this.report = args;
   }
 }
 
-export class GetMessageById {
-  static readonly reportId = "GetMessageById" as const;
-  readonly reportId = "GetMessageById" as const;
-  readonly report: Omit<_GetMessageById, "tx">;
-  declare readonly $res: () => Message | null;
+export class GetMessageReadById {
+  static readonly reportId = "GetMessageReadById" as const;
+  readonly reportId = "GetMessageReadById" as const;
+  readonly report: Omit<_GetMessageReadById, "tx">;
+  declare readonly $res: () => MessageRead | null;
 
-  constructor(args: Omit<_GetMessageById, "tx">) {
+  constructor(args: Omit<_GetMessageReadById, "tx">) {
     this.report = args;
   }
 }
 
-export class CountMessages {
-  static readonly reportId = "CountMessages" as const;
-  readonly reportId = "CountMessages" as const;
-  readonly report: Omit<_CountMessages, "tx">;
-  declare readonly $res: () => MessageCount;
+export class CountMessageReads {
+  static readonly reportId = "CountMessageReads" as const;
+  readonly reportId = "CountMessageReads" as const;
+  readonly report: Omit<_CountMessageReads, "tx">;
+  declare readonly $res: () => MessageReadCount;
 
-  constructor(args: Omit<_CountMessages, "tx">) {
+  constructor(args: Omit<_CountMessageReads, "tx">) {
     this.report = args;
   }
 }
 
-export class CountAllMessages {
-  static readonly reportId = "CountAllMessages" as const;
-  readonly reportId = "CountAllMessages" as const;
-  readonly report: Omit<_CountAllMessages, "tx">;
-  declare readonly $res: () => MessageCount;
+export class CountAllMessageReads {
+  static readonly reportId = "CountAllMessageReads" as const;
+  readonly reportId = "CountAllMessageReads" as const;
+  readonly report: Omit<_CountAllMessageReads, "tx">;
+  declare readonly $res: () => MessageReadCount;
 
-  constructor(args: Omit<_CountAllMessages, "tx">) {
+  constructor(args: Omit<_CountAllMessageReads, "tx">) {
     this.report = args;
   }
 }
 
 // Command classes
-export class BroadcastMessage {
-  static readonly commandId = "BroadcastMessage" as const;
-  readonly commandId = "BroadcastMessage" as const;
-  readonly command: Omit<_BroadcastMessage, "tx" | "createdAt">;
-  declare readonly $res: () => BroadcastMessageResult;
-
-  constructor(args: Omit<_BroadcastMessage, "tx" | "createdAt">) {
-    this.command = args;
-  }
-}
-
-export class SendMessage {
-  static readonly commandId = "SendMessage" as const;
-  readonly commandId = "SendMessage" as const;
-  readonly command: Omit<_SendMessage, "tx" | "createdAt">;
-  declare readonly $res: () => SendMessageResult;
-
-  constructor(args: Omit<_SendMessage, "tx" | "createdAt">) {
-    this.command = args;
-  }
-}
-
-export class SetSessionLastToolAt {
-  static readonly commandId = "SetSessionLastToolAt" as const;
-  readonly commandId = "SetSessionLastToolAt" as const;
-  readonly command: Omit<_SetSessionLastToolAt, "tx" | "createdAt">;
-  declare readonly $res: () => void;
-
-  constructor(args: Omit<_SetSessionLastToolAt, "tx" | "createdAt">) {
-    this.command = args;
-  }
-}
-
-export class SetSessionLastTool {
-  static readonly commandId = "SetSessionLastTool" as const;
-  readonly commandId = "SetSessionLastTool" as const;
-  readonly command: Omit<_SetSessionLastTool, "tx" | "createdAt">;
-  declare readonly $res: () => void;
-
-  constructor(args: Omit<_SetSessionLastTool, "tx" | "createdAt">) {
-    this.command = args;
-  }
-}
-
-export class SetSessionLastActivityAt {
-  static readonly commandId = "SetSessionLastActivityAt" as const;
-  readonly commandId = "SetSessionLastActivityAt" as const;
-  readonly command: Omit<_SetSessionLastActivityAt, "tx" | "createdAt">;
-  declare readonly $res: () => void;
+export class ImportSandboxRun {
+  static readonly commandId = "ImportSandboxRun" as const;
+  readonly commandId = "ImportSandboxRun" as const;
+  readonly command: Omit<_ImportSandboxRun, "tx" | "createdAt">;
+  declare readonly $res: () => SandboxRunId;
 
-  constructor(args: Omit<_SetSessionLastActivityAt, "tx" | "createdAt">) {
+  constructor(args: Omit<_ImportSandboxRun, "tx" | "createdAt">) {
     this.command = args;
   }
 }
 
-export class SetSessionGitBranch {
-  static readonly commandId = "SetSessionGitBranch" as const;
-  readonly commandId = "SetSessionGitBranch" as const;
-  readonly command: Omit<_SetSessionGitBranch, "tx" | "createdAt">;
-  declare readonly $res: () => void;
+export class DeleteSandboxRuns {
+  static readonly commandId = "DeleteSandboxRuns" as const;
+  readonly commandId = "DeleteSandboxRuns" as const;
+  readonly command: Omit<_DeleteSandboxRuns, "tx" | "createdAt">;
+  declare readonly $res: () => DeleteSandboxRunsResult;
 
-  constructor(args: Omit<_SetSessionGitBranch, "tx" | "createdAt">) {
+  constructor(args: Omit<_DeleteSandboxRuns, "tx" | "createdAt">) {
     this.command = args;
   }
 }
 
-export class DeleteSessions {
-  static readonly commandId = "DeleteSessions" as const;
-  readonly commandId = "DeleteSessions" as const;
-  readonly command: Omit<_DeleteSessions, "tx" | "createdAt">;
-  declare readonly $res: () => DeleteSessionsResult;
+export class DeleteSandboxRun {
+  static readonly commandId = "DeleteSandboxRun" as const;
+  readonly commandId = "DeleteSandboxRun" as const;
+  readonly command: Omit<_DeleteSandboxRun, "tx" | "createdAt">;
+  declare readonly $res: () => DeleteSandboxRunResult;
 
-  constructor(args: Omit<_DeleteSessions, "tx" | "createdAt">) {
+  constructor(args: Omit<_DeleteSandboxRun, "tx" | "createdAt">) {
     this.command = args;
   }
 }
 
-export class SetSessionActivity {
-  static readonly commandId = "SetSessionActivity" as const;
-  readonly commandId = "SetSessionActivity" as const;
-  readonly command: Omit<_SetSessionActivity, "tx" | "createdAt">;
-  declare readonly $res: () => void;
+export class DeleteMessage {
+  static readonly commandId = "DeleteMessage" as const;
+  readonly commandId = "DeleteMessage" as const;
+  readonly command: Omit<_DeleteMessage, "tx" | "createdAt">;
+  declare readonly $res: () => DeleteMessageResult;
 
-  constructor(args: Omit<_SetSessionActivity, "tx" | "createdAt">) {
+  constructor(args: Omit<_DeleteMessage, "tx" | "createdAt">) {
     this.command = args;
   }
 }
 
-export class SetSessionSessionName {
-  static readonly commandId = "SetSessionSessionName" as const;
-  readonly commandId = "SetSessionSessionName" as const;
-  readonly command: Omit<_SetSessionSessionName, "tx" | "createdAt">;
-  declare readonly $res: () => void;
+export class DeleteMessages {
+  static readonly commandId = "DeleteMessages" as const;
+  readonly commandId = "DeleteMessages" as const;
+  readonly command: Omit<_DeleteMessages, "tx" | "createdAt">;
+  declare readonly $res: () => DeleteMessagesResult;
 
-  constructor(args: Omit<_SetSessionSessionName, "tx" | "createdAt">) {
+  constructor(args: Omit<_DeleteMessages, "tx" | "createdAt">) {
     this.command = args;
   }
 }
 
-export class SetSessionCurrentTask {
-  static readonly commandId = "SetSessionCurrentTask" as const;
-  readonly commandId = "SetSessionCurrentTask" as const;
-  readonly command: Omit<_SetSessionCurrentTask, "tx" | "createdAt">;
+export class NotifyChannel {
+  static readonly commandId = "NotifyChannel" as const;
+  readonly commandId = "NotifyChannel" as const;
+  readonly command: Omit<_NotifyChannel, "tx" | "createdAt">;
   declare readonly $res: () => void;
 
-  constructor(args: Omit<_SetSessionCurrentTask, "tx" | "createdAt">) {
-    this.command = args;
-  }
-}
-
-export class DeleteSession {
-  static readonly commandId = "DeleteSession" as const;
-  readonly commandId = "DeleteSession" as const;
-  readonly command: Omit<_DeleteSession, "tx" | "createdAt">;
-  declare readonly $res: () => DeleteSessionResult;
-
-  constructor(args: Omit<_DeleteSession, "tx" | "createdAt">) {
-    this.command = args;
-  }
-}
-
-export class DeleteMessageRead {
-  static readonly commandId = "DeleteMessageRead" as const;
-  readonly commandId = "DeleteMessageRead" as const;
-  readonly command: Omit<_DeleteMessageRead, "tx" | "createdAt">;
-  declare readonly $res: () => DeleteMessageReadResult;
-
-  constructor(args: Omit<_DeleteMessageRead, "tx" | "createdAt">) {
-    this.command = args;
-  }
-}
-
-export class DeleteMessageReads {
-  static readonly commandId = "DeleteMessageReads" as const;
-  readonly commandId = "DeleteMessageReads" as const;
-  readonly command: Omit<_DeleteMessageReads, "tx" | "createdAt">;
-  declare readonly $res: () => DeleteMessageReadsResult;
-
-  constructor(args: Omit<_DeleteMessageReads, "tx" | "createdAt">) {
+  constructor(args: Omit<_NotifyChannel, "tx" | "createdAt">) {
     this.command = args;
   }
 }
@@ -989,92 +912,169 @@ export class DeleteRooms {
   }
 }
 
-export class ReadMessages {
-  static readonly commandId = "ReadMessages" as const;
-  readonly commandId = "ReadMessages" as const;
-  readonly command: Omit<_ReadMessages, "tx" | "createdAt">;
-  declare readonly $res: () => ReadMessagesResult;
+export class SetSessionLastToolAt {
+  static readonly commandId = "SetSessionLastToolAt" as const;
+  readonly commandId = "SetSessionLastToolAt" as const;
+  readonly command: Omit<_SetSessionLastToolAt, "tx" | "createdAt">;
+  declare readonly $res: () => void;
 
-  constructor(args: Omit<_ReadMessages, "tx" | "createdAt">) {
+  constructor(args: Omit<_SetSessionLastToolAt, "tx" | "createdAt">) {
     this.command = args;
   }
 }
 
-export class ImportSandboxRun {
-  static readonly commandId = "ImportSandboxRun" as const;
-  readonly commandId = "ImportSandboxRun" as const;
-  readonly command: Omit<_ImportSandboxRun, "tx" | "createdAt">;
-  declare readonly $res: () => SandboxRunId;
+export class SetSessionLastTool {
+  static readonly commandId = "SetSessionLastTool" as const;
+  readonly commandId = "SetSessionLastTool" as const;
+  readonly command: Omit<_SetSessionLastTool, "tx" | "createdAt">;
+  declare readonly $res: () => void;
 
-  constructor(args: Omit<_ImportSandboxRun, "tx" | "createdAt">) {
+  constructor(args: Omit<_SetSessionLastTool, "tx" | "createdAt">) {
     this.command = args;
   }
 }
 
-export class DeleteSandboxRuns {
-  static readonly commandId = "DeleteSandboxRuns" as const;
-  readonly commandId = "DeleteSandboxRuns" as const;
-  readonly command: Omit<_DeleteSandboxRuns, "tx" | "createdAt">;
-  declare readonly $res: () => DeleteSandboxRunsResult;
+export class SetSessionLastActivityAt {
+  static readonly commandId = "SetSessionLastActivityAt" as const;
+  readonly commandId = "SetSessionLastActivityAt" as const;
+  readonly command: Omit<_SetSessionLastActivityAt, "tx" | "createdAt">;
+  declare readonly $res: () => void;
 
-  constructor(args: Omit<_DeleteSandboxRuns, "tx" | "createdAt">) {
+  constructor(args: Omit<_SetSessionLastActivityAt, "tx" | "createdAt">) {
     this.command = args;
   }
 }
 
-export class DeleteSandboxRun {
-  static readonly commandId = "DeleteSandboxRun" as const;
-  readonly commandId = "DeleteSandboxRun" as const;
-  readonly command: Omit<_DeleteSandboxRun, "tx" | "createdAt">;
-  declare readonly $res: () => DeleteSandboxRunResult;
+export class SetSessionGitBranch {
+  static readonly commandId = "SetSessionGitBranch" as const;
+  readonly commandId = "SetSessionGitBranch" as const;
+  readonly command: Omit<_SetSessionGitBranch, "tx" | "createdAt">;
+  declare readonly $res: () => void;
 
-  constructor(args: Omit<_DeleteSandboxRun, "tx" | "createdAt">) {
+  constructor(args: Omit<_SetSessionGitBranch, "tx" | "createdAt">) {
     this.command = args;
   }
 }
 
-export class DeleteMessage {
-  static readonly commandId = "DeleteMessage" as const;
-  readonly commandId = "DeleteMessage" as const;
-  readonly command: Omit<_DeleteMessage, "tx" | "createdAt">;
-  declare readonly $res: () => DeleteMessageResult;
+export class DeleteSessions {
+  static readonly commandId = "DeleteSessions" as const;
+  readonly commandId = "DeleteSessions" as const;
+  readonly command: Omit<_DeleteSessions, "tx" | "createdAt">;
+  declare readonly $res: () => DeleteSessionsResult;
 
-  constructor(args: Omit<_DeleteMessage, "tx" | "createdAt">) {
+  constructor(args: Omit<_DeleteSessions, "tx" | "createdAt">) {
     this.command = args;
   }
 }
 
-export class DeleteMessages {
-  static readonly commandId = "DeleteMessages" as const;
-  readonly commandId = "DeleteMessages" as const;
-  readonly command: Omit<_DeleteMessages, "tx" | "createdAt">;
-  declare readonly $res: () => DeleteMessagesResult;
+export class SetSessionActivity {
+  static readonly commandId = "SetSessionActivity" as const;
+  readonly commandId = "SetSessionActivity" as const;
+  readonly command: Omit<_SetSessionActivity, "tx" | "createdAt">;
+  declare readonly $res: () => void;
 
-  constructor(args: Omit<_DeleteMessages, "tx" | "createdAt">) {
+  constructor(args: Omit<_SetSessionActivity, "tx" | "createdAt">) {
     this.command = args;
   }
 }
 
-export class NotifyChannel {
-  static readonly commandId = "NotifyChannel" as const;
-  readonly commandId = "NotifyChannel" as const;
-  readonly command: Omit<_NotifyChannel, "tx" | "createdAt">;
+export class SetSessionSessionName {
+  static readonly commandId = "SetSessionSessionName" as const;
+  readonly commandId = "SetSessionSessionName" as const;
+  readonly command: Omit<_SetSessionSessionName, "tx" | "createdAt">;
   declare readonly $res: () => void;
 
-  constructor(args: Omit<_NotifyChannel, "tx" | "createdAt">) {
+  constructor(args: Omit<_SetSessionSessionName, "tx" | "createdAt">) {
+    this.command = args;
+  }
+}
+
+export class SetSessionCurrentTask {
+  static readonly commandId = "SetSessionCurrentTask" as const;
+  readonly commandId = "SetSessionCurrentTask" as const;
+  readonly command: Omit<_SetSessionCurrentTask, "tx" | "createdAt">;
+  declare readonly $res: () => void;
+
+  constructor(args: Omit<_SetSessionCurrentTask, "tx" | "createdAt">) {
+    this.command = args;
+  }
+}
+
+export class DeleteSession {
+  static readonly commandId = "DeleteSession" as const;
+  readonly commandId = "DeleteSession" as const;
+  readonly command: Omit<_DeleteSession, "tx" | "createdAt">;
+  declare readonly $res: () => DeleteSessionResult;
+
+  constructor(args: Omit<_DeleteSession, "tx" | "createdAt">) {
+    this.command = args;
+  }
+}
+
+export class ReadMessages {
+  static readonly commandId = "ReadMessages" as const;
+  readonly commandId = "ReadMessages" as const;
+  readonly command: Omit<_ReadMessages, "tx" | "createdAt">;
+  declare readonly $res: () => ReadMessagesResult;
+
+  constructor(args: Omit<_ReadMessages, "tx" | "createdAt">) {
+    this.command = args;
+  }
+}
+
+export class DeleteMessageRead {
+  static readonly commandId = "DeleteMessageRead" as const;
+  readonly commandId = "DeleteMessageRead" as const;
+  readonly command: Omit<_DeleteMessageRead, "tx" | "createdAt">;
+  declare readonly $res: () => DeleteMessageReadResult;
+
+  constructor(args: Omit<_DeleteMessageRead, "tx" | "createdAt">) {
+    this.command = args;
+  }
+}
+
+export class DeleteMessageReads {
+  static readonly commandId = "DeleteMessageReads" as const;
+  readonly commandId = "DeleteMessageReads" as const;
+  readonly command: Omit<_DeleteMessageReads, "tx" | "createdAt">;
+  declare readonly $res: () => DeleteMessageReadsResult;
+
+  constructor(args: Omit<_DeleteMessageReads, "tx" | "createdAt">) {
+    this.command = args;
+  }
+}
+
+export class BroadcastMessage {
+  static readonly commandId = "BroadcastMessage" as const;
+  readonly commandId = "BroadcastMessage" as const;
+  readonly command: Omit<_BroadcastMessage, "tx" | "createdAt">;
+  declare readonly $res: () => BroadcastMessageResult;
+
+  constructor(args: Omit<_BroadcastMessage, "tx" | "createdAt">) {
+    this.command = args;
+  }
+}
+
+export class SendMessage {
+  static readonly commandId = "SendMessage" as const;
+  readonly commandId = "SendMessage" as const;
+  readonly command: Omit<_SendMessage, "tx" | "createdAt">;
+  declare readonly $res: () => SendMessageResult;
+
+  constructor(args: Omit<_SendMessage, "tx" | "createdAt">) {
     this.command = args;
   }
 }
 
 // Item constructors
 export const items = {
-  Session: (args: Session) => ({ item: args, itemType: "Session" }),
-  MessageRead: (args: MessageRead) => ({ item: args, itemType: "MessageRead" }),
+  SandboxRun: (args: SandboxRun) => ({ item: args, itemType: "SandboxRun" }),
+  Message: (args: Message) => ({ item: args, itemType: "Message" }),
   SessionNickname: (args: SessionNickname) => ({ item: args, itemType: "SessionNickname" }),
   RoomMember: (args: RoomMember) => ({ item: args, itemType: "RoomMember" }),
   Room: (args: Room) => ({ item: args, itemType: "Room" }),
-  SandboxRun: (args: SandboxRun) => ({ item: args, itemType: "SandboxRun" }),
-  Message: (args: Message) => ({ item: args, itemType: "Message" }),
+  Session: (args: Session) => ({ item: args, itemType: "Session" }),
+  MessageRead: (args: MessageRead) => ({ item: args, itemType: "MessageRead" }),
 };
 
 // Message events