@akiojin/gwt 4.11.6 → 4.12.1

package/src/cli/ui/__tests__/solid/components/WizardController.test.tsx

@@ -0,0 +1,71 @@
+/** @jsxImportSource @opentui/solid */
+import { describe, expect, it, mock } from "bun:test";
+import { testRender } from "@opentui/solid";
+import type { ToolSessionEntry } from "../../../../config/index.js";
+
+mock.module("../../../utils/versionFetcher.js", () => ({
+  fetchInstalledVersionForAgent: mock(async () => null),
+  createInstalledOption: (version: string) => ({
+    label: `installed (${version})`,
+    value: "installed",
+  }),
+  versionInfoToSelectItem: (v: { version: string }) => ({
+    label: v.version,
+    value: v.version,
+  }),
+}));
+
+describe("WizardController", () => {
+  it("keeps version selection visible after agent select", async () => {
+    const history: ToolSessionEntry[] = [];
+
+    const { WizardController } =
+      await import("../../../components/solid/WizardController.js");
+
+    const testSetup = await testRender(
+      () => (
+        <WizardController
+          visible
+          selectedBranchName="feature/test"
+          history={history}
+          onClose={() => {}}
+          onComplete={() => {}}
+          onResume={() => {}}
+          onStartNew={() => {}}
+        />
+      ),
+      { width: 80, height: 24 },
+    );
+    await testSetup.renderOnce();
+
+    try {
+      let frame = testSetup.captureCharFrame();
+      expect(frame).toContain("What would you like to do?");
+
+      await new Promise((resolve) => setTimeout(resolve, 60));
+      await testSetup.renderOnce();
+
+      // Open existing worktree
+      testSetup.mockInput.pressEnter();
+      await testSetup.renderOnce();
+
+      frame = testSetup.captureCharFrame();
+      expect(frame).toContain("Select coding agent:");
+
+      await new Promise((resolve) => setTimeout(resolve, 60));
+      await testSetup.renderOnce();
+
+      // Select default agent (Enter)
+      testSetup.mockInput.pressEnter();
+      await testSetup.renderOnce();
+      await new Promise((resolve) => setTimeout(resolve, 60));
+      await testSetup.renderOnce();
+
+      frame = testSetup.captureCharFrame();
+      expect(frame).toContain("Select version:");
+      expect(frame).not.toContain("Select Model:");
+    } finally {
+      testSetup.renderer.destroy();
+    }
+  });
+});

package/src/cli/ui/__tests__/solid/components/WizardSteps.test.tsx

@@ -1,15 +1,24 @@
 /** @jsxImportSource @opentui/solid */
-import { describe, expect, it } from "bun:test";
+import { beforeEach, describe, expect, it } from "bun:test";
 import { testRender } from "@opentui/solid";
 import {
   BranchTypeStep,
   BranchNameStep,
   AgentSelectStep,
+  VersionSelectStep,
   ModelSelectStep,
   ReasoningLevelStep,
   ExecutionModeStep,
   SkipPermissionsStep,
 } from "../../../components/solid/WizardSteps.js";
+import {
+  clearInstalledVersionCache,
+  setInstalledVersionCache,
+} from "../../../utils/installedVersionCache.js";
+import {
+  clearVersionCache,
+  setVersionCache,
+} from "../../../utils/versionCache.js";
 
 // T405: ブランチタイプ選択ステップのテスト
 describe("BranchTypeStep", () => {
@@ -128,6 +137,65 @@ describe("AgentSelectStep", () => {
   });
 });
 
+// T407a: バージョン選択ステップのテスト
+describe("VersionSelectStep", () => {
+  beforeEach(() => {
+    clearInstalledVersionCache();
+    clearVersionCache();
+  });
+
+  it("renders installed option from cache", async () => {
+    setInstalledVersionCache("claude-code", {
+      version: "1.2.3",
+      path: "/usr/local/bin/claude",
+    });
+    setVersionCache("claude-code", []);
+
+    const testSetup = await testRender(
+      () => (
+        <VersionSelectStep
+          agentId="claude-code"
+          onSelect={() => {}}
+          onBack={() => {}}
+        />
+      ),
+      { width: 60, height: 20 },
+    );
+    await testSetup.renderOnce();
+
+    try {
+      const frame = testSetup.captureCharFrame();
+      expect(frame).toContain("Select version");
+      expect(frame).toContain("installed@1.2.3");
+      expect(frame).toContain("latest");
+    } finally {
+      testSetup.renderer.destroy();
+    }
+  });
+
+  it("does not render installed option when cache is empty", async () => {
+    const testSetup = await testRender(
+      () => (
+        <VersionSelectStep
+          agentId="claude-code"
+          onSelect={() => {}}
+          onBack={() => {}}
+        />
+      ),
+      { width: 60, height: 20 },
+    );
+    await testSetup.renderOnce();
+
+    try {
+      const frame = testSetup.captureCharFrame();
+      expect(frame).toContain("latest");
+      expect(frame).not.toContain("installed@");
+    } finally {
+      testSetup.renderer.destroy();
+    }
+  });
+});
+
 // T408: モデル選択ステップのテスト
 describe("ModelSelectStep", () => {
   it("renders model options for Claude Code", async () => {
@@ -150,6 +218,28 @@ describe("ModelSelectStep", () => {
       testSetup.renderer.destroy();
     }
   });
+
+  it("renders model options for OpenCode", async () => {
+    const testSetup = await testRender(
+      () => (
+        <ModelSelectStep
+          agentId="opencode"
+          onSelect={() => {}}
+          onBack={() => {}}
+        />
+      ),
+      { width: 60, height: 20 },
+    );
+    await testSetup.renderOnce();
+
+    try {
+      const frame = testSetup.captureCharFrame();
+      expect(frame).toContain("Default (Auto)");
+      expect(frame).toContain("Custom");
+    } finally {
+      testSetup.renderer.destroy();
+    }
+  });
 });
 
 // T409: 推論レベル選択ステップ（Codexのみ）のテスト
@@ -230,7 +320,10 @@ describe("SkipPermissionsStep", () => {
       // Enterキーで選択（デフォルトはYes）
       testSetup.mockInput.pressEnter();
       await testSetup.renderOnce();
-      expect(selected).toBe(true);
+      if (selected === null) {
+        throw new Error("Expected selection");
+      }
+      expect(selected === true).toBe(true);
     } finally {
       testSetup.renderer.destroy();
     }

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { describe, it, expect } from "bun:test";
 import {
   formatBranchItem,
@@ -5,6 +6,31 @@ import {
 } from "../../utils/branchFormatter.js";
 import type { BranchInfo } from "../../types.js";
 
+const LOCAL_DATE_TIME_FORMATTER = new Intl.DateTimeFormat(undefined, {
+  year: "numeric",
+  month: "2-digit",
+  day: "2-digit",
+  hour: "2-digit",
+  minute: "2-digit",
+  hour12: false,
+});
+
+const formatLocalDateTime = (timestampMs: number): string => {
+  const date = new Date(timestampMs);
+  const parts = LOCAL_DATE_TIME_FORMATTER.formatToParts(date);
+  const get = (type: Intl.DateTimeFormatPartTypes) =>
+    parts.find((part) => part.type === type)?.value;
+  const year = get("year");
+  const month = get("month");
+  const day = get("day");
+  const hour = get("hour");
+  const minute = get("minute");
+  if (!year || !month || !day || !hour || !minute) {
+    return LOCAL_DATE_TIME_FORMATTER.format(date);
+  }
+  return `${year}-${month}-${day} ${hour}:${minute}`;
+};
+
 describe("branchFormatter", () => {
   describe("formatBranchItem", () => {
     it("should format a branch without icons", () => {
@@ -46,8 +72,9 @@ describe("branchFormatter", () => {
 
       const result = formatBranchItem(branchInfo);
 
-      expect(result.lastToolUsageLabel).toContain("Codex");
-      expect(result.lastToolUsageLabel).toContain("2025-11-26");
+      expect(result.lastToolUsageLabel).toBe(
+        `Codex@latest | ${formatLocalDateTime(branchInfo.lastToolUsage.timestamp)}`,
+      );
     });
 
     it("should set lastToolUsageLabel to null when no usage exists", () => {
@@ -156,13 +183,13 @@ describe("branchFormatter", () => {
 
       expect(results).toHaveLength(3);
       // Current branch (main) should be first
-      expect(results[0].name).toBe("main");
-      expect(results[0].isCurrent).toBe(true);
+      expect(results[0]!.name).toBe("main");
+      expect(results[0]!.isCurrent).toBe(true);
       // origin/main is also main branch, so it comes second
-      expect(results[1].name).toBe("origin/main");
-      expect(results[1].type).toBe("remote");
+      expect(results[1]!.name).toBe("origin/main");
+      expect(results[1]!.type).toBe("remote");
       // feature/test comes last
-      expect(results[2].name).toBe("feature/test");
+      expect(results[2]!.name).toBe("feature/test");
     });
 
     it("should handle empty array", () => {
@@ -189,8 +216,8 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches);
 
-      expect(results[0].name).toBe("a-branch");
-      expect(results[1].name).toBe("z-branch");
+      expect(results[0]!.name).toBe("a-branch");
+      expect(results[1]!.name).toBe("z-branch");
     });
   });
 
@@ -219,8 +246,8 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches);
 
-      expect(results[0].name).toBe("feature/current");
-      expect(results[0].isCurrent).toBe(true);
+      expect(results[0]!.name).toBe("feature/current");
+      expect(results[0]!.isCurrent).toBe(true);
     });
 
     it("should prioritize main branch as second (after current)", () => {
@@ -247,8 +274,8 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches);
 
-      expect(results[0].name).toBe("main");
-      expect(results[1].name).toBe("develop");
+      expect(results[0]!.name).toBe("main");
+      expect(results[1]!.name).toBe("develop");
     });
 
     it("should prioritize develop branch after main (when main exists)", () => {
@@ -275,9 +302,9 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches);
 
-      expect(results[0].name).toBe("main");
-      expect(results[1].name).toBe("develop");
-      expect(results[2].name).toBe("feature/test");
+      expect(results[0]!.name).toBe("main");
+      expect(results[1]!.name).toBe("develop");
+      expect(results[2]!.name).toBe("feature/test");
     });
 
     it("should NOT prioritize develop branch when main does not exist", () => {
@@ -305,9 +332,9 @@ describe("branchFormatter", () => {
       const results = formatBranchItems(branches);
 
       // develop should be sorted alphabetically, not prioritized
-      expect(results[0].name).toBe("develop");
-      expect(results[1].name).toBe("feature/a");
-      expect(results[2].name).toBe("feature/z");
+      expect(results[0]!.name).toBe("develop");
+      expect(results[1]!.name).toBe("feature/a");
+      expect(results[2]!.name).toBe("feature/z");
     });
 
     it("should prioritize branches with worktree", () => {
@@ -346,8 +373,8 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches, worktreeMap);
 
-      expect(results[0].name).toBe("feature/with-worktree");
-      expect(results[1].name).toBe("feature/no-worktree");
+      expect(results[0]!.name).toBe("feature/with-worktree");
+      expect(results[1]!.name).toBe("feature/no-worktree");
     });
 
     it("should sort branches with worktree by latest commit timestamp", () => {
@@ -403,8 +430,8 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches, worktreeMap);
 
-      expect(results[0].name).toBe("feature/recent");
-      expect(results[1].name).toBe("feature/older");
+      expect(results[0]!.name).toBe("feature/recent");
+      expect(results[1]!.name).toBe("feature/older");
     });
 
     it("should prioritize local branches over remote branches", () => {
@@ -425,10 +452,10 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches);
 
-      expect(results[0].name).toBe("feature/local");
-      expect(results[0].type).toBe("local");
-      expect(results[1].name).toBe("origin/feature/remote");
-      expect(results[1].type).toBe("remote");
+      expect(results[0]!.name).toBe("feature/local");
+      expect(results[0]!.type).toBe("local");
+      expect(results[1]!.name).toBe("origin/feature/remote");
+      expect(results[1]!.type).toBe("remote");
     });
 
     it("should sort by latest commit timestamp when worktree status matches", () => {
@@ -451,8 +478,8 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches);
 
-      expect(results[0].name).toBe("origin/feature/newer");
-      expect(results[1].name).toBe("feature/local-older");
+      expect(results[0]!.name).toBe("origin/feature/newer");
+      expect(results[1]!.name).toBe("feature/local-older");
     });
 
     it("should apply all sorting rules in correct priority order", () => {
@@ -528,13 +555,13 @@ describe("branchFormatter", () => {
       // 4. Branches with worktree
       // 5. Local branches (alphabetically)
       // 6. Remote branches
-      expect(results[0].name).toBe("feature/current");
-      expect(results[1].name).toBe("main");
-      expect(results[2].name).toBe("develop");
-      expect(results[3].name).toBe("feature/with-worktree");
-      expect(results[4].name).toBe("feature/a-local-no-worktree");
-      expect(results[5].name).toBe("feature/z-local-no-worktree");
-      expect(results[6].name).toBe("origin/feature/z-remote");
+      expect(results[0]!.name).toBe("feature/current");
+      expect(results[1]!.name).toBe("main");
+      expect(results[2]!.name).toBe("develop");
+      expect(results[3]!.name).toBe("feature/with-worktree");
+      expect(results[4]!.name).toBe("feature/a-local-no-worktree");
+      expect(results[5]!.name).toBe("feature/z-local-no-worktree");
+      expect(results[6]!.name).toBe("origin/feature/z-remote");
     });
 
     it("should handle release and hotfix branches without special priority", () => {
@@ -562,9 +589,9 @@ describe("branchFormatter", () => {
       const results = formatBranchItems(branches);
 
       // Should be sorted alphabetically (no special priority)
-      expect(results[0].name).toBe("feature/test");
-      expect(results[1].name).toBe("hotfix/urgent");
-      expect(results[2].name).toBe("release/v1.0");
+      expect(results[0]!.name).toBe("feature/test");
+      expect(results[1]!.name).toBe("hotfix/urgent");
+      expect(results[2]!.name).toBe("release/v1.0");
     });
 
     it("should sort by latest activity time (max of git commit and tool usage)", () => {
@@ -604,8 +631,8 @@ describe("branchFormatter", () => {
       // Both have same latest activity time (1_800_000_000), so alphabetical
       // feature/git-newer: max(1_800_000_000, 1_700_000_000) = 1_800_000_000
       // feature/tool-newer: max(1_700_000_000, 1_800_000_000) = 1_800_000_000
-      expect(results[0].name).toBe("feature/git-newer");
-      expect(results[1].name).toBe("feature/tool-newer");
+      expect(results[0]!.name).toBe("feature/git-newer");
+      expect(results[1]!.name).toBe("feature/tool-newer");
     });
 
     it("should prioritize branch with tool usage over branch with only git commit when tool is newer", () => {
@@ -636,8 +663,8 @@ describe("branchFormatter", () => {
       const results = formatBranchItems(branches);
 
       // feature/with-tool has newer activity (tool usage at 1_800_000_000)
-      expect(results[0].name).toBe("feature/with-tool");
-      expect(results[1].name).toBe("feature/git-only");
+      expect(results[0]!.name).toBe("feature/with-tool");
+      expect(results[1]!.name).toBe("feature/git-only");
     });
 
     it("should prioritize branch with newer git commit over branch with older tool usage", () => {
@@ -668,8 +695,8 @@ describe("branchFormatter", () => {
       const results = formatBranchItems(branches);
 
       // feature/new-git has newer activity (git commit at 1_800_000_000)
-      expect(results[0].name).toBe("feature/new-git");
-      expect(results[1].name).toBe("feature/old-tool");
+      expect(results[0]!.name).toBe("feature/new-git");
+      expect(results[1]!.name).toBe("feature/old-tool");
     });
   });
 });

package/src/cli/ui/components/solid/QuickStartStep.tsx

@@ -42,40 +42,52 @@ export function QuickStartStep(props: QuickStartStepProps) {
     }
   });
 
-  // Build selection items from history
-  // 最新の履歴エントリのみを使用（重複排除済み）
-  const latestEntry = createMemo(() => props.history[0] ?? null);
+  const buildSettingsDescription = (entry: ToolSessionEntry): string => {
+    const parts: string[] = [];
+    if (entry.toolLabel) {
+      parts.push(entry.toolLabel);
+    } else if (entry.toolId) {
+      parts.push(entry.toolId);
+    }
+    if (entry.model) {
+      parts.push(entry.model);
+    }
+    if (entry.toolId === "codex-cli" && entry.reasoningLevel) {
+      parts.push(entry.reasoningLevel);
+    }
+    return parts.join(", ");
+  };
 
   const items = createMemo<QuickStartItem[]>(() => {
     const result: QuickStartItem[] = [];
-    const entry = latestEntry();
-
-    if (entry) {
-      const reasoningInfo = entry.reasoningLevel
-        ? `, ${entry.reasoningLevel}`
-        : "";
-      const versionInfo = entry.toolVersion ? `@${entry.toolVersion}` : "";
-      const settingsDesc = `${entry.toolLabel}${versionInfo}, ${entry.model}${reasoningInfo}`;
-      const resumeDesc = entry.sessionId
-        ? `${settingsDesc}, session ${entry.sessionId}`
-        : settingsDesc;
 
-      result.push({
-        label: "Resume session (previous settings)",
-        value: `resume-${entry.toolId}`,
-        description: resumeDesc,
-        action: "resume",
-        entry,
-      });
+    props.history.forEach((entry, index) => {
+      if (!entry) return;
+      const settingsDesc = buildSettingsDescription(entry);
+      const sessionId =
+        entry.sessionId && entry.sessionId.trim().length > 0
+          ? entry.sessionId.trim()
+          : null;
+      const suffix = `${entry.toolId ?? "tool"}-${index}`;
+
+      if (sessionId) {
+        result.push({
+          label: "Resume session (previous settings)",
+          value: `resume-${suffix}`,
+          description: `${settingsDesc} | Session: ${sessionId}`,
+          action: "resume",
+          entry,
+        });
+      }
 
       result.push({
         label: "Start new (previous settings)",
-        value: `start-new-${entry.toolId}`,
+        value: `start-new-${suffix}`,
         description: settingsDesc,
         action: "start-new",
         entry,
       });
-    }
+    });
 
     // Add "Choose different settings..." at the end
     result.push({

package/src/cli/ui/components/solid/SearchInput.tsx

@@ -27,7 +27,7 @@ export function SearchInput({
       <input
         value={value}
         onChange={onChange}
-        onSubmit={onSubmit}
+        {...(onSubmit ? { onSubmit } : {})}
         placeholder={placeholder}
         width={inputWidth}
         focused={isFocused}

package/src/cli/ui/components/solid/SelectInput.tsx

@@ -1,6 +1,7 @@
 /** @jsxImportSource @opentui/solid */
 import type { SelectOption, SelectRenderable } from "@opentui/core";
 import type { Ref } from "solid-js";
+import { selectionStyle } from "../../core/theme.js";
 
 export interface SelectInputItem {
   label: string;
@@ -69,6 +70,9 @@ export function SelectInput(props: SelectInputProps) {
       <select
         options={options()}
         height={computedHeight()}
+        selectedBackgroundColor={selectionStyle.bg}
+        selectedTextColor={selectionStyle.fg}
+        selectedDescriptionColor={selectionStyle.fg}
         {...(props.selectedIndex !== undefined && {
           selectedIndex: props.selectedIndex,
         })}