Commit 9a08f9c
fix: resolve merge conflicts with main — align schemas with PR #452
- Merge origin/main (PR #452's Sentinel infra) into claude/sentinel-engine
- Remove duplicate kebab-case schema files (ai-insights.ts, ai-pr-reflections.ts, etc.)
in favor of main's camelCase versions (aiInsights.ts, aiPrReflections.ts)
- Update all imports to use main's schema exports (learningAiInsights, etc.)
- Merge LearningAgent: keep main's pattern detection + contemplation gate,
add Sentinel pipeline routes (/ingest, /enrich, /schedule/run, /ingest-pr)
- Remove duplicate v7 migration (LearningAgent already in v1_sentinel)
- Restore Sentinel frontend routes in App.tsx
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>1 parent d05eb9c commit 9a08f9c
14 files changed
Lines changed: 344 additions & 372 deletions
File tree
- src
- backend/src
- ai/agents
- automations/pr
- db/schemas/github/learning
- routes/api/sentinel
- frontend/src
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
20 | | - | |
| 19 | + | |
21 | 20 | | |
22 | 21 | | |
23 | 22 | | |
| |||
91 | 90 | | |
92 | 91 | | |
93 | 92 | | |
94 | | - | |
| 93 | + | |
95 | 94 | | |
96 | 95 | | |
97 | | - | |
98 | | - | |
| 96 | + | |
| 97 | + | |
99 | 98 | | |
100 | 99 | | |
101 | 100 | | |
| |||
128 | 127 | | |
129 | 128 | | |
130 | 129 | | |
131 | | - | |
| 130 | + | |
132 | 131 | | |
133 | 132 | | |
134 | 133 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
| 63 | + | |
64 | 64 | | |
65 | | - | |
66 | | - | |
| 65 | + | |
67 | 66 | | |
68 | | - | |
69 | | - | |
70 | | - | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
| |||
Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 0 additions & 43 deletions
This file was deleted.
Lines changed: 0 additions & 41 deletions
This file was deleted.
Lines changed: 0 additions & 44 deletions
This file was deleted.
Lines changed: 0 additions & 26 deletions
This file was deleted.
This file was deleted.
0 commit comments