From 4c2067ce0605c65706ee2fb0db60adf0e357727b Mon Sep 17 00:00:00 2001 From: Sanchit Rk <0xsanchit@gmail.com> Date: Fri, 13 Nov 2026 12:29:11 +0530 Subject: [PATCH] chore(server): name the daemon mirror table machine_space_state Its rows are keyed by machine and space, like the other per-machine tables. Edited in the single init migration, as nothing is in production yet. Co-Authored-By: Claude Opus 5.5 --- apps/server/src/db.ts | 2 +- apps/server/src/skills.ts | 2 +- apps/server/src/sync.ts | 6 +++--- apps/server/test/__artifacts__/schema.json | 12 ++++++------ apps/server/test/daemon.test.ts | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/server/src/db.ts b/apps/server/src/db.ts index 30b595f9..28f0d323 100644 --- a/apps/server/src/db.ts +++ b/apps/server/src/db.ts @@ -137,7 +137,7 @@ const migrations = { // What each space's daemons last published (git status, skills), mirrored from CodeWork's event // stream: a stopped sandbox is shown from here, never woken. yield* sql` - CREATE TABLE space_state ( + CREATE TABLE machine_space_state ( machine_id TEXT NOT NULL, space_id TEXT NOT NULL, type TEXT NOT NULL, diff --git a/apps/server/src/skills.ts b/apps/server/src/skills.ts index 569ad10e..f0f65518 100644 --- a/apps/server/src/skills.ts +++ b/apps/server/src/skills.ts @@ -26,7 +26,7 @@ export const list = Effect.fn("Skills.list")(function* ( Effect.orElseSucceed(() => []), ); const kept = yield* sql<{ spaceId: string; data: string; observedAt: number }>` - SELECT space_id, data, observed_at FROM space_state + SELECT space_id, data, observed_at FROM machine_space_state WHERE machine_id = ${input.machineId} AND type = 'plugin.skills.list' `.pipe(Effect.orDie); return spaces.map((space): SpaceSkills => { diff --git a/apps/server/src/sync.ts b/apps/server/src/sync.ts index 1bbaef67..eb12c276 100644 --- a/apps/server/src/sync.ts +++ b/apps/server/src/sync.ts @@ -260,7 +260,7 @@ export const layer = Layer.effect( }); /** - * The builtin space daemons' events, into `space_state`. A subscription opens with each space's + * The builtin space daemons' events, into `machine_space_state`. A subscription opens with each space's * last event: it is (re)started after an index batch mirrored spaces, so that replay finds their * rows, and again whenever it fails or ends. Only a newer event replaces a row. */ @@ -276,12 +276,12 @@ export const layer = Layer.effect( yield* transact((append) => Effect.gen(function* () { const written = yield* sql<{ spaceId: string }>` - INSERT INTO space_state (machine_id, space_id, type, data, observed_at) + INSERT INTO machine_space_state (machine_id, space_id, type, data, observed_at) SELECT ${machineId}, ${spaceId}, ${frame.type}, ${text}, ${observedAt} WHERE EXISTS (SELECT 1 FROM space WHERE machine_id = ${machineId} AND id = ${spaceId}) ON CONFLICT (machine_id, space_id, type) DO UPDATE SET data = excluded.data, observed_at = excluded.observed_at - WHERE space_state.observed_at < excluded.observed_at + WHERE machine_space_state.observed_at < excluded.observed_at RETURNING space_id `; if (written.length === 0) return; diff --git a/apps/server/test/__artifacts__/schema.json b/apps/server/test/__artifacts__/schema.json index 1ba7321b..f5da9b3b 100644 --- a/apps/server/test/__artifacts__/schema.json +++ b/apps/server/test/__artifacts__/schema.json @@ -72,6 +72,12 @@ "tbl_name": "machine", "sql": "CREATE TABLE machine ( id TEXT PRIMARY KEY, kind TEXT NOT NULL, name TEXT NOT NULL, executable TEXT, home TEXT, args TEXT NOT NULL DEFAULT '', env TEXT NOT NULL DEFAULT '[]', url TEXT, namespace TEXT NOT NULL, is_default INTEGER NOT NULL DEFAULT 0, pos INTEGER NOT NULL, store_id TEXT UNIQUE, cursor INTEGER NOT NULL DEFAULT 0, created_at INTEGER NOT NULL )" }, + { + "type": "table", + "name": "machine_space_state", + "tbl_name": "machine_space_state", + "sql": "CREATE TABLE machine_space_state ( machine_id TEXT NOT NULL, space_id TEXT NOT NULL, type TEXT NOT NULL, data TEXT NOT NULL, observed_at INTEGER NOT NULL, PRIMARY KEY (machine_id, space_id, type), FOREIGN KEY (machine_id, space_id) REFERENCES space(machine_id, id) ON DELETE CASCADE )" + }, { "type": "table", "name": "organization", @@ -138,12 +144,6 @@ "tbl_name": "space", "sql": "CREATE INDEX space_project_idx ON space (machine_id, project_id)" }, - { - "type": "table", - "name": "space_state", - "tbl_name": "space_state", - "sql": "CREATE TABLE space_state ( machine_id TEXT NOT NULL, space_id TEXT NOT NULL, type TEXT NOT NULL, data TEXT NOT NULL, observed_at INTEGER NOT NULL, PRIMARY KEY (machine_id, space_id, type), FOREIGN KEY (machine_id, space_id) REFERENCES space(machine_id, id) ON DELETE CASCADE )" - }, { "type": "table", "name": "sqlite_sequence", diff --git a/apps/server/test/daemon.test.ts b/apps/server/test/daemon.test.ts index db9f936f..577ca60f 100644 --- a/apps/server/test/daemon.test.ts +++ b/apps/server/test/daemon.test.ts @@ -27,7 +27,7 @@ afterAll(cleanup); /* * The desktop's Skills section without a read on demand: a real CodeWork server's skills daemon - * publishes, the app server mirrors it into `space_state` and tells the UI which space changed, and + * publishes, the app server mirrors it into `machine_space_state` and tells the UI which space changed, and * `projects.skills` answers from the mirror. */ it("mirrors a space's skills from its daemon into the app and serves them from there", async () => { @@ -59,7 +59,7 @@ it("mirrors a space's skills from its daemon into the app and serves them from t const stored = () => query( appHome, - "SELECT type, data FROM space_state WHERE machine_id = ? AND space_id = ? ORDER BY type", + "SELECT type, data FROM machine_space_state WHERE machine_id = ? AND space_id = ? ORDER BY type", machineId, spaceId, ).map((row) => ({ type: row.type, data: JSON.parse(row.data as string) as Record }));