You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maka.apache.org by as...@apache.org on 2026/08/28 13:38:55 UTC
(maka) branch fix/turn-abort-marker-after-timeline created (now b9235e927)
This is an automated email from the ASF dual-hosted git repository.
Astro-Han pushed a change to branch fix/turn-abort-marker-after-timeline
in repository https://gitbox.apache.org/repos/asf/maka.git
at b9235e927 fix(ui): state an aborted turn's outcome after its timeline
This branch includes the following new commits:
new b9235e927 fix(ui): state an aborted turn's outcome after its timeline
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org
(maka) 01/01: fix(ui): state an aborted turn's outcome after its timeline
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
Astro-Han pushed a commit to branch fix/turn-abort-marker-after-timeline
in repository https://gitbox.apache.org/repos/asf/maka.git
commit b9235e92712396a34f26bdde0ab8f547c38df3f4
Author: AstroHan <le...@outlook.com>
AuthorDate: Fri Aug 28 21:38:37 2026 +0800
fix(ui): state an aborted turn's outcome after its timeline
The aborted marker rendered at the top of the assistant answer, above
the reasoning disclosures and tool calls, where it read as a header on
work that had in fact all completed. PR #4073 moved the failed banner
below the timeline for exactly this reason but left the aborted marker
behind; both are terminal outcome markers and share the same slot, so
move the aborted marker next to the failed banner and match its block
rhythm.
Generated-by: Maka
---
packages/ui/src/chat-turn.tsx | 24 ++++++++++++------------
packages/ui/src/styles.css | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/packages/ui/src/chat-turn.tsx b/packages/ui/src/chat-turn.tsx
index c2559e624..c9e41c01a 100644
--- a/packages/ui/src/chat-turn.tsx
+++ b/packages/ui/src/chat-turn.tsx
@@ -660,12 +660,6 @@ export const TurnView = memo(function TurnView(props: {
className="maka-chat-message maka-assistant-answer"
>
<div className="maka-assistant-answer-content">
- {ownsTurnChrome && turn.status === 'aborted' && (
- <Marker variant="aborted" role="status">
- <Ban size={ICON_SIZE.meta} aria-hidden="true" />
- <em>{turnAbortMarkerLabel(turn.abortSource, locale)}</em>
- </Marker>
- )}
{/* The turn timeline is the rendering source of truth
(materialize.ts): each step's 深度思考 disclosure, answer bubble,
and Astryx tool group in the order the model produced them.
@@ -699,12 +693,18 @@ export const TurnView = memo(function TurnView(props: {
/>
),
)}
- {/* A failed turn's banner states the OUTCOME, so it belongs after
- the work it is the outcome of. It used to render above the
- timeline, where it read as a header on reasoning and tool
- calls that had in fact all succeeded.
-
- `description` carries the parked-resume diagnostic when there
+ {/* A turn's terminal marker states the OUTCOME of the turn, so
+ it belongs after the work it is the outcome of. The aborted
+ marker and the failed banner both used to render above the
+ timeline, where they read as a header on reasoning and tool
+ calls that had in fact all succeeded. */}
+ {ownsTurnChrome && turn.status === 'aborted' && (
+ <Marker variant="aborted" role="status">
+ <Ban size={ICON_SIZE.meta} aria-hidden="true" />
+ <em>{turnAbortMarkerLabel(turn.abortSource, locale)}</em>
+ </Marker>
+ )}
+ {/* `description` carries the parked-resume diagnostic when there
is one — it explains why the button did nothing, which
outranks execution state on the one turn that can have both. */}
{ownsTurnChrome && turn.status === 'failed' && props.failedReasonLabel && (
diff --git a/packages/ui/src/styles.css b/packages/ui/src/styles.css
index a81bc4c87..c3d2c3735 100644
--- a/packages/ui/src/styles.css
+++ b/packages/ui/src/styles.css
@@ -768,7 +768,7 @@
.maka-turn-aborted-marker {
gap: var(--space-1);
- margin-block: var(--space-0-5) var(--space-1);
+ margin-block: var(--space-1) var(--space-0-5);
padding: var(--space-0-5) var(--space-1-5);
background: var(--foreground-5);
color: var(--foreground-secondary);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org