fix: 修复调试功能入口节点可能无法被正常识别的问题

kqcoxn · kqcoxn · commit b8a3c55a6da2 · 2026-06-04T03:06:43.000+08:00
diff --git a/src/data/updateLogs.ts b/src/data/updateLogs.ts
@@ -115,8 +115,9 @@ export const updateLogs: UpdateLogItem[] = [
         "优化资源健康检查相关术语",
       ],
       fixes: [
-        "修复 on_error 无法连接至自身的问题",
+        "修复调试功能入口节点可能无法被正常识别的问题",
         "修复 adb 不填写 extra 无法连接的问题",
+        "修复 on_error 无法连接至自身的问题",
       ],
     },
   },
diff --git a/src/features/debug/hooks/useDebugModalController.ts b/src/features/debug/hooks/useDebugModalController.ts
@@ -202,7 +202,12 @@ export function useDebugModalController() {
       deviceInfo: state.deviceInfo,
     })),
   );
-  const flowNodes = useFlowStore((state) => state.nodes);
+  const { flowEdges, flowNodes } = useFlowStore(
+    useShallow((state) => ({
+      flowEdges: state.edges,
+      flowNodes: state.nodes,
+    })),
+  );
   const selectedFlowNodeId = useFlowStore((state) =>
     state.selectedNodes.length === 1 ? state.selectedNodes[0]?.id : undefined,
   );
@@ -298,6 +303,7 @@ export function useDebugModalController() {
   );
 
   const nodeExecutionController = useDebugNodeExecutionController({
+    flowEdges,
     flowNodes,
     liveSummary,
     nodeExecutionAttributionMode,
diff --git a/src/features/debug/hooks/useDebugNodeExecutionController.ts b/src/features/debug/hooks/useDebugNodeExecutionController.ts
@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useDebugOverlayStore } from "../../../stores/debugOverlayStore";
-import type { NodeType } from "../../../stores/flow";
+import { useFileStore } from "../../../stores/fileStore";
+import type { EdgeType, NodeType } from "../../../stores/flow";
 import { useLocalFileStore } from "../../../stores/localFileStore";
 import { useDebugRunProfileStore } from "../../../stores/debugRunProfileStore";
 import { applyDebugNodeTarget } from "../nodeTargetActions";
@@ -24,6 +25,7 @@ import {
 } from "../types";
 
 interface UseDebugNodeExecutionControllerInput {
+  flowEdges: EdgeType[];
   flowNodes: NodeType[];
   liveSummary: DebugTraceSummary;
   nodeExecutionAttributionMode: DebugExecutionAttributionMode;
@@ -36,6 +38,7 @@ interface UseDebugNodeExecutionControllerInput {
 }
 
 export function useDebugNodeExecutionController({
+  flowEdges,
   flowNodes,
   liveSummary,
   nodeExecutionAttributionMode,
@@ -58,11 +61,51 @@ export function useDebugNodeExecutionController({
   const resourcePaths = useDebugRunProfileStore(
     (state) => state.profile.resourcePaths,
   );
+  const fileSnapshotKey = useFileStore((state) =>
+    JSON.stringify({
+      currentFile: {
+        fileName: state.currentFile.fileName,
+        filePath: state.currentFile.config.filePath,
+        prefix: state.currentFile.config.prefix,
+        relativePath: state.currentFile.config.relativePath,
+      },
+      files: state.files.map((file) => ({
+        fileName: file.fileName,
+        filePath: file.config.filePath,
+        prefix: file.config.prefix,
+        relativePath: file.config.relativePath,
+        nodeCount: file.nodes.length,
+        edgeCount: file.edges.length,
+      })),
+    }),
+  );
   const flowNodeIds = useMemo(
     () => new Set(flowNodes.map((node) => node.id)),
     [flowNodes],
   );
+  const flowSnapshotKey = useMemo(
+    () =>
+      JSON.stringify({
+        edges: flowEdges.map((edge) => ({
+          id: edge.id,
+          source: edge.source,
+          sourceHandle: edge.sourceHandle,
+          target: edge.target,
+          targetHandle: edge.targetHandle,
+          jumpBack: edge.attributes?.jump_back,
+          anchor: edge.attributes?.anchor,
+        })),
+        nodes: flowNodes.map((node) => ({
+          id: node.id,
+          label: node.data.label,
+          type: node.type,
+        })),
+      }),
+    [flowEdges, flowNodes],
+  );
   const debugResolver = useMemo(() => {
+    void fileSnapshotKey;
+    void flowSnapshotKey;
     const bundle = buildDebugSnapshotBundle(localFiles, resourcePaths);
     return {
       edges: bundle.resolverSnapshot.edges,
@@ -71,7 +114,7 @@ export function useDebugNodeExecutionController({
       ),
       allNodes: bundle.resolverSnapshot.nodes,
     };
-  }, [flowNodeIds, localFiles, resourcePaths]);
+  }, [fileSnapshotKey, flowNodeIds, flowSnapshotKey, localFiles, resourcePaths]);
   const resolverEdges = debugResolver.edges;
   const resolverEdgeIndex = useMemo(
     () => createDebugResolverEdgeIndex(resolverEdges),
diff --git a/src/features/debug/snapshot.test.ts b/src/features/debug/snapshot.test.ts
@@ -1,11 +1,120 @@
-import { describe, expect, it } from "vitest";
+import { afterEach, describe, expect, it } from "vitest";
+import { NodeTypeEnum } from "../../components/flow/nodes";
+import { useFileStore } from "../../stores/fileStore";
+import { useFlowStore, type PipelineNodeType } from "../../stores/flow";
 import {
+  buildDebugSnapshotBundle,
   selectEffectiveResolverEdges,
   selectEffectiveResolverNodes,
 } from "./snapshot";
 import type { DebugNodeResolverSnapshot } from "./types";
 
 describe("snapshot resource override resolution", () => {
+  afterEach(() => {
+    useFlowStore.setState({ nodes: [], edges: [] });
+  });
+
+  it("uses currentFile config for the active opened file", () => {
+    const node = makePipelineNode("p_1", "Entry");
+    const staleFile = {
+      fileName: "main.json",
+      nodes: [],
+      edges: [],
+      config: {
+        prefix: "Stale",
+      },
+    };
+    const currentFile = {
+      ...staleFile,
+      config: {
+        filePath: "C:/resource/base/pipeline/main.json",
+        prefix: "Live",
+        relativePath: "pipeline/main.json",
+      },
+    };
+
+    useFileStore.setState({
+      currentFile,
+      files: [staleFile],
+    });
+    useFlowStore.setState({
+      nodes: [node],
+      edges: [],
+    });
+
+    const bundle = buildDebugSnapshotBundle(
+      [
+        {
+          file_path: "C:/resource/base/pipeline/main.json",
+          file_name: "main.json",
+          relative_path: "pipeline/main.json",
+          prefix: "Live",
+          nodes: [
+            {
+              label: "Live_Entry",
+              prefix: "Live",
+              anchors: [],
+            },
+          ],
+        },
+      ],
+      ["C:/resource/base"],
+    );
+
+    expect(bundle.resolverSnapshot.nodes).toEqual([
+      {
+        fileId: "main.json",
+        nodeId: "p_1",
+        runtimeName: "Live_Entry",
+        displayName: "Entry",
+        prefix: "Live",
+        sourcePath: "C:/resource/base/pipeline/main.json",
+      },
+    ]);
+  });
+
+  it("includes the active file when it is missing from files", () => {
+    const node = makePipelineNode("p_1", "Entry");
+    const currentFile = {
+      fileName: "main.json",
+      nodes: [],
+      edges: [],
+      config: {
+        filePath: "C:/resource/base/pipeline/main.json",
+        prefix: "Live",
+        relativePath: "pipeline/main.json",
+      },
+    };
+
+    useFileStore.setState({
+      currentFile,
+      files: [],
+    });
+    useFlowStore.setState({
+      nodes: [node],
+      edges: [],
+    });
+
+    const bundle = buildDebugSnapshotBundle([], ["C:/resource/base"]);
+
+    expect(bundle.graphSnapshot.files).toHaveLength(1);
+    expect(bundle.graphSnapshot.files[0]).toMatchObject({
+      fileId: "main.json",
+      path: "C:/resource/base/pipeline/main.json",
+      relativePath: "pipeline/main.json",
+    });
+    expect(bundle.resolverSnapshot.nodes).toEqual([
+      {
+        fileId: "main.json",
+        nodeId: "p_1",
+        runtimeName: "Live_Entry",
+        displayName: "Entry",
+        prefix: "Live",
+        sourcePath: "C:/resource/base/pipeline/main.json",
+      },
+    ]);
+  });
+
   it("prefers later resource paths for duplicate runtime names", () => {
     const nodes: DebugNodeResolverSnapshot["nodes"] = [
       {
@@ -58,3 +167,23 @@ describe("snapshot resource override resolution", () => {
     ).toEqual([edges[1]]);
   });
 });
+
+function makePipelineNode(id: string, label: string): PipelineNodeType {
+  return {
+    id,
+    type: NodeTypeEnum.Pipeline,
+    data: {
+      label,
+      recognition: {
+        type: "DirectHit",
+        param: {},
+      },
+      action: {
+        type: "DoNothing",
+        param: {},
+      },
+      others: {},
+    },
+    position: { x: 0, y: 0 },
+  };
+}
diff --git a/src/features/debug/snapshot.ts b/src/features/debug/snapshot.ts
@@ -70,27 +70,35 @@ function buildFileSources(): DebugFileSource[] {
   const fileState = useFileStore.getState();
   const flowState = useFlowStore.getState();
 
-  return fileState.files.map((file) => {
+  const openedFiles = fileState.files.some(
+    (file) => file.fileName === fileState.currentFile.fileName,
+  )
+    ? fileState.files
+    : [...fileState.files, fileState.currentFile];
+
+  return openedFiles.map((file) => {
     const isCurrent = file.fileName === fileState.currentFile.fileName;
+    const sourceFile = isCurrent ? fileState.currentFile : file;
+    const config = sourceFile.config;
     const nodes = isCurrent ? flowState.nodes : file.nodes;
     const edges = isCurrent ? flowState.edges : file.edges;
     const pipeline = flowToPipeline({
       nodes,
       edges,
-      fileName: file.fileName,
-      config: file.config,
+      fileName: sourceFile.fileName,
+      config,
     });
 
     return {
-      fileId: file.fileName,
-      path: file.config.filePath,
-      relativePath: file.config.relativePath,
-      prefix: file.config.prefix,
+      fileId: sourceFile.fileName,
+      path: config.filePath,
+      relativePath: config.relativePath,
+      prefix: config.prefix,
       nodes,
       edges,
       pipeline,
-      config: toRecord(file.config),
-      dirty: !file.config.filePath || file.config.isModifiedExternally,
+      config: toRecord(config),
+      dirty: !config.filePath || config.isModifiedExternally,
     };
   });
 }
diff --git a/src/stores/configStore.ts b/src/stores/configStore.ts
@@ -7,7 +7,7 @@ import { encryptApiKey } from "../utils/ai/crypto";
 export const globalConfig = {
   dev: true,
   version: `1.6.1`,
-  betaIteration: 1,
+  betaIteration: 2,
   mfwVersion: "5.10.5",
   protocolVersion: "1.0.5",
 };
diff --git a/src/stores/debugRunProfileStore.ts b/src/stores/debugRunProfileStore.ts
@@ -358,6 +358,9 @@ export const useDebugRunProfileStore = create<DebugRunProfileState>(
           targetNodeId !== undefined
             ? resolveDebugNodeTarget(targetNodeId, bundle.resolverSnapshot)
             : undefined;
+        if (targetNodeId !== undefined && !target) {
+          throw new Error("所选入口节点不在当前调试快照中，请重新打开入口节点所在文件后再试。");
+        }
         const snapshotEntry =
           bundle.resolverSnapshot.nodes.find(
             (node) => node.fileId === bundle.resolverSnapshot.rootFileId,
diff --git a/src/stores/fileStore.ts b/src/stores/fileStore.ts
@@ -411,7 +411,18 @@ export const useFileStore = create<FileState>()((set) => ({
   setFileConfig(key, value) {
     set((state) => {
       const config = { ...state.currentFile.config, [key]: value };
-      state.currentFile.config = config;
+      const currentFile = { ...state.currentFile, config };
+      const currentFileIndex = state.files.findIndex(
+        (file) => file.fileName === currentFile.fileName,
+      );
+      const files =
+        currentFileIndex >= 0
+          ? state.files.map((file, index) =>
+              index === currentFileIndex ? currentFile : file,
+            )
+          : state.files;
+      state.currentFile = currentFile;
+      state.files = files;
       return {};
     });
   },
