PR #26179: fix(directory): allow removing invalid or unwanted workspace directories

• Repository: google-gemini/gemini-cli
• Author: mini2s
• State: open | merged: False
• Link: https://github.com/google-gemini/gemini-cli/pull/26179

Description (problem / solution / changelog)

Summary

Fixes the inability to remove directories from the workspace context at runtime. Previously, once a directory was added (via --include-directories or /directory add), there was no way to remove it if it later became invalid (deleted, renamed, or inaccessible) or if the user simply wanted to narrow the working scope. This left stale or erroneous paths permanently in the session with no workaround other than restarting the CLI.

This change introduces the missing /directory remove sub-command so users can clean up their workspace on the fly.

Impact: Users can now remove stale or mistakenly added workspace directories by running /directory remove <path>[,<path>...].

Details

Problem

• After adding a directory to the workspace, it could never be removed during the same session.
• If the directory was later deleted or renamed, it remained in the workspace context and could cause confusion or errors.
• Users had to restart the CLI entirely just to correct an accidental or obsolete inclusion.

Fix

• Introduces /directory remove <paths> — a new sub-command under /directory that accepts one or more comma-separated directory paths.
• Tab completion — Only suggests directories that are currently in the workspace, making it easy to discover removable paths.
• CWD protection — The current working directory (targetDir) is protected from removal to prevent accidentally orphaning the session.
• Sandbox restriction — The command is blocked in restrictive sandbox profiles, consistent with the existing add behavior.
• Batching & feedback — Supports removing multiple directories in one call; reports success, not-found, and protected-path errors separately.

Core changes

• Added WorkspaceContext.removeDirectories() in packages/core/src/utils/workspaceContext.ts:
  • Resolves relative paths and symlinks before matching.
  • Returns { removed: string[], notFound: string[] }.
  • Emits a single onDirectoriesChanged event only when at least one directory is actually removed.
• Added batchRemoveDirectories() helper in packages/cli/src/ui/utils/directoryUtils.ts to bridge UI concerns with the core API.

Tests

• 76 new / updated tests across two test files, all passing:
  • packages/core/src/utils/workspaceContext.test.ts — 6 tests covering removal, relative-path resolution, mixed results, event emission, and CWD removal.
  • packages/cli/src/ui/commands/directoryCommand.test.tsx — 10 tests covering sandbox restriction, empty input, CWD protection, single/multiple removals, not-found handling, and tab completion.

Related Issues

<!-- No linked issue — this is a standalone feature addition. -->

https://github.com/google-gemini/gemini-cli/issues/26180

How to Validate

1. Start a Gemini CLI session with multiple directories:

   npx gemini-cli --include-directories /path/to/project1,/path/to/project2

2. List current directories to confirm they are loaded:

   /directory show

3. Remove one directory:

   /directory remove /path/to/project2

   Expect: Info message confirming removal.
4. Attempt to remove the CWD:

   /directory remove /path/to/project1

   Expect: Error message protecting the current working directory.
5. Try tab completion on /directory remove <TAB> — only currently-added directories should appear.
6. Run unit tests:

   npx vitest run packages/cli/src/ui/commands/directoryCommand.test.tsx packages/core/src/utils/workspaceContext.test.ts

   Expect: 76 tests passing.

Pre-Merge Checklist

<!-- Check all that apply before requesting review or merging. -->

• Updated relevant documentation and README (if needed)
• Added/updated tests (if needed)
• Noted breaking changes (if any) — None; this is a purely additive feature.
• Validated on required platforms/methods:
  • MacOS
    • npm run
    • npx
    • Docker
    • Podman
    • Seatbelt
  • Windows
    • npm run
    • npx
    • Docker
  • Linux
    • npm run
    • npx
    • Docker

Changed files

• packages/cli/src/ui/commands/directoryCommand.test.tsx (modified, +180/-0)
• packages/cli/src/ui/commands/directoryCommand.tsx (modified, +146/-0)
• packages/cli/src/ui/utils/directoryUtils.ts (modified, +20/-0)
• packages/core/src/utils/workspaceContext.test.ts (modified, +82/-0)
• packages/core/src/utils/workspaceContext.ts (modified, +40/-0)