Files
ProjectE/drizzle/meta/_journal.json
T
bot-hermes 66459019a8 merge: resolve origin/main into feat/plane-lift-merge
Merge origin/main into feat/plane-lift-merge to resolve PR #25 conflicts.

Conflict resolutions:
- apps/api/src/routes/states.ts: took main's complete version (reorder,
  GET /:id, resolveProject helper) since plane-lift's states CRUD was
  already incorporated via main
- apps/api/src/routes/tasks.ts: merged both imports (statesTable +
  taskDependencies), combined filter params (stateId/stateGroup/moduleId/
  cycleId from plane-lift + status removed since tasks.status column no
  longer exists), added stateId to zod schemas and insert/update logic

Additional fixes for clean typecheck:
- Removed deleted files that main re-introduced via merge (automations,
  statuses, timeline, gantt, nlp-parser, canvas, notifications,
  automation-engine, quick-add-bar, drizzle 0007-0009, migrate script)
- Fixed tasks.ts: removed all tasks.status references (column replaced by
  stateId), removed taskStatusEnum, removed /:id/status endpoint
- Fixed analytics.ts: replaced tasks.status checks with completedAt checks
- Fixed index.ts: removed duplicate stateRoutes import and route registration
- Cleaned up drizzle journal duplicate entries

Preserved from main:
- taskDependencies table definition and junction table
- Komodo/CI changes (ci.yml, docker-compose.yml)
- DEPLOY.md host fixes
- taskDependencies route code (dependencies/dependents endpoints)
2026-09-07 22:10:01 +00:00

70 lines
1.5 KiB
JSON

{
"version": "7",
"dialect": "postgresql",
"entries": [
{
"idx": 0,
"version": "7",
"dialect": "postgresql",
"tag": "0000_outstanding_zuras",
"createdAt": "2025-01-01T00:00:00.000Z"
},
{
"idx": 1,
"version": "7",
"dialect": "postgresql",
"tag": "0001_warm_eternity",
"createdAt": "2025-01-01T00:01:00.000Z"
},
{
"idx": 2,
"version": "7",
"dialect": "postgresql",
"tag": "0002_steep_black_widow",
"createdAt": "2025-01-01T00:02:00.000Z"
},
{
"idx": 3,
"version": "7",
"dialect": "postgresql",
"tag": "0003_amazing_saracen",
"createdAt": "2025-01-01T00:03:00.000Z"
},
{
"idx": 4,
"version": "7",
"dialect": "postgresql",
"tag": "0004_add_owner_id_to_domains",
"createdAt": "2025-01-01T00:04:00.000Z"
},
{
"idx": 5,
"version": "7",
"dialect": "postgresql",
"tag": "0005_search_vector_trigger",
"createdAt": "2025-01-01T00:05:00.000Z"
},
{
"idx": 6,
"version": "7",
"dialect": "postgresql",
"tag": "0006_minor_doctor_octopus",
"createdAt": "2025-01-01T00:06:00.000Z"
},
{
"idx": 7,
"version": "7",
"dialect": "postgresql",
"tag": "0007_drop_canvas_reports",
"createdAt": "2025-01-01T00:07:00.000Z"
},
{
"idx": 8,
"version": "7",
"when": 1788800393149,
"tag": "0008_plane-lift-schema",
"breakpoints": true
}
]
}