Skip to content

fix(web): 修复工具卡片弹窗在执行完成时被意外关闭 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tyanxie merged 1 commit into from
Jun 27, 2026
Merged

fix(web): 修复工具卡片弹窗在执行完成时被意外关闭 #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions src/web/src/components/InstanceView/useConversation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ export function useConversation(
const [streamingEntry, setStreamingEntry] = useState<SessionEntry | null>(
null,
);
// 追踪当前 streamingEntry 的 renderKey，避免闭包读取 state 过时
const streamingKeyRef = useRef<string | null>(null);
const [loadState, setLoadState] = useState<ConversationLoadState>("idle");
const [errorMessage, setErrorMessage] = useState<string | null>(null);
const [hasMore, setHasMore] = useState(false);
Expand Down Expand Up @@ -187,13 +189,13 @@ export function useConversation(
case "message_start": {
const message = d.message as SessionEntry["message"];
if (!message || message.role !== "assistant") break;
setStreamingEntry(
ensureRenderKey(
id,
{ type: "message", timestamp: new Date().toISOString(), message },
"streaming",
),
const entry = ensureRenderKey(
id,
{ type: "message", timestamp: new Date().toISOString(), message },
"streaming",
);
streamingKeyRef.current = entry.__renderKey ?? entry.id ?? null;
setStreamingEntry(entry);
break;
}
case "message_update": {
Expand All @@ -215,13 +217,18 @@ export function useConversation(
case "message_end": {
const message = d.message as SessionEntry["message"];
if (message) {
const entry = ensureRenderKey(
id,
{ type: "message", timestamp: new Date().toISOString(), message },
"live",
);
// 复用 streamingEntry 的 key，避免 React 重建组件导致弹窗状态丢失
const stableKey =
streamingKeyRef.current ?? nextRenderKey(id, "live");
const entry: SessionEntry = {
type: "message",
timestamp: new Date().toISOString(),
message,
__renderKey: stableKey,
};
setEntries((prev) => [...prev, entry]);
}
streamingKeyRef.current = null;
setStreamingEntry(null);
break;
}
Expand Down