@cydm/happy-elves 0.1.0-beta.31 → 0.1.0-beta.310

package/apps/relay/dist/db.js

@@ -63,6 +63,10 @@ export function initDb(db) {
       encrypted_metadata TEXT,
       current_head TEXT,
       last_turn_id TEXT,
+      head_basis_event_id INTEGER,
+      head_basis_message_id TEXT,
+      head_basis_logical_time INTEGER,
+      head_basis_turn_seq INTEGER,
       source_session_id TEXT,
       source_checkpoint_id TEXT,
       created_at INTEGER NOT NULL,
@@ -112,6 +116,41 @@ export function initDb(db) {
       FOREIGN KEY (machine_id) REFERENCES machines(id) ON DELETE CASCADE
     );
 
+    CREATE TABLE IF NOT EXISTS session_runtime_bindings (
+      account_id TEXT NOT NULL,
+      machine_id TEXT NOT NULL,
+      agent TEXT NOT NULL,
+      runtime_session_id TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      status TEXT NOT NULL,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      PRIMARY KEY (account_id, machine_id, agent, runtime_session_id),
+      FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE,
+      FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE,
+      FOREIGN KEY (machine_id) REFERENCES machines(id) ON DELETE CASCADE
+    );
+
+    CREATE TABLE IF NOT EXISTS pending_session_head_advances (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      account_id TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      machine_id TEXT NOT NULL,
+      message_id TEXT,
+      current_head TEXT NOT NULL,
+      last_turn_id TEXT NOT NULL,
+      basis_turn_id TEXT NOT NULL,
+      basis_event_message_id TEXT NOT NULL,
+      basis_turn_seq INTEGER NOT NULL,
+      basis_occurred_at INTEGER,
+      encrypted_metadata TEXT,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE,
+      FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE,
+      FOREIGN KEY (machine_id) REFERENCES machines(id) ON DELETE CASCADE
+    );
+
     CREATE TABLE IF NOT EXISTS command_results (
       account_id TEXT NOT NULL,
       request_id TEXT NOT NULL,
@@ -121,35 +160,182 @@ export function initDb(db) {
       FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE
     );
 
+    CREATE TABLE IF NOT EXISTS relay_admissions (
+      account_id TEXT NOT NULL,
+      request_id TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      machine_id TEXT NOT NULL,
+      kind TEXT NOT NULL,
+      turn_id TEXT,
+      admission TEXT NOT NULL,
+      dispatch TEXT NOT NULL,
+      started_at INTEGER,
+      finished_at INTEGER,
+      terminal_status TEXT,
+      last_error_code TEXT,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      PRIMARY KEY (account_id, request_id),
+      FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE,
+      FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE,
+      FOREIGN KEY (machine_id) REFERENCES machines(id) ON DELETE CASCADE
+    );
+
+    CREATE TABLE IF NOT EXISTS relay_session_claims (
+      account_id TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      request_id TEXT NOT NULL,
+      machine_id TEXT NOT NULL,
+      turn_id TEXT NOT NULL,
+      command_type TEXT NOT NULL,
+      state TEXT NOT NULL,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      PRIMARY KEY (account_id, session_id),
+      FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE,
+      FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE,
+      FOREIGN KEY (machine_id) REFERENCES machines(id) ON DELETE CASCADE
+    );
+
+    CREATE TABLE IF NOT EXISTS relay_dispatch_outbox (
+      account_id TEXT NOT NULL,
+      request_id TEXT NOT NULL,
+      machine_id TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      command_type TEXT NOT NULL,
+      message TEXT NOT NULL,
+      state TEXT NOT NULL,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      delivered_at INTEGER,
+      PRIMARY KEY (account_id, request_id),
+      FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE,
+      FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE,
+      FOREIGN KEY (machine_id) REFERENCES machines(id) ON DELETE CASCADE
+    );
+
+    CREATE TABLE IF NOT EXISTS session_stars (
+      account_id TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      starred_at INTEGER NOT NULL,
+      PRIMARY KEY (account_id, session_id),
+      FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE,
+      FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE
+    );
+
+    CREATE TABLE IF NOT EXISTS account_recent_sessions (
+      account_id TEXT NOT NULL,
+      session_id TEXT NOT NULL,
+      last_selected_at INTEGER NOT NULL,
+      PRIMARY KEY (account_id, session_id),
+      FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE,
+      FOREIGN KEY (session_id) REFERENCES sessions(id) ON DELETE CASCADE
+    );
+
+    CREATE TABLE IF NOT EXISTS account_workspace_cwd_pins (
+      account_id TEXT NOT NULL,
+      machine_id TEXT NOT NULL,
+      cwd TEXT NOT NULL,
+      label TEXT,
+      pinned_at INTEGER NOT NULL,
+      PRIMARY KEY (account_id, machine_id, cwd),
+      FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE
+    );
+
+    CREATE TABLE IF NOT EXISTS account_project_preferences (
+      account_id TEXT NOT NULL,
+      project_key TEXT NOT NULL,
+      machine_id TEXT,
+      cwd TEXT,
+      agent TEXT,
+      memory_mode TEXT,
+      updated_at INTEGER NOT NULL,
+      PRIMARY KEY (account_id, project_key),
+      FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE
+    );
+
+    CREATE TABLE IF NOT EXISTS account_memories (
+      id TEXT PRIMARY KEY,
+      account_id TEXT NOT NULL,
+      project_key TEXT NOT NULL,
+      encrypted_memory TEXT NOT NULL,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL,
+      FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE
+    );
+
+    CREATE TABLE IF NOT EXISTS account_memory_settings (
+      account_id TEXT NOT NULL,
+      project_key TEXT NOT NULL,
+      disabled INTEGER NOT NULL DEFAULT 0,
+      injection_enabled INTEGER NOT NULL DEFAULT 0,
+      updated_at INTEGER NOT NULL,
+      PRIMARY KEY (account_id, project_key),
+      FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE
+    );
+
     CREATE INDEX IF NOT EXISTS idx_machines_account ON machines(account_id);
     CREATE INDEX IF NOT EXISTS idx_sessions_account ON sessions(account_id, updated_at DESC);
     CREATE INDEX IF NOT EXISTS idx_events_account ON session_events(account_id, id DESC);
     CREATE INDEX IF NOT EXISTS idx_events_session ON session_events(session_id, id);
     CREATE INDEX IF NOT EXISTS idx_turn_aliases_runtime
       ON session_turn_aliases(account_id, session_id, runtime_turn_id);
+    CREATE INDEX IF NOT EXISTS idx_runtime_bindings_session
+      ON session_runtime_bindings(account_id, session_id);
+    CREATE INDEX IF NOT EXISTS idx_pending_head_session
+      ON pending_session_head_advances(account_id, session_id, machine_id);
     CREATE INDEX IF NOT EXISTS idx_command_results_created ON command_results(created_at);
+    CREATE INDEX IF NOT EXISTS idx_relay_admissions_session ON relay_admissions(account_id, session_id);
+    CREATE INDEX IF NOT EXISTS idx_relay_session_claims_request ON relay_session_claims(account_id, request_id);
+    CREATE INDEX IF NOT EXISTS idx_relay_outbox_machine_state ON relay_dispatch_outbox(account_id, machine_id, state, created_at);
     CREATE INDEX IF NOT EXISTS idx_controller_invites_account ON controller_invites(account_id, created_at DESC);
+    CREATE INDEX IF NOT EXISTS idx_session_stars_account ON session_stars(account_id, starred_at DESC);
+    CREATE INDEX IF NOT EXISTS idx_recent_sessions_account ON account_recent_sessions(account_id, last_selected_at DESC);
+    CREATE INDEX IF NOT EXISTS idx_workspace_cwd_pins_account ON account_workspace_cwd_pins(account_id, pinned_at DESC);
+    CREATE INDEX IF NOT EXISTS idx_memories_account_project ON account_memories(account_id, project_key, updated_at DESC);
   `);
     ensureColumn(db, "sessions", "current_head", "TEXT");
     ensureColumn(db, "sessions", "last_turn_id", "TEXT");
+    ensureColumn(db, "sessions", "head_basis_event_id", "INTEGER");
+    ensureColumn(db, "sessions", "head_basis_message_id", "TEXT");
+    ensureColumn(db, "sessions", "head_basis_logical_time", "INTEGER");
+    ensureColumn(db, "sessions", "head_basis_turn_seq", "INTEGER");
     ensureColumn(db, "sessions", "source_session_id", "TEXT");
     ensureColumn(db, "sessions", "source_checkpoint_id", "TEXT");
     ensureColumn(db, "session_events", "message_id", "TEXT");
     ensureColumn(db, "session_events", "turn_seq", "INTEGER");
     ensureColumn(db, "session_events", "occurred_at", "INTEGER");
+    ensureColumn(db, "relay_admissions", "started_at", "INTEGER");
+    ensureColumn(db, "relay_admissions", "finished_at", "INTEGER");
+    ensureColumn(db, "relay_admissions", "terminal_status", "TEXT");
+    ensureColumn(db, "relay_admissions", "last_error_code", "TEXT");
+    ensureColumn(db, "relay_dispatch_outbox", "message", "TEXT");
+    ensureColumn(db, "relay_dispatch_outbox", "command_type", "TEXT");
+    ensureColumn(db, "relay_dispatch_outbox", "delivered_at", "INTEGER");
     ensureColumn(db, "tokens", "device_name", "TEXT");
     ensureColumn(db, "tokens", "revoked_at", "INTEGER");
     ensureColumn(db, "tokens", "expires_at", "INTEGER");
     ensureColumn(db, "tokens", "scope", "TEXT");
+    ensureColumn(db, "tokens", "last_seen", "INTEGER");
+    ensureColumn(db, "account_project_preferences", "memory_mode", "TEXT");
     ensureColumn(db, "controller_invites", "created_by_device_id", "TEXT");
     ensureColumn(db, "controller_invites", "requested_device_name", "TEXT");
     ensureColumn(db, "controller_invites", "consumed_by_device_id", "TEXT");
     ensureColumn(db, "controller_invites", "revoked_at", "INTEGER");
+    ensureCommandResultsAccountRequestConflictTarget(db);
     db.exec(`
+    CREATE UNIQUE INDEX IF NOT EXISTS idx_command_results_account_request_unique
+      ON command_results(account_id, request_id);
     CREATE UNIQUE INDEX IF NOT EXISTS idx_events_machine_message
       ON session_events(account_id, machine_id, message_id)
       WHERE message_id IS NOT NULL;
+    CREATE UNIQUE INDEX IF NOT EXISTS idx_pending_head_machine_message
+      ON pending_session_head_advances(account_id, machine_id, message_id)
+      WHERE message_id IS NOT NULL;
   `);
+    repairHistoricalEventTimestamps(db);
+    backfillRelayDispatchOutboxCommandType(db);
+    restoreDurableSessionClaims(db);
 }
 export function pruneRelayRetention(db, now, config) {
     if (config.commandResultRetentionMs > 0) {
@@ -160,9 +346,117 @@ export function pruneRelayRetention(db, now, config) {
     }
 }
 function ensureColumn(db, table, column, definition) {
-    const rows = db.prepare(`PRAGMA table_info(${table})`).all();
-    if (!rows.some((row) => row.name === column)) {
+    if (!tableColumnNames(db, table).has(column)) {
         db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${definition}`);
     }
 }
+function tableColumnNames(db, table) {
+    return new Set(db.prepare(`PRAGMA table_info(${table})`).all().map((row) => row.name));
+}
+function restoreDurableSessionClaims(db) {
+    db.prepare(`INSERT OR IGNORE INTO relay_session_claims
+     (account_id, session_id, request_id, machine_id, turn_id, command_type, state, created_at, updated_at)
+     SELECT admissions.account_id,
+            admissions.session_id,
+            admissions.request_id,
+            admissions.machine_id,
+            admissions.turn_id,
+            'prompt',
+            'active',
+            admissions.created_at,
+            admissions.updated_at
+     FROM relay_admissions AS admissions
+     JOIN sessions ON sessions.account_id = admissions.account_id
+                  AND sessions.id = admissions.session_id
+                  AND sessions.machine_id = admissions.machine_id
+     WHERE admissions.kind = 'prompt'
+       AND admissions.turn_id IS NOT NULL
+       AND admissions.terminal_status IS NULL
+       AND sessions.status IN ('running', 'offline')`).run();
+}
+function ensureCommandResultsAccountRequestConflictTarget(db) {
+    const columns = db.prepare("PRAGMA table_info(command_results)").all();
+    const hasUpdatedAt = columns.some((column) => column.name === "updated_at");
+    const orderBy = hasUpdatedAt
+        ? "COALESCE(updated_at, created_at) DESC, created_at DESC, rowid DESC"
+        : "created_at DESC, rowid DESC";
+    db.exec(`
+    DELETE FROM command_results
+    WHERE rowid IN (
+      SELECT rowid
+      FROM (
+        SELECT
+          rowid,
+          ROW_NUMBER() OVER (
+            PARTITION BY account_id, request_id
+            ORDER BY ${orderBy}
+          ) AS duplicate_rank
+        FROM command_results
+      )
+      WHERE duplicate_rank > 1
+    );
+  `);
+}
+function repairHistoricalEventTimestamps(db) {
+    const rows = db
+        .prepare("SELECT id, turn_id FROM session_events WHERE occurred_at IS NULL AND message_id LIKE 'hist_%'")
+        .all();
+    const update = db.prepare("UPDATE session_events SET occurred_at = ? WHERE id = ? AND occurred_at IS NULL");
+    const repairs = rows
+        .map((row) => ({ id: row.id, occurredAt: uuidV7TimestampMs(row.turn_id) }))
+        .filter((row) => row.occurredAt !== undefined);
+    if (repairs.length === 0)
+        return;
+    db.exec("BEGIN");
+    try {
+        for (const item of repairs)
+            update.run(item.occurredAt, item.id);
+        db.exec("COMMIT");
+    }
+    catch (error) {
+        db.exec("ROLLBACK");
+        throw error;
+    }
+}
+function backfillRelayDispatchOutboxCommandType(db) {
+    const columns = tableColumnNames(db, "relay_dispatch_outbox");
+    if (columns.has("command_json")) {
+        db.prepare("UPDATE relay_dispatch_outbox SET message = command_json WHERE (message IS NULL OR message = '') AND command_json IS NOT NULL AND command_json != ''").run();
+    }
+    const rows = db
+        .prepare("SELECT rowid, message FROM relay_dispatch_outbox WHERE command_type IS NULL OR command_type = ''")
+        .all();
+    if (rows.length === 0)
+        return;
+    const update = db.prepare("UPDATE relay_dispatch_outbox SET command_type = ? WHERE rowid = ?");
+    db.exec("BEGIN");
+    try {
+        for (const row of rows) {
+            update.run(commandTypeFromOutboxMessage(row.message ?? ""), row.rowid);
+        }
+        db.exec("COMMIT");
+    }
+    catch (error) {
+        db.exec("ROLLBACK");
+        throw error;
+    }
+}
+function commandTypeFromOutboxMessage(message) {
+    try {
+        const parsed = JSON.parse(message);
+        return typeof parsed.type === "string" && parsed.type.trim() ? parsed.type : "unknown";
+    }
+    catch {
+        return "unknown";
+    }
+}
+function uuidV7TimestampMs(value) {
+    if (!value)
+        return undefined;
+    const match = /^([0-9a-f]{8})-([0-9a-f]{4})-7[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu.exec(value);
+    if (!match)
+        return undefined;
+    const timestamp = Number.parseInt(`${match[1]}${match[2]}`, 16);
+    return Number.isSafeInteger(timestamp) ? timestamp : undefined;
+}
 //# sourceMappingURL=db.js.map

package/apps/relay/dist/errors.d.ts

@@ -1,5 +1,6 @@
 export declare class HttpError extends Error {
     readonly statusCode: number;
     readonly code: string;
-    constructor(statusCode: number, code: string, message: string);
+    readonly details?: Record<string, unknown> | undefined;
+    constructor(statusCode: number, code: string, message: string, details?: Record<string, unknown> | undefined);
 }

package/apps/relay/dist/errors.js

@@ -1,10 +1,12 @@
 export class HttpError extends Error {
     statusCode;
     code;
-    constructor(statusCode, code, message) {
+    details;
+    constructor(statusCode, code, message, details) {
         super(message);
         this.statusCode = statusCode;
         this.code = code;
+        this.details = details;
     }
 }
 //# sourceMappingURL=errors.js.map