@akiojin/gwt 2.14.0 → 3.0.0

package/src/index.ts

@@ -33,7 +33,6 @@ import {
   getTerminalStreams,
   waitForUserAcknowledgement,
 } from "./utils/terminal.js";
-import { resolveWebUiPort, isPortInUse } from "./utils/webui.js";
 import { createLogger } from "./logging/logger.js";
 import { getToolById, getSharedEnvironment } from "./config/tools.js";
 import { launchCustomAITool } from "./launcher.js";
@@ -204,7 +203,10 @@ function showHelp(): void {
   console.log(`
 Worktree Manager
 
-Usage: gwt [options]
+Usage: gwt [command] [options]
+
+Commands:
+  serve           Start Web UI server (http://localhost:3000)
 
 Options:
   -h, --help      Show this help message
@@ -212,7 +214,8 @@ Options:
 
 Description:
   Interactive Git worktree manager with AI tool selection (Claude Code / Codex CLI) and graphical branch selection.
-  Launch without additional options to open the interactive menu.
+  Launch without additional options to open the interactive CLI menu.
+  Use 'gwt serve' to start the Web UI server for browser-based management.
 `);
 }
 
@@ -876,52 +879,7 @@ export async function main(): Promise<void> {
     process.exit(1);
   }
 
-  // Start Web UI server in background (skip if port is in use)
-  const port = resolveWebUiPort();
-  const portInUse = await isPortInUse(port);
-  let webServerHandlePromise: Promise<{
-    close: () => Promise<void>;
-  } | null> | null = null;
-  if (portInUse) {
-    printWarning(`Port ${port} is already in use. Skipping Web UI server.`);
-  } else {
-    const { startWebServer } = await import("./web/server/index.js");
-    webServerHandlePromise = startWebServer({ background: true }).catch(
-      (err) => {
-        appLogger.warn({ err }, "Web UI server failed to start");
-        return null;
-      },
-    );
-    printInfo(`Web UI available at http://localhost:${port}`);
-  }
-
-  try {
-    await runInteractiveLoop();
-  } finally {
-    if (webServerHandlePromise) {
-      const shutdownTimeoutMs = 2000;
-      const handleOrTimeout = await Promise.race([
-        webServerHandlePromise,
-        new Promise<"timeout">((resolve) => {
-          const timer = setTimeout(() => resolve("timeout"), shutdownTimeoutMs);
-          timer.unref?.();
-        }),
-      ]);
-
-      if (handleOrTimeout === "timeout") {
-        appLogger.warn(
-          { timeoutMs: shutdownTimeoutMs },
-          "Web UI server startup did not finish before shutdown timeout; skipping stop",
-        );
-      } else if (handleOrTimeout) {
-        try {
-          await handleOrTimeout.close();
-        } catch (err) {
-          appLogger.warn({ err }, "Web UI server failed to stop");
-        }
-      }
-    }
-  }
+  await runInteractiveLoop();
 }
 
 // Run the application if this module is executed directly

package/src/web/client/src/pages/BranchDetailPage.tsx

@@ -88,6 +88,66 @@ export function BranchDetailPage() {
     };
   }, [isTerminalFullscreen]);
 
+  // Available tools - must be before conditional returns
+  const customTools: CustomAITool[] = config?.tools ?? [];
+  const availableTools: SelectableTool[] = useMemo(
+    () => [
+      { id: "claude-code", label: "Claude Code", target: "claude" },
+      { id: "codex-cli", label: "Codex CLI", target: "codex" },
+      ...customTools.map(
+        (tool): SelectableTool => ({
+          id: tool.id,
+          label: tool.displayName,
+          target: "custom" as const,
+          definition: tool,
+        }),
+      ),
+    ],
+    [customTools],
+  );
+
+  // Ensure selected tool is valid - must be before conditional returns
+  useEffect(() => {
+    if (!availableTools.length) {
+      setSelectedToolId("claude-code");
+      return;
+    }
+    if (!availableTools.find((tool) => tool.id === selectedToolId)) {
+      const first = availableTools[0];
+      if (first) setSelectedToolId(first.id);
+    }
+  }, [availableTools, selectedToolId]);
+
+  // Branch sessions - must be before conditional returns
+  const branchSessions = useMemo(() => {
+    return (sessionsData ?? [])
+      .filter((session) => session.worktreePath === branch?.worktreePath)
+      .sort((a, b) => (b.startedAt ?? "").localeCompare(a.startedAt ?? ""));
+  }, [sessionsData, branch?.worktreePath]);
+
+  // Latest tool usage - must be before conditional returns
+  const latestToolUsage: LastToolUsage | null = useMemo(() => {
+    if (!branch) return null;
+    if (branch.lastToolUsage) return branch.lastToolUsage;
+    const first = branchSessions[0];
+    if (!first) return null;
+    return {
+      branch: branch.name,
+      worktreePath: branch.worktreePath ?? null,
+      toolId:
+        first.toolType === "custom"
+          ? (first.toolName ?? "custom")
+          : (first.toolType as LastToolUsage["toolId"]),
+      toolLabel:
+        first.toolType === "custom"
+          ? (first.toolName ?? "Custom")
+          : toolLabel(first.toolType),
+      mode: first.mode ?? "normal",
+      model: null,
+      timestamp: first.startedAt ? Date.parse(first.startedAt) : Date.now(),
+    };
+  }, [branch, branchSessions]);
+
   // Loading state
   if (isLoading) {
     return (
@@ -162,74 +222,10 @@ export function BranchDetailPage() {
   );
   const isSyncingBranch = syncBranch.isPending;
 
-  // Available tools
-  const customTools: CustomAITool[] = config?.tools ?? [];
-  const availableTools: SelectableTool[] = useMemo(
-    () => [
-      { id: "claude-code", label: "Claude Code", target: "claude" },
-      { id: "codex-cli", label: "Codex CLI", target: "codex" },
-      ...customTools.map(
-        (tool): SelectableTool => ({
-          id: tool.id,
-          label: tool.displayName,
-          target: "custom" as const,
-          definition: tool,
-        }),
-      ),
-    ],
-    [customTools],
-  );
-
-  // Ensure selected tool is valid
-  useEffect(() => {
-    if (!availableTools.length) {
-      setSelectedToolId("claude-code");
-      return;
-    }
-    if (!availableTools.find((tool) => tool.id === selectedToolId)) {
-      const first = availableTools[0];
-      if (first) setSelectedToolId(first.id);
-    }
-  }, [availableTools, selectedToolId]);
-
   const selectedTool = availableTools.find(
     (tool) => tool.id === selectedToolId,
   );
 
-  // Branch sessions
-  const branchSessions = useMemo(() => {
-    return (sessionsData ?? [])
-      .filter((session) => session.worktreePath === branch?.worktreePath)
-      .sort((a, b) => (b.startedAt ?? "").localeCompare(a.startedAt ?? ""));
-  }, [sessionsData, branch?.worktreePath]);
-
-  // Latest tool usage
-  const latestToolUsage: LastToolUsage | null = useMemo(() => {
-    if (branch?.lastToolUsage) return branch.lastToolUsage;
-    const first = branchSessions[0];
-    if (!first) return null;
-    return {
-      branch: branch.name,
-      worktreePath: branch.worktreePath ?? null,
-      toolId:
-        first.toolType === "custom"
-          ? (first.toolName ?? "custom")
-          : (first.toolType as LastToolUsage["toolId"]),
-      toolLabel:
-        first.toolType === "custom"
-          ? (first.toolName ?? "Custom")
-          : toolLabel(first.toolType),
-      mode: first.mode ?? "normal",
-      model: null,
-      timestamp: first.startedAt ? Date.parse(first.startedAt) : Date.now(),
-    };
-  }, [
-    branch?.lastToolUsage,
-    branch?.name,
-    branch?.worktreePath,
-    branchSessions,
-  ]);
-
   // Handlers
   const handleCreateWorktree = async () => {
     try {

package/src/web/server/tray.ts

@@ -11,15 +11,18 @@ const TRAY_ICON_BASE64 =
   "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAJ1BMVEUAAAAAvNQAvNQAvNQAvNQAvNQAvNQAvNQAvNQAvNQAvNQAvNT////J1ubyAAAAC3RSTlMAJYTcgyQJnJ3U3WXfUogAAAABYktHRAyBs1FjAAAAB3RJTUUH6QwMCRccbOpRBQAAAFdJREFUCNdjYEAARuXNriCarXr37t1tQEYmkN69M4GBoRvE2F3AwAqmd29kYIEwNjEwQxibGbghjN0MXDARJpgaqK6tDAzVUHMQJoPtKgPZyuq8S5WBAQBeRj51tvdhawAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyNS0xMi0xMlQwOToyMzoyOCswMDowMBPEA5UAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjUtMTItMTJUMDk6MjM6MjgrMDA6MDBimbspAAAAAElFTkSuQmCC";
 
 let trayInitAttempted = false;
-let trayInstance: { dispose?: () => void } | null = null;
+type TrayHandle = { dispose?: () => void; kill?: () => void };
+let trayInstance: TrayHandle | null = null;
+let trayInitPromise: Promise<TrayHandle> | null = null;
 
-function shouldEnableTray(): boolean {
+function shouldEnableTray(
+  platform: NodeJS.Platform = process.platform,
+): boolean {
+  // NOTE: `trayicon` is a win32-only dependency.
+  if (platform !== "win32") return false;
   if (process.env.GWT_DISABLE_TRAY?.toLowerCase() === "true") return false;
   if (process.env.GWT_DISABLE_TRAY === "1") return false;
   if (process.env.CI) return false;
-  if (process.platform === "linux") {
-    if (!process.env.DISPLAY && !process.env.WAYLAND_DISPLAY) return false;
-  }
   return true;
 }
 
@@ -52,9 +55,9 @@ export async function openUrl(url: string): Promise<void> {
  */
 export async function startSystemTray(
   url: string,
-  opts?: { openUrl?: OpenUrlFn },
+  opts?: { openUrl?: OpenUrlFn; platform?: NodeJS.Platform },
 ): Promise<void> {
-  if (trayInitAttempted || !shouldEnableTray()) return;
+  if (trayInitAttempted || !shouldEnableTray(opts?.platform)) return;
   trayInitAttempted = true;
 
   const logger = createLogger({ category: "tray" });
@@ -71,14 +74,31 @@ export async function startSystemTray(
     const icon = Buffer.from(TRAY_ICON_BASE64, "base64");
     const open = opts?.openUrl ?? openUrl;
 
-    trayInstance = create({
-      icon,
-      title: "gwt Web UI",
-      tooltip: "Double-click to open Web UI",
-      action: async () => {
-        await open(url);
-      },
-    });
+    const initPromise = Promise.resolve(
+      create({
+        icon,
+        title: "gwt Web UI",
+        tooltip: "Double-click to open Web UI",
+        action: async () => {
+          await open(url);
+        },
+      }) as TrayHandle,
+    );
+    trayInitPromise = initPromise;
+
+    void initPromise
+      .then((tray) => {
+        if (trayInitPromise !== initPromise) {
+          tray.dispose?.();
+          tray.kill?.();
+          return;
+        }
+        trayInstance = tray;
+      })
+      .catch((err) => {
+        if (trayInitPromise !== initPromise) return;
+        logger.warn({ err }, "System tray failed to initialize");
+      });
   } catch (err) {
     logger.warn({ err }, "System tray failed to initialize");
   }
@@ -88,6 +108,13 @@ export async function startSystemTray(
  * システムトレイアイコンを破棄
  */
 export function disposeSystemTray(): void {
-  trayInstance?.dispose?.();
+  trayInitPromise = null;
+
+  const instance = trayInstance;
   trayInstance = null;
+
+  instance?.dispose?.();
+  instance?.kill?.();
+
+  trayInitAttempted = false;
 }