@akiojin/gwt 4.10.0 → 4.12.0

package/src/utils/session/parsers/opencode.ts

@@ -13,8 +13,10 @@ import type { OpenCodeSessionInfo, SessionSearchOptions } from "../types.js";
 import {
   collectFilesIterative,
   matchesCwd,
+  resolveBranchFromCwd,
   readSessionInfoFromFile,
 } from "../common.js";
+import { listAllWorktrees } from "../../../worktree.js";
 
 /**
  * Returns the OpenCode session directory
@@ -73,15 +75,50 @@ export async function findLatestOpenCodeSession(
     return b.mtime - a.mtime;
   });
 
+  const branchFilter =
+    typeof options.branch === "string" && options.branch.trim().length > 0
+      ? options.branch.trim()
+      : null;
+  const shouldCheckBranch = Boolean(branchFilter);
+  const shouldCheckCwd = Boolean(options.cwd) && !shouldCheckBranch;
+
+  let worktrees: { path: string; branch: string }[] = [];
+  if (shouldCheckBranch) {
+    if (Array.isArray(options.worktrees) && options.worktrees.length > 0) {
+      worktrees = options.worktrees
+        .filter((entry) => entry?.path && entry?.branch)
+        .map((entry) => ({ path: entry.path, branch: entry.branch }));
+    } else {
+      try {
+        const allWorktrees = await listAllWorktrees();
+        worktrees = allWorktrees
+          .filter((entry) => entry?.path && entry?.branch)
+          .map((entry) => ({ path: entry.path, branch: entry.branch }));
+      } catch {
+        worktrees = [];
+      }
+    }
+    if (!worktrees.length) return null;
+  }
+
   for (const file of pool) {
     const info = await readSessionInfoFromFile(file.fullPath);
     if (!info.id) continue;
-    if (options.cwd) {
-      if (matchesCwd(info.cwd, options.cwd)) {
-        return { id: info.id, mtime: file.mtime };
+    const sessionCwd = info.cwd ?? null;
+
+    if (shouldCheckBranch) {
+      const resolvedBranch = resolveBranchFromCwd(sessionCwd, worktrees);
+      if (resolvedBranch !== branchFilter) {
+        continue;
       }
-      continue;
     }
+
+    if (shouldCheckCwd && options.cwd) {
+      if (!matchesCwd(sessionCwd, options.cwd)) {
+        continue;
+      }
+    }
+
     return { id: info.id, mtime: file.mtime };
   }
 
@@ -98,7 +135,11 @@ export async function findLatestOpenCodeSessionId(
   cwd: string,
   options: SessionSearchOptions = {},
 ): Promise<string | null> {
-  const searchOptions: SessionSearchOptions = { cwd: options.cwd ?? cwd };
+  const searchOptions: SessionSearchOptions = {
+    cwd: options.cwd ?? cwd,
+    branch: options.branch ?? null,
+    worktrees: options.worktrees ?? null,
+  };
   if (options.since !== undefined) searchOptions.since = options.since;
   if (options.until !== undefined) searchOptions.until = options.until;
   if (options.preferClosestTo !== undefined)

package/src/utils/session/types.ts

@@ -16,6 +16,10 @@ export interface SessionSearchOptions {
   windowMs?: number;
   /** Working directory filter */
   cwd?: string | null;
+  /** Branch name filter (resolved from session cwd via worktree paths) */
+  branch?: string | null;
+  /** Optional worktree list to avoid shelling out for branch mapping */
+  worktrees?: { path: string; branch: string }[] | null;
 }
 
 /**

package/src/utils/terminal.ts

@@ -214,6 +214,30 @@ export function resetTerminalModes(
   }
 }
 
+export function writeTerminalLine(
+  message: string,
+  stream: "stdout" | "stderr" = "stdout",
+): void {
+  const terminal = getTerminalStreams();
+  const target = stream === "stderr" ? terminal.stderr : terminal.stdout;
+  const payload = message.endsWith("\n") ? message : `${message}\n`;
+
+  if (target && typeof target.write === "function") {
+    try {
+      target.write(payload);
+      return;
+    } catch {
+      // Ignore write errors and fall back to console.
+    }
+  }
+
+  if (stream === "stderr") {
+    console.error(message);
+  } else {
+    console.log(message);
+  }
+}
+
 /**
  * Creates stdio settings for launching a child process.
  *

package/src/utils.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach, afterEach } from "vitest";
+import { describe, it, expect } from "bun:test";
 import { getPackageVersion } from "./utils";
 import { readFile } from "fs/promises";
 import path from "node:path";

package/src/utils.ts

@@ -1,7 +1,6 @@
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { access, readFile } from "fs/promises";
-import { existsSync } from "fs";
+import { readFile } from "fs/promises";
 export function getCurrentDirname(): string {
   return path.dirname(fileURLToPath(import.meta.url));
 }
@@ -16,17 +15,51 @@ export class AppError extends Error {
   }
 }
 
+/**
+ * Global cleanup callback for terminal restoration.
+ * This is called before exit to restore terminal state.
+ */
+let cleanupCallback: (() => void) | null = null;
+
+/**
+ * Registers a cleanup callback to be called on exit.
+ * Used for terminal state restoration.
+ */
+export function registerExitCleanup(callback: () => void): void {
+  cleanupCallback = callback;
+}
+
+/**
+ * Clears the registered cleanup callback.
+ */
+export function clearExitCleanup(): void {
+  cleanupCallback = null;
+}
+
+/**
+ * Performs cleanup and exits the process.
+ * Ensures terminal is restored before exiting.
+ */
+function performCleanupAndExit(exitCode: number): void {
+  try {
+    cleanupCallback?.();
+  } catch {
+    // Ignore cleanup errors to ensure exit completes
+  }
+  process.exit(exitCode);
+}
+
 export function setupExitHandlers(): void {
   // Handle Ctrl+C gracefully
   process.on("SIGINT", () => {
     console.log("\n\n👋 Goodbye!");
-    process.exit(0);
+    performCleanupAndExit(0);
   });
 
   // Handle other termination signals
   process.on("SIGTERM", () => {
     console.log("\n\n👋 Goodbye!");
-    process.exit(0);
+    performCleanupAndExit(0);
   });
 }
 

package/src/web/client/src/components/CodingAgentLaunchModal.tsx

@@ -21,6 +21,7 @@ import { useStartSession } from "../hooks/useSessions";
 import { useCreateWorktree } from "../hooks/useWorktrees";
 import { useSyncBranch } from "../hooks/useBranches";
 import { ApiError } from "../lib/api";
+import { getAgentTailwindClass } from "@/lib/coding-agent-colors";
 
 const BUILTIN_AGENT_SUMMARIES: Record<string, AgentSummary> = {
   "claude-code": {
@@ -166,7 +167,7 @@ export function CodingAgentLaunchModal({
     branch.name.replace(/^origin\//, ""),
   );
   const divergenceInfo = branch.divergence ?? null;
-  const hasBlockingDivergence = Boolean(
+  const hasConflictingDivergence = Boolean(
     divergenceInfo && divergenceInfo.ahead > 0 && divergenceInfo.behind > 0,
   );
   const needsRemoteSync = Boolean(
@@ -174,7 +175,7 @@ export function CodingAgentLaunchModal({
     divergenceInfo &&
     divergenceInfo.behind > 0 &&
     divergenceInfo.ahead === 0 &&
-    !hasBlockingDivergence,
+    !hasConflictingDivergence,
   );
 
   useEffect(() => {
@@ -270,15 +271,6 @@ export function CodingAgentLaunchModal({
       });
       return;
     }
-    if (hasBlockingDivergence) {
-      setBanner({
-        type: "error",
-        message:
-          "Both remote and local have diverged. Resolve differences before launching.",
-      });
-      return;
-    }
-
     if (
       skipPermissions &&
       !window.confirm("Skip permission checks? This is risky.")
@@ -408,11 +400,11 @@ export function CodingAgentLaunchModal({
             </Alert>
           )}
 
-          {hasBlockingDivergence && (
+          {hasConflictingDivergence && (
             <Alert variant="warning">
               <AlertDescription>
-                Both remote and local have unresolved differences. Rebase/merge
-                before launching.
+                Both remote and local have unresolved differences. You can
+                launch, but resolving differences is recommended.
               </AlertDescription>
             </Alert>
           )}
@@ -430,7 +422,11 @@ export function CodingAgentLaunchModal({
                 </SelectTrigger>
                 <SelectContent>
                   {availableAgents.map((agent) => (
-                    <SelectItem key={agent.id} value={agent.id}>
+                    <SelectItem
+                      key={agent.id}
+                      value={agent.id}
+                      className={getAgentTailwindClass(agent.id)}
+                    >
                       {agent.label}
                     </SelectItem>
                   ))}
@@ -479,12 +475,7 @@ export function CodingAgentLaunchModal({
           <div className="flex flex-wrap gap-2">
             <Button
               onClick={handleStartSession}
-              disabled={
-                isStartingSession ||
-                !selectedAgent ||
-                hasBlockingDivergence ||
-                needsRemoteSync
-              }
+              disabled={isStartingSession || !selectedAgent || needsRemoteSync}
             >
               {isStartingSession ? "Launching..." : "Launch coding agent"}
             </Button>

package/src/web/client/src/components/branch-detail/BranchInfoCards.tsx

@@ -2,6 +2,10 @@ import React from "react";
 import { Card, CardHeader, CardContent } from "@/components/ui/card";
 import { Badge } from "@/components/ui/badge";
 import type { Branch, LastToolUsage } from "../../../../../types/api.js";
+import {
+  getAgentTailwindClass,
+  getAgentBgTailwindClass,
+} from "@/lib/coding-agent-colors";
 
 interface BranchInfoCardsProps {
   branch: Branch;
@@ -158,7 +162,10 @@ export function BranchInfoCards({
           </CardHeader>
           <CardContent>
             <div className="flex flex-wrap items-center gap-2 text-sm">
-              <Badge variant="outline">
+              <Badge
+                variant="outline"
+                className={`${getAgentTailwindClass(latestToolUsage.toolId)} ${getAgentBgTailwindClass(latestToolUsage.toolId)}`}
+              >
                 {renderToolUsage(latestToolUsage)}
               </Badge>
               <span className="text-muted-foreground">
@@ -169,6 +176,14 @@ export function BranchInfoCards({
                   @ {latestToolUsage.worktreePath}
                 </span>
               )}
+              {latestToolUsage.sessionId && (
+                <span className="text-xs text-muted-foreground">
+                  Session ID:{" "}
+                  <code className="rounded bg-muted px-1.5 py-0.5 font-mono">
+                    {latestToolUsage.sessionId}
+                  </code>
+                </span>
+              )}
             </div>
           </CardContent>
         </Card>

package/src/web/client/src/components/branch-detail/SessionHistoryTable.tsx

@@ -10,6 +10,10 @@ import {
   TableHead,
   TableCell,
 } from "@/components/ui/table";
+import {
+  getAgentTailwindClass,
+  normalizeAgentToToolId,
+} from "@/lib/coding-agent-colors";
 
 interface SessionInfo {
   sessionId: string;
@@ -131,7 +135,9 @@ export function SessionHistoryTable({
                         {SESSION_STATUS_LABEL[session.status]}
                       </Badge>
                     </TableCell>
-                    <TableCell className="font-medium">
+                    <TableCell
+                      className={`font-medium ${getAgentTailwindClass(normalizeAgentToToolId(session.agentType))}`}
+                    >
                       {agentLabel(session.agentType, session.agentName)}
                     </TableCell>
                     <TableCell>

package/src/web/client/src/components/branch-detail/ToolLauncher.tsx

@@ -13,6 +13,7 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { cn } from "@/lib/utils";
+import { getAgentTailwindClass } from "@/lib/coding-agent-colors";
 import type { ApiCodingAgent, Branch } from "../../../../../types/api.js";
 
 type ToolMode = "normal" | "continue" | "resume";
@@ -45,7 +46,7 @@ interface ToolLauncherProps {
   isStartingSession: boolean;
   isSyncingBranch: boolean;
   needsRemoteSync: boolean;
-  hasBlockingDivergence: boolean;
+  hasConflictingDivergence: boolean;
   onToolChange: (toolId: string) => void;
   onModeChange: (mode: ToolMode) => void;
   onSkipPermissionsChange: (skip: boolean) => void;
@@ -88,7 +89,7 @@ export function ToolLauncher({
   isStartingSession,
   isSyncingBranch,
   needsRemoteSync,
-  hasBlockingDivergence,
+  hasConflictingDivergence,
   onToolChange,
   onModeChange,
   onSkipPermissionsChange,
@@ -170,7 +171,11 @@ export function ToolLauncher({
                   </SelectTrigger>
                   <SelectContent>
                     {availableTools.map((tool) => (
-                      <SelectItem key={tool.id} value={tool.id}>
+                      <SelectItem
+                        key={tool.id}
+                        value={tool.id}
+                        className={getAgentTailwindClass(tool.id)}
+                      >
                         {tool.label}
                       </SelectItem>
                     ))}
@@ -243,11 +248,12 @@ export function ToolLauncher({
               </Alert>
             )}
 
-            {hasBlockingDivergence && (
+            {hasConflictingDivergence && (
               <Alert variant="warning" data-testid="divergence-warning">
                 <AlertDescription>
                   <p>
-                    リモートとローカルの両方に未解決の差分があるため、起動をブロックしています。
+                    リモートとローカルの両方に未解決の差分があります。起動は可能ですが、
+                    衝突を避けるために差分の解消を推奨します。
                   </p>
                   <ul className="mt-2 list-inside list-disc text-xs text-muted-foreground">
                     <li>
@@ -266,7 +272,6 @@ export function ToolLauncher({
                 disabled={
                   isStartingSession ||
                   !selectedTool ||
-                  hasBlockingDivergence ||
                   needsRemoteSync ||
                   isSyncingBranch
                 }

package/src/web/client/src/lib/coding-agent-colors.ts

@@ -0,0 +1,149 @@
+/**
+ * Coding Agent Color Definitions for Web UI
+ *
+ * This module provides consistent color definitions for coding agents
+ * in the Web UI (React/Tailwind) (SPEC-3b0ed29b FR-024~FR-027).
+ *
+ * Note: This mirrors the CLI color utility at src/utils/coding-agent-colors.ts
+ * Both files should be kept in sync.
+ */
+
+/**
+ * Tool ID constants for coding agents
+ */
+export const CODING_AGENT_TOOL_IDS = {
+  CLAUDE_CODE: "claude-code",
+  CODEX_CLI: "codex-cli",
+  GEMINI_CLI: "gemini-cli",
+  OPENCODE: "opencode",
+} as const;
+
+/**
+ * Color definitions for coding agents
+ */
+export const CODING_AGENT_COLORS = {
+  [CODING_AGENT_TOOL_IDS.CLAUDE_CODE]: {
+    hex: "#f6e05e",
+    tailwind: "text-yellow-400",
+    bgTailwind: "bg-yellow-400/20",
+    borderTailwind: "border-yellow-400",
+  },
+  [CODING_AGENT_TOOL_IDS.CODEX_CLI]: {
+    hex: "#4fd1c5",
+    tailwind: "text-cyan-400",
+    bgTailwind: "bg-cyan-400/20",
+    borderTailwind: "border-cyan-400",
+  },
+  [CODING_AGENT_TOOL_IDS.GEMINI_CLI]: {
+    hex: "#d53f8c",
+    tailwind: "text-pink-500",
+    bgTailwind: "bg-pink-500/20",
+    borderTailwind: "border-pink-500",
+  },
+  [CODING_AGENT_TOOL_IDS.OPENCODE]: {
+    hex: "#48bb78",
+    tailwind: "text-green-400",
+    bgTailwind: "bg-green-400/20",
+    borderTailwind: "border-green-400",
+  },
+} as const;
+
+/**
+ * Default color for unknown/custom agents
+ */
+export const DEFAULT_AGENT_COLOR = {
+  hex: "#a0aec0",
+  tailwind: "text-gray-400",
+  bgTailwind: "bg-gray-400/20",
+  borderTailwind: "border-gray-400",
+};
+
+/**
+ * Get Tailwind CSS text color class for a coding agent
+ *
+ * @param toolId - The tool ID (e.g., "claude-code", "codex-cli")
+ * @returns Tailwind CSS class name
+ */
+export function getAgentTailwindClass(toolId?: string | null): string {
+  if (!toolId) {
+    return DEFAULT_AGENT_COLOR.tailwind;
+  }
+
+  const color = CODING_AGENT_COLORS[toolId as keyof typeof CODING_AGENT_COLORS];
+  return color?.tailwind ?? DEFAULT_AGENT_COLOR.tailwind;
+}
+
+/**
+ * Get Tailwind CSS background color class for a coding agent
+ *
+ * @param toolId - The tool ID (e.g., "claude-code", "codex-cli")
+ * @returns Tailwind CSS class name for background
+ */
+export function getAgentBgTailwindClass(toolId?: string | null): string {
+  if (!toolId) {
+    return DEFAULT_AGENT_COLOR.bgTailwind;
+  }
+
+  const color = CODING_AGENT_COLORS[toolId as keyof typeof CODING_AGENT_COLORS];
+  return color?.bgTailwind ?? DEFAULT_AGENT_COLOR.bgTailwind;
+}
+
+/**
+ * Get hex color for a coding agent
+ *
+ * @param toolId - The tool ID (e.g., "claude-code", "codex-cli")
+ * @returns Hex color string
+ */
+export function getAgentHexColor(toolId?: string | null): string {
+  if (!toolId) {
+    return DEFAULT_AGENT_COLOR.hex;
+  }
+
+  const color = CODING_AGENT_COLORS[toolId as keyof typeof CODING_AGENT_COLORS];
+  return color?.hex ?? DEFAULT_AGENT_COLOR.hex;
+}
+
+/**
+ * Normalize agent type string to tool ID
+ * Handles various naming conventions used across the codebase
+ *
+ * @param agentType - Agent type string (e.g., "claude", "codex-cli", "Claude Code")
+ * @returns Normalized tool ID
+ */
+export function normalizeAgentToToolId(
+  agentType?: string | null,
+): string | null {
+  if (!agentType) return null;
+
+  const normalized = agentType.toLowerCase().trim();
+
+  // Direct matches
+  if (normalized === "claude-code" || normalized === "claude") {
+    return CODING_AGENT_TOOL_IDS.CLAUDE_CODE;
+  }
+  if (normalized === "codex-cli" || normalized === "codex") {
+    return CODING_AGENT_TOOL_IDS.CODEX_CLI;
+  }
+  if (normalized === "gemini-cli" || normalized === "gemini") {
+    return CODING_AGENT_TOOL_IDS.GEMINI_CLI;
+  }
+  if (normalized === "opencode" || normalized === "open-code") {
+    return CODING_AGENT_TOOL_IDS.OPENCODE;
+  }
+
+  // Label-based matches
+  if (normalized.includes("claude")) {
+    return CODING_AGENT_TOOL_IDS.CLAUDE_CODE;
+  }
+  if (normalized.includes("codex")) {
+    return CODING_AGENT_TOOL_IDS.CODEX_CLI;
+  }
+  if (normalized.includes("gemini")) {
+    return CODING_AGENT_TOOL_IDS.GEMINI_CLI;
+  }
+  if (normalized.includes("opencode")) {
+    return CODING_AGENT_TOOL_IDS.OPENCODE;
+  }
+
+  return agentType; // Return as-is for custom agents
+}

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

@@ -210,7 +210,7 @@ export function BranchDetailPage() {
   // Computed values
   const canStartSession = Boolean(branch.worktreePath);
   const divergenceInfo = branch.divergence ?? null;
-  const hasBlockingDivergence = Boolean(
+  const hasConflictingDivergence = Boolean(
     divergenceInfo && divergenceInfo.ahead > 0 && divergenceInfo.behind > 0,
   );
   const needsRemoteSync = Boolean(
@@ -218,7 +218,7 @@ export function BranchDetailPage() {
     divergenceInfo &&
     divergenceInfo.behind > 0 &&
     divergenceInfo.ahead === 0 &&
-    !hasBlockingDivergence,
+    !hasConflictingDivergence,
   );
   const isSyncingBranch = syncBranch.isPending;
 
@@ -270,14 +270,6 @@ export function BranchDetailPage() {
       return;
     }
 
-    if (hasBlockingDivergence) {
-      setBanner({
-        type: "error",
-        message: "差分を解消してから起動してください。",
-      });
-      return;
-    }
-
     if (
       skipPermissions &&
       !window.confirm("権限チェックをスキップして起動します。続行しますか？")
@@ -293,6 +285,13 @@ export function BranchDetailPage() {
           : selectedTool.target === "custom"
             ? "custom"
             : "claude-code";
+      const resumeSessionId =
+        selectedMode === "normal"
+          ? null
+          : latestToolUsage?.sessionId &&
+              latestToolUsage.toolId === selectedToolId
+            ? latestToolUsage.sessionId
+            : null;
       const extraArgs = extraArgsText
         .split(/\s+/)
         .map((c) => c.trim())
@@ -309,6 +308,7 @@ export function BranchDetailPage() {
         ...(selectedTool.target === "codex"
           ? { bypassApprovals: skipPermissions }
           : {}),
+        ...(resumeSessionId ? { resumeSessionId } : {}),
         ...(extraArgs.length ? { extraArgs } : {}),
       } as const;
 
@@ -478,7 +478,7 @@ export function BranchDetailPage() {
               isStartingSession={isStartingSession}
               isSyncingBranch={isSyncingBranch}
               needsRemoteSync={needsRemoteSync}
-              hasBlockingDivergence={hasBlockingDivergence}
+              hasConflictingDivergence={hasConflictingDivergence}
               onToolChange={setSelectedToolId}
               onModeChange={setSelectedMode}
               onSkipPermissionsChange={setSkipPermissions}