@namzu/sdk 0.2.0 → 0.3.0

package/src/session/__tests__/integration/e2e-spawn.test.ts

@@ -18,8 +18,10 @@
 import { describe, expect, it } from 'vitest'
 import { EMPTY_TOKEN_USAGE } from '../../../constants/limits.js'
 import { AgentManager } from '../../../manager/agent/lifecycle.js'
+import { ThreadManager } from '../../../manager/thread/lifecycle.js'
 import { AgentRegistry } from '../../../registry/agent/definitions.js'
 import { InMemorySessionStore } from '../../../store/session/memory.js'
+import { InMemoryThreadStore } from '../../../store/thread/memory.js'
 import type {
 	AgentCapabilities,
 	AgentInput,
@@ -93,7 +95,12 @@ function buildDefinition(agent: Agent<BaseAgentConfig, BaseAgentResult>): AgentD
 describe('E2E — SubSession spawn → kernel summary → parent drill', () => {
 	it('emits the §10.5 event sequence with lineage + schemaVersion stamping', async () => {
 		const store = new InMemorySessionStore()
+		const threadStore = new InMemoryThreadStore()
 		const project = await store.createProject({ tenantId: tenant, name: 'e2e-project' }, tenant)
+		const thread = await threadStore.createThread(
+			{ projectId: project.id, title: 'e2e-spawn' },
+			tenant,
+		)
 
 		const userActor: ActorRef = {
 			kind: 'user',
@@ -102,7 +109,7 @@ describe('E2E — SubSession spawn → kernel summary → parent drill', () => {
 		}
 
 		const parentSession = await store.createSession(
-			{ projectId: project.id, currentActor: userActor },
+			{ threadId: thread.id, projectId: project.id, currentActor: userActor },
 			tenant,
 		)
 		// Parent Run in flight — session active while the spawn is happening.
@@ -117,11 +124,13 @@ describe('E2E — SubSession spawn → kernel summary → parent drill', () => {
 		const registry = new AgentRegistry()
 		registry.register(buildDefinition(buildAgent('worker')))
 
+		const threadManager = new ThreadManager({ threadStore, sessionStore: store })
 		const manager = new AgentManager(registry, undefined, {
 			sessionStore: store,
 			summaryMaterializer: materializer,
 			workspaceRegistry: new WorkspaceBackendRegistry(),
 			capacity: new DefaultCapacityValidator(store),
+			threadManager,
 		})
 
 		const capturedEvents: RunEvent[] = []
@@ -136,6 +145,7 @@ describe('E2E — SubSession spawn → kernel summary → parent drill', () => {
 			depth: 0,
 			budgetTracker: { total: 100_000, remaining: 100_000 },
 			tenantId: tenant,
+			threadId: thread.id,
 			sessionId: parentSession.id,
 			projectId: project.id,
 			parentActor: userActor,
@@ -212,7 +222,12 @@ describe('E2E — SubSession spawn → kernel summary → parent drill', () => {
 
 	it('closes the parent→child message gap: parent can re-ingest child content via drill + summary', async () => {
 		const store = new InMemorySessionStore()
+		const threadStore = new InMemoryThreadStore()
 		const project = await store.createProject({ tenantId: tenant, name: 'e2e-gap' }, tenant)
+		const thread = await threadStore.createThread(
+			{ projectId: project.id, title: 'e2e-gap' },
+			tenant,
+		)
 
 		const userActor: ActorRef = {
 			kind: 'user',
@@ -220,7 +235,7 @@ describe('E2E — SubSession spawn → kernel summary → parent drill', () => {
 			tenantId: tenant,
 		}
 		const parentSession = await store.createSession(
-			{ projectId: project.id, currentActor: userActor },
+			{ threadId: thread.id, projectId: project.id, currentActor: userActor },
 			tenant,
 		)
 		await store.updateSession({ ...parentSession, status: 'active' }, tenant)
@@ -234,11 +249,13 @@ describe('E2E — SubSession spawn → kernel summary → parent drill', () => {
 		const registry = new AgentRegistry()
 		registry.register(buildDefinition(buildAgent('worker')))
 
+		const threadManager = new ThreadManager({ threadStore, sessionStore: store })
 		const manager = new AgentManager(registry, undefined, {
 			sessionStore: store,
 			summaryMaterializer: materializer,
 			workspaceRegistry: new WorkspaceBackendRegistry(),
 			capacity: new DefaultCapacityValidator(store),
+			threadManager,
 		})
 
 		const task = await manager.sendMessage(
@@ -257,6 +274,7 @@ describe('E2E — SubSession spawn → kernel summary → parent drill', () => {
 				depth: 0,
 				budgetTracker: { total: 10_000, remaining: 10_000 },
 				tenantId: tenant,
+				threadId: thread.id,
 				sessionId: parentSession.id,
 				projectId: project.id,
 				parentActor: userActor,

package/src/session/__tests__/integration/event-stream-ordering.test.ts

@@ -34,7 +34,7 @@ import {
 describe('Integration — event stream ordering + lineage + schemaVersion', () => {
 	it('every sub-session RunEvent carries schemaVersion: 2', async () => {
 		const harness = buildHarness()
-		const { project, session, actor } = await seedActiveParent(harness)
+		const { project, thread, session, actor } = await seedActiveParent(harness)
 		harness.registry.register(buildDefinition(buildAgent('worker')))
 
 		const captured: RunEvent[] = []
@@ -49,6 +49,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
 			buildTaskContext({
 				sessionId: session.id,
 				projectId: project.id,
+				threadId: thread.id,
 				tenantId: DEFAULT_TENANT,
 				parentActor: actor,
 			}),
@@ -73,7 +74,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
 
 	it('every sub-session event carries lineage { parentSessionId, rootSessionId, depth }', async () => {
 		const harness = buildHarness()
-		const { project, session, actor } = await seedActiveParent(harness)
+		const { project, thread, session, actor } = await seedActiveParent(harness)
 		harness.registry.register(buildDefinition(buildAgent('worker')))
 
 		const captured: RunEvent[] = []
@@ -88,6 +89,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
 			buildTaskContext({
 				sessionId: session.id,
 				projectId: project.id,
+				threadId: thread.id,
 				tenantId: DEFAULT_TENANT,
 				parentActor: actor,
 			}),
@@ -116,7 +118,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
 
 	it('3-deep delegation: rootSessionId identical across tree; depth ascends 1→2→3', async () => {
 		const harness = buildHarness()
-		const { project, session, actor } = await seedActiveParent(harness)
+		const { project, thread, session, actor } = await seedActiveParent(harness)
 
 		// Wire a cascading agent: level-1 child spawns level-2 via its own
 		// sendMessage. We hand a reference to the manager into the child agent
@@ -129,7 +131,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
 			'mid',
 			async (_input: AgentInput, config: BaseAgentConfig): Promise<BaseAgentResult> => {
 				// Spawn a level-2 child from inside the mid-agent's run.
-				if (!config.sessionId || !config.projectId || !config.tenantId) {
+				if (!config.sessionId || !config.threadId || !config.projectId || !config.tenantId) {
 					throw new Error('mid agent missing session scoping')
 				}
 				// Flip child session to active so it is a legal spawn parent.
@@ -154,6 +156,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
 						depth: 1,
 						budgetTracker: { total: 10_000, remaining: 10_000 },
 						tenantId: config.tenantId,
+						threadId: config.threadId,
 						sessionId: childSessionId,
 						projectId: config.projectId,
 						parentActor: { kind: 'agent', agentId: 'mid' as never, tenantId: config.tenantId },
@@ -192,6 +195,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
 			buildTaskContext({
 				sessionId: session.id,
 				projectId: project.id,
+				threadId: thread.id,
 				tenantId: DEFAULT_TENANT,
 				parentActor: actor,
 			}),
@@ -237,7 +241,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
 		// its own listener — the outer listener does NOT see the nested
 		// listener's events (no cross-contamination).
 		const harness = buildHarness()
-		const { project, session, actor } = await seedActiveParent(harness)
+		const { project, thread, session, actor } = await seedActiveParent(harness)
 
 		const outerCaptured: RunEvent[] = []
 		const nestedCaptured: RunEvent[] = []
@@ -246,7 +250,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
 		const midAgent = buildAgentCustom(
 			'mid',
 			async (_input: AgentInput, config: BaseAgentConfig): Promise<BaseAgentResult> => {
-				if (!config.sessionId || !config.projectId || !config.tenantId) {
+				if (!config.sessionId || !config.threadId || !config.projectId || !config.tenantId) {
 					throw new Error('mid missing scope')
 				}
 				const cs = await harness.store.getSession(config.sessionId, config.tenantId)
@@ -273,6 +277,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
 						depth: 1,
 						budgetTracker: { total: 10_000, remaining: 10_000 },
 						tenantId: config.tenantId,
+						threadId: config.threadId,
 						sessionId: config.sessionId,
 						projectId: config.projectId,
 						parentActor: {
@@ -313,6 +318,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
 			buildTaskContext({
 				sessionId: session.id,
 				projectId: project.id,
+				threadId: thread.id,
 				tenantId: DEFAULT_TENANT,
 				parentActor: actor,
 			}),
@@ -349,7 +355,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
 		// therefore inherit the envelope even though they have no lineage in
 		// their own type definition.
 		const harness = buildHarness()
-		const { project, session, actor } = await seedActiveParent(harness)
+		const { project, thread, session, actor } = await seedActiveParent(harness)
 
 		const leafAgent = buildAgentCustom(
 			'leaf-emit',
@@ -385,6 +391,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
 			buildTaskContext({
 				sessionId: session.id,
 				projectId: project.id,
+				threadId: thread.id,
 				tenantId: DEFAULT_TENANT,
 				parentActor: actor,
 			}),

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)
 	})
 })