feat(workspace): support additional directories via --add-dir and /add-dir#1271
Merged
feat(workspace): support additional directories via --add-dir and /add-dir#1271
Conversation
RealKai42
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds support for additional directories in workspace management, allowing users to extend the agent's file access scope beyond the primary working directory. This addresses use cases where projects need to access shared libraries or modules located outside the main project directory.
Changes:
- Added
is_within_workspace()utility function that checks path containment within work_dir or additional directories - Introduced
/add-dirslash command and--add-dirCLI flag for adding directories to workspace - Updated all file tools (Glob, ReadFile, WriteFile, StrReplaceFile, ReadMediaFile) to respect additional directories
- Added
additional_dirsfield to session state for persistence across sessions - Updated Runtime to manage and share additional directories with subagents
Reviewed changes
Copilot reviewed 19 out of 19 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/kimi_cli/utils/path.py | Adds is_within_workspace() helper that checks if path is within work_dir or any additional directory |
| src/kimi_cli/tools/file/glob.py | Updates Glob tool to accept paths in additional directories and changes error messages to refer to "workspace" |
| src/kimi_cli/tools/file/read.py | Updates ReadFile to support reading from additional directories |
| src/kimi_cli/tools/file/write.py | Updates WriteFile to support writing to additional directories |
| src/kimi_cli/tools/file/replace.py | Updates StrReplaceFile to support editing files in additional directories |
| src/kimi_cli/tools/file/read_media.py | Updates ReadMediaFile to support reading media from additional directories |
| src/kimi_cli/soul/agent.py | Adds additional_dirs management to Runtime including restoration from session state, pruning stale entries, and formatting for system prompt |
| src/kimi_cli/soul/slash.py | Implements /add-dir slash command with validation and redundancy checks |
| src/kimi_cli/session_state.py | Adds additional_dirs field to SessionState for persistence |
| src/kimi_cli/cli/init.py | Adds --add-dir CLI option and processes it during session initialization |
| src/kimi_cli/agents/default/system.md | Updates system prompt template to include additional directories information |
| tests/utils/test_is_within_workspace.py | Comprehensive tests for the new is_within_workspace utility function including prefix attack tests |
| tests/tools/test_additional_dirs.py | Integration tests covering all file tools with additional directories and dynamic mutation behavior |
| tests/test_additional_dirs_state.py | Tests for session state serialization and backward compatibility |
| tests/tools/test_glob.py | Updates error message assertions to match new "workspace" terminology |
| tests/conftest.py | Updates test fixtures to use Runtime instead of BuiltinSystemPromptArgs |
| tests/core/test_kimisoul_retry_recovery.py | Adds additional_dirs to Runtime reconstruction in test helper |
| tests/core/test_kimisoul_ralph_loop.py | Adds additional_dirs to Runtime reconstruction in test helper |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
src/kimi_cli/cli/__init__.py
Outdated
| for d in local_add_dirs: | ||
| dir_str = str(KaosPath.unsafe_from_local_path(d).canonical()) | ||
| # Skip dirs within work_dir (already accessible) | ||
| if dir_str == work_dir_str or dir_str.startswith(work_dir_str + "/"): |
There was a problem hiding this comment.
The path comparison using hardcoded "/" as separator is not Windows-compatible. On Windows, path separators are backslashes. Use the is_within_directory helper function which properly handles path hierarchy checks using PurePath.relative_to(), which works correctly across platforms.
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
This was referenced Feb 28, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR adds support for expanding the workspace scope with additional directories.
What changed
--add-dir(repeatable) to include extra directories in session workspace state./add-dirslash command to list/add directories at runtime.additional_dirsin session state and prune stale paths on runtime restore.is_within_workspace(...)and updated file tools (glob,read,read_media,write,replace) to allow paths under eitherwork_diror configured additional dirs.Tests
Checklist
make gen-changelogto update the changelog.make gen-docsto update the user documentation.