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 |