V1R4C6 merge candidate (squashed). Contains 10 files, ~1440 lines added across: - docs/releases/ (6 files: checklist, evidence, blocker, resume, merge-matrix, gate-status) - ops/openclaw/ (2 files: integrate-deploy-verify, run-to-owner-gate-wechat) - patches/ (1 file: branch patch) - versions/ (1 file: V1R4C6.json) Task: admin workbench, SR-03 Search Gateway, Agent Platform Integration Baseline: V1R4C5 V1R4C5 tag semantics: - tag refs/tags/V1R4C5 targetd457ac3: immutable release snapshot - baseline gita32c76a: runtime baseline promotion commit No tag creation, baseline promotion, or memory search activation in this merge.
137 lines
4.8 KiB
Markdown
137 lines
4.8 KiB
Markdown
# V1R4C6 Integration Merge Matrix
|
|
|
|
Date: 2026-07-11
|
|
|
|
Status: integration-ready
|
|
|
|
Base baseline: V1R4C5
|
|
|
|
Base baseline git: `a32c76a3c1baa49562e53fb8adce10a5ed0e6704`
|
|
|
|
## Release Objective
|
|
|
|
Deliver three capability groups in one controlled release train:
|
|
|
|
1. Admin Workbench and Portal AIOS read-only rollout.
|
|
2. SR-03 Search Gateway real provider binding.
|
|
3. Agent Platform Integration.
|
|
|
|
This is a bundled release train, not an uncontrolled bulk merge. Each group has an independent acceptance gate and rollback switch.
|
|
|
|
## Group A — Admin Workbench and Portal AIOS
|
|
|
|
| Branch | Capability | Decision |
|
|
|---|---|---|
|
|
| `feature/v1r4c4-sr04-admin-workbench-visibility-20260711` | Admin workbench task progress and process visibility | integrate |
|
|
| `feature/v1r4c4-sr04-portal-aios-visibility-20260710` | Portal AIOS route/menu visibility | integrate |
|
|
| `patch/user-portal-me-route-diagnostics-20260709` | `/portal/me/aios/manifest`, dashboard and health route contract | integrate after route review |
|
|
| `patch/user-portal-rbac-ops-dashboard` | Admin/group-admin RBAC dashboard | integrate after RBAC review |
|
|
| `patch/agent-observability-webui` | Agent observability UI | integrate read-only |
|
|
| `patch/web-ui-complete-gitops-dashboard-20260706` | GitOps dashboard UI | integrate only if not superseded by the newer workbench implementation |
|
|
|
|
### Required user-visible result
|
|
|
|
Administrators can see:
|
|
|
|
- task progress;
|
|
- task/flow/process diagram entry;
|
|
- system health;
|
|
- authorized agent observability;
|
|
- explicit empty/error states.
|
|
|
|
### Security constraints
|
|
|
|
- Read-only first.
|
|
- RBAC is enforced server-side and client-side.
|
|
- No cross-user, cross-project, cross-session, or cross-tenant data exposure.
|
|
- Owner-only modules remain hidden from non-owner administrators.
|
|
|
|
## Group B — SR-03 Search Gateway Real Provider Binding
|
|
|
|
| Branch | Capability | Decision |
|
|
|---|---|---|
|
|
| `feature/v1r4c4-sr02-search-gateway-resilience-20260710` | Gateway resilience and safe fallback | integrate |
|
|
| `patch/search-gateway-governed-general-capability` | Governed provider binding and policy surface | integrate after scope review |
|
|
| `patch/gitops-change-archive-audit` | Change/archive audit evidence | integrate or retain as supporting audit module |
|
|
|
|
### Required result
|
|
|
|
- Real provider binding works.
|
|
- Query scope is enforced before ranking.
|
|
- Accepted records include provenance.
|
|
- Provider failure falls back to `text-only`, `no-memory`, or `scoped-only`.
|
|
- Global memory/vector indexes are not used.
|
|
|
|
### Security constraints
|
|
|
|
```text
|
|
AIOS_MEMORY_ENABLED=false
|
|
```
|
|
|
|
Search Gateway provider binding must not implicitly enable memory search.
|
|
|
|
## Group C — Agent Platform Integration
|
|
|
|
| Branch | Capability | Decision |
|
|
|---|---|---|
|
|
| `patch/agent-event-bus-unified` | Unified scoped agent event bus | integrate |
|
|
| `patch/agent-gpt-message-plane` | Scoped Agent/GPT message plane | integrate |
|
|
| `patch/autonomous-controller-dispatch-20260709` | Autonomous controller dispatch | integrate behind safe-mode gate |
|
|
| `patch/self-evolution-agent-orchestration-policy` | Agent orchestration and governance policy | integrate |
|
|
| `patch/aios-autonomous-orchestrator-architecture-review-v1` | Architecture record | integrate as documentation or mark superseded after review |
|
|
|
|
### Required result
|
|
|
|
- Agent event and message envelopes include user/project/session scope.
|
|
- Controller dispatch stops when autonomous safe mode is active.
|
|
- Consequential actions remain owner-gated.
|
|
- Observability is available before autonomous expansion.
|
|
|
|
## Explicitly Excluded
|
|
|
|
Do not merge or activate in V1R4C6:
|
|
|
|
- memory search activation;
|
|
- global vector index;
|
|
- cross-session/global recall;
|
|
- unscoped search or message delivery;
|
|
- old test/smoke/auth-only branches;
|
|
- old V1R2/V1R3 promotion requests;
|
|
- force-push reconciliation;
|
|
- Gitea database mutation.
|
|
|
|
## Merge and Deployment Order
|
|
|
|
```text
|
|
1. Verify V1R4C5 baseline and bare-repo configuration.
|
|
2. Integrate Group A read-only workbench/portal surface.
|
|
3. Run Group A RBAC and visibility acceptance.
|
|
4. Integrate Group B provider binding under isolation gate.
|
|
5. Run Group B scope/provenance/fallback acceptance.
|
|
6. Integrate Group C event/message/dispatch capabilities.
|
|
7. Run Group C scope/safe-mode/owner-gate acceptance.
|
|
8. Run combined runtime acceptance.
|
|
9. Prepare V1R4C6 tag and promotion request.
|
|
10. Stop for owner confirmation before tag/promotion.
|
|
```
|
|
|
|
## Combined Acceptance
|
|
|
|
Required:
|
|
|
|
```text
|
|
getRuntimeStatus -> active
|
|
getBaseline -> V1R4C5 before promotion
|
|
createBranch -> committed and synced
|
|
createPatch -> committed and synced
|
|
Gitea branch sentinel -> healthy
|
|
memory search -> disabled
|
|
```
|
|
|
|
## Rollback Switches
|
|
|
|
- Group A: disable new workbench routes/menu entries.
|
|
- Group B: disable real provider binding and use safe non-memory fallback.
|
|
- Group C: disable expanded dispatch and keep event/message plane observational.
|
|
- Memory search remains disabled in all rollback modes.
|