@prestyj/cli 5.10.0 → 5.11.0

package/dist/core/agent-session-crash-durability.test.js

@@ -0,0 +1,102 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { spawn } from "node:child_process";
+import { fileURLToPath } from "node:url";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+const FIXTURE = path.join(path.dirname(fileURLToPath(import.meta.url)), "__fixtures__", "crash-mid-tool-batch.mjs");
+let tmpHome;
+let tmpProject;
+async function writeJson(filePath, value) {
+    await fs.mkdir(path.dirname(filePath), { recursive: true });
+    await fs.writeFile(filePath, JSON.stringify(value, null, 2), "utf-8");
+}
+/** Run the fixture to its self-inflicted SIGKILL and return how it died. */
+function runFixture() {
+    return new Promise((resolve, reject) => {
+        const child = spawn(process.execPath, ["--import", "tsx", FIXTURE, tmpProject], {
+            // Run from the package root so `tsx` resolves; the session's working
+            // directory is passed explicitly as an argument.
+            cwd: process.cwd(),
+            env: {
+                ...process.env,
+                HOME: tmpHome,
+                USERPROFILE: tmpHome,
+                // Keep the fixture off the user's real config and away from the network.
+                GG_DISABLE_TELEMETRY: "1",
+            },
+            stdio: ["ignore", "pipe", "pipe"],
+        });
+        let stdout = "";
+        let stderr = "";
+        child.stdout.on("data", (chunk) => {
+            stdout += chunk;
+        });
+        child.stderr.on("data", (chunk) => {
+            stderr += chunk;
+        });
+        child.on("error", reject);
+        child.on("close", (code, signal) => resolve({ code, signal, stdout, stderr }));
+    });
+}
+/** Every `message` entry in a session file, in file order. */
+async function readMessages(sessionPath) {
+    const raw = await fs.readFile(sessionPath, "utf-8");
+    const messages = [];
+    for (const line of raw.split("\n")) {
+        if (!line.trim())
+            continue;
+        const entry = JSON.parse(line);
+        if (entry.type !== "message" || !entry.message)
+            continue;
+        messages.push({ role: entry.message.role, text: JSON.stringify(entry.message.content) });
+    }
+    return messages;
+}
+beforeEach(async () => {
+    tmpHome = await fs.mkdtemp(path.join(os.tmpdir(), "gg-crash-home-"));
+    tmpProject = await fs.mkdtemp(path.join(os.tmpdir(), "gg-crash-project-"));
+    await writeJson(path.join(tmpHome, ".ezcoder", "auth.json"), {
+        anthropic: {
+            accessToken: "test-access",
+            refreshToken: "test-refresh",
+            expiresAt: Date.now() + 3_600_000,
+        },
+    });
+    await writeJson(path.join(tmpHome, ".ezcoder", "settings.json"), { autoCompact: false });
+});
+afterEach(async () => {
+    await fs.rm(tmpHome, { recursive: true, force: true });
+    await fs.rm(tmpProject, { recursive: true, force: true });
+});
+describe("session durability across a mid-run crash", () => {
+    it("replays every message up to the last completed step", async () => {
+        const run = await runFixture();
+        // The process must have been killed, not exited cleanly — otherwise the
+        // post-loop flush ran and this proves nothing. Windows reports forced
+        // termination as a non-zero exit code rather than a POSIX signal.
+        expect(run.stdout, run.stderr).toContain("CRASHING");
+        expect(run.stdout).not.toContain("NO_CRASH");
+        if (process.platform === "win32") {
+            expect(run.signal).toBeNull();
+            expect(run.code).not.toBe(0);
+        }
+        else {
+            expect(run.signal).toBe("SIGKILL");
+        }
+        const sessionPath = /^SESSION (.+)$/m.exec(run.stdout)?.[1];
+        expect(sessionPath, run.stdout).toBeTruthy();
+        const persisted = await readMessages(sessionPath);
+        const roles = persisted.map((m) => m.role);
+        // user prompt → step 1 assistant → step 1 tool results → step 2 assistant.
+        // Before step-boundary flushing, ONLY the user message survived a crash.
+        expect(roles).toEqual(["user", "assistant", "tool", "assistant"]);
+        expect(persisted[1].text).toContain("working on step 1");
+        expect(persisted[2].text).toContain("output 1");
+        expect(persisted[3].text).toContain("working on step 2");
+        // The in-flight step's tool results never reached a checkpoint, so they are
+        // legitimately absent — a crash loses at most the step it was running.
+        expect(persisted.some((m) => m.text.includes("output 2"))).toBe(false);
+    }, 120_000);
+});
+//# sourceMappingURL=agent-session-crash-durability.test.js.map

package/dist/core/agent-session-crash-durability.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-session-crash-durability.test.js","sourceRoot":"","sources":["../../src/core/agent-session-crash-durability.test.ts"],"names":[],"mappings":"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"}

package/dist/core/agent-session-marker-anchors.test.js

@@ -2,7 +2,7 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { normalizeAppMarkersForHistory } from "./session-history.js";
+import { normalizeAppMarkersForHistory, normalizeAutopilotMarkersForHistory, normalizeNolanTurnsForHistory, } from "./session-history.js";
 import { useFakeHome } from "../test-support/fake-home.js";
 const shouldCompactMock = vi.hoisted(() => vi.fn());
 const compactMock = vi.hoisted(() => vi.fn());
@@ -41,7 +41,7 @@ async function writeJson(filePath, value) {
     await fs.mkdir(path.dirname(filePath), { recursive: true });
     await fs.writeFile(filePath, JSON.stringify(value, null, 2), "utf-8");
 }
-async function findSessionFile() {
+async function listSessionFiles() {
     const root = path.join(tmpHome, ".ezcoder", "sessions");
     const found = [];
     for (const dir of await fs.readdir(root)) {
@@ -50,6 +50,12 @@ async function findSessionFile() {
                 found.push(path.join(root, dir, file));
         }
     }
+    // Session filenames lead with an ISO timestamp, so lexical order is
+    // chronological — the last one is the newest (post-compaction) file.
+    return found.sort();
+}
+async function findSessionFile() {
+    const found = await listSessionFiles();
     if (found.length !== 1)
         throw new Error(`expected 1 session file, found ${found.length}`);
     return found[0];
@@ -143,5 +149,178 @@ describe("AgentSession transcript marker anchors", () => {
         expect(replayed.some((m) => m.afterMessageCount > restoredCount)).toBe(false);
         await resumed.dispose();
     }, 15_000);
+    // The reported bug: an autopilot session that gets compacted mid-conversation
+    // shows every earlier Nolan verdict / error row jammed at the BOTTOM (or missing)
+    // when reopened, even though several turns happened after them. Compaction
+    // re-persisted the markers into the continuation file still carrying anchors
+    // from the far longer pre-compaction transcript.
+    it("keeps markers in place when compaction rewrites the session mid-conversation", async () => {
+        const { AgentSession } = await import("./agent-session.js");
+        const session = new AgentSession({
+            provider: "anthropic",
+            model: "claude-test",
+            cwd: tmpProject,
+            systemPrompt: "test system prompt",
+        });
+        await session.initialize();
+        agentLoopMock.mockImplementation(async function* (messages) {
+            messages.push({ role: "assistant", content: "reply" });
+            yield { type: "agent_done" };
+        });
+        // Six turns (12 non-system messages), with markers recorded early on —
+        // exactly the shape of an autopilot run: Nolan reviews, an error surfaces,
+        // and the conversation keeps going well past both.
+        await session.prompt("turn 1");
+        await session.prompt("turn 2");
+        await session.persistAppMarker("error", { headline: "Rate limited" });
+        await session.persistAutopilotMarker("done");
+        await session.persistNolanTurn("is this right?", "looks good");
+        await session.prompt("turn 3");
+        await session.prompt("turn 4");
+        await session.prompt("turn 5");
+        // A second, later verdict — this one lands in the tail compaction keeps
+        // verbatim, so it exercises the shift branch as well as the collapse one.
+        await session.persistAutopilotMarker("prompted", { body: "fix the flake" });
+        await session.prompt("turn 6");
+        // Markers sit at messages 4 and 10 of 12 — NOT at the end.
+        expect(session.getAppMarkers().filter((m) => m.kind === "error")[0]?.afterMessageCount).toBe(4);
+        expect(session.getAutopilotMarkers().map((m) => m.afterMessageCount)).toEqual([4, 10]);
+        expect(session.getMessages().filter((m) => m.role !== "system").length).toBe(12);
+        // Compaction collapses the first 8 non-system messages into a summary +
+        // ack, keeping the last 4 verbatim: 12 → 6 non-system messages.
+        const systemMsg = session.getMessages()[0];
+        const tail = session.getMessages().slice(-4);
+        compactMock.mockResolvedValue({
+            messages: [
+                systemMsg,
+                { role: "user", content: "[Previous conversation summary]\n\nearlier work" },
+                { role: "assistant", content: "I have the full context from the summary above." },
+                ...tail,
+            ],
+            result: {
+                compacted: true,
+                originalCount: 13,
+                newCount: 7,
+                tokensBeforeEstimate: 100_000,
+                tokensAfterEstimate: 10_000,
+                anchorRemap: { summarizedCount: 8, prefixCount: 2, newNonSystemCount: 6 },
+            },
+        });
+        await session.compact();
+        const compactedCount = session.getMessages().filter((m) => m.role !== "system").length;
+        expect(compactedCount).toBe(6);
+        // Two more turns AFTER the compaction, so "the bottom" is unambiguously
+        // somewhere the old markers must not be.
+        await session.prompt("turn 7");
+        await session.prompt("turn 8");
+        await session.dispose();
+        // Resume from the continuation file compaction created.
+        const files = await listSessionFiles();
+        expect(files.length).toBe(2);
+        const resumed = new AgentSession({
+            provider: "anthropic",
+            model: "claude-test",
+            cwd: tmpProject,
+            systemPrompt: "test system prompt",
+            sessionId: files[files.length - 1],
+        });
+        await resumed.initialize();
+        const restoredCount = resumed.getMessages().filter((m) => m.role !== "system").length;
+        expect(restoredCount).toBe(10); // 6 compacted + 2 turns × 2 messages
+        const errors = normalizeAppMarkersForHistory(resumed.getAppMarkers(), restoredCount).filter((m) => m.kind === "error");
+        const verdicts = normalizeAutopilotMarkersForHistory(resumed.getAutopilotMarkers(), restoredCount);
+        const nolanTurns = normalizeNolanTurnsForHistory(resumed.getNolanTurns(), restoredCount);
+        // All of them survive the rewrite...
+        expect(errors).toHaveLength(1);
+        expect(verdicts).toHaveLength(2);
+        expect(nolanTurns).toHaveLength(1);
+        // ...the ones whose surrounding conversation was summarized away land just
+        // after the summary block (the earliest honest position)...
+        expect(errors[0].afterMessageCount).toBe(2);
+        expect(verdicts[0].afterMessageCount).toBe(2);
+        expect(nolanTurns[0].afterMessageCount).toBe(2);
+        // ...and the one in the retained tail merely shifts with it: message 10 of
+        // the old transcript is message 4 of the new one. Unrebased it stayed at
+        // 10, which in a 10-message transcript is the very bottom — exactly the
+        // reported symptom, six messages below where it belongs.
+        expect(verdicts[1].afterMessageCount).toBe(4);
+        // Nothing bunches at the end, where the four post-compaction messages live.
+        for (const anchor of [
+            errors[0].afterMessageCount,
+            verdicts[0].afterMessageCount,
+            verdicts[1].afterMessageCount,
+            nolanTurns[0].afterMessageCount,
+        ]) {
+            expect(anchor).toBeLessThan(restoredCount - 3);
+        }
+        await resumed.dispose();
+    }, 20_000);
+    // Sessions already on disk were written before the rebase existed, so their
+    // anchors are still pre-compaction values. They must be rescued to their
+    // file-order position rather than dropped or clamped to the bottom.
+    it("heals legacy sessions whose persisted anchors survived a compaction unrebased", async () => {
+        const { SessionManager, APP_MARKER_CUSTOM_KIND, AUTOPILOT_MARKER_CUSTOM_KIND, NOLAN_TURN_CUSTOM_KIND, } = await import("./session-manager.js");
+        const sessionsDir = path.join(tmpHome, ".ezcoder", "sessions");
+        const manager = new SessionManager(sessionsDir);
+        const created = await manager.create(tmpProject, "anthropic", "claude-test");
+        const message = (id, text) => ({
+            type: "message",
+            id,
+            parentId: null,
+            timestamp: new Date().toISOString(),
+            message: { role: "user", content: text },
+        });
+        const custom = (id, kind, data) => ({
+            type: "custom",
+            kind,
+            id,
+            parentId: null,
+            timestamp: new Date().toISOString(),
+            data,
+        });
+        // Post-compaction file: 2 summary messages, then the stale markers dumped
+        // by the old re-persist path (anchors from a 367-message transcript), then
+        // the conversation continues to 6 messages total.
+        await manager.appendEntry(created.path, message("m1", "[Previous conversation summary]"));
+        await manager.appendEntry(created.path, message("m2", "ack"));
+        await manager.appendEntry(created.path, 
+        // Anchor 64 overshoots the 6-message transcript entirely — previously
+        // dropped, so the verdict vanished on reopen.
+        custom("a1", AUTOPILOT_MARKER_CUSTOM_KIND, {
+            version: 1,
+            phase: "done",
+            afterMessageCount: 64,
+        }));
+        await manager.appendEntry(created.path, 
+        // Anchor 5 is still IN range but far past where the marker was written —
+        // previously replayed near the bottom, below four unrelated later turns.
+        custom("e1", APP_MARKER_CUSTOM_KIND, {
+            version: 1,
+            kind: "error",
+            afterMessageCount: 5,
+            data: { headline: "Rate limited" },
+        }));
+        await manager.appendEntry(created.path, custom("k1", NOLAN_TURN_CUSTOM_KIND, {
+            version: 1,
+            question: "why did that fail?",
+            reply: "transient rate limit",
+            afterMessageCount: 88,
+        }));
+        for (const i of [3, 4, 5, 6])
+            await manager.appendEntry(created.path, message(`m${i}`, `t${i}`));
+        const loaded = await manager.load(created.path);
+        const restoredCount = manager.getMessages(loaded.entries, loaded.header.leafId).length;
+        expect(restoredCount).toBe(6);
+        const verdicts = normalizeAutopilotMarkersForHistory(manager.getAutopilotMarkers(loaded.entries, loaded.header.leafId), restoredCount);
+        const errors = normalizeAppMarkersForHistory(manager.getAppMarkers(loaded.entries, loaded.header.leafId), restoredCount);
+        const nolanTurns = normalizeNolanTurnsForHistory(manager.getNolanTurns(loaded.entries, loaded.header.leafId), restoredCount);
+        // All three are pulled back to where they were actually written: right
+        // after the summary, above the four later messages — none dropped, none
+        // stacked at the bottom.
+        expect(verdicts.map((m) => m.afterMessageCount)).toEqual([2]);
+        expect(errors.map((m) => m.afterMessageCount)).toEqual([2]);
+        expect(nolanTurns.map((t) => t.afterMessageCount)).toEqual([2]);
+        expect(restoredCount - 2).toBe(4);
+    }, 15_000);
 });
 //# sourceMappingURL=agent-session-marker-anchors.test.js.map

package/dist/core/agent-session-marker-anchors.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-session-marker-anchors.test.js","sourceRoot":"","sources":["../../src/core/agent-session-marker-anchors.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-session-marker-anchors.test.js","sourceRoot":"","sources":["../../src/core/agent-session-marker-anchors.test.ts"],"names":[],"mappings":"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"}

package/dist/core/agent-session-model-switch.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=agent-session-model-switch.test.d.ts.map

package/dist/core/agent-session-model-switch.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-session-model-switch.test.d.ts","sourceRoot":"","sources":["../../src/core/agent-session-model-switch.test.ts"],"names":[],"mappings":""}

package/dist/core/agent-session-model-switch.test.js

@@ -0,0 +1,161 @@
+/**
+ * A mid-session model switch must be replayable state, not a silent mutation:
+ * recorded as a durable marker, injected as its own trailing message, and — the
+ * expensive part — kept OFF the cached system prefix so the next turn still
+ * reads from cache.
+ */
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { useFakeHome } from "../test-support/fake-home.js";
+const agentLoopMock = vi.hoisted(() => vi.fn());
+vi.mock("@prestyj/agent", async () => {
+    const actual = await vi.importActual("@prestyj/agent");
+    return { ...actual, agentLoop: agentLoopMock };
+});
+vi.mock("./mcp/index.js", async () => {
+    const actual = await vi.importActual("./mcp/index.js");
+    return {
+        ...actual,
+        MCPClientManager: vi.fn(function MCPClientManagerMock() {
+            return { connectAll: vi.fn(async () => []), dispose: vi.fn(async () => { }) };
+        }),
+    };
+});
+let restoreHome;
+let tempHome;
+let tempProject;
+const CACHE_MARKER = "<!-- uncached -->";
+beforeEach(async () => {
+    tempHome = await fs.mkdtemp(path.join(os.tmpdir(), "agent-switch-home-"));
+    tempProject = await fs.mkdtemp(path.join(os.tmpdir(), "agent-switch-project-"));
+    restoreHome = useFakeHome(tempHome);
+    agentLoopMock.mockReset();
+    await fs.mkdir(path.join(tempHome, ".ezcoder"), { recursive: true });
+    await fs.writeFile(path.join(tempHome, ".ezcoder", "auth.json"), JSON.stringify({
+        anthropic: { accessToken: "t", refreshToken: "t", expiresAt: Date.now() + 3_600_000 },
+        openai: { accessToken: "t", refreshToken: "t", expiresAt: Date.now() + 3_600_000 },
+    }));
+});
+afterEach(async () => {
+    restoreHome?.();
+    await Promise.all([
+        fs.rm(tempHome, { recursive: true, force: true }),
+        fs.rm(tempProject, { recursive: true, force: true }),
+    ]);
+    vi.clearAllMocks();
+});
+async function createSession() {
+    const { AgentSession } = await import("./agent-session.js");
+    const session = new AgentSession({
+        provider: "openai",
+        model: "gpt-5.6-sol",
+        // Repo cwd so the bundled agent definitions register spawn_agent — the
+        // Sol/Ultra orchestration block only renders when that tool exists, and it
+        // is the model-dependent prompt content this test is about.
+        cwd: process.cwd(),
+        systemPrompt: "stable role prompt",
+        thinkingLevel: "ultra",
+        transient: true,
+        selfCorrectionHooks: false,
+    });
+    await session.initialize();
+    // A conversation must already exist for the switch note to have a job.
+    session
+        .getMessages()
+        .push({ role: "user", content: "start the work" }, { role: "assistant", content: "on it" });
+    return session;
+}
+/**
+ * System-prompt bytes that carry cache_control. Mirrors the provider split in
+ * gg-ai `transform.ts`: everything before the marker, trimmed at the end.
+ */
+function cachedPrefix(content) {
+    const index = content.indexOf(CACHE_MARKER);
+    return (index === -1 ? content : content.slice(0, index)).trimEnd();
+}
+describe("AgentSession model switch", () => {
+    it("keeps the cached system prefix byte-identical across a switch", async () => {
+        const session = await createSession();
+        try {
+            const before = String(session.getMessages()[0].content);
+            // Sol/Ultra guidance is live, so the switch really does change the prompt.
+            expect(before).toContain(CACHE_MARKER);
+            expect(before).toContain("Proactively use spawn_agent");
+            await session.switchModel("openai", "gpt-5.5-codex");
+            const after = String(session.getMessages()[0].content);
+            expect(cachedPrefix(after)).toBe(cachedPrefix(before));
+            // Model-dependent guidance followed the model, out of the cached region.
+            expect(after).not.toContain("Proactively use spawn_agent");
+        }
+        finally {
+            await session.dispose();
+        }
+    }, 30_000);
+    it("appends the switch as its own trailing message", async () => {
+        const session = await createSession();
+        try {
+            await session.switchModel("openai", "gpt-5.5-codex");
+            const messages = session.getMessages();
+            const last = messages[messages.length - 1];
+            expect(last.role).toBe("user");
+            expect(String(last.content)).toContain("gpt-5.6-sol");
+            expect(String(last.content)).toContain("gpt-5.5-codex");
+            // Cross-provider switches name the provider on both sides.
+            await session.switchModel("anthropic", "claude-test");
+            expect(String(session.getMessages().at(-1).content)).toContain("anthropic/claude-test");
+        }
+        finally {
+            await session.dispose();
+        }
+    }, 30_000);
+    it("records a replayable model_switch marker", async () => {
+        const session = await createSession();
+        try {
+            await session.switchModel("openai", "gpt-5.5-codex");
+            const markers = session.getAppMarkers().filter((m) => m.kind === "model_switch");
+            expect(markers).toHaveLength(1);
+            expect(markers[0].data).toMatchObject({
+                from: "gpt-5.6-sol",
+                to: "gpt-5.5-codex",
+                provider: "openai",
+                fromProvider: "openai",
+            });
+        }
+        finally {
+            await session.dispose();
+        }
+    }, 30_000);
+    it("does nothing when the model did not actually change", async () => {
+        const session = await createSession();
+        try {
+            const before = [...session.getMessages()];
+            await session.switchModel("openai", "gpt-5.6-sol");
+            expect(session.getMessages()).toHaveLength(before.length);
+            expect(session.getAppMarkers().filter((m) => m.kind === "model_switch")).toHaveLength(0);
+        }
+        finally {
+            await session.dispose();
+        }
+    }, 30_000);
+    it("does not break tool pairing when a switch lands mid tool call", async () => {
+        const session = await createSession();
+        try {
+            session.getMessages().push({
+                role: "assistant",
+                content: [{ type: "tool_call", id: "t1", name: "read", args: {} }],
+            });
+            const count = session.getMessages().length;
+            await session.switchModel("openai", "gpt-5.5-codex");
+            // No user message may sit between tool_use and its tool_result.
+            expect(session.getMessages()).toHaveLength(count);
+            // The switch is still recorded durably.
+            expect(session.getAppMarkers().filter((m) => m.kind === "model_switch")).toHaveLength(1);
+        }
+        finally {
+            await session.dispose();
+        }
+    }, 30_000);
+});
+//# sourceMappingURL=agent-session-model-switch.test.js.map

package/dist/core/agent-session-model-switch.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-session-model-switch.test.js","sourceRoot":"","sources":["../../src/core/agent-session-model-switch.test.ts"],"names":[],"mappings":"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"}

package/dist/core/agent-session-notifications.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=agent-session-notifications.test.d.ts.map

package/dist/core/agent-session-notifications.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-session-notifications.test.d.ts","sourceRoot":"","sources":["../../src/core/agent-session-notifications.test.ts"],"names":[],"mappings":""}