@akiojin/gwt 4.10.0 → 4.12.0

package/src/services/__tests__/BatchMergeService.test.ts

@@ -1,26 +1,26 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { describe, it, expect, mock, beforeEach, afterEach } from "bun:test";
 import { BatchMergeService } from "../BatchMergeService";
-import type { BatchMergeConfig } from "../../ui/types";
+import type { BatchMergeConfig, BatchMergeProgress } from "../../cli/ui/types";
 
 // Mock git module
-vi.mock("../../git", () => ({
-  fetchAllRemotes: vi.fn(),
-  getLocalBranches: vi.fn(),
-  mergeFromBranch: vi.fn(),
-  hasMergeConflict: vi.fn(),
-  abortMerge: vi.fn(),
-  getMergeStatus: vi.fn(),
-  getRepositoryRoot: vi.fn(),
-  resetToHead: vi.fn(),
-  getCurrentBranchName: vi.fn(),
-  pushBranchToRemote: vi.fn(),
+mock.module("../../git", () => ({
+  fetchAllRemotes: mock(),
+  getLocalBranches: mock(),
+  mergeFromBranch: mock(),
+  hasMergeConflict: mock(),
+  abortMerge: mock(),
+  getMergeStatus: mock(),
+  getRepositoryRoot: mock(),
+  resetToHead: mock(),
+  getCurrentBranchName: mock(),
+  pushBranchToRemote: mock(),
 }));
 
 // Mock worktree module
-vi.mock("../../worktree", () => ({
-  listAdditionalWorktrees: vi.fn(),
-  generateWorktreePath: vi.fn(),
-  createWorktree: vi.fn(),
+mock.module("../../worktree", () => ({
+  listAdditionalWorktrees: mock(),
+  generateWorktreePath: mock(),
+  createWorktree: mock(),
 }));
 
 import * as git from "../../git";
@@ -34,12 +34,12 @@ describe("BatchMergeService", () => {
   let service: BatchMergeService;
 
   beforeEach(() => {
-    vi.clearAllMocks();
+    mock.restore();
     service = new BatchMergeService();
   });
 
   afterEach(() => {
-    vi.restoreAllMocks();
+    mock.restore();
   });
 
   describe("Initialization (T201)", () => {
@@ -58,7 +58,7 @@ describe("BatchMergeService", () => {
 
   describe("determineSourceBranch (T203)", () => {
     it("should return 'main' when main branch exists", async () => {
-      (git.getLocalBranches as ReturnType<typeof vi.fn>).mockResolvedValue([
+      (git.getLocalBranches as ReturnType<typeof mock>).mockResolvedValue([
         {
           name: "main",
           type: "local",
@@ -85,7 +85,7 @@ describe("BatchMergeService", () => {
     });
 
     it("should return 'develop' when main does not exist but develop exists", async () => {
-      (git.getLocalBranches as ReturnType<typeof vi.fn>).mockResolvedValue([
+      (git.getLocalBranches as ReturnType<typeof mock>).mockResolvedValue([
         {
           name: "develop",
           type: "local",
@@ -106,7 +106,7 @@ describe("BatchMergeService", () => {
     });
 
     it("should return 'master' when main and develop do not exist", async () => {
-      (git.getLocalBranches as ReturnType<typeof vi.fn>).mockResolvedValue([
+      (git.getLocalBranches as ReturnType<typeof mock>).mockResolvedValue([
         {
           name: "master",
           type: "local",
@@ -127,7 +127,7 @@ describe("BatchMergeService", () => {
     });
 
     it("should throw error when no source branch found", async () => {
-      (git.getLocalBranches as ReturnType<typeof vi.fn>).mockResolvedValue([
+      (git.getLocalBranches as ReturnType<typeof mock>).mockResolvedValue([
         {
           name: "feature/test",
           type: "local",
@@ -144,7 +144,7 @@ describe("BatchMergeService", () => {
 
   describe("getTargetBranches (T205)", () => {
     it("should return all local branches excluding main, develop, master", async () => {
-      (git.getLocalBranches as ReturnType<typeof vi.fn>).mockResolvedValue([
+      (git.getLocalBranches as ReturnType<typeof mock>).mockResolvedValue([
         {
           name: "main",
           type: "local",
@@ -185,7 +185,7 @@ describe("BatchMergeService", () => {
     });
 
     it("should return empty array when only main/develop/master exist", async () => {
-      (git.getLocalBranches as ReturnType<typeof vi.fn>).mockResolvedValue([
+      (git.getLocalBranches as ReturnType<typeof mock>).mockResolvedValue([
         {
           name: "main",
           type: "local",
@@ -209,7 +209,7 @@ describe("BatchMergeService", () => {
   describe("ensureWorktree (T207)", () => {
     it("should return existing worktree path if worktree exists", async () => {
       (
-        worktree.listAdditionalWorktrees as ReturnType<typeof vi.fn>
+        worktree.listAdditionalWorktrees as ReturnType<typeof mock>
       ).mockResolvedValue([
         {
           path: "/repo/.worktrees/feature-a",
@@ -227,15 +227,17 @@ describe("BatchMergeService", () => {
 
     it("should create worktree if it does not exist", async () => {
       (
-        worktree.listAdditionalWorktrees as ReturnType<typeof vi.fn>
+        worktree.listAdditionalWorktrees as ReturnType<typeof mock>
       ).mockResolvedValue([]);
-      (git.getRepositoryRoot as ReturnType<typeof vi.fn>).mockResolvedValue(
+      (git.getRepositoryRoot as ReturnType<typeof mock>).mockResolvedValue(
         "/repo",
       );
       (
-        worktree.generateWorktreePath as ReturnType<typeof vi.fn>
+        worktree.generateWorktreePath as ReturnType<typeof mock>
       ).mockResolvedValue("/repo/.worktrees/feature-b");
-      (worktree.createWorktree as ReturnType<typeof vi.fn>).mockResolvedValue();
+      (worktree.createWorktree as ReturnType<typeof mock>).mockResolvedValue(
+        undefined,
+      );
 
       const worktreePath = await service.ensureWorktree("feature/b");
 
@@ -260,7 +262,7 @@ describe("BatchMergeService", () => {
 
     beforeEach(() => {
       (
-        worktree.listAdditionalWorktrees as ReturnType<typeof vi.fn>
+        worktree.listAdditionalWorktrees as ReturnType<typeof mock>
       ).mockResolvedValue([
         {
           path: "/repo/.worktrees/feature-a",
@@ -271,8 +273,10 @@ describe("BatchMergeService", () => {
     });
 
     it("should successfully merge without conflicts", async () => {
-      (git.mergeFromBranch as ReturnType<typeof vi.fn>).mockResolvedValue();
-      (git.hasMergeConflict as ReturnType<typeof vi.fn>).mockResolvedValue(
+      (git.mergeFromBranch as ReturnType<typeof mock>).mockResolvedValue(
+        undefined,
+      );
+      (git.hasMergeConflict as ReturnType<typeof mock>).mockResolvedValue(
         false,
       );
 
@@ -289,13 +293,11 @@ describe("BatchMergeService", () => {
     });
 
     it("should skip branch on merge conflict", async () => {
-      (git.mergeFromBranch as ReturnType<typeof vi.fn>).mockRejectedValue(
+      (git.mergeFromBranch as ReturnType<typeof mock>).mockRejectedValue(
         new Error("Merge conflict"),
       );
-      (git.hasMergeConflict as ReturnType<typeof vi.fn>).mockResolvedValue(
-        true,
-      );
-      (git.abortMerge as ReturnType<typeof vi.fn>).mockResolvedValue();
+      (git.hasMergeConflict as ReturnType<typeof mock>).mockResolvedValue(true);
+      (git.abortMerge as ReturnType<typeof mock>).mockResolvedValue(undefined);
 
       const status = await service.mergeBranch("feature/a", "main", config);
 
@@ -305,10 +307,10 @@ describe("BatchMergeService", () => {
     });
 
     it("should handle other errors as failed", async () => {
-      (git.mergeFromBranch as ReturnType<typeof vi.fn>).mockRejectedValue(
+      (git.mergeFromBranch as ReturnType<typeof mock>).mockRejectedValue(
         new Error("Network error"),
       );
-      (git.hasMergeConflict as ReturnType<typeof vi.fn>).mockResolvedValue(
+      (git.hasMergeConflict as ReturnType<typeof mock>).mockResolvedValue(
         false,
       );
 
@@ -330,7 +332,7 @@ describe("BatchMergeService", () => {
 
     beforeEach(() => {
       (
-        worktree.listAdditionalWorktrees as ReturnType<typeof vi.fn>
+        worktree.listAdditionalWorktrees as ReturnType<typeof mock>
       ).mockResolvedValue([
         {
           path: "/repo/.worktrees/feature-a",
@@ -341,11 +343,13 @@ describe("BatchMergeService", () => {
     });
 
     it("should rollback with resetToHead after successful dry-run merge", async () => {
-      (git.mergeFromBranch as ReturnType<typeof vi.fn>).mockResolvedValue();
-      (git.hasMergeConflict as ReturnType<typeof vi.fn>).mockResolvedValue(
+      (git.mergeFromBranch as ReturnType<typeof mock>).mockResolvedValue(
+        undefined,
+      );
+      (git.hasMergeConflict as ReturnType<typeof mock>).mockResolvedValue(
         false,
       );
-      (git.resetToHead as ReturnType<typeof vi.fn>).mockResolvedValue();
+      (git.resetToHead as ReturnType<typeof mock>).mockResolvedValue(undefined);
 
       const status = await service.mergeBranch(
         "feature/a",
@@ -366,13 +370,11 @@ describe("BatchMergeService", () => {
     });
 
     it("should rollback with abortMerge after dry-run merge conflict", async () => {
-      (git.mergeFromBranch as ReturnType<typeof vi.fn>).mockRejectedValue(
+      (git.mergeFromBranch as ReturnType<typeof mock>).mockRejectedValue(
         new Error("CONFLICT (content)"),
       );
-      (git.hasMergeConflict as ReturnType<typeof vi.fn>).mockResolvedValue(
-        true,
-      );
-      (git.abortMerge as ReturnType<typeof vi.fn>).mockResolvedValue();
+      (git.hasMergeConflict as ReturnType<typeof mock>).mockResolvedValue(true);
+      (git.abortMerge as ReturnType<typeof mock>).mockResolvedValue(undefined);
 
       const status = await service.mergeBranch(
         "feature/a",
@@ -398,7 +400,7 @@ describe("BatchMergeService", () => {
 
     beforeEach(() => {
       (
-        worktree.listAdditionalWorktrees as ReturnType<typeof vi.fn>
+        worktree.listAdditionalWorktrees as ReturnType<typeof mock>
       ).mockResolvedValue([
         {
           path: "/repo/.worktrees/feature-a",
@@ -409,14 +411,18 @@ describe("BatchMergeService", () => {
     });
 
     it("should push successfully after merge when autoPush is enabled", async () => {
-      (git.mergeFromBranch as ReturnType<typeof vi.fn>).mockResolvedValue();
-      (git.hasMergeConflict as ReturnType<typeof vi.fn>).mockResolvedValue(
+      (git.mergeFromBranch as ReturnType<typeof mock>).mockResolvedValue(
+        undefined,
+      );
+      (git.hasMergeConflict as ReturnType<typeof mock>).mockResolvedValue(
         false,
       );
-      (git.getCurrentBranchName as ReturnType<typeof vi.fn>).mockResolvedValue(
+      (git.getCurrentBranchName as ReturnType<typeof mock>).mockResolvedValue(
         "feature/a",
       );
-      (git.pushBranchToRemote as ReturnType<typeof vi.fn>).mockResolvedValue();
+      (git.pushBranchToRemote as ReturnType<typeof mock>).mockResolvedValue(
+        undefined,
+      );
 
       const status = await service.mergeBranch(
         "feature/a",
@@ -435,14 +441,16 @@ describe("BatchMergeService", () => {
     });
 
     it("should handle push failure without failing merge", async () => {
-      (git.mergeFromBranch as ReturnType<typeof vi.fn>).mockResolvedValue();
-      (git.hasMergeConflict as ReturnType<typeof vi.fn>).mockResolvedValue(
+      (git.mergeFromBranch as ReturnType<typeof mock>).mockResolvedValue(
+        undefined,
+      );
+      (git.hasMergeConflict as ReturnType<typeof mock>).mockResolvedValue(
         false,
       );
-      (git.getCurrentBranchName as ReturnType<typeof vi.fn>).mockResolvedValue(
+      (git.getCurrentBranchName as ReturnType<typeof mock>).mockResolvedValue(
         "feature/a",
       );
-      (git.pushBranchToRemote as ReturnType<typeof vi.fn>).mockRejectedValue(
+      (git.pushBranchToRemote as ReturnType<typeof mock>).mockRejectedValue(
         new Error("Push failed: permission denied"),
       );
 
@@ -459,8 +467,10 @@ describe("BatchMergeService", () => {
 
     it("should not push when autoPush is false", async () => {
       const noPushConfig = { ...autoPushConfig, autoPush: false };
-      (git.mergeFromBranch as ReturnType<typeof vi.fn>).mockResolvedValue();
-      (git.hasMergeConflict as ReturnType<typeof vi.fn>).mockResolvedValue(
+      (git.mergeFromBranch as ReturnType<typeof mock>).mockResolvedValue(
+        undefined,
+      );
+      (git.hasMergeConflict as ReturnType<typeof mock>).mockResolvedValue(
         false,
       );
 
@@ -486,19 +496,25 @@ describe("BatchMergeService", () => {
         autoPush: false,
       };
 
-      (git.fetchAllRemotes as ReturnType<typeof vi.fn>).mockResolvedValue();
-      (git.getRepositoryRoot as ReturnType<typeof vi.fn>).mockResolvedValue(
+      (git.fetchAllRemotes as ReturnType<typeof mock>).mockResolvedValue(
+        undefined,
+      );
+      (git.getRepositoryRoot as ReturnType<typeof mock>).mockResolvedValue(
         "/repo",
       );
       (
-        worktree.listAdditionalWorktrees as ReturnType<typeof vi.fn>
+        worktree.listAdditionalWorktrees as ReturnType<typeof mock>
       ).mockResolvedValue([]);
-      (worktree.generateWorktreePath as ReturnType<typeof vi.fn>)
+      (worktree.generateWorktreePath as ReturnType<typeof mock>)
         .mockResolvedValueOnce("/repo/.worktrees/feature-a")
         .mockResolvedValueOnce("/repo/.worktrees/feature-b");
-      (worktree.createWorktree as ReturnType<typeof vi.fn>).mockResolvedValue();
-      (git.mergeFromBranch as ReturnType<typeof vi.fn>).mockResolvedValue();
-      (git.hasMergeConflict as ReturnType<typeof vi.fn>).mockResolvedValue(
+      (worktree.createWorktree as ReturnType<typeof mock>).mockResolvedValue(
+        undefined,
+      );
+      (git.mergeFromBranch as ReturnType<typeof mock>).mockResolvedValue(
+        undefined,
+      );
+      (git.hasMergeConflict as ReturnType<typeof mock>).mockResolvedValue(
         false,
       );
 

package/src/services/__tests__/WorktreeOrchestrator.test.ts

@@ -1,4 +1,5 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { describe, it, expect, mock, beforeEach } from "bun:test";
 import {
   WorktreeOrchestrator,
   type WorktreeService,
@@ -6,8 +7,8 @@ import {
 import * as git from "../../git.js";
 
 // Mock git.getCurrentBranch
-vi.mock("../../git.js", () => ({
-  getCurrentBranch: vi.fn(),
+mock.module("../../git.js", () => ({
+  getCurrentBranch: mock(),
 }));
 
 describe("WorktreeOrchestrator", () => {
@@ -18,11 +19,11 @@ describe("WorktreeOrchestrator", () => {
   const mockWorktreePath = "/mock/repo/.git/worktree/feature-test";
 
   beforeEach(() => {
-    // Create mock service without vi.mock()
+    // Create mock service without mock.module()
     mockWorktreeService = {
-      worktreeExists: vi.fn(),
-      generateWorktreePath: vi.fn(),
-      createWorktree: vi.fn(),
+      worktreeExists: mock(),
+      generateWorktreePath: mock(),
+      createWorktree: mock(),
     };
     orchestrator = new WorktreeOrchestrator(mockWorktreeService);
   });

package/src/services/codingAgentResolver.ts

@@ -138,17 +138,30 @@ export interface ClaudeCommandOptions {
   mode?: "normal" | "continue" | "resume";
   skipPermissions?: boolean;
   extraArgs?: string[];
+  sessionId?: string | null;
 }
 
 export function buildClaudeArgs(options: ClaudeCommandOptions = {}): string[] {
   const args: string[] = [];
+  const sessionId =
+    options.sessionId && options.sessionId.trim().length > 0
+      ? options.sessionId.trim()
+      : null;
 
   switch (options.mode) {
     case "continue":
-      args.push("-c");
+      if (sessionId) {
+        args.push("--resume", sessionId);
+      } else {
+        args.push("-c");
+      }
       break;
     case "resume":
-      args.push("-r");
+      if (sessionId) {
+        args.push("--resume", sessionId);
+      } else {
+        args.push("-r");
+      }
       break;
     default:
       break;
@@ -210,17 +223,30 @@ export interface CodexCommandOptions {
   mode?: "normal" | "continue" | "resume";
   bypassApprovals?: boolean;
   extraArgs?: string[];
+  sessionId?: string | null;
 }
 
 export function buildCodexArgs(options: CodexCommandOptions = {}): string[] {
   const args: string[] = [];
+  const sessionId =
+    options.sessionId && options.sessionId.trim().length > 0
+      ? options.sessionId.trim()
+      : null;
 
   switch (options.mode) {
     case "continue":
-      args.push("resume", "--last");
+      if (sessionId) {
+        args.push("resume", sessionId);
+      } else {
+        args.push("resume", "--last");
+      }
       break;
     case "resume":
-      args.push("resume");
+      if (sessionId) {
+        args.push("resume", sessionId);
+      } else {
+        args.push("resume");
+      }
       break;
     default:
       break;

package/src/services/dependency-installer.ts

@@ -1,7 +1,6 @@
 import path from "node:path";
-import fs from "node:fs/promises";
+import { access } from "node:fs/promises";
 import { execa } from "execa";
-import { startSpinner } from "../utils/spinner.js";
 
 export type PackageManager = "bun" | "pnpm" | "npm";
 
@@ -73,7 +72,7 @@ const INSTALL_CANDIDATES: PackageManagerCandidate[] = [
 
 async function fileExists(targetPath: string): Promise<boolean> {
   try {
-    await fs.access(targetPath);
+    await access(targetPath);
     return true;
   } catch (error) {
     const code = (error as NodeJS.ErrnoException)?.code;
@@ -144,10 +143,6 @@ export async function installDependenciesForWorktree(
 
   const [binary, ...args] = detection.command;
 
-  const spinner = startSpinner(
-    `Installing dependencies via ${detection.manager} (${path.basename(detection.lockfile)})`,
-  );
-
   try {
     await execa(binary, args, {
       cwd: worktreePath,
@@ -187,8 +182,6 @@ export async function installDependenciesForWorktree(
       reason: "install-failed",
       message: failureMessage,
     };
-  } finally {
-    spinner();
   }
 
   return {

package/src/types/api.ts

@@ -112,6 +112,8 @@ export interface LastToolUsage {
   mode?: "normal" | "continue" | "resume" | null;
   model?: string | null;
   timestamp: number; // epoch millis
+  sessionId?: string | null;
+  toolVersion?: string | null;
 }
 
 /**
@@ -177,6 +179,7 @@ export interface StartSessionRequest {
   bypassApprovals?: boolean;
   extraArgs?: string[];
   customAgentId?: string | null;
+  resumeSessionId?: string | null;
 }
 
 export type UpdateConfigRequest = ConfigPayload;

package/src/types/coding-agent.ts

@@ -0,0 +1,85 @@
+/**
+ * Coding Agent Types
+ *
+ * コーディングエージェント（Claude, Codex, Gemini）の共通型定義。
+ */
+
+/**
+ * コーディングエージェントの基本情報
+ */
+export interface CodingAgentInfo {
+  /** ツールID */
+  id: string;
+  /** 表示名 */
+  name: string;
+  /** コマンド名 */
+  command: string;
+  /** npmパッケージ名（グローバルインストール用） */
+  packageName?: string;
+}
+
+/**
+ * コーディングエージェントの起動オプション（共通部分）
+ */
+export interface CodingAgentLaunchOptions {
+  /** 作業ディレクトリ */
+  cwd: string;
+  /** セッションID（継続時） */
+  sessionId?: string;
+  /** 継続モード */
+  continueSession?: boolean;
+  /** 再開モード */
+  resumeSession?: boolean;
+  /** モデルID */
+  model?: string;
+  /** 環境変数 */
+  env?: Record<string, string>;
+}
+
+/**
+ * コーディングエージェントの起動結果
+ */
+export interface CodingAgentLaunchResult {
+  /** セッションID */
+  sessionId?: string;
+  /** 終了コード */
+  exitCode: number;
+  /** 終了シグナル */
+  signal?: string;
+}
+
+/**
+ * コーディングエージェントのセッション検出結果
+ */
+export interface CodingAgentSessionInfo {
+  /** セッションID */
+  sessionId: string;
+  /** セッションパス */
+  path?: string;
+  /** 最終更新日時 */
+  lastModified?: Date;
+}
+
+/**
+ * コーディングエージェント登録情報
+ */
+export const CODING_AGENTS: Record<string, CodingAgentInfo> = {
+  claude: {
+    id: "claude",
+    name: "Claude Code",
+    command: "claude",
+    packageName: "@anthropic-ai/claude-code",
+  },
+  codex: {
+    id: "codex",
+    name: "Codex CLI",
+    command: "codex",
+    packageName: "codex",
+  },
+  gemini: {
+    id: "gemini",
+    name: "Gemini CLI",
+    command: "gemini",
+    packageName: "@anthropic-ai/gemini-cli",
+  },
+};

package/src/types/tools.ts

@@ -216,6 +216,15 @@ export interface CodingAgentConfig {
  *
  * launchCodingAgent() 関数の引数として使用。
  */
+/**
+ * バージョン選択
+ *
+ * - "installed": bunxのデフォルト動作（キャッシュ優先）
+ * - "latest": 常に最新版をダウンロード
+ * - その他: 具体的なバージョン番号（例: "1.0.3", "2.1.0-beta.1"）
+ */
+export type VersionSelection = "installed" | "latest" | string;
+
 export interface CodingAgentLaunchOptions {
   /**
    * 実行モード
@@ -247,4 +256,14 @@ export interface CodingAgentLaunchOptions {
    * 共有環境変数（共通env + ローカル取り込み）
    */
   sharedEnv?: Record<string, string>;
+
+  /**
+   * バージョン選択
+   *
+   * bunxタイプのエージェントでのみ使用。
+   * - "installed": bunxのデフォルト動作（キャッシュ優先）
+   * - "latest": 常に最新版をダウンロード
+   * - その他: 具体的なバージョン番号
+   */
+  version?: VersionSelection;
 }