Add script to expire non-expiring free credits by iscekic · Pull Request #1269 · Kilo-Org/cloud

iscekic · 2026-03-19T10:43:42Z

Summary

Script to set 30-day expiry dates on free, non-expiring credit transactions
Credit categories driven by reviewed spreadsheet; empty description matches any
Orb double-deduction protection: detects users where Orb already clawed back credits (reducing total_microdollars_acquired) and skips setting expiry on credits that would push the balance negative
Dry-run by default, --execute to write changes
JSONL output with projected_no_script / projected_after_script balances for clear before/after visibility
Mutations log: records every DB change (old/new values) for auditability
Revert script: reads the mutations log to undo all changes if needed

Key details

Integration tests cover: fully spent, partially spent, unspent, multi-block, buy-use-free ordering, Orb double-deduction, existing expirations, and full revert round-trip

Test plan

Dry run completed successfully
Execute run verified — 0 users pushed negative by script
Integration tests pass (expire script + revert script)
CI passes (lint, typecheck, tests)

introduce configurable concurrency for expire-free-credits via p-limit parse --concurrency, defaulting to 50 and validate values increase default batch size to 10000 for throughput create timestamped output and error log files under output/ log created file paths and active concurrency for visibility

…edits exclude categories from expiration to avoid expiring credits exclude list: orb_migration_accounting_adjustment, credits_expired custom, usage_issue, feedback

…category first Instead of scanning all users and filtering, the script now takes a mandatory --category=<name> arg and queries credit_transactions by category directly, then groups by user. Much faster for targeted runs.

…ry-based filtering

…n pairs - Replace --category param with embedded (category, description) pairs copied from the reviewed spreadsheet - Empty description matches NULL or empty, specific description matches exactly — handles same category with different descriptions - Expiry date is now 30 days from runtime instead of hardcoded - Add per-category breakdown in summary output - Improve progress logging clarity

…correctness

…or that category

ignore runtime artifacts produced by the Kilo agent in prettier

src/scripts/d2026-03-18_expire-free-credits.ts

kilo-code-bot · 2026-03-19T10:46:47Z

Code Review Summary

Status: 1 Issue Found | Recommendation: Address before merge

Overview

Severity	Count
CRITICAL	0
WARNING	1
SUGGESTION	0

Issue Details (click to expand)

WARNING

File	Line	Issue
`src/scripts/d2026-03-18_expire-free-credits.ts`	419	Dry runs still emit a revertable mutations log, so applying that file later can overwrite legitimate current expirations.

Fix these issues in Kilo Cloud

Other Observations (not in diff)

None.

Files Reviewed (2 files)

src/scripts/d2026-03-18_expire-free-credits.ts - 1 issue
src/scripts/d2026-03-18_expire-free-credits.test.ts - 0 issues

_{Reviewed by gpt-5.4-20260305 · 294,119 tokens}

src/scripts/d2026-03-18_expire-free-credits.ts

markijbema

I mean i cant verify correctness just by reviewing. I think I'd write some tests or run on a copy of the database to verify first

Covers: fully/partially/unspent users, any-description matching, non-free exclusion, org-scoped exclusion, already-expiring exclusion, wrong description, mixed credits, multiple matching credits, zero-amount, existing next_credit_expiration_at LEAST, and multi-block projected expiration correctness.

src/scripts/d2026-03-18_expire-free-credits.test.ts

… comment the code comment now uses EXPIRY_DATE instead of a fixed date to clarify runtime behavior and enable easier configuration of the expiry date used by the script

…cases Verifies that original_baseline_microdollars_used correctly determines whether free credits are covered by prior usage: free credits granted after spending are not covered and expire fully, while free credits granted before spending are covered and nothing expires.

…its across batches Uses a subquery to select the next N distinct user IDs, then fetches all matching credits for those users in a single query. Prevents the previous row-level pagination from skipping credits when a user's rows span a batch boundary. Test runs with --batch-size=1 to exercise this.

…Orb double-deductions When Orb clawed back spent free credits (reducing total_microdollars_acquired), the expiration simulation would still try to expire the full credit amount, pushing ~1,610 users into negative balance. Now boosts expiration baselines on newly-tagged credits so total expiration never exceeds the current balance.

- Add src/scripts/ to testPathIgnorePatterns (integration tests need POSTGRES_SCRIPT_URL which isn't available in CI) - Replace non-null assertions with null checks / fallbacks

src/scripts/d2026-03-18_expire-free-credits.ts

…ve instead of boosting baselines Baseline boosting was wrong — increasing a credit's baseline shifts its claim window right, which *increases* expiration, not decreases it. With microdollars_used=0 (Orb users), no baseline prevents full expiration. New approach: simulate all expirations, compute headroom (balance minus existing expirations), then only set expiry on credits that fit within headroom. Credits that would cause over-expiration are skipped entirely.

src/scripts/d2026-03-18_expire-free-credits.ts

…fter-script Replace the misleading single projected_balance_microdollars with two fields: - projected_no_script_microdollars: balance after only pre-existing expirations - projected_after_script_microdollars: balance after script-set expirations too

The expire script now writes a mutations.jsonl file recording every DB change (old/new values for each credit transaction and user row). New revert script reads the mutations file and undoes the changes: - Resets expiry_date and expiration_baseline to null on credit transactions - Recomputes next_credit_expiration_at from remaining expiring credits Usage: pnpm script src/scripts/d2026-03-18_expire-free-credits-revert.ts <mutations-file> [--execute]

Runs expire script → takes snapshot → runs revert script → verifies all credits and users are restored to their original state.

src/scripts/d2026-03-18_expire-free-credits.ts

src/scripts/d2026-03-18_expire-free-credits-revert.ts

…d values - Move mutation logging after the DB transaction commits so rolled-back transactions don't leave phantom entries in the mutations file - Revert script now restores the exact old values from the mutations log instead of blindly writing nulls

src/scripts/d2026-03-18_expire-free-credits.ts

Both the expire and revert scripts now show the target database hostname and prompt for confirmation before proceeding. Bypass with --yes/-y. Tests assert the DB URL is local postgres and pass --yes automatically.

pedroheyerdahl

There are two issues when comparing with the audit sheet.

orb_free_credits | (any) sweeps up entries the audit marked SHOULD_EXPIRE=FALSE: "Email $50 non-expire (BDO)" at $2,250 across 45 credits, and "100 email campaign (Justin)" at $100. A few unreviewed entries come along too. The FALSE ones were explicitly opted out during the review, so running --execute as-is would override those decisions.

The second is the expiry window for custom | Part-time UX hire, providing tokens to use product and be productive: the audit has EXPIRE_IN_DAYS=180, but the script applies 30 days to everything. Just one credit at $100, so not a big deal financially, but it goes against the reviewed call.

src/scripts/d2026-03-18_expire-free-credits-revert.test.ts

+    const mutationsFile = findLatestMutationsFile();
+    console.log(`Running revert script with mutations file: ${mutationsFile}\n`);
+    const revertOutput = execSync(
+      `pnpm script src/scripts/d2026-03-18_expire-free-credits-revert.ts ${mutationsFile} --execute --yes`,


In general, the fix is to avoid constructing a shell command string that embeds unescaped, dynamic values (like filenames) and then running it through a shell. Instead, invoke the command with an API that accepts the executable and its arguments separately (for example, execFileSync or spawnSync from node:child_process), passing mutationsFile as a distinct argument so the shell does not interpret it.

Concretely here, we should:

Replace the use of execSync with execFileSync for both command invocations:

The “expire-free-credits” script call on lines 214–217.

The “revert” script call on lines 232–235, which is where the tainted mutationsFile is interpolated.

Pass "pnpm" as the command, "script" as the first argument, followed by the script path and other flags, and in the second call include mutationsFile as its own argument in the args array.

Import execFileSync from node:child_process instead of execSync.

Preserve the existing options (cwd, encoding, env, timeout) by passing the same options object to execFileSync.

All of these changes must be made within src/scripts/d2026-03-18_expire-free-credits-revert.test.ts:

Update the import on line 15 from execSync to execFileSync.

Change the expireOutput assignment on lines 214–217 to call execFileSync('pnpm', [...args...], options).

Change the revertOutput assignment on lines 232–235 similarly, ensuring mutationsFile is in the args array and not interpolated into a single command string.

No additional helper methods are required; only the import and function calls need updating.

…matching logic - Remove hardcoded template literal credit category/description data and global EXPIRY_DATE constants - Add --input=<path> required CLI argument for CSV file - Add parseCsv() that validates columns, parses rows, deduplicates pairs, and builds a Map<PairKey, RowLookup> with pre-computed per-row expiry dates - Add resolveCredit() with specific-match-then-catch-all fallback - Update processUser() to accept lookup map, resolve per-credit expiry dates, update each credit individually in the DB transaction, and use earliest expiry for next_credit_expiration_at - Replace OR condition query filter with simpler inArray on categoriesToQuery, with app-side filtering via resolveCredit after fetch - Remove unused `or` import from drizzle-orm

src/scripts/d2026-03-18_expire-free-credits.ts

When headroom is limited (Orb clawback cases), the order in which credits are consumed matters. Sort by resolved expiry date ascending so earlier-expiring credits are preferred over later-expiring ones.

iscekic added 11 commits March 18, 2026 14:22

feat: first pass at free credits script

87a70c5

fix(scripts): exclude categories from expiration to avoid expiring cr…

35d1e90

…edits exclude categories from expiration to avoid expiring credits exclude list: orb_migration_accounting_adjustment, credits_expired custom, usage_issue, feedback

style(scripts): remove eslint-disable-next-line above infinite loop

d2448d1

feat(expire-free-credits): switch to dynamic 30-day expiry and catego…

18f2baa

…ry-based filtering

fix(expire-free-credits): correct empty description label in startup log

e29e2a3

fix(expire-free-credits): log next_credit_expiration_at for rollback …

3f43dda

…correctness

fix(expire-free-credits): empty description matches any description f…

06639ef

…or that category

chore(prettier): add .kilo to ignore list

73ba056

ignore runtime artifacts produced by the Kilo agent in prettier

iscekic self-assigned this Mar 19, 2026

iscekic requested review from RSO, emilieschario, markijbema and pedroheyerdahl March 19, 2026 10:44

kilo-code-bot bot reviewed Mar 19, 2026

View reviewed changes

src/scripts/d2026-03-18_expire-free-credits.ts Outdated Show resolved Hide resolved

markijbema reviewed Mar 19, 2026

View reviewed changes

src/scripts/d2026-03-18_expire-free-credits.ts Outdated Show resolved Hide resolved

markijbema approved these changes Mar 19, 2026

View reviewed changes

kilo-code-bot bot reviewed Mar 19, 2026

View reviewed changes

src/scripts/d2026-03-18_expire-free-credits.test.ts Outdated Show resolved Hide resolved

iscekic added 7 commits March 19, 2026 12:13

docs(expire-free-credits): replace hardcoded date with EXPIRY_DATE in…

491fafa

… comment the code comment now uses EXPIRY_DATE instead of a fixed date to clarify runtime behavior and enable easier configuration of the expiry date used by the script

chore(scripts): add .gitignore to ignore *.jsonl in output dir

6ff6482

Merge remote-tracking branch 'origin/main' into fix/expire-credits

6353835

fix(ci): exclude src/scripts/ from Jest and fix lint errors

2d8c60e

- Add src/scripts/ to testPathIgnorePatterns (integration tests need POSTGRES_SCRIPT_URL which isn't available in CI) - Replace non-null assertions with null checks / fallbacks

kilo-code-bot bot reviewed Mar 19, 2026

View reviewed changes

src/scripts/d2026-03-18_expire-free-credits.ts Outdated Show resolved Hide resolved

kilo-code-bot bot reviewed Mar 19, 2026

View reviewed changes

src/scripts/d2026-03-18_expire-free-credits.ts Outdated Show resolved Hide resolved

iscekic added 3 commits March 20, 2026 11:56

test(expire-free-credits): add integration test for revert script

8266911

Runs expire script → takes snapshot → runs revert script → verifies all credits and users are restored to their original state.

kilo-code-bot bot reviewed Mar 20, 2026

View reviewed changes

src/scripts/d2026-03-18_expire-free-credits.ts Outdated Show resolved Hide resolved

src/scripts/d2026-03-18_expire-free-credits-revert.ts Outdated Show resolved Hide resolved

iscekic requested a review from markijbema March 20, 2026 11:14

iscekic added 3 commits March 20, 2026 12:16

style: format revert test file

556c354

fix(expire-free-credits): log mutations in dry run mode too

b8664a8

kilo-code-bot bot reviewed Mar 20, 2026

View reviewed changes

src/scripts/d2026-03-18_expire-free-credits.ts Show resolved Hide resolved

feat(expire-free-credits): add confirmation prompt with DB host display

91e1c10

Both the expire and revert scripts now show the target database hostname and prompt for confirmation before proceeding. Bypass with --yes/-y. Tests assert the DB URL is local postgres and pass --yes automatically.

pedroheyerdahl reviewed Mar 26, 2026

View reviewed changes

Merge branch 'main' into fix/expire-credits

d48f4e2

github-advanced-security bot found potential problems Mar 31, 2026

View reviewed changes

iscekic added 6 commits March 31, 2026 16:03

test: update expire-credits test to use generated CSV input

65dcecb

test: update revert test to use generated CSV input

b27d606

chore: add csv-parse dependency for expire-credits script

b05dc90

fix: cursor advancement, add FALSE-override test, add sheet URL comment

16b4335

fix: add comment in empty catch blocks to satisfy linter

dae924e

pedroheyerdahl self-requested a review March 31, 2026 14:19

pedroheyerdahl approved these changes Mar 31, 2026

View reviewed changes

kilo-code-bot bot reviewed Mar 31, 2026

View reviewed changes

src/scripts/d2026-03-18_expire-free-credits.ts Outdated Show resolved Hide resolved

fix: sort credits by expiry date before headroom selection

5da5372

When headroom is limited (Orb clawback cases), the order in which credits are consumed matters. Sort by resolved expiry date ascending so earlier-expiring credits are preferred over later-expiring ones.

iscekic merged commit ed22bd0 into main Mar 31, 2026
33 checks passed

iscekic deleted the fix/expire-credits branch March 31, 2026 15:00

@@ -12,7 +12,7 @@
             import '../lib/load-env';
-            import { execSync } from 'node:child_process';
+            import { execFileSync } from 'node:child_process';
             import { readdirSync, writeFileSync, unlinkSync, mkdtempSync } from 'node:fs';
             import { tmpdir } from 'node:os';
             import path from 'node:path';
@@ -211,8 +211,16 @@
                 // 2. Run the expire script
                 console.log('Running expire-free-credits script with --execute...\n');
-                const expireOutput = execSync(
-                  `pnpm script src/scripts/d2026-03-18_expire-free-credits.ts --input=${testCsvPath} --execute --yes --batch-size=1`,
+                const expireOutput = execFileSync(
+                  'pnpm',
+                  [
+                    'script',
+                    'src/scripts/d2026-03-18_expire-free-credits.ts',
+                    `--input=${testCsvPath}`,
+                    '--execute',
+                    '--yes',
+                    '--batch-size=1',
+                  ],
                   { cwd: process.cwd(), encoding: 'utf-8', env: { ...process.env }, timeout: 120_000 }
                 );
                 console.log(expireOutput);
@@ -229,8 +237,15 @@
                 // 4. Run the revert script
                 const mutationsFile = findLatestMutationsFile();
                 console.log(`Running revert script with mutations file: ${mutationsFile}\n`);
-                const revertOutput = execSync(
-                  `pnpm script src/scripts/d2026-03-18_expire-free-credits-revert.ts ${mutationsFile} --execute --yes`,
+                const revertOutput = execFileSync(
+                  'pnpm',
+                  [
+                    'script',
+                    'src/scripts/d2026-03-18_expire-free-credits-revert.ts',
+                    mutationsFile,
+                    '--execute',
+                    '--yes',
+                  ],
                   { cwd: process.cwd(), encoding: 'utf-8', env: { ...process.env }, timeout: 120_000 }
                 );
                 console.log(revertOutput);

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add script to expire non-expiring free credits#1269

Add script to expire non-expiring free credits#1269
iscekic merged 35 commits intomainfrom
fix/expire-credits

iscekic commented Mar 19, 2026 •

edited

Loading

Uh oh!

Uh oh!

kilo-code-bot bot commented Mar 19, 2026 •

edited

Loading

WARNING

Uh oh!

Uh oh!

markijbema left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pedroheyerdahl left a comment •

edited

Loading

Uh oh!

Check warning

Copilot Autofix

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

iscekic commented Mar 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Key details

Test plan

Uh oh!

Uh oh!

kilo-code-bot bot commented Mar 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Review Summary

Overview

WARNING

Uh oh!

Uh oh!

markijbema left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pedroheyerdahl left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Check warning

Uh oh!

Copilot Autofix

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

iscekic commented Mar 19, 2026 •

edited

Loading

kilo-code-bot bot commented Mar 19, 2026 •

edited

Loading

pedroheyerdahl left a comment •

edited

Loading