@nextclaw/ui 0.12.31 → 0.12.33

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

@@ -30,6 +30,7 @@ import { usePresenter } from "@/features/chat/components/providers/chat-presente
 import { ChatSessionWorkspaceFilePreview } from "./chat-session-workspace-file-preview";
 import { AgentIdentityAvatar } from "@/shared/components/common/agent-identity";
 import { SessionCronJobContent } from "@/features/chat/components/workspace/session-cron-job-content";
+import { ResizableRightPanel } from "@/shared/components/resizable-right-panel/resizable-right-panel";
 import { t } from "@/shared/lib/i18n";
 import { cn } from "@/shared/lib/utils";
 
@@ -314,63 +315,65 @@ export function ChatSessionWorkspacePanel({
   }
 
   return (
-    <aside
+    <ResizableRightPanel
       className={cn(
         displayMode === "overlay"
-          ? "fixed inset-0 z-40 flex bg-white"
-          : "hidden shrink-0 border-l border-gray-200/70 bg-white/95 backdrop-blur-sm md:flex md:w-[26rem] lg:w-[30rem] xl:w-[34rem]",
+          ? "bg-white"
+          : "hidden border-gray-200/70 bg-white/95 backdrop-blur-sm md:flex",
       )}
+      defaultWidth={480}
+      minWidth={360}
+      maxWidth={860}
+      overlay={displayMode === "overlay"}
     >
-      <div className="flex h-full min-h-0 w-full flex-col">
-        <div className="flex items-center justify-between gap-3 border-b border-gray-200/70 px-4 py-2.5">
-          <button
-            type="button"
-            onClick={presenter.chatThreadManager.goToParentSession}
-            className={cn(
-              "inline-flex items-center gap-1 text-xs font-medium text-gray-600 transition-colors hover:text-gray-900",
-              !hasParentSession && "pointer-events-none opacity-0",
-            )}
-          >
-            <ArrowLeft className="h-3.5 w-3.5" />
-            <span>{t("chatBackToParent")}</span>
-          </button>
-          <button
-            type="button"
-            onClick={presenter.chatThreadManager.closeWorkspacePanel}
-            className="rounded-full border border-gray-200/80 p-1.5 text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-900"
-            aria-label={t("chatWorkspaceClosePanel")}
-          >
-            <X className="h-4 w-4" />
-          </button>
-        </div>
+      <div className="flex items-center justify-between gap-3 border-b border-gray-200/70 px-4 py-2.5">
+        <button
+          type="button"
+          onClick={presenter.chatThreadManager.goToParentSession}
+          className={cn(
+            "inline-flex items-center gap-1 text-xs font-medium text-gray-600 transition-colors hover:text-gray-900",
+            !hasParentSession && "pointer-events-none opacity-0",
+          )}
+        >
+          <ArrowLeft className="h-3.5 w-3.5" />
+          <span>{t("chatBackToParent")}</span>
+        </button>
+        <button
+          type="button"
+          onClick={presenter.chatThreadManager.closeWorkspacePanel}
+          className="rounded-full border border-gray-200/80 p-1.5 text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-900"
+          aria-label={t("chatWorkspaceClosePanel")}
+        >
+          <X className="h-4 w-4" />
+        </button>
+      </div>
 
-        <WorkspaceTabsBar tabs={workspaceTabs} />
+      <WorkspaceTabsBar tabs={workspaceTabs} />
 
-        <div className="flex min-h-0 flex-1 flex-col bg-white">
-          {activeSelection.kind === "child-session" ? (
-            <>
-              <WorkspaceActiveChildHeader tab={activeSelection.tab} />
-              <div className="flex-1 min-h-0">
-                <ChildSessionContent
-                  sessionKey={activeSelection.tab.sessionKey}
-                  onToolAction={
-                    presenter.chatThreadManager.openSessionFromToolAction
-                  }
-                  onFileOpen={presenter.chatThreadManager.openFilePreview}
-                />
-              </div>
-            </>
-          ) : activeSelection.kind === "file" ? (
-            <ChatSessionWorkspaceFilePreview
-              file={activeSelection.file}
-              sessionProjectRoot={sessionProjectRoot}
-              onFileOpen={presenter.chatThreadManager.openFilePreview}
-            />
-          ) : (
-            <SessionCronJobContent jobs={sessionCronJobs} />
-          )}
-        </div>
+      <div className="flex min-h-0 flex-1 flex-col bg-white">
+        {activeSelection.kind === "child-session" ? (
+          <>
+            <WorkspaceActiveChildHeader tab={activeSelection.tab} />
+            <div className="flex-1 min-h-0">
+              <ChildSessionContent
+                sessionKey={activeSelection.tab.sessionKey}
+                onToolAction={
+                  presenter.chatThreadManager.openSessionFromToolAction
+                }
+                onFileOpen={presenter.chatThreadManager.openFilePreview}
+              />
+            </div>
+          </>
+        ) : activeSelection.kind === "file" ? (
+          <ChatSessionWorkspaceFilePreview
+            file={activeSelection.file}
+            sessionProjectRoot={sessionProjectRoot}
+            onFileOpen={presenter.chatThreadManager.openFilePreview}
+          />
+        ) : (
+          <SessionCronJobContent jobs={sessionCronJobs} />
+        )}
       </div>
-    </aside>
+    </ResizableRightPanel>
   );
 }

package/src/features/chat/components/conversation/chat-conversation-panel.test.tsx

@@ -2,7 +2,7 @@ import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { ChatConversationPanel } from "@/features/chat/components/conversation/chat-conversation-panel";
-import { ChatSessionWorkspacePanel } from "@/features/chat";
+import { ChatSessionWorkspacePanel } from "@/features/chat/components/chat-session-workspace-panel";
 import type { ResolvedChildSessionTab } from "@/features/chat/hooks/use-ncp-child-session-tabs-view";
 import type { CronJobView } from "@/shared/lib/api";
 import { useChatInputStore } from "@/features/chat/stores/chat-input.store";
@@ -556,6 +556,7 @@ describe("ChatSessionWorkspacePanel", () => {
     );
 
     expect(screen.queryByText("Child sessions")).toBeNull();
+    expect(screen.getByTestId("resizable-right-panel-handle")).toBeTruthy();
     expect(screen.getAllByText("北京天气")).toHaveLength(2);
     expect(screen.getByText("Codex")).toBeTruthy();
     expect(screen.getByText("openai/gpt-5.3-codex")).toBeTruthy();

package/src/features/chat/managers/chat-session-list.manager.test.ts

@@ -42,8 +42,9 @@ describe('ChatSessionListManager', () => {
       snapshot: {
         ...useChatThreadStore.getState().snapshot,
         workspacePanelParentKey: 'session-1',
+        activeWorkspacePanelKind: 'child-session',
         activeChildSessionKey: 'child-session-1',
-        activeWorkspaceFileKey: 'session-1::/tmp/demo.md',
+        activeWorkspaceFileKey: null,
       },
     });
   });
@@ -155,7 +156,7 @@ describe('ChatSessionListManager', () => {
     expect(useChatInputStore.getState().snapshot.pendingProjectRootSessionKey).toBeNull();
   });
 
-  it('delegates existing-session selection to routing without eagerly mutating the selected session state', () => {
+  it('delegates existing-session selection to routing while preserving workspace panel state', () => {
     const uiManager = {
       goToChatRoot: vi.fn(),
       goToSession: vi.fn(),
@@ -170,8 +171,9 @@ describe('ChatSessionListManager', () => {
 
     expect(uiManager.goToSession).toHaveBeenCalledWith('session-2');
     expect(useChatSessionListStore.getState().snapshot.selectedSessionKey).toBe('session-1');
-    expect(useChatThreadStore.getState().snapshot.workspacePanelParentKey).toBeNull();
-    expect(useChatThreadStore.getState().snapshot.activeChildSessionKey).toBeNull();
+    expect(useChatThreadStore.getState().snapshot.workspacePanelParentKey).toBe('session-1');
+    expect(useChatThreadStore.getState().snapshot.activeWorkspacePanelKind).toBe('child-session');
+    expect(useChatThreadStore.getState().snapshot.activeChildSessionKey).toBe('child-session-1');
     expect(useChatThreadStore.getState().snapshot.activeWorkspaceFileKey).toBeNull();
   });
 

package/src/features/chat/managers/chat-session-list.manager.ts

@@ -154,12 +154,6 @@ export class ChatSessionListManager {
   };
 
   selectSession = (sessionKey: string) => {
-    useChatThreadStore.getState().setSnapshot({
-      workspacePanelParentKey: null,
-      activeWorkspacePanelKind: null,
-      activeChildSessionKey: null,
-      activeWorkspaceFileKey: null,
-    });
     this.uiManager.goToSession(sessionKey);
   };
 

package/src/features/chat/utils/chat-message-invalid-tool-arguments.utils.test.ts

@@ -0,0 +1,79 @@
+import { ToolInvocationStatus, type UiMessage } from "@nextclaw/agent-chat";
+import { adaptChatMessages } from "./chat-message.utils";
+import type { ChatMessageSource } from "./chat-message.utils";
+
+const defaultTexts = {
+  roleLabels: {
+    user: "You",
+    assistant: "Assistant",
+    tool: "Tool",
+    system: "System",
+    fallback: "Message",
+  },
+  reasoningLabel: "Reasoning",
+  toolCallLabel: "Tool Call",
+  toolResultLabel: "Tool Result",
+  toolInputLabel: "Input",
+  toolNoOutputLabel: "No output",
+  toolOutputLabel: "Output",
+  toolStatusPreparingLabel: "Preparing",
+  toolStatusRunningLabel: "Running",
+  toolStatusCompletedLabel: "Completed",
+  toolStatusFailedLabel: "Failed",
+  toolStatusCancelledLabel: "Cancelled",
+  imageAttachmentLabel: "Image attachment",
+  fileAttachmentLabel: "File attachment",
+  unknownPartLabel: "Unknown Part",
+};
+
+function adapt(uiMessages: UiMessage[]) {
+  return adaptChatMessages({
+    uiMessages: uiMessages as unknown as ChatMessageSource[],
+    formatTimestamp: (value) => `formatted:${value}`,
+    texts: defaultTexts,
+  });
+}
+
+it("renders invalid tool arguments as a failed argument card instead of a normal raw-args card", () => {
+  const rawArgumentsText = '{"task":"spawn","request">\n<｜｜DSML｜｜parameter: "final_reply"}';
+  const adapted = adapt([
+    {
+      id: "assistant-invalid-tool-args",
+      role: "assistant",
+      parts: [
+        {
+          type: "tool-invocation",
+          toolInvocation: {
+            status: ToolInvocationStatus.RESULT,
+            toolCallId: "call-invalid-args",
+            toolName: "sessions_spawn",
+            args: rawArgumentsText,
+            result: {
+              ok: false,
+              error: {
+                code: "invalid_tool_arguments",
+                message: "Tool arguments are invalid.",
+                toolCallId: "call-invalid-args",
+                toolName: "sessions_spawn",
+                rawArgumentsText,
+                issues: ["Invalid JSON"],
+              },
+            },
+          },
+        },
+      ],
+    },
+  ]);
+
+  expect(adapted[0]?.parts[0]).toMatchObject({
+    type: "tool-card",
+    card: {
+      toolName: "sessions_spawn",
+      summary: "Invalid arguments: Invalid JSON",
+      input: rawArgumentsText,
+      output: "Invalid JSON",
+      statusTone: "error",
+      statusLabel: "Failed",
+    },
+  });
+});

package/src/features/chat/utils/chat-message-part.utils.ts

@@ -21,7 +21,6 @@ import { buildFileOperationCardData } from "./file-operation/card.utils";
 import { buildSessionRequestToolCard } from "./chat-message-session-request-tool-card.utils";
 import type {
   ChatMessagePartViewModel,
-  ChatToolPartViewModel,
 } from "@nextclaw/agent-chat-ui";
 import type {
   ChatMessageAdapterTexts,
@@ -39,6 +38,17 @@ type ChatMessagePartAdapterParams = {
   texts: ChatMessageAdapterTexts;
 };
 
+function readInvalidToolArgumentsError(value: unknown): Record<string, unknown> | null {
+  const error = typeof value === "object" && value !== null && !Array.isArray(value)
+    ? (value as { error?: unknown }).error
+    : null;
+  return typeof error === "object" &&
+    error !== null &&
+    !Array.isArray(error) &&
+    (error as { code?: unknown }).code === "invalid_tool_arguments"
+    ? error as Record<string, unknown>
+    : null;
+}
 
 function buildReasoningPart(
   part: Extract<ChatMessagePartSource, { type: "reasoning" }>,
@@ -113,6 +123,10 @@ function buildToolInvocationPart(
     result: invocation.result,
     texts,
   });
+  const invalidArgsError = readInvalidToolArgumentsError(invocation.result);
+  const invalidArgsIssue = Array.isArray(invalidArgsError?.issues)
+    ? invalidArgsError.issues.find((issue): issue is string => typeof issue === "string" && issue.trim().length > 0)
+    : undefined;
   const fileOperationCardData = buildFileOperationCardData({
     toolName: invocation.toolName,
     status: invocation.status,
@@ -121,14 +135,14 @@ function buildToolInvocationPart(
     parsedArgs: invocation.parsedArgs,
     result: invocation.result,
   });
-  const detail =
-    fileOperationCardData?.summary ??
-    summarizeToolArgs(invocation.parsedArgs ?? invocation.args);
-  const input = fileOperationCardData
-    ? undefined
-    : buildToolInvocationInput(invocation.args, invocation.parsedArgs);
+  const detail = invalidArgsIssue
+    ? `Invalid arguments: ${invalidArgsIssue}`
+    : fileOperationCardData?.summary ?? summarizeToolArgs(invocation.parsedArgs ?? invocation.args);
+  const input = fileOperationCardData ? undefined : buildToolInvocationInput(invocation.args, invocation.parsedArgs);
   const rawResult =
-    typeof invocation.error === "string" && invocation.error.trim()
+    invalidArgsIssue
+      ? invalidArgsIssue
+      : typeof invocation.error === "string" && invocation.error.trim()
       ? invocation.error.trim()
       : invocation.result != null
         ? stringifyUnknown(invocation.result).trim()
@@ -149,8 +163,8 @@ function buildToolInvocationPart(
     outputData: invocation.result,
     callId: invocation.toolCallId || undefined,
     hasResult: statusView.hasResult,
-    statusTone: statusView.statusTone,
-    statusLabel: statusView.statusLabel,
+    statusTone: invalidArgsError ? "error" : statusView.statusTone,
+    statusLabel: invalidArgsError ? texts.toolStatusFailedLabel : statusView.statusLabel,
     ...(fileOperationCardData?.fileOperation
       ? { fileOperation: fileOperationCardData.fileOperation }
       : {}),
@@ -217,17 +231,18 @@ function isToolInvocationPart(
 export function adaptChatMessagePart(
   params: ChatMessagePartAdapterParams,
 ): ChatMessagePartViewModel | null {
-  if (isTextPart(params.part)) {
-    return buildTextPart(params.part, params.inlineTokens);
+  const { inlineTokens, part, texts } = params;
+  if (isTextPart(part)) {
+    return buildTextPart(part, inlineTokens);
   }
-  if (isReasoningPart(params.part)) {
-    return buildReasoningPart(params.part, params.texts);
+  if (isReasoningPart(part)) {
+    return buildReasoningPart(part, texts);
   }
-  if (isFilePart(params.part)) {
-    return buildFilePart(params.part, params.texts);
+  if (isFilePart(part)) {
+    return buildFilePart(part, texts);
   }
-  if (isToolInvocationPart(params.part)) {
-    return buildToolInvocationPart(params.part, params.texts);
+  if (isToolInvocationPart(part)) {
+    return buildToolInvocationPart(part, texts);
   }
-  return buildUnknownPart(params.part, params.texts);
+  return buildUnknownPart(part, texts);
 }

package/src/main.tsx

@@ -1,18 +1,20 @@
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
-import { BrowserRouter } from 'react-router-dom';
+import { BrowserRouter, MemoryRouter } from 'react-router-dom';
 import App from './app';
 import { I18nProvider } from '@/components/providers/I18nProvider';
 import { ThemeProvider } from '@/components/providers/ThemeProvider';
 import './index.css';
 
+const AppRouter = window.nextclawDesktop?.platform === 'win32' ? MemoryRouter : BrowserRouter;
+
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <ThemeProvider>
       <I18nProvider>
-        <BrowserRouter>
+        <AppRouter>
           <App />
-        </BrowserRouter>
+        </AppRouter>
       </I18nProvider>
     </ThemeProvider>
   </StrictMode>

package/src/platforms/desktop/components/desktop-app-shell.test.tsx

@@ -1,4 +1,4 @@
-import { render, screen } from "@testing-library/react";
+import { act, render, screen } from "@testing-library/react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { DesktopAppShell } from "@/platforms/desktop/components/desktop-app-shell";
@@ -7,10 +7,22 @@ vi.mock("@/app/components/layout/sidebar", () => ({
   Sidebar: () => <aside data-testid="settings-sidebar">Settings Sidebar</aside>,
 }));
 
-function setDesktopPlatform(platform: string | null): void {
+type WindowStateListener = (snapshot: { isMaximized: boolean }) => void;
+
+let windowStateListener: WindowStateListener | null = null;
+
+function setDesktopPlatform(platform: string | null, isMaximized = false): void {
+  windowStateListener = null;
   window.nextclawDesktop = platform
     ? ({
         platform,
+        getWindowState: async () => ({ isMaximized }),
+        onWindowStateChanged: (listener: WindowStateListener) => {
+          windowStateListener = listener;
+          return () => {
+            windowStateListener = null;
+          };
+        },
       } as typeof window.nextclawDesktop)
     : undefined;
 }
@@ -48,20 +60,42 @@ describe("DesktopAppShell", () => {
 
     const chrome = screen.getByTestId("desktop-window-chrome");
     const sidebarChrome = screen.getByTestId("desktop-window-chrome-sidebar");
-    const mainChrome = screen.getByTestId("desktop-window-chrome-main");
+    const mainDragRegion = screen.getByTestId("desktop-window-chrome-main-drag-region");
+    const resizeStrip = screen.getByTestId("desktop-window-chrome-resize-strip");
+    const controls = screen.getByTestId("desktop-window-controls");
 
     expect(chrome).toBeTruthy();
     expect(chrome.parentElement?.style.getPropertyValue("--desktop-titlebar-height")).toBe("40px");
     expect(chrome.className).toContain("bg-secondary");
+    expect(chrome.className).toContain("border-b");
+    expect(chrome.className).toContain("desktop-window-drag");
     expect(sidebarChrome.className).toContain("w-[var(--desktop-sidebar-width)]");
-    expect(sidebarChrome.className).not.toContain("border-b");
-    expect(mainChrome.className).toContain("border-b");
-    expect(mainChrome.className).toContain("desktop-window-drag");
-    expect(mainChrome.className).toContain("mr-[var(--desktop-caption-safe-right)]");
-    expect(mainChrome.className).not.toContain("pr-[var(--desktop-caption-safe-right)]");
+    expect(sidebarChrome.className).toContain("desktop-window-no-drag");
+    expect(mainDragRegion.className).toContain("flex-1");
+    expect(mainDragRegion.className).toContain("desktop-window-drag");
+    expect(resizeStrip.className).toContain("desktop-window-no-drag");
+    expect(resizeStrip.className).toContain("top-0");
+    expect(resizeStrip.className).toContain("h-1");
+    expect(controls.className).toContain("desktop-window-no-drag");
+    expect(screen.getByLabelText("Minimize").className).toContain("desktop-window-no-drag");
+    expect(screen.getByLabelText("Maximize").className).toContain("desktop-window-no-drag");
+    expect(screen.getByLabelText("Close").className).toContain("desktop-window-no-drag");
     expect(screen.getByTestId("app-content")).toBeTruthy();
   });
 
+  it("switches the Windows maximize button to restore while maximized", async () => {
+    renderDesktopShell("win32");
+
+    expect(await screen.findByLabelText("Maximize")).toBeTruthy();
+
+    act(() => {
+      windowStateListener?.({ isMaximized: true });
+    });
+
+    expect(screen.getByLabelText("Restore").className).toContain("desktop-window-no-drag");
+    expect(screen.queryByLabelText("Maximize")).toBeNull();
+  });
+
   it("keeps non-Windows desktop hosts on the existing shell shape", () => {
     renderDesktopShell("darwin");
 

package/src/platforms/desktop/components/desktop-window-chrome.tsx

@@ -1,30 +1,106 @@
+import { useEffect, useState } from "react";
+import { Copy, Minus, Square, X } from "lucide-react";
 import { BrandHeader } from "@/shared/components/common/brand-header";
+import type { DesktopWindowStateSnapshot } from "@/platforms/desktop/types/desktop-update.types";
+
+type DesktopWindowControlAction = "minimize" | "toggle-maximize" | "close";
+
+type WindowControlDefinition = {
+  action: DesktopWindowControlAction;
+  label: string;
+  icon: typeof Minus;
+  variant?: "danger";
+};
+
+const windowControls: WindowControlDefinition[] = [
+  { action: "minimize", label: "Minimize", icon: Minus },
+  { action: "close", label: "Close", icon: X, variant: "danger" },
+];
 
 export function DesktopWindowChrome() {
+  const isMaximized = useDesktopWindowMaximizedState();
+  const maximizeControl: WindowControlDefinition = isMaximized
+    ? { action: "toggle-maximize", label: "Restore", icon: Copy }
+    : { action: "toggle-maximize", label: "Maximize", icon: Square };
+
   return (
     <header
-      className="flex h-[var(--desktop-titlebar-height)] shrink-0 bg-secondary"
+      className="desktop-window-drag relative flex h-[var(--desktop-titlebar-height)] shrink-0 border-b border-[#ebe7dc]/80 bg-secondary"
       data-testid="desktop-window-chrome"
     >
       <div
-        className="desktop-window-drag flex h-full w-[var(--desktop-sidebar-width)] shrink-0 items-center bg-secondary pl-4 pr-3 text-secondary-foreground"
+        className="desktop-window-no-drag absolute left-0 right-0 top-0 h-1"
+        data-testid="desktop-window-chrome-resize-strip"
+      />
+      <div
+        className="desktop-window-no-drag relative z-10 flex h-full w-[var(--desktop-sidebar-width)] shrink-0 items-center bg-secondary pl-4 pr-3 text-secondary-foreground"
         data-testid="desktop-window-chrome-sidebar"
       >
-        <div className="desktop-window-no-drag flex min-w-0 shrink-0 items-center">
-          <BrandHeader
-            className="flex min-w-0 items-center gap-2.5"
-            density="chrome"
-          />
-        </div>
-        <div className="min-w-0 flex-1 self-stretch" aria-hidden="true" />
+        <BrandHeader
+          className="flex min-w-0 shrink-0 items-center gap-2.5"
+          density="chrome"
+        />
       </div>
+      <div aria-hidden="true" className="desktop-window-drag h-full min-w-0 flex-1" data-testid="desktop-window-chrome-main-drag-region" />
       <div
-        className="desktop-window-drag mr-[var(--desktop-caption-safe-right)] flex min-w-0 flex-1 items-center border-b border-[#ebe7dc]/80 bg-secondary"
-        aria-hidden="true"
-        data-testid="desktop-window-chrome-main"
+        className="desktop-window-no-drag absolute right-0 top-0 z-20 flex h-full w-[var(--desktop-caption-safe-right)] items-start justify-end"
+        data-testid="desktop-window-controls"
       >
-        <div className="min-w-0 flex-1 self-stretch" />
+        {[windowControls[0], maximizeControl, windowControls[1]].map((control) => (
+          <DesktopWindowControlButton key={control.action} control={control} />
+        ))}
       </div>
     </header>
   );
 }
+
+function DesktopWindowControlButton({
+  control,
+}: {
+  control: WindowControlDefinition;
+}) {
+  const Icon = control.icon;
+
+  return (
+    <button
+      type="button"
+      aria-label={control.label}
+      title={control.label}
+      className={
+        control.variant === "danger"
+          ? "desktop-window-no-drag flex h-10 w-[46px] items-center justify-center text-gray-700 transition-colors hover:bg-red-500 hover:text-white"
+          : "desktop-window-no-drag flex h-10 w-[46px] items-center justify-center text-gray-700 transition-colors hover:bg-black/10"
+      }
+      onClick={() => {
+        void window.nextclawDesktop?.controlWindow?.(control.action);
+      }}
+    >
+      <Icon className="h-3.5 w-3.5" />
+    </button>
+  );
+}
+
+function useDesktopWindowMaximizedState(): boolean {
+  const [isMaximized, setIsMaximized] = useState(false);
+
+  useEffect(() => {
+    let isSubscribed = true;
+    const desktopApi = window.nextclawDesktop;
+
+    void desktopApi?.getWindowState?.().then((snapshot: DesktopWindowStateSnapshot) => {
+      if (isSubscribed) {
+        setIsMaximized(snapshot.isMaximized);
+      }
+    });
+    const unsubscribe = desktopApi?.onWindowStateChanged?.((snapshot: DesktopWindowStateSnapshot) => {
+      setIsMaximized(snapshot.isMaximized);
+    });
+
+    return () => {
+      isSubscribed = false;
+      unsubscribe?.();
+    };
+  }, []);
+
+  return isMaximized;
+}

package/src/platforms/desktop/types/desktop-update.types.ts

@@ -48,7 +48,9 @@ export type DesktopPresenceSnapshot = DesktopPresencePreferences & {
 
 export type DesktopUiLanguagePreference = 'en' | 'zh';
 
-export type DesktopShellTheme = 'warm' | 'cool';
+export type DesktopWindowControlAction = 'minimize' | 'toggle-maximize' | 'close';
+
+export type DesktopWindowStateSnapshot = { isMaximized: boolean };
 
 export type NextClawDesktopBridge = {
   platform: string;
@@ -65,6 +67,8 @@ export type NextClawDesktopBridge = {
   getPresenceState: () => Promise<DesktopPresenceSnapshot>;
   updatePresencePreferences: (preferences: Partial<DesktopPresencePreferences>) => Promise<DesktopPresenceSnapshot>;
   setLocalePreference?: (language: DesktopUiLanguagePreference | null) => Promise<DesktopUiLanguagePreference | null>;
-  setShellTheme?: (theme: DesktopShellTheme) => Promise<void>;
+  controlWindow?: (action: DesktopWindowControlAction) => Promise<void>;
+  getWindowState?: () => Promise<DesktopWindowStateSnapshot>;
+  onWindowStateChanged?: (listener: (snapshot: DesktopWindowStateSnapshot) => void) => () => void;
   onUpdateStateChanged: (listener: (snapshot: DesktopUpdateSnapshot) => void) => () => void;
 };