Skip to content

Code-review fixes for the thin-layer integration branch - #54

Merged
ziyadakl merged 9 commits into
spec107/integrationfrom
spec107/review-fixes
Nov 3, 2026
Merged

ziyadakl merged 9 commits into
spec107/integrationfrom
spec107/review-fixes

Conversation

@ziyadakl

@ziyadakl ziyadakl commented Nov 3, 2026

Copy link
Copy Markdown
Owner

Part of ziyadakl/tokenmaxxing#107 (code-review fixes)

Summary

One commit per review item, no behaviour change.

1 Sidebar.tsx machine filter, thinner
    useSidebarEnvironmentFilter reads Upstream's useSidebarProjectGroups itself
      -> threads (every machine), projects + projectGroups (filtered), allProjects, allProjectGroups
    useSidebarThreads(threads = every thread, visibleThreads = filtered)   <- snooze wake clock still reads the filtered list
    environmentFilter.showsDraft(...) replaces isDraftSessionInSidebarScope + its import
2 SidebarProjectGroups.tsx: useSidebarProjectGroups -> useSidebarInboxGroups, alias dropped
3 ThreadRewindService: span "CheckpointRollbackService.withThreadWorkspaceLease" restored
4 ThreadRewindService.layerProvided(deps): runtimeLayer.ts passes its own layers (graph unchanged)
5 Orchestrator.ts: two comments Upstream deleted in #19559 removed
6 // Fork markers removed from Upstream files (kept: migration 076 note)
7 sync-upstream.sh check: footprint line printed first
8 CUSTOM.md: Seams column (edited Upstream tests, copy sync rules, in-place reasons, archive export)

Footprint (Upstream files the Fork edits, merge-base 8657eec):

Files Lines
Fork total, before 160 +8085 -2318
Fork total, after 160 +8042 -2316
Sidebar.tsx alone, before 1 +154 -40
Sidebar.tsx alone, after 1 +123 -38

Not done to the letter:

  • Item 4: runtimeLayer.ts keeps an 8-line call, not 1-3. The layers it passes are local constants that runtimeLayer.ts builds; a layer in the rewind module cannot import them without a cycle. ImportedRewindHeal stays in runtimeLayer.ts (it is production-only; bundling it would add it to the test layer).
  • Item 7: sync-upstream.test.sh only covers the helpers, not check's step order, so it is unchanged.

Evidence

  • Before (integration 3e8de13): 16 web test files, 235 tests pass (Sidebar.logic 92, bulkArchive.logic 12, environmentFilter.logic 18, Sidebar.drag 45, environmentFilterStore 14, uiStateStore 13, projectGroups 36, Sidebar.logic.browser, Sidebar.pointer.browser, SidebarDraftBlock.browser, routeReveal.browser).
    After: the same 16 files, 235 tests pass.
  • Server: runtimeLayer, ThreadRewindService, EffectWorker, CheckpointRollbackService tests, 133 pass (after item 4).
  • vp check 0 errors, knip:check pass, tsc --noEmit clean in apps/web, apps/server and packages/contracts, shellcheck and sync-upstream.test.sh pass.
  • No test renders the whole Sidebar; the seam wiring (draft rows, empty states, New thread counts) is checked by reading.

Merge Danger

Door: two-way. Code moves and comment edits; no data or setting changes.

Blast Radius: sidebar (web), rewind layer wiring (server)

Conflicts expected with any open PR touching Sidebar.tsx or runtimeLayer.ts.

🤖 Generated with Claude Code

…ines

useSidebarEnvironmentFilter now reads Upstream's project groups itself and
returns `threads` (every machine's) under Upstream's name; the sidebar narrows
it with visibleThreads() at the one call that needs the filtered list. The
draft-scope check moves behind environmentFilter.showsDraft(). Behaviour is
unchanged (snooze wake clock input, order keys and return stamps included).

Sidebar.tsx diff against the Upstream merge-base: +154 -40 -> +125 -38.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…the import alias

It clashed with Upstream's hooks/useSidebarProjectGroups.ts.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
AGENTS.md: preserve existing span names.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…on store, runtimeLayer passes its layers

Same layer graph: runtimeLayer hands over the layers it already builds, so no
service is built twice.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Neither is Upstream text at the merge-base or a feature's; both came back with an old sync.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
CUSTOM.md's Seams column records the seams. Kept the migration 076 note: it
explains code a sync would otherwise change back. Comments that explain a
non-obvious line stay, without the prefix.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
… still shows it

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
… in-place rewrite reasons

Also updates the machine filter, rewind and archive rows for the new seams.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:L labels Nov 3, 2026
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@ziyadakl
ziyadakl merged commit 63971f3 into spec107/integration Nov 3, 2026
27 checks passed
@ziyadakl
ziyadakl deleted the spec107/review-fixes branch November 3, 2026 08:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L 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.

2 participants