Repository navigation
fix(desktop): keep the project picker beside composer parameters - #6011
Merged
Merged
Conversation
Keep model/thinking controls content-sized while retaining their ability to shrink. Let the project trigger shrink with its assigned footer slot so a narrow new-task composer does not paint over send. Leave space allocation with the existing footer-leading marker instead of duplicating it on the controls group. Extend the existing new-task story with adjacency and narrow-slot geometry assertions; the former fails with the growing model group, and the latter fails with the fixed-size project trigger. Generated-by: Maka
…tory The narrow-composer assertion read `--maka-conversation-min-width` through getPropertyValue, which the ink ladder contract rejects because custom property reads return declarations rather than resolved values. The story already sets the card's max-width to that variable, so compare the card width with its computed max-width instead and leave the allowlist unchanged. Generated-by: Claude Code
Astro-Han
marked this pull request as ready for review
October 9, 2026 02:43
zhiiw
approved these changes
Oct 9, 2026
zhiiw
left a comment
Contributor
There was a problem hiding this comment.
Verified on a real Windows machine against d12e16e824f9439da7bfeee9c86a84ad9782b1a9 (CI label + test green on this head, unmoved at posting):
- The flex contract reads correctly: left controls no longer claim the row (
flex: 1 1 0removed), the model pair and the workspace picker both shrink (flex: 0 1 auto), so a long project name spends its own box, not the send button's. - Storybook smoke on this head: 451 stories / 491 renders pass, including the extended
NewChatComposerplay — gap equality, send stays inside the card at the conversation-min width, ordering holds, no horizontal overflow. (One unrelated concurrency flake passed alone — known on this machine.)
No blocking issues.
7 of 9 tasks
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
Fix a composer layout regression introduced by #5763: the model/thinking group grew into the available footer space, pushing the project selector next to Send instead of keeping the parameters together.
max-widthto--maka-conversation-min-widthand compares the card width with its computedmax-width, so the story reads no custom property and the ink ladder contract's allowlist is unchanged. No new component, state, breakpoint, or story is introduced. Session/project ownership, picker order, and menu behavior are unchanged; no migration is needed.Refs #5763.
Verification
npm --workspace @maka/desktop run build:workspace-deps— passed on current main (6d53ca8e9).npm run formatandnpm run lint— passed.npm --workspace @maka/desktop run typecheck— passed, including renderer and stories.npm --workspace @maka/desktop run build-storybook— passed.node --test dist/main/__tests__/ink-ladder-contract.test.jsinapps/desktop— 6 passed (it failed on the first push, which read the property throughgetPropertyValue).Same story and 1280×900 viewport, cropped to the Composer. BEFORE uses a static build of current main; AFTER uses this branch. Main's measured model-to-project gap was 224px; it is now 6px.
AI use
Tool(s) and scope: Maka (GPT-6.1) diagnosed the regression, edited the layout rules and existing story assertions, ran verification, and prepared this PR. Claude Code fixed the story's custom-property read flagged by the ink ladder contract.
Checklist
Does this PR entail a change in behavior?