Files tab: multi-lane open tabs and remove edit trust

apps/desktop/src/renderer/components/files/monacoModelRegistry.ts

@@ -8,16 +8,17 @@ type Entry = {
 };
 
 /**
- * Per-workbench cache of Monaco text models keyed by workspace-relative path.
+ * Per-workbench cache of Monaco text models keyed by tab model id
+ * (`editorTabId(workspaceId, path)`).
  *
  * A model is created once per file and reused across tab switches, so switching
  * tabs is `editor.setModel(existing)` instead of dispose → recreate → re-tokenize.
  * That removes the per-switch cost behind the ">3 open files lag" report and
  * preserves each file's undo stack. The renderer keeps owning the
  * content-in-state contract; this registry only owns model *lifetime*.
  *
- * Callers must `dispose(path)` when a tab closes and `disposeAll()` on workspace
- * switch / unmount, otherwise detached models leak.
+ * Callers must `dispose(modelKey)` when a tab closes everywhere and `disposeAll()`
+ * on unmount, otherwise detached models leak.
  */
 export function createMonacoModelRegistry() {
   const models = new Map<string, Entry>();
@@ -39,23 +40,23 @@ export function createMonacoModelRegistry() {
 
   return {
     /**
-     * Return the cached model for `path`, creating it from `content` on first
+     * Return the cached model for `modelKey`, creating it from `content` on first
      * use. An already-cached model is returned untouched (it holds the live
      * edited buffer); only its language is re-applied in place when it changes.
      */
     getOrCreate(
       monaco: typeof Monaco,
-      path: string,
+      modelKey: string,
       content: string,
       languageId: string,
     ): Monaco.editor.ITextModel {
-      const existing = models.get(path);
+      const existing = models.get(modelKey);
       if (existing && !existing.model.isDisposed()) {
         setLanguage(monaco, existing, languageId);
         return existing.model;
       }
       const model = monaco.editor.createModel(content, languageId);
-      models.set(path, { model, languageId, baseVersionId: model.getAlternativeVersionId() });
+      models.set(modelKey, { model, languageId, baseVersionId: model.getAlternativeVersionId() });
       return model;
     },
 
@@ -65,11 +66,11 @@ export function createMonacoModelRegistry() {
      */
     refreshClean(
       monaco: typeof Monaco,
-      path: string,
+      modelKey: string,
       content: string,
       languageId: string,
     ): boolean {
-      const entry = models.get(path);
+      const entry = models.get(modelKey);
       if (!entry || entry.model.isDisposed()) return false;
       setLanguage(monaco, entry, languageId);
       if (entry.model.getAlternativeVersionId() !== entry.baseVersionId) return false;
@@ -81,36 +82,36 @@ export function createMonacoModelRegistry() {
     },
 
     /** Mark the current buffer as the clean baseline (after load or save). */
-    markSaved(path: string): void {
-      const entry = models.get(path);
+    markSaved(modelKey: string): void {
+      const entry = models.get(modelKey);
       if (entry && !entry.model.isDisposed()) {
         entry.baseVersionId = entry.model.getAlternativeVersionId();
       }
     },
 
     /** True when the buffer has unsaved edits relative to the last save baseline. */
-    isDirty(path: string): boolean {
-      const entry = models.get(path);
+    isDirty(modelKey: string): boolean {
+      const entry = models.get(modelKey);
       if (!entry || entry.model.isDisposed()) return false;
       return entry.model.getAlternativeVersionId() !== entry.baseVersionId;
     },
 
-    /** Current buffer text, or null when no model exists for the path. */
-    getValue(path: string): string | null {
-      const entry = models.get(path);
+    /** Current buffer text, or null when no model exists for the key. */
+    getValue(modelKey: string): string | null {
+      const entry = models.get(modelKey);
       if (!entry || entry.model.isDisposed()) return null;
       return entry.model.getValue();
     },
 
-    has(path: string): boolean {
-      const entry = models.get(path);
+    has(modelKey: string): boolean {
+      const entry = models.get(modelKey);
       return Boolean(entry && !entry.model.isDisposed());
     },
 
-    dispose(path: string): void {
-      const entry = models.get(path);
+    dispose(modelKey: string): void {
+      const entry = models.get(modelKey);
       if (!entry) return;
-      models.delete(path);
+      models.delete(modelKey);
       safeDispose(entry.model);
     },
 

apps/desktop/src/renderer/components/files/treeHelpers.test.ts

@@ -2,6 +2,8 @@ import { describe, expect, it } from "vitest";
 import {
   hasAncestorDirectoryPath,
   hasLoadedDirectoryChildren,
+  filesProjectSessionKey,
+  filesSessionKey,
   isUnavailableGitDecorationsError,
   loadedDirectoryChildrenCount,
   nearestLoadedAncestorDirectoryPath,
@@ -31,6 +33,13 @@ describe("isUnavailableGitDecorationsError", () => {
   });
 });
 
+describe("files session keys", () => {
+  it("keeps the project session key outside the lane-key namespace", () => {
+    expect(filesProjectSessionKey("/repo")).not.toBe(filesSessionKey("/repo", "__project__"));
+    expect(filesProjectSessionKey("/repo")).not.toBe(filesSessionKey("/repo", null));
+  });
+});
+
 describe("file tree change refresh helpers", () => {
   it("resolves changed paths to the directory that needs a scoped reload", () => {
     expect(parentPathForFileChange("README.md")).toBe("");

apps/desktop/src/renderer/components/files/treeHelpers.ts

@@ -5,11 +5,16 @@ import type {
   FilesWorkspace,
 } from "../../../shared/types";
 
-/** Per-(project, lane) session key — the unit of tab/layout restore. */
+/** Per-(project, lane) session key — legacy; used only for migration. */
 export function filesSessionKey(projectRoot: string, laneId: string | null): string {
   return `${projectRoot}::${laneId ?? "__primary__"}`;
 }
 
+/** Project-level session key — unified tab store across all lanes. */
+export function filesProjectSessionKey(projectRoot: string): string {
+  return JSON.stringify({ kind: "files-project-session", projectRoot });
+}
+
 /**
  * Resolve which workspace a lane should show: the lane's own worktree first,
  * then any workspace bound to that lane, then the first available, then any.

apps/desktop/src/renderer/components/files/v2/EditorGroup.test.tsx

@@ -4,6 +4,7 @@ import React from "react";
 import { cleanup, fireEvent, render, screen } from "@testing-library/react";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type { MonacoModelRegistry } from "../monacoModelRegistry";
+import { editorTabId } from "./editorGroupsStore";
 import { EditorGroup, type EditorGroupProps } from "./EditorGroup";
 
 vi.mock("./ViewerHost", () => {
@@ -25,13 +26,18 @@ const registry = {
   markSaved,
 } as unknown as MonacoModelRegistry;
 
+const tabId = editorTabId("workspace-1", "src/file.ts");
+
 const baseProps: EditorGroupProps = {
   group: {
     id: "group-1",
-    activeTabId: "src/file.ts",
-    recentTabIds: ["src/file.ts"],
+    activeTabId: tabId,
+    recentTabIds: [tabId],
     tabs: [
       {
+        id: tabId,
+        workspaceId: "workspace-1",
+        laneId: "lane-1",
         path: "src/file.ts",
         title: "file.ts",
         viewerKind: "code",
@@ -42,15 +48,21 @@ const baseProps: EditorGroupProps = {
     ],
   },
   isActiveGroup: true,
-  workspaceId: "workspace-1",
-  rootPath: "/repo",
-  laneId: null,
-  canEdit: true,
-  canRevealInFinder: true,
+  explorerWorkspaceId: "workspace-1",
+  explorerLaneId: "lane-1",
+  lanes: [{ id: "lane-1", color: "#ff0000" } as never],
+  tabScope: "all",
+  resolveTabContext: () => ({
+    workspaceId: "workspace-1",
+    rootPath: "/repo",
+    laneId: "lane-1",
+    canEdit: true,
+    canRevealInFinder: true,
+  }),
   theme: "dark",
   registry,
-  dirtyPaths: new Set(["src/file.ts"]),
-  reloadTokensByPath: {},
+  dirtyTabIds: new Set([tabId]),
+  reloadTokensByTabId: {},
   onActivateTab: vi.fn(),
   onCloseTab: vi.fn(),
   onCloseOthers: vi.fn(),
@@ -87,29 +99,19 @@ beforeEach(() => {
 
 afterEach(() => {
   cleanup();
-  vi.clearAllMocks();
 });
 
-describe("EditorGroup save shortcut", () => {
-  it("saves when Cmd/Ctrl+S originates inside the active group", () => {
+describe("EditorGroup", () => {
+  it("renders the active tab and viewer", () => {
     render(<EditorGroup {...baseProps} />);
-
-    fireEvent.keyDown(screen.getByTestId("viewer-button"), { key: "s", metaKey: true });
-
-    expect(writeText).toHaveBeenCalledWith({ workspaceId: "workspace-1", path: "src/file.ts", text: "saved text" });
+    expect(screen.getByRole("tab", { name: /file\.ts/i })).toBeTruthy();
+    expect(screen.getByTestId("viewer-button")).toBeTruthy();
   });
 
-  it("ignores Cmd/Ctrl+S from unrelated or text-input focus targets", () => {
-    render(
-      <>
-        <input data-testid="outside-input" />
-        <EditorGroup {...baseProps} />
-      </>,
-    );
-
-    fireEvent.keyDown(screen.getByTestId("outside-input"), { key: "s", metaKey: true });
-    fireEvent.keyDown(screen.getByTestId("viewer-input"), { key: "s", metaKey: true });
-
+  it("does not steal Cmd+S from focused text inputs", () => {
+    render(<EditorGroup {...baseProps} />);
+    const input = screen.getByTestId("viewer-input");
+    fireEvent.keyDown(input, { key: "s", metaKey: true });
     expect(writeText).not.toHaveBeenCalled();
   });
 });