@akiojin/gwt 2.10.0 → 2.11.1

package/src/cli/ui/hooks/useGitData.ts

@@ -4,6 +4,8 @@ import {
   hasUnpushedCommitsInRepo,
   getRepositoryRoot,
   fetchAllRemotes,
+  collectUpstreamMap,
+  getBranchDivergenceStatuses,
 } from "../../../git.js";
 import { listAdditionalWorktrees } from "../../../worktree.js";
 import { getPullRequestByBranch } from "../../../github.js";
@@ -65,6 +67,36 @@ export function useGitData(options?: UseGitDataOptions): UseGitDataResult {
       }
       const lastToolUsageMap = await getLastToolUsageMap(repoRoot);
 
+      // upstream情報とdivergence情報を取得
+      const [upstreamMap, divergenceStatuses] = await Promise.all([
+        collectUpstreamMap(repoRoot),
+        getBranchDivergenceStatuses({ cwd: repoRoot }).catch(() => []),
+      ]);
+
+      // divergenceをMapに変換
+      const divergenceMap = new Map(
+        divergenceStatuses.map((s) => [
+          s.branch,
+          {
+            ahead: s.localAhead,
+            behind: s.remoteAhead,
+            upToDate: s.localAhead === 0 && s.remoteAhead === 0,
+          },
+        ]),
+      );
+
+      // ローカルブランチ名のSet（重複除去用）
+      const localBranchNames = new Set(
+        branchesData.filter((b) => b.type === "local").map((b) => b.name),
+      );
+
+      // リモートブランチ名のSet（hasRemoteCounterpart判定用）
+      const remoteBranchNames = new Set(
+        branchesData
+          .filter((b) => b.type === "remote")
+          .map((b) => b.name.replace(/^origin\//, "")),
+      );
+
       // Store worktrees separately
       setWorktrees(worktreesData);
 
@@ -81,9 +113,18 @@ export function useGitData(options?: UseGitDataOptions): UseGitDataResult {
         worktreeMap.set(worktree.branch, uiWorktreeInfo);
       }
 
+      // リモートブランチの重複除去（ローカルに同名がある場合は除外）
+      const filteredBranches = branchesData.filter((branch) => {
+        if (branch.type === "remote") {
+          const remoteBranchBaseName = branch.name.replace(/^origin\//, "");
+          return !localBranchNames.has(remoteBranchBaseName);
+        }
+        return true;
+      });
+
       // Attach worktree info and check unpushed/PR status for local branches
       const enrichedBranches = await Promise.all(
-        branchesData.map(async (branch) => {
+        filteredBranches.map(async (branch) => {
           const worktreeInfo = worktreeMap.get(branch.name);
           let hasUnpushed = false;
           let prInfo = null;
@@ -110,6 +151,20 @@ export function useGitData(options?: UseGitDataOptions): UseGitDataResult {
             }
           }
 
+          // upstream/divergence/hasRemoteCounterpart情報を付加
+          const upstream =
+            branch.type === "local"
+              ? (upstreamMap.get(branch.name) ?? null)
+              : null;
+          const divergence =
+            branch.type === "local"
+              ? (divergenceMap.get(branch.name) ?? null)
+              : null;
+          const hasRemoteCounterpart =
+            branch.type === "local"
+              ? remoteBranchNames.has(branch.name)
+              : false;
+
           return {
             ...branch,
             ...(worktreeInfo ? { worktree: worktreeInfo } : {}),
@@ -128,6 +183,9 @@ export function useGitData(options?: UseGitDataOptions): UseGitDataResult {
             ...(lastToolUsageMap.get(branch.name)
               ? { lastToolUsage: lastToolUsageMap.get(branch.name) ?? null }
               : {}),
+            ...(upstream !== null ? { upstream } : {}),
+            ...(divergence !== null ? { divergence } : {}),
+            ...(hasRemoteCounterpart ? { hasRemoteCounterpart } : {}),
           };
         }),
       );

package/src/cli/ui/screens/__tests__/BranchActionSelectorScreen.test.tsx

@@ -11,8 +11,9 @@ describe("BranchActionSelectorScreen", () => {
   beforeEach(() => {
     // Setup happy-dom
     const window = new Window();
-    globalThis.window = window as any;
-    globalThis.document = window.document as any;
+    globalThis.window = window as unknown as typeof globalThis.window;
+    globalThis.document =
+      window.document as unknown as typeof globalThis.document;
   });
 
   it("should render the screen", () => {

package/src/cli/ui/types.ts

@@ -1,3 +1,6 @@
+import type { LastToolUsage } from "../../types/api.js";
+export type { LastToolUsage } from "../../types/api.js";
+
 export interface WorktreeInfo {
   path: string;
   locked: boolean;
@@ -5,11 +8,8 @@ export interface WorktreeInfo {
   isAccessible?: boolean;
 }
 
-import type { LastToolUsage } from "../../types/api.js";
-
 export type AITool = string;
 export type InferenceLevel = "low" | "medium" | "high" | "xhigh";
-export type { LastToolUsage } from "../../types/api.js";
 
 export interface ModelOption {
   id: string;
@@ -20,6 +20,12 @@ export interface ModelOption {
   isDefault?: boolean;
 }
 
+export interface BranchDivergence {
+  ahead: number;
+  behind: number;
+  upToDate: boolean;
+}
+
 export interface BranchInfo {
   name: string;
   type: "local" | "remote";
@@ -39,6 +45,9 @@ export interface BranchInfo {
   mergedPR?: { number: number; mergedAt: string };
   latestCommitTimestamp?: number;
   lastToolUsage?: LastToolUsage | null;
+  upstream?: string | null;
+  divergence?: BranchDivergence | null;
+  hasRemoteCounterpart?: boolean;
 }
 
 export interface BranchChoice {
@@ -132,7 +141,7 @@ export interface WorktreeWithPR {
   pullRequest: PullRequest | null;
 }
 
-export type CleanupReason = "merged-pr" | "no-diff-with-base" | "remote-synced";
+export type CleanupReason = "no-diff-with-base" | "remote-synced";
 
 export interface CleanupTarget {
   worktreePath: string | null; // null for local branch only cleanup
@@ -173,7 +182,6 @@ export interface GitHubPRResponse {
  */
 export type ScreenType =
   | "branch-list"
-  | "worktree-manager"
   | "branch-creator"
   | "branch-action-selector"
   | "ai-tool-selector"
@@ -201,6 +209,14 @@ export interface Screen {
  */
 export type WorktreeStatus = "active" | "inaccessible" | undefined;
 
+export type SyncStatus =
+  | "up-to-date"
+  | "ahead"
+  | "behind"
+  | "diverged"
+  | "no-upstream"
+  | "remote-only";
+
 export interface BranchItem extends BranchInfo {
   // Display properties
   icons: string[];
@@ -209,6 +225,9 @@ export interface BranchItem extends BranchInfo {
   label: string;
   value: string;
   lastToolUsageLabel?: string | null;
+  syncStatus?: SyncStatus;
+  syncInfo?: string | undefined;
+  remoteName?: string | undefined;
 }
 
 /**

package/src/cli/ui/utils/branchFormatter.ts

@@ -25,23 +25,38 @@ const worktreeIcons: Record<Exclude<WorktreeStatus, undefined>, string> = {
 };
 
 const changeIcons = {
-  current: "⭐",
-  hasChanges: "✏️",
-  unpushed: "⬆️",
-  openPR: "🔀",
+  current: "👉",
+  hasChanges: "💾",
+  unpushed: "📤",
+  openPR: "🔃",
   mergedPR: "✅",
   warning: "⚠️",
 };
 
 const remoteIcon = "☁";
 
+// Sync status icons
+const syncIcons = {
+  upToDate: "✓",
+  ahead: "↑",
+  behind: "↓",
+  diverged: "↕",
+  none: "-",
+  remoteOnly: "☁",
+};
+
+// Remote column markers
+const remoteMarkers = {
+  tracked: "🔗", // ローカル+同名リモートあり
+  localOnly: "💻", // ローカルのみ（リモートなし）
+  remoteOnly: "☁️", // リモートのみ（ローカルなし）
+};
+
 // Emoji width varies by terminal. Provide explicit minimum widths so we never
 // underestimate and accidentally push the row past the terminal columns.
 const iconWidthOverrides: Record<string, number> = {
   // Remote icon
   [remoteIcon]: 1,
-  // Unpushed icon
-  "⬆": 1,
   // Branch type icons
   "⚡": 1,
   "✨": 1,
@@ -53,11 +68,16 @@ const iconWidthOverrides: Record<string, number> = {
   "🟢": 1,
   "🟠": 1,
   // Change status icons
-  "⭐": 1,
-  "✏️": 1,
-  "🔀": 1,
+  "👉": 1,
+  "💾": 1,
+  "📤": 1,
+  "🔃": 1,
   "✅": 1,
   "⚠️": 1,
+  // Remote markers
+  "🔗": 1,
+  "💻": 1,
+  "☁️": 1,
 };
 
 const getIconWidth = (icon: string): number => {
@@ -79,15 +99,6 @@ function mapToolLabel(toolId: string, toolLabel?: string): string {
   return "Custom";
 }
 
-function mapModeLabel(
-  mode?: "normal" | "continue" | "resume" | null,
-): string | null {
-  if (mode === "normal") return "New";
-  if (mode === "continue") return "Continue";
-  if (mode === "resume") return "Resume";
-  return null;
-}
-
 function formatTimestamp(ts: number): string {
   const date = new Date(ts);
   const year = date.getFullYear();
@@ -103,12 +114,8 @@ function buildLastToolUsageLabel(
 ): string | null {
   if (!usage) return null;
   const toolText = mapToolLabel(usage.toolId, usage.toolLabel);
-  const modeText = mapModeLabel(usage.mode);
   const timestamp = usage.timestamp ? formatTimestamp(usage.timestamp) : null;
   const parts = [toolText];
-  if (modeText) {
-    parts.push(modeText);
-  }
   if (timestamp) {
     parts.push(timestamp);
   }
@@ -168,17 +175,81 @@ export function formatBranchItem(
     changesIcon = " ".repeat(COLUMN_WIDTH);
   }
 
-  // Column 4: Remote icon
-  let remoteIconStr: string;
+  // Column 4: Remote status (✓ for tracked, L for local-only, R for remote-only)
+  let remoteStatusStr: string;
+  if (branch.type === "remote") {
+    // リモートのみのブランチ
+    remoteStatusStr = padIcon(remoteMarkers.remoteOnly);
+  } else if (branch.hasRemoteCounterpart) {
+    // ローカルブランチで同名リモートあり
+    remoteStatusStr = padIcon(remoteMarkers.tracked);
+  } else {
+    // ローカルブランチでリモートなし
+    remoteStatusStr = padIcon(remoteMarkers.localOnly);
+  }
+
+  // Column 5: Sync status (=, ↑N, ↓N, ↕, -)
+  // 5文字固定幅（アイコン1文字 + 数字最大4桁）、9999超は「9999+」表示
+  const SYNC_COLUMN_WIDTH = 6; // アイコン1 + 数字4 + スペース1
+
+  // 数字を4桁以内にフォーマット（9999超は9999+）
+  const formatSyncNumber = (n: number): string => {
+    if (n > 9999) return "9999+";
+    return String(n);
+  };
+
+  // Sync列を固定幅でパディング
+  const padSyncColumn = (content: string): string => {
+    const width = stringWidth(content);
+    const padding = Math.max(0, SYNC_COLUMN_WIDTH - width);
+    return content + " ".repeat(padding);
+  };
+
+  let syncStatusStr: string;
+  if (branch.type === "remote") {
+    // リモートのみ → 比較不可
+    syncStatusStr = padSyncColumn(syncIcons.none);
+  } else if (branch.divergence) {
+    const { ahead, behind, upToDate } = branch.divergence;
+    if (upToDate) {
+      syncStatusStr = padSyncColumn(syncIcons.upToDate);
+    } else if (ahead > 0 && behind > 0) {
+      // diverged: ↕ のみ表示（詳細は別途表示可能）
+      syncStatusStr = padSyncColumn(syncIcons.diverged);
+    } else if (ahead > 0) {
+      // ahead: ↑N の形式
+      syncStatusStr = padSyncColumn(
+        `${syncIcons.ahead}${formatSyncNumber(ahead)}`,
+      );
+    } else {
+      // behind: ↓N の形式
+      syncStatusStr = padSyncColumn(
+        `${syncIcons.behind}${formatSyncNumber(behind)}`,
+      );
+    }
+  } else {
+    // divergence情報なし
+    syncStatusStr = padSyncColumn(syncIcons.none);
+  }
+
+  // Build Local/Remote name for display
+  // ローカルブランチ: ブランチ名を表示
+  // リモートのみ: origin/xxxをフル表示
+  let displayName: string;
+  let remoteName: string | null = null;
+
   if (branch.type === "remote") {
-    remoteIconStr = padIcon(remoteIcon);
+    // リモートのみのブランチ: フルのリモートブランチ名を表示
+    displayName = branch.name; // origin/xxx
+    remoteName = branch.name;
   } else {
-    remoteIconStr = " ".repeat(COLUMN_WIDTH);
+    // ローカルブランチ: ブランチ名を表示
+    displayName = branch.name;
   }
 
   // Build label with fixed-width columns
-  // Format: [Type][Worktree][Changes][Remote] BranchName
-  const label = `${branchTypeIcon}${worktreeIcon}${changesIcon}${remoteIconStr}${branch.name}`;
+  // Format: [Type][Worktree][Changes][Remote][Sync] DisplayName
+  const label = `${branchTypeIcon}${worktreeIcon}${changesIcon}${remoteStatusStr}${syncStatusStr}${displayName}`;
 
   // Collect icons for compatibility
   const icons: string[] = [];
@@ -208,6 +279,27 @@ export function formatBranchItem(
     icons.push(remoteIcon);
   }
 
+  // Determine sync status for BranchItem
+  let syncStatus: BranchItem["syncStatus"];
+  if (branch.type === "remote") {
+    syncStatus = "remote-only";
+  } else if (!branch.hasRemoteCounterpart) {
+    syncStatus = "no-upstream";
+  } else if (branch.divergence) {
+    const { ahead, behind, upToDate } = branch.divergence;
+    if (upToDate) {
+      syncStatus = "up-to-date";
+    } else if (ahead > 0 && behind > 0) {
+      syncStatus = "diverged";
+    } else if (ahead > 0) {
+      syncStatus = "ahead";
+    } else {
+      syncStatus = "behind";
+    }
+  } else {
+    syncStatus = "no-upstream";
+  }
+
   return {
     // Copy all properties from BranchInfo
     ...branch,
@@ -218,6 +310,9 @@ export function formatBranchItem(
     label,
     value: branch.name,
     lastToolUsageLabel: buildLastToolUsageLabel(branch.lastToolUsage),
+    syncStatus,
+    syncInfo: undefined,
+    remoteName: remoteName ?? undefined,
   };
 }
 

package/src/cli/ui/utils/modelOptions.test.ts

@@ -11,11 +11,7 @@ describe("modelOptions", () => {
   it("lists Claude official aliases and sets Opus 4.5 as default", () => {
     const options = getModelOptions("claude-code");
     const ids = options.map((m) => m.id);
-    expect(ids).toEqual([
-      "opus",
-      "sonnet",
-      "haiku",
-    ]);
+    expect(ids).toEqual(["opus", "sonnet", "haiku"]);
     const defaultModel = getDefaultModelOption("claude-code");
     expect(defaultModel?.id).toBe("opus");
     expect(defaultModel?.label).toBe("Opus 4.5");
@@ -34,7 +30,9 @@ describe("modelOptions", () => {
   });
 
   it("uses medium as default reasoning for codex-max", () => {
-    const codexMax = getModelOptions("codex-cli").find((m) => m.id === "gpt-5.1-codex-max");
+    const codexMax = getModelOptions("codex-cli").find(
+      (m) => m.id === "gpt-5.1-codex-max",
+    );
     expect(getDefaultInferenceForModel(codexMax)).toBe("medium");
   });
 

package/src/cli/ui/utils/modelOptions.ts

@@ -15,8 +15,7 @@ const MODEL_OPTIONS: Record<string, ModelOption[]> = {
     {
       id: "sonnet",
       label: "Sonnet 4.5",
-      description:
-        "Official Sonnet alias for Claude Code.",
+      description: "Official Sonnet alias for Claude Code.",
     },
     {
       id: "haiku",

package/src/config/index.ts

@@ -136,7 +136,8 @@ export async function saveSession(sessionData: SessionData): Promise<void> {
         branch: sessionData.lastBranch,
         worktreePath: sessionData.lastWorktreePath,
         toolId: sessionData.lastUsedTool ?? "unknown",
-        toolLabel: sessionData.toolLabel ?? sessionData.lastUsedTool ?? "Custom",
+        toolLabel:
+          sessionData.toolLabel ?? sessionData.lastUsedTool ?? "Custom",
         mode: sessionData.mode ?? null,
         model: sessionData.model ?? null,
         timestamp: sessionData.timestamp,

package/src/git.ts

@@ -174,11 +174,9 @@ export async function getWorktreeRoot(): Promise<string> {
 export async function getCurrentBranch(): Promise<string | null> {
   try {
     const repoRoot = await getRepositoryRoot();
-    const { stdout } = await execa(
-      "git",
-      ["branch", "--show-current"],
-      { cwd: repoRoot },
-    );
+    const { stdout } = await execa("git", ["branch", "--show-current"], {
+      cwd: repoRoot,
+    });
     return stdout.trim() || null;
   } catch {
     try {
@@ -195,11 +193,15 @@ async function getBranchCommitTimestamps(
   cwd?: string,
 ): Promise<Map<string, number>> {
   try {
-    const { stdout = "" } = (await execa("git", [
-      "for-each-ref",
-      "--format=%(refname:short)%00%(committerdate:unix)",
-      ...refs,
-    ], cwd ? { cwd } : undefined)) ?? { stdout: "" };
+    const { stdout = "" } = (await execa(
+      "git",
+      [
+        "for-each-ref",
+        "--format=%(refname:short)%00%(committerdate:unix)",
+        ...refs,
+      ],
+      cwd ? { cwd } : undefined,
+    )) ?? { stdout: "" };
 
     const map = new Map<string, number>();
 
@@ -222,9 +224,10 @@ async function getBranchCommitTimestamps(
 export async function getLocalBranches(): Promise<BranchInfo[]> {
   try {
     const commitMap = await getBranchCommitTimestamps(["refs/heads"]);
-    const { stdout = "" } =
-      (await execa("git", ["branch", "--format=%(refname:short)"])) ??
-      { stdout: "" };
+    const { stdout = "" } = (await execa("git", [
+      "branch",
+      "--format=%(refname:short)",
+    ])) ?? { stdout: "" };
     return stdout
       .split("\n")
       .filter((line) => line.trim())
@@ -250,9 +253,11 @@ export async function getLocalBranches(): Promise<BranchInfo[]> {
 export async function getRemoteBranches(): Promise<BranchInfo[]> {
   try {
     const commitMap = await getBranchCommitTimestamps(["refs/remotes"]);
-    const { stdout = "" } =
-      (await execa("git", ["branch", "-r", "--format=%(refname:short)"])) ??
-      { stdout: "" };
+    const { stdout = "" } = (await execa("git", [
+      "branch",
+      "-r",
+      "--format=%(refname:short)",
+    ])) ?? { stdout: "" };
     return stdout
       .split("\n")
       .filter((line) => line.trim() && !line.includes("HEAD"))
@@ -299,6 +304,41 @@ export async function getAllBranches(): Promise<BranchInfo[]> {
   return [...localBranches, ...remoteBranches];
 }
 
+/**
+ * ローカルブランチのupstream（追跡ブランチ）情報を取得
+ * @param cwd - 作業ディレクトリ（省略時はリポジトリルート）
+ * @returns Map<ローカルブランチ名, upstreamブランチ名>
+ */
+export async function collectUpstreamMap(
+  cwd?: string,
+): Promise<Map<string, string>> {
+  const workDir = cwd ?? (await getRepositoryRoot());
+  try {
+    const { stdout } = await execa(
+      "git",
+      [
+        "for-each-ref",
+        "--format=%(refname:short)|%(upstream:short)",
+        "refs/heads",
+      ],
+      { cwd: workDir },
+    );
+
+    return stdout
+      .split("\n")
+      .filter((line) => line.includes("|"))
+      .reduce((map, line) => {
+        const [branch, upstream] = line.split("|");
+        if (branch?.trim() && upstream?.trim()) {
+          map.set(branch.trim(), upstream.trim());
+        }
+        return map;
+      }, new Map<string, string>());
+  } catch {
+    return new Map();
+  }
+}
+
 export async function createBranch(
   branchName: string,
   baseBranch = "main",

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

@@ -71,7 +71,7 @@ export function BranchGraph({ branches }: BranchGraphProps) {
         });
       }
 
-      laneMap.get(base)!.nodes.push(branch);
+      laneMap.get(base)?.nodes.push(branch);
     });
 
     return Array.from(laneMap.values()).sort((a, b) => {

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

@@ -425,17 +425,22 @@ export function BranchDetailPage() {
       worktreePath: branch.worktreePath ?? null,
       toolId:
         first.toolType === "custom"
-          ? first.toolName ?? "custom"
+          ? (first.toolName ?? "custom")
           : (first.toolType as LastToolUsage["toolId"]),
       toolLabel:
         first.toolType === "custom"
-          ? first.toolName ?? "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]);
+  }, [
+    branch?.lastToolUsage,
+    branch?.name,
+    branch?.worktreePath,
+    branchSessions,
+  ]);
 
   const handleSessionExit = (code: number) => {
     setActiveSessionId(null);

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

@@ -57,9 +57,13 @@ export async function registerSessionRoutes(
 
       // 履歴を永続化（best-effort）
       try {
-        const { stdout: repoRoot } = await execa("git", ["rev-parse", "--show-toplevel"], {
-          cwd: worktreePath,
-        });
+        const { stdout: repoRoot } = await execa(
+          "git",
+          ["rev-parse", "--show-toplevel"],
+          {
+            cwd: worktreePath,
+          },
+        );
         let branchName: string | null = null;
         try {
           const { stdout: branchStdout } = await execa(
@@ -75,9 +79,12 @@ export async function registerSessionRoutes(
         await saveSession({
           lastWorktreePath: worktreePath,
           lastBranch: branchName,
-          lastUsedTool: toolType === "custom" ? toolName ?? "custom" : toolType,
+          lastUsedTool:
+            toolType === "custom" ? (toolName ?? "custom") : toolType,
           toolLabel:
-            toolType === "custom" ? toolName ?? "Custom" : toolLabelFromType(toolType),
+            toolType === "custom"
+              ? (toolName ?? "Custom")
+              : toolLabelFromType(toolType),
           mode,
           timestamp: Date.now(),
           repositoryRoot: repoRoot.trim(),