@namzu/sdk 0.2.0 → 0.4.0

package/src/session/__tests__/integration/handoff-broadcast-e2e.test.ts

@@ -10,9 +10,11 @@
  */
 
 import { describe, expect, it, vi } from 'vitest'
+import { ThreadManager } from '../../../manager/thread/lifecycle.js'
 import { InMemorySessionStore } from '../../../store/session/memory.js'
+import { InMemoryThreadStore } from '../../../store/thread/memory.js'
 import type { SessionId } from '../../../types/ids/index.js'
-import type { ProjectId } from '../../../types/session/ids.js'
+import type { ProjectId, ThreadId } from '../../../types/session/ids.js'
 import { generateHandoffId } from '../../../utils/id.js'
 import type { HandoffAssignment } from '../../handoff/assignment.js'
 import { type BroadcastHandoffDeps, executeBroadcastHandoff } from '../../handoff/broadcast.js'
@@ -26,6 +28,7 @@ import { DEFAULT_TENANT, okExec, stubLogger, userActor } from './_fixtures.js'
 
 function buildDeps(
 	store: InMemorySessionStore,
+	threadStore: InMemoryThreadStore,
 	execOverride?: ExecFile,
 ): {
 	deps: BroadcastHandoffDeps
@@ -54,6 +57,7 @@ function buildDeps(
 			workspaceRegistry,
 			capacity: new DefaultCapacityValidator(store),
 			events: sink,
+			threadManager: new ThreadManager({ threadStore, sessionStore: store }),
 		},
 		events: { ...sink, onBroadcastRollback },
 	}
@@ -62,6 +66,7 @@ function buildDeps(
 function buildAssignments(
 	sourceSessionId: SessionId,
 	projectId: ProjectId,
+	threadId: ThreadId,
 	recipients: ActorRef[],
 	broadcastId = 'bc_integration',
 	expectedOwnerVersion = 0,
@@ -71,6 +76,7 @@ function buildAssignments(
 		mode: 'broadcast' as const,
 		sourceSessionId,
 		tenantId: DEFAULT_TENANT,
+		threadId,
 		projectId,
 		sourceActor: userActor('usr_source'),
 		recipientActor,
@@ -83,12 +89,17 @@ function buildAssignments(
 describe('Integration — broadcast handoff E2E', () => {
 	it('happy: 3-recipient fan-out → each recipient has isolated worktree + source reaches awaiting_merge', async () => {
 		const store = new InMemorySessionStore()
+		const threadStore = new InMemoryThreadStore()
 		const project = await store.createProject(
 			{ tenantId: DEFAULT_TENANT, name: 'bc-happy' },
 			DEFAULT_TENANT,
 		)
+		const thread = await threadStore.createThread(
+			{ projectId: project.id, title: 'bc-happy' },
+			DEFAULT_TENANT,
+		)
 		const source = await store.createSession(
-			{ projectId: project.id, currentActor: userActor('usr_source') },
+			{ threadId: thread.id, projectId: project.id, currentActor: userActor('usr_source') },
 			DEFAULT_TENANT,
 		)
 
@@ -103,10 +114,10 @@ describe('Integration — broadcast handoff E2E', () => {
 			}
 			return okExec()
 		}
-		const { deps } = buildDeps(store, exec)
+		const { deps } = buildDeps(store, threadStore, exec)
 
 		const recipients = [userActor('usr_bob'), userActor('usr_carol'), userActor('usr_dan')]
-		const assignments = buildAssignments(source.id, project.id, recipients)
+		const assignments = buildAssignments(source.id, project.id, thread.id, recipients)
 
 		const outcomes = await executeBroadcastHandoff(deps, assignments, DEFAULT_TENANT)
 		expect(outcomes).toHaveLength(3)
@@ -128,12 +139,17 @@ describe('Integration — broadcast handoff E2E', () => {
 
 	it('rollback on 2nd-recipient provisioning failure: zero orphan records, partialState accurate', async () => {
 		const store = new InMemorySessionStore()
+		const threadStore = new InMemoryThreadStore()
 		const project = await store.createProject(
 			{ tenantId: DEFAULT_TENANT, name: 'bc-rb' },
 			DEFAULT_TENANT,
 		)
+		const thread = await threadStore.createThread(
+			{ projectId: project.id, title: 'bc-rb' },
+			DEFAULT_TENANT,
+		)
 		const source = await store.createSession(
-			{ projectId: project.id, currentActor: userActor('usr_source') },
+			{ threadId: thread.id, projectId: project.id, currentActor: userActor('usr_source') },
 			DEFAULT_TENANT,
 		)
 
@@ -145,9 +161,9 @@ describe('Integration — broadcast handoff E2E', () => {
 			}
 			return okExec()
 		}
-		const { deps, events } = buildDeps(store, exec)
+		const { deps, events } = buildDeps(store, threadStore, exec)
 
-		const assignments = buildAssignments(source.id, project.id, [
+		const assignments = buildAssignments(source.id, project.id, thread.id, [
 			userActor('usr_b'),
 			userActor('usr_c'),
 			userActor('usr_d'),
@@ -186,18 +202,23 @@ describe('Integration — broadcast handoff E2E', () => {
 
 	it('source transitions to awaiting_merge + retains currentActor as coordinator (§5.4)', async () => {
 		const store = new InMemorySessionStore()
+		const threadStore = new InMemoryThreadStore()
 		const project = await store.createProject(
 			{ tenantId: DEFAULT_TENANT, name: 'coord' },
 			DEFAULT_TENANT,
 		)
+		const thread = await threadStore.createThread(
+			{ projectId: project.id, title: 'coord' },
+			DEFAULT_TENANT,
+		)
 		const coordinator = userActor('usr_source')
 		const source = await store.createSession(
-			{ projectId: project.id, currentActor: coordinator },
+			{ threadId: thread.id, projectId: project.id, currentActor: coordinator },
 			DEFAULT_TENANT,
 		)
 
-		const { deps } = buildDeps(store)
-		const assignments = buildAssignments(source.id, project.id, [
+		const { deps } = buildDeps(store, threadStore)
+		const assignments = buildAssignments(source.id, project.id, thread.id, [
 			userActor('usr_b'),
 			userActor('usr_c'),
 		])
@@ -213,12 +234,17 @@ describe('Integration — broadcast handoff E2E', () => {
 
 	it('all recipients get isolated worktrees — zero path collisions even under N=8', async () => {
 		const store = new InMemorySessionStore()
+		const threadStore = new InMemoryThreadStore()
 		const project = await store.createProject(
 			{ tenantId: DEFAULT_TENANT, name: 'iso' },
 			DEFAULT_TENANT,
 		)
+		const thread = await threadStore.createThread(
+			{ projectId: project.id, title: 'iso' },
+			DEFAULT_TENANT,
+		)
 		const source = await store.createSession(
-			{ projectId: project.id, currentActor: userActor('usr_source') },
+			{ threadId: thread.id, projectId: project.id, currentActor: userActor('usr_source') },
 			DEFAULT_TENANT,
 		)
 
@@ -233,10 +259,10 @@ describe('Integration — broadcast handoff E2E', () => {
 			}
 			return okExec()
 		}
-		const { deps } = buildDeps(store, exec)
+		const { deps } = buildDeps(store, threadStore, exec)
 
 		const recipients = Array.from({ length: 8 }, (_, i) => userActor(`usr_${i}`))
-		const assignments = buildAssignments(source.id, project.id, recipients)
+		const assignments = buildAssignments(source.id, project.id, thread.id, recipients)
 
 		const outcomes = await executeBroadcastHandoff(deps, assignments, DEFAULT_TENANT)
 		expect(outcomes).toHaveLength(8)

package/src/session/__tests__/integration/handoff-illegal-transition.test.ts

@@ -16,7 +16,10 @@
  */
 
 import { describe, expect, it } from 'vitest'
+import { ThreadManager } from '../../../manager/thread/lifecycle.js'
 import { InMemorySessionStore } from '../../../store/session/memory.js'
+import { InMemoryThreadStore } from '../../../store/thread/memory.js'
+import type { ThreadId } from '../../../types/session/ids.js'
 import { generateHandoffId } from '../../../utils/id.js'
 import type { HandoffAssignment } from '../../handoff/assignment.js'
 import { DefaultCapacityValidator } from '../../handoff/capacity.js'
@@ -31,7 +34,11 @@ import { GitWorktreeDriver } from '../../workspace/git-worktree.js'
 import { WorkspaceBackendRegistry } from '../../workspace/registry.js'
 import { DEFAULT_TENANT, okExec, stubLogger, userActor } from './_fixtures.js'
 
-function buildDeps(store: InMemorySessionStore, runStatus?: RunStatusResolver): SingleHandoffDeps {
+function buildDeps(
+	store: InMemorySessionStore,
+	threadStore: InMemoryThreadStore,
+	runStatus?: RunStatusResolver,
+): SingleHandoffDeps {
 	const driver = new GitWorktreeDriver({
 		repoRoot: '/repo',
 		logger: stubLogger(),
@@ -47,31 +54,38 @@ function buildDeps(store: InMemorySessionStore, runStatus?: RunStatusResolver):
 		workspaceRegistry,
 		capacity: new DefaultCapacityValidator(store),
 		events,
+		threadManager: new ThreadManager({ threadStore, sessionStore: store }),
 		...(runStatus !== undefined && { runStatus }),
 	}
 }
 
-async function seedIdleSession(store: InMemorySessionStore) {
+async function seedIdleSession(store: InMemorySessionStore, threadStore: InMemoryThreadStore) {
 	const project = await store.createProject(
 		{ tenantId: DEFAULT_TENANT, name: 'illegal' },
 		DEFAULT_TENANT,
 	)
+	const thread = await threadStore.createThread(
+		{ projectId: project.id, title: 'illegal' },
+		DEFAULT_TENANT,
+	)
 	const session = await store.createSession(
-		{ projectId: project.id, currentActor: userActor('usr_source') },
+		{ threadId: thread.id, projectId: project.id, currentActor: userActor('usr_source') },
 		DEFAULT_TENANT,
 	)
-	return { project, session }
+	return { project, thread, session }
 }
 
 function buildAssignment(
 	sourceSessionId: Awaited<ReturnType<InMemorySessionStore['createSession']>>['id'],
 	projectId: Awaited<ReturnType<InMemorySessionStore['createProject']>>['id'],
+	threadId: ThreadId,
 ): HandoffAssignment {
 	return {
 		id: generateHandoffId(),
 		mode: 'single',
 		sourceSessionId,
 		tenantId: DEFAULT_TENANT,
+		threadId,
 		projectId,
 		sourceActor: userActor('usr_source'),
 		recipientActor: userActor('usr_target'),
@@ -83,13 +97,14 @@ function buildAssignment(
 describe('Integration — illegal handoff transitions (§5.1)', () => {
 	it('running Run → HandoffLockRejected { reason: active_run }', async () => {
 		const store = new InMemorySessionStore()
-		const { project, session } = await seedIdleSession(store)
-		const deps = buildDeps(store, {
+		const threadStore = new InMemoryThreadStore()
+		const { project, thread, session } = await seedIdleSession(store, threadStore)
+		const deps = buildDeps(store, threadStore, {
 			async blockingRun() {
 				return { reason: 'active_run' }
 			},
 		})
-		const assignment = buildAssignment(session.id, project.id)
+		const assignment = buildAssignment(session.id, project.id, thread.id)
 
 		try {
 			await executeSingleHandoff(deps, assignment, DEFAULT_TENANT)
@@ -107,15 +122,20 @@ describe('Integration — illegal handoff transitions (§5.1)', () => {
 
 	it('awaiting_hitl → HandoffLockRejected { reason: pending_hitl }', async () => {
 		const store = new InMemorySessionStore()
-		const { project, session } = await seedIdleSession(store)
-		const deps = buildDeps(store, {
+		const threadStore = new InMemoryThreadStore()
+		const { project, thread, session } = await seedIdleSession(store, threadStore)
+		const deps = buildDeps(store, threadStore, {
 			async blockingRun() {
 				return { reason: 'pending_hitl' }
 			},
 		})
 
 		try {
-			await executeSingleHandoff(deps, buildAssignment(session.id, project.id), DEFAULT_TENANT)
+			await executeSingleHandoff(
+				deps,
+				buildAssignment(session.id, project.id, thread.id),
+				DEFAULT_TENANT,
+			)
 			expect.fail('expected HandoffLockRejected')
 		} catch (err) {
 			expect(err).toBeInstanceOf(HandoffLockRejected)
@@ -129,29 +149,39 @@ describe('Integration — illegal handoff transitions (§5.1)', () => {
 		// `pending_hitl` for both. This keeps the lock-rejection enum
 		// conservative (no new reason variant for a sub-state).
 		const store = new InMemorySessionStore()
-		const { project, session } = await seedIdleSession(store)
-		const deps = buildDeps(store, {
+		const threadStore = new InMemoryThreadStore()
+		const { project, thread, session } = await seedIdleSession(store, threadStore)
+		const deps = buildDeps(store, threadStore, {
 			async blockingRun() {
 				return { reason: 'pending_hitl' }
 			},
 		})
 
 		await expect(
-			executeSingleHandoff(deps, buildAssignment(session.id, project.id), DEFAULT_TENANT),
+			executeSingleHandoff(
+				deps,
+				buildAssignment(session.id, project.id, thread.id),
+				DEFAULT_TENANT,
+			),
 		).rejects.toBeInstanceOf(HandoffLockRejected)
 	})
 
 	it('awaiting_subsession → HandoffLockRejected { reason: pending_subsession }', async () => {
 		const store = new InMemorySessionStore()
-		const { project, session } = await seedIdleSession(store)
-		const deps = buildDeps(store, {
+		const threadStore = new InMemoryThreadStore()
+		const { project, thread, session } = await seedIdleSession(store, threadStore)
+		const deps = buildDeps(store, threadStore, {
 			async blockingRun() {
 				return { reason: 'pending_subsession' }
 			},
 		})
 
 		try {
-			await executeSingleHandoff(deps, buildAssignment(session.id, project.id), DEFAULT_TENANT)
+			await executeSingleHandoff(
+				deps,
+				buildAssignment(session.id, project.id, thread.id),
+				DEFAULT_TENANT,
+			)
 			expect.fail('expected HandoffLockRejected')
 		} catch (err) {
 			expect(err).toBeInstanceOf(HandoffLockRejected)
@@ -163,17 +193,22 @@ describe('Integration — illegal handoff transitions (§5.1)', () => {
 		// When the session itself is already non-idle (e.g. `active`), the lock
 		// rejection fires from the status check — no RunStatusResolver invoked.
 		const store = new InMemorySessionStore()
-		const { project, session } = await seedIdleSession(store)
+		const threadStore = new InMemoryThreadStore()
+		const { project, thread, session } = await seedIdleSession(store, threadStore)
 		await store.updateSession({ ...session, status: 'active' }, DEFAULT_TENANT)
 
-		const deps = buildDeps(store, {
+		const deps = buildDeps(store, threadStore, {
 			async blockingRun() {
 				return null // resolver would allow, but status guard trips first
 			},
 		})
 
 		await expect(
-			executeSingleHandoff(deps, buildAssignment(session.id, project.id), DEFAULT_TENANT),
+			executeSingleHandoff(
+				deps,
+				buildAssignment(session.id, project.id, thread.id),
+				DEFAULT_TENANT,
+			),
 		).rejects.toBeInstanceOf(HandoffLockRejected)
 	})
 })

package/src/session/__tests__/integration/handoff-single-e2e.test.ts

@@ -13,7 +13,9 @@
  */
 
 import { describe, expect, it, vi } from 'vitest'
+import { ThreadManager } from '../../../manager/thread/lifecycle.js'
 import { InMemorySessionStore } from '../../../store/session/memory.js'
+import { InMemoryThreadStore } from '../../../store/thread/memory.js'
 import type { TenantId } from '../../../types/ids/index.js'
 import { generateHandoffId } from '../../../utils/id.js'
 import { TenantIsolationError } from '../../errors.js'
@@ -26,7 +28,10 @@ import { GitWorktreeDriver } from '../../workspace/git-worktree.js'
 import { WorkspaceBackendRegistry } from '../../workspace/registry.js'
 import { DEFAULT_TENANT, OTHER_TENANT, okExec, stubLogger, userActor } from './_fixtures.js'
 
-function buildHandoffDeps(store: InMemorySessionStore): {
+function buildHandoffDeps(
+	store: InMemorySessionStore,
+	threadStore: InMemoryThreadStore,
+): {
 	deps: SingleHandoffDeps
 	updateCalls: Array<{ status?: string; ownerVersion?: number }>
 } {
@@ -52,12 +57,14 @@ function buildHandoffDeps(store: InMemorySessionStore): {
 		return originalUpdate(session, tenantId)
 	}
 
+	const threadManager = new ThreadManager({ threadStore, sessionStore: store })
 	return {
 		deps: {
 			store,
 			workspaceRegistry,
 			capacity: new DefaultCapacityValidator(store),
 			events: sink,
+			threadManager,
 		},
 		updateCalls,
 	}
@@ -66,23 +73,29 @@ function buildHandoffDeps(store: InMemorySessionStore): {
 describe('Integration — single-recipient handoff E2E', () => {
 	it('idle → locked → commit: source previousActors grew + ownerVersion bumped atomically', async () => {
 		const store = new InMemorySessionStore()
+		const threadStore = new InMemoryThreadStore()
 		const project = await store.createProject(
 			{ tenantId: DEFAULT_TENANT, name: 'ho' },
 			DEFAULT_TENANT,
 		)
+		const thread = await threadStore.createThread(
+			{ projectId: project.id, title: 'ho' },
+			DEFAULT_TENANT,
+		)
 		const sourceActor = userActor('usr_source')
 		const recipientActor = userActor('usr_target')
 		const session = await store.createSession(
-			{ projectId: project.id, currentActor: sourceActor },
+			{ threadId: thread.id, projectId: project.id, currentActor: sourceActor },
 			DEFAULT_TENANT,
 		)
 
-		const { deps, updateCalls } = buildHandoffDeps(store)
+		const { deps, updateCalls } = buildHandoffDeps(store, threadStore)
 		const assignment: HandoffAssignment = {
 			id: generateHandoffId(),
 			mode: 'single',
 			sourceSessionId: session.id,
 			tenantId: DEFAULT_TENANT,
+			threadId: thread.id,
 			projectId: project.id,
 			sourceActor,
 			recipientActor,
@@ -115,21 +128,27 @@ describe('Integration — single-recipient handoff E2E', () => {
 
 	it('cross-tenant assignment rejects at entry (TenantIsolationError)', async () => {
 		const store = new InMemorySessionStore()
+		const threadStore = new InMemoryThreadStore()
 		const project = await store.createProject(
 			{ tenantId: DEFAULT_TENANT, name: 'ct' },
 			DEFAULT_TENANT,
 		)
+		const thread = await threadStore.createThread(
+			{ projectId: project.id, title: 'ct' },
+			DEFAULT_TENANT,
+		)
 		const session = await store.createSession(
-			{ projectId: project.id, currentActor: userActor('usr_source') },
+			{ threadId: thread.id, projectId: project.id, currentActor: userActor('usr_source') },
 			DEFAULT_TENANT,
 		)
 
-		const { deps } = buildHandoffDeps(store)
+		const { deps } = buildHandoffDeps(store, threadStore)
 		const assignment: HandoffAssignment = {
 			id: generateHandoffId(),
 			mode: 'single',
 			sourceSessionId: session.id,
 			tenantId: OTHER_TENANT,
+			threadId: thread.id,
 			projectId: project.id,
 			sourceActor: userActor('usr_source', OTHER_TENANT),
 			recipientActor: userActor('usr_target', OTHER_TENANT),
@@ -144,21 +163,27 @@ describe('Integration — single-recipient handoff E2E', () => {
 
 	it('source-owned workspace provisioned for recipient', async () => {
 		const store = new InMemorySessionStore()
+		const threadStore = new InMemoryThreadStore()
 		const project = await store.createProject(
 			{ tenantId: DEFAULT_TENANT, name: 'wsp' },
 			DEFAULT_TENANT,
 		)
+		const thread = await threadStore.createThread(
+			{ projectId: project.id, title: 'wsp' },
+			DEFAULT_TENANT,
+		)
 		const source = await store.createSession(
-			{ projectId: project.id, currentActor: userActor('usr_source') },
+			{ threadId: thread.id, projectId: project.id, currentActor: userActor('usr_source') },
 			DEFAULT_TENANT,
 		)
 
-		const { deps } = buildHandoffDeps(store)
+		const { deps } = buildHandoffDeps(store, threadStore)
 		const assignment: HandoffAssignment = {
 			id: generateHandoffId(),
 			mode: 'single',
 			sourceSessionId: source.id,
 			tenantId: DEFAULT_TENANT,
+			threadId: thread.id,
 			projectId: project.id,
 			sourceActor: userActor('usr_source'),
 			recipientActor: userActor('usr_target'),
@@ -190,21 +215,27 @@ describe('Integration — single-recipient handoff E2E', () => {
 	it('denormalized tenantId stamped on Session + SubSession records', async () => {
 		const _tenantType: TenantId = DEFAULT_TENANT
 		const store = new InMemorySessionStore()
+		const threadStore = new InMemoryThreadStore()
 		const project = await store.createProject(
 			{ tenantId: DEFAULT_TENANT, name: 'denorm' },
 			DEFAULT_TENANT,
 		)
+		const thread = await threadStore.createThread(
+			{ projectId: project.id, title: 'denorm' },
+			DEFAULT_TENANT,
+		)
 		const source = await store.createSession(
-			{ projectId: project.id, currentActor: userActor('usr_source') },
+			{ threadId: thread.id, projectId: project.id, currentActor: userActor('usr_source') },
 			DEFAULT_TENANT,
 		)
-		const { deps } = buildHandoffDeps(store)
+		const { deps } = buildHandoffDeps(store, threadStore)
 
 		const assignment: HandoffAssignment = {
 			id: generateHandoffId(),
 			mode: 'single',
 			sourceSessionId: source.id,
 			tenantId: DEFAULT_TENANT,
+			threadId: thread.id,
 			projectId: project.id,
 			sourceActor: userActor('usr_source'),
 			recipientActor: userActor('usr_target'),

package/src/session/__tests__/integration/hierarchy-lifecycle.test.ts

@@ -10,9 +10,12 @@
  */
 
 import { describe, expect, it } from 'vitest'
+import type { ThreadId } from '../../../types/session/ids.js'
 import { TenantIsolationError } from '../../errors.js'
 import { DEFAULT_TENANT, agentActor, buildHarness, userActor } from './_fixtures.js'
 
+const TEST_THREAD_ID = 'thd_test' as ThreadId
+
 describe('Integration — hierarchy lifecycle', () => {
 	it('creates Tenant → Project → Session → SubSession with properly branded IDs', async () => {
 		const { store } = buildHarness()
@@ -23,7 +26,7 @@ describe('Integration — hierarchy lifecycle', () => {
 		expect(project.tenantId.startsWith('tnt_')).toBe(true)
 
 		const session = await store.createSession(
-			{ projectId: project.id, currentActor: userActor('usr_a') },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: userActor('usr_a') },
 			tenant,
 		)
 		expect(session.id.startsWith('ses_')).toBe(true)
@@ -34,7 +37,7 @@ describe('Integration — hierarchy lifecycle', () => {
 		expect(session.previousActors).toEqual([])
 
 		const childSession = await store.createSession(
-			{ projectId: project.id, currentActor: agentActor('agt_worker') },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: agentActor('agt_worker') },
 			tenant,
 		)
 		const subSession = await store.createSubSession(
@@ -59,15 +62,15 @@ describe('Integration — hierarchy lifecycle', () => {
 
 		const project = await store.createProject({ tenantId: tenant, name: 'drill' }, tenant)
 		const parent = await store.createSession(
-			{ projectId: project.id, currentActor: userActor('usr_root') },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: userActor('usr_root') },
 			tenant,
 		)
 		const childA = await store.createSession(
-			{ projectId: project.id, currentActor: agentActor('agt_a') },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: agentActor('agt_a') },
 			tenant,
 		)
 		const childB = await store.createSession(
-			{ projectId: project.id, currentActor: agentActor('agt_b') },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: agentActor('agt_b') },
 			tenant,
 		)
 		await store.createSubSession(
@@ -120,7 +123,7 @@ describe('Integration — hierarchy lifecycle', () => {
 		const userC = userActor('usr_c')
 
 		const session = await store.createSession(
-			{ projectId: project.id, currentActor: userA },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: userA },
 			tenant,
 		)
 
@@ -154,11 +157,11 @@ describe('Integration — hierarchy lifecycle', () => {
 
 		const project = await store.createProject({ tenantId: tenant, name: 'cycle' }, tenant)
 		const sA = await store.createSession(
-			{ projectId: project.id, currentActor: userActor('usr_a') },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: userActor('usr_a') },
 			tenant,
 		)
 		const sB = await store.createSession(
-			{ projectId: project.id, currentActor: userActor('usr_b') },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: userActor('usr_b') },
 			tenant,
 		)
 
@@ -195,11 +198,11 @@ describe('Integration — hierarchy lifecycle', () => {
 
 		const project = await store.createProject({ tenantId: tenant, name: 'lifecycle' }, tenant)
 		const parent = await store.createSession(
-			{ projectId: project.id, currentActor: userActor('usr_a') },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: userActor('usr_a') },
 			tenant,
 		)
 		const child = await store.createSession(
-			{ projectId: project.id, currentActor: agentActor('agt_a') },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: agentActor('agt_a') },
 			tenant,
 		)
 		const sub = await store.createSubSession(

package/src/session/__tests__/integration/prev-artifact-dag.test.ts

@@ -14,7 +14,12 @@
 import { describe, expect, it } from 'vitest'
 import { InMemorySessionStore } from '../../../store/session/memory.js'
 import type { SessionId } from '../../../types/ids/index.js'
-import type { DeliverableId, SubSessionId, SummaryId } from '../../../types/session/ids.js'
+import type {
+	DeliverableId,
+	SubSessionId,
+	SummaryId,
+	ThreadId,
+} from '../../../types/session/ids.js'
 import {
 	ArtifactRefCycleError,
 	type InterventionChainLoader,
@@ -24,6 +29,8 @@ import {
 import type { DeliverableRef, SessionSummaryDeliverable } from '../../summary/deliverable.js'
 import { DEFAULT_TENANT, agentActor, userActor } from './_fixtures.js'
 
+const TEST_THREAD_ID = 'thd_test' as ThreadId
+
 /**
  * Build a live loader pointing at a real InMemorySessionStore. Each node
  * resolves via `findParentSubSession`-style lookup on the store's sub-session
@@ -68,7 +75,7 @@ async function buildLinearChain(
 	let previous: SessionId | null = null
 	for (let i = 0; i < length; i++) {
 		const s = await store.createSession(
-			{ projectId: project.id, currentActor: agentActor(`agt_${i}`) },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: agentActor(`agt_${i}`) },
 			DEFAULT_TENANT,
 		)
 		if (previous) {
@@ -260,15 +267,15 @@ describe('Integration — prevArtifactRef DAG against real store', () => {
 			DEFAULT_TENANT,
 		)
 		const sA = await store.createSession(
-			{ projectId: project.id, currentActor: agentActor('agt_a') },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: agentActor('agt_a') },
 			DEFAULT_TENANT,
 		)
 		const sB = await store.createSession(
-			{ projectId: project.id, currentActor: agentActor('agt_b') },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: agentActor('agt_b') },
 			DEFAULT_TENANT,
 		)
 		const sC = await store.createSession(
-			{ projectId: project.id, currentActor: agentActor('agt_c') },
+			{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: agentActor('agt_c') },
 			DEFAULT_TENANT,
 		)
 

package/src/session/__tests__/integration/retention-archive.test.ts

@@ -15,24 +15,26 @@ import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { InMemorySessionStore } from '../../../store/session/memory.js'
 import { createUserMessage } from '../../../types/message/index.js'
-import type { WorkspaceId } from '../../../types/session/ids.js'
+import type { ThreadId, WorkspaceId } from '../../../types/session/ids.js'
 import { ArchivalManager, ArchiveNotConfiguredError } from '../../retention/archive.js'
 import { DiskArchiveBackend } from '../../retention/disk-backend.js'
 import type { WorkspaceRef } from '../../workspace/ref.js'
 import { WorkspaceBackendRegistry } from '../../workspace/registry.js'
 import { DEFAULT_TENANT, agentActor, userActor } from './_fixtures.js'
 
+const TEST_THREAD_ID = 'thd_test' as ThreadId
+
 async function seedIdleSubSession(store: InMemorySessionStore) {
 	const project = await store.createProject(
 		{ tenantId: DEFAULT_TENANT, name: 'archive' },
 		DEFAULT_TENANT,
 	)
 	const parent = await store.createSession(
-		{ projectId: project.id, currentActor: userActor('usr_a') },
+		{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: userActor('usr_a') },
 		DEFAULT_TENANT,
 	)
 	const child = await store.createSession(
-		{ projectId: project.id, currentActor: agentActor('agt_w') },
+		{ threadId: TEST_THREAD_ID, projectId: project.id, currentActor: agentActor('agt_w') },
 		DEFAULT_TENANT,
 	)
 	const sub = await store.createSubSession(