@superblocksteam/vite-plugin-file-sync 2.0.159-next.0 → 2.0.160-next.0

package/dist/ai-service/chat/chat-session-store.js

@@ -32,7 +32,7 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-import { EVICTION_PROTECTED_MESSAGE_TYPES, EXCLUDED_MESSAGE_TYPES, parsePersistedChatMessage, } from "@superblocksteam/library-shared/types";
+import { EXCLUDED_MESSAGE_TYPES, TEXT_ATTACHMENT_MIME_TYPES, } from "@superblocksteam/library-shared/types";
 import { CHAT_PAYLOAD_PROMPT_ID_KEY, } from "@superblocksteam/shared";
 import { getErrorMeta } from "../../util/logger.js";
 import llmobs from "../llmobs/index.js";
@@ -41,7 +41,7 @@ import { recordChatGetMessages } from "./chat-session-store-metrics.js";
 import { getLastUserMessage } from "./extract-history.js";
 import { TranscriptBudget, } from "./transcript-budget.js";
 import { ensureTranscriptInstruments, recordTranscriptEviction, recordTranscriptServerLoad, registerTranscriptResidentBytesSource, } from "./transcript-metrics.js";
-import { sanitizeAiProviderResponse, sanitizeToolOutput } from "./utils.js";
+import { inferTextAttachmentType, sanitizeAiProviderResponse, sanitizeToolOutput, } from "./utils.js";
 export function isAiChatMessage(item) {
     return "role" in item && "content" in item;
 }
@@ -68,15 +68,24 @@ const DEFAULT_MESSAGE_LIMIT = 3000;
  */
 const EVICTION_WARN_THROTTLE_MS = 30_000;
 /**
- * Chat item types that are never evicted from the resident transcript. The list
- * itself is EVICTION_PROTECTED_MESSAGE_TYPES in library-shared, which carries
- * the rationale; it lives there because the editor's pod-reconcile merge has to
- * exclude these types when it infers this pod's eviction frontier from a
- * payload. Derived into a Set here because isEvictableChatItem is on the
- * per-item path of every enforce() pass. Summaries are protected separately via
- * isAiChatSummary.
+ * Chat item types that are never evicted from the resident transcript.
+ * They are byte-tiny but semantically load-bearing as presence sentinels:
+ * commit markers feed getLatestCommitId (checkpoint restore), draft
+ * accept/reject feed determineSummaryOutcome, and aws_infra_demo gates the
+ * one-time demo card off "has this type ever appeared in history". Eviction
+ * is oldest-first and the demo sentinel is emitted on the first prompt, so
+ * without protection it is the first item dropped in exactly the long
+ * sessions this budget targets, which re-fires the demo card mid-session.
+ * Summaries are protected separately via isAiChatSummary.
  */
-const EVICTION_PROTECTED_TYPES = new Set(EVICTION_PROTECTED_MESSAGE_TYPES.filter((type) => type !== undefined));
+const EVICTION_PROTECTED_TYPES = new Set([
+    "aws_infra_demo",
+    "commitRestored",
+    "commitRestoring",
+    "draftAccepted",
+    "draftCommitted",
+    "draftRejected",
+]);
 function isEvictableChatItem(item) {
     if (isAiChatSummary(item)) {
         return false;
@@ -147,16 +156,594 @@ let ChatSessionStore = (() => {
             // TODO(ai): consider replacing this with a queue-based approach
             this.inFlightLoadFromServer = Promise.resolve();
         }
-        validateChatMessageV1(payload, fallbackTimestamp) {
-            // Validation lives in library-shared so the editor's durable reader of the
-            // same rows accepts and normalizes exactly what this transcript does.
-            return parsePersistedChatMessage(payload, {
-                fallbackTimestamp,
-                onInvalid: (detail) => this.logger.warn(`[ai-service] ${detail}`),
-                onError: (error) => this.logger.error("[ai-service] Failed to validate message payload", getErrorMeta(error)),
-            });
+        /***
+         * Validates and sanitizes the attachments array
+         * @param attachments - The attachments array to validate
+         * @returns A tuple containing:
+         *   - a boolean indicating if the attachments are valid
+         *   - the sanitized attachments array
+         */
+        validateAttachments(attachments) {
+            if (!attachments) {
+                return [true, undefined];
+            }
+            if (typeof attachments !== "object" || !Array.isArray(attachments)) {
+                return [false, undefined];
+            }
+            const validAttachments = attachments
+                .map((attachment) => {
+                if (typeof attachment !== "object" || !("type" in attachment)) {
+                    return undefined;
+                }
+                // Validate image attachment
+                if (attachment.type === "image") {
+                    if (typeof attachment.image !== "string") {
+                        return undefined;
+                    }
+                    return {
+                        type: attachment.type,
+                        image: attachment.image,
+                        fileName: typeof attachment.fileName === "string"
+                            ? attachment.fileName
+                            : undefined,
+                    };
+                }
+                // Validate PDF attachment
+                if (attachment.type === "pdf") {
+                    if (typeof attachment.data !== "string") {
+                        return undefined;
+                    }
+                    return {
+                        type: attachment.type,
+                        data: attachment.data,
+                        fileName: typeof attachment.fileName === "string"
+                            ? attachment.fileName
+                            : undefined,
+                        size: attachment.size,
+                    };
+                }
+                // Validate archive attachment (zip, tgz, gz)
+                if (attachment.type === "archive") {
+                    if (typeof attachment.data !== "string") {
+                        return undefined;
+                    }
+                    return {
+                        type: attachment.type,
+                        data: attachment.data,
+                        fileName: typeof attachment.fileName === "string"
+                            ? attachment.fileName
+                            : undefined,
+                        size: attachment.size,
+                    };
+                }
+                const normalizedTextAttachmentType = typeof attachment.content === "string"
+                    ? inferTextAttachmentType({
+                        attachmentType: attachment.type,
+                        mimeType: attachment.mimeType,
+                        fileName: typeof attachment.fileName === "string"
+                            ? attachment.fileName
+                            : "",
+                    })
+                    : null;
+                // Validate text attachments and normalize any text-like subtype to the
+                // stable server-side text attachment shape.
+                if (normalizedTextAttachmentType) {
+                    if (typeof attachment.content !== "string") {
+                        return undefined;
+                    }
+                    return {
+                        type: normalizedTextAttachmentType,
+                        content: attachment.content,
+                        fileName: typeof attachment.fileName === "string"
+                            ? attachment.fileName
+                            : undefined,
+                        mimeType: typeof attachment.mimeType === "string"
+                            ? attachment.mimeType
+                            : TEXT_ATTACHMENT_MIME_TYPES[normalizedTextAttachmentType],
+                        size: attachment.size,
+                    };
+                }
+                if (attachment.type === "uploaded") {
+                    if (typeof attachment.url !== "string" ||
+                        typeof attachment.mediaType !== "string") {
+                        return undefined;
+                    }
+                    return {
+                        type: "uploaded",
+                        url: attachment.url,
+                        signedUrl: typeof attachment.signedUrl === "string"
+                            ? attachment.signedUrl
+                            : undefined,
+                        mediaType: attachment.mediaType,
+                        fileName: typeof attachment.fileName === "string"
+                            ? attachment.fileName
+                            : undefined,
+                        label: typeof attachment.label === "string"
+                            ? attachment.label
+                            : undefined,
+                        insight: typeof attachment.insight === "string"
+                            ? attachment.insight
+                            : undefined,
+                        storageKey: typeof attachment.storageKey === "string"
+                            ? attachment.storageKey
+                            : undefined,
+                        signedUrlExpiresAt: typeof attachment.signedUrlExpiresAt === "string"
+                            ? attachment.signedUrlExpiresAt
+                            : undefined,
+                        scopeType: attachment.scopeType === "app" || attachment.scopeType === "org"
+                            ? attachment.scopeType
+                            : undefined,
+                        applicationId: typeof attachment.applicationId === "string"
+                            ? attachment.applicationId
+                            : undefined,
+                    };
+                }
+                return undefined;
+            })
+                .filter(Boolean);
+            return [validAttachments.length === attachments.length, validAttachments];
+        }
+        validateChatMessageV1(payload) {
+            try {
+                if (!payload || typeof payload !== "object") {
+                    return null;
+                }
+                const msg = payload;
+                // Validate required fields. Legacy roles "server" and "ai" (written by
+                // older server paths such as setApplicationHash for `draftCommitted`
+                // messages, and recognized as assistant-like in commitMessage.ts) are
+                // coerced to "assistant" so existing chat history keeps rendering.
+                if (typeof msg.role !== "string") {
+                    this.logger.warn(`[ai-service] Invalid message role: ${msg.role}`);
+                    return null;
+                }
+                const normalizedRole = msg.role === "server" || msg.role === "ai" ? "assistant" : msg.role;
+                if (!["user", "assistant", "system"].includes(normalizedRole)) {
+                    this.logger.warn(`[ai-service] Invalid message role after normalize: ${msg.role}`);
+                    return null;
+                }
+                msg.role = normalizedRole;
+                if (typeof msg.content !== "string") {
+                    this.logger.warn(`[ai-service] Invalid message content (type=${typeof msg.content})`);
+                    return null;
+                }
+                if (typeof msg.type !== "string") {
+                    this.logger.warn(`[ai-service] Invalid message type: ${msg.type}`);
+                    return null;
+                }
+                // Validate optional fields with defaults
+                const timestamp = typeof msg.timestamp === "number" ? msg.timestamp : Date.now();
+                const group = typeof msg.group === "string" ? msg.group : undefined;
+                const status = typeof msg.status === "string" ? msg.status : undefined;
+                const action = typeof msg.action === "string" ? msg.action : undefined;
+                const title = typeof msg.title === "string" ? msg.title : undefined;
+                const streaming = typeof msg.streaming === "boolean" ? msg.streaming : undefined;
+                const integrations = Array.isArray(msg.integrations)
+                    ? msg.integrations
+                    : undefined;
+                const entities = Array.isArray(msg.entities)
+                    ? msg.entities
+                    : undefined;
+                const [isAttachmentsValid, attachments] = this.validateAttachments(msg.attachments);
+                if (!isAttachmentsValid) {
+                    this.logger.warn(`[ai-service] Invalid attachments`);
+                    return null;
+                }
+                if (msg.type === "tool") {
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "tool",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        status: status,
+                        action: action,
+                        args: msg.args,
+                        tool: msg.tool,
+                        toolCallId: typeof msg.toolCallId === "string" ? msg.toolCallId : undefined,
+                        title,
+                    };
+                }
+                else if (msg.type === "tool-result") {
+                    if (typeof msg.toolCallId !== "string" ||
+                        typeof msg.toolName !== "string") {
+                        this.logger.warn(`[ai-service] Invalid tool-result message: missing required fields`);
+                        return null;
+                    }
+                    return {
+                        role: msg.role,
+                        content: msg.content || "",
+                        type: "tool-result",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        status: status,
+                        toolCallId: msg.toolCallId,
+                        toolName: msg.toolName,
+                        output: msg.output,
+                        title,
+                    };
+                }
+                else if (msg.type === "tool-error") {
+                    if (typeof msg.toolCallId !== "string" ||
+                        typeof msg.toolName !== "string") {
+                        this.logger.warn(`[ai-service] Invalid tool-error message: missing required fields`);
+                        return null;
+                    }
+                    return {
+                        role: msg.role,
+                        content: msg.content || "",
+                        type: "tool-error",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        status: status,
+                        toolCallId: msg.toolCallId,
+                        toolName: msg.toolName,
+                        error: msg.error instanceof Error
+                            ? msg.error.message
+                            : typeof msg.error === "string"
+                                ? msg.error
+                                : (JSON.stringify(msg.error, null, 2) ?? "Unknown error"),
+                        title,
+                        errorCode: msg.errorCode,
+                        errorSummary: typeof msg.errorSummary === "string"
+                            ? msg.errorSummary
+                            : undefined,
+                    };
+                }
+                else if (msg.group === "checklist") {
+                    if (typeof msg.checklistData !== "object") {
+                        this.logger.warn(`[ai-service] Invalid checklist data`);
+                        return null;
+                    }
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "tool",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        group,
+                        status,
+                        action,
+                        checklistData: msg.checklistData,
+                        title,
+                    };
+                }
+                else if (msg.type === "multi_choice") {
+                    if (!Array.isArray(msg.choices) || msg.choices.length === 0) {
+                        this.logger.warn(`[ai-service] Invalid choices for multi_choice message`);
+                        return null;
+                    }
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "multi_choice",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        choices: msg.choices,
+                        selectionType: typeof msg.selectionType === "string"
+                            ? msg.selectionType
+                            : "single",
+                        title,
+                        questionType: typeof msg.questionType === "string"
+                            ? msg.questionType
+                            : undefined,
+                        subtitle: typeof msg.subtitle === "string" ? msg.subtitle : undefined,
+                        details: typeof msg.details === "string" ? msg.details : undefined,
+                        knowledgeCandidates: Array.isArray(msg.knowledgeCandidates)
+                            ? msg.knowledgeCandidates
+                            : undefined,
+                    };
+                }
+                else if (msg.type === "remember_knowledge_draft") {
+                    if (!Array.isArray(msg.candidates) || msg.candidates.length === 0) {
+                        this.logger.warn(`[ai-service] Invalid candidates for remember_knowledge_draft message`);
+                        return null;
+                    }
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "remember_knowledge_draft",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        candidates: msg.candidates,
+                        title,
+                    };
+                }
+                else if (msg.type === "multi_choice_response") {
+                    if (typeof msg.responseToMessageId !== "string") {
+                        this.logger.warn(`[ai-service] Invalid responseToMessageId for multi_choice_response`);
+                        return null;
+                    }
+                    if (!Array.isArray(msg.selectedChoiceIndices)) {
+                        this.logger.warn(`[ai-service] Invalid selectedChoiceIndices for multi_choice_response`);
+                        return null;
+                    }
+                    const response = {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "multi_choice_response",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        responseToMessageId: msg.responseToMessageId,
+                        selectedChoiceIndices: msg.selectedChoiceIndices,
+                        selectedScopes: Array.isArray(msg.selectedScopes)
+                            ? msg.selectedScopes
+                            : undefined,
+                        savedFacts: Array.isArray(msg.savedFacts)
+                            ? msg.savedFacts
+                            : undefined,
+                        title,
+                    };
+                    return response;
+                }
+                else if (msg.type === "remember_knowledge_draft_response") {
+                    if (typeof msg.responseToMessageId !== "string") {
+                        this.logger.warn(`[ai-service] Invalid responseToMessageId for remember_knowledge_draft_response`);
+                        return null;
+                    }
+                    if (!Array.isArray(msg.selectedCandidateIndices)) {
+                        this.logger.warn(`[ai-service] Invalid selectedCandidateIndices for remember_knowledge_draft_response`);
+                        return null;
+                    }
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "remember_knowledge_draft_response",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        responseToMessageId: msg.responseToMessageId,
+                        selectedCandidateIndices: msg.selectedCandidateIndices,
+                        selectedScopes: Array.isArray(msg.selectedScopes)
+                            ? msg.selectedScopes
+                            : undefined,
+                        savedFacts: Array.isArray(msg.savedFacts)
+                            ? msg.savedFacts
+                            : undefined,
+                        title,
+                    };
+                }
+                else if (msg.type === "confirm") {
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "confirm",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        knowledgeEntry: typeof msg.knowledgeEntry === "object" &&
+                            msg.knowledgeEntry !== null
+                            ? msg.knowledgeEntry
+                            : undefined,
+                        title,
+                    };
+                }
+                else if (msg.type === "searchable_dropdown") {
+                    if (!Array.isArray(msg.options) || msg.options.length === 0) {
+                        this.logger.warn(`[ai-service] Invalid options for searchable_dropdown message`);
+                        return null;
+                    }
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "searchable_dropdown",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        options: msg.options,
+                        placeholder: typeof msg.placeholder === "string" ? msg.placeholder : undefined,
+                        title,
+                    };
+                }
+                else if (msg.type === "searchable_dropdown_response") {
+                    if (typeof msg.responseToMessageId !== "string") {
+                        this.logger.warn(`[ai-service] Invalid responseToMessageId for searchable_dropdown_response`);
+                        return null;
+                    }
+                    if (typeof msg.selectedValue !== "string") {
+                        this.logger.warn(`[ai-service] Invalid selectedValue for searchable_dropdown_response`);
+                        return null;
+                    }
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "searchable_dropdown_response",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        responseToMessageId: msg.responseToMessageId,
+                        selectedValue: msg.selectedValue,
+                        selectedLabel: typeof msg.selectedLabel === "string"
+                            ? msg.selectedLabel
+                            : msg.selectedValue,
+                        title,
+                    };
+                }
+                else if (msg.type === "confirm_response") {
+                    if (typeof msg.responseToMessageId !== "string") {
+                        this.logger.warn(`[ai-service] Invalid responseToMessageId for confirm_response`);
+                        return null;
+                    }
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "confirm_response",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        responseToMessageId: msg.responseToMessageId,
+                        approved: Boolean(msg.approved),
+                        selectedScopes: Array.isArray(msg.selectedScopes)
+                            ? msg.selectedScopes
+                            : undefined,
+                        savedFacts: Array.isArray(msg.savedFacts)
+                            ? msg.savedFacts
+                            : undefined,
+                        title,
+                    };
+                }
+                else if (msg.type === "plan_response") {
+                    if (typeof msg.responseToMessageId !== "string") {
+                        this.logger.warn(`[ai-service] Invalid responseToMessageId for plan_response`);
+                        return null;
+                    }
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "plan_response",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        responseToMessageId: msg.responseToMessageId,
+                        title,
+                        approved: typeof msg.approved === "boolean" ? msg.approved : undefined,
+                        enableTesting: typeof msg.enableTesting === "boolean"
+                            ? msg.enableTesting
+                            : undefined,
+                    };
+                }
+                else if (msg.type === "test_run_start") {
+                    if (typeof msg.testRunId !== "string") {
+                        this.logger.warn(`[ai-service] Invalid test_run_start message: missing testRunId`);
+                        return null;
+                    }
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "test_run_start",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        testRunId: msg.testRunId,
+                        header: typeof msg.header === "string" ? msg.header : "End-to-end Testing",
+                        testCases: Array.isArray(msg.testCases) ? msg.testCases : undefined,
+                    };
+                }
+                else if (msg.type === "test_case_update") {
+                    if (typeof msg.testRunId !== "string") {
+                        this.logger.warn(`[ai-service] Invalid test_case_update message: missing testRunId`);
+                        return null;
+                    }
+                    if (typeof msg.testCaseId !== "string") {
+                        this.logger.warn(`[ai-service] Invalid test_case_update message: missing testCaseId`);
+                        return null;
+                    }
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "test_case_update",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        testRunId: msg.testRunId,
+                        testCaseId: msg.testCaseId,
+                        testCaseStatus: msg.testCaseStatus,
+                    };
+                }
+                else if (msg.type === "test_run_end") {
+                    if (typeof msg.testRunId !== "string") {
+                        this.logger.warn(`[ai-service] Invalid test_run_end message: missing testRunId`);
+                        return null;
+                    }
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "test_run_end",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        testRunId: msg.testRunId,
+                        testStatus: typeof msg.testStatus === "string"
+                            ? msg.testStatus
+                            : "completed",
+                        summary: typeof msg.summary === "string" ? msg.summary : undefined,
+                    };
+                }
+                else if (msg.type === "retry_notification") {
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "retry_notification",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        retryType: msg.retryType,
+                        attempt: typeof msg.attempt === "number" ? msg.attempt : undefined,
+                        delaySeconds: typeof msg.delaySeconds === "number" ? msg.delaySeconds : undefined,
+                        fromProvider: typeof msg.fromProvider === "string" ? msg.fromProvider : undefined,
+                        toProvider: typeof msg.toProvider === "string" ? msg.toProvider : undefined,
+                        reason: typeof msg.reason === "string" ? msg.reason : undefined,
+                    };
+                }
+                else if (msg.type === "knowledge") {
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "knowledge",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        status,
+                        facts: msg.facts,
+                    };
+                }
+                else if (msg.type === "app_knowledge_saved") {
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "app_knowledge_saved",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        knowledgeCount: typeof msg.knowledgeCount === "number" ? msg.knowledgeCount : 0,
+                        responseToMessageId: typeof msg.responseToMessageId === "string"
+                            ? msg.responseToMessageId
+                            : undefined,
+                        savedFacts: Array.isArray(msg.savedFacts)
+                            ? msg.savedFacts
+                            : undefined,
+                    };
+                }
+                else if (msg.type === "next_steps") {
+                    return {
+                        role: msg.role,
+                        content: msg.content,
+                        type: "next_steps",
+                        id: typeof msg.id === "string" ? msg.id : undefined,
+                        timestamp,
+                        nextSteps: Array.isArray(msg.nextSteps) ? msg.nextSteps : [],
+                    };
+                }
+                const baseMessage = {
+                    role: msg.role,
+                    content: msg.content,
+                    type: msg.type,
+                    id: typeof msg.id === "string" ? msg.id : undefined,
+                    timestamp,
+                    group,
+                    status: status,
+                    action: action,
+                    attachments,
+                    title,
+                };
+                if (msg.type === "plan") {
+                    if (streaming !== undefined) {
+                        baseMessage.streaming = streaming;
+                    }
+                    if (integrations) {
+                        baseMessage.integrations = integrations;
+                    }
+                    if (entities) {
+                        baseMessage.entities = entities;
+                    }
+                    if (msg.includesFreshDatabase === true) {
+                        baseMessage.includesFreshDatabase = true;
+                    }
+                }
+                // Preserve commitId for commitRestored, commitRestoring, and draftCommitted messages
+                if ((msg.type === "commitRestored" ||
+                    msg.type === "commitRestoring" ||
+                    msg.type === "draftCommitted") &&
+                    typeof msg.commitId === "string") {
+                    baseMessage.commitId =
+                        msg.commitId;
+                }
+                return baseMessage;
+            }
+            catch (error) {
+                this.logger.error("[ai-service] Failed to validate message payload", getErrorMeta(error));
+                return null;
+            }
         }
-        validateChatSummaryV1(payload, fallbackTimestamp) {
+        validateChatSummaryV1(payload) {
             try {
                 if (!payload || typeof payload !== "object") {
                     return null;
@@ -192,9 +779,7 @@ let ChatSessionStore = (() => {
                     return null;
                 }
                 // Validate optional fields with defaults
-                const timestamp = Number.isFinite(summary.timestamp)
-                    ? summary.timestamp
-                    : fallbackTimestamp;
+                const timestamp = typeof summary.timestamp === "number" ? summary.timestamp : Date.now();
                 return {
                     summary: summary.summary,
                     relevantFilePaths: summary.relevantFilePaths,
@@ -209,14 +794,14 @@ let ChatSessionStore = (() => {
                 return null;
             }
         }
-        validateChatItemV1(payload, fallbackTimestamp) {
+        validateChatItemV1(payload) {
             // First try to validate as a message
-            const messageResult = this.validateChatMessageV1(payload, fallbackTimestamp);
+            const messageResult = this.validateChatMessageV1(payload);
             if (messageResult) {
                 return messageResult;
             }
             // If not a valid message, try to validate as a summary
-            const summaryResult = this.validateChatSummaryV1(payload, fallbackTimestamp);
+            const summaryResult = this.validateChatSummaryV1(payload);
             if (summaryResult) {
                 return summaryResult;
             }
@@ -270,15 +855,7 @@ let ChatSessionStore = (() => {
                     });
                     const rawMessages = data?.messages ?? [];
                     const mapped = rawMessages.map((msg) => {
-                        // The row's own created column, not Date.now(). This value is what
-                        // the sort below orders on when a payload carries no timestamp, so
-                        // inventing one here filed old rows at the end of history on every
-                        // load. It is also half of the composite key the editor dedupes
-                        // id-less rows on, which the durable reader derives the same way.
-                        const persistedAt = msg.created
-                            ? Date.parse(msg.created)
-                            : Date.now();
-                        const chatItem = this.validateChatItemV1(msg.chatPayload, Number.isFinite(persistedAt) ? persistedAt : Date.now());
+                        const chatItem = this.validateChatItemV1(msg.chatPayload);
                         if (chatItem && isAiChatMessage(chatItem)) {
                             chatItem.authorEmail = msg.authorEmail;
                             chatItem.authorName = msg.authorName;