Merged
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
30 changes: 26 additions & 4 deletions apps/server/src/persistenceService.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ describe("PersistenceService", () => {
sessionId: "sess-1",
};

service.ingestProviderEvent({
const event1 = service.ingestProviderEvent({
...baseEvent,
id: "evt-1",
createdAt: iso(10),
Expand All@@ -115,8 +115,9 @@ describe("PersistenceService", () => {
},
},
});
expect(event1?.seq).toBeGreaterThan(0);

service.ingestProviderEvent({
const event2 = service.ingestProviderEvent({
...baseEvent,
id: "evt-2",
createdAt: iso(20),
Expand All@@ -128,8 +129,9 @@ describe("PersistenceService", () => {
delta: "hi",
},
});
expect((event2?.seq ?? 0) > (event1?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event3 = service.ingestProviderEvent({
...baseEvent,
id: "evt-3",
createdAt: iso(30),
Expand All@@ -142,8 +144,9 @@ describe("PersistenceService", () => {
},
},
});
expect((event3?.seq ?? 0) > (event2?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event4 = service.ingestProviderEvent({
...baseEvent,
id: "evt-4",
createdAt: iso(40),
Expand All@@ -156,6 +159,7 @@ describe("PersistenceService", () => {
},
},
});
expect((event4?.seq ?? 0) > (event3?.seq ?? 0)).toBe(true);

const snapshot = service.loadSnapshot();
expect(snapshot.projects).toHaveLength(1);
Expand All@@ -179,6 +183,24 @@ describe("PersistenceService", () => {
expect(catchUp.events.some((event) => event.eventType === "project.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "thread.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "message.upsert")).toBe(true);

const providerCatchUp = service.providerCatchUp({ afterSeq: 0 });
expect(providerCatchUp.lastProviderSeq).toBe(event4?.seq ?? 0);
expect(providerCatchUp.events.map((event) => event.id)).toEqual([
"evt-1",
"evt-2",
"evt-3",
"evt-4",
]);
const providerSeqs = providerCatchUp.events.map((event) => event.seq ?? 0);
for (let index = 1; index < providerSeqs.length; index += 1) {
expect(providerSeqs[index]).toBeGreaterThan(providerSeqs[index - 1] ?? Number.NEGATIVE_INFINITY);
}

const providerCatchUpAfterSecond = service.providerCatchUp({
afterSeq: event2?.seq ?? 0,
});
expect(providerCatchUpAfterSecond.events.map((event) => event.id)).toEqual(["evt-3", "evt-4"]);
} finally {
service.close();
}
Expand Down
108 changes: 105 additions & 3 deletions apps/server/src/persistenceService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
type ProjectRemoveInput,
type ProjectUpdateScriptsInput,
type ProjectUpdateScriptsResult,
type ProviderCatchUpInput,
type ProviderCatchUpResult,
type ProviderEvent,
type ProviderSendTurnInput,
type StateBootstrapResult,
Expand DownExpand Up@@ -44,6 +46,9 @@ import {
projectRemoveInputSchema,
projectScriptsSchema,
projectUpdateScriptsInputSchema,
providerCatchUpInputSchema,
providerCatchUpResultSchema,
providerEventSchema,
stateBootstrapResultSchema,
stateCatchUpInputSchema,
stateCatchUpResultSchema,
Expand DownExpand Up@@ -94,6 +99,25 @@ interface StateEventRow {
interface ProviderEventInsertResult {
inserted: boolean;
runtimeThreadId: string | null;
seq: number;
}

interface ProviderEventRow {
seq: number;
id: string;
session_id: string;
provider: string;
kind: string;
method: string;
thread_id: string | null;
turn_id: string | null;
item_id: string | null;
request_id: string | null;
request_kind: string | null;
text_delta: string | null;
message: string | null;
payload_json: string | null;
created_at: string;
}

export interface PersistenceServiceOptions {
Expand DownExpand Up@@ -772,6 +796,43 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

providerCatchUp(raw: ProviderCatchUpInput): ProviderCatchUpResult {
const input = providerCatchUpInputSchema.parse(raw);
const rows = this.db
.prepare(
`SELECT
seq,
id,
session_id,
provider,
kind,
method,
thread_id,
turn_id,
item_id,
request_id,
request_kind,
text_delta,
message,
payload_json,
created_at
FROM provider_events
WHERE seq > ?
ORDER BY seq ASC
LIMIT ?;`,
)
.all(input.afterSeq, input.limit) as unknown as ProviderEventRow[];

const events = rows
.map((row) => this.parseProviderEventRow(row))
.filter((event): event is ProviderEvent => event !== null);

return providerCatchUpResultSchema.parse({
events,
lastProviderSeq: this.readLastProviderSeq(),
});
}

listMessages(raw: StateListMessagesInput): StateListMessagesResult {
const input = stateListMessagesInputSchema.parse(raw);
const rows = this.db
Expand DownExpand Up@@ -867,12 +928,18 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

ingestProviderEvent(event: ProviderEvent): void {
ingestProviderEvent(event: ProviderEvent): ProviderEvent | null {
let persistedEvent: ProviderEvent | null = null;
this.withTransaction((pendingEvents) => {
const insertResult = this.insertProviderEvent(event);
if (!insertResult.inserted) {
return;
}
persistedEvent = providerEventSchema.parse({
...event,
seq: insertResult.seq,
...(insertResult.runtimeThreadId ? { threadId: insertResult.runtimeThreadId } : {}),
});

const localThreadId = this.resolveThreadIdForEvent(event, insertResult.runtimeThreadId);
if (!localThreadId) {
Expand DownExpand Up@@ -1138,6 +1205,7 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
}
}
});
return persistedEvent;
}

persistTurnDiffSummaryFromCheckpoint(input: {
Expand DownExpand Up@@ -1360,6 +1428,13 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
return row?.seq ?? 0;
}

private readLastProviderSeq(): number {
const row = this.db
.prepare("SELECT COALESCE(MAX(seq), 0) AS seq FROM provider_events;")
.get() as { seq: number } | undefined;
return row?.seq ?? 0;
}

private withTransaction<T>(fn: (pendingEvents: StateEvent[]) => T): T {
const pendingEvents: StateEvent[] = [];
const result = this.stateDb.transaction(() => fn(pendingEvents));
Expand DownExpand Up@@ -1766,13 +1841,40 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
event.message ?? null,
payloadJson,
event.createdAt,
) as { changes?: number | bigint };
) as { changes?: number | bigint; lastInsertRowid?: number | bigint };
const inserted = toSafeInteger(result.changes, 0) > 0;
return {
inserted: toSafeInteger(result.changes, 0) > 0,
inserted,
runtimeThreadId: runtimeThreadId ?? null,
seq: inserted ? toSafeInteger(result.lastInsertRowid, 0) : 0,
};
}

private parseProviderEventRow(row: ProviderEventRow): ProviderEvent | null {
const payload = row.payload_json ? this.tryParseJson(row.payload_json) : undefined;
const parsed = providerEventSchema.safeParse({
seq: row.seq,
id: row.id,
kind: row.kind,
provider: row.provider,
sessionId: row.session_id,
createdAt: row.created_at,
method: row.method,
...(row.thread_id ? { threadId: row.thread_id } : {}),
...(row.turn_id ? { turnId: row.turn_id } : {}),
...(row.item_id ? { itemId: row.item_id } : {}),
...(row.request_id ? { requestId: row.request_id } : {}),
...(row.request_kind ? { requestKind: row.request_kind } : {}),
...(row.text_delta !== null ? { textDelta: row.text_delta } : {}),
...(row.message ? { message: row.message } : {}),
...(payload !== undefined ? { payload } : {}),
});
if (!parsed.success) {
return null;
}
return parsed.data;
}

private parseJson<T>(json: string, schema: SafeParseSchema<T>): T | null {
const candidate = this.tryParseJson(json);
const parsed = schema.safeParse(candidate);
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/providerManager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,58 @@ import { describe, expect, it, vi } from "vitest";
import { ProviderManager } from "./providerManager";

describe("ProviderManager", () => {
it("emits persisted provider events with durable sequence metadata when available", () => {
const ingestProviderEvent = vi.fn((event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => ({
...event,
seq: 11,
}));
const persistenceService = {
ingestProviderEvent,
unbindSession: vi.fn(),
};
const manager = new ProviderManager({
persistenceService: persistenceService as never,
});
const events: Array<{ id: string; seq?: number }> = [];
manager.on("event", (event) => {
events.push({ id: event.id, seq: event.seq });
});

const internals = manager as unknown as {
onCodexEvent: (event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => void;
};

internals.onCodexEvent({
id: "evt-seq-1",
kind: "notification",
provider: "codex",
sessionId: "sess-1",
createdAt: new Date().toISOString(),
method: "turn/started",
threadId: "thread-1",
});

expect(ingestProviderEvent).toHaveBeenCalledTimes(1);
expect(events).toEqual([{ id: "evt-seq-1", seq: 11 }]);
manager.dispose();
});

it("detaches provider event listener and ends thread log streams on dispose", () => {
const manager = new ProviderManager();
const internals = manager as unknown as {
Expand Down
39 changes: 26 additions & 13 deletions apps/server/src/providerManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -180,18 +180,11 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
if (this.disposed) {
return;
}

this.routeEventToThreadLog(event);
try {
this.persistenceService?.ingestProviderEvent(event);
} catch {
// Persistence failures should not break provider streaming.
}
if (event.method === "session/closed" || event.method === "session/exited") {
this.persistenceService?.unbindSession(event.sessionId);
const emittedEvent = this.publishProviderEvent(event);
if (!emittedEvent) {
return;
}
this.emit("event", event);
this.maybeCaptureFilesystemCheckpoint(event);
this.maybeCaptureFilesystemCheckpoint(emittedEvent);
};

constructor(options: ProviderManagerOptions = {}) {
Expand DownExpand Up@@ -546,7 +539,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
}

private emitCheckpointCaptured(sessionId: string, threadId: string, turnCount: number): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "notification",
provider: "codex",
Expand All@@ -566,7 +559,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
message: string,
threadId?: string,
): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "error",
provider: "codex",
Expand All@@ -578,6 +571,26 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
});
}

private publishProviderEvent(event: ProviderEvent): ProviderEvent | null {
let emittedEvent = event;
try {
const persistedEvent = this.persistenceService?.ingestProviderEvent(event);
if (this.persistenceService && !persistedEvent) {
return null;
}
emittedEvent = persistedEvent ?? event;
} catch {
// Persistence failures should not break provider streaming.
}

this.routeEventToThreadLog(emittedEvent);
if (emittedEvent.method === "session/closed" || emittedEvent.method === "session/exited") {
this.persistenceService?.unbindSession(emittedEvent.sessionId);
}
this.emit("event", emittedEvent);
return emittedEvent;
}

private withFilesystemLock<T>(sessionId: string, fn: () => Promise<T>): Promise<T> {
const previous = this.filesystemLocks.get(sessionId) ?? Promise.resolve();
const next = previous.catch(() => undefined).then(fn);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
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
30 changes: 26 additions & 4 deletions apps/server/src/persistenceService.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ describe("PersistenceService", () => {
sessionId: "sess-1",
};

service.ingestProviderEvent({
const event1 = service.ingestProviderEvent({
...baseEvent,
id: "evt-1",
createdAt: iso(10),
Expand All@@ -115,8 +115,9 @@ describe("PersistenceService", () => {
},
},
});
expect(event1?.seq).toBeGreaterThan(0);

service.ingestProviderEvent({
const event2 = service.ingestProviderEvent({
...baseEvent,
id: "evt-2",
createdAt: iso(20),
Expand All@@ -128,8 +129,9 @@ describe("PersistenceService", () => {
delta: "hi",
},
});
expect((event2?.seq ?? 0) > (event1?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event3 = service.ingestProviderEvent({
...baseEvent,
id: "evt-3",
createdAt: iso(30),
Expand All@@ -142,8 +144,9 @@ describe("PersistenceService", () => {
},
},
});
expect((event3?.seq ?? 0) > (event2?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event4 = service.ingestProviderEvent({
...baseEvent,
id: "evt-4",
createdAt: iso(40),
Expand All@@ -156,6 +159,7 @@ describe("PersistenceService", () => {
},
},
});
expect((event4?.seq ?? 0) > (event3?.seq ?? 0)).toBe(true);

const snapshot = service.loadSnapshot();
expect(snapshot.projects).toHaveLength(1);
Expand All@@ -179,6 +183,24 @@ describe("PersistenceService", () => {
expect(catchUp.events.some((event) => event.eventType === "project.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "thread.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "message.upsert")).toBe(true);

const providerCatchUp = service.providerCatchUp({ afterSeq: 0 });
expect(providerCatchUp.lastProviderSeq).toBe(event4?.seq ?? 0);
expect(providerCatchUp.events.map((event) => event.id)).toEqual([
"evt-1",
"evt-2",
"evt-3",
"evt-4",
]);
const providerSeqs = providerCatchUp.events.map((event) => event.seq ?? 0);
for (let index = 1; index < providerSeqs.length; index += 1) {
expect(providerSeqs[index]).toBeGreaterThan(providerSeqs[index - 1] ?? Number.NEGATIVE_INFINITY);
}

const providerCatchUpAfterSecond = service.providerCatchUp({
afterSeq: event2?.seq ?? 0,
});
expect(providerCatchUpAfterSecond.events.map((event) => event.id)).toEqual(["evt-3", "evt-4"]);
} finally {
service.close();
}
Expand Down
108 changes: 105 additions & 3 deletions apps/server/src/persistenceService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
type ProjectRemoveInput,
type ProjectUpdateScriptsInput,
type ProjectUpdateScriptsResult,
type ProviderCatchUpInput,
type ProviderCatchUpResult,
type ProviderEvent,
type ProviderSendTurnInput,
type StateBootstrapResult,
Expand DownExpand Up@@ -44,6 +46,9 @@ import {
projectRemoveInputSchema,
projectScriptsSchema,
projectUpdateScriptsInputSchema,
providerCatchUpInputSchema,
providerCatchUpResultSchema,
providerEventSchema,
stateBootstrapResultSchema,
stateCatchUpInputSchema,
stateCatchUpResultSchema,
Expand DownExpand Up@@ -94,6 +99,25 @@ interface StateEventRow {
interface ProviderEventInsertResult {
inserted: boolean;
runtimeThreadId: string | null;
seq: number;
}

interface ProviderEventRow {
seq: number;
id: string;
session_id: string;
provider: string;
kind: string;
method: string;
thread_id: string | null;
turn_id: string | null;
item_id: string | null;
request_id: string | null;
request_kind: string | null;
text_delta: string | null;
message: string | null;
payload_json: string | null;
created_at: string;
}

export interface PersistenceServiceOptions {
Expand DownExpand Up@@ -772,6 +796,43 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

providerCatchUp(raw: ProviderCatchUpInput): ProviderCatchUpResult {
const input = providerCatchUpInputSchema.parse(raw);
const rows = this.db
.prepare(
`SELECT
seq,
id,
session_id,
provider,
kind,
method,
thread_id,
turn_id,
item_id,
request_id,
request_kind,
text_delta,
message,
payload_json,
created_at
FROM provider_events
WHERE seq > ?
ORDER BY seq ASC
LIMIT ?;`,
)
.all(input.afterSeq, input.limit) as unknown as ProviderEventRow[];

const events = rows
.map((row) => this.parseProviderEventRow(row))
.filter((event): event is ProviderEvent => event !== null);

return providerCatchUpResultSchema.parse({
events,
lastProviderSeq: this.readLastProviderSeq(),
});
}

listMessages(raw: StateListMessagesInput): StateListMessagesResult {
const input = stateListMessagesInputSchema.parse(raw);
const rows = this.db
Expand DownExpand Up@@ -867,12 +928,18 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

ingestProviderEvent(event: ProviderEvent): void {
ingestProviderEvent(event: ProviderEvent): ProviderEvent | null {
let persistedEvent: ProviderEvent | null = null;
this.withTransaction((pendingEvents) => {
const insertResult = this.insertProviderEvent(event);
if (!insertResult.inserted) {
return;
}
persistedEvent = providerEventSchema.parse({
...event,
seq: insertResult.seq,
...(insertResult.runtimeThreadId ? { threadId: insertResult.runtimeThreadId } : {}),
});

const localThreadId = this.resolveThreadIdForEvent(event, insertResult.runtimeThreadId);
if (!localThreadId) {
Expand DownExpand Up@@ -1138,6 +1205,7 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
}
}
});
return persistedEvent;
}

persistTurnDiffSummaryFromCheckpoint(input: {
Expand DownExpand Up@@ -1360,6 +1428,13 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
return row?.seq ?? 0;
}

private readLastProviderSeq(): number {
const row = this.db
.prepare("SELECT COALESCE(MAX(seq), 0) AS seq FROM provider_events;")
.get() as { seq: number } | undefined;
return row?.seq ?? 0;
}

private withTransaction<T>(fn: (pendingEvents: StateEvent[]) => T): T {
const pendingEvents: StateEvent[] = [];
const result = this.stateDb.transaction(() => fn(pendingEvents));
Expand DownExpand Up@@ -1766,13 +1841,40 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
event.message ?? null,
payloadJson,
event.createdAt,
) as { changes?: number | bigint };
) as { changes?: number | bigint; lastInsertRowid?: number | bigint };
const inserted = toSafeInteger(result.changes, 0) > 0;
return {
inserted: toSafeInteger(result.changes, 0) > 0,
inserted,
runtimeThreadId: runtimeThreadId ?? null,
seq: inserted ? toSafeInteger(result.lastInsertRowid, 0) : 0,
};
}

private parseProviderEventRow(row: ProviderEventRow): ProviderEvent | null {
const payload = row.payload_json ? this.tryParseJson(row.payload_json) : undefined;
const parsed = providerEventSchema.safeParse({
seq: row.seq,
id: row.id,
kind: row.kind,
provider: row.provider,
sessionId: row.session_id,
createdAt: row.created_at,
method: row.method,
...(row.thread_id ? { threadId: row.thread_id } : {}),
...(row.turn_id ? { turnId: row.turn_id } : {}),
...(row.item_id ? { itemId: row.item_id } : {}),
...(row.request_id ? { requestId: row.request_id } : {}),
...(row.request_kind ? { requestKind: row.request_kind } : {}),
...(row.text_delta !== null ? { textDelta: row.text_delta } : {}),
...(row.message ? { message: row.message } : {}),
...(payload !== undefined ? { payload } : {}),
});
if (!parsed.success) {
return null;
}
return parsed.data;
}

private parseJson<T>(json: string, schema: SafeParseSchema<T>): T | null {
const candidate = this.tryParseJson(json);
const parsed = schema.safeParse(candidate);
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/providerManager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,58 @@ import { describe, expect, it, vi } from "vitest";
import { ProviderManager } from "./providerManager";

describe("ProviderManager", () => {
it("emits persisted provider events with durable sequence metadata when available", () => {
const ingestProviderEvent = vi.fn((event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => ({
...event,
seq: 11,
}));
const persistenceService = {
ingestProviderEvent,
unbindSession: vi.fn(),
};
const manager = new ProviderManager({
persistenceService: persistenceService as never,
});
const events: Array<{ id: string; seq?: number }> = [];
manager.on("event", (event) => {
events.push({ id: event.id, seq: event.seq });
});

const internals = manager as unknown as {
onCodexEvent: (event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => void;
};

internals.onCodexEvent({
id: "evt-seq-1",
kind: "notification",
provider: "codex",
sessionId: "sess-1",
createdAt: new Date().toISOString(),
method: "turn/started",
threadId: "thread-1",
});

expect(ingestProviderEvent).toHaveBeenCalledTimes(1);
expect(events).toEqual([{ id: "evt-seq-1", seq: 11 }]);
manager.dispose();
});

it("detaches provider event listener and ends thread log streams on dispose", () => {
const manager = new ProviderManager();
const internals = manager as unknown as {
Expand Down
39 changes: 26 additions & 13 deletions apps/server/src/providerManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -180,18 +180,11 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
if (this.disposed) {
return;
}

this.routeEventToThreadLog(event);
try {
this.persistenceService?.ingestProviderEvent(event);
} catch {
// Persistence failures should not break provider streaming.
}
if (event.method === "session/closed" || event.method === "session/exited") {
this.persistenceService?.unbindSession(event.sessionId);
const emittedEvent = this.publishProviderEvent(event);
if (!emittedEvent) {
return;
}
this.emit("event", event);
this.maybeCaptureFilesystemCheckpoint(event);
this.maybeCaptureFilesystemCheckpoint(emittedEvent);
};

constructor(options: ProviderManagerOptions = {}) {
Expand DownExpand Up@@ -546,7 +539,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
}

private emitCheckpointCaptured(sessionId: string, threadId: string, turnCount: number): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "notification",
provider: "codex",
Expand All@@ -566,7 +559,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
message: string,
threadId?: string,
): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "error",
provider: "codex",
Expand All@@ -578,6 +571,26 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
});
}

private publishProviderEvent(event: ProviderEvent): ProviderEvent | null {
let emittedEvent = event;
try {
const persistedEvent = this.persistenceService?.ingestProviderEvent(event);
if (this.persistenceService && !persistedEvent) {
return null;
}
emittedEvent = persistedEvent ?? event;
} catch {
// Persistence failures should not break provider streaming.
}

this.routeEventToThreadLog(emittedEvent);
if (emittedEvent.method === "session/closed" || emittedEvent.method === "session/exited") {
this.persistenceService?.unbindSession(emittedEvent.sessionId);
}
this.emit("event", emittedEvent);
return emittedEvent;
}

private withFilesystemLock<T>(sessionId: string, fn: () => Promise<T>): Promise<T> {
const previous = this.filesystemLocks.get(sessionId) ?? Promise.resolve();
const next = previous.catch(() => undefined).then(fn);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
30 changes: 26 additions & 4 deletions apps/server/src/persistenceService.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ describe("PersistenceService", () => {
sessionId: "sess-1",
};

service.ingestProviderEvent({
const event1 = service.ingestProviderEvent({
...baseEvent,
id: "evt-1",
createdAt: iso(10),
Expand All@@ -115,8 +115,9 @@ describe("PersistenceService", () => {
},
},
});
expect(event1?.seq).toBeGreaterThan(0);

service.ingestProviderEvent({
const event2 = service.ingestProviderEvent({
...baseEvent,
id: "evt-2",
createdAt: iso(20),
Expand All@@ -128,8 +129,9 @@ describe("PersistenceService", () => {
delta: "hi",
},
});
expect((event2?.seq ?? 0) > (event1?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event3 = service.ingestProviderEvent({
...baseEvent,
id: "evt-3",
createdAt: iso(30),
Expand All@@ -142,8 +144,9 @@ describe("PersistenceService", () => {
},
},
});
expect((event3?.seq ?? 0) > (event2?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event4 = service.ingestProviderEvent({
...baseEvent,
id: "evt-4",
createdAt: iso(40),
Expand All@@ -156,6 +159,7 @@ describe("PersistenceService", () => {
},
},
});
expect((event4?.seq ?? 0) > (event3?.seq ?? 0)).toBe(true);

const snapshot = service.loadSnapshot();
expect(snapshot.projects).toHaveLength(1);
Expand All@@ -179,6 +183,24 @@ describe("PersistenceService", () => {
expect(catchUp.events.some((event) => event.eventType === "project.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "thread.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "message.upsert")).toBe(true);

const providerCatchUp = service.providerCatchUp({ afterSeq: 0 });
expect(providerCatchUp.lastProviderSeq).toBe(event4?.seq ?? 0);
expect(providerCatchUp.events.map((event) => event.id)).toEqual([
"evt-1",
"evt-2",
"evt-3",
"evt-4",
]);
const providerSeqs = providerCatchUp.events.map((event) => event.seq ?? 0);
for (let index = 1; index < providerSeqs.length; index += 1) {
expect(providerSeqs[index]).toBeGreaterThan(providerSeqs[index - 1] ?? Number.NEGATIVE_INFINITY);
}

const providerCatchUpAfterSecond = service.providerCatchUp({
afterSeq: event2?.seq ?? 0,
});
expect(providerCatchUpAfterSecond.events.map((event) => event.id)).toEqual(["evt-3", "evt-4"]);
} finally {
service.close();
}
Expand Down
108 changes: 105 additions & 3 deletions apps/server/src/persistenceService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
type ProjectRemoveInput,
type ProjectUpdateScriptsInput,
type ProjectUpdateScriptsResult,
type ProviderCatchUpInput,
type ProviderCatchUpResult,
type ProviderEvent,
type ProviderSendTurnInput,
type StateBootstrapResult,
Expand DownExpand Up@@ -44,6 +46,9 @@ import {
projectRemoveInputSchema,
projectScriptsSchema,
projectUpdateScriptsInputSchema,
providerCatchUpInputSchema,
providerCatchUpResultSchema,
providerEventSchema,
stateBootstrapResultSchema,
stateCatchUpInputSchema,
stateCatchUpResultSchema,
Expand DownExpand Up@@ -94,6 +99,25 @@ interface StateEventRow {
interface ProviderEventInsertResult {
inserted: boolean;
runtimeThreadId: string | null;
seq: number;
}

interface ProviderEventRow {
seq: number;
id: string;
session_id: string;
provider: string;
kind: string;
method: string;
thread_id: string | null;
turn_id: string | null;
item_id: string | null;
request_id: string | null;
request_kind: string | null;
text_delta: string | null;
message: string | null;
payload_json: string | null;
created_at: string;
}

export interface PersistenceServiceOptions {
Expand DownExpand Up@@ -772,6 +796,43 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

providerCatchUp(raw: ProviderCatchUpInput): ProviderCatchUpResult {
const input = providerCatchUpInputSchema.parse(raw);
const rows = this.db
.prepare(
`SELECT
seq,
id,
session_id,
provider,
kind,
method,
thread_id,
turn_id,
item_id,
request_id,
request_kind,
text_delta,
message,
payload_json,
created_at
FROM provider_events
WHERE seq > ?
ORDER BY seq ASC
LIMIT ?;`,
)
.all(input.afterSeq, input.limit) as unknown as ProviderEventRow[];

const events = rows
.map((row) => this.parseProviderEventRow(row))
.filter((event): event is ProviderEvent => event !== null);

return providerCatchUpResultSchema.parse({
events,
lastProviderSeq: this.readLastProviderSeq(),
});
}

listMessages(raw: StateListMessagesInput): StateListMessagesResult {
const input = stateListMessagesInputSchema.parse(raw);
const rows = this.db
Expand DownExpand Up@@ -867,12 +928,18 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

ingestProviderEvent(event: ProviderEvent): void {
ingestProviderEvent(event: ProviderEvent): ProviderEvent | null {
let persistedEvent: ProviderEvent | null = null;
this.withTransaction((pendingEvents) => {
const insertResult = this.insertProviderEvent(event);
if (!insertResult.inserted) {
return;
}
persistedEvent = providerEventSchema.parse({
...event,
seq: insertResult.seq,
...(insertResult.runtimeThreadId ? { threadId: insertResult.runtimeThreadId } : {}),
});

const localThreadId = this.resolveThreadIdForEvent(event, insertResult.runtimeThreadId);
if (!localThreadId) {
Expand DownExpand Up@@ -1138,6 +1205,7 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
}
}
});
return persistedEvent;
}

persistTurnDiffSummaryFromCheckpoint(input: {
Expand DownExpand Up@@ -1360,6 +1428,13 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
return row?.seq ?? 0;
}

private readLastProviderSeq(): number {
const row = this.db
.prepare("SELECT COALESCE(MAX(seq), 0) AS seq FROM provider_events;")
.get() as { seq: number } | undefined;
return row?.seq ?? 0;
}

private withTransaction<T>(fn: (pendingEvents: StateEvent[]) => T): T {
const pendingEvents: StateEvent[] = [];
const result = this.stateDb.transaction(() => fn(pendingEvents));
Expand DownExpand Up@@ -1766,13 +1841,40 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
event.message ?? null,
payloadJson,
event.createdAt,
) as { changes?: number | bigint };
) as { changes?: number | bigint; lastInsertRowid?: number | bigint };
const inserted = toSafeInteger(result.changes, 0) > 0;
return {
inserted: toSafeInteger(result.changes, 0) > 0,
inserted,
runtimeThreadId: runtimeThreadId ?? null,
seq: inserted ? toSafeInteger(result.lastInsertRowid, 0) : 0,
};
}

private parseProviderEventRow(row: ProviderEventRow): ProviderEvent | null {
const payload = row.payload_json ? this.tryParseJson(row.payload_json) : undefined;
const parsed = providerEventSchema.safeParse({
seq: row.seq,
id: row.id,
kind: row.kind,
provider: row.provider,
sessionId: row.session_id,
createdAt: row.created_at,
method: row.method,
...(row.thread_id ? { threadId: row.thread_id } : {}),
...(row.turn_id ? { turnId: row.turn_id } : {}),
...(row.item_id ? { itemId: row.item_id } : {}),
...(row.request_id ? { requestId: row.request_id } : {}),
...(row.request_kind ? { requestKind: row.request_kind } : {}),
...(row.text_delta !== null ? { textDelta: row.text_delta } : {}),
...(row.message ? { message: row.message } : {}),
...(payload !== undefined ? { payload } : {}),
});
if (!parsed.success) {
return null;
}
return parsed.data;
}

private parseJson<T>(json: string, schema: SafeParseSchema<T>): T | null {
const candidate = this.tryParseJson(json);
const parsed = schema.safeParse(candidate);
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/providerManager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,58 @@ import { describe, expect, it, vi } from "vitest";
import { ProviderManager } from "./providerManager";

describe("ProviderManager", () => {
it("emits persisted provider events with durable sequence metadata when available", () => {
const ingestProviderEvent = vi.fn((event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => ({
...event,
seq: 11,
}));
const persistenceService = {
ingestProviderEvent,
unbindSession: vi.fn(),
};
const manager = new ProviderManager({
persistenceService: persistenceService as never,
});
const events: Array<{ id: string; seq?: number }> = [];
manager.on("event", (event) => {
events.push({ id: event.id, seq: event.seq });
});

const internals = manager as unknown as {
onCodexEvent: (event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => void;
};

internals.onCodexEvent({
id: "evt-seq-1",
kind: "notification",
provider: "codex",
sessionId: "sess-1",
createdAt: new Date().toISOString(),
method: "turn/started",
threadId: "thread-1",
});

expect(ingestProviderEvent).toHaveBeenCalledTimes(1);
expect(events).toEqual([{ id: "evt-seq-1", seq: 11 }]);
manager.dispose();
});

it("detaches provider event listener and ends thread log streams on dispose", () => {
const manager = new ProviderManager();
const internals = manager as unknown as {
Expand Down
39 changes: 26 additions & 13 deletions apps/server/src/providerManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -180,18 +180,11 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
if (this.disposed) {
return;
}

this.routeEventToThreadLog(event);
try {
this.persistenceService?.ingestProviderEvent(event);
} catch {
// Persistence failures should not break provider streaming.
}
if (event.method === "session/closed" || event.method === "session/exited") {
this.persistenceService?.unbindSession(event.sessionId);
const emittedEvent = this.publishProviderEvent(event);
if (!emittedEvent) {
return;
}
this.emit("event", event);
this.maybeCaptureFilesystemCheckpoint(event);
this.maybeCaptureFilesystemCheckpoint(emittedEvent);
};

constructor(options: ProviderManagerOptions = {}) {
Expand DownExpand Up@@ -546,7 +539,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
}

private emitCheckpointCaptured(sessionId: string, threadId: string, turnCount: number): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "notification",
provider: "codex",
Expand All@@ -566,7 +559,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
message: string,
threadId?: string,
): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "error",
provider: "codex",
Expand All@@ -578,6 +571,26 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
});
}

private publishProviderEvent(event: ProviderEvent): ProviderEvent | null {
let emittedEvent = event;
try {
const persistedEvent = this.persistenceService?.ingestProviderEvent(event);
if (this.persistenceService && !persistedEvent) {
return null;
}
emittedEvent = persistedEvent ?? event;
} catch {
// Persistence failures should not break provider streaming.
}

this.routeEventToThreadLog(emittedEvent);
if (emittedEvent.method === "session/closed" || emittedEvent.method === "session/exited") {
this.persistenceService?.unbindSession(emittedEvent.sessionId);
}
this.emit("event", emittedEvent);
return emittedEvent;
}

private withFilesystemLock<T>(sessionId: string, fn: () => Promise<T>): Promise<T> {
const previous = this.filesystemLocks.get(sessionId) ?? Promise.resolve();
const next = previous.catch(() => undefined).then(fn);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
30 changes: 26 additions & 4 deletions apps/server/src/persistenceService.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ describe("PersistenceService", () => {
sessionId: "sess-1",
};

service.ingestProviderEvent({
const event1 = service.ingestProviderEvent({
...baseEvent,
id: "evt-1",
createdAt: iso(10),
Expand All@@ -115,8 +115,9 @@ describe("PersistenceService", () => {
},
},
});
expect(event1?.seq).toBeGreaterThan(0);

service.ingestProviderEvent({
const event2 = service.ingestProviderEvent({
...baseEvent,
id: "evt-2",
createdAt: iso(20),
Expand All@@ -128,8 +129,9 @@ describe("PersistenceService", () => {
delta: "hi",
},
});
expect((event2?.seq ?? 0) > (event1?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event3 = service.ingestProviderEvent({
...baseEvent,
id: "evt-3",
createdAt: iso(30),
Expand All@@ -142,8 +144,9 @@ describe("PersistenceService", () => {
},
},
});
expect((event3?.seq ?? 0) > (event2?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event4 = service.ingestProviderEvent({
...baseEvent,
id: "evt-4",
createdAt: iso(40),
Expand All@@ -156,6 +159,7 @@ describe("PersistenceService", () => {
},
},
});
expect((event4?.seq ?? 0) > (event3?.seq ?? 0)).toBe(true);

const snapshot = service.loadSnapshot();
expect(snapshot.projects).toHaveLength(1);
Expand All@@ -179,6 +183,24 @@ describe("PersistenceService", () => {
expect(catchUp.events.some((event) => event.eventType === "project.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "thread.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "message.upsert")).toBe(true);

const providerCatchUp = service.providerCatchUp({ afterSeq: 0 });
expect(providerCatchUp.lastProviderSeq).toBe(event4?.seq ?? 0);
expect(providerCatchUp.events.map((event) => event.id)).toEqual([
"evt-1",
"evt-2",
"evt-3",
"evt-4",
]);
const providerSeqs = providerCatchUp.events.map((event) => event.seq ?? 0);
for (let index = 1; index < providerSeqs.length; index += 1) {
expect(providerSeqs[index]).toBeGreaterThan(providerSeqs[index - 1] ?? Number.NEGATIVE_INFINITY);
}

const providerCatchUpAfterSecond = service.providerCatchUp({
afterSeq: event2?.seq ?? 0,
});
expect(providerCatchUpAfterSecond.events.map((event) => event.id)).toEqual(["evt-3", "evt-4"]);
} finally {
service.close();
}
Expand Down
108 changes: 105 additions & 3 deletions apps/server/src/persistenceService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
type ProjectRemoveInput,
type ProjectUpdateScriptsInput,
type ProjectUpdateScriptsResult,
type ProviderCatchUpInput,
type ProviderCatchUpResult,
type ProviderEvent,
type ProviderSendTurnInput,
type StateBootstrapResult,
Expand DownExpand Up@@ -44,6 +46,9 @@ import {
projectRemoveInputSchema,
projectScriptsSchema,
projectUpdateScriptsInputSchema,
providerCatchUpInputSchema,
providerCatchUpResultSchema,
providerEventSchema,
stateBootstrapResultSchema,
stateCatchUpInputSchema,
stateCatchUpResultSchema,
Expand DownExpand Up@@ -94,6 +99,25 @@ interface StateEventRow {
interface ProviderEventInsertResult {
inserted: boolean;
runtimeThreadId: string | null;
seq: number;
}

interface ProviderEventRow {
seq: number;
id: string;
session_id: string;
provider: string;
kind: string;
method: string;
thread_id: string | null;
turn_id: string | null;
item_id: string | null;
request_id: string | null;
request_kind: string | null;
text_delta: string | null;
message: string | null;
payload_json: string | null;
created_at: string;
}

export interface PersistenceServiceOptions {
Expand DownExpand Up@@ -772,6 +796,43 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

providerCatchUp(raw: ProviderCatchUpInput): ProviderCatchUpResult {
const input = providerCatchUpInputSchema.parse(raw);
const rows = this.db
.prepare(
`SELECT
seq,
id,
session_id,
provider,
kind,
method,
thread_id,
turn_id,
item_id,
request_id,
request_kind,
text_delta,
message,
payload_json,
created_at
FROM provider_events
WHERE seq > ?
ORDER BY seq ASC
LIMIT ?;`,
)
.all(input.afterSeq, input.limit) as unknown as ProviderEventRow[];

const events = rows
.map((row) => this.parseProviderEventRow(row))
.filter((event): event is ProviderEvent => event !== null);

return providerCatchUpResultSchema.parse({
events,
lastProviderSeq: this.readLastProviderSeq(),
});
}

listMessages(raw: StateListMessagesInput): StateListMessagesResult {
const input = stateListMessagesInputSchema.parse(raw);
const rows = this.db
Expand DownExpand Up@@ -867,12 +928,18 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

ingestProviderEvent(event: ProviderEvent): void {
ingestProviderEvent(event: ProviderEvent): ProviderEvent | null {
let persistedEvent: ProviderEvent | null = null;
this.withTransaction((pendingEvents) => {
const insertResult = this.insertProviderEvent(event);
if (!insertResult.inserted) {
return;
}
persistedEvent = providerEventSchema.parse({
...event,
seq: insertResult.seq,
...(insertResult.runtimeThreadId ? { threadId: insertResult.runtimeThreadId } : {}),
});

const localThreadId = this.resolveThreadIdForEvent(event, insertResult.runtimeThreadId);
if (!localThreadId) {
Expand DownExpand Up@@ -1138,6 +1205,7 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
}
}
});
return persistedEvent;
}

persistTurnDiffSummaryFromCheckpoint(input: {
Expand DownExpand Up@@ -1360,6 +1428,13 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
return row?.seq ?? 0;
}

private readLastProviderSeq(): number {
const row = this.db
.prepare("SELECT COALESCE(MAX(seq), 0) AS seq FROM provider_events;")
.get() as { seq: number } | undefined;
return row?.seq ?? 0;
}

private withTransaction<T>(fn: (pendingEvents: StateEvent[]) => T): T {
const pendingEvents: StateEvent[] = [];
const result = this.stateDb.transaction(() => fn(pendingEvents));
Expand DownExpand Up@@ -1766,13 +1841,40 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
event.message ?? null,
payloadJson,
event.createdAt,
) as { changes?: number | bigint };
) as { changes?: number | bigint; lastInsertRowid?: number | bigint };
const inserted = toSafeInteger(result.changes, 0) > 0;
return {
inserted: toSafeInteger(result.changes, 0) > 0,
inserted,
runtimeThreadId: runtimeThreadId ?? null,
seq: inserted ? toSafeInteger(result.lastInsertRowid, 0) : 0,
};
}

private parseProviderEventRow(row: ProviderEventRow): ProviderEvent | null {
const payload = row.payload_json ? this.tryParseJson(row.payload_json) : undefined;
const parsed = providerEventSchema.safeParse({
seq: row.seq,
id: row.id,
kind: row.kind,
provider: row.provider,
sessionId: row.session_id,
createdAt: row.created_at,
method: row.method,
...(row.thread_id ? { threadId: row.thread_id } : {}),
...(row.turn_id ? { turnId: row.turn_id } : {}),
...(row.item_id ? { itemId: row.item_id } : {}),
...(row.request_id ? { requestId: row.request_id } : {}),
...(row.request_kind ? { requestKind: row.request_kind } : {}),
...(row.text_delta !== null ? { textDelta: row.text_delta } : {}),
...(row.message ? { message: row.message } : {}),
...(payload !== undefined ? { payload } : {}),
});
if (!parsed.success) {
return null;
}
return parsed.data;
}

private parseJson<T>(json: string, schema: SafeParseSchema<T>): T | null {
const candidate = this.tryParseJson(json);
const parsed = schema.safeParse(candidate);
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/providerManager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,58 @@ import { describe, expect, it, vi } from "vitest";
import { ProviderManager } from "./providerManager";

describe("ProviderManager", () => {
it("emits persisted provider events with durable sequence metadata when available", () => {
const ingestProviderEvent = vi.fn((event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => ({
...event,
seq: 11,
}));
const persistenceService = {
ingestProviderEvent,
unbindSession: vi.fn(),
};
const manager = new ProviderManager({
persistenceService: persistenceService as never,
});
const events: Array<{ id: string; seq?: number }> = [];
manager.on("event", (event) => {
events.push({ id: event.id, seq: event.seq });
});

const internals = manager as unknown as {
onCodexEvent: (event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => void;
};

internals.onCodexEvent({
id: "evt-seq-1",
kind: "notification",
provider: "codex",
sessionId: "sess-1",
createdAt: new Date().toISOString(),
method: "turn/started",
threadId: "thread-1",
});

expect(ingestProviderEvent).toHaveBeenCalledTimes(1);
expect(events).toEqual([{ id: "evt-seq-1", seq: 11 }]);
manager.dispose();
});

it("detaches provider event listener and ends thread log streams on dispose", () => {
const manager = new ProviderManager();
const internals = manager as unknown as {
Expand Down
39 changes: 26 additions & 13 deletions apps/server/src/providerManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -180,18 +180,11 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
if (this.disposed) {
return;
}

this.routeEventToThreadLog(event);
try {
this.persistenceService?.ingestProviderEvent(event);
} catch {
// Persistence failures should not break provider streaming.
}
if (event.method === "session/closed" || event.method === "session/exited") {
this.persistenceService?.unbindSession(event.sessionId);
const emittedEvent = this.publishProviderEvent(event);
if (!emittedEvent) {
return;
}
this.emit("event", event);
this.maybeCaptureFilesystemCheckpoint(event);
this.maybeCaptureFilesystemCheckpoint(emittedEvent);
};

constructor(options: ProviderManagerOptions = {}) {
Expand DownExpand Up@@ -546,7 +539,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
}

private emitCheckpointCaptured(sessionId: string, threadId: string, turnCount: number): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "notification",
provider: "codex",
Expand All@@ -566,7 +559,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
message: string,
threadId?: string,
): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "error",
provider: "codex",
Expand All@@ -578,6 +571,26 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
});
}

private publishProviderEvent(event: ProviderEvent): ProviderEvent | null {
let emittedEvent = event;
try {
const persistedEvent = this.persistenceService?.ingestProviderEvent(event);
if (this.persistenceService && !persistedEvent) {
return null;
}
emittedEvent = persistedEvent ?? event;
} catch {
// Persistence failures should not break provider streaming.
}

this.routeEventToThreadLog(emittedEvent);
if (emittedEvent.method === "session/closed" || emittedEvent.method === "session/exited") {
this.persistenceService?.unbindSession(emittedEvent.sessionId);
}
this.emit("event", emittedEvent);
return emittedEvent;
}

private withFilesystemLock<T>(sessionId: string, fn: () => Promise<T>): Promise<T> {
const previous = this.filesystemLocks.get(sessionId) ?? Promise.resolve();
const next = previous.catch(() => undefined).then(fn);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
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
30 changes: 26 additions & 4 deletions apps/server/src/persistenceService.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ describe("PersistenceService", () => {
sessionId: "sess-1",
};

service.ingestProviderEvent({
const event1 = service.ingestProviderEvent({
...baseEvent,
id: "evt-1",
createdAt: iso(10),
Expand All@@ -115,8 +115,9 @@ describe("PersistenceService", () => {
},
},
});
expect(event1?.seq).toBeGreaterThan(0);

service.ingestProviderEvent({
const event2 = service.ingestProviderEvent({
...baseEvent,
id: "evt-2",
createdAt: iso(20),
Expand All@@ -128,8 +129,9 @@ describe("PersistenceService", () => {
delta: "hi",
},
});
expect((event2?.seq ?? 0) > (event1?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event3 = service.ingestProviderEvent({
...baseEvent,
id: "evt-3",
createdAt: iso(30),
Expand All@@ -142,8 +144,9 @@ describe("PersistenceService", () => {
},
},
});
expect((event3?.seq ?? 0) > (event2?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event4 = service.ingestProviderEvent({
...baseEvent,
id: "evt-4",
createdAt: iso(40),
Expand All@@ -156,6 +159,7 @@ describe("PersistenceService", () => {
},
},
});
expect((event4?.seq ?? 0) > (event3?.seq ?? 0)).toBe(true);

const snapshot = service.loadSnapshot();
expect(snapshot.projects).toHaveLength(1);
Expand All@@ -179,6 +183,24 @@ describe("PersistenceService", () => {
expect(catchUp.events.some((event) => event.eventType === "project.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "thread.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "message.upsert")).toBe(true);

const providerCatchUp = service.providerCatchUp({ afterSeq: 0 });
expect(providerCatchUp.lastProviderSeq).toBe(event4?.seq ?? 0);
expect(providerCatchUp.events.map((event) => event.id)).toEqual([
"evt-1",
"evt-2",
"evt-3",
"evt-4",
]);
const providerSeqs = providerCatchUp.events.map((event) => event.seq ?? 0);
for (let index = 1; index < providerSeqs.length; index += 1) {
expect(providerSeqs[index]).toBeGreaterThan(providerSeqs[index - 1] ?? Number.NEGATIVE_INFINITY);
}

const providerCatchUpAfterSecond = service.providerCatchUp({
afterSeq: event2?.seq ?? 0,
});
expect(providerCatchUpAfterSecond.events.map((event) => event.id)).toEqual(["evt-3", "evt-4"]);
} finally {
service.close();
}
Expand Down
108 changes: 105 additions & 3 deletions apps/server/src/persistenceService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
type ProjectRemoveInput,
type ProjectUpdateScriptsInput,
type ProjectUpdateScriptsResult,
type ProviderCatchUpInput,
type ProviderCatchUpResult,
type ProviderEvent,
type ProviderSendTurnInput,
type StateBootstrapResult,
Expand DownExpand Up@@ -44,6 +46,9 @@ import {
projectRemoveInputSchema,
projectScriptsSchema,
projectUpdateScriptsInputSchema,
providerCatchUpInputSchema,
providerCatchUpResultSchema,
providerEventSchema,
stateBootstrapResultSchema,
stateCatchUpInputSchema,
stateCatchUpResultSchema,
Expand DownExpand Up@@ -94,6 +99,25 @@ interface StateEventRow {
interface ProviderEventInsertResult {
inserted: boolean;
runtimeThreadId: string | null;
seq: number;
}

interface ProviderEventRow {
seq: number;
id: string;
session_id: string;
provider: string;
kind: string;
method: string;
thread_id: string | null;
turn_id: string | null;
item_id: string | null;
request_id: string | null;
request_kind: string | null;
text_delta: string | null;
message: string | null;
payload_json: string | null;
created_at: string;
}

export interface PersistenceServiceOptions {
Expand DownExpand Up@@ -772,6 +796,43 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

providerCatchUp(raw: ProviderCatchUpInput): ProviderCatchUpResult {
const input = providerCatchUpInputSchema.parse(raw);
const rows = this.db
.prepare(
`SELECT
seq,
id,
session_id,
provider,
kind,
method,
thread_id,
turn_id,
item_id,
request_id,
request_kind,
text_delta,
message,
payload_json,
created_at
FROM provider_events
WHERE seq > ?
ORDER BY seq ASC
LIMIT ?;`,
)
.all(input.afterSeq, input.limit) as unknown as ProviderEventRow[];

const events = rows
.map((row) => this.parseProviderEventRow(row))
.filter((event): event is ProviderEvent => event !== null);

return providerCatchUpResultSchema.parse({
events,
lastProviderSeq: this.readLastProviderSeq(),
});
}

listMessages(raw: StateListMessagesInput): StateListMessagesResult {
const input = stateListMessagesInputSchema.parse(raw);
const rows = this.db
Expand DownExpand Up@@ -867,12 +928,18 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

ingestProviderEvent(event: ProviderEvent): void {
ingestProviderEvent(event: ProviderEvent): ProviderEvent | null {
let persistedEvent: ProviderEvent | null = null;
this.withTransaction((pendingEvents) => {
const insertResult = this.insertProviderEvent(event);
if (!insertResult.inserted) {
return;
}
persistedEvent = providerEventSchema.parse({
...event,
seq: insertResult.seq,
...(insertResult.runtimeThreadId ? { threadId: insertResult.runtimeThreadId } : {}),
});

const localThreadId = this.resolveThreadIdForEvent(event, insertResult.runtimeThreadId);
if (!localThreadId) {
Expand DownExpand Up@@ -1138,6 +1205,7 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
}
}
});
return persistedEvent;
}

persistTurnDiffSummaryFromCheckpoint(input: {
Expand DownExpand Up@@ -1360,6 +1428,13 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
return row?.seq ?? 0;
}

private readLastProviderSeq(): number {
const row = this.db
.prepare("SELECT COALESCE(MAX(seq), 0) AS seq FROM provider_events;")
.get() as { seq: number } | undefined;
return row?.seq ?? 0;
}

private withTransaction<T>(fn: (pendingEvents: StateEvent[]) => T): T {
const pendingEvents: StateEvent[] = [];
const result = this.stateDb.transaction(() => fn(pendingEvents));
Expand DownExpand Up@@ -1766,13 +1841,40 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
event.message ?? null,
payloadJson,
event.createdAt,
) as { changes?: number | bigint };
) as { changes?: number | bigint; lastInsertRowid?: number | bigint };
const inserted = toSafeInteger(result.changes, 0) > 0;
return {
inserted: toSafeInteger(result.changes, 0) > 0,
inserted,
runtimeThreadId: runtimeThreadId ?? null,
seq: inserted ? toSafeInteger(result.lastInsertRowid, 0) : 0,
};
}

private parseProviderEventRow(row: ProviderEventRow): ProviderEvent | null {
const payload = row.payload_json ? this.tryParseJson(row.payload_json) : undefined;
const parsed = providerEventSchema.safeParse({
seq: row.seq,
id: row.id,
kind: row.kind,
provider: row.provider,
sessionId: row.session_id,
createdAt: row.created_at,
method: row.method,
...(row.thread_id ? { threadId: row.thread_id } : {}),
...(row.turn_id ? { turnId: row.turn_id } : {}),
...(row.item_id ? { itemId: row.item_id } : {}),
...(row.request_id ? { requestId: row.request_id } : {}),
...(row.request_kind ? { requestKind: row.request_kind } : {}),
...(row.text_delta !== null ? { textDelta: row.text_delta } : {}),
...(row.message ? { message: row.message } : {}),
...(payload !== undefined ? { payload } : {}),
});
if (!parsed.success) {
return null;
}
return parsed.data;
}

private parseJson<T>(json: string, schema: SafeParseSchema<T>): T | null {
const candidate = this.tryParseJson(json);
const parsed = schema.safeParse(candidate);
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/providerManager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,58 @@ import { describe, expect, it, vi } from "vitest";
import { ProviderManager } from "./providerManager";

describe("ProviderManager", () => {
it("emits persisted provider events with durable sequence metadata when available", () => {
const ingestProviderEvent = vi.fn((event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => ({
...event,
seq: 11,
}));
const persistenceService = {
ingestProviderEvent,
unbindSession: vi.fn(),
};
const manager = new ProviderManager({
persistenceService: persistenceService as never,
});
const events: Array<{ id: string; seq?: number }> = [];
manager.on("event", (event) => {
events.push({ id: event.id, seq: event.seq });
});

const internals = manager as unknown as {
onCodexEvent: (event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => void;
};

internals.onCodexEvent({
id: "evt-seq-1",
kind: "notification",
provider: "codex",
sessionId: "sess-1",
createdAt: new Date().toISOString(),
method: "turn/started",
threadId: "thread-1",
});

expect(ingestProviderEvent).toHaveBeenCalledTimes(1);
expect(events).toEqual([{ id: "evt-seq-1", seq: 11 }]);
manager.dispose();
});

it("detaches provider event listener and ends thread log streams on dispose", () => {
const manager = new ProviderManager();
const internals = manager as unknown as {
Expand Down
39 changes: 26 additions & 13 deletions apps/server/src/providerManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -180,18 +180,11 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
if (this.disposed) {
return;
}

this.routeEventToThreadLog(event);
try {
this.persistenceService?.ingestProviderEvent(event);
} catch {
// Persistence failures should not break provider streaming.
}
if (event.method === "session/closed" || event.method === "session/exited") {
this.persistenceService?.unbindSession(event.sessionId);
const emittedEvent = this.publishProviderEvent(event);
if (!emittedEvent) {
return;
}
this.emit("event", event);
this.maybeCaptureFilesystemCheckpoint(event);
this.maybeCaptureFilesystemCheckpoint(emittedEvent);
};

constructor(options: ProviderManagerOptions = {}) {
Expand DownExpand Up@@ -546,7 +539,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
}

private emitCheckpointCaptured(sessionId: string, threadId: string, turnCount: number): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "notification",
provider: "codex",
Expand All@@ -566,7 +559,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
message: string,
threadId?: string,
): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "error",
provider: "codex",
Expand All@@ -578,6 +571,26 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
});
}

private publishProviderEvent(event: ProviderEvent): ProviderEvent | null {
let emittedEvent = event;
try {
const persistedEvent = this.persistenceService?.ingestProviderEvent(event);
if (this.persistenceService && !persistedEvent) {
return null;
}
emittedEvent = persistedEvent ?? event;
} catch {
// Persistence failures should not break provider streaming.
}

this.routeEventToThreadLog(emittedEvent);
if (emittedEvent.method === "session/closed" || emittedEvent.method === "session/exited") {
this.persistenceService?.unbindSession(emittedEvent.sessionId);
}
this.emit("event", emittedEvent);
return emittedEvent;
}

private withFilesystemLock<T>(sessionId: string, fn: () => Promise<T>): Promise<T> {
const previous = this.filesystemLocks.get(sessionId) ?? Promise.resolve();
const next = previous.catch(() => undefined).then(fn);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
30 changes: 26 additions & 4 deletions apps/server/src/persistenceService.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ describe("PersistenceService", () => {
sessionId: "sess-1",
};

service.ingestProviderEvent({
const event1 = service.ingestProviderEvent({
...baseEvent,
id: "evt-1",
createdAt: iso(10),
Expand All@@ -115,8 +115,9 @@ describe("PersistenceService", () => {
},
},
});
expect(event1?.seq).toBeGreaterThan(0);

service.ingestProviderEvent({
const event2 = service.ingestProviderEvent({
...baseEvent,
id: "evt-2",
createdAt: iso(20),
Expand All@@ -128,8 +129,9 @@ describe("PersistenceService", () => {
delta: "hi",
},
});
expect((event2?.seq ?? 0) > (event1?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event3 = service.ingestProviderEvent({
...baseEvent,
id: "evt-3",
createdAt: iso(30),
Expand All@@ -142,8 +144,9 @@ describe("PersistenceService", () => {
},
},
});
expect((event3?.seq ?? 0) > (event2?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event4 = service.ingestProviderEvent({
...baseEvent,
id: "evt-4",
createdAt: iso(40),
Expand All@@ -156,6 +159,7 @@ describe("PersistenceService", () => {
},
},
});
expect((event4?.seq ?? 0) > (event3?.seq ?? 0)).toBe(true);

const snapshot = service.loadSnapshot();
expect(snapshot.projects).toHaveLength(1);
Expand All@@ -179,6 +183,24 @@ describe("PersistenceService", () => {
expect(catchUp.events.some((event) => event.eventType === "project.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "thread.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "message.upsert")).toBe(true);

const providerCatchUp = service.providerCatchUp({ afterSeq: 0 });
expect(providerCatchUp.lastProviderSeq).toBe(event4?.seq ?? 0);
expect(providerCatchUp.events.map((event) => event.id)).toEqual([
"evt-1",
"evt-2",
"evt-3",
"evt-4",
]);
const providerSeqs = providerCatchUp.events.map((event) => event.seq ?? 0);
for (let index = 1; index < providerSeqs.length; index += 1) {
expect(providerSeqs[index]).toBeGreaterThan(providerSeqs[index - 1] ?? Number.NEGATIVE_INFINITY);
}

const providerCatchUpAfterSecond = service.providerCatchUp({
afterSeq: event2?.seq ?? 0,
});
expect(providerCatchUpAfterSecond.events.map((event) => event.id)).toEqual(["evt-3", "evt-4"]);
} finally {
service.close();
}
Expand Down
108 changes: 105 additions & 3 deletions apps/server/src/persistenceService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
type ProjectRemoveInput,
type ProjectUpdateScriptsInput,
type ProjectUpdateScriptsResult,
type ProviderCatchUpInput,
type ProviderCatchUpResult,
type ProviderEvent,
type ProviderSendTurnInput,
type StateBootstrapResult,
Expand DownExpand Up@@ -44,6 +46,9 @@ import {
projectRemoveInputSchema,
projectScriptsSchema,
projectUpdateScriptsInputSchema,
providerCatchUpInputSchema,
providerCatchUpResultSchema,
providerEventSchema,
stateBootstrapResultSchema,
stateCatchUpInputSchema,
stateCatchUpResultSchema,
Expand DownExpand Up@@ -94,6 +99,25 @@ interface StateEventRow {
interface ProviderEventInsertResult {
inserted: boolean;
runtimeThreadId: string | null;
seq: number;
}

interface ProviderEventRow {
seq: number;
id: string;
session_id: string;
provider: string;
kind: string;
method: string;
thread_id: string | null;
turn_id: string | null;
item_id: string | null;
request_id: string | null;
request_kind: string | null;
text_delta: string | null;
message: string | null;
payload_json: string | null;
created_at: string;
}

export interface PersistenceServiceOptions {
Expand DownExpand Up@@ -772,6 +796,43 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

providerCatchUp(raw: ProviderCatchUpInput): ProviderCatchUpResult {
const input = providerCatchUpInputSchema.parse(raw);
const rows = this.db
.prepare(
`SELECT
seq,
id,
session_id,
provider,
kind,
method,
thread_id,
turn_id,
item_id,
request_id,
request_kind,
text_delta,
message,
payload_json,
created_at
FROM provider_events
WHERE seq > ?
ORDER BY seq ASC
LIMIT ?;`,
)
.all(input.afterSeq, input.limit) as unknown as ProviderEventRow[];

const events = rows
.map((row) => this.parseProviderEventRow(row))
.filter((event): event is ProviderEvent => event !== null);

return providerCatchUpResultSchema.parse({
events,
lastProviderSeq: this.readLastProviderSeq(),
});
}

listMessages(raw: StateListMessagesInput): StateListMessagesResult {
const input = stateListMessagesInputSchema.parse(raw);
const rows = this.db
Expand DownExpand Up@@ -867,12 +928,18 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

ingestProviderEvent(event: ProviderEvent): void {
ingestProviderEvent(event: ProviderEvent): ProviderEvent | null {
let persistedEvent: ProviderEvent | null = null;
this.withTransaction((pendingEvents) => {
const insertResult = this.insertProviderEvent(event);
if (!insertResult.inserted) {
return;
}
persistedEvent = providerEventSchema.parse({
...event,
seq: insertResult.seq,
...(insertResult.runtimeThreadId ? { threadId: insertResult.runtimeThreadId } : {}),
});

const localThreadId = this.resolveThreadIdForEvent(event, insertResult.runtimeThreadId);
if (!localThreadId) {
Expand DownExpand Up@@ -1138,6 +1205,7 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
}
}
});
return persistedEvent;
}

persistTurnDiffSummaryFromCheckpoint(input: {
Expand DownExpand Up@@ -1360,6 +1428,13 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
return row?.seq ?? 0;
}

private readLastProviderSeq(): number {
const row = this.db
.prepare("SELECT COALESCE(MAX(seq), 0) AS seq FROM provider_events;")
.get() as { seq: number } | undefined;
return row?.seq ?? 0;
}

private withTransaction<T>(fn: (pendingEvents: StateEvent[]) => T): T {
const pendingEvents: StateEvent[] = [];
const result = this.stateDb.transaction(() => fn(pendingEvents));
Expand DownExpand Up@@ -1766,13 +1841,40 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
event.message ?? null,
payloadJson,
event.createdAt,
) as { changes?: number | bigint };
) as { changes?: number | bigint; lastInsertRowid?: number | bigint };
const inserted = toSafeInteger(result.changes, 0) > 0;
return {
inserted: toSafeInteger(result.changes, 0) > 0,
inserted,
runtimeThreadId: runtimeThreadId ?? null,
seq: inserted ? toSafeInteger(result.lastInsertRowid, 0) : 0,
};
}

private parseProviderEventRow(row: ProviderEventRow): ProviderEvent | null {
const payload = row.payload_json ? this.tryParseJson(row.payload_json) : undefined;
const parsed = providerEventSchema.safeParse({
seq: row.seq,
id: row.id,
kind: row.kind,
provider: row.provider,
sessionId: row.session_id,
createdAt: row.created_at,
method: row.method,
...(row.thread_id ? { threadId: row.thread_id } : {}),
...(row.turn_id ? { turnId: row.turn_id } : {}),
...(row.item_id ? { itemId: row.item_id } : {}),
...(row.request_id ? { requestId: row.request_id } : {}),
...(row.request_kind ? { requestKind: row.request_kind } : {}),
...(row.text_delta !== null ? { textDelta: row.text_delta } : {}),
...(row.message ? { message: row.message } : {}),
...(payload !== undefined ? { payload } : {}),
});
if (!parsed.success) {
return null;
}
return parsed.data;
}

private parseJson<T>(json: string, schema: SafeParseSchema<T>): T | null {
const candidate = this.tryParseJson(json);
const parsed = schema.safeParse(candidate);
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/providerManager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,58 @@ import { describe, expect, it, vi } from "vitest";
import { ProviderManager } from "./providerManager";

describe("ProviderManager", () => {
it("emits persisted provider events with durable sequence metadata when available", () => {
const ingestProviderEvent = vi.fn((event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => ({
...event,
seq: 11,
}));
const persistenceService = {
ingestProviderEvent,
unbindSession: vi.fn(),
};
const manager = new ProviderManager({
persistenceService: persistenceService as never,
});
const events: Array<{ id: string; seq?: number }> = [];
manager.on("event", (event) => {
events.push({ id: event.id, seq: event.seq });
});

const internals = manager as unknown as {
onCodexEvent: (event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => void;
};

internals.onCodexEvent({
id: "evt-seq-1",
kind: "notification",
provider: "codex",
sessionId: "sess-1",
createdAt: new Date().toISOString(),
method: "turn/started",
threadId: "thread-1",
});

expect(ingestProviderEvent).toHaveBeenCalledTimes(1);
expect(events).toEqual([{ id: "evt-seq-1", seq: 11 }]);
manager.dispose();
});

it("detaches provider event listener and ends thread log streams on dispose", () => {
const manager = new ProviderManager();
const internals = manager as unknown as {
Expand Down
39 changes: 26 additions & 13 deletions apps/server/src/providerManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -180,18 +180,11 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
if (this.disposed) {
return;
}

this.routeEventToThreadLog(event);
try {
this.persistenceService?.ingestProviderEvent(event);
} catch {
// Persistence failures should not break provider streaming.
}
if (event.method === "session/closed" || event.method === "session/exited") {
this.persistenceService?.unbindSession(event.sessionId);
const emittedEvent = this.publishProviderEvent(event);
if (!emittedEvent) {
return;
}
this.emit("event", event);
this.maybeCaptureFilesystemCheckpoint(event);
this.maybeCaptureFilesystemCheckpoint(emittedEvent);
};

constructor(options: ProviderManagerOptions = {}) {
Expand DownExpand Up@@ -546,7 +539,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
}

private emitCheckpointCaptured(sessionId: string, threadId: string, turnCount: number): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "notification",
provider: "codex",
Expand All@@ -566,7 +559,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
message: string,
threadId?: string,
): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "error",
provider: "codex",
Expand All@@ -578,6 +571,26 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
});
}

private publishProviderEvent(event: ProviderEvent): ProviderEvent | null {
let emittedEvent = event;
try {
const persistedEvent = this.persistenceService?.ingestProviderEvent(event);
if (this.persistenceService && !persistedEvent) {
return null;
}
emittedEvent = persistedEvent ?? event;
} catch {
// Persistence failures should not break provider streaming.
}

this.routeEventToThreadLog(emittedEvent);
if (emittedEvent.method === "session/closed" || emittedEvent.method === "session/exited") {
this.persistenceService?.unbindSession(emittedEvent.sessionId);
}
this.emit("event", emittedEvent);
return emittedEvent;
}

private withFilesystemLock<T>(sessionId: string, fn: () => Promise<T>): Promise<T> {
const previous = this.filesystemLocks.get(sessionId) ?? Promise.resolve();
const next = previous.catch(() => undefined).then(fn);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
30 changes: 26 additions & 4 deletions apps/server/src/persistenceService.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ describe("PersistenceService", () => {
sessionId: "sess-1",
};

service.ingestProviderEvent({
const event1 = service.ingestProviderEvent({
...baseEvent,
id: "evt-1",
createdAt: iso(10),
Expand All@@ -115,8 +115,9 @@ describe("PersistenceService", () => {
},
},
});
expect(event1?.seq).toBeGreaterThan(0);

service.ingestProviderEvent({
const event2 = service.ingestProviderEvent({
...baseEvent,
id: "evt-2",
createdAt: iso(20),
Expand All@@ -128,8 +129,9 @@ describe("PersistenceService", () => {
delta: "hi",
},
});
expect((event2?.seq ?? 0) > (event1?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event3 = service.ingestProviderEvent({
...baseEvent,
id: "evt-3",
createdAt: iso(30),
Expand All@@ -142,8 +144,9 @@ describe("PersistenceService", () => {
},
},
});
expect((event3?.seq ?? 0) > (event2?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event4 = service.ingestProviderEvent({
...baseEvent,
id: "evt-4",
createdAt: iso(40),
Expand All@@ -156,6 +159,7 @@ describe("PersistenceService", () => {
},
},
});
expect((event4?.seq ?? 0) > (event3?.seq ?? 0)).toBe(true);

const snapshot = service.loadSnapshot();
expect(snapshot.projects).toHaveLength(1);
Expand All@@ -179,6 +183,24 @@ describe("PersistenceService", () => {
expect(catchUp.events.some((event) => event.eventType === "project.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "thread.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "message.upsert")).toBe(true);

const providerCatchUp = service.providerCatchUp({ afterSeq: 0 });
expect(providerCatchUp.lastProviderSeq).toBe(event4?.seq ?? 0);
expect(providerCatchUp.events.map((event) => event.id)).toEqual([
"evt-1",
"evt-2",
"evt-3",
"evt-4",
]);
const providerSeqs = providerCatchUp.events.map((event) => event.seq ?? 0);
for (let index = 1; index < providerSeqs.length; index += 1) {
expect(providerSeqs[index]).toBeGreaterThan(providerSeqs[index - 1] ?? Number.NEGATIVE_INFINITY);
}

const providerCatchUpAfterSecond = service.providerCatchUp({
afterSeq: event2?.seq ?? 0,
});
expect(providerCatchUpAfterSecond.events.map((event) => event.id)).toEqual(["evt-3", "evt-4"]);
} finally {
service.close();
}
Expand Down
108 changes: 105 additions & 3 deletions apps/server/src/persistenceService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
type ProjectRemoveInput,
type ProjectUpdateScriptsInput,
type ProjectUpdateScriptsResult,
type ProviderCatchUpInput,
type ProviderCatchUpResult,
type ProviderEvent,
type ProviderSendTurnInput,
type StateBootstrapResult,
Expand DownExpand Up@@ -44,6 +46,9 @@ import {
projectRemoveInputSchema,
projectScriptsSchema,
projectUpdateScriptsInputSchema,
providerCatchUpInputSchema,
providerCatchUpResultSchema,
providerEventSchema,
stateBootstrapResultSchema,
stateCatchUpInputSchema,
stateCatchUpResultSchema,
Expand DownExpand Up@@ -94,6 +99,25 @@ interface StateEventRow {
interface ProviderEventInsertResult {
inserted: boolean;
runtimeThreadId: string | null;
seq: number;
}

interface ProviderEventRow {
seq: number;
id: string;
session_id: string;
provider: string;
kind: string;
method: string;
thread_id: string | null;
turn_id: string | null;
item_id: string | null;
request_id: string | null;
request_kind: string | null;
text_delta: string | null;
message: string | null;
payload_json: string | null;
created_at: string;
}

export interface PersistenceServiceOptions {
Expand DownExpand Up@@ -772,6 +796,43 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

providerCatchUp(raw: ProviderCatchUpInput): ProviderCatchUpResult {
const input = providerCatchUpInputSchema.parse(raw);
const rows = this.db
.prepare(
`SELECT
seq,
id,
session_id,
provider,
kind,
method,
thread_id,
turn_id,
item_id,
request_id,
request_kind,
text_delta,
message,
payload_json,
created_at
FROM provider_events
WHERE seq > ?
ORDER BY seq ASC
LIMIT ?;`,
)
.all(input.afterSeq, input.limit) as unknown as ProviderEventRow[];

const events = rows
.map((row) => this.parseProviderEventRow(row))
.filter((event): event is ProviderEvent => event !== null);

return providerCatchUpResultSchema.parse({
events,
lastProviderSeq: this.readLastProviderSeq(),
});
}

listMessages(raw: StateListMessagesInput): StateListMessagesResult {
const input = stateListMessagesInputSchema.parse(raw);
const rows = this.db
Expand DownExpand Up@@ -867,12 +928,18 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

ingestProviderEvent(event: ProviderEvent): void {
ingestProviderEvent(event: ProviderEvent): ProviderEvent | null {
let persistedEvent: ProviderEvent | null = null;
this.withTransaction((pendingEvents) => {
const insertResult = this.insertProviderEvent(event);
if (!insertResult.inserted) {
return;
}
persistedEvent = providerEventSchema.parse({
...event,
seq: insertResult.seq,
...(insertResult.runtimeThreadId ? { threadId: insertResult.runtimeThreadId } : {}),
});

const localThreadId = this.resolveThreadIdForEvent(event, insertResult.runtimeThreadId);
if (!localThreadId) {
Expand DownExpand Up@@ -1138,6 +1205,7 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
}
}
});
return persistedEvent;
}

persistTurnDiffSummaryFromCheckpoint(input: {
Expand DownExpand Up@@ -1360,6 +1428,13 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
return row?.seq ?? 0;
}

private readLastProviderSeq(): number {
const row = this.db
.prepare("SELECT COALESCE(MAX(seq), 0) AS seq FROM provider_events;")
.get() as { seq: number } | undefined;
return row?.seq ?? 0;
}

private withTransaction<T>(fn: (pendingEvents: StateEvent[]) => T): T {
const pendingEvents: StateEvent[] = [];
const result = this.stateDb.transaction(() => fn(pendingEvents));
Expand DownExpand Up@@ -1766,13 +1841,40 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
event.message ?? null,
payloadJson,
event.createdAt,
) as { changes?: number | bigint };
) as { changes?: number | bigint; lastInsertRowid?: number | bigint };
const inserted = toSafeInteger(result.changes, 0) > 0;
return {
inserted: toSafeInteger(result.changes, 0) > 0,
inserted,
runtimeThreadId: runtimeThreadId ?? null,
seq: inserted ? toSafeInteger(result.lastInsertRowid, 0) : 0,
};
}

private parseProviderEventRow(row: ProviderEventRow): ProviderEvent | null {
const payload = row.payload_json ? this.tryParseJson(row.payload_json) : undefined;
const parsed = providerEventSchema.safeParse({
seq: row.seq,
id: row.id,
kind: row.kind,
provider: row.provider,
sessionId: row.session_id,
createdAt: row.created_at,
method: row.method,
...(row.thread_id ? { threadId: row.thread_id } : {}),
...(row.turn_id ? { turnId: row.turn_id } : {}),
...(row.item_id ? { itemId: row.item_id } : {}),
...(row.request_id ? { requestId: row.request_id } : {}),
...(row.request_kind ? { requestKind: row.request_kind } : {}),
...(row.text_delta !== null ? { textDelta: row.text_delta } : {}),
...(row.message ? { message: row.message } : {}),
...(payload !== undefined ? { payload } : {}),
});
if (!parsed.success) {
return null;
}
return parsed.data;
}

private parseJson<T>(json: string, schema: SafeParseSchema<T>): T | null {
const candidate = this.tryParseJson(json);
const parsed = schema.safeParse(candidate);
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/providerManager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,58 @@ import { describe, expect, it, vi } from "vitest";
import { ProviderManager } from "./providerManager";

describe("ProviderManager", () => {
it("emits persisted provider events with durable sequence metadata when available", () => {
const ingestProviderEvent = vi.fn((event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => ({
...event,
seq: 11,
}));
const persistenceService = {
ingestProviderEvent,
unbindSession: vi.fn(),
};
const manager = new ProviderManager({
persistenceService: persistenceService as never,
});
const events: Array<{ id: string; seq?: number }> = [];
manager.on("event", (event) => {
events.push({ id: event.id, seq: event.seq });
});

const internals = manager as unknown as {
onCodexEvent: (event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => void;
};

internals.onCodexEvent({
id: "evt-seq-1",
kind: "notification",
provider: "codex",
sessionId: "sess-1",
createdAt: new Date().toISOString(),
method: "turn/started",
threadId: "thread-1",
});

expect(ingestProviderEvent).toHaveBeenCalledTimes(1);
expect(events).toEqual([{ id: "evt-seq-1", seq: 11 }]);
manager.dispose();
});

it("detaches provider event listener and ends thread log streams on dispose", () => {
const manager = new ProviderManager();
const internals = manager as unknown as {
Expand Down
39 changes: 26 additions & 13 deletions apps/server/src/providerManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -180,18 +180,11 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
if (this.disposed) {
return;
}

this.routeEventToThreadLog(event);
try {
this.persistenceService?.ingestProviderEvent(event);
} catch {
// Persistence failures should not break provider streaming.
}
if (event.method === "session/closed" || event.method === "session/exited") {
this.persistenceService?.unbindSession(event.sessionId);
const emittedEvent = this.publishProviderEvent(event);
if (!emittedEvent) {
return;
}
this.emit("event", event);
this.maybeCaptureFilesystemCheckpoint(event);
this.maybeCaptureFilesystemCheckpoint(emittedEvent);
};

constructor(options: ProviderManagerOptions = {}) {
Expand DownExpand Up@@ -546,7 +539,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
}

private emitCheckpointCaptured(sessionId: string, threadId: string, turnCount: number): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "notification",
provider: "codex",
Expand All@@ -566,7 +559,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
message: string,
threadId?: string,
): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "error",
provider: "codex",
Expand All@@ -578,6 +571,26 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
});
}

private publishProviderEvent(event: ProviderEvent): ProviderEvent | null {
let emittedEvent = event;
try {
const persistedEvent = this.persistenceService?.ingestProviderEvent(event);
if (this.persistenceService && !persistedEvent) {
return null;
}
emittedEvent = persistedEvent ?? event;
} catch {
// Persistence failures should not break provider streaming.
}

this.routeEventToThreadLog(emittedEvent);
if (emittedEvent.method === "session/closed" || emittedEvent.method === "session/exited") {
this.persistenceService?.unbindSession(emittedEvent.sessionId);
}
this.emit("event", emittedEvent);
return emittedEvent;
}

private withFilesystemLock<T>(sessionId: string, fn: () => Promise<T>): Promise<T> {
const previous = this.filesystemLocks.get(sessionId) ?? Promise.resolve();
const next = previous.catch(() => undefined).then(fn);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
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
30 changes: 26 additions & 4 deletions apps/server/src/persistenceService.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ describe("PersistenceService", () => {
sessionId: "sess-1",
};

service.ingestProviderEvent({
const event1 = service.ingestProviderEvent({
...baseEvent,
id: "evt-1",
createdAt: iso(10),
Expand All@@ -115,8 +115,9 @@ describe("PersistenceService", () => {
},
},
});
expect(event1?.seq).toBeGreaterThan(0);

service.ingestProviderEvent({
const event2 = service.ingestProviderEvent({
...baseEvent,
id: "evt-2",
createdAt: iso(20),
Expand All@@ -128,8 +129,9 @@ describe("PersistenceService", () => {
delta: "hi",
},
});
expect((event2?.seq ?? 0) > (event1?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event3 = service.ingestProviderEvent({
...baseEvent,
id: "evt-3",
createdAt: iso(30),
Expand All@@ -142,8 +144,9 @@ describe("PersistenceService", () => {
},
},
});
expect((event3?.seq ?? 0) > (event2?.seq ?? 0)).toBe(true);

service.ingestProviderEvent({
const event4 = service.ingestProviderEvent({
...baseEvent,
id: "evt-4",
createdAt: iso(40),
Expand All@@ -156,6 +159,7 @@ describe("PersistenceService", () => {
},
},
});
expect((event4?.seq ?? 0) > (event3?.seq ?? 0)).toBe(true);

const snapshot = service.loadSnapshot();
expect(snapshot.projects).toHaveLength(1);
Expand All@@ -179,6 +183,24 @@ describe("PersistenceService", () => {
expect(catchUp.events.some((event) => event.eventType === "project.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "thread.upsert")).toBe(true);
expect(catchUp.events.some((event) => event.eventType === "message.upsert")).toBe(true);

const providerCatchUp = service.providerCatchUp({ afterSeq: 0 });
expect(providerCatchUp.lastProviderSeq).toBe(event4?.seq ?? 0);
expect(providerCatchUp.events.map((event) => event.id)).toEqual([
"evt-1",
"evt-2",
"evt-3",
"evt-4",
]);
const providerSeqs = providerCatchUp.events.map((event) => event.seq ?? 0);
for (let index = 1; index < providerSeqs.length; index += 1) {
expect(providerSeqs[index]).toBeGreaterThan(providerSeqs[index - 1] ?? Number.NEGATIVE_INFINITY);
}

const providerCatchUpAfterSecond = service.providerCatchUp({
afterSeq: event2?.seq ?? 0,
});
expect(providerCatchUpAfterSecond.events.map((event) => event.id)).toEqual(["evt-3", "evt-4"]);
} finally {
service.close();
}
Expand Down
108 changes: 105 additions & 3 deletions apps/server/src/persistenceService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@ import {
type ProjectRemoveInput,
type ProjectUpdateScriptsInput,
type ProjectUpdateScriptsResult,
type ProviderCatchUpInput,
type ProviderCatchUpResult,
type ProviderEvent,
type ProviderSendTurnInput,
type StateBootstrapResult,
Expand DownExpand Up@@ -44,6 +46,9 @@ import {
projectRemoveInputSchema,
projectScriptsSchema,
projectUpdateScriptsInputSchema,
providerCatchUpInputSchema,
providerCatchUpResultSchema,
providerEventSchema,
stateBootstrapResultSchema,
stateCatchUpInputSchema,
stateCatchUpResultSchema,
Expand DownExpand Up@@ -94,6 +99,25 @@ interface StateEventRow {
interface ProviderEventInsertResult {
inserted: boolean;
runtimeThreadId: string | null;
seq: number;
}

interface ProviderEventRow {
seq: number;
id: string;
session_id: string;
provider: string;
kind: string;
method: string;
thread_id: string | null;
turn_id: string | null;
item_id: string | null;
request_id: string | null;
request_kind: string | null;
text_delta: string | null;
message: string | null;
payload_json: string | null;
created_at: string;
}

export interface PersistenceServiceOptions {
Expand DownExpand Up@@ -772,6 +796,43 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

providerCatchUp(raw: ProviderCatchUpInput): ProviderCatchUpResult {
const input = providerCatchUpInputSchema.parse(raw);
const rows = this.db
.prepare(
`SELECT
seq,
id,
session_id,
provider,
kind,
method,
thread_id,
turn_id,
item_id,
request_id,
request_kind,
text_delta,
message,
payload_json,
created_at
FROM provider_events
WHERE seq > ?
ORDER BY seq ASC
LIMIT ?;`,
)
.all(input.afterSeq, input.limit) as unknown as ProviderEventRow[];

const events = rows
.map((row) => this.parseProviderEventRow(row))
.filter((event): event is ProviderEvent => event !== null);

return providerCatchUpResultSchema.parse({
events,
lastProviderSeq: this.readLastProviderSeq(),
});
}

listMessages(raw: StateListMessagesInput): StateListMessagesResult {
const input = stateListMessagesInputSchema.parse(raw);
const rows = this.db
Expand DownExpand Up@@ -867,12 +928,18 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
});
}

ingestProviderEvent(event: ProviderEvent): void {
ingestProviderEvent(event: ProviderEvent): ProviderEvent | null {
let persistedEvent: ProviderEvent | null = null;
this.withTransaction((pendingEvents) => {
const insertResult = this.insertProviderEvent(event);
if (!insertResult.inserted) {
return;
}
persistedEvent = providerEventSchema.parse({
...event,
seq: insertResult.seq,
...(insertResult.runtimeThreadId ? { threadId: insertResult.runtimeThreadId } : {}),
});

const localThreadId = this.resolveThreadIdForEvent(event, insertResult.runtimeThreadId);
if (!localThreadId) {
Expand DownExpand Up@@ -1138,6 +1205,7 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
}
}
});
return persistedEvent;
}

persistTurnDiffSummaryFromCheckpoint(input: {
Expand DownExpand Up@@ -1360,6 +1428,13 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
return row?.seq ?? 0;
}

private readLastProviderSeq(): number {
const row = this.db
.prepare("SELECT COALESCE(MAX(seq), 0) AS seq FROM provider_events;")
.get() as { seq: number } | undefined;
return row?.seq ?? 0;
}

private withTransaction<T>(fn: (pendingEvents: StateEvent[]) => T): T {
const pendingEvents: StateEvent[] = [];
const result = this.stateDb.transaction(() => fn(pendingEvents));
Expand DownExpand Up@@ -1766,13 +1841,40 @@ export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
event.message ?? null,
payloadJson,
event.createdAt,
) as { changes?: number | bigint };
) as { changes?: number | bigint; lastInsertRowid?: number | bigint };
const inserted = toSafeInteger(result.changes, 0) > 0;
return {
inserted: toSafeInteger(result.changes, 0) > 0,
inserted,
runtimeThreadId: runtimeThreadId ?? null,
seq: inserted ? toSafeInteger(result.lastInsertRowid, 0) : 0,
};
}

private parseProviderEventRow(row: ProviderEventRow): ProviderEvent | null {
const payload = row.payload_json ? this.tryParseJson(row.payload_json) : undefined;
const parsed = providerEventSchema.safeParse({
seq: row.seq,
id: row.id,
kind: row.kind,
provider: row.provider,
sessionId: row.session_id,
createdAt: row.created_at,
method: row.method,
...(row.thread_id ? { threadId: row.thread_id } : {}),
...(row.turn_id ? { turnId: row.turn_id } : {}),
...(row.item_id ? { itemId: row.item_id } : {}),
...(row.request_id ? { requestId: row.request_id } : {}),
...(row.request_kind ? { requestKind: row.request_kind } : {}),
...(row.text_delta !== null ? { textDelta: row.text_delta } : {}),
...(row.message ? { message: row.message } : {}),
...(payload !== undefined ? { payload } : {}),
});
if (!parsed.success) {
return null;
}
return parsed.data;
}

private parseJson<T>(json: string, schema: SafeParseSchema<T>): T | null {
const candidate = this.tryParseJson(json);
const parsed = schema.safeParse(candidate);
Expand Down
52 changes: 52 additions & 0 deletions apps/server/src/providerManager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,58 @@ import { describe, expect, it, vi } from "vitest";
import { ProviderManager } from "./providerManager";

describe("ProviderManager", () => {
it("emits persisted provider events with durable sequence metadata when available", () => {
const ingestProviderEvent = vi.fn((event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => ({
...event,
seq: 11,
}));
const persistenceService = {
ingestProviderEvent,
unbindSession: vi.fn(),
};
const manager = new ProviderManager({
persistenceService: persistenceService as never,
});
const events: Array<{ id: string; seq?: number }> = [];
manager.on("event", (event) => {
events.push({ id: event.id, seq: event.seq });
});

const internals = manager as unknown as {
onCodexEvent: (event: {
id: string;
kind: "notification";
provider: "codex";
sessionId: string;
createdAt: string;
method: string;
threadId: string;
}) => void;
};

internals.onCodexEvent({
id: "evt-seq-1",
kind: "notification",
provider: "codex",
sessionId: "sess-1",
createdAt: new Date().toISOString(),
method: "turn/started",
threadId: "thread-1",
});

expect(ingestProviderEvent).toHaveBeenCalledTimes(1);
expect(events).toEqual([{ id: "evt-seq-1", seq: 11 }]);
manager.dispose();
});

it("detaches provider event listener and ends thread log streams on dispose", () => {
const manager = new ProviderManager();
const internals = manager as unknown as {
Expand Down
39 changes: 26 additions & 13 deletions apps/server/src/providerManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -180,18 +180,11 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
if (this.disposed) {
return;
}

this.routeEventToThreadLog(event);
try {
this.persistenceService?.ingestProviderEvent(event);
} catch {
// Persistence failures should not break provider streaming.
}
if (event.method === "session/closed" || event.method === "session/exited") {
this.persistenceService?.unbindSession(event.sessionId);
const emittedEvent = this.publishProviderEvent(event);
if (!emittedEvent) {
return;
}
this.emit("event", event);
this.maybeCaptureFilesystemCheckpoint(event);
this.maybeCaptureFilesystemCheckpoint(emittedEvent);
};

constructor(options: ProviderManagerOptions = {}) {
Expand DownExpand Up@@ -546,7 +539,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
}

private emitCheckpointCaptured(sessionId: string, threadId: string, turnCount: number): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "notification",
provider: "codex",
Expand All@@ -566,7 +559,7 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
message: string,
threadId?: string,
): void {
this.emit("event", {
this.publishProviderEvent({
id: randomUUID(),
kind: "error",
provider: "codex",
Expand All@@ -578,6 +571,26 @@ export class ProviderManager extends EventEmitter<ProviderManagerEvents> {
});
}

private publishProviderEvent(event: ProviderEvent): ProviderEvent | null {
let emittedEvent = event;
try {
const persistedEvent = this.persistenceService?.ingestProviderEvent(event);
if (this.persistenceService && !persistedEvent) {
return null;
}
emittedEvent = persistedEvent ?? event;
} catch {
// Persistence failures should not break provider streaming.
}

this.routeEventToThreadLog(emittedEvent);
if (emittedEvent.method === "session/closed" || emittedEvent.method === "session/exited") {
this.persistenceService?.unbindSession(emittedEvent.sessionId);
}
this.emit("event", emittedEvent);
return emittedEvent;
}

private withFilesystemLock<T>(sessionId: string, fn: () => Promise<T>): Promise<T> {
const previous = this.filesystemLocks.get(sessionId) ?? Promise.resolve();
const next = previous.catch(() => undefined).then(fn);
Expand Down
Loading
Loading