();
const personalization = usePersonalizationStore();
-const stackedBlocksEnabled = computed(() => personalization.experiments.stackedBlocksEnabled);
+const stackedBlocksEnabled = computed(() => {
+ // 默认启用堆叠块显示，除非明确设置为 false
+ const enabled = personalization.experiments.stackedBlocksEnabled;
+ return enabled !== false;
+});
const filteredMessages = computed(() =>
(props.messages || []).filter(m => !(m && m.metadata && m.metadata.system_injected_image))
);
@@ -439,6 +445,15 @@ const splitActionGroups = (actions: any[] = [], messageIndex = 0) => {
> = [];
let buffer: any[] = [];
+ // 调试：记录输入
+ if (actions.length > 0) {
+ console.log(`[splitActionGroups] 消息 ${messageIndex}:`, {
+ totalActions: actions.length,
+ actionTypes: actions.map(a => a.type),
+ stackedBlocksEnabled: props.stackedBlocksEnabled
+ });
+ }
+
const flushBuffer = () => {
if (buffer.length >= 2) {
result.push({
@@ -475,6 +490,19 @@ const splitActionGroups = (actions: any[] = [], messageIndex = 0) => {
}
});
flushBuffer();
+
+ // 调试：记录输出
+ if (actions.length > 0) {
+ console.log(`[splitActionGroups] 消息 ${messageIndex} 结果:`, {
+ totalGroups: result.length,
+ groups: result.map(g => ({
+ kind: g.kind,
+ actionsCount: g.kind === 'stack' ? g.actions.length : 1,
+ actionType: g.kind === 'stack' ? g.actions[0]?.type : g.action?.type
+ }))
+ });
+ }
+
return result;
};
diff --git a/static/src/composables/useLegacySocket.ts b/static/src/composables/useLegacySocket.ts
index 28f2719..f87cb4f 100644
--- a/static/src/composables/useLegacySocket.ts
+++ b/static/src/composables/useLegacySocket.ts
@@ -848,6 +848,11 @@ export async function initializeLegacySocket(ctx: any) {
// AI消息开始
ctx.socket.on('ai_message_start', () => {
+ // 轮询模式下跳过 WebSocket 事件
+ if (ctx.usePollingMode) {
+ socketLog('AI消息开始 (轮询模式，跳过)');
+ return;
+ }
socketLog('AI消息开始');
logStreamingDebug('socket:ai_message_start');
finalizeStreamingText({ force: true });
@@ -867,6 +872,11 @@ export async function initializeLegacySocket(ctx: any) {
// 思考流开始
ctx.socket.on('thinking_start', () => {
+ // 轮询模式下跳过 WebSocket 事件
+ if (ctx.usePollingMode) {
+ socketLog('思考开始 (轮询模式，跳过)');
+ return;
+ }
socketLog('思考开始');
const ignoreThinking = ctx.runMode === 'fast' || ctx.thinkingMode === false;
streamingState.ignoreThinking = ignoreThinking;
@@ -888,6 +898,10 @@ export async function initializeLegacySocket(ctx: any) {
// 思考内容块
ctx.socket.on('thinking_chunk', (data) => {
+ // 轮询模式下跳过 WebSocket 事件
+ if (ctx.usePollingMode) {
+ return;
+ }
if (streamingState.ignoreThinking) {
return;
}
@@ -906,6 +920,11 @@ export async function initializeLegacySocket(ctx: any) {
// 思考结束
ctx.socket.on('thinking_end', (data) => {
+ // 轮询模式下跳过 WebSocket 事件
+ if (ctx.usePollingMode) {
+ socketLog('思考结束 (轮询模式，跳过)');
+ return;
+ }
socketLog('思考结束');
if (streamingState.ignoreThinking) {
streamingState.ignoreThinking = false;
@@ -926,6 +945,11 @@ export async function initializeLegacySocket(ctx: any) {
// 文本流开始
ctx.socket.on('text_start', () => {
+ // 轮询模式下跳过 WebSocket 事件
+ if (ctx.usePollingMode) {
+ socketLog('文本开始 (轮询模式，跳过)');
+ return;
+ }
socketLog('文本开始');
logStreamingDebug('socket:text_start');
finalizeStreamingText({ force: true });
@@ -940,6 +964,10 @@ export async function initializeLegacySocket(ctx: any) {
// 文本内容块
ctx.socket.on('text_chunk', (data) => {
+ // 轮询模式下跳过 WebSocket 事件
+ if (ctx.usePollingMode) {
+ return;
+ }
logStreamingDebug('socket:text_chunk', {
index: data?.index ?? null,
elapsed: data?.elapsed ?? null,
@@ -973,6 +1001,11 @@ export async function initializeLegacySocket(ctx: any) {
// 文本结束
ctx.socket.on('text_end', (data) => {
+ // 轮询模式下跳过 WebSocket 事件
+ if (ctx.usePollingMode) {
+ socketLog('文本结束 (轮询模式，跳过)');
+ return;
+ }
socketLog('文本结束');
logStreamingDebug('socket:text_end', {
finalLength: (data?.full_content || '').length,
@@ -1022,6 +1055,10 @@ export async function initializeLegacySocket(ctx: any) {
// 工具准备中事件 - 实时显示
ctx.socket.on('tool_preparing', (data) => {
+ // 轮询模式下跳过 WebSocket 事件
+ if (ctx.usePollingMode) {
+ return;
+ }
if (ctx.dropToolEvents) {
return;
}
@@ -1079,6 +1116,10 @@ export async function initializeLegacySocket(ctx: any) {
// 工具意图（流式增量）事件
ctx.socket.on('tool_intent', (data) => {
+ // 轮询模式下跳过 WebSocket 事件
+ if (ctx.usePollingMode) {
+ return;
+ }
if (ctx.dropToolEvents) {
return;
}
@@ -1104,6 +1145,10 @@ export async function initializeLegacySocket(ctx: any) {
// 工具状态更新事件 - 实时显示详细状态
ctx.socket.on('tool_status', (data) => {
+ // 轮询模式下跳过 WebSocket 事件
+ if (ctx.usePollingMode) {
+ return;
+ }
if (ctx.dropToolEvents) {
return;
}
@@ -1136,6 +1181,10 @@ export async function initializeLegacySocket(ctx: any) {
// 工具开始（从准备转为执行）
ctx.socket.on('tool_start', (data) => {
+ // 轮询模式下跳过 WebSocket 事件
+ if (ctx.usePollingMode) {
+ return;
+ }
if (ctx.dropToolEvents) {
return;
}
@@ -1204,6 +1253,10 @@ export async function initializeLegacySocket(ctx: any) {
// 更新action（工具完成）
ctx.socket.on('update_action', (data) => {
+ // 轮询模式下跳过 WebSocket 事件
+ if (ctx.usePollingMode) {
+ return;
+ }
if (ctx.dropToolEvents) {
return;
}
diff --git a/static/src/stores/task.ts b/static/src/stores/task.ts
new file mode 100644
index 0000000..35eb207
--- /dev/null
+++ b/static/src/stores/task.ts
@@ -0,0 +1,280 @@
+// @ts-nocheck
+import { defineStore } from 'pinia';
+import { debugLog } from '../app/methods/common';
+
+export const useTaskStore = defineStore('task', {
+ state: () => ({
+ currentTaskId: null as string | null,
+ lastEventIndex: 0,
+ pollingInterval: null as number | null,
+ taskStatus: 'idle' as 'idle' | 'running' | 'succeeded' | 'failed' | 'canceled',
+ isPolling: false,
+ pollingError: null as string | null,
+ taskCreatedAt: null as number | null,
+ taskUpdatedAt: null as number | null,
+ }),
+
+ getters: {
+ hasActiveTask: (state) => state.currentTaskId !== null && state.taskStatus === 'running',
+ isTaskCompleted: (state) => ['succeeded', 'failed', 'canceled'].includes(state.taskStatus),
+ },
+
+ actions: {
+ async createTask(message: string, images: any[] = [], videos: any[] = [], conversationId: string | null = null) {
+ try {
+ debugLog('[Task] 创建任务:', { message, conversationId });
+
+ const response = await fetch('/api/tasks', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify({
+ message,
+ images,
+ videos,
+ conversation_id: conversationId,
+ }),
+ });
+
+ if (!response.ok) {
+ const error = await response.json();
+ throw new Error(error.error || '创建任务失败');
+ }
+
+ const result = await response.json();
+ if (!result.success) {
+ throw new Error(result.error || '创建任务失败');
+ }
+
+ this.currentTaskId = result.data.task_id;
+ this.taskStatus = result.data.status;
+ this.lastEventIndex = 0;
+ this.taskCreatedAt = result.data.created_at;
+ this.pollingError = null;
+
+ debugLog('[Task] 任务创建成功:', result.data.task_id);
+
+ // 立即开始轮询
+ this.startPolling();
+
+ return result.data;
+ } catch (error) {
+ debugLog('[Task] 创建任务失败:', error);
+ throw error;
+ }
+ },
+
+ async pollTaskEvents(eventHandler: (event: any) => void) {
+ if (!this.currentTaskId) {
+ debugLog('[Task] 没有活跃任务，停止轮询');
+ this.stopPolling();
+ return;
+ }
+
+ try {
+ const response = await fetch(
+ `/api/tasks/${this.currentTaskId}?from=${this.lastEventIndex}`
+ );
+
+ if (!response.ok) {
+ throw new Error('轮询任务失败');
+ }
+
+ const result = await response.json();
+ if (!result.success) {
+ throw new Error(result.error || '轮询任务失败');
+ }
+
+ const data = result.data;
+
+ // 更新任务状态
+ this.taskStatus = data.status;
+ this.taskUpdatedAt = data.updated_at;
+
+ // 处理新事件
+ if (data.events && data.events.length > 0) {
+ debugLog(`[Task] 收到 ${data.events.length} 个新事件`);
+
+ for (const event of data.events) {
+ try {
+ eventHandler(event);
+ } catch (err) {
+ console.error('[Task] 处理事件失败:', err, event);
+ }
+ }
+
+ this.lastEventIndex = data.next_offset;
+ }
+
+ // 如果任务已完成，停止轮询
+ if (this.isTaskCompleted) {
+ debugLog('[Task] 任务已完成，停止轮询:', this.taskStatus);
+ this.stopPolling();
+ }
+
+ this.pollingError = null;
+ } catch (error) {
+ console.error('[Task] 轮询失败:', error);
+ this.pollingError = error.message;
+
+ // 连续失败3次后停止轮询
+ if (this.pollingError) {
+ // 可以在这里添加重试逻辑
+ }
+ }
+ },
+
+ startPolling(eventHandler?: (event: any) => void) {
+ if (this.isPolling) {
+ debugLog('[Task] 轮询已在运行');
+ return;
+ }
+
+ if (!this.currentTaskId) {
+ debugLog('[Task] 没有任务ID，无法启动轮询');
+ return;
+ }
+
+ debugLog('[Task] 启动轮询:', this.currentTaskId);
+ this.isPolling = true;
+
+ // 如果没有传入 eventHandler，从根实例获取
+ const handler = eventHandler || ((window as any).__taskEventHandler);
+
+ if (!handler) {
+ console.error('[Task] 没有事件处理器，无法启动轮询');
+ this.isPolling = false;
+ return;
+ }
+
+ // 立即执行一次
+ this.pollTaskEvents(handler);
+
+ // 设置定时轮询（150ms 间隔，接近流式输出效果）
+ this.pollingInterval = window.setInterval(() => {
+ this.pollTaskEvents(handler);
+ }, 150);
+ },
+
+ stopPolling() {
+ if (this.pollingInterval) {
+ debugLog('[Task] 停止轮询');
+ clearInterval(this.pollingInterval);
+ this.pollingInterval = null;
+ }
+ this.isPolling = false;
+ },
+
+ async cancelTask() {
+ if (!this.currentTaskId) {
+ return;
+ }
+
+ try {
+ debugLog('[Task] 取消任务:', this.currentTaskId);
+
+ const response = await fetch(`/api/tasks/${this.currentTaskId}/cancel`, {
+ method: 'POST',
+ });
+
+ if (!response.ok) {
+ throw new Error('取消任务失败');
+ }
+
+ const result = await response.json();
+ if (!result.success) {
+ throw new Error(result.error || '取消任务失败');
+ }
+
+ this.taskStatus = 'canceled';
+ this.stopPolling();
+
+ debugLog('[Task] 任务已取消');
+ } catch (error) {
+ console.error('[Task] 取消任务失败:', error);
+ throw error;
+ }
+ },
+
+ async loadRunningTask(conversationId: string | null = null) {
+ try {
+ debugLog('[Task] 查找运行中的任务');
+
+ const response = await fetch('/api/tasks');
+ if (!response.ok) {
+ throw new Error('获取任务列表失败');
+ }
+
+ const result = await response.json();
+ if (!result.success) {
+ throw new Error(result.error || '获取任务列表失败');
+ }
+
+ // 查找运行中的任务
+ const runningTask = result.data.find((task: any) =>
+ task.status === 'running' &&
+ (!conversationId || task.conversation_id === conversationId)
+ );
+
+ if (runningTask) {
+ debugLog('[Task] 发现运行中的任务:', runningTask.task_id);
+
+ this.currentTaskId = runningTask.task_id;
+ this.taskStatus = runningTask.status;
+ this.taskCreatedAt = runningTask.created_at;
+ this.taskUpdatedAt = runningTask.updated_at;
+ this.pollingError = null;
+
+ // 获取任务详情，计算已处理的事件数量
+ try {
+ const detailResponse = await fetch(`/api/tasks/${runningTask.task_id}`);
+ if (detailResponse.ok) {
+ const detailResult = await detailResponse.json();
+ if (detailResult.success && detailResult.data.events) {
+ // 设置为当前事件数量，只获取新事件
+ this.lastEventIndex = detailResult.data.next_offset || detailResult.data.events.length;
+ debugLog('[Task] 设置起始偏移量:', this.lastEventIndex);
+ } else {
+ this.lastEventIndex = 0;
+ }
+ } else {
+ this.lastEventIndex = 0;
+ }
+ } catch (error) {
+ console.warn('[Task] 获取任务详情失败，从头开始:', error);
+ this.lastEventIndex = 0;
+ }
+
+ return runningTask;
+ }
+
+ debugLog('[Task] 没有运行中的任务');
+ return null;
+ } catch (error) {
+ console.error('[Task] 加载运行中任务失败:', error);
+ return null;
+ }
+ },
+
+ clearTask() {
+ debugLog('[Task] 清理任务状态');
+ this.stopPolling();
+ this.currentTaskId = null;
+ this.lastEventIndex = 0;
+ this.taskStatus = 'idle';
+ this.pollingError = null;
+ this.taskCreatedAt = null;
+ this.taskUpdatedAt = null;
+ },
+
+ resetForNewConversation() {
+ debugLog('[Task] 重置任务状态（新对话）');
+ this.stopPolling();
+ this.currentTaskId = null;
+ this.lastEventIndex = 0;
+ this.taskStatus = 'idle';
+ this.pollingError = null;
+ },
+ },
+});
diff --git a/utils/conversation_manager.py b/utils/conversation_manager.py
index e73ec4c..6cb999b 100644
--- a/utils/conversation_manager.py
+++ b/utils/conversation_manager.py
@@ -787,10 +787,10 @@ class ConversationManager:
index = self._ensure_index_covering(limit=limit, offset=offset)
- # 按更新时间倒序排列
+ # 按更新时间倒序排列（处理 None 值）
sorted_conversations = sorted(
index.items(),
- key=lambda x: x[1].get("updated_at", ""),
+ key=lambda x: x[1].get("updated_at") or "",
reverse=True
)