@akiojin/gwt 2.2.0 → 2.4.0

package/src/cli/ui/components/screens/ModelSelectorScreen.tsx

@@ -0,0 +1,320 @@
+import React, { useEffect, useMemo, useState } from "react";
+import { Box, Text, useInput } from "ink";
+import { Header } from "../parts/Header.js";
+import { Footer } from "../parts/Footer.js";
+import { Select, type SelectItem } from "../common/Select.js";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
+import type { AITool, InferenceLevel, ModelOption } from "../../types.js";
+import {
+  getDefaultInferenceForModel,
+  getDefaultModelOption,
+  getInferenceLevelsForModel,
+  getModelOptions,
+} from "../../utils/modelOptions.js";
+
+export interface ModelSelectionResult {
+  model: string | null;
+  inferenceLevel?: InferenceLevel;
+}
+
+interface ModelSelectItem extends SelectItem {
+  description?: string;
+}
+
+interface InferenceSelectItem extends SelectItem {
+  hint?: string;
+}
+
+export interface ModelSelectorScreenProps {
+  tool: AITool;
+  onBack: () => void;
+  onSelect: (selection: ModelSelectionResult) => void;
+  version?: string | null;
+  initialSelection?: ModelSelectionResult | null;
+}
+
+const TOOL_LABELS: Record<string, string> = {
+  "claude-code": "Claude Code",
+  "codex-cli": "Codex",
+  "gemini-cli": "Gemini",
+  "qwen-cli": "Qwen",
+};
+
+const INFERENCE_LABELS: Record<InferenceLevel, string> = {
+  low: "Low (lighter reasoning)",
+  medium: "Medium (balanced reasoning)",
+  high: "High (deeper reasoning)",
+  xhigh: "Extra high (maximum reasoning)",
+};
+
+/**
+ * モデル選択 → (必要なら) 推論レベル選択を行う画面
+ */
+export function ModelSelectorScreen({
+  tool,
+  onBack,
+  onSelect,
+  version,
+  initialSelection,
+}: ModelSelectorScreenProps) {
+  const { rows } = useTerminalSize();
+
+  const [step, setStep] = useState<"model" | "inference">("model");
+  const [modelOptions, setModelOptions] = useState<ModelOption[]>([]);
+  const [selectedModel, setSelectedModel] = useState<ModelOption | null>(null);
+
+  // モデル候補をツールに応じてロード
+  useEffect(() => {
+    const options = getModelOptions(tool);
+    setModelOptions(options);
+    // 初期選択が有効なら保持
+    if (initialSelection?.model) {
+      const found = options.find((opt) => opt.id === initialSelection.model);
+      if (found) {
+        setSelectedModel(found);
+        setStep("model");
+        return;
+      }
+    }
+    setSelectedModel(null);
+    setStep("model");
+  }, [tool, initialSelection?.model]);
+
+  const modelItems: ModelSelectItem[] = useMemo(
+    () =>
+      modelOptions.map((option) => ({
+        label: option.label,
+        value: option.id,
+        ...(option.description ? { description: option.description } : {}),
+      })),
+    [modelOptions],
+  );
+
+  const defaultModelIndex = useMemo(() => {
+    const initial = initialSelection?.model
+      ? modelOptions.findIndex((opt) => opt.id === initialSelection.model)
+      : -1;
+    if (initial !== -1) return initial;
+    const defaultOption = getDefaultModelOption(tool);
+    if (!defaultOption) return 0;
+    const index = modelOptions.findIndex((opt) => opt.id === defaultOption.id);
+    return index >= 0 ? index : 0;
+  }, [initialSelection?.model, modelOptions, tool]);
+
+  const inferenceOptions = useMemo(
+    () => getInferenceLevelsForModel(selectedModel ?? undefined),
+    [selectedModel],
+  );
+
+  const inferenceItems: InferenceSelectItem[] = useMemo(
+    () => {
+      return inferenceOptions.map((level) => {
+        if (selectedModel?.id === "gpt-5.1-codex-max") {
+          if (level === "low") {
+            return {
+              label: "Low",
+              value: level,
+              hint: "Fast responses with lighter reasoning",
+            };
+          }
+          if (level === "medium") {
+            return {
+              label: "Medium (default)",
+              value: level,
+              hint: "Balances speed and reasoning depth for everyday tasks",
+            };
+          }
+          if (level === "high") {
+            return {
+              label: "High",
+              value: level,
+              hint: "Maximizes reasoning depth for complex problems",
+            };
+          }
+          if (level === "xhigh") {
+            return {
+              label: "Extra high",
+              value: level,
+              hint:
+                "Extra high reasoning depth; may quickly consume Plus plan rate limits.",
+            };
+          }
+        }
+
+        return {
+          label: INFERENCE_LABELS[level],
+          value: level,
+        };
+      });
+    },
+    [inferenceOptions, selectedModel?.id],
+  );
+
+  const defaultInferenceIndex = useMemo(() => {
+    const initialLevel = initialSelection?.inferenceLevel;
+    if (initialLevel && inferenceOptions.includes(initialLevel)) {
+      return inferenceOptions.findIndex((lvl) => lvl === initialLevel);
+    }
+    const defaultLevel = getDefaultInferenceForModel(selectedModel ?? undefined);
+    if (!defaultLevel) return 0;
+    const index = inferenceOptions.findIndex((lvl) => lvl === defaultLevel);
+    return index >= 0 ? index : 0;
+  }, [initialSelection?.inferenceLevel, inferenceOptions, selectedModel]);
+
+  useInput((_input, key) => {
+    if (key.escape) {
+      if (step === "inference") {
+        setStep("model");
+        return;
+      }
+      onBack();
+    }
+  });
+
+  const handleModelSelect = (item: ModelSelectItem) => {
+    const option =
+      modelOptions.find((opt) => opt.id === item.value) ?? modelOptions[0];
+
+    if (!option) {
+      onSelect({ model: null });
+      return;
+    }
+
+    setSelectedModel(option);
+
+    const levels = getInferenceLevelsForModel(option);
+    if (levels.length > 0) {
+      setStep("inference");
+    } else {
+      onSelect({ model: option.id });
+    }
+  };
+
+  const handleInferenceSelect = (item: InferenceSelectItem) => {
+    if (!selectedModel) {
+      setStep("model");
+      return;
+    }
+
+    onSelect({
+      model: selectedModel.id,
+      inferenceLevel: item.value as InferenceLevel,
+    });
+  };
+
+  const footerActions =
+    step === "model"
+      ? [
+          { key: "enter", description: "Select" },
+          { key: "esc", description: "Back" },
+        ]
+      : [
+          { key: "enter", description: "Select" },
+          { key: "esc", description: "Back to model" },
+        ];
+
+  const toolLabel = TOOL_LABELS[tool] ?? tool;
+
+  const renderModelItem = (
+    item: ModelSelectItem,
+    isSelected: boolean,
+  ): React.ReactNode => (
+    <Box flexDirection="column">
+      {isSelected ? (
+        <Text color="cyan">➤ {item.label}</Text>
+      ) : (
+        <Text>  {item.label}</Text>
+      )}
+      {item.description ? (
+        <Text color="gray">    {item.description}</Text>
+      ) : null}
+    </Box>
+  );
+
+  return (
+    <Box flexDirection="column" height={rows}>
+      <Header
+        title={step === "model" ? "Model Selection" : "Inference Level"}
+        titleColor="blue"
+        version={version}
+      />
+
+      <Box flexDirection="column" flexGrow={1} marginTop={1}>
+        {step === "model" ? (
+          <>
+            {tool === "gemini-cli" ? (
+              <Box marginBottom={1} flexDirection="column">
+                <Text>Gemini 3 preview is enabled.</Text>
+                <Text>
+                  Selecting Pro uses gemini-3-pro-preview and falls back to
+                  gemini-2.5-pro if unavailable.
+                </Text>
+                <Text>Use --model to pin a specific Gemini model.</Text>
+              </Box>
+            ) : null}
+
+            <Box marginBottom={1}>
+              <Text>
+                Select a model for {toolLabel}
+                {modelOptions.length === 0 ? " (no options)" : ""}
+              </Text>
+            </Box>
+            {tool === "qwen-cli" ? (
+              <Box marginBottom={1} flexDirection="column">
+                <Text>Latest Qwen models from Alibaba Cloud ModelStudio:</Text>
+                <Text>• coder-model (qwen3-coder-plus-2025-09-23)</Text>
+                <Text>• vision-model (qwen3-vl-plus-2025-09-23)</Text>
+              </Box>
+            ) : null}
+
+            {modelItems.length === 0 ? (
+              <Select
+                items={[
+                  {
+                    label: "No model selection required. Press Enter to continue.",
+                    value: "__continue__",
+                  },
+                ]}
+                onSelect={() => onSelect({ model: null })}
+              />
+            ) : (
+              <Select
+                items={modelItems}
+                onSelect={handleModelSelect}
+                initialIndex={defaultModelIndex}
+                renderItem={renderModelItem}
+              />
+            )}
+          </>
+        ) : (
+          <>
+            <Box marginBottom={1}>
+              <Text>
+                Select reasoning level for {selectedModel?.label ?? "model"}
+              </Text>
+            </Box>
+            <Select
+              items={inferenceItems}
+              onSelect={handleInferenceSelect}
+              initialIndex={defaultInferenceIndex}
+              renderItem={(item, isSelected) => (
+                <Box flexDirection="column">
+                  {isSelected ? (
+                    <Text color="cyan">➤ {item.label}</Text>
+                  ) : (
+                    <Text>  {item.label}</Text>
+                  )}
+                  {"hint" in item && item.hint ? (
+                    <Text color="gray">    {item.hint}</Text>
+                  ) : null}
+                </Box>
+              )}
+            />
+          </>
+        )}
+      </Box>
+
+      <Footer actions={footerActions} />
+    </Box>
+  );
+}

package/src/cli/ui/components/screens/PRCleanupScreen.tsx

@@ -1,10 +1,10 @@
-import React from 'react';
-import { Box, Text, useInput } from 'ink';
-import { Header } from '../parts/Header.js';
-import { Footer } from '../parts/Footer.js';
-import { Select } from '../common/Select.js';
-import { useTerminalSize } from '../../hooks/useTerminalSize.js';
-import type { CleanupTarget } from '../../types.js';
+import React from "react";
+import { Box, Text, useInput } from "ink";
+import { Header } from "../parts/Header.js";
+import { Footer } from "../parts/Footer.js";
+import { Select } from "../common/Select.js";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
+import type { CleanupTarget } from "../../types.js";
 
 export interface PRItem {
   label: string;
@@ -44,7 +44,7 @@ export function PRCleanupScreen({
   useInput((input, key) => {
     if (key.escape) {
       onBack();
-    } else if (input === 'r') {
+    } else if (input === "r") {
       onRefresh();
     }
   });
@@ -53,28 +53,28 @@ export function PRCleanupScreen({
   const prItems: PRItem[] = targets.map((target) => {
     const pr = target.pullRequest;
     const flags: string[] = [];
-    if (target.cleanupType === 'worktree-and-branch') {
-      flags.push('worktree');
+    if (target.cleanupType === "worktree-and-branch") {
+      flags.push("worktree");
     } else {
-      flags.push('branch');
+      flags.push("branch");
     }
-    if (target.reasons?.includes('merged-pr')) {
-      flags.push('merged');
+    if (target.reasons?.includes("merged-pr")) {
+      flags.push("merged");
     }
-    if (target.reasons?.includes('no-diff-with-base')) {
-      flags.push('base');
+    if (target.reasons?.includes("no-diff-with-base")) {
+      flags.push("base");
     }
     if (target.hasUncommittedChanges) {
-      flags.push('changes');
+      flags.push("changes");
     }
     if (target.hasUnpushedCommits) {
-      flags.push('unpushed');
+      flags.push("unpushed");
     }
     if (target.isAccessible === false) {
-      flags.push('inaccessible');
+      flags.push("inaccessible");
     }
 
-    const flagText = flags.length > 0 ? ` [${flags.join(', ')}]` : '';
+    const flagText = flags.length > 0 ? ` [${flags.join(", ")}]` : "";
 
     const label = pr
       ? `${target.branch} - #${pr.number} ${pr.title}${flagText}`
@@ -98,9 +98,9 @@ export function PRCleanupScreen({
 
   // Footer actions
   const footerActions = [
-    { key: 'enter', description: 'Cleanup' },
-    { key: 'r', description: 'Refresh' },
-    { key: 'esc', description: 'Back' },
+    { key: "enter", description: "Cleanup" },
+    { key: "r", description: "Refresh" },
+    { key: "esc", description: "Back" },
   ];
 
   return (

package/src/cli/ui/components/screens/SessionSelectorScreen.tsx

@@ -1,9 +1,9 @@
-import React from 'react';
-import { Box, Text, useInput } from 'ink';
-import { Header } from '../parts/Header.js';
-import { Footer } from '../parts/Footer.js';
-import { Select } from '../common/Select.js';
-import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import React from "react";
+import { Box, Text, useInput } from "ink";
+import { Header } from "../parts/Header.js";
+import { Footer } from "../parts/Footer.js";
+import { Select } from "../common/Select.js";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 
 export interface SessionItem {
   label: string;
@@ -59,8 +59,8 @@ export function SessionSelectorScreen({
 
   // Footer actions
   const footerActions = [
-    { key: 'enter', description: 'Select' },
-    { key: 'esc', description: 'Back' },
+    { key: "enter", description: "Select" },
+    { key: "esc", description: "Back" },
   ];
 
   return (

package/src/cli/ui/components/screens/WorktreeManagerScreen.tsx

@@ -1,9 +1,9 @@
-import React from 'react';
-import { Box, Text, useInput } from 'ink';
-import { Header } from '../parts/Header.js';
-import { Footer } from '../parts/Footer.js';
-import { Select } from '../common/Select.js';
-import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import React from "react";
+import { Box, Text, useInput } from "ink";
+import { Header } from "../parts/Header.js";
+import { Footer } from "../parts/Footer.js";
+import { Select } from "../common/Select.js";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 
 export interface WorktreeItem {
   branch: string;
@@ -64,8 +64,8 @@ export function WorktreeManagerScreen({
 
   // Footer actions
   const footerActions = [
-    { key: 'enter', description: 'Select' },
-    { key: 'esc', description: 'Back' },
+    { key: "enter", description: "Select" },
+    { key: "esc", description: "Back" },
   ];
 
   return (

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

@@ -46,7 +46,9 @@ export function BranchActionSelectorScreen({
     (mode === "protected" ? "Switch to root branch" : "Use existing branch");
   const secondaryActionLabel =
     secondaryLabel ??
-    (mode === "protected" ? "Create new branch from this branch" : "Create new branch");
+    (mode === "protected"
+      ? "Create new branch from this branch"
+      : "Create new branch");
 
   const items: SelectItem[] = [
     {
@@ -74,15 +76,18 @@ export function BranchActionSelectorScreen({
 
   // Footer actions
   const footerActions = [
-    { key: 'enter', description: 'Select' },
-    { key: 'esc', description: 'Back' },
+    { key: "enter", description: "Select" },
+    { key: "esc", description: "Back" },
   ];
 
   return (
     <Box flexDirection="column">
       <Box marginBottom={1}>
         <Text>
-          Selected branch: <Text bold color="cyan">{selectedBranch}</Text>
+          Selected branch:{" "}
+          <Text bold color="cyan">
+            {selectedBranch}
+          </Text>
         </Text>
       </Box>
       {infoMessage ? (

package/src/cli/ui/types.ts

@@ -5,10 +5,29 @@ export interface WorktreeInfo {
   isAccessible?: boolean;
 }
 
+export type AITool = string;
+export type InferenceLevel = "low" | "medium" | "high" | "xhigh";
+
+export interface ModelOption {
+  id: string;
+  label: string;
+  description?: string;
+  inferenceLevels?: InferenceLevel[];
+  defaultInference?: InferenceLevel;
+  isDefault?: boolean;
+}
+
 export interface BranchInfo {
   name: string;
   type: "local" | "remote";
-  branchType: "feature" | "bugfix" | "hotfix" | "release" | "main" | "develop" | "other";
+  branchType:
+    | "feature"
+    | "bugfix"
+    | "hotfix"
+    | "release"
+    | "main"
+    | "develop"
+    | "other";
   isCurrent: boolean;
   description?: string;
   worktree?: WorktreeInfo;
@@ -154,6 +173,7 @@ export type ScreenType =
   | "branch-creator"
   | "branch-action-selector"
   | "ai-tool-selector"
+  | "model-selector"
   | "session-selector"
   | "execution-mode-selector"
   | "batch-merge-progress"

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

@@ -0,0 +1,36 @@
+import { describe, it, expect } from "vitest";
+import { getModelOptions, getDefaultInferenceForModel } from "./modelOptions.js";
+
+const byId = (tool: string) => getModelOptions(tool).map((m) => m.id);
+
+describe("modelOptions", () => {
+  it("has unique Codex models", () => {
+    const ids = byId("codex-cli");
+    const unique = new Set(ids);
+    expect(unique.size).toBe(ids.length);
+    expect(ids).toEqual([
+      "gpt-5.1-codex",
+      "gpt-5.1-codex-max",
+      "gpt-5.1-codex-mini",
+      "gpt-5.1",
+    ]);
+  });
+
+  it("uses medium as default reasoning for codex-max", () => {
+    const codexMax = getModelOptions("codex-cli").find((m) => m.id === "gpt-5.1-codex-max");
+    expect(getDefaultInferenceForModel(codexMax)).toBe("medium");
+  });
+
+  it("lists expected Gemini models", () => {
+    expect(byId("gemini-cli")).toEqual([
+      "gemini-3-pro-preview",
+      "gemini-2.5-pro",
+      "gemini-2.5-flash",
+      "gemini-2.5-flash-lite",
+    ]);
+  });
+
+  it("lists expected Qwen models", () => {
+    expect(byId("qwen-cli")).toEqual(["coder-model", "vision-model"]);
+  });
+});

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

@@ -0,0 +1,122 @@
+import type { AITool, InferenceLevel, ModelOption } from "../types.js";
+
+const CODEX_BASE_LEVELS: InferenceLevel[] = ["high", "medium", "low"];
+const CODEX_MAX_LEVELS: InferenceLevel[] = ["xhigh", "high", "medium", "low"];
+
+const MODEL_OPTIONS: Record<string, ModelOption[]> = {
+  "claude-code": [
+    {
+      id: "claude-sonnet-4.5",
+      label: "Default (recommended) — Sonnet 4.5",
+      description: "Smartest model for daily use (released Sep 29, 2025)",
+      isDefault: true,
+    },
+    {
+      id: "claude-opus-4.1",
+      label: "Opus 4.1",
+      description: "Legacy: Opus 4.1 · reaches usage limits faster",
+    },
+    {
+      id: "claude-haiku-4.5",
+      label: "Haiku 4.5",
+      description: "Fastest model for simple tasks (released Oct 15, 2025)",
+    },
+  ],
+  "codex-cli": [
+    {
+      id: "gpt-5.1-codex",
+      label: "gpt-5.1-codex",
+      description: "Standard Codex model",
+      inferenceLevels: CODEX_BASE_LEVELS,
+      defaultInference: "high",
+      isDefault: true,
+    },
+    {
+      id: "gpt-5.1-codex-max",
+      label: "gpt-5.1-codex-max",
+      description: "Max performance (xhigh available)",
+      inferenceLevels: CODEX_MAX_LEVELS,
+      defaultInference: "medium",
+    },
+    {
+      id: "gpt-5.1-codex-mini",
+      label: "gpt-5.1-codex-mini",
+      description: "Lightweight / cost-saving",
+      inferenceLevels: CODEX_BASE_LEVELS,
+      defaultInference: "medium",
+    },
+    {
+      id: "gpt-5.1",
+      label: "gpt-5.1",
+      description: "General-purpose GPT-5.1",
+      inferenceLevels: CODEX_BASE_LEVELS,
+      defaultInference: "high",
+    },
+  ],
+  "gemini-cli": [
+    {
+      id: "gemini-3-pro-preview",
+      label: "Pro (gemini-3-pro-preview)",
+      description:
+        "Default Pro. Falls back to gemini-2.5-pro when preview is unavailable.",
+      isDefault: true,
+    },
+    {
+      id: "gemini-2.5-pro",
+      label: "Pro (gemini-2.5-pro)",
+      description: "Stable Pro model for deep reasoning and creativity",
+    },
+    {
+      id: "gemini-2.5-flash",
+      label: "Flash (gemini-2.5-flash)",
+      description: "Balance of speed and reasoning",
+    },
+    {
+      id: "gemini-2.5-flash-lite",
+      label: "Flash-Lite (gemini-2.5-flash-lite)",
+      description: "Fastest for simple tasks",
+    },
+  ],
+  "qwen-cli": [
+    {
+      id: "coder-model",
+      label: "Coder Model",
+      description:
+        "Latest Qwen Coder model (qwen3-coder-plus-2025-09-23) from Alibaba Cloud ModelStudio",
+      isDefault: true,
+    },
+    {
+      id: "vision-model",
+      label: "Vision Model",
+      description:
+        "Latest Qwen Vision model (qwen3-vl-plus-2025-09-23) from Alibaba Cloud ModelStudio",
+    },
+  ],
+};
+
+export function getModelOptions(tool: AITool): ModelOption[] {
+  return MODEL_OPTIONS[tool] ?? [];
+}
+
+export function getDefaultModelOption(tool: AITool): ModelOption | undefined {
+  const options = getModelOptions(tool);
+  return options.find((opt) => opt.isDefault) ?? options[0];
+}
+
+export function getInferenceLevelsForModel(
+  model?: ModelOption,
+): InferenceLevel[] {
+  if (!model?.inferenceLevels || model.inferenceLevels.length === 0) {
+    return [];
+  }
+  return model.inferenceLevels;
+}
+
+export function getDefaultInferenceForModel(
+  model?: ModelOption,
+): InferenceLevel | undefined {
+  if (!model) return undefined;
+  if (model.defaultInference) return model.defaultInference;
+  const levels = getInferenceLevelsForModel(model);
+  return levels[0];
+}