Skip to content

fix(server): refresh file search outside checkpoint processing - #12308

Merged
juliusmarminge merged 2 commits into
checkpoint-fixes/ref-probe-recoveryfrom
checkpoint-fixes/async-search-refresh
Sep 17, 2026
Merged

juliusmarminge merged 2 commits into
checkpoint-fixes/ref-probe-recoveryfrom
checkpoint-fixes/async-search-refresh

Conversation

@juliusmarminge

@juliusmarminge juliusmarminge commented Sep 17, 2026

Copy link
Copy Markdown
Member

Workspace file-search refresh runs inside the checkpoint worker. A blocked native scan delays completion receipts and other workspaces even after their checkpoint Git ref is saved.

Run search refresh in a separate scoped, drainable worker after capture/restore. Coalesce queued requests by workspace, allowing one follow-up while that workspace's scan is running. Refresh failures are logged without failing checkpoint processing, and shutdown/drain still waits for the refresh worker.

Verification: a Deferred-controlled scan remains blocked while turns in two real Git repositories finish and their latest checkpoint contents are verified. Repeated requests for the busy workspace yield only one queued follow-up; releasing the scan and draining produces three refresh calls across both workspaces. Integrated reactor suite: 45 tests passed; targeted lint and server-only typecheck passed.

Depends on #12307. The fifth dependent fix is #12181, retained on its author's fork and based on this branch. GitHub excludes fork PRs from native stack grouping.

Prepared with Codex.

Summary by CodeRabbit

  • Bug Fixes
    • Checkpoint capture and revert operations now refresh workspace entries reliably after completion.
    • Duplicate refresh requests are consolidated while ensuring each workspace reaches its latest state.
    • Checkpoint receipts and snapshots remain available when workspace refreshes are delayed.
    • Completion and shutdown now wait for pending workspace updates, improving consistency across multiple workspaces.
    • Refresh failures are handled more clearly while interruption-related failures continue to be reported.

@juliusmarminge
juliusmarminge added this pull request to stack #12309 September 17, 2026 19:59
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:S 10-29 changed lines (additions + deletions). labels Sep 17, 2026
@juliusmarminge
juliusmarminge force-pushed the checkpoint-fixes/async-search-refresh branch from 5c8b788 to 2591351 Compare September 17, 2026 20:02
@github-actions

github-actions Bot commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

ℹ️ No successful main baseline artifact is available yet. This run establishes the initial measurement.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire 13.5 KiB 15.1 KiB
Codex Thread snapshot wire 7.1 KiB 7.3 KiB
Codex Live turn WebSocket wire 6.4 KiB 7.8 KiB
Codex Live turn WebSocket decoded 56.2 KiB 66.4 KiB
Codex Live turn messages 9 21
Claude Total thread wire 13.5 KiB 15.1 KiB
Claude Thread snapshot wire 7.1 KiB 7.3 KiB
Claude Live turn WebSocket wire 6.4 KiB 7.8 KiB
Claude Live turn WebSocket decoded 57.0 KiB 66.4 KiB
Claude Live turn messages 9 21

Baseline: unavailable · PR result: 38dc191 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

  • Codex decoded thread snapshot: 114.0 KiB
  • Claude decoded thread snapshot: 114.6 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

@juliusmarminge
juliusmarminge marked this pull request as ready for review September 17, 2026 20:03
macroscopeapp[bot]
macroscopeapp Bot previously approved these changes Sep 17, 2026
@macroscopeapp

macroscopeapp Bot commented Sep 17, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at 7a863a3

Macroscope's review found this PR approvable — This focused server bug fix asynchronously refreshes the existing file-search index so checkpoint processing is not blocked, while coalescing duplicate workspace scans and draining pending work during shutdown. A regression test covers blocked refreshes, multiple workspaces, checkpoint completion, and coalescing.

No code changes detected at 38dc191. Prior analysis still applies.

You can add or adjust custom eligibility rules. Learn more.

@coderabbitai

coderabbitai Bot commented Sep 17, 2026

Copy link
Copy Markdown

Review Change StackReview Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Team

Run ID: 7fed747f-37a7-402f-8594-41a3b2f8104a

📥 Commits

Reviewing files that changed from the base of the PR and between ba04a6b and 73f8a1f.

📒 Files selected for processing (2)
  • apps/server/src/orchestration/Layers/CheckpointReactor.test.ts
  • apps/server/src/orchestration/Layers/CheckpointReactor.ts

Included review availability: Your plan provides up to 10 included reviews per hour; 2 remain after this review.


📝 Walkthrough

Walkthrough

Checkpoint capture and revert now queue coalesced workspace-entry refreshes. Reactor draining waits for queued refreshes. Tests cover blocked refreshes across two workspaces.

Changes

Workspace refresh coordination

Layer / File(s) Summary
Queued workspace refresh execution
apps/server/src/orchestration/Layers/CheckpointReactor.ts
Checkpoint capture and revert queue workspace-entry refreshes. The reactor coalesces refreshes, handles failures, removes formatted causes from git-status warnings, and drains the refresh worker.
Multi-workspace refresh validation
apps/server/src/orchestration/Layers/CheckpointReactor.test.ts
The test harness accepts a workspace refresh callback. Tests verify checkpoint receipts, snapshot persistence, refresh coalescing, and later execution across two workspaces.

Priority: ⬇️ Low

Estimated code review effort: 3 (Moderate) | ~25 minutes

Change: Bug fix

Sequence Diagram(s)

sequenceDiagram
  participant CheckpointReactor
  participant WorkspaceRefreshWorker
  participant WorkspaceEntries
  CheckpointReactor->>WorkspaceRefreshWorker: Queue workspace refresh
  CheckpointReactor->>WorkspaceRefreshWorker: Drain queued refreshes
  WorkspaceRefreshWorker->>WorkspaceEntries: Execute coalesced refresh
  WorkspaceEntries-->>WorkspaceRefreshWorker: Complete or interrupt
  WorkspaceRefreshWorker-->>CheckpointReactor: Report drain completion
Loading

Suggested reviewers: t3dotgg

Merge Risk: ⚪ Minimal · up to 73f8a

The asynchronous refresh path preserves checkpoint completion and coalesces later workspace updates without a concrete unresolved merge risk.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 2 files. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Title check ✅ Passed The title clearly summarizes the primary change: moving server file-search refresh outside checkpoint processing.
Description check ✅ Passed The description explains what changed, why it changed, the worker behavior, failure handling, drain behavior, verification, and dependency context. It omits the template checklist, but the core requir…
  • Fix all pre-merge checks with AI
✨ Finishing Touches 💡 1
📝 Generate docstrings 💡
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR

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

Comment thread apps/server/src/orchestration/Layers/CheckpointReactor.ts Outdated
@macroscopeapp

This comment has been minimized.

@macroscopeapp

This comment has been minimized.

@macroscopeapp
macroscopeapp Bot dismissed their stale review September 17, 2026 20:13

Dismissing prior approval to re-evaluate 7a863a3

@juliusmarminge
juliusmarminge force-pushed the checkpoint-fixes/async-search-refresh branch 2 times, most recently from ba04a6b to 73f8a1f Compare September 17, 2026 20:30
@juliusmarminge
juliusmarminge requested a review from a team September 17, 2026 23:32
@juliusmarminge
juliusmarminge force-pushed the checkpoint-fixes/async-search-refresh branch from 73f8a1f to 38dc191 Compare September 17, 2026 23:33
@juliusmarminge
juliusmarminge merged commit d17f46d into main Sep 17, 2026
27 of 38 checks passed
@juliusmarminge
juliusmarminge deleted the checkpoint-fixes/async-search-refresh branch September 17, 2026 23:41
@juliusmarminge
juliusmarminge restored the checkpoint-fixes/async-search-refresh branch September 17, 2026 23:42
@juliusmarminge
juliusmarminge deleted the checkpoint-fixes/async-search-refresh branch September 17, 2026 23:43
github-actions Bot added a commit to omarcresp/t3code-flake that referenced this pull request Sep 18, 2026
## What's Changed
* fix(web): keep PR panel actions in the current thread by @Bil0000 in pingdotgg/t3code#12320
* fix(web): keep browser pages aligned during panel animations by @juliusmarminge in pingdotgg/t3code#12329
* fix(server): bound provider event log records before serialization by @juliusmarminge in pingdotgg/t3code#12305
* fix(server): reject file rewind in shared workspaces by @juliusmarminge in pingdotgg/t3code#12306
* fix(server): capture checkpoints when baseline lookup fails by @juliusmarminge in pingdotgg/t3code#12307
* fix(server): refresh file search outside checkpoint processing by @juliusmarminge in pingdotgg/t3code#12308
* fix(web): keep chat from jumping when the scroll-to-end pill mounts by @Yash-Singh1 in pingdotgg/t3code#12317
* fix(server): checkpoint workspaces with empty nested repositories by @saphid in pingdotgg/t3code#12181
* chore(review): keep review bots out of the vendored .repos references by @juliusmarminge in pingdotgg/t3code#12333
* fix(server): pass Codex image attachments by path to avoid oversized requests by @saphid in pingdotgg/t3code#11050
* feat(web): filter sidebar from thread menu by @saphid in pingdotgg/t3code#8719
* feat(web): open diff files from a right-click context menu by @saphid in pingdotgg/t3code#11842
* fix(web): keep numbered jumps from stealing browser tabs by @Yash-Singh1 in pingdotgg/t3code#12315
* fix(mobile): define Clerk colors in every Uniwind theme by @juliusmarminge in pingdotgg/t3code#12344
* refactor(web): reuse searchable picker inputs by @juliusmarminge in pingdotgg/t3code#12353
* fix(web): share touch-visible pull request edit actions by @juliusmarminge in pingdotgg/t3code#12370
* fix(mobile): share accessible connection trace controls by @juliusmarminge in pingdotgg/t3code#12371
* fix(mobile): share settings control row layout by @juliusmarminge in pingdotgg/t3code#12356
* refactor(web): share diagnostic process actions by @juliusmarminge in pingdotgg/t3code#12358
* refactor(mobile): share Android toolbar search fields by @juliusmarminge in pingdotgg/t3code#12359
* refactor(web): share settings group surfaces by @juliusmarminge in pingdotgg/t3code#12360
* refactor(web): reuse inline settings actions by @juliusmarminge in pingdotgg/t3code#12362
* refactor(mobile): share thread list section controls by @juliusmarminge in pingdotgg/t3code#12363
* refactor(mobile): share connection form fields by @juliusmarminge in pingdotgg/t3code#12364
* refactor(mobile): share local environment lists by @juliusmarminge in pingdotgg/t3code#12365
* refactor(mobile): share file preview feedback by @juliusmarminge in pingdotgg/t3code#12368
* refactor(web): share standalone page layout by @juliusmarminge in pingdotgg/t3code#12354
* fix(mobile): share settings action row defaults by @juliusmarminge in pingdotgg/t3code#12369
* fix(mobile): share request action button defaults by @juliusmarminge in pingdotgg/t3code#12366
* fix(web): share accessible color picker controls by @juliusmarminge in pingdotgg/t3code#12355


**Full Changelog**: pingdotgg/t3code@v0.0.43-nightly.20260917.1880...v0.0.43-nightly.20260918.1895

Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.0.43-nightly.20260918.1895
aorwall added a commit to aorwall/t3code that referenced this pull request Sep 18, 2026
Merges `pingdotgg/t3code` `6d1d549441..9946541` (50 commits) into the
fork.

Landed 304 files against 303 in the upstream range — the extra one is
`docs/fork/inventory.json`. Fork delta is 777 files, unchanged from the
last
merge. Everything upstream changed landed.

Six conflicts, each resolved with the verdict `preflight.mjs` printed;
five were
a single hunk. Details and reasoning are in
[the merge tracker](docs/fork/upstream-merge-log.md). The two worth
reading here:

- **`ChatView.tsx`** — pingdotgg#12306 added `activeWorktreePath !== null` to the
"Revert
  files too" button, on the line the fork gates with
`FEATURES.checkpointFileRestore`. Kept both as a conjunction: upstream's
condition is about a shared workspace, the fork's is about what Moatless
  serves, and they answer different questions.
- **`FilePreviewPanel.tsx`** (the one `decide`) — pingdotgg#10909 restructured
the file
read so a folder is knowable as a folder, adding `isDirectory` /
`previewPath`.
Took that whole and re-stated the fork's `onRetargetFile` effect on top.

`apps/web/src/routeTree.gen.ts` was regenerated rather than
hand-resolved.

One judgement call: pingdotgg#11598's new `/settings/storage` page is
deliberately **not**
given a `FEATURES` gate. It self-gates on two new capability booleans
Moatless
does not report and renders an explanatory notice, so a fork flag would
duplicate
a decision the wire already makes — and would have to be deleted again
the day
the capability is reported.

## Usable as-is

- Diff files open from a right-click context menu (pingdotgg#11842).
- Sidebar filtering from the thread menu (pingdotgg#8719).
- Command palette matches thread IDs (pingdotgg#11185).
- Mobile settings are easier to navigate and scope (pingdotgg#12272); favorites
in the
  mobile model picker (pingdotgg#12231).
- Thoughts collapse within tool groups (pingdotgg#12302); thoughts and failed
tool calls
  stay in one activity row (pingdotgg#12270).
- Folder links from chat open the file tree instead of a broken preview
(pingdotgg#10909).
- Chat no longer jumps when the scroll-to-end pill mounts (pingdotgg#12317);
numbered
jumps no longer steal browser tabs (pingdotgg#12315); composer banners stay
compact
  (pingdotgg#12166).
- A large batch of shared-component refactors across web and mobile
(pingdotgg#12353pingdotgg#12371).

## Unsupported in Moatless / needs implementation

- **Pull request files marked as viewed** (pingdotgg#7721) — adds
`pullRequests.filesViewed` and `pullRequests.setFilesViewed`, which
record
which files a reviewer has checked off, persisted server-side. Both
declare
  `PullRequestRpcError` and so arrived already refusing;
`unsupported-methods.mjs` reported ADD 0 / DROP 0 as a result. Closes
with the
  rest of the `pullRequests.*` group, not separately.
- **Multi-model threads in separate worktrees** (pingdotgg#12179) — one prompt
starts a
thread per selected model, each in its own worktree. The model picker is
the
same `worktree` send-mode control `FEATURES.worktreeSelection` already
gates,
  so the fan-out is simply not offered. The same commit adds a
  `requiredWorktreeBootstrap` capability the backend does not report.
- **Automatic storage cleanup settings** (pingdotgg#11598) — the
`/settings/storage` page,
gated by the backend's absent `storageCleanup` and
`projectWorktreeCleanup`
  capabilities. Needs the sweeper below before the page means anything.
- **Command palette entries for the pull requests and usage pages**
(pingdotgg#12211) —
  the PR half is covered by `FEATURES.pullRequestSurface`.

## Backend behavior to consider reproducing in Moatless

Eight items, recorded in full in [the gaps register](docs/fork/gaps.md)
under
_Runtime fixes upstream made to its own server_. Five are on the
checkpoint and
usage paths the previous merge already opened:

- **Reject a file rewind on a shared or nested-owner cwd** (pingdotgg#12306,
`CheckpointReactor.ts`) — a checkpoint holds the whole checkout, so
restoring
one erases a sibling's uncommitted work. Moatless isolates by sandbox,
but a
workspace with nested repositories has the same overlap inside one task.
- **Capture a checkpoint when the baseline lookup fails** (pingdotgg#12307) — the
case
  that silently leaves a turn with no restore point.
- **Move the file-search refresh off the checkpoint path** (pingdotgg#12308) — it
  extended every capture by an index walk.
- **Survive an empty nested repository, and clear a stale index lock**
(pingdotgg#12181,
`GitVcsDriver.ts`) — git cannot stage an embedded repository until it
has a
commit. The lock half matters most here: forced termination is the
normal end
  of a sandboxed task.
- **Bound the provider event log before serialization** (pingdotgg#12305,
`EventNdjsonLogger.ts`) — otherwise it grows proportionally to tokens
streamed.
- **Keep usage totals across transcript cleanup** (pingdotgg#12304,
`UsageService.ts`) and
  **resolve a contested fingerprint to the newest scan** (pingdotgg#10315,
  `usageMerge.ts`). Moatless serves `server.getUsageSummary` itself.
- **Pass provider image attachments by path** (pingdotgg#11050,
`CodexAdapter.ts`) — the
turn/start request stops scaling with attachment size. A sandbox adds a
hop, so
  an oversized request costs more there.
- **Sweep stale worktrees and transcripts against retention rules**
(pingdotgg#11598,
`storageCleanup.ts`, with a workspace lease so two servers cannot sweep
the
same directory). A sandbox per task bounds the worktree half;
transcripts
  outlive the sandbox.

## Verification

`verify.mjs` — all 9 checks green on the first full pass, tests included
(333 test files, 5071 tests). No flaky retries and no caveats.

Contract drift: ADD 0 / DROP 0, so `packages/contracts/src/rpc.ts`
needed no
change. The `orchestration-decode-boilerplate` duplicate-add exception
went stale
— the colliding line is gone — and was deleted from `inventory.json` in
this
merge.

Owned-concern sweep: the three new
`apps/mobile/src/features/connection/` files
are false positives, all upstream extracting shared mobile components
out of
files it already owned, with no fork delta in any of them.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---
Moatless task:
https://moatless.soaplabstest.com/tasks/c83db5aa-7c47-47c6-93f4-fe2f6f9f548e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:S 10-29 changed lines (additions + deletions). 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.

1 participant