merge main into PR branch

Agent-Logs-Url: https://github.com/OpenKnots/okcode/sessions/c09e6a8c-001f-4ada-a5f7-e3b0018da8f4

Co-authored-by: BunsDev <68980965+BunsDev@users.noreply.github.com>

Author: Copilot

apps/server/src/wsServer.test.ts

@@ -64,6 +64,7 @@ import {
   ProjectionSnapshotQuery,
   type ProjectionSnapshotQueryShape,
 } from "./orchestration/Services/ProjectionSnapshotQuery";
+import { createAttachmentId } from "./attachmentStore";
 
 const asEventId = (value: string): EventId => EventId.makeUnsafe(value);
 const asProviderItemId = (value: string): ProviderItemId => ProviderItemId.makeUnsafe(value);
@@ -687,6 +688,29 @@ describe("WebSocket Server", () => {
     expect(bytes).toEqual(Buffer.from("hello-attachment"));
   });
 
+  it("serves persisted attachments by attachment id", async () => {
+    const baseDir = makeTempDir("okcode-state-attachment-id-");
+    const { attachmentsDir } = deriveServerPathsSync(baseDir, undefined);
+    const attachmentId = createAttachmentId("thread-preview");
+    if (!attachmentId) {
+      throw new Error("Failed to create a safe test attachment id.");
+    }
+    const attachmentPath = path.join(attachmentsDir, `${attachmentId}.patch`);
+    fs.mkdirSync(path.dirname(attachmentPath), { recursive: true });
+    fs.writeFileSync(attachmentPath, Buffer.from("diff --git a/a.ts b/a.ts\n"));
+
+    const { cwd } = makeWorkspaceFixture("project");
+    server = await createTestServer({ cwd, baseDir });
+    const addr = server.address();
+    const port = typeof addr === "object" && addr !== null ? addr.port : 0;
+    expect(port).toBeGreaterThan(0);
+
+    const response = await fetch(`http://127.0.0.1:${port}/attachments/${attachmentId}`);
+    expect(response.status).toBe(200);
+    expect(response.headers.get("content-type")).toContain("text/x-diff");
+    expect(await response.text()).toContain("diff --git");
+  });
+
   it("serves persisted attachments for URL-encoded paths", async () => {
     const baseDir = makeTempDir("okcode-state-attachments-encoded-");
     const { attachmentsDir } = deriveServerPathsSync(baseDir, undefined);

apps/server/src/wsServer.ts

@@ -137,6 +137,26 @@ function isNewerSemver(a: string, b: string): boolean {
   return false;
 }
 
+function inferAttachmentContentType(filePath: string): string {
+  const mimeType = Mime.getType(filePath);
+  if (mimeType) {
+    return mimeType;
+  }
+
+  const normalizedPath = filePath.toLowerCase();
+  if (normalizedPath.endsWith(".patch") || normalizedPath.endsWith(".diff")) {
+    return "text/x-diff; charset=utf-8";
+  }
+  if (normalizedPath.endsWith(".md")) {
+    return "text/markdown; charset=utf-8";
+  }
+  if (normalizedPath.endsWith(".txt")) {
+    return "text/plain; charset=utf-8";
+  }
+
+  return "application/octet-stream";
+}
+
 /**
  * Remote address from the HTTP upgrade (`request.socket`). The `ws` library often does not
  * expose a reliable `socket.remoteAddress` when handling messages, so we capture it here.
@@ -717,7 +737,7 @@ export const createServer = Effect.fn(function* (): Effect.fn.Return<
             return;
           }
 
-          const contentType = Mime.getType(filePath) ?? "application/octet-stream";
+          const contentType = inferAttachmentContentType(filePath);
           res.writeHead(200, {
             "Content-Type": contentType,
             "Cache-Control": "public, max-age=31536000, immutable",

apps/web/src/components/ChatView.tsx

@@ -434,10 +434,10 @@ export default function ChatView({
   const navigate = useNavigate();
   const activeProjectId = threads.find((t) => t.id === threadId)?.projectId ?? null;
   const previewOpen = usePreviewStateStore((state) =>
-    activeProjectId ? (state.openByProjectId[activeProjectId] ?? false) : false,
+    activeThreadId ? (state.openByThreadId[activeThreadId] ?? false) : false,
   );
-  const togglePreviewOpen = usePreviewStateStore((state) => state.toggleProjectOpen);
-  const setPreviewOpen = usePreviewStateStore((state) => state.setProjectOpen);
+  const togglePreviewOpen = usePreviewStateStore((state) => state.toggleThreadOpen);
+  const setPreviewOpen = usePreviewStateStore((state) => state.setThreadOpen);
   const previewDock = usePreviewStateStore((state) =>
     activeProjectId ? (state.dockByProjectId[activeProjectId] ?? "top") : "top",
   );
@@ -1747,7 +1747,7 @@ export default function ChatView({
   const handlePreviewUrl = useCallback(
     (url: string) => {
       if (!activeProject || !activeThread) return;
-      setPreviewOpen(activeProject.id, true);
+      setPreviewOpen(activeThread.id, true);
       void previewBridgeRef?.createTab({ url });
     },
     [activeProject, activeThread, setPreviewOpen, previewBridgeRef],
@@ -4937,7 +4937,7 @@ export default function ChatView({
           onImportProjectScripts={importProjectScripts}
           onToggleTerminal={toggleTerminalVisibility}
           onPrefetchTerminal={preloadThreadTerminalDrawer}
-          onTogglePreview={() => activeProjectId && togglePreviewOpen(activeProjectId)}
+          onTogglePreview={() => activeThreadId && togglePreviewOpen(activeThreadId)}
           onTogglePreviewLayout={() => activeProjectId && togglePreviewLayout(activeProjectId)}
           onMinimize={onMinimize}
         />
@@ -4980,7 +4980,7 @@ export default function ChatView({
                   key={previewPanelKey ?? undefined}
                   projectId={activeProject!.id}
                   threadId={threadId}
-                  onClose={() => setPreviewOpen(activeProject!.id, false)}
+                  onClose={() => setPreviewOpen(threadId, false)}
                 />
               </div>
               <div
@@ -5003,7 +5003,7 @@ export default function ChatView({
                 key={previewPanelKey ?? undefined}
                 projectId={activeProject!.id}
                 threadId={threadId}
-                onClose={() => setPreviewOpen(activeProject!.id, false)}
+                onClose={() => setPreviewOpen(threadId, false)}
               />
             </div>
           ) : null}
@@ -5884,7 +5884,7 @@ export default function ChatView({
                   key={previewPanelKey ?? undefined}
                   projectId={activeProject!.id}
                   threadId={threadId}
-                  onClose={() => setPreviewOpen(activeProject!.id, false)}
+                  onClose={() => setPreviewOpen(threadId, false)}
                 />
               </div>
             </>

apps/web/src/components/DiffPanel.tsx

@@ -1,4 +1,3 @@
-import { parsePatchFiles } from "@pierre/diffs";
 import { FileDiff, type FileDiffMetadata, Virtualizer } from "@pierre/diffs/react";
 import { useQuery } from "@tanstack/react-query";
 import {
@@ -18,7 +17,8 @@ import { useTheme } from "../hooks/useTheme";
 import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";
 import { buildAcceptedDiffFileKey, filterAcceptedDiffFiles } from "../lib/diffPanelAcceptance";
 import { checkpointDiffQueryOptions } from "../lib/providerReactQuery";
-import { buildPatchCacheKey, resolveDiffThemeName } from "../lib/diffRendering";
+import { resolveDiffThemeName } from "../lib/diffRendering";
+import { parseRenderablePatch } from "../lib/renderablePatch";
 import { cn } from "../lib/utils";
 import { useStore } from "../store";
 import { DiffPanelLoadingState, DiffPanelShell, type DiffPanelMode } from "./DiffPanelShell";
@@ -95,42 +95,6 @@ const DIFF_PANEL_UNSAFE_CSS = `
 }
 `;
 
-type RenderablePatch =
-  | { kind: "files"; files: FileDiffMetadata[] }
-  | { kind: "raw"; text: string; reason: string };
-
-function getRenderablePatch(
-  patch: string | undefined,
-  cacheScope = "diff-panel",
-): RenderablePatch | null {
-  if (!patch) return null;
-  const normalizedPatch = patch.trim();
-  if (normalizedPatch.length === 0) return null;
-
-  try {
-    const parsedPatches = parsePatchFiles(
-      normalizedPatch,
-      buildPatchCacheKey(normalizedPatch, cacheScope),
-    );
-    const files = parsedPatches.flatMap((parsedPatch) => parsedPatch.files);
-    if (files.length > 0) {
-      return { kind: "files", files };
-    }
-
-    return {
-      kind: "raw",
-      text: normalizedPatch,
-      reason: "Unsupported diff format. Showing raw patch.",
-    };
-  } catch {
-    return {
-      kind: "raw",
-      text: normalizedPatch,
-      reason: "Failed to parse patch. Showing raw patch.",
-    };
-  }
-}
-
 type FileDiffCategory = "all" | "added" | "modified" | "deleted" | "renamed";
 
 const CATEGORY_ORDER: FileDiffCategory[] = ["all", "added", "modified", "deleted", "renamed"];
@@ -256,7 +220,7 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
         ? "Failed to load checkpoint diff."
         : null;
   const renderablePatch = useMemo(
-    () => getRenderablePatch(selectedPatch, `diff-panel:${resolvedTheme}`),
+    () => parseRenderablePatch(selectedPatch, `diff-panel:${resolvedTheme}`),
     [resolvedTheme, selectedPatch],
   );
   const renderableFiles = useMemo(() => {

apps/web/src/components/GitActionsControl.tsx

@@ -367,7 +367,7 @@ export default function GitActionsControl({
   activeProjectId,
 }: GitActionsControlProps) {
   const { settings } = useAppSettings();
-  const setPreviewOpen = usePreviewStateStore((state) => state.setProjectOpen);
+  const setPreviewOpen = usePreviewStateStore((state) => state.setThreadOpen);
   const openFileInViewer = useFileViewNavigation();
   const threadToastData = useMemo(
     () => (activeThreadId ? { threadId: activeThreadId } : undefined),

apps/web/src/components/PreviewPanel.tsx

@@ -1,4 +1,4 @@
-import type { PreviewTabsState, PreviewTabState, ProjectId } from "@okcode/contracts";
+import type { PreviewTabsState, PreviewTabState, ProjectId, ThreadId } from "@okcode/contracts";
 import { type FormEvent, useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
 import {
   ChevronLeftIcon,
@@ -111,7 +111,7 @@ function tabDisplayTitle(tab: PreviewTabState): string {
 
 interface PreviewPanelProps {
   projectId: ProjectId;
-  threadId: string;
+  threadId: ThreadId;
   onClose: () => void;
 }
 
@@ -149,7 +149,7 @@ function resolveViewportDimensions(
 export function PreviewPanel({ projectId, threadId, onClose }: PreviewPanelProps) {
   const { settings } = useAppSettings();
   const previewBridge = readDesktopPreviewBridge();
-  const setProjectOpen = usePreviewStateStore((state) => state.setProjectOpen);
+  const setThreadOpen = usePreviewStateStore((state) => state.setThreadOpen);
   const favoriteUrls = usePreviewStateStore((state) => state.favoriteUrls);
   const toggleFavoriteUrl = usePreviewStateStore((state) => state.toggleFavoriteUrl);
   const presetId = usePreviewStateStore((state) => state.presetByProjectId[projectId] ?? null);
@@ -422,7 +422,7 @@ export function PreviewPanel({ projectId, threadId, onClose }: PreviewPanelProps
   };
 
   const onClosePreview = () => {
-    setProjectOpen(projectId, false);
+    setThreadOpen(threadId, false);
     void previewBridge?.closeAll();
     onClose();
   };