@prestyj/cli 5.2.0 → 5.3.1

package/dist/core/project-discovery.test.js

@@ -0,0 +1,104 @@
+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 { encodeCwd } from "./encode-cwd.js";
+import { discoverProjects } from "./project-discovery.js";
+// Holder the hoisted mock reads at call time (vi.mock is hoisted above imports,
+// so it can't close over a value assigned later without this indirection).
+const state = { sessionsDir: "" };
+vi.mock("../config.js", async (orig) => {
+    const actual = await orig();
+    return {
+        ...actual,
+        getAppPaths: () => ({ ...actual.getAppPaths(), sessionsDir: state.sessionsDir }),
+    };
+});
+/** Write a minimal ezcoder session file (header + one message) into `dir`. */
+async function writeSession(dir, cwd) {
+    await fs.mkdir(dir, { recursive: true });
+    const header = JSON.stringify({
+        type: "session",
+        version: 2,
+        id: "11111111-1111-1111-1111-111111111111",
+        timestamp: new Date().toISOString(),
+        cwd,
+        provider: "anthropic",
+        model: "claude-sonnet-5",
+    });
+    const message = JSON.stringify({
+        type: "message",
+        id: "22222222-2222-2222-2222-222222222222",
+        timestamp: new Date().toISOString(),
+        message: { role: "user", content: "hi" },
+    });
+    await fs.writeFile(path.join(dir, "session.jsonl"), `${header}\n${message}\n`, "utf-8");
+}
+describe("discoverProjects (ezcoder store)", () => {
+    let tmp;
+    beforeEach(async () => {
+        tmp = await fs.mkdtemp(path.join(os.tmpdir(), "gg-discovery-"));
+        state.sessionsDir = path.join(tmp, ".ezcoder", "sessions");
+        await fs.mkdir(state.sessionsDir, { recursive: true });
+        // Point Claude/Codex discovery at an empty home so they contribute nothing.
+        vi.spyOn(os, "homedir").mockReturnValue(path.join(tmp, "home"));
+    });
+    afterEach(async () => {
+        vi.restoreAllMocks();
+        await fs.rm(tmp, { recursive: true, force: true });
+    });
+    it("lists a project whose folder name contains an underscore (regression)", async () => {
+        // Real project path with a literal underscore — the lossy slash→underscore
+        // decode would resolve this to `.../projects/my/app`, which doesn't exist,
+        // so the project used to silently vanish from the picker.
+        const projectPath = path.join(tmp, "projects", "my_app");
+        await fs.mkdir(projectPath, { recursive: true });
+        await writeSession(path.join(state.sessionsDir, encodeCwd(projectPath)), projectPath);
+        const projects = await discoverProjects();
+        const found = projects.find((p) => p.path === projectPath);
+        expect(found).toBeDefined();
+        expect(found?.name).toBe("my_app");
+        expect(found?.sources).toContain("ezcoder");
+        // The lossy decode must NOT surface as a phantom project.
+        expect(projects.some((p) => p.path === path.join(tmp, "projects", "my", "app"))).toBe(false);
+    });
+    it("keys the project off the header cwd, not the directory name", async () => {
+        // The real cwd lives in the session header; the directory name is only a
+        // lossy hint. Prove the header wins by giving the dir an arbitrary name
+        // (as happens for a copied/renamed session store) whose underscore-decode
+        // would resolve somewhere else entirely — the project must still resolve to
+        // the header's true underscore path.
+        const projectPath = path.join(tmp, "projects", "my_app");
+        await fs.mkdir(projectPath, { recursive: true });
+        await writeSession(path.join(state.sessionsDir, "arbitrary-store-name"), projectPath);
+        const projects = await discoverProjects();
+        const found = projects.find((p) => p.path === projectPath);
+        expect(found).toBeDefined();
+        expect(found?.name).toBe("my_app");
+        // The decode of "arbitrary-store-name" (an existing-looking rel path) must
+        // not surface as its own phantom project.
+        expect(projects.some((p) => p.path.endsWith("arbitrary-store-name"))).toBe(false);
+    });
+    // The best-effort decode only round-trips for underscore-free absolute paths
+    // (that's the whole point of the header fix). macOS's own os.tmpdir() contains
+    // a literal underscore, so this test roots its project under posix /tmp to get
+    // an underscore-free path; skip on Windows where that root doesn't exist.
+    it.skipIf(process.platform === "win32")("falls back to underscore decode when a session file carries no cwd header", async () => {
+        const root = await fs.mkdtemp("/tmp/ggfallback-");
+        try {
+            // Legacy/headerless session dir: no `type:"session"` line. The decode
+            // still lists it as long as the decoded path exists on disk.
+            const projectPath = path.join(root, "legacy");
+            await fs.mkdir(projectPath, { recursive: true });
+            const dir = path.join(state.sessionsDir, encodeCwd(projectPath));
+            await fs.mkdir(dir, { recursive: true });
+            await fs.writeFile(path.join(dir, "session.jsonl"), `${JSON.stringify({ type: "message", message: { role: "user", content: "hi" } })}\n`, "utf-8");
+            const projects = await discoverProjects();
+            expect(projects.find((p) => p.path === projectPath)).toBeDefined();
+        }
+        finally {
+            await fs.rm(root, { recursive: true, force: true });
+        }
+    });
+});
+//# sourceMappingURL=project-discovery.test.js.map

package/dist/core/project-discovery.test.js.map

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

package/dist/core/session-history.d.ts

@@ -0,0 +1,51 @@
+import type { Message } from "@prestyj/ai";
+import type { AutopilotMarkerPayload, AppMarkerPayload, NolanTurnPayload } from "./session-manager.js";
+export interface HistoryAutopilotMarker extends AutopilotMarkerPayload {
+    /** Stable seed derived from persisted marker data for deterministic UI copy. */
+    copySeed: string;
+}
+export declare function autopilotMarkerCopySeed(marker: AutopilotMarkerPayload): string;
+/**
+ * Normalize persisted autopilot markers for transcript replay.
+ *
+ * Older compacted/continued sessions may carry markers whose original
+ * `afterMessageCount` points beyond the restored message list. Replaying those
+ * at EOF bunches old Nolan all-clear bubbles at the bottom, so drop them. Also
+ * dedupe exact marker payloads produced by old rewrite/re-persist paths.
+ */
+export declare function normalizeAutopilotMarkersForHistory(markers: readonly AutopilotMarkerPayload[], maxAfterMessageCount: number): HistoryAutopilotMarker[];
+/**
+ * Normalize persisted app transcript markers for replay: drop markers whose
+ * anchor points beyond the restored message list (stale after compaction) and
+ * dedupe exact payloads (old rewrite paths could re-append). Mirrors
+ * {@link normalizeAutopilotMarkersForHistory}.
+ */
+export declare function normalizeAppMarkersForHistory(markers: readonly AppMarkerPayload[], maxAfterMessageCount: number): AppMarkerPayload[];
+/**
+ * Normalize persisted Nolan turns for replay. Unlike autopilot/app markers, Nolan
+ * turns carry real conversation — an out-of-range anchor (stale after
+ * compaction) is CLAMPED to the last message instead of dropped, so the
+ * exchange still renders (at the end, in order) rather than vanishing. Exact
+ * duplicate payloads (old rewrite/re-persist paths) are deduped.
+ */
+export declare function normalizeNolanTurnsForHistory(turns: readonly NolanTurnPayload[], maxAfterMessageCount: number): NolanTurnPayload[];
+export interface RestoredUserRow {
+    /** The typed text as the live bubble showed it. */
+    text: string;
+    /** Attached image data URLs. */
+    images: string[];
+    /** True when the message carried a video the model could NOT watch natively
+     *  (live showed an info row after the bubble). */
+    videoWarning: boolean;
+}
+/** Rebuild the live user bubble from a persisted user message's content. */
+export declare function restoreUserRow(content: Message["content"]): RestoredUserRow;
+/**
+ * Split a persisted assistant message into per-bubble texts. Live streaming
+ * ends the assistant bubble at every server_tool_call (see useAgentEvents'
+ * server_tool_call case), so pre- and post-tool text render as separate rows.
+ * Persisted content keeps that structure as separate text blocks — emit one
+ * text per block instead of gluing them into a single row on resume.
+ */
+export declare function restoreAssistantTexts(content: Message["content"]): string[];
+//# sourceMappingURL=session-history.d.ts.map

package/dist/core/session-history.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-history.d.ts","sourceRoot":"","sources":["../../src/core/session-history.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EACV,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,sBAAsB,CAAC;AAI9B,MAAM,WAAW,sBAAuB,SAAQ,sBAAsB;IACpE,gFAAgF;IAChF,QAAQ,EAAE,MAAM,CAAC;CAClB;AAWD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAE9E;AAED;;;;;;;GAOG;AACH,wBAAgB,mCAAmC,CACjD,OAAO,EAAE,SAAS,sBAAsB,EAAE,EAC1C,oBAAoB,EAAE,MAAM,GAC3B,sBAAsB,EAAE,CAa1B;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,SAAS,gBAAgB,EAAE,EACpC,oBAAoB,EAAE,MAAM,GAC3B,gBAAgB,EAAE,CAepB;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,SAAS,gBAAgB,EAAE,EAClC,oBAAoB,EAAE,MAAM,GAC3B,gBAAgB,EAAE,CAcpB;AAmBD,MAAM,WAAW,eAAe;IAC9B,mDAAmD;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,gCAAgC;IAChC,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB;sDACkD;IAClD,YAAY,EAAE,OAAO,CAAC;CACvB;AAuBD,4EAA4E;AAC5E,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,eAAe,CAwB3E;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,MAAM,EAAE,CAK3E"}

package/dist/core/session-history.js

@@ -0,0 +1,156 @@
+import { STEERING_PREFIX } from "./steering.js";
+import { AUTOPILOT_INJECTION_PREAMBLE } from "./autopilot-cycle.js";
+function markerKey(marker) {
+    return JSON.stringify({
+        phase: marker.phase,
+        afterMessageCount: marker.afterMessageCount,
+        reason: marker.reason ?? null,
+        body: marker.body ?? null,
+    });
+}
+export function autopilotMarkerCopySeed(marker) {
+    return `${marker.phase}\0${marker.afterMessageCount}\0${marker.reason ?? ""}\0${marker.body ?? ""}`;
+}
+/**
+ * Normalize persisted autopilot markers for transcript replay.
+ *
+ * Older compacted/continued sessions may carry markers whose original
+ * `afterMessageCount` points beyond the restored message list. Replaying those
+ * at EOF bunches old Nolan all-clear bubbles at the bottom, so drop them. Also
+ * dedupe exact marker payloads produced by old rewrite/re-persist paths.
+ */
+export function normalizeAutopilotMarkersForHistory(markers, maxAfterMessageCount) {
+    const seen = new Set();
+    const normalized = [];
+    for (const marker of markers) {
+        if (marker.afterMessageCount > maxAfterMessageCount)
+            continue;
+        const key = markerKey(marker);
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        normalized.push({ ...marker, copySeed: autopilotMarkerCopySeed(marker) });
+    }
+    return normalized;
+}
+/**
+ * Normalize persisted app transcript markers for replay: drop markers whose
+ * anchor points beyond the restored message list (stale after compaction) and
+ * dedupe exact payloads (old rewrite paths could re-append). Mirrors
+ * {@link normalizeAutopilotMarkersForHistory}.
+ */
+export function normalizeAppMarkersForHistory(markers, maxAfterMessageCount) {
+    const seen = new Set();
+    const normalized = [];
+    for (const marker of markers) {
+        if (marker.afterMessageCount > maxAfterMessageCount)
+            continue;
+        const key = JSON.stringify({
+            kind: marker.kind,
+            afterMessageCount: marker.afterMessageCount,
+            data: marker.data,
+        });
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        normalized.push(marker);
+    }
+    return normalized;
+}
+/**
+ * Normalize persisted Nolan turns for replay. Unlike autopilot/app markers, Nolan
+ * turns carry real conversation — an out-of-range anchor (stale after
+ * compaction) is CLAMPED to the last message instead of dropped, so the
+ * exchange still renders (at the end, in order) rather than vanishing. Exact
+ * duplicate payloads (old rewrite/re-persist paths) are deduped.
+ */
+export function normalizeNolanTurnsForHistory(turns, maxAfterMessageCount) {
+    const seen = new Set();
+    const normalized = [];
+    for (const turn of turns) {
+        const key = JSON.stringify({ q: turn.question, r: turn.reply, a: turn.afterMessageCount });
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        normalized.push(turn.afterMessageCount > maxAfterMessageCount
+            ? { ...turn, afterMessageCount: maxAfterMessageCount }
+            : turn);
+    }
+    return normalized;
+}
+// ── User-row reconstruction ────────────────────────────────────────
+// The persisted user message is what the MODEL saw — steering wrapper, saved-
+// path notes, attached-files block. The live bubble showed only the typed
+// text, so resume must strip the machine framing back out.
+/** Separator AgentSession.buildAttachmentParts uses before the file-notes
+ *  block appended to a user message's leading text part. */
+const ATTACHED_FILES_HEADER = "Attached files (inspect with your tools):";
+/** Attachment-note text parts injected alongside the typed text. These never
+ *  appeared in the live user bubble. */
+const ATTACHMENT_NOTE_PATTERNS = [
+    /^\[Image saved at .+\]$/s,
+    /^The user attached a video at .+/s,
+    /^\[User attached a video file .+\]$/s,
+];
+function stripSteering(text) {
+    return text.startsWith(STEERING_PREFIX) ? text.slice(STEERING_PREFIX.length) : text;
+}
+/** Strip the autopilot situational-awareness preamble that the sidecar prepends
+ *  to every autopilot-injected build-session run (see frameAutopilotInjection).
+ *  The live transcript shows the clean body via the autopilot "prompted" marker;
+ *  on resume the raw session message must render the same clean instruction, not
+ *  the machine-facing preamble. */
+function stripAutopilotPreamble(text) {
+    return text.startsWith(AUTOPILOT_INJECTION_PREAMBLE)
+        ? text.slice(AUTOPILOT_INJECTION_PREAMBLE.length).trimStart()
+        : text;
+}
+function stripAttachedFilesBlock(text) {
+    if (text.startsWith(ATTACHED_FILES_HEADER))
+        return "";
+    const idx = text.indexOf(`\n\n${ATTACHED_FILES_HEADER}`);
+    return idx === -1 ? text : text.slice(0, idx);
+}
+/** Rebuild the live user bubble from a persisted user message's content. */
+export function restoreUserRow(content) {
+    if (typeof content === "string") {
+        return {
+            text: stripAttachedFilesBlock(stripAutopilotPreamble(stripSteering(content))).trim(),
+            images: [],
+            videoWarning: false,
+        };
+    }
+    const images = [];
+    const textParts = [];
+    let videoWarning = false;
+    for (const c of content) {
+        if (c.type === "image") {
+            images.push(`data:${c.mediaType};base64,${c.data}`);
+            continue;
+        }
+        if (c.type !== "text" || typeof c.text !== "string")
+            continue;
+        const stripped = stripAutopilotPreamble(stripSteering(c.text));
+        if (stripped.startsWith("[User attached a video file"))
+            videoWarning = true;
+        if (ATTACHMENT_NOTE_PATTERNS.some((re) => re.test(stripped)))
+            continue;
+        const cleaned = stripAttachedFilesBlock(stripped);
+        if (cleaned.trim())
+            textParts.push(cleaned);
+    }
+    return { text: textParts.join("\n\n").trim(), images, videoWarning };
+}
+/**
+ * Split a persisted assistant message into per-bubble texts. Live streaming
+ * ends the assistant bubble at every server_tool_call (see useAgentEvents'
+ * server_tool_call case), so pre- and post-tool text render as separate rows.
+ * Persisted content keeps that structure as separate text blocks — emit one
+ * text per block instead of gluing them into a single row on resume.
+ */
+export function restoreAssistantTexts(content) {
+    if (typeof content === "string")
+        return content.trim() ? [content] : [];
+    return content.flatMap((c) => c.type === "text" && typeof c.text === "string" && c.text.trim() ? [c.text] : []);
+}
+//# sourceMappingURL=session-history.js.map

package/dist/core/session-history.js.map

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

package/dist/core/session-history.test.d.ts

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

package/dist/core/session-history.test.d.ts.map

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

package/dist/core/session-history.test.js

@@ -0,0 +1,101 @@
+import { describe, expect, it } from "vitest";
+import { STEERING_PREFIX } from "./steering.js";
+import { frameAutopilotInjection } from "./autopilot-cycle.js";
+import { normalizeAutopilotMarkersForHistory, normalizeAppMarkersForHistory, normalizeNolanTurnsForHistory, restoreUserRow, restoreAssistantTexts, } from "./session-history.js";
+describe("normalizeAutopilotMarkersForHistory", () => {
+    it("drops out-of-range compacted-session markers and dedupes exact all-clear rows", () => {
+        const markers = [
+            { version: 1, phase: "done", afterMessageCount: 2 },
+            { version: 1, phase: "done", afterMessageCount: 2 },
+            { version: 1, phase: "done", afterMessageCount: 9 },
+            { version: 1, phase: "human", afterMessageCount: 3, reason: "Needs user approval." },
+            { version: 1, phase: "done", afterMessageCount: 12 },
+        ];
+        const restored = normalizeAutopilotMarkersForHistory(markers, 4);
+        expect(restored).toEqual([
+            { version: 1, phase: "done", afterMessageCount: 2, copySeed: "done\u00002\u0000\u0000" },
+            {
+                version: 1,
+                phase: "human",
+                afterMessageCount: 3,
+                reason: "Needs user approval.",
+                copySeed: "human\u00003\u0000Needs user approval.\u0000",
+            },
+        ]);
+        expect(restored.filter((m) => m.phase === "done")).toHaveLength(1);
+    });
+});
+describe("normalizeAppMarkersForHistory", () => {
+    it("drops out-of-range markers and dedupes exact payloads", () => {
+        const markers = [
+            { version: 1, kind: "plan", afterMessageCount: 1, data: { reason: "complex change" } },
+            { version: 1, kind: "plan", afterMessageCount: 1, data: { reason: "complex change" } },
+            { version: 1, kind: "task", afterMessageCount: 9, data: { title: "stale task" } },
+        ];
+        expect(normalizeAppMarkersForHistory(markers, 4)).toEqual([
+            { version: 1, kind: "plan", afterMessageCount: 1, data: { reason: "complex change" } },
+        ]);
+    });
+});
+describe("normalizeNolanTurnsForHistory", () => {
+    it("clamps stale anchors to the last message instead of dropping, and dedupes", () => {
+        const turns = [
+            { version: 1, question: "why?", reply: "because", afterMessageCount: 2 },
+            { version: 1, question: "why?", reply: "because", afterMessageCount: 2 },
+            { version: 1, question: "later q", reply: "later a", afterMessageCount: 50 },
+        ];
+        expect(normalizeNolanTurnsForHistory(turns, 4)).toEqual([
+            { version: 1, question: "why?", reply: "because", afterMessageCount: 2 },
+            { version: 1, question: "later q", reply: "later a", afterMessageCount: 4 },
+        ]);
+    });
+});
+describe("restoreUserRow", () => {
+    it("strips the mid-run steering wrapper so queued prompts resume clean", () => {
+        const row = restoreUserRow(`${STEERING_PREFIX}also add dark mode`);
+        expect(row.text).toBe("also add dark mode");
+    });
+    it("strips the autopilot preamble so injected prompts resume as the clean body", () => {
+        const row = restoreUserRow(frameAutopilotInjection("Add a test for the login flow."));
+        expect(row.text).toBe("Add a test for the login flow.");
+        expect(row.text).not.toContain("[Autopilot]");
+    });
+    it("drops attachment notes and the attached-files block, keeps typed text + images", () => {
+        const row = restoreUserRow([
+            {
+                type: "text",
+                text: "what's in this screenshot?\n\nAttached files (inspect with your tools):\n- notes.txt (saved at /p/notes.txt)",
+            },
+            { type: "image", mediaType: "image/png", data: "aGk=" },
+            { type: "text", text: "[Image saved at /p/.gg/uploads/x.png]" },
+        ]);
+        expect(row.text).toBe("what's in this screenshot?");
+        expect(row.images).toEqual(["data:image/png;base64,aGk="]);
+        expect(row.videoWarning).toBe(false);
+    });
+    it("flags the non-native-video note so resume re-shows the live info row", () => {
+        const row = restoreUserRow([
+            { type: "text", text: "summarize this clip" },
+            {
+                type: "text",
+                text: "[User attached a video file at /p/clip.mp4. You cannot watch video directly; if needed, use ffmpeg to extract frames or audio.]",
+            },
+        ]);
+        expect(row.text).toBe("summarize this clip");
+        expect(row.videoWarning).toBe(true);
+    });
+});
+describe("restoreAssistantTexts", () => {
+    it("keeps server-tool text splits as separate bubbles", () => {
+        expect(restoreAssistantTexts([
+            { type: "text", text: "Let me search for that." },
+            { type: "server_tool_call", id: "st1", name: "web_search", args: {} },
+            { type: "text", text: "Found it — here's the answer." },
+        ])).toEqual(["Let me search for that.", "Found it — here's the answer."]);
+    });
+    it("passes plain string content through as one bubble", () => {
+        expect(restoreAssistantTexts("hello")).toEqual(["hello"]);
+        expect(restoreAssistantTexts("  ")).toEqual([]);
+    });
+});
+//# sourceMappingURL=session-history.test.js.map

package/dist/core/session-history.test.js.map

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

package/dist/core/session-manager.d.ts

@@ -49,6 +49,34 @@ export interface NolanTurnPayload {
     reply: string;
     afterMessageCount: number;
 }
+/** Custom-entry kind for an autopilot verdict marker. Mirrors `nolan_turn`:
+ *  persisted as a `custom` entry with `parentId: null` so it's never on the
+ *  message DAG (EZ Coder never sees it) but survives resume/compaction and
+ *  interleaves back into the transcript via `afterMessageCount`. Covers all
+ *  four terminal/near-terminal autopilot markers so a resumed session renders
+ *  the exact same Nolan bubble the live run showed — never the raw verdict
+ *  keyword (e.g. `ALL_CLEAR`) the model actually replied with. */
+export declare const AUTOPILOT_MARKER_CUSTOM_KIND = "autopilot_marker";
+export interface AutopilotMarkerPayload {
+    version: 1;
+    phase: "prompted" | "done" | "human" | "capped" | "plan_approved";
+    reason?: string;
+    body?: string;
+    afterMessageCount: number;
+}
+/** Custom-entry kind for a generic app transcript marker (plan-mode banner,
+ *  task header, error row, user-bubble display hint). Same not-on-the-DAG
+ *  treatment as Nolan turns / autopilot markers: persisted with `parentId: null`
+ *  so the LLM never sees it, anchored by `afterMessageCount` so the host can
+ *  interleave it back into the transcript on resume. */
+export declare const APP_MARKER_CUSTOM_KIND = "app_transcript_marker";
+export interface AppMarkerPayload {
+    version: 1;
+    kind: "plan" | "task" | "error" | "user_hint" | "compaction";
+    afterMessageCount: number;
+    /** Kind-specific display fields (reason/title/headline/nolanSent/counts/…). */
+    data: Record<string, unknown>;
+}
 export type SessionEntry = MessageEntry | ModelChangeEntry | ThinkingLevelChangeEntry | CompactionEntry | LabelEntry | CustomEntry;
 export interface SessionHeader {
     type: "session";
@@ -130,6 +158,12 @@ export declare class SessionManager {
     /** Read all persisted Nolan turns in file order. Returns them regardless of
      *  branch (Nolan turns are not chained into the DAG), validated + normalized. */
     getNolanTurns(entries: SessionEntry[]): NolanTurnPayload[];
+    /** Read all persisted app transcript markers in file order, validated +
+     *  normalized (same not-on-the-DAG treatment as Nolan turns). */
+    getAppMarkers(entries: SessionEntry[]): AppMarkerPayload[];
+    /** Read all persisted autopilot markers in file order, validated + normalized
+     *  (same not-on-the-DAG treatment as Nolan turns). */
+    getAutopilotMarkers(entries: SessionEntry[]): AutopilotMarkerPayload[];
     /**
      * Ensure every assistant message with tool_use blocks is followed by a tool
      * message containing matching tool_result entries. Inserts synthetic

package/dist/core/session-manager.d.ts.map

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

package/dist/core/session-manager.js

@@ -15,6 +15,20 @@ export const DISPLAY_ITEM_CUSTOM_KIND = "display_item";
  *  number of non-system messages that existed when the turn was recorded, used
  *  to interleave Nolan turns back into the transcript chronologically. */
 export const NOLAN_TURN_CUSTOM_KIND = "nolan_turn";
+/** Custom-entry kind for an autopilot verdict marker. Mirrors `nolan_turn`:
+ *  persisted as a `custom` entry with `parentId: null` so it's never on the
+ *  message DAG (EZ Coder never sees it) but survives resume/compaction and
+ *  interleaves back into the transcript via `afterMessageCount`. Covers all
+ *  four terminal/near-terminal autopilot markers so a resumed session renders
+ *  the exact same Nolan bubble the live run showed — never the raw verdict
+ *  keyword (e.g. `ALL_CLEAR`) the model actually replied with. */
+export const AUTOPILOT_MARKER_CUSTOM_KIND = "autopilot_marker";
+/** Custom-entry kind for a generic app transcript marker (plan-mode banner,
+ *  task header, error row, user-bubble display hint). Same not-on-the-DAG
+ *  treatment as Nolan turns / autopilot markers: persisted with `parentId: null`
+ *  so the LLM never sees it, anchored by `afterMessageCount` so the host can
+ *  interleave it back into the transcript on resume. */
+export const APP_MARKER_CUSTOM_KIND = "app_transcript_marker";
 function isCompletedItemLike(value) {
     return (typeof value === "object" &&
         value !== null &&
@@ -351,6 +365,59 @@ export class SessionManager {
             return [];
         });
     }
+    /** Read all persisted app transcript markers in file order, validated +
+     *  normalized (same not-on-the-DAG treatment as Nolan turns). */
+    getAppMarkers(entries) {
+        return entries.flatMap((entry) => {
+            if (entry.type !== "custom" || entry.kind !== APP_MARKER_CUSTOM_KIND)
+                return [];
+            const p = entry.data;
+            const kind = p?.kind;
+            if (p?.version === 1 &&
+                (kind === "plan" ||
+                    kind === "task" ||
+                    kind === "error" ||
+                    kind === "user_hint" ||
+                    kind === "compaction")) {
+                return [
+                    {
+                        version: 1,
+                        kind,
+                        afterMessageCount: typeof p.afterMessageCount === "number" ? p.afterMessageCount : 0,
+                        data: typeof p.data === "object" && p.data !== null ? p.data : {},
+                    },
+                ];
+            }
+            return [];
+        });
+    }
+    /** Read all persisted autopilot markers in file order, validated + normalized
+     *  (same not-on-the-DAG treatment as Nolan turns). */
+    getAutopilotMarkers(entries) {
+        return entries.flatMap((entry) => {
+            if (entry.type !== "custom" || entry.kind !== AUTOPILOT_MARKER_CUSTOM_KIND)
+                return [];
+            const p = entry.data;
+            const phase = p?.phase;
+            if (p?.version === 1 &&
+                (phase === "prompted" ||
+                    phase === "done" ||
+                    phase === "human" ||
+                    phase === "capped" ||
+                    phase === "plan_approved")) {
+                return [
+                    {
+                        version: 1,
+                        phase,
+                        ...(typeof p.reason === "string" ? { reason: p.reason } : {}),
+                        ...(typeof p.body === "string" ? { body: p.body } : {}),
+                        afterMessageCount: typeof p.afterMessageCount === "number" ? p.afterMessageCount : 0,
+                    },
+                ];
+            }
+            return [];
+        });
+    }
     /**
      * Ensure every assistant message with tool_use blocks is followed by a tool
      * message containing matching tool_result entries. Inserts synthetic