@akiojin/gwt 2.14.0 → 3.1.0

package/src/cli/ui/components/App.tsx

@@ -7,7 +7,10 @@ import React, {
 } from "react";
 import { useApp } from "ink";
 import { ErrorBoundary } from "./common/ErrorBoundary.js";
-import { BranchListScreen } from "./screens/BranchListScreen.js";
+import {
+  BranchListScreen,
+  type BranchListScreenProps,
+} from "./screens/BranchListScreen.js";
 import { BranchCreatorScreen } from "./screens/BranchCreatorScreen.js";
 import { BranchActionSelectorScreen } from "../screens/BranchActionSelectorScreen.js";
 import { AIToolSelectorScreen } from "./screens/AIToolSelectorScreen.js";
@@ -19,7 +22,9 @@ import {
   ModelSelectorScreen,
   type ModelSelectionResult,
 } from "./screens/ModelSelectorScreen.js";
+import { EnvironmentProfileScreen } from "./screens/EnvironmentProfileScreen.js";
 import { useGitData } from "../hooks/useGitData.js";
+import { useProfiles } from "../hooks/useProfiles.js";
 import { useScreenState } from "../hooks/useScreenState.js";
 import { formatBranchItems } from "../utils/branchFormatter.js";
 import { calculateStatistics } from "../utils/statisticsCalculator.js";
@@ -108,6 +113,9 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
     });
   const { currentScreen, navigateTo, goBack } = useScreenState();
 
+  // Profile state
+  const { activeProfileName, refresh: refreshProfiles } = useProfiles();
+
   // Version state
   const [version, setVersion] = useState<string | null>(null);
   const [repoRoot, setRepoRoot] = useState<string | null>(null);
@@ -1153,31 +1161,39 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
 
   // Render screen based on currentScreen
   const renderScreen = () => {
+    const renderBranchListScreen = (
+      additionalProps?: Partial<BranchListScreenProps>,
+    ) => (
+      <BranchListScreen
+        branches={branchItems}
+        stats={stats}
+        onSelect={handleSelect}
+        onQuit={handleQuit}
+        onRefresh={refresh}
+        loading={loading}
+        error={error}
+        lastUpdated={lastUpdated}
+        loadingIndicatorDelay={loadingIndicatorDelay}
+        version={version}
+        workingDirectory={workingDirectory}
+        activeProfile={activeProfileName}
+        onOpenProfiles={() => navigateTo("environment-profile")}
+        {...additionalProps}
+      />
+    );
+
     switch (currentScreen) {
       case "branch-list":
-        return (
-          <BranchListScreen
-            branches={branchItems}
-            stats={stats}
-            onSelect={handleSelect}
-            onQuit={handleQuit}
-            onCleanupCommand={handleCleanupCommand}
-            onRefresh={refresh}
-            loading={loading}
-            error={error}
-            lastUpdated={lastUpdated}
-            loadingIndicatorDelay={loadingIndicatorDelay}
-            cleanupUI={{
-              indicators: cleanupIndicators,
-              footerMessage: cleanupFooterMessage,
-              inputLocked: cleanupInputLocked,
-            }}
-            version={version}
-            workingDirectory={workingDirectory}
-            selectedBranches={selectedBranches}
-            onToggleSelect={toggleBranchSelection}
-          />
-        );
+        return renderBranchListScreen({
+          onCleanupCommand: handleCleanupCommand,
+          cleanupUI: {
+            indicators: cleanupIndicators,
+            footerMessage: cleanupFooterMessage,
+            inputLocked: cleanupInputLocked,
+          },
+          selectedBranches,
+          onToggleSelect: toggleBranchSelection,
+        });
 
       case "branch-creator":
         return (
@@ -1268,22 +1284,19 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
           />
         );
 
-      default:
+      case "environment-profile":
         return (
-          <BranchListScreen
-            branches={branchItems}
-            stats={stats}
-            onSelect={handleSelect}
-            onQuit={handleQuit}
-            onRefresh={refresh}
-            loading={loading}
-            error={error}
-            lastUpdated={lastUpdated}
-            loadingIndicatorDelay={loadingIndicatorDelay}
+          <EnvironmentProfileScreen
+            onBack={() => {
+              void refreshProfiles();
+              goBack();
+            }}
             version={version}
-            workingDirectory={workingDirectory}
           />
         );
+
+      default:
+        return renderBranchListScreen();
     }
   };
 

package/src/cli/ui/components/parts/Header.tsx

@@ -22,6 +22,14 @@ export interface HeaderProps {
    * @default undefined
    */
   workingDirectory?: string;
+  /**
+   * 現在アクティブなプロファイル名
+   * - string: プロファイル名が利用可能（例: "development"）
+   * - null: プロファイルが選択されていない
+   * - undefined: プロファイル情報未提供
+   * @default undefined
+   */
+  activeProfile?: string | null | undefined;
 }
 
 /**
@@ -36,9 +44,16 @@ export const Header = React.memo(function Header({
   width = 80,
   version,
   workingDirectory,
+  activeProfile,
 }: HeaderProps) {
   const divider = dividerChar.repeat(width);
-  const displayTitle = version ? `${title} v${version}` : title;
+
+  // タイトル構築: "gwt v2.14 | Profile: development" または "gwt v2.14 | Profile: (none)"
+  let displayTitle = version ? `${title} v${version}` : title;
+  if (activeProfile !== undefined) {
+    const profileLabel = activeProfile ?? "(none)";
+    displayTitle = `${displayTitle} | Profile: ${profileLabel}`;
+  }
 
   return (
     <Box flexDirection="column">

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

@@ -11,7 +11,6 @@ import type { BranchItem, Statistics } from "../../types.js";
 import stringWidth from "string-width";
 import stripAnsi from "strip-ansi";
 import chalk from "chalk";
-import { resolveWebUiPort } from "../../../../utils/webui.js";
 
 // Emoji 幅は端末によって 1 または 2 になることがあるため、最小幅を上書きして
 // 実測より小さくならないようにする（過小評価＝折り返しの原因を防ぐ）
@@ -85,6 +84,7 @@ export interface BranchListScreenProps {
   onQuit?: () => void;
   onCleanupCommand?: () => void;
   onRefresh?: () => void;
+  onOpenProfiles?: () => void;
   loading?: boolean;
   error?: Error | null;
   lastUpdated?: Date | null;
@@ -92,6 +92,7 @@ export interface BranchListScreenProps {
   cleanupUI?: CleanupUIState;
   version?: string | null;
   workingDirectory?: string;
+  activeProfile?: string | null;
   // Test support: allow external control of filter mode and query
   testFilterMode?: boolean;
   testOnFilterModeChange?: (mode: boolean) => void;
@@ -111,6 +112,7 @@ export function BranchListScreen({
   onSelect,
   onCleanupCommand,
   onRefresh,
+  onOpenProfiles,
   loading = false,
   error = null,
   lastUpdated = null,
@@ -118,6 +120,7 @@ export function BranchListScreen({
   cleanupUI,
   version,
   workingDirectory,
+  activeProfile,
   testFilterMode,
   testOnFilterModeChange,
   testFilterQuery,
@@ -207,6 +210,8 @@ export function BranchListScreen({
       onCleanupCommand?.();
     } else if (input === "r" && onRefresh) {
       onRefresh();
+    } else if (input === "p" && onOpenProfiles) {
+      onOpenProfiles();
     }
   });
 
@@ -246,22 +251,15 @@ export function BranchListScreen({
   // Filter input: 1 line
   // Stats: 1 line
   // Empty line: 1 line
-  // Web UI URL: 1 line
   // Footer: 1 line
-  // Total fixed: 7 lines
+  // Total fixed: 6 lines
   const headerLines = 2;
   const filterLines = 1;
   const statsLines = 1;
   const emptyLine = 1;
-  const webUiLines = 1;
   const footerLines = 1;
   const fixedLines =
-    headerLines +
-    filterLines +
-    statsLines +
-    emptyLine +
-    webUiLines +
-    footerLines;
+    headerLines + filterLines + statsLines + emptyLine + footerLines;
   const contentHeight = rows - fixedLines;
   const limit = Math.max(5, contentHeight); // Minimum 5 items visible
 
@@ -270,7 +268,8 @@ export function BranchListScreen({
     { key: "enter", description: "Select" },
     { key: "f", description: "Filter" },
     { key: "r", description: "Refresh" },
-    { key: "c", description: "Cleanup branches" },
+    { key: "c", description: "Cleanup" },
+    { key: "p", description: "Profiles" },
   ];
 
   const formatLatestCommit = useCallback((timestamp?: number) => {
@@ -522,6 +521,7 @@ export function BranchListScreen({
         titleColor="cyan"
         version={version}
         {...(workingDirectory !== undefined && { workingDirectory })}
+        activeProfile={activeProfile}
       />
 
       {/* Filter Input - Always visible */}
@@ -623,11 +623,6 @@ export function BranchListScreen({
         </Box>
       )}
 
-      {/* Web UI URL */}
-      <Box>
-        <Text dimColor>Web UI: http://localhost:{resolveWebUiPort()}</Text>
-      </Box>
-
       {/* Footer */}
       <Footer actions={footerActions} />
     </Box>