@akiojin/gwt 4.12.1 → 6.0.0

package/src/web/server/services/branches.ts

@@ -1,387 +0,0 @@
-/**
- * Branch Service
- *
- * ブランチ一覧取得とマージステータス判定のビジネスロジック。
- * 既存のgit.tsとgithub.tsの機能を活用します。
- */
-
-import { execa } from "execa";
-import {
-  getAllBranches,
-  getRepositoryRoot,
-  getBranchDivergenceStatuses,
-  fetchAllRemotes,
-  pullFastForward,
-} from "../../../git.js";
-import { getPullRequestByBranch } from "../../../github.js";
-import { listAdditionalWorktrees } from "../../../worktree.js";
-import type { Branch, BranchSyncResult } from "../../../types/api.js";
-import { getLastToolUsageMap } from "../../../config/index.js";
-
-type DivergenceStatus = { remoteAhead: number; localAhead: number };
-type DivergenceValue = NonNullable<NonNullable<Branch["divergence"]>>;
-import type { BranchInfo, PullRequest } from "../../../cli/ui/types.js";
-
-const DEFAULT_BASE_BRANCHES = ["main", "master", "develop", "dev"];
-
-function mapPullRequestState(state: string): "open" | "merged" | "closed" {
-  if (state === "OPEN") {
-    return "open";
-  }
-  if (state === "MERGED") {
-    return "merged";
-  }
-  return "closed";
-}
-
-/**
- * すべてのブランチ一覧を取得（マージステータスとWorktree情報付き）
- */
-export async function listBranches(): Promise<Branch[]> {
-  const repoRoot = await getRepositoryRoot();
-  const lastToolUsageMap = await getLastToolUsageMap(repoRoot);
-
-  // リモートブランチの最新情報を取得（失敗してもローカル情報にはフォールバック）
-  try {
-    await fetchAllRemotes({ cwd: repoRoot });
-  } catch (error) {
-    console.warn(
-      "Failed to fetch remote branches for Web UI; falling back to local branches",
-      error,
-    );
-  }
-
-  const [branches, worktrees] = await Promise.all([
-    getAllBranches(),
-    listAdditionalWorktrees(),
-  ]);
-  const divergenceMap = await buildDivergenceMap(branches, repoRoot);
-  const upstreamMap = await collectUpstreamMap(repoRoot);
-  const baseCandidates = buildBaseBranchCandidates(branches);
-  const branchNames = branches.map((b: BranchInfo) => b.name);
-  const mainBranch =
-    DEFAULT_BASE_BRANCHES.find((name) => branchNames.includes(name)) ?? "main";
-  const refCache = new Map<string, boolean>();
-  const ancestorCache = new Map<string, boolean>();
-
-  const branchList: Branch[] = await Promise.all(
-    branches.map(async (branchInfo: BranchInfo) => {
-      // Worktree情報
-      const worktree = worktrees.find((wt) => wt.branch === branchInfo.name);
-
-      // マージステータス判定（GitHub PRベース）
-      let mergeStatus: "unmerged" | "merged" | "unknown" = "unknown";
-      const pr = await getPullRequestByBranch(branchInfo.name);
-      if (pr) {
-        mergeStatus = pr.state === "MERGED" ? "merged" : "unmerged";
-      } else if (branchInfo.name === mainBranch) {
-        // メインブランチは常にmerged扱い
-        mergeStatus = "merged";
-      }
-
-      const baseBranch = await resolveBaseBranch(
-        branchInfo,
-        pr,
-        upstreamMap,
-        baseCandidates,
-        repoRoot,
-        refCache,
-        ancestorCache,
-      );
-
-      const prInfo = pr
-        ? {
-            number: pr.number,
-            title: pr.title,
-            state: mapPullRequestState(pr.state),
-            mergedAt: pr.mergedAt,
-          }
-        : null;
-
-      const divergenceStatus =
-        branchInfo.type === "local"
-          ? divergenceMap.get(branchInfo.name)
-          : undefined;
-
-      const divergence = divergenceStatus
-        ? mapDivergence(divergenceStatus)
-        : null;
-
-      const lastToolUsage = lastToolUsageMap.get(branchInfo.name) ?? null;
-
-      return {
-        name: branchInfo.name,
-        type: branchInfo.type,
-        commitHash: "unknown", // BranchInfoには含まれていない
-        commitMessage: null,
-        author: null,
-        commitDate: null,
-        mergeStatus,
-        hasUnpushedCommits: Boolean(branchInfo.hasUnpushedCommits),
-        worktreePath: worktree?.path || null,
-        baseBranch: baseBranch ?? null,
-        divergence,
-        prInfo,
-        ...(lastToolUsage ? { lastToolUsage } : {}),
-      };
-    }),
-  );
-
-  return branchList;
-}
-
-export async function syncBranchState(
-  branchName: string,
-  worktreePath: string,
-): Promise<BranchSyncResult> {
-  if (!worktreePath) {
-    throw new Error("Worktree path is required to sync branch");
-  }
-
-  const repoRoot = await getRepositoryRoot();
-  const warnings: string[] = [];
-
-  await fetchAllRemotes({ cwd: repoRoot });
-
-  let pullStatus: "success" | "failed" = "success";
-  try {
-    await pullFastForward(worktreePath);
-  } catch (error) {
-    pullStatus = "failed";
-    const reason = error instanceof Error ? error.message : String(error);
-    warnings.push(reason);
-  }
-
-  const sanitizedBranch = sanitizeBranchName(branchName);
-  const divergenceInput: { cwd: string; branches?: string[] } = {
-    cwd: repoRoot,
-  };
-  if (sanitizedBranch) {
-    divergenceInput.branches = [sanitizedBranch];
-  }
-  const divergenceStatuses = await getBranchDivergenceStatuses(divergenceInput);
-  const firstDivergence = divergenceStatuses[0];
-  const divergence =
-    firstDivergence !== undefined ? mapDivergence(firstDivergence) : null;
-
-  const branch = await getBranchByName(branchName);
-  if (!branch) {
-    throw new Error(`Branch not found: ${branchName}`);
-  }
-
-  const result: BranchSyncResult = {
-    branch,
-    divergence: divergence ?? branch.divergence ?? null,
-    fetchStatus: "success",
-    pullStatus,
-  };
-
-  if (warnings.length) {
-    result.warnings = warnings;
-  }
-
-  return result;
-}
-
-async function buildDivergenceMap(
-  branches: BranchInfo[],
-  repoRoot: string,
-): Promise<Map<string, DivergenceStatus>> {
-  const localBranchNames = branches
-    .filter((branch) => branch.type === "local")
-    .map((branch) => branch.name);
-
-  if (localBranchNames.length === 0) {
-    return new Map();
-  }
-
-  try {
-    const statuses = await getBranchDivergenceStatuses({
-      cwd: repoRoot,
-      branches: localBranchNames,
-    });
-    return new Map(statuses.map((status) => [status.branch, status]));
-  } catch (error) {
-    console.warn("Failed to compute branch divergence for Web UI", error);
-    return new Map();
-  }
-}
-
-function mapDivergence(status: DivergenceStatus): DivergenceValue {
-  return {
-    ahead: status.localAhead,
-    behind: status.remoteAhead,
-    upToDate: status.localAhead === 0 && status.remoteAhead === 0,
-  };
-}
-
-function sanitizeBranchName(value: string): string {
-  return value.replace(/^origin\//, "");
-}
-
-/**
- * 特定のブランチ情報を取得
- */
-export async function getBranchByName(
-  branchName: string,
-): Promise<Branch | null> {
-  const branches = await listBranches();
-  return branches.find((b) => b.name === branchName) || null;
-}
-
-async function collectUpstreamMap(
-  repoRoot: string,
-): Promise<Map<string, string>> {
-  try {
-    const { stdout } = await execa(
-      "git",
-      [
-        "for-each-ref",
-        "--format=%(refname:short)|%(upstream:short)",
-        "refs/heads",
-      ],
-      { cwd: repoRoot },
-    );
-
-    return stdout
-      .split("\n")
-      .filter((line) => line.includes("|"))
-      .reduce((map, line) => {
-        const [branch, upstream] = line.split("|");
-        if (branch && upstream) {
-          map.set(branch.trim(), upstream.trim());
-        }
-        return map;
-      }, new Map<string, string>());
-  } catch {
-    return new Map();
-  }
-}
-
-function buildBaseBranchCandidates(branches: BranchInfo[]): string[] {
-  const candidates = new Set<string>();
-  for (const base of DEFAULT_BASE_BRANCHES) {
-    candidates.add(base);
-    candidates.add(`origin/${base}`);
-  }
-
-  for (const branch of branches) {
-    if (branch.branchType === "main" || branch.branchType === "develop") {
-      candidates.add(branch.name);
-      if (branch.name.startsWith("origin/")) {
-        const localName = branch.name.replace(/^origin\//, "");
-        if (localName) {
-          candidates.add(localName);
-        }
-      } else {
-        candidates.add(`origin/${branch.name}`);
-      }
-    }
-  }
-
-  return Array.from(candidates);
-}
-
-async function resolveBaseBranch(
-  branchInfo: BranchInfo,
-  pr: PullRequest | null,
-  upstreamMap: Map<string, string>,
-  baseCandidates: string[],
-  repoRoot: string,
-  refCache: Map<string, boolean>,
-  ancestorCache: Map<string, boolean>,
-): Promise<string | null> {
-  if (pr?.baseRefName) {
-    return pr.baseRefName;
-  }
-
-  if (branchInfo.type === "local") {
-    const upstream = upstreamMap.get(branchInfo.name);
-    if (upstream) {
-      return upstream;
-    }
-  }
-
-  return inferBaseBranchFromCandidates(
-    branchInfo.name,
-    baseCandidates,
-    repoRoot,
-    refCache,
-    ancestorCache,
-  );
-}
-
-async function inferBaseBranchFromCandidates(
-  branchName: string,
-  baseCandidates: string[],
-  repoRoot: string,
-  refCache: Map<string, boolean>,
-  ancestorCache: Map<string, boolean>,
-): Promise<string | null> {
-  for (const candidate of baseCandidates) {
-    if (!candidate || candidate === branchName) {
-      continue;
-    }
-
-    const exists = await refExists(candidate, repoRoot, refCache);
-    if (!exists) {
-      continue;
-    }
-
-    const isAncestor = await isAncestorRef(
-      candidate,
-      branchName,
-      repoRoot,
-      ancestorCache,
-    );
-    if (isAncestor) {
-      return candidate;
-    }
-  }
-
-  return null;
-}
-
-async function refExists(
-  refName: string,
-  repoRoot: string,
-  cache: Map<string, boolean>,
-): Promise<boolean> {
-  const cached = cache.get(refName);
-  if (cached !== undefined) {
-    return cached;
-  }
-
-  try {
-    await execa("git", ["rev-parse", "--verify", refName], { cwd: repoRoot });
-    cache.set(refName, true);
-    return true;
-  } catch {
-    cache.set(refName, false);
-    return false;
-  }
-}
-
-async function isAncestorRef(
-  ancestor: string,
-  branch: string,
-  repoRoot: string,
-  cache: Map<string, boolean>,
-): Promise<boolean> {
-  const cacheKey = `${ancestor}->${branch}`;
-  const cached = cache.get(cacheKey);
-  if (cached !== undefined) {
-    return cached;
-  }
-
-  try {
-    await execa("git", ["merge-base", "--is-ancestor", ancestor, branch], {
-      cwd: repoRoot,
-    });
-    cache.set(cacheKey, true);
-    return true;
-  } catch {
-    cache.set(cacheKey, false);
-    return false;
-  }
-}

package/src/web/server/services/worktrees.ts

@@ -1,93 +0,0 @@
-/**
- * Worktree Service
- *
- * Worktree管理のビジネスロジック。
- * 既存のworktree.tsの機能を活用します。
- */
-
-import {
-  listAdditionalWorktrees,
-  createWorktree as createWorktreeCore,
-  removeWorktree as removeWorktreeCore,
-  generateWorktreePath,
-  isProtectedBranchName,
-  type WorktreeInfo,
-} from "../../../worktree.js";
-import type { Worktree } from "../../../types/api.js";
-
-/**
- * すべてのWorktree一覧を取得
- */
-export async function listWorktrees(): Promise<Worktree[]> {
-  const worktrees = await listAdditionalWorktrees();
-
-  return worktrees.map((wt: WorktreeInfo) => ({
-    path: wt.path,
-    branchName: wt.branch,
-    head: wt.head,
-    isLocked: wt.isLocked ?? false,
-    isPrunable: wt.isPrunable ?? false,
-    isProtected: isProtectedBranchName(wt.branch),
-    createdAt: null, // git worktreeからは取得不可
-    lastAccessedAt: null, // git worktreeからは取得不可
-    divergence: null,
-    prInfo: null,
-  }));
-}
-
-/**
- * 特定のWorktree情報を取得
- */
-export async function getWorktreeByPath(
-  path: string,
-): Promise<Worktree | null> {
-  const worktrees = await listWorktrees();
-  return worktrees.find((wt) => wt.path === path) || null;
-}
-
-/**
- * 新しいWorktreeを作成
- */
-export async function createNewWorktree(
-  branchName: string,
-  createBranch: boolean,
-): Promise<Worktree> {
-  // 保護ブランチのチェック
-  if (isProtectedBranchName(branchName)) {
-    throw new Error(
-      `Cannot create worktree for protected branch: ${branchName}. Protected branches (main, develop, master) must remain in the main repository.`,
-    );
-  }
-
-  const { getRepositoryRoot, getCurrentBranch } =
-    await import("../../../git.js");
-
-  const [repoRoot, currentBranch] = await Promise.all([
-    getRepositoryRoot(),
-    getCurrentBranch(),
-  ]);
-
-  const worktreePath = await generateWorktreePath(repoRoot, branchName);
-
-  await createWorktreeCore({
-    branchName,
-    worktreePath,
-    repoRoot,
-    isNewBranch: createBranch,
-    baseBranch: currentBranch || "main",
-  });
-
-  const worktree = await getWorktreeByPath(worktreePath);
-  if (!worktree) {
-    throw new Error(`Failed to create worktree for branch ${branchName}`);
-  }
-
-  return worktree;
-}
-
-/**
- * Worktreeを削除
- */
-export async function removeWorktree(path: string): Promise<void> {
-  await removeWorktreeCore(path);
-}

package/src/web/server/tray.ts

@@ -1,136 +0,0 @@
-import { execa } from "execa";
-import { createRequire } from "node:module";
-import { createLogger } from "../../logging/logger.js";
-
-const require = createRequire(import.meta.url);
-
-/**
- * URL を開く関数の型定義
- * @param url - 開くURL
- */
-export type OpenUrlFn = (url: string) => Promise<void> | void;
-
-// PNG icon (16x16) for macOS/Linux - Base64 encoded
-const TRAY_ICON_PNG_BASE64 =
-  "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAdgAAAHYBTnsmCAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAADLSURBVDiNpZMxDoJAEEXfLhYewMrOxsLKG3gDj+ANPIKFtScwHoHOxmN4AysLL0BlQ0Ji4W6yLLAgfslkZnbm/0wmA/9G6CogIr4F7IAbcAYOqpoEJBYD+3UADVYAiMgZOAKvboAFwFLENoAtsAdGwAw4qepZRN7A2LIIWCngCjy7t1bVF/D05QBT4K6qOxH5dOwjuwrYApdMvC3wBHzWBTwAr6p6c+wFSBJvEeDsehLVNwZ0sQDqv+kl3xjQxcKNSaZ/s+irNK1fXfwA7LE/RA3w5ggAAAAASUVORK5CYII=";
-
-// ICO icon for Windows - Base64 encoded
-const TRAY_ICON_ICO_BASE64 =
-  "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAJ1BMVEUAAAAAvNQAvNQAvNQAvNQAvNQAvNQAvNQAvNQAvNQAvNQAvNT////J1ubyAAAAC3RSTlMAJYTcgyQJnJ3U3WXfUogAAAABYktHRAyBs1FjAAAAB3RJTUUH6QwMCRccbOpRBQAAAFdJREFUCNdjYEAARuXNriCarXr37t1tQEYmkN69M4GBoRvE2F3AwAqmd29kYIEwNjEwQxibGbghjN0MXDARJpgaqK6tDAzVUHMQJoPtKgPZyuq8S5WBAQBeRj51tvdhawAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyNS0xMi0xMlQwOToyMzoyOCswMDowMBPEA5UAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjUtMTItMTJUMDk6MjM6MjgrMDA6MDBimbspAAAAAElFTkSuQmCC";
-
-let trayInitAttempted = false;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let trayInstance: any = null;
-
-function shouldEnableTray(
-  platform: NodeJS.Platform = process.platform,
-): boolean {
-  // NOTE: `trayicon` is a win32-only dependency.
-  if (platform !== "win32") return false;
-  if (process.env.GWT_DISABLE_TRAY?.toLowerCase() === "true") return false;
-  if (process.env.GWT_DISABLE_TRAY === "1") return false;
-  if (process.env.CI) return false;
-  return true;
-}
-
-/**
- * デフォルトブラウザでURLを開く
- * @param url - 開くURL
- */
-export async function openUrl(url: string): Promise<void> {
-  const platform = process.platform;
-  try {
-    if (platform === "win32") {
-      await execa("explorer.exe", [url], { windowsHide: true });
-      return;
-    }
-    if (platform === "darwin") {
-      await execa("open", [url]);
-      return;
-    }
-    await execa("xdg-open", [url], { stdio: "ignore" });
-  } catch {
-    // Ignore errors to avoid disrupting CLI/Web UI
-  }
-}
-
-/**
- * システムトレイアイコンを初期化
- * @param url - Web UI のURL（メニューから開く）
- * @param opts - オプション設定
- * @param opts.openUrl - URL を開くカスタム関数（テスト用）
- */
-export async function startSystemTray(
-  url: string,
-  opts?: { openUrl?: OpenUrlFn; platform?: NodeJS.Platform },
-): Promise<void> {
-  if (trayInitAttempted || !shouldEnableTray(opts?.platform)) return;
-  trayInitAttempted = true;
-
-  const logger = createLogger({ category: "tray" });
-  const open = opts?.openUrl ?? openUrl;
-
-  try {
-    // systray2 をCommonJS requireでインポート（ESM互換性のため）
-    const SysTray = require("systray2").default;
-
-    const isWindows = process.platform === "win32";
-    const isMacOS = process.platform === "darwin";
-
-    // プラットフォームに応じたアイコンを選択
-    const iconBase64 = isWindows ? TRAY_ICON_ICO_BASE64 : TRAY_ICON_PNG_BASE64;
-
-    const openDashboardItem = {
-      title: "Open Web UI",
-      tooltip: "Open gwt Web UI in browser",
-      checked: false,
-      enabled: true,
-    };
-
-    const exitItem = {
-      title: "Exit",
-      tooltip: "Close the tray icon",
-      checked: false,
-      enabled: true,
-    };
-
-    trayInstance = new SysTray({
-      menu: {
-        icon: iconBase64,
-        isTemplateIcon: isMacOS,
-        title: "gwt",
-        tooltip: `gwt Web UI - ${url}`,
-        items: [openDashboardItem, SysTray.separator, exitItem],
-      },
-      debug: false,
-      copyDir: false,
-    });
-
-    trayInstance.onClick((action: { item: { title: string } }) => {
-      if (action.item.title === "Open Web UI") {
-        open(url);
-      } else if (action.item.title === "Exit") {
-        trayInstance?.kill(false);
-        trayInstance = null;
-      }
-    });
-
-    await trayInstance.ready();
-    logger.info("System tray initialized");
-  } catch (err) {
-    logger.warn({ err }, "System tray failed to initialize");
-  }
-}
-
-/**
- * システムトレイアイコンを破棄
- */
-export function disposeSystemTray(): void {
-  try {
-    trayInstance?.kill?.(false);
-  } catch {
-    // Ignore errors during cleanup
-  }
-  trayInstance = null;
-  trayInitAttempted = false;
-}

package/src/web/server/types.ts

@@ -1,14 +0,0 @@
-import type {
-  FastifyInstance,
-  RawReplyDefaultExpression,
-  RawRequestDefaultExpression,
-  RawServerDefault,
-} from "fastify";
-import type { Logger } from "pino";
-
-export type WebFastifyInstance = FastifyInstance<
-  RawServerDefault,
-  RawRequestDefaultExpression<RawServerDefault>,
-  RawReplyDefaultExpression<RawServerDefault>,
-  Logger
->;