Repository navigation
Commit 31a3785
committed
fix: post-merge dedupe and approval edge cases
- drop the duplicate streamKind field the merge stacked in
makeAcpContentDeltaEvent (upstream added the identical field)
- split stacked omp/antigravity object literals in providerDriverMeta and
session-logic
- permission responses: match ACP kind against the options the agent
advertised (allow_always falls back to allow_once, blank ids skipped,
nothing usable settles cancelled) per the review guidance from #8583
Model: kimi-code/k3 via Oh My Pi (omp)1 parent 09f72aa commit 31a3785
3 files changed
Lines changed: 6 additions & 2 deletions
File tree
- apps
- server/src/provider/acp
- web/src
- components/settings
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
212 | 212 | | |
213 | 213 | | |
214 | 214 | | |
215 | | - | |
216 | | - | |
217 | 215 | | |
218 | 216 | | |
219 | 217 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
| 87 | + | |
| 88 | + | |
87 | 89 | | |
88 | 90 | | |
89 | 91 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
67 | 71 | | |
68 | 72 | | |
69 | 73 | | |
| |||
0 commit comments