Repository navigation
Commit 18c682b
committed
Merge origin/main into kwf/owner-credit-purchases-2603
Resolve three conflicts.
- Main moved `toMicrodollars` from `@/lib/utils` to `@/lib/microdollars` (#6915).
Take the new path in both notification test files, and in the two credit pack
files that the merge could not flag.
- Regenerate `.kilo/skills/kilo-mcp/SKILL.md` from the merged catalog, so the
drift check passes.587 files changed
Lines changed: 187586 additions & 7056 deletions
File tree
- .github
- pr-assets
- scheduler-tool-cards
- session-cost
- webhook-request-execution-logs
- workflows
- .kilo/skills/kilo-mcp
- apps
- mobile
- src
- components
- agents
- home
- pr-review/diff
- i18n/locales
- lib/pr-review/diff
- web
- src
- app
- (app)
- cloud/webhooks/[triggerId]/requests
- code-reviews/[reviewId]
- organizations/[id]/sub-organizations/distribute-funds
- admin
- api
- api-request-log/download
- backfills/normalized-email
- organizations/[id]/consume-credits
- users
- [id]
- dev/insert-usage-record
- kill-balance-cache
- referrals
- gdpr-removal
- components
- gateway
- users/[id]
- heuristic-abuse
- api
- auth
- [...nextauth]
- native/token
- verify-turnstile
- cloud-agent-next/balance
- cron
- cleanup-api-request-log
- cleanup-webhook-events
- code-review-outcome-aggregate
- dev/consume-credits
- internal
- bot-session-callback/[botRequestId]
- code-review-status/[reviewId]
- kiloclaw/instance-ready
- support/users/gdpr-removal
- sso/organizations
- user-deployments/webhook
- auth/openai/callback
- feedback
- get-started
- payments/topup
- success
- users
- accept-invite/[token]
- after-sign-in
- components
- auth
- sign-in
- cloud-agent-next
- dev
- organizations
- members
- profile
- subscriptions/org-kilo-pass
- usage-analytics
- hooks
- lib
- abuse
- ai-gateway
- auto-model
- handlers
- openai-chatgpt
- providers
- direct-byok
- openrouter
- typesafe
- auth
- openai
- bouncer
- code-reviews
- core
- db
- review-memory
- summary
- telemetry
- triggers
- contributor-champions
- credits
- discord
- feedback
- integrations/platforms
- github
- webhook-handlers
- gitlab
- webhook-handlers
- kilo-pass-org
- kilo-pass
- observability
- organizations
- r2
- spend-alerts
- stripe
- trpc
- user
- deletion-queue
- handlers
- webhook-agent
- routers
- admin
- code-reviews
- organizations
- scripts
- mcp-catalog
- tests
- helpers
- packages
- db/src
- migrations
- meta
- notifications/src
- locales
- scripts
- services
- cloud-agent-next
- scripts
- src
- kilo
- persistence
- sandbox-control
- sandbox-session
- sandbox-state/ports
- session
- telemetry
- test
- e2e
- postgres
- unit/wrapper
- wrapper
- src
- control
- kilo-mcp
- src
- security-auto-analysis/src
- security-sync
- src
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
37 | 40 | | |
38 | 41 | | |
39 | 42 | | |
| |||
203 | 206 | | |
204 | 207 | | |
205 | 208 | | |
| 209 | + | |
206 | 210 | | |
207 | | - | |
208 | | - | |
209 | | - | |
210 | | - | |
211 | 211 | | |
212 | 212 | | |
213 | 213 | | |
| |||
0 commit comments