Skip to content

Fix PR creation from origin-based worktrees (#3218) - #119

Merged
aaditagrawal merged 28 commits into
mainfrom
sync/upstream-20260619-ui-settings-imports
Jun 24, 2026
Merged

Fix PR creation from origin-based worktrees (#3218)#119
aaditagrawal merged 28 commits into
mainfrom
sync/upstream-20260619-ui-settings-imports

Conversation

@aaditagrawal

Copy link
Copy Markdown
Owner

What Changed

Why

UI Changes

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes
  • I included a video for animation/interaction changes

juliusmarminge and others added 15 commits June 19, 2026 23:38
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@coderabbitai

coderabbitai Bot commented Jun 24, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 705f90e3-ae81-4815-9be1-9385c86b70ae

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch sync/upstream-20260619-ui-settings-imports

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added size:XXL 1,000+ effective changed lines (test files excluded in mixed PRs). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Jun 24, 2026
aaditagrawal added 13 commits June 24, 2026 12:21
… sync/upstream-20260619-ui-settings-imports

# Conflicts:
#	apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts
… sync/upstream-20260619-ui-settings-imports
… sync/upstream-20260619-ui-settings-imports
… sync/upstream-20260619-ui-settings-imports
… sync/upstream-20260619-ui-settings-imports
… sync/upstream-20260619-ui-settings-imports
… sync/upstream-20260619-ui-settings-imports
… sync/upstream-20260619-ui-settings-imports
… sync/upstream-20260619-ui-settings-imports
… sync/upstream-20260619-ui-settings-imports
@aaditagrawal
aaditagrawal marked this pull request as ready for review June 24, 2026 08:45
@aaditagrawal
aaditagrawal changed the base branch from sync/upstream-20260619-effect-service-foundations to main June 24, 2026 08:53
@aaditagrawal
aaditagrawal merged commit 2a5c9b1 into main Jun 24, 2026
26 of 28 checks passed

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 90614b8775

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment on lines +167 to +174
const absolutePath = path.resolve(input.workspaceRoot, normalizedInputPath);
const relativeToRoot = toPosixRelativePath(path.relative(input.workspaceRoot, absolutePath));
if (
relativeToRoot.length === 0 ||
relativeToRoot === "." ||
relativeToRoot.startsWith("../") ||
relativeToRoot === ".." ||
path.isAbsolute(relativeToRoot)

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Restore realpath checks for workspace-relative paths

When relativePath traverses a symlinked directory inside the workspace (for example link -> /tmp and link/out.txt), this lexical path.relative check still treats the path as inside the root. WorkspaceFileSystem.writeFile relies on this resolver and then writes target.absolutePath without its own realpath recheck, so a workspace can cause writes outside the project root; the previous resolver resolved real paths/deepest existing ancestors before allowing the path.

Useful? React with 👍 / 👎.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL 1,000+ effective changed lines (test files excluded in mixed PRs). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants