@ottocode/web-sdk 0.1.275 → 0.1.276

package/dist/components/messages/MessagePartItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessagePartItem.d.ts","sourceRoot":"","sources":["../../../src/components/messages/MessagePartItem.tsx"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAI1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAwInD,UAAU,oBAAoB;IAC7B,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAC7C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,eAAO,MAAM,eAAe,4DAigB3B,CAAC"}
+{"version":3,"file":"MessagePartItem.d.ts","sourceRoot":"","sources":["../../../src/components/messages/MessagePartItem.tsx"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAI1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAwInD,UAAU,oBAAoB;IAC7B,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAClD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAC7C,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,eAAO,MAAM,eAAe,4DAif3B,CAAC"}

package/dist/components/messages/renderers/DiffView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiffView.d.ts","sourceRoot":"","sources":["../../../../src/components/messages/renderers/DiffView.tsx"],"names":[],"mappings":"AAMA,UAAU,aAAa;IACtB,KAAK,EAAE,MAAM,CAAC;CACd;AAgKD,wBAAgB,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE,aAAa,2CAyHhD"}
+{"version":3,"file":"DiffView.d.ts","sourceRoot":"","sources":["../../../../src/components/messages/renderers/DiffView.tsx"],"names":[],"mappings":"AAMA,UAAU,aAAa;IACtB,KAAK,EAAE,MAAM,CAAC;CACd;AAwKD,wBAAgB,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE,aAAa,2CAyHhD"}

package/dist/components/ui/Toaster.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Toaster.d.ts","sourceRoot":"","sources":["../../../src/components/ui/Toaster.tsx"],"names":[],"mappings":"AAmKA,wBAAgB,OAAO,4CAYtB"}
+{"version":3,"file":"Toaster.d.ts","sourceRoot":"","sources":["../../../src/components/ui/Toaster.tsx"],"names":[],"mappings":"AAsKA,wBAAgB,OAAO,4CAYtB"}

package/dist/components/workspace/ToolPreviewPanel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ToolPreviewPanel.d.ts","sourceRoot":"","sources":["../../../src/components/workspace/ToolPreviewPanel.tsx"],"names":[],"mappings":"AAGA,OAAO,EACN,KAAK,SAAS,EAEd,MAAM,8BAA8B,CAAC;AAGtC,UAAU,qBAAqB;IAC9B,GAAG,EAAE,OAAO,CAAC,SAAS,EAAE;QAAE,IAAI,EAAE,cAAc,CAAA;KAAE,CAAC,CAAC;CAClD;AAOD,MAAM,WAAW,gBAAgB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,GAAG,QAAQ,CAAC,CAAC;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB;AAsVD,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,UAAU,EAAE,MAAM,GAChB,gBAAgB,GAAG,IAAI,CA+FzB;AAmFD,wBAAgB,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE,qBAAqB,2CA0P9D"}
+{"version":3,"file":"ToolPreviewPanel.d.ts","sourceRoot":"","sources":["../../../src/components/workspace/ToolPreviewPanel.tsx"],"names":[],"mappings":"AAGA,OAAO,EACN,KAAK,SAAS,EAEd,MAAM,8BAA8B,CAAC;AAGtC,UAAU,qBAAqB;IAC9B,GAAG,EAAE,OAAO,CAAC,SAAS,EAAE;QAAE,IAAI,EAAE,cAAc,CAAA;KAAE,CAAC,CAAC;CAClD;AAOD,MAAM,WAAW,gBAAgB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,GAAG,QAAQ,CAAC,CAAC;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB;AAujBD,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,UAAU,EAAE,MAAM,GAChB,gBAAgB,GAAG,IAAI,CAsGzB;AAmFD,wBAAgB,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE,qBAAqB,2CA0P9D"}

package/dist/components/workspace/ViewerTabs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ViewerTabs.d.ts","sourceRoot":"","sources":["../../../src/components/workspace/ViewerTabs.tsx"],"names":[],"mappings":"AAkOA,eAAO,MAAM,UAAU,8CAkFrB,CAAC"}
+{"version":3,"file":"ViewerTabs.d.ts","sourceRoot":"","sources":["../../../src/components/workspace/ViewerTabs.tsx"],"names":[],"mappings":"AAyVA,eAAO,MAAM,UAAU,8CAkFrB,CAAC"}

package/dist/hooks/index.js

@@ -159,6 +159,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)
@@ -893,6 +908,7 @@ class ApiClient {
   updateSession = sessionsMixin.updateSession;
   markSessionViewed = sessionsMixin.markSessionViewed;
   deleteSession = sessionsMixin.deleteSession;
+  createHandoff = sessionsMixin.createHandoff;
   abortSession = sessionsMixin.abortSession;
   abortMessage = sessionsMixin.abortMessage;
   getQueueState = sessionsMixin.getQueueState;
@@ -1279,6 +1295,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 = create((set) => ({
   tabs: [],
   activeTabId: null,
@@ -1325,7 +1388,11 @@ var useViewerTabsStore = create((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
       };
@@ -1346,6 +1413,7 @@ var useViewerTabsStore = create((set) => ({
           title: existingFile?.title ?? titleFromPath(targetPath),
           path: targetPath,
           highlight,
+          annotations: existingFile?.annotations,
           patchPreview: undefined,
           writePreview: undefined
         }),
@@ -1367,6 +1435,12 @@ var useViewerTabsStore = create((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,
@@ -1374,6 +1448,7 @@ var useViewerTabsStore = create((set) => ({
             title: existingFile?.title ?? titleFromPath(targetPath),
             path: targetPath,
             highlight: undefined,
+            annotations,
             writePreview: undefined,
             patchPreview: {
               path: targetPath,
@@ -1396,10 +1471,13 @@ var useViewerTabsStore = create((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,
@@ -1414,25 +1492,24 @@ var useViewerTabsStore = create((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
       };
@@ -2035,14 +2112,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;
@@ -2067,11 +2156,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,
@@ -2654,22 +2739,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\/)?(.+)$/);
@@ -2679,6 +2772,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;
@@ -2708,9 +2842,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;
@@ -2723,6 +2854,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,
@@ -2732,9 +2869,6 @@ ${bestEffortUnescapeJsonString(rawTail)}`;
       });
     };
     const handleWriteToolActivity = (eventType, payload, delta) => {
-      const viewerStore = useViewerTabsStore.getState();
-      if (!viewerStore.followToolActivity)
-        return;
       const name = getToolEventName(payload);
       if (name !== "write")
         return;
@@ -2748,6 +2882,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();
@@ -2771,9 +2914,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;
@@ -2797,6 +2937,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);
@@ -2902,6 +3049,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;
@@ -2952,6 +3104,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;
@@ -3381,6 +3617,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;
@@ -3454,22 +3701,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;
@@ -3504,11 +3736,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;
         }
@@ -5986,21 +6218,23 @@ function useTunnelStream() {
 // src/hooks/useProviderUsage.ts
 import { useEffect as useEffect14, useCallback as useCallback10, useRef as useRef7 } 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 = useCallback10(async () => {
+  const fetchUsage = useCallback10(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);
@@ -6019,9 +6253,15 @@ function useProviderUsage(provider, authType) {
     if (!provider || !isOAuthProvider)
       return;
     fetchRef.current();
+  }, [isOAuthProvider, provider]);
+  useEffect14(() => {
+    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,
@@ -6436,7 +6676,8 @@ export {
   useAddRemote,
   useAddMCPServer,
   sessionsQueryKey,
-  optimisticallyQueueMessage
+  optimisticallyQueueMessage,
+  normalizeQueueState
 };
 
-//# debugId=90296322954CBDC864756E2164756E21
+//# debugId=289696F18C6536EA64756E2164756E21