@ottocode/web-sdk 0.1.275 → 0.1.277

package/dist/components/index.js

@@ -480,6 +480,8 @@ function ToastItem({ toast: toast2 }) {
   };
   const style = typeStyles[toast2.type];
   const transitionClass = phase === "enter" ? "opacity-0 translate-y-2 scale-95" : phase === "exit" ? "opacity-0 translate-y-1 scale-95" : "opacity-100 translate-y-0 scale-100";
+  const rowAlignmentClass = toast2.type === "loading" ? "items-center" : "items-start";
+  const iconOffsetClass = toast2.type === "loading" ? "" : "mt-px";
   return /* @__PURE__ */ jsxs3("div", {
     className: `
 				relative overflow-hidden
@@ -494,10 +496,10 @@ function ToastItem({ toast: toast2 }) {
     role: "alert",
     children: [
       /* @__PURE__ */ jsxs3("div", {
-        className: "flex items-start gap-2.5 px-3 py-2.5",
+        className: `flex ${rowAlignmentClass} gap-2.5 px-3 py-2.5`,
         children: [
           /* @__PURE__ */ jsx7("span", {
-            className: "mt-px shrink-0",
+            className: `${iconOffsetClass} shrink-0`,
             children: style.icon
           }),
           /* @__PURE__ */ jsx7("div", {
@@ -1191,6 +1193,21 @@ var sessionsMixin = {
       throw new Error(extractErrorMessage(response.error));
     return response.data;
   },
+  async createHandoff(sessionId) {
+    const response = await fetch(`${getBaseUrl()}/v1/sessions/${encodeURIComponent(sessionId)}/handoff`, { method: "POST" });
+    const data = await response.json().catch(() => null);
+    if (!response.ok)
+      throw new Error(extractErrorMessage(data));
+    if (!data?.session || !data?.sessionId) {
+      throw new Error("No data returned from handoff");
+    }
+    return {
+      session: convertSession(data.session),
+      sessionId: String(data.sessionId),
+      sourceSessionId: String(data.sourceSessionId),
+      message: String(data.message ?? "")
+    };
+  },
   async abortSession(sessionId) {
     const response = await apiAbortSession({ path: { sessionId } });
     if (response.error)
@@ -1219,6 +1236,13 @@ var sessionsMixin = {
       throw new Error("Failed to remove from queue");
     return response.data;
   },
+  async sendQueuedMessageNow(sessionId, messageId) {
+    const response = await fetch(`${getBaseUrl()}/v1/sessions/${encodeURIComponent(sessionId)}/queue/${encodeURIComponent(messageId)}/send-now`, { method: "POST" });
+    const data = await response.json().catch(() => null);
+    if (!response.ok)
+      throw new Error(extractErrorMessage(data));
+    return data;
+  },
   async getMessages(sessionId) {
     const response = await apiListMessages({ path: { id: sessionId } });
     if (response.error)
@@ -1925,10 +1949,12 @@ class ApiClient {
   updateSession = sessionsMixin.updateSession;
   markSessionViewed = sessionsMixin.markSessionViewed;
   deleteSession = sessionsMixin.deleteSession;
+  createHandoff = sessionsMixin.createHandoff;
   abortSession = sessionsMixin.abortSession;
   abortMessage = sessionsMixin.abortMessage;
   getQueueState = sessionsMixin.getQueueState;
   removeFromQueue = sessionsMixin.removeFromQueue;
+  sendQueuedMessageNow = sessionsMixin.sendQueuedMessageNow;
   getMessages = sessionsMixin.getMessages;
   sendMessage = sessionsMixin.sendMessage;
   getStreamUrl = sessionsMixin.getStreamUrl;
@@ -2199,7 +2225,8 @@ import {
   Trash2,
   Share2,
   RefreshCw,
-  FileText as FileText2
+  FileText as FileText2,
+  ArrowRightLeft
 } from "lucide-react";
 var COMMANDS = [
   {
@@ -2268,6 +2295,12 @@ var COMMANDS = [
     description: "Generate AGENTS.md and .agents docs from the real repo structure",
     icon: FileText2
   },
+  {
+    id: "handoff",
+    label: "/handoff",
+    description: "Create a new session with current context",
+    icon: ArrowRightLeft
+  },
   {
     id: "branch",
     label: "/branch",
@@ -3828,6 +3861,7 @@ import {
   Clock,
   ListOrdered,
   RotateCcw,
+  Send,
   Trash2 as Trash22
 } from "lucide-react";
 import { useQueryClient as useQueryClient4 } from "@tanstack/react-query";
@@ -3840,14 +3874,26 @@ import { useQuery as useQuery4 } from "@tanstack/react-query";
 var defaultQueueState = {
   currentMessageId: null,
   queuedMessages: [],
-  queueLength: 0
+  queueLength: 0,
+  isRunning: false
 };
+function normalizeQueueState(state) {
+  const isRunning = state.isRunning ?? Boolean(state.currentMessageId);
+  const currentMessageId = isRunning ? state.currentMessageId : null;
+  const hasActiveTurn = Boolean(currentMessageId);
+  const queuedMessages = hasActiveTurn ? state.queuedMessages : [];
+  return {
+    currentMessageId,
+    queuedMessages,
+    queueLength: queuedMessages.length,
+    isRunning: hasActiveTurn
+  };
+}
 function optimisticallyQueueMessage(queryClient, sessionId, messageId) {
   queryClient.setQueryData(["queueState", sessionId], (current) => {
     if (!current)
       return current;
-    const isBusy = Boolean(current.currentMessageId) || current.queuedMessages.length > 0 || current.queueLength > 0;
-    if (!isBusy)
+    if (!current.isRunning || !current.currentMessageId)
       return current;
     if (current.currentMessageId === messageId)
       return current;
@@ -3872,11 +3918,7 @@ function useQueueState(sessionId) {
       if (!sessionId)
         return defaultQueueState;
       const queueState = await apiClient.getQueueState(sessionId);
-      return {
-        currentMessageId: queueState.currentMessageId,
-        queuedMessages: queueState.queuedMessages,
-        queueLength: queueState.queuedMessages.length
-      };
+      return normalizeQueueState(queueState);
     },
     enabled: !!sessionId,
     placeholderData: defaultQueueState,
@@ -4082,6 +4124,7 @@ function getQueuedPreviews(messages, queuedMessages) {
 }
 function QueueRow({
   item,
+  onSendNow,
   onCancel,
   onDelete
 }) {
@@ -4099,6 +4142,15 @@ function QueueRow({
       /* @__PURE__ */ jsxs11("div", {
         className: "flex items-center gap-1 flex-shrink-0",
         children: [
+          /* @__PURE__ */ jsx17("button", {
+            type: "button",
+            onClick: () => onSendNow(item),
+            className: "flex h-7 w-7 items-center justify-center rounded bg-transparent text-muted-foreground transition-colors hover:bg-primary/10 hover:text-primary",
+            title: "Send now",
+            children: /* @__PURE__ */ jsx17(Send, {
+              className: "h-3.5 w-3.5"
+            })
+          }),
           /* @__PURE__ */ jsx17("button", {
             type: "button",
             onClick: () => onCancel(item),
@@ -4148,6 +4200,15 @@ var InputQueueBar = memo4(function InputQueueBar2({
       console.error("Failed to remove queued message:", error);
     }
   };
+  const sendQueuedItemNow = async (item) => {
+    try {
+      await apiClient.sendQueuedMessageNow(sessionId, item.assistantMessageId);
+      queryClient.invalidateQueries({ queryKey: ["messages", sessionId] });
+      queryClient.invalidateQueries({ queryKey: ["queueState", sessionId] });
+    } catch (error) {
+      console.error("Failed to send queued message now:", error);
+    }
+  };
   return /* @__PURE__ */ jsx17("div", {
     className: "grid transition-[grid-template-rows,opacity] duration-200 ease-out",
     style: {
@@ -4246,6 +4307,7 @@ var InputQueueBar = memo4(function InputQueueBar2({
                   className: "divide-y divide-border",
                   children: queuedItems.map((item) => /* @__PURE__ */ jsx17(QueueRow, {
                     item,
+                    onSendNow: sendQueuedItemNow,
                     onCancel: (queuedItem) => removeQueuedItem(queuedItem, true),
                     onDelete: (queuedItem) => removeQueuedItem(queuedItem, false)
                   }, item.assistantMessageId))
@@ -5219,6 +5281,53 @@ function mergeChangedLines(existing, incoming) {
     return existing;
   return [...new Set([...existing, ...incoming])].sort((a, b) => a - b);
 }
+function countContentLines(content) {
+  return content.length === 0 ? 1 : content.split(`
+`).length;
+}
+function annotationId(preview, targetPath) {
+  return `${preview.toolName}:${preview.callId ?? `${normalizeViewerPath(targetPath)}:${preview.patch ?? preview.content ?? ""}`}`;
+}
+function buildAnnotation(preview, targetPath, existing) {
+  if (preview.status === "error")
+    return existing;
+  const id = annotationId(preview, targetPath);
+  if (preview.toolName === "write") {
+    const content = preview.content;
+    if (content === undefined)
+      return existing;
+    return {
+      id,
+      reason: "write",
+      callId: preview.callId,
+      status: preview.status,
+      lineTones: Array.from({ length: countContentLines(content) }, (_, index) => [index + 1, "add"]),
+      createdAt: existing?.createdAt ?? Date.now()
+    };
+  }
+  const lineTones = preview.previewLineTones?.length ? preview.previewLineTones : preview.changedLines?.length ? preview.changedLines.map((line) => [line, "add"]) : existing?.lineTones;
+  if (!lineTones?.length)
+    return existing;
+  return {
+    id,
+    reason: "apply_patch",
+    callId: preview.callId,
+    status: preview.status,
+    lineTones,
+    createdAt: existing?.createdAt ?? Date.now()
+  };
+}
+function upsertAnnotation(annotations, annotation) {
+  if (!annotation)
+    return annotations;
+  const existing = annotations ?? [];
+  const index = existing.findIndex((item) => item.id === annotation.id);
+  if (index === -1)
+    return [...existing, annotation];
+  const next = [...existing];
+  next[index] = annotation;
+  return next;
+}
 var useViewerTabsStore = create8((set) => ({
   tabs: [],
   activeTabId: null,
@@ -5265,7 +5374,11 @@ var useViewerTabsStore = create8((set) => ({
           id: targetId,
           type: "file",
           title: existingFile?.title ?? titleFromPath(targetPath),
-          path: targetPath
+          path: targetPath,
+          highlight: existingFile?.highlight,
+          annotations: existingFile?.annotations,
+          patchPreview: existingFile?.patchPreview,
+          writePreview: existingFile?.writePreview
         }),
         activeTabId: targetId
       };
@@ -5286,6 +5399,7 @@ var useViewerTabsStore = create8((set) => ({
           title: existingFile?.title ?? titleFromPath(targetPath),
           path: targetPath,
           highlight,
+          annotations: existingFile?.annotations,
           patchPreview: undefined,
           writePreview: undefined
         }),
@@ -5307,6 +5421,12 @@ var useViewerTabsStore = create8((set) => ({
         const samePatchCall = isSamePatchCall(existingPatchPreview, preview);
         const baseContent = preview.baseContent ?? (samePatchCall ? existingPatchPreview?.baseContent : existingPatchPreview?.resultContent ?? existingPatchPreview?.baseContent);
         const changedLines = samePatchCall ? preview.changedLines ?? existingPatchPreview?.changedLines : mergeChangedLines(existingPatchPreview?.changedLines, preview.changedLines);
+        const annotationPreview = {
+          ...preview,
+          changedLines: preview.changedLines
+        };
+        const existingAnnotation = existingFile?.annotations?.find((annotation2) => annotation2.id === annotationId(annotationPreview, targetPath));
+        const annotations = upsertAnnotation(existingFile?.annotations, buildAnnotation(annotationPreview, targetPath, existingAnnotation));
         return {
           tabs: upsertTab(tabs, {
             id: targetId,
@@ -5314,6 +5434,7 @@ var useViewerTabsStore = create8((set) => ({
             title: existingFile?.title ?? titleFromPath(targetPath),
             path: targetPath,
             highlight: undefined,
+            annotations,
             writePreview: undefined,
             patchPreview: {
               path: targetPath,
@@ -5336,10 +5457,13 @@ var useViewerTabsStore = create8((set) => ({
       }
       if (existingFile) {
         const existingWritePreview = existingFile.writePreview;
+        const existingAnnotation = existingFile.annotations?.find((annotation2) => annotation2.id === annotationId(preview, targetPath));
+        const annotations = upsertAnnotation(existingFile.annotations, buildAnnotation(preview, targetPath, existingAnnotation));
         return {
           tabs: upsertTab(tabs, {
             ...existingFile,
             highlight: undefined,
+            annotations,
             patchPreview: undefined,
             writePreview: {
               path: targetPath,
@@ -5354,25 +5478,24 @@ var useViewerTabsStore = create8((set) => ({
         };
       }
       const existingWrite = existing?.toolName === "write" ? existing : undefined;
+      const annotation = buildAnnotation(preview, preview.path);
       return {
         tabs: upsertTab(tabs, {
           id,
-          type: "tool-preview",
+          type: "file",
           title: titleFromPath(preview.path),
           path: preview.path,
-          toolName: preview.toolName,
-          callId: preview.callId,
-          content: preview.content ?? existingWrite?.content,
-          baseContent: undefined,
-          patch: undefined,
-          changedLines: undefined,
-          previewContent: undefined,
-          resultContent: undefined,
-          previewLineTones: undefined,
-          previewFirstLine: undefined,
-          previewLatestLine: undefined,
-          status: preview.status,
-          error: preview.error ?? existingWrite?.error
+          highlight: undefined,
+          annotations: annotation ? [annotation] : undefined,
+          patchPreview: undefined,
+          writePreview: {
+            path: preview.path,
+            toolName: "write",
+            callId: preview.callId,
+            content: preview.content ?? existingWrite?.content,
+            status: preview.status,
+            error: preview.error ?? existingWrite?.error
+          }
         }),
         activeTabId: id
       };
@@ -7280,6 +7403,24 @@ ${content}` : content;
       handleSendMessage("/compact");
     } else if (commandId === "init") {
       handleSendMessage("/init");
+    } else if (commandId === "handoff") {
+      const toastId2 = toast.loading("Creating handoff...");
+      try {
+        const result = await apiClient.createHandoff(sessionId);
+        queryClient.invalidateQueries({ queryKey: ["sessions"] });
+        queryClient.invalidateQueries({
+          queryKey: ["messages", sessionId]
+        });
+        queryClient.invalidateQueries({
+          queryKey: ["messages", result.sessionId]
+        });
+        openPlatformSession(result.sessionId);
+        toast.success("Handoff created");
+      } catch (error) {
+        toast.error(error instanceof Error ? error.message : "Failed to create handoff");
+      } finally {
+        useToastStore.getState().removeToast(toastId2);
+      }
     } else if (commandId === "delete") {
       deleteSession.mutate(sessionId, {
         onSuccess: () => {
@@ -7913,7 +8054,9 @@ function getLanguageFromPath(path) {
     html: "html",
     css: "css",
     scss: "scss",
-    md: "markdown",
+    md: "text",
+    markdown: "text",
+    mdx: "text",
     txt: "text",
     svelte: "svelte"
   };
@@ -7928,6 +8071,11 @@ function parseDiff(patch) {
   let inHunk = false;
   let filePath = "";
   for (const line of lines) {
+    const lineModePath = line.match(/^\*\*\* (?:Delete Lines in|Replace Lines in|Insert Before in|Insert After in): (.+)$/);
+    if (lineModePath?.[1]) {
+      filePath = lineModePath[1];
+      inHunk = false;
+    }
     if (line.startsWith("*** Update File:") || line.startsWith("*** Add File:")) {
       const match = line.match(/\*\*\* (?:Update|Add) File: (.+)/);
       if (match)
@@ -12913,101 +13061,83 @@ var MessagePartItem = memo10(function MessagePartItem2({
       } else if (data) {
         content = JSON.stringify(data, null, 2);
       }
-      return /* @__PURE__ */ jsxs50("div", {
+      return /* @__PURE__ */ jsx59("div", {
         className: "relative group",
-        children: [
-          /* @__PURE__ */ jsx59("div", {
-            className: "absolute -top-1 right-0 opacity-0 group-hover:opacity-100 transition-opacity z-10",
-            children: /* @__PURE__ */ jsx59(CopyButton, {
-              text: content,
-              className: "bg-background/80 backdrop-blur-sm border border-border/50 shadow-sm",
-              size: "md"
-            })
-          }),
-          /* @__PURE__ */ jsx59("div", {
-            className: `${isCompactThread ? "text-[16.5px]" : "text-[17px]"} text-foreground leading-relaxed markdown-content max-w-full overflow-x-auto`,
-            children: /* @__PURE__ */ jsx59(ReactMarkdown, {
-              remarkPlugins: [remarkGfm],
-              components: {
-                a: ({
-                  href,
-                  children,
-                  ...props
-                }) => /* @__PURE__ */ jsx59("a", {
-                  href,
-                  target: "_blank",
-                  rel: "noopener noreferrer",
-                  className: "text-primary underline decoration-primary/35 underline-offset-2 transition-colors hover:text-primary/90 hover:decoration-primary",
-                  onClick: (e) => {
-                    if (window.self !== window.top && href) {
-                      e.preventDefault();
-                      window.parent.postMessage({
-                        type: "otto-open-url",
-                        url: href
-                      }, "*");
+        children: /* @__PURE__ */ jsx59("div", {
+          className: `${isCompactThread ? "text-[16.5px]" : "text-[17px]"} text-foreground leading-relaxed markdown-content max-w-full overflow-x-auto`,
+          children: /* @__PURE__ */ jsx59(ReactMarkdown, {
+            remarkPlugins: [remarkGfm],
+            components: {
+              a: ({
+                href,
+                children,
+                ...props
+              }) => /* @__PURE__ */ jsx59("a", {
+                href,
+                target: "_blank",
+                rel: "noopener noreferrer",
+                className: "text-primary underline decoration-primary/35 underline-offset-2 transition-colors hover:text-primary/90 hover:decoration-primary",
+                onClick: (e) => {
+                  if (window.self !== window.top && href) {
+                    e.preventDefault();
+                    window.parent.postMessage({
+                      type: "otto-open-url",
+                      url: href
+                    }, "*");
+                  }
+                },
+                ...props,
+                children
+              }),
+              pre: ({
+                children,
+                ...props
+              }) => {
+                const codeContent = (() => {
+                  if (!children)
+                    return "";
+                  const child = Array.isArray(children) ? children[0] : children;
+                  if (child && typeof child === "object" && "props" in child) {
+                    const codeProps = child.props;
+                    if (typeof codeProps.children === "string") {
+                      return codeProps.children;
                     }
-                  },
+                  }
+                  return "";
+                })();
+                return /* @__PURE__ */ jsxs50("div", {
+                  className: "relative group/code my-3",
+                  children: [
+                    /* @__PURE__ */ jsx59("div", {
+                      className: "absolute top-2 right-2 opacity-0 group-hover/code:opacity-100 transition-opacity z-10",
+                      children: /* @__PURE__ */ jsx59(CopyButton, {
+                        text: codeContent,
+                        className: "bg-background/80 backdrop-blur-sm border border-border/50 shadow-sm",
+                        size: "sm"
+                      })
+                    }),
+                    /* @__PURE__ */ jsx59("pre", {
+                      ...props,
+                      className: "overflow-x-auto",
+                      children
+                    })
+                  ]
+                });
+              },
+              table: ({
+                children,
+                ...props
+              }) => /* @__PURE__ */ jsx59("div", {
+                className: "overflow-x-auto max-w-full min-w-0 my-3",
+                children: /* @__PURE__ */ jsx59("table", {
                   ...props,
                   children
-                }),
-                pre: ({
-                  children,
-                  ...props
-                }) => {
-                  const codeContent = (() => {
-                    if (!children)
-                      return "";
-                    const child = Array.isArray(children) ? children[0] : children;
-                    if (child && typeof child === "object" && "props" in child) {
-                      const codeProps = child.props;
-                      if (typeof codeProps.children === "string") {
-                        return codeProps.children;
-                      }
-                    }
-                    return "";
-                  })();
-                  return /* @__PURE__ */ jsxs50("div", {
-                    className: "relative group/code my-3",
-                    children: [
-                      /* @__PURE__ */ jsx59("div", {
-                        className: "absolute top-2 right-2 opacity-0 group-hover/code:opacity-100 transition-opacity z-10",
-                        children: /* @__PURE__ */ jsx59(CopyButton, {
-                          text: codeContent,
-                          className: "bg-background/80 backdrop-blur-sm border border-border/50 shadow-sm",
-                          size: "sm"
-                        })
-                      }),
-                      /* @__PURE__ */ jsx59("pre", {
-                        ...props,
-                        className: "overflow-x-auto",
-                        children
-                      })
-                    ]
-                  });
-                },
-                table: ({
-                  children,
-                  ...props
-                }) => /* @__PURE__ */ jsx59("div", {
-                  className: "overflow-x-auto max-w-full min-w-0 my-3",
-                  children: /* @__PURE__ */ jsx59("table", {
-                    ...props,
-                    children
-                  })
                 })
-              },
-              children: content
-            })
-          }),
-          content.length > 500 && /* @__PURE__ */ jsx59("div", {
-            className: "absolute -bottom-1 right-0 opacity-0 group-hover:opacity-100 transition-opacity z-10",
-            children: /* @__PURE__ */ jsx59(CopyButton, {
-              text: content,
-              className: "bg-background/80 backdrop-blur-sm border border-border/50 shadow-sm",
-              size: "md"
-            })
+              })
+            },
+            children: content
           })
-        ]
+        })
       });
     }
     if (part.type === "error") {
@@ -14059,7 +14189,7 @@ function ActionToolBox({ part, showLine, compact }) {
                       },
                       children: /* @__PURE__ */ jsx61("pre", {
                         ref: contentMeasureRef,
-                        className: "px-1 pt-2.5 pb-1 text-[12px] leading-relaxed text-foreground/60 font-mono whitespace-pre-wrap break-all",
+                        className: "px-1 pt-2.5 pb-1 text-[12px] leading-relaxed text-foreground/60 font-mono whitespace-pre-wrap break-words",
                         children: displayContent
                       })
                     })
@@ -14123,20 +14253,10 @@ function extractJsonStringField(raw, field) {
   let result = "";
   let i = start;
   while (i < raw.length) {
-    if (raw[i] === "\\" && i + 1 < raw.length) {
-      const next = raw[i + 1];
-      if (next === "n")
-        result += `
-`;
-      else if (next === "t")
-        result += "\t";
-      else if (next === '"')
-        result += '"';
-      else if (next === "\\")
-        result += "\\";
-      else
-        result += next;
-      i += 2;
+    const decoded = decodeJsonStringChar(raw, i);
+    if (decoded) {
+      result += decoded.value;
+      i = decoded.nextIndex;
     } else if (raw[i] === '"') {
       break;
     } else {
@@ -14146,6 +14266,38 @@ function extractJsonStringField(raw, field) {
   }
   return result;
 }
+function decodeJsonStringChar(raw, index) {
+  if (raw[index] !== "\\" || index + 1 >= raw.length)
+    return null;
+  const next = raw[index + 1];
+  if (next === "n")
+    return { value: `
+`, nextIndex: index + 2 };
+  if (next === "t")
+    return { value: "\t", nextIndex: index + 2 };
+  if (next === "r")
+    return { value: "\r", nextIndex: index + 2 };
+  if (next === "b")
+    return { value: "\b", nextIndex: index + 2 };
+  if (next === "f")
+    return { value: "\f", nextIndex: index + 2 };
+  if (next === '"')
+    return { value: '"', nextIndex: index + 2 };
+  if (next === "\\")
+    return { value: "\\", nextIndex: index + 2 };
+  if (next === "/")
+    return { value: "/", nextIndex: index + 2 };
+  if (next === "u" && index + 5 < raw.length) {
+    const hex = raw.slice(index + 2, index + 6);
+    if (/^[0-9a-fA-F]{4}$/.test(hex)) {
+      return {
+        value: String.fromCharCode(Number.parseInt(hex, 16)),
+        nextIndex: index + 6
+      };
+    }
+  }
+  return { value: next, nextIndex: index + 2 };
+}
 function extractJsonStringFieldPreview(raw, field) {
   const pattern = new RegExp(`"${field}"\\s*:\\s*"`);
   const m = pattern.exec(raw);
@@ -14155,8 +14307,25 @@ function extractJsonStringFieldPreview(raw, field) {
   if (raw.length - start <= LIVE_TOOL_CONTENT_PREVIEW_CHARS) {
     return extractJsonStringField(raw, field);
   }
+  let result = "";
+  let i = start;
+  while (i < raw.length) {
+    const decoded = decodeJsonStringChar(raw, i);
+    if (decoded) {
+      result += decoded.value;
+      i = decoded.nextIndex;
+    } else if (raw[i] === '"') {
+      break;
+    } else {
+      result += raw[i];
+      i += 1;
+    }
+    if (result.length > LIVE_TOOL_CONTENT_PREVIEW_CHARS) {
+      result = result.slice(-LIVE_TOOL_CONTENT_PREVIEW_CHARS);
+    }
+  }
   return `… showing latest streamed content only …
-${raw.slice(-LIVE_TOOL_CONTENT_PREVIEW_CHARS)}`;
+${result}`;
 }
 function getLiveToolContentPreview(toolName, content) {
   if (toolName !== "write" && toolName !== "apply_patch" && content.length <= LIVE_TOOL_CONTENT_PREVIEW_CHARS) {
@@ -15837,21 +16006,23 @@ var UsageModal = memo14(function UsageModal2() {
 // src/hooks/useProviderUsage.ts
 import { useEffect as useEffect23, useCallback as useCallback15, useRef as useRef15 } from "react";
 var POLL_INTERVAL = 60000;
-var STALE_THRESHOLD = 30000;
+var STALE_THRESHOLD = 60000;
 var inflight = new Set;
 function useProviderUsage(provider, authType) {
   const setUsage = useUsageStore((s) => s.setUsage);
   const setLoading = useUsageStore((s) => s.setLoading);
   const setLastFetched = useUsageStore((s) => s.setLastFetched);
+  const isModalOpen = useUsageStore((s) => s.isModalOpen);
+  const modalProvider = useUsageStore((s) => s.modalProvider);
   const usage = useUsageStore((s) => provider ? s.usage[provider] : undefined);
   const isOAuthProvider = authType === "oauth" && (provider === "anthropic" || provider === "openai");
-  const fetchUsage = useCallback15(async () => {
+  const fetchUsage = useCallback15(async (force = false) => {
     if (!provider || !isOAuthProvider)
       return;
     if (inflight.has(provider))
       return;
     const last = useUsageStore.getState().lastFetched[provider] ?? 0;
-    if (last && Date.now() - last < STALE_THRESHOLD)
+    if (!force && last && Date.now() - last < STALE_THRESHOLD)
       return;
     inflight.add(provider);
     setLoading(provider, true);
@@ -15870,9 +16041,15 @@ function useProviderUsage(provider, authType) {
     if (!provider || !isOAuthProvider)
       return;
     fetchRef.current();
+  }, [isOAuthProvider, provider]);
+  useEffect23(() => {
+    if (!provider || !isOAuthProvider || !isModalOpen || modalProvider !== provider) {
+      return;
+    }
+    fetchRef.current(true);
     const interval = setInterval(() => fetchRef.current(), POLL_INTERVAL);
     return () => clearInterval(interval);
-  }, [isOAuthProvider, provider]);
+  }, [isModalOpen, isOAuthProvider, modalProvider, provider]);
   return {
     usage,
     fetchUsage,
@@ -16585,7 +16762,7 @@ var MessageThread = memo16(function MessageThread2({
     }
   };
   const filteredMessages = useMemo17(() => {
-    const visibleMessages = messages.filter((message) => message.role !== "system");
+    const visibleMessages = messages.filter((message) => message.role !== "system" && !(message.role === "assistant" && message.status === "complete" && (message.parts?.length ?? 0) === 0));
     const queueBusy = Boolean(queueState.currentMessageId) || queueState.queueLength > 0;
     if (!queueBusy)
       return visibleMessages;
@@ -16756,7 +16933,8 @@ var MessageThread = memo16(function MessageThread2({
   });
 });
 // src/components/messages/MessageThreadContainer.tsx
-import { memo as memo19, useMemo as useMemo18 } from "react";
+import { memo as memo19, useEffect as useEffect29, useMemo as useMemo18 } from "react";
+import { useQueryClient as useQueryClient12 } from "@tanstack/react-query";
 
 // src/hooks/useSessionStream.ts
 import { useEffect as useEffect26, useRef as useRef18 } from "react";
@@ -17163,22 +17341,30 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
         return;
       let changeLines = 0;
       let stableChangeLength = 0;
+      let lineDirectiveCount = 0;
       for (const line of stablePatch.split(`
 `)) {
         if (line.startsWith("+") && !line.startsWith("+++") || line.startsWith("-") && !line.startsWith("---")) {
           changeLines += 1;
           stableChangeLength += line.length;
+        } else if (/^\*\*\* (?:Delete Lines in|Replace Lines in|Insert Before in|Insert After in): /.test(line) || line.startsWith("*** Lines:") || line.startsWith("*** Line:") || line.startsWith("*** With:")) {
+          lineDirectiveCount += 1;
         }
       }
-      return changeLines > 0 ? `${changeLines}:${stableChangeLength}` : undefined;
+      if (changeLines > 0)
+        return `${changeLines}:${stableChangeLength}`;
+      return lineDirectiveCount > 0 ? `lines:${lineDirectiveCount}:${stablePatch.length}` : undefined;
     };
     const extractPathsFromPatch = (patch) => {
       const paths = new Set;
       for (const line of patch.split(`
 `)) {
         const directive = line.match(/^\*\*\* (?:Update|Add|Delete) File: (.+)$/);
-        if (directive?.[1]) {
-          paths.add(directive[1].trim());
+        const replaceDirective = line.match(/^\*\*\* Replace in: (.+)$/);
+        const lineDirective = line.match(/^\*\*\* (?:Delete Lines in|Replace Lines in|Insert Before in|Insert After in): (.+)$/);
+        const path = directive?.[1] ?? replaceDirective?.[1] ?? lineDirective?.[1];
+        if (path) {
+          paths.add(path.trim());
           continue;
         }
         const unified = line.match(/^\+\+\+ (?:b\/)?(.+)$/);
@@ -17188,6 +17374,47 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
       }
       return [...paths];
     };
+    const getExtension = (path) => path.split(".").pop()?.toLowerCase() ?? "";
+    const updateFileContentCache = (path, content) => {
+      queryClient.setQueryData(["files", "read", path], {
+        content,
+        path,
+        extension: getExtension(path),
+        lineCount: content.split(`
+`).length
+      });
+    };
+    const mergeReadResultIntoFileCache = (path, result, startLine, endLine) => {
+      if (typeof result?.content !== "string")
+        return;
+      const readContent = result.content;
+      if (!startLine || !endLine) {
+        updateFileContentCache(path, readContent);
+        return;
+      }
+      queryClient.setQueryData(["files", "read", path], (current) => {
+        if (!current?.content)
+          return current;
+        const lines = current.content.split(`
+`);
+        if (lines.at(-1) === "")
+          lines.pop();
+        const readLines = readContent.split(`
+`);
+        lines.splice(startLine - 1, endLine - startLine + 1, ...readLines);
+        const content = `${lines.join(`
+`)}
+`;
+        return {
+          ...current,
+          content,
+          lineCount: typeof result.totalLines === "number" ? result.totalLines : lines.length
+        };
+      });
+    };
+    const invalidateFileContentCache = (path) => {
+      queryClient.invalidateQueries({ queryKey: ["files", "read", path] });
+    };
     const getChangedLinesForPath = (result, path) => {
       const changes = Array.isArray(result?.changes) ? result.changes : [];
       const lines = new Set;
@@ -17217,9 +17444,6 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
       return lines.size > 0 ? [...lines] : undefined;
     };
     const handleReadToolActivity = (eventType, payload, delta) => {
-      const viewerStore = useViewerTabsStore.getState();
-      if (!viewerStore.followToolActivity)
-        return;
       const name = getToolEventName(payload);
       if (name !== "read")
         return;
@@ -17232,6 +17456,12 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
       const startLine = normalizeLineNumber(args.startLine) ?? normalizeLineNumber(args.start_line) ?? rangeFromResult.startLine;
       const endLine = normalizeLineNumber(args.endLine) ?? normalizeLineNumber(args.end_line) ?? rangeFromResult.endLine ?? startLine;
       const failed = result?.ok === false || eventType === "error";
+      if (eventType === "tool.result" && !failed) {
+        mergeReadResultIntoFileCache(path, result, startLine, endLine);
+      }
+      const viewerStore = useViewerTabsStore.getState();
+      if (!viewerStore.followToolActivity)
+        return;
       viewerStore.openToolReadTab(path, {
         startLine,
         endLine,
@@ -17241,9 +17471,6 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
       });
     };
     const handleWriteToolActivity = (eventType, payload, delta) => {
-      const viewerStore = useViewerTabsStore.getState();
-      if (!viewerStore.followToolActivity)
-        return;
       const name = getToolEventName(payload);
       if (name !== "write")
         return;
@@ -17257,6 +17484,15 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
       const callId = getToolEventCallId(payload) ?? undefined;
       const status = failed ? "error" : eventType === "tool.result" ? "success" : "streaming";
       const content = status === "streaming" ? getStreamingWritePreviewContent(args, buffer) : getStringArg(args, buffer, "content");
+      if (status === "success") {
+        if (content !== undefined)
+          updateFileContentCache(path, content);
+        else
+          invalidateFileContentCache(path);
+      }
+      const viewerStore = useViewerTabsStore.getState();
+      if (!viewerStore.followToolActivity)
+        return;
       if (status === "streaming" && content !== undefined && content.length >= TOOL_PREVIEW_THROTTLE_MIN_CHARS) {
         const previewKey = callId ?? path;
         const now = Date.now();
@@ -17280,9 +17516,6 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
       });
     };
     const handleApplyPatchToolActivity = (eventType, payload, delta) => {
-      const viewerStore = useViewerTabsStore.getState();
-      if (!viewerStore.followToolActivity)
-        return;
       const name = getToolEventName(payload);
       if (name !== "apply_patch")
         return;
@@ -17306,6 +17539,13 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
       const patchPaths = extractPathsFromPatch(patch);
       if (patchPaths.length === 0)
         return;
+      if (status === "success") {
+        for (const path of patchPaths)
+          invalidateFileContentCache(path);
+      }
+      const viewerStore = useViewerTabsStore.getState();
+      if (!viewerStore.followToolActivity)
+        return;
       const matchingFileTabs = viewerStore.tabs.filter((tab) => tab.type === "file" && patchPaths.some((path) => patchPathMayReferToTarget(path, tab.path)));
       const activeMatchingFileTab = matchingFileTabs.find((tab) => tab.id === viewerStore.activeTabId);
       const fallbackPath = patchPaths.find(isLikelyCompletePatchPath);
@@ -17411,6 +17651,11 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
     const applyMessageDelta = (payload) => {
       const messageId = typeof payload?.messageId === "string" ? payload.messageId : null;
       const partId = typeof payload?.partId === "string" ? payload.partId : null;
+      const payloadType = typeof payload?.type === "string" ? payload.type : undefined;
+      if (payloadType === "error") {
+        upsertErrorPart(payload);
+        return;
+      }
       const delta = typeof payload?.delta === "string" ? payload.delta : null;
       if (!messageId || !partId || delta === null)
         return;
@@ -17461,6 +17706,90 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
         return nextMessages;
       });
     };
+    const toRecord = (value) => {
+      if (value && typeof value === "object" && !Array.isArray(value)) {
+        return value;
+      }
+      return null;
+    };
+    const parseErrorContent = (payload) => {
+      const contentRecord = toRecord(payload.content);
+      if (contentRecord)
+        return contentRecord;
+      if (typeof payload.content === "string") {
+        try {
+          const parsed = JSON.parse(payload.content);
+          const parsedRecord = toRecord(parsed);
+          if (parsedRecord)
+            return parsedRecord;
+        } catch {}
+      }
+      const message = typeof payload.error === "string" ? payload.error : typeof payload.message === "string" ? payload.message : "Assistant run failed";
+      return {
+        message,
+        type: typeof payload.errorType === "string" ? payload.errorType : "error",
+        details: toRecord(payload.details) ?? undefined,
+        isAborted: payload.isAborted === true,
+        autoCompacted: payload.autoCompacted === true
+      };
+    };
+    const upsertErrorPart = (payload) => {
+      const messageId = typeof payload?.messageId === "string" ? payload.messageId : null;
+      if (!payload || !messageId)
+        return;
+      const contentJson = parseErrorContent(payload);
+      const content = JSON.stringify(contentJson);
+      const errorMessage = typeof contentJson.message === "string" ? contentJson.message : typeof payload.error === "string" ? payload.error : "Assistant run failed";
+      const stepIndex = typeof payload.stepIndex === "number" ? payload.stepIndex : null;
+      const partId = typeof payload.partId === "string" ? payload.partId : `error-${messageId}`;
+      queryClient.setQueryData(["messages", sessionId], (oldMessages) => {
+        if (!oldMessages)
+          return oldMessages;
+        const nextMessages = [...oldMessages];
+        const messageIndex = nextMessages.findIndex((message) => message.id === messageId);
+        if (messageIndex === -1)
+          return oldMessages;
+        const targetMessage = nextMessages[messageIndex];
+        const parts = targetMessage.parts ? [...targetMessage.parts] : [];
+        const partIndex = parts.findIndex((part) => part.id === partId);
+        if (partIndex === -1) {
+          const newPart = {
+            id: partId,
+            messageId,
+            index: getOptimisticPartIndex(parts, stepIndex),
+            stepIndex,
+            type: "error",
+            content,
+            contentJson,
+            agent: targetMessage.agent,
+            provider: targetMessage.provider,
+            model: targetMessage.model,
+            startedAt: Date.now(),
+            completedAt: Date.now(),
+            toolName: null,
+            toolCallId: null,
+            toolDurationMs: null
+          };
+          parts.push(newPart);
+        } else {
+          parts[partIndex] = {
+            ...parts[partIndex],
+            content,
+            contentJson,
+            stepIndex: stepIndex ?? parts[partIndex].stepIndex ?? null,
+            completedAt: Date.now()
+          };
+        }
+        nextMessages[messageIndex] = {
+          ...targetMessage,
+          status: "error",
+          completedAt: targetMessage.completedAt ?? Date.now(),
+          error: errorMessage,
+          parts
+        };
+        return nextMessages;
+      });
+    };
     const upsertEphemeralToolCall = (payload) => {
       if (!payload)
         return;
@@ -17890,6 +18219,17 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
           }
           markMessageCompleted(payload);
           clearEphemeralForMessage(id);
+          if (id) {
+            queryClient.setQueryData(["queueState", sessionId], (current) => {
+              if (!current || current.currentMessageId !== id)
+                return current;
+              return normalizeQueueState({
+                currentMessageId: null,
+                queuedMessages: [],
+                isRunning: false
+              });
+            });
+          }
           queryClient.invalidateQueries({ queryKey: ["messages", sessionId] });
           queryClient.invalidateQueries({ queryKey: sessionsQueryKey });
           break;
@@ -17963,22 +18303,7 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
               assistantMessageIdRef.current = null;
             }
             clearEphemeralForMessage(messageId);
-            const errorMessage = typeof payload?.error === "string" ? payload.error : typeof payload?.message === "string" ? payload.message : "Assistant run failed";
-            queryClient.setQueryData(["messages", sessionId], (oldMessages) => {
-              if (!oldMessages)
-                return oldMessages;
-              const idx = oldMessages.findIndex((m) => m.id === messageId);
-              if (idx === -1)
-                return oldMessages;
-              const next = [...oldMessages];
-              next[idx] = {
-                ...next[idx],
-                status: "error",
-                completedAt: next[idx].completedAt ?? Date.now(),
-                error: errorMessage
-              };
-              return next;
-            });
+            upsertErrorPart(payload);
           }
           queryClient.invalidateQueries({ queryKey: ["messages", sessionId] });
           break;
@@ -18013,11 +18338,11 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
           break;
         }
         case "queue.updated": {
-          const queueState = {
+          const queueState = normalizeQueueState({
             currentMessageId: payload?.currentMessageId,
             queuedMessages: payload?.queuedMessages ?? [],
-            queueLength: payload?.queueLength ?? 0
-          };
+            isRunning: typeof payload?.isRunning === "boolean" ? payload.isRunning : undefined
+          });
           queryClient.setQueryData(["queueState", sessionId], queueState);
           break;
         }
@@ -18962,10 +19287,16 @@ var MessageThreadContainer = memo19(function MessageThreadContainer2({
   sessionId,
   onSelectSession
 }) {
+  const queryClient = useQueryClient12();
   const { data: messages = [], isLoading } = useMessages(sessionId);
   const { data: sessions = [] } = useSessions();
   const { preferences: preferences2 } = usePreferences();
   useSessionStream(sessionId);
+  useEffect29(() => {
+    queryClient.invalidateQueries({ queryKey: ["messages", sessionId] });
+    queryClient.invalidateQueries({ queryKey: ["queueState", sessionId] });
+    queryClient.invalidateQueries({ queryKey: sessionsQueryKey });
+  }, [queryClient, sessionId]);
   useToolApprovalShortcuts(sessionId);
   const session = useMemo18(() => sessions.find((s) => s.id === sessionId), [sessions, sessionId]);
   const isGenerating = useMemo18(() => messages.some((m) => m.role === "assistant" && m.status === "pending"), [messages]);
@@ -19110,7 +19441,7 @@ var SessionItem = memo20(function SessionItem2({
   });
 });
 // src/components/sessions/SessionListContainer.tsx
-import { memo as memo21, useMemo as useMemo19, useCallback as useCallback20, useEffect as useEffect29, useRef as useRef20 } from "react";
+import { memo as memo21, useMemo as useMemo19, useCallback as useCallback20, useEffect as useEffect30, useRef as useRef20 } from "react";
 
 // src/stores/focusStore.ts
 import { create as create20 } from "zustand";
@@ -19206,7 +19537,7 @@ var SessionListContainer = memo21(function SessionListContainer2({
       sessions: groupedSessions
     }));
   }, [sessionSnapshot, statusSessionIds]);
-  useEffect29(() => {
+  useEffect30(() => {
     if (currentFocus === "sessions") {
       const session = sessionSnapshot[sessionIndex];
       if (session) {
@@ -19229,14 +19560,14 @@ var SessionListContainer = memo21(function SessionListContainer2({
       onError: () => markedViewedRef.current.delete(session.id)
     });
   }, [markSessionViewed, sessionSnapshot]);
-  useEffect29(() => {
+  useEffect30(() => {
     const previousId = previousActiveSessionId.current;
     if (previousId && previousId !== activeSessionId) {
       markViewedIfReady(previousId);
     }
     previousActiveSessionId.current = activeSessionId;
   }, [activeSessionId, markViewedIfReady]);
-  useEffect29(() => {
+  useEffect30(() => {
     if (!activeSessionId || lastScrolledSessionId.current === activeSessionId || sessions.length === 0)
       return;
     const activeIndex = sessions.findIndex((s) => s.id === activeSessionId);
@@ -19252,7 +19583,7 @@ var SessionListContainer = memo21(function SessionListContainer2({
       });
     }
   }, [activeSessionId, sessions, hasNextPage, fetchNextPage]);
-  useEffect29(() => {
+  useEffect30(() => {
     const container = scrollContainerRef.current;
     if (!container)
       return;
@@ -19273,7 +19604,7 @@ var SessionListContainer = memo21(function SessionListContainer2({
     container.addEventListener("scroll", handleScroll, { passive: true });
     return () => container.removeEventListener("scroll", handleScroll);
   }, [hasNextPage, isFetchingNextPage, fetchNextPage]);
-  useEffect29(() => {
+  useEffect30(() => {
     const container = scrollContainerRef.current;
     const sentinel = paginationSentinelRef.current;
     if (!container || !sentinel || typeof IntersectionObserver === "undefined") {
@@ -19422,7 +19753,7 @@ import {
   lineNumbers
 } from "@codemirror/view";
 import { tags } from "@lezer/highlight";
-import { useCallback as useCallback21, useEffect as useEffect30, useMemo as useMemo20, useRef as useRef21 } from "react";
+import { useCallback as useCallback21, useEffect as useEffect31, useMemo as useMemo20, useRef as useRef21 } from "react";
 import { jsx as jsx78 } from "react/jsx-runtime";
 var viewerTheme = EditorView.theme({
   "&": {
@@ -19579,7 +19910,7 @@ var syntaxTheme = HighlightStyle.define([
   { tag: tags.invalid, color: "var(--otto-cm-invalid)" }
 ]);
 function lineDecorationsExtension(highlightedLines, highlightTone = "primary", lineTones) {
-  return EditorView.decorations.compute([], (state) => {
+  return EditorView.decorations.compute(["doc"], (state) => {
     const decorations = [];
     for (const [line, tone] of lineTones ?? []) {
       if (line > 0)
@@ -19600,7 +19931,7 @@ function lineDecorationsExtension(highlightedLines, highlightTone = "primary", l
     return builder.finish();
   });
 }
-function getLanguageExtension(path) {
+function getLanguageExtension(path, disableMarkdownSyntax = false) {
   const ext = path?.split(".").pop()?.toLowerCase() ?? "";
   switch (ext) {
     case "js":
@@ -19632,6 +19963,8 @@ function getLanguageExtension(path) {
     case "md":
     case "markdown":
     case "mdx":
+      if (disableMarkdownSyntax)
+        return [];
       return markdown();
     case "sql":
       return sql();
@@ -19658,7 +19991,8 @@ function CodeMirrorViewer({
   highlightTone = "primary",
   lineTones,
   scrollToLine,
-  scrollToEndSignal
+  scrollToEndSignal,
+  disableMarkdownSyntax = false
 }) {
   const hostRef = useRef21(null);
   const viewRef = useRef21(null);
@@ -19667,7 +20001,7 @@ function CodeMirrorViewer({
   const decorationsCompartmentRef = useRef21(new Compartment);
   const languageExtensionRef = useRef21([]);
   const decorationsExtensionRef = useRef21([]);
-  const languageExtension = useMemo20(() => getLanguageExtension(path), [path]);
+  const languageExtension = useMemo20(() => getLanguageExtension(path, disableMarkdownSyntax), [path, disableMarkdownSyntax]);
   const decorationsExtension = useMemo20(() => lineDecorationsExtension(highlightedLines, highlightTone, lineTones), [highlightedLines, highlightTone, lineTones]);
   languageExtensionRef.current = languageExtension;
   decorationsExtensionRef.current = decorationsExtension;
@@ -19683,7 +20017,7 @@ function CodeMirrorViewer({
       decorationsCompartmentRef.current.of(decorationsExtension)
     ]
   }), [languageExtension, decorationsExtension]);
-  useEffect30(() => {
+  useEffect31(() => {
     const host = hostRef.current;
     if (!host)
       return;
@@ -19710,7 +20044,7 @@ function CodeMirrorViewer({
       viewRef.current = null;
     };
   }, []);
-  useEffect30(() => {
+  useEffect31(() => {
     const view = viewRef.current;
     if (!view)
       return;
@@ -19722,7 +20056,7 @@ function CodeMirrorViewer({
       view.setState(createEditorState(contentRef.current));
     }
   }, [languageExtension, createEditorState]);
-  useEffect30(() => {
+  useEffect31(() => {
     const view = viewRef.current;
     if (!view)
       return;
@@ -19734,7 +20068,7 @@ function CodeMirrorViewer({
       view.setState(createEditorState(contentRef.current));
     }
   }, [decorationsExtension, createEditorState]);
-  useEffect30(() => {
+  useEffect31(() => {
     const view = viewRef.current;
     if (!view)
       return;
@@ -19750,7 +20084,7 @@ function CodeMirrorViewer({
     }
     contentRef.current = content;
   }, [content, createEditorState]);
-  useEffect30(() => {
+  useEffect31(() => {
     const view = viewRef.current;
     if (!view || !scrollToLine || scrollToLine < 1)
       return;
@@ -19763,7 +20097,7 @@ function CodeMirrorViewer({
       view.setState(createEditorState(contentRef.current));
     }
   }, [scrollToLine, createEditorState]);
-  useEffect30(() => {
+  useEffect31(() => {
     const view = viewRef.current;
     if (!view || scrollToEndSignal === undefined)
       return;
@@ -19839,7 +20173,8 @@ function GitDiffViewer({ diff: diff2 }) {
           className: "flex-1 min-h-0",
           children: /* @__PURE__ */ jsx79(CodeMirrorViewer, {
             content: diff2.content,
-            path: diff2.file
+            path: diff2.file,
+            disableMarkdownSyntax: true
           })
         })
       ]
@@ -19882,8 +20217,9 @@ function GitDiffViewer({ diff: diff2 }) {
         children: "No changes to display"
       }) : /* @__PURE__ */ jsx79(CodeMirrorViewer, {
         content: diff2.diff,
-        path: "diff.patch",
-        lineTones: getDiffLineTones(diff2.diff)
+        path: diff2.file,
+        lineTones: getDiffLineTones(diff2.diff),
+        disableMarkdownSyntax: true
       })
     })
   });
@@ -20143,7 +20479,7 @@ ${file.absPath}`,
 }
 
 // src/components/git/GitFileList.tsx
-import { useEffect as useEffect31, useRef as useRef22, useMemo as useMemo21 } from "react";
+import { useEffect as useEffect32, useRef as useRef22, useMemo as useMemo21 } from "react";
 import { jsx as jsx81, jsxs as jsxs70 } from "react/jsx-runtime";
 function GitFileList({ status }) {
   const { openCommitModal, openDiff } = useGitStore();
@@ -20177,7 +20513,7 @@ function GitFileList({ status }) {
     }
   };
   const conflictedLength = status.conflicted?.length ?? 0;
-  useEffect31(() => {
+  useEffect32(() => {
     if (currentFocus === "git" && gitFileIndex >= 0) {
       const element = itemRefs.current.get(gitFileIndex);
       element?.scrollIntoView({ block: "nearest", behavior: "smooth" });
@@ -20381,7 +20717,7 @@ function GitFileList({ status }) {
   });
 }
 // src/components/git/GitSidebar.tsx
-import { memo as memo22, useCallback as useCallback22, useEffect as useEffect32, useState as useState36 } from "react";
+import { memo as memo22, useCallback as useCallback22, useEffect as useEffect33, useState as useState36 } from "react";
 import {
   FolderGit2,
   ChevronRight as ChevronRight11,
@@ -20396,7 +20732,7 @@ import {
   Upload,
   X as X12
 } from "lucide-react";
-import { useQueryClient as useQueryClient12 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient13 } from "@tanstack/react-query";
 import { jsx as jsx82, jsxs as jsxs71, Fragment as Fragment33 } from "react/jsx-runtime";
 var PANEL_KEY = "git";
 var DEFAULT_WIDTH = 320;
@@ -20410,7 +20746,7 @@ var GitSidebar = memo22(function GitSidebar2({
   const panelWidth = usePanelWidthStore((s) => s.widths[PANEL_KEY] ?? DEFAULT_WIDTH);
   const { data: status, isLoading, error, refetch } = useGitStatus();
   const { data: remotes } = useGitRemotes();
-  const queryClient = useQueryClient12();
+  const queryClient = useQueryClient13();
   const pushMutation = usePushCommits();
   const pullMutation = usePullChanges();
   const initMutation = useGitInit();
@@ -20423,7 +20759,7 @@ var GitSidebar = memo22(function GitSidebar2({
   const [remoteName, setRemoteName] = useState36("origin");
   const [remoteUrl, setRemoteUrl] = useState36("");
   const [confirmRemoveRemote, setConfirmRemoveRemote] = useState36(null);
-  useEffect32(() => {
+  useEffect33(() => {
     if (isExpanded) {
       queryClient.invalidateQueries({ queryKey: ["git", "status"] });
     }
@@ -20938,11 +21274,11 @@ import { GitBranch as GitBranch9 } from "lucide-react";
 import { memo as memo23 } from "react";
 
 // src/hooks/useShortcutHintsVisible.ts
-import { useEffect as useEffect33, useState as useState37 } from "react";
+import { useEffect as useEffect34, useState as useState37 } from "react";
 var SHORTCUT_HINT_MODIFIERS = new Set(["Control", "Meta"]);
 function useShortcutHintsVisible() {
   const [isVisible, setIsVisible] = useState37(false);
-  useEffect33(() => {
+  useEffect34(() => {
     const handleKeyDown = (event) => {
       if (SHORTCUT_HINT_MODIFIERS.has(event.key) || event.ctrlKey || event.metaKey) {
         setIsVisible(true);
@@ -21008,7 +21344,7 @@ var GitSidebarToggle = memo24(function GitSidebarToggle2() {
   });
 });
 // src/components/git/GitDiffPanel.tsx
-import { useEffect as useEffect34, memo as memo25, useState as useState38 } from "react";
+import { useEffect as useEffect35, memo as memo25, useState as useState38 } from "react";
 import { X as X13, Maximize2, Minimize2 as Minimize22 } from "lucide-react";
 
 // src/hooks/useFileBrowser.ts
@@ -21063,11 +21399,11 @@ var GitDiffPanel = memo25(function GitDiffPanel2({
   const { data: fullFileDiff, isLoading: fullFileLoading } = useGitDiffFullFile(selectedFile, selectedFileStaged, showFullFile);
   const activeDiff = showFullFile && fullFileDiff ? fullFileDiff : diff2;
   const activeLoading = showFullFile ? fullFileLoading : isLoading;
-  useEffect34(() => {
+  useEffect35(() => {
     if (!isDiffOpen)
       setShowFullFile(false);
   }, [isDiffOpen]);
-  useEffect34(() => {
+  useEffect35(() => {
     const handleEscape = (e) => {
       const target = e.target;
       const isInInput = target.tagName === "INPUT" || target.tagName === "TEXTAREA" || target.isContentEditable;
@@ -21162,7 +21498,7 @@ ${activeDiff?.absPath || ""}`,
   });
 });
 // src/components/git/GitCommitModal.tsx
-import { useState as useState39, useId as useId2, useEffect as useEffect35, useCallback as useCallback23 } from "react";
+import { useState as useState39, useId as useId2, useEffect as useEffect36, useCallback as useCallback23 } from "react";
 import { GitCommit as GitCommit4, Sparkles as Sparkles5 } from "lucide-react";
 import { jsx as jsx86, jsxs as jsxs74, Fragment as Fragment34 } from "react/jsx-runtime";
 function GitCommitModal() {
@@ -21195,7 +21531,7 @@ function GitCommitModal() {
       console.error("Failed to generate commit message:", error);
     }
   }, [generateMessage]);
-  useEffect35(() => {
+  useEffect36(() => {
     if (!isCommitModalOpen)
       return;
     const handleKeyDown = (e) => {
@@ -21334,7 +21670,7 @@ function GitCommitModal() {
   });
 }
 // src/components/terminals/TerminalsPanel.tsx
-import { memo as memo27, useCallback as useCallback25, useRef as useRef24, useEffect as useEffect37 } from "react";
+import { memo as memo27, useCallback as useCallback25, useRef as useRef24, useEffect as useEffect38 } from "react";
 import {
   Terminal as TerminalIcon,
   Maximize2 as Maximize22,
@@ -21376,7 +21712,7 @@ var useTerminalStore = create21((set) => ({
 }));
 
 // src/hooks/useTerminals.ts
-import { useQuery as useQuery9, useMutation as useMutation6, useQueryClient as useQueryClient13 } from "@tanstack/react-query";
+import { useQuery as useQuery9, useMutation as useMutation6, useQueryClient as useQueryClient14 } from "@tanstack/react-query";
 import {
   getTerminals,
   postTerminals,
@@ -21397,7 +21733,7 @@ function useTerminals() {
   });
 }
 function useCreateTerminal() {
-  const queryClient = useQueryClient13();
+  const queryClient = useQueryClient14();
   return useMutation6({
     mutationFn: async (params) => {
       const response = await postTerminals({
@@ -21414,7 +21750,7 @@ function useCreateTerminal() {
   });
 }
 function useKillTerminal() {
-  const queryClient = useQueryClient13();
+  const queryClient = useQueryClient14();
   return useMutation6({
     mutationFn: async (terminalId) => {
       const response = await deleteTerminalsById({
@@ -21504,7 +21840,7 @@ var TerminalTabBar = memo26(function TerminalTabBar2({
 });
 
 // src/components/terminals/TerminalViewer.tsx
-import { useEffect as useEffect36, useRef as useRef23, useState as useState40, useCallback as useCallback24 } from "react";
+import { useEffect as useEffect37, useRef as useRef23, useState as useState40, useCallback as useCallback24 } from "react";
 import { init, Terminal as Terminal7, FitAddon } from "ghostty-web";
 import { client as client3 } from "@ottocode/api";
 import { jsx as jsx88, jsxs as jsxs76 } from "react/jsx-runtime";
@@ -21669,7 +22005,7 @@ function TerminalViewer({
       }
     };
   }, [terminalId]);
-  useEffect36(() => {
+  useEffect37(() => {
     if (!containerRef.current || !terminalId)
       return;
     let disposed = false;
@@ -21839,7 +22175,7 @@ function TerminalViewer({
       fitAddonRef.current = null;
     };
   }, [terminalId, connectWebSocket]);
-  useEffect36(() => {
+  useEffect37(() => {
     const term = termRef.current;
     if (!term)
       return;
@@ -21857,7 +22193,7 @@ function TerminalViewer({
       }
     }
   }, [isActive, fitTerminal]);
-  useEffect36(() => {
+  useEffect37(() => {
     fitTerminal();
   }, [fitTerminal]);
   return /* @__PURE__ */ jsx88("div", {
@@ -21914,12 +22250,12 @@ var TerminalsPanel = memo27(function TerminalsPanel2() {
   const autoCreatingRef = useRef24(false);
   const terminalsListRef = useRef24(terminalsList);
   terminalsListRef.current = terminalsList;
-  useEffect37(() => {
+  useEffect38(() => {
     if (isOpen && terminalsListRef.current.length > 0 && (!activeTabId || !terminalsListRef.current.find((t) => t.id === activeTabId))) {
       selectTab(terminalsListRef.current[0].id);
     }
   }, [isOpen, terminalsList.length, activeTabId, selectTab]);
-  useEffect37(() => {
+  useEffect38(() => {
     if (isOpen && terminals && terminalsList.length === 0 && !autoCreatingRef.current && !createTerminal.isPending) {
       autoCreatingRef.current = true;
       createTerminal.mutateAsync({
@@ -21955,7 +22291,7 @@ var TerminalsPanel = memo27(function TerminalsPanel2() {
       }
     } catch {}
   }, [killTerminal, activeTabId, selectTab, closePanel]);
-  useEffect37(() => {
+  useEffect38(() => {
     const handleKeyDown = (e) => {
       if (e.key === "`" && e.ctrlKey) {
         e.preventDefault();
@@ -22401,7 +22737,7 @@ var SessionFilesSidebarToggle = memo30(function SessionFilesSidebarToggle2({
   });
 });
 // src/components/session-files/SessionFilesDiffPanel.tsx
-import { useEffect as useEffect38, useMemo as useMemo23, memo as memo31 } from "react";
+import { useEffect as useEffect39, useMemo as useMemo23, memo as memo31 } from "react";
 import { X as X15, ChevronLeft, ChevronRight as ChevronRight12 } from "lucide-react";
 import { jsx as jsx93, jsxs as jsxs81 } from "react/jsx-runtime";
 function transformToUnifiedDiff(patch) {
@@ -22482,13 +22818,17 @@ function getPatchLineTones(patch) {
   }
   return tones;
 }
-function FullHeightDiffView({ patch }) {
+function FullHeightDiffView({
+  patch,
+  filePath
+}) {
   return /* @__PURE__ */ jsx93("div", {
     className: "bg-card/60 border border-border rounded-lg overflow-hidden h-full",
     children: /* @__PURE__ */ jsx93(CodeMirrorViewer, {
       content: patch,
-      path: "session.patch",
-      lineTones: getPatchLineTones(patch)
+      path: filePath,
+      lineTones: getPatchLineTones(patch),
+      disableMarkdownSyntax: true
     })
   });
 }
@@ -22541,7 +22881,7 @@ ${contentLines.map((line) => `+${line}`).join(`
     }
     return rawPatch;
   }, [selectedOperation, selectedFile]);
-  useEffect38(() => {
+  useEffect39(() => {
     const handleKeyDown = (e) => {
       const target = e.target;
       const isInInput = target.tagName === "INPUT" || target.tagName === "TEXTAREA" || target.isContentEditable;
@@ -22686,7 +23026,8 @@ ${contentLines.map((line) => `+${line}`).join(`
       /* @__PURE__ */ jsx93("div", {
         className: "flex-1 overflow-hidden p-4",
         children: patchContent ? /* @__PURE__ */ jsx93(FullHeightDiffView, {
-          patch: patchContent
+          patch: patchContent,
+          filePath: selectedFile
         }) : /* @__PURE__ */ jsx93("div", {
           className: "h-full flex items-center justify-center text-muted-foreground",
           children: "No diff content available"
@@ -22696,7 +23037,7 @@ ${contentLines.map((line) => `+${line}`).join(`
   });
 });
 // src/components/research/ResearchSidebar.tsx
-import { memo as memo32, useState as useState41, useEffect as useEffect39, useCallback as useCallback26, useRef as useRef25, useMemo as useMemo24 } from "react";
+import { memo as memo32, useState as useState41, useEffect as useEffect40, useCallback as useCallback26, useRef as useRef25, useMemo as useMemo24 } from "react";
 import {
   FlaskConical as FlaskConical3,
   Plus as Plus5,
@@ -22710,7 +23051,7 @@ import {
 } from "lucide-react";
 
 // src/hooks/useResearch.ts
-import { useQuery as useQuery11, useMutation as useMutation7, useQueryClient as useQueryClient14 } from "@tanstack/react-query";
+import { useQuery as useQuery11, useMutation as useMutation7, useQueryClient as useQueryClient15 } from "@tanstack/react-query";
 import {
   createResearchSession as apiCreateResearchSession,
   deleteResearchSession as apiDeleteResearchSession,
@@ -22773,7 +23114,7 @@ function useResearchSessions(parentSessionId, enabled = true) {
   });
 }
 function useCreateResearchSession() {
-  const queryClient = useQueryClient14();
+  const queryClient = useQueryClient15();
   return useMutation7({
     mutationFn: ({
       parentSessionId,
@@ -22787,7 +23128,7 @@ function useCreateResearchSession() {
   });
 }
 function useDeleteResearchSession() {
-  const queryClient = useQueryClient14();
+  const queryClient = useQueryClient15();
   return useMutation7({
     mutationFn: (researchId) => researchApi.deleteResearchSession(researchId),
     onSuccess: () => {
@@ -22814,7 +23155,7 @@ function useInjectContext() {
   });
 }
 function useExportToSession() {
-  const queryClient = useQueryClient14();
+  const queryClient = useQueryClient15();
   return useMutation7({
     mutationFn: ({
       researchId,
@@ -22827,7 +23168,7 @@ function useExportToSession() {
 }
 
 // src/components/research/ResearchSidebar.tsx
-import { useMutation as useMutation8, useQueryClient as useQueryClient15 } from "@tanstack/react-query";
+import { useMutation as useMutation8, useQueryClient as useQueryClient16 } from "@tanstack/react-query";
 import { jsx as jsx94, jsxs as jsxs82, Fragment as Fragment36 } from "react/jsx-runtime";
 var PANEL_KEY3 = "research";
 var DEFAULT_WIDTH3 = 384;
@@ -22861,7 +23202,7 @@ var ResearchSidebar = memo32(function ResearchSidebar2({
   const { data: parentMessagesData } = useMessages(parentSessionId ?? undefined, { enabled: isExpanded });
   useSessionStream(activeResearchSessionId ?? undefined, isExpanded);
   const updateSession = useUpdateSession(activeResearchSessionId ?? "");
-  const queryClient = useQueryClient15();
+  const queryClient = useQueryClient16();
   const sendMessage = useMutation8({
     mutationFn: async ({
       sessionId,
@@ -22871,12 +23212,12 @@ var ResearchSidebar = memo32(function ResearchSidebar2({
       queryClient.invalidateQueries({ queryKey: ["messages", sessionId] });
     }
   });
-  useEffect39(() => {
+  useEffect40(() => {
     if (parentSessionId) {
       useResearchStore.getState().setParentSessionId(parentSessionId);
     }
   }, [parentSessionId]);
-  useEffect39(() => {
+  useEffect40(() => {
     if (researchData?.sessions?.length) {
       const currentIsValid = researchData.sessions.some((s) => s.id === activeResearchSessionId);
       if (!currentIsValid) {
@@ -22886,7 +23227,7 @@ var ResearchSidebar = memo32(function ResearchSidebar2({
       selectResearchSession(null);
     }
   }, [researchData, activeResearchSessionId, selectResearchSession]);
-  useEffect39(() => {
+  useEffect40(() => {
     messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
   }, []);
   const adjustTextareaHeight = useCallback26(() => {
@@ -22896,7 +23237,7 @@ var ResearchSidebar = memo32(function ResearchSidebar2({
     textarea.style.height = "auto";
     textarea.style.height = `${Math.min(textarea.scrollHeight, 120)}px`;
   }, []);
-  useEffect39(() => {
+  useEffect40(() => {
     adjustTextareaHeight();
   }, [adjustTextareaHeight]);
   const handleCreateNew = useCallback26(async () => {
@@ -23390,7 +23731,7 @@ var ResearchSidebarToggle = memo33(function ResearchSidebarToggle2({
   });
 });
 // src/components/settings/SettingsSidebar.tsx
-import { memo as memo34, useState as useState43, useMemo as useMemo25, useCallback as useCallback28, useEffect as useEffect42, useRef as useRef28 } from "react";
+import { memo as memo34, useState as useState43, useMemo as useMemo25, useCallback as useCallback28, useEffect as useEffect43, useRef as useRef28 } from "react";
 import { createPortal } from "react-dom";
 import {
   Settings as Settings2,
@@ -23451,8 +23792,8 @@ var useOnboardingStore = create22((set, get) => ({
 }));
 
 // src/hooks/useAuthStatus.ts
-import { useEffect as useEffect40, useCallback as useCallback27, useState as useState42, useRef as useRef26 } from "react";
-import { useQueryClient as useQueryClient16 } from "@tanstack/react-query";
+import { useEffect as useEffect41, useCallback as useCallback27, useState as useState42, useRef as useRef26 } from "react";
+import { useQueryClient as useQueryClient17 } from "@tanstack/react-query";
 var isInIframe = typeof window !== "undefined" && window.self !== window.top;
 function useAuthStatus() {
   const setAuthStatus = useOnboardingStore((s) => s.setAuthStatus);
@@ -23461,7 +23802,7 @@ function useAuthStatus() {
   const setError = useOnboardingStore((s) => s.setError);
   const authStatus = useOnboardingStore((s) => s.authStatus);
   const isOpen = useOnboardingStore((s) => s.isOpen);
-  const queryClient = useQueryClient16();
+  const queryClient = useQueryClient17();
   const [initialized, setInitialized] = useState42(false);
   const [oauthPolling, setOauthPolling] = useState42(false);
   const oauthPollingRef = useRef26(null);
@@ -23655,7 +23996,7 @@ function useAuthStatus() {
       setLoading(false);
     }
   }, [fetchAuthStatus, setLoading, setError]);
-  useEffect40(() => {
+  useEffect41(() => {
     if (!oauthPolling || !isInIframe)
       return;
     oauthPollingRef.current = setInterval(() => {
@@ -23669,7 +24010,7 @@ function useAuthStatus() {
       clearTimeout(timeout);
     };
   }, [oauthPolling, fetchAuthStatus]);
-  useEffect40(() => {
+  useEffect41(() => {
     if (!oauthPolling || !authStatus)
       return;
     const currentConfigured = Object.entries(authStatus.providers).filter(([, p]) => p.configured);
@@ -23678,7 +24019,7 @@ function useAuthStatus() {
       setOauthPolling(false);
     }
   }, [authStatus, oauthPolling]);
-  useEffect40(() => {
+  useEffect41(() => {
     const handleOAuthMessage = (event) => {
       if (event.data?.type === "oauth-success") {
         fetchAuthStatus();
@@ -23749,14 +24090,14 @@ function useAuthStatus() {
 }
 
 // src/hooks/useTopupCallback.ts
-import { useEffect as useEffect41, useRef as useRef27 } from "react";
+import { useEffect as useEffect42, useRef as useRef27 } from "react";
 var STORAGE_KEY2 = "pendingPolarCheckout";
 function useTopupCallback() {
   const hasHandled = useRef27(false);
   const loadingToastId = useRef27(null);
   const setBalance = useOttoRouterStore((s) => s.setBalance);
   const removeToast = useToastStore((s) => s.removeToast);
-  useEffect41(() => {
+  useEffect42(() => {
     if (hasHandled.current)
       return;
     const params = new URLSearchParams(window.location.search);
@@ -23950,7 +24291,7 @@ var SelectRow = memo34(function SelectRow2({
   const [menuStyle, setMenuStyle] = useState43(null);
   const buttonRef = useRef28(null);
   const selectedOption = options.find((o) => o.id === value);
-  useEffect42(() => {
+  useEffect43(() => {
     if (!isOpen || !buttonRef.current)
       return;
     const update = () => {
@@ -24167,7 +24508,7 @@ var NumberInputRow = memo34(function NumberInputRow2({
   disabled
 }) {
   const [draft, setDraft] = useState43(value !== null && value !== undefined ? String(value) : "");
-  useEffect42(() => {
+  useEffect43(() => {
     setDraft(value !== null && value !== undefined ? String(value) : "");
   }, [value]);
   const persistedValue = value !== null && value !== undefined ? String(value) : "";
@@ -24898,8 +25239,8 @@ import {
 import { QRCodeSVG as QRCodeSVG2 } from "qrcode.react";
 
 // src/hooks/useTunnel.ts
-import { useQuery as useQuery12, useMutation as useMutation9, useQueryClient as useQueryClient17 } from "@tanstack/react-query";
-import { useEffect as useEffect43, useCallback as useCallback29, useRef as useRef29 } from "react";
+import { useQuery as useQuery12, useMutation as useMutation9, useQueryClient as useQueryClient18 } from "@tanstack/react-query";
+import { useEffect as useEffect44, useCallback as useCallback29, useRef as useRef29 } from "react";
 import {
   client as client4,
   getTunnelQr,
@@ -24942,7 +25283,7 @@ function useTunnelStatus() {
     queryFn: fetchTunnelStatus,
     refetchInterval: 3000
   });
-  useEffect43(() => {
+  useEffect44(() => {
     if (query.data) {
       setStatus(query.data.status);
       setUrl(query.data.url);
@@ -24952,7 +25293,7 @@ function useTunnelStatus() {
   return query;
 }
 function useStartTunnel() {
-  const queryClient = useQueryClient17();
+  const queryClient = useQueryClient18();
   const setStatus = useTunnelStore((s) => s.setStatus);
   const setUrl = useTunnelStore((s) => s.setUrl);
   const setError = useTunnelStore((s) => s.setError);
@@ -24984,7 +25325,7 @@ function useStartTunnel() {
   });
 }
 function useStopTunnel() {
-  const queryClient = useQueryClient17();
+  const queryClient = useQueryClient18();
   const reset = useTunnelStore((s) => s.reset);
   return useMutation9({
     mutationFn: stopTunnel,
@@ -25002,7 +25343,7 @@ function useTunnelQr() {
     queryFn: fetchTunnelQr,
     enabled: !!url
   });
-  useEffect43(() => {
+  useEffect44(() => {
     if (query.data?.ok && query.data.qrCode) {
       setQrCode(query.data.qrCode);
     }
@@ -25042,7 +25383,7 @@ function useTunnelStream() {
       eventSourceRef.current = null;
     };
   }, [setStatus, setUrl, setError, setProgress]);
-  useEffect43(() => {
+  useEffect44(() => {
     if (isExpanded) {
       const cleanup = connect();
       return cleanup;
@@ -25301,7 +25642,7 @@ var TunnelSidebarToggle = memo37(function TunnelSidebarToggle2() {
   });
 });
 // src/components/mcp/MCPSidebar.tsx
-import { memo as memo40, useState as useState46, useCallback as useCallback32, useMemo as useMemo26, useEffect as useEffect46, useRef as useRef32 } from "react";
+import { memo as memo40, useState as useState46, useCallback as useCallback32, useMemo as useMemo26, useEffect as useEffect47, useRef as useRef32 } from "react";
 import {
   ChevronDown as ChevronDown12,
   ChevronRight as ChevronRight14,
@@ -25318,11 +25659,11 @@ import {
   Wrench,
   X as X17
 } from "lucide-react";
-import { useQueryClient as useQueryClient19 } from "@tanstack/react-query";
+import { useQueryClient as useQueryClient20 } from "@tanstack/react-query";
 
 // src/hooks/useMCP.ts
-import { useQuery as useQuery13, useMutation as useMutation10, useQueryClient as useQueryClient18 } from "@tanstack/react-query";
-import { useEffect as useEffect44, useRef as useRef30, useCallback as useCallback30 } from "react";
+import { useQuery as useQuery13, useMutation as useMutation10, useQueryClient as useQueryClient19 } from "@tanstack/react-query";
+import { useEffect as useEffect45, useRef as useRef30, useCallback as useCallback30 } from "react";
 import {
   listMcpServers,
   startMcpServer,
@@ -25344,7 +25685,7 @@ function useMCPServers() {
     },
     refetchInterval: 1e4
   });
-  useEffect44(() => {
+  useEffect45(() => {
     if (query.data?.servers) {
       setServers(query.data.servers);
     }
@@ -25352,7 +25693,7 @@ function useMCPServers() {
   return query;
 }
 function useStartMCPServer() {
-  const queryClient = useQueryClient18();
+  const queryClient = useQueryClient19();
   return useMutation10({
     mutationFn: async (name) => {
       const { data, error } = await startMcpServer({
@@ -25371,7 +25712,7 @@ function useStartMCPServer() {
   });
 }
 function useStopMCPServer() {
-  const queryClient = useQueryClient18();
+  const queryClient = useQueryClient19();
   const setLoading = useMCPStore((s) => s.setLoading);
   return useMutation10({
     mutationFn: async (name) => {
@@ -25393,7 +25734,7 @@ function useStopMCPServer() {
   });
 }
 function useAddMCPServer() {
-  const queryClient = useQueryClient18();
+  const queryClient = useQueryClient19();
   return useMutation10({
     mutationFn: async (params) => {
       const { data, error } = await addMcpServer({
@@ -25412,7 +25753,7 @@ function useAddMCPServer() {
   });
 }
 function useRemoveMCPServer() {
-  const queryClient = useQueryClient18();
+  const queryClient = useQueryClient19();
   return useMutation10({
     mutationFn: async (name) => {
       const { data, error } = await removeMcpServer({
@@ -25431,7 +25772,7 @@ function useRemoveMCPServer() {
   });
 }
 function useAuthenticateMCPServer() {
-  const queryClient = useQueryClient18();
+  const queryClient = useQueryClient19();
   return useMutation10({
     mutationFn: async (name) => {
       const { data, error } = await initiateMcpAuth({
@@ -25450,7 +25791,7 @@ function useAuthenticateMCPServer() {
   });
 }
 function useRevokeMCPAuth() {
-  const queryClient = useQueryClient18();
+  const queryClient = useQueryClient19();
   return useMutation10({
     mutationFn: async (name) => {
       const { data, error } = await revokeMcpAuth({
@@ -25487,7 +25828,7 @@ function useCopilotDevicePoller() {
   const copilotDevice = useMCPStore((s) => s.copilotDevice);
   const setCopilotDevice = useMCPStore((s) => s.setCopilotDevice);
   const setLoading = useMCPStore((s) => s.setLoading);
-  const queryClient = useQueryClient18();
+  const queryClient = useQueryClient19();
   const timerRef = useRef30(null);
   const stopPolling = useCallback30(() => {
     if (timerRef.current) {
@@ -25495,7 +25836,7 @@ function useCopilotDevicePoller() {
       timerRef.current = null;
     }
   }, []);
-  useEffect44(() => {
+  useEffect45(() => {
     if (!copilotDevice) {
       stopPolling();
       return;
@@ -25531,7 +25872,7 @@ function useCopilotDevicePoller() {
 }
 
 // src/components/mcp/AddMCPServerModal.tsx
-import { memo as memo38, useState as useState45, useCallback as useCallback31, useRef as useRef31, useEffect as useEffect45 } from "react";
+import { memo as memo38, useState as useState45, useCallback as useCallback31, useRef as useRef31, useEffect as useEffect46 } from "react";
 import { Globe as Globe5, Laptop, FolderDot, Terminal as Terminal9 } from "lucide-react";
 import { jsx as jsx100, jsxs as jsxs88, Fragment as Fragment39 } from "react/jsx-runtime";
 function parseCommandString(input) {
@@ -25654,7 +25995,7 @@ var AddMCPServerModal = memo38(function AddMCPServerModal2({
   ]);
   const contentRef = useRef31(null);
   const [contentHeight, setContentHeight] = useState45(undefined);
-  useEffect45(() => {
+  useEffect46(() => {
     const el = contentRef.current;
     if (!el)
       return;
@@ -26198,7 +26539,7 @@ var MCPServerCard = memo40(function MCPServerCard2({
 function useAuthPoller(name, onAuthenticated) {
   const { data } = useMCPAuthStatus(name);
   const prevAuth = useRef32(false);
-  useEffect46(() => {
+  useEffect47(() => {
     if (data?.authenticated && !prevAuth.current) {
       onAuthenticated();
     }
@@ -26224,7 +26565,7 @@ var MCPSidebar = memo40(function MCPSidebar2() {
   const [pollingServer, setPollingServer] = useState46(null);
   const [deleteTarget, setDeleteTarget] = useState46(null);
   const [searchQuery, setSearchQuery] = useState46("");
-  const queryClient = useQueryClient19();
+  const queryClient = useQueryClient20();
   const handleAuthCompleted = useCallback32(() => {
     if (pollingServer) {
       setAuthUrl(pollingServer, null);
@@ -26233,7 +26574,7 @@ var MCPSidebar = memo40(function MCPSidebar2() {
     }
   }, [pollingServer, setAuthUrl, queryClient]);
   useAuthPoller(pollingServer, handleAuthCompleted);
-  useEffect46(() => {
+  useEffect47(() => {
     for (const name of loading) {
       const server = servers.find((s) => s.name === name);
       if (server?.connected) {
@@ -26530,8 +26871,8 @@ import {
 } from "lucide-react";
 
 // src/hooks/useSkills.ts
-import { useMutation as useMutation11, useQuery as useQuery14, useQueryClient as useQueryClient20 } from "@tanstack/react-query";
-import { useEffect as useEffect47 } from "react";
+import { useMutation as useMutation11, useQuery as useQuery14, useQueryClient as useQueryClient21 } from "@tanstack/react-query";
+import { useEffect as useEffect48 } from "react";
 function useSkills() {
   const setSkillsConfig = useSkillsStore((s) => s.setSkillsConfig);
   const query = useQuery14({
@@ -26541,7 +26882,7 @@ function useSkills() {
     },
     refetchInterval: 30000
   });
-  useEffect47(() => {
+  useEffect48(() => {
     if (query.data?.items) {
       setSkillsConfig({
         skills: query.data.items,
@@ -26554,7 +26895,7 @@ function useSkills() {
   return query;
 }
 function useUpdateSkillsConfig() {
-  const queryClient = useQueryClient20();
+  const queryClient = useQueryClient21();
   const setSkillsConfig = useSkillsStore((s) => s.setSkillsConfig);
   return useMutation11({
     mutationFn: (input) => apiClient.updateSkillsConfig(input),
@@ -26997,7 +27338,7 @@ var SkillsSidebarToggle = memo43(function SkillsSidebarToggle2() {
   });
 });
 // src/components/skills/SkillViewerPanel.tsx
-import { memo as memo44, useEffect as useEffect48 } from "react";
+import { memo as memo44, useEffect as useEffect49 } from "react";
 import { X as X19 } from "lucide-react";
 import { jsx as jsx106, jsxs as jsxs93 } from "react/jsx-runtime";
 var SkillViewerPanel = memo44(function SkillViewerPanel2({
@@ -27021,7 +27362,7 @@ var SkillViewerPanel = memo44(function SkillViewerPanel2({
   const content = isMainFile ? skillDetail?.content : fileData?.content;
   const isLoading = isMainFile ? !skillDetail : fileLoading;
   const displayPath = isMainFile ? "SKILL.md" : viewingFile ?? "";
-  useEffect48(() => {
+  useEffect49(() => {
     const handleEscape = (e) => {
       const target = e.target;
       const isInInput = target.tagName === "INPUT" || target.tagName === "TEXTAREA" || target.isContentEditable;
@@ -27091,7 +27432,7 @@ var SkillViewerPanel = memo44(function SkillViewerPanel2({
   });
 });
 // src/components/file-browser/FileBrowserSidebar.tsx
-import { memo as memo45, useCallback as useCallback33, useEffect as useEffect49, useRef as useRef33 } from "react";
+import { memo as memo45, useCallback as useCallback33, useEffect as useEffect50, useRef as useRef33 } from "react";
 import {
   ChevronRight as ChevronRight15,
   ChevronDown as ChevronDown13,
@@ -27160,7 +27501,7 @@ function TreeItem({
   const activeViewerTabPath = getViewerTabPath3(activeViewerTab);
   const isSelected = selectedFile === path || activeViewerTabPath === path;
   const itemRef = useRef33(null);
-  useEffect49(() => {
+  useEffect50(() => {
     if (isSelected) {
       itemRef.current?.scrollIntoView({ block: "nearest" });
     }
@@ -27225,7 +27566,7 @@ var FileBrowserSidebar = memo45(function FileBrowserSidebar2() {
   });
   const panelWidth = usePanelWidthStore((s) => s.widths[PANEL_KEY4] ?? DEFAULT_WIDTH4);
   const { data: rootData, isLoading, refetch } = useFileTree(".");
-  useEffect49(() => {
+  useEffect50(() => {
     if (isExpanded && activeFileTabPath) {
       revealFile(activeFileTabPath);
     }
@@ -27330,7 +27671,7 @@ var FileBrowserSidebarToggle = memo46(function FileBrowserSidebarToggle2() {
 // src/components/file-browser/FileViewerPanel.tsx
 import {
   memo as memo47,
-  useEffect as useEffect51,
+  useEffect as useEffect52,
   useMemo as useMemo29,
   useRef as useRef35
 } from "react";
@@ -27340,7 +27681,7 @@ import remarkGfm3 from "remark-gfm";
 
 // src/components/workspace/ToolPreviewPanel.tsx
 import { CheckCircle2 as CheckCircle22, XCircle as XCircle4 } from "lucide-react";
-import { useEffect as useEffect50, useMemo as useMemo28, useRef as useRef34 } from "react";
+import { useEffect as useEffect51, useMemo as useMemo28, useRef as useRef34 } from "react";
 import { jsx as jsx109, jsxs as jsxs96 } from "react/jsx-runtime";
 var LARGE_WRITE_PREVIEW_CHARS = 24000;
 var LARGE_WRITE_PREVIEW_LINES = 500;
@@ -27412,6 +27753,35 @@ function getStablePatchLines(patch) {
     lines.pop();
   return lines;
 }
+function getEnvelopedPatchPath(line) {
+  const directive = line.match(/^\*\*\* (?:Update|Add|Delete) File: (.+)$/);
+  const replaceDirective = line.match(/^\*\*\* Replace in: (.+)$/);
+  const lineDirective = line.match(/^\*\*\* (?:Delete Lines in|Replace Lines in|Insert Before in|Insert After in): (.+)$/);
+  return directive?.[1] ?? replaceDirective?.[1] ?? lineDirective?.[1];
+}
+function parsePatchLineNumber(value) {
+  const trimmed = value.trim();
+  if (!/^\d+$/.test(trimmed))
+    return;
+  const line = Number.parseInt(trimmed, 10);
+  return line > 0 ? line : undefined;
+}
+function parsePatchLineRange(value) {
+  const match = /^(\d+)(?:\s*-\s*(\d+|end|eof|\$))?$/i.exec(value.trim());
+  if (!match)
+    return;
+  const startLine = parsePatchLineNumber(match[1]);
+  if (!startLine)
+    return;
+  if (!match[2])
+    return { startLine, endLine: startLine };
+  const endLine = /^(end|eof|\$)$/i.test(match[2]) ? "end" : parsePatchLineNumber(match[2]);
+  if (!endLine)
+    return;
+  if (typeof endLine === "number" && endLine < startLine)
+    return;
+  return { startLine, endLine };
+}
 function getPatchLineHighlights(patch, targetPath, fallbackLines) {
   const highlighted = new Set(fallbackLines ?? []);
   if (!patch)
@@ -27427,9 +27797,9 @@ function getPatchLineHighlights(patch, targetPath, fallbackLines) {
   let inHunk = false;
   let newLine = 0;
   for (const line of getStablePatchLines(patch)) {
-    const directive = line.match(/^\*\*\* (?:Update|Add|Delete) File: (.+)$/);
-    if (directive?.[1]) {
-      activeFile = patchPathMatches(directive[1], targetPath);
+    const directivePath = getEnvelopedPatchPath(line);
+    if (directivePath) {
+      activeFile = patchPathMatches(directivePath, targetPath);
       sawFileDirective = true;
       inHunk = false;
       newLine = 0;
@@ -27523,10 +27893,10 @@ function collectEnvelopedPatchHunks(patch, targetPath) {
     current = [];
   };
   for (const line of getStablePatchLines(patch)) {
-    const directive = line.match(/^\*\*\* (?:Update|Add|Delete) File: (.+)$/);
-    if (directive?.[1]) {
+    const directivePath = getEnvelopedPatchPath(line);
+    if (directivePath) {
       flush();
-      activeFile = patchPathMatches(directive[1], targetPath);
+      activeFile = patchPathMatches(directivePath, targetPath);
       sawFileDirective = true;
       inHunk = activeFile;
       continue;
@@ -27615,9 +27985,152 @@ function buildEnvelopedPatchPreview(content, patch, targetPath) {
     latestLine: changedLines.length > 0 ? Math.max(...changedLines) : undefined
   };
 }
+function collectLineNumberPatchOperations(patch, targetPath) {
+  const operations = [];
+  let current = null;
+  let activeFile = false;
+  let phase = "directives";
+  const flush = () => {
+    if (current && activeFile)
+      operations.push(current);
+    current = null;
+    phase = "directives";
+  };
+  for (const line of getStablePatchLines(patch)) {
+    const directive = line.match(/^\*\*\* (Delete Lines in|Replace Lines in|Insert Before in|Insert After in): (.+)$/);
+    if (directive?.[1] && directive[2]) {
+      flush();
+      activeFile = patchPathMatches(directive[2], targetPath);
+      if (directive[1] === "Delete Lines in") {
+        current = { kind: "delete", filePath: directive[2], lines: [] };
+      } else if (directive[1] === "Replace Lines in") {
+        current = { kind: "replace", filePath: directive[2], lines: [] };
+      } else {
+        current = {
+          kind: "insert",
+          filePath: directive[2],
+          position: directive[1] === "Insert Before in" ? "before" : "after",
+          lines: []
+        };
+      }
+      continue;
+    }
+    if (!current)
+      continue;
+    if (line.startsWith("*** End Patch")) {
+      flush();
+      continue;
+    }
+    if (line.startsWith("*** Begin Patch"))
+      continue;
+    if (phase === "with") {
+      current.lines.push(line);
+      continue;
+    }
+    if (line.startsWith("*** Lines:") && current.kind !== "insert") {
+      const range = parsePatchLineRange(line.slice("*** Lines:".length));
+      if (range) {
+        current.startLine = range.startLine;
+        current.endLine = range.endLine;
+      }
+      continue;
+    }
+    if (line.startsWith("*** Line:") && current.kind === "insert") {
+      current.line = parsePatchLineNumber(line.slice("*** Line:".length));
+      continue;
+    }
+    if (line.startsWith("*** With:")) {
+      phase = "with";
+    }
+  }
+  flush();
+  return operations;
+}
+function getCurrentRecordPosition(records, currentIndex) {
+  let seen = 0;
+  for (let index = 0;index < records.length; index += 1) {
+    if (records[index].removed)
+      continue;
+    if (seen === currentIndex)
+      return index;
+    seen += 1;
+  }
+  return records.length;
+}
+function buildLineNumberPatchPreview(content, patch, targetPath) {
+  const operations = collectLineNumberPatchOperations(patch, targetPath);
+  if (operations.length === 0)
+    return null;
+  const contentLines = content.split(`
+`);
+  if (contentLines.at(-1) === "")
+    contentLines.pop();
+  const records = contentLines.map((line) => ({
+    text: line
+  }));
+  for (const operation of operations) {
+    const currentLines = records.filter((record) => !record.removed);
+    if (operation.kind === "insert") {
+      if (!operation.line)
+        continue;
+      const insertIndex = operation.position === "before" ? operation.line - 1 : operation.line;
+      if (insertIndex < 0 || insertIndex > currentLines.length)
+        continue;
+      const recordIndex2 = getCurrentRecordPosition(records, insertIndex);
+      records.splice(recordIndex2, 0, ...operation.lines.map((line) => ({
+        text: line,
+        tone: "add"
+      })));
+      continue;
+    }
+    if (!operation.startLine || !operation.endLine)
+      continue;
+    const endLine = operation.endLine === "end" ? currentLines.length : operation.endLine;
+    if (operation.startLine > currentLines.length || endLine > currentLines.length)
+      continue;
+    const startIndex = operation.startLine - 1;
+    const endIndex = endLine - 1;
+    const recordIndex = getCurrentRecordPosition(records, startIndex);
+    for (let index = startIndex;index <= endIndex; index += 1) {
+      const position = getCurrentRecordPosition(records, startIndex);
+      if (!records[position])
+        continue;
+      records[position].tone = "remove";
+      records[position].removed = true;
+    }
+    if (operation.kind === "replace") {
+      records.splice(recordIndex, 0, ...operation.lines.map((line) => ({
+        text: line,
+        tone: "add"
+      })));
+    }
+  }
+  const lineTones = new Map;
+  const renderedLines = records.map((record, index) => {
+    if (record.tone)
+      lineTones.set(index + 1, record.tone);
+    return record.text;
+  });
+  if (lineTones.size === 0)
+    return null;
+  const resultLines = records.filter((record) => !record.removed).map((record) => record.text);
+  const changedLines = [...lineTones.keys()];
+  return {
+    content: renderedLines.join(`
+`),
+    resultContent: resultLines.join(`
+`),
+    lineTones,
+    firstLine: Math.min(...changedLines),
+    latestLine: Math.max(...changedLines)
+  };
+}
 function buildLivePatchPreview(content, patch, targetPath) {
   if (!patch)
     return null;
+  const lineNumberPreview = buildLineNumberPatchPreview(content, patch, targetPath);
+  if (lineNumberPreview)
+    return lineNumberPreview;
   const insertions = new Map;
   const removals = new Set;
   let activeFile = false;
@@ -27747,7 +28260,8 @@ function PlainSourceViewer({
       }),
       /* @__PURE__ */ jsx109(CodeMirrorViewer, {
         content,
-        path
+        path,
+        disableMarkdownSyntax: true
       })
     ]
   });
@@ -27768,7 +28282,8 @@ function SourceViewer({
     highlightTone,
     lineTones,
     scrollToLine,
-    scrollToEndSignal
+    scrollToEndSignal,
+    disableMarkdownSyntax: true
   });
 }
 function ToolPreviewPanel({ tab }) {
@@ -27822,7 +28337,7 @@ function ToolPreviewPanel({ tab }) {
     };
   }
   const stablePatchPreview = lastPatchPreviewRef.current?.key === patchPreviewKey ? livePatchPreview ?? lastPatchPreviewRef.current.preview : livePatchPreview ?? persistedPatchPreview;
-  useEffect50(() => {
+  useEffect51(() => {
     if (tab.toolName !== "apply_patch" || !livePatchPreview)
       return;
     const baseContent = tab.baseContent ?? appliedFile?.content;
@@ -27847,11 +28362,11 @@ function ToolPreviewPanel({ tab }) {
       error: tab.error
     });
   }, [tab, appliedFile?.content, livePatchPreview]);
-  useEffect50(() => {
+  useEffect51(() => {
     if (shouldLoadAppliedFile)
       refetchAppliedFile();
   }, [shouldLoadAppliedFile, refetchAppliedFile]);
-  useEffect50(() => {
+  useEffect51(() => {
     if (scrollSignal.length === 0)
       return;
     const frame = window.requestAnimationFrame(() => {
@@ -27885,26 +28400,6 @@ function ToolPreviewPanel({ tab }) {
   return /* @__PURE__ */ jsxs96("div", {
     className: "h-full w-full bg-transparent flex flex-col",
     children: [
-      /* @__PURE__ */ jsxs96("div", {
-        className: "shrink-0 border-b border-sidebar-border bg-sidebar-accent/30 px-3 py-1.5 text-[12px] text-muted-foreground flex items-center gap-2",
-        children: [
-          /* @__PURE__ */ jsx109(StatusIcon, {
-            status: tab.status
-          }),
-          /* @__PURE__ */ jsx109("span", {
-            children: statusLabel
-          }),
-          /* @__PURE__ */ jsx109("span", {
-            className: "text-muted-foreground/60",
-            children: "·"
-          }),
-          /* @__PURE__ */ jsx109("span", {
-            className: "font-mono truncate",
-            title: tab.path,
-            children: tab.path
-          })
-        ]
-      }),
       tab.error && /* @__PURE__ */ jsx109("div", {
         className: "shrink-0 border-b border-red-500/20 bg-red-500/10 px-3 py-2 text-[12px] text-red-700 dark:text-red-300",
         children: tab.error
@@ -27952,6 +28447,26 @@ function ToolPreviewPanel({ tab }) {
           className: "h-full flex items-center justify-center text-sm text-muted-foreground",
           children: "Waiting for write content..."
         })
+      }),
+      /* @__PURE__ */ jsxs96("div", {
+        className: "shrink-0 border-t border-sidebar-border bg-sidebar-accent/30 px-3 py-1.5 text-[12px] text-muted-foreground flex items-center gap-2",
+        children: [
+          /* @__PURE__ */ jsx109(StatusIcon, {
+            status: tab.status
+          }),
+          /* @__PURE__ */ jsx109("span", {
+            children: statusLabel
+          }),
+          /* @__PURE__ */ jsx109("span", {
+            className: "text-muted-foreground/60",
+            children: "·"
+          }),
+          /* @__PURE__ */ jsx109("span", {
+            className: "font-mono truncate",
+            title: tab.path,
+            children: tab.path
+          })
+        ]
       })
     ]
   });
@@ -28061,6 +28576,7 @@ var FileViewerPanel = memo47(function FileViewerPanel2({
   open,
   file,
   highlight,
+  annotations,
   patchPreview,
   writePreview,
   onClose
@@ -28073,7 +28589,7 @@ var FileViewerPanel = memo47(function FileViewerPanel2({
   const selectedFile = file ?? storeSelectedFile;
   const closeViewer = onClose ?? storeCloseViewer;
   const { data, isLoading } = useFileContent(selectedFile);
-  useEffect51(() => {
+  useEffect52(() => {
     const handleEscape = (e) => {
       const target = e.target;
       const isInInput = target.tagName === "INPUT" || target.tagName === "TEXTAREA" || target.isContentEditable;
@@ -28100,7 +28616,7 @@ var FileViewerPanel = memo47(function FileViewerPanel2({
   const patchBaseContent = patchPreview ? patchPreview.baseContent ?? data?.content ?? "" : undefined;
   const livePatchPreview = useMemo29(() => selectedFile && patchPreview?.patch && patchBaseContent !== undefined ? buildLivePatchPreview(patchBaseContent, patchPreview.patch, selectedFile) : null, [selectedFile, patchPreview?.patch, patchBaseContent]);
   const activePatchPreview = patchPreview?.status === "success" ? persistedPatchPreview ?? livePatchPreview : livePatchPreview ?? persistedPatchPreview;
-  useEffect51(() => {
+  useEffect52(() => {
     if (!selectedFile || !patchPreview || !livePatchPreview)
       return;
     const baseContent = patchPreview.baseContent ?? data?.content;
@@ -28125,7 +28641,7 @@ var FileViewerPanel = memo47(function FileViewerPanel2({
       error: patchPreview.error
     });
   }, [selectedFile, data?.content, patchPreview, livePatchPreview]);
-  useEffect51(() => {
+  useEffect52(() => {
     if (!data || !effectiveHighlight?.startLine)
       return;
     const frame = window.requestAnimationFrame(() => {
@@ -28139,6 +28655,28 @@ var FileViewerPanel = memo47(function FileViewerPanel2({
   const highlightStart = effectiveHighlight?.startLine;
   const highlightEnd = effectiveHighlight?.endLine ?? highlightStart;
   const patchChangedLines = patchPreview?.changedLines;
+  const persistentLineTones = useMemo29(() => {
+    if (!annotations?.length)
+      return;
+    const tones = new Map;
+    for (const annotation of annotations) {
+      for (const [line, tone] of annotation.lineTones) {
+        if (line > 0)
+          tones.set(line, tone);
+      }
+    }
+    return tones.size > 0 ? tones : undefined;
+  }, [annotations]);
+  const writePreviewLineTones = useMemo29(() => {
+    if (writePreview?.content === undefined)
+      return;
+    const tones = new Map;
+    const lineCount = writePreview.content.length === 0 ? 1 : writePreview.content.split(`
+`).length;
+    for (let line = 1;line <= lineCount; line += 1)
+      tones.set(line, "add");
+    return tones;
+  }, [writePreview?.content]);
   const highlightedLines = useMemo29(() => {
     if (highlightStart && highlightEnd) {
       return new Set(Array.from({ length: highlightEnd - highlightStart + 1 }, (_, index) => highlightStart + index));
@@ -28152,18 +28690,21 @@ var FileViewerPanel = memo47(function FileViewerPanel2({
   const scrollToHighlightLine = highlightStart ?? fallbackPatchHighlightStart;
   const activePatchLineTones = useMemo29(() => {
     if (!activePatchPreview)
-      return;
-    const tones = new Map(activePatchPreview.lineTones);
+      return persistentLineTones;
+    const tones = new Map(persistentLineTones);
+    for (const [line, tone] of activePatchPreview.lineTones) {
+      tones.set(line, tone);
+    }
     for (const line of patchChangedLines ?? []) {
       if (!tones.has(line))
         tones.set(line, "add");
     }
     return tones;
-  }, [activePatchPreview, patchChangedLines]);
+  }, [activePatchPreview, patchChangedLines, persistentLineTones]);
   if (!isViewerOpen || !selectedFile)
     return null;
   const language = inferLanguage(selectedFile);
-  const renderMarkdown = isMarkdownFile(selectedFile) && !effectiveHighlight && !activePatchPreview && !writePreview?.content;
+  const renderMarkdown = isMarkdownFile(selectedFile) && !effectiveHighlight && !persistentLineTones && !activePatchPreview && !writePreview?.content;
   return /* @__PURE__ */ jsxs97("div", {
     className: mode === "pane" ? "h-full w-full bg-transparent flex flex-col" : "absolute inset-0 bg-background z-50 flex flex-col animate-in slide-in-from-left duration-300",
     children: [
@@ -28208,12 +28749,15 @@ var FileViewerPanel = memo47(function FileViewerPanel2({
         className: "flex-1 overflow-auto",
         children: writePreview?.content !== undefined ? /* @__PURE__ */ jsx110(CodeMirrorViewer, {
           content: writePreview.content,
-          path: selectedFile
+          path: selectedFile,
+          lineTones: writePreviewLineTones,
+          disableMarkdownSyntax: true
         }) : activePatchPreview ? /* @__PURE__ */ jsx110(CodeMirrorViewer, {
           content: activePatchPreview.content,
           path: selectedFile,
           lineTones: activePatchLineTones,
-          scrollToLine: activePatchPreview.latestLine
+          scrollToLine: activePatchPreview.latestLine,
+          disableMarkdownSyntax: true
         }) : isLoading ? /* @__PURE__ */ jsx110("div", {
           className: "h-full flex items-center justify-center text-muted-foreground",
           children: "Loading file..."
@@ -28259,7 +28803,9 @@ var FileViewerPanel = memo47(function FileViewerPanel2({
           content: data.content,
           path: selectedFile,
           highlightedLines,
-          scrollToLine: scrollToHighlightLine
+          lineTones: persistentLineTones,
+          scrollToLine: scrollToHighlightLine,
+          disableMarkdownSyntax: isMarkdownFile(selectedFile)
         }) : /* @__PURE__ */ jsx110("div", {
           className: "h-full flex items-center justify-center text-muted-foreground",
           children: "Unable to load file"
@@ -28294,7 +28840,7 @@ var FileViewerPanel = memo47(function FileViewerPanel2({
   });
 });
 // src/components/file-browser/QuickFilePicker.tsx
-import { memo as memo48, useState as useState48, useEffect as useEffect52, useRef as useRef36, useCallback as useCallback34, useMemo as useMemo30 } from "react";
+import { memo as memo48, useState as useState48, useEffect as useEffect53, useRef as useRef36, useCallback as useCallback34, useMemo as useMemo30 } from "react";
 import { FileCode as FileCode4, Search as Search9 } from "lucide-react";
 
 // src/stores/filePickerStore.ts
@@ -28349,14 +28895,14 @@ var QuickFilePicker = memo48(function QuickFilePicker2() {
     const results = filesData.files.map((file) => ({ file, ...fuzzyMatch(query, file) })).filter((r) => r.match).sort((a, b) => b.score - a.score).slice(0, 50);
     return results.map((r) => r.file);
   }, [filesData?.files, query]);
-  useEffect52(() => {
+  useEffect53(() => {
     if (isOpen) {
       setQuery("");
       setSelectedIndex(0);
       setTimeout(() => inputRef.current?.focus(), 0);
     }
   }, [isOpen]);
-  useEffect52(() => {
+  useEffect53(() => {
     const item = listRef.current?.children[selectedIndex];
     item?.scrollIntoView({ block: "nearest" });
   }, [selectedIndex]);
@@ -28514,20 +29060,170 @@ function HighlightedPath({ path, query }) {
   });
 }
 // src/components/workspace/ViewerTabs.tsx
-import { memo as memo49, useEffect as useEffect53 } from "react";
-import {
-  Braces as Braces2,
-  File as File3,
-  FileCode as FileCode5,
-  FileJson as FileJson2,
-  FileText as FileText8,
-  FileType as FileType2,
-  GitCommit as GitCommit5,
-  Image as Image2,
-  Settings as Settings4,
-  X as X21
-} from "lucide-react";
+import { Icon, addCollection } from "@iconify/react";
+import { icons as materialIconTheme } from "@iconify-json/material-icon-theme";
+import { memo as memo49, useEffect as useEffect54 } from "react";
+import { GitCommit as GitCommit5, X as X21 } from "lucide-react";
 import { jsx as jsx112, jsxs as jsxs99 } from "react/jsx-runtime";
+addCollection(materialIconTheme);
+var ICON_CLASS = "h-3.5 w-3.5 shrink-0";
+var FILENAME_ICON_MAP = {
+  ".dockerignore": "docker",
+  ".editorconfig": "editorconfig",
+  ".env": "settings",
+  ".env.example": "settings",
+  ".env.local": "settings",
+  ".eslintignore": "eslint",
+  ".eslintrc": "eslint",
+  ".gitattributes": "git",
+  ".gitignore": "git",
+  ".prettierrc": "prettier",
+  "astro.config.mjs": "astro-config",
+  "astro.config.ts": "astro-config",
+  "biome.json": "biome",
+  "bun.lock": "bun",
+  "bun.lockb": "bun",
+  "bunfig.toml": "bun",
+  "cargo.lock": "lock",
+  "cargo.toml": "rust",
+  "compose.yaml": "docker",
+  "compose.yml": "docker",
+  "docker-compose.yaml": "docker",
+  "docker-compose.yml": "docker",
+  dockerfile: "docker",
+  "eslint.config.js": "eslint",
+  "eslint.config.mjs": "eslint",
+  "eslint.config.ts": "eslint",
+  gemfile: "gemfile",
+  "go.mod": "go-mod",
+  "go.sum": "go-mod",
+  "jsconfig.json": "jsconfig",
+  license: "license",
+  makefile: "makefile",
+  "next.config.js": "next",
+  "next.config.mjs": "next",
+  "next.config.ts": "next",
+  "package-lock.json": "npm",
+  "package.json": "npm",
+  "pnpm-lock.yaml": "pnpm",
+  "postcss.config.js": "postcss",
+  "postcss.config.mjs": "postcss",
+  "postcss.config.ts": "postcss",
+  "prettier.config.js": "prettier",
+  "prettier.config.mjs": "prettier",
+  "prettier.config.ts": "prettier",
+  "readme.md": "readme",
+  "readme.mdx": "readme",
+  "rollup.config.js": "rollup",
+  "rollup.config.mjs": "rollup",
+  "rollup.config.ts": "rollup",
+  "svelte.config.js": "svelte",
+  "svelte.config.ts": "svelte",
+  "tailwind.config.js": "tailwindcss",
+  "tailwind.config.ts": "tailwindcss",
+  "tauri.conf.json": "tauri",
+  "tsconfig.json": "tsconfig",
+  "vite.config.js": "vite",
+  "vite.config.mjs": "vite",
+  "vite.config.ts": "vite",
+  "vitest.config.js": "vitest",
+  "vitest.config.mjs": "vitest",
+  "vitest.config.ts": "vitest",
+  "vue.config.js": "vue-config",
+  "vue.config.ts": "vue-config",
+  "yarn.lock": "lock"
+};
+var EXTENSION_ICON_MAP = {
+  ai: "image",
+  astro: "astro",
+  avif: "image",
+  bash: "console",
+  bmp: "image",
+  c: "c",
+  cc: "cpp",
+  clj: "clojure",
+  cljc: "clojure",
+  cljs: "clojure",
+  cpp: "cpp",
+  cs: "csharp",
+  css: "css",
+  cxx: "cpp",
+  dart: "dart",
+  dockerfile: "docker",
+  ex: "elixir",
+  exs: "elixir",
+  erl: "erlang",
+  fish: "console",
+  gif: "image",
+  go: "go",
+  graphql: "graphql",
+  gql: "graphql",
+  groovy: "groovy",
+  h: "c",
+  hpp: "cpp",
+  hrl: "erlang",
+  hs: "haskell",
+  htm: "html",
+  html: "html",
+  hxx: "cpp",
+  ico: "favicon",
+  java: "java",
+  jpeg: "image",
+  jpg: "image",
+  js: "javascript",
+  json: "json",
+  jsonc: "json",
+  jsx: "react",
+  jl: "julia",
+  kt: "kotlin",
+  kts: "kotlin",
+  less: "less",
+  log: "log",
+  lua: "lua",
+  luau: "luau",
+  mjs: "javascript",
+  ml: "ocaml",
+  mli: "ocaml",
+  mov: "video",
+  mp3: "audio",
+  mp4: "video",
+  md: "markdown",
+  mdx: "markdown",
+  nim: "nim",
+  pdf: "pdf",
+  php: "php-elephant",
+  png: "image",
+  prisma: "prisma",
+  proto: "proto",
+  ps1: "powershell",
+  py: "python",
+  pyw: "python",
+  r: "r",
+  rb: "ruby",
+  rs: "rust",
+  sass: "sass",
+  scala: "scala",
+  scss: "sass",
+  sh: "console",
+  sql: "database",
+  svg: "svg",
+  svelte: "svelte",
+  swift: "swift",
+  toml: "toml",
+  ts: "typescript",
+  tsx: "react-ts",
+  txt: "document",
+  vue: "vue",
+  wav: "audio",
+  webm: "video",
+  webp: "image",
+  xml: "xml",
+  yaml: "yaml",
+  yml: "yaml",
+  zig: "zig",
+  zip: "zip",
+  zsh: "console"
+};
 function tabKindLabel(tab) {
   switch (tab.type) {
     case "git-diff":
@@ -28557,86 +29253,34 @@ function getFileExtension2(path) {
   const extension = path.split(".").pop()?.toLowerCase() ?? "";
   return extension && extension !== path.toLowerCase() ? extension : "";
 }
-function renderLanguageIcon(extension) {
-  switch (extension) {
-    case "ts":
-    case "tsx":
-      return /* @__PURE__ */ jsx112("span", {
-        className: "inline-flex h-3.5 w-3.5 shrink-0 items-center justify-center bg-[#3178c6] text-[7px] font-bold leading-none text-white",
-        children: "TS"
-      });
-    case "js":
-    case "jsx":
-    case "mjs":
-    case "cjs":
-      return /* @__PURE__ */ jsx112("span", {
-        className: "inline-flex h-3.5 w-3.5 shrink-0 items-center justify-center bg-[#f7df1e] text-[7px] font-bold leading-none text-black",
-        children: "JS"
-      });
-    case "py":
-      return /* @__PURE__ */ jsx112("span", {
-        className: "inline-flex h-3.5 w-3.5 shrink-0 items-center justify-center rounded-[3px] bg-gradient-to-br from-[#3776ab] to-[#ffd43b] text-[7px] font-bold leading-none text-white",
-        children: "Py"
-      });
-    case "go":
-      return /* @__PURE__ */ jsx112("span", {
-        className: "inline-flex h-3.5 w-3.5 shrink-0 items-center justify-center rounded-full bg-[#00add8] text-[7px] font-bold leading-none text-white",
-        children: "Go"
-      });
-    case "rs":
-      return /* @__PURE__ */ jsx112("span", {
-        className: "inline-flex h-3.5 w-3.5 shrink-0 items-center justify-center rounded-full bg-[#ce422b] text-[8px] font-bold leading-none text-white",
-        children: "R"
-      });
-    case "json":
-      return /* @__PURE__ */ jsx112(FileJson2, {
-        className: "h-3.5 w-3.5 shrink-0 text-yellow-500"
-      });
-    case "md":
-    case "mdx":
-      return /* @__PURE__ */ jsx112(FileText8, {
-        className: "h-3.5 w-3.5 shrink-0 text-sky-500"
-      });
-    case "env":
-    case "toml":
-    case "yaml":
-    case "yml":
-      return /* @__PURE__ */ jsx112(Settings4, {
-        className: "h-3.5 w-3.5 shrink-0 text-violet-500"
-      });
-    case "css":
-    case "scss":
-    case "sass":
-    case "less":
-      return /* @__PURE__ */ jsx112(Braces2, {
-        className: "h-3.5 w-3.5 shrink-0 text-blue-500"
-      });
-    case "html":
-    case "xml":
-      return /* @__PURE__ */ jsx112(FileType2, {
-        className: "h-3.5 w-3.5 shrink-0 text-orange-500"
-      });
-    case "png":
-    case "jpg":
-    case "jpeg":
-    case "gif":
-    case "svg":
-    case "webp":
-      return /* @__PURE__ */ jsx112(Image2, {
-        className: "h-3.5 w-3.5 shrink-0 text-pink-500"
-      });
-    case "txt":
-    case "log":
-      return /* @__PURE__ */ jsx112(FileText8, {
-        className: "h-3.5 w-3.5 shrink-0 text-muted-foreground"
-      });
-    default:
-      return extension ? /* @__PURE__ */ jsx112(FileCode5, {
-        className: "h-3.5 w-3.5 shrink-0 text-muted-foreground/80"
-      }) : /* @__PURE__ */ jsx112(File3, {
-        className: "h-3.5 w-3.5 shrink-0 text-muted-foreground/80"
-      });
+function getFileName3(path) {
+  return path.split(/[\\/]/).pop()?.toLowerCase() ?? path.toLowerCase();
+}
+function getIconNameForPath(path) {
+  const fileName = getFileName3(path);
+  const fileIcon = FILENAME_ICON_MAP[fileName];
+  if (fileIcon)
+    return fileIcon;
+  if (fileName.endsWith(".d.ts"))
+    return "typescript-def";
+  if (fileName.endsWith(".test.ts") || fileName.endsWith(".spec.ts")) {
+    return "test-ts";
+  }
+  if (fileName.endsWith(".test.js") || fileName.endsWith(".spec.js")) {
+    return "test-js";
   }
+  if (fileName.endsWith(".test.jsx") || fileName.endsWith(".spec.jsx") || fileName.endsWith(".test.tsx") || fileName.endsWith(".spec.tsx")) {
+    return "test-jsx";
+  }
+  const extension = getFileExtension2(fileName);
+  return EXTENSION_ICON_MAP[extension] ?? "document";
+}
+function renderFileIcon(path) {
+  return /* @__PURE__ */ jsx112(Icon, {
+    "aria-hidden": "true",
+    className: ICON_CLASS,
+    icon: `material-icon-theme:${getIconNameForPath(path)}`
+  });
 }
 function renderTabIcon(tab) {
   if (tab.type === "git-diff") {
@@ -28654,10 +29298,10 @@ function renderTabIcon(tab) {
       className: `h-3.5 w-3.5 shrink-0 ${tab.status === "error" ? "text-red-500" : tab.status === "success" ? "text-emerald-500" : "text-blue-500"}`
     });
   }
-  const extension = getFileExtension2(getTabPath(tab));
+  const path = getTabPath(tab);
   return /* @__PURE__ */ jsx112("span", {
     className: "shrink-0 inline-flex items-center text-muted-foreground/80",
-    children: renderLanguageIcon(extension)
+    children: renderFileIcon(path)
   });
 }
 function renderTabContent(tab, closeTab, updateSessionFileOperationIndex) {
@@ -28686,6 +29330,7 @@ function renderTabContent(tab, closeTab, updateSessionFileOperationIndex) {
         open: true,
         file: tab.path,
         highlight: tab.highlight,
+        annotations: tab.annotations,
         patchPreview: tab.patchPreview,
         writePreview: tab.writePreview,
         onClose: () => closeTab(tab.id)
@@ -28710,7 +29355,7 @@ var ViewerTabs = memo49(function ViewerTabs2() {
   const setActiveTab = useViewerTabsStore((state) => state.setActiveTab);
   const closeTab = useViewerTabsStore((state) => state.closeTab);
   const updateSessionFileOperationIndex = useViewerTabsStore((state) => state.updateSessionFileOperationIndex);
-  useEffect53(() => {
+  useEffect54(() => {
     const handleKeyDown = (event) => {
       const target = event.target;
       const isInInput = target?.tagName === "INPUT" || target?.tagName === "TEXTAREA" || target?.isContentEditable;
@@ -28734,12 +29379,12 @@ var ViewerTabs = memo49(function ViewerTabs2() {
     className: "h-full w-full min-w-0 bg-sidebar flex flex-col",
     children: [
       /* @__PURE__ */ jsxs99("div", {
-        className: "h-12 shrink-0 bg-background flex overflow-x-auto overflow-y-hidden",
+        className: "h-12 shrink-0 bg-background flex overflow-x-auto overflow-y-hidden overscroll-x-contain scrollbar-hide",
         children: [
           tabs.map((tab) => {
             const isActive = tab.id === activeTab.id;
             return /* @__PURE__ */ jsxs99("div", {
-              className: `group h-12 max-w-56 min-w-0 px-3 border-r border-sidebar-border flex items-center gap-2 text-left transition-colors ${isActive ? "bg-sidebar text-sidebar-foreground" : "border-b bg-background text-muted-foreground/70 hover:text-foreground hover:bg-sidebar-accent/40"}`,
+              className: `group h-12 w-44 max-w-56 shrink-0 px-3 border-r border-sidebar-border flex items-center gap-2 text-left transition-colors ${isActive ? "bg-sidebar text-sidebar-foreground" : "border-b bg-background text-muted-foreground/70 hover:text-foreground hover:bg-sidebar-accent/40"}`,
               title: `${tab.title}
 ${tabKindLabel(tab)}`,
               children: [
@@ -28783,10 +29428,10 @@ ${tabKindLabel(tab)}`,
   });
 });
 // src/components/onboarding/OnboardingModal.tsx
-import { memo as memo52, useEffect as useEffect56 } from "react";
+import { memo as memo52, useEffect as useEffect57 } from "react";
 
 // src/components/onboarding/steps/ProviderSetupStep.tsx
-import { memo as memo50, useEffect as useEffect54, useState as useState49, useRef as useRef37 } from "react";
+import { memo as memo50, useEffect as useEffect55, useState as useState49, useRef as useRef37 } from "react";
 import {
   Copy as Copy5,
   Check as Check13,
@@ -28893,34 +29538,34 @@ var ProviderSetupStep = memo50(function ProviderSetupStep2({
   const { fetchBalance } = useOttoRouterBalance("ottorouter");
   const effectivePayg = payg?.effectiveSpendableUsd ?? balance ?? 0;
   const setuStatusLabel = subscription?.active ? `GO ${(subscription.creditsRemaining ?? 0).toFixed(1)} credits` : `$${effectivePayg.toFixed(2)}`;
-  useEffect54(() => {
+  useEffect55(() => {
     if (prevTopupModalOpen.current && !isTopupModalOpen) {
       fetchBalance();
     }
     prevTopupModalOpen.current = isTopupModalOpen;
   }, [isTopupModalOpen, fetchBalance]);
-  useEffect54(() => {
+  useEffect55(() => {
     if (!authStatus.ottorouter.configured && !isSettingUp) {
       setIsSettingUp(true);
       onSetupWallet().finally(() => setIsSettingUp(false));
     }
   }, [authStatus.ottorouter.configured, onSetupWallet, isSettingUp]);
-  useEffect54(() => {
+  useEffect55(() => {
     if (addingProvider && apiKeyInputRef.current) {
       apiKeyInputRef.current.focus();
     }
   }, [addingProvider]);
-  useEffect54(() => {
+  useEffect55(() => {
     if (oauthSession && oauthCodeInputRef.current) {
       oauthCodeInputRef.current.focus();
     }
   }, [oauthSession]);
-  useEffect54(() => {
+  useEffect55(() => {
     if (isImportModalOpen && importPrivateKeyRef.current) {
       importPrivateKeyRef.current.focus();
     }
   }, [isImportModalOpen]);
-  useEffect54(() => {
+  useEffect55(() => {
     if (!copilotPolling || !copilotDevice || !copilotPollFnRef.current)
       return;
     copilotCancelledRef.current = false;
@@ -29218,7 +29863,7 @@ var ProviderSetupStep = memo50(function ProviderSetupStep2({
     setImportWalletError(null);
     setImportPrivateKey("");
   };
-  useEffect54(() => {
+  useEffect55(() => {
     const handleNativeBack = (event) => {
       const customEvent = event;
       if (!customEvent.detail || customEvent.detail.handled)
@@ -30408,7 +31053,7 @@ var ProviderSetupStep = memo50(function ProviderSetupStep2({
 });
 
 // src/components/onboarding/steps/DefaultsStep.tsx
-import { memo as memo51, useState as useState50, useEffect as useEffect55, useId as useId3, useRef as useRef38 } from "react";
+import { memo as memo51, useState as useState50, useEffect as useEffect56, useId as useId3, useRef as useRef38 } from "react";
 import { ArrowLeft, Sparkles as Sparkles9, ChevronDown as ChevronDown14 } from "lucide-react";
 import { jsx as jsx114, jsxs as jsxs101, Fragment as Fragment43 } from "react/jsx-runtime";
 var DefaultsStep = memo51(function DefaultsStep2({
@@ -30431,7 +31076,7 @@ var DefaultsStep = memo51(function DefaultsStep2({
   const modelId = useId3();
   const agentId = useId3();
   const approvalId = useId3();
-  useEffect55(() => {
+  useEffect56(() => {
     const loadConfig = async () => {
       try {
         const [configData, modelsData] = await Promise.all([
@@ -30462,7 +31107,7 @@ var DefaultsStep = memo51(function DefaultsStep2({
     };
     loadConfig();
   }, []);
-  useEffect55(() => {
+  useEffect56(() => {
     if (config2?.agents?.length) {
       const agents = config2.agents;
       if (!selectedAgent || !agents.includes(selectedAgent)) {
@@ -30470,7 +31115,7 @@ var DefaultsStep = memo51(function DefaultsStep2({
       }
     }
   }, [config2, selectedAgent]);
-  useEffect55(() => {
+  useEffect56(() => {
     if (allModels?.[selectedProvider] && hasUserChangedProvider.current) {
       const providerModels = allModels[selectedProvider];
       if (!providerModels.models.some((m) => m.id === selectedModel)) {
@@ -30799,7 +31444,7 @@ var OnboardingModal = memo52(function OnboardingModal2({
     importCopilotTokenFromGh,
     getCopilotDiagnostics
   } = useAuthStatus();
-  useEffect56(() => {
+  useEffect57(() => {
     if (!isOpen)
       return;
     const handleNativeBack = (event) => {
@@ -30928,4 +31573,4 @@ export {
   AssistantMessageGroup
 };
 
-//# debugId=D9B4BA4DAB6C977C64756E2164756E21
+//# debugId=83646DAB6C1728A064756E2164756E21