@spzxg/cli-ui 0.6.6 → 0.6.8

package/src/core/store.ts

@@ -19,6 +19,7 @@ import { formatAnswersText } from "../ui/format";
 import { backgroundBlock, charCount, MAX_MESSAGE_CHARS, serializeBlock } from "./blocks";
 import { cloneBoardView, reportBoardOwner, activateBoardOwner, selectedBoardOwner, mergeBoardHistory, rememberBoardFile } from "../board/context";
 import { cloneWorkspaceChange, subscribeWorkspaceFiles, retryWorkspaceFiles, type WorkspaceWatchOptions } from "../board/fileWatch";
+import { retainFileScope } from "../board/fileScope";
 import type { WorkspaceChangeEvent, WorkspaceWatchStatus } from "./types";
 import { createWorkspace, type BoardView, type CliWorkspace } from "../board/workspace";
 import type { AskAnswers, AskQuestion, CenterJob, CenterTurn, ConversationClosedCallback, ConversationTurnCallback, NewConversationOptions } from "./types";
@@ -52,6 +53,12 @@ export interface CliState {
   viewing: Record<string, { ref: BoardRef; off: boolean }>;
   /** 看板现在的样子（按对话键）：正在看的文件、开着的文件页签、当前页签。没有看板时没有。 */
   boards: Record<string, BoardView>;
+  /** 当前对话是否有展开且可见的外置看板；Chat 内嵌看板不计入。 */
+  externalBoards: Record<string, boolean>;
+  /** 同一工作区中是否有展开且可见的对话列表。 */
+  listVisible: boolean;
+  /** 外置看板的模块和只读限制，内嵌视图沿用同一约束。 */
+  externalBoardOptions: Record<string, { availableTabs: ("files" | "changes" | "browser")[]; readOnly: boolean }>;
   /** 最近看板背景，收起/卸载后保留，供下一条消息被动参考。 */
   boardContext: Record<string, BoardView>;
   /** 业务方补充的项目背景（按对话键；"" = 还没建的新对话），随下一条消息发出（见 appendContext）。 */
@@ -146,7 +153,7 @@ export interface CliStoreOptions extends CenterClientOptions {
    */
   newConversation?: NewConversationOptions;
   /** 自己建对话（例如经业务后端建，以便把回调密钥留在服务端）：返回 center 的 job_id。 */
-  createConversation?: (firstMessage: string) => Promise<string>;
+  createConversation?: (firstMessage: string, options?: NewConversationOptions) => Promise<string>;
   /**
    * 每条消息的 business_id（center 按它去重，回调里原样带回）。缺省 `cli-<uuid>`。
    * kind = "create" 是第一条（新建对话），"message" 是之后的每条。
@@ -156,10 +163,12 @@ export interface CliStoreOptions extends CenterClientOptions {
 
 /** 发一条消息时可以单独指定的新建参数（组件自己的 props），优先于仓库的。 */
 export interface SendOptions {
+  expectedExecutionRevision?: number;
+  executionConfig?: import("./execution").ExecutionOptions;
   /** 新建对话后是否改仓库的选中（缺省改）。 */
   select?: boolean;
   newConversation?: NewConversationOptions;
-  createConversation?: (firstMessage: string) => Promise<string>;
+  createConversation?: (firstMessage: string, options?: NewConversationOptions) => Promise<string>;
   businessIdFor?: (text: string, kind: "create" | "message") => string;
 }
 
@@ -222,7 +231,7 @@ export function createCliStore(options: CliStoreOptions = {}) {
   // 列表只放宿主给的 jobIds 和本页里新建 / 接续出来的对话：不从 center 发现，也不从本地存储恢复——
   // 不传就不加载，免得把这个产品线令牌下别的业务、别的用户的对话列出来。
 
-  let state: CliState = { selected: null, jobIds: [], jobs: {}, convs: {}, listLoading: false, listError: null, refs: {}, viewing: {}, boards: {}, boardContext: {}, context: {} };
+  let state: CliState = { selected: null, jobIds: [], jobs: {}, convs: {}, listLoading: false, listError: null, refs: {}, viewing: {}, boards: {}, externalBoards: {}, listVisible: false, externalBoardOptions: {}, boardContext: {}, context: {} };
   const listeners = new Set<() => void>();
   const eventListeners = new Set<(event: CliEvent) => void>();
   const settledTurns = new Set<string>();
@@ -392,10 +401,11 @@ export function createCliStore(options: CliStoreOptions = {}) {
     previous?.();
     if (streams.get(key) !== entry || entry.refs <= 0) return;
     const { jobId, taskId } = parseConvKey(key);
-    let ended = false, retired = false;
+    let ended = false, retired = false, snapshotReceived = false;
     let cleanup: (() => void) | null = null;
     const owns = () => streams.get(key) === entry && entry.refs > 0 && entry.stop === retire;
     const active = () => !retired && owns();
+    const refreshFiles = () => { if (active() && client.board) retryWorkspaceFiles(client.board, key); };
     const retire = () => {
       if (retired) return;
       retired = true;
@@ -435,13 +445,37 @@ export function createCliStore(options: CliStoreOptions = {}) {
     try {
       cleanup = client.stream(jobId, {
         onOpen: () => { if (!active()) return; entry.attempt = 0; patchConv(key, (conv) => ({ ...conv, stream: "live", streamError: null })); },
-        onSnapshot: (snapshot) => { if (active()) patchConv(key, (conv) => applySnapshot(conv, snapshot)); },
-        onChunk: (items) => { if (active()) patchConv(key, (conv) => applyItems(conv, items)); },
-        onEnd: (end) => {
+        onSnapshot: (snapshot) => {
+          if (!active()) return;
+          patchConv(key, (conv) => applySnapshot(conv, snapshot));
+          // Each connection catches up once, including rounds completed while disconnected.
+          if (!snapshotReceived) { snapshotReceived = true; refreshFiles(); }
+        },
+        onChunk: (items) => {
           if (!active()) return;
+          let refresh = false;
+          patchConv(key, (conv) => {
+            let next = conv;
+            for (const item of items) {
+              const previous = next;
+              next = applyItems(next, [item]);
+              // applyItems also rejects events from another batch task's node session.
+              if (next === previous) continue;
+              // Observe every event: end + next user in one chunk can leave running=true.
+              if (item.type === "node" && item.event.type === "turn_end" || item.type === "transcript") refresh = true;
+              if (item.type === "turn" && item.turn.status !== "merged" && TERMINAL_TURN.has(item.turn.status)
+                && !TERMINAL_TURN.has(previous.turns.find((turn) => turn.turn_id === item.turn.turn_id)?.status ?? "")) refresh = true;
+            }
+            return next;
+          });
+          if (refresh) refreshFiles();
+        },
+        onEnd: (end) => {
+          if (!active() || ended) return;
           ended = true;
           const continuedBy = taskId ? (end.continued_by_job_id && end.continued_by_task_id ? convKey(end.continued_by_job_id, end.continued_by_task_id) : null) : end.continued_by_job_id ?? null;
           patchConv(key, (conv) => ({ ...conv, stream: "ended", endReason: end.reason, continuedBy, nodeRunning: false }));
+          refreshFiles();
           void refreshJob(jobId, true);
         },
         onClose: close,
@@ -569,7 +603,8 @@ export function createCliStore(options: CliStoreOptions = {}) {
 
   async function sendWithText(key: string | null, text: string, overrides: SendOptions): Promise<string> {
     // 发消息的组件自己的参数优先（同一个仓库里可以有几个对话组件，各带各的新建参数），没有再用仓库的。
-    const newConversation = overrides.newConversation ?? options.newConversation;
+    const originalOptions = overrides.newConversation ?? options.newConversation;
+    const newConversation = overrides.executionConfig ? { ...originalOptions, agent: overrides.executionConfig.agent ?? originalOptions?.agent, executionConfig: overrides.executionConfig } : originalOptions;
     const createConversation = overrides.createConversation ?? options.createConversation;
     const businessIdFor = overrides.businessIdFor ?? options.businessIdFor;
     const ref = key ? parseConvKey(key) : null;
@@ -578,7 +613,7 @@ export function createCliStore(options: CliStoreOptions = {}) {
       if (ref?.taskId === NEW_TASK) {
         // 在对话任务里新开一个对话：标题取第一行，智能体 / 浏览器模式沿用对话任务的第一个对话（center 决定）。
         if (!client.openConversation) throw new CenterError("当前后端不支持在对话任务里新开对话", "UNSUPPORTED", 0);
-        const result = await retryOnce(() => client.openConversation!(ref.jobId, text, { title: firstLine(text, 60), businessId }));
+        const result = await retryOnce(() => client.openConversation!(ref.jobId, text, { title: firstLine(text, 60), businessId, agent: newConversation?.agent, executionConfig: newConversation?.executionConfig, browser: newConversation?.browser, timeoutSeconds: newConversation?.timeoutSeconds }));
         const target = convKey(result.job_id, result.task_id ?? result.turn.task_id);
         patchConv(target, (conv) => ({ ...conv, turns: addTurnsIfAbsent(conv.turns, [{ ...result.turn, queue_position: result.queue_position }]) }));
         addJobIfMissing(result.job_id);
@@ -591,7 +626,7 @@ export function createCliStore(options: CliStoreOptions = {}) {
         const selectedBeforeCreate = state.selected;
         let newId: string;
         if (createConversation) {
-          newId = await createConversation(text);
+          newId = newConversation?.executionConfig ? await createConversation(text, newConversation) : await createConversation(text);
         } else {
           // 新建只发一次：center 的 POST /api/jobs 没有幂等，建好了却没收到响应时重发会建出第二个对话。
           const created = await client.createConversation(text, { ...newConversation, title: newConversation?.title || firstLine(text), businessId: newConversation?.businessId || businessId });
@@ -621,7 +656,7 @@ export function createCliStore(options: CliStoreOptions = {}) {
         void refreshJob(ref.jobId, true);
         return key;
       }
-      const result = await retryOnce(() => client.sendMessage(ref.jobId, text, { businessId, ...(ref.taskId ? { taskId: ref.taskId } : {}) }));
+      const result = await retryOnce(() => client.sendMessage(ref.jobId, text, { businessId, ...(ref.taskId ? { taskId: ref.taskId } : {}), ...(overrides.expectedExecutionRevision !== undefined ? { expectedExecutionRevision: overrides.expectedExecutionRevision } : {}) }));
       const jobTarget = result.job_id || ref.jobId;
       // 指定了对话的：接续后跟到新对话任务里对应的那个对话；只有 job_id 的照旧只换 job。
       const target = ref.taskId ? convKey(jobTarget, result.task_id ?? result.turn.task_id ?? ref.taskId) : jobTarget;
@@ -727,7 +762,28 @@ export function createCliStore(options: CliStoreOptions = {}) {
   }
 
   // 同一个仓库里登记的看板（cli-board）。后登记的优先（例如弹出的看板盖在常驻的上面）。
-  const surfaces: BoardSurface[] = [];
+  const surfaces: { surface: BoardSurface; owner?: string; inline?: boolean; priority?: () => number }[] = [];
+  const visibleLists = new Set<string>();
+  function reportListPresence(owner: string, visible: boolean) {
+    if (visible) visibleLists.add(owner); else visibleLists.delete(owner);
+    const listVisible = visibleLists.size > 0;
+    if (state.listVisible !== listVisible) set({ listVisible });
+  }
+  const externalBoards = new Map<string, Map<string, { visible: boolean; availableTabs?: readonly ("files" | "changes" | "browser")[]; readOnly?: boolean }>>();
+  function reportBoardPresence(key: string, owner: string, visible: boolean | null, options: { availableTabs?: readonly ("files" | "changes" | "browser")[]; readOnly?: boolean } = {}) {
+    const owners = externalBoards.get(key) ?? new Map<string, { visible: boolean; availableTabs?: readonly ("files" | "changes" | "browser")[]; readOnly?: boolean }>();
+    if (visible === null) owners.delete(owner); else owners.set(owner, { visible, ...options });
+    if (owners.size) externalBoards.set(key, owners); else externalBoards.delete(key);
+    const values = [...owners.values()];
+    const shown = values.some(value => value.visible);
+    const limits = owners.size ? { availableTabs: (["files", "changes", "browser"] as const).filter(tab => values.every(value => !value.availableTabs || value.availableTabs.includes(tab))), readOnly: values.some(value => value.readOnly) } : undefined;
+    if (!!state.externalBoards[key] === shown && JSON.stringify(state.externalBoardOptions[key]) === JSON.stringify(limits)) return;
+    const next = { ...state.externalBoards };
+    if (shown) next[key] = true; else delete next[key];
+    const configurations = { ...state.externalBoardOptions };
+    if (limits) configurations[key] = limits; else delete configurations[key];
+    set({ externalBoards: next, externalBoardOptions: configurations });
+  }
   // ── 看板 → 对话的引用 ─────────────────────────────
 
   function setRefs(key: string, refs: BoardRef[]) {
@@ -821,12 +877,13 @@ export function createCliStore(options: CliStoreOptions = {}) {
   const fileSubscriptions = new Map<string,{listeners:Set<{change?:(event:WorkspaceChangeEvent)=>void;status?:WorkspaceWatchOptions['onStatus']}>;stop:()=>void;status?:WorkspaceWatchStatus}>();
   function watchWorkspace(key:string,listener?:(event:WorkspaceChangeEvent)=>void,options:WorkspaceWatchOptions={}) {
     if(!client.board) throw new Error("当前后端不支持工作区文件订阅");
+    const releaseScope=options.paths?.length||options.dirs?.length?retainFileScope(client.board,key,{paths:[...options.paths??[]],dirs:[...options.dirs??[]]}):()=>{};
     const item={change:listener,status:options.onStatus};let subscription=fileSubscriptions.get(key);
     if(!subscription){
       subscription={listeners:new Set([item]),stop:()=>{}};fileSubscriptions.set(key,subscription);const owned=subscription;
-      owned.stop=subscribeWorkspaceFiles(client.board,key,event=>{emit(event);for(const next of [...owned.listeners])notifyCallback(next.change,cloneWorkspaceChange(event));},{...options,onStatus:status=>{owned.status=status;emit(status);for(const next of [...owned.listeners])notifyCallback(next.status,{...status});}});
+      owned.stop=subscribeWorkspaceFiles(client.board,key,event=>{emit(event);for(const next of [...owned.listeners])notifyCallback(next.change,cloneWorkspaceChange(event));},{intervalMs:options.intervalMs,onStatus:status=>{owned.status=status;emit(status);for(const next of [...owned.listeners])notifyCallback(next.status,{...status});}});
     }else{subscription.listeners.add(item);if(subscription.status)notifyCallback(item.status,{...subscription.status});retryWorkspaceFiles(client.board,key);}
-    const owned=subscription;let active=true;return()=>{if(!active)return;active=false;owned.listeners.delete(item);if(!owned.listeners.size){if(fileSubscriptions.get(key)===owned)fileSubscriptions.delete(key);owned.stop();}};
+    const owned=subscription;let active=true;return()=>{if(!active)return;active=false;owned.listeners.delete(item);if(!owned.listeners.size){if(fileSubscriptions.get(key)===owned)fileSubscriptions.delete(key);owned.stop();}releaseScope();};
   }
 
   // ── 补充背景：业务方随时追加，随下一条消息发给智能体 ────────
@@ -890,9 +947,11 @@ export function createCliStore(options: CliStoreOptions = {}) {
     if (ref && cur && cur.ref.id === ref.id && cur.off) setViewingState(key, { ...cur, off: false });
   }
 
-  function openInBoard(jobId: string, target: OpenTarget): boolean {
+  function openInBoard(jobId: string, target: OpenTarget, preferredInlineOwner?: string): boolean {
     let handled = false;
-    for (const surface of [...surfaces].reverse()) {
+    const available = [...surfaces].reverse().filter(item => !preferredInlineOwner || !item.inline || item.owner === preferredInlineOwner)
+      .sort((a, b) => (b.priority?.() ?? 2) - (a.priority?.() ?? 2));
+    for (const { surface } of available) {
       try { handled = surface(jobId, { ...target }); }
       catch (error) { console.error("[@spzxg/cli-ui] board surface callback failed", error); }
       if (handled) break;
@@ -903,14 +962,16 @@ export function createCliStore(options: CliStoreOptions = {}) {
 
   return {
     client,
+    getNewConversationOptions: () => options.newConversation,
     draftScope: connectionDraftScope(options),
     getState: () => state,
     /** 在看板里打开文件 / 浏览器 / 改动。返回有没有看板接住。 */
     openInBoard,
     /** 看板登记自己；返回注销函数。 */
-    registerBoard(surface: BoardSurface) {
-      surfaces.push(surface);
-      return () => { const i = surfaces.indexOf(surface); if (i >= 0) surfaces.splice(i, 1); };
+    registerBoard(surface: BoardSurface, options: { owner?: string; inline?: boolean; priority?: () => number } = {}) {
+      const entry = { surface, ...options };
+      surfaces.push(entry);
+      return () => { const i = surfaces.indexOf(entry); if (i >= 0) surfaces.splice(i, 1); };
     },
     subscribe(fn: () => void) { listeners.add(fn); return () => { listeners.delete(fn); }; },
     on(fn: (event: CliEvent) => void) { eventListeners.add(fn); return () => { eventListeners.delete(fn); }; },
@@ -923,7 +984,7 @@ export function createCliStore(options: CliStoreOptions = {}) {
     addRef, removeRef, takeRefs, restoreRefs,
     setViewing, dismissViewing, takeViewing, restoreViewing,
     /** 看板报告自己的样子（看板组件用）。 */
-    reportBoard, activateBoard,
+    reportBoard, activateBoard, reportBoardPresence, reportListPresence,
     /** 业务方追加项目背景：随下一条消息发给智能体。 */
     appendContext, removeContext, pendingContext,
     /** 工作区文件接口（不显示看板也能用）：列文件、读文件、下载、打包。不传 = 当前选中的对话。 */

package/src/core/types.ts

@@ -131,6 +131,8 @@ export interface BrowserPacing {
 
 /** 新建对话时可带的参数（POST /api/jobs，mode=conversation）。 */
 export interface NewConversationOptions {
+  /** 首轮执行配置。由服务端校验、持久化，并用于后续派发和重试。 */
+  executionConfig?: import("./execution").ExecutionOptions;
   title?: string;
   /** 业务自己的 ID（tasks[0].business_id）：第一轮的回调里原样带回，用来和业务数据对应。 */
   businessId?: string;
@@ -400,7 +402,7 @@ export interface FileEntry {
   changeToken?: string;
 }
 
-export interface DirListing { type: "dir"; path: string; entries: FileEntry[]; truncated: boolean; /** 目录里的条目总数（新版节点给）。 */ total?: number }
+export interface DirListing { type: "dir"; path: string; entries: FileEntry[]; truncated: boolean; /** 目录里的条目总数（新版节点给）。 */ total?: number; nextCursor?: string; revision?: string }
 export interface FileInfo { type: "file"; path: string; name: string; size: number; mtime: number; contentType: string; inline: boolean }
 
 export interface DiffFile {

package/src/index.ts

@@ -1,4 +1,5 @@
 export { CliMsgList, CliChat, CliBoard, type CliMsgListProps, type CliChatProps, type CliBoardProps } from "./components";
+export type { GroupChatAdapter, GroupChatMessage, GroupChatReference } from "./chat/GroupChat";
 /**
  * @spzxg/cli-ui —— 任务中心（cli-task-center）对话任务的前端积木，数据全部来自 center 服务。
  *
@@ -42,6 +43,7 @@ export {
   type TextBlock, type MessagePart,
 } from "./core/blocks";
 export type * from "./core/types";
+export type { ExecutionOptions, ExecutionConfiguration } from "./core/execution";
 
 
 export { RunControls, type RunControlProps, type RunCapabilities, type RunTask } from "./chat/RunControls";
@@ -50,3 +52,5 @@ export { formatBoardContext, appendBoardContext, BOARD_HISTORY_MAX } from "./boa
 export { subscribeWorkspaceFiles, type WorkspaceWatchOptions } from "./board/fileWatch";
 export type { WorkspaceHandlers } from "./core/provider";
 export type { BoardFile } from "./board/workspace";
+
+export { syncFile, clearFileSyncNamespace, FILE_SYNC_MAX, type FileSyncTransport, type FileSyncManifest, type FileSyncProgress } from "./board/fileSync";

package/src/msglist/CliMsgList.tsx

@@ -1,7 +1,7 @@
 // cli-msglist：消息对话列表。界面取自 Operator 的任务栏（TasksColumn 的列表视图，不做看板），
 // 一张卡片是 center 里的一个对话任务（mode=conversation）。对话任务里开了几个对话时，卡片下面按对话展开，
 // 点哪个对话选哪个（选中值是对话键 "job#task"）；卡片上的「+」在这个对话任务里新开一个对话（同一个工作区）。
-import { useEffect, useMemo, useState, type CSSProperties } from "react";
+import { useEffect, useId, useLayoutEffect, useMemo, useRef, useState, type CSSProperties } from "react";
 import { CliErrorBoundary } from "../ui/ErrorBoundary";
 import type { CliEvent, JobEntry } from "../core/store";
 import type { CliStoreOptions, CliStore } from "../core/store";
@@ -12,6 +12,7 @@ import { Icon } from "../ui/icons";
 import { agentLabel, relTime, toMs } from "../ui/format";
 import { AgentBadge, ErrNote, Skel, StatusDot, type DotCls } from "../ui/shared";
 import { resolveMsgListConfig, type CliMsgListConfig, type ResolvedMsgListConfig } from "../core/config";
+import { useBoardVisibility } from "../board/useBoardVisibility";
 
 /** onTurnEnd / onConversationEnd：浏览器里从实时流算出的结果通知，不依赖 center 的 callback.url。 */
 export interface CliMsgListProps extends CliStoreOptions, ResultHandlers {
@@ -284,6 +285,12 @@ function MsgListInner({ jobIds, selectedId, onSelect, onNew, title = "对话", c
   const cfg = useMemo(() => resolveMsgListConfig(config), [configKey]); // eslint-disable-line react-hooks/exhaustive-deps
   const h = cfg.header;
   const store = useCliStore();
+  const rootRef = useRef<HTMLDivElement>(null);
+  const owner = useId();
+  const visible = useBoardVisibility(rootRef, true);
+  const expanded = visible && !className?.split(/\s+/).includes("collapsed");
+  useLayoutEffect(() => { store.reportListPresence(owner, expanded); }, [store, owner, expanded]);
+  useLayoutEffect(() => () => { store.reportListPresence(owner, false); }, [store, owner]);
   const ids = useCliState((s) => s.jobIds);
   const jobs = useCliState((s) => s.jobs);
   const shared = useCliState((s) => s.selected);
@@ -343,7 +350,7 @@ function MsgListInner({ jobIds, selectedId, onSelect, onNew, title = "对话", c
   const showBanner = showRow || showContext;
 
   return (
-    <div className={`cli-ui cli-msglist ${className ?? ""}`} data-theme={theme} style={{ ...style, ...(width !== undefined ? { width } : null) }}>
+    <div ref={rootRef} className={`cli-ui cli-msglist ${className ?? ""}`} data-theme={theme} style={{ ...style, ...(width !== undefined ? { width } : null) }}>
       <div className="col col-tasks">
         {showBanner && <div className="proj-banner">
           {showRow && <div className="pb-row">

package/src/operator/node/Chat.tsx

@@ -12,10 +12,13 @@ import { OperatorBoardContext } from "./boardInteraction";
 import { toolDataOf } from "./transcriptModel";
 import { FileLinkContext } from "./fileLinks";
 import { Composer } from "./Composer";
+import { QueuedMessages } from "../../ui/QueuedMessages";
+import { useChatScrollbar } from "../../ui/useChatScrollbar";
 import { BranchHistory, useBranchHistory } from "./BranchHistory";
 import { BranchNavigator } from "./BranchNavigator";
 import type { Quote } from "./composerDraft";
 import type { RunControlProps } from "./RunControls";
+import type { ResolvedChatConfig } from "../../core/config";
 const QUIET_AFTER_MS = 180_000;
 function RunningIndicator({ agent, startedAt, lastActivityRef }: { agent: string | null; startedAt: number | null; lastActivityRef: React.MutableRefObject<number> }) {
   const [now, setNow] = useState(() => Date.now());
@@ -66,6 +69,7 @@ export type ChatProps = {
   running: boolean; blockedBy?: string[]; transcriptLoading?: boolean;
   older?: number; onLoadOlder?: (beforeApply?: () => void) => Promise<boolean>;
   controls: RunControlProps; configBusy: boolean; active?: boolean;
+  composer?: Pick<ResolvedChatConfig["composer"], "show" | "fileUpload">;
   onSelectTask: (id: string) => void; onFork: (text: string, sourceIds: string[], requestId: string) => Promise<boolean>;
   onSend: (text: string) => Promise<boolean>; onStop: () => Promise<boolean>;
   onStart: () => void; onEdit: () => void; onClear: () => void; onSetSendContext: (v: boolean) => void;
@@ -74,8 +78,9 @@ export type ChatProps = {
 };
 export function Chat(props: ChatProps) { return <ChatSession key={props.task.id} {...props} />; }
 function ChatSession({ project, task, tasks, agents, messages, running, transcriptLoading, older=0, onLoadOlder,
-  controls, configBusy, active=true, onSelectTask, onFork, onSend, onStop, onClear, onReconnect, onAnswer, onCancelQueued }: ChatProps) {
+  controls, configBusy, composer, active=true, onSelectTask, onFork, onSend, onStop, onClear, onReconnect, onAnswer, onCancelQueued }: ChatProps) {
   const scrollRef = useRef<HTMLDivElement>(null);
+  useChatScrollbar(scrollRef, task.id);
   const [quoteRequest, setQuoteRequest] = useState<Quote|null>(null);
   const flow=useBranchHistory(task,tasks);
   const fileScope=useMemo(()=>({taskId:task.id}),[task.id]);
@@ -83,7 +88,7 @@ function ChatSession({ project, task, tasks, agents, messages, running, transcri
   const view=active?'chat':'changes';
   const quote=(m: Msg, source: TaskRow=task, selected?:string)=>{
     const text=selected||splitAttachments(m.content).text;
-    if(text.trim()) setQuoteRequest({id:m.id, author:`${m.role==='user'?'你':agentLabel(agents,source.agent)}${source.id===task.id?'':` · ${source.title}`}`,text});
+    if(text.trim()) setQuoteRequest({id:m.id, author:`${m.role==='user'?'你':agentLabel(agents,source.agent)}${source.id===task.id?'':` · ${source.title}`}`,text,sourceTaskId:source.id});
   };
   const openBoard=useContext(OperatorBoardContext);
   const handoffs=useRef<Set<string>|null>(null);
@@ -414,7 +419,7 @@ function ChatSession({ project, task, tasks, agents, messages, running, transcri
   // window sheds rows above. Layout effect, so it lands before paint (no jump).
   useLayoutEffect(() => {
     if (pinned.current && scrollRef.current) scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
-  }, [messages, running, startIdx, endIdx]);
+  }, [messages, running, startIdx, endIdx, win]);
   // …and when the pane itself resizes (the composer growing, a banner
   // appearing). Content resizes are left alone, so expanding a tool card at
   // the bottom doesn't yank its top out of view.
@@ -436,6 +441,7 @@ function ChatSession({ project, task, tasks, agents, messages, running, transcri
     pinned.current=false; setAtBottom(false); flowPositioned.current=true;
   },[active,flow.ready,task.parent_task_id]);
   useEffect(()=>{if(!task.parent_task_id && active) scrollToBottom("auto");},[active,task.id]);
+  const queued = <QueuedMessages scopeKey={task.id} messages={messages.filter(message => message.role === "queued")} onCancel={message => stableCancelQueued(message.id)} attachmentUrl={attachment => `/api/tasks/${encodeURIComponent(attachment.taskId)}/uploads/${encodeURIComponent(attachment.name)}`} renderMessage={message => <MessageView m={message} initial={false} hideWho readOnly />} />;
   return (<FileLinkContext.Provider value={fileScope}>
     <>
       <div className="transcript-wrap">
@@ -488,11 +494,6 @@ function ChatSession({ project, task, tasks, agents, messages, running, transcri
           {running && !awaitingAnswer && !hasBelow && (
             <RunningIndicator agent={task.agent} startedAt={turnStartedAt} lastActivityRef={lastActivityRef} />
           )}
-          {/* Follow-ups queued mid-turn, pinned below the live turn — they
-              send in order once it ends. */}
-          {!hasBelow && messages.filter((m) => m.role === "queued").map((m) => (
-            <MessageView key={m.id} m={m} initial={false} hideWho={false} onAnswer={stableAnswer} onCancelQueued={stableCancelQueued} />
-          ))}
           {!hasBelow && <BranchNavigator sourceId={task.id} projectId={project.id} tasks={tasks} completed={task.status==='done'} onSelect={onSelectTask} />}
         </div>
       </div>
@@ -510,7 +511,8 @@ function ChatSession({ project, task, tasks, agents, messages, running, transcri
         )}
       </div>
       </div>
-      <Composer tasks={tasks} onFork={onFork} task={task} agentLabel={agentLabel(agents, task.agent)} disabled={task.started!==1} configBusy={configBusy} running={running} onSend={onSend} onStop={onStop} onClear={onClear} quoteRequest={quoteRequest} onQuoteHandled={()=>setQuoteRequest(null)} controls={controls} />
+      {composer?.show !== false ? <Composer tasks={tasks} onFork={onFork} task={task} agentLabel={agentLabel(agents, task.agent)} disabled={task.started!==1} configBusy={configBusy} running={running} onSend={async text => { const sent = await onSend(text); if (sent && !running) scrollToBottom("auto"); return sent; }} onStop={onStop} onClear={onClear} quoteRequest={quoteRequest} onQuoteHandled={()=>setQuoteRequest(null)} controls={controls}
+        fileUpload={composer?.fileUpload} queued={queued} /> : queued}
     </></FileLinkContext.Provider>
   );