gitforest 1.1.2 → 1.2.0

package/src/scanner/index.ts

@@ -90,6 +90,10 @@ async function scanDirectory(
   // Check if this directory exists
   if (!existsSync(dirPath)) return;
 
+  // The configured root directory (depth 0) is always a container — we must
+  // recurse into it even if it happens to have a project marker or .git.
+  const isRootDir = depth === 0;
+
   // Check if this is a git repository
   const isGit = await gitService.isGitRepo(dirPath);
 
@@ -110,20 +114,24 @@ async function scanDirectory(
       }
     }
 
-    // Don't recurse into git repositories (except for submodules which we handle above)
-    return;
+    // Don't recurse into git repositories — except the root scan directory,
+    // which the user explicitly configured as a container to scan inside.
+    if (!isRootDir) return;
   }
 
   // Check if this is a project without git
-  const marker = await detectProjectMarker(dirPath);
-  if (marker) {
-    // Only add non-git projects if configured to show them
-    if (config.display.showNonGitProjects) {
-      const project = await createProject(dirPath, "non-git", marker, gitService);
-      foundProjects.push(project);
+  if (!isGit) {
+    const marker = await detectProjectMarker(dirPath);
+    if (marker) {
+      // At the root level, skip adding it as a project — it's a container, not
+      // a project the user wants to manage.  Still recurse into children.
+      if (!isRootDir && config.display.showNonGitProjects) {
+        const project = await createProject(dirPath, "non-git", marker, gitService);
+        foundProjects.push(project);
+      }
+      // Don't recurse into non-git projects (except the root scan directory)
+      if (!isRootDir) return;
     }
-    // Don't recurse into non-git projects (even if not showing them)
-    return;
   }
 
   // This is just a directory - scan children
@@ -293,20 +301,18 @@ function projectToDbRow(project: Project) {
 }
 
 /**
- * Save projects to the cache database
+ * Save projects to the cache database.
+ * Replaces all cached projects so removed directories, depth changes, etc.
+ * are reflected immediately.
  */
 async function saveToCache(projects: Project[]): Promise<void> {
   const db = await initDb();
 
+  // Clear old entries then insert fresh scan results
+  await db.delete(schema.projects).run();
   for (const project of projects) {
     const row = projectToDbRow(project);
-    await db
-      .insert(schema.projects)
-      .values(row)
-      .onConflictDoUpdate({
-        target: schema.projects.path,
-        set: row,
-      });
+    await db.insert(schema.projects).values(row);
   }
 }
 
@@ -368,8 +374,16 @@ export async function scanWithCache(
   // Try to load from cache first
   if (!forceRefresh) {
     try {
-      const cached = await loadFromCache();
-      if (isCacheFresh(cached, config.cache.ttlSeconds)) {
+      const allCached = await loadFromCache();
+      // Filter to only projects under currently configured directories
+      const cached = allCached.filter(p =>
+        config.directories.some(dir => p.path.startsWith(dir.path))
+      );
+      // Also verify all configured directories are represented in cache
+      const allDirsCovered = config.directories.every(dir =>
+        cached.some(p => p.path.startsWith(dir.path))
+      );
+      if (allDirsCovered && isCacheFresh(cached, config.cache.ttlSeconds)) {
         return cached;
       }
     } catch {

package/src/services/editor.ts

@@ -0,0 +1,121 @@
+import type { GitforestConfig, DirectoryConfig } from "../types/index.ts";
+import { errorToString } from "../utils/errors.ts";
+
+/** Known terminal-based editors that need raw mode handling */
+const TERMINAL_EDITORS = ["vim", "nvim", "nano", "vi", "emacs", "hx", "helix"];
+
+/**
+ * Resolve which editor to use for a given project path.
+ * Priority: directory-specific > global config > $EDITOR env > "code"
+ */
+export function resolveEditor(
+  projectPath: string,
+  globalEditor?: string,
+  directories?: DirectoryConfig[]
+): string {
+  // Check for directory-specific editor
+  if (directories) {
+    const matchedDir = directories.find(d =>
+      projectPath.startsWith(d.path.replace(/^~/, process.env.HOME || ""))
+    );
+    if (matchedDir?.editor) {
+      return matchedDir.editor;
+    }
+  }
+  return globalEditor || process.env.EDITOR || "code";
+}
+
+/**
+ * Open a file/directory in the configured editor.
+ * Handles terminal vs GUI editors, macOS optimizations.
+ */
+export async function openInEditor(
+  projectPath: string,
+  config: GitforestConfig
+): Promise<{ success: boolean; error?: string }> {
+  const editor = resolveEditor(projectPath, config.editor, config.directories);
+
+  // Split command and args once
+  const parts = editor.split(" ");
+  const cmd = parts[0]!;
+  const args = parts.slice(1);
+
+  // Check if it's a known terminal editor
+  const isTerminal = TERMINAL_EDITORS.includes(cmd);
+
+  try {
+    if (isTerminal) {
+      // Suspends Ink's raw mode to allow the editor to take over
+      if (process.stdin.setRawMode) {
+        process.stdin.setRawMode(false);
+      }
+
+      // Spawn with inherit to take over terminal
+      const proc = Bun.spawn([cmd, ...args, projectPath], {
+        stdin: "inherit",
+        stdout: "inherit",
+        stderr: "inherit",
+      });
+
+      await proc.exited;
+
+      // Resume raw mode
+      if (process.stdin.setRawMode) {
+        process.stdin.setRawMode(true);
+      }
+    } else {
+      // GUI Editor
+
+      // Use 'open' command for macOS GUI editors (VS Code, Cursor) specific optimization
+      if (process.platform === "darwin" && (cmd === "code" || cmd === "cursor")) {
+        const appName = cmd === "code" ? "Visual Studio Code" : "Cursor";
+
+        const openArgs = ["open", "-a", appName, projectPath];
+        openArgs.push("--args", "-n"); // Force new window
+
+        const subprocess = Bun.spawn(openArgs, {
+          stdin: "ignore",
+          stdout: "ignore",
+          stderr: "ignore",
+        });
+        subprocess.unref();
+      } else {
+        // Fallback for other GUI editors
+
+        // Auto-inject -n for code/cursor if not using 'open' strategy or on other platforms
+        if ((cmd === "code" || cmd === "cursor") && !args.includes("-n") && !args.includes("--new-window")) {
+          args.push("-n");
+        }
+
+        const subprocess = Bun.spawn([cmd, ...args, projectPath], {
+          stdin: "ignore",
+          stdout: "ignore",
+          stderr: "ignore",
+        });
+        subprocess.unref();
+      }
+    }
+    return { success: true };
+  } catch (error) {
+    // Ensure raw mode is back if we failed mid-flight
+    if (process.stdin.setRawMode) process.stdin.setRawMode(true);
+    return { success: false, error: errorToString(error) };
+  }
+}
+
+/**
+ * Open a URL in the default browser.
+ */
+export async function openInBrowser(
+  url: string
+): Promise<{ success: boolean; error?: string }> {
+  try {
+    Bun.spawn(["open", url], {
+      stdout: "ignore",
+      stderr: "ignore",
+    });
+    return { success: true };
+  } catch (error) {
+    return { success: false, error: errorToString(error) };
+  }
+}

package/src/state/actions.ts

@@ -1,4 +1,4 @@
-import type { AppMode, SortField, SortDirection, Project, ViewMode, GitHubRepoInfo, UnifiedRepo, QuickFilter, DetailModalState } from "../types/index.ts";
+import type { AppMode, SortField, SortDirection, Project, ViewMode, GitHubRepoInfo, UnifiedRepo, QuickFilter, DetailModalState, AddDirectoryDialogState, DirectoryConfig } from "../types/index.ts";
 
 /**
  * Action creators for app state
@@ -112,7 +112,7 @@ export const setGitHubError = (error: string | null) => ({
   payload: error,
 });
 
-export const showCloneDialog = (repos: UnifiedRepo[], directories: any[], selectedDirIndex: number, useSSH: boolean) => ({
+export const showCloneDialog = (repos: UnifiedRepo[], directories: DirectoryConfig[], selectedDirIndex: number, useSSH: boolean) => ({
   type: "SHOW_CLONE_DIALOG" as const,
   payload: { repos, directories, selectedDirIndex, useSSH },
 });
@@ -173,3 +173,24 @@ export const setLanguageFilter = (language: string | null) => ({
   type: "SET_LANGUAGE_FILTER" as const,
   payload: language,
 });
+
+// Add directory dialog actions
+export const showAddDirectoryDialog = () => ({
+  type: "SHOW_ADD_DIRECTORY_DIALOG" as const,
+  payload: {
+    step: "browse",
+    selectedPath: null,
+    maxDepthInput: "2",
+    labelInput: "",
+    error: null,
+  } satisfies AddDirectoryDialogState,
+});
+
+export const hideAddDirectoryDialog = () => ({
+  type: "HIDE_ADD_DIRECTORY_DIALOG" as const,
+});
+
+export const updateAddDirectoryDialog = (updates: Partial<AddDirectoryDialogState>) => ({
+  type: "UPDATE_ADD_DIRECTORY_DIALOG" as const,
+  payload: updates,
+});

package/src/state/reducer.ts

@@ -32,6 +32,7 @@ export const initialState: UnifiedAppState = {
   isRefreshing: false,
   cloneDialog: null,
   detailModal: null,
+  addDirectoryDialog: null,
   languageFilter: null,
 };
 
@@ -288,6 +289,28 @@ export function appReducer(state: UnifiedAppState, action: UnifiedAppAction): Un
         cursorIndex: 0,
       };
 
+    case "SHOW_ADD_DIRECTORY_DIALOG":
+      return {
+        ...state,
+        mode: "add-directory",
+        addDirectoryDialog: action.payload,
+      };
+
+    case "HIDE_ADD_DIRECTORY_DIALOG":
+      return {
+        ...state,
+        mode: "normal",
+        addDirectoryDialog: null,
+      };
+
+    case "UPDATE_ADD_DIRECTORY_DIALOG":
+      return {
+        ...state,
+        addDirectoryDialog: state.addDirectoryDialog
+          ? { ...state.addDirectoryDialog, ...action.payload }
+          : null,
+      };
+
     default:
       return state;
   }

package/src/types/index.ts

@@ -190,7 +190,7 @@ export type SortField =
   | "lastActivity"
   | "size";
 export type SortDirection = "asc" | "desc";
-export type AppMode = "normal" | "filter" | "action" | "help" | "confirm" | "clone" | "detail" | "filter-options" | "command-palette";
+export type AppMode = "normal" | "filter" | "action" | "help" | "confirm" | "clone" | "detail" | "filter-options" | "command-palette" | "add-directory";
 
 // Quick filter for status-based filtering (1=dirty, 2=unpushed, 3=no-remote, 0=all)
 export type QuickFilter =
@@ -214,6 +214,14 @@ export interface CloneDialogState {
   useSSH: boolean;
 }
 
+export interface AddDirectoryDialogState {
+  step: "browse" | "maxDepth" | "label";
+  selectedPath: string | null;
+  maxDepthInput: string;
+  labelInput: string;
+  error: string | null;
+}
+
 export interface DetailModalState {
   repo: UnifiedRepo;
   readmeContent: string | null;
@@ -360,6 +368,7 @@ export interface UnifiedAppState extends AppState {
   isRefreshing: boolean;  // Background refresh indicator
   cloneDialog: CloneDialogState | null;
   detailModal: DetailModalState | null;
+  addDirectoryDialog: AddDirectoryDialogState | null;
   languageFilter: string | null;
 }
 
@@ -380,4 +389,7 @@ export type UnifiedAppAction =
   | { type: "SHOW_DETAIL_MODAL"; payload: DetailModalState }
   | { type: "HIDE_DETAIL_MODAL" }
   | { type: "UPDATE_DETAIL_MODAL"; payload: Partial<DetailModalState> }
-  | { type: "SET_LANGUAGE_FILTER"; payload: string | null };
+  | { type: "SET_LANGUAGE_FILTER"; payload: string | null }
+  | { type: "SHOW_ADD_DIRECTORY_DIALOG"; payload: AddDirectoryDialogState }
+  | { type: "HIDE_ADD_DIRECTORY_DIALOG" }
+  | { type: "UPDATE_ADD_DIRECTORY_DIALOG"; payload: Partial<AddDirectoryDialogState> };