Conversation
Co-authored-by: julius <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
f3bc237 to
f63c772
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Ports two upstream commits from the next tier of t3code port work onto MarCode:
dff8784a, upstream window controls overlay (windows&linux) pingdotgg/t3code#1969) — native Windows/Linux titlebar overlay so maximize/minimize/close buttons sit inside the app chrome, while keeping macOS'shiddenInset+ traffic-light offset intact.68061af0, upstream Improve markdown file link UX pingdotgg/t3code#1956) — chat messages render file references as monospaced chips with workspace-relative labels, icons, and hover tooltips. Changed-file previews in work-log entries are also truncated to workspace-relative form.Upstream's Claude Opus 4.7 port (
3e07f5a6) was checked during planning and is already inmainvia24dc316a; cherry-pick skipped (re-applying it would overwrite MarCode's claude-first defaults).Key reconciles (MarCode divergences preserved)
Sidebar.tsx— macOS traffic-light hack preserved. Inlinestyle={{ paddingLeft: 58 }}converted to conditionalpl-[58px]class so thewco:pl-[calc(env(titlebar-area-x)+1em)]variant can override on Windows/Linux.apps/desktop/src/main.ts— merged upstream'sgetWindowTitleBarOptions/syncWindowAppearance/syncAllWindowAppearance/nativeTheme.on("updated", ...)helpers with MarCode's existingcaptureWindowState/saveWindowState/ window-state persistence. MarCode'screateWindow(options?: { deferLoad?: boolean })signature +resolveWindowBoundspreserved.ChatView.tsx— upstream's discriminated-unionChatViewProps(withrouteKind/draftId/onDiffPanelOpen) not adopted, since MarCode uses separate route files for draft vs server threads. Added only the newreserveTitleBarControlInset?: booleanprop. Kept MarCode's collapsed-sidebarpl-[90px]macOS traffic-light hack in the header and layered upstream'swco:h-[...]+wco:pr-[...]variants on top.MessagesTimeline.tsx— MarCode keeps work-group rendering inline inrenderRowContent(upstream extracted it toWorkGroupSection). Applied upstream's intent surgically: importedformatWorkspaceRelativePath, threadedworkspaceRootintoSimpleWorkEntryRow+workEntryPreview, wrapped changed-file chips. No structural refactor.MessagesTimeline.test.tsx— MarCode's two existing tests preserved; upstream's new "formats changed file paths from the workspace root" test appended in MarCode's inline-props style (MarCode doesn't use a `buildProps()` helper).Test plan
Notes
🤖 Generated with Claude Code