@getpaseo/server 0.1.80 → 0.1.82

package/dist/server/server/agent/providers/claude/agent.js

@@ -12,6 +12,7 @@ import { formatDiagnosticStatus, formatProviderDiagnostic, formatProviderDiagnos
 import { appendOrReplaceGrowingAssistantMessage, runProviderTurn } from "../provider-runner.js";
 import { renderPromptAttachmentAsText } from "../../prompt-attachments.js";
 import { claudeQuery } from "./query.js";
+import { realClaudeRewindSdk, revertClaudeConversation, revertClaudeFiles } from "./rewind.js";
 import { normalizeProviderReplayTimestamp } from "../../provider-history-timestamps.js";
 import { getAgentStreamEventTurnId, } from "../../agent-sdk-types.js";
 import { createProviderEnv, createProviderEnvSpec, } from "../../provider-launch-config.js";
@@ -89,6 +90,9 @@ const CLAUDE_CAPABILITIES = {
     supportsMcpServers: true,
     supportsReasoningStream: true,
     supportsToolInvocations: true,
+    supportsRewindConversation: true,
+    supportsRewindFiles: true,
+    supportsRewindBoth: true,
 };
 const DEFAULT_MODES = [
     {
@@ -742,7 +746,7 @@ class TimelineAssembler {
             nextAssistantText !== INTERRUPT_TOOL_USE_PLACEHOLDER &&
             !isClaudeTranscriptNoiseText(nextAssistantText)) {
             state.emittedAssistantLength = state.assistantText.length;
-            items.push({ type: "assistant_message", text: nextAssistantText });
+            items.push({ type: "assistant_message", text: nextAssistantText, messageId: state.id });
         }
         const nextReasoningText = state.reasoningText.slice(state.emittedReasoningLength);
         if (nextReasoningText.length > 0) {
@@ -834,7 +838,19 @@ function isSyntheticUserEntry(entry) {
     if (!candidate) {
         return false;
     }
-    return candidate.isSynthetic === true || candidate.isMeta === true;
+    return (candidate.isSynthetic === true || candidate.isMeta === true || Boolean(candidate.toolUseResult));
+}
+function isToolResultUserEntry(entry) {
+    const candidate = toObjectRecord(entry);
+    if (!candidate) {
+        return false;
+    }
+    const message = toObjectRecord(candidate.message);
+    const content = message?.content;
+    return (Array.isArray(content) && content.some((block) => toObjectRecord(block)?.type === "tool_result"));
+}
+function isSyntheticHistoryUserEntry(entry) {
+    return isSyntheticUserEntry(entry) && !isToolResultUserEntry(entry);
 }
 function firstTrimmedString(sources) {
     for (const source of sources) {
@@ -845,13 +861,23 @@ function firstTrimmedString(sources) {
     }
     return null;
 }
+function readTranscriptUuid(message) {
+    const root = toObjectRecord(message) ?? {};
+    const messageType = readTrimmedString(root.type);
+    if (messageType !== "user" && messageType !== "assistant") {
+        return null;
+    }
+    return firstTrimmedString([root.uuid]);
+}
 export function readEventIdentifiers(message) {
     const root = toObjectRecord(message) ?? {};
     const messageType = readTrimmedString(root.type);
     const streamEvent = toObjectRecord(root.event);
     const streamEventMessage = toObjectRecord(streamEvent?.message);
     const messageContainer = toObjectRecord(root.message);
-    const messageIdFromUuid = messageType === "user" ? root.uuid : undefined;
+    const messageIdFromUuid = messageType === "user" || messageType === "assistant" || messageType === "system"
+        ? root.uuid
+        : undefined;
     return {
         taskId: firstTrimmedString([
             root.task_id,
@@ -1165,10 +1191,12 @@ class ClaudeAgentSession {
         this.queryPumpPromise = null;
         this.queryRestartNeeded = false;
         this.pendingInterruptAbort = false;
-        this.lastForegroundPromptText = null;
         this.foregroundHasVisibleActivity = false;
         this.activeTurnHasAssistantText = false;
         this.userMessageIds = [];
+        this.emittedUserMessageIds = new Set();
+        this.rewindTurnAnchors = [];
+        this.pendingFreshSessionId = null;
         this.recentStderr = "";
         this.closed = false;
         this.handlePermissionRequest = async (toolName, input, options) => {
@@ -1335,7 +1363,8 @@ class ClaudeAgentSession {
             this.completeAutonomousTurn();
         }
         const sdkMessage = this.toSdkUserMessage(prompt);
-        this.lastForegroundPromptText = this.extractPromptText(prompt);
+        const sdkUserMessageId = typeof sdkMessage.uuid === "string" && sdkMessage.uuid.length > 0 ? sdkMessage.uuid : null;
+        this.rememberRewindUserAnchor(sdkUserMessageId);
         const turnId = this.createTurnId("foreground");
         this.activeForegroundTurnId = turnId;
         this.foregroundHasVisibleActivity = false;
@@ -1370,6 +1399,11 @@ class ClaudeAgentSession {
             }
             this.startQueryPump();
             this.input.push(sdkMessage);
+            setTimeout(() => {
+                if (this.activeForegroundTurnId === turnId) {
+                    this.emitSubmittedUserMessage(sdkMessage, turnId);
+                }
+            }, 0);
         }
         catch (error) {
             this.finishForegroundTurn(this.buildTurnFailedEvent(error instanceof Error ? error.message : "Claude stream failed"));
@@ -1607,6 +1641,33 @@ class ClaudeAgentSession {
         }
         return Array.from(commandMap.values()).sort((a, b) => a.name.localeCompare(b.name));
     }
+    async revertConversation(input) {
+        const target = this.resolveConversationRewindTarget(input.messageId);
+        if (target.kind === "fresh-session") {
+            this.startFreshConversationSession();
+            return;
+        }
+        await revertClaudeConversation({
+            sdk: realClaudeRewindSdk,
+            sessionId: this.claudeSessionId,
+            messageId: target.messageId,
+            resolveMessageId: (messageId) => this.resolveClaudeMessageId(messageId),
+            setSessionId: (sessionId) => {
+                this.rebindConversationSession(sessionId);
+            },
+        });
+    }
+    async revertFiles(input) {
+        const messageId = await this.resolveClaudeMessageId(input.messageId);
+        await revertClaudeFiles({
+            query: await this.ensureQuery(),
+            messageId,
+        });
+    }
+    async revertBoth(input) {
+        await this.revertFiles(input);
+        await this.revertConversation(input);
+    }
     resolveSlashCommandInvocation(prompt) {
         if (typeof prompt !== "string") {
             return null;
@@ -1722,10 +1783,6 @@ class ClaudeAgentSession {
                 candidates.push(value);
             }
         };
-        const historyIds = this.readUserMessageIdsFromHistoryFile();
-        for (let idx = historyIds.length - 1; idx >= 0; idx -= 1) {
-            pushUnique(historyIds[idx]);
-        }
         for (let idx = this.persistedHistory.length - 1; idx >= 0; idx -= 1) {
             const entry = this.persistedHistory[idx];
             if (entry?.item.type === "user_message") {
@@ -1737,37 +1794,47 @@ class ClaudeAgentSession {
         }
         return candidates;
     }
-    readUserMessageIdsFromHistoryFile() {
-        if (!this.claudeSessionId) {
-            return [];
-        }
-        const historyPath = this.resolveHistoryPath(this.claudeSessionId);
-        if (!historyPath || !fs.existsSync(historyPath)) {
-            return [];
-        }
-        try {
-            const ids = [];
-            const content = fs.readFileSync(historyPath, "utf8");
-            for (const line of content.split(/\n+/)) {
-                const trimmed = line.trim();
-                if (!trimmed)
-                    continue;
-                try {
-                    const entry = JSON.parse(trimmed);
-                    if (entry?.type === "user" && typeof entry.uuid === "string") {
-                        ids.push(entry.uuid);
-                    }
-                }
-                catch {
-                    // ignore malformed lines
-                }
-            }
-            return ids;
-        }
-        catch {
-            return [];
+    rebindConversationSession(sessionId) {
+        const oldSessionId = this.claudeSessionId;
+        this.claudeSessionId = sessionId;
+        this.pendingFreshSessionId = null;
+        this.persistence = null;
+        this.cachedRuntimeInfo = null;
+        this.queryRestartNeeded = true;
+        this.persistedHistory = [];
+        this.historyPending = false;
+        this.userMessageIds = [];
+        this.emittedUserMessageIds.clear();
+        this.rewindTurnAnchors.length = 0;
+        this.loadPersistedHistory(sessionId);
+        if (oldSessionId && oldSessionId !== sessionId) {
+            this.dispatchEvents([
+                {
+                    type: "timeline",
+                    provider: "claude",
+                    item: this.createClaudeSessionChangedNotice(oldSessionId, sessionId),
+                },
+                {
+                    type: "thread_started",
+                    provider: "claude",
+                    sessionId,
+                },
+            ]);
         }
     }
+    startFreshConversationSession() {
+        const sessionId = randomUUID();
+        this.claudeSessionId = sessionId;
+        this.pendingFreshSessionId = sessionId;
+        this.persistence = null;
+        this.cachedRuntimeInfo = null;
+        this.queryRestartNeeded = true;
+        this.persistedHistory = [];
+        this.historyPending = false;
+        this.userMessageIds = [];
+        this.emittedUserMessageIds.clear();
+        this.rewindTurnAnchors.length = 0;
+    }
     rememberUserMessageId(messageId) {
         if (typeof messageId !== "string" || messageId.length === 0) {
             return;
@@ -1778,6 +1845,78 @@ class ClaudeAgentSession {
         }
         this.userMessageIds.push(messageId);
     }
+    rememberEmittedUserMessageId(messageId) {
+        if (typeof messageId !== "string" || messageId.length === 0) {
+            return;
+        }
+        this.emittedUserMessageIds.add(messageId);
+    }
+    rememberRewindUserAnchor(userMessageId) {
+        if (typeof userMessageId !== "string" || userMessageId.length === 0) {
+            return;
+        }
+        if (this.rewindTurnAnchors.some((anchor) => anchor.userMessageId === userMessageId)) {
+            return;
+        }
+        this.rewindTurnAnchors.push({
+            userMessageId,
+            assistantMessageId: null,
+        });
+    }
+    rememberRewindAssistantAnchor(assistantMessageId) {
+        if (typeof assistantMessageId !== "string" || assistantMessageId.length === 0) {
+            return;
+        }
+        for (let index = this.rewindTurnAnchors.length - 1; index >= 0; index -= 1) {
+            const anchor = this.rewindTurnAnchors[index];
+            if (!anchor) {
+                continue;
+            }
+            anchor.assistantMessageId = assistantMessageId;
+            return;
+        }
+    }
+    rememberTranscriptProgress(message, messageId) {
+        if (!messageId) {
+            return;
+        }
+        if (message.type === "user" &&
+            !isSyntheticUserEntry(message) &&
+            !isToolResultUserEntry(message)) {
+            this.rememberRewindUserAnchor(messageId);
+            return;
+        }
+        if (message.type === "assistant") {
+            this.rememberRewindAssistantAnchor(messageId);
+            return;
+        }
+        if (message.type === "stream_event") {
+            const event = toObjectRecord(message.event) ?? {};
+            const eventType = readTrimmedString(event.type);
+            if (eventType === "message_start") {
+                this.rememberRewindAssistantAnchor(messageId);
+            }
+            return;
+        }
+    }
+    resolveClaudeMessageId(messageId) {
+        return messageId;
+    }
+    resolveConversationRewindTarget(messageId) {
+        const targetUserMessageId = this.resolveClaudeMessageId(messageId);
+        const index = this.rewindTurnAnchors.findIndex((anchor) => anchor.userMessageId === targetUserMessageId);
+        if (index < 0) {
+            throw new Error(`Claude rewind target ${messageId} is not in the tracked conversation`);
+        }
+        if (index === 0) {
+            return { kind: "fresh-session" };
+        }
+        const previousTurn = this.rewindTurnAnchors[index - 1];
+        if (!previousTurn?.assistantMessageId) {
+            throw new Error(`Claude rewind cannot preserve turn ${index} because its assistant response id was not observed`);
+        }
+        return { kind: "fork", messageId: previousTurn.assistantMessageId };
+    }
     async ensureQuery() {
         if (this.query && !this.queryRestartNeeded) {
             return this.query;
@@ -1893,6 +2032,13 @@ class ClaudeAgentSession {
                 .toLowerCase()
                 .includes("\\.local\\bin"),
         }, "Resolved Claude executable");
+        const sessionBinding = {};
+        if (this.pendingFreshSessionId) {
+            sessionBinding.sessionId = this.pendingFreshSessionId;
+        }
+        else if (this.claudeSessionId) {
+            sessionBinding.resume = this.claudeSessionId;
+        }
         const base = {
             cwd: this.config.cwd,
             includePartialMessages: true,
@@ -1920,7 +2066,7 @@ class ClaudeAgentSession {
             enableFileCheckpointing: true,
             // If we have a session ID from a previous query (e.g., after interrupt),
             // resume that session to continue the conversation history.
-            ...(this.claudeSessionId ? { resume: this.claudeSessionId } : {}),
+            ...sessionBinding,
             ...(thinking ? { thinking } : {}),
             ...(effort ? { effort } : {}),
             ...extraClaudeOptions,
@@ -1934,7 +2080,7 @@ class ClaudeAgentSession {
             base.model = this.config.model;
         }
         this.lastOptionsModel = base.model ?? null;
-        if (this.claudeSessionId) {
+        if (this.claudeSessionId && !this.pendingFreshSessionId) {
             base.resume = this.claudeSessionId;
         }
         if (this.runtimeSettings?.disallowedTools?.length) {
@@ -2066,15 +2212,6 @@ class ClaudeAgentSession {
             event.type === "turn_failed" ||
             event.type === "turn_canceled");
     }
-    extractPromptText(prompt) {
-        if (typeof prompt === "string") {
-            return prompt;
-        }
-        const textParts = prompt
-            .filter((block) => block.type === "text")
-            .map((block) => block.text);
-        return textParts.length > 0 ? textParts.join("\n") : null;
-    }
     async executeRewindTurn(_turnId, invocation) {
         this.notifySubscribers({ type: "turn_started", provider: "claude" });
         try {
@@ -2128,7 +2265,6 @@ class ClaudeAgentSession {
         }
         this.notifySubscribers(event);
         this.activeForegroundTurnId = null;
-        this.lastForegroundPromptText = null;
         this.cancelCurrentTurn = null;
         this.activeTurnHasAssistantText = false;
         this.syncTurnState("foreground turn terminal");
@@ -2142,7 +2278,6 @@ class ClaudeAgentSession {
         if (terminalSeen) {
             if (this.activeForegroundTurnId) {
                 this.activeForegroundTurnId = null;
-                this.lastForegroundPromptText = null;
                 this.cancelCurrentTurn = null;
                 this.activeTurnHasAssistantText = false;
                 this.syncTurnState("foreground turn terminal");
@@ -2285,15 +2420,6 @@ class ClaudeAgentSession {
             }
         }
     }
-    isEchoedForegroundUserMessage(event) {
-        if (event.type !== "timeline" ||
-            event.item.type !== "user_message" ||
-            !this.activeForegroundTurnId ||
-            !this.lastForegroundPromptText) {
-            return false;
-        }
-        return event.item.text.trim() === this.lastForegroundPromptText.trim();
-    }
     shouldSuppressStaleResult(message) {
         // Suppress stale results from interrupted requests. The cancel path already
         // emitted the terminal event; this result is leftover from the killed API
@@ -2330,6 +2456,7 @@ class ClaudeAgentSession {
         }
         const turnId = this.activeForegroundTurnId ?? this.autonomousTurn?.id ?? null;
         const identifiers = readEventIdentifiers(message);
+        this.rememberTranscriptProgress(message, readTranscriptUuid(message));
         this.logger.trace({
             agentId: this.agentId,
             provider: "claude",
@@ -2354,9 +2481,7 @@ class ClaudeAgentSession {
             item,
             provider: "claude",
         }));
-        // User message dedup: suppress echoed user messages that match the foreground prompt
-        const filteredMessageEvents = messageEvents.filter((event) => !this.isEchoedForegroundUserMessage(event));
-        const events = [...filteredMessageEvents, ...assistantTimelineEvents];
+        const events = [...messageEvents, ...assistantTimelineEvents];
         if (events.length === 0) {
             return;
         }
@@ -2431,20 +2556,22 @@ class ClaudeAgentSession {
             return this.sidechainTracker.handleMessage(message, parentToolUseId);
         }
         const events = [];
-        const sessionCapture = this.captureSessionIdFromMessage(message);
-        if (sessionCapture.notice) {
-            events.push({
-                type: "timeline",
-                provider: "claude",
-                item: sessionCapture.notice,
-            });
-        }
-        if (sessionCapture.threadStartedSessionId) {
-            events.push({
-                type: "thread_started",
-                provider: "claude",
-                sessionId: sessionCapture.threadStartedSessionId,
-            });
+        if (message.type !== "system") {
+            const sessionCapture = this.captureSessionIdFromMessage(message);
+            if (sessionCapture.notice) {
+                events.push({
+                    type: "timeline",
+                    provider: "claude",
+                    item: sessionCapture.notice,
+                });
+            }
+            if (sessionCapture.threadStartedSessionId) {
+                events.push({
+                    type: "thread_started",
+                    provider: "claude",
+                    sessionId: sessionCapture.threadStartedSessionId,
+                });
+            }
         }
         switch (message.type) {
             case "system":
@@ -2474,6 +2601,22 @@ class ClaudeAgentSession {
         }
         return events;
     }
+    emitSubmittedUserMessage(message, turnId) {
+        const events = [];
+        this.appendUserMessageEvents(message, events);
+        if (events.length === 0) {
+            return;
+        }
+        this.foregroundHasVisibleActivity = true;
+        for (const event of events) {
+            if (event.type === "timeline") {
+                this.notifySubscribers({ ...event, turnId });
+            }
+            else {
+                this.notifySubscribers(event);
+            }
+        }
+    }
     appendSystemMessageEvents(message, events) {
         if (message.subtype === "init") {
             const sessionUpdate = this.handleSystemMessage(message);
@@ -2565,7 +2708,11 @@ class ClaudeAgentSession {
             return;
         }
         const messageId = typeof message.uuid === "string" && message.uuid.length > 0 ? message.uuid : undefined;
+        if (messageId && this.emittedUserMessageIds.has(messageId)) {
+            return;
+        }
         this.rememberUserMessageId(messageId);
+        this.rememberEmittedUserMessageId(messageId);
         const content = message.message?.content;
         const taskNotificationItem = mapTaskNotificationUserContentToToolCall({
             content,
@@ -2673,10 +2820,12 @@ class ClaudeAgentSession {
         }
         if (this.claudeSessionId === null) {
             this.claudeSessionId = sessionId;
+            this.pendingFreshSessionId = null;
             this.persistence = null;
             return { threadStartedSessionId: sessionId, notice: null };
         }
         if (this.claudeSessionId === sessionId) {
+            this.pendingFreshSessionId = null;
             return { threadStartedSessionId: null, notice: null };
         }
         const oldSessionId = this.claudeSessionId;
@@ -2685,6 +2834,7 @@ class ClaudeAgentSession {
         // not be failed just because the underlying subprocess cycled.
         this.logger.warn({ existingSessionId: this.claudeSessionId, newSessionId: sessionId }, "Claude session ID changed in message; accepting new session");
         this.claudeSessionId = sessionId;
+        this.pendingFreshSessionId = null;
         this.persistence = null;
         return {
             threadStartedSessionId: sessionId,
@@ -2709,10 +2859,12 @@ class ClaudeAgentSession {
         let notice = null;
         if (existingSessionId === null) {
             this.claudeSessionId = newSessionId;
+            this.pendingFreshSessionId = null;
             threadStartedSessionId = newSessionId;
             this.logger.debug({ sessionId: newSessionId }, "Claude session ID set for the first time");
         }
         else if (existingSessionId === newSessionId) {
+            this.pendingFreshSessionId = null;
             this.logger.debug({ sessionId: newSessionId }, "Claude session ID unchanged (same value)");
         }
         else {
@@ -2720,6 +2872,7 @@ class ClaudeAgentSession {
             // with a new session mid-turn). Accept the new ID and continue.
             this.logger.warn({ existingSessionId, newSessionId }, "Claude session ID changed in init message; accepting new session");
             this.claudeSessionId = newSessionId;
+            this.pendingFreshSessionId = null;
             threadStartedSessionId = newSessionId;
             notice = this.createClaudeSessionChangedNotice(existingSessionId, newSessionId);
         }
@@ -2960,11 +3113,19 @@ class ClaudeAgentSession {
         if (entry.isSidechain) {
             return;
         }
-        if (entry.type === "user" && typeof entry.uuid === "string") {
-            this.rememberUserMessageId(entry.uuid);
-        }
         const historyTimestamp = normalizeProviderReplayTimestamp(entry.timestamp);
         const items = this.convertHistoryEntry(entry);
+        const isVisibleUserEntry = entry.type === "user" &&
+            typeof entry.uuid === "string" &&
+            !isSyntheticHistoryUserEntry(entry) &&
+            !isToolResultUserEntry(entry);
+        if (isVisibleUserEntry && typeof entry.uuid === "string") {
+            this.rememberUserMessageId(entry.uuid);
+            this.rememberRewindUserAnchor(entry.uuid);
+        }
+        if (entry.type === "assistant" && typeof entry.uuid === "string") {
+            this.rememberRewindAssistantAnchor(entry.uuid);
+        }
         if (items.length > 0) {
             timeline.push(...items.map((item) => ({
                 item,
@@ -2976,10 +3137,26 @@ class ClaudeAgentSession {
         const cwd = this.config.cwd;
         if (!cwd)
             return null;
-        const sanitized = sanitizeClaudeProjectPath(cwd);
         const configDir = process.env.CLAUDE_CONFIG_DIR ?? path.join(os.homedir(), ".claude");
-        const dir = path.join(configDir, "projects", sanitized);
-        return path.join(dir, `${sessionId}.jsonl`);
+        const candidates = [cwd];
+        try {
+            const realCwd = fs.realpathSync(cwd);
+            if (realCwd !== cwd) {
+                candidates.push(realCwd);
+            }
+        }
+        catch {
+            // Fall back to the configured cwd when the path has already disappeared.
+        }
+        for (const candidate of candidates) {
+            const sanitized = sanitizeClaudeProjectPath(candidate);
+            const historyPath = path.join(configDir, "projects", sanitized, `${sessionId}.jsonl`);
+            if (fs.existsSync(historyPath)) {
+                return historyPath;
+            }
+        }
+        const sanitized = sanitizeClaudeProjectPath(cwd);
+        return path.join(configDir, "projects", sanitized, `${sessionId}.jsonl`);
     }
     convertHistoryEntry(entry) {
         return convertClaudeHistoryEntry(entry, (content) => this.mapBlocksToTimeline(content));
@@ -3528,6 +3705,19 @@ function normalizeHistoryBlocks(content) {
     }
     return null;
 }
+function mapAssistantHistoryBlocksWithMessageId(entry, content, mapBlocks) {
+    const items = mapBlocks(content);
+    const assistantMessageId = typeof entry.uuid === "string" && entry.uuid.length > 0 ? entry.uuid : null;
+    if (!assistantMessageId) {
+        return items;
+    }
+    for (const item of items) {
+        if (item.type === "assistant_message" && !item.messageId) {
+            item.messageId = assistantMessageId;
+        }
+    }
+    return items;
+}
 function convertClaudeHistoryEntryPreamble(entry) {
     if (entry.type === "system" && entry.subtype === "compact_boundary") {
         const compactMetadata = readCompactionMetadata(entry);
@@ -3549,7 +3739,7 @@ function convertClaudeHistoryEntryPreamble(entry) {
     if (entry.isCompactSummary) {
         return { shortCircuit: [] };
     }
-    if (entry.type === "user" && isSyntheticUserEntry(entry)) {
+    if (entry.type === "user" && isSyntheticHistoryUserEntry(entry)) {
         return { shortCircuit: [] };
     }
     const message = entry?.message;
@@ -3604,7 +3794,7 @@ export function convertClaudeHistoryEntry(entry, mapBlocks) {
         return mapped;
     }
     if (entry.type === "assistant" && contentValue) {
-        return mapBlocks(contentValue);
+        return mapAssistantHistoryBlocksWithMessageId(entry, contentValue, mapBlocks);
     }
     return timeline;
 }