@qduc/term2 0.6.1 → 0.7.1

package/dist/services/conversation-persistence-types.d.ts

@@ -0,0 +1,46 @@
+export interface SavedMessage {
+    id: string;
+    sender: string;
+    text?: string;
+    [key: string]: unknown;
+}
+export interface SavedAppMode {
+    mentorMode: boolean;
+    liteMode: boolean;
+    planMode: boolean;
+    /** Optional: absent in saves from before orchestrator mode was introduced. Treat undefined as false. */
+    orchestratorMode?: boolean;
+}
+export interface PersistedReasoningItem {
+    type: 'reasoning';
+    text: string;
+    providerMetadata?: Record<string, unknown>;
+    providerItemId?: string;
+    sequence?: number;
+}
+export interface PersistedAssistantTextItem {
+    type: 'assistant_text';
+    text: string;
+    providerMetadata?: Record<string, unknown>;
+    providerItemId?: string;
+}
+export interface PersistedToolCallItem {
+    type: 'tool_call';
+    callId: string;
+    toolName: string;
+    arguments: unknown;
+    providerItem?: Record<string, unknown>;
+}
+export interface PersistedToolResultItem {
+    type: 'tool_result';
+    callId: string;
+    toolName: string;
+    status: 'completed' | 'failed' | 'aborted';
+    output: unknown;
+    providerItem?: Record<string, unknown>;
+}
+export type PersistedAssistantTurnItem = PersistedReasoningItem | PersistedAssistantTextItem | PersistedToolCallItem | PersistedToolResultItem;
+export interface PersistedAssistantTurn {
+    items: PersistedAssistantTurnItem[];
+}
+//# sourceMappingURL=conversation-persistence-types.d.ts.map

package/dist/services/conversation-persistence-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-persistence-types.d.ts","sourceRoot":"","sources":["../../source/services/conversation-persistence-types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,wGAAwG;IACxG,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,gBAAgB,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACxC;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;IAC3C,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACxC;AAED,MAAM,MAAM,0BAA0B,GAClC,sBAAsB,GACtB,0BAA0B,GAC1B,qBAAqB,GACrB,uBAAuB,CAAC;AAE5B,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,0BAA0B,EAAE,CAAC;CACrC"}

package/dist/services/conversation-persistence-types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=conversation-persistence-types.js.map

package/dist/services/conversation-persistence-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-persistence-types.js","sourceRoot":"","sources":["../../source/services/conversation-persistence-types.ts"],"names":[],"mappings":""}

package/dist/services/conversation-persistence.d.ts

@@ -1,55 +1,60 @@
-import { type ConversationHistoryRepairSummary } from './conversation-history-repair.js';
-export interface SavedMessage {
-    id: string;
-    sender: string;
-    text?: string;
-    [key: string]: unknown;
-}
-export interface SavedAppMode {
-    mentorMode: boolean;
-    liteMode: boolean;
-    planMode: boolean;
-    /** Optional: absent in saves from before orchestrator mode was introduced. Treat undefined as false. */
-    orchestratorMode?: boolean;
-}
-export interface SavedConversation {
-    id: string;
-    createdAt: string;
-    updatedAt: string;
-    projectPath?: string;
-    sshHost?: string;
-    appMode?: SavedAppMode;
-    model?: string;
-    provider?: string;
-    reasoningEffort?: string;
-    previousResponseId: string | null;
-    history: unknown[];
-    messages: SavedMessage[];
-    historyRepair?: ConversationHistoryRepairSummary;
-}
+import { type RestoredState } from './conversation-replay.js';
+import type { SavedAppMode } from './conversation-persistence-types.js';
+export type { SavedAppMode, SavedMessage } from './conversation-persistence-types.js';
+export type { RestoredState } from './conversation-replay.js';
 export type LoadConversationForProjectResult = {
     status: 'loaded';
-    conversation: SavedConversation;
+    conversation: RestoredState;
 } | {
     status: 'not_found';
 } | {
     status: 'project_mismatch';
-    conversation: SavedConversation;
+    conversation: RestoredState;
+} | {
+    status: 'locked';
+    lockPath: string;
+    lockInfo: {
+        pid: number;
+        startedAt: string;
+        host: string;
+    } | null;
 };
-/**
- * Expose the conversations directory for testing purposes.
- */
 export declare function getConversationsDirForTest(): string;
 export declare function setConversationsDirForTest(dir: string | null): void;
+declare function getConversationPath(id: string): string;
+declare function getLockPath(id: string): string;
 export declare function generateId(): string;
-export declare function saveConversation(conversation: SavedConversation): string;
-export declare function loadConversation(id: string, expectedProjectPath?: string, expectedSshHost?: string): SavedConversation | null;
+export declare function loadConversation(id: string, expectedProjectPath?: string, expectedSshHost?: string): RestoredState | null;
 export declare function loadConversationForProject(id: string, expectedProjectPath: string, expectedSshHost?: string): LoadConversationForProjectResult;
-export declare function loadLastConversation(expectedProjectPath?: string, expectedSshHost?: string): SavedConversation | null;
+export declare function loadLastConversation(expectedProjectPath?: string, expectedSshHost?: string): RestoredState | null;
+export declare function isConversationLocked(id: string): {
+    pid: number;
+    startedAt: string;
+    host: string;
+} | null;
 export declare function deleteConversation(id: string): boolean;
-export declare function listConversations(): Array<{
+interface ConversationListEntry {
     id: string;
     updatedAt: string;
-}>;
+    projectPath?: string;
+    sshHost?: string;
+    firstUserMessage?: string;
+    appMode?: SavedAppMode;
+    model?: string;
+    provider?: string;
+    messageCount?: number;
+}
+export declare function listConversations(): ConversationListEntry[];
 export declare function getResumeCommand(id: string, sshHost?: string, remoteDir?: string, sshPort?: number): string;
+/**
+ * Fork a conversation: copy <sourceId>.jsonl to <newId>.jsonl and return the new id.
+ * The source is untouched. The new file is ready to be opened by a fresh writer.
+ */
+export declare function forkConversation(sourceId: string, newId: string): boolean;
+export declare function hasConversationContent(id: string): boolean;
+export declare function saveLastConversation(id: string, projectPath?: string, sshHost?: string): void;
+export declare const __testing: {
+    getConversationPath: typeof getConversationPath;
+    getLockPath: typeof getLockPath;
+};
 //# sourceMappingURL=conversation-persistence.d.ts.map

package/dist/services/conversation-persistence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-persistence.d.ts","sourceRoot":"","sources":["../../source/services/conversation-persistence.ts"],"names":[],"mappings":"AAIA,OAAO,EAA6B,KAAK,gCAAgC,EAAE,MAAM,kCAAkC,CAAC;AAMpH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,wGAAwG;IACxG,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,gCAAgC,CAAC;CAClD;AAED,MAAM,MAAM,gCAAgC,GACxC;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,YAAY,EAAE,iBAAiB,CAAA;CAAE,GACrD;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GACvB;IAAE,MAAM,EAAE,kBAAkB,CAAC;IAAC,YAAY,EAAE,iBAAiB,CAAA;CAAE,CAAC;AAMpE;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,MAAM,CAEnD;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAEnE;AAgED,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,iBAAiB,GAAG,MAAM,CA8BxE;AAED,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,MAAM,EACV,mBAAmB,CAAC,EAAE,MAAM,EAC5B,eAAe,CAAC,EAAE,MAAM,GACvB,iBAAiB,GAAG,IAAI,CA+B1B;AAED,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,MAAM,EACV,mBAAmB,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,GACvB,gCAAgC,CASlC;AAED,wBAAgB,oBAAoB,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI,CAyBrH;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAWtD;AAED,wBAAgB,iBAAiB,IAAI,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAsB5E;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAa3G"}
+{"version":3,"file":"conversation-persistence.d.ts","sourceRoot":"","sources":["../../source/services/conversation-persistence.ts"],"names":[],"mappings":"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"}

package/dist/services/conversation-persistence.js

@@ -1,17 +1,14 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import crypto from 'node:crypto';
+import fs from 'fs';
+import path from 'path';
+import crypto from 'crypto';
 import envPaths from 'env-paths';
-import { repairConversationHistory } from './conversation-history-repair.js';
+import { replayEvents } from './conversation-replay.js';
 const paths = envPaths('term2');
 const CONVERSATIONS_DIR = path.join(paths.log, 'conversations');
 let conversationsDirOverride = null;
 function getConversationsDir() {
-    return conversationsDirOverride ?? CONVERSATIONS_DIR;
+    return conversationsDirOverride ?? process.env['TERM2_CONVERSATIONS_DIR'] ?? CONVERSATIONS_DIR;
 }
-/**
- * Expose the conversations directory for testing purposes.
- */
 export function getConversationsDirForTest() {
     return getConversationsDir();
 }
@@ -26,7 +23,10 @@ function ensureConversationsDir() {
     return dir;
 }
 function getConversationPath(id) {
-    return path.join(getConversationsDir(), `${id}.json`);
+    return path.join(getConversationsDir(), `${id}.jsonl`);
+}
+function getLockPath(id) {
+    return path.join(getConversationsDir(), `${id}.lock`);
 }
 function getLastConversationPath() {
     return path.join(getConversationsDir(), 'last.json');
@@ -39,11 +39,9 @@ function normalizeSshHost(host) {
     return host.trim().toLowerCase();
 }
 function conversationMatchesProject(conversation, expectedProjectPath, expectedSshHost) {
-    // If no expectations provided, skip all checks
     if (expectedProjectPath === undefined && expectedSshHost === undefined) {
         return true;
     }
-    // Check project path
     if (expectedProjectPath) {
         if (!conversation.projectPath) {
             return false;
@@ -52,15 +50,12 @@ function conversationMatchesProject(conversation, expectedProjectPath, expectedS
             return false;
         }
     }
-    // Check SSH host: use normalized matching
     if (expectedSshHost) {
         if (!conversation.sshHost) {
             return false;
         }
         return normalizeSshHost(conversation.sshHost) === normalizeSshHost(expectedSshHost);
     }
-    // expectedSshHost is undefined/falsy but expectation exists (projectPath given)
-    // so conversation.sshHost must also be falsy
     if (conversation.sshHost) {
         return false;
     }
@@ -69,31 +64,38 @@ function conversationMatchesProject(conversation, expectedProjectPath, expectedS
 export function generateId() {
     return crypto.randomUUID();
 }
-export function saveConversation(conversation) {
-    ensureConversationsDir();
-    const filePath = getConversationPath(conversation.id);
-    const { historyRepair: _historyRepair, ...persistedConversation } = conversation;
-    // Normalize messages: mark any streaming/running states as terminal
-    const normalizedMessages = conversation.messages.map((msg) => {
-        if (msg.sender === 'bot' && msg.status === 'streaming') {
-            return { ...msg, status: 'finalized' };
+function readEnvelopes(filePath) {
+    const content = fs.readFileSync(filePath, 'utf-8');
+    const lines = content.split('\n');
+    const envelopes = [];
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        try {
+            const envelope = JSON.parse(trimmed);
+            envelopes.push(envelope);
         }
-        if (msg.sender === 'command' && (msg.status === 'pending' || msg.status === 'running')) {
-            return { ...msg, status: 'completed', success: msg.success ?? false };
+        catch {
+            // skip corrupt line
         }
-        return msg;
-    });
-    const data = {
-        ...persistedConversation,
-        history: repairConversationHistory(persistedConversation.history).history,
-        messages: normalizedMessages,
-        updatedAt: new Date().toISOString(),
-    };
-    fs.writeFileSync(filePath, JSON.stringify(data, null, 2), 'utf-8');
-    // Update last conversation pointer
-    const lastPath = getLastConversationPath();
-    fs.writeFileSync(lastPath, JSON.stringify({ id: conversation.id }), 'utf-8');
-    return filePath;
+    }
+    return envelopes;
+}
+function restoredUpdatedAt(filePath, envelopes) {
+    const latestEnvelopeTs = [...envelopes]
+        .reverse()
+        .map((envelope) => envelope.ts)
+        .find((ts) => typeof ts === 'string' && ts.length > 0);
+    if (latestEnvelopeTs) {
+        return latestEnvelopeTs;
+    }
+    try {
+        return fs.statSync(filePath).mtime.toISOString();
+    }
+    catch {
+        return undefined;
+    }
 }
 export function loadConversation(id, expectedProjectPath, expectedSshHost) {
     const filePath = getConversationPath(id);
@@ -101,78 +103,103 @@ export function loadConversation(id, expectedProjectPath, expectedSshHost) {
         if (!fs.existsSync(filePath)) {
             return null;
         }
-        const content = fs.readFileSync(filePath, 'utf-8');
-        const data = JSON.parse(content);
-        if (!conversationMatchesProject(data, expectedProjectPath, expectedSshHost)) {
+        const envelopes = readEnvelopes(filePath);
+        const restored = replayEvents(envelopes);
+        restored.updatedAt = restoredUpdatedAt(filePath, envelopes);
+        if (!restored.id) {
+            restored.id = id;
+        }
+        if (!conversationMatchesProject(restored, expectedProjectPath, expectedSshHost)) {
             return null;
         }
-        const { historyRepair: _historyRepair, ...persistedData } = data;
-        const repair = repairConversationHistory(Array.isArray(persistedData.history) ? persistedData.history : []);
-        return {
-            ...persistedData,
-            history: repair.history,
-            ...(repair.repaired
-                ? {
-                    historyRepair: {
-                        repaired: repair.repaired,
-                        removedItems: repair.removedItems,
-                        repairs: repair.repairs,
-                        statsBefore: repair.statsBefore,
-                        statsAfter: repair.statsAfter,
-                    },
-                }
-                : {}),
-        };
+        return restored;
     }
     catch {
         return null;
     }
 }
 export function loadConversationForProject(id, expectedProjectPath, expectedSshHost) {
-    const conversation = loadConversation(id);
-    if (!conversation) {
+    const filePath = getConversationPath(id);
+    if (!fs.existsSync(filePath)) {
         return { status: 'not_found' };
     }
+    const envelopes = readEnvelopes(filePath);
+    const conversation = replayEvents(envelopes);
+    conversation.updatedAt = restoredUpdatedAt(filePath, envelopes);
+    if (!conversation.id) {
+        conversation.id = id;
+    }
     if (!conversationMatchesProject(conversation, expectedProjectPath, expectedSshHost)) {
         return { status: 'project_mismatch', conversation };
     }
     return { status: 'loaded', conversation };
 }
 export function loadLastConversation(expectedProjectPath, expectedSshHost) {
+    const file = readLastConversationFile();
+    const candidates = file.entries.filter((e) => matchesEntryContext(e, expectedProjectPath, expectedSshHost));
+    const mostRecent = candidates.sort((a, b) => b.updatedAt.localeCompare(a.updatedAt))[0];
+    if (mostRecent) {
+        return loadConversation(mostRecent.id, expectedProjectPath, expectedSshHost);
+    }
+    // Fallback: scan all conversations when no last.json entry matches.
     const hasFilters = !!expectedProjectPath || !!expectedSshHost;
     if (hasFilters) {
         return (listConversations()
             .map(({ id }) => loadConversation(id, expectedProjectPath, expectedSshHost))
             .find((conversation) => conversation !== null) ?? null);
     }
-    const lastPath = getLastConversationPath();
+    return null;
+}
+export function isConversationLocked(id) {
+    const lp = getLockPath(id);
+    if (!fs.existsSync(lp)) {
+        return null;
+    }
     try {
-        if (!fs.existsSync(lastPath)) {
-            return null;
-        }
-        const content = fs.readFileSync(lastPath, 'utf-8');
-        const { id } = JSON.parse(content);
-        if (!id) {
-            return null;
-        }
-        return loadConversation(id);
+        return JSON.parse(fs.readFileSync(lp, 'utf-8'));
     }
     catch {
-        return null;
+        return { pid: -1, startedAt: '', host: '' };
     }
 }
 export function deleteConversation(id) {
     const filePath = getConversationPath(id);
+    const lockFile = getLockPath(id);
+    let removed = false;
     try {
         if (fs.existsSync(filePath)) {
             fs.unlinkSync(filePath);
-            return true;
+            removed = true;
         }
-        return false;
     }
     catch {
-        return false;
+        // ignore
+    }
+    try {
+        if (fs.existsSync(lockFile)) {
+            fs.unlinkSync(lockFile);
+        }
+    }
+    catch {
+        // ignore
+    }
+    // Remove any last.json entries pointing to this id
+    const file = readLastConversationFile();
+    const filtered = file.entries.filter((e) => e.id !== id);
+    if (filtered.length !== file.entries.length) {
+        if (filtered.length === 0) {
+            try {
+                fs.unlinkSync(getLastConversationPath());
+            }
+            catch {
+                // ignore
+            }
+        }
+        else {
+            writeLastConversationFile({ entries: filtered });
+        }
     }
+    return removed;
 }
 export function listConversations() {
     const dir = getConversationsDir();
@@ -180,20 +207,65 @@ export function listConversations() {
         if (!fs.existsSync(dir)) {
             return [];
         }
-        const files = fs.readdirSync(dir).filter((f) => f.endsWith('.json') && f !== 'last.json');
-        return files
-            .map((f) => {
+        const files = fs.readdirSync(dir).filter((f) => f.endsWith('.jsonl'));
+        const entries = [];
+        for (const f of files) {
+            const fp = path.join(dir, f);
             try {
-                const content = fs.readFileSync(path.join(dir, f), 'utf-8');
-                const data = JSON.parse(content);
-                return { id: data.id, updatedAt: data.updatedAt };
+                const stat = fs.statSync(fp);
+                const content = fs.readFileSync(fp, 'utf-8');
+                const lines = content.split('\n');
+                let initEnvelope = null;
+                let firstUserMessage;
+                let messageCount = 0;
+                for (const line of lines) {
+                    const trimmed = line.trim();
+                    if (!trimmed)
+                        continue;
+                    try {
+                        const envelope = JSON.parse(trimmed);
+                        if (!initEnvelope && envelope?.event?.type === 'session_init') {
+                            initEnvelope = envelope;
+                        }
+                        if (envelope?.event?.type === 'user_message') {
+                            messageCount++;
+                            if (!firstUserMessage) {
+                                firstUserMessage = envelope.event.message.text;
+                            }
+                        }
+                        else if (envelope?.event?.type === 'assistant_turn') {
+                            messageCount++;
+                        }
+                        else if (envelope?.event?.type === 'undo') {
+                            const undone = envelope.event.removedUserTurns || 0;
+                            messageCount = Math.max(0, messageCount - undone * 2);
+                        }
+                    }
+                    catch {
+                        // skip corrupt line
+                    }
+                }
+                if (!initEnvelope || initEnvelope.event.type !== 'session_init') {
+                    continue;
+                }
+                const init = initEnvelope.event;
+                entries.push({
+                    id: init.id,
+                    updatedAt: stat.mtime.toISOString(),
+                    ...(init.projectPath ? { projectPath: init.projectPath } : {}),
+                    ...(init.sshHost ? { sshHost: init.sshHost } : {}),
+                    firstUserMessage,
+                    appMode: init.appMode,
+                    model: init.model,
+                    provider: init.provider,
+                    messageCount,
+                });
             }
             catch {
-                return null;
+                // skip
             }
-        })
-            .filter((item) => item !== null)
-            .sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
+        }
+        return entries.sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
     }
     catch {
         return [];
@@ -213,4 +285,122 @@ export function getResumeCommand(id, sshHost, remoteDir, sshPort) {
     parts.push(`--resume ${id}`);
     return parts.join(' ');
 }
+/**
+ * Fork a conversation: copy <sourceId>.jsonl to <newId>.jsonl and return the new id.
+ * The source is untouched. The new file is ready to be opened by a fresh writer.
+ */
+export function forkConversation(sourceId, newId) {
+    const dir = ensureConversationsDir();
+    const srcPath = path.join(dir, `${sourceId}.jsonl`);
+    const dstPath = path.join(dir, `${newId}.jsonl`);
+    if (!fs.existsSync(srcPath)) {
+        return false;
+    }
+    fs.copyFileSync(srcPath, dstPath);
+    return true;
+}
+const CONTENT_EVENT_TYPES = new Set(['user_message', 'assistant_turn', 'command_message', 'subagent_started', 'error']);
+export function hasConversationContent(id) {
+    const filePath = getConversationPath(id);
+    if (!fs.existsSync(filePath)) {
+        return false;
+    }
+    const content = fs.readFileSync(filePath, 'utf-8');
+    for (const line of content.split('\n')) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        try {
+            const envelope = JSON.parse(trimmed);
+            if (envelope.event && CONTENT_EVENT_TYPES.has(envelope.event.type)) {
+                return true;
+            }
+        }
+        catch {
+            // skip corrupt line
+        }
+    }
+    return false;
+}
+function readLastConversationFile() {
+    const lp = getLastConversationPath();
+    try {
+        if (!fs.existsSync(lp)) {
+            return { entries: [] };
+        }
+        const content = fs.readFileSync(lp, 'utf-8');
+        const parsed = JSON.parse(content);
+        if (parsed && typeof parsed === 'object') {
+            if ('entries' in parsed && Array.isArray(parsed.entries)) {
+                return parsed;
+            }
+            // Old format: { id, updatedAt }
+            if ('id' in parsed && typeof parsed.id === 'string') {
+                const old = parsed;
+                return {
+                    entries: [{ id: old.id, updatedAt: old.updatedAt ?? new Date().toISOString() }],
+                };
+            }
+        }
+    }
+    catch {
+        // ignore
+    }
+    return { entries: [] };
+}
+function writeLastConversationFile(file) {
+    const lp = getLastConversationPath();
+    const tmp = `${lp}.tmp`;
+    try {
+        fs.writeFileSync(tmp, JSON.stringify(file, null, 2), 'utf-8');
+        fs.renameSync(tmp, lp);
+    }
+    catch {
+        // best-effort
+    }
+}
+function matchesEntryContext(entry, expectedProjectPath, expectedSshHost) {
+    if (expectedProjectPath !== undefined) {
+        if (!entry.projectPath) {
+            return false;
+        }
+        if (normalizeProjectPath(entry.projectPath) !== normalizeProjectPath(expectedProjectPath)) {
+            return false;
+        }
+    }
+    else if (entry.projectPath) {
+        return false;
+    }
+    if (expectedSshHost !== undefined) {
+        if (!entry.sshHost) {
+            return false;
+        }
+        if (normalizeSshHost(entry.sshHost) !== normalizeSshHost(expectedSshHost)) {
+            return false;
+        }
+    }
+    else if (entry.sshHost) {
+        return false;
+    }
+    return true;
+}
+export function saveLastConversation(id, projectPath, sshHost) {
+    if (!hasConversationContent(id)) {
+        return;
+    }
+    const file = readLastConversationFile();
+    // Remove any existing entry with the same id to avoid duplicates when context changes.
+    file.entries = file.entries.filter((e) => e.id !== id);
+    file.entries.push({
+        id,
+        updatedAt: new Date().toISOString(),
+        ...(projectPath !== undefined ? { projectPath } : {}),
+        ...(sshHost !== undefined ? { sshHost } : {}),
+    });
+    writeLastConversationFile(file);
+}
+export const __testing = {
+    getConversationPath,
+    getLockPath,
+};
 //# sourceMappingURL=conversation-persistence.js.map