@herdctl/core 1.3.1 → 2.0.1

package/dist/runner/__tests__/job-executor.test.js

@@ -3,7 +3,7 @@ import { mkdir, rm, realpath, readFile, stat } from "node:fs/promises";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { JobExecutor, executeJob } from "../job-executor.js";
-import { getJob, readJobOutputAll, initStateDirectory, getSessionInfo, } from "../../state/index.js";
+import { getJob, readJobOutputAll, initStateDirectory, getSessionInfo, updateSessionInfo, } from "../../state/index.js";
 // =============================================================================
 // Test Helpers
 // =============================================================================
@@ -35,28 +35,34 @@ function createMockLogger() {
         },
     };
 }
-// Helper to create a mock SDK query function
-function createMockSDKQuery(messages) {
-    return async function* mockQuery() {
+// Helper to create mock RuntimeInterface
+function createMockRuntime(handler) {
+    return {
+        execute: handler,
+    };
+}
+// Helper to create a mock runtime with predefined messages
+function createMockRuntimeWithMessages(messages) {
+    return createMockRuntime(async function* () {
         for (const message of messages) {
             yield message;
         }
-    };
+    });
 }
-// Helper to create a mock SDK query that yields messages with delays
-function createDelayedSDKQuery(messages, delayMs = 10) {
-    return async function* mockQuery() {
+// Helper to create a mock runtime that yields messages with delays
+function createDelayedMockRuntime(messages, delayMs = 10) {
+    return createMockRuntime(async function* () {
         for (const message of messages) {
             await new Promise((resolve) => setTimeout(resolve, delayMs));
             yield message;
         }
-    };
+    });
 }
-// Helper to create a mock SDK query that throws an error
-function createErrorSDKQuery(error) {
-    return async function* mockQuery() {
+// Helper to create a mock runtime that throws an error
+function createErrorMockRuntime(error) {
+    return createMockRuntime(async function* () {
         throw error;
-    };
+    });
 }
 // =============================================================================
 // JobExecutor tests
@@ -78,7 +84,7 @@ describe("JobExecutor", () => {
                 { type: "system", content: "Initialized" },
                 { type: "assistant", content: "Done" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -93,11 +99,11 @@ describe("JobExecutor", () => {
         });
         it("updates job status to running", async () => {
             let jobIdDuringExecution;
-            const sdkQuery = async function* () {
+            const runtime = createMockRuntime(async function* (options) {
                 // During execution, we can check the job status
                 yield { type: "system", content: "Running" };
-            };
-            const executor = new JobExecutor(sdkQuery, {
+            });
+            const executor = new JobExecutor(runtime, {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -114,7 +120,7 @@ describe("JobExecutor", () => {
                 { type: "system", content: "Start" },
                 { type: "assistant", content: "Task completed!" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -134,7 +140,7 @@ describe("JobExecutor", () => {
                 { type: "system", content: "Start" },
                 { type: "error", message: "Something went wrong" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -149,7 +155,7 @@ describe("JobExecutor", () => {
             expect(job?.exit_reason).toBe("error");
         });
         it("handles SDK query throwing an error", async () => {
-            const executor = new JobExecutor(createErrorSDKQuery(new Error("SDK error")), { logger: createMockLogger() });
+            const executor = new JobExecutor(createErrorMockRuntime(new Error("SDK error")), { logger: createMockLogger() });
             const result = await executor.execute({
                 agent: createTestAgent(),
                 prompt: "Test prompt",
@@ -170,7 +176,7 @@ describe("JobExecutor", () => {
                 { type: "tool_result", result: "file1\nfile2", success: true },
                 { type: "assistant", content: "Done" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -189,14 +195,14 @@ describe("JobExecutor", () => {
         it("writes output immediately without buffering", async () => {
             let outputCountDuringExecution = 0;
             const jobsDir = join(stateDir, "jobs");
-            const sdkQuery = async function* () {
+            const runtime = createMockRuntime(async function* (options) {
                 yield { type: "system", content: "First" };
                 yield { type: "assistant", content: "Second" };
                 yield { type: "assistant", content: "Third" };
-            };
+            });
             // We can't easily verify real-time writing in a unit test,
             // but we can verify all messages are written
-            const executor = new JobExecutor(sdkQuery, {
+            const executor = new JobExecutor(runtime, {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -228,7 +234,7 @@ describe("JobExecutor", () => {
                     success: true,
                 },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -266,7 +272,7 @@ describe("JobExecutor", () => {
             }
         });
         it("writes error message to output when SDK throws", async () => {
-            const executor = new JobExecutor(createErrorSDKQuery(new Error("Connection failed")), { logger: createMockLogger() });
+            const executor = new JobExecutor(createErrorMockRuntime(new Error("Connection failed")), { logger: createMockLogger() });
             const result = await executor.execute({
                 agent: createTestAgent(),
                 prompt: "Test prompt",
@@ -289,7 +295,7 @@ describe("JobExecutor", () => {
                 { type: "tool_result", result: "output", success: true },
                 { type: "error", message: "Error message", code: "ERR_TEST" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -310,7 +316,7 @@ describe("JobExecutor", () => {
                 { type: "assistant", content: "Part 1... Part 2...", partial: true },
                 { type: "assistant", content: "Part 1... Part 2... Done!", partial: false },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -332,7 +338,7 @@ describe("JobExecutor", () => {
                 { type: "tool_use", tool_name: "read_file", input: { path: "/nope" } },
                 { type: "tool_result", success: false, error: "File not found" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -353,7 +359,7 @@ describe("JobExecutor", () => {
                 { type: "system", content: "Init", subtype: "init", session_id: "session-abc123" },
                 { type: "assistant", content: "Done" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -370,7 +376,7 @@ describe("JobExecutor", () => {
                 { type: "system", content: "Progress", subtype: "progress", session_id: "should-ignore" },
                 { type: "assistant", content: "Done" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -387,7 +393,7 @@ describe("JobExecutor", () => {
                 { type: "system", content: "Init", subtype: "init", session_id: "session-persist-123" },
                 { type: "assistant", content: "Done" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             await executor.execute({
@@ -408,7 +414,7 @@ describe("JobExecutor", () => {
                 { type: "system", content: "Init", subtype: "init", session_id: "session-multi-123" },
                 { type: "assistant", content: "Done" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             // Run twice
@@ -431,7 +437,7 @@ describe("JobExecutor", () => {
                 { type: "system", content: "Init", subtype: "init", session_id: "session-ts-123" },
                 { type: "assistant", content: "Done" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             await executor.execute({
@@ -451,7 +457,7 @@ describe("JobExecutor", () => {
                 { type: "system", content: "Init", subtype: "init", session_id: "session-result-123" },
                 { type: "assistant", content: "Done" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -463,12 +469,18 @@ describe("JobExecutor", () => {
             expect(result.sessionId).toBe("session-result-123");
         });
         it("passes resume option to SDK", async () => {
+            // Create a valid session so resume isn't cleared
+            const sessionsDir = join(stateDir, "sessions");
+            await updateSessionInfo(sessionsDir, "test-agent", {
+                session_id: "session-to-resume",
+                mode: "autonomous",
+            });
             let receivedOptions;
-            const sdkQuery = async function* (params) {
-                receivedOptions = params.options;
+            const runtime = createMockRuntime(async function* (options) {
+                receivedOptions = options;
                 yield { type: "assistant", content: "Resumed" };
-            };
-            const executor = new JobExecutor(sdkQuery, {
+            });
+            const executor = new JobExecutor(runtime, {
                 logger: createMockLogger(),
             });
             await executor.execute({
@@ -481,11 +493,11 @@ describe("JobExecutor", () => {
         });
         it("passes fork option to SDK", async () => {
             let receivedOptions;
-            const sdkQuery = async function* (params) {
-                receivedOptions = params.options;
+            const runtime = createMockRuntime(async function* (options) {
+                receivedOptions = options;
                 yield { type: "assistant", content: "Forked" };
-            };
-            const executor = new JobExecutor(sdkQuery, {
+            });
+            const executor = new JobExecutor(runtime, {
                 logger: createMockLogger(),
             });
             await executor.execute({
@@ -494,14 +506,14 @@ describe("JobExecutor", () => {
                 stateDir,
                 fork: "session-to-fork",
             });
-            expect(receivedOptions?.forkSession).toBe(true);
+            expect(receivedOptions?.fork).toBe(true);
         });
         it("creates job with trigger_type 'fork' and forked_from when forking", async () => {
             const messages = [
                 { type: "system", content: "Init", subtype: "init", session_id: "forked-session-123" },
                 { type: "assistant", content: "Forked session started" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -520,7 +532,7 @@ describe("JobExecutor", () => {
             const messages = [
                 { type: "assistant", content: "Forked" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -537,7 +549,7 @@ describe("JobExecutor", () => {
             const messages = [
                 { type: "assistant", content: "Normal run" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -554,7 +566,7 @@ describe("JobExecutor", () => {
                 { type: "system", content: "Init", subtype: "init", session_id: "resume-session-123" },
                 { type: "assistant", content: "Resumed" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             // First run to establish the session
@@ -582,7 +594,7 @@ describe("JobExecutor", () => {
                 { type: "system", content: "Init", subtype: "init", session_id: "fork-session-123" },
                 { type: "assistant", content: "Forked" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             // First run to establish a session
@@ -611,7 +623,7 @@ describe("JobExecutor", () => {
                 { type: "system", content: "No session" },
                 { type: "assistant", content: "Done" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             await executor.execute({
@@ -630,7 +642,7 @@ describe("JobExecutor", () => {
                 { type: "assistant", content: "Working..." },
                 { type: "assistant", content: "Done!", summary: "Task completed" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -647,7 +659,7 @@ describe("JobExecutor", () => {
                 { type: "assistant", content: "Working..." },
                 { type: "assistant", content: "All tasks finished successfully." },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -663,7 +675,7 @@ describe("JobExecutor", () => {
                 { type: "tool_use", tool_name: "bash", input: { command: "ls" } },
                 { type: "tool_result", result: "file1\nfile2", success: true },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -680,7 +692,7 @@ describe("JobExecutor", () => {
                 { type: "assistant", content: "Partial 1...", partial: true },
                 { type: "assistant", content: "Partial 2...", partial: true },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -690,13 +702,13 @@ describe("JobExecutor", () => {
             });
             expect(result.summary).toBeUndefined();
         });
-        it("returns undefined summary when all assistant messages are too long", async () => {
-            const longContent = "x".repeat(501);
+        it("returns full summary for long assistant messages (no truncation)", async () => {
+            const longContent = "x".repeat(5000);
             const messages = [
                 { type: "assistant", content: longContent },
                 { type: "assistant", content: longContent },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -704,14 +716,17 @@ describe("JobExecutor", () => {
                 prompt: "Test prompt",
                 stateDir,
             });
-            expect(result.summary).toBeUndefined();
+            // No truncation at this layer - downstream consumers (Discord) handle their own limits
+            expect(result.summary).toBeDefined();
+            expect(result.summary).toBe(longContent);
+            expect(result.summary?.length).toBe(5000);
         });
-        it("truncates long explicit summary to 500 chars", async () => {
-            const longSummary = "x".repeat(600);
+        it("returns full explicit summary (no truncation)", async () => {
+            const longSummary = "x".repeat(5000);
             const messages = [
                 { type: "assistant", content: "Done!", summary: longSummary },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -719,11 +734,12 @@ describe("JobExecutor", () => {
                 prompt: "Test prompt",
                 stateDir,
             });
+            // No truncation at this layer
             expect(result.summary).toBeDefined();
-            expect(result.summary.length).toBe(500);
-            expect(result.summary.endsWith("...")).toBe(true);
+            expect(result.summary).toBe(longSummary);
+            expect(result.summary.length).toBe(5000);
             const job = await getJob(join(stateDir, "jobs"), result.jobId);
-            expect(job?.summary?.length).toBe(500);
+            expect(job?.summary).toBe(longSummary);
         });
         it("uses latest summary when multiple messages have summaries", async () => {
             const messages = [
@@ -731,7 +747,7 @@ describe("JobExecutor", () => {
                 { type: "assistant", content: "Second", summary: "Second summary" },
                 { type: "assistant", content: "Third", summary: "Final summary" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -743,7 +759,7 @@ describe("JobExecutor", () => {
         });
         it("handles empty message stream with undefined summary", async () => {
             const messages = [];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -765,7 +781,7 @@ describe("JobExecutor", () => {
             const onMessage = vi.fn((msg) => {
                 receivedMessages.push(msg);
             });
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             await executor.execute({
@@ -788,7 +804,7 @@ describe("JobExecutor", () => {
             const onMessage = vi.fn(() => {
                 throw new Error("Callback error");
             });
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -808,7 +824,7 @@ describe("JobExecutor", () => {
             const onMessage = vi.fn(async () => {
                 await new Promise((resolve) => setTimeout(resolve, 10));
             });
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             await executor.execute({
@@ -823,7 +839,7 @@ describe("JobExecutor", () => {
     describe("trigger types", () => {
         it("sets trigger type to manual by default", async () => {
             const messages = [{ type: "assistant", content: "Done" }];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -836,7 +852,7 @@ describe("JobExecutor", () => {
         });
         it("sets trigger type from options", async () => {
             const messages = [{ type: "assistant", content: "Done" }];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -857,7 +873,7 @@ describe("JobExecutor", () => {
                 { type: "system", content: "Start" },
                 { type: "assistant", content: "End" },
             ];
-            const executor = new JobExecutor(createDelayedSDKQuery(messages, 50), { logger: createMockLogger() });
+            const executor = new JobExecutor(createDelayedMockRuntime(messages, 50), { logger: createMockLogger() });
             const result = await executor.execute({
                 agent: createTestAgent(),
                 prompt: "Test prompt",
@@ -888,7 +904,7 @@ describe("executeJob", () => {
             { type: "system", content: "Init" },
             { type: "assistant", content: "Done" },
         ];
-        const result = await executeJob(createMockSDKQuery(messages), {
+        const result = await executeJob(createMockRuntimeWithMessages(messages), {
             agent: createTestAgent({ name: "convenience-agent" }),
             prompt: "Test prompt",
             stateDir,
@@ -901,7 +917,7 @@ describe("executeJob", () => {
     it("passes executor options", async () => {
         const messages = [{ type: "assistant", content: "Done" }];
         const logger = createMockLogger();
-        await executeJob(createMockSDKQuery(messages), {
+        await executeJob(createMockRuntimeWithMessages(messages), {
             agent: createTestAgent(),
             prompt: "Test prompt",
             stateDir,
@@ -924,7 +940,7 @@ describe("edge cases", () => {
         await rm(tempDir, { recursive: true, force: true });
     });
     it("handles empty message stream", async () => {
-        const executor = new JobExecutor(createMockSDKQuery([]), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages([]), {
             logger: createMockLogger(),
         });
         const result = await executor.execute({
@@ -941,7 +957,7 @@ describe("edge cases", () => {
         const messages = [
             { type: "assistant", content: longContent },
         ];
-        const executor = new JobExecutor(createMockSDKQuery(messages), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
             logger: createMockLogger(),
         });
         const result = await executor.execute({
@@ -958,7 +974,7 @@ describe("edge cases", () => {
         const messages = [
             { type: "assistant", content: "Hello 世界! 🌍 Γεια σου κόσμε" },
         ];
-        const executor = new JobExecutor(createMockSDKQuery(messages), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
             logger: createMockLogger(),
         });
         const result = await executor.execute({
@@ -978,7 +994,7 @@ describe("edge cases", () => {
                 content: 'Content with "quotes", \\backslashes\\, and\nnewlines',
             },
         ];
-        const executor = new JobExecutor(createMockSDKQuery(messages), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
             logger: createMockLogger(),
         });
         const result = await executor.execute({
@@ -998,7 +1014,7 @@ describe("edge cases", () => {
             type: "assistant",
             content: `Message ${i}`,
         }));
-        const executor = new JobExecutor(createMockSDKQuery(messages), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
             logger: createMockLogger(),
         });
         const result = await executor.execute({
@@ -1026,11 +1042,11 @@ describe("error handling (US-7)", () => {
     });
     describe("SDK initialization errors", () => {
         it("catches SDK initialization errors (e.g., missing API key)", async () => {
-            // Simulates SDK throwing immediately when query is created
-            const sdkQuery = () => {
+            // Simulates SDK throwing immediately when execute is called
+            const runtime = createMockRuntime(() => {
                 throw new Error("ANTHROPIC_API_KEY environment variable is not set");
-            };
-            const executor = new JobExecutor(sdkQuery, {
+            });
+            const executor = new JobExecutor(runtime, {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1043,10 +1059,10 @@ describe("error handling (US-7)", () => {
             expect(result.errorDetails?.type).toBe("initialization");
         });
         it("provides context (job ID, agent name) in initialization error", async () => {
-            const sdkQuery = () => {
+            const runtime = createMockRuntime(() => {
                 throw new Error("SDK init failed");
-            };
-            const executor = new JobExecutor(sdkQuery, {
+            });
+            const executor = new JobExecutor(runtime, {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1060,12 +1076,12 @@ describe("error handling (US-7)", () => {
     });
     describe("SDK streaming errors", () => {
         it("catches SDK streaming errors during execution", async () => {
-            const sdkQuery = async function* () {
+            const runtime = createMockRuntime(async function* (options) {
                 yield { type: "system", content: "Init" };
                 yield { type: "assistant", content: "Working..." };
                 throw new Error("Connection reset by peer");
-            };
-            const executor = new JobExecutor(sdkQuery, {
+            });
+            const executor = new JobExecutor(runtime, {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1078,13 +1094,13 @@ describe("error handling (US-7)", () => {
             expect(result.errorDetails?.type).toBe("streaming");
         });
         it("tracks messages received before streaming error", async () => {
-            const sdkQuery = async function* () {
+            const runtime = createMockRuntime(async function* (options) {
                 yield { type: "system", content: "Init" };
                 yield { type: "assistant", content: "Message 1" };
                 yield { type: "assistant", content: "Message 2" };
                 throw new Error("Stream interrupted");
-            };
-            const executor = new JobExecutor(sdkQuery, {
+            });
+            const executor = new JobExecutor(runtime, {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1096,11 +1112,11 @@ describe("error handling (US-7)", () => {
             expect(result.errorDetails?.messagesReceived).toBe(3);
         });
         it("identifies recoverable errors (rate limit)", async () => {
-            const sdkQuery = async function* () {
+            const runtime = createMockRuntime(async function* (options) {
                 yield { type: "system", content: "Init" };
                 throw new Error("Rate limit exceeded, please retry");
-            };
-            const executor = new JobExecutor(sdkQuery, {
+            });
+            const executor = new JobExecutor(runtime, {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1111,11 +1127,11 @@ describe("error handling (US-7)", () => {
             expect(result.errorDetails?.recoverable).toBe(true);
         });
         it("identifies non-recoverable errors", async () => {
-            const sdkQuery = async function* () {
+            const runtime = createMockRuntime(async function* (options) {
                 yield { type: "system", content: "Init" };
                 throw new Error("Invalid request format");
-            };
-            const executor = new JobExecutor(sdkQuery, {
+            });
+            const executor = new JobExecutor(runtime, {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1128,7 +1144,7 @@ describe("error handling (US-7)", () => {
     });
     describe("error logging to job output", () => {
         it("logs error messages to job output as error type messages", async () => {
-            const executor = new JobExecutor(createErrorSDKQuery(new Error("Test error for logging")), { logger: createMockLogger() });
+            const executor = new JobExecutor(createErrorMockRuntime(new Error("Test error for logging")), { logger: createMockLogger() });
             const result = await executor.execute({
                 agent: createTestAgent(),
                 prompt: "Test prompt",
@@ -1145,7 +1161,7 @@ describe("error handling (US-7)", () => {
         it("includes error code in job output when available", async () => {
             const errorWithCode = new Error("Network error");
             errorWithCode.code = "ECONNRESET";
-            const executor = new JobExecutor(createErrorSDKQuery(errorWithCode), {
+            const executor = new JobExecutor(createErrorMockRuntime(errorWithCode), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1161,7 +1177,7 @@ describe("error handling (US-7)", () => {
         });
         it("includes stack trace in job output", async () => {
             const error = new Error("Stack trace test");
-            const executor = new JobExecutor(createErrorSDKQuery(error), {
+            const executor = new JobExecutor(createErrorMockRuntime(error), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1179,7 +1195,7 @@ describe("error handling (US-7)", () => {
     });
     describe("job status updates", () => {
         it("updates job status to failed with error exit_reason", async () => {
-            const executor = new JobExecutor(createErrorSDKQuery(new Error("Failure")), { logger: createMockLogger() });
+            const executor = new JobExecutor(createErrorMockRuntime(new Error("Failure")), { logger: createMockLogger() });
             const result = await executor.execute({
                 agent: createTestAgent(),
                 prompt: "Test prompt",
@@ -1191,7 +1207,7 @@ describe("error handling (US-7)", () => {
         });
         it("sets exit_reason to timeout for timeout errors", async () => {
             const timeoutError = new Error("Request timed out");
-            const executor = new JobExecutor(createErrorSDKQuery(timeoutError), {
+            const executor = new JobExecutor(createErrorMockRuntime(timeoutError), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1204,7 +1220,7 @@ describe("error handling (US-7)", () => {
         });
         it("sets exit_reason to cancelled for abort errors", async () => {
             const abortError = new Error("Operation aborted by user");
-            const executor = new JobExecutor(createErrorSDKQuery(abortError), {
+            const executor = new JobExecutor(createErrorMockRuntime(abortError), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1217,7 +1233,7 @@ describe("error handling (US-7)", () => {
         });
         it("sets exit_reason to max_turns for turn limit errors", async () => {
             const maxTurnsError = new Error("Maximum turns exceeded");
-            const executor = new JobExecutor(createErrorSDKQuery(maxTurnsError), {
+            const executor = new JobExecutor(createErrorMockRuntime(maxTurnsError), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1231,7 +1247,7 @@ describe("error handling (US-7)", () => {
     });
     describe("error details in RunnerResult", () => {
         it("provides descriptive error message with context", async () => {
-            const executor = new JobExecutor(createErrorSDKQuery(new Error("API connection failed")), { logger: createMockLogger() });
+            const executor = new JobExecutor(createErrorMockRuntime(new Error("API connection failed")), { logger: createMockLogger() });
             const result = await executor.execute({
                 agent: createTestAgent({ name: "descriptive-agent" }),
                 prompt: "Test prompt",
@@ -1245,7 +1261,7 @@ describe("error handling (US-7)", () => {
         it("returns error details in RunnerResult", async () => {
             const errorWithCode = new Error("Network timeout");
             errorWithCode.code = "ETIMEDOUT";
-            const executor = new JobExecutor(createErrorSDKQuery(errorWithCode), {
+            const executor = new JobExecutor(createErrorMockRuntime(errorWithCode), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1261,13 +1277,13 @@ describe("error handling (US-7)", () => {
     });
     describe("malformed SDK responses", () => {
         it("does not crash on malformed SDK messages", async () => {
-            const sdkQuery = async function* () {
+            const runtime = createMockRuntime(async function* (options) {
                 yield { type: "system", content: "Init" };
                 // Yield a malformed message (null)
                 yield null;
                 yield { type: "assistant", content: "Continuing after malformed" };
-            };
-            const executor = new JobExecutor(sdkQuery, {
+            });
+            const executor = new JobExecutor(runtime, {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1285,12 +1301,12 @@ describe("error handling (US-7)", () => {
             expect(malformedMsg).toBeDefined();
         });
         it("handles messages with missing type field", async () => {
-            const sdkQuery = async function* () {
+            const runtime = createMockRuntime(async function* (options) {
                 yield { type: "system", content: "Init" };
                 yield { content: "Missing type" };
                 yield { type: "assistant", content: "Done" };
-            };
-            const executor = new JobExecutor(sdkQuery, {
+            });
+            const executor = new JobExecutor(runtime, {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1305,12 +1321,12 @@ describe("error handling (US-7)", () => {
             expect(unknownTypeMsg).toBeDefined();
         });
         it("handles messages with unexpected type values", async () => {
-            const sdkQuery = async function* () {
+            const runtime = createMockRuntime(async function* (options) {
                 yield { type: "system", content: "Init" };
                 yield { type: "unexpected_type", content: "Unknown" };
                 yield { type: "assistant", content: "Done" };
-            };
-            const executor = new JobExecutor(sdkQuery, {
+            });
+            const executor = new JobExecutor(runtime, {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1328,7 +1344,7 @@ describe("error handling (US-7)", () => {
                 { type: "system", content: "Start" },
                 { type: "error", message: "SDK reported error", code: "SDK_ERR" },
             ];
-            const executor = new JobExecutor(createMockSDKQuery(messages), {
+            const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
                 logger: createMockLogger(),
             });
             const result = await executor.execute({
@@ -1361,7 +1377,7 @@ describe("outputToFile (US-9)", () => {
             { type: "system", content: "Init" },
             { type: "assistant", content: "Hello" },
         ];
-        const executor = new JobExecutor(createMockSDKQuery(messages), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
             logger: createMockLogger(),
         });
         const result = await executor.execute({
@@ -1380,7 +1396,7 @@ describe("outputToFile (US-9)", () => {
             { type: "system", content: "Init" },
             { type: "assistant", content: "Hello world" },
         ];
-        const executor = new JobExecutor(createMockSDKQuery(messages), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
             logger: createMockLogger(),
         });
         const result = await executor.execute({
@@ -1400,7 +1416,7 @@ describe("outputToFile (US-9)", () => {
             { type: "system", content: "Init" },
             { type: "assistant", content: "Hello" },
         ];
-        const executor = new JobExecutor(createMockSDKQuery(messages), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
             logger: createMockLogger(),
         });
         const result = await executor.execute({
@@ -1424,7 +1440,7 @@ describe("outputToFile (US-9)", () => {
             { type: "system", content: "Init" },
             { type: "assistant", content: "Hello" },
         ];
-        const executor = new JobExecutor(createMockSDKQuery(messages), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
             logger: createMockLogger(),
         });
         const result = await executor.execute({
@@ -1451,7 +1467,7 @@ describe("outputToFile (US-9)", () => {
             { type: "tool_result", result: "localhost", success: true },
             { type: "error", message: "An error occurred" },
         ];
-        const executor = new JobExecutor(createMockSDKQuery(messages), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
             logger: createMockLogger(),
         });
         const result = await executor.execute({
@@ -1472,7 +1488,7 @@ describe("outputToFile (US-9)", () => {
         const messages = [
             { type: "assistant", content: "Hello" },
         ];
-        const executor = new JobExecutor(createMockSDKQuery(messages), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
             logger: createMockLogger(),
         });
         const result = await executor.execute({
@@ -1491,7 +1507,7 @@ describe("outputToFile (US-9)", () => {
             { type: "system", content: "Init" },
             { type: "assistant", content: "Response" },
         ];
-        const executor = new JobExecutor(createMockSDKQuery(messages), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
             logger: createMockLogger(),
         });
         const result = await executor.execute({
@@ -1510,7 +1526,7 @@ describe("outputToFile (US-9)", () => {
         const messages = [
             { type: "tool_result", result: "File not found", success: false },
         ];
-        const executor = new JobExecutor(createMockSDKQuery(messages), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
             logger: createMockLogger(),
         });
         const result = await executor.execute({
@@ -1532,7 +1548,7 @@ describe("outputToFile (US-9)", () => {
             { type: "system", content: "Init" },
             { type: "assistant", content: "Hello" },
         ];
-        const executor = new JobExecutor(createMockSDKQuery(messages), {
+        const executor = new JobExecutor(createMockRuntimeWithMessages(messages), {
             logger: createMockLogger(),
         });
         await executor.execute({
@@ -1547,4 +1563,323 @@ describe("outputToFile (US-9)", () => {
         expect(receivedMessages).toHaveLength(2);
     });
 });
+// =============================================================================
+// Session expiration handling tests (fixes unexpected logout bug)
+// =============================================================================
+describe("session expiration handling", () => {
+    let tempDir;
+    let stateDir;
+    beforeEach(async () => {
+        tempDir = await createTempDir();
+        stateDir = join(tempDir, ".herdctl");
+        await initStateDirectory({ path: stateDir });
+    });
+    afterEach(async () => {
+        await rm(tempDir, { recursive: true, force: true });
+    });
+    it("starts fresh session when existing session is expired", async () => {
+        const sessionsDir = join(stateDir, "sessions");
+        // Create an expired session (last used 25 hours ago, default timeout is 24h)
+        const expiredLastUsed = new Date(Date.now() - 25 * 60 * 60 * 1000).toISOString();
+        await updateSessionInfo(sessionsDir, "expiry-test-agent", {
+            session_id: "old-expired-session",
+            mode: "autonomous",
+        });
+        // Manually update last_used_at to make it expired
+        const { writeFile } = await import("node:fs/promises");
+        const sessionPath = join(sessionsDir, "expiry-test-agent.json");
+        const sessionData = {
+            agent_name: "expiry-test-agent",
+            session_id: "old-expired-session",
+            created_at: expiredLastUsed,
+            last_used_at: expiredLastUsed,
+            job_count: 1,
+            mode: "autonomous",
+        };
+        await writeFile(sessionPath, JSON.stringify(sessionData));
+        let receivedOptions;
+        const runtime = createMockRuntime(async function* (options) {
+            receivedOptions = options;
+            yield { type: "system", content: "Init", subtype: "init", session_id: "new-fresh-session" };
+            yield { type: "assistant", content: "Started fresh" };
+        });
+        const executor = new JobExecutor(runtime, {
+            logger: createMockLogger(),
+        });
+        const result = await executor.execute({
+            agent: createTestAgent({ name: "expiry-test-agent" }),
+            prompt: "Test prompt",
+            stateDir,
+            resume: "old-expired-session", // Try to resume expired session
+        });
+        expect(result.success).toBe(true);
+        // Should NOT have passed resume option since session was expired
+        expect(receivedOptions?.resume).toBeUndefined();
+        // New session should be created
+        expect(result.sessionId).toBe("new-fresh-session");
+    });
+    it("resumes valid session that is not expired", async () => {
+        const sessionsDir = join(stateDir, "sessions");
+        // Create a valid session (last used 1 hour ago, default timeout is 24h)
+        await updateSessionInfo(sessionsDir, "valid-session-agent", {
+            session_id: "valid-session-id",
+            mode: "autonomous",
+        });
+        let receivedOptions;
+        const runtime = createMockRuntime(async function* (options) {
+            receivedOptions = options;
+            yield { type: "assistant", content: "Resumed successfully" };
+        });
+        const executor = new JobExecutor(runtime, {
+            logger: createMockLogger(),
+        });
+        await executor.execute({
+            agent: createTestAgent({ name: "valid-session-agent" }),
+            prompt: "Test prompt",
+            stateDir,
+            resume: "valid-session-id",
+        });
+        // Should have passed resume option since session is valid
+        expect(receivedOptions?.resume).toBe("valid-session-id");
+    });
+    it("uses stored session_id from disk, not the options.resume value", async () => {
+        const sessionsDir = join(stateDir, "sessions");
+        // Create a valid session with a DIFFERENT session_id than what options.resume will provide
+        // This simulates the case where the stored session has been updated but the caller
+        // is using an outdated or generic resume value (like a boolean or old session ID)
+        await updateSessionInfo(sessionsDir, "session-mismatch-agent", {
+            session_id: "stored-session-abc123", // The actual session ID stored on disk
+            mode: "autonomous",
+        });
+        let receivedOptions;
+        const runtime = createMockRuntime(async function* (options) {
+            receivedOptions = options;
+            yield { type: "assistant", content: "Resumed with correct session" };
+        });
+        const executor = new JobExecutor(runtime, {
+            logger: createMockLogger(),
+        });
+        await executor.execute({
+            agent: createTestAgent({ name: "session-mismatch-agent" }),
+            prompt: "Test prompt",
+            stateDir,
+            // Pass a DIFFERENT value than what's stored - this could be an old session ID
+            // or any truthy value indicating "please resume"
+            resume: "outdated-session-xyz789",
+        });
+        // CRITICAL: Should use the session_id from the stored session file, NOT the options.resume value
+        // This is the fix for the unexpected logout bug - we must use the actual stored session ID
+        expect(receivedOptions?.resume).toBe("stored-session-abc123");
+    });
+    it("respects custom session timeout from agent config", async () => {
+        const sessionsDir = join(stateDir, "sessions");
+        // Create a session that is 2 hours old
+        const twoHoursAgo = new Date(Date.now() - 2 * 60 * 60 * 1000).toISOString();
+        const { writeFile } = await import("node:fs/promises");
+        const sessionPath = join(sessionsDir, "custom-timeout-agent.json");
+        const sessionData = {
+            agent_name: "custom-timeout-agent",
+            session_id: "two-hour-old-session",
+            created_at: twoHoursAgo,
+            last_used_at: twoHoursAgo,
+            job_count: 1,
+            mode: "autonomous",
+        };
+        await writeFile(sessionPath, JSON.stringify(sessionData));
+        let receivedOptions;
+        const runtime = createMockRuntime(async function* (options) {
+            receivedOptions = options;
+            yield { type: "assistant", content: "Done" };
+        });
+        const executor = new JobExecutor(runtime, {
+            logger: createMockLogger(),
+        });
+        // With 1 hour timeout, 2-hour-old session should be expired
+        await executor.execute({
+            agent: createTestAgent({
+                name: "custom-timeout-agent",
+                session: { timeout: "1h" },
+            }),
+            prompt: "Test prompt",
+            stateDir,
+            resume: "two-hour-old-session",
+        });
+        // Should NOT have passed resume since session exceeded custom timeout
+        expect(receivedOptions?.resume).toBeUndefined();
+    });
+    it("writes system message to job output when session expires", async () => {
+        const sessionsDir = join(stateDir, "sessions");
+        // Create an expired session
+        const expiredLastUsed = new Date(Date.now() - 25 * 60 * 60 * 1000).toISOString();
+        const { writeFile } = await import("node:fs/promises");
+        const sessionPath = join(sessionsDir, "output-test-agent.json");
+        const sessionData = {
+            agent_name: "output-test-agent",
+            session_id: "expired-session",
+            created_at: expiredLastUsed,
+            last_used_at: expiredLastUsed,
+            job_count: 1,
+            mode: "autonomous",
+        };
+        await writeFile(sessionPath, JSON.stringify(sessionData));
+        const runtime = createMockRuntime(async function* () {
+            yield { type: "assistant", content: "Fresh start" };
+        });
+        const executor = new JobExecutor(runtime, {
+            logger: createMockLogger(),
+        });
+        const result = await executor.execute({
+            agent: createTestAgent({ name: "output-test-agent" }),
+            prompt: "Test prompt",
+            stateDir,
+            resume: "expired-session",
+        });
+        // Check job output for session expiry message
+        const output = await readJobOutputAll(join(stateDir, "jobs"), result.jobId);
+        const systemMsg = output.find((m) => m.type === "system" && m.content?.includes("session"));
+        expect(systemMsg).toBeDefined();
+    });
+    it("clears expired session file when detected", async () => {
+        const sessionsDir = join(stateDir, "sessions");
+        // Create an expired session
+        const expiredLastUsed = new Date(Date.now() - 25 * 60 * 60 * 1000).toISOString();
+        const { writeFile } = await import("node:fs/promises");
+        const sessionPath = join(sessionsDir, "clear-test-agent.json");
+        const sessionData = {
+            agent_name: "clear-test-agent",
+            session_id: "expired-to-clear",
+            created_at: expiredLastUsed,
+            last_used_at: expiredLastUsed,
+            job_count: 1,
+            mode: "autonomous",
+        };
+        await writeFile(sessionPath, JSON.stringify(sessionData));
+        // Verify session exists
+        let sessionBefore = await getSessionInfo(sessionsDir, "clear-test-agent");
+        expect(sessionBefore).not.toBeNull();
+        const runtime = createMockRuntime(async function* () {
+            yield { type: "system", content: "Init", subtype: "init", session_id: "new-session" };
+            yield { type: "assistant", content: "Fresh" };
+        });
+        const executor = new JobExecutor(runtime, {
+            logger: createMockLogger(),
+        });
+        await executor.execute({
+            agent: createTestAgent({ name: "clear-test-agent" }),
+            prompt: "Test prompt",
+            stateDir,
+            resume: "expired-to-clear",
+        });
+        // Session should now have the new ID (old one was cleared and new one created)
+        const sessionAfter = await getSessionInfo(sessionsDir, "clear-test-agent");
+        expect(sessionAfter?.session_id).toBe("new-session");
+    });
+    it("retries with fresh session when server-side session expiration detected", async () => {
+        const sessionsDir = join(stateDir, "sessions");
+        // Create a valid session (not locally expired)
+        await updateSessionInfo(sessionsDir, "server-expiry-agent", {
+            session_id: "valid-local-session",
+            mode: "autonomous",
+        });
+        let attemptCount = 0;
+        let lastResumeValue;
+        // First attempt throws session expired error, second succeeds
+        const runtime = createMockRuntime(async function* (options) {
+            attemptCount++;
+            lastResumeValue = options.resume;
+            if (attemptCount === 1 && options.resume) {
+                // First attempt with resume - server says session expired
+                throw new Error("Session expired on server");
+            }
+            // Second attempt or fresh session - succeed
+            yield { type: "system", content: "Init", subtype: "init", session_id: "new-server-session" };
+            yield { type: "assistant", content: "Success after retry" };
+        });
+        const executor = new JobExecutor(runtime, {
+            logger: createMockLogger(),
+        });
+        const result = await executor.execute({
+            agent: createTestAgent({ name: "server-expiry-agent" }),
+            prompt: "Test prompt",
+            stateDir,
+            resume: "valid-local-session",
+        });
+        // Should have succeeded after retry
+        expect(result.success).toBe(true);
+        expect(result.sessionId).toBe("new-server-session");
+        // Should have attempted twice: first with resume, then fresh
+        expect(attemptCount).toBe(2);
+        // Second attempt should NOT have resume (fresh session)
+        expect(lastResumeValue).toBeUndefined();
+        // Check job output includes retry message
+        const output = await readJobOutputAll(join(stateDir, "jobs"), result.jobId);
+        const retryMsg = output.find((m) => m.type === "system" && m.content?.includes("Retrying with fresh session"));
+        expect(retryMsg).toBeDefined();
+    });
+    it("does not retry infinitely on persistent server errors", async () => {
+        const sessionsDir = join(stateDir, "sessions");
+        await updateSessionInfo(sessionsDir, "no-infinite-retry-agent", {
+            session_id: "some-session",
+            mode: "autonomous",
+        });
+        let attemptCount = 0;
+        // Always throw session expired error
+        const runtime = createMockRuntime(async function* (options) {
+            attemptCount++;
+            throw new Error("Session expired on server");
+        });
+        const executor = new JobExecutor(runtime, {
+            logger: createMockLogger(),
+        });
+        const result = await executor.execute({
+            agent: createTestAgent({ name: "no-infinite-retry-agent" }),
+            prompt: "Test prompt",
+            stateDir,
+            resume: "some-session",
+        });
+        // Should fail after at most 2 attempts (initial + 1 retry)
+        expect(result.success).toBe(false);
+        expect(attemptCount).toBeLessThanOrEqual(2);
+        expect(result.error?.message).toContain("Session expired");
+    });
+    it("updates last_used_at before execution to prevent mid-job session expiry", async () => {
+        const sessionsDir = join(stateDir, "sessions");
+        // Create a session that is 23 hours old (close to default 24h expiry)
+        const twentyThreeHoursAgo = new Date(Date.now() - 23 * 60 * 60 * 1000).toISOString();
+        const { writeFile } = await import("node:fs/promises");
+        const sessionPath = join(sessionsDir, "refresh-test-agent.json");
+        const sessionData = {
+            agent_name: "refresh-test-agent",
+            session_id: "almost-expired-session",
+            created_at: twentyThreeHoursAgo,
+            last_used_at: twentyThreeHoursAgo,
+            job_count: 5,
+            mode: "autonomous",
+        };
+        await writeFile(sessionPath, JSON.stringify(sessionData));
+        // Record when the test starts
+        const testStartTime = Date.now();
+        const runtime = createMockRuntime(async function* () {
+            // Simulate a delay to ensure last_used_at was updated BEFORE we got here
+            yield { type: "assistant", content: "Working..." };
+        });
+        const executor = new JobExecutor(runtime, {
+            logger: createMockLogger(),
+        });
+        await executor.execute({
+            agent: createTestAgent({ name: "refresh-test-agent" }),
+            prompt: "Test prompt",
+            stateDir,
+            resume: "almost-expired-session",
+        });
+        // Check that last_used_at was updated to a recent time (not 23 hours ago)
+        const sessionAfter = await getSessionInfo(sessionsDir, "refresh-test-agent");
+        expect(sessionAfter).not.toBeNull();
+        const lastUsedMs = new Date(sessionAfter.last_used_at).getTime();
+        // Should be updated to approximately now (within last few seconds)
+        expect(lastUsedMs).toBeGreaterThanOrEqual(testStartTime - 1000);
+        // And not still 23 hours ago
+        expect(lastUsedMs).toBeGreaterThan(new Date(twentyThreeHoursAgo).getTime());
+    });
+});
 //# sourceMappingURL=job-executor.test.js.map