fix(web): closing a file tab no longer overwrites newer changes - #8632

Closed
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write
Closed

fix(web): closing a file tab no longer overwrites newer changes#8632
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write

Conversation

@walid-baharwal

@walid-baharwalwalid-baharwal commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

What Changed

FileSaveCoordinator now tracks the revision it last confirmed on disk and flushes on dispose only when the buffer holds an edit newer than that. Previously dispose flushed whenever latestRevision > 0, and latestRevision was only ever incremented, never reconciled with what was actually written.

Why

Closing or switching a file tab re-wrote the tab's remembered buffer even when the debounce had already saved it. If the file changed on disk after that save — an agent turn, another client, a shell — the close replaced the newer content with the stale buffer, with nothing in the UI or the event store recording the loss. Fixes#8475.

Flush-on-dispose is deliberate: it saves edits made inside the 500 ms debounce window right before a tab closes. That still works, and a write that failed before the close is still retried. A write already in flight when the tab closes is unchanged from before this PR: if it fails and no newer edit exists, it is not retried.

Full disk-staleness reconciliation is deliberately out of scope. ProjectWriteFileInput carries only cwd, relativePath and contents, so a write precondition would be a contract change across server, web, mobile and desktop. The remaining case: an edit made inside the debounce window that races an external write still flushes.

Related: #8424 touches this file for a different bug and, as a side effect, would also fix#8475 by zeroing latestRevision on success. This PR uses a separate counter instead, because latestRevision is also the in-flight ordering token — zeroing it makes the revision === latestRevision check after a successful write never hold. Whichever lands second needs a rebase.

UI Changes

None. Nothing rendered changes; the observable difference is the file's contents on disk after a tab close.

Before (main) and after, same steps — open probe.txt, type a character, wait past the debounce, delete it, wait, then echo APPENDED_BY_AGENT >> probe.txt from a shell, then close the tab:

=== BEFORE: disk after closing the file tab ===
line one
line two <- APPENDED_BY_AGENT destroyed
=== AFTER: disk after closing the file tab ===
line one
line two
APPENDED_BY_AGENT <- survives

Verification

vp test run apps/web/src/components/files/fileSaveCoordinator.test.ts # 8 passedcd apps/web && pnpm typecheck
vp lint apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
vp format --check apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
git diff --check

does not rewrite already saved contents when the editor closes fails on main (expected "vi.fn()" to be called once, but got 2 times) and passes here. The other new cases cover dispose inside the debounce window, dispose while a write is in flight (with and without a newer edit), and retry after a failed write. Also verified by hand in a dev client against a scratch --home-dir, per the transcript above.

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes (N/A — nothing rendered changed; disk transcript above)
  • I included a video for animation/interaction changes (N/A)

Model: Claude Opus 5 (1M context). Harness: Claude Code.


Note

Medium Risk
Changes file persistence on tab close in a coordinator used by the editor; incorrect logic could lose edits or skip needed flushes, but scope is small and well-tested.

Overview
Fixes closing a file tab re-writing disk with a stale buffer after the debounce had already persisted the same revision—e.g. when the file changed externally afterward (#8475).

FileSaveCoordinator now keeps a persistedRevision updated on each successful persist and only runs flush-on-dispose when latestRevision > persistedRevision, instead of whenever latestRevision > 0. Flush-on-close behavior is preserved for edits still inside the debounce window, newer edits while a write is in flight, and retries after a failed write; it does not trigger a second write when the last edit was already confirmed.

Tests add coverage for those dispose/close scenarios.

Reviewed by Cursor Bugbot for commit 38876e5. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix FileSaveCoordinator.dispose overwriting newer changes by tracking persistedRevision

  • Adds persistedRevision field to FileSaveCoordinator to track the last successfully saved revision, set on each successful persist in persistLatest
  • Changes dispose to only flush when latestRevision > persistedRevision, so closing a tab no longer rewrites content that was already saved
  • Failed writes leave persistedRevision unchanged, allowing dispose to retry pending or failed writes
  • Behavioral Change: dispose now skips persisting when all edits are already confirmed; previously it always persisted if latestRevision > 0

Macroscope summarized 38876e5.

The file editor's save coordinator only ever incremented its edit
revision, so `dispose` treated any tab that had been edited once as
holding unsaved work. Closing or switching that tab re-wrote the
remembered buffer, replacing whatever had changed the file since the
last save.
Track the revision confirmed on disk and flush on dispose only when the
buffer holds a newer edit. Edits made inside the debounce window are
still saved on close, and a write that failed before the close is still
retried.
Fixespingdotgg#8475
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. 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: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: cab90719-25eb-42d3-9ed8-cf43e07cc8f3

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

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

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:XS 0-9 changed lines (additions + deletions). labels Aug 29, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at 38876e5

Macroscope's review found this PR approvable — This is a narrowly scoped file-save bug fix that prevents a redundant close-time write after a revision is already persisted, while preserving unsaved-edit flushing and retry behavior. Production changes are confined to the save coordinator, with targeted tests covering the affected lifecycle cases and no product-default or schema changes.

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

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

We are keeping the file-tab save fix in the open PR #8630 instead of maintaining two implementations. Both track the last confirmed save revision and skip the redundant write when an already-saved tab closes. Pending edits still flush on close. The additional save-order tests here remain useful for that PR. The fix is not on main yet.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed.

@t3dotggt3dotgg closed this Sep 1, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS0-9 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Closing a file tab overwrites newer on-disk changes

2 participants

@walid-baharwal@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

fix(web): closing a file tab no longer overwrites newer changes - #8632

Closed
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write
Closed

fix(web): closing a file tab no longer overwrites newer changes#8632
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write

Conversation

@walid-baharwal

@walid-baharwalwalid-baharwal commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

What Changed

FileSaveCoordinator now tracks the revision it last confirmed on disk and flushes on dispose only when the buffer holds an edit newer than that. Previously dispose flushed whenever latestRevision > 0, and latestRevision was only ever incremented, never reconciled with what was actually written.

Why

Closing or switching a file tab re-wrote the tab's remembered buffer even when the debounce had already saved it. If the file changed on disk after that save — an agent turn, another client, a shell — the close replaced the newer content with the stale buffer, with nothing in the UI or the event store recording the loss. Fixes#8475.

Flush-on-dispose is deliberate: it saves edits made inside the 500 ms debounce window right before a tab closes. That still works, and a write that failed before the close is still retried. A write already in flight when the tab closes is unchanged from before this PR: if it fails and no newer edit exists, it is not retried.

Full disk-staleness reconciliation is deliberately out of scope. ProjectWriteFileInput carries only cwd, relativePath and contents, so a write precondition would be a contract change across server, web, mobile and desktop. The remaining case: an edit made inside the debounce window that races an external write still flushes.

Related: #8424 touches this file for a different bug and, as a side effect, would also fix#8475 by zeroing latestRevision on success. This PR uses a separate counter instead, because latestRevision is also the in-flight ordering token — zeroing it makes the revision === latestRevision check after a successful write never hold. Whichever lands second needs a rebase.

UI Changes

None. Nothing rendered changes; the observable difference is the file's contents on disk after a tab close.

Before (main) and after, same steps — open probe.txt, type a character, wait past the debounce, delete it, wait, then echo APPENDED_BY_AGENT >> probe.txt from a shell, then close the tab:

=== BEFORE: disk after closing the file tab ===
line one
line two <- APPENDED_BY_AGENT destroyed
=== AFTER: disk after closing the file tab ===
line one
line two
APPENDED_BY_AGENT <- survives

Verification

vp test run apps/web/src/components/files/fileSaveCoordinator.test.ts # 8 passedcd apps/web && pnpm typecheck
vp lint apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
vp format --check apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
git diff --check

does not rewrite already saved contents when the editor closes fails on main (expected "vi.fn()" to be called once, but got 2 times) and passes here. The other new cases cover dispose inside the debounce window, dispose while a write is in flight (with and without a newer edit), and retry after a failed write. Also verified by hand in a dev client against a scratch --home-dir, per the transcript above.

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes (N/A — nothing rendered changed; disk transcript above)
  • I included a video for animation/interaction changes (N/A)

Model: Claude Opus 5 (1M context). Harness: Claude Code.


Note

Medium Risk
Changes file persistence on tab close in a coordinator used by the editor; incorrect logic could lose edits or skip needed flushes, but scope is small and well-tested.

Overview
Fixes closing a file tab re-writing disk with a stale buffer after the debounce had already persisted the same revision—e.g. when the file changed externally afterward (#8475).

FileSaveCoordinator now keeps a persistedRevision updated on each successful persist and only runs flush-on-dispose when latestRevision > persistedRevision, instead of whenever latestRevision > 0. Flush-on-close behavior is preserved for edits still inside the debounce window, newer edits while a write is in flight, and retries after a failed write; it does not trigger a second write when the last edit was already confirmed.

Tests add coverage for those dispose/close scenarios.

Reviewed by Cursor Bugbot for commit 38876e5. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix FileSaveCoordinator.dispose overwriting newer changes by tracking persistedRevision

  • Adds persistedRevision field to FileSaveCoordinator to track the last successfully saved revision, set on each successful persist in persistLatest
  • Changes dispose to only flush when latestRevision > persistedRevision, so closing a tab no longer rewrites content that was already saved
  • Failed writes leave persistedRevision unchanged, allowing dispose to retry pending or failed writes
  • Behavioral Change: dispose now skips persisting when all edits are already confirmed; previously it always persisted if latestRevision > 0

Macroscope summarized 38876e5.

The file editor's save coordinator only ever incremented its edit
revision, so `dispose` treated any tab that had been edited once as
holding unsaved work. Closing or switching that tab re-wrote the
remembered buffer, replacing whatever had changed the file since the
last save.
Track the revision confirmed on disk and flush on dispose only when the
buffer holds a newer edit. Edits made inside the debounce window are
still saved on close, and a write that failed before the close is still
retried.
Fixespingdotgg#8475
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. 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: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: cab90719-25eb-42d3-9ed8-cf43e07cc8f3

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

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

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:XS 0-9 changed lines (additions + deletions). labels Aug 29, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at 38876e5

Macroscope's review found this PR approvable — This is a narrowly scoped file-save bug fix that prevents a redundant close-time write after a revision is already persisted, while preserving unsaved-edit flushing and retry behavior. Production changes are confined to the save coordinator, with targeted tests covering the affected lifecycle cases and no product-default or schema changes.

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

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

We are keeping the file-tab save fix in the open PR #8630 instead of maintaining two implementations. Both track the last confirmed save revision and skip the redundant write when an already-saved tab closes. Pending edits still flush on close. The additional save-order tests here remain useful for that PR. The fix is not on main yet.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed.

@t3dotggt3dotgg closed this Sep 1, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS0-9 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Closing a file tab overwrites newer on-disk changes

2 participants

@walid-baharwal@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(web): closing a file tab no longer overwrites newer changes - #8632

Closed
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write
Closed

fix(web): closing a file tab no longer overwrites newer changes#8632
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write

Conversation

@walid-baharwal

@walid-baharwalwalid-baharwal commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

What Changed

FileSaveCoordinator now tracks the revision it last confirmed on disk and flushes on dispose only when the buffer holds an edit newer than that. Previously dispose flushed whenever latestRevision > 0, and latestRevision was only ever incremented, never reconciled with what was actually written.

Why

Closing or switching a file tab re-wrote the tab's remembered buffer even when the debounce had already saved it. If the file changed on disk after that save — an agent turn, another client, a shell — the close replaced the newer content with the stale buffer, with nothing in the UI or the event store recording the loss. Fixes#8475.

Flush-on-dispose is deliberate: it saves edits made inside the 500 ms debounce window right before a tab closes. That still works, and a write that failed before the close is still retried. A write already in flight when the tab closes is unchanged from before this PR: if it fails and no newer edit exists, it is not retried.

Full disk-staleness reconciliation is deliberately out of scope. ProjectWriteFileInput carries only cwd, relativePath and contents, so a write precondition would be a contract change across server, web, mobile and desktop. The remaining case: an edit made inside the debounce window that races an external write still flushes.

Related: #8424 touches this file for a different bug and, as a side effect, would also fix#8475 by zeroing latestRevision on success. This PR uses a separate counter instead, because latestRevision is also the in-flight ordering token — zeroing it makes the revision === latestRevision check after a successful write never hold. Whichever lands second needs a rebase.

UI Changes

None. Nothing rendered changes; the observable difference is the file's contents on disk after a tab close.

Before (main) and after, same steps — open probe.txt, type a character, wait past the debounce, delete it, wait, then echo APPENDED_BY_AGENT >> probe.txt from a shell, then close the tab:

=== BEFORE: disk after closing the file tab ===
line one
line two <- APPENDED_BY_AGENT destroyed
=== AFTER: disk after closing the file tab ===
line one
line two
APPENDED_BY_AGENT <- survives

Verification

vp test run apps/web/src/components/files/fileSaveCoordinator.test.ts # 8 passedcd apps/web && pnpm typecheck
vp lint apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
vp format --check apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
git diff --check

does not rewrite already saved contents when the editor closes fails on main (expected "vi.fn()" to be called once, but got 2 times) and passes here. The other new cases cover dispose inside the debounce window, dispose while a write is in flight (with and without a newer edit), and retry after a failed write. Also verified by hand in a dev client against a scratch --home-dir, per the transcript above.

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes (N/A — nothing rendered changed; disk transcript above)
  • I included a video for animation/interaction changes (N/A)

Model: Claude Opus 5 (1M context). Harness: Claude Code.


Note

Medium Risk
Changes file persistence on tab close in a coordinator used by the editor; incorrect logic could lose edits or skip needed flushes, but scope is small and well-tested.

Overview
Fixes closing a file tab re-writing disk with a stale buffer after the debounce had already persisted the same revision—e.g. when the file changed externally afterward (#8475).

FileSaveCoordinator now keeps a persistedRevision updated on each successful persist and only runs flush-on-dispose when latestRevision > persistedRevision, instead of whenever latestRevision > 0. Flush-on-close behavior is preserved for edits still inside the debounce window, newer edits while a write is in flight, and retries after a failed write; it does not trigger a second write when the last edit was already confirmed.

Tests add coverage for those dispose/close scenarios.

Reviewed by Cursor Bugbot for commit 38876e5. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix FileSaveCoordinator.dispose overwriting newer changes by tracking persistedRevision

  • Adds persistedRevision field to FileSaveCoordinator to track the last successfully saved revision, set on each successful persist in persistLatest
  • Changes dispose to only flush when latestRevision > persistedRevision, so closing a tab no longer rewrites content that was already saved
  • Failed writes leave persistedRevision unchanged, allowing dispose to retry pending or failed writes
  • Behavioral Change: dispose now skips persisting when all edits are already confirmed; previously it always persisted if latestRevision > 0

Macroscope summarized 38876e5.

The file editor's save coordinator only ever incremented its edit
revision, so `dispose` treated any tab that had been edited once as
holding unsaved work. Closing or switching that tab re-wrote the
remembered buffer, replacing whatever had changed the file since the
last save.
Track the revision confirmed on disk and flush on dispose only when the
buffer holds a newer edit. Edits made inside the debounce window are
still saved on close, and a write that failed before the close is still
retried.
Fixespingdotgg#8475
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. 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: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: cab90719-25eb-42d3-9ed8-cf43e07cc8f3

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

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

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:XS 0-9 changed lines (additions + deletions). labels Aug 29, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at 38876e5

Macroscope's review found this PR approvable — This is a narrowly scoped file-save bug fix that prevents a redundant close-time write after a revision is already persisted, while preserving unsaved-edit flushing and retry behavior. Production changes are confined to the save coordinator, with targeted tests covering the affected lifecycle cases and no product-default or schema changes.

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

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

We are keeping the file-tab save fix in the open PR #8630 instead of maintaining two implementations. Both track the last confirmed save revision and skip the redundant write when an already-saved tab closes. Pending edits still flush on close. The additional save-order tests here remain useful for that PR. The fix is not on main yet.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed.

@t3dotggt3dotgg closed this Sep 1, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS0-9 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Closing a file tab overwrites newer on-disk changes

2 participants

@walid-baharwal@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(web): closing a file tab no longer overwrites newer changes - #8632

Closed
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write
Closed

fix(web): closing a file tab no longer overwrites newer changes#8632
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write

Conversation

@walid-baharwal

@walid-baharwalwalid-baharwal commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

What Changed

FileSaveCoordinator now tracks the revision it last confirmed on disk and flushes on dispose only when the buffer holds an edit newer than that. Previously dispose flushed whenever latestRevision > 0, and latestRevision was only ever incremented, never reconciled with what was actually written.

Why

Closing or switching a file tab re-wrote the tab's remembered buffer even when the debounce had already saved it. If the file changed on disk after that save — an agent turn, another client, a shell — the close replaced the newer content with the stale buffer, with nothing in the UI or the event store recording the loss. Fixes#8475.

Flush-on-dispose is deliberate: it saves edits made inside the 500 ms debounce window right before a tab closes. That still works, and a write that failed before the close is still retried. A write already in flight when the tab closes is unchanged from before this PR: if it fails and no newer edit exists, it is not retried.

Full disk-staleness reconciliation is deliberately out of scope. ProjectWriteFileInput carries only cwd, relativePath and contents, so a write precondition would be a contract change across server, web, mobile and desktop. The remaining case: an edit made inside the debounce window that races an external write still flushes.

Related: #8424 touches this file for a different bug and, as a side effect, would also fix#8475 by zeroing latestRevision on success. This PR uses a separate counter instead, because latestRevision is also the in-flight ordering token — zeroing it makes the revision === latestRevision check after a successful write never hold. Whichever lands second needs a rebase.

UI Changes

None. Nothing rendered changes; the observable difference is the file's contents on disk after a tab close.

Before (main) and after, same steps — open probe.txt, type a character, wait past the debounce, delete it, wait, then echo APPENDED_BY_AGENT >> probe.txt from a shell, then close the tab:

=== BEFORE: disk after closing the file tab ===
line one
line two <- APPENDED_BY_AGENT destroyed
=== AFTER: disk after closing the file tab ===
line one
line two
APPENDED_BY_AGENT <- survives

Verification

vp test run apps/web/src/components/files/fileSaveCoordinator.test.ts # 8 passedcd apps/web && pnpm typecheck
vp lint apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
vp format --check apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
git diff --check

does not rewrite already saved contents when the editor closes fails on main (expected "vi.fn()" to be called once, but got 2 times) and passes here. The other new cases cover dispose inside the debounce window, dispose while a write is in flight (with and without a newer edit), and retry after a failed write. Also verified by hand in a dev client against a scratch --home-dir, per the transcript above.

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes (N/A — nothing rendered changed; disk transcript above)
  • I included a video for animation/interaction changes (N/A)

Model: Claude Opus 5 (1M context). Harness: Claude Code.


Note

Medium Risk
Changes file persistence on tab close in a coordinator used by the editor; incorrect logic could lose edits or skip needed flushes, but scope is small and well-tested.

Overview
Fixes closing a file tab re-writing disk with a stale buffer after the debounce had already persisted the same revision—e.g. when the file changed externally afterward (#8475).

FileSaveCoordinator now keeps a persistedRevision updated on each successful persist and only runs flush-on-dispose when latestRevision > persistedRevision, instead of whenever latestRevision > 0. Flush-on-close behavior is preserved for edits still inside the debounce window, newer edits while a write is in flight, and retries after a failed write; it does not trigger a second write when the last edit was already confirmed.

Tests add coverage for those dispose/close scenarios.

Reviewed by Cursor Bugbot for commit 38876e5. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix FileSaveCoordinator.dispose overwriting newer changes by tracking persistedRevision

  • Adds persistedRevision field to FileSaveCoordinator to track the last successfully saved revision, set on each successful persist in persistLatest
  • Changes dispose to only flush when latestRevision > persistedRevision, so closing a tab no longer rewrites content that was already saved
  • Failed writes leave persistedRevision unchanged, allowing dispose to retry pending or failed writes
  • Behavioral Change: dispose now skips persisting when all edits are already confirmed; previously it always persisted if latestRevision > 0

Macroscope summarized 38876e5.

The file editor's save coordinator only ever incremented its edit
revision, so `dispose` treated any tab that had been edited once as
holding unsaved work. Closing or switching that tab re-wrote the
remembered buffer, replacing whatever had changed the file since the
last save.
Track the revision confirmed on disk and flush on dispose only when the
buffer holds a newer edit. Edits made inside the debounce window are
still saved on close, and a write that failed before the close is still
retried.
Fixespingdotgg#8475
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. 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: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: cab90719-25eb-42d3-9ed8-cf43e07cc8f3

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

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

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:XS 0-9 changed lines (additions + deletions). labels Aug 29, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at 38876e5

Macroscope's review found this PR approvable — This is a narrowly scoped file-save bug fix that prevents a redundant close-time write after a revision is already persisted, while preserving unsaved-edit flushing and retry behavior. Production changes are confined to the save coordinator, with targeted tests covering the affected lifecycle cases and no product-default or schema changes.

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

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

We are keeping the file-tab save fix in the open PR #8630 instead of maintaining two implementations. Both track the last confirmed save revision and skip the redundant write when an already-saved tab closes. Pending edits still flush on close. The additional save-order tests here remain useful for that PR. The fix is not on main yet.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed.

@t3dotggt3dotgg closed this Sep 1, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS0-9 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Closing a file tab overwrites newer on-disk changes

2 participants

@walid-baharwal@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

fix(web): closing a file tab no longer overwrites newer changes - #8632

Closed
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write
Closed

fix(web): closing a file tab no longer overwrites newer changes#8632
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write

Conversation

@walid-baharwal

@walid-baharwalwalid-baharwal commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

What Changed

FileSaveCoordinator now tracks the revision it last confirmed on disk and flushes on dispose only when the buffer holds an edit newer than that. Previously dispose flushed whenever latestRevision > 0, and latestRevision was only ever incremented, never reconciled with what was actually written.

Why

Closing or switching a file tab re-wrote the tab's remembered buffer even when the debounce had already saved it. If the file changed on disk after that save — an agent turn, another client, a shell — the close replaced the newer content with the stale buffer, with nothing in the UI or the event store recording the loss. Fixes#8475.

Flush-on-dispose is deliberate: it saves edits made inside the 500 ms debounce window right before a tab closes. That still works, and a write that failed before the close is still retried. A write already in flight when the tab closes is unchanged from before this PR: if it fails and no newer edit exists, it is not retried.

Full disk-staleness reconciliation is deliberately out of scope. ProjectWriteFileInput carries only cwd, relativePath and contents, so a write precondition would be a contract change across server, web, mobile and desktop. The remaining case: an edit made inside the debounce window that races an external write still flushes.

Related: #8424 touches this file for a different bug and, as a side effect, would also fix#8475 by zeroing latestRevision on success. This PR uses a separate counter instead, because latestRevision is also the in-flight ordering token — zeroing it makes the revision === latestRevision check after a successful write never hold. Whichever lands second needs a rebase.

UI Changes

None. Nothing rendered changes; the observable difference is the file's contents on disk after a tab close.

Before (main) and after, same steps — open probe.txt, type a character, wait past the debounce, delete it, wait, then echo APPENDED_BY_AGENT >> probe.txt from a shell, then close the tab:

=== BEFORE: disk after closing the file tab ===
line one
line two <- APPENDED_BY_AGENT destroyed
=== AFTER: disk after closing the file tab ===
line one
line two
APPENDED_BY_AGENT <- survives

Verification

vp test run apps/web/src/components/files/fileSaveCoordinator.test.ts # 8 passedcd apps/web && pnpm typecheck
vp lint apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
vp format --check apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
git diff --check

does not rewrite already saved contents when the editor closes fails on main (expected "vi.fn()" to be called once, but got 2 times) and passes here. The other new cases cover dispose inside the debounce window, dispose while a write is in flight (with and without a newer edit), and retry after a failed write. Also verified by hand in a dev client against a scratch --home-dir, per the transcript above.

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes (N/A — nothing rendered changed; disk transcript above)
  • I included a video for animation/interaction changes (N/A)

Model: Claude Opus 5 (1M context). Harness: Claude Code.


Note

Medium Risk
Changes file persistence on tab close in a coordinator used by the editor; incorrect logic could lose edits or skip needed flushes, but scope is small and well-tested.

Overview
Fixes closing a file tab re-writing disk with a stale buffer after the debounce had already persisted the same revision—e.g. when the file changed externally afterward (#8475).

FileSaveCoordinator now keeps a persistedRevision updated on each successful persist and only runs flush-on-dispose when latestRevision > persistedRevision, instead of whenever latestRevision > 0. Flush-on-close behavior is preserved for edits still inside the debounce window, newer edits while a write is in flight, and retries after a failed write; it does not trigger a second write when the last edit was already confirmed.

Tests add coverage for those dispose/close scenarios.

Reviewed by Cursor Bugbot for commit 38876e5. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix FileSaveCoordinator.dispose overwriting newer changes by tracking persistedRevision

  • Adds persistedRevision field to FileSaveCoordinator to track the last successfully saved revision, set on each successful persist in persistLatest
  • Changes dispose to only flush when latestRevision > persistedRevision, so closing a tab no longer rewrites content that was already saved
  • Failed writes leave persistedRevision unchanged, allowing dispose to retry pending or failed writes
  • Behavioral Change: dispose now skips persisting when all edits are already confirmed; previously it always persisted if latestRevision > 0

Macroscope summarized 38876e5.

The file editor's save coordinator only ever incremented its edit
revision, so `dispose` treated any tab that had been edited once as
holding unsaved work. Closing or switching that tab re-wrote the
remembered buffer, replacing whatever had changed the file since the
last save.
Track the revision confirmed on disk and flush on dispose only when the
buffer holds a newer edit. Edits made inside the debounce window are
still saved on close, and a write that failed before the close is still
retried.
Fixespingdotgg#8475
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. 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: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: cab90719-25eb-42d3-9ed8-cf43e07cc8f3

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

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

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:XS 0-9 changed lines (additions + deletions). labels Aug 29, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at 38876e5

Macroscope's review found this PR approvable — This is a narrowly scoped file-save bug fix that prevents a redundant close-time write after a revision is already persisted, while preserving unsaved-edit flushing and retry behavior. Production changes are confined to the save coordinator, with targeted tests covering the affected lifecycle cases and no product-default or schema changes.

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

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

We are keeping the file-tab save fix in the open PR #8630 instead of maintaining two implementations. Both track the last confirmed save revision and skip the redundant write when an already-saved tab closes. Pending edits still flush on close. The additional save-order tests here remain useful for that PR. The fix is not on main yet.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed.

@t3dotggt3dotgg closed this Sep 1, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS0-9 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Closing a file tab overwrites newer on-disk changes

2 participants

@walid-baharwal@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(web): closing a file tab no longer overwrites newer changes - #8632

Closed
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write
Closed

fix(web): closing a file tab no longer overwrites newer changes#8632
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write

Conversation

@walid-baharwal

@walid-baharwalwalid-baharwal commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

What Changed

FileSaveCoordinator now tracks the revision it last confirmed on disk and flushes on dispose only when the buffer holds an edit newer than that. Previously dispose flushed whenever latestRevision > 0, and latestRevision was only ever incremented, never reconciled with what was actually written.

Why

Closing or switching a file tab re-wrote the tab's remembered buffer even when the debounce had already saved it. If the file changed on disk after that save — an agent turn, another client, a shell — the close replaced the newer content with the stale buffer, with nothing in the UI or the event store recording the loss. Fixes#8475.

Flush-on-dispose is deliberate: it saves edits made inside the 500 ms debounce window right before a tab closes. That still works, and a write that failed before the close is still retried. A write already in flight when the tab closes is unchanged from before this PR: if it fails and no newer edit exists, it is not retried.

Full disk-staleness reconciliation is deliberately out of scope. ProjectWriteFileInput carries only cwd, relativePath and contents, so a write precondition would be a contract change across server, web, mobile and desktop. The remaining case: an edit made inside the debounce window that races an external write still flushes.

Related: #8424 touches this file for a different bug and, as a side effect, would also fix#8475 by zeroing latestRevision on success. This PR uses a separate counter instead, because latestRevision is also the in-flight ordering token — zeroing it makes the revision === latestRevision check after a successful write never hold. Whichever lands second needs a rebase.

UI Changes

None. Nothing rendered changes; the observable difference is the file's contents on disk after a tab close.

Before (main) and after, same steps — open probe.txt, type a character, wait past the debounce, delete it, wait, then echo APPENDED_BY_AGENT >> probe.txt from a shell, then close the tab:

=== BEFORE: disk after closing the file tab ===
line one
line two <- APPENDED_BY_AGENT destroyed
=== AFTER: disk after closing the file tab ===
line one
line two
APPENDED_BY_AGENT <- survives

Verification

vp test run apps/web/src/components/files/fileSaveCoordinator.test.ts # 8 passedcd apps/web && pnpm typecheck
vp lint apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
vp format --check apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
git diff --check

does not rewrite already saved contents when the editor closes fails on main (expected "vi.fn()" to be called once, but got 2 times) and passes here. The other new cases cover dispose inside the debounce window, dispose while a write is in flight (with and without a newer edit), and retry after a failed write. Also verified by hand in a dev client against a scratch --home-dir, per the transcript above.

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes (N/A — nothing rendered changed; disk transcript above)
  • I included a video for animation/interaction changes (N/A)

Model: Claude Opus 5 (1M context). Harness: Claude Code.


Note

Medium Risk
Changes file persistence on tab close in a coordinator used by the editor; incorrect logic could lose edits or skip needed flushes, but scope is small and well-tested.

Overview
Fixes closing a file tab re-writing disk with a stale buffer after the debounce had already persisted the same revision—e.g. when the file changed externally afterward (#8475).

FileSaveCoordinator now keeps a persistedRevision updated on each successful persist and only runs flush-on-dispose when latestRevision > persistedRevision, instead of whenever latestRevision > 0. Flush-on-close behavior is preserved for edits still inside the debounce window, newer edits while a write is in flight, and retries after a failed write; it does not trigger a second write when the last edit was already confirmed.

Tests add coverage for those dispose/close scenarios.

Reviewed by Cursor Bugbot for commit 38876e5. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix FileSaveCoordinator.dispose overwriting newer changes by tracking persistedRevision

  • Adds persistedRevision field to FileSaveCoordinator to track the last successfully saved revision, set on each successful persist in persistLatest
  • Changes dispose to only flush when latestRevision > persistedRevision, so closing a tab no longer rewrites content that was already saved
  • Failed writes leave persistedRevision unchanged, allowing dispose to retry pending or failed writes
  • Behavioral Change: dispose now skips persisting when all edits are already confirmed; previously it always persisted if latestRevision > 0

Macroscope summarized 38876e5.

The file editor's save coordinator only ever incremented its edit
revision, so `dispose` treated any tab that had been edited once as
holding unsaved work. Closing or switching that tab re-wrote the
remembered buffer, replacing whatever had changed the file since the
last save.
Track the revision confirmed on disk and flush on dispose only when the
buffer holds a newer edit. Edits made inside the debounce window are
still saved on close, and a write that failed before the close is still
retried.
Fixespingdotgg#8475
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. 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: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: cab90719-25eb-42d3-9ed8-cf43e07cc8f3

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

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

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:XS 0-9 changed lines (additions + deletions). labels Aug 29, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at 38876e5

Macroscope's review found this PR approvable — This is a narrowly scoped file-save bug fix that prevents a redundant close-time write after a revision is already persisted, while preserving unsaved-edit flushing and retry behavior. Production changes are confined to the save coordinator, with targeted tests covering the affected lifecycle cases and no product-default or schema changes.

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

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

We are keeping the file-tab save fix in the open PR #8630 instead of maintaining two implementations. Both track the last confirmed save revision and skip the redundant write when an already-saved tab closes. Pending edits still flush on close. The additional save-order tests here remain useful for that PR. The fix is not on main yet.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed.

@t3dotggt3dotgg closed this Sep 1, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS0-9 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Closing a file tab overwrites newer on-disk changes

2 participants

@walid-baharwal@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(web): closing a file tab no longer overwrites newer changes - #8632

Closed
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write
Closed

fix(web): closing a file tab no longer overwrites newer changes#8632
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write

Conversation

@walid-baharwal

@walid-baharwalwalid-baharwal commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

What Changed

FileSaveCoordinator now tracks the revision it last confirmed on disk and flushes on dispose only when the buffer holds an edit newer than that. Previously dispose flushed whenever latestRevision > 0, and latestRevision was only ever incremented, never reconciled with what was actually written.

Why

Closing or switching a file tab re-wrote the tab's remembered buffer even when the debounce had already saved it. If the file changed on disk after that save — an agent turn, another client, a shell — the close replaced the newer content with the stale buffer, with nothing in the UI or the event store recording the loss. Fixes#8475.

Flush-on-dispose is deliberate: it saves edits made inside the 500 ms debounce window right before a tab closes. That still works, and a write that failed before the close is still retried. A write already in flight when the tab closes is unchanged from before this PR: if it fails and no newer edit exists, it is not retried.

Full disk-staleness reconciliation is deliberately out of scope. ProjectWriteFileInput carries only cwd, relativePath and contents, so a write precondition would be a contract change across server, web, mobile and desktop. The remaining case: an edit made inside the debounce window that races an external write still flushes.

Related: #8424 touches this file for a different bug and, as a side effect, would also fix#8475 by zeroing latestRevision on success. This PR uses a separate counter instead, because latestRevision is also the in-flight ordering token — zeroing it makes the revision === latestRevision check after a successful write never hold. Whichever lands second needs a rebase.

UI Changes

None. Nothing rendered changes; the observable difference is the file's contents on disk after a tab close.

Before (main) and after, same steps — open probe.txt, type a character, wait past the debounce, delete it, wait, then echo APPENDED_BY_AGENT >> probe.txt from a shell, then close the tab:

=== BEFORE: disk after closing the file tab ===
line one
line two <- APPENDED_BY_AGENT destroyed
=== AFTER: disk after closing the file tab ===
line one
line two
APPENDED_BY_AGENT <- survives

Verification

vp test run apps/web/src/components/files/fileSaveCoordinator.test.ts # 8 passedcd apps/web && pnpm typecheck
vp lint apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
vp format --check apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
git diff --check

does not rewrite already saved contents when the editor closes fails on main (expected "vi.fn()" to be called once, but got 2 times) and passes here. The other new cases cover dispose inside the debounce window, dispose while a write is in flight (with and without a newer edit), and retry after a failed write. Also verified by hand in a dev client against a scratch --home-dir, per the transcript above.

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes (N/A — nothing rendered changed; disk transcript above)
  • I included a video for animation/interaction changes (N/A)

Model: Claude Opus 5 (1M context). Harness: Claude Code.


Note

Medium Risk
Changes file persistence on tab close in a coordinator used by the editor; incorrect logic could lose edits or skip needed flushes, but scope is small and well-tested.

Overview
Fixes closing a file tab re-writing disk with a stale buffer after the debounce had already persisted the same revision—e.g. when the file changed externally afterward (#8475).

FileSaveCoordinator now keeps a persistedRevision updated on each successful persist and only runs flush-on-dispose when latestRevision > persistedRevision, instead of whenever latestRevision > 0. Flush-on-close behavior is preserved for edits still inside the debounce window, newer edits while a write is in flight, and retries after a failed write; it does not trigger a second write when the last edit was already confirmed.

Tests add coverage for those dispose/close scenarios.

Reviewed by Cursor Bugbot for commit 38876e5. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix FileSaveCoordinator.dispose overwriting newer changes by tracking persistedRevision

  • Adds persistedRevision field to FileSaveCoordinator to track the last successfully saved revision, set on each successful persist in persistLatest
  • Changes dispose to only flush when latestRevision > persistedRevision, so closing a tab no longer rewrites content that was already saved
  • Failed writes leave persistedRevision unchanged, allowing dispose to retry pending or failed writes
  • Behavioral Change: dispose now skips persisting when all edits are already confirmed; previously it always persisted if latestRevision > 0

Macroscope summarized 38876e5.

The file editor's save coordinator only ever incremented its edit
revision, so `dispose` treated any tab that had been edited once as
holding unsaved work. Closing or switching that tab re-wrote the
remembered buffer, replacing whatever had changed the file since the
last save.
Track the revision confirmed on disk and flush on dispose only when the
buffer holds a newer edit. Edits made inside the debounce window are
still saved on close, and a write that failed before the close is still
retried.
Fixespingdotgg#8475
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. 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: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: cab90719-25eb-42d3-9ed8-cf43e07cc8f3

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

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

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:XS 0-9 changed lines (additions + deletions). labels Aug 29, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at 38876e5

Macroscope's review found this PR approvable — This is a narrowly scoped file-save bug fix that prevents a redundant close-time write after a revision is already persisted, while preserving unsaved-edit flushing and retry behavior. Production changes are confined to the save coordinator, with targeted tests covering the affected lifecycle cases and no product-default or schema changes.

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

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

We are keeping the file-tab save fix in the open PR #8630 instead of maintaining two implementations. Both track the last confirmed save revision and skip the redundant write when an already-saved tab closes. Pending edits still flush on close. The additional save-order tests here remain useful for that PR. The fix is not on main yet.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed.

@t3dotggt3dotgg closed this Sep 1, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS0-9 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Closing a file tab overwrites newer on-disk changes

2 participants

@walid-baharwal@t3dotgg
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

fix(web): closing a file tab no longer overwrites newer changes - #8632

Closed
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write
Closed

fix(web): closing a file tab no longer overwrites newer changes#8632
walid-baharwal wants to merge 1 commit into
pingdotgg:mainfrom
walid-baharwal:fix/file-tab-close-stale-write

Conversation

@walid-baharwal

@walid-baharwalwalid-baharwal commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

What Changed

FileSaveCoordinator now tracks the revision it last confirmed on disk and flushes on dispose only when the buffer holds an edit newer than that. Previously dispose flushed whenever latestRevision > 0, and latestRevision was only ever incremented, never reconciled with what was actually written.

Why

Closing or switching a file tab re-wrote the tab's remembered buffer even when the debounce had already saved it. If the file changed on disk after that save — an agent turn, another client, a shell — the close replaced the newer content with the stale buffer, with nothing in the UI or the event store recording the loss. Fixes#8475.

Flush-on-dispose is deliberate: it saves edits made inside the 500 ms debounce window right before a tab closes. That still works, and a write that failed before the close is still retried. A write already in flight when the tab closes is unchanged from before this PR: if it fails and no newer edit exists, it is not retried.

Full disk-staleness reconciliation is deliberately out of scope. ProjectWriteFileInput carries only cwd, relativePath and contents, so a write precondition would be a contract change across server, web, mobile and desktop. The remaining case: an edit made inside the debounce window that races an external write still flushes.

Related: #8424 touches this file for a different bug and, as a side effect, would also fix#8475 by zeroing latestRevision on success. This PR uses a separate counter instead, because latestRevision is also the in-flight ordering token — zeroing it makes the revision === latestRevision check after a successful write never hold. Whichever lands second needs a rebase.

UI Changes

None. Nothing rendered changes; the observable difference is the file's contents on disk after a tab close.

Before (main) and after, same steps — open probe.txt, type a character, wait past the debounce, delete it, wait, then echo APPENDED_BY_AGENT >> probe.txt from a shell, then close the tab:

=== BEFORE: disk after closing the file tab ===
line one
line two <- APPENDED_BY_AGENT destroyed
=== AFTER: disk after closing the file tab ===
line one
line two
APPENDED_BY_AGENT <- survives

Verification

vp test run apps/web/src/components/files/fileSaveCoordinator.test.ts # 8 passedcd apps/web && pnpm typecheck
vp lint apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
vp format --check apps/web/src/components/files/fileSaveCoordinator.ts apps/web/src/components/files/fileSaveCoordinator.test.ts
git diff --check

does not rewrite already saved contents when the editor closes fails on main (expected "vi.fn()" to be called once, but got 2 times) and passes here. The other new cases cover dispose inside the debounce window, dispose while a write is in flight (with and without a newer edit), and retry after a failed write. Also verified by hand in a dev client against a scratch --home-dir, per the transcript above.

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes (N/A — nothing rendered changed; disk transcript above)
  • I included a video for animation/interaction changes (N/A)

Model: Claude Opus 5 (1M context). Harness: Claude Code.


Note

Medium Risk
Changes file persistence on tab close in a coordinator used by the editor; incorrect logic could lose edits or skip needed flushes, but scope is small and well-tested.

Overview
Fixes closing a file tab re-writing disk with a stale buffer after the debounce had already persisted the same revision—e.g. when the file changed externally afterward (#8475).

FileSaveCoordinator now keeps a persistedRevision updated on each successful persist and only runs flush-on-dispose when latestRevision > persistedRevision, instead of whenever latestRevision > 0. Flush-on-close behavior is preserved for edits still inside the debounce window, newer edits while a write is in flight, and retries after a failed write; it does not trigger a second write when the last edit was already confirmed.

Tests add coverage for those dispose/close scenarios.

Reviewed by Cursor Bugbot for commit 38876e5. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Fix FileSaveCoordinator.dispose overwriting newer changes by tracking persistedRevision

  • Adds persistedRevision field to FileSaveCoordinator to track the last successfully saved revision, set on each successful persist in persistLatest
  • Changes dispose to only flush when latestRevision > persistedRevision, so closing a tab no longer rewrites content that was already saved
  • Failed writes leave persistedRevision unchanged, allowing dispose to retry pending or failed writes
  • Behavioral Change: dispose now skips persisting when all edits are already confirmed; previously it always persisted if latestRevision > 0

Macroscope summarized 38876e5.

The file editor's save coordinator only ever incremented its edit
revision, so `dispose` treated any tab that had been edited once as
holding unsaved work. Closing or switching that tab re-wrote the
remembered buffer, replacing whatever had changed the file since the
last save.
Track the revision confirmed on disk and flush on dispose only when the
buffer holds a newer edit. Edits made inside the debounce window are
still saved on close, and a write that failed before the close is still
retried.
Fixespingdotgg#8475
@coderabbitai

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. 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: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: cab90719-25eb-42d3-9ed8-cf43e07cc8f3

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

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

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:XS 0-9 changed lines (additions + deletions). labels Aug 29, 2026
@macroscopeapp

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at 38876e5

Macroscope's review found this PR approvable — This is a narrowly scoped file-save bug fix that prevents a redundant close-time write after a revision is already persisted, while preserving unsaved-edit flushing and retry behavior. Production changes are confined to the save coordinator, with targeted tests covering the affected lifecycle cases and no product-default or schema changes.

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

@t3dotgg

Copy link
Copy Markdown
Member

Note

🤖 GPT-5.6 Sol responding on behalf of Theo

We're closing this PR as we clean up the T3 Code backlog. Thank you for taking the time to put this together.

We are keeping the file-tab save fix in the open PR #8630 instead of maintaining two implementations. Both track the last confirmed save revision and skip the redundant write when an already-saved tab closes. Pending edits still flush on close. The additional save-order tests here remain useful for that PR. The fix is not on main yet.

If you believe we closed this in error, please reopen the PR and leave a comment explaining what we missed.

@t3dotggt3dotgg closed this Sep 1, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS0-9 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Closing a file tab overwrites newer on-disk changes

2 participants

@walid-baharwal@t3dotgg