Unclassified
v2.2 Reconciliation and Integration Record
Status: Integration decision record — authoritative for the v2.2 merge until superseded by a committed canonical index update.
Date: 2026-08-13
Scope: Reconcile fetched origin/main v2.2 (9aa0be03) with local IntegrateWise commits 2187bc915, fae942fb9, and bcc32af33.
Evidence boundary: This record distinguishes implemented code/tests from normative architecture and declarations. It does not certify provider execution merely because a capability is named.
Decision summary
| ID | Decision | Default adopted for integration | Evidence |
|---|---|---|---|
| D-01 | Product core | Adopt v2.2's One Auth → Product Package → shared runtime → projections → governed execution model, interpreted through the established Spine-first truth model. | v2.2 §1–14; local canonical architecture and amendments. |
| D-02 | Truth and safety | Retain tenant/policy gates, host-owned credential authority, canonical Spine/Postgres truth, bounded operational caches, proposal/approval/action separation, and reconciliation-before-promotion. | Both models agree; local implementation contracts are more specific where v2.2 is general. |
| D-03 | Workbench | Adopt capability-first, lifecycle- and context-aware Workbench projections. A hostname is a projection hint only; it is never tenant, user, role, or credential authority. | v2.2 projection rules; local host-aware routing and Gateway CORS work. |
| D-04 | Tool capabilities | Adopt v2.2 Tool Capability contract as the target semantic contract. Mark every declared capability as bound only after a handler, eligibility/policy path, receipt, and reconciliation evidence are mapped. | v2.2 execution contract; code inspection found declarative domain bindings without corresponding handler references. |
| D-05 | Twin | Retain the local Silent Twin boundary: contextual, governed, inline, and non-authoritative; it can draft/propose but cannot self-approve, own credentials, or directly write canonical truth. | Both models agree. |
| D-06 | Public marketing | Retain local public/internal taxonomy: Brand Store, Book of Records, and Org Memory remain internal-only and never public marketing solution routes. Public host landings are marketing projections, not authenticated Workbench authority. | Local marketing host routing and stated product decision. |
| D-07 | Documentation | Import v2.2 as a normative architecture input, but do not erase local canonical evidence/amendments. The final documentation index must designate one precedence chain and list retained implementation contracts. | Incoming docs/CANON.md conflicts with local architecture index. |
Capability evidence rule
packages/workbenches adds 18 declarative Workbench domain definitions. Their CapabilityRef records identify an ID, plane, governance policy, and optional provider binding. They are valuable product and UX inventory, but a declaration is not runtime proof.
A capability can be described as executable only when all of the following are evidenced:
- a tenant/principal/context eligibility check;
- schema and connector binding validation;
- a Governance decision and, when required, scoped approval artifact;
- a bounded handler or adapter that does not expose provider credentials;
- an execution receipt/audit record; and
- reconciliation into the applicable Spine/lifecycle/continuity projection.
Until then, it is declaration-only. Marketing and operator UI must not imply otherwise.
Merge conflict defaults
| Area | Integration default | Rationale |
|---|---|---|
| Canonical truth, tenancy, credentials, Governance, reconciliation | Preserve local doctrine and import compatible v2.2 reinforcement. | These are non-negotiable safety boundaries. |
| Workbench capability model and lifecycle-aware projections | Adopt v2.2 additions where they do not bypass the local authority model. | Adds explicit, useful capability-first composition. |
| Host/subdomain routing | Preserve local host-as-hint grammar and fail-closed origin/CORS behavior; adapt v2.2 domain registry to it. | Prevents host-derived authority or credential forwarding. |
| Marketing routes and public taxonomy | Preserve local evidence-based public/internal taxonomy; selectively incorporate v2.2 page/content structure. | Avoids exposing internal products or overstating runtime completeness. |
| Old duplicate docs | Retain as lineage unless explicitly superseded in the final index. | No history or implementation detail should disappear silently. |
Explicitly unresolved, but non-blocking for preservation
- Brand architecture: whether
SpineWorkspacebecomes the external brand/primary domain or remains an implementation/category term under IntegrateWise. Until an explicit founder decision, public copy uses IntegrateWise and treats Spine as the governed context/runtime model. - Canonical filename/index: whether v2.2 replaces
INTEGRATEWISE_ARCHITECTURE.mdoutright, or the current architecture is amended and indexed as the canonical source. The integration default is a single index with both v2.2 and retained local contracts, never two competing claims. - Domain registry aliases: v2.2 aliases such as
founderops,businessops,productengineering, andorgmemoryneed a deliberate compatibility map before they drive URLs or public navigation.
Integration gates
- Every uncommitted source/docs/test change is independently committed or preserved by a durable Git reference.
- The direct-main merge has a per-conflict disposition using the defaults above.
- Capability declarations have an evidence matrix before any claim of live execution.
- Focused tests pass for imported routing, projection, and capability-contract changes.
- Only then create the normal merge commit and attempt a non-force push.