Merge dev into main: pcat catalog + EMEX VIN decode + autonomy charter
Some checks failed
Deploy / Deploy to Production (push) Has been cancelled
Some checks failed
Deploy / Deploy to Production (push) Has been cancelled
Brings 35 dev branch commits onto main, integrating with the 32 main-side commits (Sentry, translation pipeline, deploy fixes). Critical merge across VIN decode pipeline and catalog services. # Conflicts: # .gitignore # apps/api/src/catalog/catalog.module.ts # apps/api/src/categories/categories.module.ts # apps/api/src/categories/categories.service.spec.ts # apps/api/src/common/filters/http-exception.filter.ts # apps/api/src/integrations/emex/emex.service.ts # apps/api/src/integrations/emex/emex.types.ts # apps/api/src/jobs/processors/emex-scrape.processor.ts # apps/api/src/vehicles/vehicles.controller.ts # apps/api/src/vehicles/vehicles.module.ts # apps/api/src/vehicles/vehicles.service.ts # apps/web/src/routes/dashboard.tsx # apps/web/src/routes/dashboard/catalog/index.tsx
This commit is contained in:
10
.gitignore
vendored
10
.gitignore
vendored
@@ -44,7 +44,11 @@ coverage/
|
||||
tmp/
|
||||
temp/
|
||||
|
||||
# Fusion runtime state (task db, agent memory, config, sqlite WAL)
|
||||
# Tracked agent personas / project memory can be force-added if desired.
|
||||
.fusion/
|
||||
# Fusion runtime state — keep authored docs (memory, agents, templates) only
|
||||
.fusion/*
|
||||
!.fusion/memory/
|
||||
!.fusion/agents/
|
||||
!.fusion/templates/
|
||||
.fusion/memory/2*.md
|
||||
.fusion/memory/DREAMS.md
|
||||
.worktrees/
|
||||
|
||||
Reference in New Issue
Block a user