dsh-better-display 0.3.6 → 0.3.8

package/lib/types/reveal.js

@@ -0,0 +1,147 @@
+var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose, inner;
+        if (async) {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+            if (async) inner = dispose;
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
+        env.stack.push({ value: value, dispose: dispose, async: async });
+    }
+    else if (async) {
+        env.stack.push({ async: true });
+    }
+    return value;
+};
+var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
+    return function (env) {
+        function fail(e) {
+            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        var r, s = 0;
+        function next() {
+            while (r = env.stack.pop()) {
+                try {
+                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                    if (r.dispose) {
+                        var result = r.dispose.call(r.value);
+                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                    }
+                    else s |= 1;
+                }
+                catch (e) {
+                    fail(e);
+                }
+            }
+            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
+            if (env.hasError) throw env.error;
+        }
+        return next();
+    };
+})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+});
+import { spawn } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { posix, win32 } from 'node:path';
+import { isAbsoluteWorkspacePath } from './workspace-path.js';
+export async function revealRoots(ctx, sessionId) {
+    if (sessionId !== undefined) {
+        const sessions = ctx.get?.('sessions');
+        const cwd = sessions?.get(sessionId)?.header.cwd;
+        if (cwd)
+            return [cwd];
+        const query = ctx.get?.('sessionQuery');
+        if (query) {
+            const env_1 = { stack: [], error: void 0, hasError: false };
+            try {
+                const observation = __addDisposableResource(env_1, await query.observeSession(sessionId, { projectionMode: 'none' }), false);
+                if (observation.header.cwd)
+                    return [observation.header.cwd];
+            }
+            catch (e_1) {
+                env_1.error = e_1;
+                env_1.hasError = true;
+            }
+            finally {
+                __disposeResources(env_1);
+            }
+        }
+    }
+    const registry = ctx.get?.('workspaceRegistry');
+    return (registry?.list() ?? [])
+        .filter(workspace => sessionId === undefined || workspace.sessionIds.includes(sessionId))
+        .map(workspace => workspace.path);
+}
+export function resolveRevealPath(path, roots, exists = existsSync) {
+    if (isAbsoluteWorkspacePath(path))
+        return path;
+    // Drive-relative and root-relative Windows paths do not identify a workspace.
+    if (/^[A-Za-z]:|^\\/.test(path))
+        throw new Error('Path is not workspace-relative');
+    const matches = new Set();
+    for (const root of roots) {
+        if (!isAbsoluteWorkspacePath(root))
+            continue;
+        const paths = /^[A-Za-z]:[/\\]|^\\\\/.test(root) ? win32 : posix;
+        const candidate = paths.resolve(root, path);
+        if (exists(candidate))
+            matches.add(candidate);
+    }
+    if (matches.size !== 1)
+        throw new Error(matches.size === 0 ? 'Workspace path not found' : 'Workspace path is ambiguous');
+    return [...matches][0];
+}
+export function revealPath(path, platform = process.platform, spawnProcess = spawn) {
+    const options = { detached: true, stdio: 'ignore' };
+    if (platform === 'darwin') {
+        spawnProcess('open', ['-R', path], options);
+    }
+    else if (platform === 'win32') {
+        spawnProcess('explorer.exe', [`/select,"${path}"`], { ...options, windowsVerbatimArguments: true });
+    }
+    else {
+        spawnProcess('xdg-open', [path], options);
+    }
+}
+export function createRevealHandler({ roots, reveal = revealPath }) {
+    return (req, res) => {
+        if (req.method !== 'POST') {
+            res.statusCode = 405;
+            res.end();
+            return;
+        }
+        let body = '';
+        req.on('data', chunk => { body += chunk; });
+        req.on('end', async () => {
+            res.setHeader('Content-Type', 'application/json');
+            try {
+                const data = JSON.parse(body);
+                const path = typeof data === 'object' && data !== null && 'path' in data && typeof data.path === 'string'
+                    ? data.path.trim() : '';
+                if (!path)
+                    throw new Error('Empty path');
+                const sessionId = typeof data === 'object' && data !== null && 'sessionId' in data && typeof data.sessionId === 'string'
+                    ? data.sessionId : undefined;
+                const targetPath = resolveRevealPath(path, isAbsoluteWorkspacePath(path) ? [] : await roots(sessionId));
+                reveal(targetPath);
+                res.statusCode = 200;
+                res.end(JSON.stringify({ ok: true }));
+            }
+            catch (err) {
+                res.statusCode = 400;
+                res.end(JSON.stringify({ ok: false, error: String(err) }));
+            }
+        });
+    };
+}
+//# sourceMappingURL=reveal.js.map

package/lib/types/reveal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reveal.js","sourceRoot":"","sources":["../../src/reveal.ts"],"names":[],"mappings":"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"}

package/lib/types/workspace-path.d.ts

@@ -0,0 +1,3 @@
+/** Absolute paths accepted by both POSIX and Windows hosts. */
+export declare function isAbsoluteWorkspacePath(path: string): boolean;
+//# sourceMappingURL=workspace-path.d.ts.map

package/lib/types/workspace-path.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-path.d.ts","sourceRoot":"","sources":["../../src/workspace-path.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D"}

package/lib/types/workspace-path.js

@@ -0,0 +1,5 @@
+/** Absolute paths accepted by both POSIX and Windows hosts. */
+export function isAbsoluteWorkspacePath(path) {
+    return /^(?:\/|[A-Za-z]:[/\\]|\\\\)/.test(path);
+}
+//# sourceMappingURL=workspace-path.js.map

package/lib/types/workspace-path.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-path.js","sourceRoot":"","sources":["../../src/workspace-path.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,MAAM,UAAU,uBAAuB,CAAC,IAAY;IAClD,OAAO,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAClD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-better-display",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "A calmer reading view for DeepSeek Harness: native process details, live reasoning, and clean final answers.",
   "type": "module",
   "license": "MIT",

package/src/client/OfficialContent.tsx

@@ -6,6 +6,7 @@ import type { AssistantActionOwnerProps } from '@deepseek-ai/dsh-client-ui-chat/
 type MessageId = AssistantActionOwnerProps['messageId'];
 import { OFFICIAL_SEATS } from './official-slots.js';
 import type { BlockRenderProps } from './types.js';
+import { chatSeatProps } from './chat-seat.js';
 
 export function OfficialActions({ official, messageId }: Pick<BlockRenderProps, 'official'> & { messageId?: MessageId }) {
   if (!official || !messageId) return null;
@@ -56,7 +57,7 @@ export function OfficialNode({ node, fallback, ...render }: BlockRenderProps & {
   const turn = node.location.kind === 'turn' || node.location.kind === 'step' ? node.location.turn : undefined;
   // The runtime node domain is open; the public SlotMap enumerates the known kinds.
   const renderNode = official.renderSlot as unknown as (key: string, owner: object, options: object) => ReactNode;
-  return <div data-reader-official-node={node.kind} data-chat-anchor-key={node.key} data-chat-flow-kind={node.kind}>
+  return <div data-reader-official-node={node.kind} {...(node.kind === 'user' || node.kind === 'steering' ? chatSeatProps(node.kind, node.key) : {})}>
     {renderNode(OFFICIAL_SEATS.nodes, { ...owner, node }, { entryKey: node.kind, hookContext: { turnData: turn?.data, disclosureReset }, fallback })}
   </div>;
 }

package/src/client/Reader.module.css

@@ -10,11 +10,11 @@
   container-type: inline-size;
 }
 .column { max-width: var(--dsh-chat-content-width, 748px); width: 100%; margin: 0 auto; display: flex; flex-direction: column; gap: 22px; min-width: 0; }
-.toolbar { position: sticky; top: 0; display: flex; justify-content: flex-end; align-items: center; gap: 6px; min-height: 32px; padding: 0; color: var(--dsw-alias-label-tertiary); font-size: 12px; background: var(--dsw-alias-bg-base); backdrop-filter: blur(12px); -webkit-backdrop-filter: blur(12px); }
+.toolbar { position: sticky; top: 0; display: flex; justify-content: flex-end; align-items: center; gap: 6px; min-height: 32px; padding: 0; color: var(--dsw-alias-label-tertiary); font-size: 12px; background: var(--dsw-alias-bg-base); backdrop-filter: blur(12px); }
 /* 吸顶带第二车道：左「正在处理」+ 右「自动折叠」共享同一条 40px 水平基线。
    top / z-index 由下方 measured-flow 段统一定义：这一道永远钉在工具栏车道
    之下、且永远低于宿主输入卡（composerSeat z-index 7）。 */
-.turnProcessSticky { position: sticky; background: var(--dsw-alias-bg-base); backdrop-filter: blur(12px); -webkit-backdrop-filter: blur(12px); min-height: 32px; display: flex; align-items: center; }
+.turnProcessSticky { position: sticky; background: var(--dsw-alias-bg-base); backdrop-filter: blur(12px); min-height: 32px; display: flex; align-items: center; }
 .turnProcessSticky .disclosureButton { min-height: 32px; }
 /* 第二车道：折叠胶囊吸附在第一车道正下方，互不重叠 */
 .textButton, .historyButton, .iconButton, .jump, .disclosureButton, .imageOpen, .dialogClose { font: inherit; cursor: pointer; }
@@ -22,6 +22,9 @@
 .textButton:hover, .iconButton:hover, .disclosureButton:hover { background: var(--dsw-alias-interactive-bg-hover); }
 .root button:focus-visible, .root summary:focus-visible { outline: 2px solid var(--dsw-alias-state-business-primary); outline-offset: 3px; }
 .turn { display: flex; flex-direction: column; gap: 14px; min-width: 0; }
+/* Keep pinned process lanes inside the process/answer block, before turn-tail UI. */
+.turnStickyRegion { display: flex; flex-direction: column; gap: 14px; min-width: 0; }
+.turnStickyLanes { position: sticky; top: max(var(--reader-toolbar-height, 40px), var(--reader-status-height, 40px)); z-index: 6; display: flex; flex-direction: column; min-width: 0; }
 .turn + .turn { margin-top: 12px; }
 .userCluster { display: flex; flex-direction: column; align-self: flex-end; align-items: flex-end; max-width: min(525px, 82%); gap: 8px; min-width: 0; margin-bottom: 4px; }
 .userImages { display: flex; flex-direction: column; align-items: flex-end; max-width: 100%; min-width: 0; }
@@ -473,7 +476,7 @@
 .morphDrawer { overflow: hidden; height: 0; transform-origin: top center; will-change: height, opacity, transform; }
 .liveFoldImpact { animation: liveFoldElastic 180ms cubic-bezier(0.2, 0, 0, 1) both; }
 @keyframes liveFoldElastic { 0% { transform: scale(1); } 50% { transform: scale(1.015); } 100% { transform: scale(1); } }
-.liveFoldContainer { position: sticky; top: calc(max(var(--reader-toolbar-height, 40px), var(--reader-status-height, 40px)) + var(--reader-sticky-lane, 40px) * 2); z-index: 4; background: var(--dsw-alias-bg-base); backdrop-filter: blur(12px); -webkit-backdrop-filter: blur(12px); padding: 4px 0; margin-bottom: 6px; animation: liveFoldPulse 320ms cubic-bezier(0.16, 1, 0.3, 1) both; transform-origin: left center; will-change: transform, opacity; }
+.liveFoldContainer { position: sticky; top: calc(max(var(--reader-toolbar-height, 40px), var(--reader-status-height, 40px)) + var(--reader-sticky-lane, 40px) * 2); z-index: 4; background: var(--dsw-alias-bg-base); backdrop-filter: blur(12px); padding: 4px 0; margin-bottom: 6px; animation: liveFoldPulse 320ms cubic-bezier(0.16, 1, 0.3, 1) both; transform-origin: left center; will-change: transform, opacity; }
 @keyframes liveFoldPulse { 0% { transform: translateY(-4px) scale(0.98); opacity: 0.8; } 50% { transform: translateY(0) scale(1.02); opacity: 1; } 100% { transform: translateY(0) scale(1); opacity: 1; } }
 [data-motion=off] .liveFoldContainer { animation: none !important; }
 @media (prefers-reduced-motion: reduce) { .liveFoldContainer { animation: none !important; } }
@@ -532,7 +535,7 @@
    input card. Only the top toolbar lane may use 7: it pins to the scrollport's
    first lane and its containing block always ends above the seat, so it can
    never reach the band, and 7 keeps it above the host's code-block banners. */
-.toolbar { width: 100%; max-width: 100%; align-self: stretch; box-sizing: border-box; min-height: 40px; z-index: 7; border-bottom: 0; backdrop-filter: none; -webkit-backdrop-filter: none; }
+.toolbar { width: 100%; max-width: 100%; align-self: stretch; box-sizing: border-box; min-height: 40px; z-index: 7; border-bottom: 0; backdrop-filter: none; }
 /* Every sticky lane used to pin to the SAME top: the status row, the folded
    summary row and the live-fold container all sat at
    max(toolbar-height, status-height) with z-index 6. Three siblings competing
@@ -540,7 +543,7 @@
    内容被盖住、看不见" was: the disclosure opened, and the row that followed
    pinned straight on top of it. Give each lane its own band instead, stacked
    from the measured top: status first, then the summary, then the fold body. */
-.turnProcessSticky { box-sizing: border-box; width: calc(100% - var(--reader-control-width, 148px)); top: max(var(--reader-toolbar-height, 40px), var(--reader-status-height, 40px)); min-height: 40px; padding-right: 0; z-index: 6; border-bottom: 1px solid transparent; background-clip: padding-box; backdrop-filter: none; -webkit-backdrop-filter: none; }
+.turnProcessSticky { box-sizing: border-box; width: calc(100% - var(--reader-control-width, 148px)); top: max(var(--reader-toolbar-height, 40px), var(--reader-status-height, 40px)); min-height: 40px; padding-right: 0; z-index: 6; border-bottom: 1px solid transparent; background-clip: padding-box; backdrop-filter: none; }
 /* A pinned lane's in-flow gap stays visible as an uncovered scrollport strip
    while the lane itself paints opaque. Cast each plate upward over its strip
    (the .turn 14px gap / the prior cell's 16px flowCellInner padding) so the
@@ -550,8 +553,14 @@
    it too. The toolbar is z-index 7, above the lane's 6, so its buttons still
    render on top of the extension. */
 .turnProcessSticky { box-shadow: 0 -14px 0 var(--dsw-alias-bg-base), var(--reader-control-width, 148px) 0 0 var(--dsw-alias-bg-base); }
+.turnStickyLanes .turnProcessSticky, .turnStickyLanes .closedProcessSummary { position: static; top: auto; z-index: auto; }
 /* The same summary row stays in flow until it reaches the measured top lane. */
 .flowCell[data-flow-summary], .closedProcessSummary { position: sticky; top: calc(max(var(--reader-toolbar-height, 40px), var(--reader-status-height, 40px)) + var(--reader-sticky-lane, 40px)); z-index: 5; overflow: visible; box-sizing: border-box; min-height: 40px; padding-block: 4px; background: var(--dsw-alias-bg-base); border-bottom: 0; }
+/* Keep the official CodeBlock banner's internal z-index inside its wrapper so Reader lanes stay above it. */
+.root :global(.md-code-block) { z-index: 0; }
+/* Keep native code actions below the pinned Reader lanes. */
+.turnStickyRegion:has(> .turnStickyLanes > .closedProcessSummary), .turnStickyRegion:has(.flowCell[data-flow-summary]) { --reader-code-summary-height: var(--reader-sticky-lane, 40px); }
+.root :global(.md-code-block > :has(+ [data-code-block-content])) { top: calc(max(var(--reader-toolbar-height, 40px), var(--reader-status-height, 0px)) + var(--reader-status-height, 0px) + var(--reader-code-summary-height, 0px)); }
 .flowCell[data-flow-summary] { box-shadow: 0 -16px 0 var(--dsw-alias-bg-base); }
 .closedProcessSummary { box-shadow: 0 -14px 0 var(--dsw-alias-bg-base); }
 .foldControl { display: inline-flex; align-items: center; gap: 0; padding: 2px; border-radius: 8px; background: var(--dsw-alias-bg-module-platform); }
@@ -578,11 +587,34 @@
 .root[data-reader-glass] .liveFoldContainer {
   background: transparent;
   backdrop-filter: blur(16px);
-  -webkit-backdrop-filter: blur(16px);
   border: 0;
   border-radius: 0;
   box-shadow: none;
 }
+/* Keep the skin visible between controls without changing the sticky lanes. */
+.root[data-reader-glass] .toolbar,
+.root[data-reader-glass] .turnProcessSticky {
+  backdrop-filter: none;
+}
+.root[data-reader-glass] .toolbar {
+  pointer-events: none;
+}
+.root[data-reader-glass] .toolbar > .textButton,
+.root[data-reader-glass] .turnProcessSticky .disclosureButton {
+  pointer-events: auto;
+  padding: 2px 10px;
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--dsw-alias-bg-layer-1, rgba(255, 255, 255, .7)) 80%, transparent);
+  backdrop-filter: blur(12px);
+}
+.root[data-reader-glass] .turnProcessSticky .disclosureButton {
+  margin-left: 0;
+  max-width: 100%;
+}
+.root[data-reader-glass] .toolbar > .textButton:hover,
+.root[data-reader-glass] .turnProcessSticky .disclosureButton:hover {
+  background: var(--dsw-alias-interactive-bg-hover);
+}
 /* The z-index ladder is mode-independent: skin mode only drops the plate, so
    a glass reader keeps exactly the same footer precedence as an opaque one. */
 .root[data-reader-glass] .flowCell[data-flow-summary],
@@ -597,11 +629,13 @@
   padding-left: 10px;
   border-radius: 0;
 }
+.root[data-reader-glass] .turnStickyLanes { display: contents; position: static; top: auto; z-index: auto; }
+.root[data-reader-glass] .turnStickyRegion { --reader-code-summary-height: 0px; }
+.root[data-reader-glass] .turnStickyLanes .turnProcessSticky { position: sticky; top: max(var(--reader-toolbar-height, 40px), var(--reader-status-height, 40px)); z-index: 6; }
 /* User bubble becomes a sleek translucent frosted pill in skin mode */
 .root[data-reader-glass] .user {
   background: color-mix(in srgb, var(--dsw-specific-bubble, rgba(0,0,0,.08)) 25%, transparent);
   backdrop-filter: blur(12px);
-  -webkit-backdrop-filter: blur(12px);
   border: 1px solid color-mix(in srgb, var(--dsw-alias-border-l1, rgba(128,128,128,.3)) 30%, transparent);
 }
 /* Skin mode paints no plates of the reader's own: cards, panels and frames go
@@ -625,7 +659,6 @@
 .root[data-reader-glass] .diffOverlay {
   background: color-mix(in srgb, var(--dsw-alias-bg-module-platform, rgba(127,127,127,.1)) 20%, transparent);
   backdrop-filter: blur(16px);
-  -webkit-backdrop-filter: blur(16px);
 }
 .root[data-reader-glass] .diffScrollArea {
   background: transparent;
@@ -642,7 +675,6 @@
   background: color-mix(in srgb, var(--dsw-alias-markdown-code-block, rgba(0,0,0,.06)) 25%, transparent) !important;
   border: 1px solid color-mix(in srgb, var(--dsw-alias-border-l1, rgba(128,128,128,.2)) 30%, transparent);
   backdrop-filter: blur(12px);
-  -webkit-backdrop-filter: blur(12px);
 }
 /* The fold control rides a sticky row: it must not paint a plate of its own. */
 .root[data-reader-glass] .foldControl {

package/src/client/Reader.tsx

@@ -1,12 +1,15 @@
 import type {} from '@deepseek-ai/dsh-session-turn-outline/types';
-import { Fragment, memo, useCallback, useEffect, useId, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
+import type {} from '@deepseek-ai/dsh-agent/types';
+import { Fragment, memo, useCallback, useEffect, useId, useInsertionEffect, useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
 import type { ReactNode, RefObject } from 'react';
-import type { ChatConversationViewNode, ChatNode, ChatNodeKind } from '@deepseek-ai/dsh-client-ui-chat/client';
+import type { ChatConversationViewNode, ChatNode, ChatNodeKind, ChatNodeOwnerProps } from '@deepseek-ai/dsh-client-ui-chat/client';
+import { createSnapshotStore } from '@deepseek-ai/dsh-client-store';
 import { JsonBlock, MarkdownText } from '@deepseek-ai/dsh-client-ui-primitives';
 import { BlockBoundary, Blocks, contentBlocks, CopyAnswer, UserMessageActions } from './Blocks.js';
 import { ReasoningCard } from './ReasoningCard.js';
 import { ToolActivity, ToolMedia } from './ToolActivity.js';
 import { OfficialActions, OfficialNode, OfficialTail } from './OfficialContent.js';
+import { OFFICIAL_SEATS } from './official-slots.js';
 import { preparingLabel, readerFlow } from './tool-activity.js';
 import { Disclosure, ProcessFragment, RetiringContent, StatusText, useMotionAllowed, usePinnedSelection, useReadingScroll } from './motion.js';
 import { StreamMotionContext } from './streaming.js';
@@ -30,11 +33,34 @@ import type { ReaderGroup, TurnBoundary } from './projection.js';
 import type { BlockRenderProps, ReaderProps } from './types.js';
 import css from './Reader.module.css';
 import { markdownLabels, truncatedJsonLabel } from './primitive-labels.js';
+import { chatSeatProps } from './chat-seat.js';
+import { ensureStyles } from './styles.js';
 
 function isNode<K extends ChatNodeKind>(node: ChatConversationViewNode, kind: K): node is ChatNode<K> {
   return node.kind === kind;
 }
 
+function observedInputIds(order: readonly string[], getNode: (key: string) => ChatConversationViewNode | undefined): Set<string> {
+  const ids = new Set<string>();
+  for (const key of order) {
+    const node = getNode(key);
+    if (!node || (node.kind !== 'user' && node.kind !== 'steering' && node.kind !== 'turn-trigger')) continue;
+    const source = (node.data as { source?: { kind?: string; rpcId?: unknown } }).source;
+    if (source?.kind === 'user' && typeof source.rpcId === 'string') ids.add(source.rpcId);
+  }
+  return ids;
+}
+
+function inboxText(item: { content?: readonly unknown[] }): string {
+  return (item.content ?? []).filter((block): block is { type: 'text'; text: string } => {
+    return typeof block === 'object' && block !== null && (block as { type?: unknown }).type === 'text' && typeof (block as { text?: unknown }).text === 'string';
+  }).map(block => block.text).join('');
+}
+
+function inboxAttachmentCount(item: { content?: readonly unknown[] }): number {
+  return (item.content ?? []).filter(block => typeof block === 'object' && block !== null && (block as { type?: unknown }).type !== 'text').length;
+}
+
 function cleanErrorMessage(raw: string | undefined): string {
   if (!raw) return '模型服务暂时无响应或连接中断，请稍后重试。';
   let str = raw.trim();
@@ -51,7 +77,7 @@ function cleanErrorMessage(raw: string | undefined): string {
   return str;
 }
 
-type SeatProps = BlockRenderProps & Pick<ReaderProps, 'useChat'> & {
+type SeatProps = BlockRenderProps & Pick<ReaderProps, 'useChat' | 'sessionId'> & {
   nodeKey: string; boundary: TurnBoundary; pinned?: boolean; processOpen?: boolean;
 };
 
@@ -191,6 +217,7 @@ const AssistantNode = memo(function AssistantNode({ useChat, nodeKey, boundary,
 
 const MainNode = memo(function MainNode({ useChat, nodeKey, boundary, pinned, processOpen = false, ...render }: SeatProps) {
   const node = useChat(snapshot => snapshot.nodes.get(nodeKey));
+  const [disclosureReset] = useState(() => createSnapshotStore(0));
   if (!node || node.visibility === 'hidden') return null;
   if (isNode(node, 'user') || isNode(node, 'steering')) {
     const blocks = contentBlocks(node.data.content);
@@ -198,7 +225,7 @@ const MainNode = memo(function MainNode({ useChat, nodeKey, boundary, pinned, pr
     const otherBlocks = blocks.filter(b => b.kind !== 'image');
     const text = otherBlocks.filter((block): block is Extract<typeof block, { kind: 'text' }> => block.kind === 'text').map(block => block.text).join('\n\n');
     const time = node.data.time;
-    return <div className={css.userCluster} data-reader-anchor data-reader-key={nodeKey}>
+    const fallback = <>
       {node.kind === 'steering' && <p className={css.meta}>补充消息</p>}
       {imageBlocks.length > 0 && <div className={css.userImages}>
         <Blocks {...render} blocks={imageBlocks} source="user" />
@@ -207,7 +234,30 @@ const MainNode = memo(function MainNode({ useChat, nodeKey, boundary, pinned, pr
         <Blocks {...render} blocks={otherBlocks} source="user" />
       </div>}
       <UserMessageActions text={text} time={time} />
-    </div>;
+    </>;
+    const official = render.official;
+    let rendered: ReactNode = fallback;
+    if (official) {
+      const turn = node.location.kind === 'turn' || node.location.kind === 'step' ? node.location.turn : undefined;
+      const owner: ChatNodeOwnerProps & Pick<ReaderProps, 'sessionId'> = {
+        cwd: render.cwd,
+        openFile: render.openFile ?? (() => {}),
+        openSkill: () => {},
+        forkAt: render.forkAt ?? (() => {}),
+        inspectCall: callId => official.openView('trajectory', callId),
+        loadImage: official.officialImageLoader,
+        renderMessageImages: images => official.renderSlot(OFFICIAL_SEATS.images, {
+          ...images, loadImage: official.officialImageLoader,
+        }),
+        fileMentions: official.officialFileMentions,
+        sessionId: render.sessionId,
+      };
+      const options = { hookContext: { turnData: turn?.data, disclosureReset }, fallback };
+      rendered = node.kind === 'user'
+        ? official.renderSlot(OFFICIAL_SEATS.nodes, { ...owner, node }, { ...options, entryKey: 'user' })
+        : official.renderSlot(OFFICIAL_SEATS.nodes, { ...owner, node }, { ...options, entryKey: 'steering' });
+    }
+    return <div className={css.userCluster} data-reader-anchor data-reader-key={nodeKey} {...chatSeatProps(node.kind, nodeKey)}>{rendered}</div>;
   }
   if (isNode(node, 'assistant-step')) return null;
   if (isNode(node, 'tool-call')) return <ToolMedia {...render} block={node.data.root} />;
@@ -497,6 +547,8 @@ const TurnGroup = memo(function TurnGroup({ group, motion, autoFold, pinnedKeys,
     () => 'external',
   ));
   const hasProcess = flow.some(item => item.kind === 'tool' || hasProcessContent(nodes.get(item.nodeKey), boundary));
+  const showStatusLane = hasProcess && !isAwaitingModel;
+  const showClosedSummary = boundary.status === 'closed' && hasProcess && autoFold;
   // Only a real, still-active text selection delays folding. Merely clicking,
   // focusing or scrolling the live card does not create a permanent override.
   const holdingSelection = selectedProcessKeys.some(key =>
@@ -563,6 +615,7 @@ const TurnGroup = memo(function TurnGroup({ group, motion, autoFold, pinnedKeys,
     fileMentions,
     metrics,
     official,
+    sessionId: props.sessionId,
     cwd,
   };
   const terminal = terminalLabel(boundary.reason);
@@ -591,22 +644,26 @@ const TurnGroup = memo(function TurnGroup({ group, motion, autoFold, pinnedKeys,
   };
   return <section className={css.turn} data-reader-turn={group.turn ?? 'unresolved'} data-reader-turn-state={boundary.status} data-reader-turn-result={boundary.reason ?? undefined}>
     {startsWithUser && <BlockBoundary><MainNode {...shared} useChat={props.useChat} boundary={boundary} nodeKey={group.keys[0]} /></BlockBoundary>}
-    {hasProcess && !isAwaitingModel && <StickyLane kind="status" className={css.turnProcessSticky}>
-      <Disclosure open={expanded} onChange={setExpanded} controls={flowId} buttonRef={processButton}
-        label={<GroupStatus group={group} sessionId={props.sessionId} useChat={props.useChat} pending={interaction} motion={motion} />} />
-    </StickyLane>}
-    {boundary.status === 'closed' && hasProcess && autoFold && <ClosedProcessSummary open={expanded} onChange={setExpanded} controls={flowId}
-      steps={steps.filter(step => {
-        if (step.kind === 'user') return false;
-        if (step.kind !== 'body') return true;
-        const node = nodes.get(step.nodeKey);
-        return !!node && isNode(node, 'assistant-step') && (isEarlierNarration(node.data, boundary)
-          || node.data.blocks.some(block => block.kind === 'tool-call')
-          || (boundary.latestStep > 0 && node.data.step < boundary.latestStep));
-      })} />}
-    <ChoreographedFlow id={flowId} frame={presentation} motion={motion} enabled={autoFold && boundary.status === 'open' && !holdingSelection}
-      urgent={hasTurnError || interaction !== undefined || !sessionRunning} open={foldOpenByKey} processOpen={expanded}
-      onOpenChange={(key, value) => { pinProcess(); setFoldOpenByKey(current => ({ ...current, [key]: value })); }} renderStep={renderStep} />
+    <div className={css.turnStickyRegion} data-reader-sticky-region>
+      {(showStatusLane || showClosedSummary) && <div className={css.turnStickyLanes}>
+        {showStatusLane && <StickyLane kind="status" className={css.turnProcessSticky}>
+          <Disclosure open={expanded} onChange={setExpanded} controls={flowId} buttonRef={processButton}
+            label={<GroupStatus group={group} sessionId={props.sessionId} useChat={props.useChat} pending={interaction} motion={motion} />} />
+        </StickyLane>}
+        {showClosedSummary && <ClosedProcessSummary open={expanded} onChange={setExpanded} controls={flowId}
+          steps={steps.filter(step => {
+            if (step.kind === 'user') return false;
+            if (step.kind !== 'body') return true;
+            const node = nodes.get(step.nodeKey);
+            return !!node && isNode(node, 'assistant-step') && (isEarlierNarration(node.data, boundary)
+              || node.data.blocks.some(block => block.kind === 'tool-call')
+              || (boundary.latestStep > 0 && node.data.step < boundary.latestStep));
+          })} />}
+      </div>}
+      <ChoreographedFlow id={flowId} frame={presentation} motion={motion} enabled={autoFold && boundary.status === 'open' && !holdingSelection}
+        urgent={hasTurnError || interaction !== undefined || !sessionRunning} open={foldOpenByKey} processOpen={expanded}
+        onOpenChange={(key, value) => { pinProcess(); setFoldOpenByKey(current => ({ ...current, [key]: value })); }} renderStep={renderStep} />
+    </div>
     {/* 状态指示永远排在流程之后：AI 的响应永远出现在最新消息（含补充消息）的下方 */}
     {!hasProcess && boundary.status === 'open' && !isAwaitingModel && <div className={css.disclosure} data-reader-status-only>
       <GroupStatus group={group} sessionId={props.sessionId} useChat={props.useChat} pending={interaction} motion={motion} />
@@ -618,6 +675,7 @@ const TurnGroup = memo(function TurnGroup({ group, motion, autoFold, pinnedKeys,
 });
 
 export function Reader(props: ReaderProps) {
+  useInsertionEffect(() => { ensureStyles(); }, []);
   const root = useRef<HTMLDivElement>(null);
   const activatedAt = useRef(Date.now());
   const order = props.useChat(snapshot => snapshot.order);
@@ -631,6 +689,25 @@ export function Reader(props: ReaderProps) {
   const loadingOlder = props.useSession(snapshot => snapshot.loadingOlder);
   const pendingSubmissions = props.useSession(snapshot => snapshot.pendingSubmissions);
   const pendingList = asReadonlyArray<PendingSubmissionEcho>(pendingSubmissions);
+  const inbox = props.useProjection?.('inbox');
+  type PendingInboxItem = { source?: { kind?: string; rpcId?: unknown }; content?: readonly unknown[] };
+  const inboxSteering = asReadonlyArray<PendingInboxItem>(inbox?.['next-step']).filter(item => item.source?.kind === 'user');
+  const observed = useMemo(() => observedInputIds(order, key => nodes.get(key)), [order, nodes]);
+  const visibleSubmissions = useMemo(() => pendingList.filter(sub => sub.placement !== 'queued' && !observed.has(sub.requestId)), [pendingList, observed]);
+  const pendingInputs = useMemo(() => {
+    const local = new Map<string, PendingSubmissionEcho>(visibleSubmissions.map(sub => [sub.requestId, sub]));
+    const localIds = new Set(pendingList.filter(sub => sub.placement !== 'queued').map(sub => sub.requestId));
+    const rows: Array<PendingSubmissionEcho | (typeof inboxSteering)[number]> = [];
+    for (const item of inboxSteering) {
+      const rpcId = typeof item.source?.rpcId === 'string' ? item.source.rpcId : undefined;
+      if (!rpcId) { rows.push(item); continue; }
+      const submission = local.get(rpcId);
+      if (submission) { local.delete(rpcId); rows.push(submission); }
+      else if (!localIds.has(rpcId)) rows.push(item);
+    }
+    rows.push(...local.values());
+    return rows;
+  }, [inboxSteering, pendingList, visibleSubmissions]);
   const waitAnchor = waitingAnchor(order, key => nodes.get(key), pendingList);
   const motionPreference = props.useStore(state => state.motion);
   const motion = useMotionAllowed(motionPreference);
@@ -808,11 +885,6 @@ export function Reader(props: ReaderProps) {
     }
   }, [lastKey, lastNode?.kind, lastSubmissionId, scroll]);
 
-  const visibleSubmissions = useMemo(() => {
-    if (pendingList.length === 0) return [];
-    return pendingList.filter(sub => sub.placement !== 'queued');
-  }, [pendingList]);
-
   // ChatView publishes data-chat-flow="" on its column. Skins treat a
   // scrollport without that hook as inspect-only and hide [data-composer-seat].
   return <StreamMotionContext.Provider value={streamMotion}><div ref={root} className={css.root} data-reader-build="0.3.4" data-dsh-better-display="0.3.4" data-reader-wait-clock-version="input-v1" data-reader-wait-start={waitAnchor.time ?? undefined} data-motion={motion ? 'on' : 'off'} data-reader-glass={frostedGlass || undefined} data-reader-auto-fold={autoFold ? 'on' : 'off'}>
@@ -840,10 +912,14 @@ export function Reader(props: ReaderProps) {
       {openError && <div className={css.error} role="alert">会话暂时无法读取：{openError.message}</div>}
       {loading && groups.length === 0 && <p className={css.empty} role="status">正在读取会话…</p>}
       {groups.map(group => <TurnGroup key={group.key} {...props} group={group} motion={motion} autoFold={autoFold} pinnedKeys={pinnedKeys} selectedProcessKeys={selectedProcessKeys} isAwaitingModel={isAwaitingModel && group.key === groups.at(-1)?.key} />)}
-      {visibleSubmissions.map(submission => {
-        const images = pendingSubmissionImages(submission);
+      {pendingInputs.map((item, index) => {
+         const submission = 'requestId' in item ? item : undefined;
+         const text = submission?.text ?? inboxText(item as PendingInboxItem);
+         const images = submission ? pendingSubmissionImages(submission) : [];
+         const attachmentCount = images.length;
+        const requestId = submission?.requestId ?? `inbox-${index}`;
         return (
-        <div key={submission.requestId} className={css.userCluster} data-reader-pending-submission>
+        <div key={requestId} className={css.userCluster} data-reader-pending-submission data-pending-steering={submission ? undefined : ''} data-pending-attachment-count={attachmentCount}>
           {images.length > 0 && (
             <div className={css.userImages}>
               {images.map((item, idx) => (
@@ -855,12 +931,12 @@ export function Reader(props: ReaderProps) {
               ))}
             </div>
           )}
-          {submission.text ? (
+          {text ? (
             <div className={css.user}>
-              <div className={css.blocks}>{submission.text}</div>
+              <div className={css.blocks}>{text}</div>
             </div>
           ) : null}
-          <UserMessageActions text={submission.text ?? ''} time={submission.time} />
+          <UserMessageActions text={text} time={submission?.time} />
         </div>
         );
       })}