chore: commit workspace updates
This commit is contained in:
1 parent
4eeef3cfd8
commit
4b0e9d8965
490 files changed
+12826
-72249
No files matched your search
@@ -1,3 +1,4 @@
|
||||
import { mergeAgentCanvasEditor } from "@/lib/canvas/agent-canvas-patch";
|
||||
import { startTransition, useCallback, useEffect, useRef, useState, type Dispatch, type MutableRefObject, type SetStateAction } from "react";
|
||||
import { App } from "antd";
|
||||
import { useNavigate } from "react-router";
|
||||
@@ -8,7 +9,7 @@ import { removeCanvasDrawing } from "@/lib/canvas/canvas-drawing-storage";
|
||||
import { normalizeCanvasNodeTimestamps } from "@/lib/canvas/canvas-node-timestamps";
|
||||
import { hydrateAssistantImages, resetInterruptedGeneration } from "@/lib/canvas/canvas-project-generation";
|
||||
import { listAddedSkills, type Skill } from "@/services/api/skills";
|
||||
import { createCanvasProjectWithRemoteSync, deleteCanvasProjectsWithRemoteSync, loadCanvasProjectForEditing, localSavedRemotePendingMessage, saveRemoteUserDataNow } from "@/services/user-data-sync";
|
||||
import { createCanvasProjectWithRemoteSync, deleteCanvasProjectsWithRemoteSync, loadCanvasProjectForEditing, localSavedRemotePendingMessage, saveRemoteUserDataNow, subscribeAgentCanvasRefresh } from "@/services/user-data-sync";
|
||||
import { flushCanvasStorePersistence, useCanvasStore, type CanvasProject } from "@/stores/canvas/use-canvas-store";
|
||||
import { useThemeStore } from "@/stores/use-theme-store";
|
||||
import { useUserStore } from "@/stores/use-user-store";
|
||||
@@ -83,6 +84,7 @@ export function useCanvasProjectLifecycle({
|
||||
const [addedSkills, setAddedSkills] = useState<Skill[]>([]);
|
||||
const [loadError, setLoadError] = useState("");
|
||||
const [loadAttempt, setLoadAttempt] = useState(0);
|
||||
const [agentCreatedNodes, setAgentCreatedNodes] = useState<{ projectId: string; nodes: CanvasNodeData[] } | null>(null);
|
||||
const viewportSaveTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -172,9 +174,27 @@ export function useCanvasProjectLifecycle({
|
||||
};
|
||||
}, [projectLoaded]);
|
||||
|
||||
useEffect(() => subscribeAgentCanvasRefresh((project, previous) => {
|
||||
if (!projectLoaded || project.id !== projectId) return;
|
||||
// Merge only server-changed fields so dragging/editing other nodes can
|
||||
// continue while Agent media tasks complete. Same-field conflicts fail.
|
||||
const merged = previous ? mergeAgentCanvasEditor(previous, project, nodesRef.current, connectionsRef.current) : project;
|
||||
nodesRef.current = merged.nodes;
|
||||
connectionsRef.current = merged.connections;
|
||||
setNodes(merged.nodes);
|
||||
setConnections(merged.connections);
|
||||
const previousIds = new Set(previous?.nodes.map((node) => node.id));
|
||||
const created = project.nodes.filter((node) => !previousIds.has(node.id));
|
||||
if (created.length) setAgentCreatedNodes({ projectId: project.id, nodes: created });
|
||||
}), [projectId, projectLoaded, nodesRef, connectionsRef, setNodes, setConnections]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!projectLoaded || historyPausedRef.current) return;
|
||||
updateProject(projectId, { nodes, connections, chatSessions, activeChatId, appearance: canvasAppearance, backgroundMode, showImageInfo });
|
||||
const patch = { nodes, connections, chatSessions, activeChatId, appearance: canvasAppearance, backgroundMode, showImageInfo };
|
||||
const stored = useCanvasStore.getState().projects.find((project) => project.id === projectId);
|
||||
// 远端结果投影到编辑器不是一次本地编辑,避免改写时间戳并触发反向保存。
|
||||
if (stored && Object.entries(patch).every(([key, value]) => JSON.stringify(stored[key as keyof CanvasProject]) === JSON.stringify(value))) return;
|
||||
updateProject(projectId, patch);
|
||||
}, [activeChatId, backgroundMode, canvasAppearance, chatSessions, connections, historyPausedRef, nodes, projectId, projectLoaded, showImageInfo, updateProject]);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -258,6 +278,7 @@ export function useCanvasProjectLifecycle({
|
||||
loadError,
|
||||
retryLoad: () => setLoadAttempt((attempt) => attempt + 1),
|
||||
addedSkills,
|
||||
agentCreatedNodes: agentCreatedNodes?.projectId === projectId ? agentCreatedNodes.nodes : null,
|
||||
clearCanvasFiles,
|
||||
createAndOpenProject,
|
||||
currentProject,
|
||||
@@ -268,6 +289,7 @@ export function useCanvasProjectLifecycle({
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
function mergeHydratedSessions(currentSessions: CanvasAssistantSession[], hydratedSessions: CanvasAssistantSession[]) {
|
||||
const hydratedById = new Map(hydratedSessions.map((session) => [session.id, session]));
|
||||
return currentSessions.map((session) => {
|
||||
|
||||
Reference in new issue
Block a user