From 3b4d3dbd247782bfb73d536e0f39556cd3fe3000 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 07:32:54 +0800 Subject: [PATCH 01/53] feat: add AI agent auto-development pipeline --- README.md | 2 +- docs/AI_AGENT_AUTO_DEVELOPMENT.md | 104 ++ docs/AI_AGENT_REPAIR_CONTRACT.md | 155 ++ docs/sql/SYS_AI_AGENT.sql | 100 ++ docs/架构设计.md | 4 +- platform-ai/pom.xml | 6 + .../ai/model/AiAgentRepairContext.java | 10 + .../ai/model/AiAgentRepairResult.java | 9 + .../eip4/platform/ai/model/AiApplyRun.java | 20 + .../platform/ai/model/AiApplyStepResult.java | 12 + .../platform/ai/model/AiArtifactType.java | 15 + .../eip4/platform/ai/model/AiAuditEntry.java | 12 + .../ai/model/AiAutoDevelopmentRequest.java | 19 + .../ai/model/AiAutoDevelopmentRun.java | 18 + .../eip4/platform/ai/model/AiChangeSet.java | 13 + .../ai/model/AiDeploymentPackage.java | 17 + .../com/eip4/platform/ai/model/AiDraft.java | 21 + .../ai/model/AiFeatureDevelopment.java | 9 + .../platform/ai/model/AiFeatureField.java | 9 + .../platform/ai/model/AiFeatureRequest.java | 13 + .../eip4/platform/ai/model/AiGateResult.java | 9 + .../platform/ai/model/AiGeneratedDraft.java | 12 + .../eip4/platform/ai/model/AiReleasePlan.java | 14 + .../eip4/platform/ai/model/AiReleaseStep.java | 13 + .../platform/ai/model/AiRepairAction.java | 14 + .../platform/ai/model/AiRepairDraftPatch.java | 12 + .../platform/ai/model/AiRepairExecution.java | 17 + .../ai/model/AiRepairExecutionRequest.java | 4 + .../eip4/platform/ai/model/AiRepairPlan.java | 13 + .../eip4/platform/ai/model/AiRunRecord.java | 13 + .../eip4/platform/ai/model/AiSmokeResult.java | 13 + .../eip4/platform/ai/model/AiSmokeRun.java | 17 + .../com/eip4/platform/ai/model/AiTask.java | 12 + .../ai/service/AiAgentRepairExecutor.java | 9 + .../platform/ai/service/AiAgentService.java | 1483 +++++++++++++++++ .../ai/service/AiFeatureDraftGenerator.java | 407 +++++ .../platform/ai/service/AiHttpResponse.java | 6 + .../ai/service/AiLlmRepairClient.java | 11 + .../ai/service/AiLocalReleaseExecutor.java | 365 ++++ .../ai/service/AiSmokeHttpClient.java | 11 + .../platform/ai/service/AiSmokeRunner.java | 147 ++ .../DeterministicAiAgentRepairExecutor.java | 321 ++++ .../ai/service/HttpAiLlmRepairClient.java | 99 ++ .../ai/service/JdkAiSmokeHttpClient.java | 46 + .../eip4/platform/ai/store/AiAgentStore.java | 33 + .../ai/store/InMemoryAiAgentStore.java | 81 + .../platform/ai/store/JdbcAiAgentStore.java | 254 +++ .../platform/ai/web/AiAgentController.java | 178 ++ .../bootstrap/bootstrap-ai-agent.sql | 68 + .../ai/service/AiAgentServiceTest.java | 689 ++++++++ .../service/AiFeatureDraftGeneratorTest.java | 71 + .../service/AiLocalReleaseExecutorTest.java | 128 ++ .../ai/service/AiSmokeRunnerTest.java | 76 + .../ai/service/AiSpringWiringTest.java | 37 + .../ai/service/HttpAiLlmRepairClientTest.java | 113 ++ .../platform/ai/store/AiAgentDdlTest.java | 27 + .../ai/store/InMemoryAiAgentStoreTest.java | 52 + .../ai/store/JdbcAiAgentStoreTest.java | 121 ++ .../ai/web/AiAgentApiPipelineTest.java | 120 ++ .../ai/web/AiAgentControllerTest.java | 222 +++ .../src/main/resources/application-dev.yml | 12 + .../src/main/resources/application-local.yml | 12 + .../bootstrap/bootstrap-ai-agent.sql | 68 + .../metadata/flow/FlowNameResolver.java | Bin 12318 -> 12298 bytes .../platform/metadata/web/MetaController.java | 110 +- .../metadata/web/MetaControllerDdlTest.java | 40 + 66 files changed, 6136 insertions(+), 12 deletions(-) create mode 100644 docs/AI_AGENT_AUTO_DEVELOPMENT.md create mode 100644 docs/AI_AGENT_REPAIR_CONTRACT.md create mode 100644 docs/sql/SYS_AI_AGENT.sql create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiAgentRepairContext.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiAgentRepairResult.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiApplyRun.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiApplyStepResult.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiArtifactType.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiAuditEntry.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiAutoDevelopmentRequest.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiAutoDevelopmentRun.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiChangeSet.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiDeploymentPackage.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiDraft.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureDevelopment.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureField.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureRequest.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiGateResult.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiGeneratedDraft.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiReleasePlan.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiReleaseStep.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairAction.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairDraftPatch.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairExecution.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairExecutionRequest.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairPlan.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiRunRecord.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiSmokeResult.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiSmokeRun.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiTask.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentRepairExecutor.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentService.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/AiHttpResponse.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/AiLlmRepairClient.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeHttpClient.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeRunner.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/DeterministicAiAgentRepairExecutor.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/HttpAiLlmRepairClient.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/JdkAiSmokeHttpClient.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/store/AiAgentStore.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/store/InMemoryAiAgentStore.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/store/JdbcAiAgentStore.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/web/AiAgentController.java create mode 100644 platform-ai/src/main/resources/bootstrap/bootstrap-ai-agent.sql create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/service/AiAgentServiceTest.java create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/service/AiLocalReleaseExecutorTest.java create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/service/AiSmokeRunnerTest.java create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/service/AiSpringWiringTest.java create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/service/HttpAiLlmRepairClientTest.java create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/store/AiAgentDdlTest.java create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/store/InMemoryAiAgentStoreTest.java create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/store/JdbcAiAgentStoreTest.java create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentApiPipelineTest.java create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java create mode 100644 platform-app/src/main/resources/bootstrap/bootstrap-ai-agent.sql create mode 100644 platform-metadata/src/test/java/com/eip4/platform/metadata/web/MetaControllerDdlTest.java diff --git a/README.md b/README.md index cf16d28..9049822 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ EIP4 平台正式工程(路线 A'):双层制模块化单体——**保真层供 | platform-auth | 数据权限真实现(C2 已替换桩)+ P2 组织/权限 | | | platform-converter | 模板转换器(P4) | 可独立 CLI 跑批 | | platform-flow-gateway | P3 占位:Flowable 网关 | | -| platform-ai | P5 占位:MCP Server | | +| platform-ai | P5 AI Agent 开发底座:草稿/变更包/本地门禁/自动修复/人工部署包 | Agent 不直连线上执行生产变更 | | platform-parity | C1 对拍框架:录制/重放/RowDiff/自对拍 CLI | P1 一级交付物 | | platform-app | Boot 启动器,组装全部模块 | ArchUnit 规则在此模块测试里 | diff --git a/docs/AI_AGENT_AUTO_DEVELOPMENT.md b/docs/AI_AGENT_AUTO_DEVELOPMENT.md new file mode 100644 index 0000000..54b7dd7 --- /dev/null +++ b/docs/AI_AGENT_AUTO_DEVELOPMENT.md @@ -0,0 +1,104 @@ +# AI Agent 全自动开发运行说明 + +`platform-ai` 的自动开发入口是 `POST /api/ai/features/auto-develop`。它只在本地环境执行草稿生成、本地落库、smoke 和自动修复;线上变更只输出人工部署包,不连接线上环境执行。 + +## 本地运行配置 + +`local` 和 `dev` profile 已开启: + +```yaml +spring: + sql: + init: + mode: always + schema-locations: classpath:bootstrap/bootstrap-ai-agent.sql + +eip4: + ai: + store: jdbc +``` + +因此本地启动时会幂等创建 `sys_ai_task`、`sys_ai_draft`、`sys_ai_change_set`、`sys_ai_run`、`sys_ai_audit_log`,并用 JDBC 持久化开发证据。默认 profile 不强制写远端验证库,避免误把开发证据写到共享环境。 + +建议使用独立 worktree 做 Agent 功能开发,避免占用当前任务目录: + +```bash +git worktree add ../eip4-platform-ai-agent -b ai/agent-dev +cd ../eip4-platform-ai-agent +``` + +运行态验证要先构建依赖模块并启动重新打包后的 jar,避免 `spring-boot:run -pl platform-app` 读取本地 Maven 仓库里的旧 `platform-ai`: + +```bash +JAVA_HOME=/opt/homebrew/opt/openjdk@21 mvn -pl platform-app -am install -DskipTests +/opt/homebrew/opt/openjdk@21/bin/java -jar platform-app/target/platform-app-0.1.0-SNAPSHOT.jar --spring.profiles.active=local +``` + +## 请求示例 + +```bash +curl -X POST http://localhost:8093/api/ai/features/auto-develop \ + -H 'Content-Type: application/json' \ + -d '{ + "baseUrl": "http://localhost:8093", + "generateDeploymentPackage": true, + "maxRepairAttempts": 2, + "feature": { + "objective": "新增客户等级维护功能", + "featureName": "客户等级维护", + "tableName": "EIP4AI_CUSTOMER_LEVEL", + "entityName": "客户等级", + "templateId": "eip4ai-customer-level", + "menuName": "客户等级维护", + "fields": [ + {"column": "NAME", "label": "名称", "type": "string", "length": 100, "required": true}, + {"column": "CODE", "label": "编码", "type": "string", "length": 64, "required": true}, + {"column": "ENABLED", "label": "启用", "type": "boolean", "required": false} + ] + } + }' +``` + +`maxRepairAttempts` 可省略,默认 2;设为 0 时只跑首轮开发和本地门禁,失败后由调用方手动调用 repair 接口。 + +## 自动链路 + +1. 创建 `AiTask`。 +2. 生成 `ENTITY`、`PAGE_SCHEMA`、`SERVICEFLOW`、`MENU`、`TEST` 草稿。 +3. 对草稿执行基础门禁,包括 amis schema、服务流 XML、实体字段和 smoke 计划。 +4. 生成待人审 `AiChangeSet`。 +5. 生成 release plan。 +6. 本地 apply:实体走本机 `/api/meta/entity`,页面/服务流写本地库;如果本地最小库缺少 `sys_menu`,菜单发布标记为 `SKIPPED`,不阻断本地 gate,部署包仍保留菜单 SQL 供线上人审。 +7. 本地 smoke:只允许 `localhost`、`127.0.0.1`、`::1` baseUrl;HTTP 状态必须匹配,且 JSON 响应体存在 `status` 时必须为 0。 +8. 若失败,自动生成 repair plan 并执行修复重试。 +9. 生成线上人工部署包,包含 manifest、SQL 草案、回滚 SQL 和本地执行证据。 + +返回体中的关键字段: + +- `originalChangeSetId`: 首轮自动生成的变更包。 +- `changeSetId`: 最终用于部署包的变更包;如果修复生成了替代草稿,可能不同于 `originalChangeSetId`。 +- `repairExecutions`: 每轮自动修复证据。 +- `deploymentPackage.requiresHumanApproval`: 固定为 `true`,线上发布必须人工审批。 + +## LLM 修复 + +默认使用确定性修复规则。需要外部 LLM 参与时设置: + +```properties +EIP4_AI_LLM_REPAIR_ENABLED=true +EIP4_AI_LLM_REPAIR_ENDPOINT=http://127.0.0.1:18081/ai-agent/repair +EIP4_AI_LLM_REPAIR_API_KEY=... +EIP4_AI_LLM_REPAIR_MODEL=... +``` + +外部服务契约见 `docs/AI_AGENT_REPAIR_CONTRACT.md`。LLM 只能返回草稿补丁,不能要求平台执行生产命令。 + +## 线上边界 + +可靠路径是:本地 `auto-develop` 通过后,人工检查部署包,再由现有发布流程上线。功能上线后如果发现 bug,Agent 可以基于线上错误日志、导出的 run evidence 或人工复现结果生成新的本地任务并修复,但仍应先在本地验证,再输出人工部署包。 + +## 当前验证结论与遗留项 + +已在 `local` profile 验证完整自动开发链路:实体创建、默认服务流发布、页面 schema 发布、实体列表、默认搜索流和新增数据 smoke 均通过,最终状态为 `READY_FOR_HUMAN_REVIEW`。`local` 最小库没有菜单表,因此菜单 apply 为 `SKIPPED`,这是预期的本地边界。 + +遗留项是全局 metadata 辅助读路径仍有部分 SQL 写死 `eip3.` schema;在 `local/eip4m0` 下会出现非阻断 warning。AI 主链路已规避/修正必要路径,后续如果要让所有后台辅助解析在 `local` 最小库完全无噪声,需要单独做一次 schema 兼容清理。 diff --git a/docs/AI_AGENT_REPAIR_CONTRACT.md b/docs/AI_AGENT_REPAIR_CONTRACT.md new file mode 100644 index 0000000..34517d2 --- /dev/null +++ b/docs/AI_AGENT_REPAIR_CONTRACT.md @@ -0,0 +1,155 @@ +# AI Agent Repair LLM 接入契约 + +本文档定义 `platform-ai` 调用外部 LLM 修复服务的最小契约。该服务只负责根据失败证据生成安全草稿补丁,不直接写库、不发布线上、不访问生产环境。 + +## 启用配置 + +默认不启用外部 LLM 修复。需要显式配置: + +```properties +eip4.ai.llm.repair.enabled=true +eip4.ai.llm.repair.endpoint=http://127.0.0.1:18081/ai-agent/repair +eip4.ai.llm.repair.api-key=${AI_REPAIR_API_KEY} +eip4.ai.llm.repair.model=${AI_REPAIR_MODEL} +``` + +`api-key` 为空时不发送 `Authorization` 头;非空时使用 `Authorization: Bearer `。接口超时为 60 秒。服务返回非 2xx、响应格式非法或调用异常时,平台会忽略外部结果并回退到内置确定性修复规则。 + +## 请求格式 + +`HttpAiLlmRepairClient` 向配置的 endpoint 发送 `POST application/json`: + +```json +{ + "model": "repair-model-name", + "taskId": "ait-1", + "changeSetId": "aics-1", + "repairPlan": { + "taskId": "ait-1", + "changeSetId": "aics-1", + "sourceRunId": "run-1", + "status": "READY", + "generatedAt": 1710000000000, + "actions": [], + "messages": [] + }, + "drafts": [], + "contract": { + "responseField": "draftPatches", + "patchShape": "artifactType,targetId,payload,metadata", + "rule": "Return only safe draft patches; do not execute production changes" + } +} +``` + +字段说明: + +- `repairPlan`: 平台根据最近失败的 `AUTO_DEVELOP` / `LOCAL_APPLY` / `SMOKE` 证据生成的修复计划。 +- `drafts`: 当前任务的草稿快照,LLM 只能基于这些草稿生成替代草稿。 +- `contract`: 平台要求的响应约束,外部服务必须遵守。 + +## 响应格式 + +外部服务必须返回 JSON 对象,且补丁数组放在 `draftPatches` 字段: + +```json +{ + "draftPatches": [ + { + "artifactType": "ENTITY", + "targetId": "CUSTOMER", + "payload": { + "publishTarget": "/api/meta/entity", + "tableName": "SYS_CUSTOMER", + "entityName": "Customer", + "fields": [] + }, + "metadata": { + "source": "llm-repair", + "reason": "补齐实体发布目标" + } + } + ] +} +``` + +`artifactType` 只允许: + +- `ENTITY` +- `PAGE_SCHEMA` +- `SERVICEFLOW` +- `MENU` +- `TEST` +- `CODE` + +平台当前主要自动修复 `ENTITY`、`PAGE_SCHEMA`、`SERVICEFLOW`、`MENU`、`TEST`。`CODE` 补丁即使返回,也仍然必须经过后续门禁、人审和部署包流程。 + +## 安全边界 + +外部 LLM 服务不得执行以下操作: + +- 连接或修改线上数据库。 +- 触发线上发布、重启、脚本执行或远程 shell。 +- 绕过平台的草稿、变更包、本地 apply、smoke、部署包和人工审批流程。 +- 返回除 `draftPatches` 之外需要平台立即执行的命令。 + +平台接收补丁后的流程是: + +1. 将补丁写成新的 `AiDraft`,保留 `metadata.source` 和原因。 +2. 基于同一 `artifactType + targetId` 取最新草稿重新生成 change set。 +3. 执行本地 apply 和 smoke。 +4. 生成线上人工部署包。 +5. 线上部署仍由人工审批和发布系统执行。 + +## 示例:修复 TEST 契约 + +请求中的 `repairPlan.actions` 指出 smoke 期望状态码与实际接口不一致时,外部服务可以返回: + +```json +{ + "draftPatches": [ + { + "artifactType": "TEST", + "targetId": "customer-smoke", + "payload": { + "smokes": [ + { + "name": "打开客户列表", + "method": "GET", + "path": "/api/customer/list", + "expectedStatus": 200 + } + ] + }, + "metadata": { + "source": "llm-repair", + "reason": "同步 smoke 期望状态码" + } + } + ] +} +``` + +## 示例:修复 PAGE_SCHEMA + +页面 schema 缺少 `type`、`title` 或 `body` 时,外部服务可以返回: + +```json +{ + "draftPatches": [ + { + "artifactType": "PAGE_SCHEMA", + "targetId": "customer-page", + "payload": { + "type": "page", + "title": "客户管理", + "body": [] + }, + "metadata": { + "source": "llm-repair", + "reason": "补齐 amis 页面必填结构" + } + } + ] +} +``` diff --git a/docs/sql/SYS_AI_AGENT.sql b/docs/sql/SYS_AI_AGENT.sql new file mode 100644 index 0000000..153ad89 --- /dev/null +++ b/docs/sql/SYS_AI_AGENT.sql @@ -0,0 +1,100 @@ +-- ============================================================================ +-- 生产建表脚本:SYS_AI_AGENT(AI Agent 运行态平台表) +-- ---------------------------------------------------------------------------- +-- 归属:platform-ai(P5 Agent 开发底座)。 +-- 契约:/api/ai/tasks、/api/ai/tasks/{taskId}/drafts、change-sets、runs、audit。 +-- +-- 【Flyway 待办(P5)】 +-- 架构条款(docs/架构设计.md §「平台表管理」):SYS_* 平台表由 Flyway 管理。 +-- 本工程当前未引入 Flyway。本脚本即「生产建表脚本」,P5 引入 Flyway 时 +-- 原样改名为 V{n}__create_sys_ai_agent.sql 纳入 src/main/resources/db/migration 即可。 +-- 本地 / CI 自举副本见 platform-ai/src/main/resources/bootstrap/bootstrap-ai-agent.sql。 +-- +-- 边界:这些表只保存 AI 开发运行态和草稿。发布到 SYS_PAGE_SCHEMA / SYS_ENTITY / +-- 服务流等生产元数据必须经过独立人审门禁,不能由 Agent 接口直接落生产。 +-- ============================================================================ + +CREATE TABLE IF NOT EXISTS sys_ai_task ( + task_id character varying(64) NOT NULL, + objective text NOT NULL, + status character varying(32) NOT NULL, + plan_json jsonb NOT NULL, + created_at bigint NOT NULL, + updated_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_task PRIMARY KEY (task_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_draft ( + draft_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + artifact_type character varying(32) NOT NULL, + target_id character varying(128) NOT NULL, + payload_json jsonb NOT NULL, + gates_json jsonb NOT NULL, + metadata_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_draft PRIMARY KEY (draft_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_change_set ( + change_set_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + status character varying(32) NOT NULL, + draft_ids_json jsonb NOT NULL, + summary_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_change_set PRIMARY KEY (change_set_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_run ( + run_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + change_set_id character varying(64) NOT NULL, + run_type character varying(32) NOT NULL, + status character varying(32) NOT NULL, + payload_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_run PRIMARY KEY (run_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_audit_log ( + audit_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + action character varying(96) NOT NULL, + actor character varying(64) NOT NULL, + details_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_audit_log PRIMARY KEY (audit_id) +); + +CREATE INDEX IF NOT EXISTS idx_sys_ai_draft_task ON sys_ai_draft (task_id, created_at); +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_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_audit_log IS 'AI Agent 操作审计日志'; + +COMMENT ON COLUMN sys_ai_task.task_id IS 'Agent 任务 id'; +COMMENT ON COLUMN sys_ai_task.objective IS '用户目标或需求描述'; +COMMENT ON COLUMN sys_ai_task.status IS '任务状态,例如 DRAFTING / READY_FOR_REVIEW'; +COMMENT ON COLUMN sys_ai_task.plan_json IS 'Agent 计划步骤 JSON'; +COMMENT ON COLUMN sys_ai_task.created_at IS '创建时间 epoch 毫秒'; +COMMENT ON COLUMN sys_ai_task.updated_at IS '更新时间 epoch 毫秒'; + +COMMENT ON COLUMN sys_ai_draft.artifact_type IS '草稿类型:ENTITY / PAGE_SCHEMA / SERVICEFLOW / MENU / CODE / TEST'; +COMMENT ON COLUMN sys_ai_draft.target_id IS '目标标识,例如实体编码、templateId、服务流 id 或文件路径'; +COMMENT ON COLUMN sys_ai_draft.payload_json IS '草稿内容 JSON'; +COMMENT ON COLUMN sys_ai_draft.gates_json IS '草稿门禁结果 JSON'; +COMMENT ON COLUMN sys_ai_draft.metadata_json IS '来源、上下文、生成参数等附加信息'; + +COMMENT ON COLUMN sys_ai_change_set.draft_ids_json IS '纳入变更包的 draft_id 列表'; +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_audit_log.details_json IS '操作详情 JSON'; diff --git a/docs/架构设计.md b/docs/架构设计.md index f53eb9f..fd75ffe 100644 --- a/docs/架构设计.md +++ b/docs/架构设计.md @@ -18,7 +18,7 @@ eip4-platform(Maven 多模块单体) ├── platform-auth P2:组织/权限/数据权限真实现(替换 PoC 桩) ├── platform-flow-gateway Flowable REST 客户端、待办聚合、3 个 handler bean ├── platform-converter 模板转换器 + S3 脚本改写器(可独立 CLI 跑批) -├── platform-ai MCP Server、schema 双闸校验 +├── platform-ai AI Agent 开发底座、schema 双闸校验、自动修复、本地门禁和人工部署包 ├── platform-parity C1 逐行对拍框架:录制/重放/逐行 diff(P1 一级交付物,可独立 CLI 跑批) └── platform-app Spring Boot 启动器,组装上述模块 ``` @@ -118,4 +118,4 @@ eip4-platform(Maven 多模块单体) --- -**本文档维护**:随 P1 包结构落地校正;任何选型变更(尤其渲染层切换)回写第二、七节。 \ No newline at end of file +**本文档维护**:随 P1 包结构落地校正;任何选型变更(尤其渲染层切换)回写第二、七节。 diff --git a/platform-ai/pom.xml b/platform-ai/pom.xml index 5134213..ec89eb4 100644 --- a/platform-ai/pom.xml +++ b/platform-ai/pom.xml @@ -13,5 +13,11 @@ P5 占位:MCP Server、schema 双闸校验 com.eip4platform-legacy-core + com.eip4platform-converter + org.springframework.bootspring-boot-starter-web + org.springframework.bootspring-boot-starter-jdbc + org.springdocspringdoc-openapi-starter-webmvc-ui + com.fasterxml.jackson.corejackson-databind + org.springframework.bootspring-boot-starter-testtest diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAgentRepairContext.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAgentRepairContext.java new file mode 100644 index 0000000..40f997b --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAgentRepairContext.java @@ -0,0 +1,10 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiAgentRepairContext( + String taskId, + String changeSetId, + AiRepairPlan repairPlan, + List drafts) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAgentRepairResult.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAgentRepairResult.java new file mode 100644 index 0000000..4f19748 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAgentRepairResult.java @@ -0,0 +1,9 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiAgentRepairResult( + String status, + List draftPatches, + List messages) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiApplyRun.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiApplyRun.java new file mode 100644 index 0000000..c25a1a4 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiApplyRun.java @@ -0,0 +1,20 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiApplyRun( + String taskId, + String changeSetId, + String baseUrl, + String status, + long startedAt, + long finishedAt, + List steps, + AiSmokeRun smokeRun) { + + public boolean passed() { + boolean stepsPassed = steps != null && steps.stream() + .allMatch(s -> "APPLIED".equals(s.status()) || "SKIPPED".equals(s.status())); + return stepsPassed && smokeRun != null && smokeRun.passed(); + } +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiApplyStepResult.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiApplyStepResult.java new file mode 100644 index 0000000..578fd13 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiApplyStepResult.java @@ -0,0 +1,12 @@ +package com.eip4.platform.ai.model; + +import java.util.Map; + +public record AiApplyStepResult( + String id, + AiArtifactType artifactType, + String target, + String status, + String message, + Map details) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiArtifactType.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiArtifactType.java new file mode 100644 index 0000000..02a4834 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiArtifactType.java @@ -0,0 +1,15 @@ +package com.eip4.platform.ai.model; + +/** + * Agent 允许产生的受控产物类型。 + * + *

这里刻意不用自由字符串:后续 MCP 工具、发布门禁和审计都需要按类型施加不同规则。 + */ +public enum AiArtifactType { + ENTITY, + PAGE_SCHEMA, + SERVICEFLOW, + MENU, + CODE, + TEST +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAuditEntry.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAuditEntry.java new file mode 100644 index 0000000..145e712 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAuditEntry.java @@ -0,0 +1,12 @@ +package com.eip4.platform.ai.model; + +import java.util.Map; + +public record AiAuditEntry( + String id, + String taskId, + String action, + String actor, + long createdAt, + Map details) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAutoDevelopmentRequest.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAutoDevelopmentRequest.java new file mode 100644 index 0000000..4093cd5 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAutoDevelopmentRequest.java @@ -0,0 +1,19 @@ +package com.eip4.platform.ai.model; + +public record AiAutoDevelopmentRequest( + AiFeatureRequest feature, + String baseUrl, + Boolean generateDeploymentPackage, + Integer maxRepairAttempts) { + + public boolean shouldGenerateDeploymentPackage() { + return generateDeploymentPackage == null || generateDeploymentPackage; + } + + public int repairAttemptLimit() { + if (maxRepairAttempts == null) { + return 2; + } + return Math.max(0, Math.min(5, maxRepairAttempts)); + } +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAutoDevelopmentRun.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAutoDevelopmentRun.java new file mode 100644 index 0000000..1fc9543 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiAutoDevelopmentRun.java @@ -0,0 +1,18 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiAutoDevelopmentRun( + String taskId, + String changeSetId, + String originalChangeSetId, + String status, + long startedAt, + long finishedAt, + AiFeatureDevelopment development, + AiReleasePlan releasePlan, + AiApplyRun applyRun, + AiDeploymentPackage deploymentPackage, + List repairExecutions, + List messages) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiChangeSet.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiChangeSet.java new file mode 100644 index 0000000..677ab5d --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiChangeSet.java @@ -0,0 +1,13 @@ +package com.eip4.platform.ai.model; + +import java.util.List; +import java.util.Map; + +public record AiChangeSet( + String id, + String taskId, + String status, + long createdAt, + List draftIds, + Map summary) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiDeploymentPackage.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiDeploymentPackage.java new file mode 100644 index 0000000..f05ea4a --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiDeploymentPackage.java @@ -0,0 +1,17 @@ +package com.eip4.platform.ai.model; + +import java.util.List; +import java.util.Map; + +public record AiDeploymentPackage( + String taskId, + String changeSetId, + String status, + boolean requiresHumanApproval, + long generatedAt, + Map manifest, + List sqlStatements, + List rollbackSqlStatements, + List warnings, + List runEvidence) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiDraft.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiDraft.java new file mode 100644 index 0000000..f409908 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiDraft.java @@ -0,0 +1,21 @@ +package com.eip4.platform.ai.model; + +import java.util.List; +import java.util.Map; + +import com.fasterxml.jackson.databind.JsonNode; + +public record AiDraft( + String id, + String taskId, + AiArtifactType artifactType, + String targetId, + JsonNode payload, + long createdAt, + List gates, + Map metadata) { + + public boolean passed() { + return gates == null || gates.stream().allMatch(AiGateResult::passed); + } +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureDevelopment.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureDevelopment.java new file mode 100644 index 0000000..9a03429 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureDevelopment.java @@ -0,0 +1,9 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiFeatureDevelopment( + AiTask task, + List drafts, + AiChangeSet changeSet) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureField.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureField.java new file mode 100644 index 0000000..300f80b --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureField.java @@ -0,0 +1,9 @@ +package com.eip4.platform.ai.model; + +public record AiFeatureField( + String column, + String label, + String type, + Integer length, + Boolean required) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureRequest.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureRequest.java new file mode 100644 index 0000000..f2fdc19 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureRequest.java @@ -0,0 +1,13 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiFeatureRequest( + String objective, + String featureName, + String tableName, + String entityName, + String templateId, + String menuName, + List fields) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiGateResult.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiGateResult.java new file mode 100644 index 0000000..10a7dfa --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiGateResult.java @@ -0,0 +1,9 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiGateResult( + String name, + boolean passed, + List messages) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiGeneratedDraft.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiGeneratedDraft.java new file mode 100644 index 0000000..7563d18 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiGeneratedDraft.java @@ -0,0 +1,12 @@ +package com.eip4.platform.ai.model; + +import java.util.Map; + +import com.fasterxml.jackson.databind.JsonNode; + +public record AiGeneratedDraft( + AiArtifactType artifactType, + String targetId, + JsonNode payload, + Map metadata) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiReleasePlan.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiReleasePlan.java new file mode 100644 index 0000000..6521759 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiReleasePlan.java @@ -0,0 +1,14 @@ +package com.eip4.platform.ai.model; + +import java.util.List; +import java.util.Map; + +public record AiReleasePlan( + String taskId, + String changeSetId, + String status, + boolean requiresHumanApproval, + Map environmentPolicy, + List steps, + List rollbackNotes) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiReleaseStep.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiReleaseStep.java new file mode 100644 index 0000000..e46ec86 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiReleaseStep.java @@ -0,0 +1,13 @@ +package com.eip4.platform.ai.model; + +import java.util.Map; + +public record AiReleaseStep( + String id, + AiArtifactType artifactType, + String title, + String mode, + String target, + String action, + Map details) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairAction.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairAction.java new file mode 100644 index 0000000..ecf9762 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairAction.java @@ -0,0 +1,14 @@ +package com.eip4.platform.ai.model; + +import java.util.Map; + +public record AiRepairAction( + String id, + String source, + String actionType, + String artifactType, + String targetId, + boolean automated, + String rationale, + Map details) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairDraftPatch.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairDraftPatch.java new file mode 100644 index 0000000..226bf67 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairDraftPatch.java @@ -0,0 +1,12 @@ +package com.eip4.platform.ai.model; + +import java.util.Map; + +import com.fasterxml.jackson.databind.JsonNode; + +public record AiRepairDraftPatch( + AiArtifactType artifactType, + String targetId, + JsonNode payload, + Map metadata) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairExecution.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairExecution.java new file mode 100644 index 0000000..8d8cd01 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairExecution.java @@ -0,0 +1,17 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiRepairExecution( + String taskId, + String changeSetId, + String status, + long startedAt, + long finishedAt, + AiRepairPlan repairPlan, + List generatedDrafts, + AiChangeSet repairedChangeSet, + AiApplyRun retryApplyRun, + AiDeploymentPackage deploymentPackage, + List messages) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairExecutionRequest.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairExecutionRequest.java new file mode 100644 index 0000000..86c095c --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairExecutionRequest.java @@ -0,0 +1,4 @@ +package com.eip4.platform.ai.model; + +public record AiRepairExecutionRequest(String baseUrl) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairPlan.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairPlan.java new file mode 100644 index 0000000..1c5e7b5 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRepairPlan.java @@ -0,0 +1,13 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiRepairPlan( + String taskId, + String changeSetId, + String sourceRunId, + String status, + long generatedAt, + List actions, + List messages) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRunRecord.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRunRecord.java new file mode 100644 index 0000000..2dcbb3e --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiRunRecord.java @@ -0,0 +1,13 @@ +package com.eip4.platform.ai.model; + +import com.fasterxml.jackson.databind.JsonNode; + +public record AiRunRecord( + String id, + String taskId, + String changeSetId, + String runType, + String status, + long createdAt, + JsonNode payload) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiSmokeResult.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiSmokeResult.java new file mode 100644 index 0000000..b219bbc --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiSmokeResult.java @@ -0,0 +1,13 @@ +package com.eip4.platform.ai.model; + +public record AiSmokeResult( + String name, + String method, + String url, + int expectedHttpStatus, + int actualHttpStatus, + boolean passed, + long durationMillis, + String error, + String responseSnippet) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiSmokeRun.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiSmokeRun.java new file mode 100644 index 0000000..6bd7f38 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiSmokeRun.java @@ -0,0 +1,17 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiSmokeRun( + String taskId, + String changeSetId, + String baseUrl, + String status, + long startedAt, + long finishedAt, + List results) { + + public boolean passed() { + return results != null && results.stream().allMatch(AiSmokeResult::passed); + } +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiTask.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiTask.java new file mode 100644 index 0000000..6a20ea2 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiTask.java @@ -0,0 +1,12 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiTask( + String id, + String objective, + String status, + long createdAt, + long updatedAt, + List plan) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentRepairExecutor.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentRepairExecutor.java new file mode 100644 index 0000000..938f19e --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentRepairExecutor.java @@ -0,0 +1,9 @@ +package com.eip4.platform.ai.service; + +import com.eip4.platform.ai.model.AiAgentRepairContext; +import com.eip4.platform.ai.model.AiAgentRepairResult; + +public interface AiAgentRepairExecutor { + + AiAgentRepairResult repair(AiAgentRepairContext context); +} 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 new file mode 100644 index 0000000..ec7adcb --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentService.java @@ -0,0 +1,1483 @@ +package com.eip4.platform.ai.service; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.Comparator; +import java.util.HexFormat; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.regex.Pattern; + +import javax.xml.parsers.DocumentBuilderFactory; + +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; +import org.springframework.web.server.ResponseStatusException; +import org.xml.sax.InputSource; + +import com.eip4.platform.ai.model.AiApplyRun; +import com.eip4.platform.ai.model.AiApplyStepResult; +import com.eip4.platform.ai.model.AiAgentRepairContext; +import com.eip4.platform.ai.model.AiAgentRepairResult; +import com.eip4.platform.ai.model.AiArtifactType; +import com.eip4.platform.ai.model.AiAuditEntry; +import com.eip4.platform.ai.model.AiAutoDevelopmentRequest; +import com.eip4.platform.ai.model.AiAutoDevelopmentRun; +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.AiFeatureDevelopment; +import com.eip4.platform.ai.model.AiFeatureRequest; +import com.eip4.platform.ai.model.AiGateResult; +import com.eip4.platform.ai.model.AiGeneratedDraft; +import com.eip4.platform.ai.model.AiReleasePlan; +import com.eip4.platform.ai.model.AiReleaseStep; +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.AiRunRecord; +import com.eip4.platform.ai.model.AiSmokeResult; +import com.eip4.platform.ai.model.AiSmokeRun; +import com.eip4.platform.ai.model.AiTask; +import com.eip4.platform.ai.store.AiAgentStore; +import com.eip4.platform.converter.SchemaGate; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +/** + * P5 Agent 开发底座:任务、草稿、变更包和门禁。 + * + *

任何接口都不直接写生产元数据;Agent 只能生成草稿和待人审变更包,发布必须走单独的人审门禁。 + */ +@Service +public class AiAgentService { + + private static final Pattern TABLE_NAME = Pattern.compile("[A-Z][A-Z0-9_]{2,40}"); + private static final Pattern FLOW_KEY = Pattern.compile("[A-Z][A-Z0-9_]{2,80}"); + private static final Pattern COLUMN_NAME = Pattern.compile("[A-Z][A-Z0-9_]{0,39}"); + private static final Pattern HTTP_METHOD = Pattern.compile("GET|POST|PUT|DELETE|PATCH"); + + private final AiAgentStore store; + private final AiFeatureDraftGenerator featureDraftGenerator; + private final AiSmokeRunner smokeRunner; + private final AiLocalReleaseExecutor localReleaseExecutor; + private final AiAgentRepairExecutor agentRepairExecutor; + private final ObjectMapper objectMapper; + + private volatile SchemaGate schemaGate; + + public AiAgentService(AiAgentStore store, AiFeatureDraftGenerator featureDraftGenerator, + AiSmokeRunner smokeRunner, AiLocalReleaseExecutor localReleaseExecutor, + AiAgentRepairExecutor agentRepairExecutor, ObjectMapper objectMapper) { + this.store = store; + this.featureDraftGenerator = featureDraftGenerator; + this.smokeRunner = smokeRunner; + this.localReleaseExecutor = localReleaseExecutor; + this.agentRepairExecutor = agentRepairExecutor; + this.objectMapper = objectMapper; + } + + public AiTask createTask(String objective) { + String text = objective == null ? "" : objective.trim(); + if (text.isEmpty()) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "objective 不能为空"); + } + long now = System.currentTimeMillis(); + String id = "ait-" + UUID.randomUUID(); + AiTask task = new AiTask(id, text, "DRAFTING", now, now, defaultPlan()); + store.saveTask(task); + audit(id, "task.created", "agent", Map.of("objective", text)); + return task; + } + + public AiTask getTask(String taskId) { + return store.findTask(taskId) + .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "AI 任务不存在: " + taskId)); + } + + public AiDraft addDraft(String taskId, String type, String targetId, JsonNode payload, + Map metadata) { + getTask(taskId); + AiArtifactType artifactType = parseType(type); + String target = targetId == null ? "" : targetId.trim(); + if (target.isEmpty()) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "targetId 不能为空"); + } + if (payload == null || payload.isNull()) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "payload 不能为空"); + } + + List gates = validateDraft(artifactType, target, payload); + AiDraft draft = new AiDraft( + "aid-" + UUID.randomUUID(), + taskId, + artifactType, + target, + payload, + System.currentTimeMillis(), + gates, + metadata == null ? Map.of() : Map.copyOf(metadata)); + store.saveDraft(draft); + audit(taskId, "draft.saved", "agent", Map.of( + "draftId", draft.id(), + "artifactType", draft.artifactType().name(), + "passed", draft.passed())); + return draft; + } + + public AiFeatureDevelopment developFeature(AiFeatureRequest request) { + String objective = request == null || request.objective() == null || request.objective().isBlank() + ? "AI Agent 自动开发功能" + : request.objective(); + AiTask task = createTask(objective); + return developFeature(task.id(), request); + } + + public AiAutoDevelopmentRun autoDevelopFeature(AiAutoDevelopmentRequest request) { + AiAutoDevelopmentRequest req = request == null + ? new AiAutoDevelopmentRequest(null, null, null, null) + : request; + long started = System.currentTimeMillis(); + List messages = new ArrayList<>(); + List repairExecutions = new ArrayList<>(); + AiFeatureDevelopment development = null; + AiReleasePlan releasePlan = null; + AiApplyRun applyRun = null; + AiDeploymentPackage deploymentPackage = null; + String originalChangeSetId = ""; + String currentChangeSetId = ""; + String status = "FAILED"; + try { + development = developFeature(req.feature()); + String taskId = development.task().id(); + originalChangeSetId = development.changeSet().id(); + currentChangeSetId = originalChangeSetId; + releasePlan = createReleasePlan(taskId, currentChangeSetId); + applyRun = applyLocalRelease(taskId, currentChangeSetId, req.baseUrl()); + if (req.shouldGenerateDeploymentPackage()) { + deploymentPackage = createDeploymentPackage(taskId, currentChangeSetId); + } + status = autoDevelopmentStatus(applyRun, deploymentPackage, req.shouldGenerateDeploymentPackage()); + AutoRepairOutcome repairOutcome = runAutoRepairs(req, development, currentChangeSetId, + applyRun, deploymentPackage, messages, repairExecutions); + currentChangeSetId = repairOutcome.changeSetId(); + applyRun = repairOutcome.applyRun(); + deploymentPackage = repairOutcome.deploymentPackage(); + status = autoDevelopmentStatus(applyRun, deploymentPackage, req.shouldGenerateDeploymentPackage()); + messages.addAll(applyRunMessages(applyRun)); + if (deploymentPackage != null) { + messages.addAll(deploymentPackage.warnings()); + } + if (messages.isEmpty()) { + messages.add("自动开发、本地应用和 smoke 已完成,等待人工审批线上部署包"); + } + updateTaskStatus(taskId, status); + AiAutoDevelopmentRun run = autoRun(development, currentChangeSetId, originalChangeSetId, + releasePlan, applyRun, deploymentPackage, repairExecutions, status, started, messages); + saveRun(taskId, currentChangeSetId, "AUTO_DEVELOP", status, run); + audit(taskId, "auto-development.completed", "agent", Map.of( + "changeSetId", currentChangeSetId, + "originalChangeSetId", originalChangeSetId, + "status", status, + "repairAttempts", repairExecutions.size(), + "messageCount", messages.size())); + return run; + } catch (ResponseStatusException ex) { + messages.add(responseError(ex)); + if (development != null) { + updateTaskStatus(development.task().id(), "FAILED"); + String failedChangeSetId = currentChangeSetId.isBlank() + ? development.changeSet().id() : currentChangeSetId; + String initialChangeSetId = originalChangeSetId.isBlank() + ? development.changeSet().id() : originalChangeSetId; + AiAutoDevelopmentRun run = autoRun(development, failedChangeSetId, initialChangeSetId, + releasePlan, applyRun, deploymentPackage, repairExecutions, "FAILED", started, messages); + saveRun(development.task().id(), failedChangeSetId, "AUTO_DEVELOP", "FAILED", run); + audit(development.task().id(), "auto-development.failed", "agent", Map.of( + "changeSetId", failedChangeSetId, + "error", responseError(ex))); + return run; + } + throw ex; + } + } + + public AiFeatureDevelopment developFeature(String taskId, AiFeatureRequest request) { + AiTask task = getTask(taskId); + List generated = featureDraftGenerator.generate(request); + List drafts = new ArrayList<>(); + for (AiGeneratedDraft g : generated) { + drafts.add(addDraft(taskId, g.artifactType().name(), g.targetId(), g.payload(), g.metadata())); + } + AiChangeSet changeSet = createChangeSet(taskId); + audit(taskId, "feature.generated", "agent", Map.of( + "draftCount", drafts.size(), + "changeSetId", changeSet.id())); + return new AiFeatureDevelopment(task, List.copyOf(drafts), changeSet); + } + + public List listDrafts(String taskId) { + getTask(taskId); + return store.listDrafts(taskId); + } + + public AiChangeSet createChangeSet(String taskId) { + getTask(taskId); + List drafts = activeDrafts(taskId); + if (drafts.isEmpty()) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "没有草稿,不能生成变更包"); + } + List failed = drafts.stream().filter(d -> !d.passed()).toList(); + if (!failed.isEmpty()) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "存在门禁失败草稿,不能生成变更包"); + } + + Map counts = new EnumMap<>(AiArtifactType.class); + for (AiDraft draft : drafts) { + counts.merge(draft.artifactType(), 1, Integer::sum); + } + Map summary = new LinkedHashMap<>(); + summary.put("draftCount", drafts.size()); + summary.put("artifactCounts", stringifyKeys(counts)); + summary.put("requiredHumanGate", true); + summary.put("publishPolicy", "local-only; production requires human approval"); + + AiChangeSet changeSet = new AiChangeSet( + "aics-" + UUID.randomUUID(), + taskId, + "READY_FOR_REVIEW", + System.currentTimeMillis(), + drafts.stream().map(AiDraft::id).toList(), + summary); + store.saveChangeSet(changeSet); + updateTaskStatus(taskId, "READY_FOR_REVIEW"); + audit(taskId, "change-set.created", "agent", Map.of( + "changeSetId", changeSet.id(), + "draftCount", drafts.size())); + return changeSet; + } + + public List listChangeSets(String taskId) { + getTask(taskId); + return store.listChangeSets(taskId); + } + + public AiReleasePlan createReleasePlan(String taskId, String changeSetId) { + getTask(taskId); + AiChangeSet changeSet = store.listChangeSets(taskId).stream() + .filter(cs -> cs.id().equals(changeSetId)) + .findFirst() + .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, + "AI 变更包不存在: " + changeSetId)); + if (!"READY_FOR_REVIEW".equals(changeSet.status())) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "变更包状态不可发布计划: " + changeSet.status()); + } + + Map draftsById = listDrafts(taskId).stream() + .collect(Collectors.toMap(AiDraft::id, Function.identity(), (a, b) -> a, LinkedHashMap::new)); + List drafts = changeSet.draftIds().stream() + .map(draftsById::get) + .filter(d -> d != null) + .sorted(Comparator.comparingInt(d -> releaseOrder(d.artifactType()))) + .toList(); + if (drafts.size() != changeSet.draftIds().size()) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "变更包引用的草稿不完整"); + } + List failed = drafts.stream().filter(d -> !d.passed()).toList(); + if (!failed.isEmpty()) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "存在门禁失败草稿,不能生成发布计划"); + } + + List steps = new ArrayList<>(); + for (AiDraft draft : drafts) { + steps.add(releaseStep(steps.size() + 1, draft)); + } + AiReleasePlan plan = new AiReleasePlan( + taskId, + changeSetId, + "READY_FOR_LOCAL_APPLY", + true, + Map.of( + "localAutoApplyAllowed", true, + "productionRequiresHumanApproval", true, + "productionPolicy", "本地开发测试通过后,人工确认发布包并线上部署"), + List.copyOf(steps), + rollbackNotes(drafts)); + audit(taskId, "release-plan.generated", "agent", Map.of( + "changeSetId", changeSetId, + "stepCount", steps.size(), + "requiresHumanApproval", true)); + return plan; + } + + public AiSmokeRun runLocalSmoke(String taskId, String changeSetId, String baseUrl) { + getTask(taskId); + AiChangeSet changeSet = findChangeSet(taskId, changeSetId); + if (!"READY_FOR_REVIEW".equals(changeSet.status())) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "变更包状态不可运行 smoke: " + changeSet.status()); + } + Map draftsById = listDrafts(taskId).stream() + .collect(Collectors.toMap(AiDraft::id, Function.identity(), (a, b) -> a, LinkedHashMap::new)); + List testDrafts = changeSet.draftIds().stream() + .map(draftsById::get) + .filter(d -> d != null && d.artifactType() == AiArtifactType.TEST) + .toList(); + if (testDrafts.isEmpty()) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "变更包没有 TEST 草稿,不能运行 smoke"); + } + + long started = System.currentTimeMillis(); + List results = new ArrayList<>(); + String actualBaseUrl = ""; + for (AiDraft draft : testDrafts) { + AiSmokeRun one = smokeRunner.run(taskId, changeSetId, baseUrl, draft.payload()); + actualBaseUrl = one.baseUrl(); + results.addAll(one.results()); + } + long finished = System.currentTimeMillis(); + boolean passed = results.stream().allMatch(AiSmokeResult::passed); + AiSmokeRun run = new AiSmokeRun(taskId, changeSetId, actualBaseUrl, + passed ? "PASSED" : "FAILED", started, finished, List.copyOf(results)); + saveRun(taskId, changeSetId, "SMOKE", run.status(), run); + audit(taskId, "smoke.run", "agent", Map.of( + "changeSetId", changeSetId, + "status", run.status(), + "passed", run.passed(), + "resultCount", results.size())); + return run; + } + + public AiApplyRun applyLocalRelease(String taskId, String changeSetId, String baseUrl) { + getTask(taskId); + AiChangeSet changeSet = findChangeSet(taskId, changeSetId); + if (!"READY_FOR_REVIEW".equals(changeSet.status())) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "变更包状态不可本地应用: " + changeSet.status()); + } + Map draftsById = listDrafts(taskId).stream() + .collect(Collectors.toMap(AiDraft::id, Function.identity(), (a, b) -> a, LinkedHashMap::new)); + List drafts = changeSet.draftIds().stream() + .map(draftsById::get) + .filter(d -> d != null) + .sorted(Comparator.comparingInt(d -> releaseOrder(d.artifactType()))) + .toList(); + if (drafts.size() != changeSet.draftIds().size()) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "变更包引用的草稿不完整"); + } + if (drafts.stream().anyMatch(d -> !d.passed())) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "存在门禁失败草稿,不能本地应用"); + } + + long started = System.currentTimeMillis(); + List steps = localReleaseExecutor.apply(baseUrl, drafts); + boolean applyPassed = steps.stream().allMatch(AiAgentService::stepPassed); + AiSmokeRun smoke = null; + if (applyPassed) { + smoke = runLocalSmoke(taskId, changeSetId, baseUrl); + } + long finished = System.currentTimeMillis(); + String status = applyPassed && smoke != null && smoke.passed() + ? "PASSED" : (applyPassed ? "SMOKE_FAILED" : "APPLY_FAILED"); + AiApplyRun run = new AiApplyRun(taskId, changeSetId, + smoke == null ? defaultBaseUrl(baseUrl) : smoke.baseUrl(), + status, started, finished, List.copyOf(steps), smoke); + saveRun(taskId, changeSetId, "LOCAL_APPLY", run.status(), run); + updateTaskStatus(taskId, run.passed() ? "LOCAL_GATE_PASSED" : "LOCAL_GATE_FAILED"); + audit(taskId, "local-apply.run", "agent", Map.of( + "changeSetId", changeSetId, + "status", run.status(), + "passed", run.passed(), + "stepCount", steps.size(), + "smokeStatus", smoke == null ? "" : smoke.status())); + return run; + } + + public List listRuns(String taskId) { + getTask(taskId); + return store.listRuns(taskId); + } + + public List listRuns(String taskId, String changeSetId) { + getTask(taskId); + findChangeSet(taskId, changeSetId); + return store.listRuns(taskId).stream() + .filter(run -> run.changeSetId().equals(changeSetId)) + .toList(); + } + + public AiDeploymentPackage createDeploymentPackage(String taskId, String changeSetId) { + getTask(taskId); + AiChangeSet changeSet = findChangeSet(taskId, changeSetId); + if (!"READY_FOR_REVIEW".equals(changeSet.status())) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "变更包状态不可生成部署包: " + changeSet.status()); + } + List drafts = draftsInChangeSet(taskId, changeSet); + if (drafts.stream().anyMatch(d -> !d.passed())) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "存在门禁失败草稿,不能生成部署包"); + } + + List runs = listRuns(taskId, changeSetId); + Optional latestApply = latestRun(runs, "LOCAL_APPLY"); + Optional latestSmoke = latestRun(runs, "SMOKE"); + boolean localApplyPassed = latestApply.filter(run -> "PASSED".equals(run.status())).isPresent(); + boolean smokePassed = latestSmoke.filter(run -> "PASSED".equals(run.status())).isPresent(); + String entityId = latestApply.map(this::extractEntityId).orElse(""); + Map menuIds = latestApply.map(this::extractMenuIdsByTarget).orElse(Map.of()); + + List warnings = new ArrayList<>(); + if (!localApplyPassed) { + warnings.add("缺少最近通过的 LOCAL_APPLY 记录,线上部署前应先完成本地自动落库和 smoke"); + } + if (!smokePassed) { + warnings.add("缺少最近通过的 SMOKE 记录,线上部署前应先补齐本地 smoke 证据"); + } + if (entityId.isBlank() && drafts.stream().anyMatch(d -> d.artifactType() == AiArtifactType.SERVICEFLOW)) { + warnings.add("未能从本地 apply 记录提取 entityId,服务流 SQL 保留 ${entityId} 占位符"); + } + if (drafts.stream().anyMatch(d -> d.artifactType() == AiArtifactType.MENU + && isPlaceholderOrBlank(d.payload().path("parentId").asText("")))) { + warnings.add("菜单草稿未指定 parentId,线上 SQL 中需人工替换 ${parentMenuId}"); + } + + long generatedAt = System.currentTimeMillis(); + Map manifest = deploymentManifest(taskId, changeSet, drafts, latestApply, latestSmoke, + entityId, generatedAt); + AiDeploymentPackage deploymentPackage = new AiDeploymentPackage( + taskId, + changeSetId, + localApplyPassed && smokePassed ? "READY_FOR_HUMAN_REVIEW" : "BLOCKED_PENDING_LOCAL_PASS", + true, + generatedAt, + manifest, + deploymentSql(drafts, entityId, menuIds, generatedAt), + rollbackSql(drafts, generatedAt), + List.copyOf(warnings), + List.copyOf(runs)); + audit(taskId, "deployment-package.generated", "agent", Map.of( + "changeSetId", changeSetId, + "status", deploymentPackage.status(), + "warningCount", warnings.size(), + "requiresHumanApproval", true)); + updateTaskStatus(taskId, deploymentPackage.status()); + return deploymentPackage; + } + + public AiRepairPlan createRepairPlan(String taskId, String changeSetId) { + getTask(taskId); + findChangeSet(taskId, changeSetId); + Optional failed = latestFailedRun(listRuns(taskId, changeSetId)); + long generatedAt = System.currentTimeMillis(); + if (failed.isEmpty()) { + AiRepairPlan plan = new AiRepairPlan(taskId, changeSetId, "", + "NO_REPAIR_NEEDED", generatedAt, List.of(), + List.of("未发现需要修复的失败运行记录")); + saveRun(taskId, changeSetId, "REPAIR_PLAN", plan.status(), plan); + audit(taskId, "repair-plan.generated", "agent", Map.of( + "changeSetId", changeSetId, + "status", plan.status(), + "actionCount", 0)); + return plan; + } + + AiRunRecord source = failed.get(); + List actions = repairActions(source); + String status = actions.isEmpty() + ? "NEEDS_HUMAN_TRIAGE" + : (actions.stream().allMatch(AiRepairAction::automated) + ? "READY_FOR_AUTO_RETRY" : "NEEDS_HUMAN_ACTION"); + List messages = new ArrayList<>(); + messages.add("基于 " + source.runType() + " " + source.id() + " 生成修复计划"); + if (actions.isEmpty()) { + messages.add("失败 payload 暂无可归类动作,需要人工补充诊断"); + } else { + messages.add("识别到 " + actions.size() + " 个修复动作"); + } + AiRepairPlan plan = new AiRepairPlan(taskId, changeSetId, source.id(), + status, generatedAt, List.copyOf(actions), List.copyOf(messages)); + saveRun(taskId, changeSetId, "REPAIR_PLAN", plan.status(), plan); + audit(taskId, "repair-plan.generated", "agent", Map.of( + "changeSetId", changeSetId, + "sourceRunId", source.id(), + "status", plan.status(), + "actionCount", actions.size())); + return plan; + } + + public AiRepairExecution executeRepairPlan(String taskId, String changeSetId, String baseUrl) { + return executeRepairPlan(taskId, changeSetId, baseUrl, true); + } + + private AiRepairExecution executeRepairPlan(String taskId, String changeSetId, String baseUrl, + boolean generateDeploymentPackage) { + getTask(taskId); + AiChangeSet originalChangeSet = findChangeSet(taskId, changeSetId); + long started = System.currentTimeMillis(); + AiRepairPlan plan = latestRepairPlan(taskId, changeSetId) + .orElseGet(() -> createRepairPlan(taskId, changeSetId)); + List messages = new ArrayList<>(); + List generatedDrafts = new ArrayList<>(); + AiChangeSet repairedChangeSet = null; + AiApplyRun retryApply = null; + AiDeploymentPackage deploymentPackage = null; + + if ("NO_REPAIR_NEEDED".equals(plan.status())) { + messages.add("没有需要执行的修复动作"); + return saveRepairExecution(taskId, changeSetId, "NO_REPAIR_NEEDED", started, + plan, List.of(), null, null, null, messages); + } + List manual = plan.actions().stream().filter(a -> !a.automated()).toList(); + if (!manual.isEmpty()) { + AiAgentRepairResult agentRepair = agentRepairExecutor.repair(new AiAgentRepairContext( + taskId, changeSetId, plan, draftsInChangeSet(taskId, originalChangeSet))); + messages.addAll(agentRepair.messages()); + if (agentRepair.draftPatches().isEmpty()) { + messages.add("修复计划包含 " + manual.size() + " 个不可自动执行动作,需要人工处理后重跑"); + return saveRepairExecution(taskId, changeSetId, "BLOCKED_MANUAL_ACTION", started, + plan, List.of(), null, null, null, messages); + } + for (AiRepairDraftPatch patch : agentRepair.draftPatches()) { + generatedDrafts.add(addDraft(taskId, patch.artifactType().name(), patch.targetId(), + patch.payload(), patch.metadata())); + } + repairedChangeSet = createChangeSet(taskId); + messages.add("Agent 执行器生成 " + generatedDrafts.size() + + " 个修复草稿,并创建新变更包 " + repairedChangeSet.id()); + retryApply = applyLocalRelease(taskId, repairedChangeSet.id(), baseUrl); + if (generateDeploymentPackage) { + deploymentPackage = createDeploymentPackage(taskId, repairedChangeSet.id()); + } + String status = retryApply.passed() + && (!generateDeploymentPackage || "READY_FOR_HUMAN_REVIEW".equals(deploymentPackage.status())) + ? "REPAIRED" : "RETRY_FAILED"; + messages.addAll(applyRunMessages(retryApply)); + if (deploymentPackage != null) { + messages.addAll(deploymentPackage.warnings()); + } + return saveRepairExecution(taskId, changeSetId, status, started, + plan, generatedDrafts, repairedChangeSet, retryApply, deploymentPackage, messages); + } + + messages.add("执行 " + plan.actions().size() + " 个自动修复动作,并重跑本地 apply/smoke"); + retryApply = applyLocalRelease(taskId, changeSetId, baseUrl); + if (generateDeploymentPackage) { + deploymentPackage = createDeploymentPackage(taskId, changeSetId); + } + String status = retryApply.passed() + && (!generateDeploymentPackage || "READY_FOR_HUMAN_REVIEW".equals(deploymentPackage.status())) + ? "REPAIRED" : "RETRY_FAILED"; + messages.addAll(applyRunMessages(retryApply)); + if (deploymentPackage != null) { + messages.addAll(deploymentPackage.warnings()); + } + if ("REPAIRED".equals(status)) { + messages.add("自动修复重试通过,已重新生成线上人工部署包"); + } + return saveRepairExecution(taskId, changeSetId, status, started, + plan, List.of(), null, retryApply, deploymentPackage, messages); + } + + public List listAudit(String taskId) { + getTask(taskId); + return store.listAudit(taskId); + } + + private AiChangeSet findChangeSet(String taskId, String changeSetId) { + return store.listChangeSets(taskId).stream() + .filter(cs -> cs.id().equals(changeSetId)) + .findFirst() + .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, + "AI 变更包不存在: " + changeSetId)); + } + + private List draftsInChangeSet(String taskId, AiChangeSet changeSet) { + Map draftsById = listDrafts(taskId).stream() + .collect(Collectors.toMap(AiDraft::id, Function.identity(), (a, b) -> a, LinkedHashMap::new)); + List drafts = changeSet.draftIds().stream() + .map(draftsById::get) + .filter(d -> d != null) + .sorted(Comparator.comparingInt(d -> releaseOrder(d.artifactType()))) + .toList(); + if (drafts.size() != changeSet.draftIds().size()) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "变更包引用的草稿不完整"); + } + return drafts; + } + + private List activeDrafts(String taskId) { + Map latest = new LinkedHashMap<>(); + for (AiDraft draft : listDrafts(taskId)) { + String key = draft.artifactType().name() + "\u0000" + draft.targetId(); + AiDraft existing = latest.get(key); + if (existing == null || draft.createdAt() >= existing.createdAt()) { + latest.put(key, draft); + } + } + return latest.values().stream() + .sorted(Comparator.comparingInt(d -> releaseOrder(d.artifactType()))) + .toList(); + } + + public Map validateSchema(JsonNode schema) { + AiGateResult gate = validateSchemaGate(schema); + Map resp = new LinkedHashMap<>(); + resp.put("schemaValid", gate.passed()); + resp.put("validationErrors", gate.messages()); + return resp; + } + + private AiArtifactType parseType(String type) { + if (type == null || type.isBlank()) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "artifactType 不能为空"); + } + try { + return AiArtifactType.valueOf(type.trim().toUpperCase()); + } catch (IllegalArgumentException ex) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "不支持的 artifactType: " + type); + } + } + + private AiGateResult validateSchemaGate(JsonNode schema) { + if (schema == null || !schema.isObject()) { + return new AiGateResult("amis-schema", false, List.of("schema 顶层必须是 JSON object")); + } + List errors = getSchemaGate().validate(schema); + return new AiGateResult("amis-schema", errors.isEmpty(), errors.stream().limit(20).toList()); + } + + private List validateDraft(AiArtifactType type, String targetId, JsonNode payload) { + List gates = new ArrayList<>(); + gates.add(requiredFieldsGate(type, targetId, payload)); + gates.add(switch (type) { + case ENTITY -> validateEntityGate(payload); + case PAGE_SCHEMA -> validateSchemaGate(payload); + case SERVICEFLOW -> validateServiceFlowGate(payload); + case MENU -> validateMenuGate(payload); + case TEST -> validateTestGate(payload); + case CODE -> new AiGateResult("code-review-required", true, List.of("代码草稿需后续静态检查/单测门禁")); + }); + return List.copyOf(gates); + } + + private AiGateResult requiredFieldsGate(AiArtifactType type, String targetId, JsonNode payload) { + List messages = new ArrayList<>(); + if (targetId == null || targetId.isBlank()) { + messages.add("targetId 不能为空"); + } + if (payload == null || !payload.isObject()) { + messages.add(type.name() + " payload 顶层必须是 JSON object"); + } + return new AiGateResult("draft-required-fields", messages.isEmpty(), List.copyOf(messages)); + } + + private AiGateResult validateEntityGate(JsonNode payload) { + List messages = new ArrayList<>(); + String table = payload.path("tablename").asText(""); + if (!TABLE_NAME.matcher(table).matches()) { + messages.add("tablename 必须是 3-40 位大写字母数字下划线,且以字母开头"); + } + if (payload.path("name").asText("").isBlank()) { + messages.add("name 不能为空"); + } + JsonNode attrs = payload.path("attributes"); + if (!attrs.isArray() || attrs.isEmpty()) { + messages.add("attributes 至少需要 1 个业务字段"); + } else { + for (JsonNode attr : attrs) { + String col = attr.path("column").asText(""); + if (!COLUMN_NAME.matcher(col).matches()) { + messages.add("字段 column 不合法: " + col); + } + String type = attr.path("type").asText(""); + if (!List.of("string", "integer", "number", "date", "datetime", "boolean").contains(type)) { + messages.add("字段 " + col + " type 不支持: " + type); + } + } + } + return new AiGateResult("entity-meta", messages.isEmpty(), messages.stream().limit(20).toList()); + } + + private AiGateResult validateServiceFlowGate(JsonNode payload) { + List messages = new ArrayList<>(); + JsonNode flows = payload.path("flows"); + if (!flows.isArray() || flows.isEmpty()) { + messages.add("flows 至少需要 1 个服务流定义"); + } else { + for (JsonNode flow : flows) { + String key = flow.path("key").asText(""); + if (!FLOW_KEY.matcher(key).matches()) { + messages.add("服务流 key 不合法: " + key); + } + String xml = flow.path("contentXml").asText(""); + if (!isValidFlowXml(xml)) { + messages.add("服务流 XML 不合法: " + key); + } + } + } + return new AiGateResult("serviceflow-xml", messages.isEmpty(), messages.stream().limit(20).toList()); + } + + private AiGateResult validateMenuGate(JsonNode payload) { + List messages = new ArrayList<>(); + if (payload.path("name").asText("").isBlank()) { + messages.add("菜单 name 不能为空"); + } + if (payload.path("viewTemplateId").asText("").isBlank()) { + messages.add("菜单 viewTemplateId 不能为空"); + } + return new AiGateResult("menu-binding", messages.isEmpty(), List.copyOf(messages)); + } + + private AiGateResult validateTestGate(JsonNode payload) { + List messages = new ArrayList<>(); + JsonNode tests = payload.path("smokeTests"); + if (!tests.isArray() || tests.isEmpty()) { + messages.add("smokeTests 至少需要 1 条"); + } else { + for (JsonNode test : tests) { + String method = test.path("method").asText(""); + String url = test.path("url").asText(""); + if (!HTTP_METHOD.matcher(method).matches()) { + messages.add("smoke method 不合法: " + method); + } + if (!url.startsWith("/api/")) { + messages.add("smoke url 必须以 /api/ 开头: " + url); + } + } + } + return new AiGateResult("smoke-plan", messages.isEmpty(), messages.stream().limit(20).toList()); + } + + private static boolean isValidFlowXml(String xml) { + if (xml == null || xml.isBlank()) { + return false; + } + try { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); + factory.setFeature("http://xml.org/sax/features/external-general-entities", false); + factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false); + factory.setExpandEntityReferences(false); + var builder = factory.newDocumentBuilder(); + var doc = builder.parse(new InputSource(new java.io.StringReader(xml))); + return "flow".equals(doc.getDocumentElement().getNodeName()) + && doc.getElementsByTagName("input").getLength() > 0 + && doc.getElementsByTagName("transition").getLength() > 0; + } catch (Exception ex) { + return false; + } + } + + private SchemaGate getSchemaGate() { + if (schemaGate == null) { + synchronized (this) { + if (schemaGate == null) { + schemaGate = new SchemaGate(); + } + } + } + return schemaGate; + } + + private void audit(String taskId, String action, String actor, Map details) { + AiAuditEntry entry = new AiAuditEntry( + "aia-" + UUID.randomUUID(), + taskId, + action, + actor, + System.currentTimeMillis(), + details == null ? Map.of() : Map.copyOf(details)); + store.saveAudit(entry); + } + + private void saveRun(String taskId, String changeSetId, String runType, String status, Object payload) { + AiRunRecord run = new AiRunRecord( + "air-" + UUID.randomUUID(), + taskId, + changeSetId, + runType, + status, + System.currentTimeMillis(), + objectMapper.valueToTree(payload)); + store.saveRun(run); + } + + private AiRepairExecution saveRepairExecution(String taskId, String changeSetId, String status, long started, + AiRepairPlan plan, List generatedDrafts, + AiChangeSet repairedChangeSet, AiApplyRun retryApply, + AiDeploymentPackage deploymentPackage, + List messages) { + AiRepairExecution execution = new AiRepairExecution( + taskId, + changeSetId, + status, + started, + System.currentTimeMillis(), + plan, + generatedDrafts == null ? List.of() : List.copyOf(generatedDrafts), + repairedChangeSet, + retryApply, + deploymentPackage, + List.copyOf(messages)); + saveRun(taskId, changeSetId, "REPAIR_EXECUTION", status, execution); + audit(taskId, "repair-execution.completed", "agent", Map.of( + "changeSetId", changeSetId, + "status", status, + "messageCount", messages.size())); + if ("REPAIRED".equals(status)) { + updateTaskStatus(taskId, deploymentPackage == null ? "LOCAL_GATE_PASSED" : deploymentPackage.status()); + } + return execution; + } + + private AiAutoDevelopmentRun autoRun(AiFeatureDevelopment development, + String changeSetId, + String originalChangeSetId, + AiReleasePlan releasePlan, + AiApplyRun applyRun, + AiDeploymentPackage deploymentPackage, + List repairExecutions, + String status, + long started, + List messages) { + return new AiAutoDevelopmentRun( + development == null ? "" : development.task().id(), + changeSetId == null ? "" : changeSetId, + originalChangeSetId == null ? "" : originalChangeSetId, + status, + started, + System.currentTimeMillis(), + development, + releasePlan, + applyRun, + deploymentPackage, + repairExecutions == null ? List.of() : List.copyOf(repairExecutions), + List.copyOf(messages)); + } + + private AutoRepairOutcome runAutoRepairs(AiAutoDevelopmentRequest req, + AiFeatureDevelopment development, + String changeSetId, + AiApplyRun applyRun, + AiDeploymentPackage deploymentPackage, + List messages, + List repairExecutions) { + String currentChangeSetId = changeSetId; + AiApplyRun currentApplyRun = applyRun; + AiDeploymentPackage currentDeploymentPackage = deploymentPackage; + int maxAttempts = req.repairAttemptLimit(); + if (development == null || maxAttempts <= 0) { + return new AutoRepairOutcome(currentChangeSetId, currentApplyRun, currentDeploymentPackage); + } + String taskId = development.task().id(); + for (int attempt = 1; attempt <= maxAttempts; attempt++) { + String currentStatus = autoDevelopmentStatus(currentApplyRun, currentDeploymentPackage, + req.shouldGenerateDeploymentPackage()); + if (successfulStatus(currentStatus)) { + break; + } + AiRepairPlan plan = createRepairPlan(taskId, currentChangeSetId); + if ("NO_REPAIR_NEEDED".equals(plan.status())) { + messages.add("自动修复第 " + attempt + " 轮停止: 未发现可修复失败证据"); + break; + } + AiRepairExecution execution = executeRepairPlan(taskId, currentChangeSetId, req.baseUrl(), + req.shouldGenerateDeploymentPackage()); + repairExecutions.add(execution); + messages.add("自动修复第 " + attempt + " 轮结果: " + execution.status()); + messages.addAll(execution.messages()); + if (execution.repairedChangeSet() != null) { + currentChangeSetId = execution.repairedChangeSet().id(); + } + if (execution.retryApplyRun() != null) { + currentApplyRun = execution.retryApplyRun(); + } + if (execution.deploymentPackage() != null) { + currentDeploymentPackage = execution.deploymentPackage(); + } + if ("REPAIRED".equals(execution.status())) { + break; + } + if (List.of("NO_REPAIR_NEEDED", "BLOCKED_MANUAL_ACTION").contains(execution.status())) { + break; + } + } + return new AutoRepairOutcome(currentChangeSetId, currentApplyRun, currentDeploymentPackage); + } + + private static String autoDevelopmentStatus(AiApplyRun applyRun, AiDeploymentPackage deploymentPackage, + boolean deploymentPackageRequested) { + if (applyRun == null || !applyRun.passed()) { + return "LOCAL_GATE_FAILED"; + } + if (!deploymentPackageRequested) { + return "LOCAL_GATE_PASSED"; + } + return deploymentPackage == null ? "FAILED" : deploymentPackage.status(); + } + + private static List applyRunMessages(AiApplyRun applyRun) { + if (applyRun == null || applyRun.passed()) { + return List.of(); + } + List messages = new ArrayList<>(); + if (applyRun.steps() != null) { + for (AiApplyStepResult step : applyRun.steps()) { + if ("FAILED".equals(step.status())) { + messages.add(step.artifactType().name() + " " + step.target() + ": " + step.message()); + } + } + } + AiSmokeRun smoke = applyRun.smokeRun(); + if (smoke != null && smoke.results() != null) { + for (AiSmokeResult result : smoke.results()) { + if (!result.passed()) { + messages.add("SMOKE " + result.name() + " " + result.method() + " " + + result.url() + ": " + result.error()); + } + } + } + if (messages.isEmpty()) { + messages.add("本地门禁失败: " + applyRun.status()); + } + return List.copyOf(messages); + } + + private record AutoRepairOutcome( + String changeSetId, + AiApplyRun applyRun, + AiDeploymentPackage deploymentPackage) { + } + + private void updateTaskStatus(String taskId, String status) { + AiTask task = getTask(taskId); + store.saveTask(new AiTask( + task.id(), + task.objective(), + status, + task.createdAt(), + System.currentTimeMillis(), + task.plan())); + } + + private static String responseError(ResponseStatusException ex) { + String reason = ex.getReason(); + if (reason == null || reason.isBlank()) { + return "HTTP " + ex.getStatusCode().value(); + } + return "HTTP " + ex.getStatusCode().value() + ": " + reason; + } + + private static boolean isPlaceholderOrBlank(String value) { + return value == null || value.isBlank() || value.contains("${"); + } + + private Optional latestRun(List runs, String runType) { + return runs.stream() + .filter(run -> runType.equals(run.runType())) + .max(Comparator.comparingLong(AiRunRecord::createdAt)); + } + + private Optional latestRepairPlan(String taskId, String changeSetId) { + return latestRun(listRuns(taskId, changeSetId), "REPAIR_PLAN") + .map(run -> objectMapper.convertValue(run.payload(), AiRepairPlan.class)); + } + + private Optional latestFailedRun(List runs) { + return runs.stream() + .filter(run -> List.of("AUTO_DEVELOP", "LOCAL_APPLY", "SMOKE").contains(run.runType())) + .filter(run -> !successfulStatus(run.status())) + .max(Comparator.comparingLong(AiRunRecord::createdAt)); + } + + private static boolean successfulStatus(String status) { + return List.of("PASSED", "LOCAL_GATE_PASSED", "READY_FOR_HUMAN_REVIEW").contains(status); + } + + private List repairActions(AiRunRecord source) { + List actions = new ArrayList<>(); + JsonNode payload = source.payload(); + if ("AUTO_DEVELOP".equals(source.runType())) { + JsonNode applyRun = payload.path("applyRun"); + if (applyRun.isObject()) { + actions.addAll(applyRepairActions(source, applyRun)); + } + } else if ("LOCAL_APPLY".equals(source.runType())) { + actions.addAll(applyRepairActions(source, payload)); + } else if ("SMOKE".equals(source.runType())) { + actions.addAll(smokeRepairActions(source, payload)); + } + return List.copyOf(actions); + } + + private List applyRepairActions(AiRunRecord source, JsonNode applyRun) { + List actions = new ArrayList<>(); + JsonNode steps = applyRun.path("steps"); + if (steps.isArray()) { + for (JsonNode step : steps) { + if (!"APPLIED".equals(step.path("status").asText(""))) { + actions.add(applyStepRepairAction(actions.size() + 1, source, step)); + } + } + } + JsonNode smoke = applyRun.path("smokeRun"); + if (smoke.isObject()) { + actions.addAll(smokeRepairActions(source, smoke, actions.size())); + } + return List.copyOf(actions); + } + + private List smokeRepairActions(AiRunRecord source, JsonNode smokeRun) { + return smokeRepairActions(source, smokeRun, 0); + } + + private List smokeRepairActions(AiRunRecord source, JsonNode smokeRun, int offset) { + List actions = new ArrayList<>(); + JsonNode results = smokeRun.path("results"); + if (results.isArray()) { + for (JsonNode result : results) { + if (!result.path("passed").asBoolean(false)) { + actions.add(smokeRepairAction(offset + actions.size() + 1, source, result)); + } + } + } + return List.copyOf(actions); + } + + private AiRepairAction applyStepRepairAction(int index, AiRunRecord source, JsonNode step) { + String artifactType = step.path("artifactType").asText(""); + String target = step.path("target").asText(""); + String message = step.path("message").asText(""); + boolean transientFailure = isTransientFailure(message); + String actionType = transientFailure ? "RETRY_TRANSIENT_APPLY_FAILURE" : switch (artifactType) { + case "ENTITY" -> "REPAIR_ENTITY_METADATA_OR_LOCAL_API"; + case "SERVICEFLOW" -> message.contains("entityId") + ? "RETRY_AFTER_ENTITY_ID_RESOLUTION" : "REPAIR_SERVICEFLOW_XML_OR_SQL"; + case "PAGE_SCHEMA" -> "REPAIR_PAGE_SCHEMA_SQL_OR_SCHEMA"; + case "MENU" -> message.contains("sys_menu_root") + ? "SEED_MENU_ROOT_OR_SET_PARENT" : "REPAIR_MENU_BINDING"; + case "CODE" -> "RUN_CODE_REVIEW_AND_TESTS"; + default -> "INSPECT_APPLY_STEP"; + }; + return new AiRepairAction( + "repair-" + index, + source.runType(), + actionType, + artifactType, + target, + transientFailure, + message.isBlank() ? "本地应用步骤失败,需要修复后重跑 local-apply" : message, + Map.of( + "sourceRunId", source.id(), + "stepId", step.path("id").asText(""), + "stepStatus", step.path("status").asText(""), + "details", step.path("details"))); + } + + private AiRepairAction smokeRepairAction(int index, AiRunRecord source, JsonNode result) { + int actual = result.path("actualHttpStatus").asInt(-1); + String error = result.path("error").asText(""); + String actionType; + boolean automated = false; + if (actual == -1) { + actionType = "START_LOCAL_APP_OR_FIX_BASE_URL"; + } else if (List.of(502, 503, 504).contains(actual)) { + actionType = "RETRY_TRANSIENT_SMOKE_FAILURE"; + automated = true; + } else if (actual == 404) { + actionType = "REPAIR_ROUTE_OR_DRAFT_BINDING"; + } else if (actual >= 500) { + actionType = "REPAIR_BACKEND_FLOW_OR_ENTITY_METADATA"; + } else { + actionType = "REPAIR_SMOKE_EXPECTATION_OR_API_CONTRACT"; + } + return new AiRepairAction( + "repair-" + index, + source.runType(), + actionType, + "TEST", + result.path("name").asText("smoke"), + automated, + error.isBlank() ? "smoke 未通过,需要修复接口契约后重跑" : error, + Map.of( + "sourceRunId", source.id(), + "method", result.path("method").asText(""), + "url", result.path("url").asText(""), + "expectedHttpStatus", result.path("expectedHttpStatus").asInt(200), + "actualHttpStatus", actual, + "responseSnippet", result.path("responseSnippet").asText(""))); + } + + private static boolean isTransientFailure(String message) { + if (message == null || message.isBlank()) { + return false; + } + String text = message.toLowerCase(); + return text.contains("timeout") + || text.contains("timed out") + || text.contains("deadlock") + || text.contains("sqltransient") + || text.contains("http 502") + || text.contains("http 503") + || text.contains("http 504") + || text.contains("temporarily"); + } + + private String extractEntityId(AiRunRecord run) { + JsonNode steps = run.payload().path("steps"); + if (!steps.isArray()) { + return ""; + } + for (JsonNode step : steps) { + if ("ENTITY".equals(step.path("artifactType").asText())) { + String entityId = step.path("details").path("entityId").asText(""); + if (!entityId.isBlank()) { + return entityId; + } + } + } + return ""; + } + + private Map extractMenuIdsByTarget(AiRunRecord run) { + Map out = new LinkedHashMap<>(); + JsonNode steps = run.payload().path("steps"); + if (!steps.isArray()) { + return Map.of(); + } + for (JsonNode step : steps) { + if ("MENU".equals(step.path("artifactType").asText())) { + String target = step.path("target").asText(""); + String menuId = step.path("details").path("menuId").asText(""); + if (!target.isBlank() && !menuId.isBlank()) { + out.put(target, menuId); + } + } + } + return Map.copyOf(out); + } + + private Map deploymentManifest(String taskId, AiChangeSet changeSet, List drafts, + Optional latestApply, + Optional latestSmoke, + String entityId, + long generatedAt) { + Map manifest = new LinkedHashMap<>(); + manifest.put("packageId", "aipkg-" + UUID.randomUUID()); + manifest.put("taskId", taskId); + manifest.put("changeSetId", changeSet.id()); + manifest.put("generatedAt", generatedAt); + manifest.put("productionPolicy", "人工审批 SQL/API 部署包;Agent 不直连线上环境执行变更"); + manifest.put("requiresHumanApproval", true); + manifest.put("entityId", entityId); + manifest.put("drafts", drafts.stream().map(draft -> { + Map item = new LinkedHashMap<>(); + item.put("draftId", draft.id()); + item.put("artifactType", draft.artifactType().name()); + item.put("targetId", draft.targetId()); + item.put("passed", draft.passed()); + item.put("createdAt", draft.createdAt()); + return item; + }).toList()); + Map evidence = new LinkedHashMap<>(); + evidence.put("latestLocalApply", latestApply.map(this::runSummary).orElse(null)); + evidence.put("latestSmoke", latestSmoke.map(this::runSummary).orElse(null)); + manifest.put("evidence", evidence); + return Map.copyOf(manifest); + } + + private Map runSummary(AiRunRecord run) { + Map summary = new LinkedHashMap<>(); + summary.put("runId", run.id()); + summary.put("runType", run.runType()); + summary.put("status", run.status()); + summary.put("createdAt", run.createdAt()); + return Map.copyOf(summary); + } + + private List deploymentSql(List drafts, String entityId, + Map menuIdsByTarget, long generatedAt) { + List out = new ArrayList<>(); + for (AiDraft draft : drafts) { + switch (draft.artifactType()) { + case ENTITY -> out.add(entityDeploymentNote(draft)); + case SERVICEFLOW -> out.addAll(serviceFlowSql(draft, entityId, generatedAt)); + case PAGE_SCHEMA -> out.add(pageSchemaSql(draft, generatedAt)); + case MENU -> out.add(menuSql(draft, menuIdsByTarget.get(draft.targetId()), generatedAt)); + case TEST -> out.add("-- TEST " + draft.targetId() + ": 保留 smoke 结果作为上线审批附件,不生成生产 SQL"); + case CODE -> out.add("-- CODE " + draft.targetId() + ": 代码改动需通过代码仓库发布流程,不生成运行态 SQL"); + } + } + return List.copyOf(out); + } + + private String entityDeploymentNote(AiDraft draft) { + return "-- ENTITY " + draft.targetId() + + ": 人工审批后在目标环境调用 POST /api/meta/entity,payload=" + + json(draft.payload()) + + ";确认返回 entityId 后替换服务流 SQL 中的 ${entityId}"; + } + + private List serviceFlowSql(AiDraft draft, String entityId, long generatedAt) { + List out = new ArrayList<>(); + String resolvedEntityId = entityId == null || entityId.isBlank() ? "${entityId}" : entityId; + for (JsonNode flow : draft.payload().path("flows")) { + String xml = flow.path("contentXml").asText(""); + if (!entityId.isBlank()) { + xml = xml.replace("${entityId}", entityId); + } + out.add(""" + INSERT INTO sys_serviceflow + (sys_serviceflow_id, displayname, contentxml, entityid, iscontrol, isupdateable, + isactive, createtime, updatetime, createby, updateby, version) + VALUES (%s, %s, %s, %s, %d, %d, 1, %d, %d, 'AI_AGENT', 'AI_AGENT', 0) + ON CONFLICT (sys_serviceflow_id) DO UPDATE SET + displayname = EXCLUDED.displayname, + contentxml = EXCLUDED.contentxml, + entityid = EXCLUDED.entityid, + iscontrol = EXCLUDED.iscontrol, + isupdateable = EXCLUDED.isupdateable, + updatetime = EXCLUDED.updatetime, + updateby = EXCLUDED.updateby, + version = sys_serviceflow.version + 1; + """.formatted( + sqlString(flow.path("key").asText()), + sqlString(flow.path("displayName").asText(flow.path("key").asText())), + sqlString(xml), + sqlString(resolvedEntityId), + flow.path("control").asBoolean(true) ? 1 : 0, + flow.path("updateable").asBoolean(true) ? 1 : 0, + generatedAt, + generatedAt)); + } + return out; + } + + private String pageSchemaSql(AiDraft draft, long generatedAt) { + String schemaJson = json(draft.payload()); + return """ + INSERT INTO sys_page_schema (template_id, name, schema_json, schema_etag, version, update_time) + VALUES (%s, %s, %s::jsonb, %s, 1, %d) + ON CONFLICT (template_id) DO UPDATE SET + name = EXCLUDED.name, + schema_json = EXCLUDED.schema_json, + schema_etag = EXCLUDED.schema_etag, + version = sys_page_schema.version + 1, + update_time = EXCLUDED.update_time; + """.formatted( + sqlString(draft.targetId()), + sqlString(draft.payload().path("title").asText(draft.targetId())), + sqlString(schemaJson), + sqlString(sha256(schemaJson)), + generatedAt); + } + + private String menuSql(AiDraft draft, String appliedMenuId, long generatedAt) { + JsonNode payload = draft.payload(); + String menuId = appliedMenuId == null || appliedMenuId.isBlank() ? "${menuId}" : appliedMenuId; + String parentId = payload.path("parentId").asText(""); + if (parentId.isBlank()) { + parentId = "${parentMenuId}"; + } + String menuRoot = payload.path("menuroot").asText(""); + if (menuRoot.isBlank()) { + menuRoot = "${menuRoot}"; + } + return """ + INSERT INTO sys_menu + (sys_menu_id, name, parentid, view_templateid, typename, menuroot, seq, + isactive, version, createtime, createby, updatetime, updateby) + VALUES (%s, %s, %s, %s, %s, %s, %d, 1, 0, %d, 'AI_AGENT', %d, 'AI_AGENT') + ON CONFLICT (sys_menu_id) DO UPDATE SET + name = EXCLUDED.name, + parentid = EXCLUDED.parentid, + view_templateid = EXCLUDED.view_templateid, + typename = EXCLUDED.typename, + menuroot = EXCLUDED.menuroot, + seq = EXCLUDED.seq, + isactive = 1, + updatetime = EXCLUDED.updatetime, + updateby = EXCLUDED.updateby, + version = sys_menu.version + 1; + """.formatted( + sqlString(menuId), + sqlString(payload.path("name").asText(draft.targetId())), + sqlString(parentId), + sqlString(payload.path("viewTemplateId").asText(draft.targetId())), + sqlString(payload.path("typename").asText("功能菜单")), + sqlString(menuRoot), + payload.path("seq").asInt(0), + generatedAt, + generatedAt); + } + + private List rollbackSql(List drafts, long generatedAt) { + List out = new ArrayList<>(); + for (AiDraft draft : drafts) { + switch (draft.artifactType()) { + case ENTITY -> out.add("-- ENTITY " + draft.targetId() + + ": 人工确认后调用 DELETE /api/meta/entity/" + draft.targetId() + + ",并清理对应菜单/服务流/页面 schema"); + case SERVICEFLOW -> out.add(serviceFlowRollbackSql(draft)); + case PAGE_SCHEMA -> out.add("DELETE FROM sys_page_schema WHERE template_id = " + + sqlString(draft.targetId()) + ";"); + case MENU -> out.add(""" + UPDATE sys_menu + SET isactive = 0, updatetime = %d, updateby = 'AI_AGENT_ROLLBACK', + version = version + 1 + WHERE TRIM(view_templateid) = %s; + """.formatted(generatedAt, sqlString(draft.targetId()))); + case TEST -> out.add("-- TEST " + draft.targetId() + ": 无生产数据回滚动作"); + case CODE -> out.add("-- CODE " + draft.targetId() + ": 通过代码仓库反向补丁或回滚发布单处理"); + } + } + return List.copyOf(out); + } + + private String serviceFlowRollbackSql(AiDraft draft) { + List keys = new ArrayList<>(); + for (JsonNode flow : draft.payload().path("flows")) { + keys.add(sqlString(flow.path("key").asText())); + } + return "DELETE FROM sys_serviceflow WHERE sys_serviceflow_id IN (" + + String.join(", ", keys) + ");"; + } + + private String json(Object value) { + try { + return objectMapper.writeValueAsString(value); + } catch (JsonProcessingException ex) { + throw new IllegalArgumentException("AI Agent 部署包 JSON 序列化失败", ex); + } + } + + private static String sqlString(String value) { + String text = value == null ? "" : value; + return "'" + text.replace("'", "''") + "'"; + } + + private static String sha256(String text) { + try { + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + return HexFormat.of().formatHex(digest.digest(text.getBytes(StandardCharsets.UTF_8))); + } catch (NoSuchAlgorithmException ex) { + throw new IllegalStateException(ex); + } + } + + private static List defaultPlan() { + List plan = new ArrayList<>(); + plan.add("采集需求和上下文"); + plan.add("生成实体/页面/服务流/菜单草稿"); + plan.add("执行 schema 校验、渲染冒烟和 API smoke"); + plan.add("失败时自动修复并重跑门禁"); + plan.add("生成待人审变更包和回滚说明"); + return List.copyOf(plan); + } + + private static Map stringifyKeys(Map counts) { + Map out = new LinkedHashMap<>(); + for (Map.Entry e : counts.entrySet()) { + out.put(e.getKey().name(), e.getValue()); + } + return out; + } + + private static int releaseOrder(AiArtifactType type) { + return switch (type) { + case ENTITY -> 10; + case SERVICEFLOW -> 20; + case PAGE_SCHEMA -> 30; + case MENU -> 40; + case TEST -> 50; + case CODE -> 60; + }; + } + + private static boolean stepPassed(AiApplyStepResult step) { + return step != null && ("APPLIED".equals(step.status()) || "SKIPPED".equals(step.status())); + } + + private static String defaultBaseUrl(String baseUrl) { + return baseUrl == null || baseUrl.isBlank() ? "http://localhost:8084" : baseUrl.trim(); + } + + private static AiReleaseStep releaseStep(int index, AiDraft draft) { + return switch (draft.artifactType()) { + case ENTITY -> new AiReleaseStep( + "step-" + index, + draft.artifactType(), + "创建实体元数据和物理表", + "LOCAL_EXECUTABLE", + draft.targetId(), + "POST /api/meta/entity", + Map.of("payload", draft.payload())); + case SERVICEFLOW -> new AiReleaseStep( + "step-" + index, + draft.artifactType(), + "发布实体默认服务流", + "LOCAL_EXECUTABLE", + draft.targetId(), + "UPSERT sys_serviceflow after ENTITY returns entityId", + Map.of( + "flowCount", draft.payload().path("flows").size(), + "requiresEntityId", draft.payload().path("requiresEntityId").asBoolean(false))); + case PAGE_SCHEMA -> new AiReleaseStep( + "step-" + index, + draft.artifactType(), + "发布页面 schema", + "LOCAL_EXECUTABLE", + draft.targetId(), + "UPSERT sys_page_schema", + Map.of("templateId", draft.targetId(), "schema", draft.payload())); + case MENU -> new AiReleaseStep( + "step-" + index, + draft.artifactType(), + "挂载菜单入口", + "LOCAL_EXECUTABLE", + draft.targetId(), + "POST /api/admin/menus/create or SYS_MENU upsert", + Map.of("payload", draft.payload())); + case TEST -> new AiReleaseStep( + "step-" + index, + draft.artifactType(), + "运行本地 smoke 测试", + "LOCAL_GATE", + draft.targetId(), + "execute smokeTests locally", + Map.of("smokeTestCount", draft.payload().path("smokeTests").size())); + case CODE -> new AiReleaseStep( + "step-" + index, + draft.artifactType(), + "应用代码改动", + "LOCAL_EXECUTABLE", + draft.targetId(), + "apply patch and run tests", + Map.of("payload", draft.payload())); + }; + } + + private static List rollbackNotes(List drafts) { + List notes = new ArrayList<>(); + for (AiDraft draft : drafts) { + switch (draft.artifactType()) { + case ENTITY -> notes.add("如实体发布失败或需回滚,调用 DELETE /api/meta/entity/" + draft.targetId() + + "(仅 EIP4 前缀实体)并清 POInfo/白名单缓存"); + case SERVICEFLOW -> notes.add("删除本次新增/更新的 sys_serviceflow 记录: " + draft.targetId()); + case PAGE_SCHEMA -> notes.add("删除或恢复 sys_page_schema template_id=" + draft.targetId()); + case MENU -> notes.add("删除或禁用指向 templateId=" + draft.targetId() + " 的菜单项"); + case TEST -> notes.add("保留 smoke 测试结果作为上线审批附件"); + case CODE -> notes.add("按代码变更包反向补丁回滚: " + draft.targetId()); + } + } + return List.copyOf(notes); + } +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java new file mode 100644 index 0000000..5c15e76 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java @@ -0,0 +1,407 @@ +package com.eip4.platform.ai.service; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.HexFormat; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + +import org.springframework.stereotype.Component; + +import com.dsasp.server.common.core.FlowDefinition; +import com.dsasp.server.core.service.flow.model.DefaultFlowHelper; +import com.eip4.platform.ai.model.AiArtifactType; +import com.eip4.platform.ai.model.AiFeatureField; +import com.eip4.platform.ai.model.AiFeatureRequest; +import com.eip4.platform.ai.model.AiGeneratedDraft; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; + +@Component +public class AiFeatureDraftGenerator { + + private static final String ENTITY_ID_PLACEHOLDER = "${entityId}"; + private static final Set SYSTEM_COLUMNS = Set.of( + "VERSION", "CREATETIME", "UPDATETIME", "CREATEBY", "UPDATEBY", "ISACTIVE"); + + private final ObjectMapper objectMapper; + + public AiFeatureDraftGenerator(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + + public List generate(AiFeatureRequest request) { + FeatureSpec spec = normalize(request); + List drafts = new ArrayList<>(); + drafts.add(new AiGeneratedDraft(AiArtifactType.ENTITY, spec.tableName(), + entityPayload(spec), metadata("entity-meta", "/api/meta/entity"))); + drafts.add(new AiGeneratedDraft(AiArtifactType.PAGE_SCHEMA, spec.templateId(), + pageSchema(spec), metadata("page-schema", "sys_page_schema"))); + drafts.add(new AiGeneratedDraft(AiArtifactType.SERVICEFLOW, spec.tableName() + "_DEFAULT_FLOWS", + serviceFlowPayload(spec), metadata("serviceflow", "sys_serviceflow"))); + drafts.add(new AiGeneratedDraft(AiArtifactType.MENU, spec.templateId(), + menuPayload(spec), metadata("menu", "sys_menu"))); + drafts.add(new AiGeneratedDraft(AiArtifactType.TEST, spec.templateId() + "-smoke", + testPayload(spec), metadata("smoke-test", "local-gates"))); + return List.copyOf(drafts); + } + + private ObjectNode entityPayload(FeatureSpec spec) { + ObjectNode root = objectMapper.createObjectNode(); + root.put("publishTarget", "/api/meta/entity"); + root.put("tablename", spec.tableName()); + root.put("name", spec.entityName()); + ArrayNode attrs = root.putArray("attributes"); + for (FieldSpec field : spec.fields()) { + ObjectNode attr = attrs.addObject(); + attr.put("column", field.column()); + attr.put("display", field.label()); + attr.put("type", field.type()); + if (field.length() != null) { + attr.put("length", field.length()); + } + attr.put("mandatory", field.required()); + } + return root; + } + + private ObjectNode pageSchema(FeatureSpec spec) { + ObjectNode page = objectMapper.createObjectNode(); + page.put("type", "page"); + page.put("title", spec.featureName()); + ArrayNode body = page.putArray("body"); + ObjectNode crud = body.addObject(); + crud.put("type", "crud"); + crud.put("name", lowerCamel(spec.tableName()) + "Crud"); + crud.put("syncLocation", false); + ObjectNode api = crud.putObject("api"); + api.put("method", "get"); + api.put("url", "/api/entity/" + spec.tableName() + "/list?page=${page}&perPage=${perPage}"); + api.put("adaptor", "return payload;"); + ArrayNode headerToolbar = crud.putArray("headerToolbar"); + ObjectNode addButton = headerToolbar.addObject(); + addButton.put("type", "button"); + addButton.put("label", "新增"); + addButton.put("level", "primary"); + addButton.put("icon", "fa fa-plus"); + addButton.put("actionType", "dialog"); + ObjectNode addDialog = addButton.putObject("dialog"); + addDialog.put("title", "新增" + spec.entityName()); + ObjectNode addForm = addDialog.putObject("body"); + addForm.put("type", "form"); + addForm.put("api", "post:/api/entity/" + spec.tableName() + "/save"); + addForm.set("body", formControls(spec, false)); + headerToolbar.add("pagination"); + ArrayNode footerToolbar = crud.putArray("footerToolbar"); + footerToolbar.add("statistics"); + footerToolbar.add("pagination"); + crud.put("perPage", 20); + crud.set("columns", columns(spec)); + return page; + } + + private ArrayNode columns(FeatureSpec spec) { + ArrayNode columns = objectMapper.createArrayNode(); + for (FieldSpec field : spec.fields()) { + ObjectNode column = columns.addObject(); + column.put("name", field.column()); + column.put("label", field.label()); + } + ObjectNode op = columns.addObject(); + op.put("type", "operation"); + op.put("label", "操作"); + op.put("width", 180); + ArrayNode buttons = op.putArray("buttons"); + ObjectNode edit = buttons.addObject(); + edit.put("type", "button"); + edit.put("label", "编辑"); + edit.put("level", "link"); + edit.put("actionType", "dialog"); + ObjectNode editDialog = edit.putObject("dialog"); + editDialog.put("title", "编辑${" + displayColumn(spec) + "}"); + ObjectNode editForm = editDialog.putObject("body"); + editForm.put("type", "form"); + editForm.put("api", "post:/api/entity/" + spec.tableName() + "/save"); + ArrayNode editControls = formControls(spec, true); + ObjectNode hiddenPk = objectMapper.createObjectNode(); + hiddenPk.put("type", "hidden"); + hiddenPk.put("name", spec.tableName() + "_ID"); + hiddenPk.put("value", "${" + spec.tableName() + "_ID}"); + editControls.add(hiddenPk); + editForm.set("body", editControls); + + ObjectNode del = buttons.addObject(); + del.put("type", "button"); + del.put("label", "删除"); + del.put("level", "link"); + del.put("className", "text-danger"); + del.put("actionType", "ajax"); + del.put("confirmText", "确认删除该记录?"); + ObjectNode delApi = del.putObject("api"); + delApi.put("method", "post"); + delApi.put("url", "/api/entity/" + spec.tableName() + "/delete"); + ObjectNode data = delApi.putObject("data"); + data.put("id", "${" + spec.tableName() + "_ID}"); + del.put("reload", lowerCamel(spec.tableName()) + "Crud"); + return columns; + } + + private ArrayNode formControls(FeatureSpec spec, boolean bindCurrentRow) { + ArrayNode controls = objectMapper.createArrayNode(); + for (FieldSpec field : spec.fields()) { + ObjectNode c = controls.addObject(); + c.put("type", controlType(field.type())); + c.put("name", field.column()); + c.put("label", field.label()); + if (field.required()) { + c.put("required", true); + } + if (bindCurrentRow) { + c.put("value", "${" + field.column() + "}"); + } + } + return controls; + } + + private ObjectNode serviceFlowPayload(FeatureSpec spec) { + ObjectNode root = objectMapper.createObjectNode(); + root.put("publishTarget", "sys_serviceflow"); + root.put("requiresEntityId", true); + root.put("entityIdBinding", "publish ENTITY draft first, then replace " + ENTITY_ID_PLACEHOLDER); + ArrayNode flows = root.putArray("flows"); + addFlow(flows, DefaultFlowHelper.getDefaultAdd(spec.tableName(), ENTITY_ID_PLACEHOLDER, spec.entityName())); + addFlow(flows, DefaultFlowHelper.getDefaultUpdate(spec.tableName(), ENTITY_ID_PLACEHOLDER, spec.entityName())); + addFlow(flows, DefaultFlowHelper.getDefaultSearch(spec.tableName(), ENTITY_ID_PLACEHOLDER, spec.entityName())); + addFlow(flows, DefaultFlowHelper.getDefaultDelete(spec.tableName(), ENTITY_ID_PLACEHOLDER, spec.entityName())); + addFlow(flows, DefaultFlowHelper.getDefaultLoad(spec.tableName(), ENTITY_ID_PLACEHOLDER, spec.entityName())); + return root; + } + + private void addFlow(ArrayNode flows, FlowDefinition flow) { + ObjectNode node = flows.addObject(); + node.put("key", flow.getKey()); + node.put("displayName", flow.getDisplayName()); + node.put("entityId", flow.getEntityId()); + node.put("control", flow.isControl()); + node.put("updateable", flow.isUpdateable()); + node.put("contentXml", flow.getFlow()); + } + + private ObjectNode menuPayload(FeatureSpec spec) { + ObjectNode root = objectMapper.createObjectNode(); + root.put("publishTarget", "sys_menu"); + root.put("name", spec.menuName()); + root.put("typename", "功能菜单"); + root.put("viewTemplateId", spec.templateId()); + root.put("seq", 0); + return root; + } + + private ObjectNode testPayload(FeatureSpec spec) { + ObjectNode root = objectMapper.createObjectNode(); + root.put("publishTarget", "local-smoke"); + ArrayNode tests = root.putArray("smokeTests"); + addSmoke(tests, "page-schema", "GET", "/api/page/schema/" + spec.templateId(), 200); + addSmoke(tests, "entity-list", "GET", "/api/entity/" + spec.tableName() + "/list?page=1&perPage=20", 200); + addSmoke(tests, "flow-search", "GET", "/api/flow/" + spec.tableName() + "_SEARCH?page=1&perPage=20", 200); + ObjectNode create = addSmoke(tests, "entity-create", "POST", + "/api/entity/" + spec.tableName() + "/save", 200); + create.set("requestBody", sampleEntityBody(spec)); + ArrayNode manual = root.putArray("manualGates"); + manual.add("确认实体字段、菜单位置、权限角色和服务流写入策略"); + manual.add("确认本地 smoke 通过后再人工部署线上"); + return root; + } + + private ObjectNode addSmoke(ArrayNode tests, String name, String method, String url, int expectStatus) { + ObjectNode t = tests.addObject(); + t.put("name", name); + t.put("method", method); + t.put("url", url); + t.put("expectHttpStatus", expectStatus); + return t; + } + + private ObjectNode sampleEntityBody(FeatureSpec spec) { + ObjectNode body = objectMapper.createObjectNode(); + for (FieldSpec field : spec.fields()) { + switch (field.type()) { + case "integer" -> body.put(field.column(), 1); + case "number" -> body.put(field.column(), 1.0); + case "date" -> body.put(field.column(), "2026-01-01"); + case "datetime" -> body.put(field.column(), "2026-01-01 00:00:00"); + case "boolean" -> body.put(field.column(), true); + default -> body.put(field.column(), "AI_SMOKE_" + field.column()); + } + } + return body; + } + + private FeatureSpec normalize(AiFeatureRequest request) { + String feature = firstText(request == null ? null : request.featureName(), + request == null ? null : request.entityName(), + request == null ? null : request.objective(), + "AI功能"); + String table = normalizeTable(request == null ? null : request.tableName(), feature); + String entityName = firstText(request == null ? null : request.entityName(), feature, table); + String templateId = normalizeTemplateId(request == null ? null : request.templateId(), table); + String menuName = firstText(request == null ? null : request.menuName(), feature); + List fields = normalizeFields(request == null ? null : request.fields()); + return new FeatureSpec(feature, table, entityName, templateId, menuName, fields); + } + + private List normalizeFields(List input) { + List raw = input == null ? List.of() : input; + List out = new ArrayList<>(); + Set seen = new LinkedHashSet<>(); + for (AiFeatureField f : raw) { + String column = normalizeColumn(f == null ? null : f.column()); + if (column == null || SYSTEM_COLUMNS.contains(column) || !seen.add(column)) { + continue; + } + String type = normalizeType(f.type()); + Integer length = normalizeLength(type, f.length()); + String label = firstText(f.label(), column); + out.add(new FieldSpec(column, label, type, length, Boolean.TRUE.equals(f.required()))); + } + if (out.isEmpty()) { + out.add(new FieldSpec("NAME", "名称", "string", 100, true)); + out.add(new FieldSpec("DESCRIPTION", "描述", "string", 500, false)); + } + return List.copyOf(out); + } + + private static String normalizeTable(String raw, String seed) { + String table = raw == null ? "" : raw.trim().toUpperCase(Locale.ROOT); + table = table.replaceAll("[^A-Z0-9_]", "_").replaceAll("_+", "_"); + if (!table.matches("[A-Z][A-Z0-9_]{2,40}")) { + table = "EIP4AI_" + sha(seed).substring(0, 10).toUpperCase(Locale.ROOT); + } + if (table.length() > 40) { + table = table.substring(0, 40); + } + return table; + } + + private static String normalizeTemplateId(String raw, String table) { + String id = raw == null ? "" : raw.trim(); + if (id.isBlank()) { + id = table.toLowerCase(Locale.ROOT).replace('_', '-'); + } + id = id.replaceAll("[^A-Za-z0-9_.:-]", "-").replaceAll("-+", "-"); + return id.length() > 64 ? id.substring(0, 64) : id; + } + + private static String normalizeColumn(String raw) { + if (raw == null || raw.isBlank()) { + return null; + } + String col = raw.trim().toUpperCase(Locale.ROOT).replaceAll("[^A-Z0-9_]", "_").replaceAll("_+", "_"); + if (!col.matches("[A-Z][A-Z0-9_]{0,39}")) { + col = "F_" + col; + } + return col.length() > 40 ? col.substring(0, 40) : col; + } + + private static String normalizeType(String raw) { + String t = raw == null ? "" : raw.trim().toLowerCase(Locale.ROOT); + return switch (t) { + case "int", "integer", "long" -> "integer"; + case "number", "decimal", "double", "money" -> "number"; + case "date" -> "date"; + case "datetime", "time", "timestamp" -> "datetime"; + case "bool", "boolean" -> "boolean"; + default -> "string"; + }; + } + + private static Integer normalizeLength(String type, Integer length) { + if (!"string".equals(type)) { + return null; + } + if (length == null || length < 1) { + return 100; + } + return Math.min(length, 2000); + } + + private static String controlType(String fieldType) { + return switch (fieldType) { + case "integer", "number" -> "input-number"; + case "date" -> "input-date"; + case "datetime" -> "input-datetime"; + case "boolean" -> "switch"; + default -> "input-text"; + }; + } + + private static String displayColumn(FeatureSpec spec) { + return spec.fields().stream() + .filter(f -> "NAME".equals(f.column()) || f.required()) + .map(FieldSpec::column) + .findFirst() + .orElse(spec.fields().get(0).column()); + } + + private static String lowerCamel(String table) { + String[] parts = table.toLowerCase(Locale.ROOT).split("_+"); + StringBuilder sb = new StringBuilder(parts[0]); + for (int i = 1; i < parts.length; i++) { + if (!parts[i].isBlank()) { + sb.append(Character.toUpperCase(parts[i].charAt(0))).append(parts[i].substring(1)); + } + } + return sb.toString(); + } + + private static String firstText(String... values) { + for (String value : values) { + if (value != null && !value.isBlank()) { + return value.trim(); + } + } + return ""; + } + + private static Map metadata(String generatorStep, String publishTarget) { + Map metadata = new LinkedHashMap<>(); + metadata.put("source", "ai-agent"); + metadata.put("generator", "deterministic-feature-v1"); + metadata.put("generatorStep", generatorStep); + metadata.put("publishTarget", publishTarget); + return metadata; + } + + private static String sha(String text) { + try { + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + return HexFormat.of().formatHex(digest.digest(String.valueOf(text).getBytes(StandardCharsets.UTF_8))); + } catch (NoSuchAlgorithmException ex) { + throw new IllegalStateException(ex); + } + } + + private record FeatureSpec( + String featureName, + String tableName, + String entityName, + String templateId, + String menuName, + List fields) { + } + + private record FieldSpec( + String column, + String label, + String type, + Integer length, + boolean required) { + } +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiHttpResponse.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiHttpResponse.java new file mode 100644 index 0000000..e40b917 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiHttpResponse.java @@ -0,0 +1,6 @@ +package com.eip4.platform.ai.service; + +public record AiHttpResponse( + int statusCode, + String body) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLlmRepairClient.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLlmRepairClient.java new file mode 100644 index 0000000..3bae86c --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLlmRepairClient.java @@ -0,0 +1,11 @@ +package com.eip4.platform.ai.service; + +import java.util.List; + +import com.eip4.platform.ai.model.AiAgentRepairContext; +import com.eip4.platform.ai.model.AiRepairDraftPatch; + +public interface AiLlmRepairClient { + + List repair(AiAgentRepairContext context); +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java new file mode 100644 index 0000000..db3c7e2 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java @@ -0,0 +1,365 @@ +package com.eip4.platform.ai.service; + +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HexFormat; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.UUID; + +import org.springframework.http.HttpStatus; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ResponseStatusException; + +import com.eip4.platform.ai.model.AiApplyStepResult; +import com.eip4.platform.ai.model.AiArtifactType; +import com.eip4.platform.ai.model.AiDraft; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +@Component +public class AiLocalReleaseExecutor { + + private final JdbcTemplate jdbcTemplate; + private final AiSmokeHttpClient httpClient; + private final ObjectMapper objectMapper; + + public AiLocalReleaseExecutor(JdbcTemplate jdbcTemplate, AiSmokeHttpClient httpClient, ObjectMapper objectMapper) { + this.jdbcTemplate = jdbcTemplate; + this.httpClient = httpClient; + this.objectMapper = objectMapper; + } + + public List apply(String baseUrl, List drafts) { + URI base = safeLocalBase(baseUrl); + ApplyContext ctx = new ApplyContext(base); + List results = new ArrayList<>(); + for (AiDraft draft : drafts.stream().sorted(Comparator.comparingInt(d -> releaseOrder(d.artifactType()))).toList()) { + if (draft.artifactType() == AiArtifactType.TEST) { + continue; + } + AiApplyStepResult result = applyOne(ctx, draft, results.size() + 1); + results.add(result); + if ("FAILED".equals(result.status())) { + break; + } + } + return List.copyOf(results); + } + + private static int releaseOrder(AiArtifactType type) { + return switch (type) { + case ENTITY -> 10; + case SERVICEFLOW -> 20; + case PAGE_SCHEMA -> 30; + case MENU -> 40; + case TEST -> 50; + case CODE -> 60; + }; + } + + private AiApplyStepResult applyOne(ApplyContext ctx, AiDraft draft, int index) { + try { + return switch (draft.artifactType()) { + case ENTITY -> applyEntity(ctx, draft, index); + case SERVICEFLOW -> applyServiceFlows(ctx, draft, index); + case PAGE_SCHEMA -> applyPageSchema(draft, index); + case MENU -> applyMenu(ctx, draft, index); + case CODE -> skipped(index, draft, "代码草稿暂不由平台运行时应用"); + case TEST -> skipped(index, draft, "TEST 由 smoke runner 执行"); + }; + } catch (Exception ex) { + return new AiApplyStepResult("apply-" + index, draft.artifactType(), draft.targetId(), "FAILED", + ex.getClass().getSimpleName() + ": " + String.valueOf(ex.getMessage()), Map.of()); + } + } + + private AiApplyStepResult applyEntity(ApplyContext ctx, AiDraft draft, int index) throws Exception { + String tableName = draft.payload().path("tablename").asText(draft.targetId()).toUpperCase(Locale.ROOT); + AiHttpResponse response = httpClient.exchange("POST", ctx.base().resolve("/api/meta/entity"), + draft.payload(), Duration.ofSeconds(20)); + if (response.statusCode() < 200 || response.statusCode() >= 300) { + return failed(index, draft, "实体发布 HTTP " + response.statusCode(), Map.of("response", response.body())); + } + JsonNode root = objectMapper.readTree(response.body()); + if (root.path("status").asInt(1) != 0) { + String message = root.path("msg").asText("unknown"); + if (message.contains("实体已存在")) { + List ids = jdbcTemplate.queryForList( + "SELECT TRIM(sys_entity_id) FROM sys_entity WHERE tablename=? AND isactive=1", + String.class, tableName); + if (!ids.isEmpty()) { + ctx.entityId(ids.get(0)); + ctx.tableName(tableName); + return applied(index, draft, "实体已存在,复用本地 entityId", + Map.of("entityId", ctx.entityId(), "tableName", ctx.tableName(), "idempotent", true)); + } + } + return failed(index, draft, "实体发布失败: " + message, Map.of()); + } + String entityId = root.path("data").path("entityId").asText(""); + if (entityId.isBlank()) { + return failed(index, draft, "实体发布响应缺 data.entityId", Map.of()); + } + ctx.entityId(entityId); + ctx.tableName(tableName); + return applied(index, draft, "实体已创建", Map.of("entityId", entityId, "tableName", ctx.tableName())); + } + + private AiApplyStepResult applyServiceFlows(ApplyContext ctx, AiDraft draft, int index) { + if (ctx.entityId().isBlank()) { + return failed(index, draft, "缺少实体 entityId,不能发布服务流", Map.of()); + } + long now = System.currentTimeMillis(); + int count = 0; + for (JsonNode flow : draft.payload().path("flows")) { + String key = flow.path("key").asText(); + String xml = flow.path("contentXml").asText().replace("${entityId}", ctx.entityId()); + jdbcTemplate.update(""" + INSERT INTO sys_serviceflow + (sys_serviceflow_id, displayname, contentxml, entityid, iscontrol, isupdateable, + isactive, createtime, updatetime, createby, updateby, version) + VALUES (?, ?, ?, ?, ?, ?, 1, ?, ?, 'AI_AGENT', 'AI_AGENT', 0) + ON CONFLICT (sys_serviceflow_id) DO UPDATE SET + displayname = EXCLUDED.displayname, + contentxml = EXCLUDED.contentxml, + entityid = EXCLUDED.entityid, + iscontrol = EXCLUDED.iscontrol, + isupdateable = EXCLUDED.isupdateable, + updatetime = EXCLUDED.updatetime, + updateby = EXCLUDED.updateby, + version = sys_serviceflow.version + 1 + """, + key, + flow.path("displayName").asText(key), + xml, + ctx.entityId(), + flow.path("control").asBoolean(true) ? 1 : 0, + flow.path("updateable").asBoolean(true) ? 1 : 0, + now, + now); + count++; + } + return applied(index, draft, "服务流已发布", Map.of("flowCount", count, "entityId", ctx.entityId())); + } + + private AiApplyStepResult applyPageSchema(AiDraft draft, int index) throws Exception { + String schemaJson = objectMapper.writeValueAsString(draft.payload()); + String etag = sha256(schemaJson); + long now = System.currentTimeMillis(); + jdbcTemplate.update(""" + INSERT INTO sys_page_schema (template_id, name, schema_json, schema_etag, version, update_time) + VALUES (?, ?, ?::jsonb, ?, 1, ?) + ON CONFLICT (template_id) DO UPDATE SET + name = EXCLUDED.name, + schema_json = EXCLUDED.schema_json, + schema_etag = EXCLUDED.schema_etag, + version = sys_page_schema.version + 1, + update_time = EXCLUDED.update_time + """, + draft.targetId(), draft.payload().path("title").asText(draft.targetId()), schemaJson, etag, now); + return applied(index, draft, "页面 schema 已发布", Map.of("templateId", draft.targetId(), "etag", etag)); + } + + private AiApplyStepResult applyMenu(ApplyContext ctx, AiDraft draft, int index) { + if (!tableExists("sys_menu")) { + return skipped(index, draft, "本地库缺少 sys_menu,菜单挂载跳过,部署包保留人工 SQL"); + } + String templateId = draft.payload().path("viewTemplateId").asText(draft.targetId()); + String menuName = draft.payload().path("name").asText(templateId); + String parentId = textOrBlank(draft.payload().get("parentId")); + String menuRoot = textOrBlank(draft.payload().get("menuroot")); + if (parentId.isBlank()) { + ParentMenu parent = ensureAiMenuParent(menuRoot); + parentId = parent.parentId(); + menuRoot = parent.menuRoot(); + } + List existing = jdbcTemplate.queryForList( + "SELECT TRIM(sys_menu_id) FROM sys_menu WHERE TRIM(view_templateid)=? AND isactive=1", + String.class, templateId); + String menuId = existing.isEmpty() ? UUID.randomUUID().toString() : existing.get(0); + long now = System.currentTimeMillis(); + if (existing.isEmpty()) { + jdbcTemplate.update(""" + INSERT INTO sys_menu + (sys_menu_id, name, parentid, view_templateid, typename, menuroot, seq, + isactive, version, createtime, createby, updatetime, updateby) + VALUES (?, ?, ?, ?, ?, ?, ?, 1, 0, ?, 'AI_AGENT', ?, 'AI_AGENT') + """, + menuId, + menuName, + parentId, + templateId, + draft.payload().path("typename").asText("功能菜单"), + menuRoot.isBlank() ? null : menuRoot, + draft.payload().path("seq").asInt(0), + now, + now); + } else { + jdbcTemplate.update(""" + UPDATE sys_menu + SET name=?, parentid=?, view_templateid=?, typename=?, menuroot=?, seq=?, + updatetime=?, updateby='AI_AGENT', version=version+1 + WHERE TRIM(sys_menu_id)=? + """, + menuName, + parentId, + templateId, + draft.payload().path("typename").asText("功能菜单"), + menuRoot.isBlank() ? null : menuRoot, + draft.payload().path("seq").asInt(0), + now, + menuId); + } + return applied(index, draft, "菜单已挂载", Map.of("menuId", menuId, "parentId", parentId)); + } + + private ParentMenu ensureAiMenuParent(String preferredRoot) { + List existingDir = jdbcTemplate.queryForList( + "SELECT TRIM(sys_menu_id) FROM sys_menu WHERE name='AI Agent' AND parentid IS NULL AND isactive=1 ORDER BY seq LIMIT 1", + String.class); + if (!existingDir.isEmpty()) { + String root = preferredRoot; + if (root == null || root.isBlank()) { + List roots = jdbcTemplate.queryForList( + "SELECT TRIM(menuroot) FROM sys_menu WHERE TRIM(sys_menu_id)=?", + String.class, existingDir.get(0)); + root = roots.isEmpty() ? "" : roots.get(0); + } + return new ParentMenu(existingDir.get(0), root == null ? "" : root); + } + String root = preferredRoot; + if (root == null || root.isBlank()) { + List roots = jdbcTemplate.queryForList( + "SELECT TRIM(sys_menu_root_id) FROM sys_menu_root WHERE isactive=1 ORDER BY seq LIMIT 1", + String.class); + if (roots.isEmpty()) { + throw new ResponseStatusException(HttpStatus.CONFLICT, "缺少 sys_menu_root,不能自动挂载菜单"); + } + root = roots.get(0); + } + String dirId = UUID.randomUUID().toString(); + long now = System.currentTimeMillis(); + jdbcTemplate.update(""" + INSERT INTO sys_menu + (sys_menu_id, name, parentid, view_templateid, typename, menuroot, seq, + isactive, version, createtime, createby, updatetime, updateby) + VALUES (?, 'AI Agent', NULL, NULL, '目录', ?, 9999, 1, 0, ?, 'AI_AGENT', ?, 'AI_AGENT') + """, + dirId, root, now, now); + return new ParentMenu(dirId, root); + } + + private boolean tableExists(String tableName) { + try { + Boolean exists = jdbcTemplate.queryForObject("SELECT to_regclass(?) IS NOT NULL", Boolean.class, tableName); + return Boolean.TRUE.equals(exists); + } catch (RuntimeException ex) { + return false; + } + } + + private static AiApplyStepResult applied(int index, AiDraft draft, String message, Map details) { + return new AiApplyStepResult("apply-" + index, draft.artifactType(), draft.targetId(), + "APPLIED", message, details); + } + + private static AiApplyStepResult failed(int index, AiDraft draft, String message, Map details) { + return new AiApplyStepResult("apply-" + index, draft.artifactType(), draft.targetId(), + "FAILED", message, details); + } + + private static AiApplyStepResult skipped(int index, AiDraft draft, String message) { + return new AiApplyStepResult("apply-" + index, draft.artifactType(), draft.targetId(), + "SKIPPED", message, Map.of()); + } + + private static URI safeLocalBase(String raw) { + String value = raw == null || raw.isBlank() ? "http://localhost:8084" : raw.trim(); + URI uri; + try { + uri = URI.create(value); + } catch (IllegalArgumentException ex) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "baseUrl 不合法: " + value); + } + String scheme = uri.getScheme(); + String host = uri.getHost(); + if (!"http".equalsIgnoreCase(scheme) && !"https".equalsIgnoreCase(scheme)) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "baseUrl 只允许 http/https"); + } + if (!isLocalHost(host)) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "本地发布仅允许访问本机地址"); + } + String normalized = uri.toString(); + if (!normalized.endsWith("/")) { + normalized += "/"; + } + return URI.create(normalized); + } + + private static boolean isLocalHost(String host) { + if (host == null) { + return false; + } + String h = host.toLowerCase(Locale.ROOT); + return "localhost".equals(h) || "127.0.0.1".equals(h) || "::1".equals(h) || "[::1]".equals(h); + } + + private static String textOrBlank(JsonNode node) { + if (node == null || node.isNull()) { + return ""; + } + String value = node.asText(""); + return value == null ? "" : value.trim(); + } + + private static String sha256(String text) { + try { + MessageDigest digest = MessageDigest.getInstance("SHA-256"); + return HexFormat.of().formatHex(digest.digest(text.getBytes(StandardCharsets.UTF_8))); + } catch (NoSuchAlgorithmException ex) { + throw new IllegalStateException(ex); + } + } + + private static class ApplyContext { + private final URI base; + private String entityId = ""; + private String tableName = ""; + + ApplyContext(URI base) { + this.base = base; + } + + URI base() { + return base; + } + + String entityId() { + return entityId; + } + + void entityId(String entityId) { + this.entityId = entityId == null ? "" : entityId; + } + + String tableName() { + return tableName; + } + + void tableName(String tableName) { + this.tableName = tableName == null ? "" : tableName; + } + } + + private record ParentMenu(String parentId, String menuRoot) { + } +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeHttpClient.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeHttpClient.java new file mode 100644 index 0000000..558393c --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeHttpClient.java @@ -0,0 +1,11 @@ +package com.eip4.platform.ai.service; + +import java.net.URI; +import java.time.Duration; + +import com.fasterxml.jackson.databind.JsonNode; + +public interface AiSmokeHttpClient { + + AiHttpResponse exchange(String method, URI uri, JsonNode requestBody, Duration timeout) throws Exception; +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeRunner.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeRunner.java new file mode 100644 index 0000000..fdd37d4 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiSmokeRunner.java @@ -0,0 +1,147 @@ +package com.eip4.platform.ai.service; + +import java.net.URI; +import java.time.Duration; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ResponseStatusException; + +import com.eip4.platform.ai.model.AiSmokeResult; +import com.eip4.platform.ai.model.AiSmokeRun; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +@Component +public class AiSmokeRunner { + + private static final Duration REQUEST_TIMEOUT = Duration.ofSeconds(8); + private static final int SNIPPET_LIMIT = 600; + private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); + + private final AiSmokeHttpClient httpClient; + + public AiSmokeRunner(AiSmokeHttpClient httpClient) { + this.httpClient = httpClient; + } + + public AiSmokeRun run(String taskId, String changeSetId, String baseUrl, JsonNode testPayload) { + URI base = safeLocalBase(baseUrl); + JsonNode tests = testPayload == null ? null : testPayload.path("smokeTests"); + if (tests == null || !tests.isArray() || tests.isEmpty()) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "没有可执行的 smokeTests"); + } + + long started = System.currentTimeMillis(); + List results = new ArrayList<>(); + for (JsonNode test : tests) { + results.add(runOne(base, test)); + } + long finished = System.currentTimeMillis(); + boolean passed = results.stream().allMatch(AiSmokeResult::passed); + return new AiSmokeRun(taskId, changeSetId, base.toString(), passed ? "PASSED" : "FAILED", + started, finished, List.copyOf(results)); + } + + private AiSmokeResult runOne(URI base, JsonNode test) { + String name = text(test, "name", "unnamed"); + String method = text(test, "method", "GET").toUpperCase(Locale.ROOT); + String url = text(test, "url", ""); + int expected = test.path("expectHttpStatus").asInt(200); + long started = System.currentTimeMillis(); + if (!url.startsWith("/api/")) { + return failed(name, method, url, expected, -1, started, "smoke url 必须以 /api/ 开头", ""); + } + if (!List.of("GET", "POST", "PUT", "DELETE", "PATCH").contains(method)) { + return failed(name, method, url, expected, -1, started, "不支持的 HTTP method: " + method, ""); + } + try { + URI uri = base.resolve(url); + AiHttpResponse response = httpClient.exchange(method, uri, test.get("requestBody"), REQUEST_TIMEOUT); + boolean passed = response.statusCode() == expected; + String err = passed ? businessStatusError(response.body()) + : "期望 HTTP " + expected + ",实际 HTTP " + response.statusCode(); + passed = passed && err.isBlank(); + return new AiSmokeResult(name, method, url, expected, response.statusCode(), passed, + System.currentTimeMillis() - started, err, snippet(response.body())); + } catch (Exception ex) { + return failed(name, method, url, expected, -1, started, + ex.getClass().getSimpleName() + ": " + String.valueOf(ex.getMessage()), ""); + } + } + + private static AiSmokeResult failed(String name, String method, String url, int expected, int actual, + long started, String error, String response) { + return new AiSmokeResult(name, method, url, expected, actual, false, + System.currentTimeMillis() - started, error, snippet(response)); + } + + private static URI safeLocalBase(String raw) { + String value = raw == null || raw.isBlank() ? "http://localhost:8084" : raw.trim(); + URI uri; + try { + uri = URI.create(value); + } catch (IllegalArgumentException ex) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "baseUrl 不合法: " + value); + } + String scheme = uri.getScheme(); + String host = uri.getHost(); + if (!"http".equalsIgnoreCase(scheme) && !"https".equalsIgnoreCase(scheme)) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "baseUrl 只允许 http/https"); + } + if (!isLocalHost(host)) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "smoke 仅允许访问本机地址"); + } + String normalized = uri.toString(); + if (!normalized.endsWith("/")) { + normalized += "/"; + } + return URI.create(normalized); + } + + private static boolean isLocalHost(String host) { + if (host == null) { + return false; + } + String h = host.toLowerCase(Locale.ROOT); + return "localhost".equals(h) || "127.0.0.1".equals(h) || "::1".equals(h) || "[::1]".equals(h); + } + + private static String text(JsonNode node, String field, String fallback) { + JsonNode value = node == null ? null : node.get(field); + if (value == null || value.isNull()) { + return fallback; + } + String s = value.asText(); + return s == null || s.isBlank() ? fallback : s.trim(); + } + + private static String snippet(String body) { + if (body == null || body.isBlank()) { + return ""; + } + String compact = body.replaceAll("\\s+", " ").trim(); + return compact.length() <= SNIPPET_LIMIT ? compact : compact.substring(0, SNIPPET_LIMIT); + } + + private static String businessStatusError(String body) { + if (body == null || body.isBlank()) { + return ""; + } + try { + JsonNode root = OBJECT_MAPPER.readTree(body); + JsonNode status = root == null || !root.isObject() ? null : root.get("status"); + if (status != null && !status.isNull() && status.asInt(0) != 0) { + String msg = root.path("msg").asText(""); + return msg.isBlank() ? "响应 JSON status=" + status.asText() + : "响应 JSON status=" + status.asText() + ": " + msg; + } + } catch (Exception ignore) { + return ""; + } + return ""; + } +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/DeterministicAiAgentRepairExecutor.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/DeterministicAiAgentRepairExecutor.java new file mode 100644 index 0000000..8dd193b --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/DeterministicAiAgentRepairExecutor.java @@ -0,0 +1,321 @@ +package com.eip4.platform.ai.service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import com.eip4.platform.ai.model.AiAgentRepairContext; +import com.eip4.platform.ai.model.AiAgentRepairResult; +import com.eip4.platform.ai.model.AiArtifactType; +import com.eip4.platform.ai.model.AiDraft; +import com.eip4.platform.ai.model.AiRepairAction; +import com.eip4.platform.ai.model.AiRepairDraftPatch; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; + +@Component +public class DeterministicAiAgentRepairExecutor implements AiAgentRepairExecutor { + + private final ObjectMapper objectMapper; + private final List llmRepairClients; + + @Autowired + public DeterministicAiAgentRepairExecutor(ObjectMapper objectMapper, List llmRepairClients) { + this.objectMapper = objectMapper; + this.llmRepairClients = llmRepairClients == null ? List.of() : List.copyOf(llmRepairClients); + } + + public DeterministicAiAgentRepairExecutor(ObjectMapper objectMapper) { + this(objectMapper, List.of()); + } + + @Override + public AiAgentRepairResult repair(AiAgentRepairContext context) { + if (context == null || context.repairPlan() == null || context.drafts() == null) { + return new AiAgentRepairResult("NOOP", List.of(), List.of("缺少修复上下文")); + } + AiAgentRepairResult llmResult = tryLlmRepair(context); + if (!llmResult.draftPatches().isEmpty()) { + return llmResult; + } + List patches = new ArrayList<>(); + List messages = new ArrayList<>(); + for (AiRepairAction action : context.repairPlan().actions()) { + if ("REPAIR_ENTITY_METADATA_OR_LOCAL_API".equals(action.actionType())) { + entityMetadataPatch(context, action).ifPresentOrElse( + patch -> { + patches.add(patch); + messages.add("已生成 ENTITY 草稿修复: " + action.targetId()); + }, + () -> messages.add("未找到可确定修复的 ENTITY 草稿: " + action.targetId())); + } else if ("REPAIR_SMOKE_EXPECTATION_OR_API_CONTRACT".equals(action.actionType())) { + smokeExpectationPatch(context, action).ifPresentOrElse( + patch -> { + patches.add(patch); + messages.add("已生成 TEST 草稿修复: " + action.targetId()); + }, + () -> messages.add("未找到可修复的 TEST 草稿: " + action.targetId())); + } else if ("REPAIR_PAGE_SCHEMA_SQL_OR_SCHEMA".equals(action.actionType())) { + pageSchemaPatch(context, action).ifPresentOrElse( + patch -> { + patches.add(patch); + messages.add("已生成 PAGE_SCHEMA 草稿修复: " + action.targetId()); + }, + () -> messages.add("未找到可确定修复的 PAGE_SCHEMA 草稿: " + action.targetId())); + } else if ("SEED_MENU_ROOT_OR_SET_PARENT".equals(action.actionType()) + || "REPAIR_MENU_BINDING".equals(action.actionType())) { + menuParentPatch(context, action).ifPresentOrElse( + patch -> { + patches.add(patch); + messages.add("已生成 MENU 草稿修复: " + action.targetId()); + }, + () -> messages.add("未找到可确定修复的 MENU 草稿: " + action.targetId())); + } else if ("RETRY_AFTER_ENTITY_ID_RESOLUTION".equals(action.actionType()) + || "REPAIR_SERVICEFLOW_XML_OR_SQL".equals(action.actionType())) { + serviceFlowEntityBindingPatch(context, action).ifPresentOrElse( + patch -> { + patches.add(patch); + messages.add("已生成 SERVICEFLOW 草稿修复: " + action.targetId()); + }, + () -> messages.add("未找到可确定修复的 SERVICEFLOW 草稿: " + action.targetId())); + } + } + String status = patches.isEmpty() ? "NO_PATCHES" : "PATCHES_GENERATED"; + return new AiAgentRepairResult(status, List.copyOf(patches), List.copyOf(messages)); + } + + private AiAgentRepairResult tryLlmRepair(AiAgentRepairContext context) { + List patches = new ArrayList<>(); + List messages = new ArrayList<>(); + for (AiLlmRepairClient client : llmRepairClients) { + List one = client.repair(context); + if (one != null && !one.isEmpty()) { + patches.addAll(one); + messages.add("LLM repair client generated " + one.size() + " draft patch(es)"); + break; + } + } + return new AiAgentRepairResult(patches.isEmpty() ? "NO_PATCHES" : "PATCHES_GENERATED", + List.copyOf(patches), List.copyOf(messages)); + } + + private java.util.Optional entityMetadataPatch(AiAgentRepairContext context, + AiRepairAction action) { + for (AiDraft draft : context.drafts()) { + if (draft.artifactType() != AiArtifactType.ENTITY || !draft.targetId().equals(action.targetId())) { + continue; + } + ObjectNode copy = draft.payload().deepCopy(); + boolean changed = false; + if (!"/api/meta/entity".equals(copy.path("publishTarget").asText(""))) { + copy.put("publishTarget", "/api/meta/entity"); + changed = true; + } + if (copy.path("tablename").asText("").isBlank()) { + copy.put("tablename", draft.targetId()); + changed = true; + } + if (copy.path("name").asText("").isBlank()) { + copy.put("name", draft.targetId()); + changed = true; + } + JsonNode attrs = copy.path("attributes"); + if (attrs.isArray()) { + for (JsonNode attr : attrs) { + if (attr instanceof ObjectNode node && node.path("display").asText("").isBlank()) { + node.put("display", node.path("column").asText("字段")); + changed = true; + } + } + } + if (!changed) { + return java.util.Optional.empty(); + } + return java.util.Optional.of(new AiRepairDraftPatch( + AiArtifactType.ENTITY, + draft.targetId(), + copy, + Map.of( + "source", "deterministic-agent-repair", + "repairActionId", action.id(), + "supersedesDraftId", draft.id()))); + } + return java.util.Optional.empty(); + } + + private java.util.Optional serviceFlowEntityBindingPatch(AiAgentRepairContext context, + AiRepairAction action) { + for (AiDraft draft : context.drafts()) { + if (draft.artifactType() != AiArtifactType.SERVICEFLOW || !draft.targetId().equals(action.targetId())) { + continue; + } + ObjectNode copy = draft.payload().deepCopy(); + JsonNode flows = copy.path("flows"); + if (!flows.isArray()) { + return java.util.Optional.empty(); + } + boolean changed = false; + copy.put("requiresEntityId", true); + copy.put("entityIdBinding", "publish ENTITY draft first, then replace ${entityId}"); + for (JsonNode flow : flows) { + if (!(flow instanceof ObjectNode node)) { + continue; + } + String existingEntityId = node.path("entityId").asText(""); + String xml = node.path("contentXml").asText(""); + if (!"${entityId}".equals(existingEntityId)) { + node.put("entityId", "${entityId}"); + changed = true; + } + if (!xml.contains("${entityId}") && !existingEntityId.isBlank()) { + node.put("contentXml", xml.replace(existingEntityId, "${entityId}")); + changed = true; + } + } + if (!changed) { + return java.util.Optional.empty(); + } + return java.util.Optional.of(new AiRepairDraftPatch( + AiArtifactType.SERVICEFLOW, + draft.targetId(), + copy, + Map.of( + "source", "deterministic-agent-repair", + "repairActionId", action.id(), + "supersedesDraftId", draft.id()))); + } + return java.util.Optional.empty(); + } + + private java.util.Optional menuParentPatch(AiAgentRepairContext context, + AiRepairAction action) { + for (AiDraft draft : context.drafts()) { + if (draft.artifactType() != AiArtifactType.MENU || !draft.targetId().equals(action.targetId())) { + continue; + } + ObjectNode copy = draft.payload().deepCopy(); + boolean changed = false; + if (copy.path("parentId").asText("").isBlank()) { + copy.put("parentId", "${parentMenuId}"); + changed = true; + } + if (copy.path("menuroot").asText("").isBlank()) { + copy.put("menuroot", "${menuRoot}"); + changed = true; + } + if (!changed) { + return java.util.Optional.empty(); + } + return java.util.Optional.of(new AiRepairDraftPatch( + AiArtifactType.MENU, + draft.targetId(), + copy, + Map.of( + "source", "deterministic-agent-repair", + "repairActionId", action.id(), + "supersedesDraftId", draft.id(), + "requiresHumanReplacement", true))); + } + return java.util.Optional.empty(); + } + + private java.util.Optional pageSchemaPatch(AiAgentRepairContext context, + AiRepairAction action) { + for (AiDraft draft : context.drafts()) { + if (draft.artifactType() != AiArtifactType.PAGE_SCHEMA || !draft.targetId().equals(action.targetId())) { + continue; + } + ObjectNode copy = draft.payload().deepCopy(); + boolean changed = false; + if (copy.path("type").asText("").isBlank()) { + copy.put("type", "page"); + changed = true; + } + if (copy.path("title").asText("").isBlank()) { + copy.put("title", draft.targetId()); + changed = true; + } + JsonNode body = copy.get("body"); + if (body == null || body.isNull()) { + copy.putArray("body"); + changed = true; + } + if (!changed) { + return java.util.Optional.empty(); + } + return java.util.Optional.of(new AiRepairDraftPatch( + AiArtifactType.PAGE_SCHEMA, + draft.targetId(), + copy, + Map.of( + "source", "deterministic-agent-repair", + "repairActionId", action.id(), + "supersedesDraftId", draft.id()))); + } + return java.util.Optional.empty(); + } + + private java.util.Optional smokeExpectationPatch(AiAgentRepairContext context, + AiRepairAction action) { + int actual = intDetail(action, "actualHttpStatus", -1); + if (actual < 200 || actual >= 300) { + return java.util.Optional.empty(); + } + String method = stringDetail(action, "method"); + String url = stringDetail(action, "url"); + for (AiDraft draft : context.drafts()) { + if (draft.artifactType() != AiArtifactType.TEST) { + continue; + } + ObjectNode copy = draft.payload().deepCopy(); + JsonNode tests = copy.path("smokeTests"); + if (!tests.isArray()) { + continue; + } + boolean changed = false; + for (JsonNode test : tests) { + if (test instanceof ObjectNode node + && method.equalsIgnoreCase(node.path("method").asText("")) + && url.equals(node.path("url").asText(""))) { + node.put("expectHttpStatus", actual); + changed = true; + } + } + if (changed) { + return java.util.Optional.of(new AiRepairDraftPatch( + AiArtifactType.TEST, + draft.targetId(), + copy, + Map.of( + "source", "deterministic-agent-repair", + "repairActionId", action.id(), + "supersedesDraftId", draft.id()))); + } + } + return java.util.Optional.empty(); + } + + private static int intDetail(AiRepairAction action, String key, int fallback) { + Object value = action.details() == null ? null : action.details().get(key); + if (value instanceof Number n) { + return n.intValue(); + } + if (value instanceof String s) { + try { + return Integer.parseInt(s); + } catch (NumberFormatException ignored) { + return fallback; + } + } + return fallback; + } + + private static String stringDetail(AiRepairAction action, String key) { + Object value = action.details() == null ? null : action.details().get(key); + return value == null ? "" : String.valueOf(value); + } +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/HttpAiLlmRepairClient.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/HttpAiLlmRepairClient.java new file mode 100644 index 0000000..d8e3d94 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/HttpAiLlmRepairClient.java @@ -0,0 +1,99 @@ +package com.eip4.platform.ai.service; + +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; + +import com.eip4.platform.ai.model.AiAgentRepairContext; +import com.eip4.platform.ai.model.AiRepairDraftPatch; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + +@Component +@ConditionalOnProperty(name = "eip4.ai.llm.repair.enabled", havingValue = "true") +public class HttpAiLlmRepairClient implements AiLlmRepairClient { + + private static final TypeReference> PATCH_LIST = new TypeReference<>() { + }; + + private final ObjectMapper objectMapper; + private final HttpClient httpClient; + private final URI endpoint; + private final String apiKey; + private final String model; + + public HttpAiLlmRepairClient(ObjectMapper objectMapper, + @Value("${eip4.ai.llm.repair.endpoint:}") String endpoint, + @Value("${eip4.ai.llm.repair.api-key:}") String apiKey, + @Value("${eip4.ai.llm.repair.model:}") String model) { + this(objectMapper, HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(10)).build(), + endpoint, apiKey, model); + } + + HttpAiLlmRepairClient(ObjectMapper objectMapper, HttpClient httpClient, + String endpoint, String apiKey, String model) { + this.objectMapper = objectMapper; + this.httpClient = httpClient; + this.endpoint = endpoint == null || endpoint.isBlank() ? null : URI.create(endpoint.trim()); + this.apiKey = apiKey == null ? "" : apiKey.trim(); + this.model = model == null ? "" : model.trim(); + } + + @Override + public List repair(AiAgentRepairContext context) { + if (endpoint == null || context == null) { + return List.of(); + } + try { + HttpRequest.Builder builder = HttpRequest.newBuilder(endpoint) + .timeout(Duration.ofSeconds(60)) + .header("Content-Type", "application/json") + .POST(HttpRequest.BodyPublishers.ofString(json(requestPayload(context)))); + if (!apiKey.isBlank()) { + builder.header("Authorization", "Bearer " + apiKey); + } + HttpResponse response = httpClient.send(builder.build(), HttpResponse.BodyHandlers.ofString()); + if (response.statusCode() < 200 || response.statusCode() >= 300) { + return List.of(); + } + return parsePatches(response.body()); + } catch (Exception ex) { + return List.of(); + } + } + + private Map requestPayload(AiAgentRepairContext context) { + return Map.of( + "model", model, + "taskId", context.taskId(), + "changeSetId", context.changeSetId(), + "repairPlan", context.repairPlan(), + "drafts", context.drafts(), + "contract", Map.of( + "responseField", "draftPatches", + "patchShape", "artifactType,targetId,payload,metadata", + "rule", "Return only safe draft patches; do not execute production changes")); + } + + private List parsePatches(String body) throws JsonProcessingException { + var root = objectMapper.readTree(body); + var patches = root.path("draftPatches"); + if (!patches.isArray()) { + return List.of(); + } + return objectMapper.convertValue(patches, PATCH_LIST); + } + + private String json(Object value) throws JsonProcessingException { + return objectMapper.writeValueAsString(value); + } +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/JdkAiSmokeHttpClient.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/JdkAiSmokeHttpClient.java new file mode 100644 index 0000000..a1c5392 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/JdkAiSmokeHttpClient.java @@ -0,0 +1,46 @@ +package com.eip4.platform.ai.service; + +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +@Component +public class JdkAiSmokeHttpClient implements AiSmokeHttpClient { + + private final HttpClient httpClient; + private final ObjectMapper objectMapper; + + @Autowired + public JdkAiSmokeHttpClient(ObjectMapper objectMapper) { + this(HttpClient.newHttpClient(), objectMapper); + } + + JdkAiSmokeHttpClient(HttpClient httpClient, ObjectMapper objectMapper) { + this.httpClient = httpClient; + this.objectMapper = objectMapper; + } + + @Override + public AiHttpResponse exchange(String method, URI uri, JsonNode requestBody, Duration timeout) throws Exception { + HttpRequest.BodyPublisher body = requestBody == null || requestBody.isNull() + ? HttpRequest.BodyPublishers.noBody() + : HttpRequest.BodyPublishers.ofString(objectMapper.writeValueAsString(requestBody)); + HttpRequest.Builder builder = HttpRequest.newBuilder(uri) + .timeout(timeout) + .header("Accept", "application/json"); + if (requestBody != null && !requestBody.isNull()) { + builder.header("Content-Type", "application/json"); + } + HttpRequest request = builder.method(method, body).build(); + HttpResponse response = httpClient.send(request, HttpResponse.BodyHandlers.ofString()); + return new AiHttpResponse(response.statusCode(), response.body()); + } +} 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 new file mode 100644 index 0000000..3bdb1fc --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/store/AiAgentStore.java @@ -0,0 +1,33 @@ +package com.eip4.platform.ai.store; + +import java.util.List; +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.AiRunRecord; +import com.eip4.platform.ai.model.AiTask; + +public interface AiAgentStore { + + void saveTask(AiTask task); + + Optional findTask(String taskId); + + void saveDraft(AiDraft draft); + + List listDrafts(String taskId); + + void saveChangeSet(AiChangeSet changeSet); + + List listChangeSets(String taskId); + + void saveRun(AiRunRecord run); + + List listRuns(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 new file mode 100644 index 0000000..9d1b166 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/store/InMemoryAiAgentStore.java @@ -0,0 +1,81 @@ +package com.eip4.platform.ai.store; + +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +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.AiRunRecord; +import com.eip4.platform.ai.model.AiTask; + +@Component +@ConditionalOnProperty(name = "eip4.ai.store", havingValue = "memory", matchIfMissing = true) +public class InMemoryAiAgentStore implements AiAgentStore { + + private final Map tasks = new ConcurrentHashMap<>(); + private final Map> draftsByTask = new ConcurrentHashMap<>(); + private final Map> auditByTask = new ConcurrentHashMap<>(); + private final Map> changeSetsByTask = new ConcurrentHashMap<>(); + private final Map> runsByTask = new ConcurrentHashMap<>(); + + @Override + public void saveTask(AiTask task) { + tasks.put(task.id(), task); + draftsByTask.computeIfAbsent(task.id(), ignored -> new CopyOnWriteArrayList<>()); + auditByTask.computeIfAbsent(task.id(), ignored -> new CopyOnWriteArrayList<>()); + changeSetsByTask.computeIfAbsent(task.id(), ignored -> new CopyOnWriteArrayList<>()); + runsByTask.computeIfAbsent(task.id(), ignored -> new CopyOnWriteArrayList<>()); + } + + @Override + public Optional findTask(String taskId) { + return Optional.ofNullable(tasks.get(taskId)); + } + + @Override + public void saveDraft(AiDraft draft) { + draftsByTask.computeIfAbsent(draft.taskId(), ignored -> new CopyOnWriteArrayList<>()).add(draft); + } + + @Override + public List listDrafts(String taskId) { + return List.copyOf(draftsByTask.getOrDefault(taskId, List.of())); + } + + @Override + public void saveChangeSet(AiChangeSet changeSet) { + changeSetsByTask.computeIfAbsent(changeSet.taskId(), ignored -> new CopyOnWriteArrayList<>()).add(changeSet); + } + + @Override + public List listChangeSets(String taskId) { + return List.copyOf(changeSetsByTask.getOrDefault(taskId, List.of())); + } + + @Override + public void saveRun(AiRunRecord run) { + runsByTask.computeIfAbsent(run.taskId(), ignored -> new CopyOnWriteArrayList<>()).add(run); + } + + @Override + public List listRuns(String taskId) { + return List.copyOf(runsByTask.getOrDefault(taskId, List.of())); + } + + @Override + public void saveAudit(AiAuditEntry entry) { + auditByTask.computeIfAbsent(entry.taskId(), ignored -> new CopyOnWriteArrayList<>()).add(entry); + } + + @Override + public List listAudit(String taskId) { + return List.copyOf(auditByTask.getOrDefault(taskId, List.of())); + } +} 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 new file mode 100644 index 0000000..413f3a7 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/store/JdbcAiAgentStore.java @@ -0,0 +1,254 @@ +package com.eip4.platform.ai.store; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; +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.AiDraft; +import com.eip4.platform.ai.model.AiGateResult; +import com.eip4.platform.ai.model.AiRunRecord; +import com.eip4.platform.ai.model.AiTask; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +@Component +@ConditionalOnProperty(name = "eip4.ai.store", havingValue = "jdbc") +public class JdbcAiAgentStore implements AiAgentStore { + + private static final TypeReference> STRING_LIST = new TypeReference<>() { + }; + private static final TypeReference> GATE_LIST = new TypeReference<>() { + }; + private static final TypeReference> OBJECT_MAP = new TypeReference<>() { + }; + + private final JdbcTemplate jdbcTemplate; + private final ObjectMapper objectMapper; + + public JdbcAiAgentStore(JdbcTemplate jdbcTemplate, ObjectMapper objectMapper) { + this.jdbcTemplate = jdbcTemplate; + this.objectMapper = objectMapper; + } + + @Override + public void saveTask(AiTask task) { + jdbcTemplate.update(""" + INSERT INTO sys_ai_task (task_id, objective, status, plan_json, created_at, updated_at) + VALUES (?, ?, ?, ?::jsonb, ?, ?) + ON CONFLICT (task_id) DO UPDATE SET + objective = EXCLUDED.objective, + status = EXCLUDED.status, + plan_json = EXCLUDED.plan_json, + updated_at = EXCLUDED.updated_at + """, + task.id(), task.objective(), task.status(), json(task.plan()), task.createdAt(), task.updatedAt()); + } + + @Override + public Optional findTask(String taskId) { + List rows = jdbcTemplate.query(""" + SELECT task_id, objective, status, plan_json, created_at, updated_at + FROM sys_ai_task + WHERE task_id = ? + """, taskMapper(), taskId); + return rows.stream().findFirst(); + } + + @Override + public void saveDraft(AiDraft draft) { + jdbcTemplate.update(""" + INSERT INTO sys_ai_draft + (draft_id, task_id, artifact_type, target_id, payload_json, gates_json, metadata_json, created_at) + VALUES (?, ?, ?, ?, ?::jsonb, ?::jsonb, ?::jsonb, ?) + ON CONFLICT (draft_id) DO UPDATE SET + artifact_type = EXCLUDED.artifact_type, + target_id = EXCLUDED.target_id, + payload_json = EXCLUDED.payload_json, + gates_json = EXCLUDED.gates_json, + metadata_json = EXCLUDED.metadata_json + """, + draft.id(), draft.taskId(), draft.artifactType().name(), draft.targetId(), + json(draft.payload()), json(draft.gates()), json(draft.metadata()), draft.createdAt()); + } + + @Override + public List listDrafts(String taskId) { + return jdbcTemplate.query(""" + SELECT draft_id, task_id, artifact_type, target_id, payload_json, gates_json, metadata_json, created_at + FROM sys_ai_draft + WHERE task_id = ? + ORDER BY created_at ASC, draft_id ASC + """, draftMapper(), taskId); + } + + @Override + public void saveChangeSet(AiChangeSet changeSet) { + jdbcTemplate.update(""" + INSERT INTO sys_ai_change_set + (change_set_id, task_id, status, draft_ids_json, summary_json, created_at) + VALUES (?, ?, ?, ?::jsonb, ?::jsonb, ?) + ON CONFLICT (change_set_id) DO UPDATE SET + status = EXCLUDED.status, + draft_ids_json = EXCLUDED.draft_ids_json, + summary_json = EXCLUDED.summary_json + """, + changeSet.id(), changeSet.taskId(), changeSet.status(), + json(changeSet.draftIds()), json(changeSet.summary()), changeSet.createdAt()); + } + + @Override + public List listChangeSets(String taskId) { + return jdbcTemplate.query(""" + SELECT change_set_id, task_id, status, draft_ids_json, summary_json, created_at + FROM sys_ai_change_set + WHERE task_id = ? + ORDER BY created_at ASC, change_set_id ASC + """, changeSetMapper(), taskId); + } + + @Override + public void saveRun(AiRunRecord run) { + jdbcTemplate.update(""" + INSERT INTO sys_ai_run + (run_id, task_id, change_set_id, run_type, status, payload_json, created_at) + VALUES (?, ?, ?, ?, ?, ?::jsonb, ?) + ON CONFLICT (run_id) DO UPDATE SET + run_type = EXCLUDED.run_type, + status = EXCLUDED.status, + payload_json = EXCLUDED.payload_json + """, + run.id(), run.taskId(), run.changeSetId(), run.runType(), run.status(), + json(run.payload()), run.createdAt()); + } + + @Override + public List listRuns(String taskId) { + return jdbcTemplate.query(""" + SELECT run_id, task_id, change_set_id, run_type, status, payload_json, created_at + FROM sys_ai_run + WHERE task_id = ? + ORDER BY created_at ASC, run_id ASC + """, runMapper(), taskId); + } + + @Override + public void saveAudit(AiAuditEntry entry) { + jdbcTemplate.update(""" + INSERT INTO sys_ai_audit_log + (audit_id, task_id, action, actor, details_json, created_at) + VALUES (?, ?, ?, ?, ?::jsonb, ?) + ON CONFLICT (audit_id) DO UPDATE SET + action = EXCLUDED.action, + actor = EXCLUDED.actor, + details_json = EXCLUDED.details_json + """, + entry.id(), entry.taskId(), entry.action(), entry.actor(), json(entry.details()), entry.createdAt()); + } + + @Override + public List listAudit(String taskId) { + return jdbcTemplate.query(""" + SELECT audit_id, task_id, action, actor, details_json, created_at + FROM sys_ai_audit_log + WHERE task_id = ? + ORDER BY created_at ASC, audit_id ASC + """, auditMapper(), taskId); + } + + private RowMapper taskMapper() { + return (rs, rowNum) -> new AiTask( + rs.getString("task_id"), + rs.getString("objective"), + rs.getString("status"), + rs.getLong("created_at"), + rs.getLong("updated_at"), + read(jsonText(rs, "plan_json"), STRING_LIST)); + } + + private RowMapper draftMapper() { + return (rs, rowNum) -> new AiDraft( + rs.getString("draft_id"), + rs.getString("task_id"), + AiArtifactType.valueOf(rs.getString("artifact_type")), + rs.getString("target_id"), + readTree(jsonText(rs, "payload_json")), + rs.getLong("created_at"), + read(jsonText(rs, "gates_json"), GATE_LIST), + read(jsonText(rs, "metadata_json"), OBJECT_MAP)); + } + + private RowMapper changeSetMapper() { + return (rs, rowNum) -> new AiChangeSet( + rs.getString("change_set_id"), + rs.getString("task_id"), + rs.getString("status"), + rs.getLong("created_at"), + read(jsonText(rs, "draft_ids_json"), STRING_LIST), + read(jsonText(rs, "summary_json"), OBJECT_MAP)); + } + + private RowMapper auditMapper() { + return (rs, rowNum) -> new AiAuditEntry( + rs.getString("audit_id"), + rs.getString("task_id"), + rs.getString("action"), + rs.getString("actor"), + rs.getLong("created_at"), + read(jsonText(rs, "details_json"), OBJECT_MAP)); + } + + private RowMapper runMapper() { + return (rs, rowNum) -> new AiRunRecord( + rs.getString("run_id"), + rs.getString("task_id"), + rs.getString("change_set_id"), + rs.getString("run_type"), + rs.getString("status"), + rs.getLong("created_at"), + readTree(jsonText(rs, "payload_json"))); + } + + private String json(Object value) { + try { + return objectMapper.writeValueAsString(value); + } catch (JsonProcessingException ex) { + throw new IllegalArgumentException("AI Agent 产物 JSON 序列化失败", ex); + } + } + + private T read(String json, TypeReference 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); + } catch (JsonProcessingException ex) { + throw new IllegalArgumentException("AI Agent schema JSON 反序列化失败", ex); + } + } + + private static String jsonText(ResultSet rs, String column) throws SQLException { + Object value = rs.getObject(column); + if (value == null) { + return "{}"; + } + return String.valueOf(value); + } +} 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 new file mode 100644 index 0000000..f5316ca --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/web/AiAgentController.java @@ -0,0 +1,178 @@ +package com.eip4.platform.ai.web; + +import java.util.List; +import java.util.Map; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.eip4.platform.ai.model.AiAuditEntry; +import com.eip4.platform.ai.model.AiAutoDevelopmentRequest; +import com.eip4.platform.ai.model.AiAutoDevelopmentRun; +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.AiFeatureDevelopment; +import com.eip4.platform.ai.model.AiFeatureRequest; +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.AiRunRecord; +import com.eip4.platform.ai.model.AiSmokeRun; +import com.eip4.platform.ai.model.AiTask; +import com.eip4.platform.ai.service.AiAgentService; +import com.fasterxml.jackson.databind.JsonNode; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +@Tag(name = "AI Agent 开发工具", description = "受控任务/草稿/变更包/校验接口;生产发布前的人审边界") +@RestController +@RequestMapping("/api/ai") +public class AiAgentController { + + private final AiAgentService service; + + public AiAgentController(AiAgentService service) { + this.service = service; + } + + @Operation(summary = "创建 Agent 开发任务", description = "只创建受控任务和初始计划,不执行线上变更") + @PostMapping("/tasks") + public AiTask createTask(@RequestBody CreateTaskRequest req) { + return service.createTask(req.objective()); + } + + @Operation(summary = "自动开发功能草稿", description = "创建任务并生成实体/页面/服务流/菜单/测试草稿,门禁通过后生成待人审变更包") + @PostMapping("/features/develop") + public AiFeatureDevelopment developFeature(@RequestBody AiFeatureRequest req) { + return service.developFeature(req); + } + + @Operation(summary = "一键自动开发功能", description = "生成草稿、变更包、发布计划,执行本地落库和 smoke,并生成线上人工部署包") + @PostMapping("/features/auto-develop") + public AiAutoDevelopmentRun autoDevelopFeature(@RequestBody(required = false) AiAutoDevelopmentRequest req) { + return service.autoDevelopFeature(req); + } + + @Operation(summary = "查看 Agent 开发任务") + @GetMapping("/tasks/{taskId}") + public AiTask task(@PathVariable String taskId) { + return service.getTask(taskId); + } + + @Operation(summary = "保存 Agent 草稿产物", description = "PAGE_SCHEMA 草稿会自动跑 amis schema 校验") + @PostMapping("/tasks/{taskId}/drafts") + public AiDraft addDraft(@PathVariable String taskId, @RequestBody CreateDraftRequest req) { + return service.addDraft(taskId, req.artifactType(), req.targetId(), req.payload(), req.metadata()); + } + + @Operation(summary = "列出任务草稿") + @GetMapping("/tasks/{taskId}/drafts") + public List drafts(@PathVariable String taskId) { + return service.listDrafts(taskId); + } + + @Operation(summary = "在既有任务下自动开发功能草稿") + @PostMapping("/tasks/{taskId}/develop-feature") + public AiFeatureDevelopment developFeature(@PathVariable String taskId, @RequestBody AiFeatureRequest req) { + return service.developFeature(taskId, req); + } + + @Operation(summary = "生成待人审变更包", description = "任何草稿门禁失败时拒绝生成") + @PostMapping("/tasks/{taskId}/change-sets") + public AiChangeSet createChangeSet(@PathVariable String taskId) { + return service.createChangeSet(taskId); + } + + @Operation(summary = "列出任务变更包") + @GetMapping("/tasks/{taskId}/change-sets") + public List changeSets(@PathVariable String taskId) { + return service.listChangeSets(taskId); + } + + @Operation(summary = "生成变更包发布计划", description = "按实体→服务流→页面→菜单→smoke 排序;线上发布仍要求人工批准") + @PostMapping("/tasks/{taskId}/change-sets/{changeSetId}/release-plan") + public AiReleasePlan releasePlan(@PathVariable String taskId, @PathVariable String changeSetId) { + return service.createReleasePlan(taskId, changeSetId); + } + + @Operation(summary = "运行本地 smoke 门禁", description = "只允许访问本机 baseUrl;返回逐条 HTTP smoke 结果") + @PostMapping("/tasks/{taskId}/change-sets/{changeSetId}/smoke") + public AiSmokeRun runSmoke(@PathVariable String taskId, + @PathVariable String changeSetId, + @RequestBody(required = false) SmokeRunRequest req) { + return service.runLocalSmoke(taskId, changeSetId, req == null ? null : req.baseUrl()); + } + + @Operation(summary = "本地应用变更包并运行 smoke", description = "仅允许本机 baseUrl;不会执行线上部署") + @PostMapping("/tasks/{taskId}/change-sets/{changeSetId}/local-apply") + public AiApplyRun localApply(@PathVariable String taskId, + @PathVariable String changeSetId, + @RequestBody(required = false) SmokeRunRequest req) { + return service.applyLocalRelease(taskId, changeSetId, req == null ? null : req.baseUrl()); + } + + @Operation(summary = "列出任务执行证据", description = "包含本地 smoke 和本地 apply 的结构化结果") + @GetMapping("/tasks/{taskId}/runs") + public List runs(@PathVariable String taskId) { + return service.listRuns(taskId); + } + + @Operation(summary = "列出变更包执行证据", description = "按变更包过滤本地 smoke/apply 结构化结果") + @GetMapping("/tasks/{taskId}/change-sets/{changeSetId}/runs") + public List runs(@PathVariable String taskId, @PathVariable String changeSetId) { + return service.listRuns(taskId, changeSetId); + } + + @Operation(summary = "生成线上人工部署包", description = "输出 manifest、SQL 草案、回滚 SQL 和本地执行证据;不连接线上环境执行") + @PostMapping("/tasks/{taskId}/change-sets/{changeSetId}/deployment-package") + public AiDeploymentPackage deploymentPackage(@PathVariable String taskId, @PathVariable String changeSetId) { + return service.createDeploymentPackage(taskId, changeSetId); + } + + @Operation(summary = "生成自动修复计划", description = "读取最近失败的自动开发/本地应用/smoke 证据,输出结构化修复动作并写入 run history") + @PostMapping("/tasks/{taskId}/change-sets/{changeSetId}/repair-plan") + public AiRepairPlan repairPlan(@PathVariable String taskId, @PathVariable String changeSetId) { + return service.createRepairPlan(taskId, changeSetId); + } + + @Operation(summary = "执行自动修复并重跑本地门禁", description = "仅执行 repair-plan 中标记 automated=true 的动作;存在人工动作时阻断") + @PostMapping("/tasks/{taskId}/change-sets/{changeSetId}/repair-execution") + public AiRepairExecution executeRepairPlan(@PathVariable String taskId, + @PathVariable String changeSetId, + @RequestBody(required = false) AiRepairExecutionRequest req) { + return service.executeRepairPlan(taskId, changeSetId, req == null ? null : req.baseUrl()); + } + + @Operation(summary = "列出任务审计日志") + @GetMapping("/tasks/{taskId}/audit") + public List audit(@PathVariable String taskId) { + return service.listAudit(taskId); + } + + @Operation(summary = "校验任意 amis schema", description = "AI 生成 schema 的第一道闸;后续仍需渲染冒烟") + @PostMapping("/tools/validate-schema") + public Map validateSchema(@RequestBody JsonNode schema) { + return service.validateSchema(schema); + } + + public record CreateTaskRequest(String objective) { + } + + public record CreateDraftRequest( + String artifactType, + String targetId, + JsonNode payload, + Map metadata) { + } + + public record SmokeRunRequest(String baseUrl) { + } +} diff --git a/platform-ai/src/main/resources/bootstrap/bootstrap-ai-agent.sql b/platform-ai/src/main/resources/bootstrap/bootstrap-ai-agent.sql new file mode 100644 index 0000000..f4a01a6 --- /dev/null +++ b/platform-ai/src/main/resources/bootstrap/bootstrap-ai-agent.sql @@ -0,0 +1,68 @@ +-- ============================================================================ +-- eip4-platform P5 AI Agent 运行态自举 schema —— bootstrap-ai-agent.sql +-- ---------------------------------------------------------------------------- +-- 用途:在本地/CI 库上保存 Agent 开发任务、草稿产物、待人审变更包、执行证据和审计日志。 +-- +-- 纪律:可重复执行(CREATE TABLE IF NOT EXISTS / CREATE INDEX IF NOT EXISTS); +-- 只保存 AI 运行态和草稿,不直接写 SYS_PAGE_SCHEMA / SYS_ENTITY / 服务流等生产元数据。 +-- 生产脚本副本见 docs/sql/SYS_AI_AGENT.sql;P5 引入 Flyway 后可原样迁入 migration。 +-- ============================================================================ + +CREATE TABLE IF NOT EXISTS sys_ai_task ( + task_id character varying(64) NOT NULL, + objective text NOT NULL, + status character varying(32) NOT NULL, + plan_json jsonb NOT NULL, + created_at bigint NOT NULL, + updated_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_task PRIMARY KEY (task_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_draft ( + draft_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + artifact_type character varying(32) NOT NULL, + target_id character varying(128) NOT NULL, + payload_json jsonb NOT NULL, + gates_json jsonb NOT NULL, + metadata_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_draft PRIMARY KEY (draft_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_change_set ( + change_set_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + status character varying(32) NOT NULL, + draft_ids_json jsonb NOT NULL, + summary_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_change_set PRIMARY KEY (change_set_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_run ( + run_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + change_set_id character varying(64) NOT NULL, + run_type character varying(32) NOT NULL, + status character varying(32) NOT NULL, + payload_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_run PRIMARY KEY (run_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_audit_log ( + audit_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + action character varying(96) NOT NULL, + actor character varying(64) NOT NULL, + details_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_audit_log PRIMARY KEY (audit_id) +); + +CREATE INDEX IF NOT EXISTS idx_sys_ai_draft_task ON sys_ai_draft (task_id, created_at); +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_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 new file mode 100644 index 0000000..53f4fc2 --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiAgentServiceTest.java @@ -0,0 +1,689 @@ +package com.eip4.platform.ai.service; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.web.server.ResponseStatusException; + +import com.eip4.platform.ai.model.AiAutoDevelopmentRequest; +import com.eip4.platform.ai.model.AiArtifactType; +import com.eip4.platform.ai.model.AiFeatureField; +import com.eip4.platform.ai.model.AiFeatureRequest; +import com.eip4.platform.ai.model.AiRepairDraftPatch; +import com.eip4.platform.ai.store.InMemoryAiAgentStore; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +class AiAgentServiceTest { + + private static final ObjectMapper MAPPER = new ObjectMapper(); + + @Test + @DisplayName("创建任务后保存有效页面草稿并生成待人审变更包") + void createTaskDraftAndChangeSet() throws Exception { + AiAgentService service = newService(); + var task = service.createTask("新增合同类型维护功能"); + + JsonNode page = MAPPER.readTree(""" + {"type":"page","title":"合同类型维护","body":{"type":"tpl","tpl":"ok"}} + """); + var draft = service.addDraft(task.id(), "PAGE_SCHEMA", "contract-type-page", page, Map.of("source", "test")); + + assertTrue(draft.passed()); + assertEquals(1, service.listDrafts(task.id()).size()); + + var changeSet = service.createChangeSet(task.id()); + assertEquals("READY_FOR_REVIEW", changeSet.status()); + assertEquals(1, changeSet.draftIds().size()); + assertEquals(1, service.listChangeSets(task.id()).size()); + assertEquals(3, service.listAudit(task.id()).size()); + } + + @Test + @DisplayName("无效 schema 草稿会阻止生成变更包") + void invalidSchemaBlocksChangeSet() throws Exception { + AiAgentService service = newService(); + var task = service.createTask("生成坏页面"); + JsonNode invalid = MAPPER.readTree("\"not-object\""); + + var draft = service.addDraft(task.id(), "PAGE_SCHEMA", "bad", invalid, null); + + assertFalse(draft.passed()); + ResponseStatusException ex = assertThrows(ResponseStatusException.class, + () -> service.createChangeSet(task.id())); + assertEquals(409, ex.getStatusCode().value()); + } + + @Test + @DisplayName("不允许空目标或未知产物类型") + void validatesInputs() { + AiAgentService service = newService(); + assertThrows(ResponseStatusException.class, () -> service.createTask(" ")); + var task = service.createTask("合法任务"); + JsonNode payload = MAPPER.createObjectNode().put("x", 1); + ResponseStatusException blankTarget = assertThrows(ResponseStatusException.class, + () -> service.addDraft(task.id(), "CODE", " ", payload, null)); + assertEquals(400, blankTarget.getStatusCode().value()); + ResponseStatusException ex = assertThrows(ResponseStatusException.class, + () -> service.addDraft(task.id(), "UNKNOWN", "x", payload, null)); + assertEquals(400, ex.getStatusCode().value()); + } + + @Test + @DisplayName("自动开发功能:生成实体/页面/服务流/菜单/测试草稿并创建待人审变更包") + void developFeatureCreatesFullDraftSet() { + AiAgentService service = newService(); + + var result = service.developFeature(contractTypeFeature()); + + assertEquals(5, result.drafts().size()); + assertTrue(result.drafts().stream().allMatch(d -> d.passed()), "自动生成草稿必须全部过基础门禁"); + assertEquals("READY_FOR_REVIEW", result.changeSet().status()); + assertEquals(5, result.changeSet().draftIds().size()); + assertEquals(5, service.listDrafts(result.task().id()).size()); + + var plan = service.createReleasePlan(result.task().id(), result.changeSet().id()); + assertTrue(plan.requiresHumanApproval()); + assertEquals(5, plan.steps().size()); + assertEquals("ENTITY", plan.steps().get(0).artifactType().name()); + assertEquals("TEST", plan.steps().get(4).artifactType().name()); + assertEquals("READY_FOR_LOCAL_APPLY", plan.status()); + + var smoke = service.runLocalSmoke(result.task().id(), result.changeSet().id(), "http://localhost:8084"); + assertTrue(smoke.passed()); + assertEquals("PASSED", smoke.status()); + assertEquals(4, smoke.results().size()); + assertEquals(1, service.listRuns(result.task().id(), result.changeSet().id()).size()); + + var apply = service.applyLocalRelease(result.task().id(), result.changeSet().id(), "http://localhost:8084"); + assertTrue(apply.passed()); + assertEquals("PASSED", apply.status()); + assertEquals(4, apply.steps().size()); + assertEquals("PASSED", apply.smokeRun().status()); + assertEquals(3, service.listRuns(result.task().id()).size()); + + var deploymentPackage = service.createDeploymentPackage(result.task().id(), result.changeSet().id()); + assertEquals("READY_FOR_HUMAN_REVIEW", deploymentPackage.status()); + assertTrue(deploymentPackage.requiresHumanApproval()); + assertTrue(deploymentPackage.sqlStatements().stream().anyMatch(sql -> sql.contains("sys_page_schema"))); + 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"))); + } + + @Test + @DisplayName("一键自动开发会串联草稿生成、本地应用、smoke 和部署包") + void autoDevelopFeatureRunsFullPipeline() { + AiAgentService service = newService(); + + var run = service.autoDevelopFeature(new AiAutoDevelopmentRequest( + contractTypeFeature(), "http://localhost:8084", true, null)); + + assertEquals("READY_FOR_HUMAN_REVIEW", run.status()); + assertEquals(run.originalChangeSetId(), run.changeSetId()); + assertEquals(5, run.development().drafts().size()); + assertEquals("READY_FOR_LOCAL_APPLY", run.releasePlan().status()); + assertEquals("PASSED", run.applyRun().status()); + assertEquals("READY_FOR_HUMAN_REVIEW", run.deploymentPackage().status()); + assertTrue(run.repairExecutions().isEmpty()); + assertTrue(run.messages().stream().anyMatch(m -> m.contains("parentId"))); + assertEquals("READY_FOR_HUMAN_REVIEW", service.getTask(run.taskId()).status()); + assertEquals(3, service.listRuns(run.taskId()).size()); + assertTrue(service.listRuns(run.taskId()).stream().anyMatch(r -> "AUTO_DEVELOP".equals(r.runType()))); + } + + @Test + @DisplayName("一键自动开发本地应用失败时返回诊断消息并保留执行证据") + void autoDevelopFeatureReturnsDiagnosticsWhenLocalApplyFails() { + AiAgentService service = newService(new FailingLocalReleaseExecutor()); + + var run = service.autoDevelopFeature(new AiAutoDevelopmentRequest( + contractTypeFeature(), "http://localhost:8084", true, 0)); + + assertEquals("LOCAL_GATE_FAILED", run.status()); + assertEquals("APPLY_FAILED", run.applyRun().status()); + assertEquals("BLOCKED_PENDING_LOCAL_PASS", run.deploymentPackage().status()); + assertTrue(run.repairExecutions().isEmpty()); + assertTrue(run.messages().stream().anyMatch(m -> m.contains("实体接口不可用"))); + assertTrue(run.messages().stream().anyMatch(m -> m.contains("LOCAL_APPLY"))); + assertEquals("LOCAL_GATE_FAILED", service.getTask(run.taskId()).status()); + assertEquals(2, service.listRuns(run.taskId()).size()); + assertTrue(service.listRuns(run.taskId()).stream().anyMatch(r -> "AUTO_DEVELOP".equals(r.runType()))); + + var repairPlan = service.createRepairPlan(run.taskId(), run.changeSetId()); + + assertEquals("NEEDS_HUMAN_ACTION", repairPlan.status()); + assertEquals(1, repairPlan.actions().size()); + assertEquals("ENTITY", repairPlan.actions().get(0).artifactType()); + assertEquals("REPAIR_ENTITY_METADATA_OR_LOCAL_API", repairPlan.actions().get(0).actionType()); + assertTrue(repairPlan.actions().get(0).rationale().contains("实体接口不可用")); + assertEquals(3, service.listRuns(run.taskId()).size()); + assertTrue(service.listRuns(run.taskId()).stream().anyMatch(r -> "REPAIR_PLAN".equals(r.runType()))); + } + + @Test + @DisplayName("一键自动开发默认会自动修复可恢复的本地门禁失败") + void autoDevelopFeatureAutomaticallyRepairsRecoverableSmokeFailure() { + AtomicInteger smokeCalls = new AtomicInteger(); + AiSmokeRunner flakySmokeRunner = new AiSmokeRunner((method, uri, requestBody, timeout) -> { + if (smokeCalls.incrementAndGet() <= 4) { + return new AiHttpResponse(503, "temporary unavailable"); + } + return new AiHttpResponse(200, "{\"status\":0}"); + }); + AiAgentService service = newService(new NoopLocalReleaseExecutor(), flakySmokeRunner); + + var run = service.autoDevelopFeature(new AiAutoDevelopmentRequest( + contractTypeFeature(), "http://localhost:8084", true, null)); + + assertEquals("READY_FOR_HUMAN_REVIEW", run.status()); + assertEquals(run.originalChangeSetId(), run.changeSetId()); + assertEquals("PASSED", run.applyRun().status()); + assertEquals(1, run.repairExecutions().size()); + assertEquals("REPAIRED", run.repairExecutions().get(0).status()); + assertEquals("READY_FOR_HUMAN_REVIEW", run.deploymentPackage().status()); + assertTrue(run.messages().stream().anyMatch(m -> m.contains("自动修复第 1 轮结果: REPAIRED"))); + assertEquals("READY_FOR_HUMAN_REVIEW", service.getTask(run.taskId()).status()); + assertTrue(service.listRuns(run.taskId()).stream().anyMatch(r -> "REPAIR_EXECUTION".equals(r.runType()))); + } + + @Test + @DisplayName("一键自动开发关闭部署包时自动修复后只返回本地门禁通过") + void autoDevelopFeatureHonorsDeploymentPackageSwitchAfterRepair() { + AtomicInteger smokeCalls = new AtomicInteger(); + AiSmokeRunner flakySmokeRunner = new AiSmokeRunner((method, uri, requestBody, timeout) -> { + if (smokeCalls.incrementAndGet() <= 4) { + return new AiHttpResponse(503, "temporary unavailable"); + } + return new AiHttpResponse(200, "{\"status\":0}"); + }); + AiAgentService service = newService(new NoopLocalReleaseExecutor(), flakySmokeRunner); + + var run = service.autoDevelopFeature(new AiAutoDevelopmentRequest( + contractTypeFeature(), "http://localhost:8084", false, null)); + + assertEquals("LOCAL_GATE_PASSED", run.status()); + assertEquals("PASSED", run.applyRun().status()); + assertEquals(1, run.repairExecutions().size()); + assertEquals("REPAIRED", run.repairExecutions().get(0).status()); + assertNull(run.deploymentPackage()); + assertNull(run.repairExecutions().get(0).deploymentPackage()); + assertEquals("LOCAL_GATE_PASSED", service.getTask(run.taskId()).status()); + } + + @Test + @DisplayName("自动修复执行会重试瞬时 smoke 失败并生成新部署包") + void executeRepairPlanRetriesTransientSmokeFailure() { + AtomicInteger smokeCalls = new AtomicInteger(); + AiSmokeRunner flakySmokeRunner = new AiSmokeRunner((method, uri, requestBody, timeout) -> { + if (smokeCalls.incrementAndGet() <= 4) { + return new AiHttpResponse(503, "temporary unavailable"); + } + return new AiHttpResponse(200, "{\"status\":0}"); + }); + AiAgentService service = newService(new NoopLocalReleaseExecutor(), flakySmokeRunner); + + var run = service.autoDevelopFeature(new AiAutoDevelopmentRequest( + contractTypeFeature(), "http://localhost:8084", true, 0)); + + assertEquals("LOCAL_GATE_FAILED", run.status()); + assertEquals("SMOKE_FAILED", run.applyRun().status()); + + var repairPlan = service.createRepairPlan(run.taskId(), run.changeSetId()); + + assertEquals("READY_FOR_AUTO_RETRY", repairPlan.status()); + assertEquals(4, repairPlan.actions().size()); + assertTrue(repairPlan.actions().stream().allMatch(a -> a.automated())); + assertTrue(repairPlan.actions().stream() + .allMatch(a -> "RETRY_TRANSIENT_SMOKE_FAILURE".equals(a.actionType()))); + + var execution = service.executeRepairPlan(run.taskId(), run.changeSetId(), "http://localhost:8084"); + + assertEquals("REPAIRED", execution.status()); + assertTrue(execution.retryApplyRun().passed()); + assertEquals("READY_FOR_HUMAN_REVIEW", execution.deploymentPackage().status()); + assertEquals("READY_FOR_HUMAN_REVIEW", service.getTask(run.taskId()).status()); + assertTrue(service.listRuns(run.taskId()).stream().anyMatch(r -> "REPAIR_EXECUTION".equals(r.runType()))); + } + + @Test + @DisplayName("Agent 修复执行器会生成 TEST 草稿修复 HTTP 契约偏差并重跑") + void executeRepairPlanGeneratesDraftPatchForSmokeContractMismatch() { + AiSmokeRunner contractSmokeRunner = new AiSmokeRunner((method, uri, requestBody, timeout) -> { + if ("POST".equals(method) && uri.toString().contains("/save")) { + return new AiHttpResponse(201, "{\"status\":0}"); + } + return new AiHttpResponse(200, "{\"status\":0}"); + }); + AiAgentService service = newService(new NoopLocalReleaseExecutor(), contractSmokeRunner); + + var run = service.autoDevelopFeature(new AiAutoDevelopmentRequest( + contractTypeFeature(), "http://localhost:8084", true, 0)); + + assertEquals("LOCAL_GATE_FAILED", run.status()); + assertEquals("SMOKE_FAILED", run.applyRun().status()); + + var repairPlan = service.createRepairPlan(run.taskId(), run.changeSetId()); + + assertEquals("NEEDS_HUMAN_ACTION", repairPlan.status()); + assertEquals(1, repairPlan.actions().size()); + assertEquals("REPAIR_SMOKE_EXPECTATION_OR_API_CONTRACT", repairPlan.actions().get(0).actionType()); + + var execution = service.executeRepairPlan(run.taskId(), run.changeSetId(), "http://localhost:8084"); + + assertEquals("REPAIRED", execution.status()); + assertEquals(1, execution.generatedDrafts().size()); + assertEquals("TEST", execution.generatedDrafts().get(0).artifactType().name()); + assertTrue(execution.generatedDrafts().get(0).payload().path("smokeTests").toString() + .contains("\"expectHttpStatus\":201")); + assertTrue(execution.retryApplyRun().passed()); + assertEquals("READY_FOR_HUMAN_REVIEW", execution.deploymentPackage().status()); + assertEquals(5, execution.repairedChangeSet().draftIds().size()); + } + + @Test + @DisplayName("Agent 修复执行器会生成 PAGE_SCHEMA 草稿补齐缺失 body 并重跑") + void executeRepairPlanGeneratesPageSchemaPatch() throws Exception { + AiAgentService service = newService(new PageSchemaBodyRequiredExecutor()); + var task = service.createTask("修复页面 schema"); + JsonNode pageWithoutBody = MAPPER.readTree(""" + {"type":"page","title":"坏页面"} + """); + var pageDraft = service.addDraft(task.id(), "PAGE_SCHEMA", "bad-page", pageWithoutBody, Map.of()); + assertTrue(pageDraft.passed()); + JsonNode testPayload = MAPPER.readTree(""" + {"smokeTests":[{"name":"page-schema","method":"GET","url":"/api/page/schema/bad-page","expectHttpStatus":200}]} + """); + service.addDraft(task.id(), "TEST", "bad-page-smoke", testPayload, Map.of()); + var changeSet = service.createChangeSet(task.id()); + + var apply = service.applyLocalRelease(task.id(), changeSet.id(), "http://localhost:8084"); + assertEquals("APPLY_FAILED", apply.status()); + + var repairPlan = service.createRepairPlan(task.id(), changeSet.id()); + assertEquals("NEEDS_HUMAN_ACTION", repairPlan.status()); + assertEquals("REPAIR_PAGE_SCHEMA_SQL_OR_SCHEMA", repairPlan.actions().get(0).actionType()); + + var execution = service.executeRepairPlan(task.id(), changeSet.id(), "http://localhost:8084"); + + assertEquals("REPAIRED", execution.status()); + assertEquals(1, execution.generatedDrafts().size()); + assertEquals("PAGE_SCHEMA", execution.generatedDrafts().get(0).artifactType().name()); + assertTrue(execution.generatedDrafts().get(0).payload().has("body")); + assertTrue(execution.retryApplyRun().passed()); + assertEquals("READY_FOR_HUMAN_REVIEW", execution.deploymentPackage().status()); + assertEquals(2, execution.repairedChangeSet().draftIds().size()); + } + + @Test + @DisplayName("Agent 修复执行器会生成 MENU 草稿显式父级占位并重跑") + void executeRepairPlanGeneratesMenuParentPatch() throws Exception { + AiAgentService service = newService(new MenuParentRequiredExecutor()); + var task = service.createTask("修复菜单挂载"); + JsonNode menu = MAPPER.readTree(""" + {"name":"坏菜单","viewTemplateId":"bad-page","typename":"功能菜单","seq":0} + """); + service.addDraft(task.id(), "MENU", "bad-page", menu, Map.of()); + JsonNode testPayload = MAPPER.readTree(""" + {"smokeTests":[{"name":"page-schema","method":"GET","url":"/api/page/schema/bad-page","expectHttpStatus":200}]} + """); + service.addDraft(task.id(), "TEST", "bad-page-smoke", testPayload, Map.of()); + var changeSet = service.createChangeSet(task.id()); + + var apply = service.applyLocalRelease(task.id(), changeSet.id(), "http://localhost:8084"); + assertEquals("APPLY_FAILED", apply.status()); + + var repairPlan = service.createRepairPlan(task.id(), changeSet.id()); + assertEquals("NEEDS_HUMAN_ACTION", repairPlan.status()); + assertEquals("SEED_MENU_ROOT_OR_SET_PARENT", repairPlan.actions().get(0).actionType()); + + var execution = service.executeRepairPlan(task.id(), changeSet.id(), "http://localhost:8084"); + + assertEquals("REPAIRED", execution.status()); + assertEquals(1, execution.generatedDrafts().size()); + assertEquals("MENU", execution.generatedDrafts().get(0).artifactType().name()); + assertEquals("${parentMenuId}", execution.generatedDrafts().get(0).payload().path("parentId").asText()); + assertTrue(execution.retryApplyRun().passed()); + assertEquals("READY_FOR_HUMAN_REVIEW", execution.deploymentPackage().status()); + assertTrue(execution.deploymentPackage().warnings().stream().anyMatch(w -> w.contains("parentId"))); + assertEquals(2, execution.repairedChangeSet().draftIds().size()); + } + + @Test + @DisplayName("Agent 修复执行器会生成 SERVICEFLOW 草稿恢复 entityId 占位绑定并重跑") + void executeRepairPlanGeneratesServiceFlowEntityBindingPatch() throws Exception { + AiAgentService service = newService(new ServiceFlowEntityBindingExecutor()); + var task = service.createTask("修复服务流 entityId 绑定"); + JsonNode entity = MAPPER.readTree(""" + {"tablename":"EIP4AI_FLOW_FIX","name":"服务流修复","attributes":[{"column":"NAME","display":"名称","type":"string","mandatory":true}]} + """); + service.addDraft(task.id(), "ENTITY", "EIP4AI_FLOW_FIX", entity, Map.of()); + JsonNode serviceFlow = MAPPER.readTree(""" + {"requiresEntityId":true,"flows":[{"key":"EIP4AI_FLOW_FIX_SEARCH","displayName":"查询","entityId":"wrong-entity-id","control":true,"updateable":true,"contentXml":""}]} + """); + service.addDraft(task.id(), "SERVICEFLOW", "EIP4AI_FLOW_FIX_DEFAULT_FLOWS", serviceFlow, Map.of()); + JsonNode testPayload = MAPPER.readTree(""" + {"smokeTests":[{"name":"flow-search","method":"GET","url":"/api/flow/EIP4AI_FLOW_FIX_SEARCH","expectHttpStatus":200}]} + """); + service.addDraft(task.id(), "TEST", "flow-fix-smoke", testPayload, Map.of()); + var changeSet = service.createChangeSet(task.id()); + + var apply = service.applyLocalRelease(task.id(), changeSet.id(), "http://localhost:8084"); + assertEquals("APPLY_FAILED", apply.status()); + + var repairPlan = service.createRepairPlan(task.id(), changeSet.id()); + assertEquals("NEEDS_HUMAN_ACTION", repairPlan.status()); + assertEquals("RETRY_AFTER_ENTITY_ID_RESOLUTION", repairPlan.actions().get(0).actionType()); + + var execution = service.executeRepairPlan(task.id(), changeSet.id(), "http://localhost:8084"); + + assertEquals("REPAIRED", execution.status()); + assertEquals(1, execution.generatedDrafts().size()); + assertEquals("SERVICEFLOW", execution.generatedDrafts().get(0).artifactType().name()); + assertTrue(execution.generatedDrafts().get(0).payload().toString().contains("${entityId}")); + assertTrue(execution.retryApplyRun().passed()); + assertEquals("READY_FOR_HUMAN_REVIEW", execution.deploymentPackage().status()); + assertEquals(3, execution.repairedChangeSet().draftIds().size()); + } + + @Test + @DisplayName("Agent 修复执行器会生成 ENTITY 草稿补齐发布目标并重跑") + void executeRepairPlanGeneratesEntityPublishTargetPatch() throws Exception { + AiAgentService service = newService(new EntityPublishTargetRequiredExecutor()); + var task = service.createTask("修复实体发布目标"); + JsonNode entity = MAPPER.readTree(""" + {"tablename":"EIP4AI_ENTITY_FIX","name":"实体修复","attributes":[{"column":"NAME","display":"","type":"string","mandatory":true}]} + """); + service.addDraft(task.id(), "ENTITY", "EIP4AI_ENTITY_FIX", entity, Map.of()); + JsonNode testPayload = MAPPER.readTree(""" + {"smokeTests":[{"name":"entity-list","method":"GET","url":"/api/entity/EIP4AI_ENTITY_FIX/list","expectHttpStatus":200}]} + """); + service.addDraft(task.id(), "TEST", "entity-fix-smoke", testPayload, Map.of()); + var changeSet = service.createChangeSet(task.id()); + + var apply = service.applyLocalRelease(task.id(), changeSet.id(), "http://localhost:8084"); + assertEquals("APPLY_FAILED", apply.status()); + + var repairPlan = service.createRepairPlan(task.id(), changeSet.id()); + assertEquals("NEEDS_HUMAN_ACTION", repairPlan.status()); + assertEquals("REPAIR_ENTITY_METADATA_OR_LOCAL_API", repairPlan.actions().get(0).actionType()); + + var execution = service.executeRepairPlan(task.id(), changeSet.id(), "http://localhost:8084"); + + assertEquals("REPAIRED", execution.status()); + assertEquals(1, execution.generatedDrafts().size()); + assertEquals("ENTITY", execution.generatedDrafts().get(0).artifactType().name()); + assertEquals("/api/meta/entity", execution.generatedDrafts().get(0).payload().path("publishTarget").asText()); + assertEquals("NAME", execution.generatedDrafts().get(0).payload().path("attributes").get(0).path("display").asText()); + assertTrue(execution.retryApplyRun().passed()); + assertEquals("READY_FOR_HUMAN_REVIEW", execution.deploymentPackage().status()); + assertEquals(2, execution.repairedChangeSet().draftIds().size()); + } + + @Test + @DisplayName("LLM 修复客户端返回草稿补丁时优先于确定性 fallback") + void executeRepairPlanUsesLlmDraftPatchBeforeDeterministicFallback() throws Exception { + AiLlmRepairClient llmClient = context -> java.util.List.of(new AiRepairDraftPatch( + AiArtifactType.ENTITY, + "EIP4AI_ENTITY_FIX", + json(""" + {"publishTarget":"/api/meta/entity","tablename":"EIP4AI_ENTITY_FIX","name":"LLM实体修复","attributes":[{"column":"NAME","display":"LLM名称","type":"string","mandatory":true}]} + """), + Map.of("source", "fake-llm"))); + AiAgentService service = newService(new EntityPublishTargetRequiredExecutor(), + new AiSmokeRunner((method, uri, requestBody, timeout) -> new AiHttpResponse(200, "{\"status\":0}")), + new DeterministicAiAgentRepairExecutor(MAPPER, java.util.List.of(llmClient))); + var task = service.createTask("LLM 修复实体发布目标"); + JsonNode entity = MAPPER.readTree(""" + {"tablename":"EIP4AI_ENTITY_FIX","name":"实体修复","attributes":[{"column":"NAME","display":"","type":"string","mandatory":true}]} + """); + service.addDraft(task.id(), "ENTITY", "EIP4AI_ENTITY_FIX", entity, Map.of()); + JsonNode testPayload = MAPPER.readTree(""" + {"smokeTests":[{"name":"entity-list","method":"GET","url":"/api/entity/EIP4AI_ENTITY_FIX/list","expectHttpStatus":200}]} + """); + service.addDraft(task.id(), "TEST", "entity-fix-smoke", testPayload, Map.of()); + var changeSet = service.createChangeSet(task.id()); + service.applyLocalRelease(task.id(), changeSet.id(), "http://localhost:8084"); + service.createRepairPlan(task.id(), changeSet.id()); + + var execution = service.executeRepairPlan(task.id(), changeSet.id(), "http://localhost:8084"); + + assertEquals("REPAIRED", execution.status()); + assertEquals("LLM实体修复", execution.generatedDrafts().get(0).payload().path("name").asText()); + assertEquals("fake-llm", execution.generatedDrafts().get(0).metadata().get("source")); + assertTrue(execution.retryApplyRun().passed()); + } + + @Test + @DisplayName("实体草稿字段非法会阻止生成变更包") + void invalidEntityDraftBlocksChangeSet() { + AiAgentService service = newService(); + var task = service.createTask("坏实体"); + JsonNode invalidEntity = MAPPER.createObjectNode() + .put("tablename", "bad table") + .put("name", "坏实体") + .set("attributes", MAPPER.createArrayNode() + .add(MAPPER.createObjectNode().put("column", "BAD-COL").put("type", "unknown"))); + + var draft = service.addDraft(task.id(), "ENTITY", "bad", invalidEntity, null); + + assertFalse(draft.passed()); + ResponseStatusException ex = assertThrows(ResponseStatusException.class, + () -> service.createChangeSet(task.id())); + assertEquals(409, ex.getStatusCode().value()); + } + + private static AiAgentService newService() { + return newService(new NoopLocalReleaseExecutor()); + } + + private static AiAgentService newService(AiLocalReleaseExecutor localReleaseExecutor) { + return newService(localReleaseExecutor, + new AiSmokeRunner((method, uri, requestBody, timeout) -> new AiHttpResponse(200, "{\"status\":0}"))); + } + + private static AiAgentService newService(AiLocalReleaseExecutor localReleaseExecutor, AiSmokeRunner smokeRunner) { + return newService(localReleaseExecutor, smokeRunner, new DeterministicAiAgentRepairExecutor(MAPPER)); + } + + private static AiAgentService newService(AiLocalReleaseExecutor localReleaseExecutor, + AiSmokeRunner smokeRunner, + AiAgentRepairExecutor repairExecutor) { + return new AiAgentService(new InMemoryAiAgentStore(), new AiFeatureDraftGenerator(MAPPER), + smokeRunner, localReleaseExecutor, repairExecutor, MAPPER); + } + + private static AiFeatureRequest contractTypeFeature() { + return new AiFeatureRequest( + "新增合同类型维护功能", + "合同类型维护", + "EIP4AI_CONTRACT_TYPE", + "合同类型", + "eip4ai-contract-type", + "合同类型维护", + java.util.List.of( + new AiFeatureField("NAME", "名称", "string", 100, true), + new AiFeatureField("CODE", "编码", "string", 64, true), + new AiFeatureField("ENABLED", "启用", "boolean", null, false))); + } + + private static JsonNode json(String text) { + try { + return MAPPER.readTree(text); + } catch (Exception ex) { + throw new IllegalArgumentException(ex); + } + } + + private static class NoopLocalReleaseExecutor extends AiLocalReleaseExecutor { + NoopLocalReleaseExecutor() { + super(org.mockito.Mockito.mock(org.springframework.jdbc.core.JdbcTemplate.class), + (method, uri, requestBody, timeout) -> new AiHttpResponse(200, "{\"status\":0}"), MAPPER); + } + + @Override + public java.util.List apply( + String baseUrl, java.util.List drafts) { + return drafts.stream() + .filter(d -> d.artifactType() != com.eip4.platform.ai.model.AiArtifactType.TEST) + .map(d -> { + Map details = switch (d.artifactType()) { + case ENTITY -> Map.of("entityId", "e-test-entity-id", "tableName", d.targetId()); + case SERVICEFLOW -> Map.of("flowCount", 5, "entityId", "e-test-entity-id"); + case PAGE_SCHEMA -> Map.of("templateId", d.targetId(), "etag", "test-etag"); + case MENU -> Map.of("menuId", "m-test-menu-id"); + case CODE, TEST -> Map.of(); + }; + return new com.eip4.platform.ai.model.AiApplyStepResult( + "apply-" + d.id(), d.artifactType(), d.targetId(), "APPLIED", "ok", details); + }) + .toList(); + } + } + + private static class FailingLocalReleaseExecutor extends AiLocalReleaseExecutor { + FailingLocalReleaseExecutor() { + super(org.mockito.Mockito.mock(org.springframework.jdbc.core.JdbcTemplate.class), + (method, uri, requestBody, timeout) -> new AiHttpResponse(500, "{\"status\":1}"), MAPPER); + } + + @Override + public java.util.List apply( + String baseUrl, java.util.List drafts) { + var first = drafts.get(0); + return java.util.List.of(new com.eip4.platform.ai.model.AiApplyStepResult( + "apply-1", first.artifactType(), first.targetId(), "FAILED", + "实体接口不可用", Map.of())); + } + } + + private static class PageSchemaBodyRequiredExecutor extends AiLocalReleaseExecutor { + PageSchemaBodyRequiredExecutor() { + super(org.mockito.Mockito.mock(org.springframework.jdbc.core.JdbcTemplate.class), + (method, uri, requestBody, timeout) -> new AiHttpResponse(200, "{\"status\":0}"), MAPPER); + } + + @Override + public java.util.List apply( + String baseUrl, java.util.List drafts) { + java.util.List out = new java.util.ArrayList<>(); + int index = 1; + for (var draft : drafts) { + if (draft.artifactType() == com.eip4.platform.ai.model.AiArtifactType.TEST) { + continue; + } + if (draft.artifactType() == com.eip4.platform.ai.model.AiArtifactType.PAGE_SCHEMA + && !draft.payload().has("body")) { + out.add(new com.eip4.platform.ai.model.AiApplyStepResult( + "apply-" + index, draft.artifactType(), draft.targetId(), "FAILED", + "页面 schema 缺少 body", Map.of())); + return out; + } + out.add(new com.eip4.platform.ai.model.AiApplyStepResult( + "apply-" + index, draft.artifactType(), draft.targetId(), "APPLIED", "ok", Map.of())); + index++; + } + return out; + } + } + + private static class MenuParentRequiredExecutor extends AiLocalReleaseExecutor { + MenuParentRequiredExecutor() { + super(org.mockito.Mockito.mock(org.springframework.jdbc.core.JdbcTemplate.class), + (method, uri, requestBody, timeout) -> new AiHttpResponse(200, "{\"status\":0}"), MAPPER); + } + + @Override + public java.util.List apply( + String baseUrl, java.util.List drafts) { + java.util.List out = new java.util.ArrayList<>(); + int index = 1; + for (var draft : drafts) { + if (draft.artifactType() == com.eip4.platform.ai.model.AiArtifactType.TEST) { + continue; + } + if (draft.artifactType() == com.eip4.platform.ai.model.AiArtifactType.MENU + && draft.payload().path("parentId").asText("").isBlank()) { + out.add(new com.eip4.platform.ai.model.AiApplyStepResult( + "apply-" + index, draft.artifactType(), draft.targetId(), "FAILED", + "缺少 sys_menu_root,不能自动挂载菜单", Map.of())); + return out; + } + out.add(new com.eip4.platform.ai.model.AiApplyStepResult( + "apply-" + index, draft.artifactType(), draft.targetId(), "APPLIED", "ok", Map.of())); + index++; + } + return out; + } + } + + private static class ServiceFlowEntityBindingExecutor extends AiLocalReleaseExecutor { + ServiceFlowEntityBindingExecutor() { + super(org.mockito.Mockito.mock(org.springframework.jdbc.core.JdbcTemplate.class), + (method, uri, requestBody, timeout) -> new AiHttpResponse(200, "{\"status\":0}"), MAPPER); + } + + @Override + public java.util.List apply( + String baseUrl, java.util.List drafts) { + java.util.List out = new java.util.ArrayList<>(); + int index = 1; + for (var draft : drafts) { + if (draft.artifactType() == com.eip4.platform.ai.model.AiArtifactType.TEST) { + continue; + } + if (draft.artifactType() == com.eip4.platform.ai.model.AiArtifactType.SERVICEFLOW + && !draft.payload().toString().contains("${entityId}")) { + out.add(new com.eip4.platform.ai.model.AiApplyStepResult( + "apply-" + index, draft.artifactType(), draft.targetId(), "FAILED", + "服务流 contentXml 缺少 ${entityId} 占位", Map.of())); + return out; + } + out.add(new com.eip4.platform.ai.model.AiApplyStepResult( + "apply-" + index, draft.artifactType(), draft.targetId(), "APPLIED", "ok", Map.of())); + index++; + } + return out; + } + } + + private static class EntityPublishTargetRequiredExecutor extends AiLocalReleaseExecutor { + EntityPublishTargetRequiredExecutor() { + super(org.mockito.Mockito.mock(org.springframework.jdbc.core.JdbcTemplate.class), + (method, uri, requestBody, timeout) -> new AiHttpResponse(200, "{\"status\":0}"), MAPPER); + } + + @Override + public java.util.List apply( + String baseUrl, java.util.List drafts) { + java.util.List out = new java.util.ArrayList<>(); + int index = 1; + for (var draft : drafts) { + if (draft.artifactType() == com.eip4.platform.ai.model.AiArtifactType.TEST) { + continue; + } + if (draft.artifactType() == com.eip4.platform.ai.model.AiArtifactType.ENTITY + && !"/api/meta/entity".equals(draft.payload().path("publishTarget").asText(""))) { + out.add(new com.eip4.platform.ai.model.AiApplyStepResult( + "apply-" + index, draft.artifactType(), draft.targetId(), "FAILED", + "实体草稿缺少 publishTarget=/api/meta/entity", Map.of())); + return out; + } + out.add(new com.eip4.platform.ai.model.AiApplyStepResult( + "apply-" + index, draft.artifactType(), draft.targetId(), "APPLIED", "ok", + draft.artifactType() == com.eip4.platform.ai.model.AiArtifactType.ENTITY + ? Map.of("entityId", "e-test-entity-id") : Map.of())); + index++; + } + return out; + } + } +} diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java new file mode 100644 index 0000000..6ac0e6d --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java @@ -0,0 +1,71 @@ +package com.eip4.platform.ai.service; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import com.eip4.platform.ai.model.AiArtifactType; +import com.eip4.platform.ai.model.AiFeatureField; +import com.eip4.platform.ai.model.AiFeatureRequest; +import com.fasterxml.jackson.databind.ObjectMapper; + +class AiFeatureDraftGeneratorTest { + + private static final ObjectMapper MAPPER = new ObjectMapper(); + + @Test + @DisplayName("根据功能规格生成 5 类草稿") + void generatesFeatureDrafts() { + AiFeatureDraftGenerator generator = new AiFeatureDraftGenerator(MAPPER); + + var drafts = generator.generate(new AiFeatureRequest( + "新增合同类型维护", + "合同类型维护", + "EIP4AI_CONTRACT_TYPE", + "合同类型", + "eip4ai-contract-type", + "合同类型维护", + List.of(new AiFeatureField("NAME", "名称", "string", 100, true)))); + + assertEquals(5, drafts.size()); + assertTrue(drafts.stream().anyMatch(d -> d.artifactType() == AiArtifactType.ENTITY)); + assertTrue(drafts.stream().anyMatch(d -> d.artifactType() == AiArtifactType.PAGE_SCHEMA)); + assertTrue(drafts.stream().anyMatch(d -> d.artifactType() == AiArtifactType.SERVICEFLOW)); + assertTrue(drafts.stream().anyMatch(d -> d.artifactType() == AiArtifactType.MENU)); + assertTrue(drafts.stream().anyMatch(d -> d.artifactType() == AiArtifactType.TEST)); + var serviceFlow = drafts.stream().filter(d -> d.artifactType() == AiArtifactType.SERVICEFLOW) + .findFirst().orElseThrow(); + assertEquals(5, serviceFlow.payload().path("flows").size()); + assertFalse(serviceFlow.payload().path("flows").get(0).path("contentXml").asText().isBlank()); + var test = drafts.stream().filter(d -> d.artifactType() == AiArtifactType.TEST) + .findFirst().orElseThrow(); + assertTrue(test.payload().path("smokeTests").get(3).has("requestBody")); + } + + @Test + @DisplayName("功能规格缺表名和字段时生成安全默认值") + void fillsSafeDefaults() { + AiFeatureDraftGenerator generator = new AiFeatureDraftGenerator(MAPPER); + + var drafts = generator.generate(new AiFeatureRequest( + "新增客户反馈登记", + "客户反馈登记", + null, + null, + null, + null, + null)); + + var entity = drafts.stream().filter(d -> d.artifactType() == AiArtifactType.ENTITY) + .findFirst().orElseThrow(); + assertTrue(entity.targetId().startsWith("EIP4AI_")); + assertNotNull(entity.payload().path("attributes").get(0)); + assertEquals("NAME", entity.payload().path("attributes").get(0).path("column").asText()); + } +} diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiLocalReleaseExecutorTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiLocalReleaseExecutorTest.java new file mode 100644 index 0000000..616d2ff --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiLocalReleaseExecutorTest.java @@ -0,0 +1,128 @@ +package com.eip4.platform.ai.service; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockingDetails; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.jdbc.core.JdbcTemplate; + +import com.eip4.platform.ai.model.AiArtifactType; +import com.eip4.platform.ai.model.AiDraft; +import com.eip4.platform.ai.model.AiFeatureField; +import com.eip4.platform.ai.model.AiFeatureRequest; +import com.eip4.platform.ai.model.AiGeneratedDraft; +import com.eip4.platform.ai.model.AiGateResult; +import com.fasterxml.jackson.databind.ObjectMapper; + +class AiLocalReleaseExecutorTest { + + private static final ObjectMapper MAPPER = new ObjectMapper(); + + @Test + @DisplayName("本地应用按实体→服务流→页面→菜单写入") + void appliesGeneratedDrafts() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + when(jdbc.queryForObject(anyString(), eq(Boolean.class), any())).thenReturn(true); + when(jdbc.queryForList(anyString(), eq(String.class))).thenReturn(List.of("ROOT")); + when(jdbc.queryForList(anyString(), eq(String.class), any())).thenReturn(List.of()); + when(jdbc.update(anyString(), org.mockito.ArgumentMatchers.any())).thenReturn(1); + when(jdbc.update(anyString(), org.mockito.ArgumentMatchers.any())).thenReturn(1); + + AiLocalReleaseExecutor executor = new AiLocalReleaseExecutor(jdbc, + (method, uri, requestBody, timeout) -> new AiHttpResponse(200, + "{\"status\":0,\"data\":{\"entityId\":\"e1000000-0000-0000-0000-00000000ai01\"}}"), + MAPPER); + AiFeatureDraftGenerator generator = new AiFeatureDraftGenerator(MAPPER); + List drafts = toDrafts(generator.generate(new AiFeatureRequest( + "新增合同类型维护", "合同类型维护", "EIP4AI_CONTRACT_TYPE", "合同类型", + "eip4ai-contract-type", "合同类型维护", + List.of(new AiFeatureField("NAME", "名称", "string", 100, true))))); + + var results = executor.apply("http://localhost:8084", drafts); + + assertEquals(4, results.size()); + assertTrue(results.stream().allMatch(r -> "APPLIED".equals(r.status()))); + assertEquals("ENTITY", results.get(0).artifactType().name()); + assertEquals("SERVICEFLOW", results.get(1).artifactType().name()); + assertEquals("PAGE_SCHEMA", results.get(2).artifactType().name()); + assertEquals("MENU", results.get(3).artifactType().name()); + assertTrue(hasUpdateSql(jdbc, "sys_serviceflow")); + assertTrue(hasUpdateSql(jdbc, "sys_page_schema")); + assertTrue(hasUpdateSql(jdbc, "sys_menu")); + } + + @Test + @DisplayName("实体已存在时复用本地 entityId 并视为幂等成功") + void reusesExistingEntityId() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + when(jdbc.queryForList(anyString(), eq(String.class), eq("EIP4AI_EXISTING"))) + .thenReturn(List.of("entity-existing-001")); + + AiLocalReleaseExecutor executor = new AiLocalReleaseExecutor(jdbc, + (method, uri, requestBody, timeout) -> new AiHttpResponse(200, + "{\"status\":1,\"msg\":\"实体已存在: EIP4AI_EXISTING\"}"), + MAPPER); + AiDraft draft = new AiDraft("d-entity", "t-1", AiArtifactType.ENTITY, "EIP4AI_EXISTING", + MAPPER.createObjectNode().put("tablename", "EIP4AI_EXISTING"), + 1L, List.of(new AiGateResult("ok", true, List.of())), Map.of()); + + var results = executor.apply("http://localhost:8084", List.of(draft)); + + assertEquals(1, results.size()); + assertEquals("APPLIED", results.get(0).status()); + assertEquals("entity-existing-001", results.get(0).details().get("entityId")); + assertEquals(true, results.get(0).details().get("idempotent")); + } + + @Test + @DisplayName("本地库缺 sys_menu 时菜单发布跳过但不阻断 apply") + void skipsMenuWhenLocalSchemaDoesNotHaveMenuTable() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + when(jdbc.queryForObject(anyString(), eq(Boolean.class), any())).thenReturn(false); + when(jdbc.update(anyString(), org.mockito.ArgumentMatchers.any())).thenReturn(1); + + AiLocalReleaseExecutor executor = new AiLocalReleaseExecutor(jdbc, + (method, uri, requestBody, timeout) -> new AiHttpResponse(200, + "{\"status\":0,\"data\":{\"entityId\":\"e1000000-0000-0000-0000-00000000ai01\"}}"), + MAPPER); + AiFeatureDraftGenerator generator = new AiFeatureDraftGenerator(MAPPER); + List drafts = toDrafts(generator.generate(new AiFeatureRequest( + "新增合同类型维护", "合同类型维护", "EIP4AI_CONTRACT_TYPE", "合同类型", + "eip4ai-contract-type", "合同类型维护", + List.of(new AiFeatureField("NAME", "名称", "string", 100, true))))); + + var results = executor.apply("http://localhost:8084", drafts); + + assertEquals(4, results.size()); + assertEquals("SKIPPED", results.get(3).status()); + assertTrue(results.get(3).message().contains("sys_menu")); + } + + private static List toDrafts(List generated) { + List drafts = new ArrayList<>(); + for (AiGeneratedDraft g : generated) { + drafts.add(new AiDraft("d-" + drafts.size(), "t-1", g.artifactType(), g.targetId(), g.payload(), + 1L, List.of(new AiGateResult("ok", true, List.of())), Map.of())); + } + return drafts; + } + + private static boolean hasUpdateSql(JdbcTemplate jdbc, String token) { + return mockingDetails(jdbc).getInvocations().stream() + .filter(i -> "update".equals(i.getMethod().getName())) + .anyMatch(i -> i.getArguments().length > 0 && String.valueOf(i.getArguments()[0]).contains(token)); + } +} diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiSmokeRunnerTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiSmokeRunnerTest.java new file mode 100644 index 0000000..b616005 --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiSmokeRunnerTest.java @@ -0,0 +1,76 @@ +package com.eip4.platform.ai.service; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.web.server.ResponseStatusException; + +import com.fasterxml.jackson.databind.ObjectMapper; + +class AiSmokeRunnerTest { + + private static final ObjectMapper MAPPER = new ObjectMapper(); + + @Test + @DisplayName("运行 smokeTests 并返回逐条结果") + void runsSmokeTests() throws Exception { + List called = new ArrayList<>(); + AiSmokeRunner runner = new AiSmokeRunner((method, uri, requestBody, timeout) -> { + called.add(uri); + return new AiHttpResponse(uri.getPath().endsWith("/ok") ? 200 : 500, "{\"ok\":true}"); + }); + + var run = runner.run("ait-1", "aics-1", "http://localhost:8084", MAPPER.readTree(""" + {"smokeTests":[ + {"name":"ok","method":"GET","url":"/api/ok","expectHttpStatus":200}, + {"name":"bad","method":"GET","url":"/api/bad","expectHttpStatus":200} + ]} + """)); + + assertFalse(run.passed()); + assertEquals("FAILED", run.status()); + assertEquals(2, run.results().size()); + assertTrue(run.results().get(0).passed()); + assertFalse(run.results().get(1).passed()); + assertEquals("http://localhost:8084/api/ok", called.get(0).toString()); + } + + @Test + @DisplayName("HTTP 200 但响应 JSON status 非 0 时判失败") + void failsOnBusinessStatusError() throws Exception { + AiSmokeRunner runner = new AiSmokeRunner((method, uri, requestBody, timeout) -> + new AiHttpResponse(200, "{\"status\":1,\"msg\":\"业务失败\"}")); + + var run = runner.run("ait-1", "aics-1", "http://localhost:8084", MAPPER.readTree(""" + {"smokeTests":[ + {"name":"biz","method":"GET","url":"/api/biz","expectHttpStatus":200} + ]} + """)); + + assertFalse(run.passed()); + assertEquals("FAILED", run.status()); + assertFalse(run.results().get(0).passed()); + assertTrue(run.results().get(0).error().contains("status=1")); + } + + @Test + @DisplayName("smoke runner 拒绝非本机 baseUrl") + void rejectsRemoteBaseUrl() throws Exception { + AiSmokeRunner runner = new AiSmokeRunner((method, uri, requestBody, timeout) -> new AiHttpResponse(200, "")); + + ResponseStatusException ex = assertThrows(ResponseStatusException.class, + () -> runner.run("ait-1", "aics-1", "https://example.com", MAPPER.readTree(""" + {"smokeTests":[{"name":"x","method":"GET","url":"/api/x","expectHttpStatus":200}]} + """))); + + assertEquals(400, ex.getStatusCode().value()); + } +} diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiSpringWiringTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiSpringWiringTest.java new file mode 100644 index 0000000..e88acf5 --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiSpringWiringTest.java @@ -0,0 +1,37 @@ +package com.eip4.platform.ai.service; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.runner.ApplicationContextRunner; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.jdbc.core.JdbcTemplate; + +import com.eip4.platform.ai.store.AiAgentStore; +import com.eip4.platform.ai.web.AiAgentController; +import com.fasterxml.jackson.databind.ObjectMapper; + +class AiSpringWiringTest { + + private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() + .withUserConfiguration(AiModuleConfiguration.class) + .withBean(ObjectMapper.class, ObjectMapper::new) + .withBean(JdbcTemplate.class, () -> org.mockito.Mockito.mock(JdbcTemplate.class)); + + @Test + void aiModuleComponentsWireInSpringContext() { + contextRunner.run(context -> { + assertThat(context).hasSingleBean(AiAgentController.class); + assertThat(context).hasSingleBean(AiAgentService.class); + assertThat(context).hasSingleBean(AiSmokeRunner.class); + assertThat(context).hasSingleBean(AiSmokeHttpClient.class); + assertThat(context).hasSingleBean(AiAgentStore.class); + }); + } + + @Configuration + @ComponentScan("com.eip4.platform.ai") + static class AiModuleConfiguration { + } +} diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/HttpAiLlmRepairClientTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/HttpAiLlmRepairClientTest.java new file mode 100644 index 0000000..5dcce10 --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/HttpAiLlmRepairClientTest.java @@ -0,0 +1,113 @@ +package com.eip4.platform.ai.service; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.http.HttpClient; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; + +import com.eip4.platform.ai.model.AiAgentRepairContext; +import com.eip4.platform.ai.model.AiArtifactType; +import com.eip4.platform.ai.model.AiChangeSet; +import com.eip4.platform.ai.model.AiDraft; +import com.eip4.platform.ai.model.AiGateResult; +import com.eip4.platform.ai.model.AiRepairAction; +import com.eip4.platform.ai.model.AiRepairDraftPatch; +import com.eip4.platform.ai.model.AiRepairPlan; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.sun.net.httpserver.HttpServer; + +import org.junit.jupiter.api.Test; + +class HttpAiLlmRepairClientTest { + + private static final ObjectMapper MAPPER = new ObjectMapper(); + + @Test + void sendsRepairContextAndParsesDraftPatches() throws Exception { + AtomicReference authorization = new AtomicReference<>(); + AtomicReference requestBody = new AtomicReference<>(); + HttpServer server = startServer(200, authorization, requestBody, """ + { + "draftPatches": [ + { + "artifactType": "PAGE_SCHEMA", + "targetId": "customer-page", + "payload": {"type":"page","title":"客户管理","body":[]}, + "metadata": {"source":"llm-repair"} + } + ] + } + """); + try { + String endpoint = "http://127.0.0.1:" + server.getAddress().getPort() + "/repair"; + HttpAiLlmRepairClient client = new HttpAiLlmRepairClient( + MAPPER, HttpClient.newHttpClient(), endpoint, "secret-token", "repair-model"); + + List patches = client.repair(context()); + + assertEquals("Bearer secret-token", authorization.get()); + assertTrue(requestBody.get().contains("\"model\":\"repair-model\"")); + assertTrue(requestBody.get().contains("\"taskId\":\"ait-1\"")); + assertTrue(requestBody.get().contains("\"responseField\":\"draftPatches\"")); + assertEquals(1, patches.size()); + assertEquals(AiArtifactType.PAGE_SCHEMA, patches.get(0).artifactType()); + assertEquals("customer-page", patches.get(0).targetId()); + assertEquals("llm-repair", patches.get(0).metadata().get("source")); + } finally { + server.stop(0); + } + } + + @Test + void returnsEmptyPatchesWhenProviderFails() throws Exception { + HttpServer server = startServer(500, new AtomicReference<>(), new AtomicReference<>(), "{}"); + try { + String endpoint = "http://127.0.0.1:" + server.getAddress().getPort() + "/repair"; + HttpAiLlmRepairClient client = new HttpAiLlmRepairClient( + MAPPER, HttpClient.newHttpClient(), endpoint, "", "repair-model"); + + assertTrue(client.repair(context()).isEmpty()); + } finally { + server.stop(0); + } + } + + private static HttpServer startServer(int statusCode, + AtomicReference authorization, + AtomicReference requestBody, + String response) throws IOException { + HttpServer server = HttpServer.create(new InetSocketAddress("127.0.0.1", 0), 0); + server.createContext("/repair", exchange -> { + authorization.set(exchange.getRequestHeaders().getFirst("Authorization")); + requestBody.set(new String(exchange.getRequestBody().readAllBytes(), StandardCharsets.UTF_8)); + byte[] bytes = response.getBytes(StandardCharsets.UTF_8); + exchange.getResponseHeaders().add("Content-Type", "application/json"); + exchange.sendResponseHeaders(statusCode, bytes.length); + exchange.getResponseBody().write(bytes); + exchange.close(); + }); + server.start(); + return server; + } + + private static AiAgentRepairContext context() throws Exception { + AiRepairPlan plan = new AiRepairPlan("ait-1", "aics-1", "run-1", "READY_FOR_AUTO_RETRY", + 100L, + List.of(new AiRepairAction("repair-1", "LOCAL_APPLY", "REPAIR_PAGE_SCHEMA_SQL_OR_SCHEMA", + "PAGE_SCHEMA", "customer-page", false, "页面 schema 缺少 body", Map.of())), + List.of("需要修复页面 schema")); + AiDraft draft = new AiDraft("aid-1", "ait-1", AiArtifactType.PAGE_SCHEMA, "customer-page", + MAPPER.readTree("{\"type\":\"page\",\"title\":\"客户管理\"}"), + 90L, + List.of(new AiGateResult("schema", true, List.of())), + Map.of("source", "test")); + return new AiAgentRepairContext("ait-1", new AiChangeSet("aics-1", "ait-1", + "READY_FOR_REVIEW", 80L, List.of("aid-1"), Map.of()).id(), plan, List.of(draft)); + } +} 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 new file mode 100644 index 0000000..91d104a --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/store/AiAgentDdlTest.java @@ -0,0 +1,27 @@ +package com.eip4.platform.ai.store; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.nio.charset.StandardCharsets; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.util.StreamUtils; + +class AiAgentDdlTest { + + @Test + @DisplayName("AI Agent bootstrap DDL 包含运行态平台表") + void bootstrapDdlDeclaresTables() throws Exception { + String ddl = StreamUtils.copyToString( + getClass().getResourceAsStream("/bootstrap/bootstrap-ai-agent.sql"), + StandardCharsets.UTF_8); + + assertTrue(ddl.contains("CREATE TABLE IF NOT EXISTS sys_ai_task")); + 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_audit_log")); + assertTrue(ddl.contains("CREATE INDEX IF NOT EXISTS idx_sys_ai_run_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 new file mode 100644 index 0000000..1cde54c --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/store/InMemoryAiAgentStoreTest.java @@ -0,0 +1,52 @@ +package com.eip4.platform.ai.store; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.DisplayName; +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.AiDraft; +import com.eip4.platform.ai.model.AiGateResult; +import com.eip4.platform.ai.model.AiRunRecord; +import com.eip4.platform.ai.model.AiTask; +import com.fasterxml.jackson.databind.ObjectMapper; + +class InMemoryAiAgentStoreTest { + + @Test + @DisplayName("内存存储按任务隔离 task/draft/change-set/audit") + void storesTaskScopedArtifacts() { + ObjectMapper mapper = new ObjectMapper(); + InMemoryAiAgentStore store = new InMemoryAiAgentStore(); + AiTask task = new AiTask("ait-1", "目标", "DRAFTING", 1L, 1L, List.of("plan")); + AiDraft draft = new AiDraft("aid-1", task.id(), AiArtifactType.CODE, "target", + mapper.createObjectNode().put("ok", true), 2L, + List.of(new AiGateResult("required", true, List.of())), Map.of()); + AiChangeSet changeSet = new AiChangeSet("aics-1", task.id(), "READY_FOR_REVIEW", 3L, + 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")); + 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.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.listAudit(task.id()).size()); + assertEquals(List.of(), store.listDrafts("other-task")); + assertEquals(List.of(), store.listRuns("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 new file mode 100644 index 0000000..5947ffa --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/store/JdbcAiAgentStoreTest.java @@ -0,0 +1,121 @@ +package com.eip4.platform.ai.store; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.sql.ResultSet; +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; + +import com.eip4.platform.ai.model.AiRunRecord; +import com.eip4.platform.ai.model.AiTask; +import com.fasterxml.jackson.databind.ObjectMapper; + +class JdbcAiAgentStoreTest { + + @Test + @DisplayName("JDBC 存储写入 task 使用 sys_ai_task 和 jsonb plan") + void savesTask() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + JdbcAiAgentStore store = new JdbcAiAgentStore(jdbc, new ObjectMapper()); + + store.saveTask(new AiTask("ait-1", "目标", "DRAFTING", 1L, 2L, List.of("采集上下文"))); + + ArgumentCaptor sql = ArgumentCaptor.forClass(String.class); + verify(jdbc).update(sql.capture(), eq("ait-1"), eq("目标"), eq("DRAFTING"), + eq("[\"采集上下文\"]"), eq(1L), eq(2L)); + org.junit.jupiter.api.Assertions.assertTrue(sql.getValue().contains("sys_ai_task")); + org.junit.jupiter.api.Assertions.assertTrue(sql.getValue().contains("?::jsonb")); + } + + @Test + @DisplayName("JDBC 存储可从 jsonb 行还原 task") + @SuppressWarnings("unchecked") + void mapsTaskRow() throws Exception { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + JdbcAiAgentStore store = new JdbcAiAgentStore(jdbc, new ObjectMapper()); + when(jdbc.query(any(String.class), any(RowMapper.class), eq("ait-1"))).thenAnswer(invocation -> { + RowMapper mapper = invocation.getArgument(1); + ResultSet rs = mock(ResultSet.class); + when(rs.getString("task_id")).thenReturn("ait-1"); + when(rs.getString("objective")).thenReturn("目标"); + when(rs.getString("status")).thenReturn("DRAFTING"); + when(rs.getLong("created_at")).thenReturn(1L); + when(rs.getLong("updated_at")).thenReturn(2L); + when(rs.getObject("plan_json")).thenReturn("[\"采集上下文\"]"); + return List.of(mapper.mapRow(rs, 0)); + }); + + AiTask task = store.findTask("ait-1").orElseThrow(); + + assertEquals("目标", task.objective()); + assertEquals(List.of("采集上下文"), task.plan()); + } + + @Test + @DisplayName("JDBC 存储写入 audit 使用 sys_ai_audit_log") + void savesAudit() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + JdbcAiAgentStore store = new JdbcAiAgentStore(jdbc, new ObjectMapper()); + + store.saveAudit(new com.eip4.platform.ai.model.AiAuditEntry( + "aia-1", "ait-1", "task.created", "agent", 3L, Map.of("k", "v"))); + + ArgumentCaptor sql = ArgumentCaptor.forClass(String.class); + verify(jdbc).update(sql.capture(), eq("aia-1"), eq("ait-1"), eq("task.created"), + eq("agent"), eq("{\"k\":\"v\"}"), eq(3L)); + org.junit.jupiter.api.Assertions.assertTrue(sql.getValue().contains("sys_ai_audit_log")); + } + + @Test + @DisplayName("JDBC 存储写入 run 使用 sys_ai_run 和 jsonb payload") + void savesRun() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + ObjectMapper mapper = new ObjectMapper(); + JdbcAiAgentStore store = new JdbcAiAgentStore(jdbc, mapper); + + store.saveRun(new AiRunRecord("air-1", "ait-1", "aics-1", "SMOKE", "PASSED", 5L, + mapper.createObjectNode().put("status", "PASSED"))); + + ArgumentCaptor sql = ArgumentCaptor.forClass(String.class); + verify(jdbc).update(sql.capture(), eq("air-1"), eq("ait-1"), eq("aics-1"), eq("SMOKE"), + eq("PASSED"), eq("{\"status\":\"PASSED\"}"), eq(5L)); + org.junit.jupiter.api.Assertions.assertTrue(sql.getValue().contains("sys_ai_run")); + org.junit.jupiter.api.Assertions.assertTrue(sql.getValue().contains("?::jsonb")); + } + + @Test + @DisplayName("JDBC 存储可从 jsonb 行还原 run") + @SuppressWarnings("unchecked") + void mapsRunRow() throws Exception { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + JdbcAiAgentStore store = new JdbcAiAgentStore(jdbc, new ObjectMapper()); + when(jdbc.query(any(String.class), any(RowMapper.class), eq("ait-1"))).thenAnswer(invocation -> { + RowMapper mapper = invocation.getArgument(1); + ResultSet rs = mock(ResultSet.class); + when(rs.getString("run_id")).thenReturn("air-1"); + when(rs.getString("task_id")).thenReturn("ait-1"); + when(rs.getString("change_set_id")).thenReturn("aics-1"); + when(rs.getString("run_type")).thenReturn("LOCAL_APPLY"); + when(rs.getString("status")).thenReturn("PASSED"); + when(rs.getLong("created_at")).thenReturn(5L); + when(rs.getObject("payload_json")).thenReturn("{\"status\":\"PASSED\"}"); + return List.of(mapper.mapRow(rs, 0)); + }); + + AiRunRecord run = store.listRuns("ait-1").get(0); + + assertEquals("LOCAL_APPLY", run.runType()); + assertEquals("PASSED", run.payload().path("status").asText()); + } +} diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentApiPipelineTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentApiPipelineTest.java new file mode 100644 index 0000000..849eb7a --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentApiPipelineTest.java @@ -0,0 +1,120 @@ +package com.eip4.platform.ai.web; + +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +import com.eip4.platform.ai.model.AiApplyStepResult; +import com.eip4.platform.ai.model.AiArtifactType; +import com.eip4.platform.ai.model.AiDraft; +import com.eip4.platform.ai.service.AiAgentService; +import com.eip4.platform.ai.service.AiFeatureDraftGenerator; +import com.eip4.platform.ai.service.AiHttpResponse; +import com.eip4.platform.ai.service.AiLocalReleaseExecutor; +import com.eip4.platform.ai.service.AiSmokeRunner; +import com.eip4.platform.ai.service.DeterministicAiAgentRepairExecutor; +import com.eip4.platform.ai.store.InMemoryAiAgentStore; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +class AiAgentApiPipelineTest { + + private static final ObjectMapper MAPPER = new ObjectMapper(); + + private AiAgentService service; + private MockMvc mvc; + + @BeforeEach + void setUp() { + AtomicInteger smokeCalls = new AtomicInteger(); + AiSmokeRunner flakySmokeRunner = new AiSmokeRunner((method, uri, requestBody, timeout) -> { + if (smokeCalls.incrementAndGet() <= 4) { + return new AiHttpResponse(503, "temporary unavailable"); + } + return new AiHttpResponse(200, "{\"status\":0}"); + }); + service = new AiAgentService(new InMemoryAiAgentStore(), new AiFeatureDraftGenerator(MAPPER), + flakySmokeRunner, new NoopLocalReleaseExecutor(), + new DeterministicAiAgentRepairExecutor(MAPPER), MAPPER); + mvc = MockMvcBuilders.standaloneSetup(new AiAgentController(service)).build(); + } + + @Test + void autoDevelopEndpointRunsFullPipelineWithAutomaticRepair() throws Exception { + MvcResult result = mvc.perform(post("/api/ai/features/auto-develop") + .contentType("application/json") + .content(""" + { + "baseUrl": "http://localhost:8084", + "generateDeploymentPackage": true, + "feature": { + "objective": "新增客户等级维护功能", + "featureName": "客户等级维护", + "tableName": "EIP4AI_CUSTOMER_LEVEL", + "entityName": "客户等级", + "templateId": "eip4ai-customer-level", + "menuName": "客户等级维护", + "fields": [ + {"column": "NAME", "label": "名称", "type": "string", "length": 100, "required": true}, + {"column": "CODE", "label": "编码", "type": "string", "length": 64, "required": true}, + {"column": "ENABLED", "label": "启用", "type": "boolean", "required": false} + ] + } + } + """)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.status").value("READY_FOR_HUMAN_REVIEW")) + .andExpect(jsonPath("$.originalChangeSetId").isNotEmpty()) + .andExpect(jsonPath("$.changeSetId").isNotEmpty()) + .andExpect(jsonPath("$.development.drafts.length()").value(5)) + .andExpect(jsonPath("$.applyRun.status").value("PASSED")) + .andExpect(jsonPath("$.repairExecutions.length()").value(1)) + .andExpect(jsonPath("$.repairExecutions[0].status").value("REPAIRED")) + .andExpect(jsonPath("$.deploymentPackage.status").value("READY_FOR_HUMAN_REVIEW")) + .andExpect(jsonPath("$.deploymentPackage.requiresHumanApproval").value(true)) + .andReturn(); + + JsonNode response = MAPPER.readTree(result.getResponse().getContentAsString()); + String taskId = response.path("taskId").asText(); + assertTrue(service.listRuns(taskId).stream().anyMatch(run -> "AUTO_DEVELOP".equals(run.runType()))); + assertTrue(service.listRuns(taskId).stream().anyMatch(run -> "REPAIR_EXECUTION".equals(run.runType()))); + assertTrue(service.listAudit(taskId).stream().anyMatch(audit -> "auto-development.completed".equals(audit.action()))); + } + + private static class NoopLocalReleaseExecutor extends AiLocalReleaseExecutor { + + NoopLocalReleaseExecutor() { + super(org.mockito.Mockito.mock(org.springframework.jdbc.core.JdbcTemplate.class), + (method, uri, requestBody, timeout) -> new AiHttpResponse(200, "{\"status\":0}"), MAPPER); + } + + @Override + public java.util.List apply(String baseUrl, java.util.List drafts) { + return drafts.stream() + .filter(draft -> draft.artifactType() != AiArtifactType.TEST) + .map(draft -> new AiApplyStepResult("apply-" + draft.id(), draft.artifactType(), + draft.targetId(), "APPLIED", "ok", details(draft))) + .toList(); + } + + private static Map details(AiDraft draft) { + return switch (draft.artifactType()) { + case ENTITY -> Map.of("entityId", "e-test-entity-id", "tableName", draft.targetId()); + case SERVICEFLOW -> Map.of("flowCount", 5, "entityId", "e-test-entity-id"); + case PAGE_SCHEMA -> Map.of("templateId", draft.targetId(), "etag", "test-etag"); + case MENU -> Map.of("menuId", "m-test-menu-id"); + case CODE, TEST -> Map.of(); + }; + } + } +} diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java new file mode 100644 index 0000000..70bfaad --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java @@ -0,0 +1,222 @@ +package com.eip4.platform.ai.web; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +import com.eip4.platform.ai.model.AiApplyRun; +import com.eip4.platform.ai.model.AiApplyStepResult; +import com.eip4.platform.ai.model.AiArtifactType; +import com.eip4.platform.ai.model.AiAutoDevelopmentRequest; +import com.eip4.platform.ai.model.AiAutoDevelopmentRun; +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.AiFeatureDevelopment; +import com.eip4.platform.ai.model.AiFeatureField; +import com.eip4.platform.ai.model.AiFeatureRequest; +import com.eip4.platform.ai.model.AiGateResult; +import com.eip4.platform.ai.model.AiReleasePlan; +import com.eip4.platform.ai.model.AiReleaseStep; +import com.eip4.platform.ai.model.AiRepairAction; +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.AiRunRecord; +import com.eip4.platform.ai.model.AiSmokeResult; +import com.eip4.platform.ai.model.AiSmokeRun; +import com.eip4.platform.ai.model.AiTask; +import com.eip4.platform.ai.service.AiAgentService; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +@ExtendWith(MockitoExtension.class) +class AiAgentControllerTest { + + @Mock + AiAgentService service; + + MockMvc mvc; + + ObjectMapper objectMapper; + + @BeforeEach + void setUp() { + objectMapper = new ObjectMapper(); + mvc = MockMvcBuilders.standaloneSetup(new AiAgentController(service)).build(); + } + + @Test + void 一键自动开发转调service并返回执行证据() throws Exception { + AiAutoDevelopmentRun run = autoDevelopmentRun(); + when(service.autoDevelopFeature(any(AiAutoDevelopmentRequest.class))).thenReturn(run); + + AiAutoDevelopmentRequest request = new AiAutoDevelopmentRequest( + new AiFeatureRequest("开发客户管理", "客户管理", "SYS_CUSTOMER", + "Customer", "list-form", "客户管理", + List.of(new AiFeatureField("NAME", "客户名称", "text", 64, true))), + "http://127.0.0.1:18080", + true, + 2); + + mvc.perform(post("/api/ai/features/auto-develop") + .contentType("application/json") + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.taskId").value("ait-1")) + .andExpect(jsonPath("$.changeSetId").value("aics-1")) + .andExpect(jsonPath("$.originalChangeSetId").value("aics-0")) + .andExpect(jsonPath("$.status").value("READY_FOR_DEPLOYMENT_REVIEW")) + .andExpect(jsonPath("$.applyRun.smokeRun.results[0].passed").value(true)) + .andExpect(jsonPath("$.repairExecutions").isArray()) + .andExpect(jsonPath("$.deploymentPackage.requiresHumanApproval").value(true)); + + ArgumentCaptor captor = ArgumentCaptor.forClass(AiAutoDevelopmentRequest.class); + verify(service).autoDevelopFeature(captor.capture()); + assertEquals("客户管理", captor.getValue().feature().featureName()); + assertEquals("http://127.0.0.1:18080", captor.getValue().baseUrl()); + assertTrue(captor.getValue().shouldGenerateDeploymentPackage()); + assertEquals(2, captor.getValue().repairAttemptLimit()); + } + + @Test + void 修复计划接口返回自动化动作() throws Exception { + AiRepairPlan plan = repairPlan(); + when(service.createRepairPlan("ait-1", "aics-1")).thenReturn(plan); + + mvc.perform(post("/api/ai/tasks/ait-1/change-sets/aics-1/repair-plan")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.taskId").value("ait-1")) + .andExpect(jsonPath("$.actions[0].artifactType").value("TEST")) + .andExpect(jsonPath("$.actions[0].automated").value(true)); + + verify(service).createRepairPlan("ait-1", "aics-1"); + } + + @Test + void 执行修复接口透传baseUrl并返回重跑结果() throws Exception { + AiRepairExecution execution = repairExecution(); + when(service.executeRepairPlan(eq("ait-1"), eq("aics-1"), eq("http://localhost:18080"))) + .thenReturn(execution); + + AiRepairExecutionRequest request = new AiRepairExecutionRequest("http://localhost:18080"); + + mvc.perform(post("/api/ai/tasks/ait-1/change-sets/aics-1/repair-execution") + .contentType("application/json") + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.status").value("PASSED")) + .andExpect(jsonPath("$.generatedDrafts[0].artifactType").value("PAGE_SCHEMA")) + .andExpect(jsonPath("$.retryApplyRun.smokeRun.status").value("PASSED")); + + verify(service).executeRepairPlan("ait-1", "aics-1", "http://localhost:18080"); + } + + @Test + void schema校验接口转发JsonNode() throws Exception { + when(service.validateSchema(any(JsonNode.class))).thenReturn(Map.of( + "valid", true, + "warnings", List.of())); + + mvc.perform(post("/api/ai/tools/validate-schema") + .contentType("application/json") + .content("{\"type\":\"page\",\"title\":\"客户\",\"body\":[]}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.valid").value(true)); + + ArgumentCaptor captor = ArgumentCaptor.forClass(JsonNode.class); + verify(service).validateSchema(captor.capture()); + assertEquals("page", captor.getValue().path("type").asText()); + } + + private AiAutoDevelopmentRun autoDevelopmentRun() { + AiFeatureDevelopment development = new AiFeatureDevelopment(task(), List.of(draft()), changeSet()); + AiReleasePlan releasePlan = new AiReleasePlan("ait-1", "aics-1", "READY", + true, + Map.of("policy", "local-only"), + List.of(new AiReleaseStep("step-1", AiArtifactType.PAGE_SCHEMA, "页面", + "LOCAL_APPLY", "customer-page", "UPSERT", Map.of())), + List.of("按变更包反向回滚")); + AiApplyRun applyRun = applyRun(); + AiDeploymentPackage deploymentPackage = deploymentPackage(); + return new AiAutoDevelopmentRun("ait-1", "aics-1", "aics-0", "READY_FOR_DEPLOYMENT_REVIEW", + 100L, 200L, development, releasePlan, applyRun, deploymentPackage, + List.of(), + List.of("本地门禁通过,等待人工部署")); + } + + private AiRepairExecution repairExecution() { + return new AiRepairExecution("ait-1", "aics-1", "PASSED", + 100L, 200L, repairPlan(), List.of(draft()), changeSet(), applyRun(), + deploymentPackage(), List.of("已生成修复草稿并通过本地 smoke")); + } + + private AiRepairPlan repairPlan() { + return new AiRepairPlan("ait-1", "aics-1", "run-1", "READY", + 100L, + List.of(new AiRepairAction("repair-1", "SMOKE", "PATCH_DRAFT", + "TEST", "customer-smoke", true, "同步测试契约", + Map.of("expectedStatus", 200))), + List.of("发现测试契约不匹配")); + } + + private AiTask task() { + return new AiTask("ait-1", "开发客户管理", "READY_FOR_REVIEW", + 1L, 2L, List.of("生成草稿", "本地验证")); + } + + private AiDraft draft() { + return new AiDraft("aid-1", "ait-1", AiArtifactType.PAGE_SCHEMA, "customer-page", + objectMapper.createObjectNode() + .put("type", "page") + .put("title", "客户管理") + .set("body", objectMapper.createArrayNode()), + 3L, + List.of(new AiGateResult("schema", true, List.of())), + Map.of("source", "test")); + } + + private AiChangeSet changeSet() { + return new AiChangeSet("aics-1", "ait-1", "READY_FOR_REVIEW", + 4L, List.of("aid-1"), Map.of("draftCount", 1)); + } + + private AiApplyRun applyRun() { + AiSmokeRun smokeRun = new AiSmokeRun("ait-1", "aics-1", "http://localhost:18080", + "PASSED", 10L, 20L, + List.of(new AiSmokeResult("打开页面", "GET", "/customer", + 200, 200, true, 12L, null, "ok"))); + return new AiApplyRun("ait-1", "aics-1", "http://localhost:18080", + "PASSED", 5L, 25L, + List.of(new AiApplyStepResult("step-1", AiArtifactType.PAGE_SCHEMA, + "customer-page", "APPLIED", "ok", Map.of())), + smokeRun); + } + + private AiDeploymentPackage deploymentPackage() { + return new AiDeploymentPackage("ait-1", "aics-1", "READY_FOR_HUMAN_APPROVAL", + true, 30L, Map.of("changeSetId", "aics-1"), + List.of("insert into sys_page_schema ..."), + List.of("delete from sys_page_schema where id = 'customer-page'"), + List.of(), + List.of()); + } +} diff --git a/platform-app/src/main/resources/application-dev.yml b/platform-app/src/main/resources/application-dev.yml index baed538..8b3c4ab 100644 --- a/platform-app/src/main/resources/application-dev.yml +++ b/platform-app/src/main/resources/application-dev.yml @@ -22,6 +22,10 @@ spring: hikari: maximum-pool-size: 10 read-only: false + sql: + init: + mode: always + schema-locations: classpath:bootstrap/bootstrap-ai-agent.sql eip4: auth: @@ -29,6 +33,14 @@ eip4: secret: ${EIP4_AUTH_JWT_SECRET:dev-only-eip4-jwt-secret-change-me-in-production-0123456789} expire-seconds: 28800 # 8h issuer: eip4-platform + ai: + store: jdbc + llm: + repair: + enabled: ${EIP4_AI_LLM_REPAIR_ENABLED:false} + endpoint: ${EIP4_AI_LLM_REPAIR_ENDPOINT:} + api-key: ${EIP4_AI_LLM_REPAIR_API_KEY:} + model: ${EIP4_AI_LLM_REPAIR_MODEL:} file: root: ${EIP4_FILE_ROOT:./data/files} script: diff --git a/platform-app/src/main/resources/application-local.yml b/platform-app/src/main/resources/application-local.yml index 3f1f0df..8b3fe79 100644 --- a/platform-app/src/main/resources/application-local.yml +++ b/platform-app/src/main/resources/application-local.yml @@ -13,6 +13,10 @@ spring: hikari: maximum-pool-size: 5 read-only: false + sql: + init: + mode: always + schema-locations: classpath:bootstrap/bootstrap-ai-agent.sql server: port: 8084 @@ -25,6 +29,14 @@ eip4: secret: ${EIP4_AUTH_JWT_SECRET:dev-only-eip4-jwt-secret-change-me-in-production-0123456789} expire-seconds: 28800 # 8h issuer: eip4-platform + ai: + store: jdbc + llm: + repair: + enabled: ${EIP4_AI_LLM_REPAIR_ENABLED:false} + endpoint: ${EIP4_AI_LLM_REPAIR_ENDPOINT:} + api-key: ${EIP4_AI_LLM_REPAIR_API_KEY:} + model: ${EIP4_AI_LLM_REPAIR_MODEL:} logging: level: diff --git a/platform-app/src/main/resources/bootstrap/bootstrap-ai-agent.sql b/platform-app/src/main/resources/bootstrap/bootstrap-ai-agent.sql new file mode 100644 index 0000000..8cfcf1a --- /dev/null +++ b/platform-app/src/main/resources/bootstrap/bootstrap-ai-agent.sql @@ -0,0 +1,68 @@ +-- ============================================================================ +-- eip4-platform P5 AI Agent 运行态自举 schema —— bootstrap-ai-agent.sql +-- ---------------------------------------------------------------------------- +-- 用途:platform-app 启动器本地/dev profile 直接加载的 AI Agent 表自举脚本。 +-- +-- 纪律:可重复执行(CREATE TABLE IF NOT EXISTS / CREATE INDEX IF NOT EXISTS); +-- 只保存 AI 运行态和草稿,不直接写 SYS_PAGE_SCHEMA / SYS_ENTITY / 服务流等生产元数据。 +-- platform-ai 模块内保留同名副本,生产脚本副本见 docs/sql/SYS_AI_AGENT.sql。 +-- ============================================================================ + +CREATE TABLE IF NOT EXISTS sys_ai_task ( + task_id character varying(64) NOT NULL, + objective text NOT NULL, + status character varying(32) NOT NULL, + plan_json jsonb NOT NULL, + created_at bigint NOT NULL, + updated_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_task PRIMARY KEY (task_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_draft ( + draft_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + artifact_type character varying(32) NOT NULL, + target_id character varying(128) NOT NULL, + payload_json jsonb NOT NULL, + gates_json jsonb NOT NULL, + metadata_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_draft PRIMARY KEY (draft_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_change_set ( + change_set_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + status character varying(32) NOT NULL, + draft_ids_json jsonb NOT NULL, + summary_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_change_set PRIMARY KEY (change_set_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_run ( + run_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + change_set_id character varying(64) NOT NULL, + run_type character varying(32) NOT NULL, + status character varying(32) NOT NULL, + payload_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_run PRIMARY KEY (run_id) +); + +CREATE TABLE IF NOT EXISTS sys_ai_audit_log ( + audit_id character varying(64) NOT NULL, + task_id character varying(64) NOT NULL, + action character varying(96) NOT NULL, + actor character varying(64) NOT NULL, + details_json jsonb NOT NULL, + created_at bigint NOT NULL, + CONSTRAINT pk_sys_ai_audit_log PRIMARY KEY (audit_id) +); + +CREATE INDEX IF NOT EXISTS idx_sys_ai_draft_task ON sys_ai_draft (task_id, created_at); +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_audit_log_task ON sys_ai_audit_log (task_id, created_at); diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/flow/FlowNameResolver.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/flow/FlowNameResolver.java index 5959c98556047dacbc27a2a112695c6ec0e54e16..e05d86cbe68ff1f20be28225b2415b36be4e0b92 100644 GIT binary patch delta 26 icmbQ2(3P-Zo80EzaxyHN?o&I&jH delta 50 rcmeB5n3u3&n;dIuW`VKZ=52B^EKuepB~La8bF#FiB~&m(a~m4~!j}-1 diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/MetaController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/MetaController.java index cad9bbc..aeb27c7 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/MetaController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/MetaController.java @@ -92,7 +92,7 @@ public class MetaController { // 属性模板:取 SYS_USERGROUP.NAME 属性行做默认值载体 Map attrTpl = loadAttrTemplate(idOf(tplEnt)); - List> created = new ArrayList<>(); + List created = new ArrayList<>(); // 标准列 created.add(saveAttr(attrTpl, entityId, table + "_ID", "主键", "CHAR", 36, true, true, ctx)); created.add(saveAttr(attrTpl, entityId, "VERSION", "版本", "INTEGER", null, true, false, ctx)); @@ -125,9 +125,9 @@ public class MetaController { } } - // 动态建表 - Entity newEnt = (Entity) dataDicService.getSYSEntity(entityId); - String ddl = newEnt.createTableSql(); + // 动态建表前先清刚保存实体/属性带来的 POInfo 缓存,保证后续读写立即拿到新字段。 + cacheInvalidator.evictByEntityId(entityId, table); + String ddl = createTableDdl(table, created); dataDicService.executeCreateSql(ddl); // P1-5:建表后按元数据补索引(外键 uuid 列 + UPDATETIME),引擎只建表不建索引 @@ -224,9 +224,9 @@ public class MetaController { return resp; } - private Map saveAttr(Map tpl, String entityId, String col, - String display, String ref, Integer len, - boolean mandatory, boolean isKey, Properties ctx) { + private GeneralPOJO saveAttr(Map tpl, String entityId, String col, + String display, String ref, Integer len, + boolean mandatory, boolean isKey, Properties ctx) { Map m = new HashMap<>(tpl); m.remove("SYS_ENTITYATTRIBUTE_ID"); m.put("ENTITYID", entityId); @@ -243,8 +243,100 @@ public class MetaController { } else { m.remove("FIELDLENGTH"); } - pojoCRUDService.save(m, "SYS_ENTITYATTRIBUTE", ctx); - return Map.of("column", col, "type", ref); + return pojoCRUDService.save(m, "SYS_ENTITYATTRIBUTE", ctx); + } + + static String createTableDdl(String table, List attrs) { + if (attrs == null || attrs.isEmpty()) { + throw new IllegalStateException("实体属性为空,无法建表: " + table); + } + StringBuilder sql = new StringBuilder(); + StringBuilder unique = new StringBuilder(); + StringBuilder combUnique = new StringBuilder(); + sql.append("CREATE TABLE ").append(table).append("\n"); + sql.append("(\n"); + for (GeneralPOJO attr : attrs) { + appendColumnDdl(table, attr, sql, unique, combUnique); + } + sql.append(unique); + if (!combUnique.isEmpty()) { + sql.append(combUnique).append("), \n"); + } + sql.append("primary key (").append(table).append("_ID)\n"); + sql.append("); \n"); + return sql.toString(); + } + + private static void appendColumnDdl(String table, GeneralPOJO attr, StringBuilder sql, + StringBuilder unique, StringBuilder combUnique) { + if (attr.get_ValueAsBoolean("ISREADONLY")) { + return; + } + String ref = value(attr, "REFERENCEID"); + if ("LIST".equals(ref) || "BLOB".equals(ref) || "STATUS".equals(ref)) { + return; + } + String col = value(attr, "COLUMNNAME"); + if (col == null || !col.matches("[A-Z][A-Z0-9_]{1,60}")) { + throw new IllegalStateException("实体字段名不合法: " + col); + } + if ("CREATEBY".equals(col) || "UPDATEBY".equals(col) || "ORGID".equals(col) || "DEPARTID".equals(col)) { + sql.append(col).append(" character(36) "); + } else if ("NVARCHAR".equals(ref) || "CODE".equals(ref)) { + int length = positiveInt(attr.get_Value("FIELDLENGTH"), 100); + sql.append(col).append(" character varying(").append(length).append(") "); + } else if ("INTEGER".equals(ref) || "BOOLEAN".equals(ref) || "ENUMERATE".equals(ref)) { + sql.append(col).append(" integer "); + } else if ("DECIMAL".equals(ref) || "MONEY".equals(ref)) { + sql.append(col).append(" numeric(18,6) "); + } else if ("DATE".equals(ref) || "TIME".equals(ref)) { + sql.append(col).append(" bigint "); + } else if ("CHAR".equals(ref)) { + sql.append(col).append(" character(36) "); + } else { + sql.append(col).append(" character(36) REFERENCES ").append(table); + } + if (attr.get_ValueAsBoolean("ISMANDATORY")) { + sql.append(" NOT NULL "); + } + String defValue = value(attr, "DEFAULTVALUE"); + if (defValue != null && !defValue.isBlank() + && ("INTEGER".equals(ref) || "BOOLEAN".equals(ref) || "DECIMAL".equals(ref) || "MONEY".equals(ref))) { + sql.append(" DEFAULT ").append(defValue); + } + sql.append(", \n"); + if (attr.get_ValueAsBoolean("ISIDENTIFIER")) { + unique.append(" unique (").append(col).append("), \n"); + } else if (attr.get_ValueAsBoolean("ISCOMBIDENTIFIER")) { + if (combUnique.isEmpty()) { + combUnique.append(" unique ("); + } else { + combUnique.append(","); + } + combUnique.append(col); + } + } + + private static int positiveInt(Object value, int defaultValue) { + if (value instanceof Number n && n.intValue() > 0) { + return n.intValue(); + } + if (value != null) { + try { + int parsed = Integer.parseInt(value.toString()); + if (parsed > 0) { + return parsed; + } + } catch (NumberFormatException ignore) { + return defaultValue; + } + } + return defaultValue; + } + + private static String value(GeneralPOJO po, String column) { + Object value = po.get_Value(column); + return value == null ? null : value.toString(); } private Map loadAttrTemplate(String tplEntityId) { diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/MetaControllerDdlTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/MetaControllerDdlTest.java new file mode 100644 index 0000000..12ceefc --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/MetaControllerDdlTest.java @@ -0,0 +1,40 @@ +package com.eip4.platform.metadata.web; + +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.List; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import com.dsasp.server.common.dataDic.bean.GeneralPOJO; + +class MetaControllerDdlTest { + + @Test + @DisplayName("运行态实体 DDL 按旧引擎类型规则生成主键、字符串和布尔列") + void createTableDdlUsesSavedAttributes() { + String ddl = MetaController.createTableDdl("EIP4AI_RT_DEMO", List.of( + attr("EIP4AI_RT_DEMO_ID", "CHAR", null, true), + attr("NAME", "NVARCHAR", 100, true), + attr("ENABLED", "BOOLEAN", null, false) + )); + + assertTrue(ddl.contains("CREATE TABLE EIP4AI_RT_DEMO")); + assertTrue(ddl.contains("EIP4AI_RT_DEMO_ID character(36) NOT NULL")); + assertTrue(ddl.contains("NAME character varying(100) NOT NULL")); + assertTrue(ddl.contains("ENABLED integer")); + assertTrue(ddl.contains("primary key (EIP4AI_RT_DEMO_ID)")); + } + + private static GeneralPOJO attr(String column, String referenceId, Integer length, boolean mandatory) { + GeneralPOJO po = mock(GeneralPOJO.class); + when(po.get_Value("COLUMNNAME")).thenReturn(column); + when(po.get_Value("REFERENCEID")).thenReturn(referenceId); + when(po.get_Value("FIELDLENGTH")).thenReturn(length); + when(po.get_ValueAsBoolean("ISMANDATORY")).thenReturn(mandatory); + return po; + } +} From 5bf641838afb90a5d1562775b97bd17c9a142d9f Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 07:47:22 +0800 Subject: [PATCH 02/53] feat: add EIP4 agent CLI and skills plan --- README.md | 5 + docs/AI_AGENT_AUTO_DEVELOPMENT.md | 21 ++ docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md | 167 +++++++++ docs/skills/README.md | 20 ++ docs/skills/eip4-ai-feature-development.md | 66 ++++ docs/skills/eip4-env-manage.md | 34 ++ docs/skills/eip4-release-manage.md | 39 +++ docs/架构设计.md | 1 + platform-cli/pom.xml | 56 +++ .../java/com/eip4/platform/cli/Eip4Cli.java | 328 ++++++++++++++++++ .../com/eip4/platform/cli/Eip4HttpClient.java | 10 + .../eip4/platform/cli/Eip4HttpResponse.java | 7 + .../eip4/platform/cli/JdkEip4HttpClient.java | 39 +++ .../com/eip4/platform/cli/Eip4CliTest.java | 136 ++++++++ pom.xml | 6 + 15 files changed, 935 insertions(+) create mode 100644 docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md create mode 100644 docs/skills/README.md create mode 100644 docs/skills/eip4-ai-feature-development.md create mode 100644 docs/skills/eip4-env-manage.md create mode 100644 docs/skills/eip4-release-manage.md create mode 100644 platform-cli/pom.xml create mode 100644 platform-cli/src/main/java/com/eip4/platform/cli/Eip4Cli.java create mode 100644 platform-cli/src/main/java/com/eip4/platform/cli/Eip4HttpClient.java create mode 100644 platform-cli/src/main/java/com/eip4/platform/cli/Eip4HttpResponse.java create mode 100644 platform-cli/src/main/java/com/eip4/platform/cli/JdkEip4HttpClient.java create mode 100644 platform-cli/src/test/java/com/eip4/platform/cli/Eip4CliTest.java diff --git a/README.md b/README.md index 9049822..aa4b8e4 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ EIP4 平台正式工程(路线 A'):双层制模块化单体——**保真层供 | platform-converter | 模板转换器(P4) | 可独立 CLI 跑批 | | platform-flow-gateway | P3 占位:Flowable 网关 | | | platform-ai | P5 AI Agent 开发底座:草稿/变更包/本地门禁/自动修复/人工部署包 | Agent 不直连线上执行生产变更 | +| platform-cli | EIP4 Agent 受控命令入口:环境探测、AI 自动开发、后续发布编排 | Agent 优先通过 CLI/API 操作 | | platform-parity | C1 对拍框架:录制/重放/RowDiff/自对拍 CLI | P1 一级交付物 | | platform-app | Boot 启动器,组装全部模块 | ArchUnit 规则在此模块测试里 | @@ -75,6 +76,10 @@ java -cp "$CP" com.eip4.platform.parity.selfcheck.ParityCli --privilege # C # 指向 eip4dev 自对拍: mvn -pl platform-parity exec:java -Dexec.mainClass="com.eip4.platform.parity.selfcheck.ParityCli" \ "-Dexec.args=--discover --jdbc=jdbc:postgresql://localhost:5433/eip4dev?currentSchema=eip3 --engine=http://localhost:8093 --out=parity-reports/eip4dev" + +# 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 ``` ## tools/ diff --git a/docs/AI_AGENT_AUTO_DEVELOPMENT.md b/docs/AI_AGENT_AUTO_DEVELOPMENT.md index 54b7dd7..4fa8717 100644 --- a/docs/AI_AGENT_AUTO_DEVELOPMENT.md +++ b/docs/AI_AGENT_AUTO_DEVELOPMENT.md @@ -36,6 +36,27 @@ JAVA_HOME=/opt/homebrew/opt/openjdk@21 mvn -pl platform-app -am install -DskipTe ## 请求示例 +推荐优先使用 `platform-cli`,让 Agent 通过稳定命令入口操作自动开发链路: + +```bash +mvn -pl platform-cli package +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai auto-develop \ + --base-url http://localhost:8093 \ + --objective "新增客户等级维护功能" \ + --feature-name "客户等级维护" \ + --table-name EIP4AI_CUSTOMER_LEVEL \ + --entity-name "客户等级" \ + --template-id eip4ai-customer-level \ + --menu-name "客户等级维护" \ + --field NAME:名称:string:100:true \ + --field CODE:编码:string:64:true \ + --field ENABLED:启用:boolean::false \ + --max-repair-attempts 2 \ + --output target/ai-runs/customer-level.json +``` + +底层 REST API 仍可直接调用: + ```bash curl -X POST http://localhost:8093/api/ai/features/auto-develop \ -H 'Content-Type: application/json' \ diff --git a/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md new file mode 100644 index 0000000..40f1776 --- /dev/null +++ b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md @@ -0,0 +1,167 @@ +# AI Agent 借鉴 NocoBase 的落地路线 + +日期:2026-06-17 + +本文记录 EIP4 对 NocoBase AI + no-code 体系的可借鉴点和落地顺序。目标不是照搬 NocoBase 的 TypeScript 插件运行时,而是吸收它的工程边界:核心平台稳定、业务能力包化、AI 通过受控 CLI/API 操作、所有变更可审计、可验证、可回滚。 + +参考: + +- NocoBase README: https://github.com/nocobase/nocobase +- NocoBase Plugin Development: https://docs.nocobase.com/plugin-development/ +- NocoBase Project Structure: https://docs.nocobase.com/plugin-development/project-structure +- NocoBase AI Builder: https://docs.nocobase.com/ai-builder/ +- NocoBase AI Plugin Development: https://docs.nocobase.com/ai-dev/ +- NocoBase CLI: https://docs.nocobase.com/api/cli/ +- NocoBase Skills: https://github.com/nocobase/skills + +## 一、判断 + +NocoBase 最核心的启发是:AI 不应该默认直接写一堆业务代码,而是基于平台已有的可配置能力工作。AI 负责把自然语言需求转换为数据模型、页面配置、工作流、权限和发布包,人负责审核关键边界。 + +EIP4 当前已经有实体、页面 schema、服务流、菜单、smoke、部署包这些受控对象,因此更适合走“AI 操作元数据和发布包”的路线,而不是引入一套新的插件运行时。 + +## 二、可借鉴点 + +| NocoBase 做法 | EIP4 对应落点 | 处理方式 | +|---|---|---| +| AI 基于 no-code 基础设施工作 | `platform-ai` 生成实体/页面/服务流/菜单草稿 | 已落地,继续收敛到受控接口 | +| CLI 作为 Agent 操作入口 | `platform-cli` | P1 建立,后续扩展环境/发布/回滚 | +| Skills 让 Agent 理解平台 | `docs/skills/` | P1 建立规范骨架 | +| 插件生命周期 | EIP4 `FeaturePackage` 生命周期 | P2 设计和持久化 | +| 版本控制/里程碑回滚 | `SYS_AI_REVISION` / release evidence | P2-P3 | +| FlowEngine 的可配置模型 | EIP4 typed page schema + component registry | P4 借鉴思想,不照搬实现 | + +## 三、落地顺序 + +### P0:全自动开发主链路 + +状态:已完成。 + +完成内容: + +- `POST /api/ai/features/auto-develop` +- 草稿生成、变更包、release plan、本地 apply、smoke、自动修复、人工部署包 +- JDBC 审计和运行证据 +- 本地 jar 验证通过 + +验收标准: + +- 本地可从一段功能需求生成可审核部署包 +- 线上执行仍停在人审边界 + +### P1:受控入口和 Agent 知识包 + +状态:第一版完成。 + +目标: + +- 建立 `platform-cli`,让 Agent 通过命令调用 EIP4,而不是直接猜 HTTP 接口或直连数据库。 +- 建立 `docs/skills/`,把 EIP4 的环境管理、自动开发、发布管理写成 Agent 可复用的操作规程。 + +本阶段交付: + +- `eip4 env status` +- `eip4 ai auto-develop` +- `docs/skills/eip4-env-manage.md` +- `docs/skills/eip4-ai-feature-development.md` +- `docs/skills/eip4-release-manage.md` + +验收标准: + +- CLI 单测覆盖命令解析和请求组装 +- README 和自动开发文档给出 CLI 用法 +- Agent 后续操作优先引用 Skills 和 CLI + +### P2:FeaturePackage 和里程碑版本 + +目标: + +- 把 AI 生成结果从松散的 draft/change-set 升级为稳定的 `FeaturePackage`。 +- 保存里程碑版本,支持本地回滚和线上部署前差异确认。 + +建议对象: + +- `FeaturePackage`: manifest、entity、serviceflow、page schema、menu、acl、sql、rollback、smoke、evidence +- `SYS_AI_FEATURE_PACKAGE` +- `SYS_AI_REVISION` + +验收标准: + +- 一个功能包可以导出、导入、重复校验 +- 每个通过 smoke 的里程碑都能追溯输入、输出、测试证据和回滚脚本 + +### P3:发布、回滚和环境治理 + +目标: + +- CLI 扩展为环境管理和发布编排入口。 +- 建立本地、测试、生产环境的只读探测、部署前检查和人工批准边界。 + +建议命令: + +- `eip4 env list/use/status` +- `eip4 release package` +- `eip4 release verify` +- `eip4 release apply --require-approval` +- `eip4 release rollback --package-id` + +验收标准: + +- 默认不能连接线上执行写操作 +- 生产写操作必须有显式环境、审批标记和部署包 +- 发布失败能用结构化 evidence 回到本地修复链路 + +### P4:Typed Page Schema 和组件注册表 + +目标: + +- 借鉴 NocoBase FlowEngine 的“可配置模型”思想,把页面 block、field、action、linkage 抽象为 typed schema。 +- 让 AI 和人工设计器操作同一份 schema。 + +验收标准: + +- 页面 schema 有版本、类型、组件能力表和校验器 +- AI 只能选择注册过的组件和动作 +- 设计器变更和 AI 变更能互相接续 + +### P5:多 Agent 协作和 AI 员工 + +目标: + +- 在平台内提供面向业务用户的 AI 助手能力,而不只是在开发侧使用 Agent。 + +建议方向: + +- 数据分析 Agent +- 表单配置 Agent +- 服务流诊断 Agent +- 权限风险审查 Agent +- 发布审计 Agent + +验收标准: + +- 每个 Agent 有独立权限、审计、工具白名单 +- 业务侧操作和开发侧操作共用平台审计模型 + +## 四、不照搬的部分 + +NocoBase 是 TypeScript/Yarn workspace/插件包体系。EIP4 是 Java/Spring/Maven,并且必须兼容 EIP3 的实体、服务流和 XML 模板迁移路径。直接照搬 NocoBase 插件运行时会引入过高迁移成本。 + +EIP4 应该借鉴的是边界和流程: + +1. 稳定核心能力。 +2. 业务功能包化。 +3. Agent 通过 CLI/API 操作。 +4. 人审控制生产变更。 +5. 每一步有 evidence、版本和回滚。 + +## 五、当前推进状态 + +| 阶段 | 状态 | 说明 | +|---|---|---| +| P0 | 完成 | `platform-ai` 主链路已提交 | +| P1 | 第一版完成 | 已新增 `platform-cli` 和 Skills 规范骨架 | +| P2 | 待开始 | 依赖 P1 的 CLI 和规范稳定 | +| P3 | 待开始 | 依赖 P2 的功能包和版本模型 | +| P4 | 待开始 | 依赖页面 schema 现状清理 | +| P5 | 待开始 | 依赖权限、审计、工具白名单成熟 | diff --git a/docs/skills/README.md b/docs/skills/README.md new file mode 100644 index 0000000..381deb5 --- /dev/null +++ b/docs/skills/README.md @@ -0,0 +1,20 @@ +# EIP4 Agent Skills + +本目录是 EIP4 给 AI Agent 使用的领域操作规程。目标是让 Codex、Claude Code、Cursor、OpenCode 等 Agent 都按同一套规则操作 EIP4,而不是临时猜接口、猜表结构或直连线上库。 + +## Skills + +| Skill | 用途 | +|---|---| +| `eip4-env-manage` | 环境探测、启动检查、端口和 profile 边界 | +| `eip4-ai-feature-development` | 从自然语言需求生成实体、服务流、页面、菜单和本地 smoke | +| `eip4-release-manage` | 部署包、人审、发布前校验和回滚边界 | + +## 通用原则 + +1. 优先使用 `platform-cli`,其次使用公开 REST API,最后才考虑人工 SQL。 +2. 默认只允许本地开发和测试环境自动执行写操作。 +3. 线上环境只能生成部署包和校验证据,不能由 Agent 默认直接写入。 +4. 每次自动开发必须保留 request、draft、change-set、apply、smoke、repair、deployment package evidence。 +5. 任何失败先回到本地复现和修复,再重新生成部署包。 + diff --git a/docs/skills/eip4-ai-feature-development.md b/docs/skills/eip4-ai-feature-development.md new file mode 100644 index 0000000..bad8dd5 --- /dev/null +++ b/docs/skills/eip4-ai-feature-development.md @@ -0,0 +1,66 @@ +# Skill: eip4-ai-feature-development + +## 触发场景 + +- 用户描述一个新功能,希望 AI 自动生成。 +- 用户要求从 EIP3 模板、实体、服务流或页面定义生成 EIP4 功能。 +- 用户要求本地自动开发、自动修复和 smoke。 + +## 输入要求 + +最小需求应包含: + +- 功能目标 +- 功能名称 +- 业务表名 +- 实体名称 +- 页面 templateId +- 菜单名称 +- 字段列表 + +字段格式: + +```text +column:label:type[:length][:required] +``` + +示例: + +```text +NAME:名称:string:100:true +CODE:编码:string:64:true +ENABLED:启用:boolean::false +``` + +## 推荐命令 + +```bash +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai auto-develop \ + --base-url http://localhost:8084 \ + --objective "新增客户等级维护功能" \ + --feature-name "客户等级维护" \ + --table-name EIP4AI_CUSTOMER_LEVEL \ + --entity-name "客户等级" \ + --template-id eip4ai-customer-level \ + --menu-name "客户等级维护" \ + --field NAME:名称:string:100:true \ + --field CODE:编码:string:64:true \ + --field ENABLED:启用:boolean::false \ + --max-repair-attempts 2 \ + --output target/ai-runs/customer-level.json +``` + +## 通过标准 + +- `applyStatus` 为 `PASSED`。 +- `smokeStatus` 为 `PASSED`。 +- 最终状态为 `READY_FOR_HUMAN_REVIEW`。 +- 部署包存在且 `requiresHumanApproval=true`。 + +## 失败处理 + +1. 查看输出 JSON 中的 apply/smoke/repair evidence。 +2. 如果自动修复已尝试但失败,基于 evidence 修改本地代码或元数据生成逻辑。 +3. 重新运行本地 auto-develop。 +4. 不直接连接线上库修复。 + diff --git a/docs/skills/eip4-env-manage.md b/docs/skills/eip4-env-manage.md new file mode 100644 index 0000000..252aee9 --- /dev/null +++ b/docs/skills/eip4-env-manage.md @@ -0,0 +1,34 @@ +# Skill: eip4-env-manage + +## 触发场景 + +- 用户要求启动、检查或切换 EIP4 环境。 +- 用户要求 Agent 在本地验证功能。 +- 用户要求确认当前服务是否可被 AI 自动开发链路使用。 + +## 操作规则 + +1. 确认当前目录是否是独立 worktree,避免污染用户正在做的任务。 +2. 使用 JDK 21,不能使用 JDK 26。 +3. 默认本地 profile: + - `local`: `http://localhost:8084` + - `dev`: `http://localhost:8093` +4. 使用 CLI 探测环境: + +```bash +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar env status --base-url http://localhost:8084 +``` + +5. 如果服务未启动,优先使用重新打包后的 jar: + +```bash +JAVA_HOME=/opt/homebrew/opt/openjdk@21 mvn -pl platform-app -am install -DskipTests +/opt/homebrew/opt/openjdk@21/bin/java -jar platform-app/target/platform-app-0.1.0-SNAPSHOT.jar --spring.profiles.active=local +``` + +## 禁止事项 + +- 不在用户原始任务目录中直接改动或启动长时间任务,除非用户明确要求。 +- 不把线上环境设置为默认写入目标。 +- 不跳过 JDK 版本检查。 + diff --git a/docs/skills/eip4-release-manage.md b/docs/skills/eip4-release-manage.md new file mode 100644 index 0000000..98e4f11 --- /dev/null +++ b/docs/skills/eip4-release-manage.md @@ -0,0 +1,39 @@ +# Skill: eip4-release-manage + +## 触发场景 + +- 用户要求生成部署包。 +- 用户要求发布 AI 生成的功能。 +- 用户要求线上 bug 修复或回滚。 + +## 当前边界 + +当前 `platform-ai` 只生成线上人工部署包,不自动连接线上环境执行写操作。这是设计边界,不是功能缺失。 + +## 发布前检查 + +1. 确认本地 auto-develop 已通过。 +2. 确认部署包包含: + - manifest + - SQL 草案 + - rollback SQL + - 本地 apply evidence + - smoke evidence + - repair evidence +3. 确认部署包需要人工审批。 +4. 如果包含 `${parentMenuId}` 等占位符,必须人工替换并复核。 + +## 线上 bug 修复路径 + +1. 收集线上错误日志、请求样本或人工复现步骤。 +2. 在本地创建新的 AI 修复任务。 +3. 本地执行 apply/smoke/repair。 +4. 生成新的部署包。 +5. 人工审核后走现有上线流程。 + +## 禁止事项 + +- 不让 Agent 默认直接写线上数据库。 +- 不绕过部署包和人审。 +- 不把 smoke 失败的变更包交给发布流程。 + diff --git a/docs/架构设计.md b/docs/架构设计.md index fd75ffe..19ebd59 100644 --- a/docs/架构设计.md +++ b/docs/架构设计.md @@ -19,6 +19,7 @@ eip4-platform(Maven 多模块单体) ├── platform-flow-gateway Flowable REST 客户端、待办聚合、3 个 handler bean ├── platform-converter 模板转换器 + S3 脚本改写器(可独立 CLI 跑批) ├── platform-ai AI Agent 开发底座、schema 双闸校验、自动修复、本地门禁和人工部署包 +├── platform-cli EIP4 Agent 受控命令入口:环境探测、AI 自动开发、后续发布编排 ├── platform-parity C1 逐行对拍框架:录制/重放/逐行 diff(P1 一级交付物,可独立 CLI 跑批) └── platform-app Spring Boot 启动器,组装上述模块 ``` diff --git a/platform-cli/pom.xml b/platform-cli/pom.xml new file mode 100644 index 0000000..653ebd3 --- /dev/null +++ b/platform-cli/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + com.eip4 + eip4-platform + 0.1.0-SNAPSHOT + + platform-cli + platform-cli + EIP4 Agent 受控命令入口:环境探测、AI 自动开发、发布前门禁编排 + + + + com.fasterxml.jackson.core + jackson-databind + + + org.junit.jupiter + junit-jupiter + test + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.7.1 + + + + com.eip4.platform.cli.Eip4Cli + + + + jar-with-dependencies + + false + + + + make-assembly + package + + single + + + + + + + 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 new file mode 100644 index 0000000..bf4ca56 --- /dev/null +++ b/platform-cli/src/main/java/com/eip4/platform/cli/Eip4Cli.java @@ -0,0 +1,328 @@ +package com.eip4.platform.cli; + +import java.io.IOException; +import java.io.PrintStream; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; + +public final class Eip4Cli { + + private static final String DEFAULT_BASE_URL = "http://localhost:8084"; + + private final ObjectMapper objectMapper; + private final Eip4HttpClient httpClient; + + public Eip4Cli(Eip4HttpClient httpClient) { + this.objectMapper = new ObjectMapper(); + this.httpClient = httpClient; + } + + public static void main(String[] args) { + ObjectMapper objectMapper = new ObjectMapper(); + int code = new Eip4Cli(new JdkEip4HttpClient(objectMapper)).run(args, System.out, System.err); + if (code != 0) { + System.exit(code); + } + } + + int run(String[] args, PrintStream out, PrintStream err) { + try { + if (args.length == 0 || isHelp(args[0])) { + printHelp(out); + return 0; + } + return switch (args[0]) { + case "env" -> runEnv(args, out, err); + case "ai" -> runAi(args, out, err); + default -> fail(err, "Unknown command: " + args[0]); + }; + } catch (IllegalArgumentException ex) { + return fail(err, ex.getMessage()); + } catch (IOException ex) { + return fail(err, "I/O failed: " + ex.getMessage()); + } catch (InterruptedException ex) { + Thread.currentThread().interrupt(); + return fail(err, "Interrupted"); + } + } + + private int runEnv(String[] args, PrintStream out, PrintStream err) throws IOException, InterruptedException { + if (args.length < 2 || isHelp(args[1])) { + printEnvHelp(out); + return 0; + } + if (!"status".equals(args[1])) { + return fail(err, "Unknown env command: " + args[1]); + } + Options options = Options.parse(args, 2); + String baseUrl = baseUrl(options); + URI uri = endpoint(baseUrl, "/v3/api-docs"); + Eip4HttpResponse response = httpClient.send("GET", uri, null); + if (!response.successful()) { + err.println("EIP4 env NOT_READY"); + err.println("baseUrl: " + baseUrl); + err.println("status: " + response.statusCode()); + return 2; + } + out.println("EIP4 env READY"); + out.println("baseUrl: " + baseUrl); + out.println("apiDocs: " + uri); + return 0; + } + + private int runAi(String[] args, PrintStream out, PrintStream err) throws IOException, InterruptedException { + if (args.length < 2 || isHelp(args[1])) { + printAiHelp(out); + return 0; + } + if (!"auto-develop".equals(args[1])) { + return fail(err, "Unknown ai command: " + args[1]); + } + Options options = Options.parse(args, 2); + ObjectNode request = buildAutoDevelopRequest(options); + String baseUrl = baseUrl(options); + Eip4HttpResponse response = httpClient.send( + "POST", + endpoint(baseUrl, "/api/ai/features/auto-develop"), + request); + if (!response.successful()) { + err.println("AI auto-develop failed"); + err.println("status: " + response.statusCode()); + err.println(response.body()); + return 2; + } + JsonNode body = response.body().isBlank() + ? objectMapper.createObjectNode() + : objectMapper.readTree(response.body()); + String formatted = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(body); + String output = options.single("output"); + if (output == null) { + out.println(formatted); + } else { + Path outputPath = Path.of(output); + if (outputPath.getParent() != null) { + Files.createDirectories(outputPath.getParent()); + } + Files.writeString(outputPath, formatted + System.lineSeparator(), StandardCharsets.UTF_8); + out.println("Wrote run result: " + outputPath.toAbsolutePath()); + printAutoDevelopSummary(body, out); + } + return 0; + } + + private ObjectNode buildAutoDevelopRequest(Options options) { + ObjectNode root = objectMapper.createObjectNode(); + String baseUrl = baseUrl(options); + root.put("baseUrl", baseUrl); + root.put("generateDeploymentPackage", !options.has("no-deployment-package")); + String maxRepairAttempts = options.single("max-repair-attempts"); + if (maxRepairAttempts != null) { + root.put("maxRepairAttempts", parseInt(maxRepairAttempts, "max-repair-attempts")); + } + + ObjectNode feature = root.putObject("feature"); + putRequired(feature, "objective", options, "objective"); + putRequired(feature, "featureName", options, "feature-name"); + putRequired(feature, "tableName", options, "table-name"); + putRequired(feature, "entityName", options, "entity-name"); + putRequired(feature, "templateId", options, "template-id"); + putRequired(feature, "menuName", options, "menu-name"); + + List fields = options.values("field"); + if (fields.isEmpty()) { + throw new IllegalArgumentException("Missing required option: --field"); + } + ArrayNode fieldNodes = feature.putArray("fields"); + for (String field : fields) { + fieldNodes.add(parseField(field)); + } + return root; + } + + private ObjectNode parseField(String spec) { + String[] parts = spec.split(":", -1); + if (parts.length < 3 || parts.length > 5) { + throw new IllegalArgumentException("Invalid --field, expected column:label:type[:length][:required]"); + } + ObjectNode node = objectMapper.createObjectNode(); + node.put("column", requiredPart(parts[0], "field column")); + node.put("label", requiredPart(parts[1], "field label")); + node.put("type", requiredPart(parts[2], "field type").toLowerCase(Locale.ROOT)); + if (parts.length >= 4 && !parts[3].isBlank()) { + node.put("length", parseInt(parts[3], "field length")); + } + if (parts.length >= 5 && !parts[4].isBlank()) { + node.put("required", Boolean.parseBoolean(parts[4])); + } else { + node.put("required", false); + } + return node; + } + + private void putRequired(ObjectNode node, String jsonName, Options options, String optionName) { + node.put(jsonName, requiredPart(options.single(optionName), optionName)); + } + + private String baseUrl(Options options) { + String value = options.single("base-url"); + if (value == null || value.isBlank()) { + value = System.getenv("EIP4_BASE_URL"); + } + if (value == null || value.isBlank()) { + value = DEFAULT_BASE_URL; + } + while (value.endsWith("/")) { + value = value.substring(0, value.length() - 1); + } + return value; + } + + private URI endpoint(String baseUrl, String path) { + return URI.create(baseUrl + path); + } + + private void printAutoDevelopSummary(JsonNode body, PrintStream out) { + out.println("status: " + text(body, "status")); + out.println("taskId: " + text(body, "taskId")); + out.println("changeSetId: " + text(body, "changeSetId")); + JsonNode apply = body.path("applyRun"); + if (!apply.isMissingNode()) { + out.println("applyStatus: " + text(apply, "status")); + } + JsonNode smoke = body.path("smokeRun"); + if (!smoke.isMissingNode()) { + out.println("smokeStatus: " + text(smoke, "status")); + } + } + + private String text(JsonNode node, String field) { + JsonNode value = node.path(field); + return value.isMissingNode() || value.isNull() ? "" : value.asText(); + } + + private int parseInt(String value, String name) { + try { + return Integer.parseInt(value); + } catch (NumberFormatException ex) { + throw new IllegalArgumentException("Invalid integer for " + name + ": " + value); + } + } + + private String requiredPart(String value, String name) { + if (value == null || value.isBlank()) { + throw new IllegalArgumentException("Missing required value: " + name); + } + return value; + } + + private boolean isHelp(String arg) { + return "--help".equals(arg) || "-h".equals(arg) || "help".equals(arg); + } + + private int fail(PrintStream err, String message) { + err.println(message); + err.println("Run `eip4 --help` for usage."); + return 1; + } + + private void printHelp(PrintStream out) { + out.println(""" + EIP4 CLI + + Usage: + eip4 env status [--base-url URL] + eip4 ai auto-develop --objective TEXT --feature-name NAME --table-name TABLE --entity-name NAME --template-id ID --menu-name NAME --field column:label:type[:length][:required] + + Environment: + EIP4_BASE_URL defaults the target service URL when --base-url is omitted. + """); + } + + private void printEnvHelp(PrintStream out) { + out.println(""" + Usage: + eip4 env status [--base-url URL] + """); + } + + private void printAiHelp(PrintStream out) { + out.println(""" + Usage: + eip4 ai auto-develop [options] + + Required: + --objective TEXT + --feature-name NAME + --table-name TABLE + --entity-name NAME + --template-id ID + --menu-name NAME + --field column:label:type[:length][:required] + + Optional: + --base-url URL + --max-repair-attempts N + --no-deployment-package + --output FILE + """); + } + + private static final class Options { + private final Map> values = new LinkedHashMap<>(); + + static Options parse(String[] args, int from) { + Options options = new Options(); + for (int i = from; i < args.length; i++) { + String arg = args[i]; + if (!arg.startsWith("--")) { + throw new IllegalArgumentException("Unexpected argument: " + arg); + } + String name = arg.substring(2); + if (name.isBlank()) { + throw new IllegalArgumentException("Invalid option: " + arg); + } + if ("no-deployment-package".equals(name)) { + options.add(name, "true"); + continue; + } + if (i + 1 >= args.length || args[i + 1].startsWith("--")) { + throw new IllegalArgumentException("Missing value for option: " + arg); + } + options.add(name, args[++i]); + } + return options; + } + + boolean has(String name) { + return values.containsKey(name); + } + + String single(String name) { + List list = values.get(name); + if (list == null || list.isEmpty()) { + return null; + } + return list.get(list.size() - 1); + } + + List values(String name) { + return values.getOrDefault(name, List.of()); + } + + private void add(String name, String value) { + values.computeIfAbsent(name, ignored -> new ArrayList<>()).add(value); + } + } +} diff --git a/platform-cli/src/main/java/com/eip4/platform/cli/Eip4HttpClient.java b/platform-cli/src/main/java/com/eip4/platform/cli/Eip4HttpClient.java new file mode 100644 index 0000000..d59b411 --- /dev/null +++ b/platform-cli/src/main/java/com/eip4/platform/cli/Eip4HttpClient.java @@ -0,0 +1,10 @@ +package com.eip4.platform.cli; + +import java.io.IOException; +import java.net.URI; + +import com.fasterxml.jackson.databind.JsonNode; + +interface Eip4HttpClient { + Eip4HttpResponse send(String method, URI uri, JsonNode body) throws IOException, InterruptedException; +} diff --git a/platform-cli/src/main/java/com/eip4/platform/cli/Eip4HttpResponse.java b/platform-cli/src/main/java/com/eip4/platform/cli/Eip4HttpResponse.java new file mode 100644 index 0000000..53dd188 --- /dev/null +++ b/platform-cli/src/main/java/com/eip4/platform/cli/Eip4HttpResponse.java @@ -0,0 +1,7 @@ +package com.eip4.platform.cli; + +record Eip4HttpResponse(int statusCode, String body) { + boolean successful() { + return statusCode >= 200 && statusCode < 300; + } +} diff --git a/platform-cli/src/main/java/com/eip4/platform/cli/JdkEip4HttpClient.java b/platform-cli/src/main/java/com/eip4/platform/cli/JdkEip4HttpClient.java new file mode 100644 index 0000000..b024461 --- /dev/null +++ b/platform-cli/src/main/java/com/eip4/platform/cli/JdkEip4HttpClient.java @@ -0,0 +1,39 @@ +package com.eip4.platform.cli; + +import java.io.IOException; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +final class JdkEip4HttpClient implements Eip4HttpClient { + + private static final Duration TIMEOUT = Duration.ofSeconds(30); + + private final HttpClient client; + private final ObjectMapper objectMapper; + + JdkEip4HttpClient(ObjectMapper objectMapper) { + this.client = HttpClient.newBuilder().connectTimeout(TIMEOUT).build(); + this.objectMapper = objectMapper; + } + + @Override + public Eip4HttpResponse send(String method, URI uri, JsonNode body) throws IOException, InterruptedException { + HttpRequest.BodyPublisher publisher = body == null + ? HttpRequest.BodyPublishers.noBody() + : HttpRequest.BodyPublishers.ofString(objectMapper.writeValueAsString(body)); + HttpRequest request = HttpRequest.newBuilder(uri) + .timeout(TIMEOUT) + .header("Accept", "application/json") + .header("Content-Type", "application/json") + .method(method, publisher) + .build(); + HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString()); + return new Eip4HttpResponse(response.statusCode(), response.body()); + } +} 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 new file mode 100644 index 0000000..50ac686 --- /dev/null +++ b/platform-cli/src/test/java/com/eip4/platform/cli/Eip4CliTest.java @@ -0,0 +1,136 @@ +package com.eip4.platform.cli; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +class Eip4CliTest { + + private final ObjectMapper objectMapper = new ObjectMapper(); + + @TempDir + Path tempDir; + + @Test + void envStatusChecksOpenApiEndpoint() { + CapturingClient client = new CapturingClient(new Eip4HttpResponse(200, "{}")); + CliResult result = run(client, "env", "status", "--base-url", "http://localhost:8084/"); + + assertEquals(0, result.code()); + assertEquals("GET", client.method); + assertEquals(URI.create("http://localhost:8084/v3/api-docs"), client.uri); + assertTrue(result.out().contains("EIP4 env READY")); + } + + @Test + void autoDevelopBuildsRequestAndWritesResponse() throws Exception { + String response = """ + { + "status": "READY_FOR_HUMAN_REVIEW", + "taskId": "task-1", + "changeSetId": "cs-1", + "applyRun": {"status": "PASSED"}, + "smokeRun": {"status": "PASSED"} + } + """; + CapturingClient client = new CapturingClient(new Eip4HttpResponse(200, response)); + Path output = tempDir.resolve("run.json"); + + CliResult result = run(client, + "ai", "auto-develop", + "--base-url", "http://localhost:8084", + "--objective", "新增客户等级维护", + "--feature-name", "客户等级维护", + "--table-name", "EIP4AI_CUSTOMER_LEVEL", + "--entity-name", "客户等级", + "--template-id", "eip4ai-customer-level", + "--menu-name", "客户等级维护", + "--field", "NAME:名称:string:100:true", + "--field", "ENABLED:启用:boolean::false", + "--max-repair-attempts", "3", + "--no-deployment-package", + "--output", output.toString()); + + assertEquals(0, result.code()); + assertEquals("POST", client.method); + assertEquals(URI.create("http://localhost:8084/api/ai/features/auto-develop"), client.uri); + assertFalse(client.body.path("generateDeploymentPackage").asBoolean()); + assertEquals(3, client.body.path("maxRepairAttempts").asInt()); + JsonNode feature = client.body.path("feature"); + assertEquals("EIP4AI_CUSTOMER_LEVEL", feature.path("tableName").asText()); + assertEquals(2, feature.path("fields").size()); + assertEquals("NAME", feature.path("fields").get(0).path("column").asText()); + assertEquals(100, feature.path("fields").get(0).path("length").asInt()); + assertTrue(feature.path("fields").get(0).path("required").asBoolean()); + assertTrue(Files.readString(output, StandardCharsets.UTF_8).contains("READY_FOR_HUMAN_REVIEW")); + assertTrue(result.out().contains("applyStatus: PASSED")); + } + + @Test + void autoDevelopRequiresAtLeastOneField() { + CapturingClient client = new CapturingClient(new Eip4HttpResponse(200, "{}")); + + CliResult result = run(client, + "ai", "auto-develop", + "--objective", "新增客户等级维护", + "--feature-name", "客户等级维护", + "--table-name", "EIP4AI_CUSTOMER_LEVEL", + "--entity-name", "客户等级", + "--template-id", "eip4ai-customer-level", + "--menu-name", "客户等级维护"); + + assertEquals(1, result.code()); + assertTrue(result.err().contains("Missing required option: --field")); + assertEquals(0, client.calls); + } + + private CliResult run(CapturingClient client, String... args) { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + ByteArrayOutputStream err = new ByteArrayOutputStream(); + int code = new Eip4Cli(client).run( + args, + new PrintStream(out, true, StandardCharsets.UTF_8), + new PrintStream(err, true, StandardCharsets.UTF_8)); + return new CliResult( + code, + out.toString(StandardCharsets.UTF_8), + err.toString(StandardCharsets.UTF_8)); + } + + private final class CapturingClient implements Eip4HttpClient { + private final Eip4HttpResponse response; + private int calls; + private String method; + private URI uri; + private JsonNode body = objectMapper.createObjectNode(); + + private CapturingClient(Eip4HttpResponse response) { + this.response = response; + } + + @Override + public Eip4HttpResponse send(String method, URI uri, JsonNode body) { + this.calls++; + this.method = method; + this.uri = uri; + this.body = body == null ? objectMapper.createObjectNode() : body; + return response; + } + } + + private record CliResult(int code, String out, String err) { + } +} diff --git a/pom.xml b/pom.xml index f724489..b8f7daa 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,7 @@ platform-flow-gateway platform-converter platform-ai + platform-cli platform-parity platform-app @@ -70,6 +71,11 @@ platform-ai ${project.version} + + com.eip4 + platform-cli + ${project.version} + com.eip4 platform-parity From c5bfbd3ca38ab6dd0932bed49552126db63fd720 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 07:56:45 +0800 Subject: [PATCH 03/53] 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(); From 5f7e226fa05e3195faa0103d4d499ea7ce2e8a62 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 08:21:40 +0800 Subject: [PATCH 04/53] feat: add CLI env registry and release verification --- README.md | 2 + docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md | 11 +- docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md | 93 ++++++ docs/skills/eip4-env-manage.md | 17 +- docs/skills/eip4-release-manage.md | 14 +- .../java/com/eip4/platform/cli/Eip4Cli.java | 293 +++++++++++++++++- .../com/eip4/platform/cli/Eip4EnvStore.java | 140 +++++++++ .../com/eip4/platform/cli/Eip4CliTest.java | 135 +++++++- 8 files changed, 684 insertions(+), 21 deletions(-) create mode 100644 docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md create mode 100644 platform-cli/src/main/java/com/eip4/platform/cli/Eip4EnvStore.java diff --git a/README.md b/README.md index 3cf91b8..e1345a3 100644 --- a/README.md +++ b/README.md @@ -79,8 +79,10 @@ 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 add --name local --base-url http://localhost:8084 --use 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 +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release verify --package-file target/ai-runs/package.json ``` ## tools/ diff --git a/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md index 909fc17..4718ba6 100644 --- a/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md +++ b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md @@ -111,6 +111,8 @@ EIP4 当前已经有实体、页面 schema、服务流、菜单、smoke、部署 ### P3:发布、回滚和环境治理 +状态:进行中。 + 目标: - CLI 扩展为环境管理和发布编排入口。 @@ -130,6 +132,13 @@ EIP4 当前已经有实体、页面 schema、服务流、菜单、smoke、部署 - 生产写操作必须有显式环境、审批标记和部署包 - 发布失败能用结构化 evidence 回到本地修复链路 +源码级修订: + +- 参考 NocoBase `env/status.ts` 和 `env-guard.ts`,`platform-cli` 新增本地 env registry/current env。 +- 参考 NocoBase revision 创建前检查版本控制插件的思路,EIP4 后续 revision restore/diff 不能只依赖 JSON 快照,必须有发布系统能力检查。 +- 新增 `eip4 release verify --package-file FILE`,先做离线发布前门禁,阻断未替换占位符和缺失本地 evidence 的功能包。 +- 详细源码对照见 `docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md`。 + ### P4:Typed Page Schema 和组件注册表 目标: @@ -181,6 +190,6 @@ EIP4 应该借鉴的是边界和流程: | P0 | 完成 | `platform-ai` 主链路已提交 | | P1 | 第一版完成 | 已新增 `platform-cli` 和 Skills 规范骨架 | | P2 | 第一版完成 | 已新增功能包快照、里程碑 revision、CLI 命令和持久化表 | -| P3 | 待开始 | 依赖 P2 的功能包和版本模型 | +| P3 | 进行中 | 已开始 env registry/current env/cross-env guard/release verify | | P4 | 待开始 | 依赖页面 schema 现状清理 | | P5 | 待开始 | 依赖权限、审计、工具白名单成熟 | diff --git a/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md b/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md new file mode 100644 index 0000000..bd3cf5c --- /dev/null +++ b/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md @@ -0,0 +1,93 @@ +# NocoBase 源码级对照和 EIP4 修订 + +日期:2026-06-17 + +本文件补充 `docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md` 的源码级依据。结论:EIP4 不照搬 NocoBase 的 TypeScript 插件运行时,但 P3 之后必须参考它的 CLI/env/revision/skills/tool-registry 边界,否则容易只做出“HTTP wrapper”,做不到可持续的 Agent 开发体系。 + +## 一、已抽样源码 + +| 主题 | NocoBase 源码 | 对 EIP4 的影响 | +|---|---|---| +| CLI env status | `packages/core/cli/src/commands/env/status.ts` | CLI 要有 env registry/current env/status,不应只靠 `--base-url` | +| 跨 env 确认 | `packages/core/cli/src/lib/env-guard.ts` | 显式选择非当前 env 时需要确认边界 | +| API client | `packages/core/cli/src/lib/api-client.ts` | CLI 请求应带结构化 env/token/role/header,后续不能散落在命令里 | +| runtime command registry | `packages/core/cli/src/generated/command-registry.ts` | 可根据运行时 API 生成命令,EIP4 后续可用 OpenAPI 生成安全 CLI | +| generic resource command | `packages/core/cli/src/lib/resource-command.ts` | CRUD 类命令应统一处理 JSON body、分页、过滤、错误输出 | +| plugin import/enable | `packages/core/cli/src/commands/plugin/import.ts`, `packages/core/cli/src/commands/plugin/enable.ts` | EIP4 的 FeaturePackage 后续也要区分导入、启用、发布和重启/刷新 | +| revision create | `packages/core/cli/src/commands/revision/create.ts` | revision 不能只是保存 JSON,发布前要检查版本控制能力是否可用 | +| skills install | `packages/core/cli/src/commands/skills/install.ts` | Skills 应由 CLI 安装/检查/更新,而不是只放仓库文档 | +| AI plugin server | `packages/plugins/@nocobase/plugin-ai/src/server/plugin.ts` | AI 功能要注册 tools、skills、MCP、AI employees、ACL snippet | +| FlowEngine | `packages/core/flow-engine/src/flowEngine.ts`, `packages/core/flow-engine/src/models/flowModel.tsx` | 页面 schema 需要演进到 typed model/action/event/resource registry | + +## 二、对当前实现的校正 + +### P0-P2 是否做实 + +已做实: + +- `platform-ai` 主链路有 Java 实现、JDBC/内存 store、DDL、Web API 和测试。 +- `platform-cli` 是可运行 jar,不是伪命令。 +- `FeaturePackage` 和 `Revision` 已有最小持久化模型。 + +但它还不是 NocoBase 级完整度: + +- CLI 之前缺少 env registry/current env。 +- revision 只是功能包快照,不是完整版本控制。 +- Skills 只是仓库文档,没有 CLI 安装/检查/更新。 +- AI tools/permissions/MCP/AI employee 还没有平台级注册。 +- 页面配置还没有 typed FlowModel registry。 + +### 已按源码对照修订的 P3 第一批 + +- `platform-cli` 新增本地 env registry,默认保存到 `~/.eip4/eip4-cli.json`。 +- 新增 `eip4 env add/list/use/current/status`。 +- AI 命令支持 `--env`。 +- 显式选择非当前 env 时必须加 `--yes`,避免误操作共享环境。 +- 新增 `eip4 release verify --package-file FILE`,离线检查功能包是否具备本地门禁 evidence、人审标记、SQL/rollback,并阻断 `${...}` 占位符。 + +## 三、后续实现顺序 + +### P3-1:CLI env 和发布前治理 + +状态:进行中。 + +目标: + +- env registry/current env +- `release verify` +- package/revision 差异检查 +- 生产环境默认只读 + +### P3-2:FeaturePackage 导出/导入 + +目标: + +- `.eip4pkg.json` 文件格式 +- checksum +- import preview +- import 后不自动启用 + +### P3-3:Revision diff/restore + +目标: + +- revision diff +- rollback plan +- rollback 只生成计划和 SQL,不默认执行生产写入 + +### P4:Typed UI Registry + +目标: + +- typed page schema +- component/action/event registry +- AI 只能选择 registry 中允许的组件和动作 + +### P5:AI tools/skills/employee/ACL + +目标: + +- AI tool registry +- Skills CLI check/update +- AI Agent 权限和审计 +- MCP 工具白名单 diff --git a/docs/skills/eip4-env-manage.md b/docs/skills/eip4-env-manage.md index 252aee9..c8e07d0 100644 --- a/docs/skills/eip4-env-manage.md +++ b/docs/skills/eip4-env-manage.md @@ -16,7 +16,13 @@ 4. 使用 CLI 探测环境: ```bash -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 env add \ + --name local \ + --base-url http://localhost:8084 \ + --kind local \ + --use + +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar env status ``` 5. 如果服务未启动,优先使用重新打包后的 jar: @@ -31,4 +37,13 @@ JAVA_HOME=/opt/homebrew/opt/openjdk@21 mvn -pl platform-app -am install -DskipTe - 不在用户原始任务目录中直接改动或启动长时间任务,除非用户明确要求。 - 不把线上环境设置为默认写入目标。 - 不跳过 JDK 版本检查。 +- 显式选择非当前 env 执行 AI 或发布类命令时,必须要求 `--yes` 或等效人工确认。 +## 常用命令 + +```bash +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar env list +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar env current +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar env use --name local +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar env status --all +``` diff --git a/docs/skills/eip4-release-manage.md b/docs/skills/eip4-release-manage.md index 17b389b..c15a9a1 100644 --- a/docs/skills/eip4-release-manage.md +++ b/docs/skills/eip4-release-manage.md @@ -34,15 +34,22 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai revision \ --output target/ai-runs/revision.json ``` -4. 确认部署包包含: +4. 运行离线发布校验: + +```bash +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release verify \ + --package-file target/ai-runs/feature-package.json +``` + +5. 确认部署包包含: - manifest - SQL 草案 - rollback SQL - 本地 apply evidence - smoke evidence - repair evidence -5. 确认部署包需要人工审批。 -6. 如果包含 `${parentMenuId}` 等占位符,必须人工替换并复核。 +6. 确认部署包需要人工审批。 +7. 如果包含 `${parentMenuId}` 等占位符,必须人工替换并复核;`release verify` 默认会阻断这类包。 ## 线上 bug 修复路径 @@ -57,3 +64,4 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai revision \ - 不让 Agent 默认直接写线上数据库。 - 不绕过部署包和人审。 - 不把 smoke 失败的变更包交给发布流程。 +- 不发布 `release verify` 失败的功能包。 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 0943245..8664e0b 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 @@ -23,10 +23,18 @@ public final class Eip4Cli { private final ObjectMapper objectMapper; private final Eip4HttpClient httpClient; + private final Eip4EnvStore envStore; public Eip4Cli(Eip4HttpClient httpClient) { this.objectMapper = new ObjectMapper(); this.httpClient = httpClient; + this.envStore = Eip4EnvStore.defaultStore(objectMapper); + } + + Eip4Cli(Eip4HttpClient httpClient, Eip4EnvStore envStore) { + this.objectMapper = new ObjectMapper(); + this.httpClient = httpClient; + this.envStore = envStore; } public static void main(String[] args) { @@ -46,6 +54,7 @@ public final class Eip4Cli { return switch (args[0]) { case "env" -> runEnv(args, out, err); case "ai" -> runAi(args, out, err); + case "release" -> runRelease(args, out, err); default -> fail(err, "Unknown command: " + args[0]); }; } catch (IllegalArgumentException ex) { @@ -63,20 +72,186 @@ public final class Eip4Cli { printEnvHelp(out); return 0; } - if (!"status".equals(args[1])) { - return fail(err, "Unknown env command: " + args[1]); + return switch (args[1]) { + case "add" -> runEnvAdd(args, out); + case "list" -> runEnvList(args, out); + case "use" -> runEnvUse(args, out); + case "current" -> runEnvCurrent(out); + case "status" -> runEnvStatus(args, out, err); + default -> fail(err, "Unknown env command: " + args[1]); + }; + } + + private int runRelease(String[] args, PrintStream out, PrintStream err) throws IOException { + if (args.length < 2 || isHelp(args[1])) { + printReleaseHelp(out); + return 0; } + return switch (args[1]) { + case "verify" -> runReleaseVerify(args, out, err); + default -> fail(err, "Unknown release command: " + args[1]); + }; + } + + private int runReleaseVerify(String[] args, PrintStream out, PrintStream err) throws IOException { Options options = Options.parse(args, 2); - String baseUrl = baseUrl(options); + Path packageFile = Path.of(requiredPart(options.single("package-file"), "package-file")); + JsonNode root = objectMapper.readTree(Files.readString(packageFile, StandardCharsets.UTF_8)); + JsonNode deploymentPackage = root.has("deploymentPackage") ? root.path("deploymentPackage") : root; + List blockers = new ArrayList<>(); + List warnings = new ArrayList<>(); + + if (!"READY_FOR_HUMAN_REVIEW".equals(text(deploymentPackage, "status"))) { + blockers.add("deploymentPackage.status 必须是 READY_FOR_HUMAN_REVIEW"); + } + if (!deploymentPackage.path("requiresHumanApproval").asBoolean(false)) { + blockers.add("deploymentPackage.requiresHumanApproval 必须是 true"); + } + if (!hasTextArrayItems(deploymentPackage.path("sqlStatements"))) { + blockers.add("sqlStatements 不能为空"); + } + if (!hasTextArrayItems(deploymentPackage.path("rollbackSqlStatements"))) { + blockers.add("rollbackSqlStatements 不能为空"); + } + if (!hasRunEvidence(deploymentPackage.path("runEvidence"), "LOCAL_APPLY", "PASSED")) { + blockers.add("缺少通过的 LOCAL_APPLY evidence"); + } + if (!hasRunEvidence(deploymentPackage.path("runEvidence"), "SMOKE", "PASSED")) { + blockers.add("缺少通过的 SMOKE evidence"); + } + if (containsPlaceholder(deploymentPackage.path("sqlStatements"))) { + blockers.add("sqlStatements 仍包含 ${...} 占位符,必须人工替换后再发布"); + } + deploymentPackage.path("warnings").forEach(warning -> warnings.add(warning.asText())); + + ObjectNode report = objectMapper.createObjectNode(); + report.put("status", blockers.isEmpty() ? "PASSED" : "FAILED"); + report.put("packageId", packageId(root, deploymentPackage)); + report.put("taskId", text(deploymentPackage, "taskId")); + report.put("changeSetId", text(deploymentPackage, "changeSetId")); + ArrayNode blockerNodes = report.putArray("blockers"); + blockers.forEach(blockerNodes::add); + ArrayNode warningNodes = report.putArray("warnings"); + warnings.forEach(warningNodes::add); + + if (options.has("json-output")) { + out.println(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(report)); + } else if (blockers.isEmpty()) { + out.println("Release package PASSED"); + out.println("packageId: " + packageId(root, deploymentPackage)); + if (!warnings.isEmpty()) { + out.println("warnings:"); + warnings.forEach(warning -> out.println("- " + warning)); + } + } else { + err.println("Release package FAILED"); + blockers.forEach(blocker -> err.println("- " + blocker)); + } + return blockers.isEmpty() ? 0 : 2; + } + + private int runEnvAdd(String[] args, PrintStream out) throws IOException { + Options options = Options.parse(args, 2); + String name = requiredPart(options.single("name"), "name"); + String baseUrl = Eip4EnvStore.normalizeBaseUrl(requiredPart(options.single("base-url"), "base-url")); + String kind = options.single("kind") == null ? "local" : options.single("kind"); + Eip4EnvStore.EnvConfig env = Eip4EnvStore.normalize(new Eip4EnvStore.EnvConfig(name, kind, baseUrl)); + envStore.saveEnv(env, options.has("use")); + out.println("Saved env: " + env.name()); + out.println("baseUrl: " + env.baseUrl()); + if (options.has("use")) { + out.println("currentEnv: " + env.name()); + } + return 0; + } + + private int runEnvList(String[] args, PrintStream out) throws IOException { + Options options = Options.parse(args, 2); + List envs = envStore.listEnvs(); + String current = envStore.currentEnvName(); + if (options.has("json-output")) { + ObjectNode root = objectMapper.createObjectNode(); + root.put("currentEnv", current); + ArrayNode array = root.putArray("envs"); + for (Eip4EnvStore.EnvConfig env : envs) { + ObjectNode row = array.addObject(); + row.put("name", env.name()); + row.put("kind", env.kind()); + row.put("baseUrl", env.baseUrl()); + row.put("current", env.name().equals(current)); + } + out.println(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(root)); + return 0; + } + if (envs.isEmpty()) { + out.println("No EIP4 envs configured. Add one with `eip4 env add --name local --base-url http://localhost:8084 --use`."); + return 0; + } + out.println("CURRENT NAME KIND BASE_URL"); + for (Eip4EnvStore.EnvConfig env : envs) { + out.println((env.name().equals(current) ? "*" : "-") + " " + + env.name() + " " + env.kind() + " " + env.baseUrl()); + } + return 0; + } + + private int runEnvUse(String[] args, PrintStream out) throws IOException { + Options options = Options.parse(args, 2); + String name = requiredPart(options.single("name"), "name"); + Eip4EnvStore.EnvConfig env = envStore.useEnv(name); + out.println("currentEnv: " + env.name()); + out.println("baseUrl: " + env.baseUrl()); + return 0; + } + + private int runEnvCurrent(PrintStream out) throws IOException { + Eip4EnvStore.EnvConfig env = envStore.currentEnv().orElse(null); + if (env == null) { + out.println("No current EIP4 env configured."); + return 0; + } + out.println("currentEnv: " + env.name()); + out.println("kind: " + env.kind()); + out.println("baseUrl: " + env.baseUrl()); + return 0; + } + + private int runEnvStatus(String[] args, PrintStream out, PrintStream err) throws IOException, InterruptedException { + Options options = Options.parse(args, 2); + if (options.has("all")) { + int exit = 0; + for (Eip4EnvStore.EnvConfig env : envStore.listEnvs()) { + int code = checkEnvStatus(env.name(), env.baseUrl(), out, err); + if (code != 0) { + exit = code; + } + } + if (envStore.listEnvs().isEmpty()) { + out.println("No EIP4 envs configured."); + } + return exit; + } + CliTarget target = target(options); + return checkEnvStatus(target.envName(), target.baseUrl(), out, err); + } + + private int checkEnvStatus(String envName, String baseUrl, PrintStream out, PrintStream err) + throws IOException, InterruptedException { URI uri = endpoint(baseUrl, "/v3/api-docs"); Eip4HttpResponse response = httpClient.send("GET", uri, null); if (!response.successful()) { err.println("EIP4 env NOT_READY"); + if (!envName.isBlank()) { + err.println("env: " + envName); + } err.println("baseUrl: " + baseUrl); err.println("status: " + response.statusCode()); return 2; } out.println("EIP4 env READY"); + if (!envName.isBlank()) { + out.println("env: " + envName); + } out.println("baseUrl: " + baseUrl); out.println("apiDocs: " + uri); return 0; @@ -98,6 +273,7 @@ public final class Eip4Cli { private int runAiAutoDevelop(String[] args, PrintStream out, PrintStream err) throws IOException, InterruptedException { Options options = Options.parse(args, 2); + ensureCrossEnvConfirmed(options); ObjectNode request = buildAutoDevelopRequest(options); String baseUrl = baseUrl(options); Eip4HttpResponse response = httpClient.send( @@ -110,6 +286,7 @@ public final class Eip4Cli { private int runAiFeaturePackage(String[] args, PrintStream out, PrintStream err) throws IOException, InterruptedException { Options options = Options.parse(args, 2); + ensureCrossEnvConfirmed(options); String taskId = requiredPart(options.single("task-id"), "task-id"); String changeSetId = requiredPart(options.single("change-set-id"), "change-set-id"); Eip4HttpResponse response = httpClient.send( @@ -123,6 +300,7 @@ public final class Eip4Cli { private int runAiRevision(String[] args, PrintStream out, PrintStream err) throws IOException, InterruptedException { Options options = Options.parse(args, 2); + ensureCrossEnvConfirmed(options); String taskId = requiredPart(options.single("task-id"), "task-id"); String packageId = requiredPart(options.single("package-id"), "package-id"); ObjectNode request = objectMapper.createObjectNode(); @@ -167,7 +345,7 @@ public final class Eip4Cli { return 0; } - private ObjectNode buildAutoDevelopRequest(Options options) { + private ObjectNode buildAutoDevelopRequest(Options options) throws IOException { ObjectNode root = objectMapper.createObjectNode(); String baseUrl = baseUrl(options); root.put("baseUrl", baseUrl); @@ -220,18 +398,42 @@ public final class Eip4Cli { node.put(jsonName, requiredPart(options.single(optionName), optionName)); } - private String baseUrl(Options options) { - String value = options.single("base-url"); - if (value == null || value.isBlank()) { - value = System.getenv("EIP4_BASE_URL"); + private String baseUrl(Options options) throws IOException { + return target(options).baseUrl(); + } + + private CliTarget target(Options options) throws IOException { + String explicitBaseUrl = options.single("base-url"); + if (explicitBaseUrl != null && !explicitBaseUrl.isBlank()) { + return new CliTarget("", Eip4EnvStore.normalizeBaseUrl(explicitBaseUrl)); } + String envName = options.single("env"); + if (envName != null && !envName.isBlank()) { + Eip4EnvStore.EnvConfig env = envStore.findEnv(envName) + .orElseThrow(() -> new IllegalArgumentException("EIP4 env not found: " + envName)); + return new CliTarget(env.name(), env.baseUrl()); + } + Eip4EnvStore.EnvConfig current = envStore.currentEnv().orElse(null); + if (current != null) { + return new CliTarget(current.name(), current.baseUrl()); + } + String value = System.getenv("EIP4_BASE_URL"); if (value == null || value.isBlank()) { value = DEFAULT_BASE_URL; } - while (value.endsWith("/")) { - value = value.substring(0, value.length() - 1); + return new CliTarget("", Eip4EnvStore.normalizeBaseUrl(value)); + } + + private void ensureCrossEnvConfirmed(Options options) throws IOException { + String envName = options.single("env"); + if (envName == null || envName.isBlank() || options.has("yes")) { + return; + } + String current = envStore.currentEnvName(); + if (!current.isBlank() && !current.equals(envName.trim())) { + throw new IllegalArgumentException("Refusing to target env `" + envName + + "` while current env is `" + current + "`. Re-run with --yes to confirm."); } - return value; } private URI endpoint(String baseUrl, String path) { @@ -265,6 +467,43 @@ public final class Eip4Cli { return value.isMissingNode() || value.isNull() ? "" : value.asText(); } + private boolean hasTextArrayItems(JsonNode node) { + return node.isArray() && node.size() > 0 && node.elements().hasNext(); + } + + private boolean containsPlaceholder(JsonNode node) { + if (!node.isArray()) { + return false; + } + for (JsonNode item : node) { + if (item.asText("").contains("${")) { + return true; + } + } + return false; + } + + private boolean hasRunEvidence(JsonNode runEvidence, String runType, String status) { + if (!runEvidence.isArray()) { + return false; + } + for (JsonNode run : runEvidence) { + if (runType.equals(run.path("runType").asText()) && status.equals(run.path("status").asText())) { + return true; + } + } + return false; + } + + private String packageId(JsonNode root, JsonNode deploymentPackage) { + String id = text(root, "id"); + if (!id.isBlank()) { + return id; + } + String manifestId = deploymentPackage.path("manifest").path("packageId").asText(""); + return manifestId == null ? "" : manifestId; + } + private int parseInt(String value, String name) { try { return Integer.parseInt(value); @@ -295,18 +534,35 @@ public final class Eip4Cli { EIP4 CLI Usage: - eip4 env status [--base-url URL] + eip4 env add --name NAME --base-url URL [--kind local|http] [--use] + eip4 env list [--json-output] + eip4 env use --name NAME + eip4 env current + eip4 env status [--env NAME|--base-url URL|--all] eip4 ai auto-develop --objective TEXT --feature-name NAME --table-name TABLE --entity-name NAME --template-id ID --menu-name NAME --field column:label:type[:length][:required] + eip4 release verify --package-file FILE Environment: - EIP4_BASE_URL defaults the target service URL when --base-url is omitted. + Configured envs are stored in ~/.eip4/eip4-cli.json by default. + EIP4_CLI_HOME overrides the CLI home directory. + """); + } + + private void printReleaseHelp(PrintStream out) { + out.println(""" + Usage: + eip4 release verify --package-file FILE [--json-output] """); } private void printEnvHelp(PrintStream out) { out.println(""" Usage: - eip4 env status [--base-url URL] + eip4 env add --name NAME --base-url URL [--kind local|http] [--use] + eip4 env list [--json-output] + eip4 env use --name NAME + eip4 env current + eip4 env status [--env NAME|--base-url URL|--all] """); } @@ -335,15 +591,22 @@ public final class Eip4Cli { --package-id ID Optional: + --env NAME --base-url URL --max-repair-attempts N --no-deployment-package + --yes --output FILE """); } + private record CliTarget(String envName, String baseUrl) { + } + private static final class Options { private final Map> values = new LinkedHashMap<>(); + private static final List BOOLEAN_OPTIONS = List.of( + "all", "json-output", "no-deployment-package", "use", "yes"); static Options parse(String[] args, int from) { Options options = new Options(); @@ -356,7 +619,7 @@ public final class Eip4Cli { if (name.isBlank()) { throw new IllegalArgumentException("Invalid option: " + arg); } - if ("no-deployment-package".equals(name)) { + if (BOOLEAN_OPTIONS.contains(name)) { options.add(name, "true"); continue; } diff --git a/platform-cli/src/main/java/com/eip4/platform/cli/Eip4EnvStore.java b/platform-cli/src/main/java/com/eip4/platform/cli/Eip4EnvStore.java new file mode 100644 index 0000000..b2665ec --- /dev/null +++ b/platform-cli/src/main/java/com/eip4/platform/cli/Eip4EnvStore.java @@ -0,0 +1,140 @@ +package com.eip4.platform.cli; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import com.fasterxml.jackson.databind.ObjectMapper; + +final class Eip4EnvStore { + + private static final int SCHEMA_VERSION = 1; + + private final Path configPath; + private final ObjectMapper objectMapper; + + Eip4EnvStore(Path configPath, ObjectMapper objectMapper) { + this.configPath = configPath; + this.objectMapper = objectMapper; + } + + static Eip4EnvStore defaultStore(ObjectMapper objectMapper) { + String cliHome = System.getenv("EIP4_CLI_HOME"); + Path home = cliHome == null || cliHome.isBlank() + ? Path.of(System.getProperty("user.home"), ".eip4") + : Path.of(cliHome); + return new Eip4EnvStore(home.resolve("eip4-cli.json"), objectMapper); + } + + Config load() throws IOException { + if (!Files.exists(configPath)) { + return new Config(SCHEMA_VERSION, "", new LinkedHashMap<>()); + } + String json = Files.readString(configPath, StandardCharsets.UTF_8); + if (json.isBlank()) { + return new Config(SCHEMA_VERSION, "", new LinkedHashMap<>()); + } + Config config = objectMapper.readValue(json, Config.class); + return normalize(config); + } + + void saveEnv(EnvConfig env, boolean use) throws IOException { + Config config = load(); + Map envs = new LinkedHashMap<>(config.envs()); + envs.put(env.name(), env); + String current = use || config.currentEnv().isBlank() ? env.name() : config.currentEnv(); + save(new Config(SCHEMA_VERSION, current, envs)); + } + + List listEnvs() throws IOException { + return List.copyOf(load().envs().values()); + } + + Optional findEnv(String name) throws IOException { + if (name == null || name.isBlank()) { + return Optional.empty(); + } + return Optional.ofNullable(load().envs().get(name.trim())); + } + + Optional currentEnv() throws IOException { + Config config = load(); + if (config.currentEnv().isBlank()) { + return Optional.empty(); + } + return Optional.ofNullable(config.envs().get(config.currentEnv())); + } + + String currentEnvName() throws IOException { + return load().currentEnv(); + } + + EnvConfig useEnv(String name) throws IOException { + String requested = name == null ? "" : name.trim(); + Config config = load(); + EnvConfig env = config.envs().get(requested); + if (env == null) { + throw new IllegalArgumentException("EIP4 env not found: " + requested); + } + save(new Config(SCHEMA_VERSION, requested, new LinkedHashMap<>(config.envs()))); + return env; + } + + private void save(Config config) throws IOException { + if (configPath.getParent() != null) { + Files.createDirectories(configPath.getParent()); + } + String json = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(normalize(config)); + Files.writeString(configPath, json + System.lineSeparator(), StandardCharsets.UTF_8); + } + + private static Config normalize(Config config) { + Map envs = new LinkedHashMap<>(); + if (config != null && config.envs() != null) { + for (EnvConfig env : config.envs().values()) { + if (env == null || env.name() == null || env.name().isBlank()) { + continue; + } + envs.put(env.name(), normalize(env)); + } + } + String current = config == null || config.currentEnv() == null ? "" : config.currentEnv().trim(); + if (!current.isBlank() && !envs.containsKey(current)) { + current = ""; + } + return new Config(SCHEMA_VERSION, current, envs); + } + + static EnvConfig normalize(EnvConfig env) { + String name = required(env.name(), "name"); + String kind = env.kind() == null || env.kind().isBlank() ? "local" : env.kind().trim(); + String baseUrl = normalizeBaseUrl(required(env.baseUrl(), "baseUrl")); + return new EnvConfig(name, kind, baseUrl); + } + + static String normalizeBaseUrl(String value) { + String out = value == null ? "" : value.trim(); + while (out.endsWith("/")) { + out = out.substring(0, out.length() - 1); + } + return out; + } + + private static String required(String value, String name) { + if (value == null || value.isBlank()) { + throw new IllegalArgumentException("Missing required env " + name); + } + return value.trim(); + } + + record Config(int schemaVersion, String currentEnv, Map envs) { + } + + record EnvConfig(String name, String kind, String baseUrl) { + } +} 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 1b24268..920aee6 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 @@ -35,6 +35,30 @@ class Eip4CliTest { assertTrue(result.out().contains("EIP4 env READY")); } + @Test + void envCommandsPersistAndUseCurrentEnv() { + CapturingClient client = new CapturingClient(new Eip4HttpResponse(200, "{}")); + Eip4EnvStore store = tempStore(); + + CliResult add = run(store, client, "env", "add", + "--name", "local", + "--base-url", "http://localhost:8084/", + "--kind", "local", + "--use"); + CliResult current = run(store, client, "env", "current"); + CliResult list = run(store, client, "env", "list"); + CliResult status = run(store, client, "env", "status"); + + assertEquals(0, add.code()); + assertEquals(0, current.code()); + assertEquals(0, list.code()); + assertEquals(0, status.code()); + assertTrue(current.out().contains("currentEnv: local")); + assertTrue(list.out().contains("* local local http://localhost:8084")); + assertEquals(URI.create("http://localhost:8084/v3/api-docs"), client.uri); + assertTrue(status.out().contains("env: local")); + } + @Test void autoDevelopBuildsRequestAndWritesResponse() throws Exception { String response = """ @@ -79,6 +103,47 @@ class Eip4CliTest { assertTrue(result.out().contains("applyStatus: PASSED")); } + @Test + void autoDevelopCanUseConfiguredEnv() { + CapturingClient client = new CapturingClient(new Eip4HttpResponse(200, """ + {"status":"READY_FOR_HUMAN_REVIEW","taskId":"task-1","changeSetId":"cs-1"} + """)); + Eip4EnvStore store = tempStore(); + run(store, client, "env", "add", "--name", "dev", "--base-url", "http://localhost:8093", "--use"); + + CliResult result = run(store, client, + "ai", "auto-develop", + "--env", "dev", + "--objective", "新增客户等级维护", + "--feature-name", "客户等级维护", + "--table-name", "EIP4AI_CUSTOMER_LEVEL", + "--entity-name", "客户等级", + "--template-id", "eip4ai-customer-level", + "--menu-name", "客户等级维护", + "--field", "NAME:名称:string:100:true"); + + assertEquals(0, result.code()); + assertEquals(URI.create("http://localhost:8093/api/ai/features/auto-develop"), client.uri); + assertEquals("http://localhost:8093", client.body.path("baseUrl").asText()); + } + + @Test + void explicitCrossEnvRequiresYes() { + CapturingClient client = new CapturingClient(new Eip4HttpResponse(200, "{}")); + Eip4EnvStore store = tempStore(); + run(store, client, "env", "add", "--name", "local", "--base-url", "http://localhost:8084", "--use"); + run(store, client, "env", "add", "--name", "dev", "--base-url", "http://localhost:8093"); + + CliResult result = run(store, client, + "ai", "feature-package", + "--env", "dev", + "--task-id", "ait-1", + "--change-set-id", "aics-1"); + + assertEquals(1, result.code()); + assertTrue(result.err().contains("Refusing to target env `dev`")); + } + @Test void autoDevelopRequiresAtLeastOneField() { CapturingClient client = new CapturingClient(new Eip4HttpResponse(200, "{}")); @@ -143,10 +208,74 @@ class Eip4CliTest { assertTrue(result.out().contains("packageId: aipkg-1")); } + @Test + void releaseVerifyPassesReadyFeaturePackage() throws Exception { + Path file = tempDir.resolve("package.json"); + Files.writeString(file, """ + { + "id": "aipkg-1", + "deploymentPackage": { + "taskId": "ait-1", + "changeSetId": "aics-1", + "status": "READY_FOR_HUMAN_REVIEW", + "requiresHumanApproval": true, + "sqlStatements": ["insert into sys_page_schema values ('x')"], + "rollbackSqlStatements": ["delete from sys_page_schema where id = 'x'"], + "warnings": [], + "runEvidence": [ + {"runType": "LOCAL_APPLY", "status": "PASSED"}, + {"runType": "SMOKE", "status": "PASSED"} + ] + } + } + """, StandardCharsets.UTF_8); + + CliResult result = run(new CapturingClient(new Eip4HttpResponse(200, "{}")), + "release", "verify", "--package-file", file.toString()); + + assertEquals(0, result.code()); + assertTrue(result.out().contains("Release package PASSED")); + assertTrue(result.out().contains("packageId: aipkg-1")); + } + + @Test + void releaseVerifyBlocksSqlPlaceholders() throws Exception { + Path file = tempDir.resolve("package-with-placeholder.json"); + Files.writeString(file, """ + { + "deploymentPackage": { + "taskId": "ait-1", + "changeSetId": "aics-1", + "status": "READY_FOR_HUMAN_REVIEW", + "requiresHumanApproval": true, + "manifest": {"packageId": "aipkg-2"}, + "sqlStatements": ["insert into sys_menu(parent_id) values ('${parentMenuId}')"], + "rollbackSqlStatements": ["delete from sys_menu where id = 'x'"], + "warnings": ["菜单 parentId 待替换"], + "runEvidence": [ + {"runType": "LOCAL_APPLY", "status": "PASSED"}, + {"runType": "SMOKE", "status": "PASSED"} + ] + } + } + """, StandardCharsets.UTF_8); + + CliResult result = run(new CapturingClient(new Eip4HttpResponse(200, "{}")), + "release", "verify", "--package-file", file.toString()); + + assertEquals(2, result.code()); + assertTrue(result.err().contains("Release package FAILED")); + assertTrue(result.err().contains("占位符")); + } + private CliResult run(CapturingClient client, String... args) { + return run(tempStore(), client, args); + } + + private CliResult run(Eip4EnvStore store, CapturingClient client, String... args) { ByteArrayOutputStream out = new ByteArrayOutputStream(); ByteArrayOutputStream err = new ByteArrayOutputStream(); - int code = new Eip4Cli(client).run( + int code = new Eip4Cli(client, store).run( args, new PrintStream(out, true, StandardCharsets.UTF_8), new PrintStream(err, true, StandardCharsets.UTF_8)); @@ -156,6 +285,10 @@ class Eip4CliTest { err.toString(StandardCharsets.UTF_8)); } + private Eip4EnvStore tempStore() { + return new Eip4EnvStore(tempDir.resolve("eip4-cli.json"), objectMapper); + } + private final class CapturingClient implements Eip4HttpClient { private final Eip4HttpResponse response; private int calls; From ade5e91ac1b96ab9199cdaa489f86f2609fc493f Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 08:30:20 +0800 Subject: [PATCH 05/53] feat: add feature package export preview --- README.md | 2 + docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md | 3 +- docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md | 10 ++ docs/skills/eip4-release-manage.md | 18 +- .../java/com/eip4/platform/cli/Eip4Cli.java | 170 ++++++++++++++++-- .../com/eip4/platform/cli/Eip4CliTest.java | 71 ++++++++ 6 files changed, 251 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index e1345a3..76788d1 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,8 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar env add --name loc 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 java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release verify --package-file target/ai-runs/package.json +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release export --package-file target/ai-runs/package.json --output target/ai-runs/package.eip4pkg.json +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release import-preview --package-file target/ai-runs/package.eip4pkg.json ``` ## tools/ diff --git a/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md index 4718ba6..2f2ef4f 100644 --- a/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md +++ b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md @@ -137,6 +137,7 @@ EIP4 当前已经有实体、页面 schema、服务流、菜单、smoke、部署 - 参考 NocoBase `env/status.ts` 和 `env-guard.ts`,`platform-cli` 新增本地 env registry/current env。 - 参考 NocoBase revision 创建前检查版本控制插件的思路,EIP4 后续 revision restore/diff 不能只依赖 JSON 快照,必须有发布系统能力检查。 - 新增 `eip4 release verify --package-file FILE`,先做离线发布前门禁,阻断未替换占位符和缺失本地 evidence 的功能包。 +- 新增 `eip4 release export/import-preview`,形成 `.eip4pkg.json` 文件格式和 checksum 门禁;导入预览不写环境、不启用功能。 - 详细源码对照见 `docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md`。 ### P4:Typed Page Schema 和组件注册表 @@ -190,6 +191,6 @@ EIP4 应该借鉴的是边界和流程: | P0 | 完成 | `platform-ai` 主链路已提交 | | P1 | 第一版完成 | 已新增 `platform-cli` 和 Skills 规范骨架 | | P2 | 第一版完成 | 已新增功能包快照、里程碑 revision、CLI 命令和持久化表 | -| P3 | 进行中 | 已开始 env registry/current env/cross-env guard/release verify | +| P3 | 进行中 | 已完成 env registry/current env/cross-env guard/release verify/export/import-preview 第一版 | | P4 | 待开始 | 依赖页面 schema 现状清理 | | P5 | 待开始 | 依赖权限、审计、工具白名单成熟 | diff --git a/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md b/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md index bd3cf5c..f804c95 100644 --- a/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md +++ b/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md @@ -44,6 +44,8 @@ - AI 命令支持 `--env`。 - 显式选择非当前 env 时必须加 `--yes`,避免误操作共享环境。 - 新增 `eip4 release verify --package-file FILE`,离线检查功能包是否具备本地门禁 evidence、人审标记、SQL/rollback,并阻断 `${...}` 占位符。 +- 新增 `eip4 release export --package-file FILE --output FILE`,将功能包封装为 `.eip4pkg.json`,包含格式版本和 SHA-256 checksum。 +- 新增 `eip4 release import-preview --package-file FILE`,离线验证 `.eip4pkg.json` checksum 和发布门禁,不写任何环境。 ## 三、后续实现顺序 @@ -60,6 +62,8 @@ ### P3-2:FeaturePackage 导出/导入 +状态:第一版完成。 + 目标: - `.eip4pkg.json` 文件格式 @@ -67,6 +71,12 @@ - import preview - import 后不自动启用 +第一版已落地: + +- export: 普通 feature package JSON -> `.eip4pkg.json` 信封。 +- import-preview: 校验 format/version/checksum/payload 和 release gate。 +- import-preview 只读,不落库、不启用、不发布。 + ### P3-3:Revision diff/restore 目标: diff --git a/docs/skills/eip4-release-manage.md b/docs/skills/eip4-release-manage.md index c15a9a1..691190e 100644 --- a/docs/skills/eip4-release-manage.md +++ b/docs/skills/eip4-release-manage.md @@ -41,15 +41,26 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release verify \ --package-file target/ai-runs/feature-package.json ``` -5. 确认部署包包含: +5. 导出 `.eip4pkg.json` 并做导入预览: + +```bash +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release export \ + --package-file target/ai-runs/feature-package.json \ + --output target/ai-runs/feature-package.eip4pkg.json + +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release import-preview \ + --package-file target/ai-runs/feature-package.eip4pkg.json +``` + +6. 确认部署包包含: - manifest - SQL 草案 - rollback SQL - 本地 apply evidence - smoke evidence - repair evidence -6. 确认部署包需要人工审批。 -7. 如果包含 `${parentMenuId}` 等占位符,必须人工替换并复核;`release verify` 默认会阻断这类包。 +7. 确认部署包需要人工审批。 +8. 如果包含 `${parentMenuId}` 等占位符,必须人工替换并复核;`release verify` 默认会阻断这类包。 ## 线上 bug 修复路径 @@ -65,3 +76,4 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release verify \ - 不绕过部署包和人审。 - 不把 smoke 失败的变更包交给发布流程。 - 不发布 `release verify` 失败的功能包。 +- 不把 `import-preview` 当成导入或启用;它只是离线检查。 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 8664e0b..5d6ca42 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 @@ -6,7 +6,10 @@ import java.net.URI; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.util.ArrayList; +import java.util.HexFormat; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; @@ -20,6 +23,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode; public final class Eip4Cli { private static final String DEFAULT_BASE_URL = "http://localhost:8084"; + private static final String PACKAGE_FORMAT = "EIP4_FEATURE_PACKAGE"; + private static final int PACKAGE_FORMAT_VERSION = 1; + private static final String PACKAGE_CHECKSUM_ALGORITHM = "SHA-256"; private final ObjectMapper objectMapper; private final Eip4HttpClient httpClient; @@ -88,19 +94,118 @@ public final class Eip4Cli { return 0; } return switch (args[1]) { + case "export" -> runReleaseExport(args, out); + case "import-preview" -> runReleaseImportPreview(args, out, err); case "verify" -> runReleaseVerify(args, out, err); default -> fail(err, "Unknown release command: " + args[1]); }; } + private int runReleaseExport(String[] args, PrintStream out) throws IOException { + Options options = Options.parse(args, 2); + Path packageFile = Path.of(requiredPart(options.single("package-file"), "package-file")); + Path output = Path.of(requiredPart(options.single("output"), "output")); + JsonNode raw = objectMapper.readTree(Files.readString(packageFile, StandardCharsets.UTF_8)); + JsonNode payload = packagePayload(raw); + ObjectNode envelope = objectMapper.createObjectNode(); + envelope.put("format", PACKAGE_FORMAT); + envelope.put("formatVersion", PACKAGE_FORMAT_VERSION); + envelope.put("exportedAt", System.currentTimeMillis()); + envelope.put("checksumAlgorithm", PACKAGE_CHECKSUM_ALGORITHM); + envelope.set("payload", payload); + envelope.put("checksum", checksum(payload)); + if (output.getParent() != null) { + Files.createDirectories(output.getParent()); + } + Files.writeString(output, + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(envelope) + System.lineSeparator(), + StandardCharsets.UTF_8); + out.println("Exported feature package: " + output.toAbsolutePath()); + out.println("packageId: " + packageId(payload, deploymentPackage(payload))); + out.println("checksum: " + envelope.path("checksum").asText()); + return 0; + } + + private int runReleaseImportPreview(String[] args, PrintStream out, PrintStream err) throws IOException { + Options options = Options.parse(args, 2); + Path packageFile = Path.of(requiredPart(options.single("package-file"), "package-file")); + JsonNode raw = objectMapper.readTree(Files.readString(packageFile, StandardCharsets.UTF_8)); + ReleaseValidation validation = validateReleasePackage(raw, true); + return printReleaseValidation(validation, options, out, err, "Import preview"); + } + private int runReleaseVerify(String[] args, PrintStream out, PrintStream err) throws IOException { Options options = Options.parse(args, 2); Path packageFile = Path.of(requiredPart(options.single("package-file"), "package-file")); JsonNode root = objectMapper.readTree(Files.readString(packageFile, StandardCharsets.UTF_8)); - JsonNode deploymentPackage = root.has("deploymentPackage") ? root.path("deploymentPackage") : root; + ReleaseValidation validation = validateReleasePackage(root, false); + return printReleaseValidation(validation, options, out, err, "Release package"); + } + + private ReleaseValidation validateReleasePackage(JsonNode root, boolean requireEnvelope) throws IOException { List blockers = new ArrayList<>(); List warnings = new ArrayList<>(); + validateEnvelope(root, blockers, requireEnvelope); + JsonNode payload = packagePayload(root); + JsonNode deploymentPackage = deploymentPackage(payload); + if (payload.isMissingNode() || payload.isNull() || !payload.isObject()) { + blockers.add("payload 必须是功能包 JSON object"); + } + validateDeploymentPackage(deploymentPackage, blockers, warnings); + + ObjectNode report = objectMapper.createObjectNode(); + report.put("status", blockers.isEmpty() ? "PASSED" : "FAILED"); + report.put("format", root.path("format").asText("")); + report.put("formatVersion", root.path("formatVersion").asInt(0)); + report.put("checksum", root.path("checksum").asText("")); + report.put("packageId", packageId(payload, deploymentPackage)); + report.put("taskId", text(deploymentPackage, "taskId")); + report.put("changeSetId", text(deploymentPackage, "changeSetId")); + ArrayNode blockerNodes = report.putArray("blockers"); + blockers.forEach(blockerNodes::add); + ArrayNode warningNodes = report.putArray("warnings"); + warnings.forEach(warningNodes::add); + return new ReleaseValidation(report, List.copyOf(blockers), List.copyOf(warnings)); + } + + private void validateEnvelope(JsonNode root, List blockers, boolean requireEnvelope) throws IOException { + if (!root.has("format")) { + if (requireEnvelope) { + blockers.add("导入预览要求 .eip4pkg.json 信封,缺少 format"); + } + return; + } + if (!PACKAGE_FORMAT.equals(root.path("format").asText())) { + blockers.add("format 必须是 " + PACKAGE_FORMAT); + } + if (root.path("formatVersion").asInt(0) != PACKAGE_FORMAT_VERSION) { + blockers.add("formatVersion 必须是 " + PACKAGE_FORMAT_VERSION); + } + if (!PACKAGE_CHECKSUM_ALGORITHM.equals(root.path("checksumAlgorithm").asText())) { + blockers.add("checksumAlgorithm 必须是 " + PACKAGE_CHECKSUM_ALGORITHM); + } + JsonNode payload = root.path("payload"); + if (!payload.isObject()) { + blockers.add("payload 必须是 JSON object"); + return; + } + String expected = root.path("checksum").asText(""); + if (expected.isBlank()) { + blockers.add("checksum 不能为空"); + return; + } + String actual = checksum(payload); + if (!expected.equals(actual)) { + blockers.add("checksum 不匹配,expected=" + expected + ", actual=" + actual); + } + } + + private void validateDeploymentPackage(JsonNode deploymentPackage, List blockers, + List warnings) { + if (!deploymentPackage.isObject()) { + blockers.add("deploymentPackage 必须是 JSON object"); + } if (!"READY_FOR_HUMAN_REVIEW".equals(text(deploymentPackage, "status"))) { blockers.add("deploymentPackage.status 必须是 READY_FOR_HUMAN_REVIEW"); } @@ -123,31 +228,41 @@ public final class Eip4Cli { blockers.add("sqlStatements 仍包含 ${...} 占位符,必须人工替换后再发布"); } deploymentPackage.path("warnings").forEach(warning -> warnings.add(warning.asText())); + } - ObjectNode report = objectMapper.createObjectNode(); - report.put("status", blockers.isEmpty() ? "PASSED" : "FAILED"); - report.put("packageId", packageId(root, deploymentPackage)); - report.put("taskId", text(deploymentPackage, "taskId")); - report.put("changeSetId", text(deploymentPackage, "changeSetId")); - ArrayNode blockerNodes = report.putArray("blockers"); - blockers.forEach(blockerNodes::add); - ArrayNode warningNodes = report.putArray("warnings"); - warnings.forEach(warningNodes::add); + private JsonNode packagePayload(JsonNode root) { + if (root != null && PACKAGE_FORMAT.equals(root.path("format").asText()) && root.has("payload")) { + return root.path("payload"); + } + return root; + } + private JsonNode deploymentPackage(JsonNode payload) { + if (payload != null && payload.has("deploymentPackage")) { + return payload.path("deploymentPackage"); + } + return payload; + } + + private int printReleaseValidation(ReleaseValidation validation, Options options, PrintStream out, + PrintStream err, String label) throws IOException { if (options.has("json-output")) { - out.println(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(report)); - } else if (blockers.isEmpty()) { - out.println("Release package PASSED"); - out.println("packageId: " + packageId(root, deploymentPackage)); - if (!warnings.isEmpty()) { + out.println(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(validation.report())); + } else if (validation.blockers().isEmpty()) { + out.println(label + " PASSED"); + out.println("packageId: " + validation.report().path("packageId").asText()); + if (!validation.report().path("checksum").asText("").isBlank()) { + out.println("checksum: " + validation.report().path("checksum").asText()); + } + if (!validation.warnings().isEmpty()) { out.println("warnings:"); - warnings.forEach(warning -> out.println("- " + warning)); + validation.warnings().forEach(warning -> out.println("- " + warning)); } } else { - err.println("Release package FAILED"); - blockers.forEach(blocker -> err.println("- " + blocker)); + err.println(label + " FAILED"); + validation.blockers().forEach(blocker -> err.println("- " + blocker)); } - return blockers.isEmpty() ? 0 : 2; + return validation.blockers().isEmpty() ? 0 : 2; } private int runEnvAdd(String[] args, PrintStream out) throws IOException { @@ -504,6 +619,16 @@ public final class Eip4Cli { return manifestId == null ? "" : manifestId; } + private String checksum(JsonNode payload) throws IOException { + try { + MessageDigest digest = MessageDigest.getInstance(PACKAGE_CHECKSUM_ALGORITHM); + byte[] hash = digest.digest(objectMapper.writeValueAsBytes(payload)); + return "sha256:" + HexFormat.of().formatHex(hash); + } catch (NoSuchAlgorithmException ex) { + throw new IllegalStateException("Missing checksum algorithm: " + PACKAGE_CHECKSUM_ALGORITHM, ex); + } + } + private int parseInt(String value, String name) { try { return Integer.parseInt(value); @@ -540,6 +665,8 @@ public final class Eip4Cli { eip4 env current eip4 env status [--env NAME|--base-url URL|--all] eip4 ai auto-develop --objective TEXT --feature-name NAME --table-name TABLE --entity-name NAME --template-id ID --menu-name NAME --field column:label:type[:length][:required] + eip4 release export --package-file FILE --output FILE + eip4 release import-preview --package-file FILE eip4 release verify --package-file FILE Environment: @@ -551,6 +678,8 @@ public final class Eip4Cli { private void printReleaseHelp(PrintStream out) { out.println(""" Usage: + eip4 release export --package-file FILE --output FILE + eip4 release import-preview --package-file FILE [--json-output] eip4 release verify --package-file FILE [--json-output] """); } @@ -603,6 +732,9 @@ public final class Eip4Cli { private record CliTarget(String envName, String baseUrl) { } + private record ReleaseValidation(ObjectNode report, List blockers, List warnings) { + } + private static final class Options { private final Map> values = new LinkedHashMap<>(); private static final List BOOLEAN_OPTIONS = List.of( 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 920aee6..7d5482d 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 @@ -268,6 +268,77 @@ class Eip4CliTest { assertTrue(result.err().contains("占位符")); } + @Test + void releaseExportWritesChecksumEnvelopeAndImportPreviewPasses() throws Exception { + Path source = validPackageFile("package-source.json"); + Path exported = tempDir.resolve("customer-level.eip4pkg.json"); + + CliResult export = run(new CapturingClient(new Eip4HttpResponse(200, "{}")), + "release", "export", + "--package-file", source.toString(), + "--output", exported.toString()); + + assertEquals(0, export.code()); + JsonNode envelope = objectMapper.readTree(Files.readString(exported)); + assertEquals("EIP4_FEATURE_PACKAGE", envelope.path("format").asText()); + assertEquals(1, envelope.path("formatVersion").asInt()); + assertEquals("SHA-256", envelope.path("checksumAlgorithm").asText()); + assertTrue(envelope.path("checksum").asText().startsWith("sha256:")); + assertEquals("aipkg-1", envelope.path("payload").path("id").asText()); + + CliResult preview = run(new CapturingClient(new Eip4HttpResponse(200, "{}")), + "release", "import-preview", + "--package-file", exported.toString()); + + assertEquals(0, preview.code()); + assertTrue(preview.out().contains("Import preview PASSED")); + assertTrue(preview.out().contains("checksum: sha256:")); + } + + @Test + void releaseImportPreviewRejectsTamperedChecksum() throws Exception { + Path source = validPackageFile("package-source.json"); + Path exported = tempDir.resolve("customer-level.eip4pkg.json"); + run(new CapturingClient(new Eip4HttpResponse(200, "{}")), + "release", "export", + "--package-file", source.toString(), + "--output", exported.toString()); + String tampered = Files.readString(exported, StandardCharsets.UTF_8) + .replace("READY_FOR_HUMAN_REVIEW", "BLOCKED_PENDING_LOCAL_PASS"); + Files.writeString(exported, tampered, StandardCharsets.UTF_8); + + CliResult preview = run(new CapturingClient(new Eip4HttpResponse(200, "{}")), + "release", "import-preview", + "--package-file", exported.toString()); + + assertEquals(2, preview.code()); + assertTrue(preview.err().contains("Import preview FAILED")); + assertTrue(preview.err().contains("checksum 不匹配")); + } + + private Path validPackageFile(String name) throws Exception { + Path file = tempDir.resolve(name); + Files.writeString(file, """ + { + "id": "aipkg-1", + "deploymentPackage": { + "taskId": "ait-1", + "changeSetId": "aics-1", + "status": "READY_FOR_HUMAN_REVIEW", + "requiresHumanApproval": true, + "sqlStatements": ["insert into sys_page_schema values ('x')"], + "rollbackSqlStatements": ["delete from sys_page_schema where id = 'x'"], + "warnings": [], + "runEvidence": [ + {"runType": "LOCAL_APPLY", "status": "PASSED"}, + {"runType": "SMOKE", "status": "PASSED"} + ] + } + } + """, StandardCharsets.UTF_8); + return file; + } + private CliResult run(CapturingClient client, String... args) { return run(tempStore(), client, args); } From b05f0e89b5bbdd42cc42f0c19b0e5c930e6312b9 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 08:33:47 +0800 Subject: [PATCH 06/53] feat: add release diff rollback plan --- README.md | 2 + docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md | 5 +- docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md | 10 + docs/skills/eip4-release-manage.md | 23 +- .../java/com/eip4/platform/cli/Eip4Cli.java | 212 ++++++++++++++++++ .../com/eip4/platform/cli/Eip4CliTest.java | 78 ++++++- 6 files changed, 321 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 76788d1..34fabf1 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,8 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai feature-package java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release verify --package-file target/ai-runs/package.json java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release export --package-file target/ai-runs/package.json --output target/ai-runs/package.eip4pkg.json java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release import-preview --package-file target/ai-runs/package.eip4pkg.json +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release diff --left target/ai-runs/package-old.json --right target/ai-runs/package.json +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release rollback-plan --package-file target/ai-runs/package.eip4pkg.json --output target/ai-runs/rollback-plan.json ``` ## tools/ diff --git a/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md index 2f2ef4f..8229b92 100644 --- a/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md +++ b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md @@ -124,7 +124,7 @@ EIP4 当前已经有实体、页面 schema、服务流、菜单、smoke、部署 - `eip4 release package` - `eip4 release verify` - `eip4 release apply --require-approval` -- `eip4 release rollback --package-id` +- `eip4 release rollback-plan --package-file FILE --output FILE` 验收标准: @@ -138,6 +138,7 @@ EIP4 当前已经有实体、页面 schema、服务流、菜单、smoke、部署 - 参考 NocoBase revision 创建前检查版本控制插件的思路,EIP4 后续 revision restore/diff 不能只依赖 JSON 快照,必须有发布系统能力检查。 - 新增 `eip4 release verify --package-file FILE`,先做离线发布前门禁,阻断未替换占位符和缺失本地 evidence 的功能包。 - 新增 `eip4 release export/import-preview`,形成 `.eip4pkg.json` 文件格式和 checksum 门禁;导入预览不写环境、不启用功能。 +- 新增 `eip4 release diff/rollback-plan`,先落地离线差异检查和计划型回滚;回滚计划不执行生产 SQL。 - 详细源码对照见 `docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md`。 ### P4:Typed Page Schema 和组件注册表 @@ -191,6 +192,6 @@ EIP4 应该借鉴的是边界和流程: | P0 | 完成 | `platform-ai` 主链路已提交 | | P1 | 第一版完成 | 已新增 `platform-cli` 和 Skills 规范骨架 | | P2 | 第一版完成 | 已新增功能包快照、里程碑 revision、CLI 命令和持久化表 | -| P3 | 进行中 | 已完成 env registry/current env/cross-env guard/release verify/export/import-preview 第一版 | +| P3 | 进行中 | 已完成 env registry/current env/cross-env guard/release verify/export/import-preview/diff/rollback-plan 第一版 | | P4 | 待开始 | 依赖页面 schema 现状清理 | | P5 | 待开始 | 依赖权限、审计、工具白名单成熟 | diff --git a/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md b/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md index f804c95..d973c2c 100644 --- a/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md +++ b/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md @@ -46,6 +46,8 @@ - 新增 `eip4 release verify --package-file FILE`,离线检查功能包是否具备本地门禁 evidence、人审标记、SQL/rollback,并阻断 `${...}` 占位符。 - 新增 `eip4 release export --package-file FILE --output FILE`,将功能包封装为 `.eip4pkg.json`,包含格式版本和 SHA-256 checksum。 - 新增 `eip4 release import-preview --package-file FILE`,离线验证 `.eip4pkg.json` checksum 和发布门禁,不写任何环境。 +- 新增 `eip4 release diff --left FILE --right FILE`,离线比较两个功能包或 `.eip4pkg.json` 的标识、SQL、rollback SQL 和 manifest 差异。 +- 新增 `eip4 release rollback-plan --package-file FILE --output FILE`,只生成结构化回滚计划,不执行生产写入。 ## 三、后续实现顺序 @@ -79,12 +81,20 @@ ### P3-3:Revision diff/restore +状态:第一版完成。 + 目标: - revision diff - rollback plan - rollback 只生成计划和 SQL,不默认执行生产写入 +第一版已落地: + +- diff: 比较两个普通 feature package JSON 或 `.eip4pkg.json`,支持 checksum 校验和 JSON 输出。 +- rollback-plan: 生成 `EIP4_ROLLBACK_PLAN` JSON,包含 package/task/changeSet、rollback SQL、source evidence 和人审要求。 +- rollback-plan 会阻断 rollback SQL 中的 `${...}` 占位符;命令不连接环境、不落库、不执行 SQL。 + ### P4:Typed UI Registry 目标: diff --git a/docs/skills/eip4-release-manage.md b/docs/skills/eip4-release-manage.md index 691190e..94621a8 100644 --- a/docs/skills/eip4-release-manage.md +++ b/docs/skills/eip4-release-manage.md @@ -52,15 +52,31 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release import-pre --package-file target/ai-runs/feature-package.eip4pkg.json ``` -6. 确认部署包包含: +6. 如存在上一版功能包,先做离线差异检查: + +```bash +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release diff \ + --left target/ai-runs/feature-package-old.json \ + --right target/ai-runs/feature-package.json +``` + +7. 需要回滚预案时,只生成回滚计划文件: + +```bash +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release rollback-plan \ + --package-file target/ai-runs/feature-package.eip4pkg.json \ + --output target/ai-runs/rollback-plan.json +``` + +8. 确认部署包包含: - manifest - SQL 草案 - rollback SQL - 本地 apply evidence - smoke evidence - repair evidence -7. 确认部署包需要人工审批。 -8. 如果包含 `${parentMenuId}` 等占位符,必须人工替换并复核;`release verify` 默认会阻断这类包。 +9. 确认部署包需要人工审批。 +10. 如果包含 `${parentMenuId}` 等占位符,必须人工替换并复核;`release verify` 默认会阻断这类包。 ## 线上 bug 修复路径 @@ -77,3 +93,4 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release import-pre - 不把 smoke 失败的变更包交给发布流程。 - 不发布 `release verify` 失败的功能包。 - 不把 `import-preview` 当成导入或启用;它只是离线检查。 +- 不把 `rollback-plan` 当成回滚执行;它只生成计划和 SQL 清单。 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 5d6ca42..ad2dc92 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 @@ -11,9 +11,11 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.HexFormat; import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -94,13 +96,50 @@ public final class Eip4Cli { return 0; } return switch (args[1]) { + case "diff" -> runReleaseDiff(args, out, err); case "export" -> runReleaseExport(args, out); case "import-preview" -> runReleaseImportPreview(args, out, err); + case "rollback-plan" -> runReleaseRollbackPlan(args, out, err); case "verify" -> runReleaseVerify(args, out, err); default -> fail(err, "Unknown release command: " + args[1]); }; } + private int runReleaseDiff(String[] args, PrintStream out, PrintStream err) throws IOException { + Options options = Options.parse(args, 2); + Path leftFile = Path.of(requiredPart(options.single("left"), "left")); + Path rightFile = Path.of(requiredPart(options.single("right"), "right")); + JsonNode leftRoot = objectMapper.readTree(Files.readString(leftFile, StandardCharsets.UTF_8)); + JsonNode rightRoot = objectMapper.readTree(Files.readString(rightFile, StandardCharsets.UTF_8)); + List blockers = new ArrayList<>(); + validateEnvelope(leftRoot, blockers, false); + validateEnvelope(rightRoot, blockers, false); + JsonNode leftPayload = packagePayload(leftRoot); + JsonNode rightPayload = packagePayload(rightRoot); + JsonNode leftDeploymentPackage = deploymentPackage(leftPayload); + JsonNode rightDeploymentPackage = deploymentPackage(rightPayload); + ObjectNode report = buildReleaseDiff(leftPayload, rightPayload, leftDeploymentPackage, rightDeploymentPackage); + report.put("status", blockers.isEmpty() ? "PASSED" : "FAILED"); + ArrayNode blockerNodes = report.putArray("blockers"); + blockers.forEach(blockerNodes::add); + if (!blockers.isEmpty()) { + return printReleaseOperationFailed("Release diff", blockers, err); + } + if (options.has("json-output")) { + out.println(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(report)); + return 0; + } + out.println("Release diff " + (report.path("changed").asBoolean(false) ? "CHANGED" : "UNCHANGED")); + out.println("leftPackageId: " + report.path("leftPackageId").asText()); + out.println("rightPackageId: " + report.path("rightPackageId").asText()); + printArrayDiffSummary(report.path("sqlStatements"), out, "sqlStatements"); + printArrayDiffSummary(report.path("rollbackSqlStatements"), out, "rollbackSqlStatements"); + if (report.path("manifestChanged").asBoolean(false)) { + out.println("manifest: changed"); + } + return 0; + } + private int runReleaseExport(String[] args, PrintStream out) throws IOException { Options options = Options.parse(args, 2); Path packageFile = Path.of(requiredPart(options.single("package-file"), "package-file")); @@ -134,6 +173,33 @@ public final class Eip4Cli { return printReleaseValidation(validation, options, out, err, "Import preview"); } + private int runReleaseRollbackPlan(String[] args, PrintStream out, PrintStream err) throws IOException { + Options options = Options.parse(args, 2); + Path packageFile = Path.of(requiredPart(options.single("package-file"), "package-file")); + Path output = Path.of(requiredPart(options.single("output"), "output")); + JsonNode raw = objectMapper.readTree(Files.readString(packageFile, StandardCharsets.UTF_8)); + List blockers = new ArrayList<>(); + validateEnvelope(raw, blockers, false); + JsonNode payload = packagePayload(raw); + JsonNode deploymentPackage = deploymentPackage(payload); + validateRollbackPlanSource(payload, deploymentPackage, blockers); + if (!blockers.isEmpty()) { + return printReleaseOperationFailed("Rollback plan", blockers, err); + } + ObjectNode plan = buildRollbackPlan(raw, payload, deploymentPackage); + if (output.getParent() != null) { + Files.createDirectories(output.getParent()); + } + Files.writeString(output, + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(plan) + System.lineSeparator(), + StandardCharsets.UTF_8); + out.println("Wrote rollback plan: " + output.toAbsolutePath()); + out.println("packageId: " + plan.path("packageId").asText()); + out.println("rollbackSqlStatements: " + plan.path("rollbackSqlStatements").size()); + out.println("mode: " + plan.path("mode").asText()); + return 0; + } + private int runReleaseVerify(String[] args, PrintStream out, PrintStream err) throws IOException { Options options = Options.parse(args, 2); Path packageFile = Path.of(requiredPart(options.single("package-file"), "package-file")); @@ -169,6 +235,80 @@ public final class Eip4Cli { return new ReleaseValidation(report, List.copyOf(blockers), List.copyOf(warnings)); } + private ObjectNode buildReleaseDiff(JsonNode leftPayload, JsonNode rightPayload, + JsonNode leftDeploymentPackage, JsonNode rightDeploymentPackage) { + ObjectNode report = objectMapper.createObjectNode(); + String leftPackageId = packageId(leftPayload, leftDeploymentPackage); + String rightPackageId = packageId(rightPayload, rightDeploymentPackage); + report.put("leftPackageId", leftPackageId); + report.put("rightPackageId", rightPackageId); + ObjectNode fields = report.putObject("fields"); + putScalarDiff(fields, "packageId", leftPackageId, rightPackageId); + putScalarDiff(fields, "taskId", text(leftDeploymentPackage, "taskId"), text(rightDeploymentPackage, "taskId")); + putScalarDiff(fields, "changeSetId", text(leftDeploymentPackage, "changeSetId"), + text(rightDeploymentPackage, "changeSetId")); + ObjectNode sqlDiff = textArrayDiff(leftDeploymentPackage.path("sqlStatements"), + rightDeploymentPackage.path("sqlStatements")); + ObjectNode rollbackDiff = textArrayDiff(leftDeploymentPackage.path("rollbackSqlStatements"), + rightDeploymentPackage.path("rollbackSqlStatements")); + report.set("sqlStatements", sqlDiff); + report.set("rollbackSqlStatements", rollbackDiff); + boolean manifestChanged = !leftDeploymentPackage.path("manifest").equals(rightDeploymentPackage.path("manifest")); + report.put("manifestChanged", manifestChanged); + boolean fieldsChanged = fieldsChanged(fields); + report.put("changed", fieldsChanged + || sqlDiff.path("changed").asBoolean(false) + || rollbackDiff.path("changed").asBoolean(false) + || manifestChanged); + return report; + } + + private ObjectNode buildRollbackPlan(JsonNode root, JsonNode payload, JsonNode deploymentPackage) { + ObjectNode plan = objectMapper.createObjectNode(); + plan.put("type", "EIP4_ROLLBACK_PLAN"); + plan.put("version", 1); + plan.put("generatedAt", System.currentTimeMillis()); + plan.put("packageId", packageId(payload, deploymentPackage)); + plan.put("taskId", text(deploymentPackage, "taskId")); + plan.put("changeSetId", text(deploymentPackage, "changeSetId")); + plan.put("sourceChecksum", root.path("checksum").asText("")); + plan.put("requiresHumanApproval", true); + plan.put("mode", "PLAN_ONLY"); + plan.put("policy", "Review and apply through the approved release process. This file does not execute SQL."); + ArrayNode rollback = plan.putArray("rollbackSqlStatements"); + textValues(deploymentPackage.path("rollbackSqlStatements")).forEach(rollback::add); + ArrayNode sourceEvidence = plan.putArray("sourceRunEvidence"); + if (deploymentPackage.path("runEvidence").isArray()) { + deploymentPackage.path("runEvidence").forEach(sourceEvidence::add); + } + ArrayNode warnings = plan.putArray("warnings"); + warnings.add("Generated offline; no production SQL was executed."); + deploymentPackage.path("warnings").forEach(warning -> warnings.add(warning.asText())); + return plan; + } + + private void validateRollbackPlanSource(JsonNode payload, JsonNode deploymentPackage, List blockers) { + if (!payload.isObject()) { + blockers.add("payload 必须是功能包 JSON object"); + } + if (!deploymentPackage.isObject()) { + blockers.add("deploymentPackage 必须是 JSON object"); + return; + } + if (packageId(payload, deploymentPackage).isBlank()) { + blockers.add("packageId 不能为空"); + } + if (!deploymentPackage.path("requiresHumanApproval").asBoolean(false)) { + blockers.add("deploymentPackage.requiresHumanApproval 必须是 true"); + } + if (!hasTextArrayItems(deploymentPackage.path("rollbackSqlStatements"))) { + blockers.add("rollbackSqlStatements 不能为空"); + } + if (containsPlaceholder(deploymentPackage.path("rollbackSqlStatements"))) { + blockers.add("rollbackSqlStatements 仍包含 ${...} 占位符,必须人工替换后再生成回滚计划"); + } + } + private void validateEnvelope(JsonNode root, List blockers, boolean requireEnvelope) throws IOException { if (!root.has("format")) { if (requireEnvelope) { @@ -265,6 +405,12 @@ public final class Eip4Cli { return validation.blockers().isEmpty() ? 0 : 2; } + private int printReleaseOperationFailed(String label, List blockers, PrintStream err) { + err.println(label + " FAILED"); + blockers.forEach(blocker -> err.println("- " + blocker)); + return 2; + } + private int runEnvAdd(String[] args, PrintStream out) throws IOException { Options options = Options.parse(args, 2); String name = requiredPart(options.single("name"), "name"); @@ -598,6 +744,68 @@ public final class Eip4Cli { return false; } + private List textValues(JsonNode node) { + List values = new ArrayList<>(); + if (!node.isArray()) { + return values; + } + for (JsonNode item : node) { + String value = item.asText(""); + if (!value.isBlank()) { + values.add(value); + } + } + return values; + } + + private ObjectNode textArrayDiff(JsonNode left, JsonNode right) { + List leftValues = textValues(left); + List rightValues = textValues(right); + Set leftSet = new LinkedHashSet<>(leftValues); + Set rightSet = new LinkedHashSet<>(rightValues); + ObjectNode node = objectMapper.createObjectNode(); + node.put("leftCount", leftValues.size()); + node.put("rightCount", rightValues.size()); + ArrayNode added = node.putArray("added"); + for (String value : rightSet) { + if (!leftSet.contains(value)) { + added.add(value); + } + } + ArrayNode removed = node.putArray("removed"); + for (String value : leftSet) { + if (!rightSet.contains(value)) { + removed.add(value); + } + } + boolean orderChanged = added.isEmpty() && removed.isEmpty() && !leftValues.equals(rightValues); + node.put("orderChanged", orderChanged); + node.put("changed", !added.isEmpty() || !removed.isEmpty() || orderChanged); + return node; + } + + private void putScalarDiff(ObjectNode parent, String field, String left, String right) { + ObjectNode node = parent.putObject(field); + node.put("left", left); + node.put("right", right); + node.put("changed", !left.equals(right)); + } + + private boolean fieldsChanged(ObjectNode fields) { + for (JsonNode field : fields) { + if (field.path("changed").asBoolean(false)) { + return true; + } + } + return false; + } + + private void printArrayDiffSummary(JsonNode diff, PrintStream out, String label) { + out.println(label + ": added=" + diff.path("added").size() + + ", removed=" + diff.path("removed").size() + + ", orderChanged=" + diff.path("orderChanged").asBoolean(false)); + } + private boolean hasRunEvidence(JsonNode runEvidence, String runType, String status) { if (!runEvidence.isArray()) { return false; @@ -665,8 +873,10 @@ public final class Eip4Cli { eip4 env current eip4 env status [--env NAME|--base-url URL|--all] eip4 ai auto-develop --objective TEXT --feature-name NAME --table-name TABLE --entity-name NAME --template-id ID --menu-name NAME --field column:label:type[:length][:required] + eip4 release diff --left FILE --right FILE eip4 release export --package-file FILE --output FILE eip4 release import-preview --package-file FILE + eip4 release rollback-plan --package-file FILE --output FILE eip4 release verify --package-file FILE Environment: @@ -678,8 +888,10 @@ public final class Eip4Cli { private void printReleaseHelp(PrintStream out) { out.println(""" Usage: + eip4 release diff --left FILE --right FILE [--json-output] eip4 release export --package-file FILE --output FILE eip4 release import-preview --package-file FILE [--json-output] + eip4 release rollback-plan --package-file FILE --output FILE eip4 release verify --package-file FILE [--json-output] """); } 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 7d5482d..102667b 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 @@ -316,18 +316,87 @@ class Eip4CliTest { assertTrue(preview.err().contains("checksum 不匹配")); } + @Test + void releaseDiffReportsSqlAndRollbackChanges() throws Exception { + Path left = packageFile("left-package.json", "aipkg-left", + "insert into sys_page_schema values ('left')", + "delete from sys_page_schema where id = 'left'"); + Path right = packageFile("right-package.json", "aipkg-right", + "insert into sys_page_schema values ('right')", + "delete from sys_page_schema where id = 'right'"); + + CliResult result = run(new CapturingClient(new Eip4HttpResponse(200, "{}")), + "release", "diff", + "--left", left.toString(), + "--right", right.toString(), + "--json-output"); + + assertEquals(0, result.code()); + JsonNode report = objectMapper.readTree(result.out()); + assertTrue(report.path("changed").asBoolean()); + assertEquals("aipkg-left", report.path("leftPackageId").asText()); + assertEquals("aipkg-right", report.path("rightPackageId").asText()); + assertEquals(1, report.path("sqlStatements").path("added").size()); + assertTrue(report.path("sqlStatements").path("added").get(0).asText().contains("'right'")); + assertEquals(1, report.path("rollbackSqlStatements").path("removed").size()); + } + + @Test + void releaseRollbackPlanWritesPlanOnlyArtifact() throws Exception { + Path source = validPackageFile("package-source.json"); + Path planFile = tempDir.resolve("rollback-plan.json"); + + CliResult result = run(new CapturingClient(new Eip4HttpResponse(200, "{}")), + "release", "rollback-plan", + "--package-file", source.toString(), + "--output", planFile.toString()); + + assertEquals(0, result.code()); + JsonNode plan = objectMapper.readTree(Files.readString(planFile)); + assertEquals("EIP4_ROLLBACK_PLAN", plan.path("type").asText()); + assertEquals("PLAN_ONLY", plan.path("mode").asText()); + assertEquals("aipkg-1", plan.path("packageId").asText()); + assertTrue(plan.path("requiresHumanApproval").asBoolean()); + assertEquals(1, plan.path("rollbackSqlStatements").size()); + assertTrue(plan.path("policy").asText().contains("does not execute SQL")); + assertTrue(result.out().contains("Wrote rollback plan")); + } + + @Test + void releaseRollbackPlanBlocksRollbackPlaceholders() throws Exception { + Path source = packageFile("package-with-rollback-placeholder.json", "aipkg-placeholder", + "insert into sys_page_schema values ('x')", + "delete from sys_page_schema where id = '${pageSchemaId}'"); + Path planFile = tempDir.resolve("rollback-plan.json"); + + CliResult result = run(new CapturingClient(new Eip4HttpResponse(200, "{}")), + "release", "rollback-plan", + "--package-file", source.toString(), + "--output", planFile.toString()); + + assertEquals(2, result.code()); + assertTrue(result.err().contains("Rollback plan FAILED")); + assertTrue(result.err().contains("rollbackSqlStatements 仍包含")); + } + private Path validPackageFile(String name) throws Exception { + return packageFile(name, "aipkg-1", + "insert into sys_page_schema values ('x')", + "delete from sys_page_schema where id = 'x'"); + } + + private Path packageFile(String name, String packageId, String sql, String rollbackSql) throws Exception { Path file = tempDir.resolve(name); Files.writeString(file, """ { - "id": "aipkg-1", + "id": "%s", "deploymentPackage": { "taskId": "ait-1", "changeSetId": "aics-1", "status": "READY_FOR_HUMAN_REVIEW", "requiresHumanApproval": true, - "sqlStatements": ["insert into sys_page_schema values ('x')"], - "rollbackSqlStatements": ["delete from sys_page_schema where id = 'x'"], + "sqlStatements": [%s], + "rollbackSqlStatements": [%s], "warnings": [], "runEvidence": [ {"runType": "LOCAL_APPLY", "status": "PASSED"}, @@ -335,7 +404,8 @@ class Eip4CliTest { ] } } - """, StandardCharsets.UTF_8); + """.formatted(packageId, objectMapper.writeValueAsString(sql), + objectMapper.writeValueAsString(rollbackSql)), StandardCharsets.UTF_8); return file; } From 5eb95a4ef49916b7261bb91121ef287606f8720b Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 08:39:51 +0800 Subject: [PATCH 07/53] feat: add typed page schema registry --- README.md | 6 ++ docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md | 11 +- docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md | 10 ++ docs/skills/eip4-ai-feature-development.md | 14 ++- .../schema/PageComponentDefinition.java | 10 ++ .../schema/PageComponentRegistry.java | 87 +++++++++++++++ .../metadata/schema/TypedPageSchemaIssue.java | 4 + .../schema/TypedPageSchemaReport.java | 12 +++ .../schema/TypedPageSchemaValidator.java | 100 ++++++++++++++++++ .../metadata/web/PageSchemaController.java | 49 +++++++++ .../schema/TypedPageSchemaValidatorTest.java | 67 ++++++++++++ .../web/PageSchemaControllerTest.java | 40 +++++++ 12 files changed, 408 insertions(+), 2 deletions(-) create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/schema/PageComponentDefinition.java create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/schema/PageComponentRegistry.java create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaIssue.java create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaReport.java create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidator.java create mode 100644 platform-metadata/src/test/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidatorTest.java diff --git a/README.md b/README.md index 34fabf1..ab44435 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,12 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release export --p java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release import-preview --package-file target/ai-runs/package.eip4pkg.json java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release diff --left target/ai-runs/package-old.json --right target/ai-runs/package.json java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar release rollback-plan --package-file target/ai-runs/package.eip4pkg.json --output target/ai-runs/rollback-plan.json + +# Typed page schema +curl http://localhost:8084/api/page/schema/components +curl -X POST http://localhost:8084/api/page/schema/validate \ + -H "Content-Type: application/json" \ + --data-binary @target/ai-runs/page-schema.json ``` ## tools/ diff --git a/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md index 8229b92..31791cc 100644 --- a/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md +++ b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md @@ -143,6 +143,8 @@ EIP4 当前已经有实体、页面 schema、服务流、菜单、smoke、部署 ### P4:Typed Page Schema 和组件注册表 +状态:第一版完成。 + 目标: - 借鉴 NocoBase FlowEngine 的“可配置模型”思想,把页面 block、field、action、linkage 抽象为 typed schema。 @@ -154,6 +156,13 @@ EIP4 当前已经有实体、页面 schema、服务流、菜单、smoke、部署 - AI 只能选择注册过的组件和动作 - 设计器变更和 AI 变更能互相接续 +第一版已落地: + +- `GET /api/page/schema/components` 下发组件能力表。 +- `POST /api/page/schema/validate` 做 typed page schema 离线校验。 +- `PUT /api/page/schema/{templateId}/overlay` 保存 overlay 前强制校验组件和 actionType。 +- 当前仍是第一版 registry;后续要继续补 linkage/event/resource 和组件属性级 schema。 + ### P5:多 Agent 协作和 AI 员工 目标: @@ -193,5 +202,5 @@ EIP4 应该借鉴的是边界和流程: | P1 | 第一版完成 | 已新增 `platform-cli` 和 Skills 规范骨架 | | P2 | 第一版完成 | 已新增功能包快照、里程碑 revision、CLI 命令和持久化表 | | P3 | 进行中 | 已完成 env registry/current env/cross-env guard/release verify/export/import-preview/diff/rollback-plan 第一版 | -| P4 | 待开始 | 依赖页面 schema 现状清理 | +| P4 | 第一版完成 | 已新增组件 registry、typed schema validator、校验 API 和 overlay 保存前门禁 | | P5 | 待开始 | 依赖权限、审计、工具白名单成熟 | diff --git a/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md b/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md index d973c2c..305f01e 100644 --- a/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md +++ b/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md @@ -97,12 +97,22 @@ ### P4:Typed UI Registry +状态:第一版完成。 + 目标: - typed page schema - component/action/event registry - AI 只能选择 registry 中允许的组件和动作 +第一版已落地: + +- `PageComponentRegistry` 提供页面组件能力表,当前覆盖 page/crud/form/operation/button、常用 layout/display 和字段组件。 +- `TypedPageSchemaValidator` 校验根节点、已注册组件和 actionType 能力。 +- `GET /api/page/schema/components` 返回组件能力表。 +- `POST /api/page/schema/validate` 离线校验页面 schema,不写库。 +- `PUT /api/page/schema/{templateId}/overlay` 保存前会先跑 typed schema 校验,未注册组件或不支持 action 会被 400 阻断。 + ### P5:AI tools/skills/employee/ACL 目标: diff --git a/docs/skills/eip4-ai-feature-development.md b/docs/skills/eip4-ai-feature-development.md index bad8dd5..4ba7a44 100644 --- a/docs/skills/eip4-ai-feature-development.md +++ b/docs/skills/eip4-ai-feature-development.md @@ -56,6 +56,19 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai auto-develop \ - `smokeStatus` 为 `PASSED`。 - 最终状态为 `READY_FOR_HUMAN_REVIEW`。 - 部署包存在且 `requiresHumanApproval=true`。 +- 页面 schema 只能使用组件能力表中注册的组件和动作。 + +## 页面 schema 校验 + +```bash +curl http://localhost:8084/api/page/schema/components + +curl -X POST http://localhost:8084/api/page/schema/validate \ + -H "Content-Type: application/json" \ + --data-binary @target/ai-runs/page-schema.json +``` + +设计器保存 overlay 时也会执行同一套 typed schema 校验;未注册组件或不支持的 `actionType` 会被拒绝。 ## 失败处理 @@ -63,4 +76,3 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai auto-develop \ 2. 如果自动修复已尝试但失败,基于 evidence 修改本地代码或元数据生成逻辑。 3. 重新运行本地 auto-develop。 4. 不直接连接线上库修复。 - diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/PageComponentDefinition.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/PageComponentDefinition.java new file mode 100644 index 0000000..1996950 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/PageComponentDefinition.java @@ -0,0 +1,10 @@ +package com.eip4.platform.metadata.schema; + +import java.util.List; + +public record PageComponentDefinition( + String type, + String category, + List capabilities, + List allowedActions) { +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/PageComponentRegistry.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/PageComponentRegistry.java new file mode 100644 index 0000000..abc245f --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/PageComponentRegistry.java @@ -0,0 +1,87 @@ +package com.eip4.platform.metadata.schema; + +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +public final class PageComponentRegistry { + + public static final int VERSION = 1; + + private final Map components; + + private PageComponentRegistry(Map components) { + this.components = Collections.unmodifiableMap(new LinkedHashMap<>(components)); + } + + public static PageComponentRegistry defaults() { + Map map = new LinkedHashMap<>(); + register(map, "page", "layout", List.of("page-root"), List.of()); + register(map, "crud", "data", List.of("list", "pagination", "toolbar", "columns"), List.of()); + register(map, "form", "data", List.of("submit", "validation", "api"), List.of("submit", "reset")); + register(map, "operation", "data", List.of("row-actions"), List.of()); + register(map, "service", "data", List.of("remote-schema", "remote-data"), List.of()); + register(map, "button", "action", List.of("dialog", "ajax", "drawer", "link", "reload"), List.of( + "ajax", "dialog", "drawer", "link", "url", "reload", "submit", "reset", "cancel", "copy", + "download", "toast", "confirm")); + register(map, "tpl", "display", List.of("template-text"), List.of()); + register(map, "static", "display", List.of("readonly"), List.of()); + register(map, "static-text", "display", List.of("readonly"), List.of()); + register(map, "wrapper", "layout", List.of("container"), List.of()); + register(map, "container", "layout", List.of("container"), List.of()); + register(map, "grid", "layout", List.of("columns"), List.of()); + register(map, "hbox", "layout", List.of("columns"), List.of()); + register(map, "group", "layout", List.of("form-group"), List.of()); + register(map, "input-text", "field", List.of("text", "required"), List.of()); + register(map, "textarea", "field", List.of("text", "multiline", "required"), List.of()); + register(map, "input-password", "field", List.of("password", "required"), List.of()); + register(map, "input-number", "field", List.of("number", "required"), List.of()); + register(map, "input-date", "field", List.of("date", "required"), List.of()); + register(map, "input-datetime", "field", List.of("datetime", "required"), List.of()); + register(map, "input-time", "field", List.of("time", "required"), List.of()); + register(map, "input-month", "field", List.of("month", "required"), List.of()); + register(map, "input-quarter", "field", List.of("quarter", "required"), List.of()); + register(map, "input-year", "field", List.of("year", "required"), List.of()); + register(map, "switch", "field", List.of("boolean"), List.of()); + register(map, "checkbox", "field", List.of("boolean"), List.of()); + register(map, "checkboxes", "field", List.of("multi-option"), List.of()); + register(map, "radios", "field", List.of("single-option"), List.of()); + register(map, "select", "field", List.of("single-option", "remote-options"), List.of()); + register(map, "picker", "field", List.of("dialog-picker", "remote-options"), List.of()); + register(map, "input-tree", "field", List.of("tree-options"), List.of()); + register(map, "input-tag", "field", List.of("tags"), List.of()); + register(map, "input-color", "field", List.of("color"), List.of()); + register(map, "input-file", "field", List.of("upload"), List.of()); + register(map, "input-image", "field", List.of("image-upload"), List.of()); + register(map, "input-table", "field", List.of("editable-table"), List.of()); + register(map, "hidden", "field", List.of("hidden-value"), List.of()); + return new PageComponentRegistry(map); + } + + public boolean supportsComponent(String type) { + return components.containsKey(type); + } + + public boolean supportsAction(String componentType, String actionType) { + PageComponentDefinition definition = components.get(componentType); + return definition != null && definition.allowedActions().contains(actionType); + } + + public Map components() { + return components; + } + + public Map toResponse() { + Map data = new LinkedHashMap<>(); + data.put("schemaVersion", VERSION); + data.put("components", components.values()); + return data; + } + + private static void register(Map map, String type, String category, + List capabilities, List allowedActions) { + map.put(type, new PageComponentDefinition(type, category, List.copyOf(capabilities), + List.copyOf(allowedActions))); + } +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaIssue.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaIssue.java new file mode 100644 index 0000000..5731827 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaIssue.java @@ -0,0 +1,4 @@ +package com.eip4.platform.metadata.schema; + +public record TypedPageSchemaIssue(String path, String code, String message) { +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaReport.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaReport.java new file mode 100644 index 0000000..a9f6893 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaReport.java @@ -0,0 +1,12 @@ +package com.eip4.platform.metadata.schema; + +import java.util.List; +import java.util.Set; + +public record TypedPageSchemaReport( + int schemaVersion, + boolean valid, + List issues, + Set usedComponents, + Set usedActions) { +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidator.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidator.java new file mode 100644 index 0000000..fd144a4 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidator.java @@ -0,0 +1,100 @@ +package com.eip4.platform.metadata.schema; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +import com.fasterxml.jackson.core.JacksonException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +public final class TypedPageSchemaValidator { + + private final ObjectMapper objectMapper; + private final PageComponentRegistry registry; + + public TypedPageSchemaValidator(ObjectMapper objectMapper, PageComponentRegistry registry) { + this.objectMapper = objectMapper; + this.registry = registry; + } + + public static TypedPageSchemaValidator defaults() { + return new TypedPageSchemaValidator(new ObjectMapper(), PageComponentRegistry.defaults()); + } + + public TypedPageSchemaReport validate(String schemaJson) { + List issues = new ArrayList<>(); + Set usedComponents = new LinkedHashSet<>(); + Set usedActions = new LinkedHashSet<>(); + JsonNode root; + try { + root = objectMapper.readTree(schemaJson); + } catch (JacksonException ex) { + issues.add(new TypedPageSchemaIssue("$", "INVALID_JSON", "schema 不是合法 JSON: " + ex.getOriginalMessage())); + return report(issues, usedComponents, usedActions); + } + if (root == null || !root.isObject()) { + issues.add(new TypedPageSchemaIssue("$", "ROOT_NOT_OBJECT", "页面 schema 根节点必须是 JSON object")); + return report(issues, usedComponents, usedActions); + } + if (!"page".equals(root.path("type").asText(""))) { + issues.add(new TypedPageSchemaIssue("$.type", "ROOT_TYPE_NOT_PAGE", "页面 schema 根节点 type 必须是 page")); + } + visit(root, "$", issues, usedComponents, usedActions); + return report(issues, usedComponents, usedActions); + } + + private void visit(JsonNode node, String path, List issues, + Set usedComponents, Set usedActions) { + if (node.isObject()) { + validateObject(node, path, issues, usedComponents, usedActions); + node.properties().forEach(entry -> visit(entry.getValue(), childPath(path, entry.getKey()), + issues, usedComponents, usedActions)); + return; + } + if (node.isArray()) { + for (int i = 0; i < node.size(); i++) { + visit(node.get(i), path + "[" + i + "]", issues, usedComponents, usedActions); + } + } + } + + private void validateObject(JsonNode node, String path, List issues, + Set usedComponents, Set usedActions) { + String componentType = node.path("type").asText(""); + if (!componentType.isBlank()) { + usedComponents.add(componentType); + if (!registry.supportsComponent(componentType)) { + issues.add(new TypedPageSchemaIssue(path + ".type", "UNSUPPORTED_COMPONENT", + "组件未注册: " + componentType)); + } + } + String actionType = node.path("actionType").asText(""); + if (!actionType.isBlank()) { + usedActions.add(actionType); + if (componentType.isBlank()) { + issues.add(new TypedPageSchemaIssue(path + ".actionType", "ACTION_WITHOUT_COMPONENT", + "actionType 必须绑定到有 type 的组件")); + } else if (!registry.supportsAction(componentType, actionType)) { + issues.add(new TypedPageSchemaIssue(path + ".actionType", "UNSUPPORTED_ACTION", + "组件 " + componentType + " 不支持 actionType: " + actionType)); + } + } + } + + private TypedPageSchemaReport report(List issues, Set usedComponents, + Set usedActions) { + return new TypedPageSchemaReport(PageComponentRegistry.VERSION, issues.isEmpty(), List.copyOf(issues), + Collections.unmodifiableSet(new LinkedHashSet<>(usedComponents)), + Collections.unmodifiableSet(new LinkedHashSet<>(usedActions))); + } + + private String childPath(String path, String field) { + if (field.matches("[A-Za-z_][A-Za-z0-9_]*")) { + return path + "." + field; + } + return path + "['" + field.replace("'", "\\'") + "']"; + } +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java index 0eb90d3..3ab7260 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java @@ -19,6 +19,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -28,6 +29,9 @@ import org.springframework.web.server.ResponseStatusException; import com.dsasp.server.common.user.service.LoggedInUser; import com.dsasp.server.common.util.UserSession; +import com.eip4.platform.metadata.schema.PageComponentRegistry; +import com.eip4.platform.metadata.schema.TypedPageSchemaReport; +import com.eip4.platform.metadata.schema.TypedPageSchemaValidator; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -66,9 +70,35 @@ public class PageSchemaController { public static final String HEADER_SCHEMA_LAYER = "X-Schema-Layer"; private final JdbcTemplate jdbcTemplate; + private final PageComponentRegistry componentRegistry; + private final TypedPageSchemaValidator typedSchemaValidator; public PageSchemaController(JdbcTemplate jdbcTemplate) { + this(jdbcTemplate, PageComponentRegistry.defaults()); + } + + PageSchemaController(JdbcTemplate jdbcTemplate, PageComponentRegistry componentRegistry) { this.jdbcTemplate = jdbcTemplate; + this.componentRegistry = componentRegistry; + this.typedSchemaValidator = new TypedPageSchemaValidator(SCHEMA_MAPPER, componentRegistry); + } + + @Operation(summary = "查询 typed page schema 组件能力表", + description = "AI Agent 和设计器共用;未注册组件不能保存为 overlay。") + @GetMapping("/api/page/schema/components") + public ResponseEntity> components() { + return ResponseEntity.ok(ok("component registry", componentRegistry.toResponse())); + } + + @Operation(summary = "校验 typed page schema", + description = "校验根类型、组件注册和 actionType 能力;不写库。") + @PostMapping("/api/page/schema/validate") + public ResponseEntity> validateSchema(@RequestBody String schemaJsonRaw) { + TypedPageSchemaReport report = typedSchemaValidator.validate(schemaJsonRaw == null ? "" : schemaJsonRaw); + if (!report.valid()) { + return ResponseEntity.badRequest().body(fail("typed schema 校验失败", validationData(report))); + } + return ResponseEntity.ok(ok("typed schema 校验通过", validationData(report))); } // ================================================================ GET 读取 @@ -139,6 +169,10 @@ public class PageSchemaController { if (schemaJsonRaw == null || schemaJsonRaw.isBlank()) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "请求体不能为空"); } + TypedPageSchemaReport validation = typedSchemaValidator.validate(schemaJsonRaw); + if (!validation.valid()) { + return ResponseEntity.badRequest().body(fail("typed schema 校验失败", validationData(validation))); + } // 计算 overlay etag String overlayEtag = sha256(schemaJsonRaw); @@ -335,9 +369,24 @@ public class PageSchemaController { } private static Map fail(String msg) { + return fail(msg, null); + } + + private static Map fail(String msg, Map data) { Map r = new LinkedHashMap<>(); r.put("status", 1); r.put("msg", msg); + if (data != null) r.put("data", data); return r; } + + private static Map validationData(TypedPageSchemaReport report) { + Map data = new LinkedHashMap<>(); + data.put("schemaVersion", report.schemaVersion()); + data.put("valid", report.valid()); + data.put("issues", report.issues()); + data.put("usedComponents", report.usedComponents()); + data.put("usedActions", report.usedActions()); + return data; + } } diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidatorTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidatorTest.java new file mode 100644 index 0000000..bc8021d --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidatorTest.java @@ -0,0 +1,67 @@ +package com.eip4.platform.metadata.schema; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +class TypedPageSchemaValidatorTest { + + private final TypedPageSchemaValidator validator = TypedPageSchemaValidator.defaults(); + + @Test + void acceptsRegisteredCrudFormAndButtonActions() { + TypedPageSchemaReport report = validator.validate(""" + { + "type": "page", + "body": [{ + "type": "crud", + "columns": [{ + "type": "operation", + "buttons": [ + {"type": "button", "actionType": "dialog", "dialog": {"body": {"type": "form"}}}, + {"type": "button", "actionType": "ajax"} + ] + }] + }] + } + """); + + assertTrue(report.valid()); + assertTrue(report.usedComponents().contains("crud")); + assertTrue(report.usedActions().contains("dialog")); + assertTrue(report.usedActions().contains("ajax")); + } + + @Test + void rejectsUnsupportedComponent() { + TypedPageSchemaReport report = validator.validate(""" + {"type":"page","body":{"type":"unknown-widget"}} + """); + + assertFalse(report.valid()); + assertEquals("UNSUPPORTED_COMPONENT", report.issues().get(0).code()); + assertTrue(report.issues().get(0).path().contains("$.body.type")); + } + + @Test + void rejectsUnsupportedActionForComponent() { + TypedPageSchemaReport report = validator.validate(""" + {"type":"page","body":{"type":"form","actionType":"dialog"}} + """); + + assertFalse(report.valid()); + assertEquals("UNSUPPORTED_ACTION", report.issues().get(0).code()); + } + + @Test + void requiresPageRoot() { + TypedPageSchemaReport report = validator.validate(""" + {"type":"crud"} + """); + + assertFalse(report.valid()); + assertEquals("ROOT_TYPE_NOT_PAGE", report.issues().get(0).code()); + } +} diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerTest.java index c8e822e..c7113c3 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerTest.java @@ -353,6 +353,46 @@ class PageSchemaControllerTest { assertTrue(hash.matches("[0-9a-f]{64}")); } + @Test + @DisplayName("18. 组件能力表端点返回 schemaVersion 和已注册组件") + void componentRegistryEndpoint() { + PageSchemaController c = new PageSchemaController(mock(JdbcTemplate.class)); + + var resp = c.components(); + + assertEquals(HttpStatus.OK, resp.getStatusCode()); + assertEquals(0, resp.getBody().get("status")); + assertTrue(resp.getBody().toString().contains("schemaVersion")); + assertTrue(resp.getBody().toString().contains("crud")); + } + + @Test + @DisplayName("19. typed schema 校验端点拒绝未注册组件") + void validateSchemaRejectsUnsupportedComponent() { + PageSchemaController c = new PageSchemaController(mock(JdbcTemplate.class)); + + var resp = c.validateSchema("{\"type\":\"page\",\"body\":{\"type\":\"evil-widget\"}}"); + + assertEquals(HttpStatus.BAD_REQUEST, resp.getStatusCode()); + assertEquals(1, resp.getBody().get("status")); + assertTrue(resp.getBody().toString().contains("UNSUPPORTED_COMPONENT")); + } + + @Test + @DisplayName("20. PUT overlay 先做 typed schema 校验,失败时不写库") + void putOverlayRejectsUnsupportedComponentBeforeWrite() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + PageSchemaController c = new PageSchemaController(jdbc); + setAdminSession(); + + var resp = c.putOverlay(TID, "{\"type\":\"page\",\"body\":{\"type\":\"evil-widget\"}}"); + + assertEquals(HttpStatus.BAD_REQUEST, resp.getStatusCode()); + assertTrue(resp.getBody().toString().contains("UNSUPPORTED_COMPONENT")); + verify(jdbc, never()).update(anyString(), any(), any(), any(), any(), any(), any()); + clearSession(); + } + // ── Session 工具 ───────────────────────────────────────────────────────── private static void setAdminSession() { From 8bdde45e89dd081e33d003b84e838f78383e9ac6 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 08:45:56 +0800 Subject: [PATCH 08/53] feat: add AI tool access registry --- README.md | 7 + docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md | 11 +- docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md | 13 ++ docs/skills/eip4-ai-feature-development.md | 13 ++ .../ai/model/AiEmployeeDefinition.java | 12 ++ .../ai/model/AiToolAccessDecision.java | 11 ++ .../ai/model/AiToolAccessRequest.java | 11 ++ .../platform/ai/model/AiToolDefinition.java | 13 ++ .../platform/ai/service/AiAgentService.java | 28 +++ .../platform/ai/service/AiToolRegistry.java | 166 ++++++++++++++++++ .../platform/ai/web/AiAgentController.java | 22 +++ .../ai/service/AiToolRegistryTest.java | 68 +++++++ .../ai/web/AiAgentControllerTest.java | 62 +++++++ 13 files changed, 436 insertions(+), 1 deletion(-) create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiEmployeeDefinition.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiToolAccessDecision.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiToolAccessRequest.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/model/AiToolDefinition.java create mode 100644 platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java create mode 100644 platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java diff --git a/README.md b/README.md index ab44435..32d5139 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,13 @@ curl http://localhost:8084/api/page/schema/components curl -X POST http://localhost:8084/api/page/schema/validate \ -H "Content-Type: application/json" \ --data-binary @target/ai-runs/page-schema.json + +# AI tools / employees / ACL +curl http://localhost:8084/api/ai/tools +curl http://localhost:8084/api/ai/employees +curl -X POST http://localhost:8084/api/ai/tools/access-check \ + -H "Content-Type: application/json" \ + -d '{"employeeId":"agent-developer","toolName":"local.apply","grantedScopes":["ai:local:apply"],"targetEnv":"local","productionWrite":false}' ``` ## tools/ diff --git a/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md index 31791cc..8dd12a9 100644 --- a/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md +++ b/docs/AI_AGENT_Nocobase_ADOPTION_PLAN.md @@ -165,6 +165,8 @@ EIP4 当前已经有实体、页面 schema、服务流、菜单、smoke、部署 ### P5:多 Agent 协作和 AI 员工 +状态:第一版完成。 + 目标: - 在平台内提供面向业务用户的 AI 助手能力,而不只是在开发侧使用 Agent。 @@ -182,6 +184,13 @@ EIP4 当前已经有实体、页面 schema、服务流、菜单、smoke、部署 - 每个 Agent 有独立权限、审计、工具白名单 - 业务侧操作和开发侧操作共用平台审计模型 +第一版已落地: + +- `GET /api/ai/tools` 下发工具注册表和 scope 要求。 +- `GET /api/ai/employees` 下发 AI employee 定义。 +- `POST /api/ai/tools/access-check` 统一检查 employee/tool/scope/targetEnv/productionWrite。 +- 生产写默认阻断;当前只开放本地开发、校验、smoke、功能包和发布准备工具。 + ## 四、不照搬的部分 NocoBase 是 TypeScript/Yarn workspace/插件包体系。EIP4 是 Java/Spring/Maven,并且必须兼容 EIP3 的实体、服务流和 XML 模板迁移路径。直接照搬 NocoBase 插件运行时会引入过高迁移成本。 @@ -203,4 +212,4 @@ EIP4 应该借鉴的是边界和流程: | P2 | 第一版完成 | 已新增功能包快照、里程碑 revision、CLI 命令和持久化表 | | P3 | 进行中 | 已完成 env registry/current env/cross-env guard/release verify/export/import-preview/diff/rollback-plan 第一版 | | P4 | 第一版完成 | 已新增组件 registry、typed schema validator、校验 API 和 overlay 保存前门禁 | -| P5 | 待开始 | 依赖权限、审计、工具白名单成熟 | +| P5 | 第一版完成 | 已新增 AI tool registry、AI employee registry 和 access-check 门禁 | diff --git a/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md b/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md index 305f01e..c649b0a 100644 --- a/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md +++ b/docs/AI_AGENT_Nocobase_SOURCE_REVIEW.md @@ -115,9 +115,22 @@ ### P5:AI tools/skills/employee/ACL +状态:第一版完成。 + 目标: - AI tool registry +- AI employee registry +- ACL/scope check +- 生产写默认阻断 + +第一版已落地: + +- `AiToolRegistry` 注册工具、操作入口、所需 scope、本地限定和生产写边界。 +- `GET /api/ai/tools` 返回 AI 工具注册表。 +- `GET /api/ai/employees` 返回 AI employee 定义。 +- `POST /api/ai/tools/access-check` 只做权限判定,不执行工具;`local.apply` 等本地工具在 prod target 会被阻断。 +- 当前所有工具都不允许生产写;线上部署仍由人工拿发布包执行。 - Skills CLI check/update - AI Agent 权限和审计 - MCP 工具白名单 diff --git a/docs/skills/eip4-ai-feature-development.md b/docs/skills/eip4-ai-feature-development.md index 4ba7a44..3da372f 100644 --- a/docs/skills/eip4-ai-feature-development.md +++ b/docs/skills/eip4-ai-feature-development.md @@ -70,6 +70,19 @@ curl -X POST http://localhost:8084/api/page/schema/validate \ 设计器保存 overlay 时也会执行同一套 typed schema 校验;未注册组件或不支持的 `actionType` 会被拒绝。 +## AI 工具权限检查 + +```bash +curl http://localhost:8084/api/ai/tools +curl http://localhost:8084/api/ai/employees + +curl -X POST http://localhost:8084/api/ai/tools/access-check \ + -H "Content-Type: application/json" \ + -d '{"employeeId":"agent-developer","toolName":"local.apply","grantedScopes":["ai:local:apply"],"targetEnv":"local","productionWrite":false}' +``` + +本地 apply、smoke 等工具只允许本地目标;生产写默认被阻断,线上部署仍走人工发布。 + ## 失败处理 1. 查看输出 JSON 中的 apply/smoke/repair evidence。 diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiEmployeeDefinition.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiEmployeeDefinition.java new file mode 100644 index 0000000..c517066 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiEmployeeDefinition.java @@ -0,0 +1,12 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiEmployeeDefinition( + String id, + String name, + String role, + List toolNames, + List requiredScopes, + List policies) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiToolAccessDecision.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiToolAccessDecision.java new file mode 100644 index 0000000..75aa048 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiToolAccessDecision.java @@ -0,0 +1,11 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiToolAccessDecision( + boolean allowed, + List missingScopes, + List blockers, + AiToolDefinition tool, + AiEmployeeDefinition employee) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiToolAccessRequest.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiToolAccessRequest.java new file mode 100644 index 0000000..3cd0bb7 --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiToolAccessRequest.java @@ -0,0 +1,11 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiToolAccessRequest( + String employeeId, + String toolName, + List grantedScopes, + String targetEnv, + boolean productionWrite) { +} diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiToolDefinition.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiToolDefinition.java new file mode 100644 index 0000000..bd7915f --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiToolDefinition.java @@ -0,0 +1,13 @@ +package com.eip4.platform.ai.model; + +import java.util.List; + +public record AiToolDefinition( + String name, + String category, + String description, + List operations, + List requiredScopes, + boolean localOnly, + boolean productionWriteAllowed) { +} 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 492810e..613ec4c 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 @@ -18,6 +18,7 @@ import java.util.regex.Pattern; import javax.xml.parsers.DocumentBuilderFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.web.server.ResponseStatusException; @@ -50,6 +51,10 @@ import com.eip4.platform.ai.model.AiRunRecord; import com.eip4.platform.ai.model.AiSmokeResult; import com.eip4.platform.ai.model.AiSmokeRun; import com.eip4.platform.ai.model.AiTask; +import com.eip4.platform.ai.model.AiToolAccessDecision; +import com.eip4.platform.ai.model.AiToolAccessRequest; +import com.eip4.platform.ai.model.AiToolDefinition; +import com.eip4.platform.ai.model.AiEmployeeDefinition; import com.eip4.platform.ai.store.AiAgentStore; import com.eip4.platform.converter.SchemaGate; import com.fasterxml.jackson.core.JsonProcessingException; @@ -75,19 +80,30 @@ public class AiAgentService { private final AiLocalReleaseExecutor localReleaseExecutor; private final AiAgentRepairExecutor agentRepairExecutor; private final ObjectMapper objectMapper; + private final AiToolRegistry toolRegistry; private static volatile SchemaGate sharedSchemaGate; private volatile SchemaGate schemaGate; + @Autowired public AiAgentService(AiAgentStore store, AiFeatureDraftGenerator featureDraftGenerator, AiSmokeRunner smokeRunner, AiLocalReleaseExecutor localReleaseExecutor, AiAgentRepairExecutor agentRepairExecutor, ObjectMapper objectMapper) { + this(store, featureDraftGenerator, smokeRunner, localReleaseExecutor, agentRepairExecutor, + objectMapper, AiToolRegistry.defaults()); + } + + AiAgentService(AiAgentStore store, AiFeatureDraftGenerator featureDraftGenerator, + AiSmokeRunner smokeRunner, AiLocalReleaseExecutor localReleaseExecutor, + AiAgentRepairExecutor agentRepairExecutor, ObjectMapper objectMapper, + AiToolRegistry toolRegistry) { this.store = store; this.featureDraftGenerator = featureDraftGenerator; this.smokeRunner = smokeRunner; this.localReleaseExecutor = localReleaseExecutor; this.agentRepairExecutor = agentRepairExecutor; this.objectMapper = objectMapper; + this.toolRegistry = toolRegistry; } public AiTask createTask(String objective) { @@ -695,6 +711,18 @@ public class AiAgentService { return resp; } + public List listTools() { + return toolRegistry.tools(); + } + + public List listEmployees() { + return toolRegistry.employees(); + } + + public AiToolAccessDecision checkToolAccess(AiToolAccessRequest request) { + return toolRegistry.check(request); + } + private AiArtifactType parseType(String type) { if (type == null || type.isBlank()) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "artifactType 不能为空"); diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java new file mode 100644 index 0000000..d15e4fd --- /dev/null +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java @@ -0,0 +1,166 @@ +package com.eip4.platform.ai.service; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + +import com.eip4.platform.ai.model.AiEmployeeDefinition; +import com.eip4.platform.ai.model.AiToolAccessDecision; +import com.eip4.platform.ai.model.AiToolAccessRequest; +import com.eip4.platform.ai.model.AiToolDefinition; + +public final class AiToolRegistry { + + private final Map tools; + private final Map employees; + + private AiToolRegistry(Map tools, Map employees) { + this.tools = Collections.unmodifiableMap(new LinkedHashMap<>(tools)); + this.employees = Collections.unmodifiableMap(new LinkedHashMap<>(employees)); + } + + public static AiToolRegistry defaults() { + Map tools = new LinkedHashMap<>(); + registerTool(tools, "feature.draft.generate", "development", + "Generate entity, page schema, serviceflow, menu and smoke drafts.", + List.of("POST /api/ai/features/develop", "POST /api/ai/features/auto-develop"), + List.of("ai:feature:draft"), false, false); + registerTool(tools, "schema.validate", "validation", + "Validate AMIS and typed page schema before saving or packaging.", + List.of("POST /api/ai/tools/validate-schema", "POST /api/page/schema/validate"), + List.of("ai:schema:validate"), false, false); + registerTool(tools, "local.apply", "local-gate", + "Apply a change set to a local EIP4 environment only.", + List.of("POST /api/ai/tasks/{taskId}/change-sets/{changeSetId}/local-apply"), + List.of("ai:local:apply"), true, false); + registerTool(tools, "smoke.run", "local-gate", + "Run local smoke checks against a local EIP4 baseUrl.", + List.of("POST /api/ai/tasks/{taskId}/change-sets/{changeSetId}/smoke"), + List.of("ai:smoke:run"), true, false); + registerTool(tools, "feature.package", "release-prep", + "Create feature packages, revisions and release evidence for human review.", + List.of("POST /api/ai/tasks/{taskId}/change-sets/{changeSetId}/feature-package", + "POST /api/ai/tasks/{taskId}/feature-packages/{packageId}/revisions"), + List.of("ai:package:create"), false, false); + registerTool(tools, "release.prepare", "release-prep", + "Export, verify, diff and prepare rollback plans without production execution.", + List.of("eip4 release verify", "eip4 release export", "eip4 release diff", + "eip4 release rollback-plan"), + List.of("ai:release:prepare"), false, false); + + Map employees = new LinkedHashMap<>(); + registerEmployee(employees, "agent-developer", "Agent Developer", + "Develops EIP4 feature packages in local environments.", + List.of("feature.draft.generate", "schema.validate", "local.apply", "smoke.run", + "feature.package", "release.prepare"), + List.of("ai:feature:draft", "ai:schema:validate", "ai:local:apply", "ai:smoke:run", + "ai:package:create", "ai:release:prepare"), + List.of("Local apply only", "Production deployment requires human operator")); + registerEmployee(employees, "release-auditor", "Release Auditor", + "Reviews packages, diffs and rollback plans before human deployment.", + List.of("schema.validate", "feature.package", "release.prepare"), + List.of("ai:schema:validate", "ai:package:create", "ai:release:prepare"), + List.of("Read-only release preparation", "No environment writes")); + registerEmployee(employees, "support-diagnoser", "Support Diagnoser", + "Reads run evidence and prepares repair plans for local reproduction.", + List.of("schema.validate", "smoke.run"), + List.of("ai:schema:validate", "ai:smoke:run"), + List.of("Local diagnostics only")); + return new AiToolRegistry(tools, employees); + } + + public List tools() { + return List.copyOf(tools.values()); + } + + public List employees() { + return List.copyOf(employees.values()); + } + + public AiToolAccessDecision check(AiToolAccessRequest request) { + String employeeId = text(request == null ? null : request.employeeId()); + String toolName = text(request == null ? null : request.toolName()); + AiEmployeeDefinition employee = employees.get(employeeId); + AiToolDefinition tool = tools.get(toolName); + List blockers = new ArrayList<>(); + if (employee == null) { + blockers.add("Unknown AI employee: " + employeeId); + } + if (tool == null) { + blockers.add("Unknown AI tool: " + toolName); + } + if (employee == null || tool == null) { + return new AiToolAccessDecision(false, List.of(), List.copyOf(blockers), tool, employee); + } + if (!employee.toolNames().contains(tool.name())) { + blockers.add("Employee " + employee.id() + " is not allowed to use tool " + tool.name()); + } + Set granted = new LinkedHashSet<>(request.grantedScopes() == null + ? List.of() : request.grantedScopes()); + List missingScopes = new ArrayList<>(); + for (String scope : tool.requiredScopes()) { + if (!granted.contains(scope)) { + missingScopes.add(scope); + } + } + for (String scope : employee.requiredScopes()) { + if (tool.requiredScopes().contains(scope) && !granted.contains(scope) && !missingScopes.contains(scope)) { + missingScopes.add(scope); + } + } + if (!missingScopes.isEmpty()) { + blockers.add("Missing scopes: " + String.join(",", missingScopes)); + } + String targetEnv = text(request.targetEnv()).toLowerCase(Locale.ROOT); + if (tool.localOnly() && !isLocalEnv(targetEnv)) { + blockers.add("Tool " + tool.name() + " is local-only, targetEnv=" + targetEnv); + } + if (request.productionWrite() || isProductionEnv(targetEnv)) { + if (!tool.productionWriteAllowed()) { + blockers.add("Tool " + tool.name() + " is not allowed to perform production writes"); + } + if (!granted.contains("human:approval")) { + blockers.add("Production write requires human:approval scope"); + } + } + return new AiToolAccessDecision(blockers.isEmpty(), List.copyOf(missingScopes), List.copyOf(blockers), + tool, employee); + } + + private static void registerTool(Map tools, String name, String category, + String description, List operations, List requiredScopes, + boolean localOnly, boolean productionWriteAllowed) { + tools.put(name, new AiToolDefinition(name, category, description, List.copyOf(operations), + List.copyOf(requiredScopes), localOnly, productionWriteAllowed)); + } + + private static void registerEmployee(Map employees, String id, String name, + String role, List toolNames, List requiredScopes, + List policies) { + employees.put(id, new AiEmployeeDefinition(id, name, role, List.copyOf(toolNames), + List.copyOf(requiredScopes), List.copyOf(policies))); + } + + private static boolean isLocalEnv(String targetEnv) { + return targetEnv.isBlank() + || targetEnv.equals("local") + || targetEnv.equals("dev") + || targetEnv.startsWith("localhost") + || targetEnv.startsWith("127.0.0.1") + || targetEnv.startsWith("http://localhost") + || targetEnv.startsWith("http://127.0.0.1"); + } + + private static boolean isProductionEnv(String targetEnv) { + return targetEnv.equals("prod") || targetEnv.equals("production") || targetEnv.contains("prod"); + } + + private static String text(String value) { + return value == null ? "" : value.trim(); + } +} 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 26864e3..4697e69 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 @@ -28,6 +28,10 @@ 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; +import com.eip4.platform.ai.model.AiToolAccessDecision; +import com.eip4.platform.ai.model.AiToolAccessRequest; +import com.eip4.platform.ai.model.AiToolDefinition; +import com.eip4.platform.ai.model.AiEmployeeDefinition; import com.eip4.platform.ai.service.AiAgentService; import com.fasterxml.jackson.databind.JsonNode; @@ -191,6 +195,24 @@ public class AiAgentController { return service.validateSchema(schema); } + @Operation(summary = "列出 AI 工具注册表", description = "返回工具、操作入口、所需 scope 和生产写边界") + @GetMapping("/tools") + public List tools() { + return service.listTools(); + } + + @Operation(summary = "列出 AI 员工定义", description = "返回 AI employee 可用工具、所需 scope 和策略") + @GetMapping("/employees") + public List employees() { + return service.listEmployees(); + } + + @Operation(summary = "检查 AI 工具访问权限", description = "只做权限判定,不执行工具;生产写默认阻断") + @PostMapping("/tools/access-check") + public AiToolAccessDecision checkToolAccess(@RequestBody(required = false) AiToolAccessRequest request) { + return service.checkToolAccess(request); + } + public record CreateTaskRequest(String objective) { } diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java new file mode 100644 index 0000000..2cf0ac3 --- /dev/null +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java @@ -0,0 +1,68 @@ +package com.eip4.platform.ai.service; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; + +import org.junit.jupiter.api.Test; + +import com.eip4.platform.ai.model.AiToolAccessRequest; + +class AiToolRegistryTest { + + private final AiToolRegistry registry = AiToolRegistry.defaults(); + + @Test + void agentDeveloperCanUseLocalApplyWithScopeInLocalEnv() { + var decision = registry.check(new AiToolAccessRequest( + "agent-developer", + "local.apply", + List.of("ai:local:apply"), + "local", + false)); + + assertTrue(decision.allowed()); + assertTrue(decision.blockers().isEmpty()); + } + + @Test + void localOnlyToolIsBlockedForProductionTarget() { + var decision = registry.check(new AiToolAccessRequest( + "agent-developer", + "local.apply", + List.of("ai:local:apply", "human:approval"), + "prod", + true)); + + assertFalse(decision.allowed()); + assertTrue(decision.blockers().stream().anyMatch(b -> b.contains("local-only"))); + assertTrue(decision.blockers().stream().anyMatch(b -> b.contains("production writes"))); + } + + @Test + void missingScopesAreReported() { + var decision = registry.check(new AiToolAccessRequest( + "release-auditor", + "release.prepare", + List.of(), + "local", + false)); + + assertFalse(decision.allowed()); + assertTrue(decision.missingScopes().contains("ai:release:prepare")); + } + + @Test + void employeeCannotUseUnassignedTool() { + var decision = registry.check(new AiToolAccessRequest( + "support-diagnoser", + "feature.package", + List.of("ai:package:create"), + "local", + false)); + + assertFalse(decision.allowed()); + assertTrue(decision.blockers().stream().anyMatch(b -> b.contains("not allowed"))); + } +} diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java index 70bfaad..80023e4 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java @@ -6,6 +6,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -44,6 +45,10 @@ import com.eip4.platform.ai.model.AiRunRecord; import com.eip4.platform.ai.model.AiSmokeResult; import com.eip4.platform.ai.model.AiSmokeRun; import com.eip4.platform.ai.model.AiTask; +import com.eip4.platform.ai.model.AiToolAccessDecision; +import com.eip4.platform.ai.model.AiToolAccessRequest; +import com.eip4.platform.ai.model.AiToolDefinition; +import com.eip4.platform.ai.model.AiEmployeeDefinition; import com.eip4.platform.ai.service.AiAgentService; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -147,6 +152,63 @@ class AiAgentControllerTest { assertEquals("page", captor.getValue().path("type").asText()); } + @Test + void 工具注册表接口返回工具列表() throws Exception { + when(service.listTools()).thenReturn(List.of(new AiToolDefinition( + "schema.validate", "validation", "validate schema", + List.of("POST /api/page/schema/validate"), + List.of("ai:schema:validate"), false, false))); + + mvc.perform(get("/api/ai/tools")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$[0].name").value("schema.validate")) + .andExpect(jsonPath("$[0].requiredScopes[0]").value("ai:schema:validate")); + + verify(service).listTools(); + } + + @Test + void ai员工接口返回员工定义() throws Exception { + when(service.listEmployees()).thenReturn(List.of(new AiEmployeeDefinition( + "agent-developer", "Agent Developer", "Develops features", + List.of("feature.draft.generate"), + List.of("ai:feature:draft"), + List.of("Local apply only")))); + + mvc.perform(get("/api/ai/employees")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$[0].id").value("agent-developer")) + .andExpect(jsonPath("$[0].toolNames[0]").value("feature.draft.generate")); + + verify(service).listEmployees(); + } + + @Test + void 工具访问检查接口不执行工具只返回判定() throws Exception { + var request = new AiToolAccessRequest("agent-developer", "local.apply", + List.of("ai:local:apply"), "prod", true); + when(service.checkToolAccess(any(AiToolAccessRequest.class))).thenReturn(new AiToolAccessDecision( + false, + List.of(), + List.of("Tool local.apply is not allowed to perform production writes"), + new AiToolDefinition("local.apply", "local-gate", "local apply", + List.of("POST /local-apply"), List.of("ai:local:apply"), true, false), + new AiEmployeeDefinition("agent-developer", "Agent Developer", "Develops features", + List.of("local.apply"), List.of("ai:local:apply"), List.of()))); + + mvc.perform(post("/api/ai/tools/access-check") + .contentType("application/json") + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.allowed").value(false)) + .andExpect(jsonPath("$.blockers[0]").value("Tool local.apply is not allowed to perform production writes")); + + ArgumentCaptor captor = ArgumentCaptor.forClass(AiToolAccessRequest.class); + verify(service).checkToolAccess(captor.capture()); + assertEquals("prod", captor.getValue().targetEnv()); + assertTrue(captor.getValue().productionWrite()); + } + private AiAutoDevelopmentRun autoDevelopmentRun() { AiFeatureDevelopment development = new AiFeatureDevelopment(task(), List.of(draft()), changeSet()); AiReleasePlan releasePlan = new AiReleasePlan("ait-1", "aics-1", "READY", From c5b7b682109a073a338488353eadec872ca3fbe5 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 08:57:59 +0800 Subject: [PATCH 09/53] fix: harden AI tool access check --- .../eip4/platform/ai/service/AiToolRegistry.java | 10 ++++++---- .../platform/ai/service/AiToolRegistryTest.java | 9 +++++++++ .../platform/ai/web/AiAgentControllerTest.java | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java index d15e4fd..eb83e01 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java @@ -100,8 +100,9 @@ public final class AiToolRegistry { if (!employee.toolNames().contains(tool.name())) { blockers.add("Employee " + employee.id() + " is not allowed to use tool " + tool.name()); } - Set granted = new LinkedHashSet<>(request.grantedScopes() == null - ? List.of() : request.grantedScopes()); + List requestScopes = request == null || request.grantedScopes() == null + ? List.of() : request.grantedScopes(); + Set granted = new LinkedHashSet<>(requestScopes); List missingScopes = new ArrayList<>(); for (String scope : tool.requiredScopes()) { if (!granted.contains(scope)) { @@ -116,11 +117,12 @@ public final class AiToolRegistry { if (!missingScopes.isEmpty()) { blockers.add("Missing scopes: " + String.join(",", missingScopes)); } - String targetEnv = text(request.targetEnv()).toLowerCase(Locale.ROOT); + String targetEnv = text(request == null ? null : request.targetEnv()).toLowerCase(Locale.ROOT); if (tool.localOnly() && !isLocalEnv(targetEnv)) { blockers.add("Tool " + tool.name() + " is local-only, targetEnv=" + targetEnv); } - if (request.productionWrite() || isProductionEnv(targetEnv)) { + boolean productionWrite = request != null && request.productionWrite(); + if (productionWrite || isProductionEnv(targetEnv)) { if (!tool.productionWriteAllowed()) { blockers.add("Tool " + tool.name() + " is not allowed to perform production writes"); } diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java index 2cf0ac3..5f7d3b6 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java @@ -65,4 +65,13 @@ class AiToolRegistryTest { assertFalse(decision.allowed()); assertTrue(decision.blockers().stream().anyMatch(b -> b.contains("not allowed"))); } + + @Test + void nullRequestIsRejectedWithoutException() { + var decision = registry.check(null); + + assertFalse(decision.allowed()); + assertTrue(decision.blockers().stream().anyMatch(b -> b.contains("Unknown AI employee"))); + assertTrue(decision.blockers().stream().anyMatch(b -> b.contains("Unknown AI tool"))); + } } diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java index 80023e4..d83fe6a 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java @@ -209,6 +209,20 @@ class AiAgentControllerTest { assertTrue(captor.getValue().productionWrite()); } + @Test + void 工具访问检查允许空body由service返回拒绝判定() throws Exception { + when(service.checkToolAccess(null)).thenReturn(new AiToolAccessDecision( + false, List.of(), List.of("Unknown AI employee: ", "Unknown AI tool: "), + null, null)); + + mvc.perform(post("/api/ai/tools/access-check")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.allowed").value(false)) + .andExpect(jsonPath("$.blockers[0]").value("Unknown AI employee: ")); + + verify(service).checkToolAccess(null); + } + private AiAutoDevelopmentRun autoDevelopmentRun() { AiFeatureDevelopment development = new AiFeatureDevelopment(task(), List.of(draft()), changeSet()); AiReleasePlan releasePlan = new AiReleasePlan("ait-1", "aics-1", "READY", From c1ff0db96b548e482eaed20edf270c32cbfd4279 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 09:15:10 +0800 Subject: [PATCH 10/53] feat: enforce typed page schema in AI drafts --- platform-ai/pom.xml | 1 + .../platform/ai/service/AiAgentService.java | 87 ++++++++++++++++--- .../ai/service/AiLocalReleaseExecutor.java | 2 +- .../ai/service/AiAgentServiceTest.java | 38 ++++++++ .../service/AiLocalReleaseExecutorTest.java | 1 + .../schema/TypedPageSchemaValidator.java | 29 ++++++- .../metadata/web/PageSchemaController.java | 2 + .../schema/TypedPageSchemaValidatorTest.java | 17 ++++ .../web/PageSchemaControllerWiringTest.java | 20 +++++ 9 files changed, 181 insertions(+), 16 deletions(-) create mode 100644 platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerWiringTest.java diff --git a/platform-ai/pom.xml b/platform-ai/pom.xml index ec89eb4..9e3bd12 100644 --- a/platform-ai/pom.xml +++ b/platform-ai/pom.xml @@ -14,6 +14,7 @@ com.eip4platform-legacy-core com.eip4platform-converter + com.eip4platform-metadata org.springframework.bootspring-boot-starter-web org.springframework.bootspring-boot-starter-jdbc org.springdocspringdoc-openapi-starter-webmvc-ui 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 613ec4c..9b83535 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 @@ -57,6 +57,10 @@ import com.eip4.platform.ai.model.AiToolDefinition; import com.eip4.platform.ai.model.AiEmployeeDefinition; import com.eip4.platform.ai.store.AiAgentStore; import com.eip4.platform.converter.SchemaGate; +import com.eip4.platform.metadata.schema.PageComponentRegistry; +import com.eip4.platform.metadata.schema.TypedPageSchemaIssue; +import com.eip4.platform.metadata.schema.TypedPageSchemaReport; +import com.eip4.platform.metadata.schema.TypedPageSchemaValidator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -81,6 +85,7 @@ public class AiAgentService { private final AiAgentRepairExecutor agentRepairExecutor; private final ObjectMapper objectMapper; private final AiToolRegistry toolRegistry; + private final TypedPageSchemaValidator typedSchemaValidator; private static volatile SchemaGate sharedSchemaGate; private volatile SchemaGate schemaGate; @@ -90,13 +95,23 @@ public class AiAgentService { AiSmokeRunner smokeRunner, AiLocalReleaseExecutor localReleaseExecutor, AiAgentRepairExecutor agentRepairExecutor, ObjectMapper objectMapper) { this(store, featureDraftGenerator, smokeRunner, localReleaseExecutor, agentRepairExecutor, - objectMapper, AiToolRegistry.defaults()); + objectMapper, AiToolRegistry.defaults(), + new TypedPageSchemaValidator(objectMapper, PageComponentRegistry.defaults())); } AiAgentService(AiAgentStore store, AiFeatureDraftGenerator featureDraftGenerator, AiSmokeRunner smokeRunner, AiLocalReleaseExecutor localReleaseExecutor, AiAgentRepairExecutor agentRepairExecutor, ObjectMapper objectMapper, AiToolRegistry toolRegistry) { + this(store, featureDraftGenerator, smokeRunner, localReleaseExecutor, agentRepairExecutor, + objectMapper, toolRegistry, + new TypedPageSchemaValidator(objectMapper, PageComponentRegistry.defaults())); + } + + AiAgentService(AiAgentStore store, AiFeatureDraftGenerator featureDraftGenerator, + AiSmokeRunner smokeRunner, AiLocalReleaseExecutor localReleaseExecutor, + AiAgentRepairExecutor agentRepairExecutor, ObjectMapper objectMapper, + AiToolRegistry toolRegistry, TypedPageSchemaValidator typedSchemaValidator) { this.store = store; this.featureDraftGenerator = featureDraftGenerator; this.smokeRunner = smokeRunner; @@ -104,6 +119,9 @@ public class AiAgentService { this.agentRepairExecutor = agentRepairExecutor; this.objectMapper = objectMapper; this.toolRegistry = toolRegistry; + this.typedSchemaValidator = typedSchemaValidator == null + ? new TypedPageSchemaValidator(objectMapper, PageComponentRegistry.defaults()) + : typedSchemaValidator; } public AiTask createTask(String objective) { @@ -704,10 +722,26 @@ public class AiAgentService { } public Map validateSchema(JsonNode schema) { - AiGateResult gate = validateSchemaGate(schema); + AiGateResult schemaGate = validateSchemaGate(schema); + TypedPageSchemaReport typedReport = validateTypedPageSchema(schema); + List typedMessages = typedMessages(typedReport); + List validationErrors = new ArrayList<>(); + validationErrors.addAll(schemaGate.messages()); + validationErrors.addAll(typedMessages); Map resp = new LinkedHashMap<>(); - resp.put("schemaValid", gate.passed()); - resp.put("validationErrors", gate.messages()); + resp.put("valid", schemaGate.passed() && typedReport.valid()); + resp.put("schemaValid", schemaGate.passed()); + resp.put("typedSchemaValid", typedReport.valid()); + resp.put("validationErrors", validationErrors.stream().limit(40).toList()); + resp.put("typedSchemaVersion", typedReport.schemaVersion()); + resp.put("typedSchemaIssues", typedReport.issues().stream().limit(20) + .map(issue -> Map.of( + "path", issue.path(), + "code", issue.code(), + "message", issue.message())) + .toList()); + resp.put("usedComponents", typedReport.usedComponents()); + resp.put("usedActions", typedReport.usedActions()); return resp; } @@ -742,17 +776,44 @@ public class AiAgentService { return new AiGateResult("amis-schema", errors.isEmpty(), errors.stream().limit(20).toList()); } + private AiGateResult validateTypedPageSchemaGate(JsonNode schema) { + TypedPageSchemaReport report = validateTypedPageSchema(schema); + return new AiGateResult("typed-page-schema", report.valid(), typedMessages(report)); + } + + private TypedPageSchemaReport validateTypedPageSchema(JsonNode schema) { + try { + return typedSchemaValidator.validate(schema == null ? "null" : objectMapper.writeValueAsString(schema)); + } catch (JsonProcessingException ex) { + return typedSchemaValidator.validate(""); + } + } + + private static List typedMessages(TypedPageSchemaReport report) { + return report.issues().stream() + .limit(20) + .map(AiAgentService::typedMessage) + .toList(); + } + + private static String typedMessage(TypedPageSchemaIssue issue) { + return issue.path() + " " + issue.code() + ": " + issue.message(); + } + private List validateDraft(AiArtifactType type, String targetId, JsonNode payload) { List gates = new ArrayList<>(); gates.add(requiredFieldsGate(type, targetId, payload)); - gates.add(switch (type) { - case ENTITY -> validateEntityGate(payload); - case PAGE_SCHEMA -> validateSchemaGate(payload); - case SERVICEFLOW -> validateServiceFlowGate(payload); - case MENU -> validateMenuGate(payload); - case TEST -> validateTestGate(payload); - case CODE -> new AiGateResult("code-review-required", true, List.of("代码草稿需后续静态检查/单测门禁")); - }); + switch (type) { + case PAGE_SCHEMA -> { + gates.add(validateSchemaGate(payload)); + gates.add(validateTypedPageSchemaGate(payload)); + } + case ENTITY -> gates.add(validateEntityGate(payload)); + case SERVICEFLOW -> gates.add(validateServiceFlowGate(payload)); + case MENU -> gates.add(validateMenuGate(payload)); + case TEST -> gates.add(validateTestGate(payload)); + case CODE -> gates.add(new AiGateResult("code-review-required", true, List.of("代码草稿需后续静态检查/单测门禁"))); + } return List.copyOf(gates); } @@ -1344,7 +1405,7 @@ public class AiAgentService { INSERT INTO sys_serviceflow (sys_serviceflow_id, displayname, contentxml, entityid, iscontrol, isupdateable, isactive, createtime, updatetime, createby, updateby, version) - VALUES (%s, %s, %s, %s, %d, %d, 1, %d, %d, 'AI_AGENT', 'AI_AGENT', 0) + VALUES (%s, %s, %s::xml, %s, %d, %d, 1, %d, %d, 'AI_AGENT', 'AI_AGENT', 0) ON CONFLICT (sys_serviceflow_id) DO UPDATE SET displayname = EXCLUDED.displayname, contentxml = EXCLUDED.contentxml, diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java index db3c7e2..8f31bea 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java @@ -127,7 +127,7 @@ public class AiLocalReleaseExecutor { INSERT INTO sys_serviceflow (sys_serviceflow_id, displayname, contentxml, entityid, iscontrol, isupdateable, isactive, createtime, updatetime, createby, updateby, version) - VALUES (?, ?, ?, ?, ?, ?, 1, ?, ?, 'AI_AGENT', 'AI_AGENT', 0) + VALUES (?, ?, ?::xml, ?, ?, ?, 1, ?, ?, 'AI_AGENT', 'AI_AGENT', 0) ON CONFLICT (sys_serviceflow_id) DO UPDATE SET displayname = EXCLUDED.displayname, contentxml = EXCLUDED.contentxml, 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 d3fbd91..ed82d28 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 @@ -62,6 +62,43 @@ class AiAgentServiceTest { assertEquals(409, ex.getStatusCode().value()); } + @Test + @DisplayName("页面草稿必须通过 typed 组件注册表门禁") + void typedPageSchemaGateBlocksUnsupportedComponent() throws Exception { + AiAgentService service = newService(); + var task = service.createTask("生成未注册组件页面"); + JsonNode invalid = MAPPER.readTree(""" + {"type":"page","title":"坏页面","body":{"type":"evil-widget"}} + """); + + var draft = service.addDraft(task.id(), "PAGE_SCHEMA", "bad-component-page", invalid, null); + + assertFalse(draft.passed()); + assertTrue(draft.gates().stream().anyMatch(g -> "typed-page-schema".equals(g.name()) && !g.passed())); + assertTrue(draft.gates().stream().flatMap(g -> g.messages().stream()) + .anyMatch(m -> m.contains("UNSUPPORTED_COMPONENT"))); + ResponseStatusException ex = assertThrows(ResponseStatusException.class, + () -> service.createChangeSet(task.id())); + assertEquals(409, ex.getStatusCode().value()); + } + + @Test + @DisplayName("AI schema 校验工具返回 AMIS + typed 双闸结果") + void validateSchemaReturnsCombinedGateReport() throws Exception { + AiAgentService service = newService(); + JsonNode invalid = MAPPER.readTree(""" + {"type":"page","body":{"type":"evil-widget"}} + """); + + Map report = service.validateSchema(invalid); + + assertEquals(false, report.get("valid")); + assertEquals(true, report.get("schemaValid")); + assertEquals(false, report.get("typedSchemaValid")); + assertTrue(report.get("validationErrors").toString().contains("UNSUPPORTED_COMPONENT")); + assertTrue(report.get("typedSchemaIssues").toString().contains("evil-widget")); + } + @Test @DisplayName("不允许空目标或未知产物类型") void validatesInputs() { @@ -115,6 +152,7 @@ class AiAgentServiceTest { assertTrue(deploymentPackage.requiresHumanApproval()); assertTrue(deploymentPackage.sqlStatements().stream().anyMatch(sql -> sql.contains("sys_page_schema"))); assertTrue(deploymentPackage.sqlStatements().stream().anyMatch(sql -> sql.contains("sys_serviceflow"))); + assertTrue(deploymentPackage.sqlStatements().stream().anyMatch(sql -> sql.contains("::xml"))); assertTrue(deploymentPackage.rollbackSqlStatements().stream().anyMatch(sql -> sql.contains("sys_serviceflow"))); assertTrue(deploymentPackage.warnings().stream().anyMatch(w -> w.contains("parentId"))); diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiLocalReleaseExecutorTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiLocalReleaseExecutorTest.java index 616d2ff..bc42637 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiLocalReleaseExecutorTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiLocalReleaseExecutorTest.java @@ -60,6 +60,7 @@ class AiLocalReleaseExecutorTest { assertEquals("PAGE_SCHEMA", results.get(2).artifactType().name()); assertEquals("MENU", results.get(3).artifactType().name()); assertTrue(hasUpdateSql(jdbc, "sys_serviceflow")); + assertTrue(hasUpdateSql(jdbc, "?::xml")); assertTrue(hasUpdateSql(jdbc, "sys_page_schema")); assertTrue(hasUpdateSql(jdbc, "sys_menu")); } diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidator.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidator.java index fd144a4..1a786e4 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidator.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidator.java @@ -65,8 +65,12 @@ public final class TypedPageSchemaValidator { Set usedComponents, Set usedActions) { String componentType = node.path("type").asText(""); if (!componentType.isBlank()) { - usedComponents.add(componentType); - if (!registry.supportsComponent(componentType)) { + boolean registeredComponent = registry.supportsComponent(componentType); + boolean componentCandidate = registeredComponent || isComponentCandidate(path, node); + if (componentCandidate) { + usedComponents.add(componentType); + } + if (componentCandidate && !registeredComponent) { issues.add(new TypedPageSchemaIssue(path + ".type", "UNSUPPORTED_COMPONENT", "组件未注册: " + componentType)); } @@ -84,6 +88,27 @@ public final class TypedPageSchemaValidator { } } + private boolean isComponentCandidate(String path, JsonNode node) { + return "$".equals(path) + || path.endsWith(".body") + || path.contains(".body[") + || path.contains(".columns[") + || path.contains(".buttons[") + || path.contains(".headerToolbar[") + || path.contains(".footerToolbar[") + || path.contains(".tabs[") + || path.contains(".items[") + || node.has("actionType") + || node.has("body") + || node.has("columns") + || node.has("buttons") + || node.has("label") + || node.has("tpl") + || node.has("dialog") + || node.has("drawer") + || node.has("required"); + } + private TypedPageSchemaReport report(List issues, Set usedComponents, Set usedActions) { return new TypedPageSchemaReport(PageComponentRegistry.VERSION, issues.isEmpty(), List.copyOf(issues), diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java index 3ab7260..f284094 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java @@ -10,6 +10,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -73,6 +74,7 @@ public class PageSchemaController { private final PageComponentRegistry componentRegistry; private final TypedPageSchemaValidator typedSchemaValidator; + @Autowired public PageSchemaController(JdbcTemplate jdbcTemplate) { this(jdbcTemplate, PageComponentRegistry.defaults()); } diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidatorTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidatorTest.java index bc8021d..2803f8d 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidatorTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidatorTest.java @@ -45,6 +45,23 @@ class TypedPageSchemaValidatorTest { assertTrue(report.issues().get(0).path().contains("$.body.type")); } + @Test + void ignoresNonComponentTypeFieldsInConfigurationObjects() { + TypedPageSchemaReport report = validator.validate(""" + { + "type": "page", + "body": { + "type": "crud", + "api": {"type": "json", "method": "get", "url": "/api/entity/EIP4AI_DEMO/list"} + } + } + """); + + assertTrue(report.valid()); + assertTrue(report.usedComponents().contains("crud")); + assertFalse(report.usedComponents().contains("json")); + } + @Test void rejectsUnsupportedActionForComponent() { TypedPageSchemaReport report = validator.validate(""" diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerWiringTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerWiringTest.java new file mode 100644 index 0000000..4541c2c --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerWiringTest.java @@ -0,0 +1,20 @@ +package com.eip4.platform.metadata.web; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.runner.ApplicationContextRunner; +import org.springframework.jdbc.core.JdbcTemplate; + +class PageSchemaControllerWiringTest { + + private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() + .withBean(JdbcTemplate.class, () -> mock(JdbcTemplate.class)) + .withUserConfiguration(PageSchemaController.class); + + @Test + void springUsesJdbcTemplateConstructor() { + contextRunner.run(context -> assertThat(context).hasSingleBean(PageSchemaController.class)); + } +} From e55072598eddc42c14eeb2ff7a44529253806d10 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 12:14:57 +0800 Subject: [PATCH 11/53] feat: add AI page blueprint compiler --- docs/AI_AGENT_AUTO_DEVELOPMENT.md | 5 +- docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md | 82 +++++++ .../ai/service/AiFeatureDraftGenerator.java | 140 +++--------- .../ai/page-recipes/maintenance-crud-v1.yaml | 49 +++++ .../service/AiFeatureDraftGeneratorTest.java | 10 + .../schema/blueprint/PageBlueprint.java | 32 +++ .../blueprint/PageBlueprintCompiler.java | 201 ++++++++++++++++++ .../schema/blueprint/PageBlueprintField.java | 10 + .../blueprint/PageBlueprintCompilerTest.java | 78 +++++++ 9 files changed, 489 insertions(+), 118 deletions(-) create mode 100644 docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md create mode 100644 platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprint.java create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintField.java create mode 100644 platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java diff --git a/docs/AI_AGENT_AUTO_DEVELOPMENT.md b/docs/AI_AGENT_AUTO_DEVELOPMENT.md index f7690af..c81ab7b 100644 --- a/docs/AI_AGENT_AUTO_DEVELOPMENT.md +++ b/docs/AI_AGENT_AUTO_DEVELOPMENT.md @@ -102,8 +102,9 @@ curl -X POST http://localhost:8093/api/ai/features/auto-develop \ ## 自动链路 1. 创建 `AiTask`。 -2. 生成 `ENTITY`、`PAGE_SCHEMA`、`SERVICEFLOW`、`MENU`、`TEST` 草稿。 -3. 对草稿执行基础门禁,包括 amis schema、服务流 XML、实体字段和 smoke 计划。 +2. 生成 `ENTITY`、`PAGE_SCHEMA`、`SERVICEFLOW`、`MENU`、`TEST` 草稿。`PAGE_SCHEMA` + 先生成 EIP4 PageBlueprint,再由平台编译器输出 amis schema;草稿 metadata 保留 blueprint 证据。 +3. 对草稿执行基础门禁,包括 amis schema、typed page schema、服务流 XML、实体字段和 smoke 计划。 4. 生成待人审 `AiChangeSet`。 5. 生成 release plan。 6. 本地 apply:实体走本机 `/api/meta/entity`,页面/服务流写本地库;如果本地最小库缺少 `sys_menu`,菜单发布标记为 `SKIPPED`,不阻断本地 gate,部署包仍保留菜单 SQL 供线上人审。 diff --git a/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md b/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md new file mode 100644 index 0000000..3715951 --- /dev/null +++ b/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md @@ -0,0 +1,82 @@ +# AI Agent Page Blueprint Contract + +日期:2026-06-17 + +## 目标 + +EIP4 的 AI Agent 不直接自由生成 amis JSON。Agent 应先生成 EIP4 PageBlueprint,再由平台编译器输出 amis schema,并继续通过 typed page schema、amis schema 和真实浏览器 E2E。 + +这条路径借鉴 NocoBase 的做法:AI 操作受控配置模型,平台负责规范化、校验、模板复用和版本证据。 + +## 当前已落地对象 + +代码位置: + +- `platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprint.java` +- `platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintField.java` +- `platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java` +- `platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml` + +AI 自动开发链路中的 `PAGE_SCHEMA` 草稿仍然保存编译后的 amis schema,保持现有落库和前端渲染契约不变;草稿 metadata 额外保存: + +- `pageRecipe` +- `pageBlueprintVersion` +- `pageBlueprint` + +## Recipe: maintenance-crud-v1 + +适用范围: + +- 普通实体维护页 +- 单主表列表 +- 新增、编辑、删除 +- 本地 smoke 可覆盖列表、新增、服务流搜索 + +标准输出结构: + +- 顶层 `type=page` +- `body[0]` 为 `crud` +- `crud.name` 固定为 `{lowerCamel(tableName)}Crud` +- `crud.syncLocation=false` +- 列表 API 固定为 `/api/entity/{table}/list?page=${page}&perPage=${perPage}` +- 新增按钮位于 `headerToolbar[0]` +- 新增按钮使用 `level=primary`、`icon=fa fa-plus`、`actionType=dialog` +- 新增和编辑表单提交到 `post:/api/entity/{table}/save` +- 编辑按钮位于操作列第一位 +- 删除按钮位于操作列第二位 +- 删除按钮使用 `className=text-danger`、`actionType=ajax`、`confirmText` +- 删除 API 固定为 `/api/entity/{table}/delete` +- 页大小默认 `20` +- `footerToolbar` 固定包含 `statistics` 和 `pagination` + +字段映射: + +- `string` -> `input-text` +- `integer` / `number` -> `input-number` +- `date` -> `input-date` +- `datetime` -> `input-datetime` +- `boolean` -> `switch` +- 主键不出现在新增表单,编辑表单最后追加 `hidden` + +## 当前边界 + +本阶段只解决“AI 生成维护类 CRUD 页时走受控 recipe”。还未覆盖: + +- 主子表页面 +- 树表页面 +- 审批办理页面 +- 看板、日历、图表、报表页 +- 复杂字段分组 +- 条件联动 +- 引用选择器策略 +- 权限按钮策略 + +这些类型必须作为新的 recipe 增量加入,不能让 Agent 直接绕过 blueprint 生成最终 amis JSON。 + +## 后续演进 + +1. 将 `maintenance-crud-v1.yaml` 中的规则接入 UI lint。 +2. 增加 `master-detail-v1`、`tree-crud-v1`、`approval-task-v1` recipe。 +3. 让设计器 overlay 保存也能记录对应 blueprint 或 template 来源。 +4. 在功能包中导出 blueprint,线上部署包继续导出编译后的 amis schema。 +5. Playwright E2E 从 recipe 反推出应验证的 UI 行为。 diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java index 5c15e76..978fcdb 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java @@ -20,6 +20,9 @@ import com.eip4.platform.ai.model.AiArtifactType; import com.eip4.platform.ai.model.AiFeatureField; import com.eip4.platform.ai.model.AiFeatureRequest; import com.eip4.platform.ai.model.AiGeneratedDraft; +import com.eip4.platform.metadata.schema.blueprint.PageBlueprint; +import com.eip4.platform.metadata.schema.blueprint.PageBlueprintCompiler; +import com.eip4.platform.metadata.schema.blueprint.PageBlueprintField; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -32,18 +35,21 @@ public class AiFeatureDraftGenerator { "VERSION", "CREATETIME", "UPDATETIME", "CREATEBY", "UPDATEBY", "ISACTIVE"); private final ObjectMapper objectMapper; + private final PageBlueprintCompiler pageBlueprintCompiler; public AiFeatureDraftGenerator(ObjectMapper objectMapper) { this.objectMapper = objectMapper; + this.pageBlueprintCompiler = new PageBlueprintCompiler(objectMapper); } public List generate(AiFeatureRequest request) { FeatureSpec spec = normalize(request); + PageBlueprint pageBlueprint = pageBlueprint(spec); List drafts = new ArrayList<>(); drafts.add(new AiGeneratedDraft(AiArtifactType.ENTITY, spec.tableName(), entityPayload(spec), metadata("entity-meta", "/api/meta/entity"))); drafts.add(new AiGeneratedDraft(AiArtifactType.PAGE_SCHEMA, spec.templateId(), - pageSchema(spec), metadata("page-schema", "sys_page_schema"))); + pageBlueprintCompiler.compile(pageBlueprint), pageSchemaMetadata(pageBlueprint))); drafts.add(new AiGeneratedDraft(AiArtifactType.SERVICEFLOW, spec.tableName() + "_DEFAULT_FLOWS", serviceFlowPayload(spec), metadata("serviceflow", "sys_serviceflow"))); drafts.add(new AiGeneratedDraft(AiArtifactType.MENU, spec.templateId(), @@ -72,102 +78,16 @@ public class AiFeatureDraftGenerator { return root; } - private ObjectNode pageSchema(FeatureSpec spec) { - ObjectNode page = objectMapper.createObjectNode(); - page.put("type", "page"); - page.put("title", spec.featureName()); - ArrayNode body = page.putArray("body"); - ObjectNode crud = body.addObject(); - crud.put("type", "crud"); - crud.put("name", lowerCamel(spec.tableName()) + "Crud"); - crud.put("syncLocation", false); - ObjectNode api = crud.putObject("api"); - api.put("method", "get"); - api.put("url", "/api/entity/" + spec.tableName() + "/list?page=${page}&perPage=${perPage}"); - api.put("adaptor", "return payload;"); - ArrayNode headerToolbar = crud.putArray("headerToolbar"); - ObjectNode addButton = headerToolbar.addObject(); - addButton.put("type", "button"); - addButton.put("label", "新增"); - addButton.put("level", "primary"); - addButton.put("icon", "fa fa-plus"); - addButton.put("actionType", "dialog"); - ObjectNode addDialog = addButton.putObject("dialog"); - addDialog.put("title", "新增" + spec.entityName()); - ObjectNode addForm = addDialog.putObject("body"); - addForm.put("type", "form"); - addForm.put("api", "post:/api/entity/" + spec.tableName() + "/save"); - addForm.set("body", formControls(spec, false)); - headerToolbar.add("pagination"); - ArrayNode footerToolbar = crud.putArray("footerToolbar"); - footerToolbar.add("statistics"); - footerToolbar.add("pagination"); - crud.put("perPage", 20); - crud.set("columns", columns(spec)); - return page; - } - - private ArrayNode columns(FeatureSpec spec) { - ArrayNode columns = objectMapper.createArrayNode(); + private PageBlueprint pageBlueprint(FeatureSpec spec) { + List fields = new ArrayList<>(); for (FieldSpec field : spec.fields()) { - ObjectNode column = columns.addObject(); - column.put("name", field.column()); - column.put("label", field.label()); + fields.add(new PageBlueprintField(field.column(), field.label(), field.type(), + field.required(), true, true)); } - ObjectNode op = columns.addObject(); - op.put("type", "operation"); - op.put("label", "操作"); - op.put("width", 180); - ArrayNode buttons = op.putArray("buttons"); - ObjectNode edit = buttons.addObject(); - edit.put("type", "button"); - edit.put("label", "编辑"); - edit.put("level", "link"); - edit.put("actionType", "dialog"); - ObjectNode editDialog = edit.putObject("dialog"); - editDialog.put("title", "编辑${" + displayColumn(spec) + "}"); - ObjectNode editForm = editDialog.putObject("body"); - editForm.put("type", "form"); - editForm.put("api", "post:/api/entity/" + spec.tableName() + "/save"); - ArrayNode editControls = formControls(spec, true); - ObjectNode hiddenPk = objectMapper.createObjectNode(); - hiddenPk.put("type", "hidden"); - hiddenPk.put("name", spec.tableName() + "_ID"); - hiddenPk.put("value", "${" + spec.tableName() + "_ID}"); - editControls.add(hiddenPk); - editForm.set("body", editControls); - - ObjectNode del = buttons.addObject(); - del.put("type", "button"); - del.put("label", "删除"); - del.put("level", "link"); - del.put("className", "text-danger"); - del.put("actionType", "ajax"); - del.put("confirmText", "确认删除该记录?"); - ObjectNode delApi = del.putObject("api"); - delApi.put("method", "post"); - delApi.put("url", "/api/entity/" + spec.tableName() + "/delete"); - ObjectNode data = delApi.putObject("data"); - data.put("id", "${" + spec.tableName() + "_ID}"); - del.put("reload", lowerCamel(spec.tableName()) + "Crud"); - return columns; - } - - private ArrayNode formControls(FeatureSpec spec, boolean bindCurrentRow) { - ArrayNode controls = objectMapper.createArrayNode(); - for (FieldSpec field : spec.fields()) { - ObjectNode c = controls.addObject(); - c.put("type", controlType(field.type())); - c.put("name", field.column()); - c.put("label", field.label()); - if (field.required()) { - c.put("required", true); - } - if (bindCurrentRow) { - c.put("value", "${" + field.column() + "}"); - } - } - return controls; + return new PageBlueprint(PageBlueprint.VERSION, PageBlueprint.RECIPE_MAINTENANCE_CRUD, + spec.templateId(), spec.featureName(), spec.tableName(), spec.entityName(), + spec.tableName() + "_ID", displayColumn(spec), fields, + true, true, true, 20); } private ObjectNode serviceFlowPayload(FeatureSpec spec) { @@ -332,16 +252,6 @@ public class AiFeatureDraftGenerator { return Math.min(length, 2000); } - private static String controlType(String fieldType) { - return switch (fieldType) { - case "integer", "number" -> "input-number"; - case "date" -> "input-date"; - case "datetime" -> "input-datetime"; - case "boolean" -> "switch"; - default -> "input-text"; - }; - } - private static String displayColumn(FeatureSpec spec) { return spec.fields().stream() .filter(f -> "NAME".equals(f.column()) || f.required()) @@ -350,17 +260,6 @@ public class AiFeatureDraftGenerator { .orElse(spec.fields().get(0).column()); } - private static String lowerCamel(String table) { - String[] parts = table.toLowerCase(Locale.ROOT).split("_+"); - StringBuilder sb = new StringBuilder(parts[0]); - for (int i = 1; i < parts.length; i++) { - if (!parts[i].isBlank()) { - sb.append(Character.toUpperCase(parts[i].charAt(0))).append(parts[i].substring(1)); - } - } - return sb.toString(); - } - private static String firstText(String... values) { for (String value : values) { if (value != null && !value.isBlank()) { @@ -379,6 +278,15 @@ public class AiFeatureDraftGenerator { return metadata; } + @SuppressWarnings("unchecked") + private Map pageSchemaMetadata(PageBlueprint pageBlueprint) { + Map metadata = metadata("page-schema", "sys_page_schema"); + metadata.put("pageRecipe", pageBlueprint.recipe()); + metadata.put("pageBlueprintVersion", pageBlueprint.schemaVersion()); + metadata.put("pageBlueprint", objectMapper.convertValue(pageBlueprint, Map.class)); + return metadata; + } + private static String sha(String text) { try { MessageDigest digest = MessageDigest.getInstance("SHA-256"); diff --git a/platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml b/platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml new file mode 100644 index 0000000..13bc47a --- /dev/null +++ b/platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml @@ -0,0 +1,49 @@ +schemaVersion: 1 +recipe: maintenance-crud-v1 +title: EIP4 maintenance CRUD page +purpose: 普通实体维护页,覆盖列表、新增、编辑、删除。 +compiler: com.eip4.platform.metadata.schema.blueprint.PageBlueprintCompiler +amis: + rootType: page + body: + - type: crud + syncLocation: false + perPage: 20 + apiPattern: /api/entity/{tableName}/list?page=${page}&perPage=${perPage} + headerToolbar: + - addButton: + label: 新增 + level: primary + icon: fa fa-plus + actionType: dialog + formApiPattern: post:/api/entity/{tableName}/save + - pagination + footerToolbar: + - statistics + - pagination + operationColumn: + label: 操作 + width: 180 + actions: + - edit: + level: link + actionType: dialog + formApiPattern: post:/api/entity/{tableName}/save + - delete: + level: link + className: text-danger + actionType: ajax + confirmText: 确认删除该记录? + apiPattern: /api/entity/{tableName}/delete +fieldMappings: + string: input-text + integer: input-number + number: input-number + date: input-date + datetime: input-datetime + boolean: switch +gates: + - typed-page-schema + - amis-schema + - local-smoke + - playwright-render diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java index 6ac0e6d..f72dd2e 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java @@ -6,6 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; +import java.util.Map; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -39,6 +40,15 @@ class AiFeatureDraftGeneratorTest { assertTrue(drafts.stream().anyMatch(d -> d.artifactType() == AiArtifactType.SERVICEFLOW)); assertTrue(drafts.stream().anyMatch(d -> d.artifactType() == AiArtifactType.MENU)); assertTrue(drafts.stream().anyMatch(d -> d.artifactType() == AiArtifactType.TEST)); + var pageSchema = drafts.stream().filter(d -> d.artifactType() == AiArtifactType.PAGE_SCHEMA) + .findFirst().orElseThrow(); + assertEquals("maintenance-crud-v1", pageSchema.metadata().get("pageRecipe")); + assertEquals(1, pageSchema.metadata().get("pageBlueprintVersion")); + assertEquals("crud", pageSchema.payload().path("body").get(0).path("type").asText()); + @SuppressWarnings("unchecked") + Map blueprint = (Map) pageSchema.metadata().get("pageBlueprint"); + assertEquals("EIP4AI_CONTRACT_TYPE", blueprint.get("tableName")); + assertEquals("NAME", blueprint.get("displayField")); var serviceFlow = drafts.stream().filter(d -> d.artifactType() == AiArtifactType.SERVICEFLOW) .findFirst().orElseThrow(); assertEquals(5, serviceFlow.payload().path("flows").size()); diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprint.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprint.java new file mode 100644 index 0000000..8906476 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprint.java @@ -0,0 +1,32 @@ +package com.eip4.platform.metadata.schema.blueprint; + +import java.util.List; + +/** + * EIP4 页面生成蓝图。 + * + *

AI 和设计器应优先产出本对象,再由平台编译成 amis schema。这样 UI/UE 规则集中在 + * recipe/compiler/validator 中,而不是散落在 Agent 提示词里。 + */ +public record PageBlueprint( + int schemaVersion, + String recipe, + String templateId, + String title, + String tableName, + String entityName, + String primaryKey, + String displayField, + List fields, + boolean allowCreate, + boolean allowEdit, + boolean allowDelete, + int pageSize) { + + public static final int VERSION = 1; + public static final String RECIPE_MAINTENANCE_CRUD = "maintenance-crud-v1"; + + public PageBlueprint { + fields = fields == null ? List.of() : List.copyOf(fields); + } +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java new file mode 100644 index 0000000..a39ee5e --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java @@ -0,0 +1,201 @@ +package com.eip4.platform.metadata.schema.blueprint; + +import java.util.Locale; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; + +/** + * 把 EIP4 受控 PageBlueprint 编译成当前前端可消费的 amis schema。 + */ +public final class PageBlueprintCompiler { + + private final ObjectMapper objectMapper; + + public PageBlueprintCompiler(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + + public ObjectNode compile(PageBlueprint blueprint) { + validate(blueprint); + if (PageBlueprint.RECIPE_MAINTENANCE_CRUD.equals(blueprint.recipe())) { + return maintenanceCrud(blueprint); + } + throw new IllegalArgumentException("Unsupported page recipe: " + blueprint.recipe()); + } + + private ObjectNode maintenanceCrud(PageBlueprint blueprint) { + ObjectNode page = objectMapper.createObjectNode(); + page.put("type", "page"); + page.put("title", blueprint.title()); + ArrayNode body = page.putArray("body"); + ObjectNode crud = body.addObject(); + String crudName = lowerCamel(blueprint.tableName()) + "Crud"; + crud.put("type", "crud"); + crud.put("name", crudName); + crud.put("syncLocation", false); + ObjectNode api = crud.putObject("api"); + api.put("method", "get"); + api.put("url", "/api/entity/" + blueprint.tableName() + "/list?page=${page}&perPage=${perPage}"); + api.put("adaptor", "return payload;"); + + ArrayNode headerToolbar = crud.putArray("headerToolbar"); + if (blueprint.allowCreate()) { + ObjectNode addButton = headerToolbar.addObject(); + addButton.put("type", "button"); + addButton.put("label", "新增"); + addButton.put("level", "primary"); + addButton.put("icon", "fa fa-plus"); + addButton.put("actionType", "dialog"); + ObjectNode addDialog = addButton.putObject("dialog"); + addDialog.put("title", "新增" + blueprint.entityName()); + ObjectNode addForm = addDialog.putObject("body"); + addForm.put("type", "form"); + addForm.put("api", "post:/api/entity/" + blueprint.tableName() + "/save"); + addForm.set("body", formControls(blueprint, false)); + } + headerToolbar.add("pagination"); + + ArrayNode footerToolbar = crud.putArray("footerToolbar"); + footerToolbar.add("statistics"); + footerToolbar.add("pagination"); + crud.put("perPage", blueprint.pageSize()); + crud.set("columns", columns(blueprint, crudName)); + return page; + } + + private ArrayNode columns(PageBlueprint blueprint, String crudName) { + ArrayNode columns = objectMapper.createArrayNode(); + for (PageBlueprintField field : blueprint.fields()) { + if (!field.listVisible()) { + continue; + } + ObjectNode column = columns.addObject(); + column.put("name", field.name()); + column.put("label", field.label()); + } + if (!blueprint.allowEdit() && !blueprint.allowDelete()) { + return columns; + } + ObjectNode op = columns.addObject(); + op.put("type", "operation"); + op.put("label", "操作"); + op.put("width", 180); + ArrayNode buttons = op.putArray("buttons"); + if (blueprint.allowEdit()) { + addEditAction(blueprint, buttons); + } + if (blueprint.allowDelete()) { + addDeleteAction(blueprint, buttons, crudName); + } + return columns; + } + + private void addEditAction(PageBlueprint blueprint, ArrayNode buttons) { + ObjectNode edit = buttons.addObject(); + edit.put("type", "button"); + edit.put("label", "编辑"); + edit.put("level", "link"); + edit.put("actionType", "dialog"); + ObjectNode editDialog = edit.putObject("dialog"); + editDialog.put("title", "编辑${" + blueprint.displayField() + "}"); + ObjectNode editForm = editDialog.putObject("body"); + editForm.put("type", "form"); + editForm.put("api", "post:/api/entity/" + blueprint.tableName() + "/save"); + ArrayNode editControls = formControls(blueprint, true); + ObjectNode hiddenPk = objectMapper.createObjectNode(); + hiddenPk.put("type", "hidden"); + hiddenPk.put("name", blueprint.primaryKey()); + hiddenPk.put("value", "${" + blueprint.primaryKey() + "}"); + editControls.add(hiddenPk); + editForm.set("body", editControls); + } + + private void addDeleteAction(PageBlueprint blueprint, ArrayNode buttons, String crudName) { + ObjectNode del = buttons.addObject(); + del.put("type", "button"); + del.put("label", "删除"); + del.put("level", "link"); + del.put("className", "text-danger"); + del.put("actionType", "ajax"); + del.put("confirmText", "确认删除该记录?"); + ObjectNode delApi = del.putObject("api"); + delApi.put("method", "post"); + delApi.put("url", "/api/entity/" + blueprint.tableName() + "/delete"); + ObjectNode data = delApi.putObject("data"); + data.put("id", "${" + blueprint.primaryKey() + "}"); + del.put("reload", crudName); + } + + private ArrayNode formControls(PageBlueprint blueprint, boolean bindCurrentRow) { + ArrayNode controls = objectMapper.createArrayNode(); + for (PageBlueprintField field : blueprint.fields()) { + if (!field.formVisible()) { + continue; + } + ObjectNode c = controls.addObject(); + c.put("type", controlType(field.type())); + c.put("name", field.name()); + c.put("label", field.label()); + if (field.required()) { + c.put("required", true); + } + if (bindCurrentRow) { + c.put("value", "${" + field.name() + "}"); + } + } + return controls; + } + + private void validate(PageBlueprint blueprint) { + if (blueprint == null) { + throw new IllegalArgumentException("Page blueprint is required"); + } + if (blueprint.schemaVersion() != PageBlueprint.VERSION) { + throw new IllegalArgumentException("Unsupported page blueprint version: " + blueprint.schemaVersion()); + } + if (!PageBlueprint.RECIPE_MAINTENANCE_CRUD.equals(blueprint.recipe())) { + throw new IllegalArgumentException("Unsupported page recipe: " + blueprint.recipe()); + } + required(blueprint.templateId(), "templateId"); + required(blueprint.title(), "title"); + required(blueprint.tableName(), "tableName"); + required(blueprint.entityName(), "entityName"); + required(blueprint.primaryKey(), "primaryKey"); + required(blueprint.displayField(), "displayField"); + if (blueprint.fields().isEmpty()) { + throw new IllegalArgumentException("fields must not be empty"); + } + if (blueprint.pageSize() < 1 || blueprint.pageSize() > 200) { + throw new IllegalArgumentException("pageSize must be between 1 and 200"); + } + } + + private static void required(String value, String field) { + if (value == null || value.isBlank()) { + throw new IllegalArgumentException(field + " is required"); + } + } + + private static String controlType(String fieldType) { + return switch (fieldType) { + case "integer", "number" -> "input-number"; + case "date" -> "input-date"; + case "datetime" -> "input-datetime"; + case "boolean" -> "switch"; + default -> "input-text"; + }; + } + + private static String lowerCamel(String table) { + String[] parts = table.toLowerCase(Locale.ROOT).split("_+"); + StringBuilder sb = new StringBuilder(parts[0]); + for (int i = 1; i < parts.length; i++) { + if (!parts[i].isBlank()) { + sb.append(Character.toUpperCase(parts[i].charAt(0))).append(parts[i].substring(1)); + } + } + return sb.toString(); + } +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintField.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintField.java new file mode 100644 index 0000000..759731f --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintField.java @@ -0,0 +1,10 @@ +package com.eip4.platform.metadata.schema.blueprint; + +public record PageBlueprintField( + String name, + String label, + String type, + boolean required, + boolean listVisible, + boolean formVisible) { +} diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java new file mode 100644 index 0000000..984cff8 --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java @@ -0,0 +1,78 @@ +package com.eip4.platform.metadata.schema.blueprint; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.util.List; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; + +class PageBlueprintCompilerTest { + + private static final ObjectMapper MAPPER = new ObjectMapper(); + + @Test + @DisplayName("maintenance-crud-v1 编译为 EIP4 标准 amis CRUD 页") + void compilesMaintenanceCrudRecipe() { + PageBlueprint blueprint = new PageBlueprint( + PageBlueprint.VERSION, + PageBlueprint.RECIPE_MAINTENANCE_CRUD, + "eip4ai-contract-type", + "合同类型维护", + "EIP4AI_CONTRACT_TYPE", + "合同类型", + "EIP4AI_CONTRACT_TYPE_ID", + "NAME", + List.of( + new PageBlueprintField("NAME", "名称", "string", true, true, true), + new PageBlueprintField("ENABLED", "启用", "boolean", false, true, true)), + true, + true, + true, + 20); + + ObjectNode schema = new PageBlueprintCompiler(MAPPER).compile(blueprint); + + assertEquals("page", schema.path("type").asText()); + assertEquals("合同类型维护", schema.path("title").asText()); + ObjectNode crud = (ObjectNode) schema.path("body").get(0); + assertEquals("crud", crud.path("type").asText()); + assertEquals("eip4aiContractTypeCrud", crud.path("name").asText()); + assertEquals("/api/entity/EIP4AI_CONTRACT_TYPE/list?page=${page}&perPage=${perPage}", + crud.path("api").path("url").asText()); + assertEquals("新增", crud.path("headerToolbar").get(0).path("label").asText()); + assertEquals("post:/api/entity/EIP4AI_CONTRACT_TYPE/save", + crud.path("headerToolbar").get(0).path("dialog").path("body").path("api").asText()); + assertEquals("switch", crud.path("headerToolbar").get(0).path("dialog").path("body") + .path("body").get(1).path("type").asText()); + assertEquals("hidden", crud.path("columns").get(2).path("buttons").get(0).path("dialog") + .path("body").path("body").get(2).path("type").asText()); + assertEquals("text-danger", crud.path("columns").get(2).path("buttons").get(1) + .path("className").asText()); + } + + @Test + @DisplayName("不支持的 recipe 会被拒绝") + void rejectsUnsupportedRecipe() { + PageBlueprint blueprint = new PageBlueprint( + PageBlueprint.VERSION, + "dashboard-v9", + "tpl", + "标题", + "EIP4AI_T", + "实体", + "EIP4AI_T_ID", + "NAME", + List.of(new PageBlueprintField("NAME", "名称", "string", true, true, true)), + true, + true, + true, + 20); + + assertThrows(IllegalArgumentException.class, () -> new PageBlueprintCompiler(MAPPER).compile(blueprint)); + } +} From fcc5719bc60fd7465abdf62fe8dc351e8ad4550d Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 12:33:09 +0800 Subject: [PATCH 12/53] feat: enforce AI page recipe gate --- docs/AI_AGENT_AUTO_DEVELOPMENT.md | 2 +- docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md | 21 ++- .../platform/ai/service/AiAgentService.java | 58 +++++++- .../DeterministicAiAgentRepairExecutor.java | 14 +- .../ai/page-recipes/maintenance-crud-v1.yaml | 1 + .../ai/service/AiAgentServiceTest.java | 24 ++++ .../blueprint/PageBlueprintCompiler.java | 14 +- .../blueprint/PageRecipeDefinition.java | 24 ++++ .../schema/blueprint/PageRecipeRegistry.java | 66 +++++++++ .../blueprint/PageRecipeValidationReport.java | 14 ++ .../schema/blueprint/PageRecipeValidator.java | 126 ++++++++++++++++++ .../blueprint/PageRecipeValidatorTest.java | 61 +++++++++ 12 files changed, 414 insertions(+), 11 deletions(-) create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeDefinition.java create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidationReport.java create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidator.java create mode 100644 platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidatorTest.java diff --git a/docs/AI_AGENT_AUTO_DEVELOPMENT.md b/docs/AI_AGENT_AUTO_DEVELOPMENT.md index c81ab7b..0aaab16 100644 --- a/docs/AI_AGENT_AUTO_DEVELOPMENT.md +++ b/docs/AI_AGENT_AUTO_DEVELOPMENT.md @@ -104,7 +104,7 @@ curl -X POST http://localhost:8093/api/ai/features/auto-develop \ 1. 创建 `AiTask`。 2. 生成 `ENTITY`、`PAGE_SCHEMA`、`SERVICEFLOW`、`MENU`、`TEST` 草稿。`PAGE_SCHEMA` 先生成 EIP4 PageBlueprint,再由平台编译器输出 amis schema;草稿 metadata 保留 blueprint 证据。 -3. 对草稿执行基础门禁,包括 amis schema、typed page schema、服务流 XML、实体字段和 smoke 计划。 +3. 对草稿执行基础门禁,包括 page-recipe、amis schema、typed page schema、服务流 XML、实体字段和 smoke 计划。 4. 生成待人审 `AiChangeSet`。 5. 生成 release plan。 6. 本地 apply:实体走本机 `/api/meta/entity`,页面/服务流写本地库;如果本地最小库缺少 `sys_menu`,菜单发布标记为 `SKIPPED`,不阻断本地 gate,部署包仍保留菜单 SQL 供线上人审。 diff --git a/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md b/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md index 3715951..52b4717 100644 --- a/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md +++ b/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md @@ -23,6 +23,11 @@ AI 自动开发链路中的 `PAGE_SCHEMA` 草稿仍然保存编译后的 amis sc - `pageBlueprintVersion` - `pageBlueprint` +声明了 `pageRecipe` 的草稿必须通过 `page-recipe` 门禁。该门禁会重新解析 metadata 中的 +`pageBlueprint`,用平台注册的 recipe/compiler 重新编译,并要求草稿 payload 与编译结果一致。 +因此 Agent 不能一边声明使用标准 recipe,一边绕过 compiler 私改 amis JSON。没有声明 recipe 的 +历史/手工 `PAGE_SCHEMA` 草稿暂按自由 schema 处理,只走 amis schema 和 typed page schema。 + ## Recipe: maintenance-crud-v1 适用范围: @@ -73,10 +78,16 @@ AI 自动开发链路中的 `PAGE_SCHEMA` 草稿仍然保存编译后的 amis sc 这些类型必须作为新的 recipe 增量加入,不能让 Agent 直接绕过 blueprint 生成最终 amis JSON。 +## 已落地门禁 + +- `page-recipe`:校验 recipe 已注册、metadata 证据完整、payload 等于 blueprint 编译结果。 +- `typed-page-schema`:校验组件和 actionType 来自 EIP4 注册表。 +- `amis-schema`:校验最终 schema 符合 amis schema。 +- `local-smoke`:本地发布后访问页面、实体、服务流和新增接口。 + ## 后续演进 -1. 将 `maintenance-crud-v1.yaml` 中的规则接入 UI lint。 -2. 增加 `master-detail-v1`、`tree-crud-v1`、`approval-task-v1` recipe。 -3. 让设计器 overlay 保存也能记录对应 blueprint 或 template 来源。 -4. 在功能包中导出 blueprint,线上部署包继续导出编译后的 amis schema。 -5. Playwright E2E 从 recipe 反推出应验证的 UI 行为。 +1. 增加 `master-detail-v1`、`tree-crud-v1`、`approval-task-v1` recipe。 +2. 让设计器 overlay 保存也能记录对应 blueprint 或 template 来源。 +3. 在功能包中导出 blueprint,线上部署包继续导出编译后的 amis schema。 +4. Playwright E2E 从 recipe 反推出应验证的 UI 行为。 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 9b83535..ebc2933 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 @@ -61,6 +61,10 @@ import com.eip4.platform.metadata.schema.PageComponentRegistry; import com.eip4.platform.metadata.schema.TypedPageSchemaIssue; import com.eip4.platform.metadata.schema.TypedPageSchemaReport; import com.eip4.platform.metadata.schema.TypedPageSchemaValidator; +import com.eip4.platform.metadata.schema.blueprint.PageBlueprint; +import com.eip4.platform.metadata.schema.blueprint.PageRecipeRegistry; +import com.eip4.platform.metadata.schema.blueprint.PageRecipeValidationReport; +import com.eip4.platform.metadata.schema.blueprint.PageRecipeValidator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -86,6 +90,7 @@ public class AiAgentService { private final ObjectMapper objectMapper; private final AiToolRegistry toolRegistry; private final TypedPageSchemaValidator typedSchemaValidator; + private final PageRecipeValidator pageRecipeValidator; private static volatile SchemaGate sharedSchemaGate; private volatile SchemaGate schemaGate; @@ -122,6 +127,7 @@ public class AiAgentService { this.typedSchemaValidator = typedSchemaValidator == null ? new TypedPageSchemaValidator(objectMapper, PageComponentRegistry.defaults()) : typedSchemaValidator; + this.pageRecipeValidator = new PageRecipeValidator(objectMapper, PageRecipeRegistry.defaults()); } public AiTask createTask(String objective) { @@ -154,7 +160,8 @@ public class AiAgentService { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "payload 不能为空"); } - List gates = validateDraft(artifactType, target, payload); + Map safeMetadata = metadata == null ? Map.of() : metadata; + List gates = validateDraft(artifactType, target, payload, safeMetadata); AiDraft draft = new AiDraft( "aid-" + UUID.randomUUID(), taskId, @@ -163,7 +170,7 @@ public class AiAgentService { payload, System.currentTimeMillis(), gates, - metadata == null ? Map.of() : Map.copyOf(metadata)); + Map.copyOf(safeMetadata)); store.saveDraft(draft); audit(taskId, "draft.saved", "agent", Map.of( "draftId", draft.id(), @@ -781,6 +788,49 @@ public class AiAgentService { return new AiGateResult("typed-page-schema", report.valid(), typedMessages(report)); } + private AiGateResult validatePageRecipeGate(String targetId, JsonNode schema, Map metadata) { + boolean hasRecipe = metadata.containsKey("pageRecipe"); + boolean hasBlueprint = metadata.containsKey("pageBlueprint"); + if (!hasRecipe && !hasBlueprint) { + return new AiGateResult("page-recipe", true, List.of("未声明 pageRecipe,按手工 PAGE_SCHEMA 草稿跳过 recipe 门禁")); + } + List messages = new ArrayList<>(); + Object recipeValue = metadata.get("pageRecipe"); + Object blueprintValue = metadata.get("pageBlueprint"); + Object versionValue = metadata.get("pageBlueprintVersion"); + if (!(recipeValue instanceof String recipe) || recipe.isBlank()) { + messages.add("pageRecipe metadata 不能为空"); + } + if (blueprintValue == null) { + messages.add("pageBlueprint metadata 不能为空"); + } + if (!(versionValue instanceof Number)) { + messages.add("pageBlueprintVersion metadata 必须是数字"); + } + if (!messages.isEmpty()) { + return new AiGateResult("page-recipe", false, messages); + } + try { + PageBlueprint blueprint = objectMapper.convertValue(blueprintValue, PageBlueprint.class); + if (!recipeValue.equals(blueprint.recipe())) { + messages.add("pageRecipe 与 pageBlueprint.recipe 不一致"); + } + if (!targetId.equals(blueprint.templateId())) { + messages.add("targetId 与 pageBlueprint.templateId 不一致"); + } + if (((Number) versionValue).intValue() != blueprint.schemaVersion()) { + messages.add("pageBlueprintVersion 与 pageBlueprint.schemaVersion 不一致"); + } + if (!messages.isEmpty()) { + return new AiGateResult("page-recipe", false, messages); + } + PageRecipeValidationReport report = pageRecipeValidator.validate(blueprint, schema); + return new AiGateResult("page-recipe", report.valid(), report.messages()); + } catch (IllegalArgumentException ex) { + return new AiGateResult("page-recipe", false, List.of("pageBlueprint metadata 解析失败: " + ex.getMessage())); + } + } + private TypedPageSchemaReport validateTypedPageSchema(JsonNode schema) { try { return typedSchemaValidator.validate(schema == null ? "null" : objectMapper.writeValueAsString(schema)); @@ -800,13 +850,15 @@ public class AiAgentService { return issue.path() + " " + issue.code() + ": " + issue.message(); } - private List validateDraft(AiArtifactType type, String targetId, JsonNode payload) { + private List validateDraft(AiArtifactType type, String targetId, JsonNode payload, + Map metadata) { List gates = new ArrayList<>(); gates.add(requiredFieldsGate(type, targetId, payload)); switch (type) { case PAGE_SCHEMA -> { gates.add(validateSchemaGate(payload)); gates.add(validateTypedPageSchemaGate(payload)); + gates.add(validatePageRecipeGate(targetId, payload, metadata)); } case ENTITY -> gates.add(validateEntityGate(payload)); case SERVICEFLOW -> gates.add(validateServiceFlowGate(payload)); diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/DeterministicAiAgentRepairExecutor.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/DeterministicAiAgentRepairExecutor.java index 8dd193b..d6739ce 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/DeterministicAiAgentRepairExecutor.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/DeterministicAiAgentRepairExecutor.java @@ -1,6 +1,7 @@ package com.eip4.platform.ai.service; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -251,7 +252,7 @@ public class DeterministicAiAgentRepairExecutor implements AiAgentRepairExecutor AiArtifactType.PAGE_SCHEMA, draft.targetId(), copy, - Map.of( + repairMetadata(draft, "source", "deterministic-agent-repair", "repairActionId", action.id(), "supersedesDraftId", draft.id()))); @@ -318,4 +319,15 @@ public class DeterministicAiAgentRepairExecutor implements AiAgentRepairExecutor Object value = action.details() == null ? null : action.details().get(key); return value == null ? "" : String.valueOf(value); } + + private static Map repairMetadata(AiDraft draft, Object... entries) { + Map out = new LinkedHashMap<>(); + if (draft.metadata() != null) { + out.putAll(draft.metadata()); + } + for (int i = 0; i + 1 < entries.length; i += 2) { + out.put(String.valueOf(entries[i]), entries[i + 1]); + } + return Map.copyOf(out); + } } diff --git a/platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml b/platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml index 13bc47a..95ed2fe 100644 --- a/platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml +++ b/platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml @@ -43,6 +43,7 @@ fieldMappings: datetime: input-datetime boolean: switch gates: + - page-recipe - typed-page-schema - amis-schema - local-smoke 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 ed82d28..e0a992e 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 @@ -21,6 +21,7 @@ import com.eip4.platform.ai.model.AiRepairDraftPatch; import com.eip4.platform.ai.store.InMemoryAiAgentStore; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; class AiAgentServiceTest { @@ -123,6 +124,10 @@ class AiAgentServiceTest { assertEquals(5, result.drafts().size()); assertTrue(result.drafts().stream().allMatch(d -> d.passed()), "自动生成草稿必须全部过基础门禁"); + assertTrue(result.drafts().stream() + .filter(d -> d.artifactType() == AiArtifactType.PAGE_SCHEMA) + .flatMap(d -> d.gates().stream()) + .anyMatch(g -> "page-recipe".equals(g.name()) && g.passed())); assertEquals("READY_FOR_REVIEW", result.changeSet().status()); assertEquals(5, result.changeSet().draftIds().size()); assertEquals(5, service.listDrafts(result.task().id()).size()); @@ -170,6 +175,25 @@ class AiAgentServiceTest { assertEquals(1, service.listRevisions(result.task().id()).size()); } + @Test + @DisplayName("声明 PageBlueprint 的页面草稿必须匹配 recipe 编译结果") + void pageRecipeGateRejectsTamperedSchema() { + AiAgentService service = newService(); + var generated = new AiFeatureDraftGenerator(MAPPER).generate(contractTypeFeature()).stream() + .filter(d -> d.artifactType() == AiArtifactType.PAGE_SCHEMA) + .findFirst().orElseThrow(); + ObjectNode tampered = generated.payload().deepCopy(); + tampered.put("title", "被篡改标题"); + var task = service.createTask("验证 page recipe 门禁"); + + var draft = service.addDraft(task.id(), "PAGE_SCHEMA", generated.targetId(), tampered, generated.metadata()); + + assertFalse(draft.passed()); + assertTrue(draft.gates().stream() + .anyMatch(g -> "page-recipe".equals(g.name()) && !g.passed() + && g.messages().toString().contains("$.title"))); + } + @Test @DisplayName("一键自动开发会串联草稿生成、本地应用、smoke 和部署包") void autoDevelopFeatureRunsFullPipeline() { diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java index a39ee5e..a8ad36e 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java @@ -164,9 +164,21 @@ public final class PageBlueprintCompiler { required(blueprint.entityName(), "entityName"); required(blueprint.primaryKey(), "primaryKey"); required(blueprint.displayField(), "displayField"); - if (blueprint.fields().isEmpty()) { + if (blueprint.fields() == null || blueprint.fields().isEmpty()) { throw new IllegalArgumentException("fields must not be empty"); } + boolean displayFieldExists = false; + for (PageBlueprintField field : blueprint.fields()) { + required(field.name(), "field.name"); + required(field.label(), "field.label"); + required(field.type(), "field.type"); + if (field.name().equals(blueprint.displayField())) { + displayFieldExists = true; + } + } + if (!displayFieldExists) { + throw new IllegalArgumentException("displayField must match one blueprint field"); + } if (blueprint.pageSize() < 1 || blueprint.pageSize() > 200) { throw new IllegalArgumentException("pageSize must be between 1 and 200"); } diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeDefinition.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeDefinition.java new file mode 100644 index 0000000..a4b17e6 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeDefinition.java @@ -0,0 +1,24 @@ +package com.eip4.platform.metadata.schema.blueprint; + +import java.util.List; +import java.util.Map; + +public record PageRecipeDefinition( + String recipe, + int schemaVersion, + String title, + Map fieldMappings, + List gates) { + + public PageRecipeDefinition { + if (recipe == null || recipe.isBlank()) { + throw new IllegalArgumentException("recipe is required"); + } + if (schemaVersion < 1) { + throw new IllegalArgumentException("schemaVersion must be positive"); + } + title = title == null ? "" : title; + fieldMappings = Map.copyOf(fieldMappings == null ? Map.of() : fieldMappings); + gates = List.copyOf(gates == null ? List.of() : gates); + } +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java new file mode 100644 index 0000000..0582ad7 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java @@ -0,0 +1,66 @@ +package com.eip4.platform.metadata.schema.blueprint; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; + +public final class PageRecipeRegistry { + + private final Map recipes; + + public PageRecipeRegistry(List definitions) { + Map ordered = new LinkedHashMap<>(); + for (PageRecipeDefinition definition : definitions == null ? List.of() : definitions) { + PageRecipeDefinition previous = ordered.put(definition.recipe(), definition); + if (previous != null) { + throw new IllegalArgumentException("Duplicate page recipe: " + definition.recipe()); + } + } + this.recipes = Map.copyOf(ordered); + } + + public static PageRecipeRegistry defaults() { + return new PageRecipeRegistry(List.of(maintenanceCrud())); + } + + public Optional find(String recipe) { + if (recipe == null || recipe.isBlank()) { + return Optional.empty(); + } + return Optional.ofNullable(recipes.get(recipe)); + } + + public boolean supports(String recipe) { + return find(recipe).isPresent(); + } + + public ObjectNode compile(PageBlueprint blueprint, ObjectMapper objectMapper) { + if (!supports(blueprint == null ? null : blueprint.recipe())) { + String recipe = blueprint == null ? "" : blueprint.recipe(); + throw new IllegalArgumentException("Unsupported page recipe: " + recipe); + } + return switch (blueprint.recipe()) { + case PageBlueprint.RECIPE_MAINTENANCE_CRUD -> new PageBlueprintCompiler(objectMapper).compile(blueprint); + default -> throw new IllegalArgumentException("Unsupported page recipe: " + blueprint.recipe()); + }; + } + + private static PageRecipeDefinition maintenanceCrud() { + return new PageRecipeDefinition( + PageBlueprint.RECIPE_MAINTENANCE_CRUD, + PageBlueprint.VERSION, + "EIP4 maintenance CRUD page", + Map.of( + "string", "input-text", + "integer", "input-number", + "number", "input-number", + "date", "input-date", + "datetime", "input-datetime", + "boolean", "switch"), + List.of("page-recipe", "typed-page-schema", "amis-schema", "local-smoke", "playwright-render")); + } +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidationReport.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidationReport.java new file mode 100644 index 0000000..df495ce --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidationReport.java @@ -0,0 +1,14 @@ +package com.eip4.platform.metadata.schema.blueprint; + +import java.util.List; + +public record PageRecipeValidationReport( + String recipe, + boolean valid, + List messages) { + + public PageRecipeValidationReport { + recipe = recipe == null ? "" : recipe; + messages = List.copyOf(messages == null ? List.of() : messages); + } +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidator.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidator.java new file mode 100644 index 0000000..11fd02a --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidator.java @@ -0,0 +1,126 @@ +package com.eip4.platform.metadata.schema.blueprint; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +public final class PageRecipeValidator { + + private final ObjectMapper objectMapper; + private final PageRecipeRegistry registry; + + public PageRecipeValidator(ObjectMapper objectMapper, PageRecipeRegistry registry) { + this.objectMapper = objectMapper; + this.registry = registry; + } + + public static PageRecipeValidator defaults() { + return new PageRecipeValidator(new ObjectMapper(), PageRecipeRegistry.defaults()); + } + + public PageRecipeValidationReport validate(PageBlueprint blueprint, JsonNode schema) { + List messages = new ArrayList<>(); + if (blueprint == null) { + return report("", List.of("pageBlueprint metadata is required when pageRecipe is declared")); + } + String recipe = blueprint.recipe(); + registry.find(recipe).ifPresentOrElse( + definition -> { + if (definition.schemaVersion() != blueprint.schemaVersion()) { + messages.add("pageBlueprintVersion 与 recipe 版本不一致: expected=" + + definition.schemaVersion() + ", actual=" + blueprint.schemaVersion()); + } + }, + () -> messages.add("未注册的 page recipe: " + recipe)); + if (schema == null || !schema.isObject()) { + messages.add("PAGE_SCHEMA payload 顶层必须是 JSON object"); + return report(recipe, messages); + } + if (messages.isEmpty()) { + try { + JsonNode expected = registry.compile(blueprint, objectMapper); + if (!expected.equals(schema)) { + String difference = firstDifference(expected, schema, "$"); + messages.add("PAGE_SCHEMA payload 与 recipe 编译结果不一致" + + (difference == null ? "" : ": " + difference)); + } + } catch (IllegalArgumentException ex) { + messages.add(ex.getMessage()); + } + } + return report(recipe, messages); + } + + private static PageRecipeValidationReport report(String recipe, List messages) { + return new PageRecipeValidationReport(recipe, messages.isEmpty(), messages.stream().limit(20).toList()); + } + + private static String firstDifference(JsonNode expected, JsonNode actual, String path) { + if (expected == null && actual == null) { + return null; + } + if (expected == null || actual == null) { + return path + " expected=" + valueSummary(expected) + ", actual=" + valueSummary(actual); + } + if (expected.isObject() && actual.isObject()) { + Iterator> fields = expected.fields(); + while (fields.hasNext()) { + Map.Entry entry = fields.next(); + JsonNode actualChild = actual.get(entry.getKey()); + if (actualChild == null) { + return child(path, entry.getKey()) + " missing"; + } + String difference = firstDifference(entry.getValue(), actualChild, child(path, entry.getKey())); + if (difference != null) { + return difference; + } + } + Iterator actualNames = actual.fieldNames(); + while (actualNames.hasNext()) { + String name = actualNames.next(); + if (!expected.has(name)) { + return child(path, name) + " unexpected=" + valueSummary(actual.get(name)); + } + } + return null; + } + if (expected.isArray() && actual.isArray()) { + if (expected.size() != actual.size()) { + return path + " array size expected=" + expected.size() + ", actual=" + actual.size(); + } + for (int i = 0; i < expected.size(); i++) { + String difference = firstDifference(expected.get(i), actual.get(i), path + "[" + i + "]"); + if (difference != null) { + return difference; + } + } + return null; + } + if (!expected.equals(actual)) { + return path + " expected=" + valueSummary(expected) + ", actual=" + valueSummary(actual); + } + return null; + } + + private static String child(String path, String field) { + if (field.matches("[A-Za-z_][A-Za-z0-9_]*")) { + return path + "." + field; + } + return path + "['" + field.replace("'", "\\'") + "']"; + } + + private static String valueSummary(JsonNode node) { + if (node == null || node.isNull()) { + return "null"; + } + String text = node.isTextual() ? node.asText() : node.toString(); + if (text.length() > 80) { + return text.substring(0, 77) + "..."; + } + return text; + } +} diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidatorTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidatorTest.java new file mode 100644 index 0000000..636c571 --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidatorTest.java @@ -0,0 +1,61 @@ +package com.eip4.platform.metadata.schema.blueprint; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; + +class PageRecipeValidatorTest { + + private static final ObjectMapper MAPPER = new ObjectMapper(); + private final PageRecipeValidator validator = new PageRecipeValidator(MAPPER, PageRecipeRegistry.defaults()); + + @Test + @DisplayName("page recipe 校验接受 compiler 标准输出") + void acceptsCompiledRecipeOutput() { + PageBlueprint blueprint = blueprint(); + ObjectNode schema = new PageBlueprintCompiler(MAPPER).compile(blueprint); + + PageRecipeValidationReport report = validator.validate(blueprint, schema); + + assertTrue(report.valid()); + } + + @Test + @DisplayName("page recipe 校验拒绝被篡改的 schema") + void rejectsSchemaThatDiffersFromCompilerOutput() { + PageBlueprint blueprint = blueprint(); + ObjectNode schema = new PageBlueprintCompiler(MAPPER).compile(blueprint); + schema.put("title", "被篡改标题"); + + PageRecipeValidationReport report = validator.validate(blueprint, schema); + + assertFalse(report.valid()); + assertTrue(report.messages().get(0).contains("$.title")); + } + + private static PageBlueprint blueprint() { + return new PageBlueprint( + PageBlueprint.VERSION, + PageBlueprint.RECIPE_MAINTENANCE_CRUD, + "eip4ai-contract-type", + "合同类型维护", + "EIP4AI_CONTRACT_TYPE", + "合同类型", + "EIP4AI_CONTRACT_TYPE_ID", + "NAME", + List.of( + new PageBlueprintField("NAME", "名称", "string", true, true, true), + new PageBlueprintField("ENABLED", "启用", "boolean", false, true, true)), + true, + true, + true, + 20); + } +} From 2b0b673ce9b08a66914359cb93dcc411a3a45d1e Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 12:38:26 +0800 Subject: [PATCH 13/53] feat: expose AI page recipes --- docs/AI_AGENT_AUTO_DEVELOPMENT.md | 19 +++++------ docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md | 10 ++++++ .../platform/ai/service/AiAgentService.java | 15 ++++++++- .../platform/ai/service/AiToolRegistry.java | 8 +++-- .../platform/ai/web/AiAgentController.java | 13 ++++++++ .../ai/service/AiToolRegistryTest.java | 13 ++++++++ .../ai/web/AiAgentControllerTest.java | 32 +++++++++++++++++++ .../schema/blueprint/PageRecipeRegistry.java | 4 +++ 8 files changed, 102 insertions(+), 12 deletions(-) diff --git a/docs/AI_AGENT_AUTO_DEVELOPMENT.md b/docs/AI_AGENT_AUTO_DEVELOPMENT.md index 0aaab16..22f8aaf 100644 --- a/docs/AI_AGENT_AUTO_DEVELOPMENT.md +++ b/docs/AI_AGENT_AUTO_DEVELOPMENT.md @@ -102,16 +102,17 @@ curl -X POST http://localhost:8093/api/ai/features/auto-develop \ ## 自动链路 1. 创建 `AiTask`。 -2. 生成 `ENTITY`、`PAGE_SCHEMA`、`SERVICEFLOW`、`MENU`、`TEST` 草稿。`PAGE_SCHEMA` +2. 读取 `/api/ai/page-recipes` 中的 EIP4 页面 recipe,确认当前页面类型的 UI/UE 约束。 +3. 生成 `ENTITY`、`PAGE_SCHEMA`、`SERVICEFLOW`、`MENU`、`TEST` 草稿。`PAGE_SCHEMA` 先生成 EIP4 PageBlueprint,再由平台编译器输出 amis schema;草稿 metadata 保留 blueprint 证据。 -3. 对草稿执行基础门禁,包括 page-recipe、amis schema、typed page schema、服务流 XML、实体字段和 smoke 计划。 -4. 生成待人审 `AiChangeSet`。 -5. 生成 release plan。 -6. 本地 apply:实体走本机 `/api/meta/entity`,页面/服务流写本地库;如果本地最小库缺少 `sys_menu`,菜单发布标记为 `SKIPPED`,不阻断本地 gate,部署包仍保留菜单 SQL 供线上人审。 -7. 本地 smoke:只允许 `localhost`、`127.0.0.1`、`::1` baseUrl;HTTP 状态必须匹配,且 JSON 响应体存在 `status` 时必须为 0。 -8. 若失败,自动生成 repair plan 并执行修复重试。 -9. 生成线上人工部署包,包含 manifest、SQL 草案、回滚 SQL 和本地执行证据。 -10. 可选:生成功能包快照并保存 revision,用于后续导出、差异比较和回滚扩展。 +4. 对草稿执行基础门禁,包括 page-recipe、amis schema、typed page schema、服务流 XML、实体字段和 smoke 计划。 +5. 生成待人审 `AiChangeSet`。 +6. 生成 release plan。 +7. 本地 apply:实体走本机 `/api/meta/entity`,页面/服务流写本地库;如果本地最小库缺少 `sys_menu`,菜单发布标记为 `SKIPPED`,不阻断本地 gate,部署包仍保留菜单 SQL 供线上人审。 +8. 本地 smoke:只允许 `localhost`、`127.0.0.1`、`::1` baseUrl;HTTP 状态必须匹配,且 JSON 响应体存在 `status` 时必须为 0。 +9. 若失败,自动生成 repair plan 并执行修复重试。 +10. 生成线上人工部署包,包含 manifest、SQL 草案、回滚 SQL 和本地执行证据。 +11. 可选:生成功能包快照并保存 revision,用于后续导出、差异比较和回滚扩展。 返回体中的关键字段: diff --git a/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md b/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md index 52b4717..df2397f 100644 --- a/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md +++ b/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md @@ -15,8 +15,18 @@ EIP4 的 AI Agent 不直接自由生成 amis JSON。Agent 应先生成 EIP4 Page - `platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprint.java` - `platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintField.java` - `platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java` +- `platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java` +- `platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidator.java` - `platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml` +AI 可查询入口: + +- `GET /api/ai/page-recipes` +- `GET /api/ai/page-recipes/{recipe}` + +工具注册表中对应工具为 `page-recipe.read`,所需 scope 为 `ai:page-recipe:read`。Agent 生成 +PageBlueprint 前应先读取 recipe 定义,再生成草稿。 + AI 自动开发链路中的 `PAGE_SCHEMA` 草稿仍然保存编译后的 amis schema,保持现有落库和前端渲染契约不变;草稿 metadata 额外保存: - `pageRecipe` 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 ebc2933..4b5311f 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 @@ -62,6 +62,7 @@ import com.eip4.platform.metadata.schema.TypedPageSchemaIssue; import com.eip4.platform.metadata.schema.TypedPageSchemaReport; import com.eip4.platform.metadata.schema.TypedPageSchemaValidator; import com.eip4.platform.metadata.schema.blueprint.PageBlueprint; +import com.eip4.platform.metadata.schema.blueprint.PageRecipeDefinition; import com.eip4.platform.metadata.schema.blueprint.PageRecipeRegistry; import com.eip4.platform.metadata.schema.blueprint.PageRecipeValidationReport; import com.eip4.platform.metadata.schema.blueprint.PageRecipeValidator; @@ -90,6 +91,7 @@ public class AiAgentService { private final ObjectMapper objectMapper; private final AiToolRegistry toolRegistry; private final TypedPageSchemaValidator typedSchemaValidator; + private final PageRecipeRegistry pageRecipeRegistry; private final PageRecipeValidator pageRecipeValidator; private static volatile SchemaGate sharedSchemaGate; @@ -127,7 +129,8 @@ public class AiAgentService { this.typedSchemaValidator = typedSchemaValidator == null ? new TypedPageSchemaValidator(objectMapper, PageComponentRegistry.defaults()) : typedSchemaValidator; - this.pageRecipeValidator = new PageRecipeValidator(objectMapper, PageRecipeRegistry.defaults()); + this.pageRecipeRegistry = PageRecipeRegistry.defaults(); + this.pageRecipeValidator = new PageRecipeValidator(objectMapper, pageRecipeRegistry); } public AiTask createTask(String objective) { @@ -760,6 +763,16 @@ public class AiAgentService { return toolRegistry.employees(); } + public List listPageRecipes() { + return pageRecipeRegistry.definitions(); + } + + public PageRecipeDefinition getPageRecipe(String recipe) { + return pageRecipeRegistry.find(recipe) + .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, + "页面 recipe 不存在: " + (recipe == null ? "" : recipe))); + } + public AiToolAccessDecision checkToolAccess(AiToolAccessRequest request) { return toolRegistry.check(request); } diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java index eb83e01..1cd9bee 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiToolRegistry.java @@ -34,6 +34,10 @@ public final class AiToolRegistry { "Validate AMIS and typed page schema before saving or packaging.", List.of("POST /api/ai/tools/validate-schema", "POST /api/page/schema/validate"), List.of("ai:schema:validate"), false, false); + registerTool(tools, "page-recipe.read", "design-contract", + "Read EIP4 page recipes and UI/UE constraints before generating page blueprints.", + List.of("GET /api/ai/page-recipes", "GET /api/ai/page-recipes/{recipe}"), + List.of("ai:page-recipe:read"), false, false); registerTool(tools, "local.apply", "local-gate", "Apply a change set to a local EIP4 environment only.", List.of("POST /api/ai/tasks/{taskId}/change-sets/{changeSetId}/local-apply"), @@ -56,9 +60,9 @@ public final class AiToolRegistry { Map employees = new LinkedHashMap<>(); registerEmployee(employees, "agent-developer", "Agent Developer", "Develops EIP4 feature packages in local environments.", - List.of("feature.draft.generate", "schema.validate", "local.apply", "smoke.run", + List.of("feature.draft.generate", "schema.validate", "page-recipe.read", "local.apply", "smoke.run", "feature.package", "release.prepare"), - List.of("ai:feature:draft", "ai:schema:validate", "ai:local:apply", "ai:smoke:run", + List.of("ai:feature:draft", "ai:schema:validate", "ai:page-recipe:read", "ai:local:apply", "ai:smoke:run", "ai:package:create", "ai:release:prepare"), List.of("Local apply only", "Production deployment requires human operator")); registerEmployee(employees, "release-auditor", "Release Auditor", 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 4697e69..02a42e5 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 @@ -33,6 +33,7 @@ import com.eip4.platform.ai.model.AiToolAccessRequest; import com.eip4.platform.ai.model.AiToolDefinition; import com.eip4.platform.ai.model.AiEmployeeDefinition; import com.eip4.platform.ai.service.AiAgentService; +import com.eip4.platform.metadata.schema.blueprint.PageRecipeDefinition; import com.fasterxml.jackson.databind.JsonNode; import io.swagger.v3.oas.annotations.Operation; @@ -207,6 +208,18 @@ public class AiAgentController { return service.listEmployees(); } + @Operation(summary = "列出 AI 页面 recipe", description = "返回 Agent 生成页面前必须读取的 EIP4 UI/UE recipe 定义") + @GetMapping("/page-recipes") + public List pageRecipes() { + return service.listPageRecipes(); + } + + @Operation(summary = "查看 AI 页面 recipe", description = "按 recipe id 返回字段映射、门禁和版本信息") + @GetMapping("/page-recipes/{recipe}") + public PageRecipeDefinition pageRecipe(@PathVariable String recipe) { + return service.getPageRecipe(recipe); + } + @Operation(summary = "检查 AI 工具访问权限", description = "只做权限判定,不执行工具;生产写默认阻断") @PostMapping("/tools/access-check") public AiToolAccessDecision checkToolAccess(@RequestBody(required = false) AiToolAccessRequest request) { diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java index 5f7d3b6..850b595 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiToolRegistryTest.java @@ -26,6 +26,19 @@ class AiToolRegistryTest { assertTrue(decision.blockers().isEmpty()); } + @Test + void agentDeveloperCanReadPageRecipes() { + var decision = registry.check(new AiToolAccessRequest( + "agent-developer", + "page-recipe.read", + List.of("ai:page-recipe:read"), + "local", + false)); + + assertTrue(decision.allowed()); + assertTrue(decision.blockers().isEmpty()); + } + @Test void localOnlyToolIsBlockedForProductionTarget() { var decision = registry.check(new AiToolAccessRequest( diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java index d83fe6a..2b1e53a 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/web/AiAgentControllerTest.java @@ -50,6 +50,7 @@ import com.eip4.platform.ai.model.AiToolAccessRequest; import com.eip4.platform.ai.model.AiToolDefinition; import com.eip4.platform.ai.model.AiEmployeeDefinition; import com.eip4.platform.ai.service.AiAgentService; +import com.eip4.platform.metadata.schema.blueprint.PageRecipeDefinition; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -183,6 +184,37 @@ class AiAgentControllerTest { verify(service).listEmployees(); } + @Test + void 页面Recipe列表接口返回规范定义() throws Exception { + when(service.listPageRecipes()).thenReturn(List.of(new PageRecipeDefinition( + "maintenance-crud-v1", 1, "EIP4 maintenance CRUD page", + Map.of("string", "input-text"), + List.of("page-recipe", "typed-page-schema")))); + + mvc.perform(get("/api/ai/page-recipes")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$[0].recipe").value("maintenance-crud-v1")) + .andExpect(jsonPath("$[0].fieldMappings.string").value("input-text")) + .andExpect(jsonPath("$[0].gates[0]").value("page-recipe")); + + verify(service).listPageRecipes(); + } + + @Test + void 页面Recipe详情接口按名称查询() throws Exception { + when(service.getPageRecipe(eq("maintenance-crud-v1"))).thenReturn(new PageRecipeDefinition( + "maintenance-crud-v1", 1, "EIP4 maintenance CRUD page", + Map.of("boolean", "switch"), + List.of("page-recipe"))); + + mvc.perform(get("/api/ai/page-recipes/maintenance-crud-v1")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.recipe").value("maintenance-crud-v1")) + .andExpect(jsonPath("$.fieldMappings.boolean").value("switch")); + + verify(service).getPageRecipe("maintenance-crud-v1"); + } + @Test void 工具访问检查接口不执行工具只返回判定() throws Exception { var request = new AiToolAccessRequest("agent-developer", "local.apply", diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java index 0582ad7..17b2d61 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java @@ -38,6 +38,10 @@ public final class PageRecipeRegistry { return find(recipe).isPresent(); } + public List definitions() { + return List.copyOf(recipes.values()); + } + public ObjectNode compile(PageBlueprint blueprint, ObjectMapper objectMapper) { if (!supports(blueprint == null ? null : blueprint.recipe())) { String recipe = blueprint == null ? "" : blueprint.recipe(); From 718c5a5b9b5badb74434201b07f1c8057dd93df1 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 13:03:38 +0800 Subject: [PATCH 14/53] feat: add AI tree CRUD recipe --- docs/AI_AGENT_AUTO_DEVELOPMENT.md | 23 +++ docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md | 29 +++- docs/skills/eip4-ai-feature-development.md | 21 +++ .../platform/ai/model/AiFeatureRequest.java | 13 +- .../ai/service/AiFeatureDraftGenerator.java | 40 ++++- .../ai/page-recipes/maintenance-crud-v1.yaml | 54 +++---- .../ai/page-recipes/tree-crud-v1.yaml | 62 ++++++++ .../service/AiFeatureDraftGeneratorTest.java | 77 ++++++++- .../java/com/eip4/platform/cli/Eip4Cli.java | 7 +- .../com/eip4/platform/cli/Eip4CliTest.java | 2 + .../schema/blueprint/PageBlueprint.java | 1 + .../blueprint/PageBlueprintCompiler.java | 150 +++++++++++++++++- .../schema/blueprint/PageRecipeRegistry.java | 18 ++- .../metadata/web/EntityController.java | 88 ++++++++++ .../blueprint/PageBlueprintCompilerTest.java | 63 +++++++- .../blueprint/PageRecipeValidatorTest.java | 30 ++++ .../web/EntityControllerWhitelistTest.java | 43 +++++ 17 files changed, 675 insertions(+), 46 deletions(-) create mode 100644 platform-ai/src/main/resources/ai/page-recipes/tree-crud-v1.yaml diff --git a/docs/AI_AGENT_AUTO_DEVELOPMENT.md b/docs/AI_AGENT_AUTO_DEVELOPMENT.md index 22f8aaf..6ed2e34 100644 --- a/docs/AI_AGENT_AUTO_DEVELOPMENT.md +++ b/docs/AI_AGENT_AUTO_DEVELOPMENT.md @@ -51,10 +51,31 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai auto-develop \ --field NAME:名称:string:100:true \ --field CODE:编码:string:64:true \ --field ENABLED:启用:boolean::false \ + --page-recipe maintenance-crud-v1 \ --max-repair-attempts 2 \ --output target/ai-runs/customer-level.json ``` +树形维护页使用 `tree-crud-v1`。如果字段列表没有显式提供 `PARENTID`,生成器会自动补一个父级字段, +页面使用 `/api/entity/{table}/tree?parentKey=PARENTID&idKey={table}_ID&perPage=2000` +作为树数据接口,并把 `PARENTID` 从树列表列中隐藏: + +```bash +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai auto-develop \ + --base-url http://localhost:8093 \ + --objective "新增组织分类树形维护功能" \ + --feature-name "组织分类维护" \ + --table-name EIP4AI_ORG_CATEGORY \ + --entity-name "组织分类" \ + --template-id eip4ai-org-category \ + --menu-name "组织分类维护" \ + --field NAME:名称:string:100:true \ + --field CODE:编码:string:64:true \ + --page-recipe tree-crud-v1 \ + --max-repair-attempts 2 \ + --output target/ai-runs/org-category-tree.json +``` + 本地门禁通过后,可以把最终变更包封装成功能包快照,并保存一个里程碑 revision: ```bash @@ -88,6 +109,7 @@ curl -X POST http://localhost:8093/api/ai/features/auto-develop \ "entityName": "客户等级", "templateId": "eip4ai-customer-level", "menuName": "客户等级维护", + "pageRecipe": "maintenance-crud-v1", "fields": [ {"column": "NAME", "label": "名称", "type": "string", "length": 100, "required": true}, {"column": "CODE", "label": "编码", "type": "string", "length": 64, "required": true}, @@ -105,6 +127,7 @@ curl -X POST http://localhost:8093/api/ai/features/auto-develop \ 2. 读取 `/api/ai/page-recipes` 中的 EIP4 页面 recipe,确认当前页面类型的 UI/UE 约束。 3. 生成 `ENTITY`、`PAGE_SCHEMA`、`SERVICEFLOW`、`MENU`、`TEST` 草稿。`PAGE_SCHEMA` 先生成 EIP4 PageBlueprint,再由平台编译器输出 amis schema;草稿 metadata 保留 blueprint 证据。 + 未指定 `feature.pageRecipe` 时默认使用 `maintenance-crud-v1`;树形维护页应指定 `tree-crud-v1`。 4. 对草稿执行基础门禁,包括 page-recipe、amis schema、typed page schema、服务流 XML、实体字段和 smoke 计划。 5. 生成待人审 `AiChangeSet`。 6. 生成 release plan。 diff --git a/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md b/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md index df2397f..b4d5619 100644 --- a/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md +++ b/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md @@ -18,6 +18,7 @@ EIP4 的 AI Agent 不直接自由生成 amis JSON。Agent 应先生成 EIP4 Page - `platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java` - `platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidator.java` - `platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml` +- `platform-ai/src/main/resources/ai/page-recipes/tree-crud-v1.yaml` AI 可查询入口: @@ -50,7 +51,7 @@ AI 自动开发链路中的 `PAGE_SCHEMA` 草稿仍然保存编译后的 amis sc 标准输出结构: - 顶层 `type=page` -- `body[0]` 为 `crud` +- `body` 为 `crud` - `crud.name` 固定为 `{lowerCamel(tableName)}Crud` - `crud.syncLocation=false` - 列表 API 固定为 `/api/entity/{table}/list?page=${page}&perPage=${perPage}` @@ -64,6 +65,29 @@ AI 自动开发链路中的 `PAGE_SCHEMA` 草稿仍然保存编译后的 amis sc - 页大小默认 `20` - `footerToolbar` 固定包含 `statistics` 和 `pagination` +## Recipe: tree-crud-v1 + +适用范围: + +- 自引用层级实体维护页 +- 实体必须包含 `PARENTID` 字段 +- 覆盖树形列表、新增顶级节点、加子节点、编辑、删除 + +标准输出结构: + +- 顶层 `type=page` +- `body` 为 `crud` +- `crud.name` 固定为 `{lowerCamel(tableName)}TreeCrud` +- `crud.childrenColumnName=children` +- 列表 API 固定为 `/api/entity/{table}/tree?parentKey=PARENTID&idKey={primaryKey}&perPage=2000` +- 新增顶级按钮位于 `headerToolbar[0]` +- 新增顶级按钮使用 `level=primary`、`icon=fa fa-plus`、`actionType=dialog` +- 操作列按钮顺序固定为:加子项、编辑、删除 +- 加子项表单必须隐藏写入 `PARENTID=${primaryKey}` +- 编辑表单必须保留隐藏主键和 `PARENTID` +- 删除按钮使用 `className=text-danger`、`actionType=ajax`、`confirmText` +- 树数据端点返回 `data.items` 层级数组,每个节点的子节点字段为 `children` + 字段映射: - `string` -> `input-text` @@ -78,7 +102,6 @@ AI 自动开发链路中的 `PAGE_SCHEMA` 草稿仍然保存编译后的 amis sc 本阶段只解决“AI 生成维护类 CRUD 页时走受控 recipe”。还未覆盖: - 主子表页面 -- 树表页面 - 审批办理页面 - 看板、日历、图表、报表页 - 复杂字段分组 @@ -97,7 +120,7 @@ AI 自动开发链路中的 `PAGE_SCHEMA` 草稿仍然保存编译后的 amis sc ## 后续演进 -1. 增加 `master-detail-v1`、`tree-crud-v1`、`approval-task-v1` recipe。 +1. 增加 `master-detail-v1`、`approval-task-v1` recipe。 2. 让设计器 overlay 保存也能记录对应 blueprint 或 template 来源。 3. 在功能包中导出 blueprint,线上部署包继续导出编译后的 amis schema。 4. Playwright E2E 从 recipe 反推出应验证的 UI 行为。 diff --git a/docs/skills/eip4-ai-feature-development.md b/docs/skills/eip4-ai-feature-development.md index 3da372f..2efa94e 100644 --- a/docs/skills/eip4-ai-feature-development.md +++ b/docs/skills/eip4-ai-feature-development.md @@ -17,6 +17,7 @@ - 页面 templateId - 菜单名称 - 字段列表 +- 页面配方,可省略。默认 `maintenance-crud-v1`;树形维护页使用 `tree-crud-v1` 字段格式: @@ -46,10 +47,29 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai auto-develop \ --field NAME:名称:string:100:true \ --field CODE:编码:string:64:true \ --field ENABLED:启用:boolean::false \ + --page-recipe maintenance-crud-v1 \ --max-repair-attempts 2 \ --output target/ai-runs/customer-level.json ``` +树形维护页示例: + +```bash +java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai auto-develop \ + --base-url http://localhost:8084 \ + --objective "新增组织分类树形维护功能" \ + --feature-name "组织分类维护" \ + --table-name EIP4AI_ORG_CATEGORY \ + --entity-name "组织分类" \ + --template-id eip4ai-org-category \ + --menu-name "组织分类维护" \ + --field NAME:名称:string:100:true \ + --field CODE:编码:string:64:true \ + --page-recipe tree-crud-v1 \ + --max-repair-attempts 2 \ + --output target/ai-runs/org-category-tree.json +``` + ## 通过标准 - `applyStatus` 为 `PASSED`。 @@ -57,6 +77,7 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai auto-develop \ - 最终状态为 `READY_FOR_HUMAN_REVIEW`。 - 部署包存在且 `requiresHumanApproval=true`。 - 页面 schema 只能使用组件能力表中注册的组件和动作。 +- `PAGE_SCHEMA` 草稿必须声明并通过 `page-recipe` 门禁;普通维护页为 `maintenance-crud-v1`,树形维护页为 `tree-crud-v1`。 ## 页面 schema 校验 diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureRequest.java b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureRequest.java index f2fdc19..a5cfa33 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureRequest.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/model/AiFeatureRequest.java @@ -9,5 +9,16 @@ public record AiFeatureRequest( String entityName, String templateId, String menuName, - List fields) { + List fields, + String pageRecipe) { + + public AiFeatureRequest(String objective, + String featureName, + String tableName, + String entityName, + String templateId, + String menuName, + List fields) { + this(objective, featureName, tableName, entityName, templateId, menuName, fields, null); + } } diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java index 978fcdb..30a6ccc 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java @@ -81,10 +81,12 @@ public class AiFeatureDraftGenerator { private PageBlueprint pageBlueprint(FeatureSpec spec) { List fields = new ArrayList<>(); for (FieldSpec field : spec.fields()) { + boolean treeParentField = PageBlueprint.RECIPE_TREE_CRUD.equals(spec.pageRecipe()) + && "PARENTID".equals(field.column()); fields.add(new PageBlueprintField(field.column(), field.label(), field.type(), - field.required(), true, true)); + field.required(), !treeParentField, true)); } - return new PageBlueprint(PageBlueprint.VERSION, PageBlueprint.RECIPE_MAINTENANCE_CRUD, + return new PageBlueprint(PageBlueprint.VERSION, spec.pageRecipe(), spec.templateId(), spec.featureName(), spec.tableName(), spec.entityName(), spec.tableName() + "_ID", displayColumn(spec), fields, true, true, true, 20); @@ -129,7 +131,12 @@ public class AiFeatureDraftGenerator { root.put("publishTarget", "local-smoke"); ArrayNode tests = root.putArray("smokeTests"); addSmoke(tests, "page-schema", "GET", "/api/page/schema/" + spec.templateId(), 200); - addSmoke(tests, "entity-list", "GET", "/api/entity/" + spec.tableName() + "/list?page=1&perPage=20", 200); + if (PageBlueprint.RECIPE_TREE_CRUD.equals(spec.pageRecipe())) { + addSmoke(tests, "entity-tree", "GET", "/api/entity/" + spec.tableName() + + "/tree?parentKey=PARENTID&idKey=" + spec.tableName() + "_ID&perPage=2000", 200); + } else { + addSmoke(tests, "entity-list", "GET", "/api/entity/" + spec.tableName() + "/list?page=1&perPage=20", 200); + } addSmoke(tests, "flow-search", "GET", "/api/flow/" + spec.tableName() + "_SEARCH?page=1&perPage=20", 200); ObjectNode create = addSmoke(tests, "entity-create", "POST", "/api/entity/" + spec.tableName() + "/save", 200); @@ -152,7 +159,9 @@ public class AiFeatureDraftGenerator { private ObjectNode sampleEntityBody(FeatureSpec spec) { ObjectNode body = objectMapper.createObjectNode(); for (FieldSpec field : spec.fields()) { - switch (field.type()) { + if ("PARENTID".equals(field.column())) { + body.put(field.column(), ""); + } else switch (field.type()) { case "integer" -> body.put(field.column(), 1); case "number" -> body.put(field.column(), 1.0); case "date" -> body.put(field.column(), "2026-01-01"); @@ -173,11 +182,12 @@ public class AiFeatureDraftGenerator { String entityName = firstText(request == null ? null : request.entityName(), feature, table); String templateId = normalizeTemplateId(request == null ? null : request.templateId(), table); String menuName = firstText(request == null ? null : request.menuName(), feature); - List fields = normalizeFields(request == null ? null : request.fields()); - return new FeatureSpec(feature, table, entityName, templateId, menuName, fields); + String pageRecipe = normalizePageRecipe(request == null ? null : request.pageRecipe()); + List fields = normalizeFields(request == null ? null : request.fields(), pageRecipe); + return new FeatureSpec(feature, table, entityName, templateId, menuName, pageRecipe, fields); } - private List normalizeFields(List input) { + private List normalizeFields(List input, String pageRecipe) { List raw = input == null ? List.of() : input; List out = new ArrayList<>(); Set seen = new LinkedHashSet<>(); @@ -195,9 +205,24 @@ public class AiFeatureDraftGenerator { out.add(new FieldSpec("NAME", "名称", "string", 100, true)); out.add(new FieldSpec("DESCRIPTION", "描述", "string", 500, false)); } + if (PageBlueprint.RECIPE_TREE_CRUD.equals(pageRecipe) && seen.add("PARENTID")) { + out.add(new FieldSpec("PARENTID", "上级", "string", 64, false)); + } return List.copyOf(out); } + private static String normalizePageRecipe(String raw) { + String recipe = raw == null ? "" : raw.trim(); + if (recipe.isBlank()) { + return PageBlueprint.RECIPE_MAINTENANCE_CRUD; + } + if (PageBlueprint.RECIPE_MAINTENANCE_CRUD.equals(recipe) + || PageBlueprint.RECIPE_TREE_CRUD.equals(recipe)) { + return recipe; + } + throw new IllegalArgumentException("Unsupported pageRecipe: " + recipe); + } + private static String normalizeTable(String raw, String seed) { String table = raw == null ? "" : raw.trim().toUpperCase(Locale.ROOT); table = table.replaceAll("[^A-Z0-9_]", "_").replaceAll("_+", "_"); @@ -302,6 +327,7 @@ public class AiFeatureDraftGenerator { String entityName, String templateId, String menuName, + String pageRecipe, List fields) { } diff --git a/platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml b/platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml index 95ed2fe..44b3dd7 100644 --- a/platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml +++ b/platform-ai/src/main/resources/ai/page-recipes/maintenance-crud-v1.yaml @@ -6,35 +6,35 @@ compiler: com.eip4.platform.metadata.schema.blueprint.PageBlueprintCompiler amis: rootType: page body: - - type: crud - syncLocation: false - perPage: 20 - apiPattern: /api/entity/{tableName}/list?page=${page}&perPage=${perPage} - headerToolbar: - - addButton: - label: 新增 - level: primary - icon: fa fa-plus + type: crud + syncLocation: false + perPage: 20 + apiPattern: /api/entity/{tableName}/list?page=${page}&perPage=${perPage} + headerToolbar: + - addButton: + label: 新增 + level: primary + icon: fa fa-plus + actionType: dialog + formApiPattern: post:/api/entity/{tableName}/save + - pagination + footerToolbar: + - statistics + - pagination + operationColumn: + label: 操作 + width: 180 + actions: + - edit: + level: link actionType: dialog formApiPattern: post:/api/entity/{tableName}/save - - pagination - footerToolbar: - - statistics - - pagination - operationColumn: - label: 操作 - width: 180 - actions: - - edit: - level: link - actionType: dialog - formApiPattern: post:/api/entity/{tableName}/save - - delete: - level: link - className: text-danger - actionType: ajax - confirmText: 确认删除该记录? - apiPattern: /api/entity/{tableName}/delete + - delete: + level: link + className: text-danger + actionType: ajax + confirmText: 确认删除该记录? + apiPattern: /api/entity/{tableName}/delete fieldMappings: string: input-text integer: input-number diff --git a/platform-ai/src/main/resources/ai/page-recipes/tree-crud-v1.yaml b/platform-ai/src/main/resources/ai/page-recipes/tree-crud-v1.yaml new file mode 100644 index 0000000..1797115 --- /dev/null +++ b/platform-ai/src/main/resources/ai/page-recipes/tree-crud-v1.yaml @@ -0,0 +1,62 @@ +schemaVersion: 1 +recipe: tree-crud-v1 +title: EIP4 tree CRUD page +purpose: 自引用层级实体维护页,覆盖树形列表、新增顶级、加子项、编辑、删除。 +compiler: com.eip4.platform.metadata.schema.blueprint.PageBlueprintCompiler +requirements: + parentField: PARENTID + childrenColumnName: children +amis: + rootType: page + body: + type: crud + syncLocation: false + childrenColumnName: children + apiPattern: /api/entity/{tableName}/tree?parentKey=PARENTID&idKey={primaryKey}&perPage=2000 + headerToolbar: + - addRootButton: + labelPattern: 新增顶级{entityName} + level: primary + icon: fa fa-plus + actionType: dialog + formApiPattern: post:/api/entity/{tableName}/save + - reloadButton: + label: 刷新 + level: link + icon: fa fa-refresh + actionType: reload + targetPattern: "{crudName}" + footerToolbar: [] + operationColumn: + label: 操作 + width: 240 + actions: + - addChild: + labelPattern: 加子{entityName} + level: link + actionType: dialog + parentBinding: PARENTID=${primaryKey} + formApiPattern: post:/api/entity/{tableName}/save + - edit: + level: link + actionType: dialog + formApiPattern: post:/api/entity/{tableName}/save + - delete: + level: link + className: text-danger + actionType: ajax + confirmText: 确认删除该记录? + apiPattern: /api/entity/{tableName}/delete +fieldMappings: + string: input-text + integer: input-number + number: input-number + date: input-date + datetime: input-datetime + boolean: switch +gates: + - page-recipe + - typed-page-schema + - amis-schema + - local-smoke + - playwright-render diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java index f72dd2e..2aa6667 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java @@ -3,6 +3,7 @@ package com.eip4.platform.ai.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; @@ -44,7 +45,7 @@ class AiFeatureDraftGeneratorTest { .findFirst().orElseThrow(); assertEquals("maintenance-crud-v1", pageSchema.metadata().get("pageRecipe")); assertEquals(1, pageSchema.metadata().get("pageBlueprintVersion")); - assertEquals("crud", pageSchema.payload().path("body").get(0).path("type").asText()); + assertEquals("crud", pageSchema.payload().path("body").path("type").asText()); @SuppressWarnings("unchecked") Map blueprint = (Map) pageSchema.metadata().get("pageBlueprint"); assertEquals("EIP4AI_CONTRACT_TYPE", blueprint.get("tableName")); @@ -78,4 +79,78 @@ class AiFeatureDraftGeneratorTest { assertNotNull(entity.payload().path("attributes").get(0)); assertEquals("NAME", entity.payload().path("attributes").get(0).path("column").asText()); } + + @Test + @DisplayName("树形配方生成 tree-crud 页面和树接口 smoke") + void generatesTreeCrudFeatureDrafts() { + AiFeatureDraftGenerator generator = new AiFeatureDraftGenerator(MAPPER); + + var drafts = generator.generate(new AiFeatureRequest( + "新增组织分类维护", + "组织分类维护", + "EIP4AI_ORG_CATEGORY", + "组织分类", + "eip4ai-org-category", + "组织分类维护", + List.of( + new AiFeatureField("NAME", "名称", "string", 100, true), + new AiFeatureField("CODE", "编码", "string", 64, true)), + "tree-crud-v1")); + + var entity = drafts.stream().filter(d -> d.artifactType() == AiArtifactType.ENTITY) + .findFirst().orElseThrow(); + assertTrue(hasAttribute(entity.payload().path("attributes"), "PARENTID")); + + var pageSchema = drafts.stream().filter(d -> d.artifactType() == AiArtifactType.PAGE_SCHEMA) + .findFirst().orElseThrow(); + assertEquals("tree-crud-v1", pageSchema.metadata().get("pageRecipe")); + assertEquals("crud", pageSchema.payload().path("body").path("type").asText()); + assertEquals("children", pageSchema.payload().path("body").path("childrenColumnName").asText()); + assertEquals("/api/entity/EIP4AI_ORG_CATEGORY/tree?parentKey=PARENTID&idKey=EIP4AI_ORG_CATEGORY_ID&perPage=2000", + pageSchema.payload().path("body").path("api").path("url").asText()); + assertFalse(hasColumn(pageSchema.payload().path("body").path("columns"), "PARENTID")); + + var test = drafts.stream().filter(d -> d.artifactType() == AiArtifactType.TEST) + .findFirst().orElseThrow(); + assertEquals("entity-tree", test.payload().path("smokeTests").get(1).path("name").asText()); + assertEquals("/api/entity/EIP4AI_ORG_CATEGORY/tree?parentKey=PARENTID&idKey=EIP4AI_ORG_CATEGORY_ID&perPage=2000", + test.payload().path("smokeTests").get(1).path("url").asText()); + assertEquals("", test.payload().path("smokeTests").get(3).path("requestBody").path("PARENTID").asText()); + } + + @Test + @DisplayName("未知页面配方不静默降级") + void rejectsUnknownPageRecipe() { + AiFeatureDraftGenerator generator = new AiFeatureDraftGenerator(MAPPER); + + assertThrows(IllegalArgumentException.class, () -> generator.generate(new AiFeatureRequest( + "新增客户等级维护", + "客户等级维护", + "EIP4AI_CUSTOMER_LEVEL", + "客户等级", + "eip4ai-customer-level", + "客户等级维护", + List.of(new AiFeatureField("NAME", "名称", "string", 100, true)), + "unknown-recipe"))); + } + + private static boolean hasAttribute(Iterable attributes, String column) { + for (Object attribute : attributes) { + if (attribute instanceof com.fasterxml.jackson.databind.JsonNode node + && column.equals(node.path("column").asText())) { + return true; + } + } + return false; + } + + private static boolean hasColumn(Iterable columns, String name) { + for (Object column : columns) { + if (column instanceof com.fasterxml.jackson.databind.JsonNode node + && name.equals(node.path("name").asText())) { + return true; + } + } + return false; + } } 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 ad2dc92..2005082 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 @@ -632,6 +632,10 @@ public final class Eip4Cli { for (String field : fields) { fieldNodes.add(parseField(field)); } + String pageRecipe = options.single("page-recipe"); + if (pageRecipe != null && !pageRecipe.isBlank()) { + feature.put("pageRecipe", pageRecipe); + } return root; } @@ -872,7 +876,7 @@ public final class Eip4Cli { eip4 env use --name NAME eip4 env current eip4 env status [--env NAME|--base-url URL|--all] - eip4 ai auto-develop --objective TEXT --feature-name NAME --table-name TABLE --entity-name NAME --template-id ID --menu-name NAME --field column:label:type[:length][:required] + eip4 ai auto-develop --objective TEXT --feature-name NAME --table-name TABLE --entity-name NAME --template-id ID --menu-name NAME --field column:label:type[:length][:required] [--page-recipe maintenance-crud-v1|tree-crud-v1] eip4 release diff --left FILE --right FILE eip4 release export --package-file FILE --output FILE eip4 release import-preview --package-file FILE @@ -934,6 +938,7 @@ public final class Eip4Cli { Optional: --env NAME --base-url URL + --page-recipe maintenance-crud-v1|tree-crud-v1 --max-repair-attempts N --no-deployment-package --yes 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 102667b..2eed1ad 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 @@ -84,6 +84,7 @@ class Eip4CliTest { "--menu-name", "客户等级维护", "--field", "NAME:名称:string:100:true", "--field", "ENABLED:启用:boolean::false", + "--page-recipe", "tree-crud-v1", "--max-repair-attempts", "3", "--no-deployment-package", "--output", output.toString()); @@ -95,6 +96,7 @@ class Eip4CliTest { assertEquals(3, client.body.path("maxRepairAttempts").asInt()); JsonNode feature = client.body.path("feature"); assertEquals("EIP4AI_CUSTOMER_LEVEL", feature.path("tableName").asText()); + assertEquals("tree-crud-v1", feature.path("pageRecipe").asText()); assertEquals(2, feature.path("fields").size()); assertEquals("NAME", feature.path("fields").get(0).path("column").asText()); assertEquals(100, feature.path("fields").get(0).path("length").asInt()); diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprint.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprint.java index 8906476..1b46b1a 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprint.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprint.java @@ -25,6 +25,7 @@ public record PageBlueprint( public static final int VERSION = 1; public static final String RECIPE_MAINTENANCE_CRUD = "maintenance-crud-v1"; + public static final String RECIPE_TREE_CRUD = "tree-crud-v1"; public PageBlueprint { fields = fields == null ? List.of() : List.copyOf(fields); diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java index a8ad36e..7a53706 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java @@ -22,6 +22,9 @@ public final class PageBlueprintCompiler { if (PageBlueprint.RECIPE_MAINTENANCE_CRUD.equals(blueprint.recipe())) { return maintenanceCrud(blueprint); } + if (PageBlueprint.RECIPE_TREE_CRUD.equals(blueprint.recipe())) { + return treeCrud(blueprint); + } throw new IllegalArgumentException("Unsupported page recipe: " + blueprint.recipe()); } @@ -29,8 +32,7 @@ public final class PageBlueprintCompiler { ObjectNode page = objectMapper.createObjectNode(); page.put("type", "page"); page.put("title", blueprint.title()); - ArrayNode body = page.putArray("body"); - ObjectNode crud = body.addObject(); + ObjectNode crud = page.putObject("body"); String crudName = lowerCamel(blueprint.tableName()) + "Crud"; crud.put("type", "crud"); crud.put("name", crudName); @@ -65,6 +67,46 @@ public final class PageBlueprintCompiler { return page; } + private ObjectNode treeCrud(PageBlueprint blueprint) { + ObjectNode page = objectMapper.createObjectNode(); + page.put("type", "page"); + page.put("title", blueprint.title()); + ObjectNode crud = page.putObject("body"); + String crudName = lowerCamel(blueprint.tableName()) + "TreeCrud"; + crud.put("type", "crud"); + crud.put("name", crudName); + crud.put("syncLocation", false); + crud.put("childrenColumnName", "children"); + ObjectNode api = crud.putObject("api"); + api.put("method", "get"); + api.put("url", "/api/entity/" + blueprint.tableName() + + "/tree?parentKey=PARENTID&idKey=" + blueprint.primaryKey() + "&perPage=2000"); + api.put("adaptor", "return payload;"); + + ArrayNode headerToolbar = crud.putArray("headerToolbar"); + if (blueprint.allowCreate()) { + ObjectNode addButton = headerToolbar.addObject(); + addButton.put("type", "button"); + addButton.put("label", "新增顶级" + blueprint.entityName()); + addButton.put("level", "primary"); + addButton.put("icon", "fa fa-plus"); + addButton.put("actionType", "dialog"); + ObjectNode addDialog = addButton.putObject("dialog"); + addDialog.put("title", "新增顶级" + blueprint.entityName()); + ObjectNode addForm = addDialog.putObject("body"); + addForm.put("type", "form"); + addForm.put("api", "post:/api/entity/" + blueprint.tableName() + "/save"); + addForm.put("reload", crudName); + ArrayNode controls = formControlsExcluding(blueprint, false, "PARENTID"); + controls.add(hidden("PARENTID", "")); + addForm.set("body", controls); + } + headerToolbar.add(reloadButton(crudName)); + crud.putArray("footerToolbar"); + crud.set("columns", treeColumns(blueprint, crudName)); + return page; + } + private ArrayNode columns(PageBlueprint blueprint, String crudName) { ArrayNode columns = objectMapper.createArrayNode(); for (PageBlueprintField field : blueprint.fields()) { @@ -92,6 +134,69 @@ public final class PageBlueprintCompiler { return columns; } + private ArrayNode treeColumns(PageBlueprint blueprint, String crudName) { + ArrayNode columns = objectMapper.createArrayNode(); + for (PageBlueprintField field : blueprint.fields()) { + if (!field.listVisible() || "PARENTID".equals(field.name())) { + continue; + } + ObjectNode column = columns.addObject(); + column.put("name", field.name()); + column.put("label", field.label()); + } + ObjectNode op = columns.addObject(); + op.put("type", "operation"); + op.put("label", "操作"); + op.put("width", 240); + ArrayNode buttons = op.putArray("buttons"); + if (blueprint.allowCreate()) { + addChildAction(blueprint, buttons, crudName); + } + if (blueprint.allowEdit()) { + addTreeEditAction(blueprint, buttons, crudName); + } + if (blueprint.allowDelete()) { + addDeleteAction(blueprint, buttons, crudName); + } + return columns; + } + + private void addChildAction(PageBlueprint blueprint, ArrayNode buttons, String crudName) { + ObjectNode addChild = buttons.addObject(); + addChild.put("type", "button"); + addChild.put("label", "加子" + blueprint.entityName()); + addChild.put("level", "link"); + addChild.put("actionType", "dialog"); + ObjectNode dialog = addChild.putObject("dialog"); + dialog.put("title", "在${" + blueprint.displayField() + "}下新增" + blueprint.entityName()); + ObjectNode form = dialog.putObject("body"); + form.put("type", "form"); + form.put("api", "post:/api/entity/" + blueprint.tableName() + "/save"); + form.put("reload", crudName); + ArrayNode controls = objectMapper.createArrayNode(); + controls.add(hidden("PARENTID", "${" + blueprint.primaryKey() + "}")); + controls.addAll(formControlsExcluding(blueprint, false, "PARENTID")); + form.set("body", controls); + } + + private void addTreeEditAction(PageBlueprint blueprint, ArrayNode buttons, String crudName) { + ObjectNode edit = buttons.addObject(); + edit.put("type", "button"); + edit.put("label", "编辑"); + edit.put("level", "link"); + edit.put("actionType", "dialog"); + ObjectNode editDialog = edit.putObject("dialog"); + editDialog.put("title", "编辑${" + blueprint.displayField() + "}"); + ObjectNode editForm = editDialog.putObject("body"); + editForm.put("type", "form"); + editForm.put("api", "post:/api/entity/" + blueprint.tableName() + "/save"); + editForm.put("reload", crudName); + ArrayNode editControls = formControlsExcluding(blueprint, true, "PARENTID"); + editControls.add(hidden("PARENTID", "${PARENTID}")); + editControls.add(hidden(blueprint.primaryKey(), "${" + blueprint.primaryKey() + "}")); + editForm.set("body", editControls); + } + private void addEditAction(PageBlueprint blueprint, ArrayNode buttons) { ObjectNode edit = buttons.addObject(); edit.put("type", "button"); @@ -129,9 +234,13 @@ public final class PageBlueprintCompiler { } private ArrayNode formControls(PageBlueprint blueprint, boolean bindCurrentRow) { + return formControlsExcluding(blueprint, bindCurrentRow); + } + + private ArrayNode formControlsExcluding(PageBlueprint blueprint, boolean bindCurrentRow, String... excludedFields) { ArrayNode controls = objectMapper.createArrayNode(); for (PageBlueprintField field : blueprint.fields()) { - if (!field.formVisible()) { + if (!field.formVisible() || isExcluded(field.name(), excludedFields)) { continue; } ObjectNode c = controls.addObject(); @@ -148,6 +257,25 @@ public final class PageBlueprintCompiler { return controls; } + private ObjectNode hidden(String name, String value) { + ObjectNode hidden = objectMapper.createObjectNode(); + hidden.put("type", "hidden"); + hidden.put("name", name); + hidden.put("value", value); + return hidden; + } + + private ObjectNode reloadButton(String target) { + ObjectNode button = objectMapper.createObjectNode(); + button.put("type", "button"); + button.put("label", "刷新"); + button.put("level", "link"); + button.put("icon", "fa fa-refresh"); + button.put("actionType", "reload"); + button.put("target", target); + return button; + } + private void validate(PageBlueprint blueprint) { if (blueprint == null) { throw new IllegalArgumentException("Page blueprint is required"); @@ -155,7 +283,8 @@ public final class PageBlueprintCompiler { if (blueprint.schemaVersion() != PageBlueprint.VERSION) { throw new IllegalArgumentException("Unsupported page blueprint version: " + blueprint.schemaVersion()); } - if (!PageBlueprint.RECIPE_MAINTENANCE_CRUD.equals(blueprint.recipe())) { + if (!PageBlueprint.RECIPE_MAINTENANCE_CRUD.equals(blueprint.recipe()) + && !PageBlueprint.RECIPE_TREE_CRUD.equals(blueprint.recipe())) { throw new IllegalArgumentException("Unsupported page recipe: " + blueprint.recipe()); } required(blueprint.templateId(), "templateId"); @@ -179,6 +308,10 @@ public final class PageBlueprintCompiler { if (!displayFieldExists) { throw new IllegalArgumentException("displayField must match one blueprint field"); } + if (PageBlueprint.RECIPE_TREE_CRUD.equals(blueprint.recipe()) + && blueprint.fields().stream().noneMatch(field -> "PARENTID".equals(field.name()))) { + throw new IllegalArgumentException("tree-crud-v1 requires PARENTID field"); + } if (blueprint.pageSize() < 1 || blueprint.pageSize() > 200) { throw new IllegalArgumentException("pageSize must be between 1 and 200"); } @@ -200,6 +333,15 @@ public final class PageBlueprintCompiler { }; } + private static boolean isExcluded(String fieldName, String... excludedFields) { + for (String excluded : excludedFields) { + if (excluded.equals(fieldName)) { + return true; + } + } + return false; + } + private static String lowerCamel(String table) { String[] parts = table.toLowerCase(Locale.ROOT).split("_+"); StringBuilder sb = new StringBuilder(parts[0]); diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java index 17b2d61..deca6b4 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeRegistry.java @@ -24,7 +24,7 @@ public final class PageRecipeRegistry { } public static PageRecipeRegistry defaults() { - return new PageRecipeRegistry(List.of(maintenanceCrud())); + return new PageRecipeRegistry(List.of(maintenanceCrud(), treeCrud())); } public Optional find(String recipe) { @@ -49,6 +49,7 @@ public final class PageRecipeRegistry { } return switch (blueprint.recipe()) { case PageBlueprint.RECIPE_MAINTENANCE_CRUD -> new PageBlueprintCompiler(objectMapper).compile(blueprint); + case PageBlueprint.RECIPE_TREE_CRUD -> new PageBlueprintCompiler(objectMapper).compile(blueprint); default -> throw new IllegalArgumentException("Unsupported page recipe: " + blueprint.recipe()); }; } @@ -67,4 +68,19 @@ public final class PageRecipeRegistry { "boolean", "switch"), List.of("page-recipe", "typed-page-schema", "amis-schema", "local-smoke", "playwright-render")); } + + private static PageRecipeDefinition treeCrud() { + return new PageRecipeDefinition( + PageBlueprint.RECIPE_TREE_CRUD, + PageBlueprint.VERSION, + "EIP4 tree CRUD page", + Map.of( + "string", "input-text", + "integer", "input-number", + "number", "input-number", + "date", "input-date", + "datetime", "input-datetime", + "boolean", "switch"), + List.of("page-recipe", "typed-page-schema", "amis-schema", "local-smoke", "playwright-render")); + } } diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/EntityController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/EntityController.java index a6945c9..3b957b8 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/EntityController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/EntityController.java @@ -108,6 +108,51 @@ public class EntityController { return resp; } + /** + * 树形查询:GET /api/entity/{table}/tree?parentKey=PARENTID&idKey={TABLE}_ID。 + * + *

用于 AI page recipe `tree-crud-v1` 和通用树表页面。端点仍走实体白名单和引擎查询, + * 只在现代层把平面结果组装为 amis tree/crud 可消费的 {@code children} 层级。 + */ + @GetMapping("/{table}/tree") + public Map tree(@PathVariable String table, + @RequestParam(defaultValue = "PARENTID") String parentKey, + @RequestParam(required = false) String idKey, + @RequestParam(defaultValue = "2000") int perPage, + @RequestParam(required = false) String asUser, + @RequestParam(required = false) String roles, + @RequestParam(required = false) String asDepart, + @RequestParam(required = false) String asOrg, + @RequestParam(required = false) String orderBy, + @RequestParam(required = false) String orderDir) { + String t = table.toUpperCase(); + identifierWhitelist.requireLegalTable(t); + String idCol = idKey == null || idKey.isBlank() ? t + "_ID" : idKey.toUpperCase(); + String parentCol = parentKey == null || parentKey.isBlank() ? "PARENTID" : parentKey.toUpperCase(); + identifierWhitelist.requireLegalColumn(t, idCol, "树主键列"); + identifierWhitelist.requireLegalColumn(t, parentCol, "树父级列"); + + Properties ctx = buildCtx(asUser, roles, asDepart, asOrg); + Map cond = new HashMap<>(); + cond.put(POJOCRUDService.PAGE_START, 0); + cond.put(POJOCRUDService.PAGE_SIZE, Math.max(1, Math.min(perPage, 10000))); + applyOrder(cond, t, orderBy, orderDir); + + Map result = pojoCRUDService.listSelect(cond, t, ctx); + List> flat = toRows(result.get(POJOCRUDService.LIST_RESULT)); + List> roots = buildTree(flat, idCol, parentCol); + + Map data = new HashMap<>(); + data.put("items", roots); + data.put("total", flat.size()); + + Map resp = new HashMap<>(); + resp.put("status", 0); + resp.put("msg", ""); + resp.put("data", data); + return resp; + } + /** * 单条加载:GET /api/entity/{table}/{id}[?pageId=] * @@ -231,6 +276,49 @@ public class EntityController { return row; } + @SuppressWarnings("unchecked") + private static List> buildTree(List> flat, String idKey, String parentKey) { + Map> byId = new LinkedHashMap<>(); + for (Map row : flat) { + String id = text(rowValue(row, idKey)); + if (id.isBlank()) { + id = text(row.get("_id")); + } + if (!id.isBlank()) { + byId.put(id, row); + } + } + List> roots = new ArrayList<>(); + for (Map row : flat) { + String parentId = text(rowValue(row, parentKey)); + Map parent = parentId.isBlank() ? null : byId.get(parentId); + if (parent == null || parent == row) { + roots.add(row); + continue; + } + List> children = (List>) parent.computeIfAbsent( + "children", ignored -> new ArrayList>()); + children.add(row); + } + return roots; + } + + private static Object rowValue(Map row, String key) { + if (row.containsKey(key)) { + return row.get(key); + } + for (Map.Entry entry : row.entrySet()) { + if (key.equalsIgnoreCase(entry.getKey())) { + return entry.getValue(); + } + } + return null; + } + + private static String text(Object value) { + return value == null ? "" : String.valueOf(value).trim(); + } + /** * 去 CHAR 列尾部补白:DB CHAR(n) 主键/引用值带尾空格(如 {@code "MESSAGE "}),而 * picker 选项 {@code _id}(PickerController 已 .trim())与表单提交值均为无补白形态。表单加载 diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java index 984cff8..dac3ff5 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java @@ -39,7 +39,7 @@ class PageBlueprintCompilerTest { assertEquals("page", schema.path("type").asText()); assertEquals("合同类型维护", schema.path("title").asText()); - ObjectNode crud = (ObjectNode) schema.path("body").get(0); + ObjectNode crud = (ObjectNode) schema.path("body"); assertEquals("crud", crud.path("type").asText()); assertEquals("eip4aiContractTypeCrud", crud.path("name").asText()); assertEquals("/api/entity/EIP4AI_CONTRACT_TYPE/list?page=${page}&perPage=${perPage}", @@ -55,6 +55,46 @@ class PageBlueprintCompilerTest { .path("className").asText()); } + @Test + @DisplayName("tree-crud-v1 编译为 EIP4 标准 amis 树表维护页") + void compilesTreeCrudRecipe() { + PageBlueprint blueprint = new PageBlueprint( + PageBlueprint.VERSION, + PageBlueprint.RECIPE_TREE_CRUD, + "eip4ai-category", + "分类维护", + "EIP4AI_CATEGORY", + "分类", + "EIP4AI_CATEGORY_ID", + "NAME", + List.of( + new PageBlueprintField("NAME", "名称", "string", true, true, true), + new PageBlueprintField("PARENTID", "上级", "string", false, false, true), + new PageBlueprintField("SEQ", "排序", "integer", false, true, true)), + true, + true, + true, + 20); + + ObjectNode schema = new PageBlueprintCompiler(MAPPER).compile(blueprint); + + ObjectNode crud = (ObjectNode) schema.path("body"); + assertEquals("crud", crud.path("type").asText()); + assertEquals("eip4aiCategoryTreeCrud", crud.path("name").asText()); + assertEquals("children", crud.path("childrenColumnName").asText()); + assertEquals("/api/entity/EIP4AI_CATEGORY/tree?parentKey=PARENTID&idKey=EIP4AI_CATEGORY_ID&perPage=2000", + crud.path("api").path("url").asText()); + assertEquals("新增顶级分类", crud.path("headerToolbar").get(0).path("label").asText()); + assertEquals("reload", crud.path("headerToolbar").get(1).path("actionType").asText()); + assertEquals("eip4aiCategoryTreeCrud", crud.path("headerToolbar").get(1).path("target").asText()); + assertEquals("操作", crud.path("columns").get(2).path("label").asText()); + assertEquals("加子分类", crud.path("columns").get(2).path("buttons").get(0).path("label").asText()); + assertEquals("PARENTID", crud.path("columns").get(2).path("buttons").get(0) + .path("dialog").path("body").path("body").get(0).path("name").asText()); + assertEquals("text-danger", crud.path("columns").get(2).path("buttons").get(2) + .path("className").asText()); + } + @Test @DisplayName("不支持的 recipe 会被拒绝") void rejectsUnsupportedRecipe() { @@ -75,4 +115,25 @@ class PageBlueprintCompilerTest { assertThrows(IllegalArgumentException.class, () -> new PageBlueprintCompiler(MAPPER).compile(blueprint)); } + + @Test + @DisplayName("tree-crud-v1 必须声明 PARENTID 字段") + void rejectsTreeCrudWithoutParentField() { + PageBlueprint blueprint = new PageBlueprint( + PageBlueprint.VERSION, + PageBlueprint.RECIPE_TREE_CRUD, + "tpl", + "标题", + "EIP4AI_T", + "实体", + "EIP4AI_T_ID", + "NAME", + List.of(new PageBlueprintField("NAME", "名称", "string", true, true, true)), + true, + true, + true, + 20); + + assertThrows(IllegalArgumentException.class, () -> new PageBlueprintCompiler(MAPPER).compile(blueprint)); + } } diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidatorTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidatorTest.java index 636c571..4ed14bf 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidatorTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageRecipeValidatorTest.java @@ -40,6 +40,17 @@ class PageRecipeValidatorTest { assertTrue(report.messages().get(0).contains("$.title")); } + @Test + @DisplayName("page recipe 校验接受 tree-crud-v1 输出") + void acceptsTreeCrudRecipeOutput() { + PageBlueprint blueprint = treeBlueprint(); + ObjectNode schema = new PageBlueprintCompiler(MAPPER).compile(blueprint); + + PageRecipeValidationReport report = validator.validate(blueprint, schema); + + assertTrue(report.valid()); + } + private static PageBlueprint blueprint() { return new PageBlueprint( PageBlueprint.VERSION, @@ -58,4 +69,23 @@ class PageRecipeValidatorTest { true, 20); } + + private static PageBlueprint treeBlueprint() { + return new PageBlueprint( + PageBlueprint.VERSION, + PageBlueprint.RECIPE_TREE_CRUD, + "eip4ai-category", + "分类维护", + "EIP4AI_CATEGORY", + "分类", + "EIP4AI_CATEGORY_ID", + "NAME", + List.of( + new PageBlueprintField("NAME", "名称", "string", true, true, true), + new PageBlueprintField("PARENTID", "上级", "string", false, false, true)), + true, + true, + true, + 20); + } } diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/EntityControllerWhitelistTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/EntityControllerWhitelistTest.java index c53b88f..b1bca05 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/EntityControllerWhitelistTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/EntityControllerWhitelistTest.java @@ -104,6 +104,36 @@ class EntityControllerWhitelistTest { verify(wl).requireLegalColumn(eq(TABLE), eq("ORDERNO"), eq("排序列")); } + @Test + @SuppressWarnings("unchecked") + void tree查询组装children并校验树列() { + IdentifierWhitelist wl = mock(IdentifierWhitelist.class); + POJOCRUDService engine = mock(POJOCRUDService.class); + Map engineResult = new HashMap<>(); + engineResult.put(POJOCRUDService.LIST_RESULT, List.of( + treeRow("root-1", "", "根节点"), + treeRow("child-1", "root-1", "子节点"))); + engineResult.put(POJOCRUDService.PAGE_COUNT, 2L); + when(engine.listSelect(any(), eq(TABLE), any(Properties.class))).thenReturn(engineResult); + EntityController c = new EntityController(engine, wl, + mock(org.springframework.jdbc.core.JdbcTemplate.class), mock(PickerController.class)); + + Map resp = c.tree(TABLE, "PARENTID", "EIP4PT_ORDER_ID", + 2000, null, null, null, null, null, null); + + assertEquals(0, resp.get("status")); + Map data = (Map) resp.get("data"); + List> roots = (List>) data.get("items"); + assertEquals(1, roots.size()); + assertEquals("根节点", roots.get(0).get("NAME")); + List> children = (List>) roots.get(0).get("children"); + assertEquals(1, children.size()); + assertEquals("子节点", children.get(0).get("NAME")); + verify(wl).requireLegalTable(TABLE); + verify(wl).requireLegalColumn(TABLE, "EIP4PT_ORDER_ID", "树主键列"); + verify(wl).requireLegalColumn(TABLE, "PARENTID", "树父级列"); + } + @Test @SuppressWarnings("unchecked") void 保留键不过白名单只放行() { @@ -145,6 +175,19 @@ class EntityControllerWhitelistTest { return p; } + private static GeneralPOJO treeRow(String id, String parentId, String name) { + GeneralPOJO p = mock(GeneralPOJO.class); + when(p.get_ID()).thenReturn(id); + when(p.get_ColumnCount()).thenReturn(3); + when(p.get_ColumnName(0)).thenReturn("EIP4PT_ORDER_ID"); + when(p.get_Value(0)).thenReturn(id); + when(p.get_ColumnName(1)).thenReturn("PARENTID"); + when(p.get_Value(1)).thenReturn(parentId); + when(p.get_ColumnName(2)).thenReturn("NAME"); + when(p.get_Value(2)).thenReturn(name); + return p; + } + @Test @SuppressWarnings("unchecked") void load带pageId_SelectDialog字段返对象() { From d91da77038ab6f44bf6f66071d52e2fd3bc2eac8 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 13:28:49 +0800 Subject: [PATCH 15/53] feat: add AI render plan gate --- docs/AI_AGENT_AUTO_DEVELOPMENT.md | 5 +- docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md | 3 +- docs/skills/eip4-ai-feature-development.md | 1 + .../platform/ai/service/AiAgentService.java | 112 +++++++++++++++++- .../ai/service/AiFeatureDraftGenerator.java | 79 ++++++++++++ .../ai/service/AiAgentServiceTest.java | 103 +++++++++++++--- .../service/AiFeatureDraftGeneratorTest.java | 29 +++++ 7 files changed, 313 insertions(+), 19 deletions(-) diff --git a/docs/AI_AGENT_AUTO_DEVELOPMENT.md b/docs/AI_AGENT_AUTO_DEVELOPMENT.md index 6ed2e34..7dae927 100644 --- a/docs/AI_AGENT_AUTO_DEVELOPMENT.md +++ b/docs/AI_AGENT_AUTO_DEVELOPMENT.md @@ -128,11 +128,12 @@ curl -X POST http://localhost:8093/api/ai/features/auto-develop \ 3. 生成 `ENTITY`、`PAGE_SCHEMA`、`SERVICEFLOW`、`MENU`、`TEST` 草稿。`PAGE_SCHEMA` 先生成 EIP4 PageBlueprint,再由平台编译器输出 amis schema;草稿 metadata 保留 blueprint 证据。 未指定 `feature.pageRecipe` 时默认使用 `maintenance-crud-v1`;树形维护页应指定 `tree-crud-v1`。 -4. 对草稿执行基础门禁,包括 page-recipe、amis schema、typed page schema、服务流 XML、实体字段和 smoke 计划。 +4. 对草稿执行基础门禁,包括 page-recipe、amis schema、typed page schema、服务流 XML、实体字段、smoke 计划和 render plan。 5. 生成待人审 `AiChangeSet`。 6. 生成 release plan。 7. 本地 apply:实体走本机 `/api/meta/entity`,页面/服务流写本地库;如果本地最小库缺少 `sys_menu`,菜单发布标记为 `SKIPPED`,不阻断本地 gate,部署包仍保留菜单 SQL 供线上人审。 8. 本地 smoke:只允许 `localhost`、`127.0.0.1`、`::1` baseUrl;HTTP 状态必须匹配,且 JSON 响应体存在 `status` 时必须为 0。 + `TEST` 草稿同时包含 `renderTests`,给 Playwright 渲染验收提供 recipe、schemaUrl、预期组件、CRUD 名、数据 API、列、动作和关键文本。 9. 若失败,自动生成 repair plan 并执行修复重试。 10. 生成线上人工部署包,包含 manifest、SQL 草案、回滚 SQL 和本地执行证据。 11. 可选:生成功能包快照并保存 revision,用于后续导出、差异比较和回滚扩展。 @@ -174,6 +175,6 @@ EIP4_AI_LLM_REPAIR_MODEL=... ## 当前验证结论与遗留项 -已在 `local` profile 验证完整自动开发链路:实体创建、默认服务流发布、页面 schema 发布、实体列表、默认搜索流和新增数据 smoke 均通过,最终状态为 `READY_FOR_HUMAN_REVIEW`。`local` 最小库没有菜单表,因此菜单 apply 为 `SKIPPED`,这是预期的本地边界。 +已在 `local` profile 验证完整自动开发链路:实体创建、默认服务流发布、页面 schema 发布、实体列表/树列表、默认搜索流和新增数据 smoke 均通过,最终状态为 `READY_FOR_HUMAN_REVIEW`。`local` 最小库没有菜单表,因此菜单 apply 为 `SKIPPED`,这是预期的本地边界。 遗留项是全局 metadata 辅助读路径仍有部分 SQL 写死 `eip3.` schema;在 `local/eip4m0` 下会出现非阻断 warning。AI 主链路已规避/修正必要路径,后续如果要让所有后台辅助解析在 `local` 最小库完全无噪声,需要单独做一次 schema 兼容清理。 diff --git a/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md b/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md index b4d5619..cfbb97a 100644 --- a/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md +++ b/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md @@ -117,10 +117,11 @@ AI 自动开发链路中的 `PAGE_SCHEMA` 草稿仍然保存编译后的 amis sc - `typed-page-schema`:校验组件和 actionType 来自 EIP4 注册表。 - `amis-schema`:校验最终 schema 符合 amis schema。 - `local-smoke`:本地发布后访问页面、实体、服务流和新增接口。 +- `render-plan`:`TEST` 草稿必须提供 Playwright 可消费的 `renderTests`,包含 recipe、schemaUrl、预期根组件、CRUD 名、数据 API、列表列、页面动作和关键文本。 ## 后续演进 1. 增加 `master-detail-v1`、`approval-task-v1` recipe。 2. 让设计器 overlay 保存也能记录对应 blueprint 或 template 来源。 3. 在功能包中导出 blueprint,线上部署包继续导出编译后的 amis schema。 -4. Playwright E2E 从 recipe 反推出应验证的 UI 行为。 +4. Playwright E2E 消费 `renderTests`,执行真实浏览器渲染并回写运行证据。 diff --git a/docs/skills/eip4-ai-feature-development.md b/docs/skills/eip4-ai-feature-development.md index 2efa94e..e5ca36c 100644 --- a/docs/skills/eip4-ai-feature-development.md +++ b/docs/skills/eip4-ai-feature-development.md @@ -78,6 +78,7 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai auto-develop \ - 部署包存在且 `requiresHumanApproval=true`。 - 页面 schema 只能使用组件能力表中注册的组件和动作。 - `PAGE_SCHEMA` 草稿必须声明并通过 `page-recipe` 门禁;普通维护页为 `maintenance-crud-v1`,树形维护页为 `tree-crud-v1`。 +- `TEST` 草稿必须通过 `smoke-plan` 和 `render-plan`;`renderTests` 是后续 Playwright 渲染验收的输入,需包含预期组件、列、动作、数据 API 和关键文本。 ## 页面 schema 校验 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 4b5311f..2591b47 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 @@ -876,7 +876,10 @@ public class AiAgentService { case ENTITY -> gates.add(validateEntityGate(payload)); case SERVICEFLOW -> gates.add(validateServiceFlowGate(payload)); case MENU -> gates.add(validateMenuGate(payload)); - case TEST -> gates.add(validateTestGate(payload)); + case TEST -> { + gates.add(validateTestGate(payload)); + gates.add(validateRenderPlanGate(payload)); + } case CODE -> gates.add(new AiGateResult("code-review-required", true, List.of("代码草稿需后续静态检查/单测门禁"))); } return List.copyOf(gates); @@ -971,6 +974,113 @@ public class AiAgentService { return new AiGateResult("smoke-plan", messages.isEmpty(), messages.stream().limit(20).toList()); } + private AiGateResult validateRenderPlanGate(JsonNode payload) { + List messages = new ArrayList<>(); + JsonNode tests = payload.path("renderTests"); + if (!tests.isArray() || tests.isEmpty()) { + messages.add("renderTests 至少需要 1 条"); + } else { + for (JsonNode test : tests) { + String name = test.path("name").asText(""); + String recipe = test.path("recipe").asText(""); + String schemaUrl = test.path("schemaUrl").asText(""); + String rootType = test.path("expectedRootType").asText(""); + String bodyType = test.path("expectedBodyType").asText(""); + String crudName = test.path("expectedCrudName").asText(""); + String expectedApi = test.path("expectedApi").asText(""); + JsonNode components = test.path("expectedComponents"); + JsonNode columns = test.path("expectedColumns"); + JsonNode actions = test.path("expectedActions"); + JsonNode texts = test.path("expectedTexts"); + if (name.isBlank()) { + messages.add("render name 不能为空"); + } + if (pageRecipeRegistry.find(recipe).isEmpty()) { + messages.add("render recipe 未注册: " + recipe); + } + if (!schemaUrl.startsWith("/api/page/schema/")) { + messages.add("render schemaUrl 必须以 /api/page/schema/ 开头: " + schemaUrl); + } + if (!"page".equals(rootType)) { + messages.add("render expectedRootType 必须是 page"); + } + if (!"crud".equals(bodyType)) { + messages.add("render expectedBodyType 必须是 crud"); + } + if (crudName.isBlank()) { + messages.add("render expectedCrudName 不能为空"); + } + if (!expectedApi.startsWith("/api/entity/")) { + messages.add("render expectedApi 必须指向 /api/entity/: " + expectedApi); + } + if (PageBlueprint.RECIPE_TREE_CRUD.equals(recipe) && !expectedApi.contains("/tree?")) { + messages.add("tree-crud-v1 render expectedApi 必须是树接口"); + } + if (PageBlueprint.RECIPE_MAINTENANCE_CRUD.equals(recipe) && !expectedApi.contains("/list?")) { + messages.add("maintenance-crud-v1 render expectedApi 必须是列表接口"); + } + if (!components.isArray() || components.isEmpty()) { + messages.add("render expectedComponents 至少需要 1 项"); + } else { + if (!arrayContainsText(components, "page")) { + messages.add("render expectedComponents 必须包含 page"); + } + if (!arrayContainsText(components, "crud")) { + messages.add("render expectedComponents 必须包含 crud"); + } + } + if (!columns.isArray() || columns.isEmpty()) { + messages.add("render expectedColumns 至少需要 1 项"); + } else { + for (JsonNode column : columns) { + if (column.path("name").asText("").isBlank()) { + messages.add("render expectedColumns.name 不能为空"); + } + if (column.path("label").asText("").isBlank()) { + messages.add("render expectedColumns.label 不能为空"); + } + } + } + if (!actions.isArray() || actions.isEmpty()) { + messages.add("render expectedActions 至少需要 1 项"); + } else { + if (!arrayContainsText(actions, "新增") + && !arrayContainsTextStartingWith(actions, "新增顶级")) { + messages.add("render expectedActions 必须包含新增动作"); + } + if (!arrayContainsText(actions, "编辑")) { + messages.add("render expectedActions 必须包含编辑动作"); + } + if (!arrayContainsText(actions, "删除")) { + messages.add("render expectedActions 必须包含删除动作"); + } + } + if (!texts.isArray() || texts.isEmpty()) { + messages.add("render expectedTexts 至少需要 1 项"); + } + } + } + return new AiGateResult("render-plan", messages.isEmpty(), messages.stream().limit(20).toList()); + } + + private static boolean arrayContainsText(JsonNode array, String value) { + for (JsonNode item : array) { + if (value.equals(item.asText(""))) { + return true; + } + } + return false; + } + + private static boolean arrayContainsTextStartingWith(JsonNode array, String prefix) { + for (JsonNode item : array) { + if (item.asText("").startsWith(prefix)) { + return true; + } + } + return false; + } + private static boolean isValidFlowXml(String xml) { if (xml == null || xml.isBlank()) { return false; diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java index 30a6ccc..6e03995 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java @@ -141,8 +141,11 @@ public class AiFeatureDraftGenerator { ObjectNode create = addSmoke(tests, "entity-create", "POST", "/api/entity/" + spec.tableName() + "/save", 200); create.set("requestBody", sampleEntityBody(spec)); + ArrayNode renderTests = root.putArray("renderTests"); + addRender(renderTests, spec); ArrayNode manual = root.putArray("manualGates"); manual.add("确认实体字段、菜单位置、权限角色和服务流写入策略"); + manual.add("按 renderTests 使用 Playwright 渲染页面,确认组件、列和操作按钮符合 recipe"); manual.add("确认本地 smoke 通过后再人工部署线上"); return root; } @@ -156,6 +159,71 @@ public class AiFeatureDraftGenerator { return t; } + private void addRender(ArrayNode renderTests, FeatureSpec spec) { + ObjectNode render = renderTests.addObject(); + render.put("name", "page-render"); + render.put("recipe", spec.pageRecipe()); + render.put("schemaUrl", "/api/page/schema/" + spec.templateId()); + render.put("expectedRootType", "page"); + render.put("expectedBodyType", "crud"); + render.put("expectedCrudName", expectedCrudName(spec)); + render.put("expectedApi", expectedPageApi(spec)); + if (PageBlueprint.RECIPE_TREE_CRUD.equals(spec.pageRecipe())) { + render.put("childrenColumnName", "children"); + } + ArrayNode components = render.putArray("expectedComponents"); + components.add("page"); + components.add("crud"); + components.add("form"); + components.add("button"); + addExpectedColumns(render.putArray("expectedColumns"), spec); + addExpectedActions(render.putArray("expectedActions"), spec); + ArrayNode texts = render.putArray("expectedTexts"); + texts.add(spec.featureName()); + texts.add(spec.entityName()); + for (FieldSpec field : spec.fields()) { + if (!"PARENTID".equals(field.column())) { + texts.add(field.label()); + } + } + } + + private void addExpectedColumns(ArrayNode columns, FeatureSpec spec) { + for (FieldSpec field : spec.fields()) { + if ("PARENTID".equals(field.column())) { + continue; + } + ObjectNode column = columns.addObject(); + column.put("name", field.column()); + column.put("label", field.label()); + } + } + + private void addExpectedActions(ArrayNode actions, FeatureSpec spec) { + if (PageBlueprint.RECIPE_TREE_CRUD.equals(spec.pageRecipe())) { + actions.add("新增顶级" + spec.entityName()); + actions.add("刷新"); + actions.add("加子" + spec.entityName()); + } else { + actions.add("新增"); + } + actions.add("编辑"); + actions.add("删除"); + } + + private static String expectedCrudName(FeatureSpec spec) { + return lowerCamel(spec.tableName()) + + (PageBlueprint.RECIPE_TREE_CRUD.equals(spec.pageRecipe()) ? "TreeCrud" : "Crud"); + } + + private static String expectedPageApi(FeatureSpec spec) { + if (PageBlueprint.RECIPE_TREE_CRUD.equals(spec.pageRecipe())) { + return "/api/entity/" + spec.tableName() + + "/tree?parentKey=PARENTID&idKey=" + spec.tableName() + "_ID&perPage=2000"; + } + return "/api/entity/" + spec.tableName() + "/list?page=${page}&perPage=${perPage}"; + } + private ObjectNode sampleEntityBody(FeatureSpec spec) { ObjectNode body = objectMapper.createObjectNode(); for (FieldSpec field : spec.fields()) { @@ -303,6 +371,17 @@ public class AiFeatureDraftGenerator { return metadata; } + private static String lowerCamel(String table) { + String[] parts = table.toLowerCase(Locale.ROOT).split("_+"); + StringBuilder sb = new StringBuilder(parts[0]); + for (int i = 1; i < parts.length; i++) { + if (!parts[i].isBlank()) { + sb.append(Character.toUpperCase(parts[i].charAt(0))).append(parts[i].substring(1)); + } + } + return sb.toString(); + } + @SuppressWarnings("unchecked") private Map pageSchemaMetadata(PageBlueprint pageBlueprint) { Map metadata = metadata("page-schema", "sys_page_schema"); 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 e0a992e..ab028e9 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 @@ -115,6 +115,64 @@ class AiAgentServiceTest { assertEquals(400, ex.getStatusCode().value()); } + @Test + @DisplayName("TEST 草稿必须包含页面渲染计划") + void testDraftRequiresRenderPlan() throws Exception { + AiAgentService service = newService(); + var task = service.createTask("验证渲染计划门禁"); + JsonNode payload = MAPPER.readTree(""" + {"publishTarget":"local-smoke","smokeTests":[ + {"name":"page-schema","method":"GET","url":"/api/page/schema/demo","expectHttpStatus":200} + ]} + """); + + var draft = service.addDraft(task.id(), "TEST", "demo-smoke", payload, null); + + assertFalse(draft.passed()); + assertTrue(draft.gates().stream() + .anyMatch(g -> "render-plan".equals(g.name()) && !g.passed() + && g.messages().toString().contains("renderTests"))); + ResponseStatusException ex = assertThrows(ResponseStatusException.class, + () -> service.createChangeSet(task.id())); + assertEquals(409, ex.getStatusCode().value()); + } + + @Test + @DisplayName("TEST 渲染计划必须声明列和动作断言") + void testDraftRequiresRenderColumnsAndActions() throws Exception { + AiAgentService service = newService(); + var task = service.createTask("验证渲染计划细节门禁"); + JsonNode payload = MAPPER.readTree(""" + { + "publishTarget":"local-smoke", + "smokeTests":[ + {"name":"page-schema","method":"GET","url":"/api/page/schema/demo","expectHttpStatus":200} + ], + "renderTests":[ + { + "name":"page-render", + "recipe":"maintenance-crud-v1", + "schemaUrl":"/api/page/schema/demo", + "expectedRootType":"page", + "expectedBodyType":"crud", + "expectedCrudName":"demoCrud", + "expectedApi":"/api/entity/EIP4AI_DEMO/list?page=${page}&perPage=${perPage}", + "expectedComponents":["page","crud"], + "expectedTexts":["示例"] + } + ] + } + """); + + var draft = service.addDraft(task.id(), "TEST", "demo-smoke", payload, null); + + assertFalse(draft.passed()); + assertTrue(draft.gates().stream() + .anyMatch(g -> "render-plan".equals(g.name()) && !g.passed() + && g.messages().toString().contains("expectedColumns") + && g.messages().toString().contains("expectedActions"))); + } + @Test @DisplayName("自动开发功能:生成实体/页面/服务流/菜单/测试草稿并创建待人审变更包") void developFeatureCreatesFullDraftSet() { @@ -374,9 +432,7 @@ class AiAgentServiceTest { """); var pageDraft = service.addDraft(task.id(), "PAGE_SCHEMA", "bad-page", pageWithoutBody, Map.of()); assertTrue(pageDraft.passed()); - JsonNode testPayload = MAPPER.readTree(""" - {"smokeTests":[{"name":"page-schema","method":"GET","url":"/api/page/schema/bad-page","expectHttpStatus":200}]} - """); + JsonNode testPayload = testPayload("page-schema", "/api/page/schema/bad-page"); service.addDraft(task.id(), "TEST", "bad-page-smoke", testPayload, Map.of()); var changeSet = service.createChangeSet(task.id()); @@ -407,9 +463,7 @@ class AiAgentServiceTest { {"name":"坏菜单","viewTemplateId":"bad-page","typename":"功能菜单","seq":0} """); service.addDraft(task.id(), "MENU", "bad-page", menu, Map.of()); - JsonNode testPayload = MAPPER.readTree(""" - {"smokeTests":[{"name":"page-schema","method":"GET","url":"/api/page/schema/bad-page","expectHttpStatus":200}]} - """); + JsonNode testPayload = testPayload("page-schema", "/api/page/schema/bad-page"); service.addDraft(task.id(), "TEST", "bad-page-smoke", testPayload, Map.of()); var changeSet = service.createChangeSet(task.id()); @@ -445,9 +499,7 @@ class AiAgentServiceTest { {"requiresEntityId":true,"flows":[{"key":"EIP4AI_FLOW_FIX_SEARCH","displayName":"查询","entityId":"wrong-entity-id","control":true,"updateable":true,"contentXml":""}]} """); service.addDraft(task.id(), "SERVICEFLOW", "EIP4AI_FLOW_FIX_DEFAULT_FLOWS", serviceFlow, Map.of()); - JsonNode testPayload = MAPPER.readTree(""" - {"smokeTests":[{"name":"flow-search","method":"GET","url":"/api/flow/EIP4AI_FLOW_FIX_SEARCH","expectHttpStatus":200}]} - """); + JsonNode testPayload = testPayload("flow-search", "/api/flow/EIP4AI_FLOW_FIX_SEARCH"); service.addDraft(task.id(), "TEST", "flow-fix-smoke", testPayload, Map.of()); var changeSet = service.createChangeSet(task.id()); @@ -478,9 +530,7 @@ class AiAgentServiceTest { {"tablename":"EIP4AI_ENTITY_FIX","name":"实体修复","attributes":[{"column":"NAME","display":"","type":"string","mandatory":true}]} """); service.addDraft(task.id(), "ENTITY", "EIP4AI_ENTITY_FIX", entity, Map.of()); - JsonNode testPayload = MAPPER.readTree(""" - {"smokeTests":[{"name":"entity-list","method":"GET","url":"/api/entity/EIP4AI_ENTITY_FIX/list","expectHttpStatus":200}]} - """); + JsonNode testPayload = testPayload("entity-list", "/api/entity/EIP4AI_ENTITY_FIX/list"); service.addDraft(task.id(), "TEST", "entity-fix-smoke", testPayload, Map.of()); var changeSet = service.createChangeSet(task.id()); @@ -521,9 +571,7 @@ class AiAgentServiceTest { {"tablename":"EIP4AI_ENTITY_FIX","name":"实体修复","attributes":[{"column":"NAME","display":"","type":"string","mandatory":true}]} """); service.addDraft(task.id(), "ENTITY", "EIP4AI_ENTITY_FIX", entity, Map.of()); - JsonNode testPayload = MAPPER.readTree(""" - {"smokeTests":[{"name":"entity-list","method":"GET","url":"/api/entity/EIP4AI_ENTITY_FIX/list","expectHttpStatus":200}]} - """); + JsonNode testPayload = testPayload("entity-list", "/api/entity/EIP4AI_ENTITY_FIX/list"); service.addDraft(task.id(), "TEST", "entity-fix-smoke", testPayload, Map.of()); var changeSet = service.createChangeSet(task.id()); service.applyLocalRelease(task.id(), changeSet.id(), "http://localhost:8084"); @@ -598,6 +646,31 @@ class AiAgentServiceTest { } } + private static JsonNode testPayload(String smokeName, String smokeUrl) { + return json(""" + { + "smokeTests": [ + {"name": "%s", "method": "GET", "url": "%s", "expectHttpStatus": 200} + ], + "renderTests": [ + { + "name": "page-render", + "recipe": "maintenance-crud-v1", + "schemaUrl": "/api/page/schema/test-page", + "expectedRootType": "page", + "expectedBodyType": "crud", + "expectedCrudName": "testPageCrud", + "expectedApi": "/api/entity/EIP4AI_TEST/list?page=${page}&perPage=${perPage}", + "expectedComponents": ["page", "crud", "form", "button"], + "expectedColumns": [{"name": "NAME", "label": "名称"}], + "expectedActions": ["新增", "编辑", "删除"], + "expectedTexts": ["测试页面"] + } + ] + } + """.formatted(smokeName, smokeUrl)); + } + private static class NoopLocalReleaseExecutor extends AiLocalReleaseExecutor { NoopLocalReleaseExecutor() { super(org.mockito.Mockito.mock(org.springframework.jdbc.core.JdbcTemplate.class), diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java index 2aa6667..845bd49 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java @@ -57,6 +57,16 @@ class AiFeatureDraftGeneratorTest { var test = drafts.stream().filter(d -> d.artifactType() == AiArtifactType.TEST) .findFirst().orElseThrow(); assertTrue(test.payload().path("smokeTests").get(3).has("requestBody")); + assertEquals("maintenance-crud-v1", test.payload().path("renderTests").get(0).path("recipe").asText()); + assertEquals("/api/page/schema/eip4ai-contract-type", + test.payload().path("renderTests").get(0).path("schemaUrl").asText()); + assertEquals("eip4aiContractTypeCrud", + test.payload().path("renderTests").get(0).path("expectedCrudName").asText()); + assertEquals("NAME", test.payload().path("renderTests").get(0) + .path("expectedColumns").get(0).path("name").asText()); + assertTrue(hasText(test.payload().path("renderTests").get(0).path("expectedActions"), "新增")); + assertTrue(hasText(test.payload().path("renderTests").get(0).path("expectedActions"), "编辑")); + assertTrue(hasText(test.payload().path("renderTests").get(0).path("expectedActions"), "删除")); } @Test @@ -116,6 +126,15 @@ class AiFeatureDraftGeneratorTest { assertEquals("/api/entity/EIP4AI_ORG_CATEGORY/tree?parentKey=PARENTID&idKey=EIP4AI_ORG_CATEGORY_ID&perPage=2000", test.payload().path("smokeTests").get(1).path("url").asText()); assertEquals("", test.payload().path("smokeTests").get(3).path("requestBody").path("PARENTID").asText()); + assertEquals("tree-crud-v1", test.payload().path("renderTests").get(0).path("recipe").asText()); + assertEquals("eip4aiOrgCategoryTreeCrud", + test.payload().path("renderTests").get(0).path("expectedCrudName").asText()); + assertEquals("children", test.payload().path("renderTests").get(0).path("childrenColumnName").asText()); + assertEquals("/api/entity/EIP4AI_ORG_CATEGORY/tree?parentKey=PARENTID&idKey=EIP4AI_ORG_CATEGORY_ID&perPage=2000", + test.payload().path("renderTests").get(0).path("expectedApi").asText()); + assertTrue(hasText(test.payload().path("renderTests").get(0).path("expectedActions"), "新增顶级组织分类")); + assertTrue(hasText(test.payload().path("renderTests").get(0).path("expectedActions"), "刷新")); + assertTrue(hasText(test.payload().path("renderTests").get(0).path("expectedActions"), "加子组织分类")); } @Test @@ -153,4 +172,14 @@ class AiFeatureDraftGeneratorTest { } return false; } + + private static boolean hasText(Iterable values, String expected) { + for (Object value : values) { + if (value instanceof com.fasterxml.jackson.databind.JsonNode node + && expected.equals(node.asText())) { + return true; + } + } + return false; + } } From 4b2cedfd1d321cd99cc3e931c714f2ad7fa76eae Mon Sep 17 00:00:00 2001 From: zhengwr Date: Wed, 17 Jun 2026 14:17:53 +0800 Subject: [PATCH 16/53] feat: add AI page preview URL --- docs/AI_AGENT_AUTO_DEVELOPMENT.md | 2 +- docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md | 2 +- docs/skills/eip4-ai-feature-development.md | 2 +- .../platform/ai/service/AiAgentService.java | 6 +++ .../ai/service/AiFeatureDraftGenerator.java | 1 + .../ai/service/AiAgentServiceTest.java | 2 + .../service/AiFeatureDraftGeneratorTest.java | 4 ++ .../src/main/resources/static/amis.html | 38 ++++++++++++++++++- 8 files changed, 52 insertions(+), 5 deletions(-) diff --git a/docs/AI_AGENT_AUTO_DEVELOPMENT.md b/docs/AI_AGENT_AUTO_DEVELOPMENT.md index 7dae927..f2b594b 100644 --- a/docs/AI_AGENT_AUTO_DEVELOPMENT.md +++ b/docs/AI_AGENT_AUTO_DEVELOPMENT.md @@ -133,7 +133,7 @@ curl -X POST http://localhost:8093/api/ai/features/auto-develop \ 6. 生成 release plan。 7. 本地 apply:实体走本机 `/api/meta/entity`,页面/服务流写本地库;如果本地最小库缺少 `sys_menu`,菜单发布标记为 `SKIPPED`,不阻断本地 gate,部署包仍保留菜单 SQL 供线上人审。 8. 本地 smoke:只允许 `localhost`、`127.0.0.1`、`::1` baseUrl;HTTP 状态必须匹配,且 JSON 响应体存在 `status` 时必须为 0。 - `TEST` 草稿同时包含 `renderTests`,给 Playwright 渲染验收提供 recipe、schemaUrl、预期组件、CRUD 名、数据 API、列、动作和关键文本。 + `TEST` 草稿同时包含 `renderTests`,给 Playwright 渲染验收提供 recipe、schemaUrl、previewUrl、预期组件、CRUD 名、数据 API、列、动作和关键文本。 9. 若失败,自动生成 repair plan 并执行修复重试。 10. 生成线上人工部署包,包含 manifest、SQL 草案、回滚 SQL 和本地执行证据。 11. 可选:生成功能包快照并保存 revision,用于后续导出、差异比较和回滚扩展。 diff --git a/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md b/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md index cfbb97a..49d09c4 100644 --- a/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md +++ b/docs/AI_AGENT_PAGE_BLUEPRINT_CONTRACT.md @@ -117,7 +117,7 @@ AI 自动开发链路中的 `PAGE_SCHEMA` 草稿仍然保存编译后的 amis sc - `typed-page-schema`:校验组件和 actionType 来自 EIP4 注册表。 - `amis-schema`:校验最终 schema 符合 amis schema。 - `local-smoke`:本地发布后访问页面、实体、服务流和新增接口。 -- `render-plan`:`TEST` 草稿必须提供 Playwright 可消费的 `renderTests`,包含 recipe、schemaUrl、预期根组件、CRUD 名、数据 API、列表列、页面动作和关键文本。 +- `render-plan`:`TEST` 草稿必须提供 Playwright 可消费的 `renderTests`,包含 recipe、schemaUrl、previewUrl、预期根组件、CRUD 名、数据 API、列表列、页面动作和关键文本。 ## 后续演进 diff --git a/docs/skills/eip4-ai-feature-development.md b/docs/skills/eip4-ai-feature-development.md index e5ca36c..c22d071 100644 --- a/docs/skills/eip4-ai-feature-development.md +++ b/docs/skills/eip4-ai-feature-development.md @@ -78,7 +78,7 @@ java -jar platform-cli/target/platform-cli-0.1.0-SNAPSHOT.jar ai auto-develop \ - 部署包存在且 `requiresHumanApproval=true`。 - 页面 schema 只能使用组件能力表中注册的组件和动作。 - `PAGE_SCHEMA` 草稿必须声明并通过 `page-recipe` 门禁;普通维护页为 `maintenance-crud-v1`,树形维护页为 `tree-crud-v1`。 -- `TEST` 草稿必须通过 `smoke-plan` 和 `render-plan`;`renderTests` 是后续 Playwright 渲染验收的输入,需包含预期组件、列、动作、数据 API 和关键文本。 +- `TEST` 草稿必须通过 `smoke-plan` 和 `render-plan`;`renderTests` 是后续 Playwright 渲染验收的输入,需包含 previewUrl、预期组件、列、动作、数据 API 和关键文本。 ## 页面 schema 校验 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 2591b47..d91db4e 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 @@ -984,6 +984,7 @@ public class AiAgentService { String name = test.path("name").asText(""); String recipe = test.path("recipe").asText(""); String schemaUrl = test.path("schemaUrl").asText(""); + String previewUrl = test.path("previewUrl").asText(""); String rootType = test.path("expectedRootType").asText(""); String bodyType = test.path("expectedBodyType").asText(""); String crudName = test.path("expectedCrudName").asText(""); @@ -1001,6 +1002,11 @@ public class AiAgentService { if (!schemaUrl.startsWith("/api/page/schema/")) { messages.add("render schemaUrl 必须以 /api/page/schema/ 开头: " + schemaUrl); } + if (!previewUrl.startsWith("/amis.html?schema=") + && !previewUrl.startsWith("/amis.html?templateId=") + && !previewUrl.startsWith("/amis.html?schemaUrl=")) { + messages.add("render previewUrl 必须指向可解析 schema 的 /amis.html: " + previewUrl); + } if (!"page".equals(rootType)) { messages.add("render expectedRootType 必须是 page"); } diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java index 6e03995..f500cae 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiFeatureDraftGenerator.java @@ -164,6 +164,7 @@ public class AiFeatureDraftGenerator { render.put("name", "page-render"); render.put("recipe", spec.pageRecipe()); render.put("schemaUrl", "/api/page/schema/" + spec.templateId()); + render.put("previewUrl", "/amis.html?schema=" + spec.templateId()); render.put("expectedRootType", "page"); render.put("expectedBodyType", "crud"); render.put("expectedCrudName", expectedCrudName(spec)); 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 ab028e9..ef4bb02 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 @@ -153,6 +153,7 @@ class AiAgentServiceTest { "name":"page-render", "recipe":"maintenance-crud-v1", "schemaUrl":"/api/page/schema/demo", + "previewUrl":"/amis.html?schema=demo", "expectedRootType":"page", "expectedBodyType":"crud", "expectedCrudName":"demoCrud", @@ -657,6 +658,7 @@ class AiAgentServiceTest { "name": "page-render", "recipe": "maintenance-crud-v1", "schemaUrl": "/api/page/schema/test-page", + "previewUrl": "/amis.html?schema=test-page", "expectedRootType": "page", "expectedBodyType": "crud", "expectedCrudName": "testPageCrud", diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java index 845bd49..f02d07e 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiFeatureDraftGeneratorTest.java @@ -60,6 +60,8 @@ class AiFeatureDraftGeneratorTest { assertEquals("maintenance-crud-v1", test.payload().path("renderTests").get(0).path("recipe").asText()); assertEquals("/api/page/schema/eip4ai-contract-type", test.payload().path("renderTests").get(0).path("schemaUrl").asText()); + assertEquals("/amis.html?schema=eip4ai-contract-type", + test.payload().path("renderTests").get(0).path("previewUrl").asText()); assertEquals("eip4aiContractTypeCrud", test.payload().path("renderTests").get(0).path("expectedCrudName").asText()); assertEquals("NAME", test.payload().path("renderTests").get(0) @@ -130,6 +132,8 @@ class AiFeatureDraftGeneratorTest { assertEquals("eip4aiOrgCategoryTreeCrud", test.payload().path("renderTests").get(0).path("expectedCrudName").asText()); assertEquals("children", test.payload().path("renderTests").get(0).path("childrenColumnName").asText()); + assertEquals("/amis.html?schema=eip4ai-org-category", + test.payload().path("renderTests").get(0).path("previewUrl").asText()); assertEquals("/api/entity/EIP4AI_ORG_CATEGORY/tree?parentKey=PARENTID&idKey=EIP4AI_ORG_CATEGORY_ID&perPage=2000", test.payload().path("renderTests").get(0).path("expectedApi").asText()); assertTrue(hasText(test.payload().path("renderTests").get(0).path("expectedActions"), "新增顶级组织分类")); diff --git a/platform-app/src/main/resources/static/amis.html b/platform-app/src/main/resources/static/amis.html index 41b6757..7cd7e71 100644 --- a/platform-app/src/main/resources/static/amis.html +++ b/platform-app/src/main/resources/static/amis.html @@ -16,10 +16,44 @@