@akiojin/gwt 4.7.0 → 4.9.0

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

@@ -125,6 +125,19 @@ function buildLastToolUsageLabel(
   return parts.join(" | ");
 }
 
+/**
+ * Calculate the latest activity timestamp for a branch.
+ * Returns the maximum of git commit timestamp and tool usage timestamp (in seconds).
+ */
+export function getLatestActivityTimestamp(branch: BranchInfo): number {
+  const gitTimestampSec = branch.latestCommitTimestamp ?? 0;
+  // lastToolUsage.timestamp is in milliseconds, convert to seconds
+  const toolTimestampSec = branch.lastToolUsage?.timestamp
+    ? Math.floor(branch.lastToolUsage.timestamp / 1000)
+    : 0;
+  return Math.max(gitTimestampSec, toolTimestampSec);
+}
+
 /**
  * Converts BranchInfo to BranchItem with display properties
  */
@@ -357,11 +370,12 @@ function sortBranches(
     if (aHasWorktree && !bHasWorktree) return -1;
     if (!aHasWorktree && bHasWorktree) return 1;
 
-    // 5. Prioritize most recent commit within same worktree status
-    const aCommit = a.latestCommitTimestamp ?? 0;
-    const bCommit = b.latestCommitTimestamp ?? 0;
-    if (aCommit !== bCommit) {
-      return bCommit - aCommit;
+    // 5. Prioritize most recent activity within same worktree status
+    // (max of git commit timestamp and tool usage timestamp)
+    const aLatest = getLatestActivityTimestamp(a);
+    const bLatest = getLatestActivityTimestamp(b);
+    if (aLatest !== bLatest) {
+      return bLatest - aLatest;
     }
 
     // 6. Local branches are prioritized over remote-only

package/src/codex.ts

@@ -196,7 +196,6 @@ export async function launchCodexCLI(
 
       const child = execa("bunx", [CODEX_CLI_PACKAGE, ...args], {
         cwd: worktreePath,
-        shell: true,
         stdin: childStdio.stdin,
         stdout: childStdio.stdout,
         stderr: childStdio.stderr,

package/src/config/index.ts

@@ -52,11 +52,8 @@ const DEFAULT_CONFIG: AppConfig = {
 export async function loadConfig(): Promise<AppConfig> {
   const configPaths = [
     path.join(process.cwd(), ".gwt.json"),
-    path.join(process.cwd(), ".claude-worktree.json"), // 後方互換性
     path.join(homedir(), ".config", "gwt", "config.json"),
-    path.join(homedir(), ".config", "claude-worktree", "config.json"), // 後方互換性
     path.join(homedir(), ".gwt.json"),
-    path.join(homedir(), ".claude-worktree.json"), // 後方互換性
   ];
 
   for (const configPath of configPaths) {
@@ -79,10 +76,9 @@ export async function loadConfig(): Promise<AppConfig> {
   return {
     ...DEFAULT_CONFIG,
     defaultBaseBranch:
-      process.env.CLAUDE_WORKTREE_BASE_BRANCH ||
-      DEFAULT_CONFIG.defaultBaseBranch,
-    skipPermissions: process.env.CLAUDE_WORKTREE_SKIP_PERMISSIONS === "true",
-    enableGitHubIntegration: process.env.CLAUDE_WORKTREE_GITHUB !== "false",
+      process.env.GWT_BASE_BRANCH || DEFAULT_CONFIG.defaultBaseBranch,
+    skipPermissions: process.env.GWT_SKIP_PERMISSIONS === "true",
+    enableGitHubIntegration: process.env.GWT_GITHUB !== "false",
     enableDebugMode:
       process.env.DEBUG_CLEANUP === "true" || process.env.DEBUG === "true",
   };

package/src/config/profiles.ts

@@ -29,16 +29,13 @@ import {
 /**
  * 設定ディレクトリのパスを取得
  *
- * 環境変数の優先順位: GWT_HOME > CLAUDE_WORKTREE_HOME (後方互換性) > ホームディレクトリ
+ * 環境変数 GWT_HOME が設定されている場合はそれを使用、それ以外はホームディレクトリ
  */
 function getConfigDir(): string {
   const worktreeHome =
     process.env.GWT_HOME && process.env.GWT_HOME.trim().length > 0
       ? process.env.GWT_HOME
-      : process.env.CLAUDE_WORKTREE_HOME &&
-          process.env.CLAUDE_WORKTREE_HOME.trim().length > 0
-        ? process.env.CLAUDE_WORKTREE_HOME
-        : homedir();
+      : homedir();
   return path.join(worktreeHome, ".gwt");
 }
 
@@ -133,11 +130,11 @@ async function mutateProfiles(
 }
 
 /**
- * プロファイル設定ファイルのパス（後方互換性のためエクスポート）
+ * プロファイル設定ファイルのパス
  *
  * @deprecated 内部では getProfilesConfigPath() を使用してください。
  * この定数はモジュールロード時に評価されるため、
- * 実行中に環境変数（GWT_HOME/CLAUDE_WORKTREE_HOME）を変更しても反映されません。
+ * 実行中に環境変数（GWT_HOME）を変更しても反映されません。
  */
 export const PROFILES_CONFIG_PATH = getProfilesConfigPath();
 

package/src/config/tools.ts

@@ -7,14 +7,7 @@
 
 import { homedir } from "node:os";
 import path from "node:path";
-import {
-  readFile,
-  writeFile,
-  mkdir,
-  rename,
-  access,
-  cp,
-} from "node:fs/promises";
+import { readFile, writeFile, mkdir, rename } from "node:fs/promises";
 import type {
   ToolsConfig,
   CustomAITool,
@@ -28,60 +21,17 @@ const logger = createLogger({ category: "config" });
 
 /**
  * ツール設定ファイルのパス
- * 環境変数の優先順位: GWT_HOME > CLAUDE_WORKTREE_HOME (後方互換性) > ホームディレクトリ
+ * 環境変数 GWT_HOME が設定されている場合はそれを使用、それ以外はホームディレクトリ
  */
 export const WORKTREE_HOME =
   process.env.GWT_HOME && process.env.GWT_HOME.trim().length > 0
     ? process.env.GWT_HOME
-    : process.env.CLAUDE_WORKTREE_HOME &&
-        process.env.CLAUDE_WORKTREE_HOME.trim().length > 0
-      ? process.env.CLAUDE_WORKTREE_HOME
-      : homedir();
+    : homedir();
 
-const LEGACY_CONFIG_DIR = path.join(homedir(), ".claude-worktree");
 export const CONFIG_DIR = path.join(WORKTREE_HOME, ".gwt");
 export const TOOLS_CONFIG_PATH = path.join(CONFIG_DIR, "tools.json");
 const TEMP_CONFIG_PATH = `${TOOLS_CONFIG_PATH}.tmp`;
 
-/**
- * レガシー設定ディレクトリから新しいディレクトリへ移行
- */
-async function migrateLegacyConfig(): Promise<void> {
-  try {
-    // 新しいディレクトリが既に存在する場合は移行不要
-    try {
-      await access(CONFIG_DIR);
-      return;
-    } catch {
-      // 新しいディレクトリが存在しない場合は続行
-    }
-
-    // レガシーディレクトリの存在を確認
-    try {
-      await access(LEGACY_CONFIG_DIR);
-    } catch {
-      // レガシーディレクトリも存在しない場合は移行不要
-      return;
-    }
-
-    // レガシーディレクトリを新しいディレクトリにコピー
-    await mkdir(path.dirname(CONFIG_DIR), { recursive: true });
-    await cp(LEGACY_CONFIG_DIR, CONFIG_DIR, { recursive: true });
-    logger.info(
-      { from: LEGACY_CONFIG_DIR, to: CONFIG_DIR },
-      "Legacy config migrated",
-    );
-    console.log(
-      `✅ Migrated configuration from ${LEGACY_CONFIG_DIR} to ${CONFIG_DIR}`,
-    );
-  } catch (error) {
-    // 移行に失敗しても継続(エラーログのみ)
-    if (process.env.DEBUG) {
-      console.error("Failed to migrate legacy config:", error);
-    }
-  }
-}
-
 const DEFAULT_CONFIG: ToolsConfig = {
   version: "1.0.0",
   env: {},
@@ -98,9 +48,6 @@ const DEFAULT_CONFIG: ToolsConfig = {
  * @throws JSON構文エラー時
  */
 export async function loadToolsConfig(): Promise<ToolsConfig> {
-  // 最初の呼び出し時にレガシー設定の移行を試行
-  await migrateLegacyConfig();
-
   try {
     const content = await readFile(TOOLS_CONFIG_PATH, "utf-8");
     const config = JSON.parse(content) as ToolsConfig;

package/src/gemini.ts

@@ -175,7 +175,6 @@ export async function launchGeminiCLI(
       const run = async (cmd: string, args: string[]) => {
         const child = execa(cmd, args, {
           cwd: worktreePath,
-          shell: true,
           stdin: childStdio.stdin,
           stdout: childStdio.stdout,
           stderr: childStdio.stderr,
@@ -328,7 +327,7 @@ export async function launchGeminiCLI(
  */
 export async function isGeminiCLIAvailable(): Promise<boolean> {
   try {
-    await execa("bunx", [GEMINI_CLI_PACKAGE, "--version"], { shell: true });
+    await execa("bunx", [GEMINI_CLI_PACKAGE, "--version"]);
     return true;
   } catch (error: unknown) {
     const err = error as NodeJS.ErrnoException;

package/src/index.ts

@@ -13,7 +13,6 @@ import {
   hasUnpushedCommits,
   getUncommittedChangesCount,
   getUnpushedCommitsCount,
-  pushBranchToRemote,
   GitError,
 } from "./git.js";
 import { launchClaudeCode } from "./claude.js";
@@ -57,7 +56,7 @@ import {
   DependencyInstallError,
   type DependencyInstallResult,
 } from "./services/dependency-installer.js";
-import { confirmYesNo, waitForEnter } from "./utils/prompt.js";
+import { waitForEnter } from "./utils/prompt.js";
 
 const ERROR_PROMPT = chalk.yellow(
   "Review the error details, then press Enter to continue.",
@@ -435,7 +434,7 @@ export async function handleAIToolWorkflow(
       switch (dependencyStatus.reason) {
         case "missing-lockfile":
           warningMessage =
-            "Skipping automatic install because no lockfiles (bun.lock / pnpm-lock.yaml / package-lock.json) or package.json were found. Run the appropriate package-manager install command manually if needed.";
+            "Skipping automatic install because no lockfiles (bun.lock / pnpm-lock.yaml / package-lock.json) or package.json could be found. Run the appropriate package-manager install command manually if needed.";
           break;
         case "missing-binary":
           warningMessage = `Package manager '${dependencyStatus.manager ?? "unknown"}' is not available in this environment; skipping automatic install.`;
@@ -554,23 +553,21 @@ export async function handleAIToolWorkflow(
       throw new Error(`Tool not found: ${tool}`);
     }
 
-    // Save selection immediately so "last tool" is reflected even if the tool
-    // is interrupted or killed mid-run (e.g., Ctrl+C).
-    await saveSession(
-      {
-        lastWorktreePath: worktreePath,
-        lastBranch: branch,
-        lastUsedTool: tool,
-        toolLabel: toolConfig.displayName ?? tool,
-        mode,
-        model: normalizedModel ?? null,
-        reasoningLevel: inferenceLevel ?? null,
-        skipPermissions: skipPermissions ?? null,
-        timestamp: Date.now(),
-        repositoryRoot: repoRoot,
-      },
-      { skipHistory: true },
-    );
+    // Save selection immediately (including history) so "last tool" is reflected
+    // even if the tool is interrupted or killed mid-run (e.g., Ctrl+C).
+    // FR-042: Record timestamp to session history immediately on tool start.
+    await saveSession({
+      lastWorktreePath: worktreePath,
+      lastBranch: branch,
+      lastUsedTool: tool,
+      toolLabel: toolConfig.displayName ?? tool,
+      mode,
+      model: normalizedModel ?? null,
+      reasoningLevel: inferenceLevel ?? null,
+      skipPermissions: skipPermissions ?? null,
+      timestamp: Date.now(),
+      repositoryRoot: repoRoot,
+    });
 
     // Lookup saved session ID for Continue (auto attach)
     let resumeSessionId: string | null =
@@ -600,96 +597,127 @@ export async function handleAIToolWorkflow(
 
     const launchStartedAt = Date.now();
 
+    // FR-043: Start periodic timestamp update timer (30 seconds interval)
+    // This ensures the latest activity time is updated even if the tool is force-killed
+    const SESSION_UPDATE_INTERVAL_MS = 30_000;
+    const updateTimer = setInterval(async () => {
+      try {
+        await saveSession(
+          {
+            lastWorktreePath: worktreePath,
+            lastBranch: branch,
+            lastUsedTool: tool,
+            toolLabel: toolConfig.displayName ?? tool,
+            mode,
+            model: normalizedModel ?? null,
+            reasoningLevel: inferenceLevel ?? null,
+            skipPermissions: skipPermissions ?? null,
+            timestamp: Date.now(),
+            repositoryRoot: repoRoot,
+          },
+          { skipHistory: true }, // Don't add to history, just update timestamp
+        );
+      } catch {
+        // Ignore errors during periodic update
+      }
+    }, SESSION_UPDATE_INTERVAL_MS);
+
     // Launch selected AI tool
     // Builtin tools use their dedicated launch functions
     // Custom tools use the generic launchCustomAITool function
     let launchResult: { sessionId?: string | null } | void;
-    if (tool === "claude-code") {
-      const launchOptions: {
-        mode?: "normal" | "continue" | "resume";
-        skipPermissions?: boolean;
-        envOverrides?: Record<string, string>;
-        model?: string;
-        sessionId?: string | null;
-        chrome?: boolean;
-      } = {
-        mode:
-          mode === "resume"
-            ? "resume"
-            : mode === "continue"
-              ? "continue"
-              : "normal",
-        skipPermissions,
-        envOverrides: sharedEnv,
-        sessionId: resumeSessionId,
-        chrome: true,
-      };
-      if (normalizedModel) {
-        launchOptions.model = normalizedModel;
-      }
-      launchResult = await launchClaudeCode(worktreePath, launchOptions);
-    } else if (tool === "codex-cli") {
-      const launchOptions: {
-        mode?: "normal" | "continue" | "resume";
-        bypassApprovals?: boolean;
-        envOverrides?: Record<string, string>;
-        model?: string;
-        reasoningEffort?: CodexReasoningEffort;
-        sessionId?: string | null;
-      } = {
-        mode:
-          mode === "resume"
-            ? "resume"
-            : mode === "continue"
-              ? "continue"
-              : "normal",
-        bypassApprovals: skipPermissions,
-        envOverrides: sharedEnv,
-        sessionId: resumeSessionId,
-      };
-      if (normalizedModel) {
-        launchOptions.model = normalizedModel;
-      }
-      if (inferenceLevel) {
-        launchOptions.reasoningEffort = inferenceLevel as CodexReasoningEffort;
-      }
-      launchResult = await launchCodexCLI(worktreePath, launchOptions);
-    } else if (tool === "gemini-cli") {
-      const launchOptions: {
-        mode?: "normal" | "continue" | "resume";
-        skipPermissions?: boolean;
-        envOverrides?: Record<string, string>;
-        model?: string;
-        sessionId?: string | null;
-      } = {
-        mode:
-          mode === "resume"
-            ? "resume"
-            : mode === "continue"
-              ? "continue"
-              : "normal",
-        skipPermissions,
-        envOverrides: sharedEnv,
-        sessionId: resumeSessionId,
-      };
-      if (normalizedModel) {
-        launchOptions.model = normalizedModel;
+    try {
+      if (tool === "claude-code") {
+        const launchOptions: {
+          mode?: "normal" | "continue" | "resume";
+          skipPermissions?: boolean;
+          envOverrides?: Record<string, string>;
+          model?: string;
+          sessionId?: string | null;
+          chrome?: boolean;
+        } = {
+          mode:
+            mode === "resume"
+              ? "resume"
+              : mode === "continue"
+                ? "continue"
+                : "normal",
+          skipPermissions,
+          envOverrides: sharedEnv,
+          sessionId: resumeSessionId,
+          chrome: true,
+        };
+        if (normalizedModel) {
+          launchOptions.model = normalizedModel;
+        }
+        launchResult = await launchClaudeCode(worktreePath, launchOptions);
+      } else if (tool === "codex-cli") {
+        const launchOptions: {
+          mode?: "normal" | "continue" | "resume";
+          bypassApprovals?: boolean;
+          envOverrides?: Record<string, string>;
+          model?: string;
+          reasoningEffort?: CodexReasoningEffort;
+          sessionId?: string | null;
+        } = {
+          mode:
+            mode === "resume"
+              ? "resume"
+              : mode === "continue"
+                ? "continue"
+                : "normal",
+          bypassApprovals: skipPermissions,
+          envOverrides: sharedEnv,
+          sessionId: resumeSessionId,
+        };
+        if (normalizedModel) {
+          launchOptions.model = normalizedModel;
+        }
+        if (inferenceLevel) {
+          launchOptions.reasoningEffort =
+            inferenceLevel as CodexReasoningEffort;
+        }
+        launchResult = await launchCodexCLI(worktreePath, launchOptions);
+      } else if (tool === "gemini-cli") {
+        const launchOptions: {
+          mode?: "normal" | "continue" | "resume";
+          skipPermissions?: boolean;
+          envOverrides?: Record<string, string>;
+          model?: string;
+          sessionId?: string | null;
+        } = {
+          mode:
+            mode === "resume"
+              ? "resume"
+              : mode === "continue"
+                ? "continue"
+                : "normal",
+          skipPermissions,
+          envOverrides: sharedEnv,
+          sessionId: resumeSessionId,
+        };
+        if (normalizedModel) {
+          launchOptions.model = normalizedModel;
+        }
+        launchResult = await launchGeminiCLI(worktreePath, launchOptions);
+      } else {
+        // Custom tool
+        printInfo(`Launching custom tool: ${toolConfig.displayName}`);
+        launchResult = await launchCustomAITool(toolConfig, {
+          mode:
+            mode === "resume"
+              ? "resume"
+              : mode === "continue"
+                ? "continue"
+                : "normal",
+          skipPermissions,
+          cwd: worktreePath,
+          sharedEnv,
+        });
       }
-      launchResult = await launchGeminiCLI(worktreePath, launchOptions);
-    } else {
-      // Custom tool
-      printInfo(`Launching custom tool: ${toolConfig.displayName}`);
-      launchResult = await launchCustomAITool(toolConfig, {
-        mode:
-          mode === "resume"
-            ? "resume"
-            : mode === "continue"
-              ? "continue"
-              : "normal",
-        skipPermissions,
-        cwd: worktreePath,
-        sharedEnv,
-      });
+    } finally {
+      // FR-043: Clear the periodic timestamp update timer
+      clearInterval(updateTimer);
     }
 
     // Persist session with captured session ID (if any)
@@ -768,19 +796,21 @@ export async function handleAIToolWorkflow(
       lastSessionId: finalSessionId,
     });
 
-    let uncommittedExists = false;
     try {
       const [hasUncommitted, hasUnpushed] = await Promise.all([
         hasUncommittedChanges(worktreePath),
         hasUnpushedCommits(worktreePath, branch),
       ]);
-      uncommittedExists = hasUncommitted;
 
       if (hasUncommitted) {
         const uncommittedCount = await getUncommittedChangesCount(worktreePath);
         const countLabel =
-          uncommittedCount > 0 ? ` (${uncommittedCount}件)` : "";
-        printWarning(`未コミットの変更があります${countLabel}。`);
+          uncommittedCount > 0
+            ? ` (${uncommittedCount} ${
+                uncommittedCount === 1 ? "change" : "changes"
+              })`
+            : "";
+        printWarning(`Uncommitted changes detected${countLabel}.`);
       }
 
       if (hasUnpushed) {
@@ -788,36 +818,21 @@ export async function handleAIToolWorkflow(
           worktreePath,
           branch,
         );
-        const countLabel = unpushedCount > 0 ? ` (${unpushedCount}件)` : "";
-        const shouldPush = await confirmYesNo(
-          `未プッシュのコミットがあります${countLabel}。プッシュしますか？`,
-          { defaultValue: false },
-        );
-        if (shouldPush) {
-          printInfo(`Pushing origin/${branch}...`);
-          try {
-            await pushBranchToRemote(worktreePath, branch);
-            printInfo(`Push completed for ${branch}.`);
-          } catch (error) {
-            const details =
-              error instanceof Error ? error.message : String(error);
-            printWarning(`Push failed for ${branch}: ${details}`);
-          }
-        }
+        const countLabel =
+          unpushedCount > 0
+            ? ` (${unpushedCount} ${
+                unpushedCount === 1 ? "commit" : "commits"
+              })`
+            : "";
+        printWarning(`Unpushed commits detected${countLabel}.`);
       }
     } catch (error) {
       const details = error instanceof Error ? error.message : String(error);
       printWarning(`Failed to check git status after session: ${details}`);
     }
 
-    if (uncommittedExists) {
-      await waitForEnter("Press Enter to return to the main menu...");
-    } else {
-      // Small buffer before returning to branch list to avoid abrupt screen swap
-      await new Promise((resolve) =>
-        setTimeout(resolve, POST_SESSION_DELAY_MS),
-      );
-    }
+    // Small buffer before returning to branch list to avoid abrupt screen swap
+    await new Promise((resolve) => setTimeout(resolve, POST_SESSION_DELAY_MS));
     printInfo("Session completed successfully. Returning to main menu...");
     return;
   } catch (error) {

package/src/utils/command.ts

@@ -59,6 +59,7 @@ export interface CommandLookupResult {
   available: boolean;
   path: string | null;
   source: "installed" | "bunx";
+  version?: string | null;
 }
 
 /**
@@ -69,6 +70,7 @@ export interface ToolStatus {
   name: string;
   status: "installed" | "bunx";
   path: string | null;
+  version?: string | null;
 }
 
 /**
@@ -85,6 +87,33 @@ export function clearCommandLookupCache(): void {
   commandLookupCache.clear();
 }
 
+/**
+ * Gets the version of a command by running it with --version.
+ * FR-022: Returns version in "v{version}" format, null on failure.
+ * FR-023: Times out after 3 seconds to minimize startup delay.
+ *
+ * @param commandPath - Full path to the command
+ * @returns Version string (e.g., "v1.0.3") or null on failure
+ */
+export async function getCommandVersion(
+  commandPath: string,
+): Promise<string | null> {
+  try {
+    const result = await execa(commandPath, ["--version"], {
+      timeout: 3000,
+      stdin: "ignore",
+      stdout: "pipe",
+      stderr: "ignore",
+    });
+    // Extract version number from output
+    // Examples: "claude 1.0.3", "codex 0.77.0", "gemini 0.1.0"
+    const match = result.stdout.match(/(\d+\.\d+(?:\.\d+)?(?:-[\w.]+)?)/);
+    return match ? `v${match[1]}` : null;
+  } catch {
+    return null;
+  }
+}
+
 /**
  * Finds a command by checking PATH first, then fallback paths.
  * Results are cached for the lifetime of the process (FR-020).
@@ -141,6 +170,13 @@ export async function findCommand(
     lookupResult = { available: true, path: null, source: "bunx" };
   }
 
+  // Step 4: Get version for installed commands (FR-022)
+  if (lookupResult.source === "installed" && lookupResult.path) {
+    lookupResult.version = await getCommandVersion(lookupResult.path);
+  } else {
+    lookupResult.version = null;
+  }
+
   // Cache the result (FR-020)
   commandLookupCache.set(commandName, lookupResult);
 
@@ -181,6 +217,7 @@ export async function detectAllToolStatuses(): Promise<ToolStatus[]> {
         name: tool.displayName,
         status: result.source,
         path: result.path,
+        version: result.version ?? null,
       };
     }),
   );

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

@@ -275,8 +275,8 @@ export function ConfigPage() {
             </p>
             <h3 className="mt-1 text-lg font-semibold">登録済みツール</h3>
             <p className="mt-2 text-sm text-muted-foreground">
-              CLI と Web UI は同じ設定を参照します。更新すると
-              ~/.claude-worktree/tools.json に保存されます。
+              CLI と Web UI は同じ設定を参照します。更新すると ~/.gwt/tools.json
+              に保存されます。
             </p>
           </CardHeader>
           <CardContent>