Commit Graph

9 Commits

Author SHA1 Message Date
z.zhang f9873ee870 chore: 清理生成视频和 AI 临时文件 2026-09-08 11:24:04 +08:00
z.zhang 35131cde88 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	apps/web/e2e/order-closed-loop-contract.spec.ts
#	apps/web/src/App.tsx
#	apps/web/src/api/client.ts
#	apps/web/src/api/types.ts
#	apps/web/src/chat/ChatPanel.tsx
#	apps/web/src/gov/GovConsole.tsx
#	apps/web/src/master/FlexPanel.tsx
#	apps/web/src/master/MasterPanel.tsx
#	apps/web/src/orders/OrderPanel.tsx
#	apps/web/src/projects/ProjectPanel.tsx
#	apps/web/src/skills/AsyncJobsTab.tsx
#	apps/web/src/skills/mcpApi.ts
#	apps/web/src/styles.css
#	docs/CHANGELOG.md
#	docs/README.md
#	docs/algorithm/scheduling-v1.md
#	docs/algorithm/solution-selection-v1.md
#	docs/architecture/harness.md
#	docs/development/e2e.md
#	docs/product/features.md
#	docs/product/plan-completion-matrix.md
#	docs/round-67-approval-migration-parallel-implementation-plan.md
#	docs/round-67-approval-migration-state.md
#	docs/round-67-approval-migration-work-plan.md
#	package.json
#	packaging/aps-sidecar.spec
#	packaging/requirements-sidecar.lock
#	plan.md
#	pyproject.toml
#	requirements.txt
#	server/agent_core/approval_db_store.py
#	server/agent_core/approval_migrate.py
#	server/agent_core/approval_store.py
#	server/agent_core/async_jobs.py
#	server/agent_core/automation.py
#	server/agent_core/harness.py
#	server/agent_core/intent.py
#	server/aps_domain/attribution.py
#	server/aps_domain/closed_loop_runtime.py
#	server/aps_domain/flex.py
#	server/aps_domain/folder_pack.py
#	server/aps_domain/importers.py
#	server/aps_domain/lns.py
#	server/aps_domain/mes.py
#	server/aps_domain/mrp.py
#	server/aps_domain/multimodal.py
#	server/aps_domain/scenario_selection.py
#	server/aps_domain/scheduling_problem_v2.py
#	server/aps_domain/scheduling_validator.py
#	server/aps_domain/sourcing.py
#	server/aps_domain/workflow.py
#	server/db/models.py
#	server/engines/cp_engine.py
#	server/engines/nsga2_engine.py
#	server/engines/solver_process.py
#	server/engines/solver_worker.py
#	server/gateway/app.py
#	server/gateway/plan_api.py
#	server/sidecar.py
#	server/state/branches.py
#	server/state/checkpoints.py
#	shared/schemas/intent.schema.json
#	tests/conftest.py
#	tests/golden/test_approval_database_store.py
#	tests/golden/test_approval_migration.py
#	tests/golden/test_assistant.py
#	tests/golden/test_async_jobs.py
#	tests/golden/test_automation_gateway.py
#	tests/golden/test_automation_gears.py
#	tests/golden/test_cp_cumulative.py
#	tests/golden/test_cp_operation_level.py
#	tests/golden/test_desktop_sidecar.py
#	tests/golden/test_engine_constraint_semantics.py
#	tests/golden/test_evidence_contract.py
#	tests/golden/test_folder_pack.py
#	tests/golden/test_guidance.py
#	tests/golden/test_importers.py
#	tests/golden/test_mes.py
#	tests/golden/test_mes_evidence_v2.py
#	tests/golden/test_multimodal.py
#	tests/golden/test_nsga2_engine.py
#	tests/golden/test_preference_features.py
#	tests/golden/test_project_file_upload.py
#	tests/golden/test_solver_engine_isolation.py
#	tests/golden/test_solver_subprocess.py
#	锐扬演示-操作手册.md
2026-09-04 00:51:17 +08:00
z.zhang 08bdda4cb9 chore: gitignore 本地运行日志(.codex-*)与截图日志/废弃目录 2026-09-03 23:32:19 +08:00
z.zhang 3543208458 feat(fallback): FB-01 智能兜底 P1(只读)——Pi Agent 兜底车道进产品路径
- 新增 server/agent_core/fallback_lane.py(core-fallback-lane):兜底编排器,run 目录/环境清洗/模型协商/三重熔断/stopReason 成败判定/propose_reply 绝不抛出
- 新增 server/integrations/pi_bridge.py(integ-pi-bridge):只读三工具 + callId 凭证 + 路径越界拦截 + 快照导出
- harness._POWER_MAP 纯追加 agent.fallback.propose=P1(计划草稿,沙盒语义不写主干)
- feature_flags 新增 _DEFAULT_OFF_KEYS:fallback 默认关(与全局 fail-open 相反),/api/features 显式 defaultOff 标注
- workflow assistant.reply/unknown 分支接线:开关关时原路径逐字节不变;90s 硬熔断;失败回退原话术
- node 解析 Windows 优先 node.exe(避开 node.CMD 垫片),APS_FALLBACK_NODE 最高优先
- 验证:全量黄金 1084 passed / 1 failed(test_preference_features 既有日期炸弹,与本轮无关);真实 Kimi K2.6 端到端冒烟 7 判据全 PASS(含越狱测试与审计链核验)
- 文档:docs/architecture/fallback.md 新建、harness.md 权力矩阵、CHANGELOG
- 边界:P1 仅只读;写操作/确认卡执行/桌面打包属 P2+;Pi runtime 打包未做
2026-09-03 13:48:03 +08:00
z.zhang fee1a4c13d feat: APS 智能排产智能体全量实现(M-POC~M6 + 跨阶段治理 + round-1~66)
- 智能体核心:Harness 门禁/_POWER_MAP、P2/P3 确认卡、证据链、Plan 运行时 L0-L3、统一工具运行时、自动化 G0-G4
- 领域层:Rule/CP-SAT/GA/NSGA-II/LNS 引擎、13 类约束目录、IIS 冲突归因、敏感性/蒙特卡洛、插单重排、MRP 分解
- 状态层:世界/对话成对快照、分支树、检查点、Saga 补偿、审批文件/DB 双后端
- 集成层:MCP 插件总线、MES/WMS 适配器(stub+HTTP)、异步任务
- 前端:左说右动工作台(聊天+甘特/负荷/交期)、主数据、订单、治理台、分支树、时间线、审计统计
- 桌面端:Electron 壳 + Python Sidecar + NSIS 打包 + 许可证
- 文档:plan.md 蓝图、完成矩阵(50 Done/10 Partial/0 Missing)、CHANGELOG 全量账本、各轮次计划/状态
- 验证基线:黄金测试 1000+ 项、Node 60 项、Web build 通过(详见 docs/CHANGELOG.md)
2026-08-20 11:39:21 +08:00
z.zhang 6152a3a904 feat: 完成 APS 智能体平台阶段性交付
- 完成多引擎排产、闭环资源验证、审批审计及 SAP/MES/WMS 集成\n- 增加桌面 Sidecar、升级打包、Web 工作台、图纸解析与多智能体能力\n- 补齐 CI、交付文档、演示脚本和全量黄金测试
2026-08-11 00:54:05 +08:00
z.zhang 2a8160ee0d feat: 完善 APS 工作台、租户认证与桌面授权 2026-07-28 02:14:13 +08:00
z.zhang 43c39ff7ac feat: 康尼现场数据接入 + 柔性能力池排产 + 对话查数/知识库/报告
- 现场导入:kangni_intake 解析完整生产路线,清演示数据后写入固定轨主数据与柔性轨
- 柔性排产:pool_engine/cp_engine 能力池+虚拟产线,正排/倒排/瓶颈锚 + 滚动窗口
- 对话查数:master_query 支持订单/物料/BOM/工艺路线/委外采购建议,会话焦点指代
- 「把这个订单排产」指代解析;「这个订单有委外吗」等追问应答
- 排产方案报告导出 Excel 工作计划表(工作计划/方案概览/冲突 三表)
- 知识库:机加工工艺路线生成模式 + 城轨机构装配模板
- 领域模块:MRP 分解/急单/敏感性/战役/库存投影/产能平衡/计划追溯/MES/SAP 集成桩
- 前端:柔性工作台、柔性甘特、产能池、KPI、方案对比、导入栏等视图
- 需求原始材料 demand/ 加入 .gitignore 不入库

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-23 13:38:43 +08:00
z.zhang a91f5921ed first commit 2026-07-21 11:05:57 +08:00