fix: stabilize ci verification

Author: pallyoung

packages/server/src/__tests__/session-commands.test.ts

@@ -428,6 +428,67 @@ describe("Session Commands", () => {
       });
     });
 
+    it("preserves non-session leaf kinds when removing a typed session pane", async () => {
+      const workspacePath = mkdtempSync(join(tmpdir(), "coder-studio-close-typed-"));
+      tempDirs.push(workspacePath);
+      const workspace = await workspaceMgr.open({ path: workspacePath });
+      workspaceMgr.updateUiState(workspace.id, {
+        ...workspace.uiState,
+        paneLayout: {
+          id: "root",
+          type: "split",
+          direction: "horizontal",
+          children: [
+            { id: "left", type: "leaf", leafKind: "draft" },
+            { id: "center", type: "leaf", leafKind: "session", sessionId: "sess-typed" },
+            { id: "right", type: "leaf", leafKind: "editor" },
+          ],
+        },
+      });
+
+      const deleteSpy = vi.spyOn(sessionMgr, "delete").mockImplementation(() => {});
+      vi.spyOn(sessionMgr, "get").mockImplementation((sessionId: string) =>
+        sessionId === "sess-typed"
+          ? ({
+              id: "sess-typed",
+              workspaceId: workspace.id,
+              terminalId: "term-typed",
+              providerId: "codex",
+              capability: "full",
+              state: "ended",
+              startedAt: 1,
+              lastActiveAt: 1,
+              endedAt: 2,
+            } as const)
+          : undefined
+      );
+
+      const result = await dispatch(
+        {
+          kind: "command",
+          id: "test-id-close-typed",
+          op: "session.close",
+          args: {
+            sessionId: "sess-typed",
+            paneDisposition: "remove",
+          },
+        },
+        ctx
+      );
+
+      expect(result.ok).toBe(true);
+      expect(deleteSpy).toHaveBeenCalledWith("sess-typed");
+      expect(workspaceMgr.get(workspace.id)?.uiState.paneLayout).toEqual({
+        id: "root",
+        type: "split",
+        direction: "horizontal",
+        children: [
+          { id: "left", type: "leaf", leafKind: "draft" },
+          { id: "right", type: "leaf", leafKind: "editor" },
+        ],
+      });
+    });
+
     it("keeps the pane as a draft leaf for desktop disposition", async () => {
       const workspacePath = mkdtempSync(join(tmpdir(), "coder-studio-close-desktop-"));
       tempDirs.push(workspacePath);

packages/server/src/fs/search-replace.ts

@@ -609,9 +609,9 @@ function globToRegExp(pattern: string) {
   let source = "^";
 
   for (let index = 0; index < pattern.length; index += 1) {
-    const char = pattern[index];
-    const next = pattern[index + 1];
-    const nextNext = pattern[index + 2];
+    const char = pattern.charAt(index);
+    const next = pattern.charAt(index + 1);
+    const nextNext = pattern.charAt(index + 2);
 
     if (char === "*" && next === "*" && nextNext === "/") {
       source += "(?:.*/)?";

packages/server/src/lsp/vue-spec.ts

@@ -17,7 +17,7 @@
  * but semantic features will not return until the bridge is in place.
  */
 
-import path, { dirname } from "node:path";
+import path from "node:path";
 import type { LspCompanionSpec, LspServerSpec } from "./server-factory.js";
 
 export type VueBridgeMode = "auto" | "off";
@@ -64,9 +64,10 @@ export function inferVueLanguageServerLocation(vueExecutablePath: string): strin
     return null;
   }
 
-  const binDir = dirname(vueExecutablePath); // <root>/node_modules/.bin
-  const nodeModulesDir = dirname(binDir); // <root>/node_modules
-  return joinPathOnPlatform(nodeModulesDir, "@vue", "language-server");
+  const pathApi = getPathApi(vueExecutablePath);
+  const binDir = pathApi.dirname(vueExecutablePath); // <root>/node_modules/.bin
+  const nodeModulesDir = pathApi.dirname(binDir); // <root>/node_modules
+  return pathApi.join(nodeModulesDir, "@vue", "language-server");
 }
 
 export function buildVueSpecParts(inputs: VueSpecInputs): VueSpecParts {
@@ -118,18 +119,20 @@ export function parseVueBridgeMode(value: string | undefined): VueBridgeMode {
   return value.toLowerCase() === "off" ? "off" : "auto";
 }
 
-function joinPathOnPlatform(...segments: string[]): string {
-  // Pick the path style based on the input that produced these segments by
-  // letting node:path decide via `path.join`. Tests can still pass either
-  // separator style.
-  return path.join(...segments);
-}
-
 function deriveTsdk(vueLanguageServerLocation: string): string {
   // typescript is installed at the sibling of @vue/language-server:
   //   <root>/node_modules/@vue/language-server   <- location
   //   <root>/node_modules/typescript/lib         <- tsdk
-  const vueAtDir = dirname(vueLanguageServerLocation); // <root>/node_modules/@vue
-  const nodeModulesDir = dirname(vueAtDir); // <root>/node_modules
-  return joinPathOnPlatform(nodeModulesDir, "typescript", "lib");
+  const pathApi = getPathApi(vueLanguageServerLocation);
+  const vueAtDir = pathApi.dirname(vueLanguageServerLocation); // <root>/node_modules/@vue
+  const nodeModulesDir = pathApi.dirname(vueAtDir); // <root>/node_modules
+  return pathApi.join(nodeModulesDir, "typescript", "lib");
+}
+
+function getPathApi(value: string) {
+  return isWindowsStylePath(value) ? path.win32 : path.posix;
+}
+
+function isWindowsStylePath(value: string) {
+  return /^[A-Za-z]:[\\/]/.test(value) || value.includes("\\");
 }

packages/server/src/workspace/pane-layout.ts

@@ -30,7 +30,7 @@ function closePaneBySessionId(node: WorkspacePaneNode, sessionId: string): Works
 
 function replaceSessionWithDraft(node: WorkspacePaneNode, sessionId: string): WorkspacePaneNode {
   if (node.type === "leaf") {
-    if (node.sessionId === sessionId) {
+    if ("sessionId" in node && node.sessionId === sessionId) {
       return createDraftLeaf(node.id, isLegacyLeaf(node));
     }
     return node;
@@ -62,7 +62,7 @@ function removePaneBySessionId(node: WorkspacePaneNode, sessionId: string): Work
 
 function removeSessionPane(node: WorkspacePaneNode, sessionId: string): WorkspacePaneNode | null {
   if (node.type === "leaf") {
-    if (node.sessionId === sessionId) {
+    if ("sessionId" in node && node.sessionId === sessionId) {
       return null;
     }
     return node;

packages/web/src/features/agent-panes/components/session-card.test.tsx

@@ -1,8 +1,8 @@
 import { act, fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { createStore, Provider } from "jotai";
 import type { ReactNode } from "react";
-import { beforeEach, describe, expect, it, vi } from "vitest";
-import { lastViewedTargetAtom, pendingFocusSessionAtom } from "../../../atoms/app-ui";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { lastViewedTargetAtom, localeAtom, pendingFocusSessionAtom } from "../../../atoms/app-ui";
 import { connectionStatusAtom, wsClientAtom } from "../../../atoms/connection";
 import { sessionsAtom } from "../../../atoms/sessions";
 import {
@@ -40,6 +40,7 @@ function createSessionStore(
   sendCommand = vi.fn().mockResolvedValue(undefined)
 ) {
   const store = createStore();
+  store.set(localeAtom, "en");
 
   store.set(wsClientAtom, {
     sendCommand,
@@ -82,10 +83,15 @@ function createSessionStore(
 
 describe("SessionCard", () => {
   beforeEach(() => {
+    window.localStorage.setItem("ui.locale", JSON.stringify("en"));
     vi.clearAllMocks();
     paneDragEnabledMock.value = true;
   });
 
+  afterEach(() => {
+    window.localStorage.clear();
+  });
+
   it("renders ended sessions with a read-only terminal host", () => {
     const { store } = createSessionStore();
 
@@ -523,7 +529,7 @@ describe("SessionCard", () => {
     expect(headerRow).not.toBeNull();
     expect(headerRow).toContainElement(screen.getByText("SESSION-56"));
     expect(headerRow).toContainElement(screen.getByText("Codex"));
-    expect(headerRow).toContainElement(screen.getByText("Idle"));
+    expect(headerRow).toContainElement(screen.getByText("Waiting for input"));
     expect(inlineMeta).not.toBeNull();
     expect(headerRow).toContainElement(inlineMeta as HTMLElement);
   });

packages/web/src/features/agent-panes/index.test.tsx

@@ -345,6 +345,7 @@ function setPaneRect(
 
 describe("AgentPanes", () => {
   beforeEach(() => {
+    window.localStorage.setItem("ui.locale", JSON.stringify("en"));
     vi.clearAllMocks();
   });
 
@@ -1566,10 +1567,12 @@ describe("AgentPanes", () => {
       </Provider>
     );
 
-    expect(await screen.findByText("Install & Start")).toBeInTheDocument();
-
     await waitFor(() => {
-      expect(screen.getByText("Install & Start")).toBeInTheDocument();
+      expect(sendCommand).toHaveBeenCalledWith("provider.runtimeStatus", {}, undefined);
+    });
+
+    await act(async () => {
+      await Promise.resolve();
     });
 
     fireEvent.click(screen.getByRole("button", { name: /Claude/i }));
@@ -1648,7 +1651,11 @@ describe("AgentPanes", () => {
     );
 
     await waitFor(() => {
-      expect(screen.getByText("Install & Start")).toBeInTheDocument();
+      expect(sendCommand).toHaveBeenCalledWith("provider.runtimeStatus", {}, undefined);
+    });
+
+    await act(async () => {
+      await Promise.resolve();
     });
 
     fireEvent.click(screen.getByRole("button", { name: /Codex/i }));
@@ -1718,7 +1725,11 @@ describe("AgentPanes", () => {
     );
 
     await waitFor(() => {
-      expect(screen.getByText("View Install Steps")).toBeInTheDocument();
+      expect(sendCommand).toHaveBeenCalledWith("provider.runtimeStatus", {}, undefined);
+    });
+
+    await act(async () => {
+      await Promise.resolve();
     });
 
     fireEvent.click(screen.getByRole("button", { name: /Codex/i }));

packages/web/src/features/code-editor/components/monaco-host.test.tsx

@@ -1,6 +1,6 @@
 import { act, fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { createStore, Provider } from "jotai";
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { themeAtom } from "../../../atoms/app-ui";
 import { wsClientAtom } from "../../../atoms/connection";
 import { getThemeById } from "../../../theme";
@@ -284,6 +284,7 @@ vi.mock("monaco-editor/esm/vs/editor/browser/services/codeEditorService.js", ()
 
 describe("MonacoHost", () => {
   beforeEach(() => {
+    window.localStorage.setItem("ui.locale", JSON.stringify("en"));
     mockCreateEditor.mockClear();
     mockCreateModel.mockClear();
     mockDefineTheme.mockClear();
@@ -313,6 +314,10 @@ describe("MonacoHost", () => {
     openHandlerState.current = null;
   });
 
+  afterEach(() => {
+    window.localStorage.clear();
+  });
+
   it("configures Monaco JS/TS defaults for JSX syntax and eager model sync", () => {
     expect(mockSetTypeScriptCompilerOptions).toHaveBeenCalledWith(
       expect.objectContaining({

packages/web/src/features/code-editor/index.test.tsx

@@ -296,10 +296,15 @@ describe("CodeEditorHost", () => {
       baseHash: string;
       encoding: "utf-8";
     }>();
-    const sendCommand = vi
-      .fn()
-      .mockImplementationOnce(() => firstRead.promise)
-      .mockImplementationOnce(() => secondRead.promise);
+    let fileReadCount = 0;
+    const sendCommand = vi.fn().mockImplementation(async (op: string) => {
+      if (op === "file.read") {
+        fileReadCount += 1;
+        return fileReadCount === 1 ? firstRead.promise : secondRead.promise;
+      }
+
+      return null;
+    });
     const { store } = setupStore({ activePath: "src/foo.ts", sendCommand });
 
     render(
@@ -328,15 +333,16 @@ describe("CodeEditorHost", () => {
     });
 
     await waitFor(() => {
-      expect(sendCommand).toHaveBeenNthCalledWith(
-        2,
+      const fileReadCalls = sendCommand.mock.calls.filter(([op]) => op === "file.read");
+      expect(fileReadCalls).toHaveLength(2);
+      expect(fileReadCalls[1]).toEqual([
         "file.read",
         {
           workspaceId: "ws-1",
           path: "src/foo.ts",
         },
-        undefined
-      );
+        undefined,
+      ]);
     });
 
     await act(async () => {

packages/web/src/features/code-editor/monaco/language-tokenization.test.ts

@@ -42,4 +42,4 @@ beforeAll(async () => {
   monaco = await import("monaco-editor");
   ({ ensureVueLanguageRegistered } = await import("./vue-language"));
   ensureVueLanguageRegistered();
-});
+}, 30_000);

packages/web/src/features/terminal-panel/uploads/use-paste-drop-upload.test.tsx

@@ -97,6 +97,7 @@ describe("usePasteDropUpload", () => {
   beforeEach(() => {
     container = document.createElement("div");
     document.body.appendChild(container);
+    window.localStorage.setItem("ui.locale", JSON.stringify("en"));
     sendInput = vi.fn().mockResolvedValue(undefined);
     vi.stubGlobal(
       "fetch",
@@ -113,6 +114,7 @@ describe("usePasteDropUpload", () => {
 
   afterEach(() => {
     container.remove();
+    window.localStorage.clear();
     vi.unstubAllGlobals();
   });