mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-05-23 04:28:06 +00:00
317d146302
Resolves conflicts in 9 files to bring 181 commits from release/v3.8.0 into the dashboard refactor branch ahead of merging back to release. Layout strategy: our pages overhaul (tabs→pages, restructured sidebar, removed redundant headers, OpenCode Free no-auth card) is the source of truth. Release's functional additions are adapted into our layout. Conflict resolution: - package.json/package-lock.json: take release's deps (axios bump, CLI v4 deps, tls-client-node/wreq-js move to optionalDependencies); re-add our @xyflow/react addition; regenerate lockfile. - src/shared/constants/sidebarVisibility.ts: keep our 9-section restructure — release's new IDs (limits, media, cli-tools, agents, cloud-agents, memory, skills, agent-skills, context-*) are all already present in our groups. - src/i18n/messages/en.json: auto-merge picked up all release's new keys (autoCatalog*, quotaCutoffs*, systemTransforms*, schema-coercion, vision); only naming conflict was OmniSkills/AgentSkills — kept ours (no space). - src/app/(dashboard)/dashboard/HomePageClient.tsx: kept our Provider Topology card; ported release's TierCoverageWidget (placed before topology). - src/app/(dashboard)/dashboard/settings/page.tsx: kept our redirect to /settings/general (we moved tabs to separate pages); release's sticky tab CSS change is moot in our structure. - src/app/(dashboard)/dashboard/skills/page.tsx: rerere applied — release hardcoded "OmniSkills" h1 was already removed by our header-cleanup refactor. - src/app/(dashboard)/dashboard/agent-skills/page.tsx: both branches created this file independently with identical data source; kept our Tailwind-themed 2-column grid (release's version used inline styles). - src/app/(dashboard)/dashboard/batch/page.tsx: kept our single-tab structure (FilesListTab moved to /batch/files page); ported release's onRefresh prop addition. - src/app/(dashboard)/dashboard/batch/files/page.tsx (not in conflict but updated): added batches fetch + batches prop to preserve release's feature of showing related batches in the file detail modal. Pre-existing typecheck errors in open-sse/services/contextManager.ts (lines 141, 154, 167) come from release/v3.8.0 and are not introduced by this merge. |
||
|---|---|---|
| .. | ||
| healthcheck.mjs | ||
| responses-ws-proxy.mjs | ||
| run-ecosystem-tests.mjs | ||
| run-next-playwright.mjs | ||
| run-next.mjs | ||
| run-playwright-tests.mjs | ||
| run-protocol-clients-tests.mjs | ||
| run-standalone.mjs | ||
| smoke-electron-packaged.mjs | ||
| standalone-server-ws.mjs | ||
| sync-env.mjs | ||
| system-info.mjs | ||
| v1-ws-bridge.mjs | ||