The open-source agent harness - the runtime layer that turns an LLM into a working agent.
Update schema for globally unique sessions (#27)
Bhavesh Patel7bb58e0ebe3a
diff --git a/packages/harness/src/agent-session/SessionHandle.ts b/packages/harness/src/agent-session/SessionHandle.tsindex 759db0c49..d1f2bce4e 100644--- a/packages/harness/src/agent-session/SessionHandle.ts+++ b/packages/harness/src/agent-session/SessionHandle.ts@@ -181,7 +181,6 @@ export class SessionHandle<const previousTurnId = resolvePreviousTurnId(input.previous_turn_id, this.session.last_turn_id);const previous = previousTurnId? await this.store.freezeAndGetTurn({- tenant_id: this.tenant_id,session_id: this.session.session_id,turn_id: previousTurnId,turn_done_event: cancelledTurnDoneEvent(),@@ -273,7 +272,6 @@ export class SessionHandle<};await this.store.createTurn({- tenant_id: this.tenant_id,turn: turnInit,new_threads,new_context_appends,@@ -294,7 +292,6 @@ export class SessionHandle<return new TurnHandle({store: this.store,- tenantId: this.tenant_id,turn: turnRecord,orchestrator,resolver: input.resolver,@@ -313,7 +310,6 @@ export class SessionHandle</** Returns the turn handle (store-backed; not executable), or undefined if not found. */async getTurn(turn_id: string): Promise<TurnHandle<TTurnCustom> | undefined> {const turn = await this.store.getTurn({- tenant_id: this.tenant_id,session_id: this.session.session_id,turn_id,});@@ -322,7 +318,6 @@ export class SessionHandle<}return TurnHandle.fromRecord({store: this.store,- tenantId: this.tenant_id,turn,});}@@ -333,7 +328,6 @@ export class SessionHandle<page_token?: string | undefined;}): Promise<{ data: TurnRecordWithoutSnapshot<TTurnCustom>[]; pagination: TokenPagination }> {return this.store.listTurns({- tenant_id: this.tenant_id,session_id: this.session.session_id,limit: input.limit,page_token: input.page_token,@@ -354,7 +348,6 @@ export class SessionHandle<pagination: TokenPagination;}> {return this.store.listSessionEvents({- tenant_id: this.tenant_id,session_id: this.session.session_id,limit: input.limit,page_token: input.page_token,diff --git a/packages/harness/src/agent-session/TurnHandle.ts b/packages/harness/src/agent-session/TurnHandle.tsindex 67ab183d8..60a751fc6 100644--- a/packages/harness/src/agent-session/TurnHandle.ts+++ b/packages/harness/src/agent-session/TurnHandle.ts@@ -87,7 +87,6 @@ function turnMetricsFromAgentThreadMetrics(metrics: AgentThreadMetrics): TurnMetexport class TurnHandle<TTurnCustom extends object = Record<string, never>> {private readonly store: ISessionStore<object, TTurnCustom>;- private readonly tenantId: string;private turn: TurnRecord<TTurnCustom>;private readonly orchestrator: AgentThreadOrchestrator | undefined;private readonly resolver: ITurnResourceResolver<TTurnCustom> | undefined;@@ -96,14 +95,12 @@ export class TurnHandle<TTurnCustom extends object = Record<string, never>> {constructor(options: {store: ISessionStore<object, TTurnCustom>;- tenantId: string;turn: TurnRecord<TTurnCustom>;orchestrator?: AgentThreadOrchestrator | undefined;resolver?: ITurnResourceResolver<TTurnCustom> | undefined;signal?: AbortSignal | undefined;}) {this.store = options.store;- this.tenantId = options.tenantId;this.turn = options.turn;this.orchestrator = options.orchestrator;this.resolver = options.resolver;@@ -113,7 +110,6 @@ export class TurnHandle<TTurnCustom extends object = Record<string, never>> {/** Store-only handle (e.g. from {@link SessionHandle.getTurn}) — stream() is not available. */static fromRecord<TCustom extends object = Record<string, never>>(options: {store: ISessionStore<object, TCustom>;- tenantId: string;turn: TurnRecord<TCustom>;}): TurnHandle<TCustom> {return new TurnHandle(options);@@ -210,7 +206,6 @@ export class TurnHandle<TTurnCustom extends object = Record<string, never>> {thread_id: null,};await this.store.appendToEvents({- tenant_id: this.tenantId,session_id: this.turn.session_id,turn_id: this.turn.turn_id,events: [turnCreated],@@ -324,7 +319,6 @@ export class TurnHandle<TTurnCustom extends object = Record<string, never>> {if (!frozenByStore) {try {await this.store.updateTurnState({- tenant_id: this.tenantId,session_id: this.turn.session_id,turn_id: this.turn.turn_id,state: terminalState,@@ -377,7 +371,6 @@ export class TurnHandle<TTurnCustom extends object = Record<string, never>> {pagination: TokenPagination;}> {return this.store.listTurnEvents({- tenant_id: this.tenantId,session_id: this.turn.session_id,turn_id: this.turn.turn_id,limit: input.limit,@@ -392,7 +385,6 @@ export class TurnHandle<TTurnCustom extends object = Record<string, never>> {*/private async persistExecutionEvent(event: AgentThreadExecutionEvent): Promise<TurnStreamingEvent | null> {const scope = {- tenant_id: this.tenantId,session_id: this.turn.session_id,turn_id: this.turn.turn_id,};diff --git a/packages/harness/src/agent-session/store/ISessionStore.ts b/packages/harness/src/agent-session/store/ISessionStore.tsindex 00b764bdd..ea5c6bedd 100644--- a/packages/harness/src/agent-session/store/ISessionStore.ts+++ b/packages/harness/src/agent-session/store/ISessionStore.ts@@ -69,7 +69,6 @@ export interface TurnContextAppend {}export interface CreateTurnInput<TTurnCustom extends object = Record<string, never>> {- tenant_id: string;turn: TurnRecordWithoutSnapshot<TTurnCustom>;/** Threads absent on the previous turn (turn 1: the root thread; else empty). */new_threads: NewThreadInit[];@@ -91,7 +90,6 @@ export interface CreateTurnInput<TTurnCustom extends object = Record<string, nev}export interface FreezeAndGetTurnInput {- tenant_id: string;session_id: string;turn_id: string;/** Caller-built cancelled turn.done event; store persists atomically with state flip when it cancels. */@@ -99,20 +97,17 @@ export interface FreezeAndGetTurnInput {}export interface GetTurnInput {- tenant_id: string;session_id: string;turn_id: string;}export interface ListTurnsInput {- tenant_id: string;session_id: string;limit: number;page_token: string | undefined;}export interface UpdateTurnStateInput {- tenant_id: string;session_id: string;turn_id: string;state: TerminalTurnState;@@ -121,28 +116,24 @@ export interface UpdateTurnStateInput {}export interface AppendToEventsInput {- tenant_id: string;session_id: string;turn_id: string;events: PersistedTurnEvent[];}export interface AddThreadsInput {- tenant_id: string;session_id: string;turn_id: string;threads: AgentThreadSnapshot[];}export interface RemoveThreadsInput {- tenant_id: string;session_id: string;turn_id: string;thread_ids: string[];}export interface AppendToThreadContextInput {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;@@ -152,28 +143,24 @@ export interface AppendToThreadContextInput {}export interface OverwriteThreadContextInput {- tenant_id: string;session_id: string;turn_id: string;event: ThreadOverwriteContextEvent;}export interface PatchMCPServersInput {- tenant_id: string;session_id: string;turn_id: string;mcp_servers: MCPServerInitInfo[];}export interface PatchSandboxInfoInput {- tenant_id: string;session_id: string;turn_id: string;sandbox_info: SandboxInfo;}export interface PatchThreadCapabilityStateInput {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;@@ -182,7 +169,6 @@ export interface PatchThreadCapabilityStateInput {}export interface ListTurnEventsInput {- tenant_id: string;session_id: string;turn_id: string;limit: number;@@ -191,7 +177,6 @@ export interface ListTurnEventsInput {}export interface ListSessionEventsInput {- tenant_id: string;session_id: string;limit: number;page_token: string | undefined;@@ -200,7 +185,8 @@ export interface ListSessionEventsInput {/*** Session/turn persistence contract. Pure durability: no streaming, SSE, or- * subscription members. Turn-scoped ops take session_id (membership check).+ * subscription members. Callers authorize the parent session before using+ * turn-scoped operations, which rely on globally unique session_id values.* Capability maps are initialized atomically by createTurn and subsequently* updated through patchThreadCapabilityState. Agent binding is session-scoped:* reads always return a hydrated agent_spec even if the backend persists a uri/id.@@ -212,6 +198,7 @@ export interface ISessionStore</*** Accepts a hydrated AgentSpec. Impl may persist the blob and/or a uri/id derived* from it — callers do not pass a bare pointer through this API.+ * `session_id` is globally unique across tenants.* Sets `last_activity_timestamp_ms` (= now) on create.*/createSession(input: CreateSessionInput<TSessionCustom>): Promise<void>;diff --git a/packages/harness/src/agent-session/store/InMemorySessionStore.ts b/packages/harness/src/agent-session/store/InMemorySessionStore.tsindex 042b0c394..100e1ccec 100644--- a/packages/harness/src/agent-session/store/InMemorySessionStore.ts+++ b/packages/harness/src/agent-session/store/InMemorySessionStore.ts@@ -60,12 +60,12 @@ function deepCopy<T>(value: T): T {return structuredClone(value);}-function sessionKey(tenant: string, sessionId: string): string {- return `${tenant}:${sessionId}`;+function sessionKey(sessionId: string): string {+ return sessionId;}-function turnKey(tenant: string, sessionId: string, turnId: string): string {- return `${tenant}:${sessionId}:${turnId}`;+function turnKey({ session_id, turn_id }: { session_id: string; turn_id: string }): string {+ return `${session_id}:${turn_id}`;}function newThreadSnapshot(thread: NewThreadInit): AgentThreadSnapshot {@@ -156,7 +156,7 @@ export class InMemorySessionStore<private readonly events = new Map<string, StoredEvent[]>();async createSession(input: CreateSessionInput<TSessionCustom>): Promise<void> {- const key = sessionKey(input.tenant_id, input.session_id);+ const key = sessionKey(input.session_id);if (this.sessions.has(key)) {throw new SessionAlreadyExistsError(input.session_id);}@@ -177,14 +177,14 @@ export class InMemorySessionStore<}async getSession(input: GetSessionInput): Promise<SessionRecord<TSessionCustom> | undefined> {- const stored = this.sessions.get(sessionKey(input.tenant_id, input.session_id));- return stored ? deepCopy(stored.record) : undefined;+ const stored = this.sessions.get(sessionKey(input.session_id));+ return stored?.record.tenant_id === input.tenant_id ? deepCopy(stored.record) : undefined;}async updateSession(input: UpdateSessionInput<TSessionCustom>): Promise<void> {- const key = sessionKey(input.tenant_id, input.session_id);+ const key = sessionKey(input.session_id);const stored = this.sessions.get(key);- if (!stored) {+ if (stored?.record.tenant_id !== input.tenant_id) {throw new SessionNotFoundError(input.session_id);}if (input.agent_spec !== undefined) {@@ -202,10 +202,9 @@ export class InMemorySessionStore<async listSessions(input: ListSessionsInput,): Promise<{ data: SessionRecord<TSessionCustom>[]; pagination: TokenPagination }> {- const prefix = `${input.tenant_id}:`;const records: SessionRecord<TSessionCustom>[] = [];- for (const [key, stored] of this.sessions) {- if (!key.startsWith(prefix)) continue;+ for (const stored of this.sessions.values()) {+ if (stored.record.tenant_id !== input.tenant_id) continue;const createdAt = stored.record.created_at.getTime();if (input.start_timestamp !== undefined && createdAt < input.start_timestamp.getTime()) continue;if (input.end_timestamp !== undefined && createdAt > input.end_timestamp.getTime()) continue;@@ -224,7 +223,7 @@ export class InMemorySessionStore<// Atomicity is free here: this body is fully synchronous, so Node's// run-to-completion guarantees it. Real backends must still use their own// locking/transactions to satisfy the ISessionStore createTurn contract.- const sKey = sessionKey(input.tenant_id, input.turn.session_id);+ const sKey = sessionKey(input.turn.session_id);const stored = this.sessions.get(sKey);if (!stored) {throw new SessionNotFoundError(input.turn.session_id);@@ -233,7 +232,7 @@ export class InMemorySessionStore<const previousTurnId = input.turn.previous_turn_id;let previousSnapshot: TurnSnapshot | undefined;if (previousTurnId !== null) {- const prevKey = turnKey(input.tenant_id, input.turn.session_id, previousTurnId);+ const prevKey = turnKey({ session_id: input.turn.session_id, turn_id: previousTurnId });const prev = this.turns.get(prevKey);// Unknown previous_turn_id is allowed (relaxed): treat as no inheritance.// A still-running previous must be frozen first.@@ -245,7 +244,7 @@ export class InMemorySessionStore<}}- const tKey = turnKey(input.tenant_id, input.turn.session_id, input.turn.turn_id);+ const tKey = turnKey(input.turn);if (this.turns.has(tKey)) {throw new TurnAlreadyExistsError(input.turn.turn_id);}@@ -274,11 +273,8 @@ export class InMemorySessionStore<}async freezeAndGetTurn(input: FreezeAndGetTurnInput): Promise<TurnRecord<TTurnCustom>> {- const tKey = turnKey(input.tenant_id, input.session_id, input.turn_id);- const turn = this.turns.get(tKey);- if (!turn) {- throw new TurnNotFoundError(input.turn_id);- }+ const tKey = turnKey(input);+ const turn = this.requireTurn(input.session_id, input.turn_id);if (turn.state.status === 'running') {const cancelledState: TerminalTurnState = {@@ -298,19 +294,19 @@ export class InMemorySessionStore<}async getTurn(input: GetTurnInput): Promise<TurnRecord<TTurnCustom> | undefined> {- const turn = this.turns.get(turnKey(input.tenant_id, input.session_id, input.turn_id));+ const turn = this.turns.get(turnKey(input));return turn ? deepCopy(turn) : undefined;}async listTurns(input: ListTurnsInput,): Promise<{ data: TurnRecordWithoutSnapshot<TTurnCustom>[]; pagination: TokenPagination }> {- const stored = this.sessions.get(sessionKey(input.tenant_id, input.session_id));+ const stored = this.sessions.get(sessionKey(input.session_id));if (!stored) {throw new SessionNotFoundError(input.session_id);}const records = stored.turnIds.map(id => {- const turn = this.turns.get(turnKey(input.tenant_id, input.session_id, id));+ const turn = this.turns.get(turnKey({ session_id: input.session_id, turn_id: id }));if (!turn) {throw new TurnNotFoundError(id);}@@ -323,11 +319,8 @@ export class InMemorySessionStore<async updateTurnState(input: UpdateTurnStateInput): Promise<void> {// Same as createTurn: synchronous body ⇒ atomic under run-to-completion.- const tKey = turnKey(input.tenant_id, input.session_id, input.turn_id);- const turn = this.turns.get(tKey);- if (!turn) {- throw new TurnNotFoundError(input.turn_id);- }+ const tKey = turnKey(input);+ const turn = this.requireTurn(input.session_id, input.turn_id);if (turn.state.status !== 'running') {throw new TurnNotRunningError(input.turn_id, turn.state);}@@ -340,8 +333,8 @@ export class InMemorySessionStore<}async appendToEvents(input: AppendToEventsInput): Promise<void> {- this.requireRunningTurn(input.tenant_id, input.session_id, input.turn_id);- const tKey = turnKey(input.tenant_id, input.session_id, input.turn_id);+ this.requireRunningTurn(input.session_id, input.turn_id);+ const tKey = turnKey(input);const list = this.events.get(tKey);if (!list) {throw new TurnNotFoundError(input.turn_id);@@ -350,16 +343,16 @@ export class InMemorySessionStore<return;}- private requireTurn(tenant: string, sessionId: string, turnId: string): TurnRecord<TTurnCustom> {- const turn = this.turns.get(turnKey(tenant, sessionId, turnId));+ private requireTurn(sessionId: string, turnId: string): TurnRecord<TTurnCustom> {+ const turn = this.turns.get(turnKey({ session_id: sessionId, turn_id: turnId }));if (!turn) {throw new TurnNotFoundError(turnId);}return turn;}- private requireRunningTurn(tenant: string, sessionId: string, turnId: string): TurnRecord<TTurnCustom> {- const turn = this.requireTurn(tenant, sessionId, turnId);+ private requireRunningTurn(sessionId: string, turnId: string): TurnRecord<TTurnCustom> {+ const turn = this.requireTurn(sessionId, turnId);if (turn.state.status !== 'running') {throw new TurnNotRunningError(turnId, turn.state);}@@ -367,7 +360,7 @@ export class InMemorySessionStore<}async addThreads(input: AddThreadsInput): Promise<void> {- const turn = this.requireRunningTurn(input.tenant_id, input.session_id, input.turn_id);+ const turn = this.requireRunningTurn(input.session_id, input.turn_id);for (const thread of input.threads) {turn.snapshot.threads[thread.thread_id] = deepCopy(thread);}@@ -379,7 +372,7 @@ export class InMemorySessionStore<if (input.thread_ids.length === 0) {return;}- const turn = this.requireRunningTurn(input.tenant_id, input.session_id, input.turn_id);+ const turn = this.requireRunningTurn(input.session_id, input.turn_id);for (const id of input.thread_ids) {Reflect.deleteProperty(turn.snapshot.threads, id);}@@ -388,7 +381,7 @@ export class InMemorySessionStore<}async appendToThreadContext(input: AppendToThreadContextInput): Promise<void> {- const turn = this.requireRunningTurn(input.tenant_id, input.session_id, input.turn_id);+ const turn = this.requireRunningTurn(input.session_id, input.turn_id);const thread = turn.snapshot.threads[input.thread_id];if (!thread) {throw new SessionStoreInvariantError(`Thread not found: ${input.thread_id}`);@@ -405,7 +398,7 @@ export class InMemorySessionStore<}async overwriteThreadContext(input: OverwriteThreadContextInput): Promise<void> {- const turn = this.requireRunningTurn(input.tenant_id, input.session_id, input.turn_id);+ const turn = this.requireRunningTurn(input.session_id, input.turn_id);const threadId = input.event.thread_id;const thread = turn.snapshot.threads[threadId];if (!thread) {@@ -418,7 +411,7 @@ export class InMemorySessionStore<}async patchMCPServers(input: PatchMCPServersInput): Promise<void> {- const turn = this.requireRunningTurn(input.tenant_id, input.session_id, input.turn_id);+ const turn = this.requireRunningTurn(input.session_id, input.turn_id);turn.snapshot.mcp_servers ??= {};for (const server of input.mcp_servers) {turn.snapshot.mcp_servers[server.id] = deepCopy(server);@@ -428,14 +421,14 @@ export class InMemorySessionStore<}async patchSandboxInfo(input: PatchSandboxInfoInput): Promise<void> {- const turn = this.requireRunningTurn(input.tenant_id, input.session_id, input.turn_id);+ const turn = this.requireRunningTurn(input.session_id, input.turn_id);turn.snapshot.sandbox_info = deepCopy(input.sandbox_info);turn.updated_at = new Date();return;}async patchThreadCapabilityState(input: PatchThreadCapabilityStateInput): Promise<void> {- const turn = this.requireRunningTurn(input.tenant_id, input.session_id, input.turn_id);+ const turn = this.requireRunningTurn(input.session_id, input.turn_id);const thread = turn.snapshot.threads[input.thread_id];if (!thread) {throw new SessionStoreInvariantError(`Thread not found: ${input.thread_id}`);@@ -457,7 +450,8 @@ export class InMemorySessionStore<data: PersistedTurnEvent[];pagination: TokenPagination;}> {- const list = this.events.get(turnKey(input.tenant_id, input.session_id, input.turn_id));+ this.requireTurn(input.session_id, input.turn_id);+ const list = this.events.get(turnKey(input));if (!list) {throw new TurnNotFoundError(input.turn_id);}@@ -472,7 +466,7 @@ export class InMemorySessionStore<data: SessionEventItem[];pagination: TokenPagination;}> {- const stored = this.sessions.get(sessionKey(input.tenant_id, input.session_id));+ const stored = this.sessions.get(sessionKey(input.session_id));if (!stored) {throw new SessionNotFoundError(input.session_id);}@@ -487,14 +481,14 @@ export class InMemorySessionStore<offset: decodedCursor?.offset ?? 0,};- const anchor = this.turns.get(turnKey(input.tenant_id, input.session_id, cursor.last_turn_id));+ const anchor = this.turns.get(turnKey({ session_id: input.session_id, turn_id: cursor.last_turn_id }));if (!anchor) {throw new TurnNotFoundError(cursor.last_turn_id);}- const turnIds = this.resolveAncestorChain(input.tenant_id, input.session_id, anchor);+ const turnIds = this.resolveAncestorChain(input.session_id, anchor);const flattened: SessionEventItem[] = [];for (const turnId of [...turnIds].reverse()) {- const evts = this.events.get(turnKey(input.tenant_id, input.session_id, turnId)) ?? [];+ const evts = this.events.get(turnKey({ session_id: input.session_id, turn_id: turnId })) ?? [];for (const event of [...evts].sort((a, b) => b.id.localeCompare(a.id))) {flattened.push({ turn_id: turnId, event });}@@ -512,12 +506,12 @@ export class InMemorySessionStore<* previous N ancestors, so spill through the oldest ancestor's own window* until a root or gap. A missing turn or repeated id ends the walk.*/- private resolveAncestorChain(tenant: string, sessionId: string, anchor: TurnRecord<TTurnCustom>): string[] {+ private resolveAncestorChain(sessionId: string, anchor: TurnRecord<TTurnCustom>): string[] {const chain = [...anchor.ancestor_ids, anchor.turn_id];const seen = new Set(chain);let oldestId = chain[0];while (oldestId && oldestId !== anchor.turn_id) {- const oldest = this.turns.get(turnKey(tenant, sessionId, oldestId));+ const oldest = this.turns.get(turnKey({ session_id: sessionId, turn_id: oldestId }));if (!oldest) break;const older = oldest.ancestor_ids.filter(id => !seen.has(id));if (older.length === 0) break;diff --git a/packages/harness/tests/agent-session/capabilityState.test.ts b/packages/harness/tests/agent-session/capabilityState.test.tsindex 007855a52..8b75d2df9 100644--- a/packages/harness/tests/agent-session/capabilityState.test.ts+++ b/packages/harness/tests/agent-session/capabilityState.test.ts@@ -90,7 +90,6 @@ describe('capability_state (tfy.plan fixture)', () => {// drain}const stored1 = await store.getTurn({- tenant_id: tenant,session_id: 's1',turn_id: turn1.id,});@@ -121,7 +120,6 @@ describe('capability_state (tfy.plan fixture)', () => {// drain}const stored2 = await store.getTurn({- tenant_id: tenant,session_id: 's1',turn_id: turn2.id,});@@ -187,14 +185,12 @@ describe('capability_state (tfy.plan fixture)', () => {// drain}const prior = await store.getTurn({- tenant_id: tenant,session_id: 's1',turn_id: turn1.id,});expect(prior?.snapshot.threads[MAIN_THREAD_ID]?.capability_state?.['tfy.plan']).toEqual(planV1);const latest = await store.getTurn({- tenant_id: tenant,session_id: 's1',turn_id: turn3.id,});diff --git a/packages/harness/tests/agent-session/sessions.test.ts b/packages/harness/tests/agent-session/sessions.test.tsindex 97f83f4ae..f8efb442e 100644--- a/packages/harness/tests/agent-session/sessions.test.ts+++ b/packages/harness/tests/agent-session/sessions.test.ts@@ -43,7 +43,6 @@ describe('Sessions / SessionHandle / TurnHandle (storage + createTurn)', () => {expect(turn.input).toHaveLength(1);const stored = await store.getTurn({- tenant_id: tenant,session_id: 's1',turn_id: turn.id,});@@ -140,7 +139,6 @@ describe('Sessions / SessionHandle / TurnHandle (storage + createTurn)', () => {}),).rejects.toThrow();const turns = await store.listTurns({- tenant_id: tenant,session_id: 's1',limit: 10,page_token: undefined,diff --git a/packages/harness/tests/agent-session/store/storeContractSuite.ts b/packages/harness/tests/agent-session/store/storeContractSuite.tsindex 084d8060f..180fcd2e8 100644--- a/packages/harness/tests/agent-session/store/storeContractSuite.ts+++ b/packages/harness/tests/agent-session/store/storeContractSuite.ts@@ -68,7 +68,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {async function finishTurn(store: ISessionStore, turnId: string) {const state = makeDoneTurnState();await store.updateTurnState({- tenant_id: tenant,session_id: sessionId,turn_id: turnId,state,@@ -130,6 +129,19 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await seedSession(store);await expect(seedSession(store)).rejects.toBeInstanceOf(SessionStoreConflictError);});++ it('createSession rejects a session_id already used by another tenant', async () => {+ const store = createStore();+ await seedSession(store);+ await expect(+ store.createSession({+ tenant_id: 'other',+ session_id: sessionId,+ agent_spec: makeAgentSpec(),+ custom: null,+ }),+ ).rejects.toBeInstanceOf(SessionStoreConflictError);+ });});describe('listSessions', () => {@@ -324,15 +336,14 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {const session = await store.getSession({ tenant_id: tenant, session_id: sessionId });expect(['turn-a', 'turn-b']).toContain(mustGet(session).last_turn_id);const turns = await store.listTurns({- tenant_id: tenant,session_id: sessionId,limit: 10,page_token: undefined,});expect(turns.data.map(t => t.turn_id).sort()).toEqual(['tip', 'turn-a', 'turn-b']);- const turnA = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 'turn-a' });- const turnB = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 'turn-b' });+ const turnA = await store.getTurn({ session_id: sessionId, turn_id: 'turn-a' });+ const turnB = await store.getTurn({ session_id: sessionId, turn_id: 'turn-b' });expect(contextContents(turnA?.snapshot.threads[MAIN_THREAD_ID]?.context)).toEqual(['shared', 'a-only']);expect(contextContents(turnB?.snapshot.threads[MAIN_THREAD_ID]?.context)).toEqual(['shared', 'b-only']);});@@ -390,7 +401,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {}),);await store.patchThreadCapabilityState({- tenant_id: tenant,session_id: sessionId,turn_id: 't1',thread_id: MAIN_THREAD_ID,@@ -416,7 +426,7 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {}),);- const t2 = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 't2' });+ const t2 = await store.getTurn({ session_id: sessionId, turn_id: 't2' });const main = mustGet(t2).snapshot.threads[MAIN_THREAD_ID];expect(contextContents(main?.context)).toEqual(['L1a', 'L1b', 'L2']);expect(main?.current_context_usage.prompt_tokens).toBe(3);@@ -455,7 +465,7 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {}),);- const t2 = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 't2' });+ const t2 = await store.getTurn({ session_id: sessionId, turn_id: 't2' });expect(t2?.snapshot.threads[MAIN_THREAD_ID]?.capability_state).toEqual({keep: { version: 2 },});@@ -495,7 +505,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {}),);await store.overwriteThreadContext({- tenant_id: tenant,session_id: sessionId,turn_id: 't2',event: {@@ -528,7 +537,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {);const fork = await store.getTurn({- tenant_id: tenant,session_id: sessionId,turn_id: 't3-fork',});@@ -585,7 +593,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {);const turn = await store.getTurn({- tenant_id: tenant,session_id: sessionId,turn_id: 't1',});@@ -615,14 +622,12 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 'turn-1' }));const cancelledState = makeCancelledTurnState(CancellationReason.CancelledForNextTurn);const record = await store.freezeAndGetTurn({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',turn_done_event: makeTurnDoneEvent(cancelledState),});expect(record.state.status).toBe('cancelled');const { data } = await store.listTurnEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',limit: 10,@@ -631,7 +636,7 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {});expect(data.some(e => e.type === EventType.TURN_DONE)).toBe(true);- const keys = { tenant_id: tenant, session_id: sessionId, turn_id: 'turn-1' };+ const keys = { session_id: sessionId, turn_id: 'turn-1' };const fencedWrites: (() => Promise<unknown>)[] = [() =>store.appendToEvents({@@ -703,13 +708,11 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await finishTurn(store, 'turn-1');const doneState = makeDoneTurnState();await store.freezeAndGetTurn({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',turn_done_event: makeTurnDoneEvent(doneState),});const { data } = await store.listTurnEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',limit: 10,@@ -726,23 +729,20 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {const cancelledState = makeCancelledTurnState(CancellationReason.CancelledForNextTurn);const results = await Promise.allSettled([store.freezeAndGetTurn({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',turn_done_event: makeTurnDoneEvent(cancelledState),}),store.freezeAndGetTurn({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',turn_done_event: makeTurnDoneEvent(cancelledState),}),]);expect(results.every(r => r.status === 'fulfilled')).toBe(true);- const turn = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 'turn-1' });+ const turn = await store.getTurn({ session_id: sessionId, turn_id: 'turn-1' });expect(mustGet(turn).state.status).toBe('cancelled');const { data } = await store.listTurnEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',limit: 10,@@ -760,13 +760,11 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {const doneState = makeDoneTurnState();const results = await Promise.allSettled([store.freezeAndGetTurn({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',turn_done_event: makeTurnDoneEvent(cancelledState),}),store.updateTurnState({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',state: doneState,@@ -780,10 +778,9 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {// freeze-after-update is a plain read (both fulfill); update-after-freeze rejects.expect(rejected.length === 0 || rejected.length === 1).toBe(true);- const turn = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 'turn-1' });+ const turn = await store.getTurn({ session_id: sessionId, turn_id: 'turn-1' });expect(['cancelled', 'done']).toContain(mustGet(turn).state.status);const { data } = await store.listTurnEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',limit: 10,@@ -803,7 +800,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {const cancelledState = makeCancelledTurnState(CancellationReason.ClientCancelled);await expect(store.updateTurnState({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',state: cancelledState,@@ -819,17 +815,15 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {const state = makeDoneTurnState();const turnDone = makeTurnDoneEvent(state);await store.updateTurnState({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',state,turn_done_event: turnDone,});- const turn = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 'turn-1' });+ const turn = await store.getTurn({ session_id: sessionId, turn_id: 'turn-1' });expect(mustGet(turn).state).toEqual(state);const { data } = await store.listTurnEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',limit: 10,@@ -847,7 +841,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {const state = makeDoneTurnState();await expect(store.updateTurnState({- tenant_id: tenant,session_id: sessionId,turn_id: 'missing',state,@@ -868,14 +861,12 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {expect(created.created_at).toBeDefined();expect(model.created_at).toBeDefined();await store.appendToEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',// Deliberately reversed: durable ordering comes from event.id.events: [model, created],});const { data } = await store.listTurnEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',limit: 10,@@ -891,7 +882,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await seedSession(store);await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 'turn-1' }));await store.addThreads({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',threads: [@@ -907,7 +897,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {],});await store.appendToThreadContext({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',thread_id: 'child',@@ -915,11 +904,10 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {current_context_usage: null,completion: null,});- let turn = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 'turn-1' });+ let turn = await store.getTurn({ session_id: sessionId, turn_id: 'turn-1' });expect(turn?.snapshot.threads['child']?.context).toHaveLength(1);await store.overwriteThreadContext({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',event: {@@ -933,16 +921,15 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {usage: getEmptyUsage(),},});- turn = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 'turn-1' });+ turn = await store.getTurn({ session_id: sessionId, turn_id: 'turn-1' });expect(turn?.snapshot.threads['child']?.context).toEqual([{ role: 'user', content: 'replaced' }]);await store.removeThreads({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',thread_ids: ['child'],});- turn = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 'turn-1' });+ turn = await store.getTurn({ session_id: sessionId, turn_id: 'turn-1' });expect(turn?.snapshot.threads['child']).toBeUndefined();});@@ -967,7 +954,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {}),);await store.appendToThreadContext({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',thread_id: MAIN_THREAD_ID,@@ -977,7 +963,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {});const loaded = await store.getTurn({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',});@@ -997,7 +982,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await seedSession(store);await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 'turn-1' }));await store.patchThreadCapabilityState({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',thread_id: MAIN_THREAD_ID,@@ -1005,14 +989,13 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {state: { v: 1 },});await store.patchThreadCapabilityState({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',thread_id: MAIN_THREAD_ID,key: 'tfy.plan',state: { v: 2 },});- const turn = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 'turn-1' });+ const turn = await store.getTurn({ session_id: sessionId, turn_id: 'turn-1' });expect(turn?.snapshot.threads[MAIN_THREAD_ID]?.capability_state).toEqual({ 'tfy.plan': { v: 2 } });});@@ -1025,7 +1008,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 'turn-1' }));await expect(store.patchThreadCapabilityState({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',thread_id: 'missing-thread',@@ -1062,7 +1044,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {}),);await store.patchThreadCapabilityState({- tenant_id: tenant,session_id: sessionId,turn_id: 't2',thread_id: MAIN_THREAD_ID,@@ -1070,8 +1051,8 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {state: { step: 2 },});- const t1 = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 't1' });- const t2 = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 't2' });+ const t1 = await store.getTurn({ session_id: sessionId, turn_id: 't1' });+ const t2 = await store.getTurn({ session_id: sessionId, turn_id: 't2' });expect(t1?.snapshot.threads[MAIN_THREAD_ID]?.capability_state).toEqual({ plan: { step: 1 } });expect(t2?.snapshot.threads[MAIN_THREAD_ID]?.capability_state).toEqual({ plan: { step: 2 } });});@@ -1093,7 +1074,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {}),);const turn = await store.getTurn({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',});@@ -1132,7 +1112,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {}),);const turn = await store.getTurn({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',});@@ -1147,18 +1126,16 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await seedSession(store);await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 'turn-1' }));await store.patchMCPServers({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',mcp_servers: [{ id: 'svc', name: 'svc', session_id: 'mcp-1', transport_type: 'streamable-http' }],});await store.patchSandboxInfo({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',sandbox_info: { sandbox_id: 'sbx-1' },});- const turn = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 'turn-1' });+ const turn = await store.getTurn({ session_id: sessionId, turn_id: 'turn-1' });expect(turn?.snapshot.mcp_servers?.['svc']?.session_id).toBe('mcp-1');expect(mustGet(turn).snapshot.sandbox_info?.sandbox_id).toBe('sbx-1');});@@ -1168,18 +1145,16 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await seedSession(store);await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 'turn-1' }));await store.patchMCPServers({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',mcp_servers: [{ id: 'svc', name: 'svc', session_id: 'mcp-1', transport_type: 'streamable-http' }],});await store.patchMCPServers({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',mcp_servers: [{ id: 'svc', name: 'svc', transport_type: 'sse' }],});- const turn = await store.getTurn({ tenant_id: tenant, session_id: sessionId, turn_id: 'turn-1' });+ const turn = await store.getTurn({ session_id: sessionId, turn_id: 'turn-1' });expect(mustGet(turn).snapshot.mcp_servers).toEqual({svc: { id: 'svc', name: 'svc', transport_type: 'sse' },});@@ -1200,7 +1175,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await finishTurn(store, 't2');await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 't3', previousTurnId: 't2', firstTurnId: 't1' }));const page1 = await store.listTurns({- tenant_id: tenant,session_id: sessionId,limit: 2,page_token: undefined,@@ -1208,7 +1182,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {expect(page1.data.map(t => t.turn_id)).toEqual(['t1', 't2']);expect(page1.pagination.next_page_token).toBeDefined();const page2 = await store.listTurns({- tenant_id: tenant,session_id: sessionId,limit: 2,page_token: page1.pagination.next_page_token,@@ -1221,13 +1194,11 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await seedSession(store);await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 'turn-1' }));await store.appendToEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',events: [makeTurnCreatedEvent('turn-1'), makeModelMessageEvent()],});const { data } = await store.listTurnEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',limit: 10,@@ -1242,7 +1213,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await seedSession(store);await expect(store.listTurnEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 'missing',limit: 10,@@ -1257,7 +1227,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await seedSession(store);await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 'turn-1' }));const page = await store.listTurnEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 'turn-1',limit: 10,@@ -1273,7 +1242,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await seedSession(store);await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 't1' }));await store.appendToEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 't1',events: [makeTurnCreatedEvent('t1')],@@ -1281,14 +1249,12 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await finishTurn(store, 't1');await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 't2', previousTurnId: 't1', firstTurnId: 't1' }));await store.appendToEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 't2',events: [makeTurnCreatedEvent('t2')],});// t2 still running — must appear in the feed.const { data } = await store.listSessionEvents({- tenant_id: tenant,session_id: sessionId,limit: 10,page_token: undefined,@@ -1316,14 +1282,12 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {}),};await store.appendToEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 't1',events: [passthrough],});const { data } = await store.listSessionEvents({- tenant_id: tenant,session_id: sessionId,limit: 10,page_token: undefined,@@ -1337,7 +1301,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await seedSession(store);await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 't1' }));await store.appendToEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 't1',events: [makeTurnCreatedEvent('t1')],@@ -1353,14 +1316,12 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {);for (const turnId of ['t2-sibling', 't2-anchor']) {await store.appendToEvents({- tenant_id: tenant,session_id: sessionId,turn_id: turnId,events: [makeTurnCreatedEvent(turnId)],});}const { data } = await store.listSessionEvents({- tenant_id: tenant,session_id: sessionId,limit: 10,last_turn_id: undefined,@@ -1373,7 +1334,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await expect(store.listSessionEvents({- tenant_id: tenant,session_id: sessionId,limit: 10,last_turn_id: 'missing',@@ -1387,7 +1347,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await seedSession(store);await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 't1' }));await store.appendToEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 't1',events: [makeTurnCreatedEvent('t1')],@@ -1395,14 +1354,12 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {await finishTurn(store, 't1');await store.createTurn(makeCreateTurnInput({ sessionId, turnId: 't2', previousTurnId: 't1', firstTurnId: 't1' }));await store.appendToEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 't2',events: [makeTurnCreatedEvent('t2')],});const firstPage = await store.listSessionEvents({- tenant_id: tenant,session_id: sessionId,limit: 1,last_turn_id: undefined,@@ -1418,14 +1375,12 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {makeCreateTurnInput({ sessionId, turnId: 't2-new-active', previousTurnId: 't1', firstTurnId: 't1' }),);await store.appendToEvents({- tenant_id: tenant,session_id: sessionId,turn_id: 't2-new-active',events: [makeTurnCreatedEvent('t2-new-active')],});const secondPage = await store.listSessionEvents({- tenant_id: tenant,session_id: sessionId,limit: 10,last_turn_id: undefined,@@ -1461,7 +1416,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {input.turn.ancestor_ids = window;await store.createTurn(input);await store.appendToEvents({- tenant_id: tenant,session_id: sessionId,turn_id: turnId,events: [makeTurnCreatedEvent(turnId)],@@ -1469,7 +1423,6 @@ export function runStoreContractSuite(createStore: () => ISessionStore) {}const tip = mustGet(ids.at(-1), 'chain tip');const { data } = await store.listSessionEvents({- tenant_id: tenant,session_id: sessionId,limit: chainLength + 10,last_turn_id: tip,diff --git a/packages/harness/tests/agent-session/testHelpers.ts b/packages/harness/tests/agent-session/testHelpers.tsindex 2c09f2dd4..0d95ce2ab 100644--- a/packages/harness/tests/agent-session/testHelpers.ts+++ b/packages/harness/tests/agent-session/testHelpers.ts@@ -149,7 +149,6 @@ const defaultRootThread: NewThreadInit = {/** Delta-shaped createTurn input for store contract tests. */export function makeCreateTurnInput(input: {- tenant?: string;sessionId: string;turnId: string;previousTurnId?: string | null;@@ -169,7 +168,6 @@ export function makeCreateTurnInput(input: {void snapshot;const isFirstInChain = input.previousTurnId === undefined || input.previousTurnId === null;return {- tenant_id: input.tenant ?? 't1',turn: turnInit,new_threads: isFirstInChain ? (input.new_threads ?? [defaultRootThread]) : (input.new_threads ?? []),new_context_appends: input.new_context_appends ?? [],diff --git a/packages/harness/tests/agent-session/turnStream.test.ts b/packages/harness/tests/agent-session/turnStream.test.tsindex a33bdb454..cd11ccd85 100644--- a/packages/harness/tests/agent-session/turnStream.test.ts+++ b/packages/harness/tests/agent-session/turnStream.test.ts@@ -68,7 +68,6 @@ describe('TurnHandle.stream()', () => {expect(data.some(e => e.type === EventType.TURN_DONE)).toBe(true);const stored = await store.getTurn({- tenant_id: tenant,session_id: 's1',turn_id: turn.id,});@@ -267,7 +266,6 @@ describe('TurnHandle.stream()', () => {}expect(closeCalls).toBe(1);const stored = await store.getTurn({- tenant_id: tenant,session_id: 's1',turn_id: turn.id,});@@ -294,7 +292,6 @@ describe('TurnHandle.stream()', () => {expect(turn.state.reason).toBe(CancellationReason.ClientCancelled);}const stored = await store.getTurn({- tenant_id: tenant,session_id: 's1',turn_id: turn.id,});@@ -320,7 +317,6 @@ describe('TurnHandle.stream()', () => {expect(turn.state.reason).toBe(CancellationReason.Abandoned);}const stored = await store.getTurn({- tenant_id: tenant,session_id: 's1',turn_id: turn.id,});@@ -349,7 +345,6 @@ describe('TurnHandle.stream()', () => {expect(turn.state.reason).toBe(CancellationReason.ServerExecutionTimeout);}const stored = await store.getTurn({- tenant_id: tenant,session_id: 's1',turn_id: turn.id,});@@ -381,7 +376,6 @@ describe('TurnHandle.stream()', () => {expect(closeCalls).toBe(1);expect(turn.state.status).toBe('done');const stored = await store.getTurn({- tenant_id: tenant,session_id: 's1',turn_id: turn.id,});diff --git a/packages/server/src/apis/sessions.ts b/packages/server/src/apis/sessions.tsindex ae1b403cb..e02c25b15 100644--- a/packages/server/src/apis/sessions.ts+++ b/packages/server/src/apis/sessions.ts@@ -162,7 +162,6 @@ export async function cancelSessionTurn(const { sessionId, turnId, reason = CancellationReason.ClientCancelled } = input;const turn = await deps.sessionStore.getTurn({- tenant_id: TENANT_ID,session_id: sessionId,turn_id: turnId,});diff --git a/packages/server/src/db/postgres/migrations/20260803_000002_session_scoped_keys.ts b/packages/server/src/db/postgres/migrations/20260803_000002_session_scoped_keys.tsnew file mode 100644index 000000000..6be84da88--- /dev/null+++ b/packages/server/src/db/postgres/migrations/20260803_000002_session_scoped_keys.ts@@ -0,0 +1,81 @@+import type { Kysely } from 'kysely';++/** Drop tenant_id from turn-scoped tables; session_id is globally unique with cascade FKs. */+export async function up(db: Kysely<unknown>): Promise<void> {+ // Index includes tenant_id; drop before reshaping turn.+ await db.schema.dropIndex('turn_list_idx').execute();++ // session_id must be unique before child FKs can reference it alone.+ await db.schema.alterTable('session').dropConstraint('session_pkey').execute();+ await db.schema.alterTable('session').addPrimaryKeyConstraint('session_pkey', ['session_id']).execute();++ // turn: drop tenant_id, rekey, cascade on session delete.+ await db.schema.alterTable('turn').dropConstraint('turn_pkey').execute();+ await db.schema.alterTable('turn').dropColumn('tenant_id').execute();+ await db.schema.alterTable('turn').addPrimaryKeyConstraint('turn_pkey', ['session_id', 'turn_id']).execute();+ await db.schema+ .alterTable('turn')+ .addForeignKeyConstraint('turn_session_fkey', ['session_id'], 'session', ['session_id'])+ .onDelete('cascade')+ .execute();++ // turn_thread: drop tenant_id, rekey, cascade on session delete.+ await db.schema.alterTable('turn_thread').dropConstraint('turn_thread_pkey').execute();+ await db.schema.alterTable('turn_thread').dropColumn('tenant_id').execute();+ await db.schema+ .alterTable('turn_thread')+ .addPrimaryKeyConstraint('turn_thread_pkey', ['session_id', 'turn_id', 'thread_id'])+ .execute();+ await db.schema+ .alterTable('turn_thread')+ .addForeignKeyConstraint('turn_thread_session_fkey', ['session_id'], 'session', ['session_id'])+ .onDelete('cascade')+ .execute();++ // session_event: drop tenant_id, rekey, cascade on session delete.+ await db.schema.alterTable('session_event').dropConstraint('session_event_pkey').execute();+ await db.schema.alterTable('session_event').dropColumn('tenant_id').execute();+ await db.schema+ .alterTable('session_event')+ .addPrimaryKeyConstraint('session_event_pkey', ['session_id', 'turn_id', 'event_id'])+ .execute();+ await db.schema+ .alterTable('session_event')+ .addForeignKeyConstraint('session_event_session_fkey', ['session_id'], 'session', ['session_id'])+ .onDelete('cascade')+ .execute();++ // thread_context_log: drop tenant_id, rekey, cascade on session delete.+ await db.schema.alterTable('thread_context_log').dropConstraint('thread_context_log_pkey').execute();+ await db.schema.alterTable('thread_context_log').dropColumn('tenant_id').execute();+ await db.schema+ .alterTable('thread_context_log')+ .addPrimaryKeyConstraint('thread_context_log_pkey', ['session_id', 'thread_id', 'append_id'])+ .execute();+ await db.schema+ .alterTable('thread_context_log')+ .addForeignKeyConstraint('thread_context_log_session_fkey', ['session_id'], 'session', ['session_id'])+ .onDelete('cascade')+ .execute();++ // thread_capability_state: drop tenant_id, rekey, cascade on session delete.+ await db.schema.alterTable('thread_capability_state').dropConstraint('thread_capability_state_pkey').execute();+ await db.schema.alterTable('thread_capability_state').dropColumn('tenant_id').execute();+ await db.schema+ .alterTable('thread_capability_state')+ .addPrimaryKeyConstraint('thread_capability_state_pkey', ['session_id', 'turn_id', 'thread_id', 'key'])+ .execute();+ await db.schema+ .alterTable('thread_capability_state')+ .addForeignKeyConstraint('thread_capability_state_session_fkey', ['session_id'], 'session', ['session_id'])+ .onDelete('cascade')+ .execute();++ // Rebuild list index without tenant_id.+ await db.schema.createIndex('turn_list_idx').on('turn').columns(['session_id', 'created_at', 'turn_id']).execute();+}++/** Irreversible: the dropped tenant_id values are not recoverable. */+export function down(): Promise<void> {+ return Promise.reject(new Error('20260803_000002_session_scoped_keys is not reversible'));+}diff --git a/packages/server/src/db/postgres/session-store/PostgresSessionStore.ts b/packages/server/src/db/postgres/session-store/PostgresSessionStore.tsindex c2581a42b..00ab7c8c2 100644--- a/packages/server/src/db/postgres/session-store/PostgresSessionStore.ts+++ b/packages/server/src/db/postgres/session-store/PostgresSessionStore.ts@@ -110,7 +110,6 @@ export class PostgresSessionStore implements ISessionStore<SessionCustom, TurnCuasync createTurn(input: CreateTurnInput<TurnCustom>): Promise<void> {await createTurnQuery(this.db, {- tenant_id: input.tenant_id,session_id: input.turn.session_id,turn: {turn_id: input.turn.turn_id,@@ -148,7 +147,6 @@ export class PostgresSessionStore implements ISessionStore<SessionCustom, TurnCu): Promise<{ data: TurnRecordWithoutSnapshot<TurnCustom>[]; pagination: TokenPagination }> {const offset = decodeOffsetPageToken(input.page_token);const result = await listTurnsQuery(this.db, {- tenant_id: input.tenant_id,session_id: input.session_id,limit: input.limit,offset,diff --git a/packages/server/src/db/postgres/session-store/queries/capabilities.ts b/packages/server/src/db/postgres/session-store/queries/capabilities.tsindex 0da20e81c..c4af561d0 100644--- a/packages/server/src/db/postgres/session-store/queries/capabilities.ts+++ b/packages/server/src/db/postgres/session-store/queries/capabilities.ts@@ -13,7 +13,6 @@ export async function patchThreadCapabilityState(input: PatchThreadCapabilityStateInput,): Promise<void> {const keys = {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,};@@ -21,12 +20,11 @@ export async function patchThreadCapabilityState(const rows = await db.with('turn_fence', qb => turnRunningFence(qb, keys)).insertInto('thread_capability_state')- .columns(['tenant_id', 'session_id', 'turn_id', 'thread_id', 'key', 'state', 'updated_at'])+ .columns(['session_id', 'turn_id', 'thread_id', 'key', 'state', 'updated_at']).expression(eb =>eb.selectFrom(values([{ one: 1 }], 'src')).select([- sql<string>`${input.tenant_id}`.as('tenant_id'),sql<string>`${input.session_id}`.as('session_id'),sql<string>`${input.turn_id}`.as('turn_id'),sql<string>`${input.thread_id}`.as('thread_id'),@@ -37,7 +35,7 @@ export async function patchThreadCapabilityState(.where(wb => wb.exists(wb.selectFrom('turn_fence').select(sql`1`.as('one')))),).onConflict(oc =>- oc.columns(['tenant_id', 'session_id', 'turn_id', 'thread_id', 'key']).doUpdateSet({+ oc.columns(['session_id', 'turn_id', 'thread_id', 'key']).doUpdateSet({state: sql`excluded.state`,updated_at: sql`now()`,}),diff --git a/packages/server/src/db/postgres/session-store/queries/events.ts b/packages/server/src/db/postgres/session-store/queries/events.tsindex 630fa8d4e..cfb620efb 100644--- a/packages/server/src/db/postgres/session-store/queries/events.ts+++ b/packages/server/src/db/postgres/session-store/queries/events.ts@@ -22,7 +22,6 @@ export async function appendToEvents(db: Kysely<Database>, input: AppendToEventsif (input.events.length === 0) return;const keys = {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,};@@ -37,12 +36,11 @@ export async function appendToEvents(db: Kysely<Database>, input: AppendToEventsconst inserted = await db.with('turn_fence', qb => turnRunningFence(qb, keys)).insertInto('session_event')- .columns(['tenant_id', 'session_id', 'turn_id', 'event_id', 'event', 'created_at'])+ .columns(['session_id', 'turn_id', 'event_id', 'event', 'created_at']).expression(eb =>eb.selectFrom(values(eventRows, 'ev')).select([- sql<string>`${input.tenant_id}`.as('tenant_id'),sql<string>`${input.session_id}`.as('session_id'),sql<string>`${input.turn_id}`.as('turn_id'),'ev.event_id',@@ -77,22 +75,16 @@ export async function listTurnEvents(eb =>eb.selectFrom('session_event')- .select(['tenant_id', 'session_id', 'turn_id', 'event_id', 'event'])- .where('tenant_id', '=', input.tenant_id)+ .select(['session_id', 'turn_id', 'event_id', 'event']).where('session_id', '=', input.session_id).where('turn_id', '=', input.turn_id).orderBy('event_id', eventOrder).limit(limit + 1).offset(offset).as('e'),- join =>- join- .onRef('e.tenant_id', '=', 't.tenant_id')- .onRef('e.session_id', '=', 't.session_id')- .onRef('e.turn_id', '=', 't.turn_id'),+ join => join.onRef('e.session_id', '=', 't.session_id').onRef('e.turn_id', '=', 't.turn_id'),).select(['t.turn_id', 'e.event'])- .where('t.tenant_id', '=', input.tenant_id).where('t.session_id', '=', input.session_id).where('t.turn_id', '=', input.turn_id).orderBy('e.event_id', eventOrder)@@ -121,7 +113,6 @@ export async function listSessionEvents(const session = await db.selectFrom('session').select('last_turn_id')- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).executeTakeFirst();if (!session) {@@ -141,7 +132,6 @@ export async function listSessionEvents(const anchor = await db.selectFrom('turn').select(['turn_id', 'ancestor_ids'])- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).where('turn_id', '=', cursor.last_turn_id).executeTakeFirst();@@ -149,14 +139,11 @@ export async function listSessionEvents(throw new TurnNotFoundError(cursor.last_turn_id);}- const chainIds = await resolveAncestorChain(db, input.tenant_id, input.session_id, anchor);+ const chainIds = await resolveAncestorChain(db, input.session_id, anchor);const rows = await db.selectFrom(unnestWithOrdinality(chainIds, 'c')).innerJoin('session_event as e', join =>- join- .on('e.tenant_id', '=', input.tenant_id)- .on('e.session_id', '=', input.session_id)- .onRef('e.turn_id', '=', 'c.turn_id'),+ join.on('e.session_id', '=', input.session_id).onRef('e.turn_id', '=', 'c.turn_id'),).select(['e.turn_id as turn_id', 'e.event as event']).orderBy('c.pos', 'desc')@@ -181,7 +168,6 @@ export interface AnchorTurn {*/export async function resolveAncestorChain(db: Kysely<Database>,- tenant: string,sessionId: string,anchor: AnchorTurn,): Promise<string[]> {@@ -192,7 +178,6 @@ export async function resolveAncestorChain(const oldest = await db.selectFrom('turn').select(['ancestor_ids'])- .where('tenant_id', '=', tenant).where('session_id', '=', sessionId).where('turn_id', '=', oldestId).executeTakeFirst();diff --git a/packages/server/src/db/postgres/session-store/queries/threads.ts b/packages/server/src/db/postgres/session-store/queries/threads.tsindex 0e818735b..6f2f7a39e 100644--- a/packages/server/src/db/postgres/session-store/queries/threads.ts+++ b/packages/server/src/db/postgres/session-store/queries/threads.ts@@ -24,7 +24,6 @@ import {type DbOrTrx = Kysely<Database> | Transaction<Database>;interface CapabilityStateInsertRow {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;@@ -40,14 +39,12 @@ interface CapabilityStateInsertRow {export async function addThreads(db: Kysely<Database>, input: AddThreadsInput): Promise<void> {await db.transaction().execute(async trx => {await assertTurnRunning(trx, {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,});const now = new Date();const logRows: {- tenant_id: string;session_id: string;thread_id: string;turn_id: string;@@ -76,7 +73,6 @@ export async function addThreads(db: Kysely<Database>, input: AddThreadsInput):for (const body of thread.context) {logRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,thread_id: thread.thread_id,turn_id: input.turn_id,@@ -95,7 +91,6 @@ export async function addThreads(db: Kysely<Database>, input: AddThreadsInput):);}capabilityStateRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,thread_id: thread.thread_id,@@ -125,7 +120,6 @@ export async function addThreads(db: Kysely<Database>, input: AddThreadsInput):}const turnThreadRows = turnThreadPlans.map(plan => ({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,thread_id: plan.thread_id,@@ -156,7 +150,6 @@ export async function removeThreads(db: Kysely<Database>, input: RemoveThreadsIn}const keys: TurnKeys = {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,};@@ -167,7 +160,6 @@ export async function removeThreads(db: Kysely<Database>, input: RemoveThreadsIn.with('del_cap', qb =>qb.deleteFrom('thread_capability_state')- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).where('thread_id', 'in', input.thread_ids)@@ -176,7 +168,6 @@ export async function removeThreads(db: Kysely<Database>, input: RemoveThreadsIn.with('del_tt', qb =>qb.deleteFrom('turn_thread')- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).where('thread_id', 'in', input.thread_ids)@@ -232,7 +223,6 @@ async function fencedTurnThreadContextUpdate(checkpoint: completionPatchExpr(args.completion),updated_at: sql`now()`,})- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).where('thread_id', '=', thread_id)@@ -261,12 +251,11 @@ async function fencedTurnThreadContextUpdate(.with('new_rows', qb =>qb.insertInto('thread_context_log')- .columns(['tenant_id', 'session_id', 'thread_id', 'turn_id', 'body', 'created_at'])+ .columns(['session_id', 'thread_id', 'turn_id', 'body', 'created_at']).expression(eb =>eb.selectFrom(values(bodyRows, 'b')).select([- sql<string>`${keys.tenant_id}`.as('tenant_id'),sql<string>`${keys.session_id}`.as('session_id'),sql<string>`${thread_id}`.as('thread_id'),sql<string>`${keys.turn_id}`.as('turn_id'),@@ -285,7 +274,6 @@ async function fencedTurnThreadContextUpdate(checkpoint: completionPatchExpr(args.completion),updated_at: sql`now()`,})- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).where('thread_id', '=', thread_id)@@ -305,7 +293,6 @@ async function fencedTurnThreadContextUpdate(export async function appendToThreadContext(db: Kysely<Database>, input: AppendToThreadContextInput): Promise<void> {await fencedTurnThreadContextUpdate(db, {keys: {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,},@@ -325,7 +312,6 @@ export async function appendToThreadContext(db: Kysely<Database>, input: AppendTexport async function overwriteThreadContext(db: Kysely<Database>, input: OverwriteThreadContextInput): Promise<void> {await fencedTurnThreadContextUpdate(db, {keys: {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,},@@ -350,7 +336,6 @@ export async function patchMCPServers(db: Kysely<Database>, input: PatchMCPServe}const keys: TurnKeys = {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,};@@ -364,7 +349,6 @@ export async function patchMCPServers(db: Kysely<Database>, input: PatchMCPServeELSE '{}'::jsonb END) || ${json(serversById)}`,).set({ updated_at: sql`now()` })- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).where(sql<boolean>`state->>'status' = 'running'`)@@ -381,7 +365,6 @@ export async function patchMCPServers(db: Kysely<Database>, input: PatchMCPServe*/export async function patchSandboxInfo(db: Kysely<Database>, input: PatchSandboxInfoInput): Promise<void> {const keys: TurnKeys = {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,};@@ -390,7 +373,6 @@ export async function patchSandboxInfo(db: Kysely<Database>, input: PatchSandbox.updateTable('turn').set(sql`checkpoint['sandbox_info']`, json(input.sandbox_info)).set({ updated_at: sql`now()` })- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).where(sql<boolean>`state->>'status' = 'running'`)@@ -404,7 +386,6 @@ export async function patchSandboxInfo(db: Kysely<Database>, input: PatchSandbox/** Test helper: read a turn_thread row. */export async function getTurnThread(db: DbOrTrx,- tenant_id: string,session_id: string,turn_id: string,thread_id: string,@@ -421,7 +402,6 @@ export async function getTurnThread(return await db.selectFrom('turn_thread').select(['thread_id', 'checkpoint', 'agent_info', 'current_context_usage', 'context_ids'])- .where('tenant_id', '=', tenant_id).where('session_id', '=', session_id).where('turn_id', '=', turn_id).where('thread_id', '=', thread_id)diff --git a/packages/server/src/db/postgres/session-store/queries/turns.ts b/packages/server/src/db/postgres/session-store/queries/turns.tsindex f892ecd2b..7380d53a1 100644--- a/packages/server/src/db/postgres/session-store/queries/turns.ts+++ b/packages/server/src/db/postgres/session-store/queries/turns.ts@@ -56,7 +56,6 @@ export interface NewThreadRegistration {}export interface TurnKeys {- tenant_id: string;session_id: string;turn_id: string;}@@ -78,7 +77,6 @@ export interface CreateTurnTurnFields {}export interface CreateTurnInput {- tenant_id: string;session_id: string;turn: CreateTurnTurnFields;new_threads: NewThreadRegistration[];@@ -94,13 +92,11 @@ export interface CreateTurnInput {}export interface GetTurnInput {- tenant_id: string;session_id: string;turn_id: string;}export interface ListTurnsInput {- tenant_id: string;session_id: string;limit: number;offset: number;@@ -130,14 +126,12 @@ function terminalTurnState(state: TurnState, turn_id: string): TerminalTurnState* network call. Under READ COMMITTED, FOR SHARE re-checks the predicate after a* lock wait, so a committed freeze empties the fence and the write inserts 0 rows;* error classification happens on that rare 0-row path.- ** Multi-statement turn-scoped writes use {@link assertTurnRunning} instead.*/export function turnRunningFence(db: TurnFenceDb, keys: TurnKeys) {return db.selectFrom('turn').select(sql`1`.as('one'))- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).where(sql`state->>'status'`, '=', 'running')@@ -149,7 +143,6 @@ export async function classifyTurnFenceWriteFailure(db: Kysely<Database>, keys:const row = await db.selectFrom('turn').select('state')- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).executeTakeFirst();@@ -171,7 +164,6 @@ export async function classifyTurnThreadWriteFailure(const row = await db.selectFrom('turn').select('state')- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).executeTakeFirst();@@ -190,7 +182,6 @@ export async function assertTurnRunning(db: DbOrTrx, keys: TurnKeys): Promise<voconst row = await db.selectFrom('turn').select('state')- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).forShare()@@ -211,12 +202,11 @@ interface CapabilityAggRow {async function assembleTurnRecord(db: DbOrTrx,- args: { tenant_id: string; session_id: string; turn_id: string },+ args: { session_id: string; turn_id: string },): Promise<TurnRecord<TurnCustom> | undefined> {const turn = await db.selectFrom('turn').selectAll()- .where('tenant_id', '=', args.tenant_id).where('session_id', '=', args.session_id).where('turn_id', '=', args.turn_id).executeTakeFirst();@@ -230,13 +220,11 @@ async function assembleTurnRecord(.leftJoin(lateralUnnestBigintArrayWithOrdinality(sql<number[]>`tt.context_ids`, 'c'), join => join.onTrue()).leftJoin('thread_context_log as l', join =>join- .on('l.tenant_id', '=', args.tenant_id).on('l.session_id', '=', args.session_id).onRef('l.thread_id', '=', 'tt.thread_id').onRef('l.append_id', '=', 'c.append_id'),).select(['tt.thread_id', 'tt.checkpoint', 'tt.agent_info', 'tt.current_context_usage', 'l.body', 'c.pos'])- .where('tt.tenant_id', '=', args.tenant_id).where('tt.session_id', '=', args.session_id).where('tt.turn_id', '=', args.turn_id).orderBy('tt.thread_id')@@ -246,7 +234,6 @@ async function assembleTurnRecord(const capabilityRows: CapabilityAggRow[] = await db.selectFrom('thread_capability_state').select(['thread_id', sql<Record<string, JsonValue> | null>`jsonb_object_agg(key, state)`.as('capability_state')])- .where('tenant_id', '=', args.tenant_id).where('session_id', '=', args.session_id).where('turn_id', '=', args.turn_id).groupBy('thread_id')@@ -326,7 +313,6 @@ async function assembleTurnRecord(}interface TurnInsertValues {- tenant_id: string;session_id: string;turn_id: string;first_turn_id: string;@@ -341,7 +327,6 @@ interface TurnInsertValues {}interface LogInsertRow {- tenant_id: string;session_id: string;thread_id: string;turn_id: string;@@ -350,7 +335,6 @@ interface LogInsertRow {}interface TurnThreadInsertRow {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;@@ -362,7 +346,6 @@ interface TurnThreadInsertRow {}interface CapabilityStateInsertRow {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;@@ -385,7 +368,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):const locked = await trx.selectFrom('session').select(['last_turn_id'])- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).forUpdate().executeTakeFirst();@@ -404,7 +386,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):}: {}),})- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).execute();@@ -426,10 +407,7 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):const prevRows = await trx.selectFrom('turn as t').leftJoin('turn_thread as tt', join =>- join- .onRef('tt.tenant_id', '=', 't.tenant_id')- .onRef('tt.session_id', '=', 't.session_id')- .onRef('tt.turn_id', '=', 't.turn_id'),+ join.onRef('tt.session_id', '=', 't.session_id').onRef('tt.turn_id', '=', 't.turn_id'),).select(['t.checkpoint as turn_checkpoint',@@ -440,7 +418,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):'tt.current_context_usage','tt.context_ids',])- .where('t.tenant_id', '=', input.tenant_id).where('t.session_id', '=', input.session_id).where('t.turn_id', '=', prevTurnId).execute();@@ -486,7 +463,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):// step3: turn rowconst turnValues: TurnInsertValues = {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn.turn_id,first_turn_id: input.turn.first_turn_id,@@ -506,7 +482,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):for (const append of input.new_context_appends) {for (const body of append.context) {logRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,thread_id: append.thread_id,turn_id: input.turn.turn_id,@@ -547,7 +522,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):const newIds = newIdsByThread.get(parent.thread_id) ?? [];const usage = appendUsageByThread.get(parent.thread_id) ?? parent.current_context_usage;turnThreadRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn.turn_id,thread_id: parent.thread_id,@@ -567,7 +541,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):completion: null,};turnThreadRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn.turn_id,thread_id: nt.thread_id,@@ -589,7 +562,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):if (capability.capability_state === null) continue;for (const [key, state] of Object.entries(capability.capability_state)) {capabilityStateRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn.turn_id,thread_id: capability.thread_id,@@ -631,7 +603,6 @@ export async function freezeAndGetTurn(db: Kysely<Database>, input: FreezeAndGetstate: cancelledState,updated_at: sql`now()`,})- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).where('turn_id', '=', input.turn_id).where(sql<boolean>`state->>'status' = 'running'`)@@ -641,7 +612,6 @@ export async function freezeAndGetTurn(db: Kysely<Database>, input: FreezeAndGetawait trx.insertInto('session_event').values({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,event_id: input.turn_done_event.id,@@ -678,7 +648,6 @@ export async function listTurns(db: Kysely<Database>, input: ListTurnsInput): Prconst rows = await db.selectFrom('turn').selectAll()- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).orderBy('created_at', 'asc').orderBy('turn_id', 'asc')@@ -720,7 +689,6 @@ export async function updateTurnState(db: Kysely<Database>, input: UpdateTurnStastate: input.state,updated_at: sql`now()`,})- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).where('turn_id', '=', input.turn_id).where(sql<boolean>`state->>'status' = 'running'`)@@ -731,7 +699,6 @@ export async function updateTurnState(db: Kysely<Database>, input: UpdateTurnStaconst existing = await trx.selectFrom('turn').select('state')- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).where('turn_id', '=', input.turn_id).executeTakeFirst();@@ -743,7 +710,6 @@ export async function updateTurnState(db: Kysely<Database>, input: UpdateTurnStaawait trx.insertInto('session_event').values({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,event_id: input.turn_done_event.id,diff --git a/packages/server/src/db/postgres/types.ts b/packages/server/src/db/postgres/types.tsindex aa617379d..361d3a31d 100644--- a/packages/server/src/db/postgres/types.ts+++ b/packages/server/src/db/postgres/types.ts@@ -68,7 +68,7 @@ export interface TurnCheckpoint {}/**- * PRIMARY KEY (tenant_id, session_id)+ * PRIMARY KEY (session_id)* WITH (fillfactor = 85); headroom so the per-turn bump stays HOT (no index churn)* CREATE INDEX session_list_idx ON session (tenant_id, created_at, session_id)*/@@ -104,13 +104,11 @@ export interface SessionTable {}/**- * PRIMARY KEY (tenant_id, session_id, turn_id)+ * PRIMARY KEY (session_id, turn_id)* WITH (fillfactor = 85); headroom for the state flip + rare checkpoint patches- * CREATE INDEX turn_list_idx ON turn (tenant_id, session_id, created_at, turn_id)+ * CREATE INDEX turn_list_idx ON turn (session_id, created_at, turn_id)*/export interface TurnTable {- /** key */- tenant_id: string;/** key */session_id: string;/** key (ulid) */@@ -151,13 +149,11 @@ export interface TurnTable {/*** the complete STATE of one thread at one turn- * PRIMARY KEY (tenant_id, session_id, turn_id, thread_id)+ * PRIMARY KEY (session_id, turn_id, thread_id)* WITH (fillfactor = 70); the ONE deliberately-hot table: rewritten 5–10x while its* turn runs; immutable once the turn is terminal (fence)*/export interface TurnThreadTable {- /** key */- tenant_id: string;/** key */session_id: string;/** key */@@ -211,12 +207,10 @@ export interface TurnThreadTable {/*** pure immutable client-facing event log- * PRIMARY KEY (tenant_id, session_id, turn_id, event_id)+ * PRIMARY KEY (session_id, turn_id, event_id)* pure INSERT → fillfactor 100*/export interface SessionEventTable {- /** key */- tenant_id: string;/** key */session_id: string;/** top: every read is turn-scoped or turn-attributed (envelope) */@@ -249,13 +243,11 @@ export interface SessionEventTable {/*** pure immutable CONTENT; no state → no checkpoint field- * PRIMARY KEY (tenant_id, session_id, thread_id, append_id)+ * PRIMARY KEY (session_id, thread_id, append_id)* pure INSERT → default fillfactor 100, zero dead tuples;* cleanup is whole-session delete only*/export interface ThreadContextLogTable {- /** key */- tenant_id: string;/** key */session_id: string;/** key */@@ -292,7 +284,7 @@ export interface ThreadContextLogTable {/*** PER-TURN KV snapshot, latest-wins per (turn, thread, key)- * PRIMARY KEY (tenant_id, session_id, turn_id, thread_id, key)+ * PRIMARY KEY (session_id, turn_id, thread_id, key)* WITH (fillfactor = 85); single-statement fenced upsert per CAPABILITY_STATE event** Capability history is per-turn on purpose: createTurn carries the previous@@ -301,8 +293,6 @@ export interface ThreadContextLogTable {* A cross-turn latest-wins PK was tried and REVERTED for the fork reason.*/export interface ThreadCapabilityStateTable {- /** key */- tenant_id: string;/** key */session_id: string;/**diff --git a/packages/server/src/db/sqlite/migrations/20260730_000002_session_store.ts b/packages/server/src/db/sqlite/migrations/20260730_000002_session_store.tsindex e52f78c52..7d6ffd2b1 100644--- a/packages/server/src/db/sqlite/migrations/20260730_000002_session_store.ts+++ b/packages/server/src/db/sqlite/migrations/20260730_000002_session_store.ts@@ -18,7 +18,7 @@ export async function up(db: Kysely<unknown>): Promise<void> {last_activity_timestamp_ms INTEGER NOT NULL,created_at TEXT NOT NULL,updated_at TEXT NOT NULL,- PRIMARY KEY (tenant_id, session_id)+ PRIMARY KEY (session_id)) STRICT`.execute(db);@@ -29,8 +29,7 @@ export async function up(db: Kysely<unknown>): Promise<void> {await sql`CREATE TABLE turn (- tenant_id TEXT NOT NULL,- session_id TEXT NOT NULL,+ session_id TEXT NOT NULL REFERENCES session(session_id) ON DELETE CASCADE,turn_id TEXT NOT NULL,first_turn_id TEXT NOT NULL,previous_turn_id TEXT,@@ -41,63 +40,59 @@ export async function up(db: Kysely<unknown>): Promise<void> {custom BLOB,created_at TEXT NOT NULL,updated_at TEXT NOT NULL,- PRIMARY KEY (tenant_id, session_id, turn_id)+ PRIMARY KEY (session_id, turn_id)) STRICT`.execute(db);await sql`CREATE INDEX turn_list_idx- ON turn (tenant_id, session_id, created_at, turn_id)+ ON turn (session_id, created_at, turn_id)`.execute(db);await sql`CREATE TABLE turn_thread (- tenant_id TEXT NOT NULL,- session_id TEXT NOT NULL,+ session_id TEXT NOT NULL REFERENCES session(session_id) ON DELETE CASCADE,turn_id TEXT NOT NULL,thread_id TEXT NOT NULL,checkpoint BLOB NOT NULL,agent_info BLOB,current_context_usage BLOB NOT NULL,updated_at TEXT NOT NULL,- PRIMARY KEY (tenant_id, session_id, turn_id, thread_id)+ PRIMARY KEY (session_id, turn_id, thread_id)) STRICT`.execute(db);await sql`CREATE TABLE turn_thread_context (- tenant_id TEXT NOT NULL,- session_id TEXT NOT NULL,+ session_id TEXT NOT NULL REFERENCES session(session_id) ON DELETE CASCADE,turn_id TEXT NOT NULL,thread_id TEXT NOT NULL,pos INTEGER NOT NULL,append_id INTEGER NOT NULL,- PRIMARY KEY (tenant_id, session_id, turn_id, thread_id, pos)+ PRIMARY KEY (session_id, turn_id, thread_id, pos)) STRICT`.execute(db);await sql`CREATE INDEX turn_thread_context_append_idx- ON turn_thread_context (tenant_id, session_id, thread_id, append_id)+ ON turn_thread_context (session_id, thread_id, append_id)`.execute(db);await sql`CREATE TABLE session_event (- tenant_id TEXT NOT NULL,- session_id TEXT NOT NULL,+ session_id TEXT NOT NULL REFERENCES session(session_id) ON DELETE CASCADE,turn_id TEXT NOT NULL,event_id TEXT NOT NULL,event BLOB NOT NULL,created_at TEXT NOT NULL,- PRIMARY KEY (tenant_id, session_id, turn_id, event_id)+ PRIMARY KEY (session_id, turn_id, event_id)) STRICT`.execute(db);await sql`CREATE TABLE thread_context_log (append_id INTEGER PRIMARY KEY AUTOINCREMENT,- tenant_id TEXT NOT NULL,- session_id TEXT NOT NULL,+ session_id TEXT NOT NULL REFERENCES session(session_id) ON DELETE CASCADE,thread_id TEXT NOT NULL,turn_id TEXT NOT NULL,body BLOB NOT NULL,@@ -107,19 +102,18 @@ export async function up(db: Kysely<unknown>): Promise<void> {await sql`CREATE INDEX thread_context_log_lookup_idx- ON thread_context_log (tenant_id, session_id, thread_id, append_id)+ ON thread_context_log (session_id, thread_id, append_id)`.execute(db);await sql`CREATE TABLE thread_capability_state (- tenant_id TEXT NOT NULL,- session_id TEXT NOT NULL,+ session_id TEXT NOT NULL REFERENCES session(session_id) ON DELETE CASCADE,turn_id TEXT NOT NULL,thread_id TEXT NOT NULL,key TEXT NOT NULL,state BLOB,updated_at TEXT NOT NULL,- PRIMARY KEY (tenant_id, session_id, turn_id, thread_id, key)+ PRIMARY KEY (session_id, turn_id, thread_id, key)) STRICT`.execute(db);}diff --git a/packages/server/src/db/sqlite/session-store/SqliteSessionStore.ts b/packages/server/src/db/sqlite/session-store/SqliteSessionStore.tsindex 4100fd2ce..940e01ec6 100644--- a/packages/server/src/db/sqlite/session-store/SqliteSessionStore.ts+++ b/packages/server/src/db/sqlite/session-store/SqliteSessionStore.ts@@ -108,7 +108,6 @@ export class SqliteSessionStore implements ISessionStore<SessionCustom, TurnCustasync createTurn(input: CreateTurnInput<TurnCustom>): Promise<void> {await createTurnQuery(this.db, {- tenant_id: input.tenant_id,session_id: input.turn.session_id,turn: {turn_id: input.turn.turn_id,@@ -146,7 +145,6 @@ export class SqliteSessionStore implements ISessionStore<SessionCustom, TurnCust): Promise<{ data: TurnRecordWithoutSnapshot<TurnCustom>[]; pagination: TokenPagination }> {const offset = decodeOffsetPageToken(input.page_token);const result = await listTurnsQuery(this.db, {- tenant_id: input.tenant_id,session_id: input.session_id,limit: input.limit,offset,diff --git a/packages/server/src/db/sqlite/session-store/queries/capabilities.ts b/packages/server/src/db/sqlite/session-store/queries/capabilities.tsindex 00ac0487e..558e3b9f8 100644--- a/packages/server/src/db/sqlite/session-store/queries/capabilities.ts+++ b/packages/server/src/db/sqlite/session-store/queries/capabilities.ts@@ -2,7 +2,7 @@ import type { PatchThreadCapabilityStateInput } from '@truefoundry/utils/agent-simport { sql, type Kysely } from 'kysely';import type { Database } from '../../types';import { jsonbBind, nowIso } from '../sqlExpressions';-import { classifyTurnFenceWriteFailure, type TurnKeys } from './turns';+import { classifyTurnFenceWriteFailure } from './turns';/*** patchThreadCapabilityState — single-statement fenced upsert on the PER-TURN PK.@@ -13,25 +13,18 @@ export async function patchThreadCapabilityState(db: Kysely<Database>,input: PatchThreadCapabilityStateInput,): Promise<void> {- const keys: TurnKeys = {- tenant_id: input.tenant_id,- session_id: input.session_id,- turn_id: input.turn_id,- };-await db.transaction().execute(async trx => {// Fence inside IMMEDIATE transaction: verify turn is still running.const fenceRow = await trx.selectFrom('turn').select(sql`1`.as('one'))- .where('tenant_id', '=', keys.tenant_id)- .where('session_id', '=', keys.session_id)- .where('turn_id', '=', keys.turn_id)+ .where('session_id', '=', input.session_id)+ .where('turn_id', '=', input.turn_id).where(sql<boolean>`state->>'status' = 'running'`).executeTakeFirst();if (!fenceRow) {- await classifyTurnFenceWriteFailure(trx, keys);+ await classifyTurnFenceWriteFailure(trx, input);}const now = nowIso();@@ -40,7 +33,6 @@ export async function patchThreadCapabilityState(await trx.insertInto('thread_capability_state').values({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,thread_id: input.thread_id,@@ -49,7 +41,7 @@ export async function patchThreadCapabilityState(updated_at: now,}).onConflict(oc =>- oc.columns(['tenant_id', 'session_id', 'turn_id', 'thread_id', 'key']).doUpdateSet({+ oc.columns(['session_id', 'turn_id', 'thread_id', 'key']).doUpdateSet({state: sql`excluded.state`,updated_at: sql`excluded.updated_at`,}),diff --git a/packages/server/src/db/sqlite/session-store/queries/events.ts b/packages/server/src/db/sqlite/session-store/queries/events.tsindex e5b5d7b36..3034c51f3 100644--- a/packages/server/src/db/sqlite/session-store/queries/events.ts+++ b/packages/server/src/db/sqlite/session-store/queries/events.ts@@ -21,7 +21,6 @@ export async function appendToEvents(db: Kysely<Database>, input: AppendToEventsif (input.events.length === 0) return;const keys: TurnKeys = {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,};@@ -31,7 +30,6 @@ export async function appendToEvents(db: Kysely<Database>, input: AppendToEventsconst fenceRow = await trx.selectFrom('turn').select(sql`1`.as('one'))- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).where(sql<boolean>`state->>'status' = 'running'`)@@ -42,7 +40,6 @@ export async function appendToEvents(db: Kysely<Database>, input: AppendToEvents}const eventRows = input.events.map(event => ({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,event_id: event.id,@@ -72,28 +69,16 @@ export async function listTurnEvents(eb =>eb.selectFrom('session_event')- .select([- 'tenant_id',- 'session_id',- 'turn_id',- 'event_id',- jsonText<PersistedTurnEvent>(sql.ref('event')).as('event'),- ])- .where('tenant_id', '=', input.tenant_id)+ .select(['session_id', 'turn_id', 'event_id', jsonText<PersistedTurnEvent>(sql.ref('event')).as('event')]).where('session_id', '=', input.session_id).where('turn_id', '=', input.turn_id).orderBy('event_id', eventOrder).limit(limit + 1).offset(offset).as('e'),- join =>- join- .onRef('e.tenant_id', '=', 't.tenant_id')- .onRef('e.session_id', '=', 't.session_id')- .onRef('e.turn_id', '=', 't.turn_id'),+ join => join.onRef('e.session_id', '=', 't.session_id').onRef('e.turn_id', '=', 't.turn_id'),).select(['t.turn_id', 'e.event'])- .where('t.tenant_id', '=', input.tenant_id).where('t.session_id', '=', input.session_id).where('t.turn_id', '=', input.turn_id).orderBy('e.event_id', eventOrder)@@ -126,7 +111,6 @@ export interface AnchorTurn {*/export async function resolveAncestorChain(db: Kysely<Database>,- tenant: string,sessionId: string,anchor: AnchorTurn,): Promise<string[]> {@@ -137,7 +121,6 @@ export async function resolveAncestorChain(const oldest = await db.selectFrom('turn').select([jsonText<string[]>(sql.ref('ancestor_ids')).as('ancestor_ids')])- .where('tenant_id', '=', tenant).where('session_id', '=', sessionId).where('turn_id', '=', oldestId).executeTakeFirst();@@ -160,7 +143,6 @@ export async function listSessionEvents(const session = await db.selectFrom('session').select('last_turn_id')- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).executeTakeFirst();if (!session) {@@ -180,7 +162,6 @@ export async function listSessionEvents(const anchor = await db.selectFrom('turn').select(['turn_id', jsonText<string[]>(sql.ref('ancestor_ids')).as('ancestor_ids')])- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).where('turn_id', '=', cursor.last_turn_id).executeTakeFirst();@@ -188,7 +169,7 @@ export async function listSessionEvents(throw new TurnNotFoundError(cursor.last_turn_id);}- const chainIds = await resolveAncestorChain(db, input.tenant_id, input.session_id, {+ const chainIds = await resolveAncestorChain(db, input.session_id, {turn_id: anchor.turn_id,ancestor_ids: anchor.ancestor_ids,});@@ -199,10 +180,7 @@ export async function listSessionEvents(const rows = await db.selectFrom(sql<{ key: number; value: string }>`json_each(${chainJson})`.as('c')).innerJoin('session_event as e', join =>- join- .on('e.tenant_id', '=', input.tenant_id)- .on('e.session_id', '=', input.session_id)- .on(sql<boolean>`e.turn_id = c.value`),+ join.on('e.session_id', '=', input.session_id).on(sql<boolean>`e.turn_id = c.value`),).select([sql<string>`c.value`.as('turn_id'), jsonText<SessionEventItem['event']>(sql.ref('e.event')).as('event')]).orderBy(sql`c.key`, 'desc')diff --git a/packages/server/src/db/sqlite/session-store/queries/threads.ts b/packages/server/src/db/sqlite/session-store/queries/threads.tsindex ab0f211b9..30729d00b 100644--- a/packages/server/src/db/sqlite/session-store/queries/threads.ts+++ b/packages/server/src/db/sqlite/session-store/queries/threads.ts@@ -27,14 +27,12 @@ type DbOrTrx = Kysely<Database> | Transaction<Database>;export async function addThreads(db: Kysely<Database>, input: AddThreadsInput): Promise<void> {await db.transaction().execute(async trx => {await assertTurnRunning(trx, {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,});const now = nowIso();const logRows: {- tenant_id: string;session_id: string;thread_id: string;turn_id: string;@@ -42,7 +40,6 @@ export async function addThreads(db: Kysely<Database>, input: AddThreadsInput):created_at: string;}[] = [];const capabilityStateRows: {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;@@ -71,7 +68,6 @@ export async function addThreads(db: Kysely<Database>, input: AddThreadsInput):for (const body of thread.context) {logRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,thread_id: thread.thread_id,turn_id: input.turn_id,@@ -90,7 +86,6 @@ export async function addThreads(db: Kysely<Database>, input: AddThreadsInput):);}capabilityStateRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,thread_id: thread.thread_id,@@ -120,7 +115,6 @@ export async function addThreads(db: Kysely<Database>, input: AddThreadsInput):}const turnThreadRows = turnThreadPlans.map(plan => ({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,thread_id: plan.thread_id,@@ -135,7 +129,6 @@ export async function addThreads(db: Kysely<Database>, input: AddThreadsInput):}const contextMappingRows: {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;@@ -149,7 +142,6 @@ export async function addThreads(db: Kysely<Database>, input: AddThreadsInput):const appendId = newIds[i];if (appendId !== undefined) {contextMappingRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,thread_id: plan.thread_id,@@ -183,14 +175,12 @@ export async function removeThreads(db: Kysely<Database>, input: RemoveThreadsInawait db.transaction().execute(async trx => {await assertTurnRunning(trx, {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,});await trx.deleteFrom('turn_thread_context')- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).where('turn_id', '=', input.turn_id).where('thread_id', 'in', input.thread_ids)@@ -198,7 +188,6 @@ export async function removeThreads(db: Kysely<Database>, input: RemoveThreadsInawait trx.deleteFrom('turn_thread')- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).where('turn_id', '=', input.turn_id).where('thread_id', 'in', input.thread_ids)@@ -206,7 +195,6 @@ export async function removeThreads(db: Kysely<Database>, input: RemoveThreadsInawait trx.deleteFrom('thread_capability_state')- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).where('turn_id', '=', input.turn_id).where('thread_id', 'in', input.thread_ids)@@ -218,7 +206,6 @@ async function getNextPos(db: DbOrTrx, keys: TurnKeys, thread_id: string): Promiconst maxRow = await db.selectFrom('turn_thread_context').select([sql<number | null>`MAX(pos)`.as('max_pos')])- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).where('thread_id', '=', thread_id)@@ -263,7 +250,6 @@ async function fencedTurnThreadContextUpdate(if (replace_array) {await trx.deleteFrom('turn_thread_context')- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).where('thread_id', '=', thread_id)@@ -272,7 +258,6 @@ async function fencedTurnThreadContextUpdate(if (context.length > 0) {const logRows = context.map(body => ({- tenant_id: keys.tenant_id,session_id: keys.session_id,thread_id,turn_id: keys.turn_id,@@ -285,7 +270,6 @@ async function fencedTurnThreadContextUpdate(let nextPos = replace_array ? 1 : await getNextPos(trx, keys, thread_id);const contextMappingRows: {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;@@ -295,7 +279,6 @@ async function fencedTurnThreadContextUpdate(for (const row of sortedByAppendId(inserted)) {contextMappingRows.push({- tenant_id: keys.tenant_id,session_id: keys.session_id,turn_id: keys.turn_id,thread_id,@@ -322,7 +305,6 @@ async function fencedTurnThreadContextUpdate(current_context_usage: usageExpr,updated_at: now,})- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).where('thread_id', '=', thread_id)@@ -341,7 +323,6 @@ async function fencedTurnThreadContextUpdate(export async function appendToThreadContext(db: Kysely<Database>, input: AppendToThreadContextInput): Promise<void> {await fencedTurnThreadContextUpdate(db, {keys: {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,},@@ -361,7 +342,6 @@ export async function appendToThreadContext(db: Kysely<Database>, input: AppendTexport async function overwriteThreadContext(db: Kysely<Database>, input: OverwriteThreadContextInput): Promise<void> {await fencedTurnThreadContextUpdate(db, {keys: {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,},@@ -385,7 +365,6 @@ export async function patchMCPServers(db: Kysely<Database>, input: PatchMCPServe}const keys: TurnKeys = {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,};@@ -416,7 +395,6 @@ export async function patchMCPServers(db: Kysely<Database>, input: PatchMCPServe)`,updated_at: nowIso(),})- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).where(sql<boolean>`state->>'status' = 'running'`)@@ -432,7 +410,6 @@ export async function patchMCPServers(db: Kysely<Database>, input: PatchMCPServe*/export async function patchSandboxInfo(db: Kysely<Database>, input: PatchSandboxInfoInput): Promise<void> {const keys: TurnKeys = {- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,};@@ -443,7 +420,6 @@ export async function patchSandboxInfo(db: Kysely<Database>, input: PatchSandboxcheckpoint: jsonbSet(sql.ref('checkpoint'), '$.sandbox_info', input.sandbox_info),updated_at: nowIso(),})- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).where(sql<boolean>`state->>'status' = 'running'`)diff --git a/packages/server/src/db/sqlite/session-store/queries/turns.ts b/packages/server/src/db/sqlite/session-store/queries/turns.tsindex 545046ed4..e32ea74c0 100644--- a/packages/server/src/db/sqlite/session-store/queries/turns.ts+++ b/packages/server/src/db/sqlite/session-store/queries/turns.ts@@ -56,7 +56,6 @@ export interface NewThreadRegistration {}export interface TurnKeys {- tenant_id: string;session_id: string;turn_id: string;}@@ -78,7 +77,6 @@ export interface CreateTurnTurnFields {}export interface CreateTurnInput {- tenant_id: string;session_id: string;turn: CreateTurnTurnFields;new_threads: NewThreadRegistration[];@@ -94,13 +92,11 @@ export interface CreateTurnInput {}export interface GetTurnInput {- tenant_id: string;session_id: string;turn_id: string;}export interface ListTurnsInput {- tenant_id: string;session_id: string;limit: number;offset: number;@@ -128,7 +124,6 @@ async function loadTurnState(db: DbOrTrx, keys: TurnKeys): Promise<TurnState | uconst row = await db.selectFrom('turn').select([jsonText<TurnState>(sql.ref('state')).as('state')])- .where('tenant_id', '=', keys.tenant_id).where('session_id', '=', keys.session_id).where('turn_id', '=', keys.turn_id).executeTakeFirst();@@ -175,12 +170,11 @@ interface CapabilityAggRow {async function assembleTurnRecord(db: DbOrTrx,- args: { tenant_id: string; session_id: string; turn_id: string },+ args: { session_id: string; turn_id: string },): Promise<TurnRecord<TurnCustom> | undefined> {const turn = await db.selectFrom('turn').select([- 'tenant_id','session_id','turn_id','first_turn_id',@@ -193,7 +187,6 @@ async function assembleTurnRecord('created_at','updated_at',])- .where('tenant_id', '=', args.tenant_id).where('session_id', '=', args.session_id).where('turn_id', '=', args.turn_id).executeTakeFirst();@@ -206,14 +199,12 @@ async function assembleTurnRecord(.selectFrom('turn_thread as tt').leftJoin('turn_thread_context as ttc', join =>join- .on('ttc.tenant_id', '=', args.tenant_id).on('ttc.session_id', '=', args.session_id).on('ttc.turn_id', '=', args.turn_id).onRef('ttc.thread_id', '=', 'tt.thread_id'),).leftJoin('thread_context_log as l', join =>join- .on('l.tenant_id', '=', args.tenant_id).on('l.session_id', '=', args.session_id).onRef('l.thread_id', '=', 'tt.thread_id').onRef('l.append_id', '=', 'ttc.append_id'),@@ -226,7 +217,6 @@ async function assembleTurnRecord(jsonText<ContextMessage | null>(sql.ref('l.body')).as('body'),'ttc.pos',])- .where('tt.tenant_id', '=', args.tenant_id).where('tt.session_id', '=', args.session_id).where('tt.turn_id', '=', args.turn_id).orderBy('tt.thread_id')@@ -239,7 +229,6 @@ async function assembleTurnRecord('thread_id',sql<Record<string, JsonValue> | null>`json(jsonb_group_object(key, json(state)))`.as('capability_state'),])- .where('tenant_id', '=', args.tenant_id).where('session_id', '=', args.session_id).where('turn_id', '=', args.turn_id).groupBy('thread_id')@@ -329,7 +318,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):const locked = await trx.selectFrom('session').select(['last_turn_id'])- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).executeTakeFirst();@@ -343,7 +331,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):updated_at: nowIso(),last_activity_timestamp_ms: input.last_activity_timestamp_ms,})- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id);if (input.update_session_title_if_not_exist !== null) {@@ -371,16 +358,12 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):const prevRows = await trx.selectFrom('turn as t').leftJoin('turn_thread as tt', join =>- join- .onRef('tt.tenant_id', '=', 't.tenant_id')- .onRef('tt.session_id', '=', 't.session_id')- .onRef('tt.turn_id', '=', 't.turn_id'),+ join.onRef('tt.session_id', '=', 't.session_id').onRef('tt.turn_id', '=', 't.turn_id'),).leftJoin(db.selectFrom('turn_thread_context').select(['thread_id', 'turn_id', sql<number>`MAX(pos)`.as('max_pos')])- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).where('turn_id', '=', prevTurnId).groupBy(['thread_id', 'turn_id'])@@ -396,7 +379,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):jsonText<CurrentContextUsage | null>(sql.ref('tt.current_context_usage')).as('current_context_usage'),'tc_agg.max_pos',])- .where('t.tenant_id', '=', input.tenant_id).where('t.session_id', '=', input.session_id).where('t.turn_id', '=', prevTurnId).execute();@@ -444,7 +426,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):await trx.insertInto('turn').values({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn.turn_id,first_turn_id: input.turn.first_turn_id,@@ -461,7 +442,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):// Step 4: insert new context log rows.const logRows: {- tenant_id: string;session_id: string;thread_id: string;turn_id: string;@@ -472,7 +452,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):for (const append of input.new_context_appends) {for (const body of append.context) {logRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,thread_id: append.thread_id,turn_id: input.turn.turn_id,@@ -508,7 +487,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):// Step 5: insert turn_thread rows for carried-forward and new threads.const turnThreadRows: {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;@@ -519,7 +497,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):}[] = [];const turnThreadContextRows: {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;@@ -530,7 +507,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):for (const parent of prevThreadRows) {const usage = appendUsageByThread.get(parent.thread_id) ?? parent.current_context_usage;turnThreadRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn.turn_id,thread_id: parent.thread_id,@@ -546,7 +522,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):const parentContextRows = await trx.selectFrom('turn_thread_context').select(['thread_id', 'pos', 'append_id'])- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).where('turn_id', '=', prevTurnId).where(@@ -560,7 +535,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):for (const cr of parentContextRows) {turnThreadContextRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn.turn_id,thread_id: cr.thread_id,@@ -577,7 +551,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):const appendId = newIds[i];if (appendId !== undefined) {turnThreadContextRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn.turn_id,thread_id: parent.thread_id,@@ -597,7 +570,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):completion: null,};turnThreadRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn.turn_id,thread_id: nt.thread_id,@@ -611,7 +583,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):const appendId = newIds[i];if (appendId !== undefined) {turnThreadContextRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn.turn_id,thread_id: nt.thread_id,@@ -632,7 +603,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):// Step 6: insert capability state rows (thread coverage asserted above).const capabilityStateRows: {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;@@ -645,7 +615,6 @@ export async function createTurn(db: Kysely<Database>, input: CreateTurnInput):if (capability.capability_state === null) continue;for (const [key, state] of Object.entries(capability.capability_state)) {capabilityStateRows.push({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn.turn_id,thread_id: capability.thread_id,@@ -685,7 +654,6 @@ export async function freezeAndGetTurn(db: Kysely<Database>, input: FreezeAndGetstate: jsonbBind(cancelledState),updated_at: nowIso(),})- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).where('turn_id', '=', input.turn_id).where(sql<boolean>`state->>'status' = 'running'`)@@ -695,7 +663,6 @@ export async function freezeAndGetTurn(db: Kysely<Database>, input: FreezeAndGetawait trx.insertInto('session_event').values({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,event_id: input.turn_done_event.id,@@ -741,7 +708,6 @@ export async function listTurns(db: Kysely<Database>, input: ListTurnsInput): Pr'created_at','updated_at',])- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).orderBy('created_at', 'asc').orderBy('turn_id', 'asc')@@ -783,7 +749,6 @@ export async function updateTurnState(db: Kysely<Database>, input: UpdateTurnStastate: jsonbBind(input.state),updated_at: nowIso(),})- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).where('turn_id', '=', input.turn_id).where(sql<boolean>`state->>'status' = 'running'`)@@ -794,7 +759,6 @@ export async function updateTurnState(db: Kysely<Database>, input: UpdateTurnStaconst existing = await trx.selectFrom('turn').select([jsonText<TurnState>(sql.ref('state')).as('state')])- .where('tenant_id', '=', input.tenant_id).where('session_id', '=', input.session_id).where('turn_id', '=', input.turn_id).executeTakeFirst();@@ -806,7 +770,6 @@ export async function updateTurnState(db: Kysely<Database>, input: UpdateTurnStaawait trx.insertInto('session_event').values({- tenant_id: input.tenant_id,session_id: input.session_id,turn_id: input.turn_id,event_id: input.turn_done_event.id,diff --git a/packages/server/src/db/sqlite/types.ts b/packages/server/src/db/sqlite/types.tsindex 2010a32ef..dc87c9a4f 100644--- a/packages/server/src/db/sqlite/types.ts+++ b/packages/server/src/db/sqlite/types.ts@@ -73,7 +73,7 @@ export interface TurnCheckpoint {type JsonbColumn<T extends object | null> = JSONColumnType<T, T | string, T | string>;/**- * PRIMARY KEY (tenant_id, session_id)+ * PRIMARY KEY (session_id)* CREATE INDEX session_list_idx ON session (tenant_id, created_at, session_id)*/export interface SessionTable {@@ -89,11 +89,10 @@ export interface SessionTable {}/**- * PRIMARY KEY (tenant_id, session_id, turn_id)- * CREATE INDEX turn_list_idx ON turn (tenant_id, session_id, created_at, turn_id)+ * PRIMARY KEY (session_id, turn_id)+ * CREATE INDEX turn_list_idx ON turn (session_id, created_at, turn_id)*/export interface TurnTable {- tenant_id: string;session_id: string;turn_id: string;first_turn_id: string;@@ -111,10 +110,9 @@ export interface TurnTable {/*** Complete state of one thread at one turn.* Context order lives in `turn_thread_context` (no context_ids column).- * PRIMARY KEY (tenant_id, session_id, turn_id, thread_id)+ * PRIMARY KEY (session_id, turn_id, thread_id)*/export interface TurnThreadTable {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;@@ -126,10 +124,9 @@ export interface TurnThreadTable {/*** Ordered mapping from a turn_thread to append-only log rows.- * PRIMARY KEY (tenant_id, session_id, turn_id, thread_id, pos)+ * PRIMARY KEY (session_id, turn_id, thread_id, pos)*/export interface TurnThreadContextTable {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;@@ -139,10 +136,9 @@ export interface TurnThreadContextTable {/*** Pure immutable client-facing event log.- * PRIMARY KEY (tenant_id, session_id, turn_id, event_id)+ * PRIMARY KEY (session_id, turn_id, event_id)*/export interface SessionEventTable {- tenant_id: string;session_id: string;turn_id: string;event_id: string;@@ -156,7 +152,6 @@ export interface SessionEventTable {*/export interface ThreadContextLogTable {append_id: Generated<number>;- tenant_id: string;session_id: string;thread_id: string;turn_id: string;@@ -166,10 +161,9 @@ export interface ThreadContextLogTable {/*** Per-turn KV snapshot, latest-wins per (turn, thread, key).- * PRIMARY KEY (tenant_id, session_id, turn_id, thread_id, key)+ * PRIMARY KEY (session_id, turn_id, thread_id, key)*/export interface ThreadCapabilityStateTable {- tenant_id: string;session_id: string;turn_id: string;thread_id: string;