sync: port duplicate workspace roots guard and record July 16 upstream ancestry (#3829) by aaditagrawal · Pull Request #158 · aaditagrawal/t3code

aaditagrawal · 2026-07-16T09:20:26Z

What changed

Ports duplicate project workspace roots prevention across orchestration, shared path helpers, client-runtime, and sidebar grouping (#3829).
Records upstream ancestry through July 16 so origin/main is zero behind upstream/main after merge.
Preserves fork: keeps fork Cursor SDK test harness (skips upstream ACP-stdio cancel hunk that does not apply).

Validation

vp check / vp run typecheck — pass
Focused server/web/shared/client-runtime tests for this slice — pass
git rev-list --left-right --count HEAD...upstream/main → 911 0
CI: pending

Stack: 4 of 4; depends on #157.

pingdotgg#3978)

…otgg#3991)

…ive links (pingdotgg#3992)

Co-authored-by: codex <codex@users.noreply.github.com>

coderabbitai · 2026-07-16T09:20:33Z

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: a9afaab1-3a70-4795-b774-601a46322bcc

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/20260716-workspace-roots

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.}

aaditagrawal · 2026-07-16T09:20:44Z

sync: port duplicate workspace roots guard and record July 16 upstream ancestry (#3829) #158 👈 (View in Graphite)
sync: port upstream native diff highlighter and macOS fullscreen titlebar (#4029, #4019) #157
sync: port upstream web status animations, onboarding, markdown lists (#3978, #4001, #4020) #156
sync: port upstream docs fixes and legal docs (#3990–#3992, #3972, #4000) #155
main

This stack of pull requests is managed by Graphite. Learn more about stacking.

aaditagrawal · 2026-07-16T09:21:24Z

@coderabbitai review

coderabbitai · 2026-07-16T09:21:30Z

✅ Action performed

Review finished.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9f5a104857

ℹ️ 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".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 20a2420a45

ℹ️ 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".

chatgpt-codex-connector · 2026-07-16T09:48:45Z

+      yield* requireActiveProjectWorkspaceRootAbsent({
+        readModel,
+        command,
+        workspaceRoot: command.workspaceRoot,
+        exceptProjectId: command.projectId,
+      });


Handle normalized autobootstrap matches before create

When the web server auto-bootstrap path in serverRuntimeStartup.ts looks for an existing project, it uses ProjectionSnapshotQuery.getActiveProjectByWorkspaceRoot, which is an exact workspace_root = ... lookup. For an existing active row that differs only by formatting this guard now normalizes and rejects the project.create instead of letting auto-bootstrap reuse the existing project/thread, so databases with older /repo/ rows or Windows case variants fail to produce bootstrapped welcome targets. Normalize the lookup/reuse path or translate this duplicate into the existing project before dispatching create.

Useful? React with 👍 / 👎.

pingdotgg#3978) (cherry picked from commit 2fdc704)

Co-authored-by: codex <codex@users.noreply.github.com> (cherry picked from commit b982337)

Co-authored-by: codex <codex@users.noreply.github.com> (cherry picked from commit 54f167e)

(cherry picked from commit 5e8b2c8)

(cherry picked from commit 0418301)

Cherry-pick of upstream d114e27 (Prevent duplicate project workspace roots). Adds requireActiveProjectWorkspaceRootAbsent invariant to the decider, normalizeProjectPathForComparison/normalizeProjectPathForDispatch moved to packages/shared/src/path.ts, and sidebar project-grouping dedupe-by-physical-key logic (prefers the primary environment's member, then freshest updatedAt/createdAt, then highest id). apps/server/src/provider/Layers/CursorAdapter.test.ts is intentionally left unchanged: upstream's hunk there fixes an unrelated ACP-stdio session/cancel test behavior that has no equivalent in the fork's SDK-based Cursor adapter test harness, and is unrelated to the workspace-root invariant this commit otherwise ports. Co-authored-by: codex <codex@users.noreply.github.com>

–pingdotgg#3992, pingdotgg#3972, pingdotgg#4000, pingdotgg#4001, pingdotgg#4029, pingdotgg#4019, pingdotgg#3829, pingdotgg#4020).

aaditagrawal · 2026-07-16T10:01:54Z

Merge activity

Jul 16, 10:01 AM UTC: A user started a stack merge that includes this pull request via Graphite.
Jul 16, 10:06 AM UTC: Graphite couldn't merge this PR because it had merge conflicts.

t3dotgg and others added 11 commits July 15, 2026 09:08

perf(web): duty-cycle status animations and remove fixed noise overlay (

2fdc704

pingdotgg#3978)

fix(docs): correct CI task-runner commands in ci.md (pingdotgg#3990)

7b928d5

fix(docs): repair broken source links in architecture overview (pingd…

c69120f

…otgg#3991)

fix(docs): replace stale codething-mvp absolute paths with repo-relat…

4624426

…ive links (pingdotgg#3992)

docs: Add T3 Code Legal Docs (pingdotgg#3972)

d359789

Co-authored-by: codex <codex@users.noreply.github.com>

Fix Legal modal header crash (pingdotgg#4000)

ecb35f7

Co-authored-by: codex <codex@users.noreply.github.com>

[codex] Fix onboarding connection status (pingdotgg#4001)

b982337

Co-authored-by: codex <codex@users.noreply.github.com>

Isolate native diff highlight grammar state (pingdotgg#4029)

5e8b2c8

Fix macOS fullscreen titlebar spacing (pingdotgg#4019)

0418301

Prevent duplicate project workspace roots (pingdotgg#3829)

d114e27

Co-authored-by: codex <codex@users.noreply.github.com>

Normalize over-indented markdown list items (pingdotgg#4020)

54f167e

Co-authored-by: codex <codex@users.noreply.github.com>

aaditagrawal mentioned this pull request Jul 16, 2026

sync: port upstream docs fixes and legal docs (#3990–#3992, #3972, #4000) #155

Merged

This was referenced Jul 16, 2026

sync: port upstream web status animations, onboarding, markdown lists (#3978, #4001, #4020) #156

Merged

sync: port upstream native diff highlighter and macOS fullscreen titlebar (#4029, #4019) #157

Merged

github-actions Bot added the vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. label Jul 16, 2026

aaditagrawal changed the title ~~sync: port upstream duplicate workspace roots guard (#3829)~~ sync: port duplicate workspace roots guard and record July 16 upstream ancestry (#3829) Jul 16, 2026

github-actions Bot added the size:L 100-499 effective changed lines (test files excluded in mixed PRs). label Jul 16, 2026

aaditagrawal force-pushed the sync/20260716-workspace-roots branch from 7b3a640 to 9f5a104 Compare July 16, 2026 09:33

aaditagrawal force-pushed the sync/20260716-mobile-desktop branch from c24c2c1 to 5c6da4e Compare July 16, 2026 09:33

chatgpt-codex-connector Bot reviewed Jul 16, 2026

View reviewed changes

Comment thread apps/web/src/sidebarProjectGrouping.ts

aaditagrawal force-pushed the sync/20260716-workspace-roots branch from 9f5a104 to 10a8aa4 Compare July 16, 2026 09:40

aaditagrawal force-pushed the sync/20260716-mobile-desktop branch from 5c6da4e to 34b0027 Compare July 16, 2026 09:40

chatgpt-codex-connector Bot reviewed Jul 16, 2026

View reviewed changes

aaditagrawal force-pushed the sync/20260716-workspace-roots branch from 20a2420 to 4a940ef Compare July 16, 2026 09:49

aaditagrawal force-pushed the sync/20260716-mobile-desktop branch from 34b0027 to 4025f28 Compare July 16, 2026 09:49

perf(web): duty-cycle status animations and remove fixed noise overlay (

52afe17

pingdotgg#3978) (cherry picked from commit 2fdc704)

juliusmarminge and others added 8 commits July 16, 2026 15:20

[codex] Fix onboarding connection status (pingdotgg#4001)

b1901df

Co-authored-by: codex <codex@users.noreply.github.com> (cherry picked from commit b982337)

Normalize over-indented markdown list items (pingdotgg#4020)

84657ee

Co-authored-by: codex <codex@users.noreply.github.com> (cherry picked from commit 54f167e)

fix(web): allow reconnect for saved idle/error cloud environments

3a2d533

Isolate native diff highlight grammar state (pingdotgg#4029)

e3cd2ec

(cherry picked from commit 5e8b2c8)

Fix macOS fullscreen titlebar spacing (pingdotgg#4019)

1ced949

(cherry picked from commit 0418301)

fix(web): keep duplicate project refs for sidebar thread lookup

07612d4

Record upstream ancestry through July 16 (pingdotgg#3978, pingdotgg#3990

7009cae

–pingdotgg#3992, pingdotgg#3972, pingdotgg#4000, pingdotgg#4001, pingdotgg#4029, pingdotgg#4019, pingdotgg#3829, pingdotgg#4020).

aaditagrawal force-pushed the sync/20260716-workspace-roots branch from 4a74aa1 to 7009cae Compare July 16, 2026 09:50

aaditagrawal force-pushed the sync/20260716-mobile-desktop branch from 4025f28 to 1ced949 Compare July 16, 2026 09:50

aaditagrawal changed the base branch from sync/20260716-mobile-desktop to graphite-base/158 July 16, 2026 10:04

aaditagrawal changed the base branch from graphite-base/158 to main July 16, 2026 10:05

aaditagrawal merged commit 715e170 into main Jul 16, 2026
21 of 23 checks passed

aaditagrawal mentioned this pull request Jul 16, 2026

sync: port localhost preview URL resolution and record July 16 ancestry (#4011) #159

Merged

aaditagrawal deleted the sync/20260716-workspace-roots branch August 1, 2026 19:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sync: port duplicate workspace roots guard and record July 16 upstream ancestry (#3829) - #158

sync: port duplicate workspace roots guard and record July 16 upstream ancestry (#3829)#158
aaditagrawal merged 20 commits into
mainfrom
sync/20260716-workspace-roots

aaditagrawal commented Jul 16, 2026 •

edited

Loading

Uh oh!

coderabbitai Bot commented Jul 16, 2026 •

edited

Loading

Review skipped

Uh oh!

aaditagrawal commented Jul 16, 2026 •

edited

Loading

Uh oh!

aaditagrawal commented Jul 16, 2026

Uh oh!

coderabbitai Bot commented Jul 16, 2026 •

edited

Loading

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

chatgpt-codex-connector Bot Jul 16, 2026

Uh oh!

aaditagrawal commented Jul 16, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

aaditagrawal commented Jul 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What changed

Validation

Uh oh!

coderabbitai Bot commented Jul 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

aaditagrawal commented Jul 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aaditagrawal commented Jul 16, 2026

Uh oh!

coderabbitai Bot commented Jul 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jul 16, 2026

Choose a reason for hiding this comment

Uh oh!

aaditagrawal commented Jul 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge activity

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

aaditagrawal commented Jul 16, 2026 •

edited

Loading

coderabbitai Bot commented Jul 16, 2026 •

edited

Loading

aaditagrawal commented Jul 16, 2026 •

edited

Loading

coderabbitai Bot commented Jul 16, 2026 •

edited

Loading

aaditagrawal commented Jul 16, 2026 •

edited

Loading