@akiojin/gwt 4.0.0 → 4.1.0

package/src/cli/ui/__tests__/components/screens/BranchQuickStartScreen.test.tsx

@@ -23,7 +23,7 @@ describe("BranchQuickStartScreen", () => {
           {
             toolId: "codex-cli",
             toolLabel: "Codex",
-            model: "gpt-5.1-codex",
+            model: "gpt-5.2-codex",
             sessionId: "abc-123",
             inferenceLevel: "high",
             skipPermissions: true,
@@ -38,12 +38,12 @@ describe("BranchQuickStartScreen", () => {
     expect(titleMatches.length).toBeGreaterThan(0);
     expect(
       getByText(
-        /Model: gpt-5.1-codex \/ Reasoning: High \/ Skip: Yes \/ ID: abc-123/,
+        /Model: gpt-5.2-codex \/ Reasoning: High \/ Skip: Yes \/ ID: abc-123/,
       ),
     ).toBeDefined();
     expect(queryAllByText(/ID: abc-123/)).toHaveLength(1);
     expect(
-      getByText(/Model: gpt-5.1-codex \/ Reasoning: High \/ Skip: Yes$/),
+      getByText(/Model: gpt-5.2-codex \/ Reasoning: High \/ Skip: Yes$/),
     ).toBeDefined();
   });
 
@@ -90,7 +90,7 @@ describe("BranchQuickStartScreen", () => {
           {
             toolId: "codex-cli",
             toolLabel: "Codex",
-            model: "gpt-5.1-codex",
+            model: "gpt-5.2-codex",
             sessionId: "abc-123",
           },
         ]}
@@ -110,7 +110,7 @@ describe("BranchQuickStartScreen", () => {
           {
             toolId: "codex-cli",
             toolLabel: "Codex",
-            model: "gpt-5.1-codex",
+            model: "gpt-5.2-codex",
             sessionId: "codex-123",
             inferenceLevel: "high",
             skipPermissions: true,
@@ -131,7 +131,7 @@ describe("BranchQuickStartScreen", () => {
     expect(getAllByText(/\[Codex\]/i)).toHaveLength(2);
     expect(
       getByText(
-        /Model: gpt-5.1-codex \/ Reasoning: High \/ Skip: Yes \/ ID: codex-123/,
+        /Model: gpt-5.2-codex \/ Reasoning: High \/ Skip: Yes \/ ID: codex-123/,
       ),
     ).toBeDefined();
     expect(getAllByText(/\[Claude\]/i)).toHaveLength(2);

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

@@ -58,7 +58,7 @@ describe("branchFormatter", () => {
           toolLabel: "Codex",
           mode: "normal",
           timestamp: Date.UTC(2025, 10, 26, 14, 3), // 2025-11-26 14:03 UTC
-          model: "gpt-5.1-codex",
+          model: "gpt-5.2-codex",
         },
       };
 

package/src/cli/ui/components/common/Select.tsx

@@ -1,11 +1,18 @@
 import React, { useEffect, useState } from "react";
-import { Box, Text, useInput, useStdout } from "ink";
+import { Box, Text, useStdout } from "ink";
+import { useAppInput } from "../../hooks/useAppInput.js";
 
+/**
+ * Item descriptor for the `Select` component.
+ */
 export interface SelectItem {
   label: string;
   value: string;
 }
 
+/**
+ * Props for the `Select` component.
+ */
 export interface SelectProps<T extends SelectItem = SelectItem> {
   items: T[];
   onSelect: (item: T) => void;
@@ -133,7 +140,7 @@ const SelectComponent = <T extends SelectItem = SelectItem>({
     }
   }, [items, limit]);
 
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (disabled) {
       return;
     }

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

@@ -1,19 +1,26 @@
 import React, { useState, useEffect } from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { Select } from "../common/Select.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import { getAllTools } from "../../../../config/tools.js";
 import type { AIToolConfig } from "../../../../types/tools.js";
 import type { AITool } from "../../types.js";
 
+/**
+ * Renderable item for the AI tool selector list.
+ */
 export interface AIToolItem {
   label: string;
   value: AITool;
   description: string;
 }
 
+/**
+ * Props for `AIToolSelectorScreen`.
+ */
 export interface AIToolSelectorScreenProps {
   onBack: () => void;
   onSelect: (tool: AITool) => void;
@@ -96,7 +103,7 @@ export function AIToolSelectorScreen({
 
   // Handle keyboard input
   // Note: Select component handles Enter and arrow keys
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (key.escape) {
       onBack();
     }

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

@@ -1,12 +1,16 @@
 import React from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { ProgressBar } from "../parts/ProgressBar.js";
 import { MergeStatusList } from "../parts/MergeStatusList.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import type { BatchMergeProgress, BranchMergeStatus } from "../../types.js";
 
+/**
+ * Props for `BatchMergeProgressScreen`.
+ */
 export interface BatchMergeProgressScreenProps {
   progress: BatchMergeProgress;
   statuses: BranchMergeStatus[];
@@ -26,7 +30,7 @@ export function BatchMergeProgressScreen({
   const { rows } = useTerminalSize();
 
   // Handle keyboard input
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if ((input === "q" || key.escape) && onCancel) {
       onCancel();
     }

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

@@ -1,11 +1,15 @@
 import React from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { MergeStatusList } from "../parts/MergeStatusList.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import type { BatchMergeResult } from "../../types.js";
 
+/**
+ * Props for `BatchMergeResultScreen`.
+ */
 export interface BatchMergeResultScreenProps {
   result: BatchMergeResult;
   onBack?: () => void;
@@ -25,7 +29,7 @@ export function BatchMergeResultScreen({
   const { rows } = useTerminalSize();
 
   // Handle keyboard input
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (input === "q" && onQuit) {
       onQuit();
     } else if (key.escape && onBack) {

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

@@ -1,9 +1,10 @@
 import React, { useState, useCallback, useEffect, useRef } from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { Select } from "../common/Select.js";
 import { Input } from "../common/Input.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import { BRANCH_PREFIXES } from "../../../../config/constants.js";
 
@@ -12,6 +13,9 @@ type Step = "type-selection" | "name-input";
 
 const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧"];
 
+/**
+ * Props for `BranchCreatorScreen`.
+ */
 export interface BranchCreatorScreenProps {
   onBack: () => void;
   onCreate: (branchName: string) => Promise<void>;
@@ -52,7 +56,7 @@ export function BranchCreatorScreen({
   const spinnerFrame = SPINNER_FRAMES[spinnerIndex] ?? SPINNER_FRAMES[0];
 
   // Handle keyboard input for back navigation
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (isCreating) {
       return;
     }

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

@@ -1,11 +1,12 @@
 import React, { useCallback, useState, useMemo, useEffect } from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Stats } from "../parts/Stats.js";
 import { Footer } from "../parts/Footer.js";
 import { Select } from "../common/Select.js";
 import { Input } from "../common/Input.js";
 import { LoadingIndicator } from "../common/LoadingIndicator.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import type { BranchItem, Statistics } from "../../types.js";
 import stringWidth from "string-width";
@@ -77,6 +78,9 @@ interface CleanupUIState {
   inputLocked: boolean;
 }
 
+/**
+ * Props for `BranchListScreen`.
+ */
 export interface BranchListScreenProps {
   branches: BranchItem[];
   stats: Statistics;
@@ -166,7 +170,7 @@ export function BranchListScreen({
   // Handle keyboard input
   // Note: Input component blocks specific keys (c/r/f) using blockKeys prop
   // This prevents shortcuts from triggering while typing in the filter
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (cleanupUI?.inputLocked) {
       return;
     }
@@ -326,8 +330,6 @@ export function BranchListScreen({
           return chalk.cyan(label);
         case "gemini-cli":
           return chalk.magenta(label);
-        case "qwen-cli":
-          return chalk.gray(label);
         default: {
           const trimmed = label.trim().toLowerCase();
           if (!toolId || trimmed === "unknown") {

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

@@ -1,16 +1,23 @@
 import React from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { Select, type SelectItem } from "../common/Select.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 
+/**
+ * Action returned by `BranchQuickStartScreen`.
+ */
 export type QuickStartAction = "reuse-continue" | "reuse-new" | "manual";
 
+/**
+ * Previous tool/session configuration shown in the quick start list.
+ */
 export interface BranchQuickStartOption {
   toolId?: string | null;
   toolLabel: string;
-  toolCategory?: "Codex" | "Claude" | "Gemini" | "Qwen" | "Other";
+  toolCategory?: "Codex" | "Claude" | "Gemini" | "Other";
   model?: string | null;
   sessionId?: string | null;
   inferenceLevel?: string | null;
@@ -32,10 +39,6 @@ const formatSkip = (skip?: boolean | null) =>
 
 const supportsReasoning = (toolId?: string | null) => toolId === "codex-cli";
 
-const UNSUPPORTED_TOOL_ID = "qwen-cli";
-const UNSUPPORTED_TOOL_MESSAGE = "Unsupported tool (Qwen CLI). ";
-const UNSUPPORTED_TOOL_CATEGORY_LABEL = "Qwen (unsupported)";
-
 const describe = (opt: BranchQuickStartOption, includeSessionId = true) => {
   const parts = [`Model: ${opt.model ?? "default"}`];
   if (supportsReasoning(opt.toolId)) {
@@ -58,6 +61,9 @@ type QuickStartItem = SelectItem & {
   categoryColor: "cyan" | "yellow" | "magenta" | "green" | "white";
 };
 
+/**
+ * Props for `BranchQuickStartScreen`.
+ */
 export interface BranchQuickStartScreenProps {
   previousOptions: BranchQuickStartOption[];
   loading?: boolean;
@@ -82,7 +88,6 @@ export function BranchQuickStartScreen({
     "codex-cli": { label: "Codex", color: "cyan" },
     "claude-code": { label: "Claude", color: "yellow" },
     "gemini-cli": { label: "Gemini", color: "magenta" },
-    "qwen-cli": { label: "Qwen", color: "green" },
     other: { label: "Other", color: "white" },
   } as const;
 
@@ -96,8 +101,6 @@ export function BranchQuickStartScreen({
         return CATEGORY_META["claude-code"];
       case "gemini-cli":
         return CATEGORY_META["gemini-cli"];
-      case "qwen-cli":
-        return CATEGORY_META["qwen-cli"];
       default:
         return CATEGORY_META.other;
     }
@@ -105,7 +108,7 @@ export function BranchQuickStartScreen({
 
   const items: QuickStartItem[] = previousOptions.length
     ? (() => {
-        const order = ["Claude", "Codex", "Gemini", "Qwen", "Other"];
+        const order = ["Claude", "Codex", "Gemini", "Other"];
         const sorted = [...previousOptions].sort((a, b) => {
           const ca = resolveCategory(a.toolId).label;
           const cb = resolveCategory(b.toolId).label;
@@ -115,7 +118,6 @@ export function BranchQuickStartScreen({
         const flat: QuickStartItem[] = [];
         sorted.forEach((opt, idx) => {
           const cat = resolveCategory(opt.toolId);
-          const isUnsupportedTool = opt.toolId === UNSUPPORTED_TOOL_ID;
           const prevCat =
             idx > 0 ? resolveCategory(sorted[idx - 1]?.toolId).label : null;
           const isNewCategory = prevCat !== cat.label;
@@ -126,10 +128,7 @@ export function BranchQuickStartScreen({
               value: `reuse-continue:${opt.toolId ?? "unknown"}:${idx}`,
               action: "reuse-continue",
               toolId: opt.toolId ?? null,
-              description: isUnsupportedTool
-                ? `${UNSUPPORTED_TOOL_MESSAGE}${describe(opt, true)}`
-                : describe(opt, true),
-              ...(isUnsupportedTool ? { disabled: true } : {}),
+              description: describe(opt, true),
               groupStart: isNewCategory && flat.length > 0,
               category: cat.label,
               categoryColor: cat.color,
@@ -139,10 +138,7 @@ export function BranchQuickStartScreen({
               value: `reuse-new:${opt.toolId ?? "unknown"}:${idx}`,
               action: "reuse-new",
               toolId: opt.toolId ?? null,
-              description: isUnsupportedTool
-                ? `${UNSUPPORTED_TOOL_MESSAGE}${describe(opt, false)}`
-                : describe(opt, false),
-              ...(isUnsupportedTool ? { disabled: true } : {}),
+              description: describe(opt, false),
               groupStart: false,
               category: cat.label,
               categoryColor: cat.color,
@@ -182,7 +178,7 @@ export function BranchQuickStartScreen({
     categoryColor: CATEGORY_META.other.color,
   });
 
-  useInput((_, key) => {
+  useAppInput((_, key) => {
     if (key.escape) {
       onBack();
     }
@@ -209,11 +205,6 @@ export function BranchQuickStartScreen({
             onSelect(item.action, item.toolId ?? null);
           }}
           renderItem={(item: QuickStartItem, isSelected) => {
-            const categoryLabel =
-              item.toolId === UNSUPPORTED_TOOL_ID
-                ? UNSUPPORTED_TOOL_CATEGORY_LABEL
-                : item.category;
-
             return (
               <Box
                 flexDirection="column"
@@ -223,7 +214,7 @@ export function BranchQuickStartScreen({
               >
                 <Text>
                   <Text color={item.categoryColor} inverse={isSelected}>
-                    {`[${categoryLabel}] `}
+                    {`[${item.category}] `}
                   </Text>
                   <Text inverse={isSelected}>
                     {item.label}

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

@@ -6,16 +6,20 @@
  */
 
 import React, { useState, useCallback, useMemo, useEffect } from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { Select } from "../common/Select.js";
 import { Input } from "../common/Input.js";
 import { Confirm } from "../common/Confirm.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import { useProfiles } from "../../hooks/useProfiles.js";
 import { isValidProfileName } from "../../../../types/profiles.js";
 
+/**
+ * Props for `EnvironmentProfileScreen`.
+ */
 export interface EnvironmentProfileScreenProps {
   onBack: () => void;
   version?: string | null;
@@ -432,7 +436,7 @@ export function EnvironmentProfileScreen({
   );
 
   // キーボード入力ハンドリング
-  useInput(
+  useAppInput(
     (input, key) => {
       // 入力モード時は他のキーハンドリングをスキップ
       if (

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

@@ -1,29 +1,45 @@
 import React, { useState } from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { Select } from "../common/Select.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 
+/**
+ * Supported execution modes for interactive tools.
+ */
 export type ExecutionMode = "normal" | "continue" | "resume";
 
+/**
+ * Selectable execution mode item (step 1).
+ */
 export interface ExecutionModeItem {
   label: string;
   value: ExecutionMode;
   description: string;
 }
 
+/**
+ * Selectable skip-permissions item (step 2).
+ */
 export interface SkipPermissionsItem {
   label: string;
   value: string; // "yes" or "no"
   description: string;
 }
 
+/**
+ * Result returned by `ExecutionModeSelectorScreen`.
+ */
 export interface ExecutionModeResult {
   mode: ExecutionMode;
   skipPermissions: boolean;
 }
 
+/**
+ * Props for `ExecutionModeSelectorScreen`.
+ */
 export interface ExecutionModeSelectorScreenProps {
   onBack: () => void;
   onSelect: (result: ExecutionModeResult) => void;
@@ -48,7 +64,7 @@ export function ExecutionModeSelectorScreen({
   const [selectedMode, setSelectedMode] = useState<ExecutionMode | null>(null);
 
   // Handle keyboard input
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (key.escape) {
       if (step === 2) {
         // Go back to step 1

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

@@ -1,8 +1,9 @@
 import React, { useEffect, useMemo, useState } from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { Select, type SelectItem } from "../common/Select.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import type { AITool, InferenceLevel, ModelOption } from "../../types.js";
 import {
@@ -12,6 +13,9 @@ import {
   getModelOptions,
 } from "../../utils/modelOptions.js";
 
+/**
+ * Result returned by `ModelSelectorScreen`.
+ */
 export interface ModelSelectionResult {
   model: string | null;
   inferenceLevel?: InferenceLevel;
@@ -25,6 +29,9 @@ interface InferenceSelectItem extends SelectItem {
   hint?: string;
 }
 
+/**
+ * Props for `ModelSelectorScreen`.
+ */
 export interface ModelSelectorScreenProps {
   tool: AITool;
   onBack: () => void;
@@ -158,7 +165,7 @@ export function ModelSelectorScreen({
     return index >= 0 ? index : 0;
   }, [initialSelection?.inferenceLevel, inferenceOptions, selectedModel]);
 
-  useInput((_input, key) => {
+  useAppInput((_input, key) => {
     if (key.escape) {
       if (step === "inference") {
         setStep("model");

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

@@ -1,17 +1,24 @@
 import React from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { Select } from "../common/Select.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 import type { CleanupTarget } from "../../types.js";
 
+/**
+ * Renderable item for the cleanup target list.
+ */
 export interface PRItem {
   label: string;
   value: string;
   target: CleanupTarget;
 }
 
+/**
+ * Props for `PRCleanupScreen`.
+ */
 export interface PRCleanupScreenProps {
   targets: CleanupTarget[];
   loading: boolean;
@@ -41,7 +48,7 @@ export function PRCleanupScreen({
 
   // Handle keyboard input
   // Note: Select component handles Enter and arrow keys
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (key.escape) {
       onBack();
     } else if (input === "r") {

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

@@ -1,16 +1,23 @@
 import React from "react";
-import { Box, Text, useInput } from "ink";
+import { Box, Text } from "ink";
 import { Header } from "../parts/Header.js";
 import { Footer } from "../parts/Footer.js";
 import { Select } from "../common/Select.js";
+import { useAppInput } from "../../hooks/useAppInput.js";
 import { useTerminalSize } from "../../hooks/useTerminalSize.js";
 
+/**
+ * Renderable item for the session selector list.
+ */
 export interface SessionItem {
   label: string;
   value: string;
   secondary?: string;
 }
 
+/**
+ * Props for `SessionSelectorScreen`.
+ */
 export interface SessionSelectorScreenProps {
   sessions: {
     sessionId: string;
@@ -41,7 +48,7 @@ export function SessionSelectorScreen({
 
   // Handle keyboard input
   // Note: Select component handles Enter and arrow keys
-  useInput((input, key) => {
+  useAppInput((input, key) => {
     if (key.escape) {
       onBack();
     }