From c5bfbd3ca38ab6dd0932bed49552126db63fd720 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 07:56:45 +0800 Subject: [PATCH] feat: add AI feature package revisions --- README.md | 1 + docs/AI_AGENT_AUTO_DEVELOPMENT.md | 29 +++++++ docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md | 21 ++++- docs/skills/eip4-release-manage.md | 28 ++++++- docs/sql/SYS_AI_AGENT.sql | 29 +++++++ .../platform/ai/model/AiFeaturePackage.java | 13 +++ .../eip4/platform/ai/model/AiRevision.java | 13 +++ .../platform/ai/service/AiAgentService.java | 84 ++++++++++++++++++- .../eip4/platform/ai/store/AiAgentStore.java | 10 +++ .../ai/store/InMemoryAiAgentStore.java | 27 ++++++ .../platform/ai/store/JdbcAiAgentStore.java | 83 ++++++++++++++++++ .../platform/ai/web/AiAgentController.java | 31 +++++++ .../bootstrap/bootstrap-ai-agent.sql | 24 ++++++ .../ai/service/AiAgentServiceTest.java | 13 +++ .../platform/ai/store/AiAgentDdlTest.java | 4 + .../ai/store/InMemoryAiAgentStoreTest.java | 16 ++++ .../ai/store/JdbcAiAgentStoreTest.java | 40 +++++++++ .../bootstrap/bootstrap-ai-agent.sql | 24 ++++++ .../java/com/eip4/platform/cli/Eip4Cli.java | 75 +++++++++++++++-- .../com/eip4/platform/cli/Eip4CliTest.java | 46 ++++++++++ 20 files changed, 597 insertions(+), 14 deletions(-) create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeaturePackage.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiRevision.java diff --git a/README.md b/README.md index aa4b8e4..3cf91b8 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,7 @@ mvn -pl platform-parity exec:java -Dexec.mainClass="com.eip4.platform.parity.sel # EIP4 Agent CLI mvn -pl platform-cli package java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar env status --base-url http://localhost:8084 +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai feature-package --task-id ait-xxx --change-set-id aics-xxx --output target/ai-runs/package.json ``` ## tools/ diff --git a/docs/AI_AGENT_AUTO_DEVELOPMENT.md b/docs/AI_AGENT_AUTO_DEVELOPMENT.md index 4fa8717..f7690af 100644 --- a/docs/AI_AGENT_AUTO_DEVELOPMENT.md +++ b/docs/AI_AGENT_AUTO_DEVELOPMENT.md @@ -55,6 +55,23 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai auto-develop \ --output target/ai-runs/customer-level.json ``` +本地门禁通过后,可以把最终变更包封装成功能包快照,并保存一个里程碑 revision: + +```bash +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai feature-package \ + --base-url http://localhost:8093 \ + --task-id ait-xxx \ + --change-set-id aics-xxx \ + --output target/ai-runs/customer-level-package.json + +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai revision \ + --base-url http://localhost:8093 \ + --task-id ait-xxx \ + --package-id aipkg-xxx \ + --note "本地门禁通过,待人工部署" \ + --output target/ai-runs/customer-level-revision.json +``` + 底层 REST API 仍可直接调用: ```bash @@ -93,6 +110,7 @@ curl -X POST http://localhost:8093/api/ai/features/auto-develop \ 7. 本地 smoke:只允许 `localhost`、`127.0.0.1`、`::1` baseUrl;HTTP 状态必须匹配,且 JSON 响应体存在 `status` 时必须为 0。 8. 若失败,自动生成 repair plan 并执行修复重试。 9. 生成线上人工部署包,包含 manifest、SQL 草案、回滚 SQL 和本地执行证据。 +10. 可选:生成功能包快照并保存 revision,用于后续导出、差异比较和回滚扩展。 返回体中的关键字段: @@ -101,6 +119,17 @@ curl -X POST http://localhost:8093/api/ai/features/auto-develop \ - `repairExecutions`: 每轮自动修复证据。 - `deploymentPackage.requiresHumanApproval`: 固定为 `true`,线上发布必须人工审批。 +## 功能包和 revision + +P2 第一版新增功能包快照和里程碑版本: + +- `POST /api/ai/tasks/{taskId}/change-sets/{changeSetId}/feature-package` +- `GET /api/ai/tasks/{taskId}/feature-packages` +- `POST /api/ai/tasks/{taskId}/feature-packages/{packageId}/revisions` +- `GET /api/ai/tasks/{taskId}/revisions` + +功能包封装部署包、manifest、本地 evidence、SQL 草案和回滚 SQL。revision 当前保存功能包 JSON 快照,作为后续差异比较和回滚执行的基础。生产执行仍不自动化,必须人审。 + ## LLM 修复 默认使用确定性修复规则。需要外部 LLM 参与时设置: diff --git a/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md index 40f1776..909fc17 100644 --- a/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md +++ b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md @@ -74,6 +74,8 @@ EIP4 当前已经有实体、页面 schema、服务流、菜单、smoke、部署 ### P2:FeaturePackage 和里程碑版本 +状态:第一版完成。 + 目标: - 把 AI 生成结果从松散的 draft/change-set 升级为稳定的 `FeaturePackage`。 @@ -90,6 +92,23 @@ EIP4 当前已经有实体、页面 schema、服务流、菜单、smoke、部署 - 一个功能包可以导出、导入、重复校验 - 每个通过 smoke 的里程碑都能追溯输入、输出、测试证据和回滚脚本 +第一版已落地: + +- `POST /api/ai/tasks/{taskId}/change-sets/{changeSetId}/feature-package` +- `GET /api/ai/tasks/{taskId}/feature-packages` +- `POST /api/ai/tasks/{taskId}/feature-packages/{packageId}/revisions` +- `GET /api/ai/tasks/{taskId}/revisions` +- `eip4 ai feature-package` +- `eip4 ai revision` +- `sys_ai_feature_package` +- `sys_ai_revision` + +未完成项: + +- 功能包导出/导入文件格式 +- revision 差异比较 +- 回滚执行编排 + ### P3:发布、回滚和环境治理 目标: @@ -161,7 +180,7 @@ EIP4 应该借鉴的是边界和流程: |---|---|---| | P0 | 完成 | `platform-ai` 主链路已提交 | | P1 | 第一版完成 | 已新增 `platform-cli` 和 Skills 规范骨架 | -| P2 | 待开始 | 依赖 P1 的 CLI 和规范稳定 | +| P2 | 第一版完成 | 已新增功能包快照、里程碑 revision、CLI 命令和持久化表 | | P3 | 待开始 | 依赖 P2 的功能包和版本模型 | | P4 | 待开始 | 依赖页面 schema 现状清理 | | P5 | 待开始 | 依赖权限、审计、工具白名单成熟 | diff --git a/docs/skills/eip4-release-manage.md b/docs/skills/eip4-release-manage.md index 98e4f11..17b389b 100644 --- a/docs/skills/eip4-release-manage.md +++ b/docs/skills/eip4-release-manage.md @@ -13,15 +13,36 @@ ## 发布前检查 1. 确认本地 auto-develop 已通过。 -2. 确认部署包包含: +2. 使用 CLI 生成 AI 功能包快照: + +```bash +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai feature-package \ + --base-url http://localhost:8084 \ + --task-id ait-xxx \ + --change-set-id aics-xxx \ + --output target/ai-runs/feature-package.json +``` + +3. 保存里程碑 revision: + +```bash +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai revision \ + --base-url http://localhost:8084 \ + --task-id ait-xxx \ + --package-id aipkg-xxx \ + --note "本地门禁通过,待人工部署" \ + --output target/ai-runs/revision.json +``` + +4. 确认部署包包含: - manifest - SQL 草案 - rollback SQL - 本地 apply evidence - smoke evidence - repair evidence -3. 确认部署包需要人工审批。 -4. 如果包含 `${parentMenuId}` 等占位符,必须人工替换并复核。 +5. 确认部署包需要人工审批。 +6. 如果包含 `${parentMenuId}` 等占位符,必须人工替换并复核。 ## 线上 bug 修复路径 @@ -36,4 +57,3 @@ - 不让 Agent 默认直接写线上数据库。 - 不绕过部署包和人审。 - 不把 smoke 失败的变更包交给发布流程。 - diff --git a/docs/sql/SYS_AI_AGENT.sql b/docs/sql/SYS_AI_AGENT.sql index 153ad89..8ba1ca3 100644 --- a/docs/sql/SYS_AI_AGENT.sql +++ b/docs/sql/SYS_AI_AGENT.sql @@ -57,6 +57,28 @@ CREATE TABLE IF NOT EXISTS sys_ai_run ( CONSTRAINT pk_sys_ai_run PRIMARY KEY (run_id) ); +CREATE TABLE IF NOT EXISTS sys_ai_feature_package ( + package_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + change_set_id character varying(64) NOT NULL, + status character varying(32) NOT NULL, + manifest_json jsonb NOT NULL, + deployment_package_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_feature_package PRIMARY KEY (package_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_revision ( + revision_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + package_id character varying(64) NOT NULL, + status character varying(32) NOT NULL, + note text NOT NULL, + snapshot_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_revision PRIMARY KEY (revision_id) +); + CREATE TABLE IF NOT EXISTS sys_ai_audit_log ( audit_id character varying(64) NOT NULL, task_id character varying(64) NOT NULL, @@ -71,12 +93,16 @@ CREATE INDEX IF NOT EXISTS idx_sys_ai_draft_task ON sys_ai_draft (task_id, creat CREATE INDEX IF NOT EXISTS idx_sys_ai_change_set_task ON sys_ai_change_set (task_id, created_at); CREATE INDEX IF NOT EXISTS idx_sys_ai_run_task ON sys_ai_run (task_id, created_at); CREATE INDEX IF NOT EXISTS idx_sys_ai_run_change_set ON sys_ai_run (change_set_id, created_at); +CREATE INDEX IF NOT EXISTS idx_sys_ai_feature_package_task ON sys_ai_feature_package (task_id, created_at); +CREATE INDEX IF NOT EXISTS idx_sys_ai_revision_task ON sys_ai_revision (task_id, created_at); CREATE INDEX IF NOT EXISTS idx_sys_ai_audit_log_task ON sys_ai_audit_log (task_id, created_at); COMMENT ON TABLE sys_ai_task IS 'AI Agent 开发任务。只描述需求、状态和计划,不代表已发布功能'; COMMENT ON TABLE sys_ai_draft IS 'AI Agent 草稿产物。payload_json 保存实体/页面/服务流/代码等草稿'; COMMENT ON TABLE sys_ai_change_set IS 'AI Agent 待人审变更包。通过门禁后供人工确认和发布'; COMMENT ON TABLE sys_ai_run IS 'AI Agent 本地执行证据。保存 smoke/local-apply 的结构化结果'; +COMMENT ON TABLE sys_ai_feature_package IS 'AI Agent 功能包快照。封装部署包、manifest 和本地证据,用于人审/导出/版本里程碑'; +COMMENT ON TABLE sys_ai_revision IS 'AI Agent 里程碑版本。保存功能包快照,后续用于差异比较和回滚'; COMMENT ON TABLE sys_ai_audit_log IS 'AI Agent 操作审计日志'; COMMENT ON COLUMN sys_ai_task.task_id IS 'Agent 任务 id'; @@ -97,4 +123,7 @@ COMMENT ON COLUMN sys_ai_change_set.summary_json IS '变更摘要、风险、人 COMMENT ON COLUMN sys_ai_run.run_type IS '执行类型:SMOKE / LOCAL_APPLY / AUTO_DEVELOP / REPAIR_PLAN / REPAIR_EXECUTION'; COMMENT ON COLUMN sys_ai_run.status IS '执行状态:PASSED / FAILED / APPLY_FAILED / SMOKE_FAILED 等'; COMMENT ON COLUMN sys_ai_run.payload_json IS '执行结果 JSON,包含逐条 smoke 或 apply step 详情'; +COMMENT ON COLUMN sys_ai_feature_package.manifest_json IS '功能包 manifest,包含包 id、变更包 id、证据数量和发布边界'; +COMMENT ON COLUMN sys_ai_feature_package.deployment_package_json IS '部署包完整 JSON 快照'; +COMMENT ON COLUMN sys_ai_revision.snapshot_json IS '里程碑快照 JSON,当前保存 AiFeaturePackage'; COMMENT ON COLUMN sys_ai_audit_log.details_json IS '操作详情 JSON'; diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeaturePackage.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeaturePackage.java new file mode 100644 index 0000000..c837dee --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeaturePackage.java @@ -0,0 +1,13 @@ +package com.eip4.platform.ai.model; + +import java.util.Map; + +public record AiFeaturePackage( + String id, + String taskId, + String changeSetId, + String status, + long createdAt, + Map manifest, + AiDeploymentPackage deploymentPackage) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRevision.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRevision.java new file mode 100644 index 0000000..f79c3a0 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRevision.java @@ -0,0 +1,13 @@ +package com.eip4.platform.ai.model; + +import com.fasterxml.jackson.databind.JsonNode; + +public record AiRevision( + String id, + String taskId, + String packageId, + String status, + String note, + long createdAt, + JsonNode snapshot) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentService.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentService.java index ec7adcb..492810e 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentService.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentService.java @@ -36,6 +36,7 @@ import com.eip4.platform.ai.model.AiDeploymentPackage; import com.eip4.platform.ai.model.AiDraft; import com.eip4.platform.ai.model.AiFeatureDevelopment; import com.eip4.platform.ai.model.AiFeatureRequest; +import com.eip4.platform.ai.model.AiFeaturePackage; import com.eip4.platform.ai.model.AiGateResult; import com.eip4.platform.ai.model.AiGeneratedDraft; import com.eip4.platform.ai.model.AiReleasePlan; @@ -44,6 +45,7 @@ import com.eip4.platform.ai.model.AiRepairAction; import com.eip4.platform.ai.model.AiRepairDraftPatch; import com.eip4.platform.ai.model.AiRepairExecution; import com.eip4.platform.ai.model.AiRepairPlan; +import com.eip4.platform.ai.model.AiRevision; import com.eip4.platform.ai.model.AiRunRecord; import com.eip4.platform.ai.model.AiSmokeResult; import com.eip4.platform.ai.model.AiSmokeRun; @@ -74,6 +76,7 @@ public class AiAgentService { private final AiAgentRepairExecutor agentRepairExecutor; private final ObjectMapper objectMapper; + private static volatile SchemaGate sharedSchemaGate; private volatile SchemaGate schemaGate; public AiAgentService(AiAgentStore store, AiFeatureDraftGenerator featureDraftGenerator, @@ -471,6 +474,64 @@ public class AiAgentService { return deploymentPackage; } + public AiFeaturePackage createFeaturePackage(String taskId, String changeSetId) { + getTask(taskId); + AiDeploymentPackage deploymentPackage = createDeploymentPackage(taskId, changeSetId); + long createdAt = System.currentTimeMillis(); + String id = "aipkg-" + UUID.randomUUID(); + AiFeaturePackage featurePackage = new AiFeaturePackage( + id, + taskId, + changeSetId, + deploymentPackage.status(), + createdAt, + featurePackageManifest(id, deploymentPackage, createdAt), + deploymentPackage); + store.saveFeaturePackage(featurePackage); + saveRun(taskId, changeSetId, "FEATURE_PACKAGE", featurePackage.status(), featurePackage); + audit(taskId, "feature-package.created", "agent", Map.of( + "packageId", featurePackage.id(), + "changeSetId", changeSetId, + "status", featurePackage.status())); + return featurePackage; + } + + public List listFeaturePackages(String taskId) { + getTask(taskId); + return store.listFeaturePackages(taskId); + } + + public AiRevision createRevision(String taskId, String packageId, String note) { + getTask(taskId); + AiFeaturePackage featurePackage = store.listFeaturePackages(taskId).stream() + .filter(pkg -> pkg.id().equals(packageId)) + .findFirst() + .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, + "AI 功能包不存在: " + packageId)); + String status = "READY_FOR_HUMAN_REVIEW".equals(featurePackage.status()) + ? "RESTORABLE" : "SNAPSHOT_ONLY"; + AiRevision revision = new AiRevision( + "airev-" + UUID.randomUUID(), + taskId, + packageId, + status, + note == null ? "" : note.trim(), + System.currentTimeMillis(), + objectMapper.valueToTree(featurePackage)); + store.saveRevision(revision); + saveRun(taskId, featurePackage.changeSetId(), "REVISION", revision.status(), revision); + audit(taskId, "revision.created", "agent", Map.of( + "revisionId", revision.id(), + "packageId", packageId, + "status", revision.status())); + return revision; + } + + public List listRevisions(String taskId) { + getTask(taskId); + return store.listRevisions(taskId); + } + public AiRepairPlan createRepairPlan(String taskId, String changeSetId) { getTask(taskId); findChangeSet(taskId, changeSetId); @@ -778,10 +839,11 @@ public class AiAgentService { private SchemaGate getSchemaGate() { if (schemaGate == null) { - synchronized (this) { - if (schemaGate == null) { - schemaGate = new SchemaGate(); + synchronized (AiAgentService.class) { + if (sharedSchemaGate == null) { + sharedSchemaGate = new SchemaGate(); } + schemaGate = sharedSchemaGate; } } return schemaGate; @@ -1194,6 +1256,22 @@ public class AiAgentService { return Map.copyOf(manifest); } + private Map featurePackageManifest(String packageId, AiDeploymentPackage deploymentPackage, + long createdAt) { + Map manifest = new LinkedHashMap<>(deploymentPackage.manifest()); + manifest.put("packageId", packageId); + manifest.put("packageType", "EIP4_AI_FEATURE_PACKAGE"); + manifest.put("packageVersion", 1); + manifest.put("createdAt", createdAt); + manifest.put("status", deploymentPackage.status()); + manifest.put("requiresHumanApproval", deploymentPackage.requiresHumanApproval()); + manifest.put("runEvidenceCount", deploymentPackage.runEvidence().size()); + manifest.put("sqlStatementCount", deploymentPackage.sqlStatements().size()); + manifest.put("rollbackStatementCount", deploymentPackage.rollbackSqlStatements().size()); + manifest.put("revisionPolicy", "save milestone after local gate passes; production still requires human approval"); + return Map.copyOf(manifest); + } + private Map runSummary(AiRunRecord run) { Map summary = new LinkedHashMap<>(); summary.put("runId", run.id()); diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/store/AiAgentStore.java b/platform-ai/src/main/java/com/eip4/platform/ai/store/AiAgentStore.java index 3bdb1fc..8ee7183 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/store/AiAgentStore.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/store/AiAgentStore.java @@ -6,6 +6,8 @@ import java.util.Optional; import com.eip4.platform.ai.model.AiAuditEntry; import com.eip4.platform.ai.model.AiChangeSet; import com.eip4.platform.ai.model.AiDraft; +import com.eip4.platform.ai.model.AiFeaturePackage; +import com.eip4.platform.ai.model.AiRevision; import com.eip4.platform.ai.model.AiRunRecord; import com.eip4.platform.ai.model.AiTask; @@ -27,6 +29,14 @@ public interface AiAgentStore { List listRuns(String taskId); + void saveFeaturePackage(AiFeaturePackage featurePackage); + + List listFeaturePackages(String taskId); + + void saveRevision(AiRevision revision); + + List listRevisions(String taskId); + void saveAudit(AiAuditEntry entry); List listAudit(String taskId); diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/store/InMemoryAiAgentStore.java b/platform-ai/src/main/java/com/eip4/platform/ai/store/InMemoryAiAgentStore.java index 9d1b166..55bbca8 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/store/InMemoryAiAgentStore.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/store/InMemoryAiAgentStore.java @@ -12,6 +12,8 @@ import org.springframework.stereotype.Component; import com.eip4.platform.ai.model.AiAuditEntry; import com.eip4.platform.ai.model.AiChangeSet; import com.eip4.platform.ai.model.AiDraft; +import com.eip4.platform.ai.model.AiFeaturePackage; +import com.eip4.platform.ai.model.AiRevision; import com.eip4.platform.ai.model.AiRunRecord; import com.eip4.platform.ai.model.AiTask; @@ -24,6 +26,8 @@ public class InMemoryAiAgentStore implements AiAgentStore { private final Map> auditByTask = new ConcurrentHashMap<>(); private final Map> changeSetsByTask = new ConcurrentHashMap<>(); private final Map> runsByTask = new ConcurrentHashMap<>(); + private final Map> featurePackagesByTask = new ConcurrentHashMap<>(); + private final Map> revisionsByTask = new ConcurrentHashMap<>(); @Override public void saveTask(AiTask task) { @@ -32,6 +36,8 @@ public class InMemoryAiAgentStore implements AiAgentStore { auditByTask.computeIfAbsent(task.id(), ignored -> new CopyOnWriteArrayList<>()); changeSetsByTask.computeIfAbsent(task.id(), ignored -> new CopyOnWriteArrayList<>()); runsByTask.computeIfAbsent(task.id(), ignored -> new CopyOnWriteArrayList<>()); + featurePackagesByTask.computeIfAbsent(task.id(), ignored -> new CopyOnWriteArrayList<>()); + revisionsByTask.computeIfAbsent(task.id(), ignored -> new CopyOnWriteArrayList<>()); } @Override @@ -69,6 +75,27 @@ public class InMemoryAiAgentStore implements AiAgentStore { return List.copyOf(runsByTask.getOrDefault(taskId, List.of())); } + @Override + public void saveFeaturePackage(AiFeaturePackage featurePackage) { + featurePackagesByTask.computeIfAbsent(featurePackage.taskId(), ignored -> new CopyOnWriteArrayList<>()) + .add(featurePackage); + } + + @Override + public List listFeaturePackages(String taskId) { + return List.copyOf(featurePackagesByTask.getOrDefault(taskId, List.of())); + } + + @Override + public void saveRevision(AiRevision revision) { + revisionsByTask.computeIfAbsent(revision.taskId(), ignored -> new CopyOnWriteArrayList<>()).add(revision); + } + + @Override + public List listRevisions(String taskId) { + return List.copyOf(revisionsByTask.getOrDefault(taskId, List.of())); + } + @Override public void saveAudit(AiAuditEntry entry) { auditByTask.computeIfAbsent(entry.taskId(), ignored -> new CopyOnWriteArrayList<>()).add(entry); diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/store/JdbcAiAgentStore.java b/platform-ai/src/main/java/com/eip4/platform/ai/store/JdbcAiAgentStore.java index 413f3a7..eec9841 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/store/JdbcAiAgentStore.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/store/JdbcAiAgentStore.java @@ -14,8 +14,11 @@ import org.springframework.stereotype.Component; import com.eip4.platform.ai.model.AiArtifactType; import com.eip4.platform.ai.model.AiAuditEntry; import com.eip4.platform.ai.model.AiChangeSet; +import com.eip4.platform.ai.model.AiDeploymentPackage; import com.eip4.platform.ai.model.AiDraft; +import com.eip4.platform.ai.model.AiFeaturePackage; import com.eip4.platform.ai.model.AiGateResult; +import com.eip4.platform.ai.model.AiRevision; import com.eip4.platform.ai.model.AiRunRecord; import com.eip4.platform.ai.model.AiTask; import com.fasterxml.jackson.core.JsonProcessingException; @@ -143,6 +146,56 @@ public class JdbcAiAgentStore implements AiAgentStore { """, runMapper(), taskId); } + @Override + public void saveFeaturePackage(AiFeaturePackage featurePackage) { + jdbcTemplate.update(""" + INSERT INTO sys_ai_feature_package + (package_id, task_id, change_set_id, status, manifest_json, deployment_package_json, created_at) + VALUES (?, ?, ?, ?, ?::jsonb, ?::jsonb, ?) + ON CONFLICT (package_id) DO UPDATE SET + status = EXCLUDED.status, + manifest_json = EXCLUDED.manifest_json, + deployment_package_json = EXCLUDED.deployment_package_json + """, + featurePackage.id(), featurePackage.taskId(), featurePackage.changeSetId(), featurePackage.status(), + json(featurePackage.manifest()), json(featurePackage.deploymentPackage()), featurePackage.createdAt()); + } + + @Override + public List listFeaturePackages(String taskId) { + return jdbcTemplate.query(""" + SELECT package_id, task_id, change_set_id, status, manifest_json, deployment_package_json, created_at + FROM sys_ai_feature_package + WHERE task_id = ? + ORDER BY created_at ASC, package_id ASC + """, featurePackageMapper(), taskId); + } + + @Override + public void saveRevision(AiRevision revision) { + jdbcTemplate.update(""" + INSERT INTO sys_ai_revision + (revision_id, task_id, package_id, status, note, snapshot_json, created_at) + VALUES (?, ?, ?, ?, ?, ?::jsonb, ?) + ON CONFLICT (revision_id) DO UPDATE SET + status = EXCLUDED.status, + note = EXCLUDED.note, + snapshot_json = EXCLUDED.snapshot_json + """, + revision.id(), revision.taskId(), revision.packageId(), revision.status(), revision.note(), + json(revision.snapshot()), revision.createdAt()); + } + + @Override + public List listRevisions(String taskId) { + return jdbcTemplate.query(""" + SELECT revision_id, task_id, package_id, status, note, snapshot_json, created_at + FROM sys_ai_revision + WHERE task_id = ? + ORDER BY created_at ASC, revision_id ASC + """, revisionMapper(), taskId); + } + @Override public void saveAudit(AiAuditEntry entry) { jdbcTemplate.update(""" @@ -220,6 +273,28 @@ public class JdbcAiAgentStore implements AiAgentStore { readTree(jsonText(rs, "payload_json"))); } + private RowMapper featurePackageMapper() { + return (rs, rowNum) -> new AiFeaturePackage( + rs.getString("package_id"), + rs.getString("task_id"), + rs.getString("change_set_id"), + rs.getString("status"), + rs.getLong("created_at"), + read(jsonText(rs, "manifest_json"), OBJECT_MAP), + read(jsonText(rs, "deployment_package_json"), AiDeploymentPackage.class)); + } + + private RowMapper revisionMapper() { + return (rs, rowNum) -> new AiRevision( + rs.getString("revision_id"), + rs.getString("task_id"), + rs.getString("package_id"), + rs.getString("status"), + rs.getString("note"), + rs.getLong("created_at"), + readTree(jsonText(rs, "snapshot_json"))); + } + private String json(Object value) { try { return objectMapper.writeValueAsString(value); @@ -236,6 +311,14 @@ public class JdbcAiAgentStore implements AiAgentStore { } } + private T read(String json, Class type) { + try { + return objectMapper.readValue(json, type); + } catch (JsonProcessingException ex) { + throw new IllegalArgumentException("AI Agent 产物 JSON 反序列化失败", ex); + } + } + private JsonNode readTree(String json) { try { return objectMapper.readTree(json); diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/web/AiAgentController.java b/platform-ai/src/main/java/com/eip4/platform/ai/web/AiAgentController.java index f5316ca..26864e3 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/web/AiAgentController.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/web/AiAgentController.java @@ -18,11 +18,13 @@ import com.eip4.platform.ai.model.AiDeploymentPackage; import com.eip4.platform.ai.model.AiDraft; import com.eip4.platform.ai.model.AiFeatureDevelopment; import com.eip4.platform.ai.model.AiFeatureRequest; +import com.eip4.platform.ai.model.AiFeaturePackage; import com.eip4.platform.ai.model.AiApplyRun; import com.eip4.platform.ai.model.AiReleasePlan; import com.eip4.platform.ai.model.AiRepairExecution; import com.eip4.platform.ai.model.AiRepairExecutionRequest; import com.eip4.platform.ai.model.AiRepairPlan; +import com.eip4.platform.ai.model.AiRevision; import com.eip4.platform.ai.model.AiRunRecord; import com.eip4.platform.ai.model.AiSmokeRun; import com.eip4.platform.ai.model.AiTask; @@ -137,6 +139,32 @@ public class AiAgentController { return service.createDeploymentPackage(taskId, changeSetId); } + @Operation(summary = "生成 AI 功能包快照", description = "封装部署包、manifest、本地 evidence 和回滚 SQL;用于人审、导出和里程碑版本") + @PostMapping("/tasks/{taskId}/change-sets/{changeSetId}/feature-package") + public AiFeaturePackage featurePackage(@PathVariable String taskId, @PathVariable String changeSetId) { + return service.createFeaturePackage(taskId, changeSetId); + } + + @Operation(summary = "列出任务功能包快照") + @GetMapping("/tasks/{taskId}/feature-packages") + public List featurePackages(@PathVariable String taskId) { + return service.listFeaturePackages(taskId); + } + + @Operation(summary = "保存 AI 功能包里程碑", description = "保存功能包快照作为可追溯 revision;后续回滚/差异比较基于该快照扩展") + @PostMapping("/tasks/{taskId}/feature-packages/{packageId}/revisions") + public AiRevision createRevision(@PathVariable String taskId, + @PathVariable String packageId, + @RequestBody(required = false) CreateRevisionRequest req) { + return service.createRevision(taskId, packageId, req == null ? "" : req.note()); + } + + @Operation(summary = "列出任务 AI 里程碑版本") + @GetMapping("/tasks/{taskId}/revisions") + public List revisions(@PathVariable String taskId) { + return service.listRevisions(taskId); + } + @Operation(summary = "生成自动修复计划", description = "读取最近失败的自动开发/本地应用/smoke 证据,输出结构化修复动作并写入 run history") @PostMapping("/tasks/{taskId}/change-sets/{changeSetId}/repair-plan") public AiRepairPlan repairPlan(@PathVariable String taskId, @PathVariable String changeSetId) { @@ -175,4 +203,7 @@ public class AiAgentController { public record SmokeRunRequest(String baseUrl) { } + + public record CreateRevisionRequest(String note) { + } } diff --git a/platform-ai/src/main/resources/bootstrap/bootstrap-ai-agent.sql b/platform-ai/src/main/resources/bootstrap/bootstrap-ai-agent.sql index f4a01a6..ad77b94 100644 --- a/platform-ai/src/main/resources/bootstrap/bootstrap-ai-agent.sql +++ b/platform-ai/src/main/resources/bootstrap/bootstrap-ai-agent.sql @@ -51,6 +51,28 @@ CREATE TABLE IF NOT EXISTS sys_ai_run ( CONSTRAINT pk_sys_ai_run PRIMARY KEY (run_id) ); +CREATE TABLE IF NOT EXISTS sys_ai_feature_package ( + package_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + change_set_id character varying(64) NOT NULL, + status character varying(32) NOT NULL, + manifest_json jsonb NOT NULL, + deployment_package_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_feature_package PRIMARY KEY (package_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_revision ( + revision_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + package_id character varying(64) NOT NULL, + status character varying(32) NOT NULL, + note text NOT NULL, + snapshot_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_revision PRIMARY KEY (revision_id) +); + CREATE TABLE IF NOT EXISTS sys_ai_audit_log ( audit_id character varying(64) NOT NULL, task_id character varying(64) NOT NULL, @@ -65,4 +87,6 @@ CREATE INDEX IF NOT EXISTS idx_sys_ai_draft_task ON sys_ai_draft (task_id, creat CREATE INDEX IF NOT EXISTS idx_sys_ai_change_set_task ON sys_ai_change_set (task_id, created_at); CREATE INDEX IF NOT EXISTS idx_sys_ai_run_task ON sys_ai_run (task_id, created_at); CREATE INDEX IF NOT EXISTS idx_sys_ai_run_change_set ON sys_ai_run (change_set_id, created_at); +CREATE INDEX IF NOT EXISTS idx_sys_ai_feature_package_task ON sys_ai_feature_package (task_id, created_at); +CREATE INDEX IF NOT EXISTS idx_sys_ai_revision_task ON sys_ai_revision (task_id, created_at); CREATE INDEX IF NOT EXISTS idx_sys_ai_audit_log_task ON sys_ai_audit_log (task_id, created_at); diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiAgentServiceTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiAgentServiceTest.java index 53f4fc2..d3fbd91 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiAgentServiceTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiAgentServiceTest.java @@ -117,6 +117,19 @@ class AiAgentServiceTest { assertTrue(deploymentPackage.sqlStatements().stream().anyMatch(sql -> sql.contains("sys_serviceflow"))); assertTrue(deploymentPackage.rollbackSqlStatements().stream().anyMatch(sql -> sql.contains("sys_serviceflow"))); assertTrue(deploymentPackage.warnings().stream().anyMatch(w -> w.contains("parentId"))); + + var featurePackage = service.createFeaturePackage(result.task().id(), result.changeSet().id()); + assertEquals("READY_FOR_HUMAN_REVIEW", featurePackage.status()); + assertEquals(result.changeSet().id(), featurePackage.changeSetId()); + assertEquals("EIP4_AI_FEATURE_PACKAGE", featurePackage.manifest().get("packageType")); + assertEquals(1, service.listFeaturePackages(result.task().id()).size()); + + var revision = service.createRevision(result.task().id(), featurePackage.id(), "本地门禁通过"); + assertEquals("RESTORABLE", revision.status()); + assertEquals(featurePackage.id(), revision.packageId()); + assertEquals("本地门禁通过", revision.note()); + assertEquals(featurePackage.id(), revision.snapshot().path("id").asText()); + assertEquals(1, service.listRevisions(result.task().id()).size()); } @Test diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/store/AiAgentDdlTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/store/AiAgentDdlTest.java index 91d104a..7b22112 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/store/AiAgentDdlTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/store/AiAgentDdlTest.java @@ -21,7 +21,11 @@ class AiAgentDdlTest { assertTrue(ddl.contains("CREATE TABLE IF NOT EXISTS sys_ai_draft")); assertTrue(ddl.contains("CREATE TABLE IF NOT EXISTS sys_ai_change_set")); assertTrue(ddl.contains("CREATE TABLE IF NOT EXISTS sys_ai_run")); + assertTrue(ddl.contains("CREATE TABLE IF NOT EXISTS sys_ai_feature_package")); + assertTrue(ddl.contains("CREATE TABLE IF NOT EXISTS sys_ai_revision")); assertTrue(ddl.contains("CREATE TABLE IF NOT EXISTS sys_ai_audit_log")); assertTrue(ddl.contains("CREATE INDEX IF NOT EXISTS idx_sys_ai_run_task")); + assertTrue(ddl.contains("CREATE INDEX IF NOT EXISTS idx_sys_ai_feature_package_task")); + assertTrue(ddl.contains("CREATE INDEX IF NOT EXISTS idx_sys_ai_revision_task")); } } diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/store/InMemoryAiAgentStoreTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/store/InMemoryAiAgentStoreTest.java index 1cde54c..d334f79 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/store/InMemoryAiAgentStoreTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/store/InMemoryAiAgentStoreTest.java @@ -12,8 +12,11 @@ import org.junit.jupiter.api.Test; import com.eip4.platform.ai.model.AiArtifactType; import com.eip4.platform.ai.model.AiAuditEntry; import com.eip4.platform.ai.model.AiChangeSet; +import com.eip4.platform.ai.model.AiDeploymentPackage; import com.eip4.platform.ai.model.AiDraft; +import com.eip4.platform.ai.model.AiFeaturePackage; import com.eip4.platform.ai.model.AiGateResult; +import com.eip4.platform.ai.model.AiRevision; import com.eip4.platform.ai.model.AiRunRecord; import com.eip4.platform.ai.model.AiTask; import com.fasterxml.jackson.databind.ObjectMapper; @@ -33,20 +36,33 @@ class InMemoryAiAgentStoreTest { List.of(draft.id()), Map.of("draftCount", 1)); AiRunRecord run = new AiRunRecord("air-1", task.id(), changeSet.id(), "SMOKE", "PASSED", 4L, mapper.createObjectNode().put("status", "PASSED")); + AiDeploymentPackage deploymentPackage = new AiDeploymentPackage(task.id(), changeSet.id(), "READY", + true, 5L, Map.of("changeSetId", changeSet.id()), List.of("sql"), List.of("rollback"), + List.of(), List.of(run)); + AiFeaturePackage featurePackage = new AiFeaturePackage("aipkg-1", task.id(), changeSet.id(), "READY", + 6L, Map.of("packageType", "EIP4_AI_FEATURE_PACKAGE"), deploymentPackage); + AiRevision revision = new AiRevision("airev-1", task.id(), featurePackage.id(), "RESTORABLE", + "milestone", 7L, mapper.valueToTree(featurePackage)); AiAuditEntry audit = new AiAuditEntry("aia-1", task.id(), "draft.saved", "agent", 4L, Map.of()); store.saveTask(task); store.saveDraft(draft); store.saveChangeSet(changeSet); store.saveRun(run); + store.saveFeaturePackage(featurePackage); + store.saveRevision(revision); store.saveAudit(audit); assertTrue(store.findTask(task.id()).isPresent()); assertEquals(1, store.listDrafts(task.id()).size()); assertEquals(1, store.listChangeSets(task.id()).size()); assertEquals(1, store.listRuns(task.id()).size()); + assertEquals(1, store.listFeaturePackages(task.id()).size()); + assertEquals(1, store.listRevisions(task.id()).size()); assertEquals(1, store.listAudit(task.id()).size()); assertEquals(List.of(), store.listDrafts("other-task")); assertEquals(List.of(), store.listRuns("other-task")); + assertEquals(List.of(), store.listFeaturePackages("other-task")); + assertEquals(List.of(), store.listRevisions("other-task")); } } diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/store/JdbcAiAgentStoreTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/store/JdbcAiAgentStoreTest.java index 5947ffa..8e7825c 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/store/JdbcAiAgentStoreTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/store/JdbcAiAgentStoreTest.java @@ -17,6 +17,9 @@ import org.mockito.ArgumentCaptor; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; +import com.eip4.platform.ai.model.AiDeploymentPackage; +import com.eip4.platform.ai.model.AiFeaturePackage; +import com.eip4.platform.ai.model.AiRevision; import com.eip4.platform.ai.model.AiRunRecord; import com.eip4.platform.ai.model.AiTask; import com.fasterxml.jackson.databind.ObjectMapper; @@ -118,4 +121,41 @@ class JdbcAiAgentStoreTest { assertEquals("LOCAL_APPLY", run.runType()); assertEquals("PASSED", run.payload().path("status").asText()); } + + @Test + @DisplayName("JDBC 存储写入 feature package 使用 sys_ai_feature_package") + void savesFeaturePackage() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + ObjectMapper mapper = new ObjectMapper(); + JdbcAiAgentStore store = new JdbcAiAgentStore(jdbc, mapper); + AiDeploymentPackage deploymentPackage = new AiDeploymentPackage("ait-1", "aics-1", "READY", + true, 10L, Map.of("changeSetId", "aics-1"), + List.of("sql"), List.of("rollback"), List.of(), List.of()); + + store.saveFeaturePackage(new AiFeaturePackage("aipkg-1", "ait-1", "aics-1", "READY", + 11L, Map.of("packageType", "EIP4_AI_FEATURE_PACKAGE"), deploymentPackage)); + + ArgumentCaptor sql = ArgumentCaptor.forClass(String.class); + verify(jdbc).update(sql.capture(), eq("aipkg-1"), eq("ait-1"), eq("aics-1"), eq("READY"), + eq("{\"packageType\":\"EIP4_AI_FEATURE_PACKAGE\"}"), any(String.class), eq(11L)); + org.junit.jupiter.api.Assertions.assertTrue(sql.getValue().contains("sys_ai_feature_package")); + org.junit.jupiter.api.Assertions.assertTrue(sql.getValue().contains("deployment_package_json")); + } + + @Test + @DisplayName("JDBC 存储写入 revision 使用 sys_ai_revision") + void savesRevision() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + ObjectMapper mapper = new ObjectMapper(); + JdbcAiAgentStore store = new JdbcAiAgentStore(jdbc, mapper); + + store.saveRevision(new AiRevision("airev-1", "ait-1", "aipkg-1", "RESTORABLE", + "milestone", 12L, mapper.createObjectNode().put("id", "aipkg-1"))); + + ArgumentCaptor sql = ArgumentCaptor.forClass(String.class); + verify(jdbc).update(sql.capture(), eq("airev-1"), eq("ait-1"), eq("aipkg-1"), eq("RESTORABLE"), + eq("milestone"), eq("{\"id\":\"aipkg-1\"}"), eq(12L)); + org.junit.jupiter.api.Assertions.assertTrue(sql.getValue().contains("sys_ai_revision")); + org.junit.jupiter.api.Assertions.assertTrue(sql.getValue().contains("snapshot_json")); + } } diff --git a/platform-app/src/main/resources/bootstrap/bootstrap-ai-agent.sql b/platform-app/src/main/resources/bootstrap/bootstrap-ai-agent.sql index 8cfcf1a..27fa1d4 100644 --- a/platform-app/src/main/resources/bootstrap/bootstrap-ai-agent.sql +++ b/platform-app/src/main/resources/bootstrap/bootstrap-ai-agent.sql @@ -51,6 +51,28 @@ CREATE TABLE IF NOT EXISTS sys_ai_run ( CONSTRAINT pk_sys_ai_run PRIMARY KEY (run_id) ); +CREATE TABLE IF NOT EXISTS sys_ai_feature_package ( + package_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + change_set_id character varying(64) NOT NULL, + status character varying(32) NOT NULL, + manifest_json jsonb NOT NULL, + deployment_package_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_feature_package PRIMARY KEY (package_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_revision ( + revision_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + package_id character varying(64) NOT NULL, + status character varying(32) NOT NULL, + note text NOT NULL, + snapshot_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_revision PRIMARY KEY (revision_id) +); + CREATE TABLE IF NOT EXISTS sys_ai_audit_log ( audit_id character varying(64) NOT NULL, task_id character varying(64) NOT NULL, @@ -65,4 +87,6 @@ CREATE INDEX IF NOT EXISTS idx_sys_ai_draft_task ON sys_ai_draft (task_id, creat CREATE INDEX IF NOT EXISTS idx_sys_ai_change_set_task ON sys_ai_change_set (task_id, created_at); CREATE INDEX IF NOT EXISTS idx_sys_ai_run_task ON sys_ai_run (task_id, created_at); CREATE INDEX IF NOT EXISTS idx_sys_ai_run_change_set ON sys_ai_run (change_set_id, created_at); +CREATE INDEX IF NOT EXISTS idx_sys_ai_feature_package_task ON sys_ai_feature_package (task_id, created_at); +CREATE INDEX IF NOT EXISTS idx_sys_ai_revision_task ON sys_ai_revision (task_id, created_at); CREATE INDEX IF NOT EXISTS idx_sys_ai_audit_log_task ON sys_ai_audit_log (task_id, created_at); diff --git a/platform-cli/src/main/java/com/eip4/platform/cli/Eip4Cli.java b/platform-cli/src/main/java/com/eip4/platform/cli/Eip4Cli.java index bf4ca56..0943245 100644 --- a/platform-cli/src/main/java/com/eip4/platform/cli/Eip4Cli.java +++ b/platform-cli/src/main/java/com/eip4/platform/cli/Eip4Cli.java @@ -87,9 +87,16 @@ public final class Eip4Cli { printAiHelp(out); return 0; } - if (!"auto-develop".equals(args[1])) { - return fail(err, "Unknown ai command: " + args[1]); - } + return switch (args[1]) { + case "auto-develop" -> runAiAutoDevelop(args, out, err); + case "feature-package" -> runAiFeaturePackage(args, out, err); + case "revision" -> runAiRevision(args, out, err); + default -> fail(err, "Unknown ai command: " + args[1]); + }; + } + + private int runAiAutoDevelop(String[] args, PrintStream out, PrintStream err) + throws IOException, InterruptedException { Options options = Options.parse(args, 2); ObjectNode request = buildAutoDevelopRequest(options); String baseUrl = baseUrl(options); @@ -97,8 +104,42 @@ public final class Eip4Cli { "POST", endpoint(baseUrl, "/api/ai/features/auto-develop"), request); + return writeJsonResponse(response, options, out, err, "AI auto-develop failed", true); + } + + private int runAiFeaturePackage(String[] args, PrintStream out, PrintStream err) + throws IOException, InterruptedException { + Options options = Options.parse(args, 2); + String taskId = requiredPart(options.single("task-id"), "task-id"); + String changeSetId = requiredPart(options.single("change-set-id"), "change-set-id"); + Eip4HttpResponse response = httpClient.send( + "POST", + endpoint(baseUrl(options), "/api/ai/tasks/" + taskId + + "/change-sets/" + changeSetId + "/feature-package"), + null); + return writeJsonResponse(response, options, out, err, "AI feature-package failed", false); + } + + private int runAiRevision(String[] args, PrintStream out, PrintStream err) + throws IOException, InterruptedException { + Options options = Options.parse(args, 2); + String taskId = requiredPart(options.single("task-id"), "task-id"); + String packageId = requiredPart(options.single("package-id"), "package-id"); + ObjectNode request = objectMapper.createObjectNode(); + request.put("note", options.single("note") == null ? "" : options.single("note")); + Eip4HttpResponse response = httpClient.send( + "POST", + endpoint(baseUrl(options), "/api/ai/tasks/" + taskId + + "/feature-packages/" + packageId + "/revisions"), + request); + return writeJsonResponse(response, options, out, err, "AI revision failed", false); + } + + private int writeJsonResponse(Eip4HttpResponse response, Options options, PrintStream out, PrintStream err, + String failureMessage, boolean autoDevelopSummary) + throws IOException { if (!response.successful()) { - err.println("AI auto-develop failed"); + err.println(failureMessage); err.println("status: " + response.statusCode()); err.println(response.body()); return 2; @@ -117,7 +158,11 @@ public final class Eip4Cli { } Files.writeString(outputPath, formatted + System.lineSeparator(), StandardCharsets.UTF_8); out.println("Wrote run result: " + outputPath.toAbsolutePath()); - printAutoDevelopSummary(body, out); + if (autoDevelopSummary) { + printAutoDevelopSummary(body, out); + } else { + printGenericSummary(body, out); + } } return 0; } @@ -207,6 +252,14 @@ public final class Eip4Cli { } } + private void printGenericSummary(JsonNode body, PrintStream out) { + out.println("id: " + text(body, "id")); + out.println("status: " + text(body, "status")); + out.println("taskId: " + text(body, "taskId")); + out.println("changeSetId: " + text(body, "changeSetId")); + out.println("packageId: " + text(body, "packageId")); + } + private String text(JsonNode node, String field) { JsonNode value = node.path(field); return value.isMissingNode() || value.isNull() ? "" : value.asText(); @@ -261,8 +314,10 @@ public final class Eip4Cli { out.println(""" Usage: eip4 ai auto-develop [options] + eip4 ai feature-package --task-id ID --change-set-id ID [--base-url URL] [--output FILE] + eip4 ai revision --task-id ID --package-id ID [--note TEXT] [--base-url URL] [--output FILE] - Required: + Required for auto-develop: --objective TEXT --feature-name NAME --table-name TABLE @@ -271,6 +326,14 @@ public final class Eip4Cli { --menu-name NAME --field column:label:type[:length][:required] + Required for feature-package: + --task-id ID + --change-set-id ID + + Required for revision: + --task-id ID + --package-id ID + Optional: --base-url URL --max-repair-attempts N diff --git a/platform-cli/src/test/java/com/eip4/platform/cli/Eip4CliTest.java b/platform-cli/src/test/java/com/eip4/platform/cli/Eip4CliTest.java index 50ac686..1b24268 100644 --- a/platform-cli/src/test/java/com/eip4/platform/cli/Eip4CliTest.java +++ b/platform-cli/src/test/java/com/eip4/platform/cli/Eip4CliTest.java @@ -97,6 +97,52 @@ class Eip4CliTest { assertEquals(0, client.calls); } + @Test + void featurePackageCommandPostsToPackageEndpoint() throws Exception { + CapturingClient client = new CapturingClient(new Eip4HttpResponse(200, """ + {"id":"aipkg-1","taskId":"ait-1","changeSetId":"aics-1","status":"READY_FOR_HUMAN_REVIEW"} + """)); + Path output = tempDir.resolve("package.json"); + + CliResult result = run(client, + "ai", "feature-package", + "--base-url", "http://localhost:8084", + "--task-id", "ait-1", + "--change-set-id", "aics-1", + "--output", output.toString()); + + assertEquals(0, result.code()); + assertEquals("POST", client.method); + assertEquals(URI.create("http://localhost:8084/api/ai/tasks/ait-1/change-sets/aics-1/feature-package"), + client.uri); + assertEquals("aipkg-1", objectMapper.readTree(Files.readString(output)).path("id").asText()); + assertTrue(result.out().contains("id: aipkg-1")); + } + + @Test + void revisionCommandPostsNoteToRevisionEndpoint() throws Exception { + CapturingClient client = new CapturingClient(new Eip4HttpResponse(200, """ + {"id":"airev-1","taskId":"ait-1","packageId":"aipkg-1","status":"RESTORABLE"} + """)); + Path output = tempDir.resolve("revision.json"); + + CliResult result = run(client, + "ai", "revision", + "--base-url", "http://localhost:8084", + "--task-id", "ait-1", + "--package-id", "aipkg-1", + "--note", "本地门禁通过", + "--output", output.toString()); + + assertEquals(0, result.code()); + assertEquals("POST", client.method); + assertEquals(URI.create("http://localhost:8084/api/ai/tasks/ait-1/feature-packages/aipkg-1/revisions"), + client.uri); + assertEquals("本地门禁通过", client.body.path("note").asText()); + assertEquals("airev-1", objectMapper.readTree(Files.readString(output)).path("id").asText()); + assertTrue(result.out().contains("packageId: aipkg-1")); + } + private CliResult run(CapturingClient client, String... args) { ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream err = new ByteArrayOutputStream();