@akiojin/gwt 4.6.0 → 4.7.0

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

@@ -0,0 +1,192 @@
+import React, { useCallback, useMemo, useState } from "react";
+import { Box, Text } from "ink";
+import stringWidth from "string-width";
+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 { FormattedLogEntry } from "../../../../logging/formatter.js";
+
+interface LogListItem {
+  label: string;
+  value: string;
+  entry: FormattedLogEntry;
+}
+
+export interface LogListScreenProps {
+  entries: FormattedLogEntry[];
+  loading?: boolean;
+  error?: string | null;
+  onBack: () => void;
+  onSelect: (entry: FormattedLogEntry) => void;
+  onCopy: (entry: FormattedLogEntry) => void;
+  onPickDate?: () => void;
+  notification?: { message: string; tone: "success" | "error" } | null;
+  version?: string | null;
+  selectedDate?: string | null;
+}
+
+const truncateToWidth = (value: string, maxWidth: number): string => {
+  if (maxWidth <= 0) return "";
+  if (stringWidth(value) <= maxWidth) return value;
+  const ellipsis = "…";
+  const ellipsisWidth = stringWidth(ellipsis);
+  if (ellipsisWidth >= maxWidth) return ellipsis;
+
+  let result = "";
+  for (const char of Array.from(value)) {
+    if (stringWidth(result + char) + ellipsisWidth > maxWidth) {
+      break;
+    }
+    result += char;
+  }
+  return result + ellipsis;
+};
+
+const padToWidth = (value: string, width: number): string => {
+  if (width <= 0) return "";
+  if (stringWidth(value) >= width) return value;
+  return value + " ".repeat(width - stringWidth(value));
+};
+
+export function LogListScreen({
+  entries,
+  loading = false,
+  error = null,
+  onBack,
+  onSelect,
+  onCopy,
+  onPickDate,
+  notification,
+  version,
+  selectedDate,
+}: LogListScreenProps) {
+  const { rows, columns } = useTerminalSize();
+  const [selectedIndex, setSelectedIndex] = useState(0);
+
+  const maxLabelWidth = Math.max(10, columns - 2);
+
+  const items = useMemo<LogListItem[]>(
+    () =>
+      entries.map((entry) => ({
+        label: truncateToWidth(entry.summary, maxLabelWidth),
+        value: entry.id,
+        entry,
+      })),
+    [entries, maxLabelWidth],
+  );
+
+  const handleSelect = useCallback(
+    (item: LogListItem) => {
+      onSelect(item.entry);
+    },
+    [onSelect],
+  );
+
+  const handleCopy = useCallback(() => {
+    const entry = entries[selectedIndex];
+    if (entry) {
+      onCopy(entry);
+    }
+  }, [entries, selectedIndex, onCopy]);
+
+  useAppInput((input, key) => {
+    if (key.escape || input === "q") {
+      onBack();
+      return;
+    }
+
+    if (input === "c") {
+      handleCopy();
+      return;
+    }
+
+    if (input === "d" && onPickDate) {
+      onPickDate();
+    }
+  });
+
+  const renderItem = useCallback(
+    (item: LogListItem, isSelected: boolean) => {
+      if (!isSelected) {
+        return <Text>{item.label}</Text>;
+      }
+      const padded = padToWidth(item.label, maxLabelWidth);
+      const output = `\u001b[46m\u001b[30m${padded}\u001b[0m`;
+      return <Text>{output}</Text>;
+    },
+    [maxLabelWidth],
+  );
+
+  const headerLines = 2;
+  const statsLines = 1;
+  const emptyLine = 1;
+  const footerLines = 1;
+  const fixedLines = headerLines + statsLines + emptyLine + footerLines;
+  const contentHeight = rows - fixedLines;
+  const limit = Math.max(5, contentHeight);
+
+  const footerActions = [
+    { key: "enter", description: "Detail" },
+    { key: "c", description: "Copy" },
+    { key: "d", description: "Date" },
+    { key: "esc", description: "Back" },
+  ];
+
+  return (
+    <Box flexDirection="column" height={rows}>
+      <Header title="gwt - Log Viewer" titleColor="cyan" version={version} />
+
+      {notification ? (
+        <Box marginTop={1}>
+          <Text color={notification.tone === "error" ? "red" : "green"}>
+            {notification.message}
+          </Text>
+        </Box>
+      ) : null}
+
+      <Box marginTop={1}>
+        <Box marginRight={2}>
+          <Text>
+            Date: <Text bold>{selectedDate ?? "---"}</Text>
+          </Text>
+        </Box>
+        <Text>
+          Total: <Text bold>{entries.length}</Text>
+        </Text>
+      </Box>
+
+      <Box height={1} />
+
+      <Box flexDirection="column" flexGrow={1}>
+        {loading ? (
+          <Box>
+            <Text dimColor>Loading logs...</Text>
+          </Box>
+        ) : entries.length === 0 ? (
+          <Box>
+            <Text dimColor>ログがありません</Text>
+          </Box>
+        ) : (
+          <Select
+            items={items}
+            onSelect={handleSelect}
+            limit={limit}
+            selectedIndex={selectedIndex}
+            onSelectedIndexChange={setSelectedIndex}
+            renderItem={renderItem}
+          />
+        )}
+
+        {error ? (
+          <Box marginTop={1}>
+            <Text color="red">{error}</Text>
+          </Box>
+        ) : null}
+      </Box>
+
+      <Footer actions={footerActions} />
+    </Box>
+  );
+}

package/src/cli/ui/hooks/useGitData.ts

@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback } from "react";
+import { useState, useEffect, useCallback, useRef } from "react";
 import {
   getAllBranches,
   hasUnpushedCommitsInRepo,
@@ -80,7 +80,15 @@ export function useGitData(options?: UseGitDataOptions): UseGitDataResult {
   const [error, setError] = useState<Error | null>(null);
   const [lastUpdated, setLastUpdated] = useState<Date | null>(null);
 
-  const loadData = useCallback(async () => {
+  // キャッシュ機構: 初回ロード完了を追跡（useRef で再レンダリングを防ぐ）
+  const hasLoadedOnceRef = useRef(false);
+
+  const loadData = useCallback(async (forceRefresh = false) => {
+    // キャッシュがあり、強制リフレッシュでなければスキップ
+    if (hasLoadedOnceRef.current && !forceRefresh) {
+      return;
+    }
+
     setLoading(true);
     setError(null);
 
@@ -295,6 +303,7 @@ export function useGitData(options?: UseGitDataOptions): UseGitDataResult {
 
       setBranches(enrichedBranches);
       setLastUpdated(new Date());
+      hasLoadedOnceRef.current = true; // 初回ロード完了をマーク
     } catch (err) {
       setError(err instanceof Error ? err : new Error(String(err)));
       setBranches([]);
@@ -305,7 +314,7 @@ export function useGitData(options?: UseGitDataOptions): UseGitDataResult {
   }, []);
 
   const refresh = useCallback(() => {
-    loadData();
+    loadData(true); // forceRefresh = true で強制的にデータを再取得
   }, [loadData]);
 
   useEffect(() => {

package/src/cli/ui/types.ts

@@ -188,6 +188,9 @@ export interface GitHubPRResponse {
  */
 export type ScreenType =
   | "branch-list"
+  | "log-list"
+  | "log-detail"
+  | "log-date-picker"
   | "branch-creator"
   | "branch-action-selector"
   | "branch-quick-start"

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

@@ -0,0 +1,31 @@
+import { execa } from "execa";
+
+export interface ClipboardOptions {
+  platform?: NodeJS.Platform;
+  execa?: typeof execa;
+}
+
+export async function copyToClipboard(
+  text: string,
+  options: ClipboardOptions = {},
+): Promise<void> {
+  const runner = options.execa ?? execa;
+  const platform = options.platform ?? process.platform;
+
+  if (platform === "win32") {
+    await runner("cmd", ["/c", "clip"], { input: text, windowsHide: true });
+    return;
+  }
+
+  if (platform === "darwin") {
+    await runner("pbcopy", [], { input: text });
+    return;
+  }
+
+  try {
+    await runner("xclip", ["-selection", "clipboard"], { input: text });
+    return;
+  } catch {
+    await runner("xsel", ["--clipboard", "--input"], { input: text });
+  }
+}

package/src/gemini.ts

@@ -6,7 +6,7 @@ import {
   getTerminalStreams,
   resetTerminalModes,
 } from "./utils/terminal.js";
-import { isCommandAvailable } from "./utils/command.js";
+import { findCommand } from "./utils/command.js";
 import { findLatestGeminiSessionId } from "./utils/session.js";
 
 const GEMINI_CLI_PACKAGE = "@google/gemini-cli@latest";
@@ -152,7 +152,7 @@ export async function launchGeminiCLI(
     const childStdio = createChildStdio();
 
     // Auto-detect locally installed gemini command
-    const hasLocalGemini = await isCommandAvailable("gemini");
+    const geminiLookup = await findCommand("gemini");
 
     // Preserve TTY for interactive UI (colors/width) by inheriting stdout/stderr.
     // Session ID is determined via file-based detection after exit.
@@ -184,11 +184,12 @@ export async function launchGeminiCLI(
         await execChild(child);
       };
 
-      if (hasLocalGemini) {
+      if (geminiLookup.source === "installed" && geminiLookup.path) {
+        // Use the full path to avoid PATH issues in non-interactive shells
         console.log(
           chalk.green("   ✨ Using locally installed gemini command"),
         );
-        return await run("gemini", runArgs);
+        return await run(geminiLookup.path, runArgs);
       }
       console.log(
         chalk.cyan("   🔄 Falling back to bunx @google/gemini-cli@latest"),
@@ -200,7 +201,12 @@ export async function launchGeminiCLI(
       );
       console.log(chalk.yellow("      npm install -g @google/gemini-cli"));
       console.log("");
-      await new Promise((resolve) => setTimeout(resolve, 2000));
+      const shouldSkipDelay =
+        typeof process !== "undefined" &&
+        (process.env?.NODE_ENV === "test" || Boolean(process.env?.VITEST));
+      if (!shouldSkipDelay) {
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+      }
       return await run("bunx", [GEMINI_CLI_PACKAGE, ...runArgs]);
     };
 
@@ -263,7 +269,9 @@ export async function launchGeminiCLI(
 
     return capturedSessionId ? { sessionId: capturedSessionId } : {};
   } catch (error: unknown) {
-    const hasLocalGemini = await isCommandAvailable("gemini");
+    const geminiCheck = await findCommand("gemini");
+    const hasLocalGemini =
+      geminiCheck.source === "installed" && geminiCheck.path !== null;
     let errorMessage: string;
     const err = error as NodeJS.ErrnoException;
 

package/src/index.ts

@@ -768,11 +768,13 @@ export async function handleAIToolWorkflow(
       lastSessionId: finalSessionId,
     });
 
+    let uncommittedExists = false;
     try {
       const [hasUncommitted, hasUnpushed] = await Promise.all([
         hasUncommittedChanges(worktreePath),
         hasUnpushedCommits(worktreePath, branch),
       ]);
+      uncommittedExists = hasUncommitted;
 
       if (hasUncommitted) {
         const uncommittedCount = await getUncommittedChangesCount(worktreePath);
@@ -807,8 +809,15 @@ export async function handleAIToolWorkflow(
       const details = error instanceof Error ? error.message : String(error);
       printWarning(`Failed to check git status after session: ${details}`);
     }
-    // Small buffer before returning to branch list to avoid abrupt screen swap
-    await new Promise((resolve) => setTimeout(resolve, POST_SESSION_DELAY_MS));
+
+    if (uncommittedExists) {
+      await waitForEnter("Press Enter to return to the main menu...");
+    } else {
+      // Small buffer before returning to branch list to avoid abrupt screen swap
+      await new Promise((resolve) =>
+        setTimeout(resolve, POST_SESSION_DELAY_MS),
+      );
+    }
     printInfo("Session completed successfully. Returning to main menu...");
     return;
   } catch (error) {

package/src/logging/formatter.ts

@@ -0,0 +1,106 @@
+export interface FormattedLogEntry {
+  id: string;
+  raw: Record<string, unknown>;
+  timestamp: number | null;
+  timeLabel: string;
+  levelLabel: string;
+  category: string;
+  message: string;
+  summary: string;
+  json: string;
+}
+
+const LEVEL_LABELS: Record<number, string> = {
+  10: "TRACE",
+  20: "DEBUG",
+  30: "INFO",
+  40: "WARN",
+  50: "ERROR",
+  60: "FATAL",
+};
+
+const formatTimeLabel = (
+  value: unknown,
+): { label: string; timestamp: number | null } => {
+  if (typeof value === "string" || typeof value === "number") {
+    const date = new Date(value);
+    if (!Number.isNaN(date.getTime())) {
+      const hours = String(date.getHours()).padStart(2, "0");
+      const minutes = String(date.getMinutes()).padStart(2, "0");
+      const seconds = String(date.getSeconds()).padStart(2, "0");
+      return {
+        label: `${hours}:${minutes}:${seconds}`,
+        timestamp: date.getTime(),
+      };
+    }
+  }
+
+  return { label: "--:--:--", timestamp: null };
+};
+
+const formatLevelLabel = (value: unknown): string => {
+  if (typeof value === "number") {
+    return LEVEL_LABELS[value] ?? `LEVEL-${value}`;
+  }
+  if (typeof value === "string") {
+    return value.toUpperCase();
+  }
+  return "UNKNOWN";
+};
+
+const resolveMessage = (entry: Record<string, unknown>): string => {
+  if (typeof entry.msg === "string") {
+    return entry.msg;
+  }
+  if (typeof entry.message === "string") {
+    return entry.message;
+  }
+  if (entry.msg !== undefined) {
+    return String(entry.msg);
+  }
+  return "";
+};
+
+export function parseLogLines(
+  lines: string[],
+  options: { limit?: number } = {},
+): FormattedLogEntry[] {
+  const entries: FormattedLogEntry[] = [];
+
+  lines.forEach((line, index) => {
+    if (!line.trim()) return;
+    try {
+      const parsed = JSON.parse(line) as Record<string, unknown>;
+      const { label: timeLabel, timestamp } = formatTimeLabel(parsed.time);
+      const levelLabel = formatLevelLabel(parsed.level);
+      const category =
+        typeof parsed.category === "string" ? parsed.category : "unknown";
+      const message = resolveMessage(parsed);
+      const summary =
+        `[${timeLabel}] [${levelLabel}] [${category}] ${message}`.trim();
+      const json = JSON.stringify(parsed, null, 2);
+      const id = `${timestamp ?? "unknown"}-${index}`;
+
+      entries.push({
+        id,
+        raw: parsed,
+        timestamp,
+        timeLabel,
+        levelLabel,
+        category,
+        message,
+        summary,
+        json,
+      });
+    } catch {
+      // Skip malformed JSON lines
+    }
+  });
+
+  const limit = options.limit ?? 100;
+  if (entries.length <= limit) {
+    return [...entries].reverse();
+  }
+
+  return entries.slice(-limit).reverse();
+}

package/src/logging/reader.ts

@@ -0,0 +1,76 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+import os from "node:os";
+import { formatDate } from "./logger.js";
+
+export interface LogFileInfo {
+  date: string;
+  path: string;
+  mtimeMs: number;
+}
+
+const LOG_FILENAME_PATTERN = /^\d{4}-\d{2}-\d{2}\.jsonl$/;
+
+export function resolveLogDir(cwd: string = process.cwd()): string {
+  const cwdBase = path.basename(cwd) || "workspace";
+  return path.join(os.homedir(), ".gwt", "logs", cwdBase);
+}
+
+export function buildLogFilePath(logDir: string, date: string): string {
+  return path.join(logDir, `${date}.jsonl`);
+}
+
+export function getTodayLogDate(): string {
+  return formatDate(new Date());
+}
+
+export async function readLogFileLines(filePath: string): Promise<string[]> {
+  try {
+    const content = await fs.readFile(filePath, "utf-8");
+    return content.split("\n").filter(Boolean);
+  } catch (error) {
+    const err = error as NodeJS.ErrnoException;
+    if (err.code === "ENOENT") {
+      return [];
+    }
+    throw error;
+  }
+}
+
+export async function listLogFiles(logDir: string): Promise<LogFileInfo[]> {
+  try {
+    const entries = await fs.readdir(logDir, { withFileTypes: true });
+    const files: LogFileInfo[] = [];
+
+    for (const entry of entries) {
+      if (!entry.isFile()) continue;
+      if (!LOG_FILENAME_PATTERN.test(entry.name)) continue;
+
+      const date = entry.name.replace(/\.jsonl$/, "");
+      const fullPath = path.join(logDir, entry.name);
+      try {
+        const stat = await fs.stat(fullPath);
+        files.push({ date, path: fullPath, mtimeMs: stat.mtimeMs });
+      } catch {
+        // Ignore stat errors per-file
+      }
+    }
+
+    return files.sort((a, b) => b.date.localeCompare(a.date));
+  } catch (error) {
+    const err = error as NodeJS.ErrnoException;
+    if (err.code === "ENOENT") {
+      return [];
+    }
+    throw error;
+  }
+}
+
+export async function listRecentLogFiles(
+  logDir: string,
+  days = 7,
+): Promise<LogFileInfo[]> {
+  const files = await listLogFiles(logDir);
+  const cutoff = Date.now() - days * 24 * 60 * 60 * 1000;
+  return files.filter((file) => file.mtimeMs >= cutoff);
+}

package/src/worktree.ts

@@ -289,6 +289,73 @@ export async function generateAlternativeWorktreePath(
   return alternativePath;
 }
 
+type StaleWorktreeAssessment = {
+  status: "absent" | "registered" | "stale" | "unknown";
+  reason?: string;
+};
+
+async function assessStaleWorktreeDirectory(
+  targetPath: string,
+): Promise<StaleWorktreeAssessment> {
+  const fsSync = await import("node:fs");
+
+  if (!fsSync.existsSync(targetPath)) {
+    return { status: "absent" };
+  }
+
+  const registered = await checkWorktreePathConflict(targetPath);
+  if (registered) {
+    return { status: "registered" };
+  }
+
+  const gitMetaPath = path.join(targetPath, ".git");
+  if (!fsSync.existsSync(gitMetaPath)) {
+    return { status: "stale", reason: "missing .git" };
+  }
+
+  let gitMetaStat: Awaited<ReturnType<typeof fs.lstat>>;
+  try {
+    gitMetaStat = await fs.lstat(gitMetaPath);
+  } catch {
+    return { status: "unknown", reason: "unable to stat .git" };
+  }
+
+  if (gitMetaStat.isDirectory()) {
+    return { status: "unknown", reason: ".git is a directory" };
+  }
+
+  if (!gitMetaStat.isFile()) {
+    return { status: "unknown", reason: ".git is not a file" };
+  }
+
+  let gitMetaContents = "";
+  try {
+    gitMetaContents = await fs.readFile(gitMetaPath, "utf8");
+  } catch {
+    return { status: "unknown", reason: "unable to read .git" };
+  }
+
+  const gitdirMatch = gitMetaContents.match(/^\s*gitdir:\s*(.+)\s*$/m);
+  if (!gitdirMatch) {
+    return { status: "unknown", reason: "missing gitdir entry" };
+  }
+
+  const rawGitdir = gitdirMatch[1]?.trim();
+  if (!rawGitdir) {
+    return { status: "unknown", reason: "empty gitdir entry" };
+  }
+
+  const gitdirPath = path.isAbsolute(rawGitdir)
+    ? rawGitdir
+    : path.resolve(targetPath, rawGitdir);
+
+  if (!fsSync.existsSync(gitdirPath)) {
+    return { status: "stale", reason: "missing gitdir path" };
+  }
+
+  return { status: "unknown", reason: "gitdir exists" };
+}
+
 /**
  * 新しいworktreeを作成
  * @param {WorktreeConfig} config - worktreeの設定
@@ -302,6 +369,16 @@ export async function createWorktree(config: WorktreeConfig): Promise<void> {
   }
 
   try {
+    const staleness = await assessStaleWorktreeDirectory(config.worktreePath);
+    if (staleness.status === "stale") {
+      await fs.rm(config.worktreePath, { recursive: true, force: true });
+    } else if (staleness.status === "unknown") {
+      const reason = staleness.reason ? ` (${staleness.reason})` : "";
+      throw new WorktreeError(
+        `Worktree path already exists but is not registered as a git worktree, and stale status could not be confirmed${reason}. Remove the directory manually and retry: ${config.worktreePath}`,
+      );
+    }
+
     const worktreeParentDir = path.dirname(config.worktreePath);
 
     try {