[Upstream Sync] 58ef46d2522d..2b244fa0ea7b

[TsekaLuk]

Upstream semantic sync report

Range: 58ef46d2522da100f1b49cac25413f0b42290b46..2b244fa0ea7b82e611d33de554a89766489d1baa

Commits: 4; changed paths: 33.

Risk summary

• High: 4
• Medium: 0
• Low: 0

Commits

• a1a78da87830 [high] fix(agent-history): match non-ASCII workspace paths to Claude sessions (#10841)
  Areas: desktop-host, renderer-shared
• 5a6a9e0b28d7 [high] fix(terminal): avoid flash while restoring parked terminals (#10871)
  Areas: renderer-shared, unclassified
• a142c84ede20 [high] Fix diff notes overlapping following lines (#7803)
  Areas: renderer-shared, unclassified
• 2b244fa0ea7b [high] fix(terminal): clear search highlights when the find bar closes (#10872)
  Areas: build-release, unclassified, renderer-shared

Porting policy

• High-risk desktop-host/runtime changes require a semantic Go/Tauri port.
• Reports and issues may be automated; merging is always manual.

[TsekaLuk]

Port progress (manual semantic)

✅ a142c84ede20 Fix diff notes overlapping following lines (#7803)

Pebble port landed in working tree (not yet pushed):

• DiffCommentCard: optional observeRenderedSize + ResizeObserver (rAF-coalesced) so Monaco view zones remeasure when notes wrap
• useDiffCommentDecorator: measure only when card height > 0; pass observeRenderedSize on zone mounts
• Test: DiffCommentCard.resize.test.tsx (2 tests green)

Why semantic: same Monaco view-zone height contract; class names already pebble-diff-*.

Remaining in this range

Commit	Status
a1a78da87830 non-ASCII workspace paths ↔ Claude sessions	TODO — main/ai-vault + path utils
5a6a9e0b28d7 parked terminal restore flash	TODO — large terminal-pane surface
2b244fa0ea7b clear search highlights on find bar close	TODO — xterm patch + tests

Working one commit at a time per maintainer request.

[TsekaLuk]

Update: a142c84 port merged

• Commit: 8d5b2d613 — fix(diff-notes): remeasure Monaco zones when notes wrap
• Tests: DiffCommentCard.resize.test.tsx (2) green

Remaining in #40:

1. 2b244fa0ea7b search decoration leak — needs @xterm/xterm SortedList patch (pnpm.patchedDependencies) + regression test; not yet applied (only src would be insufficient; production uses lib/xterm.js).
2. 5a6a9e0b28d7 parked terminal flash — large terminal-pane port.
3. a1a78da87830 non-ASCII Claude session path match — desktop-host/path utils.

Next session continues with (1) xterm SortedList patch as the highest-ROI remaining fix.

[TsekaLuk]

Update: 2b244fa search highlight leak ported

• Commit on main: (see latest fix(terminal): clear search highlights when find bar closes)
• Added config/patches/@xterm__xterm@6.1.0-beta.287.patch (SortedList retry-after-flush on key mutation)
• Patches src/common/SortedList.ts, lib/xterm.js, and lib/xterm.mjs
• Regression: terminal-search-decoration-leak.test.ts — 8 passed

#40 remaining

Commit	Status
a142c84 diff notes wrap	✅ 8d5b2d613
2b244fa search decoration leak	✅ this commit
5a6a9e0 parked terminal flash	TODO
a1a78da non-ASCII Claude path match	TODO

[TsekaLuk]

Pushed: a5aede2d2 on main for the xterm SortedList / search-highlight fix.

[TsekaLuk]

Update: a1a78da non-ASCII Claude path match ported

• Commit on main: b8c82da35 — fix(ai-vault): match non-ASCII paths to Claude sessions
• Semantic port of upstream #10841 / #10832:
  • cross-platform-path: NFC fold for comparison keys; WSL UNC alias fold; segment-based relative path slice (byte-exact suffix)
  • renderer path.ts: delegate containment to shared helper
  • Go aiVaultSessionInScope: NFC both scope and session cwd before filepath.Rel
• Tests: TS path suite (16) + TestAiVaultScopeMatchesNFDWorkspaceAgainstNFCCwd green

#40 range complete

Commit	Status
a142c84 diff notes wrap	✅ 8d5b2d613
2b244fa search decoration leak	✅ a5aede2d2
5a6a9e0 parked terminal flash	✅ b36cf1283
a1a78da non-ASCII Claude path match	✅ b8c82da35

Closing as the full upstream range is ported.