@akiojin/gwt 2.7.4 → 2.9.0

package/src/git.ts

@@ -58,27 +58,103 @@ export async function isGitRepository(): Promise<boolean> {
  * @throws {GitError} リポジトリルートの取得に失敗した場合
  */
 export async function getRepositoryRoot(): Promise<string> {
+  const fs = await import("node:fs");
+  const path = await import("node:path");
+
+  const toExistingDir = (p: string): string => {
+    let current = path.resolve(p);
+    while (!fs.existsSync(current) && path.dirname(current) !== current) {
+      current = path.dirname(current);
+    }
+    if (!fs.existsSync(current)) {
+      return current;
+    }
+    try {
+      const stat = fs.statSync(current);
+      return stat.isDirectory() ? current : path.dirname(current);
+    } catch {
+      return current;
+    }
+  };
+
+  // 1) show-toplevel を最優先
+  try {
+    const { stdout } = await execa("git", ["rev-parse", "--show-toplevel"]);
+    const top = stdout.trim();
+    if (top) {
+      const marker = `${path.sep}.worktrees${path.sep}`;
+      const idx = top.indexOf(marker);
+      if (idx >= 0) {
+        // /repo/.worktrees/<name> → repo root = /repo
+        const parent = top.slice(0, idx);
+        const upTwo = path.resolve(top, "..", "..");
+        if (fs.existsSync(parent)) return toExistingDir(parent);
+        if (fs.existsSync(upTwo)) return toExistingDir(upTwo);
+      }
+      if (fs.existsSync(top)) {
+        return toExistingDir(top);
+      }
+      return toExistingDir(path.resolve(top, ".."));
+    }
+  } catch {
+    // fallback
+  }
+
+  // 2) git-common-dir 経由
   try {
-    // git rev-parse --git-common-dirを使用してメインリポジトリの.gitディレクトリを取得
     const { stdout: gitCommonDir } = await execa("git", [
       "rev-parse",
       "--git-common-dir",
     ]);
-    const gitDir = gitCommonDir.trim();
-
-    // .gitディレクトリの親ディレクトリがリポジトリルート
-    const path = await import("node:path");
-    const repoRoot = path.dirname(gitDir);
-
-    // 相対パスが返された場合（.gitなど）は、現在のディレクトリからの相対パスとして解決
-    if (!path.isAbsolute(repoRoot)) {
-      return path.resolve(repoRoot);
+    const gitDir = path.resolve(gitCommonDir.trim());
+    const parts = gitDir.split(path.sep);
+    const idxWorktrees = parts.lastIndexOf("worktrees");
+    if (idxWorktrees > 0) {
+      const repo = parts.slice(0, idxWorktrees).join(path.sep);
+      if (fs.existsSync(repo)) return toExistingDir(repo);
     }
+    const idxGit = parts.lastIndexOf(".git");
+    if (idxGit > 0) {
+      const repo = parts.slice(0, idxGit).join(path.sep);
+      if (fs.existsSync(repo)) return toExistingDir(repo);
+    }
+    return toExistingDir(path.dirname(gitDir));
+  } catch {
+    // fallback
+  }
 
-    return repoRoot;
-  } catch (error) {
-    throw new GitError("Failed to get repository root", error);
+  // 3) .git を上に辿って探す
+  let current = process.cwd();
+  const root = path.parse(current).root;
+  while (true) {
+    const candidate = path.join(current, ".git");
+    if (fs.existsSync(candidate)) {
+      if (fs.statSync(candidate).isDirectory()) {
+        return toExistingDir(current);
+      }
+      try {
+        const content = fs.readFileSync(candidate, "utf-8");
+        const match = content.match(/gitdir:\s*(.+)\s*/i);
+        const gitDirMatch = match?.[1];
+        if (gitDirMatch) {
+          const gitDirPath = path.resolve(current, gitDirMatch.trim());
+          const parts = gitDirPath.split(path.sep);
+          const idxWT = parts.lastIndexOf("worktrees");
+          if (idxWT > 0) {
+            const repo = parts.slice(0, idxWT).join(path.sep);
+            return toExistingDir(repo);
+          }
+          return toExistingDir(path.dirname(gitDirPath));
+        }
+      } catch {
+        // ignore and continue
+      }
+    }
+    if (current === root) break;
+    current = path.dirname(current);
   }
+
+  throw new GitError("Failed to get repository root");
 }
 
 /**
@@ -97,22 +173,33 @@ export async function getWorktreeRoot(): Promise<string> {
 
 export async function getCurrentBranch(): Promise<string | null> {
   try {
-    const { stdout } = await execa("git", ["branch", "--show-current"]);
+    const repoRoot = await getRepositoryRoot();
+    const { stdout } = await execa(
+      "git",
+      ["branch", "--show-current"],
+      { cwd: repoRoot },
+    );
     return stdout.trim() || null;
   } catch {
-    return null;
+    try {
+      const { stdout } = await execa("git", ["branch", "--show-current"]);
+      return stdout.trim() || null;
+    } catch {
+      return null;
+    }
   }
 }
 
 async function getBranchCommitTimestamps(
   refs: string[],
+  cwd?: string,
 ): Promise<Map<string, number>> {
   try {
-    const { stdout } = await execa("git", [
+    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>();
 
@@ -135,10 +222,9 @@ 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)",
-    ]);
+    const { stdout = "" } =
+      (await execa("git", ["branch", "--format=%(refname:short)"])) ??
+      { stdout: "" };
     return stdout
       .split("\n")
       .filter((line) => line.trim())
@@ -156,19 +242,17 @@ export async function getLocalBranches(): Promise<BranchInfo[]> {
             : {}),
         } satisfies BranchInfo;
       });
-  } catch (error) {
-    throw new GitError("Failed to get local branches", error);
+  } catch (primaryError) {
+    throw new GitError("Failed to get local branches", primaryError);
   }
 }
 
 export async function getRemoteBranches(): Promise<BranchInfo[]> {
   try {
     const commitMap = await getBranchCommitTimestamps(["refs/remotes"]);
-    const { stdout } = await execa("git", [
-      "branch",
-      "-r",
-      "--format=%(refname:short)",
-    ]);
+    const { stdout = "" } =
+      (await execa("git", ["branch", "-r", "--format=%(refname:short)"])) ??
+      { stdout: "" };
     return stdout
       .split("\n")
       .filter((line) => line.trim() && !line.includes("HEAD"))
@@ -187,8 +271,8 @@ export async function getRemoteBranches(): Promise<BranchInfo[]> {
             : {}),
         } satisfies BranchInfo;
       });
-  } catch (error) {
-    throw new GitError("Failed to get remote branches", error);
+  } catch (primaryError) {
+    throw new GitError("Failed to get remote branches", primaryError);
   }
 }
 

package/src/index.ts

@@ -665,11 +665,14 @@ export async function handleAIToolWorkflow(
       });
     }
 
-    // Save session with lastUsedTool
+    // Save session with lastUsedTool (tool selection is confirmed at this point)
     await saveSession({
       lastWorktreePath: worktreePath,
       lastBranch: branch,
       lastUsedTool: tool,
+      toolLabel: toolConfig.displayName ?? tool,
+      mode,
+      model: model ?? null,
       timestamp: Date.now(),
       repositoryRoot: repoRoot,
     });

package/src/types/api.ts

@@ -30,6 +30,7 @@ export interface Branch {
     state: "open" | "merged" | "closed";
     mergedAt?: string | null;
   } | null;
+  lastToolUsage?: LastToolUsage | null;
 }
 
 /**
@@ -46,6 +47,7 @@ export interface Worktree {
   lastAccessedAt?: string | null; // ISO8601
   divergence?: Branch["divergence"];
   prInfo?: Branch["prInfo"];
+  lastToolUsage?: LastToolUsage | null;
 }
 
 /**
@@ -102,6 +104,16 @@ export interface CustomAITool {
   updatedAt?: string | null; // ISO8601
 }
 
+export interface LastToolUsage {
+  branch: string;
+  worktreePath: string | null;
+  toolId: string;
+  toolLabel: string;
+  mode?: "normal" | "continue" | "resume" | null;
+  model?: string | null;
+  timestamp: number; // epoch millis
+}
+
 /**
  * REST API Response wrappers
  */

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"]>>;
@@ -38,6 +39,7 @@ function mapPullRequestState(state: string): "open" | "merged" | "closed" {
  */
 export async function listBranches(): Promise<Branch[]> {
   const repoRoot = await getRepositoryRoot();
+  const lastToolUsageMap = await getLastToolUsageMap(repoRoot);
 
   // リモートブランチの最新情報を取得（失敗してもローカル情報にはフォールバック）
   try {
@@ -103,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,
@@ -116,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");