Hotfix multiple folder workspace checkpoint #6903
Conversation
dosubot
bot
added
size:XS
NaccOll
force-pushed
the
hotfix-multiple-folder-workspace-checkpoint
branch
from
ded505d to
e05e5a6
Compare
![roomote[bot]](https://avatars.githubusercontent.com/in/1546624?s=60&v=4){kind=small}
There was a problem hiding this comment.
Thank you for your contribution! I've reviewed the changes and found that the PR partially addresses issue #6897 but appears to be incomplete based on the description.
Missing Implementation:
The PR description mentions fixing both getCheckpointService() and codebaseSearchTool(), but I notice that codebaseSearchTool in src/core/tools/codebaseSearchTool.ts (line 20) still uses getWorkspacePath() directly instead of cline.cwd || getWorkspacePath(). Was this intentionally left out or should it be included in this PR?
|
|
||
| try { | ||
| const workspaceDir = getWorkspacePath() | ||
| const workspaceDir = cline.cwd || getWorkspacePath() |
There was a problem hiding this comment.
Is this change sufficient? Looking at the Task class implementation, cline.cwd is just a getter that returns this.workspacePath (lines 2286-2288 in Task.ts), which is already set from getWorkspacePath() during Task construction. This means cline.cwd || getWorkspacePath() might return the same value in both cases.
Could you clarify if there's a scenario where cline.cwd would differ from getWorkspacePath() in multi-folder workspaces?
There was a problem hiding this comment.
switch folder will cause incorrent
hannesrudolph
added
the
Issue/PR - Triage
hannesrudolph
added
PR - Needs Preliminary Review
and removed
Issue/PR - Triage
daniel-lxs
moved this from PR [Needs Prelim Review]
to PR [Needs Review]
in Roo Code Roadmap
github-project-automation
bot
moved this from PR [Needs Review]
to Done
in Roo Code Roadmap
* main: (70 commits) fix: use native Ollama API instead of OpenAI compatibility layer (RooCodeInc#7137) feat: add support for OpenAI gpt-5-chat-latest model (RooCodeInc#7058) Make enhance with task history default to true (RooCodeInc#7140) Bump cloud version to 0.16.0 (RooCodeInc#7135) Release: v1.51.0 (RooCodeInc#7130) Add an API for resuming tasks by ID (RooCodeInc#7122) Add support for task page event population (RooCodeInc#7117) fix: add type check before calling .match() on diffItem.content (RooCodeInc#6905) (RooCodeInc#6906) Fix: Enable save button for provider dropdown and checkbox changes (RooCodeInc#7113) fix: Use cline.cwd as primary source for workspace path in codebaseSearchTool (RooCodeInc#6902) Hotfix multiple folder workspace checkpoint (RooCodeInc#6903) fix: prevent XML entity decoding in diff tools (RooCodeInc#7107) (RooCodeInc#7108) Refactor task execution system: improve call stack management (RooCodeInc#7035) Changeset version bump (RooCodeInc#7104) feat(web): fill missing SEO-related values (RooCodeInc#7096) Update contributors list (RooCodeInc#6883) Release v3.25.15 (RooCodeInc#7103) fix: add /evals page to sitemap generation (RooCodeInc#7102) feat: implement sitemap generation in TypeScript and remove XML file (RooCodeInc#6206) fix: reset condensing state when switching tasks (RooCodeInc#6922) ...
4 participants
#6897
In multi-folder workspaces, mimic the history and index status, binding the dialog to the CWD when creating a new ChatView. This will prevent CWD switching during a conversation and further confusion.
Important
Fixes multi-folder workspace handling by using
cline.cwdfor workspace path determination ingetCheckpointService()andcodebaseSearchTool().getCheckpointService()inindex.ts, usecline.cwdas the workspace directory if available, preventing CWD switching during conversations.codebaseSearchTool()incodebaseSearchTool.ts, usecline.cwdas the workspace path if available, ensuring correct path determination.This description was created by
for ded505d6e8e1f24dc0070737ff34fe5543a8a5dd. You can customize this summary. It will automatically update as commits are pushed.