Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ const session: NonNullable<SessionResult["session"]> = {
scopeId: "workspace-1",
harness: "claude-acp",
harnessSessionId: "native-1",
createCommandId: null,
launchContextJson: null,
predecessorSessionId: null,
epoch: "epoch-1",
status: "idle",
title: "Automation run",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ function saved(overrides: Partial<SavedSession> = {}): SavedSession {
scopeId: "workspace",
harness: "claude-acp",
harnessSessionId: "native-1",
createCommandId: null,
launchContextJson: null,
predecessorSessionId: null,
epoch: "epoch",
status: "idle",
title: "Saved chat",
Expand Down
107 changes: 107 additions & 0 deletions packages/chat-runtime/src/db/account-migration.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
import { Database } from "bun:sqlite";
import { expect, test } from "bun:test";
import {
copyFileSync,
mkdirSync,
mkdtempSync,
readFileSync,
rmSync,
writeFileSync,
} from "node:fs";
import { tmpdir } from "node:os";
import { join, resolve } from "node:path";
import { drizzle } from "drizzle-orm/bun-sqlite";
import { migrate } from "drizzle-orm/bun-sqlite/migrator";

test("chat account migration preserves legacy data and durably enforces unique launch and successor receipts", () => {
const dir = mkdtempSync(join(tmpdir(), "chat-account-migration-"));
const source = resolve(import.meta.dir, "drizzle");
const folder = join(dir, "migrations");
mkdirSync(join(folder, "meta"), { recursive: true });
const journal = JSON.parse(
readFileSync(join(source, "meta/_journal.json"), "utf8"),
) as { entries: Array<{ tag: string }> };
const index = journal.entries.findIndex(
(entry) => entry.tag === "0001_account_chat_launch_context",
);
expect(index).toBe(1);
for (const entry of journal.entries)
copyFileSync(
join(source, `${entry.tag}.sql`),
join(folder, `${entry.tag}.sql`),
);
const writeJournal = (count: number) =>
writeFileSync(
join(folder, "meta/_journal.json"),
JSON.stringify({ ...journal, entries: journal.entries.slice(0, count) }),
);
let sqlite = new Database(join(dir, "chat.db"));
try {
writeJournal(index);
migrate(drizzle(sqlite), { migrationsFolder: folder });
sqlite.exec(
"INSERT INTO chat_sessions_local (session_id, scope_id, harness, harness_session_id, epoch, status, title, updated_at) VALUES ('old', 'workspace', 'claude-acp', 'native-old', 'epoch', 'idle', 'kept', 1)",
);
const original = sqlite
.query("SELECT * FROM chat_sessions_local")
.get() as Record<string, unknown>;
writeJournal(index + 1);
migrate(drizzle(sqlite), { migrationsFolder: folder });
expect(sqlite.query("SELECT * FROM chat_sessions_local").get()).toEqual({
...original,
launch_context: null,
create_command_id: null,
predecessor_session_id: null,
});
sqlite.exec(
"UPDATE chat_sessions_local SET launch_context='fixture', create_command_id='command', predecessor_session_id='source' WHERE session_id='old'",
);
sqlite.close();
sqlite = new Database(join(dir, "chat.db"));
migrate(drizzle(sqlite), { migrationsFolder: folder });
expect(
sqlite
.query(
"SELECT launch_context, create_command_id, predecessor_session_id FROM chat_sessions_local",
)
.get(),
).toEqual({
launch_context: "fixture",
create_command_id: "command",
predecessor_session_id: "source",
});
for (const field of ["create_command_id", "predecessor_session_id"]) {
expect(() =>
sqlite.exec(
`INSERT INTO chat_sessions_local (session_id, scope_id, harness, epoch, status, updated_at, ${field}) SELECT 'duplicate', 'workspace', 'claude-acp', 'epoch', 'idle', 1, ${field} FROM chat_sessions_local WHERE session_id='old'`,
),
).toThrow(`UNIQUE constraint failed: chat_sessions_local.${field}`);
}
const insertLegacy = sqlite.query(
"INSERT INTO chat_sessions_local (session_id, scope_id, harness, epoch, status, updated_at) VALUES (?, 'workspace', 'claude-acp', 'epoch', 'idle', 1)",
);
insertLegacy.run("null-a");
insertLegacy.run("null-b");
expect(
sqlite
.query(
"SELECT session_id, create_command_id, predecessor_session_id FROM chat_sessions_local WHERE session_id IN ('null-a', 'null-b') ORDER BY session_id",
)
.all(),
).toEqual([
{
session_id: "null-a",
create_command_id: null,
predecessor_session_id: null,
},
{
session_id: "null-b",
create_command_id: null,
predecessor_session_id: null,
},
]);
} finally {
sqlite.close();
rmSync(dir, { recursive: true, force: true });
}
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ALTER TABLE `chat_sessions_local` ADD `launch_context` text;--> statement-breakpoint
ALTER TABLE `chat_sessions_local` ADD `create_command_id` text;--> statement-breakpoint
ALTER TABLE `chat_sessions_local` ADD `predecessor_session_id` text;--> statement-breakpoint
CREATE UNIQUE INDEX `chat_sessions_local_create_command_id_idx` ON `chat_sessions_local` (`create_command_id`);--> statement-breakpoint
CREATE UNIQUE INDEX `chat_sessions_local_predecessor_session_id_idx` ON `chat_sessions_local` (`predecessor_session_id`);
189 changes: 189 additions & 0 deletions packages/chat-runtime/src/db/drizzle/meta/0001_snapshot.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
{
"version": "6",
"dialect": "sqlite",
"id": "73ba863c-cd96-443a-8af8-398609a612a5",
"prevId": "0c9aa8ad-c478-45be-a2a7-661fae258042",
"tables": {
"chat_journal": {
"name": "chat_journal",
"columns": {
"session_id": {
"name": "session_id",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"epoch": {
"name": "epoch",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"seq": {
"name": "seq",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"ts": {
"name": "ts",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"event_json": {
"name": "event_json",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {
"chat_journal_session_id_epoch_seq_pk": {
"columns": [
"session_id",
"epoch",
"seq"
],
"name": "chat_journal_session_id_epoch_seq_pk"
}
},
"uniqueConstraints": {},
"checkConstraints": {}
},
"chat_sessions_local": {
"name": "chat_sessions_local",
"columns": {
"session_id": {
"name": "session_id",
"type": "text",
"primaryKey": true,
"notNull": true,
"autoincrement": false
},
"scope_id": {
"name": "scope_id",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"harness": {
"name": "harness",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"harness_session_id": {
"name": "harness_session_id",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"launch_context": {
"name": "launch_context",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"create_command_id": {
"name": "create_command_id",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"predecessor_session_id": {
"name": "predecessor_session_id",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"epoch": {
"name": "epoch",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"status": {
"name": "status",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"title": {
"name": "title",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"queued_count": {
"name": "queued_count",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": 0
},
"updated_at": {
"name": "updated_at",
"type": "integer",
"primaryKey": false,
"notNull": true,
"autoincrement": false
}
},
"indexes": {
"chat_sessions_local_scope_id_idx": {
"name": "chat_sessions_local_scope_id_idx",
"columns": [
"scope_id"
],
"isUnique": false
},
"chat_sessions_local_create_command_id_idx": {
"name": "chat_sessions_local_create_command_id_idx",
"columns": [
"create_command_id"
],
"isUnique": true
},
"chat_sessions_local_predecessor_session_id_idx": {
"name": "chat_sessions_local_predecessor_session_id_idx",
"columns": [
"predecessor_session_id"
],
"isUnique": true
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"checkConstraints": {}
}
},
"views": {},
"enums": {},
"_meta": {
"schemas": {},
"tables": {},
"columns": {}
},
"internal": {
"indexes": {}
}
}
7 changes: 7 additions & 0 deletions packages/chat-runtime/src/db/drizzle/meta/_journal.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
"when": 1785962456515,
"tag": "0000_natural_wolverine",
"breakpoints": true
},
{
"idx": 1,
"version": "6",
"when": 1791593834266,
"tag": "0001_account_chat_launch_context",
"breakpoints": true
}
]
}
14 changes: 13 additions & 1 deletion packages/chat-runtime/src/db/schema/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
primaryKey,
sqliteTable,
text,
uniqueIndex,
} from "drizzle-orm/sqlite-core";

export const CHAT_DB_FILENAME = "chat.db";
Expand All @@ -30,13 +31,24 @@ export const chatSessionsLocal = sqliteTable(
scopeId: text("scope_id").notNull(),
harness: text().notNull(),
harnessSessionId: text("harness_session_id"),
launchContextJson: text("launch_context"),
createCommandId: text("create_command_id"),
predecessorSessionId: text("predecessor_session_id"),
epoch: text().notNull(),
status: text().$type<SessionStatus>().notNull(),
title: text(),
queuedCount: integer("queued_count").notNull().default(0),
updatedAt: integer("updated_at").notNull(),
},
(table) => [index("chat_sessions_local_scope_id_idx").on(table.scopeId)],
(table) => [
index("chat_sessions_local_scope_id_idx").on(table.scopeId),
uniqueIndex("chat_sessions_local_create_command_id_idx").on(
table.createCommandId,
),
uniqueIndex("chat_sessions_local_predecessor_session_id_idx").on(
table.predecessorSessionId,
),
],
);

export type JournalRow = typeof chatJournal.$inferSelect;
Expand Down
Loading