@akiojin/gwt 2.6.1 → 2.8.0

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

@@ -10,7 +10,11 @@ import {
 import { useConfig } from "../hooks/useConfig";
 import { ApiError } from "../lib/api";
 import { Terminal } from "../components/Terminal";
-import type { Branch, CustomAITool } from "../../../../types/api.js";
+import type {
+  Branch,
+  CustomAITool,
+  LastToolUsage,
+} from "../../../../types/api.js";
 
 type ToolType = "claude-code" | "codex-cli" | "custom";
 type ToolMode = "normal" | "continue" | "resume";
@@ -410,6 +414,29 @@ export function BranchDetailPage() {
       .sort((a, b) => (b.startedAt ?? "").localeCompare(a.startedAt ?? ""));
   }, [sessionsData, branch?.worktreePath]);
 
+  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]);
+
   const handleSessionExit = (code: number) => {
     setActiveSessionId(null);
     setIsTerminalFullscreen(false);
@@ -449,6 +476,21 @@ export function BranchDetailPage() {
             {branch.worktreePath ? "Worktreeあり" : "Worktree未作成"}
           </span>
         </div>
+        <div className="badge-group" style={{ marginTop: "0.5rem" }}>
+          {latestToolUsage ? (
+            <>
+              <span className="status-badge status-badge--muted">
+                {renderToolUsage(latestToolUsage)}
+              </span>
+              <span className="status-badge status-badge--muted">
+                {formatUsageTimestamp(latestToolUsage.timestamp)} ・ worktree:{" "}
+                {latestToolUsage.worktreePath ?? branch.worktreePath ?? "N/A"}
+              </span>
+            </>
+          ) : (
+            <span className="status-badge status-badge--muted">Unknown</span>
+          )}
+        </div>
         <div className="page-hero__actions">
           {!canStartSession ? (
             <button
@@ -950,6 +992,32 @@ const SESSION_STATUS_LABEL: Record<
   failed: "failed",
 };
 
+function renderToolUsage(usage: LastToolUsage): string {
+  const modeLabel =
+    usage.mode === "normal"
+      ? "New"
+      : usage.mode === "continue"
+        ? "Continue"
+        : usage.mode === "resume"
+          ? "Resume"
+          : null;
+  const toolText = mapToolLabel(usage.toolId, usage.toolLabel);
+  return [toolText, modeLabel, usage.model].filter(Boolean).join(" | ");
+}
+
+function formatUsageTimestamp(value: number): string {
+  return formatDate(new Date(value).toISOString());
+}
+
+function mapToolLabel(toolId: string, toolLabel?: string | null): string {
+  if (toolId === "claude-code") return "Claude";
+  if (toolId === "codex-cli") return "Codex";
+  if (toolId === "gemini-cli") return "Gemini";
+  if (toolId === "qwen-cli") return "Qwen";
+  if (toolLabel) return toolLabel;
+  return "Custom";
+}
+
 function parseExtraArgs(value: string): string[] {
   return value
     .split(/\s+/)

package/src/web/server/routes/sessions.ts

@@ -11,6 +11,8 @@ import type {
   AIToolSession,
   StartSessionRequest,
 } from "../../../types/api.js";
+import { saveSession } from "../../../config/index.js";
+import { execa } from "execa";
 
 /**
  * セッション関連のルートを登録
@@ -53,6 +55,37 @@ export async function registerSessionRoutes(
         toolName,
       );
 
+      // 履歴を永続化（best-effort）
+      try {
+        const { stdout: repoRoot } = await execa("git", ["rev-parse", "--show-toplevel"], {
+          cwd: worktreePath,
+        });
+        let branchName: string | null = null;
+        try {
+          const { stdout: branchStdout } = await execa(
+            "git",
+            ["rev-parse", "--abbrev-ref", "HEAD"],
+            { cwd: worktreePath },
+          );
+          branchName = branchStdout.trim() || null;
+        } catch {
+          branchName = null;
+        }
+
+        await saveSession({
+          lastWorktreePath: worktreePath,
+          lastBranch: branchName,
+          lastUsedTool: toolType === "custom" ? toolName ?? "custom" : toolType,
+          toolLabel:
+            toolType === "custom" ? toolName ?? "Custom" : toolLabelFromType(toolType),
+          mode,
+          timestamp: Date.now(),
+          repositoryRoot: repoRoot.trim(),
+        });
+      } catch {
+        // ignore persistence errors
+      }
+
       reply.code(201);
       return { success: true, data: session };
     } catch (error) {
@@ -128,3 +161,9 @@ export async function registerSessionRoutes(
     }
   });
 }
+
+function toolLabelFromType(toolType: "claude-code" | "codex-cli" | "custom") {
+  if (toolType === "claude-code") return "Claude";
+  if (toolType === "codex-cli") return "Codex";
+  return "Custom";
+}

package/src/web/server/services/branches.ts

@@ -16,6 +16,7 @@ import {
 import { getPullRequestByBranch } from "../../../github.js";
 import { listAdditionalWorktrees } from "../../../worktree.js";
 import type { Branch, BranchSyncResult } from "../../../types/api.js";
+import { getLastToolUsageMap } from "../../../config/index.js";
 
 type DivergenceStatus = { remoteAhead: number; localAhead: number };
 type DivergenceValue = NonNullable<NonNullable<Branch["divergence"]>>;
@@ -37,10 +38,22 @@ function mapPullRequestState(state: string): "open" | "merged" | "closed" {
  * すべてのブランチ一覧を取得（マージステータスとWorktree情報付き）
  */
 export async function listBranches(): Promise<Branch[]> {
-  const [branches, worktrees, repoRoot] = await Promise.all([
+  const repoRoot = await getRepositoryRoot();
+  const lastToolUsageMap = await getLastToolUsageMap(repoRoot);
+
+  // リモートブランチの最新情報を取得（失敗してもローカル情報にはフォールバック）
+  try {
+    await fetchAllRemotes({ cwd: repoRoot });
+  } catch (error) {
+    console.warn(
+      "Failed to fetch remote branches for Web UI; falling back to local branches",
+      error,
+    );
+  }
+
+  const [branches, worktrees] = await Promise.all([
     getAllBranches(),
     listAdditionalWorktrees(),
-    getRepositoryRoot(),
   ]);
   const divergenceMap = await buildDivergenceMap(branches, repoRoot);
   const upstreamMap = await collectUpstreamMap(repoRoot);
@@ -92,6 +105,8 @@ export async function listBranches(): Promise<Branch[]> {
         ? mapDivergence(divergenceStatus)
         : null;
 
+      const lastToolUsage = lastToolUsageMap.get(branchInfo.name) ?? null;
+
       return {
         name: branchInfo.name,
         type: branchInfo.type,
@@ -105,6 +120,7 @@ export async function listBranches(): Promise<Branch[]> {
         baseBranch: baseBranch ?? null,
         divergence,
         prInfo,
+        ...(lastToolUsage ? { lastToolUsage } : {}),
       };
     }),
   );

package/src/worktree.ts

@@ -98,7 +98,13 @@ export interface WorktreeInfo {
 
 async function listWorktrees(): Promise<WorktreeInfo[]> {
   try {
-    const { stdout } = await execa("git", ["worktree", "list", "--porcelain"]);
+    const { getRepositoryRoot } = await import("./git.js");
+    const repoRoot = await getRepositoryRoot();
+    const { stdout } = await execa(
+      "git",
+      ["worktree", "list", "--porcelain"],
+      { cwd: repoRoot },
+    );
     const worktrees: WorktreeInfo[] = [];
     const lines = stdout.split("\n");