Skip to content

Conversation

jfcantu
Copy link

@jfcantu jfcantu commented Sep 29, 2025

Related GitHub Issue

Addresses: #8164

(I discussed this with @hannesrudolph on Discord, who indicated not to worry about creating a new issue.)

Roo Code Task Context (Optional)

Description

What:

  • Clarifies the error message shown when checkpointing cannot be enabled due to a Git repository existing below the workspace root.
  • Replace the term "nested" in checkpointing-related code with "child".

Why:
The term "nesting" can be confusing, as it implies the issue is "git repository inside a git repository", which may not be the case.

How:

  • Replaced the term "nested" with "child", which is clearer.
  • Rephrased the error message to be more informational, and added a link pointing to the Roo documentation.

Test Procedure

I ran pnpm test as described.

I received this error several times, but it appears to be related to my local build environment, not to my changes:

roo-cline:test: Error: require() of ES Module C:\jfc\src\roo\Roo-Code\node_modules\.pnpm\[email protected]\node_modules\brace-expansion\index.js from C:\jfc\src\roo\Roo-Code\node_modules\.pnpm\[email protected]\node_modules\minimatch\minimatch.js not supported.

Pre-Submission Checklist

  • [N/A] Issue Linked: This PR is linked to an approved GitHub Issue (see "Related GitHub Issue" above).
  • [Y] Scope: My changes are focused on the linked issue (one major feature/fix per PR).
  • [Y] Self-Review: I have performed a thorough self-review of my code.
  • [Y] Testing: New and/or updated tests have been added to cover my changes (if applicable).
  • [Y] Documentation Impact: I have considered if my changes require documentation updates (see "Documentation Updates" section below).
  • [Y] Contribution Guidelines: I have read and agree to the Contributor Guidelines.

Screenshots / Videos

Documentation Updates

PR for documentation update has been submitted: RooCodeInc/Roo-Code-Docs#373

Additional Notes

Get in Touch


Important

Clarified Git repository detection terminology in checkpointing by replacing 'nested' with 'child' and updated related error messages and tests.

  • Behavior:
    • Rephrased error message in common.json for Git repository detection, replacing 'nested' with 'child' and adding a documentation link.
    • Updated ShadowCheckpointService.ts to use 'child' instead of 'nested' in error handling and logging.
  • Functions:
    • Renamed getNestedGitRepository() to getChildGitRepository() in ShadowCheckpointService.ts.
  • Tests:
    • Updated test descriptions and expectations in ShadowCheckpointService.spec.ts to reflect terminology change from 'nested' to 'child'.

This description was created by Ellipsis for 3e1b9fc. You can customize this summary. It will automatically update as commits are pushed.

@hannesrudolph hannesrudolph added the Issue/PR - Triage New issue. Needs quick review to confirm validity and assign labels. label Sep 29, 2025
@hannesrudolph hannesrudolph marked this pull request as ready for review September 30, 2025 17:02
@Copilot Copilot AI review requested due to automatic review settings September 30, 2025 17:02
@hannesrudolph hannesrudolph requested a review from jr as a code owner September 30, 2025 17:02
@dosubot dosubot bot added the size:M This PR changes 30-99 lines, ignoring generated files. label Sep 30, 2025
@hannesrudolph hannesrudolph moved this from Triage to PR [Needs Prelim Review] in Roo Code Roadmap Sep 30, 2025
Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR clarifies the error message and terminology used when checkpointing cannot be enabled due to Git repositories existing below the workspace root. The changes replace the potentially confusing term "nested" with "child" throughout the codebase and improve the error message clarity.

  • Replaces "nested" terminology with "child" for better clarity
  • Updates error message to be more informative and includes documentation link
  • Updates corresponding test descriptions and variable names

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File Description
src/services/checkpoints/ShadowCheckpointService.ts Updates method names, variable names, and error messages from "nested" to "child" terminology
src/services/checkpoints/tests/ShadowCheckpointService.spec.ts Updates test descriptions, variable names, and expected error message patterns to match new terminology
src/i18n/locales/en/common.json Updates the internationalized error message with clearer wording and adds documentation link

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

const relativePath = path.relative(this.workspaceDir, nestedGitPath)
const message = t("common:errors.nested_git_repos_warning", { path: relativePath })
const relativePath = path.relative(this.workspaceDir, childGitPath)
const message = t("common:errors.child_git_repos_warning", { path: relativePath })
Copy link

Copilot AI Sep 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The translation key references 'child_git_repos_warning' but the JSON file still uses 'nested_git_repos_warning'. This will cause the translation to fail.

Copilot uses AI. Check for mistakes.

@dosubot dosubot bot added the documentation Improvements or additions to documentation label Sep 30, 2025
"checkpoint_failed": "Failed to restore checkpoint.",
"git_not_installed": "Git is required for the checkpoints feature. Please install Git to enable checkpoints.",
"nested_git_repos_warning": "Checkpoints are disabled because a nested git repository was detected at: {{path}}. To use checkpoints, please remove or relocate this nested git repository.",
"nested_git_repos_warning": "Checkpoints are disabled because a Git repository was detected below the workspace root at: {{path}}. To use checkpoints, please remove or relocate this git repository, or open a Git repository as the workspace root.\n\nFor more information, see https://docs.roocode.com/features/checkpoints#git-repositories-below-the-workspace-root",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typographical consistency: The string uses "Git repository" earlier but refers to it as "git repository" later on this line. Consider using a consistent capitalization (e.g., "Git repository") throughout.

Suggested change
"nested_git_repos_warning": "Checkpoints are disabled because a Git repository was detected below the workspace root at: {{path}}. To use checkpoints, please remove or relocate this git repository, or open a Git repository as the workspace root.\n\nFor more information, see https://docs.roocode.com/features/checkpoints#git-repositories-below-the-workspace-root",
"nested_git_repos_warning": "Checkpoints are disabled because a Git repository was detected below the workspace root at: {{path}}. To use checkpoints, please remove or relocate this Git repository, or open a Git repository as the workspace root.\n\nFor more information, see https://docs.roocode.com/features/checkpoints#git-repositories-below-the-workspace-root",

@hannesrudolph hannesrudolph added PR - Needs Preliminary Review and removed Issue/PR - Triage New issue. Needs quick review to confirm validity and assign labels. labels Sep 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation PR - Needs Preliminary Review size:M This PR changes 30-99 lines, ignoring generated files.

Projects

Status: PR [Needs Prelim Review]

Development

Successfully merging this pull request may close these issues.

2 participants