refactor(ui): refine Button proportions and interaction hierarchy by Astro-Han · Pull Request #901 · apache/maka

Astro-Han · 2026-07-13T17:13:04Z

Summary

Refine the shared Button primitive into governed 32px default and 28px compact tiers with one 13px bilingual type tier.
Simplify the neutral hierarchy to secondary, ghost, and quiet; remove the outline and layout-free nav escape hatches.
Make hover, active, focus, and disabled states visually distinct, and expand Storybook coverage for CJK, English, mixed labels, icons, sizes, variants, and disabled controls.

Why

The shared Button had accumulated 28px, 30px, 32px, 36px, and 40px paths, while compact consumers compensated with local geometry and hover rules. That made Chinese and English labels appear inconsistent and blurred the hierarchy between solid actions, bordered secondary actions, and quiet controls.

This change restores the primitive as the single authority for action proportions and interaction states. Composite navigation rows remain in their existing semantic seams instead of pretending to be another Button size.

Closes#878.

Scope

No per-language CSS or language-specific sizing.
No new typography, control-height, or interaction-state tokens.
No parallel Button primitive.
Composite sidebar, session, and artifact rows keep their semantic layouts; standard actions use the governed Button tiers.

Verification

npm --workspace @maka/ui test — 128 tests passed.
npm --workspace @maka/desktop test — 2,415 tests passed.
npm run typecheck — all workspaces passed.
Storybook real-browser computed styles, light and dark:
- default / compact heights: 32px / 28px
- CJK and English labels: 13px
- solid / neutral weights: 500 / 400
- secondary border: 1px
- hover, active, focus, and disabled states are pairwise distinguishable
- disabled opacity: 0.45
Representative Electron visual smoke reviewed for settings actions, compact chat actions, destructive permission dialog, and composite sidebar rows. All four screenshots rendered successfully; the existing macOS harness reached its 60s cleanup threshold after capture.

Button hierarchy

Before	After

Interaction states

Before	After

Impact

Button consumers now use a smaller governed default height, neutral text uses normal weight, and outline, lg, and nav are no longer valid Button options. Existing consumers are migrated in this PR; no operator action or data migration is required.

Reviewer notes

Please focus on the shared variant matrix, the distinction between ghost and quiet text tone, and the semantic separation between standard actions and composite navigation rows.

Ready for review

Verification is complete and the results above are current
Impact, compatibility, migration, documentation, and release-note needs are addressed
User-visible UI/UX changes include visual evidence, or Verification explains why it is not applicable

…ill shape (#1028) #901 retired the composer consumer-layer button CSS (maka-composer-tool-button / maka-composer-context-plus / maka-composer-send-button) onto the shared Button, but the shared primitive had no governed replacement for the circle — its only radius is the control-tier rounded-sm — so the "+" affordance (hover included) and the send button silently went square. Add a `shape` axis to buttonVariants (default / pill) so the pill tier lives on the governed primitive, opt the composer "+" and send buttons into shape="pill", and extend the radius-converge contract with `alsoTiers` so a component can legitimately serve more than one radius tier (buttonVariants: control + pill). The utility-primitives contract now asserts the composer buttons carry shape="pill", and button.test.ts locks that tailwind-merge resolves pill over the base rounded-sm.

docs/screenshots/ holds issue-878 and AskUserQuestion evidence images (#901, #939). No tracked file references them, and the PR bodies embed them via raw URLs pinned to PR-branch SHAs, which GitHub keeps serving (verified HTTP 200) independently of main.

Astro-Han · 2026-07-13T17:13:04Z

Summary

Refine the shared Button primitive into governed 32px default and 28px compact tiers with one 13px bilingual type tier.
Simplify the neutral hierarchy to secondary, ghost, and quiet; remove the outline and layout-free nav escape hatches.
Make hover, active, focus, and disabled states visually distinct, and expand Storybook coverage for CJK, English, mixed labels, icons, sizes, variants, and disabled controls.

Why

The shared Button had accumulated 28px, 30px, 32px, 36px, and 40px paths, while compact consumers compensated with local geometry and hover rules. That made Chinese and English labels appear inconsistent and blurred the hierarchy between solid actions, bordered secondary actions, and quiet controls.

This change restores the primitive as the single authority for action proportions and interaction states. Composite navigation rows remain in their existing semantic seams instead of pretending to be another Button size.

Closes#878.

Scope

No per-language CSS or language-specific sizing.
No new typography, control-height, or interaction-state tokens.
No parallel Button primitive.
Composite sidebar, session, and artifact rows keep their semantic layouts; standard actions use the governed Button tiers.

Verification

npm --workspace @maka/ui test — 128 tests passed.
npm --workspace @maka/desktop test — 2,415 tests passed.
npm run typecheck — all workspaces passed.
Storybook real-browser computed styles, light and dark:
- default / compact heights: 32px / 28px
- CJK and English labels: 13px
- solid / neutral weights: 500 / 400
- secondary border: 1px
- hover, active, focus, and disabled states are pairwise distinguishable
- disabled opacity: 0.45
Representative Electron visual smoke reviewed for settings actions, compact chat actions, destructive permission dialog, and composite sidebar rows. All four screenshots rendered successfully; the existing macOS harness reached its 60s cleanup threshold after capture.

Button hierarchy

Before	After

Interaction states

Before	After

Impact

Button consumers now use a smaller governed default height, neutral text uses normal weight, and outline, lg, and nav are no longer valid Button options. Existing consumers are migrated in this PR; no operator action or data migration is required.

Reviewer notes

Please focus on the shared variant matrix, the distinction between ghost and quiet text tone, and the semantic separation between standard actions and composite navigation rows.

Ready for review

Verification is complete and the results above are current
Impact, compatibility, migration, documentation, and release-note needs are addressed
User-visible UI/UX changes include visual evidence, or Verification explains why it is not applicable

…ill shape (#1028) #901 retired the composer consumer-layer button CSS (maka-composer-tool-button / maka-composer-context-plus / maka-composer-send-button) onto the shared Button, but the shared primitive had no governed replacement for the circle — its only radius is the control-tier rounded-sm — so the "+" affordance (hover included) and the send button silently went square. Add a `shape` axis to buttonVariants (default / pill) so the pill tier lives on the governed primitive, opt the composer "+" and send buttons into shape="pill", and extend the radius-converge contract with `alsoTiers` so a component can legitimately serve more than one radius tier (buttonVariants: control + pill). The utility-primitives contract now asserts the composer buttons carry shape="pill", and button.test.ts locks that tailwind-merge resolves pill over the base rounded-sm.

docs/screenshots/ holds issue-878 and AskUserQuestion evidence images (#901, #939). No tracked file references them, and the PR bodies embed them via raw URLs pinned to PR-branch SHAs, which GitHub keeps serving (verified HTTP 200) independently of main.

Astro-Han · 2026-07-13T17:13:04Z

Summary

Refine the shared Button primitive into governed 32px default and 28px compact tiers with one 13px bilingual type tier.
Simplify the neutral hierarchy to secondary, ghost, and quiet; remove the outline and layout-free nav escape hatches.
Make hover, active, focus, and disabled states visually distinct, and expand Storybook coverage for CJK, English, mixed labels, icons, sizes, variants, and disabled controls.

Why

The shared Button had accumulated 28px, 30px, 32px, 36px, and 40px paths, while compact consumers compensated with local geometry and hover rules. That made Chinese and English labels appear inconsistent and blurred the hierarchy between solid actions, bordered secondary actions, and quiet controls.

This change restores the primitive as the single authority for action proportions and interaction states. Composite navigation rows remain in their existing semantic seams instead of pretending to be another Button size.

Closes#878.

Scope

No per-language CSS or language-specific sizing.
No new typography, control-height, or interaction-state tokens.
No parallel Button primitive.
Composite sidebar, session, and artifact rows keep their semantic layouts; standard actions use the governed Button tiers.

Verification

npm --workspace @maka/ui test — 128 tests passed.
npm --workspace @maka/desktop test — 2,415 tests passed.
npm run typecheck — all workspaces passed.
Storybook real-browser computed styles, light and dark:
- default / compact heights: 32px / 28px
- CJK and English labels: 13px
- solid / neutral weights: 500 / 400
- secondary border: 1px
- hover, active, focus, and disabled states are pairwise distinguishable
- disabled opacity: 0.45
Representative Electron visual smoke reviewed for settings actions, compact chat actions, destructive permission dialog, and composite sidebar rows. All four screenshots rendered successfully; the existing macOS harness reached its 60s cleanup threshold after capture.

Button hierarchy

Before	After

Interaction states

Before	After

Impact

Button consumers now use a smaller governed default height, neutral text uses normal weight, and outline, lg, and nav are no longer valid Button options. Existing consumers are migrated in this PR; no operator action or data migration is required.

Reviewer notes

Please focus on the shared variant matrix, the distinction between ghost and quiet text tone, and the semantic separation between standard actions and composite navigation rows.

Ready for review

Verification is complete and the results above are current
Impact, compatibility, migration, documentation, and release-note needs are addressed
User-visible UI/UX changes include visual evidence, or Verification explains why it is not applicable

…ill shape (#1028) #901 retired the composer consumer-layer button CSS (maka-composer-tool-button / maka-composer-context-plus / maka-composer-send-button) onto the shared Button, but the shared primitive had no governed replacement for the circle — its only radius is the control-tier rounded-sm — so the "+" affordance (hover included) and the send button silently went square. Add a `shape` axis to buttonVariants (default / pill) so the pill tier lives on the governed primitive, opt the composer "+" and send buttons into shape="pill", and extend the radius-converge contract with `alsoTiers` so a component can legitimately serve more than one radius tier (buttonVariants: control + pill). The utility-primitives contract now asserts the composer buttons carry shape="pill", and button.test.ts locks that tailwind-merge resolves pill over the base rounded-sm.

docs/screenshots/ holds issue-878 and AskUserQuestion evidence images (#901, #939). No tracked file references them, and the PR bodies embed them via raw URLs pinned to PR-branch SHAs, which GitHub keeps serving (verified HTTP 200) independently of main.

Astro-Han · 2026-07-13T17:13:04Z

Summary

Refine the shared Button primitive into governed 32px default and 28px compact tiers with one 13px bilingual type tier.
Simplify the neutral hierarchy to secondary, ghost, and quiet; remove the outline and layout-free nav escape hatches.
Make hover, active, focus, and disabled states visually distinct, and expand Storybook coverage for CJK, English, mixed labels, icons, sizes, variants, and disabled controls.

Why

The shared Button had accumulated 28px, 30px, 32px, 36px, and 40px paths, while compact consumers compensated with local geometry and hover rules. That made Chinese and English labels appear inconsistent and blurred the hierarchy between solid actions, bordered secondary actions, and quiet controls.

This change restores the primitive as the single authority for action proportions and interaction states. Composite navigation rows remain in their existing semantic seams instead of pretending to be another Button size.

Closes#878.

Scope

No per-language CSS or language-specific sizing.
No new typography, control-height, or interaction-state tokens.
No parallel Button primitive.
Composite sidebar, session, and artifact rows keep their semantic layouts; standard actions use the governed Button tiers.

Verification

npm --workspace @maka/ui test — 128 tests passed.
npm --workspace @maka/desktop test — 2,415 tests passed.
npm run typecheck — all workspaces passed.
Storybook real-browser computed styles, light and dark:
- default / compact heights: 32px / 28px
- CJK and English labels: 13px
- solid / neutral weights: 500 / 400
- secondary border: 1px
- hover, active, focus, and disabled states are pairwise distinguishable
- disabled opacity: 0.45
Representative Electron visual smoke reviewed for settings actions, compact chat actions, destructive permission dialog, and composite sidebar rows. All four screenshots rendered successfully; the existing macOS harness reached its 60s cleanup threshold after capture.

Button hierarchy

Before	After

Interaction states

Before	After

Impact

Button consumers now use a smaller governed default height, neutral text uses normal weight, and outline, lg, and nav are no longer valid Button options. Existing consumers are migrated in this PR; no operator action or data migration is required.

Reviewer notes

Please focus on the shared variant matrix, the distinction between ghost and quiet text tone, and the semantic separation between standard actions and composite navigation rows.

Ready for review

Verification is complete and the results above are current
Impact, compatibility, migration, documentation, and release-note needs are addressed
User-visible UI/UX changes include visual evidence, or Verification explains why it is not applicable

…ill shape (#1028) #901 retired the composer consumer-layer button CSS (maka-composer-tool-button / maka-composer-context-plus / maka-composer-send-button) onto the shared Button, but the shared primitive had no governed replacement for the circle — its only radius is the control-tier rounded-sm — so the "+" affordance (hover included) and the send button silently went square. Add a `shape` axis to buttonVariants (default / pill) so the pill tier lives on the governed primitive, opt the composer "+" and send buttons into shape="pill", and extend the radius-converge contract with `alsoTiers` so a component can legitimately serve more than one radius tier (buttonVariants: control + pill). The utility-primitives contract now asserts the composer buttons carry shape="pill", and button.test.ts locks that tailwind-merge resolves pill over the base rounded-sm.

docs/screenshots/ holds issue-878 and AskUserQuestion evidence images (#901, #939). No tracked file references them, and the PR bodies embed them via raw URLs pinned to PR-branch SHAs, which GitHub keeps serving (verified HTTP 200) independently of main.

Astro-Han · 2026-07-13T17:13:04Z

Summary

Refine the shared Button primitive into governed 32px default and 28px compact tiers with one 13px bilingual type tier.
Simplify the neutral hierarchy to secondary, ghost, and quiet; remove the outline and layout-free nav escape hatches.
Make hover, active, focus, and disabled states visually distinct, and expand Storybook coverage for CJK, English, mixed labels, icons, sizes, variants, and disabled controls.

Why

The shared Button had accumulated 28px, 30px, 32px, 36px, and 40px paths, while compact consumers compensated with local geometry and hover rules. That made Chinese and English labels appear inconsistent and blurred the hierarchy between solid actions, bordered secondary actions, and quiet controls.

This change restores the primitive as the single authority for action proportions and interaction states. Composite navigation rows remain in their existing semantic seams instead of pretending to be another Button size.

Closes#878.

Scope

No per-language CSS or language-specific sizing.
No new typography, control-height, or interaction-state tokens.
No parallel Button primitive.
Composite sidebar, session, and artifact rows keep their semantic layouts; standard actions use the governed Button tiers.

Verification

npm --workspace @maka/ui test — 128 tests passed.
npm --workspace @maka/desktop test — 2,415 tests passed.
npm run typecheck — all workspaces passed.
Storybook real-browser computed styles, light and dark:
- default / compact heights: 32px / 28px
- CJK and English labels: 13px
- solid / neutral weights: 500 / 400
- secondary border: 1px
- hover, active, focus, and disabled states are pairwise distinguishable
- disabled opacity: 0.45
Representative Electron visual smoke reviewed for settings actions, compact chat actions, destructive permission dialog, and composite sidebar rows. All four screenshots rendered successfully; the existing macOS harness reached its 60s cleanup threshold after capture.

Button hierarchy

Before	After

Interaction states

Before	After

Impact

Button consumers now use a smaller governed default height, neutral text uses normal weight, and outline, lg, and nav are no longer valid Button options. Existing consumers are migrated in this PR; no operator action or data migration is required.

Reviewer notes

Please focus on the shared variant matrix, the distinction between ghost and quiet text tone, and the semantic separation between standard actions and composite navigation rows.

Ready for review

Verification is complete and the results above are current
Impact, compatibility, migration, documentation, and release-note needs are addressed
User-visible UI/UX changes include visual evidence, or Verification explains why it is not applicable

…ill shape (#1028) #901 retired the composer consumer-layer button CSS (maka-composer-tool-button / maka-composer-context-plus / maka-composer-send-button) onto the shared Button, but the shared primitive had no governed replacement for the circle — its only radius is the control-tier rounded-sm — so the "+" affordance (hover included) and the send button silently went square. Add a `shape` axis to buttonVariants (default / pill) so the pill tier lives on the governed primitive, opt the composer "+" and send buttons into shape="pill", and extend the radius-converge contract with `alsoTiers` so a component can legitimately serve more than one radius tier (buttonVariants: control + pill). The utility-primitives contract now asserts the composer buttons carry shape="pill", and button.test.ts locks that tailwind-merge resolves pill over the base rounded-sm.

docs/screenshots/ holds issue-878 and AskUserQuestion evidence images (#901, #939). No tracked file references them, and the PR bodies embed them via raw URLs pinned to PR-branch SHAs, which GitHub keeps serving (verified HTTP 200) independently of main.

Astro-Han · 2026-07-13T17:13:04Z

Summary

Refine the shared Button primitive into governed 32px default and 28px compact tiers with one 13px bilingual type tier.
Simplify the neutral hierarchy to secondary, ghost, and quiet; remove the outline and layout-free nav escape hatches.
Make hover, active, focus, and disabled states visually distinct, and expand Storybook coverage for CJK, English, mixed labels, icons, sizes, variants, and disabled controls.

Why

The shared Button had accumulated 28px, 30px, 32px, 36px, and 40px paths, while compact consumers compensated with local geometry and hover rules. That made Chinese and English labels appear inconsistent and blurred the hierarchy between solid actions, bordered secondary actions, and quiet controls.

This change restores the primitive as the single authority for action proportions and interaction states. Composite navigation rows remain in their existing semantic seams instead of pretending to be another Button size.

Closes#878.

Scope

No per-language CSS or language-specific sizing.
No new typography, control-height, or interaction-state tokens.
No parallel Button primitive.
Composite sidebar, session, and artifact rows keep their semantic layouts; standard actions use the governed Button tiers.

Verification

npm --workspace @maka/ui test — 128 tests passed.
npm --workspace @maka/desktop test — 2,415 tests passed.
npm run typecheck — all workspaces passed.
Storybook real-browser computed styles, light and dark:
- default / compact heights: 32px / 28px
- CJK and English labels: 13px
- solid / neutral weights: 500 / 400
- secondary border: 1px
- hover, active, focus, and disabled states are pairwise distinguishable
- disabled opacity: 0.45
Representative Electron visual smoke reviewed for settings actions, compact chat actions, destructive permission dialog, and composite sidebar rows. All four screenshots rendered successfully; the existing macOS harness reached its 60s cleanup threshold after capture.

Button hierarchy

Before	After

Interaction states

Before	After

Impact

Button consumers now use a smaller governed default height, neutral text uses normal weight, and outline, lg, and nav are no longer valid Button options. Existing consumers are migrated in this PR; no operator action or data migration is required.

Reviewer notes

Please focus on the shared variant matrix, the distinction between ghost and quiet text tone, and the semantic separation between standard actions and composite navigation rows.

Ready for review

Verification is complete and the results above are current
Impact, compatibility, migration, documentation, and release-note needs are addressed
User-visible UI/UX changes include visual evidence, or Verification explains why it is not applicable

…ill shape (#1028) #901 retired the composer consumer-layer button CSS (maka-composer-tool-button / maka-composer-context-plus / maka-composer-send-button) onto the shared Button, but the shared primitive had no governed replacement for the circle — its only radius is the control-tier rounded-sm — so the "+" affordance (hover included) and the send button silently went square. Add a `shape` axis to buttonVariants (default / pill) so the pill tier lives on the governed primitive, opt the composer "+" and send buttons into shape="pill", and extend the radius-converge contract with `alsoTiers` so a component can legitimately serve more than one radius tier (buttonVariants: control + pill). The utility-primitives contract now asserts the composer buttons carry shape="pill", and button.test.ts locks that tailwind-merge resolves pill over the base rounded-sm.

docs/screenshots/ holds issue-878 and AskUserQuestion evidence images (#901, #939). No tracked file references them, and the PR bodies embed them via raw URLs pinned to PR-branch SHAs, which GitHub keeps serving (verified HTTP 200) independently of main.

Astro-Han · 2026-07-13T17:13:04Z

Summary

Refine the shared Button primitive into governed 32px default and 28px compact tiers with one 13px bilingual type tier.
Simplify the neutral hierarchy to secondary, ghost, and quiet; remove the outline and layout-free nav escape hatches.
Make hover, active, focus, and disabled states visually distinct, and expand Storybook coverage for CJK, English, mixed labels, icons, sizes, variants, and disabled controls.

Why

The shared Button had accumulated 28px, 30px, 32px, 36px, and 40px paths, while compact consumers compensated with local geometry and hover rules. That made Chinese and English labels appear inconsistent and blurred the hierarchy between solid actions, bordered secondary actions, and quiet controls.

This change restores the primitive as the single authority for action proportions and interaction states. Composite navigation rows remain in their existing semantic seams instead of pretending to be another Button size.

Closes#878.

Scope

No per-language CSS or language-specific sizing.
No new typography, control-height, or interaction-state tokens.
No parallel Button primitive.
Composite sidebar, session, and artifact rows keep their semantic layouts; standard actions use the governed Button tiers.

Verification

npm --workspace @maka/ui test — 128 tests passed.
npm --workspace @maka/desktop test — 2,415 tests passed.
npm run typecheck — all workspaces passed.
Storybook real-browser computed styles, light and dark:
- default / compact heights: 32px / 28px
- CJK and English labels: 13px
- solid / neutral weights: 500 / 400
- secondary border: 1px
- hover, active, focus, and disabled states are pairwise distinguishable
- disabled opacity: 0.45
Representative Electron visual smoke reviewed for settings actions, compact chat actions, destructive permission dialog, and composite sidebar rows. All four screenshots rendered successfully; the existing macOS harness reached its 60s cleanup threshold after capture.

Button hierarchy

Before	After

Interaction states

Before	After

Impact

Button consumers now use a smaller governed default height, neutral text uses normal weight, and outline, lg, and nav are no longer valid Button options. Existing consumers are migrated in this PR; no operator action or data migration is required.

Reviewer notes

Please focus on the shared variant matrix, the distinction between ghost and quiet text tone, and the semantic separation between standard actions and composite navigation rows.

Ready for review

Verification is complete and the results above are current
Impact, compatibility, migration, documentation, and release-note needs are addressed
User-visible UI/UX changes include visual evidence, or Verification explains why it is not applicable

…ill shape (#1028) #901 retired the composer consumer-layer button CSS (maka-composer-tool-button / maka-composer-context-plus / maka-composer-send-button) onto the shared Button, but the shared primitive had no governed replacement for the circle — its only radius is the control-tier rounded-sm — so the "+" affordance (hover included) and the send button silently went square. Add a `shape` axis to buttonVariants (default / pill) so the pill tier lives on the governed primitive, opt the composer "+" and send buttons into shape="pill", and extend the radius-converge contract with `alsoTiers` so a component can legitimately serve more than one radius tier (buttonVariants: control + pill). The utility-primitives contract now asserts the composer buttons carry shape="pill", and button.test.ts locks that tailwind-merge resolves pill over the base rounded-sm.

docs/screenshots/ holds issue-878 and AskUserQuestion evidence images (#901, #939). No tracked file references them, and the PR bodies embed them via raw URLs pinned to PR-branch SHAs, which GitHub keeps serving (verified HTTP 200) independently of main.

Astro-Han · 2026-07-13T17:13:04Z

Summary

Refine the shared Button primitive into governed 32px default and 28px compact tiers with one 13px bilingual type tier.
Simplify the neutral hierarchy to secondary, ghost, and quiet; remove the outline and layout-free nav escape hatches.
Make hover, active, focus, and disabled states visually distinct, and expand Storybook coverage for CJK, English, mixed labels, icons, sizes, variants, and disabled controls.

Why

The shared Button had accumulated 28px, 30px, 32px, 36px, and 40px paths, while compact consumers compensated with local geometry and hover rules. That made Chinese and English labels appear inconsistent and blurred the hierarchy between solid actions, bordered secondary actions, and quiet controls.

This change restores the primitive as the single authority for action proportions and interaction states. Composite navigation rows remain in their existing semantic seams instead of pretending to be another Button size.

Closes#878.

Scope

No per-language CSS or language-specific sizing.
No new typography, control-height, or interaction-state tokens.
No parallel Button primitive.
Composite sidebar, session, and artifact rows keep their semantic layouts; standard actions use the governed Button tiers.

Verification

npm --workspace @maka/ui test — 128 tests passed.
npm --workspace @maka/desktop test — 2,415 tests passed.
npm run typecheck — all workspaces passed.
Storybook real-browser computed styles, light and dark:
- default / compact heights: 32px / 28px
- CJK and English labels: 13px
- solid / neutral weights: 500 / 400
- secondary border: 1px
- hover, active, focus, and disabled states are pairwise distinguishable
- disabled opacity: 0.45
Representative Electron visual smoke reviewed for settings actions, compact chat actions, destructive permission dialog, and composite sidebar rows. All four screenshots rendered successfully; the existing macOS harness reached its 60s cleanup threshold after capture.

Button hierarchy

Before	After

Interaction states

Before	After

Impact

Button consumers now use a smaller governed default height, neutral text uses normal weight, and outline, lg, and nav are no longer valid Button options. Existing consumers are migrated in this PR; no operator action or data migration is required.

Reviewer notes

Please focus on the shared variant matrix, the distinction between ghost and quiet text tone, and the semantic separation between standard actions and composite navigation rows.

Ready for review

Verification is complete and the results above are current
Impact, compatibility, migration, documentation, and release-note needs are addressed
User-visible UI/UX changes include visual evidence, or Verification explains why it is not applicable

…ill shape (#1028) #901 retired the composer consumer-layer button CSS (maka-composer-tool-button / maka-composer-context-plus / maka-composer-send-button) onto the shared Button, but the shared primitive had no governed replacement for the circle — its only radius is the control-tier rounded-sm — so the "+" affordance (hover included) and the send button silently went square. Add a `shape` axis to buttonVariants (default / pill) so the pill tier lives on the governed primitive, opt the composer "+" and send buttons into shape="pill", and extend the radius-converge contract with `alsoTiers` so a component can legitimately serve more than one radius tier (buttonVariants: control + pill). The utility-primitives contract now asserts the composer buttons carry shape="pill", and button.test.ts locks that tailwind-merge resolves pill over the base rounded-sm.

docs/screenshots/ holds issue-878 and AskUserQuestion evidence images (#901, #939). No tracked file references them, and the PR bodies embed them via raw URLs pinned to PR-branch SHAs, which GitHub keeps serving (verified HTTP 200) independently of main.

Astro-Han added 9 commits July 14, 2026 02:08

refactor(ui): refine button interaction hierarchy
1fa0b41

docs(ui): add button visual comparison
b8884dd

fix(ui): preserve session row control radius
ce3c879

fix(ui): govern aria-disabled button states
a2c0869

fix(ui): complete composite row interactions
7b03125

refactor(ui): move prompt suggestions to semantic rows
b068da4

refactor(ui): use destructive history action
732ae6d

test(ui): lock real button interaction states
640961d

fix(ui): use governed disabled opacity
6c35908

Astro-Han force-pushed the refactor/ui-button-hierarchy branch from 4a20293 to 6c35908Compare July 13, 2026 18:10

Astro-Han added 7 commits July 14, 2026 02:24

refactor(ui): remove legacy button consumer layers
19b7d5b

docs(ui): add governed button consumer evidence
1dda55b

refactor(ui): enforce button consumer ownership
3f23596

docs(ui): refresh governed consumer evidence
d04dd5d

fix(ui): restore governed chat actions
03c299d

test(ui): exercise composite keyboard focus
286b64b

chore(ui): align Storybook dependency audit
e7928ef

Astro-Han marked this pull request as ready for review July 13, 2026 19:24

Astro-Han merged commit 0af06d3 into mainJul 13, 2026
3 checks passed

Astro-Han deleted the refactor/ui-button-hierarchy branch July 13, 2026 19:25

This was referenced Jul 15, 2026
fix(ui): restore quiet composer picker triggers #999
Merged
fix(ui): restore circular composer icon buttons via governed Button pill shape #1028
Merged

This was referenced Jul 16, 2026
chore: remove committed review-evidence screenshots #1094
Merged
refactor(desktop): converge settings sidebar tier and row primitives #1132
Merged

Astro-Han added 9 commits July 14, 2026 02:08

refactor(ui): refine button interaction hierarchy
1fa0b41

docs(ui): add button visual comparison
b8884dd

fix(ui): preserve session row control radius
ce3c879

fix(ui): govern aria-disabled button states
a2c0869

fix(ui): complete composite row interactions
7b03125

refactor(ui): move prompt suggestions to semantic rows
b068da4

refactor(ui): use destructive history action
732ae6d

test(ui): lock real button interaction states
640961d

fix(ui): use governed disabled opacity
6c35908

Astro-Han force-pushed the refactor/ui-button-hierarchy branch from 4a20293 to 6c35908Compare July 13, 2026 18:10

Astro-Han added 7 commits July 14, 2026 02:24

refactor(ui): remove legacy button consumer layers
19b7d5b

docs(ui): add governed button consumer evidence
1dda55b

refactor(ui): enforce button consumer ownership
3f23596

docs(ui): refresh governed consumer evidence
d04dd5d

fix(ui): restore governed chat actions
03c299d

test(ui): exercise composite keyboard focus
286b64b

chore(ui): align Storybook dependency audit
e7928ef

Astro-Han marked this pull request as ready for review July 13, 2026 19:24

Astro-Han merged commit 0af06d3 into mainJul 13, 2026
3 checks passed

Astro-Han deleted the refactor/ui-button-hierarchy branch July 13, 2026 19:25

This was referenced Jul 15, 2026
fix(ui): restore quiet composer picker triggers #999
Merged
fix(ui): restore circular composer icon buttons via governed Button pill shape #1028
Merged

This was referenced Jul 16, 2026
chore: remove committed review-evidence screenshots #1094
Merged
refactor(desktop): converge settings sidebar tier and row primitives #1132
Merged

Astro-Han added 9 commits July 14, 2026 02:08

refactor(ui): refine button interaction hierarchy
1fa0b41

docs(ui): add button visual comparison
b8884dd

fix(ui): preserve session row control radius
ce3c879

fix(ui): govern aria-disabled button states
a2c0869

fix(ui): complete composite row interactions
7b03125

refactor(ui): move prompt suggestions to semantic rows
b068da4

refactor(ui): use destructive history action
732ae6d

test(ui): lock real button interaction states
640961d

fix(ui): use governed disabled opacity
6c35908

Astro-Han force-pushed the refactor/ui-button-hierarchy branch from 4a20293 to 6c35908Compare July 13, 2026 18:10

Astro-Han added 7 commits July 14, 2026 02:24

refactor(ui): remove legacy button consumer layers
19b7d5b

docs(ui): add governed button consumer evidence
1dda55b

refactor(ui): enforce button consumer ownership
3f23596

docs(ui): refresh governed consumer evidence
d04dd5d

fix(ui): restore governed chat actions
03c299d

test(ui): exercise composite keyboard focus
286b64b

chore(ui): align Storybook dependency audit
e7928ef

Astro-Han marked this pull request as ready for review July 13, 2026 19:24

Astro-Han merged commit 0af06d3 into mainJul 13, 2026
3 checks passed

Astro-Han deleted the refactor/ui-button-hierarchy branch July 13, 2026 19:25

This was referenced Jul 15, 2026
fix(ui): restore quiet composer picker triggers #999
Merged
fix(ui): restore circular composer icon buttons via governed Button pill shape #1028
Merged

This was referenced Jul 16, 2026
chore: remove committed review-evidence screenshots #1094
Merged
refactor(desktop): converge settings sidebar tier and row primitives #1132
Merged

Astro-Han added 9 commits July 14, 2026 02:08

refactor(ui): refine button interaction hierarchy
1fa0b41

docs(ui): add button visual comparison
b8884dd

fix(ui): preserve session row control radius
ce3c879

fix(ui): govern aria-disabled button states
a2c0869

fix(ui): complete composite row interactions
7b03125

refactor(ui): move prompt suggestions to semantic rows
b068da4

refactor(ui): use destructive history action
732ae6d

test(ui): lock real button interaction states
640961d

fix(ui): use governed disabled opacity
6c35908

Astro-Han force-pushed the refactor/ui-button-hierarchy branch from 4a20293 to 6c35908Compare July 13, 2026 18:10

Astro-Han added 7 commits July 14, 2026 02:24

refactor(ui): remove legacy button consumer layers
19b7d5b

docs(ui): add governed button consumer evidence
1dda55b

refactor(ui): enforce button consumer ownership
3f23596

docs(ui): refresh governed consumer evidence
d04dd5d

fix(ui): restore governed chat actions
03c299d

test(ui): exercise composite keyboard focus
286b64b

chore(ui): align Storybook dependency audit
e7928ef

Astro-Han marked this pull request as ready for review July 13, 2026 19:24

Astro-Han merged commit 0af06d3 into mainJul 13, 2026
3 checks passed

Astro-Han deleted the refactor/ui-button-hierarchy branch July 13, 2026 19:25

This was referenced Jul 15, 2026
fix(ui): restore quiet composer picker triggers #999
Merged
fix(ui): restore circular composer icon buttons via governed Button pill shape #1028
Merged

This was referenced Jul 16, 2026
chore: remove committed review-evidence screenshots #1094
Merged
refactor(desktop): converge settings sidebar tier and row primitives #1132
Merged

Astro-Han added 9 commits July 14, 2026 02:08

refactor(ui): refine button interaction hierarchy
1fa0b41

docs(ui): add button visual comparison
b8884dd

fix(ui): preserve session row control radius
ce3c879

fix(ui): govern aria-disabled button states
a2c0869

fix(ui): complete composite row interactions
7b03125

refactor(ui): move prompt suggestions to semantic rows
b068da4

refactor(ui): use destructive history action
732ae6d

test(ui): lock real button interaction states
640961d

fix(ui): use governed disabled opacity
6c35908

Astro-Han force-pushed the refactor/ui-button-hierarchy branch from 4a20293 to 6c35908Compare July 13, 2026 18:10

Astro-Han added 7 commits July 14, 2026 02:24

refactor(ui): remove legacy button consumer layers
19b7d5b

docs(ui): add governed button consumer evidence
1dda55b

refactor(ui): enforce button consumer ownership
3f23596

docs(ui): refresh governed consumer evidence
d04dd5d

fix(ui): restore governed chat actions
03c299d

test(ui): exercise composite keyboard focus
286b64b

chore(ui): align Storybook dependency audit
e7928ef

Astro-Han marked this pull request as ready for review July 13, 2026 19:24

Astro-Han merged commit 0af06d3 into mainJul 13, 2026
3 checks passed

Astro-Han deleted the refactor/ui-button-hierarchy branch July 13, 2026 19:25

This was referenced Jul 15, 2026
fix(ui): restore quiet composer picker triggers #999
Merged
fix(ui): restore circular composer icon buttons via governed Button pill shape #1028
Merged

This was referenced Jul 16, 2026
chore: remove committed review-evidence screenshots #1094
Merged
refactor(desktop): converge settings sidebar tier and row primitives #1132
Merged

Astro-Han added 9 commits July 14, 2026 02:08

refactor(ui): refine button interaction hierarchy
1fa0b41

docs(ui): add button visual comparison
b8884dd

fix(ui): preserve session row control radius
ce3c879

fix(ui): govern aria-disabled button states
a2c0869

fix(ui): complete composite row interactions
7b03125

refactor(ui): move prompt suggestions to semantic rows
b068da4

refactor(ui): use destructive history action
732ae6d

test(ui): lock real button interaction states
640961d

fix(ui): use governed disabled opacity
6c35908

Astro-Han force-pushed the refactor/ui-button-hierarchy branch from 4a20293 to 6c35908Compare July 13, 2026 18:10

Astro-Han added 7 commits July 14, 2026 02:24

refactor(ui): remove legacy button consumer layers
19b7d5b

docs(ui): add governed button consumer evidence
1dda55b

refactor(ui): enforce button consumer ownership
3f23596

docs(ui): refresh governed consumer evidence
d04dd5d

fix(ui): restore governed chat actions
03c299d

test(ui): exercise composite keyboard focus
286b64b

chore(ui): align Storybook dependency audit
e7928ef

Astro-Han marked this pull request as ready for review July 13, 2026 19:24

Astro-Han merged commit 0af06d3 into mainJul 13, 2026
3 checks passed

Astro-Han deleted the refactor/ui-button-hierarchy branch July 13, 2026 19:25

This was referenced Jul 15, 2026
fix(ui): restore quiet composer picker triggers #999
Merged
fix(ui): restore circular composer icon buttons via governed Button pill shape #1028
Merged

This was referenced Jul 16, 2026
chore: remove committed review-evidence screenshots #1094
Merged
refactor(desktop): converge settings sidebar tier and row primitives #1132
Merged

Astro-Han added 9 commits July 14, 2026 02:08

refactor(ui): refine button interaction hierarchy
1fa0b41

docs(ui): add button visual comparison
b8884dd

fix(ui): preserve session row control radius
ce3c879

fix(ui): govern aria-disabled button states
a2c0869

fix(ui): complete composite row interactions
7b03125

refactor(ui): move prompt suggestions to semantic rows
b068da4

refactor(ui): use destructive history action
732ae6d

test(ui): lock real button interaction states
640961d

fix(ui): use governed disabled opacity
6c35908

Astro-Han force-pushed the refactor/ui-button-hierarchy branch from 4a20293 to 6c35908Compare July 13, 2026 18:10

Astro-Han added 7 commits July 14, 2026 02:24

refactor(ui): remove legacy button consumer layers
19b7d5b

docs(ui): add governed button consumer evidence
1dda55b

refactor(ui): enforce button consumer ownership
3f23596

docs(ui): refresh governed consumer evidence
d04dd5d

fix(ui): restore governed chat actions
03c299d

test(ui): exercise composite keyboard focus
286b64b

chore(ui): align Storybook dependency audit
e7928ef

Astro-Han marked this pull request as ready for review July 13, 2026 19:24

Astro-Han merged commit 0af06d3 into mainJul 13, 2026
3 checks passed

Astro-Han deleted the refactor/ui-button-hierarchy branch July 13, 2026 19:25

This was referenced Jul 15, 2026
fix(ui): restore quiet composer picker triggers #999
Merged
fix(ui): restore circular composer icon buttons via governed Button pill shape #1028
Merged

This was referenced Jul 16, 2026
chore: remove committed review-evidence screenshots #1094
Merged
refactor(desktop): converge settings sidebar tier and row primitives #1132
Merged

Astro-Han added 9 commits July 14, 2026 02:08

refactor(ui): refine button interaction hierarchy
1fa0b41

docs(ui): add button visual comparison
b8884dd

fix(ui): preserve session row control radius
ce3c879

fix(ui): govern aria-disabled button states
a2c0869

fix(ui): complete composite row interactions
7b03125

refactor(ui): move prompt suggestions to semantic rows
b068da4

refactor(ui): use destructive history action
732ae6d

test(ui): lock real button interaction states
640961d

fix(ui): use governed disabled opacity
6c35908

Astro-Han force-pushed the refactor/ui-button-hierarchy branch from 4a20293 to 6c35908Compare July 13, 2026 18:10

Astro-Han added 7 commits July 14, 2026 02:24

refactor(ui): remove legacy button consumer layers
19b7d5b

docs(ui): add governed button consumer evidence
1dda55b

refactor(ui): enforce button consumer ownership
3f23596

docs(ui): refresh governed consumer evidence
d04dd5d

fix(ui): restore governed chat actions
03c299d

test(ui): exercise composite keyboard focus
286b64b

chore(ui): align Storybook dependency audit
e7928ef

Astro-Han marked this pull request as ready for review July 13, 2026 19:24

Astro-Han merged commit 0af06d3 into mainJul 13, 2026
3 checks passed

Astro-Han deleted the refactor/ui-button-hierarchy branch July 13, 2026 19:25

This was referenced Jul 15, 2026
fix(ui): restore quiet composer picker triggers #999
Merged
fix(ui): restore circular composer icon buttons via governed Button pill shape #1028
Merged

This was referenced Jul 16, 2026
chore: remove committed review-evidence screenshots #1094
Merged
refactor(desktop): converge settings sidebar tier and row primitives #1132
Merged

Uh oh!

Conversation

Astro-Han commented Jul 13, 2026

Summary

Why

Scope

Verification

Button hierarchy

Interaction states

Impact

Reviewer notes

Ready for review

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Conversation

Astro-Han commented Jul 13, 2026

Summary

Why

Scope

Verification

Button hierarchy

Interaction states

Impact

Reviewer notes

Ready for review

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Conversation

Astro-Han commented Jul 13, 2026

Summary

Why

Scope

Verification

Button hierarchy

Interaction states

Impact

Reviewer notes

Ready for review

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Conversation

Astro-Han commented Jul 13, 2026

Summary

Why

Scope

Verification

Button hierarchy

Interaction states

Impact

Reviewer notes

Ready for review

Uh oh!

Uh oh!