Repository navigation
fix(server): bare repositories now group with projects of the same remote - #17340
Conversation
ApprovabilityVerdict: Approved at Macroscope's review found this PR approvable — This is a narrowly scoped server-side bug fix that adds tested bare-repository detection while preserving normal checkout behavior. The contract change is documentation-only, and the runtime impact is limited to enabling existing repository identity and grouping flows for bare repositories. You can add or adjust custom eligibility rules. Learn more. |
|
Warning Review limit reachedOnly developers with an assigned seat can use this organization's usage-based review budget, and seats here are assigned manually. Ask an admin to assign a seat, or change the review continuation mode in Billing. Next included review available in 14 minutes. View limit details
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info
📝 Walkthrough
Merge Risk: ⚪ Minimal · up to
|
shrikantkalar023
left a comment
There was a problem hiding this comment.
self review done.
…mote `git rev-parse --show-toplevel` exits 128 in a bare repository, so bare-repo projects resolved no repository identity and never grouped with same-remote projects in other environments. When it fails, probe `--is-bare-repository --absolute-git-dir` and key bare repositories by their git dir. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
b512235 to
c0fe8a6
Compare
|
Taking over this one. I’ll preserve the original commits, merge main, and adapt bare-repository identity discovery around the current metadata fast path, with focused real-Git regression proof and independent reviews. |
Dismissing prior approval to re-evaluate 2e0a27b
Merges `pingdotgg/t3code` `main` at `e64766c56a` (367 commits from `143ab1606d`) into the fork. It branches from `main`; no other merge PR is open. ## Numbers - Landed: 2630 files from `git diff --stat HEAD^1 HEAD`, against 2629 in the upstream range. The gap: - Kept deleted: `pair.ts`, `pair.test.ts` and `useDiscoveredLocalServers.test.ts`. - Kept as fork files: `branding.test.ts` and `addBrowserSurface.test.ts`. - Extra on the merge side: four ported fork browser tests, `fork/ThreadParentLine.tsx` and `inventory.json`. - Fork delta: 812 files, down from 817. ## Conflicts (40, each by its preflight verdict) - **Upstream's test prune (pingdotgg#22557):** upstream's deletions win, fork-only tests stay, and fork adaptations of deleted upstream tests are dropped. - Upstream's deletion accepted for the `ThreadDetailsPrRows`, `PreviewEmptyState`, `previewEmptyStateLogic`, `projectScriptEditor.permissions` and `terminalSessionAvailability` tests. - Four fork browser tests are ported to the new `require-disposable-render` pattern: ThreadForkDialog, MoatlessArtifactChip, PreviewView.frame and MobileSidebarDrawer. - **`threadRoutes.ts`, `ThreadRouteView.tsx`, `ChatView.tsx`:** take upstream's `unlistedThreadDetail` (pingdotgg#19724), plus three fork changes: - An unlisted thread is "missing" once its subscription has failed. - A closed thread is not redirected by `archivedAt`, because it is absent from a Moatless listing and still opens by URL. - `onOpenRelatedThread` shows its toast only for a deleted shell. The `unlisted-thread-adoption` inventory entry now owns `threadRoutes.test.ts` and `ChatView.tsx`. - **`AGENTS.md` (`decide`):** kept the fork bullet and appended upstream's test rules and browser-test section. - **Upstream's change with the fork delta re-stated:** `BranchToolbar` (`showWorkspaceControls`), `GitActionsControl`, `ChatOverlayHosts`, `FilePreviewPanel`, `projectFilesQueryState`, `usePreviewSession` (on upstream's `inactiveAtom`) and `useThreadActions`. - **`getSidebarForkParentThreadId`:** upstream removed it, so it moves into `fork/ThreadParentLine.tsx`. - **New inventory entries:** the `branding-test` path policy and the `preview-session-use-atom-value` duplicate-add exception. - **Sweep:** 19 owned-concern hits, all upstream-owned and taken as upstream's. No new workflow. ## Feature classification ### Usable as-is - Mermaid rendering through pele (pingdotgg#21472) and project icon previews (pingdotgg#20372). - Dialog and composer polish, PR panel fixes and centred tables. - The Waiting thread state (pingdotgg#21500), which shows once the backend sends `blockedOnThreadWait`. - The even-pace tick on Limits (pingdotgg#22408). ### Unsupported in Moatless / needs implementation - `device.easAccount` and EAS Simulator device hosts (pingdotgg#21841–pingdotgg#21846). Added to the `UnsupportedMethodError` union, and the Integrations page that holds them is already flag-gated. - `projects.listIgnoredFiles` and the `ignoredFileListing` capability, which "Add project to another machine" uses (pingdotgg#22180). Added to the union. The dialog falls back to tracked files only while the capability is absent. - `pullRequests.changeBreakdown` (pingdotgg#22189, pingdotgg#22255). Its union already carries `UnsupportedMethodError`, and the tooltip drops the split when the call fails. - T3 Connect reachability (pingdotgg#22172). - Scheduled-task webhook filters and dedupe (pingdotgg#22194, pingdotgg#22234). - `lastEventLoopStall` (pingdotgg#22213) and the `previewClose` scope (pingdotgg#22156). - `compactIdleThreads` and `autoCompactThreshold` (pingdotgg#21682). - MCP diff tools (pingdotgg#15464), the install id (pingdotgg#21506) and the writing-style setting (pingdotgg#22203). ### Backend behavior to consider reproducing in Moatless - **Settlement and waits:** `blockedOnThreadWait`, orphaned follow-ups and delegated waits (pingdotgg#21499, pingdotgg#22581, pingdotgg#20037, pingdotgg#20025). - **Stop and wake:** `latestRunStopRequested` stops a stopped usage-limit thread from auto-resuming (pingdotgg#21114). A wake run settles when the provider never opens the wake turn (pingdotgg#19196). Snooze survives a run's completion (pingdotgg#22202, pingdotgg#17118). - **Runs and shells:** run failures are persisted (pingdotgg#19646), and shell updates coalesce for a slow client (pingdotgg#14859). - **VCS:** bare repositories (pingdotgg#17340, pingdotgg#16688, pingdotgg#18152, pingdotgg#20368), stack layers (pingdotgg#20415, pingdotgg#20388), VCS safety fixes (pingdotgg#15036, pingdotgg#19802) and PR provider robustness (pingdotgg#18780). - **Other:** update and restart safety (pingdotgg#22253), terminal and checkpoint performance (pingdotgg#21242, pingdotgg#21291), resource metrics (pingdotgg#22122), provider polling (pingdotgg#18851) and tool-token expiry (pingdotgg#18552, pingdotgg#19491). `docs/fork/gaps.md` is updated under *Methods the backend does not dispatch* and *Runtime fixes upstream made to its own server*. ## Verification Full `verify.mjs` run: every check except `test` passes (duplicate-adds, tripwires, resolution-check, unsupported-methods with ADD 2 / DROP 0 / KEEP 2, lockfile, fmt, lint, typecheck and build). Test failures and what was done about each: - **Machine failures seen in earlier merges:** `shared` `AgentScope`, `t3` `OrchestratorReplayFixtures` and `provider-opencode` `OpenCodeServerLedger`. The `GitVcsDriver` and `RepositoryIdentityResolver` partial-clone tests fail because of the sandbox's `insteadOf` rewrite. - **New and environmental:** `t3` `ProviderInstanceRegistry` reads the sandbox's own `ANTHROPIC_*` and `CLAUDE_CONFIG_DIR`. With those unset, all 9 of its tests pass. - **`web`:** - The fork's `AppRoot.test.tsx` broke on upstream's new `useEffect` (pingdotgg#20886). It now stubs `useEffect` and passes. - Four browser files failed to import in the parallel run and pass alone. - **Playwright:** 1.60 wants chromium build 1223, which this sandbox lacks. Browser tests ran against 1243 through a symlinked `PLAYWRIGHT_BROWSERS_PATH`. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --- Moatless task: https://moatless.soaplabstest.com/tasks/c3df6407-7ad0-483c-a46c-e8b603326150
Bare repositories currently return no repository identity because Git's work-tree-root query fails. Their projects therefore stay separate from checkouts of the same remote.
After a completed root-query failure, probe the project directory and its .git target explicitly, accepting only a bare repository. Read its remotes with an explicit Git directory, preserve safe.bareRepository=explicit, and use the Git directory as rootPath. Normal checkout discovery, shared caching and refresh remain intact; checkout metadata directories and repositories without a usable remote return no identity. Failed or timed-out process launches stop discovery.
Rebuilt on current main from @shrikantkalar023's original contribution, retaining the contributor's commits. The original five added tests were reduced to four behavior cases; the resolver suite is 16 tests instead of 17.
Verification at 2e0a27b9c1:
Before/after test and grouping proof
This is identity/grouping behavior, with no visual layout change. No browser session or live multi-machine client session was run. Windows/macOS Git path handling, Electron desktop, iOS/Android and Forgejo refinement were not verified natively on this Linux host. Each uncached non-Git project can now perform up to two additional bounded Git probes; negative caching remains one minute. Current-head build/typecheck, lint, release smoke, general tests and all eight server shards passed; configured correctness and approvability checks passed. CI is blocked: the first web job failed two unchanged browser cases on asynchronous rendering waits; both files passed locally (6/6). The rerun failed the same cases plus an unchanged HtmlRenderDialog zoom-button timeout. No web/client-runtime or workflow source changes are in this PR. These unrelated browser failures were not bypassed; the PR is not declared merge-ready. A canceled duplicate fingerprint run is superseded by the successful fingerprint run on the same head.
Implementation: Codex GPT-6.1 Sol in T3 Code; tests: Codex GPT-6 Astra; adversarial reviews: Claude Opus 5.5 and Codex GPT-6 Sol.