Merge upstream/main into feat_inhouse_mcp - 解决冲突并保留MCP服务功能

Author: shenwujie

.gitignore

@@ -62,3 +62,6 @@ spring-ai-alibaba-jmanus/ui-vue3/pnpm-lock.yaml
 # MCP configuration files
 modified_mcp_config.json
 .cursorindexingignore
+
+# ignore code copilot local index
+.idea/LocalCodeIndex/

spring-ai-alibaba-graph/spring-ai-alibaba-graph-core/src/main/java/com/alibaba/cloud/ai/graph/CompileConfig.java

@@ -49,6 +49,8 @@ public class CompileConfig {
 
 	private boolean releaseThread = false;
 
+	private boolean interruptBeforeEdge = false;
+
 	private ObservationRegistry observationRegistry = ObservationRegistry.NOOP;
 
 	/**
@@ -101,6 +103,15 @@ public String[] getInterruptAfter() {
 		return interruptsAfter.toArray(new String[0]);
 	}
 
+	/**
+	 * return the current state of option concerning whether to interrupt the graph
+	 * execution before evaluating conditional edges
+	 * @return true if option is enabled, false otherwise
+	 */
+	public boolean interruptBeforeEdge() {
+		return interruptBeforeEdge;
+	}
+
 	/**
 	 * Returns the set of interrupts that will occur before the specified node.
 	 * @return An unmodifiable set of interruptible nodes.
@@ -233,6 +244,23 @@ public Builder interruptsBefore(Collection<String> interruptsBefore) {
 			return this;
 		}
 
+		/**
+		 * Sets whether to interrupt the graph execution before evaluating conditional
+		 * edges.
+		 * <p>
+		 * By default, interruptions happen after a node has finished executing. If this
+		 * is set to {@code true}, the interruption will occur after the node finishes but
+		 * *before* any of its conditional edges are evaluated. This allows for inspecting
+		 * the state before a branch is chosen.
+		 * @param interruptBeforeEdge if {@code true}, interrupt before evaluating edges,
+		 * otherwise interrupt after.
+		 * @return The current {@code Builder} instance for method chaining.
+		 */
+		public Builder interruptBeforeEdge(boolean interruptBeforeEdge) {
+			this.config.interruptBeforeEdge = interruptBeforeEdge;
+			return this;
+		}
+
 		/**
 		 * Sets multiple interrupt points that trigger after node execution from a
 		 * collection.
@@ -283,6 +311,7 @@ private CompileConfig(CompileConfig config) {
 		this.releaseThread = config.releaseThread;
 		this.lifecycleListeners = config.lifecycleListeners;
 		this.observationRegistry = config.observationRegistry;
+		this.interruptBeforeEdge = config.interruptBeforeEdge;
 	}
 
 }