Structure output to enhance the result of data collection (alibaba#1672)

* feat(controller): refactor saveToVersionHistory method to handle plan ID extraction and JSON parsing
feat(model): add autogenerated ID field to PlanTemplate entity
feat(interface): add getPlanId and setPlanId methods to PlanInterface
fix(yml): enable H2 console for easier database access

* 修复前端bug

* build ui

* javaformat

---------

Co-authored-by: rainerWJY <answeropensource@alibabacloud.com>

Author: rainerWJY

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/planning/controller/PlanTemplateController.java

@@ -140,7 +140,7 @@ public ResponseEntity<Map<String, Object>> generatePlan(@RequestBody Map<String,
 			}
 
 			// Save to version history
-			PlanTemplateService.VersionSaveResult saveResult = saveToVersionHistory(planTemplateId, planJson);
+			PlanTemplateService.VersionSaveResult saveResult = saveToVersionHistory(planJson);
 
 			// Return plan data
 			Map<String, Object> response = new HashMap<>();
@@ -288,32 +288,71 @@ private ResponseEntity<Map<String, Object>> executePlanByTemplateIdInternal(Stri
 
 	/**
 	 * Save version history
-	 * @param planId Plan ID
 	 * @param planJson Plan JSON data
 	 * @return Save result
 	 */
-	private PlanTemplateService.VersionSaveResult saveToVersionHistory(String planId, String planJson) {
-		// Extract title from JSON
-		String title = planTemplateService.extractTitleFromPlan(planJson);
+	private PlanTemplateService.VersionSaveResult saveToVersionHistory(String planJson) {
+		try {
+			// Parse JSON to extract planTemplateId and title
+			ObjectMapper mapper = new ObjectMapper();
+			PlanInterface planData = mapper.readValue(planJson, PlanInterface.class);
 
-		// Check if the plan exists
-		PlanTemplate template = planTemplateService.getPlanTemplate(planId);
-		if (template == null) {
-			// If it doesn't exist, create a new plan
-			planTemplateService.savePlanTemplate(planId, title, "User request to generate plan: " + planId, planJson);
-			logger.info("New plan created: {}", planId);
-			return new PlanTemplateService.VersionSaveResult(true, false, "New plan created", 0);
-		}
-		else {
-			// If it exists, save a new version
-			PlanTemplateService.VersionSaveResult result = planTemplateService.saveToVersionHistory(planId, planJson);
-			if (result.isSaved()) {
-				logger.info("New version of plan {} saved", planId, result.getVersionIndex());
+			String planTemplateId = planData.getRootPlanId();
+			if (planTemplateId == null || planTemplateId.trim().isEmpty()) {
+				planTemplateId = planData.getCurrentPlanId();
+			}
+
+			// Check if planTemplateId is empty or starts with "new-", then generate a new
+			// one
+			if (planTemplateId == null || planTemplateId.trim().isEmpty() || planTemplateId.startsWith("new-")) {
+				String newPlanTemplateId = planIdDispatcher.generatePlanTemplateId();
+				logger.info(
+						"Original planTemplateId '{}' is empty or starts with 'new-', generated new planTemplateId: {}",
+						planTemplateId, newPlanTemplateId);
+
+				// Update the plan object with new ID
+				planData.setCurrentPlanId(newPlanTemplateId);
+				planData.setRootPlanId(newPlanTemplateId);
+
+				// Re-serialize the updated plan object to JSON
+				planJson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(planData);
+				planTemplateId = newPlanTemplateId;
+			}
+
+			String title = planData.getTitle();
+
+			if (planTemplateId == null || planTemplateId.trim().isEmpty()) {
+				throw new IllegalArgumentException("Plan ID cannot be found in JSON");
+			}
+			if (title == null || title.trim().isEmpty()) {
+				title = "Untitled Plan";
+			}
+
+			// Check if the plan exists
+			PlanTemplate template = planTemplateService.getPlanTemplate(planTemplateId);
+			if (template == null) {
+				// If it doesn't exist, create a new plan
+				planTemplateService.savePlanTemplate(planTemplateId, title,
+						"User request to generate plan: " + planTemplateId, planJson);
+				logger.info("New plan created: {}", planTemplateId);
+				return new PlanTemplateService.VersionSaveResult(true, false, "New plan created", 0);
 			}
 			else {
-				logger.info("Plan {} is the same, no new version saved", planId);
+				// If it exists, save a new version
+				PlanTemplateService.VersionSaveResult result = planTemplateService.saveToVersionHistory(planTemplateId,
+						planJson);
+				if (result.isSaved()) {
+					logger.info("New version of plan {} saved", planTemplateId, result.getVersionIndex());
+				}
+				else {
+					logger.info("Plan {} is the same, no new version saved", planTemplateId);
+				}
+				return result;
 			}
-			return result;
+		}
+		catch (Exception e) {
+			logger.error("Failed to parse plan JSON", e);
+			throw new RuntimeException("Failed to save version history: " + e.getMessage());
 		}
 	}
 
@@ -324,20 +363,42 @@ private PlanTemplateService.VersionSaveResult saveToVersionHistory(String planId
 	 */
 	@PostMapping("/save")
 	public ResponseEntity<Map<String, Object>> savePlan(@RequestBody Map<String, String> request) {
-		String planId = request.get("planId");
 		String planJson = request.get("planJson");
 
-		if (planId == null || planId.trim().isEmpty()) {
-			return ResponseEntity.badRequest().body(Map.of("error", "Plan ID cannot be empty"));
-		}
-
 		if (planJson == null || planJson.trim().isEmpty()) {
 			return ResponseEntity.badRequest().body(Map.of("error", "Plan data cannot be empty"));
 		}
 
 		try {
+			// Parse JSON to get planId
+			ObjectMapper mapper = new ObjectMapper();
+			PlanInterface planData = mapper.readValue(planJson, PlanInterface.class);
+			String planId = planData.getCurrentPlanId();
+			if (planId == null) {
+				planId = planData.getRootPlanId();
+			}
+
+			// Check if planId is empty or starts with "new-", then generate a new one
+			if (planId == null || planId.trim().isEmpty() || planId.startsWith("new-")) {
+				String newPlanId = planIdDispatcher.generatePlanTemplateId();
+				logger.info("Original planId '{}' is empty or starts with 'new-', generated new planId: {}", planId,
+						newPlanId);
+
+				// Update the plan object with new ID
+				planData.setCurrentPlanId(newPlanId);
+				planData.setRootPlanId(newPlanId);
+
+				// Re-serialize the updated plan object to JSON
+				planJson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(planData);
+				planId = newPlanId;
+			}
+
+			if (planId == null || planId.trim().isEmpty()) {
+				return ResponseEntity.badRequest().body(Map.of("error", "Plan ID cannot be found in JSON"));
+			}
+
 			// Save to version history
-			PlanTemplateService.VersionSaveResult saveResult = saveToVersionHistory(planId, planJson);
+			PlanTemplateService.VersionSaveResult saveResult = saveToVersionHistory(planJson);
 
 			// Calculate version count
 			List<String> versions = planTemplateService.getPlanVersions(planId);
@@ -543,7 +604,7 @@ public ResponseEntity<Map<String, Object>> updatePlanTemplate(@RequestBody Map<S
 			}
 
 			// Save to version history
-			PlanTemplateService.VersionSaveResult saveResult = saveToVersionHistory(planId, planJson);
+			PlanTemplateService.VersionSaveResult saveResult = saveToVersionHistory(planJson);
 
 			// Return plan data
 			Map<String, Object> response = new HashMap<>();

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/planning/model/po/PlanTemplate.java

@@ -19,6 +19,8 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
@@ -31,7 +33,11 @@
 public class PlanTemplate {
 
 	@Id
-	@Column(name = "plan_template_id", length = 50)
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "id")
+	private Long id;
+
+	@Column(name = "plan_template_id", length = 50, unique = true, nullable = false)
 	private String planTemplateId;
 
 	@Column(name = "title", length = 255)
@@ -59,6 +65,14 @@ public PlanTemplate(String planTemplateId, String title, String userRequest) {
 	}
 
 	// Getters and setters
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
 	public String getPlanTemplateId() {
 		return planTemplateId;
 	}

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/planning/model/vo/AbstractExecutionPlan.java

@@ -91,7 +91,6 @@ public void setPlanId(String planId) {
 		this.rootPlanId = planId;
 	}
 
-	@JsonIgnore
 	public String getPlanId() {
 		return rootPlanId;
 	}

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/planning/model/vo/PlanInterface.java

@@ -162,6 +162,10 @@ public interface PlanInterface {
 	 */
 	String getPlanExecutionStateStringFormat(boolean onlyCompletedAndFirstInProgress);
 
+	public void setPlanId(String planId);
+
+	public String getPlanId();
+
 	/**
 	 * 更新所有步骤的索引，从0开始递增。 Update the indices of all steps, starting from 0.
 	 */

spring-ai-alibaba-jmanus/src/main/java/com/alibaba/cloud/ai/example/manus/tool/PlanningTool.java

@@ -48,6 +48,8 @@ public static class PlanningInput {
 
 		private List<String> steps;
 
+		private String terminateColumns;
+
 		public PlanningInput() {
 		}
 
@@ -56,6 +58,7 @@ public PlanningInput(String command, String planId, String title, List<String> s
 			this.planId = planId;
 			this.title = title;
 			this.steps = steps;
+			this.terminateColumns = null;
 		}
 
 		public String getCommand() {
@@ -90,6 +93,14 @@ public void setSteps(List<String> steps) {
 			this.steps = steps;
 		}
 
+		public String getTerminateColumns() {
+			return terminateColumns;
+		}
+
+		public void setTerminateColumns(String terminateColumns) {
+			this.terminateColumns = terminateColumns;
+		}
+
 	}
 
 	public String getCurrentPlanId() {
@@ -122,6 +133,11 @@ public ExecutionPlan getCurrentPlan() {
 			                "type": "string"
 			            }
 			        }
+			        ,
+					"terminateColumns": {
+						"description": "Terminate structure output columns for all steps (optional, will be applied to every step)",
+						"type": "string"
+					}
 			    },
 			    "required": [
 			    	"command",
@@ -158,7 +174,7 @@ public ToolExecuteResult run(PlanningInput input) {
 		List<String> steps = input.getSteps();
 
 		return switch (command) {
-			case "create" -> createPlan(planId, title, steps);
+			case "create" -> createPlan(planId, title, steps, input.getTerminateColumns());
 			// case "update" -> updatePlan(planId, title, steps);
 			// case "get" -> getPlan(planId);
 			// case "mark_step" -> markStep(planId, stepIndex, stepStatus, stepNotes);
@@ -182,18 +198,23 @@ private ExecutionStep createExecutionStep(String step, int index) {
 		return executionStep;
 	}
 
-	public ToolExecuteResult createPlan(String planId, String title, List<String> steps) {
+	public ToolExecuteResult createPlan(String planId, String title, List<String> steps, String terminateColumns) {
 		if (title == null || steps == null || steps.isEmpty()) {
 			log.info("Missing required parameters when creating plan: planId={}, title={}, steps={}", planId, title,
 					steps);
 			return new ToolExecuteResult("Required parameters missing");
 		}
 
 		ExecutionPlan plan = new ExecutionPlan(planId, planId, title);
-		// Use the new createExecutionStep method to create and add steps
+
 		int index = 0;
 		for (String step : steps) {
-			plan.addStep(createExecutionStep(step, index++));
+			ExecutionStep execStep = createExecutionStep(step, index);
+			if (terminateColumns != null && !terminateColumns.isEmpty()) {
+				execStep.setTerminateColumns(terminateColumns);
+			}
+			plan.addStep(execStep);
+			index++;
 		}
 
 		this.currentPlan = plan;

spring-ai-alibaba-jmanus/src/main/resources/application-h2.yml

@@ -6,7 +6,7 @@ spring:
     password: $FSD#@!@#!#$!12341234
   h2:
     console:
-      enabled: false
+      enabled: true
       path: /h2-console
       settings:
         web-allow-others: true