[Worktree] Simplify optimization patch's path

[mohammedahmed18]

PR Type

Enhancement

---

Description

• Simplify patch storage path usage

• Remove project-scoped patch directories

• Drop cached project ID utilities

• Minor typing and import cleanup

---

Diagram Walkthrough

flowchart LR
  A["git_worktree_utils.py"] -- "remove project ID caching" --> B["delete get_git_project_id"]
  A -- "remove per-project patches dir" --> C["delete get_patches_dir_for_project"]
  A -- "write patches directly to patches_dir" --> D["update create_diff_patch_from_worktree"]

Loading

File Walkthrough

	Relevant files
Enhancement	git_worktree_utils.py Simplify patch path logic and cleanup                                        codeflash/code_utils/git_worktree_utils.py Remove cached project ID and helper functions Eliminate per-project patches directory resolution Write patch files directly under patches_dir Clean up unused imports and TYPE_CHECKING blocks +2/-27

---

[github-actions]

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

⏱️ Estimated effort to review: 2 🔵🔵⚪⚪⚪

🧪 No relevant tests

🔒 No security concerns identified

⚡ Recommended focus areas for review Directory existence The code writes directly to patches_dir without ensuring the directory exists. Confirm patches_dir is created elsewhere or add a mkdir to avoid runtime errors when writing the patch file. patch_path = Path(patches_dir / f"{worktree_dir.name}.{fto_name}.patch") with patch_path.open("w", encoding="utf8") as f: f.write(uni_diff_text) return patch_path Filename safety fto_name is interpolated into the patch filename without sanitization. If it contains path separators or unsafe characters, it may cause invalid paths or unintended directories. Consider normalizing or restricting allowed characters. patch_path = Path(patches_dir / f"{worktree_dir.name}.{fto_name}.patch") with patch_path.open("w", encoding="utf8") as f: f.write(uni_diff_text) return patch_path

[github-actions]

PR Code Suggestions ✨

Explore these optional code suggestions:

Category	Suggestion	Impact
Possible issue	Create output directory safely Ensure the target directory exists before writing the patch to avoid runtime failures. Create the patches_dir directory (and parents) when needed. codeflash/code_utils/git_worktree_utils.py [96-100] +(patches_dir).mkdir(parents=True, exist_ok=True) patch_path = Path(patches_dir / f"{worktree_dir.name}.{fto_name}.patch") with patch_path.open("w", encoding="utf8") as f: f.write(uni_diff_text) Suggestion importance[1-10]: 7 __ Why: The PR removed project-specific patch directory creation; ensuring patches_dir exists before writing prevents runtime errors and is directly applicable to the shown lines. The change is correct and low-risk, improving robustness.	Medium
General	Handle optional name safely Guard against None in fto_name to prevent filenames like '...None.patch'. Use a sensible default or omit the segment when fto_name is not provided. codeflash/code_utils/git_worktree_utils.py [96-100] -patch_path = Path(patches_dir / f"{worktree_dir.name}.{fto_name}.patch") +suffix = f".{fto_name}" if fto_name else "" +patch_path = Path(patches_dir / f"{worktree_dir.name}{suffix}.patch") Suggestion importance[1-10]: 6 __ Why: Since fto_name is Optional[str], guarding against None avoids creating filenames with 'None' and is contextually accurate. It's a minor but useful improvement to output correctness.	Low

[Saga4]

What benefit we were having with 1 object in cache?

[mohammedahmed18]

before I used to store patch files inside a directory that has the name of the first commit sha of the repo (to know later what directory the patches are located for each project)

so caching here to prevent getting the first commit sha on every run

[mohammedahmed18]

@Saga4
we don't need all of this now, since we are using the vscode workspace state
to store data for each workspace into the disk easily