@akiojin/gwt 4.11.6 → 4.12.0

package/src/utils/session/parsers/opencode.ts

@@ -13,8 +13,10 @@ import type { OpenCodeSessionInfo, SessionSearchOptions } from "../types.js";
 import {
   collectFilesIterative,
   matchesCwd,
+  resolveBranchFromCwd,
   readSessionInfoFromFile,
 } from "../common.js";
+import { listAllWorktrees } from "../../../worktree.js";
 
 /**
  * Returns the OpenCode session directory
@@ -73,15 +75,50 @@ export async function findLatestOpenCodeSession(
     return b.mtime - a.mtime;
   });
 
+  const branchFilter =
+    typeof options.branch === "string" && options.branch.trim().length > 0
+      ? options.branch.trim()
+      : null;
+  const shouldCheckBranch = Boolean(branchFilter);
+  const shouldCheckCwd = Boolean(options.cwd) && !shouldCheckBranch;
+
+  let worktrees: { path: string; branch: string }[] = [];
+  if (shouldCheckBranch) {
+    if (Array.isArray(options.worktrees) && options.worktrees.length > 0) {
+      worktrees = options.worktrees
+        .filter((entry) => entry?.path && entry?.branch)
+        .map((entry) => ({ path: entry.path, branch: entry.branch }));
+    } else {
+      try {
+        const allWorktrees = await listAllWorktrees();
+        worktrees = allWorktrees
+          .filter((entry) => entry?.path && entry?.branch)
+          .map((entry) => ({ path: entry.path, branch: entry.branch }));
+      } catch {
+        worktrees = [];
+      }
+    }
+    if (!worktrees.length) return null;
+  }
+
   for (const file of pool) {
     const info = await readSessionInfoFromFile(file.fullPath);
     if (!info.id) continue;
-    if (options.cwd) {
-      if (matchesCwd(info.cwd, options.cwd)) {
-        return { id: info.id, mtime: file.mtime };
+    const sessionCwd = info.cwd ?? null;
+
+    if (shouldCheckBranch) {
+      const resolvedBranch = resolveBranchFromCwd(sessionCwd, worktrees);
+      if (resolvedBranch !== branchFilter) {
+        continue;
       }
-      continue;
     }
+
+    if (shouldCheckCwd && options.cwd) {
+      if (!matchesCwd(sessionCwd, options.cwd)) {
+        continue;
+      }
+    }
+
     return { id: info.id, mtime: file.mtime };
   }
 
@@ -98,7 +135,11 @@ export async function findLatestOpenCodeSessionId(
   cwd: string,
   options: SessionSearchOptions = {},
 ): Promise<string | null> {
-  const searchOptions: SessionSearchOptions = { cwd: options.cwd ?? cwd };
+  const searchOptions: SessionSearchOptions = {
+    cwd: options.cwd ?? cwd,
+    branch: options.branch ?? null,
+    worktrees: options.worktrees ?? null,
+  };
   if (options.since !== undefined) searchOptions.since = options.since;
   if (options.until !== undefined) searchOptions.until = options.until;
   if (options.preferClosestTo !== undefined)

package/src/utils/session/types.ts

@@ -16,6 +16,10 @@ export interface SessionSearchOptions {
   windowMs?: number;
   /** Working directory filter */
   cwd?: string | null;
+  /** Branch name filter (resolved from session cwd via worktree paths) */
+  branch?: string | null;
+  /** Optional worktree list to avoid shelling out for branch mapping */
+  worktrees?: { path: string; branch: string }[] | null;
 }
 
 /**

package/src/worktree.ts

@@ -1,5 +1,5 @@
 import { execa } from "execa";
-import fs from "node:fs/promises";
+import { lstat, mkdir, readFile, rm } from "node:fs/promises";
 import path from "node:path";
 import chalk from "chalk";
 import { createLogger } from "./logging/logger.js";
@@ -247,6 +247,10 @@ async function listWorktrees(): Promise<WorktreeInfo[]> {
   }
 }
 
+export async function listAllWorktrees(): Promise<WorktreeInfo[]> {
+  return listWorktrees();
+}
+
 /**
  * 追加のworktree（メインworktreeを除く）の一覧を取得
  * @returns {Promise<WorktreeInfo[]>} worktree情報の配列
@@ -411,9 +415,9 @@ async function assessStaleWorktreeDirectory(
     return { status: "stale", reason: "missing .git" };
   }
 
-  let gitMetaStat: Awaited<ReturnType<typeof fs.lstat>>;
+  let gitMetaStat: Awaited<ReturnType<typeof lstat>>;
   try {
-    gitMetaStat = await fs.lstat(gitMetaPath);
+    gitMetaStat = await lstat(gitMetaPath);
   } catch {
     return { status: "unknown", reason: "unable to stat .git" };
   }
@@ -428,7 +432,7 @@ async function assessStaleWorktreeDirectory(
 
   let gitMetaContents = "";
   try {
-    gitMetaContents = await fs.readFile(gitMetaPath, "utf8");
+    gitMetaContents = await readFile(gitMetaPath, "utf8");
   } catch {
     return { status: "unknown", reason: "unable to read .git" };
   }
@@ -469,7 +473,7 @@ 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 });
+      await rm(config.worktreePath, { recursive: true, force: true });
     } else if (staleness.status === "unknown") {
       const reason = staleness.reason ? ` (${staleness.reason})` : "";
       throw new WorktreeError(
@@ -480,7 +484,7 @@ export async function createWorktree(config: WorktreeConfig): Promise<void> {
     const worktreeParentDir = path.dirname(config.worktreePath);
 
     try {
-      await fs.mkdir(worktreeParentDir, { recursive: true });
+      await mkdir(worktreeParentDir, { recursive: true });
     } catch (error: unknown) {
       const errorWithCode = error as { code?: unknown; message?: unknown };
       const code =
@@ -827,9 +831,11 @@ async function getWorktreesWithPRStatus(): Promise<WorktreeWithPR[]> {
 async function getOrphanedLocalBranchStatuses({
   baseBranch,
   repoRoot,
+  onProgress,
 }: {
   baseBranch: string;
   repoRoot: string;
+  onProgress?: (status: CleanupStatus) => void;
 }): Promise<CleanupStatus[]> {
   try {
     // 並列実行で高速化
@@ -886,11 +892,10 @@ async function getOrphanedLocalBranchStatuses({
           localBranch.name,
           repoRoot,
         );
-        const comparisonBase = upstream ?? baseBranch;
 
         const hasUniqueCommits = await branchHasUniqueCommitsComparedToBase(
           localBranch.name,
-          comparisonBase,
+          baseBranch,
           repoRoot,
         );
 
@@ -909,7 +914,7 @@ async function getOrphanedLocalBranchStatuses({
           );
         }
 
-        statuses.push({
+        const status: CleanupStatus = {
           worktreePath: null, // worktreeは存在しない
           branch: localBranch.name,
           hasUncommittedChanges: false, // worktreeが存在しないため常にfalse
@@ -920,7 +925,9 @@ async function getOrphanedLocalBranchStatuses({
           hasUpstream,
           upstream,
           reasons,
-        });
+        };
+        statuses.push(status);
+        onProgress?.(status);
       }
     }
 
@@ -940,7 +947,11 @@ async function getOrphanedLocalBranchStatuses({
   }
 }
 
-export async function getCleanupStatus(): Promise<CleanupStatus[]> {
+export async function getCleanupStatus({
+  onProgress,
+}: {
+  onProgress?: (status: CleanupStatus) => void;
+} = {}): Promise<CleanupStatus[]> {
   const [config, repoRoot, worktreesWithPR] = await Promise.all([
     getConfig(),
     getRepositoryRoot(),
@@ -951,6 +962,7 @@ export async function getCleanupStatus(): Promise<CleanupStatus[]> {
   const orphanedStatuses = await getOrphanedLocalBranchStatuses({
     baseBranch,
     repoRoot,
+    ...(onProgress ? { onProgress } : {}),
   });
   const statuses: CleanupStatus[] = [];
 
@@ -1003,11 +1015,10 @@ export async function getCleanupStatus(): Promise<CleanupStatus[]> {
       worktree.branch,
       repoRoot,
     );
-    const comparisonBase = upstream ?? baseBranch;
 
     const hasUniqueCommits = await branchHasUniqueCommitsComparedToBase(
       worktree.branch,
-      comparisonBase,
+      baseBranch,
       repoRoot,
     );
 
@@ -1026,7 +1037,7 @@ export async function getCleanupStatus(): Promise<CleanupStatus[]> {
       );
     }
 
-    statuses.push({
+    const status: CleanupStatus = {
       worktreePath: worktree.worktreePath,
       branch: worktree.branch,
       hasUncommittedChanges: hasUncommitted,
@@ -1041,7 +1052,9 @@ export async function getCleanupStatus(): Promise<CleanupStatus[]> {
       ...(isAccessible
         ? {}
         : { invalidReason: "Path not accessible in current environment" }),
-    });
+    };
+    statuses.push(status);
+    onProgress?.(status);
   }
 
   statuses.push(...orphanedStatuses);