mirror of
https://github.com/nexu-io/open-design.git
synced 2026-10-27 09:51:12 +01:00
lefarcen
5238987830
42 conflicted files resolved. Key rulings (product owner directive: the feature branch's accepted UI is the baseline; main may only contribute pure logic/infra or new capabilities whose UI does not disturb it): - package.json x18: versions -> main (0.16.1); root guard script -> main (script tests moved to e2e/tests/scripts on main). Feature-side deps (e.g. @powerformer/vela-cli pin) preserved. - CI workflows (ci.yml, release-branch-direct-pr-guard.yml): main's wording/structure kept; both sides were semantically identical here. - daemon server.ts / acp/session.ts / amr-acp-integration.test.ts: union merge - feat workspace gating/reconciliation kept authoritative, main's failure classification (c3de4d5b9), ACP tool transcript flush and usage telemetry (7787556cf) layered in. - FileViewer/edit-mode cluster: feat's #5517-based accepted manual-edit implementation kept wholesale. main's #5890/#6098 direct-manipulation additions (set-inner-html text-like editing, SelectionOverlay/ TextToolbar/ColorPicker components, gestures/shortcuts/color modules, expanded styleProps) are NOT integrated; needs deliberate reconciliation before this branch merges back to main. - GPT-5.5 Fast service tier (233793271): daemon/CLI/contract capability kept; web UI pickers (AvatarMenu wholesale-feat, InlineModelSwitcher, SettingsDialog) removed per accepted-UI-zero-change directive. - PreviewRunStatusBar trio: feat deleted the component; deletion kept, main's absence-pinning regression tests kept. - Workspace tab width (2fd9d8134) and dsManager tab label capitalization reverted to feat values. - e2e/ui: feat's #5517-repointed selectors kept; main's new updater About + BYOK error-code [P1] tests kept; main's topbar help-menu [P2] and service-tier UI tests dropped with the UI they target. Post-merge reconciliation fixes (validation-driven): - i18n: deduped manualEdit.* keys both sides added (20 main-only keys removed with their cut UI, 4 name-collisions resolved to feat values) across types.ts + all 19 locales. - FileViewer.test.tsx comment no longer names the daemon tree (new main-side guard rule). - langfuse feedback tests opt back into the Vela sink that main's tests/setup.ts now disables by default. - delete-cancels-active-runs harness supplies the db-backed workspace-project lookups feat's delete gate dereferences. - stable-prompt drift attribution expects ['intent','craft']: craft follows the intent signal on this branch.