From 277ad5a0d07ed77dc6902da0be0002bdfba89e3d Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 15 Sep 2026 13:59:00 +0800
Subject: [PATCH 01/10] fix(ui): give the turn elapsed clock one start
 authority

The running elapsed and the settled duration must read one Turn start fact.
The optimistic send timestamp was a second authority: it fed the pre-Turn cue
and every transient update re-stamped it to Date.now(), so the running clock
restarted mid-turn instead of measuring from the turn's own start.

- Drop that client-side start; the pre-Turn cue now waits without a clock until
  turn.startedAt reaches the client, which is also what the settled duration
  measures from.
- Write a transient message's send time once, so an update no longer moves it.
- Drop cursor:pointer from the process disclosure, and cover <summary> in the
  native-cursor convention (the hand stays for links).

Generated-by: Maka
---
 .../transient-message-projection.test.ts          |  7 +++++++
 .../contracts/transient-message-projection.ts     |  4 ++++
 .../desktop/src/renderer/styles/native-cursor.css | 10 +++++++---
 .../__tests__/chat-view-empty-compaction.test.tsx |  8 +++++---
 packages/ui/src/chat-view.tsx                     | 15 ++++++---------
 packages/ui/src/styles.css                        |  2 --
 6 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/transient-message-projection.test.ts b/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
index 961938d14d..fb5cb24477 100644
--- a/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
+++ b/apps/desktop/src/main/__tests__/transient-message-projection.test.ts
@@ -205,3 +205,10 @@ test('keeps a Host-bound current Turn when a later IPC result has no Turn identi
     hostTurnId: 'host-turn',
   });
 });
+
+test('keeps a transient message send time when a later update carries a new timestamp', () => {
+  const first = { ...transient, ts: 2 };
+  const later = { ...transient, ts: 9, text: 'edited text' };
+
+  assert.deepEqual(mergeTransientMessageProjection(first, later), { ...later, ts: 2 });
+});
diff --git a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
index 803a6024b6..26bb4ef7fd 100644
--- a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
@@ -49,6 +49,10 @@ export function mergeTransientMessageProjection(
 ): TransientUserMessage {
   update = {
     ...update,
+    // A Message's send time is written once. An update carrying its own `ts`
+    // (the desktop publisher stamps Date.now() on every publish) must not move
+    // it, or the optimistic row's time drifts to the latest edit.
+    ts: current.ts,
     ...(update.pendingSteering === undefined && current.pendingSteering !== undefined ? { pendingSteering: current.pendingSteering } : {}),
     ...(!Object.hasOwn(update, 'deliveryStatus') && current.deliveryStatus !== undefined ? { deliveryStatus: current.deliveryStatus } : {}),
     ...(!Object.hasOwn(update, 'deliveryDetail') && current.deliveryDetail !== undefined ? { deliveryDetail: current.deliveryDetail } : {}),
diff --git a/apps/desktop/src/renderer/styles/native-cursor.css b/apps/desktop/src/renderer/styles/native-cursor.css
index ed42ad88f3..ecca0601bd 100644
--- a/apps/desktop/src/renderer/styles/native-cursor.css
+++ b/apps/desktop/src/renderer/styles/native-cursor.css
@@ -54,7 +54,9 @@
  * group label (InputGroup: `isGroupLabel`), which names a group via
  * `aria-labelledby` and forwards no click — the `label` selector misses it,
  * so it kept StyleX's hand cursor. Match the stable themeProps class to catch
- * that span too (real <label> field labels are already covered above). */
+ * that span too (real <label> field labels are already covered above).
+ * Disclosure <summary> controls set cursor:pointer in their own stylesheets;
+ * cover the element here so no disclosure re-introduces the hand. */
 :where(
   button,
   label,
@@ -69,7 +71,8 @@
   [role="combobox"],
   [role="radio"],
   [role="checkbox"],
-  [role="treeitem"]
+  [role="treeitem"],
+  summary
 ):not(:disabled):not([aria-disabled="true"]),
 :where(
   button,
@@ -82,7 +85,8 @@
   [role="option"],
   [role="switch"],
   [role="tab"],
-  [role="treeitem"]
+  [role="treeitem"],
+  summary
 ):not(:disabled):not([aria-disabled="true"])
   :where(svg, span, div, p, i, img, path) {
   cursor: default !important;
diff --git a/packages/ui/src/__tests__/chat-view-empty-compaction.test.tsx b/packages/ui/src/__tests__/chat-view-empty-compaction.test.tsx
index dfa6588bd4..8b489d2bfe 100644
--- a/packages/ui/src/__tests__/chat-view-empty-compaction.test.tsx
+++ b/packages/ui/src/__tests__/chat-view-empty-compaction.test.tsx
@@ -126,7 +126,7 @@ test('renders the empty hero when an empty session has no live compaction row',
   assert.doesNotMatch(markup, /Compacting context/);
 });
 
-test('the pending Turn clock ticks from send time and hands over without a duplicate status', async (t) => {
+test('the pending Turn waits without a clock until the Turn start time reaches the client', async (t) => {
   const now = 1_700_000_000_000;
   t.mock.timers.enable({ apis: ['Date', 'setInterval'], now });
   const original = {
@@ -164,14 +164,16 @@ test('the pending Turn clock ticks from send time and hands over without a dupli
   };
   await render({});
   assert.equal(container.querySelectorAll('.maka-turn-processing').length, 1);
-  assert.match(container.querySelector('.maka-turn-elapsed')?.textContent ?? '', /0s/);
+  // The optimistic send timestamp is not a Turn start: no clock until one exists.
+  assert.equal(container.querySelector('.maka-turn-elapsed'), null);
   await act(() => t.mock.timers.tick(2_000));
-  assert.match(container.querySelector('.maka-turn-elapsed')?.textContent ?? '', /2s/);
+  assert.equal(container.querySelector('.maka-turn-elapsed'), null);
   await render({
     transientMessages: [],
     messages: [{ type: 'user', id: 'durable-user', turnId: liveTurn.turnId, text: pending.text, ts: pending.ts }],
   });
   assert.equal(container.querySelectorAll('.maka-turn-processing').length, 1);
+  // The Turn's recorded start now drives the clock.
   assert.match(container.querySelector('.maka-turn-elapsed')?.textContent ?? '', /2s/);
   await render({ liveTurns: undefined, activeTurn: undefined, transientMessages: [] });
   assert.equal(container.querySelectorAll('.maka-turn-processing').length, 0);
diff --git a/packages/ui/src/chat-view.tsx b/packages/ui/src/chat-view.tsx
index 7fc56e87a2..59aa822cf8 100644
--- a/packages/ui/src/chat-view.tsx
+++ b/packages/ui/src/chat-view.tsx
@@ -405,10 +405,6 @@ export function ChatView(props: {
   const tailTurnId = streamingActive ? props.activeTurn?.turnId : undefined;
   const runningStatus = streamingActive && !props.activeTurn?.awaitingInput;
   const hasRenderedLiveTurn = tailTurnId !== undefined && turns.some((turn) => turn.turnId === tailTurnId);
-  const pendingRunningStartedAt = transientMessages.findLast((message) =>
-    message.transientPlacement === 'current_turn'
-    && tailTurnId !== undefined && message.hostTurnId === tailTurnId,
-  )?.ts ?? activeContent?.startedAt;
   const boundaryOverlayTurnId = activeContent?.turnId
     ?? (streamingActive ? tailTurnId : undefined);
   // One rail tick per turn that carries a user prompt (Codex-style prompt
@@ -657,7 +653,10 @@ export function ChatView(props: {
                   ))}
                 </section>
               )}
-              {/* The optimistic message supplies the clock while the session is created. */}
+              {/* Send feedback while the session is created. The elapsed clock
+                  stays off until the Turn's own start time reaches the client
+                  (turn.startedAt): a client send timestamp is not a second
+                  authority for when the Turn began. */}
               {runningStatus && (
                 <section className="maka-turn" data-live-streaming="true">
                   <LocalizedChatMessage
@@ -665,9 +664,7 @@ export function ChatView(props: {
                     sender="assistant"
                     className="maka-chat-message maka-assistant-answer"
                   >
-                    <TurnFooter actions={[]} live context="" activity={
-                      <TurnRunningStatus startedAt={pendingRunningStartedAt} />
-                    } />
+                    <TurnFooter actions={[]} live context="" activity={<TurnRunningStatus />} />
                   </LocalizedChatMessage>
                 </section>
               )}
@@ -865,7 +862,7 @@ export function ChatView(props: {
                       activeContent?.turnId === tailTurnId && activeContent?.providerRetry ? (
                         <ModelProviderRetryIndicator retry={activeContent.providerRetry} />
                       ) : (
-                        (runningStatus && <TurnRunningStatus startedAt={pendingRunningStartedAt} />)
+                        (runningStatus && <TurnRunningStatus />)
                       )
                     } />
                   </LocalizedChatMessage>
diff --git a/packages/ui/src/styles.css b/packages/ui/src/styles.css
index 1af7e4ca80..e9ce266a07 100644
--- a/packages/ui/src/styles.css
+++ b/packages/ui/src/styles.css
@@ -269,14 +269,12 @@
   color: var(--muted-foreground);
   font: var(--maka-text-body);
   list-style: none;
-  cursor: pointer;
 }
 .maka-processing-summary::-webkit-details-marker { display: none; }
 .maka-processing-summary:hover { color: var(--foreground); }
 .maka-processing-summary:focus-visible { outline: var(--focus-ring-width) solid var(--focus-ring); outline-offset: calc(-1 * var(--focus-ring-width)); }
 .maka-processing-summary > svg { flex-shrink: 0; transition: transform var(--duration-fast) var(--ease-standard); }
 .maka-processing-summary .maka-turn-processing { margin: 0; }
-.maka-processing-summary[aria-disabled='true'] { cursor: default; }
 .maka-processing-summary[aria-disabled='true']:hover { color: var(--muted-foreground); }
 .maka-processing-sequence[open] > .maka-processing-summary > svg { transform: rotate(90deg); }
 .maka-processing-content { display: flex; min-width: 0; flex-direction: column; gap: 8px; padding-block: 12px 4px; }

From db52e72fc229b5ff2d1672cd86ad7177b36ed17c Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 15 Sep 2026 14:20:27 +0800
Subject: [PATCH 02/10] fix(ui): state the turn elapsed once
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A settled turn stated its elapsed twice: the process disclosure header and the
footer meta. The header already owns the running cue, so keep the elapsed there
and leave the footer meta to model · cost.

Generated-by: Maka
---
 .../src/__tests__/turn-running-spinner.test.tsx  | 16 ++++++++++++++++
 packages/ui/src/chat-turn.tsx                    |  8 +++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/ui/src/__tests__/turn-running-spinner.test.tsx b/packages/ui/src/__tests__/turn-running-spinner.test.tsx
index 6ac16ce382..0dec43e5ba 100644
--- a/packages/ui/src/__tests__/turn-running-spinner.test.tsx
+++ b/packages/ui/src/__tests__/turn-running-spinner.test.tsx
@@ -125,3 +125,19 @@ test('only the latest assistant segment owns live activity after a user instruct
   assert.match(summaries[1]?.textContent ?? '', /Pondering/);
   assert.equal(document.querySelectorAll('.maka-turn-processing').length, 1);
 });
+
+test('states the elapsed once, in the process header rather than the footer meta', () => {
+  const tool = { toolUseId: 'read', toolName: 'Read', status: 'completed' as const, args: {} };
+  const turn: TurnViewModel = {
+    turnId: 'turn-1', status: 'completed', modelId: 'fixture-model', tools: [tool], notes: [], startedAt: 1,
+    durationMs: 213_000,
+    timeline: [{ kind: 'tools', items: [tool] }, { kind: 'text', messageId: 'answer', text: 'the answer' }],
+  };
+  const { document } = parseHTML(renderToStaticMarkup(
+    <LocaleProvider locale="en">
+      <TurnView turn={turn} footerActions={[{ id: 'copy', label: 'Copy', enabled: true }]} />
+    </LocaleProvider>,
+  ));
+  assert.match(document.querySelector('.maka-processing-summary')?.textContent ?? '', /Worked for 3m 33s/);
+  assert.equal(document.querySelector('.maka-turn-footer-meta')?.textContent, 'fixture-model');
+});
diff --git a/packages/ui/src/chat-turn.tsx b/packages/ui/src/chat-turn.tsx
index 70908cb677..4065e3d7b0 100644
--- a/packages/ui/src/chat-turn.tsx
+++ b/packages/ui/src/chat-turn.tsx
@@ -994,12 +994,14 @@ export function TurnFooter(props: {
   );
 }
 
-/** "model · duration · cost" for a settled turn; undefined when there is nothing to say. */
+/**
+ * "model · cost" for a settled turn; undefined when there is nothing to say.
+ * The elapsed lives in the process disclosure header, so it is not repeated
+ * here — a turn with no process disclosure states no elapsed.
+ */
 function turnMetaSummary(turn: TurnViewModel): string | undefined {
   const parts: string[] = [];
   if (turn.modelId) parts.push(turn.modelId);
-  // Duration counts whole seconds, so anything under one would read「0s」.
-  if (turn.durationMs && turn.durationMs >= 1_000) parts.push(formatTurnDuration(turn.durationMs));
   if (turn.tokens?.costUsd && turn.tokens.costUsd > 0) parts.push(`$${turn.tokens.costUsd.toFixed(4)}`);
   return parts.length > 0 ? parts.join(' · ') : undefined;
 }

From 618f4aa872f5bfe43fa2c4268dedb953b5d74ab3 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 15 Sep 2026 14:53:49 +0800
Subject: [PATCH 03/10] test(storybook): cover the pending send before its Turn
 lands

The window between sending and the Turn reaching the transcript is where the
running cue read a client-side start. Give that state its own fixture and pin
that the cue shows no clock until the Turn's own start arrives.

Generated-by: Maka
---
 apps/desktop/stories/app-shell.stories.tsx | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/apps/desktop/stories/app-shell.stories.tsx b/apps/desktop/stories/app-shell.stories.tsx
index 75df23c912..f87bf61a48 100644
--- a/apps/desktop/stories/app-shell.stories.tsx
+++ b/apps/desktop/stories/app-shell.stories.tsx
@@ -680,6 +680,34 @@ const NPM_TEST_STDOUT_AT_CANCEL = "\n> maka@0.2.0 test\n> npm run build:test &&
 // This is the interrupted counterpart to RunningStatusDuringToolRun, and the only
 // story that reaches the interrupted tool row. It goes through the real
 // ChatView → materializeTurns → ToolTrow path, so the row renders inside the
+// Real path: the prompt has been admitted but its Turn has not reached the
+// transcript yet. The running cue used to read its start from the client's own
+// send stamp here; it now waits for the Turn's recorded start, so there is no
+// clock in this window. This fixture pins that.
+export const PromptSentBeforeTurnLands: Story = {
+  render: () => (
+    <ComposedShell
+      session={{ status: 'running', streaming: true, lastMessageAt: NOW - 3_000 }}
+      chat={{
+        activeTurn: { turnId: 'turn-sent' },
+        messages: [],
+        transientMessages: [{
+          id: 'msg-sent',
+          text: '刚发出的问题：这一轮的耗时是怎么算出来的？',
+          ts: NOW,
+          transientPlacement: 'current_turn',
+          hostTurnId: 'turn-sent',
+        }],
+      }}
+    />
+  ),
+  play: async ({ canvasElement }) => {
+    await expect(canvasElement.querySelector('.maka-turn-processing')).not.toBeNull();
+    // No clock before the Turn's own start reaches the client.
+    await expect(canvasElement.querySelector('.maka-turn-elapsed')).toBeNull();
+  },
+};
+
 // production `.maka-turn` frame. The session is `aborted` too, so the sidebar row
 // and composer agree with the transcript instead of still reading as active.
 export const InterruptedToolAfterTurnAbort: Story = {

From 7e699cfa181c3f9711973b0d19b6d2cc38c5fbf6 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 15 Sep 2026 15:04:24 +0800
Subject: [PATCH 04/10] refactor(ui): drop the process attention label
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A failed or interrupted tool turned the process disclosure header into
"需要处理" and forced it open, special-casing one row the lifecycle already
states. Keep the disclosure's own mechanism: the label follows running or the
recorded duration, and the row shows its own error state.

Generated-by: Maka
---
 .../chat-turn-answer-identity.test.tsx          | 11 ++++++-----
 packages/ui/src/chat-turn.tsx                   | 17 +++++------------
 packages/ui/src/conversation-copy.ts            |  7 +++----
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/packages/ui/src/__tests__/chat-turn-answer-identity.test.tsx b/packages/ui/src/__tests__/chat-turn-answer-identity.test.tsx
index 94788f9300..cfe88f9224 100644
--- a/packages/ui/src/__tests__/chat-turn-answer-identity.test.tsx
+++ b/packages/ui/src/__tests__/chat-turn-answer-identity.test.tsx
@@ -734,20 +734,21 @@ test('a newly failed tool reveals the process while turn recovery stays outside'
   const process = container.querySelector('details.maka-processing-sequence');
   const summary = process?.querySelector('summary');
   assert.ok(process && summary);
-  await act(() => { summary.dispatchEvent(new window.Event('click', { bubbles: true, cancelable: true })); });
   assert.equal(process.hasAttribute('open'), true);
   await act(() => root.render(<LocaleProvider locale="en"><TurnView
     turn={{ ...turnWith([PROCESS_TEXT, { kind: 'tools', items: [{ toolUseId: 'tool-1', toolName: 'read', args: {}, status: 'errored' }] }]), status: 'failed' }}
     failedReasonLabel="Read failed"
     safeResumeAction={{ pending: false, onResume() {} }}
   /></LocaleProvider>));
-  assert.equal(process.hasAttribute('open'), true);
-  assert.match(summary.textContent ?? '', /Needs attention/);
+  // A failed tool is an ordinary row: no attention label, and no reveal of its own.
+  assert.doesNotMatch(summary.textContent ?? '', /Needs attention/);
+  assert.equal(summary.textContent, 'Execution process');
+  assert.equal(process.hasAttribute('open'), false);
   assert.doesNotMatch(process.textContent ?? '', /Continue this turn/);
   assert.match(container.textContent ?? '', /Continue this turn/);
   await act(() => { summary.dispatchEvent(new window.Event('click', { bubbles: true, cancelable: true })); });
-  assert.equal(process.hasAttribute('open'), false);
-  assert.match(container.textContent ?? '', /Continue this turn/);
+  assert.equal(process.hasAttribute('open'), true);
+  assert.equal(container.querySelectorAll('.maka-processing-summary').length, 1);
 });
 
 test('uses a generic process label when no duration is recorded, and localizes known duration', async () => {
diff --git a/packages/ui/src/chat-turn.tsx b/packages/ui/src/chat-turn.tsx
index 4065e3d7b0..bfc19bb803 100644
--- a/packages/ui/src/chat-turn.tsx
+++ b/packages/ui/src/chat-turn.tsx
@@ -1341,21 +1341,14 @@ function ProcessingBlock(props: {
   const copy = getConversationCopy(useUiLocale()).messages;
   // null follows the lifecycle: open while running, collapsed on completion.
   // Settled reader choices survive appended events. Live work stays expanded.
+  // A failed or interrupted tool is an ordinary row inside the disclosure; it
+  // gets no label or auto-reveal of its own.
   const [manualOpen, setManualOpen] = useState<boolean | null>(null);
-  const needsAttention = props.entries.some((entry) => entry.kind === 'tools'
-    && entry.items.some((tool) => tool.status === 'errored' || tool.status === 'interrupted'));
-  // Reveal a new failure even if a prior settled process was collapsed.
-  // They can close it again once settled; its attention label remains visible. Permission
-  // requests and turn recovery banners are owned outside the timeline.
-  useEffect(() => {
-    if (needsAttention) setManualOpen(null);
-  }, [needsAttention]);
-  const open = props.running || (manualOpen ?? needsAttention);
+  const open = props.running || manualOpen === true;
   const seconds = props.durationMs !== undefined && Number.isFinite(props.durationMs)
     ? Math.floor(Math.max(0, props.durationMs) / 1000)
     : undefined;
-  const label = needsAttention ? copy.processNeedsAttention
-    : props.running || seconds === undefined ? copy.processDetails
+  const label = props.running || seconds === undefined ? copy.processDetails
     : copy.processDuration(Math.floor(seconds / 60), seconds % 60);
   return (
     <details
@@ -1374,7 +1367,7 @@ function ProcessingBlock(props: {
           if (!props.running) setManualOpen(!open);
         }}
       >
-        {props.activity && !needsAttention ? (
+        {props.activity ? (
           <TurnRunningStatus
             startedAt={props.activity.startedAt}
             activityLabel={props.activity.label}
diff --git a/packages/ui/src/conversation-copy.ts b/packages/ui/src/conversation-copy.ts
index 76c2c3701c..6e23672340 100644
--- a/packages/ui/src/conversation-copy.ts
+++ b/packages/ui/src/conversation-copy.ts
@@ -285,7 +285,6 @@ export interface ConversationCopy {
     workingPhrases: readonly string[];
     processDetails: string;
     processDuration: (minutes: number, seconds: number) => string;
-    processNeedsAttention: string;
     providerRetryScheduled: (seconds: number, attempt: number, maxAttempts: number) => string;
     providerRetryStarted: (attempt: number, maxAttempts: number) => string;
     providerRetryWaiting: (attempt: number, maxAttempts: number) => string;
@@ -553,7 +552,7 @@ const CONVERSATION_COPY = {
       chooseAriaLabel: (label, branch) => branch ? `选择项目：${label}，当前分支 ${branch}` : `选择项目：${label}`,
     },
     messages: {
-      you: '你', assistant: 'Maka', processing: '正在处理…', continuing: '继续中…', workingPhrases: ['正在琢磨…', '正在推敲…', '正在盘算…', '正在钻研…', '正在忙活…', '正在梳理…', '正在打磨…', '正在鼓捣…', '正在酝酿…', '正在攻坚…', '正在权衡…', '正在拾掇…'], processDetails: '执行过程', processDuration: (minutes, seconds) => `用时 ${minutes > 0 ? `${minutes}分 ` : ''}${seconds}秒`, processNeedsAttention: '执行过程 · 需要处理', providerRetryScheduled: (seconds, attempt, maxAttempts) => `${formatRetryDelay(seconds, { day: '天', hour: '小时', minute: '分', second: '秒' })}后重试（${attempt}/${maxAttempts}）`, providerRetryStarted: (attempt, maxAttempts) => `正在重试（${attempt}/${maxAttempts}）`, providerRetryWaiting: (attempt, maxAttempts) => `等待重试（${attempt}/${maxAttempts}）`, providerRetryReason: { stream_truncated: '响应中途断开', network: '网络中断', provider_capacity: '模型服务暂时满载', provider_unavailable: '模型服务暂时不可用', rate_limit: '触发模型速率限制', timeout: '请求超时', unknown: '模型请求失败' }, failureDetailsUnavailable: '无可用诊断详情。', safeResumePending: '正在检查…', safeResume: '继续这一轮', thinking: '深度思考', truncated: '已截断', copied: '已复制', copying: '复制中', copyFailed: '复制失败', copy: '复制', editMessage: '编辑并重发', editMessageDisabledRunning: '当前回答仍在进行中，结束后再编辑', editMessageDisabledAttachments: '包含附件的历史消息暂不支持编辑并重发', editMessageDisabledQuotes: '包含引用的历史消息暂不支持编辑并重发', editMessageDisabledTransformedText: '包含已展开上下文的历史消息暂不支持编辑并重发',
+      you: '你', assistant: 'Maka', processing: '正在处理…', continuing: '继续中…', workingPhrases: ['正在琢磨…', '正在推敲…', '正在盘算…', '正在钻研…', '正在忙活…', '正在梳理…', '正在打磨…', '正在鼓捣…', '正在酝酿…', '正在攻坚…', '正在权衡…', '正在拾掇…'], processDetails: '执行过程', processDuration: (minutes, seconds) => `用时 ${minutes > 0 ? `${minutes}分 ` : ''}${seconds}秒`, providerRetryScheduled: (seconds, attempt, maxAttempts) => `${formatRetryDelay(seconds, { day: '天', hour: '小时', minute: '分', second: '秒' })}后重试（${attempt}/${maxAttempts}）`, providerRetryStarted: (attempt, maxAttempts) => `正在重试（${attempt}/${maxAttempts}）`, providerRetryWaiting: (attempt, maxAttempts) => `等待重试（${attempt}/${maxAttempts}）`, providerRetryReason: { stream_truncated: '响应中途断开', network: '网络中断', provider_capacity: '模型服务暂时满载', provider_unavailable: '模型服务暂时不可用', rate_limit: '触发模型速率限制', timeout: '请求超时', unknown: '模型请求失败' }, failureDetailsUnavailable: '无可用诊断详情。', safeResumePending: '正在检查…', safeResume: '继续这一轮', thinking: '深度思考', truncated: '已截断', copied: '已复制', copying: '复制中', copyFailed: '复制失败', copy: '复制', editMessage: '编辑并重发', editMessageDisabledRunning: '当前回答仍在进行中，结束后再编辑', editMessageDisabledAttachments: '包含附件的历史消息暂不支持编辑并重发', editMessageDisabledQuotes: '包含引用的历史消息暂不支持编辑并重发', editMessageDisabledTransformedText: '包含已展开上下文的历史消息暂不支持编辑并重发',
       editMessageDisabledDirectoryReferences: '包含文件夹引用的历史消息暂不支持编辑并重发',
       userAriaLabel: '你发送的消息', systemAriaLabel: '系统消息', assistantAriaLabel: 'Maka 的回答', answerActionsAriaLabel: (context) => `回答操作${context ? `：${context}` : ''}`, answerActionAriaLabel: (action, context) => `${action}回答${context ? `：${context}` : ''}`, messageActionAriaLabel: (action, context) => `${action}消息${context ? `：${context}` : ''}`, sourceAriaLabel: '本轮回答的来源', derivativesAriaLabel: '本轮回答的衍生', scheduledTaskTriggered: '定时任务触发', scheduledTaskTitle: (id) => `由定时任务触发 · ${id}`, legacyAutomationTriggered: '旧版自动化（仅历史）', legacyAutomationTitle: (id) => `由旧版自动化触发 · ${id} · 仅保留历史，不会再次执行`, goalContinued: 'Goal 自动继续', goalTitle: (id) => `由 Goal 继续执行 · ${id}`, agentGraphTriggered: 'Agent Graph 自动继续', agentGraphTitle: (graphId) => `由 Agent Graph 调度器触发 · ${graphId}`,
       thinkingTruncatedTitle: '部分 reasoning 已截断；显示的是最近的内容', outputTruncatedTitle: '助手输出已超过单次回合上限，超出部分未渲染。如需完整内容请重新生成或查看持久化的任务日志。', removeAttachmentAriaLabel: (name) => `移除 ${name}`, quoteLabel: '引用', quoteExpandAriaLabel: '展开引用全文', quoteCollapseAriaLabel: '收起引用', removeQuoteAriaLabel: '移除引用', aborted: '已中断', abortedByStop: '已中断 · 由停止按钮触发',
@@ -711,7 +710,7 @@ const CONVERSATION_COPY = {
       chooseAriaLabel: (label, branch) => branch ? `選擇專案：${label}，目前分支 ${branch}` : `選擇專案：${label}`,
     },
     messages: {
-      you: '你', assistant: 'Maka', processing: '正在處理…', continuing: '繼續中…', workingPhrases: ['正在琢磨…', '正在推敲…', '正在盤算…', '正在鑽研…', '正在忙活…', '正在梳理…', '正在打磨…', '正在鼓搗…', '正在醞釀…', '正在攻堅…', '正在權衡…', '正在拾掇…'], processDetails: '執行過程', processDuration: (minutes, seconds) => `用時 ${minutes > 0 ? `${minutes}分 ` : ''}${seconds}秒`, processNeedsAttention: '執行過程 · 需要處理', providerRetryScheduled: (seconds, attempt, maxAttempts) => `${formatRetryDelay(seconds, { day: '天', hour: '小時', minute: '分', second: '秒' })}後重試（${attempt}/${maxAttempts}）`, providerRetryStarted: (attempt, maxAttempts) => `正在重試（${attempt}/${maxAttempts}）`, providerRetryWaiting: (attempt, maxAttempts) => `等待重試（${attempt}/${maxAttempts}）`, providerRetryReason: { stream_truncated: '回應中途斷開', network: '網路中斷', provider_capacity: '模型服務暫時滿載', provider_unavailable: '模型服務暫時不可用', rate_limit: '觸發模型速率限制', timeout: '請求超時', unknown: '模型請求失敗' }, failureDetailsUnavailable: '無可用診斷詳情。', safeResumePending: '正在檢查…', safeResume: '繼續這一輪', thinking: '深度思考', truncated: '已截斷', copied: '已複製', copying: '複製中', copyFailed: '複製失敗', copy: '複製', editMessage: '編輯並重發', editMessageDisabledRunning: '目前回答仍在進行中，結束後再編輯', editMessageDisabledAttachments: '包含附件的歷史訊息暫不支援編輯並重發', editMessageDisabledQuotes: '包含引用的歷史訊息暫不支援編輯並重發', editMessageDisabledTransformedText: '包含已展開上下文的歷史訊息暫不支援編輯並重發',
+      you: '你', assistant: 'Maka', processing: '正在處理…', continuing: '繼續中…', workingPhrases: ['正在琢磨…', '正在推敲…', '正在盤算…', '正在鑽研…', '正在忙活…', '正在梳理…', '正在打磨…', '正在鼓搗…', '正在醞釀…', '正在攻堅…', '正在權衡…', '正在拾掇…'], processDetails: '執行過程', processDuration: (minutes, seconds) => `用時 ${minutes > 0 ? `${minutes}分 ` : ''}${seconds}秒`, providerRetryScheduled: (seconds, attempt, maxAttempts) => `${formatRetryDelay(seconds, { day: '天', hour: '小時', minute: '分', second: '秒' })}後重試（${attempt}/${maxAttempts}）`, providerRetryStarted: (attempt, maxAttempts) => `正在重試（${attempt}/${maxAttempts}）`, providerRetryWaiting: (attempt, maxAttempts) => `等待重試（${attempt}/${maxAttempts}）`, providerRetryReason: { stream_truncated: '回應中途斷開', network: '網路中斷', provider_capacity: '模型服務暫時滿載', provider_unavailable: '模型服務暫時不可用', rate_limit: '觸發模型速率限制', timeout: '請求超時', unknown: '模型請求失敗' }, failureDetailsUnavailable: '無可用診斷詳情。', safeResumePending: '正在檢查…', safeResume: '繼續這一輪', thinking: '深度思考', truncated: '已截斷', copied: '已複製', copying: '複製中', copyFailed: '複製失敗', copy: '複製', editMessage: '編輯並重發', editMessageDisabledRunning: '目前回答仍在進行中，結束後再編輯', editMessageDisabledAttachments: '包含附件的歷史訊息暫不支援編輯並重發', editMessageDisabledQuotes: '包含引用的歷史訊息暫不支援編輯並重發', editMessageDisabledTransformedText: '包含已展開上下文的歷史訊息暫不支援編輯並重發',
       editMessageDisabledDirectoryReferences: '包含資料夾引用的歷史訊息暫不支援編輯並重發',
       userAriaLabel: '你傳送的訊息', systemAriaLabel: '系統訊息', assistantAriaLabel: 'Maka 的回答', answerActionsAriaLabel: (context) => `回答操作${context ? `：${context}` : ''}`, answerActionAriaLabel: (action, context) => `${action}回答${context ? `：${context}` : ''}`, messageActionAriaLabel: (action, context) => `${action}訊息${context ? `：${context}` : ''}`, sourceAriaLabel: '本輪迴答的來源', derivativesAriaLabel: '本輪迴答的衍生', scheduledTaskTriggered: '定時任務觸發', scheduledTaskTitle: (id) => `由定時任務觸發 · ${id}`, legacyAutomationTriggered: '舊版自動化（僅歷史）', legacyAutomationTitle: (id) => `由舊版自動化觸發 · ${id} · 僅保留歷史，不會再次執行`, goalContinued: 'Goal 自動繼續', goalTitle: (id) => `由 Goal 繼續執行 · ${id}`, agentGraphTriggered: 'Agent Graph 自動繼續', agentGraphTitle: (graphId) => `由 Agent Graph 排程器觸發 · ${graphId}`,
       thinkingTruncatedTitle: '部分 reasoning 已截斷；顯示的是最近的內容', outputTruncatedTitle: '助手輸出已超過單次回合上限，超出部分未渲染。如需完整內容請重新生成或檢視持久化的任務記錄。', removeAttachmentAriaLabel: (name) => `移除 ${name}`, quoteLabel: '引用', quoteExpandAriaLabel: '展開引用全文', quoteCollapseAriaLabel: '收起引用', removeQuoteAriaLabel: '移除引用', aborted: '(已中斷)', abortedByStop: '(已中斷 · 由停止按鈕觸發)',
@@ -895,7 +894,7 @@ const CONVERSATION_COPY = {
       chooseAriaLabel: (label, branch) => branch ? `Choose project: ${label}, current branch ${branch}` : `Choose project: ${label}`,
     },
     messages: {
-      you: 'You', assistant: 'Maka', processing: 'Working…', continuing: 'Continuing…', workingPhrases: ['Pondering…', 'Tinkering…', 'Untangling…', 'Digging in…', 'Mulling…', 'Chewing on it…', 'Wrangling…', 'Piecing it together…'], processDetails: 'Execution process', processDuration: (minutes, seconds) => `Worked for ${minutes > 0 ? `${minutes}m ` : ''}${seconds}s`, processNeedsAttention: 'Execution process · Needs attention', providerRetryScheduled: (seconds, attempt, maxAttempts) => `Retrying in ${formatRetryDelay(seconds, { day: 'd', hour: 'h', minute: 'm', second: 's' })} (${attempt}/${maxAttempts})`, providerRetryStarted: (attempt, maxAttempts) => `Retrying (${attempt}/${maxAttempts})`, providerRetryWaiting: (attempt, maxAttempts) => `Waiting to retry (${attempt}/${maxAttempts})`, providerRetryReason: { stream_truncated: 'Response stream ended before completion', network: 'Network interrupted', provider_capacity: 'The model service is temporarily at capacity', provider_unavailable: 'Model service temporarily unavailable', rate_limit: 'Model rate limit reached', timeout: 'Request timed out', unknown: 'Model request failed' }, failureDetailsUnavailable: 'No diagnostic details are available.', safeResumePending: 'Checking…', safeResume: 'Continue this turn', thinking: 'Thinking', truncated: 'Truncated', copied: 'Copied', copying: 'Copying', copyFailed: 'Copy failed', copy: 'Copy', editMessage: 'Edit & resend', editMessageDisabledRunning: 'Wait for this answer to finish before editing', editMessageDisabledAttachments: 'Edit & resend does not yet support messages with attachments', editMessageDisabledQuotes: 'Edit & resend does not yet support messages with quotes', editMessageDisabledTransformedText: 'Edit & resend does not yet support messages with expanded context',
+      you: 'You', assistant: 'Maka', processing: 'Working…', continuing: 'Continuing…', workingPhrases: ['Pondering…', 'Tinkering…', 'Untangling…', 'Digging in…', 'Mulling…', 'Chewing on it…', 'Wrangling…', 'Piecing it together…'], processDetails: 'Execution process', processDuration: (minutes, seconds) => `Worked for ${minutes > 0 ? `${minutes}m ` : ''}${seconds}s`, providerRetryScheduled: (seconds, attempt, maxAttempts) => `Retrying in ${formatRetryDelay(seconds, { day: 'd', hour: 'h', minute: 'm', second: 's' })} (${attempt}/${maxAttempts})`, providerRetryStarted: (attempt, maxAttempts) => `Retrying (${attempt}/${maxAttempts})`, providerRetryWaiting: (attempt, maxAttempts) => `Waiting to retry (${attempt}/${maxAttempts})`, providerRetryReason: { stream_truncated: 'Response stream ended before completion', network: 'Network interrupted', provider_capacity: 'The model service is temporarily at capacity', provider_unavailable: 'Model service temporarily unavailable', rate_limit: 'Model rate limit reached', timeout: 'Request timed out', unknown: 'Model request failed' }, failureDetailsUnavailable: 'No diagnostic details are available.', safeResumePending: 'Checking…', safeResume: 'Continue this turn', thinking: 'Thinking', truncated: 'Truncated', copied: 'Copied', copying: 'Copying', copyFailed: 'Copy failed', copy: 'Copy', editMessage: 'Edit & resend', editMessageDisabledRunning: 'Wait for this answer to finish before editing', editMessageDisabledAttachments: 'Edit & resend does not yet support messages with attachments', editMessageDisabledQuotes: 'Edit & resend does not yet support messages with quotes', editMessageDisabledTransformedText: 'Edit & resend does not yet support messages with expanded context',
       editMessageDisabledDirectoryReferences: 'Edit & resend does not yet support messages with folder references',
       userAriaLabel: 'Your message', systemAriaLabel: 'System message', assistantAriaLabel: "Maka's response", answerActionsAriaLabel: (context) => `Response actions${context ? `: ${context}` : ''}`, answerActionAriaLabel: (action, context) => `${action} response${context ? `: ${context}` : ''}`, messageActionAriaLabel: (action, context) => `${action} message${context ? `: ${context}` : ''}`, sourceAriaLabel: 'Source of this response', derivativesAriaLabel: 'Responses derived from this one', scheduledTaskTriggered: 'Triggered by scheduled task', scheduledTaskTitle: (id) => `Triggered by scheduled task · ${id}`, legacyAutomationTriggered: 'Legacy Automation (history only)', legacyAutomationTitle: (id) => `Triggered by legacy Automation · ${id} · Historical only; it will not run again`, goalContinued: 'Continued by Goal', goalTitle: (id) => `Continued by Goal · ${id}`, agentGraphTriggered: 'Continued by Agent Graph', agentGraphTitle: (graphId) => `Triggered by the Agent Graph scheduler · ${graphId}`,
       thinkingTruncatedTitle: 'Some reasoning was truncated; showing the most recent content', outputTruncatedTitle: 'The assistant output exceeded the per-turn limit. Regenerate it or inspect the persisted task log for the complete content.', removeAttachmentAriaLabel: (name) => `Remove ${name}`, quoteLabel: 'Quote', quoteExpandAriaLabel: 'Show the full quoted excerpt', quoteCollapseAriaLabel: 'Collapse the quoted excerpt', removeQuoteAriaLabel: 'Remove quote', aborted: 'Interrupted', abortedByStop: 'Interrupted · Stop button',

From 0a74fdaed7a1970b3a292f546a1ab13099d1a7a5 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 15 Sep 2026 15:12:47 +0800
Subject: [PATCH 05/10] fix(ui): make the running cue the process disclosure
 row
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The cue is now the disclosure's own summary row: one line, the activity text,
and the elapsed once the Turn's start is known. No spinner, and no separate
pre-Turn shape — the pending send renders the same row.

The row is rendered for every Turn (empty when nothing ran yet), so the cue
never moves between owners and settlement does not shift the transcript.

Generated-by: Maka
---
 packages/ui/src/chat-turn.tsx | 37 +++++++++++++++++-------------
 packages/ui/src/chat-view.tsx | 42 +++++++++++++++--------------------
 packages/ui/src/styles.css    |  3 +++
 3 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/packages/ui/src/chat-turn.tsx b/packages/ui/src/chat-turn.tsx
index bfc19bb803..77624aaaed 100644
--- a/packages/ui/src/chat-turn.tsx
+++ b/packages/ui/src/chat-turn.tsx
@@ -64,7 +64,7 @@ import { foldTimeline, type FoldedTimelineChild, type FoldedTimelineEntry } from
 import { AttachmentKindIcon } from './attachment-kinds.js';
 import { QuoteRefChip } from './quote-ref-chip.js';
 import { Marker, markerVariants } from './primitives/chat.js';
-import { ToolTrow, toolTrowHasVisibleSpinner } from './tool-activity.js';
+import { ToolTrow } from './tool-activity.js';
 import { formatBytes } from './tool-activity/preview-utils.js';
 import { useUiLocale } from './locale-context.js';
 import type { UiLocale } from '@maka/core/ui-locale';
@@ -500,9 +500,6 @@ export const TurnView = memo(function TurnView(props: {
     () => splitTimelineAtUserMessages(foldedTimeline, showAssistantMessage),
     [foldedTimeline, showAssistantMessage],
   );
-  const toolSurfaceOwnsSpinner = turn.timeline.some(
-    (item) => item.kind === 'tools' && toolTrowHasVisibleSpinner(item.items),
-  );
   return (
     <section
       className="maka-turn"
@@ -672,6 +669,10 @@ export const TurnView = memo(function TurnView(props: {
         const activityProcessIndex = ownsTurnChrome
           ? segment.items.findLastIndex((item) => item.kind === 'processing')
           : -1;
+        // Live work is disclosed in one place: the same summary row that carries
+        // the process. A Turn with no process content still owns that row (empty)
+        // so the running cue never moves and the row survives settlement.
+        const liveWorkOwnsDisclosure = ownsTurnChrome && activityProcessIndex === -1;
         // Disjoint namespaces: a steering id is any string, so a bare
         // sentinel could collide with a real one.
         const assistantKey =
@@ -694,6 +695,21 @@ export const TurnView = memo(function TurnView(props: {
                 and Astryx tool group in the order the model produced them.
                 Intermediate text, reasoning and tools share a disclosure;
                 the final reply and inserted user instructions stay outside. */}
+              {liveWorkOwnsDisclosure && (
+                <ProcessingBlock
+                  key="processing-status"
+                  activityObserved={props.activityObserved}
+                  entries={[]}
+                  running={!!props.liveStreaming || turn.status === 'running'}
+                  durationMs={turn.durationMs}
+                  activity={props.liveStreaming?.runningStatus && !props.liveStreaming.providerRetry
+                    ? { startedAt: turn.startedAt, label: runningToolLabel }
+                    : undefined}
+                  onStreamingSettled={props.liveStreaming?.onStreamingSettled}
+                  onOpenLinkedSession={props.onOpenLinkedSession}
+                  initialLiveContent={props.liveStreaming?.initialLiveContent}
+                />
+              )}
               {segment.items.map((item, index) =>
                 item.kind === 'processing' ? (
                   <ProcessingBlock
@@ -797,12 +813,6 @@ export const TurnView = memo(function TurnView(props: {
                 live={!!props.liveStreaming}
                 activity={props.liveStreaming?.providerRetry ? (
                   <ModelProviderRetryIndicator retry={props.liveStreaming.providerRetry} />
-                ) : props.liveStreaming?.runningStatus && activityProcessIndex === -1 ? (
-                  <TurnRunningStatus
-                    startedAt={turn.startedAt}
-                    showSpinner={!toolSurfaceOwnsSpinner}
-                    activityLabel={runningToolLabel}
-                  />
                 ) : undefined}
                 context={answerContext}
                 onAction={
@@ -1029,7 +1039,6 @@ const WORKING_PHRASE_INTERVAL_MS = 20_000;
  */
 export function TurnRunningStatus(props: {
   startedAt?: number;
-  showSpinner?: boolean;
   activityLabel?: string;
 }) {
   const copy = getConversationCopy(useUiLocale()).messages;
@@ -1048,9 +1057,6 @@ export function TurnRunningStatus(props: {
       aria-label={props.activityLabel ?? copy.processing}
       ref={rootRef}
     >
-      {props.showSpinner !== false && (
-        <Spinner size="md" shade="subtle" aria-hidden="true" />
-      )}
       {/* Name the activity once; the clock must not announce each second. */}
       <span className="maka-turn-indicator-text" aria-hidden="true">
         <span className="maka-turn-status-label">
@@ -1327,7 +1333,7 @@ function TurnTimelineEntry(props: {
   );
 }
 
-function ProcessingBlock(props: {
+export function ProcessingBlock(props: {
   activityObserved?: boolean;
   entries: FoldedTimelineChild[];
   running: boolean;
@@ -1371,7 +1377,6 @@ function ProcessingBlock(props: {
           <TurnRunningStatus
             startedAt={props.activity.startedAt}
             activityLabel={props.activity.label}
-            showSpinner={false}
           />
         ) : <span>{label}</span>}
         {!props.running && <ChevronRight size={ICON_SIZE.meta} aria-hidden="true" />}
diff --git a/packages/ui/src/chat-view.tsx b/packages/ui/src/chat-view.tsx
index 59aa822cf8..1c70fe169a 100644
--- a/packages/ui/src/chat-view.tsx
+++ b/packages/ui/src/chat-view.tsx
@@ -51,7 +51,7 @@ import type { LiveTurnProjection } from './live-turn-projection.js';
 import {
   ModelProviderRetryIndicator,
   LocalizedChatMessage,
-  TurnRunningStatus,
+  ProcessingBlock,
   TurnFooter,
   TurnView,
   TransientUserMessage,
@@ -653,19 +653,13 @@ export function ChatView(props: {
                   ))}
                 </section>
               )}
-              {/* Send feedback while the session is created. The elapsed clock
-                  stays off until the Turn's own start time reaches the client
-                  (turn.startedAt): a client send timestamp is not a second
-                  authority for when the Turn began. */}
+              {/* Send feedback while the session is created. It is the same
+                  summary row the process disclosure uses, so the cue does not
+                  change shape when the Turn lands; the click stays off until
+                  the Turn's own start time reaches the client. */}
               {runningStatus && (
                 <section className="maka-turn" data-live-streaming="true">
-                  <LocalizedChatMessage
-                    accessibleLabel={conversationCopy.messages.assistantAriaLabel}
-                    sender="assistant"
-                    className="maka-chat-message maka-assistant-answer"
-                  >
-                    <TurnFooter actions={[]} live context="" activity={<TurnRunningStatus />} />
-                  </LocalizedChatMessage>
+                  <ProcessingBlock entries={[]} running activity={{}} />
                 </section>
               )}
             </>
@@ -853,19 +847,19 @@ export function ChatView(props: {
                   that same TurnView can take over. */}
               {streamingActive && !hasRenderedLiveTurn && (
                 <section className="maka-turn" data-live-streaming="true">
-                  <LocalizedChatMessage
-                    accessibleLabel={conversationCopy.messages.assistantAriaLabel}
-                    sender="assistant"
-                    className="maka-chat-message maka-assistant-answer"
-                  >
-                    <TurnFooter actions={[]} live context="" activity={
-                      activeContent?.turnId === tailTurnId && activeContent?.providerRetry ? (
+                  {activeContent && activeContent.turnId === tailTurnId && activeContent.providerRetry ? (
+                    <LocalizedChatMessage
+                      accessibleLabel={conversationCopy.messages.assistantAriaLabel}
+                      sender="assistant"
+                      className="maka-chat-message maka-assistant-answer"
+                    >
+                      <TurnFooter actions={[]} live context="" activity={
                         <ModelProviderRetryIndicator retry={activeContent.providerRetry} />
-                      ) : (
-                        (runningStatus && <TurnRunningStatus />)
-                      )
-                    } />
-                  </LocalizedChatMessage>
+                      } />
+                    </LocalizedChatMessage>
+                  ) : runningStatus ? (
+                    <ProcessingBlock entries={[]} running activity={{}} />
+                  ) : null}
                 </section>
               )}
               {conversationItemPlacement.orphan && (
diff --git a/packages/ui/src/styles.css b/packages/ui/src/styles.css
index e9ce266a07..c018c0ca10 100644
--- a/packages/ui/src/styles.css
+++ b/packages/ui/src/styles.css
@@ -278,6 +278,9 @@
 .maka-processing-summary[aria-disabled='true']:hover { color: var(--muted-foreground); }
 .maka-processing-sequence[open] > .maka-processing-summary > svg { transform: rotate(90deg); }
 .maka-processing-content { display: flex; min-width: 0; flex-direction: column; gap: 8px; padding-block: 12px 4px; }
+/* A disclosure with no work yet is only its summary row, so the running cue can
+   live there without an empty panel's padding. */
+.maka-processing-content:empty { display: none; }
 /* Match Astryx ChatToolCalls' grid disclosure motion. The native details
    content remains rendered through exit, without a second open state or timer.
    Unsupported browsers retain the native immediate disclosure. */

From 0dde50d0b3023e438ea47a454141d346f2a5ead9 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 15 Sep 2026 15:33:46 +0800
Subject: [PATCH 06/10] refactor(ui): drop dead props and long comments from
 the process row

The empty status row carries no entries, so the stream callbacks it was
passed can never fire. Trim the comments added by this branch to what a
future reader still needs.

Generated-by: Maka
---
 .../contracts/transient-message-projection.ts   |  4 +---
 .../src/renderer/styles/native-cursor.css       |  3 +--
 apps/desktop/stories/app-shell.stories.tsx      |  8 +++-----
 .../chat-turn-answer-identity.test.tsx          |  2 +-
 .../chat-view-empty-compaction.test.tsx         |  4 ++--
 packages/ui/src/chat-turn.tsx                   | 17 ++++-------------
 packages/ui/src/chat-view.tsx                   |  5 +----
 packages/ui/src/styles.css                      |  3 +--
 8 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
index 26bb4ef7fd..b06bea0c6e 100644
--- a/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
+++ b/apps/desktop/src/renderer/application/contracts/transient-message-projection.ts
@@ -49,9 +49,7 @@ export function mergeTransientMessageProjection(
 ): TransientUserMessage {
   update = {
     ...update,
-    // A Message's send time is written once. An update carrying its own `ts`
-    // (the desktop publisher stamps Date.now() on every publish) must not move
-    // it, or the optimistic row's time drifts to the latest edit.
+    // A Message's send time is written once; an update's `ts` must not move it.
     ts: current.ts,
     ...(update.pendingSteering === undefined && current.pendingSteering !== undefined ? { pendingSteering: current.pendingSteering } : {}),
     ...(!Object.hasOwn(update, 'deliveryStatus') && current.deliveryStatus !== undefined ? { deliveryStatus: current.deliveryStatus } : {}),
diff --git a/apps/desktop/src/renderer/styles/native-cursor.css b/apps/desktop/src/renderer/styles/native-cursor.css
index ecca0601bd..5f34bbd16a 100644
--- a/apps/desktop/src/renderer/styles/native-cursor.css
+++ b/apps/desktop/src/renderer/styles/native-cursor.css
@@ -55,8 +55,7 @@
  * `aria-labelledby` and forwards no click — the `label` selector misses it,
  * so it kept StyleX's hand cursor. Match the stable themeProps class to catch
  * that span too (real <label> field labels are already covered above).
- * Disclosure <summary> controls set cursor:pointer in their own stylesheets;
- * cover the element here so no disclosure re-introduces the hand. */
+ * Disclosure <summary> controls set cursor:pointer in their own stylesheets. */
 :where(
   button,
   label,
diff --git a/apps/desktop/stories/app-shell.stories.tsx b/apps/desktop/stories/app-shell.stories.tsx
index f87bf61a48..d5b40d894c 100644
--- a/apps/desktop/stories/app-shell.stories.tsx
+++ b/apps/desktop/stories/app-shell.stories.tsx
@@ -680,10 +680,8 @@ const NPM_TEST_STDOUT_AT_CANCEL = "\n> maka@0.2.0 test\n> npm run build:test &&
 // This is the interrupted counterpart to RunningStatusDuringToolRun, and the only
 // story that reaches the interrupted tool row. It goes through the real
 // ChatView → materializeTurns → ToolTrow path, so the row renders inside the
-// Real path: the prompt has been admitted but its Turn has not reached the
-// transcript yet. The running cue used to read its start from the client's own
-// send stamp here; it now waits for the Turn's recorded start, so there is no
-// clock in this window. This fixture pins that.
+// Real path: the prompt is admitted, its Turn has not reached the transcript
+// yet. The cue carries no clock until the Turn's own start arrives.
 export const PromptSentBeforeTurnLands: Story = {
   render: () => (
     <ComposedShell
@@ -703,7 +701,7 @@ export const PromptSentBeforeTurnLands: Story = {
   ),
   play: async ({ canvasElement }) => {
     await expect(canvasElement.querySelector('.maka-turn-processing')).not.toBeNull();
-    // No clock before the Turn's own start reaches the client.
+    // No clock before the Turn's own start arrives.
     await expect(canvasElement.querySelector('.maka-turn-elapsed')).toBeNull();
   },
 };
diff --git a/packages/ui/src/__tests__/chat-turn-answer-identity.test.tsx b/packages/ui/src/__tests__/chat-turn-answer-identity.test.tsx
index cfe88f9224..7ab11bc0a6 100644
--- a/packages/ui/src/__tests__/chat-turn-answer-identity.test.tsx
+++ b/packages/ui/src/__tests__/chat-turn-answer-identity.test.tsx
@@ -740,7 +740,7 @@ test('a newly failed tool reveals the process while turn recovery stays outside'
     failedReasonLabel="Read failed"
     safeResumeAction={{ pending: false, onResume() {} }}
   /></LocaleProvider>));
-  // A failed tool is an ordinary row: no attention label, and no reveal of its own.
+  // A failed tool is an ordinary row: no label, no reveal.
   assert.doesNotMatch(summary.textContent ?? '', /Needs attention/);
   assert.equal(summary.textContent, 'Execution process');
   assert.equal(process.hasAttribute('open'), false);
diff --git a/packages/ui/src/__tests__/chat-view-empty-compaction.test.tsx b/packages/ui/src/__tests__/chat-view-empty-compaction.test.tsx
index 8b489d2bfe..ccb4c9a5a8 100644
--- a/packages/ui/src/__tests__/chat-view-empty-compaction.test.tsx
+++ b/packages/ui/src/__tests__/chat-view-empty-compaction.test.tsx
@@ -164,7 +164,7 @@ test('the pending Turn waits without a clock until the Turn start time reaches t
   };
   await render({});
   assert.equal(container.querySelectorAll('.maka-turn-processing').length, 1);
-  // The optimistic send timestamp is not a Turn start: no clock until one exists.
+  // No Turn start yet, so no clock.
   assert.equal(container.querySelector('.maka-turn-elapsed'), null);
   await act(() => t.mock.timers.tick(2_000));
   assert.equal(container.querySelector('.maka-turn-elapsed'), null);
@@ -173,7 +173,7 @@ test('the pending Turn waits without a clock until the Turn start time reaches t
     messages: [{ type: 'user', id: 'durable-user', turnId: liveTurn.turnId, text: pending.text, ts: pending.ts }],
   });
   assert.equal(container.querySelectorAll('.maka-turn-processing').length, 1);
-  // The Turn's recorded start now drives the clock.
+  // The Turn's own start drives the clock.
   assert.match(container.querySelector('.maka-turn-elapsed')?.textContent ?? '', /2s/);
   await render({ liveTurns: undefined, activeTurn: undefined, transientMessages: [] });
   assert.equal(container.querySelectorAll('.maka-turn-processing').length, 0);
diff --git a/packages/ui/src/chat-turn.tsx b/packages/ui/src/chat-turn.tsx
index 77624aaaed..208aecfd12 100644
--- a/packages/ui/src/chat-turn.tsx
+++ b/packages/ui/src/chat-turn.tsx
@@ -669,9 +669,8 @@ export const TurnView = memo(function TurnView(props: {
         const activityProcessIndex = ownsTurnChrome
           ? segment.items.findLastIndex((item) => item.kind === 'processing')
           : -1;
-        // Live work is disclosed in one place: the same summary row that carries
-        // the process. A Turn with no process content still owns that row (empty)
-        // so the running cue never moves and the row survives settlement.
+        // Every Turn owns this row, empty or not, so the cue never moves and
+        // settlement does not shift the transcript.
         const liveWorkOwnsDisclosure = ownsTurnChrome && activityProcessIndex === -1;
         // Disjoint namespaces: a steering id is any string, so a bare
         // sentinel could collide with a real one.
@@ -705,9 +704,6 @@ export const TurnView = memo(function TurnView(props: {
                   activity={props.liveStreaming?.runningStatus && !props.liveStreaming.providerRetry
                     ? { startedAt: turn.startedAt, label: runningToolLabel }
                     : undefined}
-                  onStreamingSettled={props.liveStreaming?.onStreamingSettled}
-                  onOpenLinkedSession={props.onOpenLinkedSession}
-                  initialLiveContent={props.liveStreaming?.initialLiveContent}
                 />
               )}
               {segment.items.map((item, index) =>
@@ -1004,11 +1000,7 @@ export function TurnFooter(props: {
   );
 }
 
-/**
- * "model · cost" for a settled turn; undefined when there is nothing to say.
- * The elapsed lives in the process disclosure header, so it is not repeated
- * here — a turn with no process disclosure states no elapsed.
- */
+/** "model · cost" for a settled turn; the elapsed lives in the process row. */
 function turnMetaSummary(turn: TurnViewModel): string | undefined {
   const parts: string[] = [];
   if (turn.modelId) parts.push(turn.modelId);
@@ -1347,8 +1339,7 @@ export function ProcessingBlock(props: {
   const copy = getConversationCopy(useUiLocale()).messages;
   // null follows the lifecycle: open while running, collapsed on completion.
   // Settled reader choices survive appended events. Live work stays expanded.
-  // A failed or interrupted tool is an ordinary row inside the disclosure; it
-  // gets no label or auto-reveal of its own.
+  // A failed tool is an ordinary row: no label and no reveal of its own.
   const [manualOpen, setManualOpen] = useState<boolean | null>(null);
   const open = props.running || manualOpen === true;
   const seconds = props.durationMs !== undefined && Number.isFinite(props.durationMs)
diff --git a/packages/ui/src/chat-view.tsx b/packages/ui/src/chat-view.tsx
index 1c70fe169a..e3c9ac493b 100644
--- a/packages/ui/src/chat-view.tsx
+++ b/packages/ui/src/chat-view.tsx
@@ -653,10 +653,7 @@ export function ChatView(props: {
                   ))}
                 </section>
               )}
-              {/* Send feedback while the session is created. It is the same
-                  summary row the process disclosure uses, so the cue does not
-                  change shape when the Turn lands; the click stays off until
-                  the Turn's own start time reaches the client. */}
+              {/* The pre-Turn cue is the same summary row the process uses. */}
               {runningStatus && (
                 <section className="maka-turn" data-live-streaming="true">
                   <ProcessingBlock entries={[]} running activity={{}} />
diff --git a/packages/ui/src/styles.css b/packages/ui/src/styles.css
index c018c0ca10..b2212f445e 100644
--- a/packages/ui/src/styles.css
+++ b/packages/ui/src/styles.css
@@ -278,8 +278,7 @@
 .maka-processing-summary[aria-disabled='true']:hover { color: var(--muted-foreground); }
 .maka-processing-sequence[open] > .maka-processing-summary > svg { transform: rotate(90deg); }
 .maka-processing-content { display: flex; min-width: 0; flex-direction: column; gap: 8px; padding-block: 12px 4px; }
-/* A disclosure with no work yet is only its summary row, so the running cue can
-   live there without an empty panel's padding. */
+/* An empty disclosure is only its summary row. */
 .maka-processing-content:empty { display: none; }
 /* Match Astryx ChatToolCalls' grid disclosure motion. The native details
    content remains rendered through exit, without a second open state or timer.

From 7e6cb7320e40346ef7a936000d2f50d8e04ec368 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 15 Sep 2026 15:40:46 +0800
Subject: [PATCH 07/10] refactor(ui): keep the running status component private

TurnRunningStatus had no consumer outside its own module; only a unit test
imported it. Render those assertions through TurnView instead.

Generated-by: Maka
---
 .../chat-turn-answer-identity.test.tsx        | 25 ++++++++++++++-----
 packages/ui/src/chat-turn.tsx                 |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/packages/ui/src/__tests__/chat-turn-answer-identity.test.tsx b/packages/ui/src/__tests__/chat-turn-answer-identity.test.tsx
index 7ab11bc0a6..bea2874e51 100644
--- a/packages/ui/src/__tests__/chat-turn-answer-identity.test.tsx
+++ b/packages/ui/src/__tests__/chat-turn-answer-identity.test.tsx
@@ -24,7 +24,7 @@ import { afterEach, test } from 'node:test';
 import { act, StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
 import { parseHTML } from 'linkedom';
-import { LocalizedChatMessage, TurnRunningStatus, TurnView } from '../chat-turn.js';
+import { LocalizedChatMessage, TurnView } from '../chat-turn.js';
 import { LocaleProvider } from '../locale-context.js';
 import type { TurnTimelineItem, TurnViewModel } from '../materialize.js';
 
@@ -457,7 +457,13 @@ test('rotates working phrases on the elapsed clock without announcing each phras
   const now = Date.UTC(2026, 8, 14, 12);
   context.mock.timers.enable({ apis: ['Date', 'setInterval'], now });
   const { container, root } = domRoot();
-  await act(() => root.render(<LocaleProvider locale="en"><TurnRunningStatus startedAt={now} /></LocaleProvider>));
+  const turn: TurnViewModel = {
+    turnId: 'turn-1', status: 'running', tools: [], notes: [], startedAt: now, timeline: [],
+  };
+  const render = (next: TurnViewModel) => act(() => root.render(
+    <LocaleProvider locale="en"><TurnView turn={next} liveStreaming={{ runningStatus: true }} /></LocaleProvider>,
+  ));
+  await render(turn);
   const status = container.querySelector('[role="status"]')!;
   assert.match(status.textContent, /Pondering/);
   assert.equal(status.getAttribute('aria-label'), 'Working…');
@@ -466,9 +472,11 @@ test('rotates working phrases on the elapsed clock without announcing each phras
   assert.match(status.textContent, /20s/);
   assert.equal(status.getAttribute('aria-label'), 'Working…');
   // Concrete activity takes precedence over the playful phrase.
-  await act(() => root.render(<LocaleProvider locale="en"><TurnRunningStatus startedAt={now} activityLabel="Clicking Save" /></LocaleProvider>));
-  assert.match(status.textContent, /Clicking Save/);
-  assert.doesNotMatch(status.textContent, /Tinkering/);
+  await render({ ...turn, tools: [{
+    toolUseId: 'cu-1', toolName: 'maka_computer', activityKind: 'computer', status: 'running', args: { app: 'Safari' },
+  }] });
+  assert.doesNotMatch(status.textContent ?? '', /Pondering|Tinkering/);
+  assert.notEqual(status.getAttribute('aria-label'), 'Working…');
 });
 
 test('keeps elapsed time while system motion preference changes the working phrase', async (context) => {
@@ -482,7 +490,12 @@ test('keeps elapsed time while system motion preference changes the working phra
     addEventListener(_type: string, listener: () => void) { listeners.add(listener); },
     removeEventListener(_type: string, listener: () => void) { listeners.delete(listener); },
   }) });
-  await act(() => root.render(<LocaleProvider locale="en"><TurnRunningStatus startedAt={now} /></LocaleProvider>));
+  const turn: TurnViewModel = {
+    turnId: 'turn-1', status: 'running', tools: [], notes: [], startedAt: now, timeline: [],
+  };
+  await act(() => root.render(
+    <LocaleProvider locale="en"><TurnView turn={turn} liveStreaming={{ runningStatus: true }} /></LocaleProvider>,
+  ));
   await act(() => context.mock.timers.tick(20_000));
   assert.equal(container.querySelector('.maka-turn-status-label')?.textContent, 'Pondering…');
   assert.equal(container.querySelector('.maka-turn-elapsed')?.textContent, '20s');
diff --git a/packages/ui/src/chat-turn.tsx b/packages/ui/src/chat-turn.tsx
index 208aecfd12..99294baa30 100644
--- a/packages/ui/src/chat-turn.tsx
+++ b/packages/ui/src/chat-turn.tsx
@@ -1029,7 +1029,7 @@ const WORKING_PHRASE_INTERVAL_MS = 20_000;
  * rare fallback path where streaming beat the user turn into the transcript;
  * the phrase then stands alone.
  */
-export function TurnRunningStatus(props: {
+function TurnRunningStatus(props: {
   startedAt?: number;
   activityLabel?: string;
 }) {

From 735412750fd1f3d70fc09e687d884acd2ba04c31 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 15 Sep 2026 15:54:20 +0800
Subject: [PATCH 08/10] fix(ui): delete the orphaned tool-row spinner helper

The process header no longer asks whether a tool row owns the spinner, so
toolTrowHasVisibleSpinner has no caller left. Knip flagged the stale export.

Generated-by: Maka
---
 packages/ui/src/tool-activity.tsx | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/ui/src/tool-activity.tsx b/packages/ui/src/tool-activity.tsx
index f635ed4bce..ad89254b33 100644
--- a/packages/ui/src/tool-activity.tsx
+++ b/packages/ui/src/tool-activity.tsx
@@ -373,15 +373,6 @@ export function ToolTrow({
   );
 }
 
-/** Whether a visible, collapsed ChatToolCalls row owns the active spinner. */
-export function toolTrowHasVisibleSpinner(items: readonly ToolActivityItem[]): boolean {
-  return items.some((item, index) =>
-    !isLinkedAgentResult(item.result)
-    && isInFlightToolStatus(toolActivityPresentationStatus(item))
-    && (index === items.length - 1 || isLinkedAgentResult(items[index + 1]?.result)),
-  );
-}
-
 type LinkedAgentRow = {
   key: string;
   name: string;

From 3eb589df175935d7b20e027d469fbf657e95bc47 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 15 Sep 2026 16:01:13 +0800
Subject: [PATCH 09/10] test(desktop): follow the running cue into the process
 row

The pending cue is no longer a message footer, so the handoff test asserts the
process row instead of the footer frame.

Generated-by: Maka
---
 apps/desktop/src/main/__tests__/streaming-handoff.test.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src/main/__tests__/streaming-handoff.test.ts b/apps/desktop/src/main/__tests__/streaming-handoff.test.ts
index 7bcb6280e2..5b869d8239 100644
--- a/apps/desktop/src/main/__tests__/streaming-handoff.test.ts
+++ b/apps/desktop/src/main/__tests__/streaming-handoff.test.ts
@@ -88,7 +88,7 @@ function renderLiveTurn(liveTurn: LiveTurnProjection): string {
 }
 
 describe('single live-turn handoff', () => {
-  it('keeps activity in the answer footer before the session or Turn arrives', () => {
+  it('keeps activity in the process row before the session or Turn arrives', () => {
     const session: NonNullable<Parameters<typeof ChatView>[0]['activeSession']> = {
       id: 'session-1', name: 'pending', status: 'running' as const, backend: 'ai-sdk',
       labels: [], isFlagged: false, isArchived: false, hasUnread: false,
@@ -107,8 +107,9 @@ describe('single live-turn handoff', () => {
         onNew() {},
       } satisfies Parameters<typeof ChatView>[0]));
       const { document } = parseHTML(markup);
-      const status = document.querySelector('.maka-assistant-answer [role="status"]');
-      assert.ok(status?.closest('.maka-turn-footer'), 'activity must occupy the shared footer');
+      const status = document.querySelector('.maka-processing-summary [role="status"]');
+      assert.ok(status, 'activity must occupy the process row');
+      assert.equal(document.querySelector('.maka-turn-footer'), null);
       assert.equal(document.querySelector('.maka-assistant-answer [role="toolbar"]'), null);
     }
   });

From 7190e7e3b6fed09d1442751ae91993adad749ae1 Mon Sep 17 00:00:00 2001
From: AstroHan <lei.yuhan@outlook.com>
Date: Tue, 15 Sep 2026 16:18:16 +0800
Subject: [PATCH 10/10] test(perf): expand every collapsed disclosure without a
 stale index

Every Turn now owns a process disclosure, so the geometry scene has many more
of them. Re-resolve the first collapsed one each time instead of walking an
index-based list that a click invalidates.

Generated-by: Maka
---
 scripts/perf/geometry-ablation.mjs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/perf/geometry-ablation.mjs b/scripts/perf/geometry-ablation.mjs
index 5d64fa871d..3e7d5604ad 100644
--- a/scripts/perf/geometry-ablation.mjs
+++ b/scripts/perf/geometry-ablation.mjs
@@ -139,7 +139,9 @@ if (process.versions.electron) {
         // expanded reading state, otherwise the 45-tool scene has no overflow.
         const summaries = page.locator('.maka-processing-sequence:not([open]) > summary');
         const expandedProcess = (await summaries.count()) > 0;
-        for (const summary of await summaries.all()) await summary.click();
+        // Expand every collapsed process disclosure. Re-resolve each time: a
+        // click flips the element to [open], so an index-based list goes stale.
+        while ((await summaries.count()) > 0) await summaries.first().click();
         await page.evaluate(() => document.fonts.ready);
         await expect(page.locator('.maka-markdown-pending')).toHaveCount(0);
         if (expandedProcess) {