Skip to content

Commit 18c682b

Browse files
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.
2 parents 337cc0d + 75410ce commit 18c682b

587 files changed

Lines changed: 187586 additions & 7056 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.env.local.example‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ R2_ACCOUNT_ID=mock-test-account-id
3434
R2_ACCESS_KEY_ID=mock-test-access-key
3535
R2_SECRET_ACCESS_KEY=mock-test-secret-key
3636
R2_CLI_SESSIONS_BUCKET_NAME=test-bucket
37+
R2_API_REQUEST_LOG_BUCKET_NAME=test-api-request-log
38+
R2_API_REQUEST_LOG_ACCESS_KEY_ID=mock-test-api-request-log-access-key
39+
R2_API_REQUEST_LOG_SECRET_ACCESS_KEY=mock-test-api-request-log-secret-key
3740
# ============================================================================
3841
# AI / Model Inference (Required for AI features)
3942
# ============================================================================
@@ -203,11 +206,8 @@ ARTIFICIAL_ANALYSIS_API_KEY=
203206
AI_ATTRIBUTION_ADMIN_SECRET=
204207
GASTOWN_SERVICE_URL=
205208
O11Y_SERVICE_URL=
209+
BOUNCER_URL=
206210
CRON_SECRET=
207-
# Abuse detection
208-
ABUSE_SERVICE_URL=
209-
ABUSE_SERVICE_CF_ACCESS_CLIENT_ID=
210-
ABUSE_SERVICE_CF_ACCESS_CLIENT_SECRET=
211211
# Coding Plan provider management (optional; server-only)
212212
# Install through `pnpm web:env set` rather than adding real values here.
213213
BYTEPLUS_CODING_PLAN_ACCESS_KEY_ID=
176 KB
Loading
231 KB
Loading
278 KB
Loading
16.9 KB
Loading
77.8 KB
Loading
79.4 KB
Loading
75.6 KB
Loading
220 KB
Loading
26.9 KB
Loading

0 commit comments

Comments
 (0)