2 files changed, 90 insertions, 20 deletions

diff --git a/packages/kernel/src/runtime/run-turn.test.ts b/packages/kernel/src/runtime/run-turn.test.ts
index 48f0b5a..667476f 100644
--- a/packages/kernel/src/runtime/run-turn.test.ts
+++ b/packages/kernel/src/runtime/run-turn.test.ts
@@ -817,26 +817,26 @@ describe("runTurn", () => {
 		}
 	});
 
-	describe("span instrumentation", () => {
-		function createTestLogger(): {
-			logger: Logger;
-			sink: LogSink & { records: LogRecord[] };
-			deps: LogDeps;
-		} {
-			let idCounter = 0;
-			const deps: LogDeps = {
-				now: () => 1000 + idCounter * 100,
-				newId: () => `span-${++idCounter}`,
-			};
-			const records: LogRecord[] = [];
-			const sink: LogSink & { records: LogRecord[] } = {
-				records,
-				emit: (record) => records.push(record),
-			};
-			const logger = createLogger({ extensionId: "test" }, sink, deps);
-			return { logger, sink, deps };
-		}
+	function createTestLogger(): {
+		logger: Logger;
+		sink: LogSink & { records: LogRecord[] };
+		deps: LogDeps;
+	} {
+		let idCounter = 0;
+		const deps: LogDeps = {
+			now: () => 1000 + idCounter * 100,
+			newId: () => `span-${++idCounter}`,
+		};
+		const records: LogRecord[] = [];
+		const sink: LogSink & { records: LogRecord[] } = {
+			records,
+			emit: (record) => records.push(record),
+		};
+		const logger = createLogger({ extensionId: "test" }, sink, deps);
+		return { logger, sink, deps };
+	}
 
+	describe("span instrumentation", () => {
 		it("emits turn + step span open/close in order", async () => {
 			const provider = createFakeProvider([
 				[
@@ -1040,4 +1040,69 @@ describe("runTurn", () => {
 			}
 		});
 	});
+
+	describe("provider logger threading", () => {
+		it("passes step span logger to provider.stream opts when logger provided", async () => {
+			let capturedOpts: Record<string, unknown> | undefined;
+
+			const provider: ProviderContract = {
+				id: "fake",
+				stream(_messages, _tools, opts) {
+					capturedOpts = opts !== undefined ? { ...opts } : undefined;
+					return (async function* () {
+						yield { type: "text-delta", delta: "hi" } as ProviderEvent;
+						yield { type: "usage", usage: { inputTokens: 1, outputTokens: 1 } } as ProviderEvent;
+						yield { type: "finish", reason: "stop" } as ProviderEvent;
+					})();
+				},
+			};
+
+			const { logger } = createTestLogger();
+
+			await runTurn({
+				provider,
+				messages: [userMessage],
+				tools: [],
+				dispatch: { maxConcurrent: 1, eager: false },
+				conversationId: "conv-1",
+				turnId: "turn-1",
+				emit: () => {},
+				logger,
+			});
+
+			expect(capturedOpts).toBeDefined();
+			expect(capturedOpts?.logger).toBeDefined();
+			expect(typeof (capturedOpts?.logger as Record<string, unknown>).info).toBe("function");
+			expect(typeof (capturedOpts?.logger as Record<string, unknown>).span).toBe("function");
+		});
+
+		it("passes undefined for opts.logger when no logger provided", async () => {
+			let capturedOpts: Record<string, unknown> | undefined;
+
+			const provider: ProviderContract = {
+				id: "fake",
+				stream(_messages, _tools, opts) {
+					capturedOpts = opts !== undefined ? { ...opts } : undefined;
+					return (async function* () {
+						yield { type: "text-delta", delta: "hi" } as ProviderEvent;
+						yield { type: "usage", usage: { inputTokens: 1, outputTokens: 1 } } as ProviderEvent;
+						yield { type: "finish", reason: "stop" } as ProviderEvent;
+					})();
+				},
+			};
+
+			await runTurn({
+				provider,
+				messages: [userMessage],
+				tools: [],
+				dispatch: { maxConcurrent: 1, eager: false },
+				conversationId: "conv-1",
+				turnId: "turn-1",
+				emit: () => {},
+			});
+
+			expect(capturedOpts).toBeDefined();
+			expect(capturedOpts?.logger).toBeUndefined();
+		});
+	});
 });
diff --git a/packages/kernel/src/runtime/run-turn.ts b/packages/kernel/src/runtime/run-turn.ts
index 0f42ef3..a78c31d 100644
--- a/packages/kernel/src/runtime/run-turn.ts
+++ b/packages/kernel/src/runtime/run-turn.ts
@@ -78,6 +78,7 @@ interface StepContext {
 	readonly conversationId: string;
 	readonly turnId: string;
 	readonly logger: Logger;
+	readonly stepLogger: Logger | undefined;
 	readonly toolSpans: Map<string, Span>;
 }
 
@@ -197,7 +198,10 @@ async function executeStep(ctx: StepContext): Promise<StepResult> {
 	);
 
 	try {
-		const stream = ctx.provider.stream(ctx.messages, ctx.tools);
+		const opts = {
+			...(ctx.stepLogger !== undefined ? { logger: ctx.stepLogger } : {}),
+		};
+		const stream = ctx.provider.stream(ctx.messages, ctx.tools, opts);
 		for await (const event of stream) {
 			if (ctx.signal.aborted) break;
 			processEvent(event, chunks, toolCalls, dispatcher, ctx);
@@ -351,6 +355,7 @@ export async function runTurn(input: RunTurnInput): Promise<RunTurnResult> {
 				conversationId,
 				turnId,
 				logger: turnSpan?.log ?? logger ?? createNoopLogger(),
+				stepLogger: logger,
 				toolSpans,
 			});