gitforest 1.1.2 → 1.2.0

package/src/hooks/useKeyBindings.ts

@@ -1,4 +1,6 @@
+import React from "react";
 import { useInput, useApp } from "ink";
+import type { Key } from "ink";
 import { useStore, useFilteredProjects, useSelectedProjects, useFilteredUnifiedRepos, useSelectedUnifiedRepos } from "../state/store.tsx";
 import {
   moveCursor,
@@ -13,12 +15,14 @@ import {
   startAction,
   endAction,
   updateProgress,
+  showAddDirectoryDialog,
 } from "../state/actions.ts";
 import { batchPull as defaultBatchPull, batchPush as defaultBatchPush, batchFetch as defaultBatchFetch } from "../operations/batch.ts";
 import { initGitInProject as defaultInitGitInProject } from "../git/operations.ts";
 import { executeCommand as defaultExecuteCommand, findCommandByKey as defaultFindCommandByKey } from "../operations/commands.ts";
 import { errorToString } from "../utils/errors.ts";
-import type { GitforestConfig, ConfirmDialogState, QuickFilter, ViewMode, DetailModalState, UnifiedRepo, CommandConfig, Project, BatchResult, OperationResult } from "../types/index.ts";
+import { UI } from "../constants.ts";
+import type { GitforestConfig, ConfirmDialogState, QuickFilter, ViewMode, DetailModalState, UnifiedRepo, UnifiedAppState, UnifiedAppAction, CommandConfig, Project, BatchResult, OperationResult } from "../types/index.ts";
 
 /**
  * Dependencies that can be injected for testing
@@ -34,10 +38,151 @@ export interface KeyBindingDeps {
 
 interface UseKeyBindingsOptions {
   config: GitforestConfig;
-  onRefresh: () => Promise<void>;
+  onRefresh: (options?: { forceRefresh?: boolean }) => Promise<void>;
   deps?: Partial<KeyBindingDeps>;
 }
 
+/**
+ * Handle input in filter mode.
+ * Returns true if input was handled.
+ */
+function handleFilterMode(
+  key: Key,
+  dispatch: React.Dispatch<UnifiedAppAction>,
+): boolean {
+  if (key.escape) {
+    dispatch(setMode("normal"));
+    dispatch(setFilter(""));
+    return true;
+  }
+  if (key.return) {
+    dispatch(setMode("normal"));
+    return true;
+  }
+  return true; // Let TextInput handle other keys
+}
+
+/**
+ * Handle input in detail modal mode.
+ * Returns true if input was fully handled, false if it should fall through to normal mode.
+ */
+async function handleDetailMode(
+  input: string,
+  key: Key,
+  state: UnifiedAppState,
+  dispatch: React.Dispatch<UnifiedAppAction>,
+): Promise<boolean> {
+  if (key.escape) {
+    dispatch({ type: "HIDE_DETAIL_MODAL" });
+    return true;
+  }
+  // j/k to scroll README
+  if (input === "j") {
+    dispatch({ type: "UPDATE_DETAIL_MODAL", payload: {
+      readmeScrollOffset: (state.detailModal?.readmeScrollOffset ?? 0) + 1,
+    }});
+    return true;
+  }
+  if (input === "k") {
+    dispatch({ type: "UPDATE_DETAIL_MODAL", payload: {
+      readmeScrollOffset: Math.max(0, (state.detailModal?.readmeScrollOffset ?? 0) - 1),
+    }});
+    return true;
+  }
+  // Actions that close modal and fall through to normal handling
+  if (input === "p" || input === "P" || input === "f") {
+    dispatch({ type: "HIDE_DETAIL_MODAL" });
+    return false; // Let input fall through to normal mode handling
+  }
+  if (input === "o") {
+    const repo = state.detailModal?.repo;
+    if (repo?.github?.htmlUrl) {
+      try {
+        await Bun.$`open ${repo.github.htmlUrl}`.quiet();
+      } catch (error) {
+        dispatch(setMessage(`Failed to open browser: ${errorToString(error)}`));
+      }
+    }
+    return true;
+  }
+  if (input === "d") {
+    const repo = state.detailModal?.repo;
+    if (repo?.localPath) {
+      const editor = process.env.EDITOR || "code";
+      try {
+        await Bun.$`${editor} ${repo.localPath}`.quiet();
+      } catch (error) {
+        dispatch(setMessage(`Failed to open editor: ${errorToString(error)}`));
+      }
+    }
+    return true;
+  }
+  return true; // Don't process other keys in detail mode
+}
+
+/**
+ * Handle input in filter options mode.
+ * Any key closes the overlay.
+ */
+function handleFilterOptionsMode(
+  dispatch: React.Dispatch<UnifiedAppAction>,
+): void {
+  dispatch(setMode("normal"));
+}
+
+/**
+ * Handle input in help mode.
+ * Any key closes the help overlay.
+ */
+function handleHelpMode(
+  dispatch: React.Dispatch<UnifiedAppAction>,
+): void {
+  dispatch(setMode("normal"));
+}
+
+/**
+ * Handle input in clone dialog mode.
+ * Returns true if input was handled.
+ */
+function handleCloneMode(
+  key: Key,
+  dispatch: React.Dispatch<UnifiedAppAction>,
+): boolean {
+  if (key.escape) {
+    dispatch({ type: "HIDE_CLONE_DIALOG" });
+    dispatch(setMode("normal"));
+    return true;
+  }
+  // Let CloneDialog handle other keys
+  return true;
+}
+
+/**
+ * Handle input in command palette mode.
+ * Returns true if input was handled.
+ */
+async function handleCommandPaletteMode(
+  input: string,
+  key: Key,
+  config: GitforestConfig,
+  dispatch: React.Dispatch<UnifiedAppAction>,
+  selectedUnifiedRepos: UnifiedRepo[],
+  findCommandByKey: (commands: CommandConfig[], key: string) => CommandConfig | undefined,
+  handleCommandExecution: (command: CommandConfig, repos: UnifiedRepo[]) => Promise<void>,
+): Promise<boolean> {
+  if (key.escape) {
+    dispatch(setMode("normal"));
+    return true;
+  }
+  const command = findCommandByKey(config.commands, input);
+  if (command) {
+    await handleCommandExecution(command, selectedUnifiedRepos);
+    dispatch(setMode("normal"));
+    return true;
+  }
+  return true;
+}
+
 export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOptions) {
   const { state, dispatch } = useStore();
   const { exit } = useApp();
@@ -84,8 +229,8 @@ export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOption
       if (result.success) {
         if (result.output) {
           // Show truncated output
-          const shortOutput = result.output.length > 50 
-            ? result.output.slice(0, 50) + "..." 
+          const shortOutput = result.output.length > UI.OUTPUT_TRUNCATION_LENGTH
+            ? result.output.slice(0, UI.OUTPUT_TRUNCATION_LENGTH) + "..."
             : result.output;
           dispatch(setMessage(`${command.name}: ${shortOutput}`));
         } else {
@@ -96,7 +241,7 @@ export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOption
       }
     } catch (error) {
       dispatch(endAction());
-      dispatch(setMessage(`${command.name} failed: ${error instanceof Error ? error.message : String(error)}`));
+      dispatch(setMessage(`${command.name} failed: ${errorToString(error)}`));
     }
   }
 
@@ -111,9 +256,11 @@ export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOption
           const content = await file.text();
           return { content, error: null };
         }
-      } catch {}
+      } catch {
+        // Expected: README may not exist locally
+      }
     }
-    
+
     // Try GitHub API
     if (repo.github) {
       try {
@@ -130,125 +277,25 @@ export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOption
           const content = await response.text();
           return { content, error: null };
         }
-      } catch {}
+      } catch {
+        // Expected: repo may not have a README on GitHub
+      }
     }
-    
+
     return { content: null, error: "README not found" };
   }
 
   useInput(async (input, key) => {
     const { mode, cursorIndex, selectedIndices } = state;
 
-    // Handle filter mode separately
-    if (mode === "filter") {
-      if (key.escape) {
-        dispatch(setMode("normal"));
-        dispatch(setFilter(""));
-        return;
-      }
-      if (key.return) {
-        dispatch(setMode("normal"));
-        return;
-      }
-      // Let TextInput handle other keys
-      return;
-    }
-
-    // Handle detail modal mode
-    if (mode === "detail") {
-      if (key.escape) {
-        dispatch({ type: "HIDE_DETAIL_MODAL" });
-        return;
-      }
-      // j/k to scroll README
-      if (input === "j") {
-        dispatch({ type: "UPDATE_DETAIL_MODAL", payload: { 
-          readmeScrollOffset: (state.detailModal?.readmeScrollOffset ?? 0) + 1 
-        }});
-        return;
-      }
-      if (input === "k") {
-        dispatch({ type: "UPDATE_DETAIL_MODAL", payload: { 
-          readmeScrollOffset: Math.max(0, (state.detailModal?.readmeScrollOffset ?? 0) - 1)
-        }});
-        return;
-      }
-      // Actions in modal - these should trigger the onAction callback
-      // For now, just close modal and perform action
-      if (input === "p" || input === "P" || input === "f") {
-        // Let the existing handlers work, but close modal first
-        dispatch({ type: "HIDE_DETAIL_MODAL" });
-        // Don't return - let it fall through to normal handling
-      }
-      if (input === "o") {
-        // Open in browser - need to implement
-        const repo = state.detailModal?.repo;
-        if (repo?.github?.htmlUrl) {
-          // Use Bun to open URL
-          try {
-            await Bun.$`open ${repo.github.htmlUrl}`.quiet();
-          } catch (error) {
-            dispatch(setMessage(`Failed to open browser: ${errorToString(error)}`));
-          }
-        }
-        return;
-      }
-      if (input === "d") {
-        // Open in editor
-        const repo = state.detailModal?.repo;
-        if (repo?.localPath) {
-          const editor = process.env.EDITOR || "code";
-          try {
-            await Bun.$`${editor} ${repo.localPath}`.quiet();
-          } catch (error) {
-            dispatch(setMessage(`Failed to open editor: ${errorToString(error)}`));
-          }
-        }
-        return;
-      }
-      return; // Don't process other keys in detail mode
-    }
-
-    // Handle filter options mode
-    if (mode === "filter-options") {
-      // Any key closes the overlay
-      dispatch(setMode("normal"));
-      return;
-    }
-
-    // Handle help mode
-    if (mode === "help") {
-      dispatch(setMode("normal"));
-      return;
-    }
-
-    // Handle clone dialog mode
-    if (mode === "clone") {
-      if (key.escape) {
-        dispatch({ type: "HIDE_CLONE_DIALOG" });
-        dispatch(setMode("normal"));
-        return;
-      }
-      // Let CloneDialog handle other keys
-      return;
-    }
-
-    // Handle command palette mode
-    if (mode === "command-palette") {
-      if (key.escape) {
-        dispatch(setMode("normal"));
-        return;
-      }
-      
-      // Find and execute command by key
-      const command = findCommandByKey(config.commands, input);
-      if (command) {
-        await handleCommandExecution(command, selectedUnifiedRepos);
-        dispatch(setMode("normal"));
-        return;
-      }
-      return;
-    }
+    // Dispatch to mode-specific handlers
+    if (mode === "filter" && handleFilterMode(key, dispatch)) return;
+    if (mode === "detail" && await handleDetailMode(input, key, state, dispatch)) return;
+    if (mode === "filter-options") { handleFilterOptionsMode(dispatch); return; }
+    if (mode === "help") { handleHelpMode(dispatch); return; }
+    if (mode === "clone" && handleCloneMode(key, dispatch)) return;
+    if (mode === "add-directory") return; // Let AddDirectoryDialog handle all keys
+    if (mode === "command-palette" && await handleCommandPaletteMode(input, key, config, dispatch, selectedUnifiedRepos, findCommandByKey, handleCommandExecution)) return;
 
     // Global keys that work in any mode
     if (input === "q" || (key.ctrl && input === "c")) {
@@ -280,8 +327,7 @@ export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOption
     // Tab - cycle view mode
     if (key.tab) {
       const modes: ViewMode[] = ["local", "github", "combined"];
-      const unifiedState = state as any;
-      const currentMode: ViewMode = unifiedState.viewMode || "local";
+      const currentMode: ViewMode = state.viewMode || "local";
       const currentIdx = modes.indexOf(currentMode);
       if (currentIdx === -1) return; // Safety check
       const nextIdx = (currentIdx + 1) % modes.length;
@@ -335,8 +381,7 @@ export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOption
     }
 
     if (input === "G") {
-      const unifiedState = state as any;
-      const currentViewMode = unifiedState.viewMode || "combined";
+      const currentViewMode = state.viewMode || "combined";
       const itemCount = currentViewMode === "local" ? filteredProjects.length : filteredUnifiedRepos.length;
       dispatch(moveCursor(itemCount - 1));
       return;
@@ -349,8 +394,7 @@ export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOption
     }
 
     if (input === "a") {
-      const unifiedState = state as any;
-      const currentViewMode = unifiedState.viewMode || "combined";
+      const currentViewMode = state.viewMode || "combined";
       const itemCount = currentViewMode === "local" ? filteredProjects.length : filteredUnifiedRepos.length;
       if (selectedIndices.size === itemCount) {
         dispatch(deselectAll());
@@ -412,10 +456,10 @@ export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOption
       return;
     }
 
-    // Refresh
+    // Refresh (force rescan to pick up config/filesystem changes)
     if (input === "r") {
       dispatch({ type: "SET_REFRESHING", payload: true });
-      await onRefresh();
+      await onRefresh({ forceRefresh: true });
       dispatch({ type: "SET_REFRESHING", payload: false });
       dispatch(setMessage("Refresh complete"));
       return;
@@ -458,7 +502,7 @@ export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOption
       }
 
       // Refresh after success to reflect latest state
-      await onRefresh();
+      await onRefresh({ forceRefresh: true });
       return;
     }
 
@@ -488,7 +532,7 @@ export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOption
         dispatch(setMessage(`Pulled ${result.successful} projects successfully`));
       }
 
-      await onRefresh();
+      await onRefresh({ forceRefresh: true });
       return;
     }
 
@@ -518,7 +562,7 @@ export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOption
         dispatch(setMessage(`Fetched ${result.successful} projects`));
       }
 
-      await onRefresh();
+      await onRefresh({ forceRefresh: true });
       return;
     }
 
@@ -545,7 +589,7 @@ export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOption
       );
 
       // Refresh after init
-      await onRefresh();
+      await onRefresh({ forceRefresh: true });
       return;
     }
 
@@ -643,6 +687,12 @@ export function useKeyBindings({ config, onRefresh, deps }: UseKeyBindingsOption
       return;
     }
 
+    // + key - Add a directory to scan
+    if (input === "+") {
+      dispatch(showAddDirectoryDialog());
+      return;
+    }
+
     // Custom commands - check if input matches a configured command key
     // This allows executing commands directly from main list without command palette
     if (config.commands.length > 0) {

package/src/hooks/useUnifiedRepos.ts

@@ -120,65 +120,75 @@ export function useUnifiedRepos(config: GitforestConfig) {
 
   /**
    * Main load function - smart loading with cache-first strategy
+   * @param options.forceRefresh - Skip cache and perform a full rescan (e.g. after config changes)
    */
-  const loadUnifiedRepos = useCallback(async () => {
+  const loadUnifiedRepos = useCallback(async (options?: { forceRefresh?: boolean }) => {
+    const forceRefresh = options?.forceRefresh ?? false;
+
     // If we already have data, don't show loading state
     const hasExistingData = state.unifiedRepos.length > 0;
-    
+
     if (!hasExistingData) {
       dispatch(setLoading(true));
     }
     dispatch({ type: "SET_GITHUB_ERROR", payload: null });
 
     try {
-      // Step 1: Load from cache instantly
-      const { localProjects, githubRepos, hasCachedData } = await loadFromCacheInstantly();
-
-      if (hasCachedData) {
-        // We have cached data - refresh in background
-        hasLoadedRef.current = true;
-        
-        // Check if cache is stale and needs refresh
-        const now = Date.now();
-        const isLocalStale = localProjects.some(p => 
-          now - p.lastScanned.getTime() > config.cache.ttlSeconds * 1000
-        );
-        
-        if (isLocalStale) {
-          // Refresh in background without blocking
-          refreshInBackground(localProjects, githubRepos);
+      // If forceRefresh, skip cache entirely and do a full scan
+      if (!forceRefresh) {
+        // Step 1: Load from cache instantly
+        const { localProjects, githubRepos, hasCachedData } = await loadFromCacheInstantly();
+
+        if (hasCachedData) {
+          // We have cached data - refresh in background
+          hasLoadedRef.current = true;
+
+          // Check if cache is stale or doesn't cover all configured directories
+          const now = Date.now();
+          const isLocalStale = localProjects.some(p =>
+            now - p.lastScanned.getTime() > config.cache.ttlSeconds * 1000
+          );
+          const allDirsCovered = config.directories.every(dir =>
+            localProjects.some(p => p.path.startsWith(dir.path))
+          );
+
+          if (isLocalStale || !allDirsCovered) {
+            // Refresh in background without blocking
+            refreshInBackground(localProjects, githubRepos);
+          }
+          return;
         }
-      } else {
-        // No cache - do full load with loading indicator
-        dispatch(setLoading(true));
-        dispatch({ type: "SET_GITHUB_LOADING", payload: true });
-
-        const [freshLocalProjects, githubResult] = await Promise.all([
-          scanWithCache(config, { forceRefresh: true }),
-          fetchGitHubReposWithCache({
-            includeArchived: false,
-            includeForks: true,
-            includeOrgs: true,
-          }, config.cache.githubTtlSeconds),
-        ]);
-
-        const sorted = sortProjects(freshLocalProjects, sortBy, sortDirection);
-        dispatch(setProjects(sorted));
+      }
 
-        const unified = createUnifiedView(freshLocalProjects, githubResult.repos);
-        dispatch({ type: "SET_GITHUB_REPOS", payload: githubResult.repos });
-        dispatch({ type: "SET_UNIFIED_REPOS", payload: unified });
+      // No cache or forced refresh - do full load with loading indicator
+      dispatch(setLoading(true));
+      dispatch({ type: "SET_GITHUB_LOADING", payload: true });
 
-        if (githubResult.error) {
-          dispatch({ type: "SET_GITHUB_ERROR", payload: githubResult.error });
-        }
+      const [freshLocalProjects, githubResult] = await Promise.all([
+        scanWithCache(config, { forceRefresh: true }),
+        fetchGitHubReposWithCache({
+          includeArchived: false,
+          includeForks: true,
+          includeOrgs: true,
+        }, config.cache.githubTtlSeconds),
+      ]);
 
-        const localCount = unified.filter(r => r.source === "local" || r.source === "both").length;
-        const githubOnlyCount = unified.filter(r => r.source === "github").length;
-        dispatch(setMessage(`Found ${localCount} local, ${githubOnlyCount} GitHub-only repos`));
+      const sorted = sortProjects(freshLocalProjects, sortBy, sortDirection);
+      dispatch(setProjects(sorted));
 
-        hasLoadedRef.current = true;
+      const unified = createUnifiedView(freshLocalProjects, githubResult.repos);
+      dispatch({ type: "SET_GITHUB_REPOS", payload: githubResult.repos });
+      dispatch({ type: "SET_UNIFIED_REPOS", payload: unified });
+
+      if (githubResult.error) {
+        dispatch({ type: "SET_GITHUB_ERROR", payload: githubResult.error });
       }
+
+      const localCount = unified.filter(r => r.source === "local" || r.source === "both").length;
+      const githubOnlyCount = unified.filter(r => r.source === "github").length;
+      dispatch(setMessage(`Found ${localCount} local, ${githubOnlyCount} GitHub-only repos`));
+
+      hasLoadedRef.current = true;
     } catch (error) {
       dispatch(setError(errorToString(error)));
     } finally {

package/src/index.tsx

@@ -22,6 +22,7 @@ import {
   loginGitHub,
   logoutGitHub,
   handleConfigCommand,
+  handleDirCommand,
 } from "./cli/index.ts";
 import { clearCache, getCacheStats } from "./scanner/index.ts";
 import type { ViewMode, GitforestConfig } from "./types/index.ts";
@@ -45,6 +46,13 @@ Commands:
   create-repos             Create GitHub repos for projects without remotes
   archive <repos...>       Archive GitHub repositories
 
+Directory Commands:
+  dir                      List configured directories (alias: dirs)
+  dir list                 List configured directories
+  dir add <path>           Add a directory to scan
+  dir remove <path|index>  Remove a directory from config
+  dir set <path|index>     Update directory settings
+
 GitHub Commands:
   login                    Login to GitHub (opens browser)
   logout                   Logout from GitHub
@@ -62,13 +70,16 @@ Cache Commands:
 Options:
   --init                   Create default config file
   --help, -h               Show this help message
-  --json                   Output as JSON (for list, status, dirty)
+  --json                   Output as JSON (for list, status, dirty, dir list)
   --verbose, -v            Verbose output
   --filter, -f <text>      Filter projects by name/path
   --public                 Create public repos (default: private)
   --local                  Show local repos only (github command)
   --combined               Show all repos (github command)
   --target, -t <dir>       Target directory for clone
+  --max-depth <n>          Max scan depth (for dir add/set)
+  --label <text>           Label for directory (for dir add/set)
+  --editor <cmd>           Editor override (for dir set)
 
 Environment:
   GITHUB_TOKEN             GitHub personal access token for API access
@@ -97,6 +108,7 @@ TUI Keyboard shortcuts:
   3               Show no-remote projects
   s               Cycle sort
   v               Cycle view (local/github/combined)
+  +               Add directory to scan
   r               Refresh
   ?               Help
   q               Quit
@@ -106,6 +118,13 @@ Examples:
   gitforest list                      # List all local projects
   gitforest list --json               # List as JSON
   gitforest status                    # Show local status summary
+  gitforest dir                       # List configured directories
+  gitforest dir add ~/work            # Add a directory to scan
+  gitforest dir add ~/oss --max-depth 3 --label "Open Source"
+  gitforest dir remove ~/old          # Remove a directory
+  gitforest dir remove 2              # Remove by index
+  gitforest dir set 1 --max-depth 4   # Update scan depth
+  gitforest dir set ~/work --label "Work Projects"
   gitforest unified-status            # Show status with GitHub repos
   gitforest github                    # List GitHub repos not cloned
   gitforest github --combined         # List all repos
@@ -170,9 +189,10 @@ function parseArgs(args: string[]): {
   // Known flags
   const knownLongFlags = new Set([
     'init', 'help', 'json', 'verbose', 'filter', 'target',
-    'public', 'local', 'combined', 'https', 'max-depth'
+    'public', 'local', 'combined', 'https', 'max-depth',
+    'label', 'editor', 'depth',
   ]);
-  const flagsWithValues = new Set(['filter', 'target', 'max-depth']);
+  const flagsWithValues = new Set(['filter', 'target', 'max-depth', 'label', 'editor', 'depth']);
 
 
   const shortFlagMap: Record<string, string> = {
@@ -254,16 +274,16 @@ async function runOnboardingWizard(): Promise<void> {
   };
 
   // Render onboarding wizard
-  const { waitUntilExit, unmount } = render(
+  const instance = render(
     <OnboardingWizard
       onComplete={handleComplete}
       onCancel={handleCancel}
-      onUnmount={unmount}
+      onUnmount={() => instance.unmount()}
     />
   );
 
   // Wait for completion or cancellation
-  await waitUntilExit();
+  await instance.waitUntilExit();
 
   if (cancelled) {
     console.log("\nOnboarding cancelled. Run 'gitforest --init' to create a default config.");
@@ -456,13 +476,34 @@ async function main() {
           }
           break;
 
+        case "dir":
+        case "dirs":
+        case "directories": {
+          const label = typeof flags["label"] === "string" ? flags["label"] : undefined;
+          const editor = typeof flags["editor"] === "string" ? flags["editor"] : undefined;
+          const dirOptions = { ...cliOptions, label, editor };
+          if (positional.length === 0) {
+            await handleDirCommand("list", [], dirOptions);
+          } else {
+            await handleDirCommand(positional[0]!, positional.slice(1), dirOptions);
+          }
+          break;
+        }
+
         case "config":
           if (positional.length === 0) {
             console.error("Error: Missing config subcommand");
             console.log("Usage: gitforest config add-dir <path>");
             process.exit(1);
           }
-          await handleConfigCommand(positional[0]!, positional.slice(1), cliOptions);
+          // Legacy: redirect config add-dir to dir add
+          if (positional[0] === "add-dir") {
+            const label = typeof flags["label"] === "string" ? flags["label"] : undefined;
+            const editor = typeof flags["editor"] === "string" ? flags["editor"] : undefined;
+            await handleDirCommand("add", positional.slice(1), { ...cliOptions, label, editor });
+          } else {
+            await handleConfigCommand(positional[0]!, positional.slice(1), cliOptions);
+          }
           break;
 
         default: