From f48c0ac5719fb071f41d37cc70b3063fc6a445fe Mon Sep 17 00:00:00 2001 From: LoopX Agent <337587101+loopx-agent@users.noreply.github.com> Date: Sun, 15 Nov 2026 00:36:33 +0800 Subject: [PATCH] Keep conversation history rendering off the typing path Signed-off-by: LoopX Agent <337587101+loopx-agent@users.noreply.github.com> --- .../personal-workspace/channel-timeline.tsx | 6 +- .../personal-workspace-page.tsx | 101 ++++++++++++------ .../personal-workspace-browser/goal-draft.mjs | 4 + 3 files changed, 76 insertions(+), 35 deletions(-) diff --git a/apps/presentation/dashboard/src/features/personal-workspace/channel-timeline.tsx b/apps/presentation/dashboard/src/features/personal-workspace/channel-timeline.tsx index c82eb6a48a..c9547d5b36 100644 --- a/apps/presentation/dashboard/src/features/personal-workspace/channel-timeline.tsx +++ b/apps/presentation/dashboard/src/features/personal-workspace/channel-timeline.tsx @@ -2,7 +2,7 @@ import {DocumentAttachment, isDocumentAttachment} from "./document-attachment"; import { MessageActivity } from "./message-activity"; import { GoalDraftCard } from "./goal-draft-card"; import type { GoalDraft } from "../../../../../../loopx/control_plane/collaboration/goal_draft.js"; -import {Fragment, useEffect, useEffectEvent, useLayoutEffect, useRef, useState} from "react"; +import {Fragment, memo, useEffect, useEffectEvent, useLayoutEffect, useRef, useState} from "react"; import { CollaborationCards } from "./collaboration-card"; import {ConversationReplyContext} from "./conversation-requests"; import { Activity, Bot, Sparkles } from "lucide-react"; @@ -54,7 +54,7 @@ function LinkedHistoryImage({name, source, ready, zh}: {name: string; source: st onError={() => setImageRead(current => current?.source === source ? {source, failed: true} : current)}/>; } -export function ChannelTimeline({ +export const ChannelTimeline = memo(function ChannelTimeline({ emptyState, readOnly = false, items, @@ -307,4 +307,4 @@ export function ChannelTimeline({ ); -} +}); diff --git a/apps/presentation/dashboard/src/features/personal-workspace/personal-workspace-page.tsx b/apps/presentation/dashboard/src/features/personal-workspace/personal-workspace-page.tsx index ad0cecaf4a..c116b069a6 100644 --- a/apps/presentation/dashboard/src/features/personal-workspace/personal-workspace-page.tsx +++ b/apps/presentation/dashboard/src/features/personal-workspace/personal-workspace-page.tsx @@ -22,7 +22,7 @@ import { } from "../../../../../../loopx/control_plane/presentation/action_review_plan.js"; import { refreshAttention } from "./attention-details"; import { teamPlanAssignments, teamPlanAppliedLine, teamPlanAppliedOutcome, teamPlanFields, teamPlanGoalId, teamPlanLaneCount, teamPlanReceiptGapLanes, teamPlanTodoIds } from "./team-plan-preview"; -import { Suspense, lazy, useEffect, useLayoutEffect, useMemo, useRef, useState, type ClipboardEvent as ReactClipboardEvent, type ReactNode } from "react"; +import { Suspense, lazy, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, type ClipboardEvent as ReactClipboardEvent, type ReactNode } from "react"; import { applyTypedAction, @@ -1312,7 +1312,9 @@ export function PersonalWorkspacePage({ active: Boolean(runningMessage || selectedAgentModelReadback?.active_turn_id), refreshKey: `${managerMessages.length}:${Boolean(managerMessages.at(-1)?.pending)}:${steering}`, }); - const queuedTurnKeys = new Set(conversationQueue.turns.map(turn => JSON.stringify([conversationSessionId, turn.turn_id]))); + const queueTurns = conversationQueue.readReady ? conversationQueue.turns : undefined; + const queuedTurnKeys = useMemo(() => queueTurns && new Set(queueTurns.map(turn => + JSON.stringify([conversationSessionId, turn.turn_id]))), [queueTurns, conversationSessionId]); const observedQueue = useRef<{scope: string; snapshot: string} | null>(null); useEffect(() => { const turnId = conversationQueue.activeTurnId; @@ -1376,8 +1378,55 @@ export function PersonalWorkspacePage({ || managerChannelProposalIds.includes(item.proposal.previewId)))), [items, managerSessionProposalIds, managerChannelProposalIds], ); + const boundManagerChat = Boolean(selectedWorkspaceRef || originalConversation); + const managerTimelineItems = useMemo(() => boundManagerChat + ? managerChatItems.filter(item => item.kind === "message") : managerChatItems, [boundManagerChat, managerChatItems]); + const managedTimelineItems = useMemo(() => visibleTimelineItems.filter(item => item.kind === "message"), [visibleTimelineItems]); + const managerTimelineUnavailable = Boolean(originalConversation && (originalSourceUnresolved + || (conversationHistoryState && conversationHistoryState.phase !== "ready"))); + const managerTimelineTitle = managerTimelineUnavailable + ? originalConversation?.error || conversationHistoryState?.phase === "unavailable" || conversationHistoryState?.phase === "partial" + ? (locale === "zh-CN" ? "原会话暂不可用" : "Original conversation unavailable") + : (locale === "zh-CN" ? "正在读取原会话…" : "Reading the original conversation…") + : workspaceTitle; + const managerTimelineDescription = managerTimelineUnavailable ? "" : t("workspace.empty"); + const managerTimelineEmpty = useMemo(() => managerTimelineTitle + ? {title: managerTimelineTitle, description: managerTimelineDescription} : undefined, + [managerTimelineTitle, managerTimelineDescription]); + const timelineKey = `${selectionScope}:${conversationKey}:${selectedAgentId}`; + + // Draft edits do not change history. A retained history action still calls + // the latest committed handler in its own conversation. + const currentTimelineActions = useRef(null); + const timelineActionTarget = agentWorkActive ? conversationKey : selectedGoal?.goalId ?? conversationKey; + const canCancelTimelineTurn = !readOnly && Boolean(callbacks.onCancelConversationPreparation); + const canInterruptTimelineTurn = !readOnly && Boolean(callbacks.onInterruptConversationTurn); + const nextTimelineActions = { + key: timelineKey, + select: setSelection, + review: readOnly ? undefined : reviewGoalDraft, + suggest: readOnly ? undefined : suggestReply, + adjust: focusTurnComposer, + cancel: canCancelTimelineTurn ? () => callbacks.onCancelConversationPreparation?.(timelineActionTarget) : undefined, + interrupt: canInterruptTimelineTurn ? (turnId: string) => callbacks.onInterruptConversationTurn?.(timelineActionTarget, turnId) : undefined, + openEvidence: (goalId: string) => { selectGoal(goalId, "chat"); }, + }; + useLayoutEffect(() => { currentTimelineActions.current = nextTimelineActions; }); + const timelineActions = useMemo(() => { + const current = () => currentTimelineActions.current?.key === timelineKey ? currentTimelineActions.current : null; + return { + onSelect: (value: WorkspaceDrawerSelection) => current()?.select(value), + onReviewGoalDraft: async (...args: Parameters) => { await current()?.review?.(...args); }, + onSuggestReply: (text: string) => current()?.suggest?.(text), + onAdjustTurn: (turnId: string) => current()?.adjust(turnId), + onCancelPreparation: () => current()?.cancel?.(), + onInterruptTurn: async (turnId: string) => { await current()?.interrupt?.(turnId); }, + onOpenGoalEvidence: (goalId: string) => current()?.openEvidence(goalId), + }; + }, [timelineKey]); const conversationOpen = (!agentWorkActive || managedWorkActive) && (selectedGoal ? selectedGoalTab === "chat" : managerChatOpen); const boundHistory = Boolean(originalConversation); + const onReadTimelineMessage = useCallback(() => { followConversationRef.current = false; }, []); const historyPositionScope = JSON.stringify([selectionScope, conversationKey, selectedAgentId, conversationMessageFocus?.sessionId, conversationMessageFocus?.messageId]); const [positionedHistoryScope, setPositionedHistoryScope] = useState(null); @@ -1387,7 +1436,7 @@ export function PersonalWorkspacePage({ historyPhase: conversationHistoryState?.phase, historyPositionReady: !boundHistory || (conversationOpen && positionedHistoryScope === historyPositionScope), onRetryHistory: conversationHistoryState?.retry, - onReadMessage: () => { followConversationRef.current = false; }, + onReadMessage: onReadTimelineMessage, }; const latestMessage = managerMessages.at(-1); const latestMessageTextLength = latestMessage?.text.length ?? 0; @@ -3013,10 +3062,10 @@ export function PersonalWorkspacePage({ sessionId={selectedWorkSessionId} onSession={(id, replace) => callbacks.onSelectWorkSession?.(id, replace)} onSelect={id => callbacks.onSelectWorkAgent?.(id)} onClose={() => callbacks.onSelectWorkAgent?.(null)}> {workspaceConversations?.managed?.error ?

{workspaceConversations.managed.error}

: null} - item.kind === "message")} onSelect={setSelection} selectedGoal={selectedGoal} - onAdjustTurn={steeringTurnId ? focusTurnComposer : undefined} - onCancelPreparation={!readOnly && callbacks.onCancelConversationPreparation ? () => callbacks.onCancelConversationPreparation!(conversationKey) : undefined} - onInterruptTurn={!readOnly && callbacks.onInterruptConversationTurn ? turnId => callbacks.onInterruptConversationTurn!(conversationKey, turnId) : undefined}/> + : (<> {selectedGoal && activeSessionRun?.goalId === selectedGoal.goalId ? ( ) : null} - callbacks.onCancelConversationPreparation!(selectedGoal.goalId) : undefined} - onInterruptTurn={!readOnly && callbacks.onInterruptConversationTurn - ? (turnId) => callbacks.onInterruptConversationTurn!(selectedGoal.goalId, turnId) - : undefined} /> + ), }} /> @@ -3043,24 +3091,13 @@ export function PersonalWorkspacePage({ recheckingRuntimes={recheckingRuntimes} onRecheckRuntimes={callbacks.onRecheckRuntimes ? recheckRuntimes : undefined} operations={actionReadback.isError ? [] : homeOperations} onSelectOperation={proposal => setSelection({kind: "proposal", item: proposal})} /> ) : ( - item.kind === "message") : managerChatItems} - onSelect={setSelection} selectedGoal={null} showManagerTeamResults={!selectedWorkspaceRef && !originalConversation} - onAdjustTurn={steeringTurnId ? focusTurnComposer : undefined} - onCancelPreparation={!readOnly && callbacks.onCancelConversationPreparation - ? () => callbacks.onCancelConversationPreparation!(conversationKey) : undefined} - onInterruptTurn={!readOnly && callbacks.onInterruptConversationTurn - ? (turnId) => callbacks.onInterruptConversationTurn!(conversationKey, turnId) - : undefined} - onOpenGoalEvidence={(goalId) => { selectGoal(goalId, "chat"); }} /> + ))} : null} diff --git a/examples/personal-workspace-browser/goal-draft.mjs b/examples/personal-workspace-browser/goal-draft.mjs index 69402a06d6..2575c32c0b 100644 --- a/examples/personal-workspace-browser/goal-draft.mjs +++ b/examples/personal-workspace-browser/goal-draft.mjs @@ -28,6 +28,10 @@ export const goalDraftScenario = { const requests = api.turnRequests.length; await card.getByRole("button", {name: "资本支出变化", exact: true}).click(); assert.equal(await composer.inputValue(), "资本支出变化"); + await composer.fill("保留现金流的判断。"); + await card.getByRole("button", {name: "资本支出变化", exact: true}).click(); + assert.equal(await composer.inputValue(), "保留现金流的判断。\n资本支出变化", + "An existing suggestion appends to the current draft"); assert.equal(api.turnRequests.length, requests, "Suggestion auto-sent a request"); assert.equal(api.actionPreviews.length, 0); assert.equal(api.durableWriteCount, writes);