@nextclaw/ui 0.25.4 → 0.26.1

package/src/features/chat/features/workspace/components/chat-session-workspace-file-preview.tsx

@@ -152,30 +152,34 @@ export function resolveWorkspacePreviewErrorText(error: unknown): string {
     : t('chatWorkspacePreviewFailed');
 }
 
-function WorkspaceDiffBody({ diffBlock }: { diffBlock: ChatFileOperationBlockViewModel | null }) {
+function WorkspaceDiffBody({ diffBlock, fileKey }: { diffBlock: ChatFileOperationBlockViewModel | null; fileKey: string }) {
   if (!diffBlock) {
     return <WorkspaceFilePreviewStatus text={t('chatWorkspaceDiffEmpty')} />;
   }
-  return <WorkspaceCodeSurface block={diffBlock} />;
+  return <WorkspaceCodeSurface block={diffBlock} restorationKey={`workspace-preview:diff:${fileKey}`} />;
 }
 
 function WorkspaceCodeSurface({
   block,
+  restorationKey,
   targetColumn,
   targetLine,
 }: {
   block: ChatFileOperationBlockViewModel;
+  restorationKey: string;
   targetColumn?: number | null;
   targetLine?: number | null;
 }) {
+  const { scrollRef, onScroll } = useScrollRestoration<HTMLDivElement>({ restorationKey, isEnabled: !targetLine });
   return (
-    <div className="h-full overflow-auto custom-scrollbar bg-white">
+    <div ref={scrollRef} onScroll={onScroll} className="h-full overflow-auto custom-scrollbar bg-card">
       <FileOperationCodeSurface block={block} layout="workspace" targetColumn={targetColumn} targetLine={targetLine} />
     </div>
   );
 }
 
 function WorkspacePreviewBody({
+  fileKey,
   contentUrl,
   contentUrlKind,
   contentLabel,
@@ -194,6 +198,7 @@ function WorkspacePreviewBody({
   targetColumn,
   targetLine,
 }: {
+  fileKey: string;
   contentUrl: string | null;
   contentUrlKind: WorkspaceFileContentKind | null;
   contentLabel: string;
@@ -272,7 +277,7 @@ function WorkspacePreviewBody({
   }
 
   if (previewBlock) {
-    return <WorkspaceCodeSurface block={previewBlock} targetColumn={targetColumn} targetLine={targetLine} />;
+    return <WorkspaceCodeSurface block={previewBlock} restorationKey={`workspace-preview:source:${fileKey}`} targetColumn={targetColumn} targetLine={targetLine} />;
   }
 
   return <WorkspaceFilePreviewStatus text={t('chatWorkspacePreviewEmpty')} />;
@@ -304,7 +309,7 @@ export function ChatSessionWorkspaceFilePreview({
   const markdownScrollRef = useRef<HTMLDivElement>(null);
   const isPreviewMode = file.viewMode === 'preview';
   const suppliedContentUrl = file.contentUrl?.trim() || null;
-  const usesServerPath = isPreviewMode && !suppliedContentUrl;
+  const usesServerPath = isPreviewMode && !suppliedContentUrl && file.rawText == null;
   const previewQuery = useServerPathRead({
     path: file.path,
     basePath: sessionWorkingDir,
@@ -338,6 +343,7 @@ export function ChatSessionWorkspaceFilePreview({
   const localContentUrlCandidate = buildServerPathContentUrl(file.path, sessionWorkingDir);
   const shouldRenderLocalContent = Boolean(
     !suppliedContentUrl &&
+    file.rawText == null &&
     isPreviewMode &&
     localContentUrlCandidate &&
     file.previewViewer !== 'source' &&
@@ -400,6 +406,7 @@ export function ChatSessionWorkspaceFilePreview({
   );
   const previewBody = (
     <WorkspacePreviewBody
+      fileKey={file.key}
       contentUrl={contentUrl}
       contentUrlKind={contentUrlKind}
       contentLabel={file.label?.trim() || resolvedPath}
@@ -445,7 +452,7 @@ export function ChatSessionWorkspaceFilePreview({
 
       <div className="flex-1 min-h-0 overflow-hidden">
         {file.viewMode === 'diff' ? (
-          <WorkspaceDiffBody diffBlock={diffBlock} />
+          <WorkspaceDiffBody diffBlock={diffBlock} fileKey={file.key} />
         ) : excerptPath && previewText ? (
           <WorkspaceTextSelectionMenu
             fileLabel={file.label?.trim() || excerptPath.split('/').at(-1) || excerptPath}

package/src/features/chat/features/workspace/components/chat-session-workspace-panel-content.tsx

@@ -17,6 +17,7 @@ import { ChatSessionWorkspaceFilePreview } from '@/features/chat/features/worksp
 import { ChatSessionWorkspaceDirectoryBrowser } from '@/features/chat/features/workspace/components/chat-session-workspace-directory-browser';
 import { SessionCronJobContent } from '@/features/chat/features/workspace/components/session-cron-job-content';
 import { ChatSessionChildSessions } from '@/features/chat/features/workspace/components/child-sessions/chat-session-child-sessions';
+import { SessionRunBadge } from '@/features/chat/features/session/components/session-run-badge';
 import { ChatSessionTokenUsage } from '@/features/chat/features/workspace/components/overview/chat-session-token-usage';
 import { ChatSessionContinuousAttention } from '@/features/chat/features/workspace/components/overview/chat-session-continuous-attention';
 import { useNcpSessionObservations } from '@/features/chat/features/ncp/hooks/use-ncp-session-queries';
@@ -32,6 +33,7 @@ import { t } from '@/shared/lib/i18n';
 import { resolveWorkspaceRelativePath } from '@/shared/lib/session-project';
 import { cn } from '@/shared/lib/utils';
 import { IconActionButton } from '@/shared/components/ui/actions/icon-action-button';
+import type { SessionRunStatus } from '@/features/chat/types/session-run-status.types';
 
 type ChatSessionWorkspacePanelContentProps = {
   activeSelection: WorkspaceSelection;
@@ -51,12 +53,14 @@ function WorkspaceOverviewEntry({
   description,
   icon,
   onClick,
+  runStatus,
   title,
 }: {
   count?: number;
   description: string;
   icon: ReactNode;
   onClick: () => void;
+  runStatus?: SessionRunStatus;
   title: string;
 }) {
   return (
@@ -76,6 +80,7 @@ function WorkspaceOverviewEntry({
               {count}
             </span>
           ) : null}
+          {runStatus ? <SessionRunBadge status={runStatus} /> : null}
         </span>
         <span className="mt-0.5 block text-xs leading-5 text-gray-500">{description}</span>
       </span>
@@ -117,6 +122,7 @@ function WorkspaceOverview({
             count={childSessionTabs.length}
             description={t('chatWorkspaceChildSessionsDescription')}
             icon={<GitBranch className="h-4 w-4" />}
+            runStatus={childSessionTabs.some((tab) => tab.runStatus === 'running') ? 'running' : undefined}
             title={t('chatWorkspaceChildSessions')}
             onClick={() => {
               if (sessionKey) {

package/src/features/chat/features/workspace/components/chat-session-workspace-panel-nav.tsx

@@ -8,15 +8,16 @@ import {
   FolderTree,
   GitBranch,
   LayoutDashboard,
-  Maximize2,
   MessageSquarePlus,
   MessageSquareText,
-  Minimize2,
   RefreshCw,
+  PanelRight,
+  PictureInPicture2,
   X,
 } from "lucide-react";
 import type { WorkspaceTabViewModel } from "@/features/chat/features/workspace/utils/chat-workspace-panel-view-model.utils";
 import { copySessionId } from "@/features/chat/features/session/components/session-header/chat-session-more-actions-menu";
+import { SessionRunBadge } from "@/features/chat/features/session/components/session-run-badge";
 import { AgentIdentityAvatar } from "@/shared/components/common/agent-identity";
 import { FileTypeIcon } from "@/shared/components/file-type-icon";
 import {
@@ -104,7 +105,7 @@ function buildWorkspaceFileMenuGroups(
     ? [{
         key: "close",
         icon: <X className="h-4 w-4" />,
-        label: t("chatWorkspaceCloseFile"),
+        label: t("workbenchCloseTab"),
         onSelect: tab.onClose,
       }]
     : [];
@@ -153,7 +154,9 @@ function buildCompactWorkspaceTabs(
         fileName={tab.fileName}
       />
     ),
-    badge: tab.kind === "file" && tab.viewMode === "diff" ? (
+    badge: tab.runStatus ? (
+      <SessionRunBadge status={tab.runStatus} />
+    ) : tab.kind === "file" && tab.viewMode === "diff" ? (
         <span className="shrink-0 rounded border border-amber-200 bg-amber-50 px-1 py-0 text-[9px] font-medium uppercase tracking-[0.08em] text-amber-700">
           {t("chatWorkspaceDiff")}
         </span>
@@ -162,41 +165,39 @@ function buildCompactWorkspaceTabs(
     closeLabel: `${
       tab.kind === "file"
         ? t("chatWorkspaceCloseFile")
-        : t("chatWorkspaceCloseTab")
+        : t("workbenchCloseTab")
     }: ${tab.title}`,
     closePlacement: "leading-hover",
     onSelect: tab.onSelect,
     onClose: tab.onClose,
-    menuLabel:
-      tab.kind === "child-session"
-        ? t("chatSessionMoreActions")
-        : t("chatWorkspaceFileMoreActions"),
-    menuGroups:
-      tab.menuGroups ??
-      buildWorkspaceSessionMenuGroups(tab) ??
-      buildWorkspaceFileMenuGroups(tab),
+    menuLabel: `${t('pageActions')}: ${tab.title}`,
+    menuGroups: [
+      ...(tab.menuGroups ?? []),
+      ...(buildWorkspaceSessionMenuGroups(tab) ?? buildWorkspaceFileMenuGroups(tab) ?? []).map((group) => ({
+        ...group,
+        items: group.items.filter((item) => !tab.menuGroups?.some((shared) => shared.items.some((action) => action.key === item.key))),
+      })).filter((group) => group.items.length > 0),
+      { key: 'placement', items: [
+        ...(tab.onMoveGlobal ? [{ key: 'move-global', label: t('workbenchMoveGlobal'), icon: <PanelRight className="h-4 w-4" />, onSelect: tab.onMoveGlobal }] : []),
+        ...(tab.onFloat ? [{ key: 'float', label: t('workbenchFloatView'), icon: <PictureInPicture2 className="h-4 w-4" />, onSelect: tab.onFloat }] : []),
+      ] },
+    ],
   }));
 }
 
 export function WorkspaceTabsBar({
   canGoBack,
   canGoForward,
-  isMaximized = false,
-  onClose,
   onGoBack,
   onGoForward,
   onRefreshFile,
-  onToggleMaximize,
   tabs,
 }: {
   canGoBack: boolean;
   canGoForward: boolean;
-  isMaximized?: boolean;
-  onClose: () => void;
   onGoBack: () => void;
   onGoForward: () => void;
   onRefreshFile?: () => void;
-  onToggleMaximize?: () => void;
   tabs: readonly WorkspaceTabViewModel[];
 }) {
   const compactTabs = buildCompactWorkspaceTabs(tabs);
@@ -213,27 +214,11 @@ export function WorkspaceTabsBar({
           },
         ]
       : []),
-    ...(onToggleMaximize
-      ? [
-          {
-            key: "maximize",
-            icon: isMaximized ? (
-              <Minimize2 className="h-4 w-4" />
-            ) : (
-              <Maximize2 className="h-4 w-4" />
-            ),
-            label: isMaximized
-              ? t("chatWorkspaceRestorePanel")
-              : t("chatWorkspaceMaximizePanel"),
-            onClick: onToggleMaximize,
-          },
-        ]
-      : []),
-    { key: "close", icon: <X className="h-4 w-4" />, label: t("chatWorkspaceClosePanel"), onClick: onClose },
   ];
 
   return (
     <CompactTabStrip
+      className="h-10 min-w-0 flex-1 border-0 bg-transparent px-0"
       testId="workspace-tabs-bar"
       scrollTestId="workspace-tabs-scroll"
       tabs={compactTabs}

package/src/features/chat/features/workspace/components/chat-session-workspace-panel.tsx

@@ -1,3 +1,8 @@
+import { usePageResourceActions } from '@/features/right-panel-resources';
+import { pageResourceFromTarget } from '@/features/right-panel-resources';
+import { createWorkspaceFilePanelTarget } from '@/features/chat/features/workspace/utils/workspace-file-panel-route.utils';
+import { buildSessionPanelUrl } from '@/features/chat/features/session/utils/chat-session-route.utils';
+import { sessionSurfaceManager } from '@/features/chat/managers/session-surface.manager';
 import { useEffect, useMemo, useState } from "react";
 import { useQueryClient } from "@tanstack/react-query";
 import type { CronJobView } from "@/shared/lib/api";
@@ -23,8 +28,9 @@ import {
 import { WorkspaceTabsBar } from "./chat-session-workspace-panel-nav";
 import { usePresenter } from "@/features/chat/components/providers/chat-presenter.provider";
 import { ChatSessionWorkspacePanelContent } from "@/features/chat/features/workspace/components/chat-session-workspace-panel-content";
-import { ResizableRightPanel } from "@/shared/components/resizable-right-panel/resizable-right-panel";
-import { cn } from "@/shared/lib/utils";
+import { WorkbenchSurface } from "@/shared/components/workbench/workbench-surface";
+import { getAppPresenter } from "@/app/presenters/app.presenter";
+import { t } from "@/shared/lib/i18n";
 import {
   canGoBackInNavigationHistory,
   canGoForwardInNavigationHistory,
@@ -34,6 +40,7 @@ import { buildServerPathReadQueryKey } from "@/shared/hooks/use-server-path-read
 
 type ChatSessionWorkspacePanelProps = {
   sessionKey: string | null;
+  hidden?: boolean;
   childSessionTabs: readonly ChatChildSessionTab[];
   activeChildSessionKey: string | null;
   activeSideChatDraft: ChatWorkspaceSideChatDraft | null;
@@ -55,6 +62,7 @@ type ChatSessionWorkspacePanelProps = {
 
 export function ChatSessionWorkspacePanel({
   sessionKey,
+  hidden = false,
   childSessionTabs,
   activeChildSessionKey,
   activeSideChatDraft,
@@ -74,8 +82,8 @@ export function ChatSessionWorkspacePanel({
   displayMode = "docked",
 }: ChatSessionWorkspacePanelProps) {
   const presenter = usePresenter();
+  const pageActions = usePageResourceActions();
   const queryClient = useQueryClient();
-  const [isMaximized, setIsMaximized] = useState(false);
   const [filePreviewRefreshVersion, setFilePreviewRefreshVersion] = useState(0);
   const resolvedChildTabs = useNcpChildSessionTabsView(childSessionTabs);
   const optimisticReadAtBySessionKey = useChatSessionListStore(
@@ -159,8 +167,6 @@ export function ChatSessionWorkspacePanel({
     return null;
   }
 
-  const isContainerMaximized = displayMode === "docked" && isMaximized;
-  const isOverlayPanel = displayMode === "overlay" || isContainerMaximized;
   const activeFile =
     activeSelection.kind === "file" && activeSelection.file.viewMode === "preview"
       ? activeSelection.file
@@ -185,40 +191,43 @@ export function ChatSessionWorkspacePanel({
     : undefined;
 
   return (
-    <ResizableRightPanel
-      data-testid="chat-session-workspace-panel"
-      data-theme-surface="workspace-panel"
-      className={cn(
-        isOverlayPanel
-          ? "bg-white"
-          : "hidden border-gray-200/70 bg-white/95 backdrop-blur-sm md:flex",
-        isContainerMaximized ? "shadow-xl" : null,
-      )}
-      defaultWidth={workspacePanelWidth}
-      width={workspacePanelWidth}
-      minWidth={CHAT_WORKSPACE_PANEL_MIN_WIDTH}
-      maxWidth={CHAT_WORKSPACE_PANEL_MAX_WIDTH}
+    <WorkbenchSurface
+      id={`session-workspace:${sessionKey ?? 'draft'}`} manager={getAppPresenter().workbenchSurfaceManager}
+      title={t('workbenchSessionGroup')} testId="chat-session-workspace-panel" hidden={hidden}
+      width={workspacePanelWidth} minWidth={CHAT_WORKSPACE_PANEL_MIN_WIDTH} maxWidth={CHAT_WORKSPACE_PANEL_MAX_WIDTH}
       onWidthCommit={presenter.chatThreadManager.setWorkspacePanelWidth}
-      overlay={isOverlayPanel}
-      overlayScope={isContainerMaximized ? "container" : "viewport"}
-    >
+      fullscreen={displayMode === "overlay"} onClose={presenter.chatThreadManager.closeWorkspacePanel} closeLabel={t('workbenchHideGroup')}
+      navigation={
       <WorkspaceTabsBar
-        tabs={workspaceTabs}
+        tabs={workspaceTabs.map((tab) => ({
+          ...tab,
+          menuGroups: (() => {
+            const file = workspaceFileTabs.find((item) => `file:${item.key}` === tab.key);
+            const target = file ? createWorkspaceFilePanelTarget(file, { workingDir: sessionWorkingDir, projectRoot: sessionProjectRoot })
+              : tab.sessionKey ? { kind: 'chat-session', title: tab.title, url: buildSessionPanelUrl(tab.sessionKey), resourceUri: buildSessionPanelUrl(tab.sessionKey), historyPolicy: 'none' as const } : tab.kind !== 'side-chat-draft' ? { kind: 'workspace', title: tab.title, url: `nextclaw://workspace?${new URLSearchParams({ session: sessionKey ?? '', page: tab.kind })}`, historyPolicy: 'none' as const } : null;
+            return target ? [...(tab.menuGroups ?? []), ...pageActions(pageResourceFromTarget(target), 'workspace')] : tab.menuGroups;
+          })(),
+          onMoveGlobal: tab.kind === 'file' ? () => presenter.chatThreadManager.moveFileToGlobal(tab.key.slice('file:'.length), { workingDir: sessionWorkingDir, projectRoot: sessionProjectRoot }, getAppPresenter().docBrowserManager)
+            : tab.kind === 'child-session' && tab.sessionKey ? () => {
+              sessionSurfaceManager.dock({ sessionKey: tab.sessionKey!, title: tab.title }, getAppPresenter().docBrowserManager);
+              tab.onClose?.();
+            } : undefined,
+          onFloat: tab.kind === 'child-session' && tab.sessionKey ? () => {
+            sessionSurfaceManager.open({ sessionKey: tab.sessionKey!, title: tab.title });
+            tab.onClose?.();
+          } : undefined,
+        }))}
         canGoBack={canGoBackInNavigationHistory(workspaceHistory)}
         canGoForward={canGoForwardInNavigationHistory(workspaceHistory)}
-        isMaximized={isContainerMaximized}
         onGoBack={presenter.chatThreadManager.goBackWorkspacePanel}
         onGoForward={presenter.chatThreadManager.goForwardWorkspacePanel}
         onRefreshFile={refreshActiveFile}
-        onToggleMaximize={
-          displayMode === "docked"
-            ? () => setIsMaximized((value) => !value)
-            : undefined
-        }
-        onClose={presenter.chatThreadManager.closeWorkspacePanel}
+
       />
+      }
+    >
 
-      <div className="flex min-h-0 flex-1 flex-col bg-white">
+      <div className="flex min-h-0 flex-1 flex-col bg-card">
         <ChatSessionWorkspacePanelContent
           activeSelection={activeSelection}
           childSessionTabs={resolvedChildTabs}
@@ -232,6 +241,6 @@ export function ChatSessionWorkspacePanel({
           sessionWorkingDir={sessionWorkingDir}
         />
       </div>
-    </ResizableRightPanel>
+    </WorkbenchSurface>
   );
 }

package/src/features/chat/features/workspace/components/child-sessions/chat-session-child-sessions.tsx

@@ -2,6 +2,7 @@ import { ChevronRight, GitBranch, MessageSquarePlus } from 'lucide-react';
 
 import { usePresenter } from '@/features/chat/components/providers/chat-presenter.provider';
 import type { ResolvedChildSessionTab } from '@/features/chat/features/ncp/hooks/use-ncp-child-session-tabs-view';
+import { SessionRunBadge } from '@/features/chat/features/session/components/session-run-badge';
 import { ChatSessionMoreActionsMenu } from '@/features/chat/features/session/components/session-header/chat-session-more-actions-menu';
 import { t } from '@/shared/lib/i18n';
 
@@ -52,7 +53,10 @@ export function ChatSessionChildSessions({
                     <GitBranch className="h-4 w-4" />
                   </span>
                   <span className="min-w-0 flex-1">
-                    <span className="block truncate text-sm font-medium text-gray-900">{tab.title}</span>
+                    <span className="flex min-w-0 items-center gap-1.5 text-sm font-medium text-gray-900">
+                      <span className="truncate">{tab.title}</span>
+                      {tab.runStatus ? <SessionRunBadge status={tab.runStatus} /> : null}
+                    </span>
                     {tab.projectName || tab.sessionTypeLabel ? (
                       <span className="mt-0.5 block truncate text-xs text-gray-500">
                         {[tab.sessionTypeLabel, tab.projectName].filter(Boolean).join(' · ')}
@@ -63,6 +67,7 @@ export function ChatSessionChildSessions({
                 </button>
                 <ChatSessionMoreActionsMenu
                   sessionKey={tab.sessionKey}
+                  sessionTitle={tab.title}
                   triggerSize="sm"
                   triggerTone="strong"
                   className="absolute right-2 top-1/2 -translate-y-1/2 bg-white opacity-100 md:opacity-0 md:group-hover:opacity-100 md:group-focus-within:opacity-100"

package/src/features/chat/features/workspace/components/project-files/workspace-directory-tree.tsx

@@ -6,7 +6,7 @@ import {
   Check,
   Folder,
   FolderOpen,
-  MoreHorizontal,
+  MoreVertical,
   X,
 } from 'lucide-react';
 import type {
@@ -429,7 +429,7 @@ export function WorkspaceDirectoryTreeEntry({
             <ContextMenuTrigger>
               <IconActionButton
                 className="mr-1 opacity-0 pointer-events-none group-hover:pointer-events-auto group-hover:opacity-100 group-focus-within:pointer-events-auto group-focus-within:opacity-100 data-[context-menu-open]:pointer-events-auto data-[context-menu-open]:opacity-100"
-                icon={<MoreHorizontal className="h-3.5 w-3.5" />}
+                icon={<MoreVertical className="h-3.5 w-3.5" />}
                 label={t('chatWorkspaceMoreActionsFor').replace('{name}', entry.name)}
                 size="sm"
                 tooltipSide="left"

package/src/features/chat/features/workspace/components/project-files/workspace-project-files-toolbar.tsx

@@ -1,4 +1,4 @@
-import { ChevronsUp, FilePlus2, FolderPlus, MoreHorizontal, RefreshCw } from 'lucide-react';
+import { ChevronsUp, FilePlus2, FolderPlus, MoreVertical, RefreshCw } from 'lucide-react';
 import { IconActionButton } from '@/shared/components/ui/actions/icon-action-button';
 import { ContextMenuTrigger } from '@/shared/components/ui/context-menu/context-menu';
 import { t } from '@/shared/lib/i18n';
@@ -54,7 +54,7 @@ export function WorkspaceProjectFilesToolbar({
       />
       <ContextMenuTrigger>
         <IconActionButton
-          icon={<MoreHorizontal className="h-4 w-4" />}
+          icon={<MoreVertical className="h-4 w-4" />}
           label={t('chatWorkspaceRootMoreActions')}
           size="sm"
         />

package/src/features/chat/features/workspace/utils/__tests__/chat-workspace-panel-view-model.utils.test.ts

@@ -257,6 +257,33 @@ describe("fixed workspace tabs", () => {
   });
 });
 
+it("projects child running state onto both the collection and child tabs", () => {
+  const tabs = buildWorkspaceTabsViewModel({
+    hasSession: true,
+    resolvedChildTabs: [
+      createChildTab({ runStatus: "running" }),
+      createChildTab({ sessionKey: "child-2" }),
+    ],
+    activeSideChatDraft: null,
+    closedWorkspaceTabEntries: [],
+    workspaceFileTabs: [],
+    activeSelection: { kind: "overview" },
+    optimisticReadAtBySessionKey: {},
+    onSelectSession: vi.fn(),
+    onSelectFile: vi.fn(),
+    onOpenFileViewer: vi.fn(),
+    onCloseTab: vi.fn(),
+    onSelectOverview: vi.fn(),
+    onSelectChildSessions: vi.fn(),
+    onSelectProjectFiles: vi.fn(),
+    onSelectCronJobs: vi.fn(),
+  });
+
+  expect(tabs.find((tab) => tab.kind === "child-sessions")?.runStatus).toBe("running");
+  expect(tabs.find((tab) => tab.key === "child:child-1")?.runStatus).toBe("running");
+  expect(tabs.find((tab) => tab.key === "child:child-2")?.runStatus).toBeUndefined();
+});
+
 describe("buildWorkspaceTabsViewModel", () => {
   beforeEach(() => setLanguage("en"));
 

package/src/features/chat/features/workspace/utils/__tests__/workspace-file-panel-route.utils.test.ts

@@ -0,0 +1,94 @@
+import { expect, it } from "vitest";
+import {
+  createWorkspaceFilePanelTarget,
+  readWorkspaceFilePanelView,
+  resolveFileResourceTarget,
+} from "@/features/chat/features/workspace/utils/workspace-file-panel-route.utils";
+import { DocBrowserManager } from "@/shared/components/doc-browser/managers/doc-browser.manager";
+import { WorkbenchSurfaceManager } from "@/shared/components/workbench/managers/workbench-surface.manager";
+import { useDocBrowserStore } from "@/shared/components/doc-browser/stores/doc-browser.store";
+import { RightPanelResourceRouteResolver } from "@/features/right-panel-resources";
+
+it("carries source context and diff data through global open, dedupe and reload", async () => {
+  const file = {
+    key: "source::diff::src/a.ts",
+    parentSessionKey: "source",
+    path: "src/a.ts",
+    viewMode: "diff" as const,
+    fullLines: [
+      { kind: "add" as const, text: "const result = 1;", newLineNumber: 1 },
+    ],
+  };
+  const target = createWorkspaceFilePanelTarget(file, {
+    workingDir: "/project/a",
+    projectRoot: "/project",
+  });
+  const manager = new DocBrowserManager(
+    new WorkbenchSurfaceManager(),
+    new RightPanelResourceRouteResolver(),
+  );
+  manager.openTarget(target, { newTab: true, placement: "docked" });
+  const before = useDocBrowserStore.getState().snapshot;
+  manager.openTarget(target, { newTab: true });
+  expect(useDocBrowserStore.getState().snapshot.tabs.length).toBe(
+    before.tabs.length,
+  );
+  await useDocBrowserStore.persist.rehydrate();
+  const state = useDocBrowserStore.getState().snapshot;
+  const restored = readWorkspaceFilePanelView(
+    state.tabs.find((tab) => tab.id === state.activeTabId)!,
+  );
+  expect(restored).toMatchObject({
+    workingDir: "/project/a",
+    projectRoot: "/project",
+    file,
+  });
+  expect(target.url).not.toContain("const result");
+});
+
+it("resolves native file URIs using the source context and preserves precise location", () => {
+  const target = resolveFileResourceTarget(
+    "nextclaw://file/workspace/docs/readme.md?view=source&line=12&column=3",
+    { workingDir: "/source-project", sessionKey: "source" },
+  )!;
+  expect(target.viewState).toMatchObject({
+    workingDir: "/source-project",
+    file: {
+      path: "docs/readme.md",
+      line: 12,
+      column: 3,
+      previewViewer: "source",
+      parentSessionKey: "source",
+    },
+  });
+  const restored = readWorkspaceFilePanelView({
+    ...target,
+    currentUrl: target.url,
+  } as never);
+  expect(restored?.file.line).toBe(12);
+  expect(
+    resolveFileResourceTarget("nextclaw://file/workspace/docs/a.md"),
+  ).toBeNull();
+  expect(
+    resolveFileResourceTarget(
+      "nextclaw://file/workspace/docs/a.md?base=%2Fexplicit",
+      { workingDir: "/other" },
+    )?.viewState,
+  ).toMatchObject({ workingDir: "/explicit" });
+  expect(
+    resolveFileResourceTarget("nextclaw://file/absolute/tmp/a.md")?.viewState,
+  ).toMatchObject({ workingDir: null, file: { path: "/tmp/a.md" } });
+});
+
+it("rejects traversal and malformed file scopes without changing resource identity", () => {
+  for (const uri of [
+    "nextclaw://file/unknown/a.md",
+    "nextclaw://file/workspace/%2e%2e%2fprivate",
+    "nextclaw://file/workspace/a%5Cb",
+    "nextclaw://file/workspace/",
+  ]) {
+    expect(
+      resolveFileResourceTarget(uri, { workingDir: "/source" }),
+    ).toBeNull();
+  }
+});

package/src/features/chat/features/workspace/utils/chat-workspace-file-tab-persistence.utils.ts

@@ -70,6 +70,7 @@ export function normalizePersistedWorkspaceFileTab(
     patchText: normalizeOptionalText(value.patchText),
     oldStartLine: normalizeOptionalNumber(value.oldStartLine),
     newStartLine: normalizeOptionalNumber(value.newStartLine),
+    fullLines: Array.isArray(value.fullLines) ? value.fullLines.filter((line) => line && ['context', 'add', 'remove'].includes(line.kind) && typeof line.text === 'string' && (line.oldLineNumber === undefined || Number.isFinite(line.oldLineNumber)) && (line.newLineNumber === undefined || Number.isFinite(line.newLineNumber))) : undefined,
   };
 }
 
@@ -94,6 +95,7 @@ export function toPersistedWorkspaceFileTab(
     patchText: tab.patchText,
     oldStartLine: tab.oldStartLine,
     newStartLine: tab.newStartLine,
+    fullLines: tab.fullLines,
   };
 }
 

package/src/features/chat/features/workspace/utils/chat-workspace-file-tab.utils.ts

@@ -82,3 +82,18 @@ export function reparentWorkspaceFileTab(tab: ChatWorkspaceFileTab, parentSessio
     parentSessionKey: normalizedParentSessionKey,
   };
 }
+
+export function createWorkspaceFileViewerTab(sourceTab: ChatWorkspaceFileTab, viewer: 'source' | 'rendered'): ChatWorkspaceFileTab | null {
+  return createWorkspaceFileTab({
+    path: sourceTab.path,
+    label: sourceTab.label ?? undefined,
+    viewMode: 'preview',
+    previewViewer: viewer,
+    line: sourceTab.line ?? undefined,
+    column: sourceTab.column ?? undefined,
+    params: sourceTab.params ?? undefined,
+    rawText: sourceTab.rawText ?? undefined,
+    contentUrl: sourceTab.contentUrl ?? undefined,
+    mimeType: sourceTab.mimeType ?? undefined,
+  }, sourceTab.parentSessionKey);
+}