mcp-scraper 0.35.1 → 0.37.0

package/dist/{chunk-62DQAWPF.js → chunk-CSCD2HNS.js}

@@ -6,12 +6,17 @@ var DB_URL = process.env.TURSO_DATABASE_URL ?? "file:./paa-api.db";
 var DB_TOKEN = process.env.TURSO_AUTH_TOKEN;
 var _db = null;
 var _rateLimitSchemaReady = false;
-var CORE_SCHEMA_VERSION = "2026-07-24.2";
+var CORE_SCHEMA_VERSION = "2026-07-28.1";
 var CORE_SCHEMA_TABLES = [
+  "admin_credit_adjustment_events",
+  "admin_credit_adjustments",
   "billing_authorizations",
+  "billing_credits",
   "billing_debits",
+  "billing_debit_allocations",
   "billing_events",
   "browser_profile_labels",
+  "connected_account_billing",
   "concurrency_locks",
   "credit_lots",
   "free_credit_refreshes",
@@ -40,7 +45,10 @@ var CORE_SCHEMA_TABLES = [
   "workflow_webhook_deliveries"
 ];
 var CORE_SCHEMA_INDEXES = [
+  "admin_credit_adjustment_events_reference",
+  "admin_credit_adjustments_user_created",
   "billing_authorizations_user_status",
+  "billing_credits_user_status",
   "billing_debits_user_status",
   "billing_events_authorization",
   "billing_events_user_created_at",
@@ -65,6 +73,7 @@ var CORE_SCHEMA_INDEXES = [
   "site_audit_jobs_user_id",
   "site_audit_phase_log_job_id",
   "site_extract_jobs_status",
+  "site_extract_jobs_idempotency",
   "site_extract_jobs_user_id",
   "site_extract_pages_job_id",
   "workflow_artifacts_run",
@@ -79,6 +88,19 @@ var CORE_SCHEMA_COLUMNS = {
   credit_lots: ["never_expires"],
   harvest_attempts: ["debug_json"],
   oauth_tokens: ["replaced_by", "rotated_at"],
+  site_extract_jobs: [
+    "attempted_urls",
+    "successful_urls",
+    "failed_urls",
+    "idempotency_key",
+    "request_fingerprint",
+    "dispatch_attempts",
+    "next_dispatch_at",
+    "dispatch_error",
+    "settlement_attempts",
+    "next_settlement_at",
+    "settlement_error"
+  ],
   users: [
     "balance_mc",
     "concurrency_stripe_sub_id",
@@ -112,6 +134,46 @@ async function hasCurrentCoreSchema(db) {
   const result = await db.execute(`SELECT ${checks.join(" AND ")} AS ready`);
   return Number(result.rows[0]?.ready ?? 0) === 1;
 }
+async function runIdempotentCoreDataBackfills(db) {
+  await db.execute(`
+    UPDATE site_extract_jobs SET
+      attempted_urls = done_urls,
+      successful_urls = (
+        SELECT COUNT(*) FROM site_extract_pages
+        WHERE job_id = site_extract_jobs.id
+          AND CASE
+            WHEN json_valid(page) = 0 THEN 0
+            WHEN json_extract(page, '$.extractionStatus') IS NOT NULL
+              THEN json_extract(page, '$.extractionStatus') = 'successful'
+            ELSE COALESCE(
+              json_extract(page, '$.status') >= 200
+              AND json_extract(page, '$.status') < 300
+              AND json_extract(page, '$.wordCount') > 0,
+              0
+            )
+          END
+      ),
+      failed_urls = MAX(0, done_urls - (
+        SELECT COUNT(*) FROM site_extract_pages
+        WHERE job_id = site_extract_jobs.id
+          AND CASE
+            WHEN json_valid(page) = 0 THEN 0
+            WHEN json_extract(page, '$.extractionStatus') IS NOT NULL
+              THEN json_extract(page, '$.extractionStatus') = 'successful'
+            ELSE COALESCE(
+              json_extract(page, '$.status') >= 200
+              AND json_extract(page, '$.status') < 300
+              AND json_extract(page, '$.wordCount') > 0,
+              0
+            )
+          END
+      ))
+    WHERE done_urls > 0
+      AND attempted_urls = 0
+      AND successful_urls = 0
+      AND failed_urls = 0
+  `);
+}
 function getDb() {
   if (!_db) _db = createClient({ url: DB_URL, authToken: DB_TOKEN });
   return _db;
@@ -138,8 +200,12 @@ async function migrate() {
     `);
     applied = { rows: [] };
   }
-  if (applied.rows.length > 0 && await hasCurrentCoreSchema(db)) return;
+  if (applied.rows.length > 0 && await hasCurrentCoreSchema(db)) {
+    await runIdempotentCoreDataBackfills(db);
+    return;
+  }
   if (await hasCurrentCoreSchema(db)) {
+    await runIdempotentCoreDataBackfills(db);
     await db.execute({
       sql: "INSERT OR IGNORE INTO schema_migrations (version) VALUES (?)",
       args: [CORE_SCHEMA_VERSION]
@@ -397,6 +463,74 @@ async function migrate() {
     )
   `);
   await db.execute(`CREATE INDEX IF NOT EXISTS billing_debits_user_status ON billing_debits(user_id, status)`);
+  await db.execute(`
+    CREATE TABLE IF NOT EXISTS billing_debit_allocations (
+      debit_idempotency_key TEXT NOT NULL REFERENCES billing_debits(idempotency_key),
+      lot_id                INTEGER NOT NULL REFERENCES credit_lots(id),
+      user_id               INTEGER NOT NULL REFERENCES users(id),
+      amount_mc             INTEGER NOT NULL,
+      expires_at            TEXT NOT NULL,
+      PRIMARY KEY (debit_idempotency_key, lot_id)
+    )
+  `);
+  await db.execute(`
+    CREATE TABLE IF NOT EXISTS connected_account_billing (
+      user_id                     INTEGER PRIMARY KEY REFERENCES users(id),
+      stripe_subscription_id      TEXT,
+      stripe_subscription_item_id TEXT,
+      price_id                    TEXT,
+      quantity                    INTEGER NOT NULL DEFAULT 0,
+      status                      TEXT NOT NULL DEFAULT 'pending',
+      last_error_code             TEXT,
+      checked_at                  TEXT NOT NULL DEFAULT (datetime('now')),
+      synced_at                   TEXT,
+      updated_at                  TEXT NOT NULL DEFAULT (datetime('now'))
+    )
+  `);
+  await db.execute(`
+    CREATE TABLE IF NOT EXISTS billing_credits (
+      idempotency_key TEXT PRIMARY KEY,
+      user_id         INTEGER NOT NULL REFERENCES users(id),
+      amount_mc       INTEGER NOT NULL,
+      operation       TEXT NOT NULL,
+      description     TEXT,
+      status          TEXT NOT NULL DEFAULT 'claimed',
+      created_at      TEXT NOT NULL DEFAULT (datetime('now')),
+      applied_at      TEXT
+    )
+  `);
+  await db.execute(`CREATE INDEX IF NOT EXISTS billing_credits_user_status ON billing_credits(user_id, status)`);
+  await db.execute(`
+    CREATE TABLE IF NOT EXISTS admin_credit_adjustments (
+      reference   TEXT PRIMARY KEY,
+      user_id     INTEGER NOT NULL REFERENCES users(id),
+      direction   TEXT NOT NULL,
+      amount_mc   INTEGER NOT NULL,
+      reason      TEXT NOT NULL,
+      actor       TEXT NOT NULL,
+      status      TEXT NOT NULL DEFAULT 'applied',
+      created_at  TEXT NOT NULL DEFAULT (datetime('now')),
+      updated_at  TEXT
+    )
+  `);
+  await db.execute(`CREATE INDEX IF NOT EXISTS admin_credit_adjustments_user_created ON admin_credit_adjustments(user_id, created_at)`);
+  await db.execute(`
+    CREATE TABLE IF NOT EXISTS admin_credit_adjustment_events (
+      id             INTEGER PRIMARY KEY AUTOINCREMENT,
+      reference      TEXT NOT NULL REFERENCES admin_credit_adjustments(reference),
+      seq            INTEGER NOT NULL,
+      kind           TEXT NOT NULL,
+      from_amount_mc INTEGER,
+      to_amount_mc   INTEGER,
+      from_reason    TEXT,
+      to_reason      TEXT,
+      moved_mc       INTEGER NOT NULL DEFAULT 0,
+      actor          TEXT NOT NULL,
+      created_at     TEXT NOT NULL DEFAULT (datetime('now')),
+      UNIQUE (reference, seq)
+    )
+  `);
+  await db.execute(`CREATE INDEX IF NOT EXISTS admin_credit_adjustment_events_reference ON admin_credit_adjustment_events(reference)`);
   await db.execute(`
     CREATE TABLE IF NOT EXISTS site_audit_jobs (
       id            TEXT    PRIMARY KEY,
@@ -432,6 +566,17 @@ async function migrate() {
       options       TEXT,
       total_urls    INTEGER DEFAULT 0,
       done_urls     INTEGER DEFAULT 0,
+      attempted_urls INTEGER DEFAULT 0,
+      successful_urls INTEGER DEFAULT 0,
+      failed_urls   INTEGER DEFAULT 0,
+      idempotency_key TEXT,
+      request_fingerprint TEXT,
+      dispatch_attempts INTEGER DEFAULT 0,
+      next_dispatch_at TEXT,
+      dispatch_error TEXT,
+      settlement_attempts INTEGER DEFAULT 0,
+      next_settlement_at TEXT,
+      settlement_error TEXT,
       artifacts     TEXT,
       error         TEXT,
       billed_mc     INTEGER,
@@ -450,6 +595,51 @@ async function migrate() {
   await db.execute(`CREATE INDEX IF NOT EXISTS site_extract_jobs_user_id ON site_extract_jobs(user_id)`);
   await db.execute(`CREATE INDEX IF NOT EXISTS site_extract_jobs_status ON site_extract_jobs(status)`);
   await db.execute(`CREATE INDEX IF NOT EXISTS site_extract_pages_job_id ON site_extract_pages(job_id)`);
+  try {
+    await db.execute(`ALTER TABLE site_extract_jobs ADD COLUMN attempted_urls INTEGER DEFAULT 0`);
+  } catch {
+  }
+  try {
+    await db.execute(`ALTER TABLE site_extract_jobs ADD COLUMN successful_urls INTEGER DEFAULT 0`);
+  } catch {
+  }
+  try {
+    await db.execute(`ALTER TABLE site_extract_jobs ADD COLUMN failed_urls INTEGER DEFAULT 0`);
+  } catch {
+  }
+  try {
+    await db.execute(`ALTER TABLE site_extract_jobs ADD COLUMN idempotency_key TEXT`);
+  } catch {
+  }
+  try {
+    await db.execute(`ALTER TABLE site_extract_jobs ADD COLUMN request_fingerprint TEXT`);
+  } catch {
+  }
+  try {
+    await db.execute(`ALTER TABLE site_extract_jobs ADD COLUMN dispatch_attempts INTEGER DEFAULT 0`);
+  } catch {
+  }
+  try {
+    await db.execute(`ALTER TABLE site_extract_jobs ADD COLUMN next_dispatch_at TEXT`);
+  } catch {
+  }
+  try {
+    await db.execute(`ALTER TABLE site_extract_jobs ADD COLUMN dispatch_error TEXT`);
+  } catch {
+  }
+  try {
+    await db.execute(`ALTER TABLE site_extract_jobs ADD COLUMN settlement_attempts INTEGER DEFAULT 0`);
+  } catch {
+  }
+  try {
+    await db.execute(`ALTER TABLE site_extract_jobs ADD COLUMN next_settlement_at TEXT`);
+  } catch {
+  }
+  try {
+    await db.execute(`ALTER TABLE site_extract_jobs ADD COLUMN settlement_error TEXT`);
+  } catch {
+  }
+  await db.execute(`CREATE UNIQUE INDEX IF NOT EXISTS site_extract_jobs_idempotency ON site_extract_jobs(user_id, idempotency_key) WHERE idempotency_key IS NOT NULL`);
   await db.execute(`
     CREATE TABLE IF NOT EXISTS password_reset_tokens (
       token      TEXT    PRIMARY KEY,
@@ -670,6 +860,7 @@ async function migrate() {
   if (!await hasCurrentCoreSchema(db)) {
     throw new Error("core schema migration finished without all required tables, indexes, and columns");
   }
+  await runIdempotentCoreDataBackfills(db);
   await db.execute({
     sql: "INSERT OR IGNORE INTO schema_migrations (version) VALUES (?)",
     args: [CORE_SCHEMA_VERSION]
@@ -1647,6 +1838,75 @@ async function setSubscriptionTier(userId, tier, concurrency, subId) {
     args: [tier, Math.max(0, Math.round(concurrency)), subId, userId]
   });
 }
+function rowToConnectedAccountBillingState(row) {
+  return {
+    user_id: Number(row.user_id),
+    stripe_subscription_id: row.stripe_subscription_id != null ? String(row.stripe_subscription_id) : null,
+    stripe_subscription_item_id: row.stripe_subscription_item_id != null ? String(row.stripe_subscription_item_id) : null,
+    price_id: row.price_id != null ? String(row.price_id) : null,
+    quantity: Math.max(0, Number(row.quantity ?? 0)),
+    status: ["pending", "synced", "blocked", "error"].includes(String(row.status)) ? String(row.status) : "error",
+    last_error_code: row.last_error_code != null ? String(row.last_error_code) : null,
+    checked_at: String(row.checked_at),
+    synced_at: row.synced_at != null ? String(row.synced_at) : null,
+    updated_at: String(row.updated_at)
+  };
+}
+async function getConnectedAccountBillingState(userId) {
+  const res = await getDb().execute({
+    sql: "SELECT * FROM connected_account_billing WHERE user_id = ? LIMIT 1",
+    args: [userId]
+  });
+  const row = res.rows[0];
+  return row ? rowToConnectedAccountBillingState(row) : null;
+}
+async function setConnectedAccountBillingState(input) {
+  const quantity = Math.max(0, Math.round(input.quantity));
+  await getDb().execute({
+    sql: `INSERT INTO connected_account_billing
+      (user_id, stripe_subscription_id, stripe_subscription_item_id, price_id, quantity, status, last_error_code, checked_at, synced_at, updated_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, datetime('now'), CASE WHEN ? THEN datetime('now') ELSE NULL END, datetime('now'))
+      ON CONFLICT(user_id) DO UPDATE SET
+        stripe_subscription_id = excluded.stripe_subscription_id,
+        stripe_subscription_item_id = excluded.stripe_subscription_item_id,
+        price_id = excluded.price_id,
+        quantity = excluded.quantity,
+        status = excluded.status,
+        last_error_code = excluded.last_error_code,
+        checked_at = datetime('now'),
+        synced_at = CASE WHEN ? THEN datetime('now') ELSE connected_account_billing.synced_at END,
+        updated_at = datetime('now')`,
+    args: [
+      input.userId,
+      input.stripeSubscriptionId,
+      input.stripeSubscriptionItemId,
+      input.priceId,
+      quantity,
+      input.status,
+      input.lastErrorCode ?? null,
+      input.synced === true ? 1 : 0,
+      input.synced === true ? 1 : 0
+    ]
+  });
+  const state = await getConnectedAccountBillingState(input.userId);
+  if (!state) throw new Error("connected account billing state was not persisted");
+  return state;
+}
+async function listUsersDueForConnectedAccountBillingReconciliation(staleMinutes = 60, limit = 20) {
+  const modifier = `-${Math.max(1, Math.round(staleMinutes))} minutes`;
+  const res = await getDb().execute({
+    sql: `SELECT u.*
+      FROM users u
+      LEFT JOIN connected_account_billing b ON b.user_id = u.id
+      WHERE u.active = 1
+        AND u.subscription_id IS NOT NULL
+        AND (b.checked_at IS NULL OR b.checked_at <= datetime('now', ?))
+      ORDER BY COALESCE(b.checked_at, u.created_at) ASC
+      LIMIT ?`,
+    args: [modifier, Math.max(1, Math.min(100, Math.round(limit)))]
+  });
+  return res.rows.map((row) => rowToUser(row));
+}
 async function setMemoryPlan(userId, plan, subscriptionId) {
   await getDb().execute({
     sql: "UPDATE users SET memory_plan = ?, memory_subscription_id = ? WHERE id = ?",
@@ -1784,6 +2044,84 @@ async function creditMc(userId, mc, operation, description, stripePaymentIntent,
   const res = await db.execute({ sql: "SELECT balance_mc FROM users WHERE id = ?", args: [userId] });
   return Number(res.rows[0]?.balance_mc ?? 0);
 }
+async function creditMcIdempotent(userId, mc, operation, description, idempotencyKey, options) {
+  if (!Number.isSafeInteger(mc) || mc <= 0) throw new Error("idempotent credit amount must be a positive integer");
+  if (!idempotencyKey || idempotencyKey.length > 500) throw new Error("idempotent credit key is required and must be bounded");
+  const db = getDb();
+  await ensureMigrated(userId);
+  let neverExpires = options?.neverExpires;
+  if (neverExpires === void 0) {
+    const tier = await db.execute({ sql: "SELECT subscription_tier FROM users WHERE id = ? LIMIT 1", args: [userId] });
+    neverExpires = String(tier.rows[0]?.subscription_tier ?? "").startsWith("sonic");
+  }
+  const expiry = neverExpires ? "9999-12-31 23:59:59" : null;
+  const readBalance = async () => {
+    const res = await db.execute({ sql: "SELECT balance_mc FROM users WHERE id = ?", args: [userId] });
+    return Number(res.rows[0]?.balance_mc ?? 0);
+  };
+  let results;
+  try {
+    results = await db.batch([
+      {
+        sql: "INSERT OR IGNORE INTO billing_credits (idempotency_key, user_id, amount_mc, operation, description, status) VALUES (?, ?, ?, ?, ?, 'claimed')",
+        args: [idempotencyKey, userId, mc, operation, description]
+      },
+      {
+        sql: "UPDATE billing_credits SET status = 'applying' WHERE idempotency_key = ? AND user_id = ? AND amount_mc = ? AND operation = ? AND description = ? AND status = 'claimed'",
+        args: [idempotencyKey, userId, mc, operation, description]
+      },
+      {
+        sql: `INSERT INTO credit_lots (user_id, amount_mc, remaining_mc, source, stripe_pi, expires_at, never_expires)
+              SELECT user_id, amount_mc, amount_mc, operation, NULL, COALESCE(?, datetime('now', ?)), ?
+              FROM billing_credits
+              WHERE idempotency_key = ? AND status = 'applying'`,
+        args: [expiry, CREDIT_LOT_TTL, neverExpires ? 1 : 0, idempotencyKey]
+      },
+      {
+        sql: `UPDATE users
+              SET balance_mc = balance_mc + COALESCE((
+                SELECT amount_mc FROM billing_credits WHERE idempotency_key = ? AND status = 'applying'
+              ), 0)
+              WHERE id = ?`,
+        args: [idempotencyKey, userId]
+      },
+      {
+        sql: "INSERT INTO ledger (user_id, amount_mc, operation, description) SELECT user_id, amount_mc, operation, description FROM billing_credits WHERE idempotency_key = ? AND status = 'applying'",
+        args: [idempotencyKey]
+      },
+      {
+        sql: "UPDATE billing_credits SET status = 'applied', applied_at = datetime('now') WHERE idempotency_key = ? AND status = 'applying'",
+        args: [idempotencyKey]
+      }
+    ], "write");
+  } catch (error) {
+    try {
+      const recovered = await db.execute({
+        sql: "SELECT user_id, amount_mc, operation, description FROM billing_credits WHERE idempotency_key = ? AND status = 'applied' LIMIT 1",
+        args: [idempotencyKey]
+      });
+      const row2 = recovered.rows[0];
+      if (row2 && Number(row2.user_id) === userId && Number(row2.amount_mc) === mc && String(row2.operation) === operation && String(row2.description) === description) {
+        return { ok: true, balance_mc: await readBalance(), duplicate: true };
+      }
+    } catch {
+    }
+    throw error;
+  }
+  const claim = await db.execute({
+    sql: "SELECT user_id, amount_mc, operation, description, status FROM billing_credits WHERE idempotency_key = ? LIMIT 1",
+    args: [idempotencyKey]
+  });
+  const row = claim.rows[0];
+  if (!row || Number(row.user_id) !== userId || Number(row.amount_mc) !== mc || String(row.operation) !== operation || String(row.description) !== description) {
+    throw new Error("idempotent credit key conflicts with another credit");
+  }
+  return {
+    ok: String(row.status) === "applied",
+    balance_mc: await readBalance(),
+    duplicate: results[1]?.rowsAffected === 0 && String(row.status) === "applied"
+  };
+}
 async function ledgerExistsForOperation(userId, operation) {
   const res = await getDb().execute({
     sql: "SELECT 1 FROM ledger WHERE user_id = ? AND operation = ? LIMIT 1",
@@ -1826,6 +2164,8 @@ async function debitMcIdempotent(userId, mc, operation, description, idempotency
   try {
     results = await db.batch([
       {
+        // An unfunded claim may be retried with a corrected estimate under the
+        // same logical operation fingerprint. Applied claims remain immutable.
         sql: "UPDATE billing_debits SET amount_mc = ? WHERE idempotency_key = ? AND user_id = ? AND operation = ? AND description = ? AND status = 'claimed'",
         args: [mc, idempotencyKey, userId, operation, description]
       },
@@ -1834,17 +2174,29 @@ async function debitMcIdempotent(userId, mc, operation, description, idempotency
         args: [idempotencyKey, userId, mc, operation, description]
       },
       {
-        sql: "UPDATE users SET balance_mc = balance_mc - ? WHERE id = ? AND balance_mc >= ? AND EXISTS (SELECT 1 FROM billing_debits WHERE idempotency_key = ? AND user_id = ? AND amount_mc = ? AND operation = ? AND description = ? AND status = 'claimed')",
-        args: [mc, userId, mc, idempotencyKey, userId, mc, operation, description]
+        sql: `UPDATE users
+              SET balance_mc = balance_mc - ?
+              WHERE id = ?
+                AND balance_mc >= ?
+                AND (SELECT COALESCE(SUM(remaining_mc), 0)
+                     FROM credit_lots
+                     WHERE user_id = ?
+                       AND remaining_mc > 0
+                       AND (never_expires = 1 OR expires_at > datetime('now'))) >= ?
+                AND EXISTS (SELECT 1 FROM billing_debits WHERE idempotency_key = ? AND user_id = ? AND amount_mc = ? AND operation = ? AND description = ? AND status = 'claimed')`,
+        args: [mc, userId, mc, userId, mc, idempotencyKey, userId, mc, operation, description]
       },
       {
         sql: "UPDATE billing_debits SET status = 'applying' WHERE idempotency_key = ? AND user_id = ? AND amount_mc = ? AND operation = ? AND description = ? AND status = 'claimed' AND changes() = 1",
         args: [idempotencyKey, userId, mc, operation, description]
       },
       {
-        sql: `WITH ordered AS MATERIALIZED (
+        sql: `INSERT OR IGNORE INTO billing_debit_allocations
+                (debit_idempotency_key, lot_id, user_id, amount_mc, expires_at)
+              WITH ordered AS MATERIALIZED (
                 SELECT id,
                        remaining_mc,
+                       expires_at,
                        COALESCE(SUM(remaining_mc) OVER (
                          ORDER BY never_expires ASC, expires_at ASC, granted_at ASC, id ASC
                          ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING
@@ -1852,14 +2204,26 @@ async function debitMcIdempotent(userId, mc, operation, description, idempotency
                 FROM credit_lots
                 WHERE user_id = ? AND remaining_mc > 0 AND (never_expires = 1 OR expires_at > datetime('now'))
               ), allocation AS (
-                SELECT id, MIN(remaining_mc, MAX(0, ? - prior_mc)) AS take_mc
+                SELECT id, expires_at, MIN(remaining_mc, MAX(0, ? - prior_mc)) AS take_mc
                 FROM ordered
               )
-              UPDATE credit_lots
-              SET remaining_mc = remaining_mc - COALESCE((SELECT take_mc FROM allocation WHERE allocation.id = credit_lots.id), 0)
-              WHERE id IN (SELECT id FROM allocation WHERE take_mc > 0)
+              SELECT ?, id, ?, take_mc, expires_at
+              FROM allocation
+              WHERE take_mc > 0
                 AND EXISTS (SELECT 1 FROM billing_debits WHERE idempotency_key = ? AND status = 'applying')`,
-        args: [userId, mc, idempotencyKey]
+        args: [userId, mc, idempotencyKey, userId, idempotencyKey]
+      },
+      {
+        sql: `UPDATE credit_lots
+              SET remaining_mc = remaining_mc - COALESCE((
+                SELECT amount_mc FROM billing_debit_allocations
+                WHERE debit_idempotency_key = ? AND lot_id = credit_lots.id
+              ), 0)
+              WHERE id IN (
+                SELECT lot_id FROM billing_debit_allocations WHERE debit_idempotency_key = ?
+              )
+                AND EXISTS (SELECT 1 FROM billing_debits WHERE idempotency_key = ? AND status = 'applying')`,
+        args: [idempotencyKey, idempotencyKey, idempotencyKey]
       },
       {
         sql: "INSERT INTO ledger (user_id, amount_mc, operation, description) SELECT user_id, -amount_mc, operation, description FROM billing_debits WHERE idempotency_key = ? AND status = 'applying'",
@@ -1923,6 +2287,7 @@ async function settleDebitMcIdempotent(userId, debitIdempotencyKey, finalAmountM
                    e.amount_mc AS final_amount_mc,
                    e.billing_class,
                    e.source_surface,
+                   e.settled_at,
                    d.amount_mc AS held_amount_mc
             FROM billing_events e
             JOIN billing_debits d ON d.idempotency_key = ?
@@ -1943,11 +2308,35 @@ async function settleDebitMcIdempotent(userId, debitIdempotencyKey, finalAmountM
     if (!Number.isSafeInteger(heldAmountMc) || !Number.isSafeInteger(durableFinalAmountMc) || durableFinalAmountMc < 0 || durableFinalAmountMc > heldAmountMc) {
       throw new Error("idempotent debit settlement receipt is invalid");
     }
+    const nominalRefundMc = heldAmountMc - durableFinalAmountMc;
+    const allocationRefund = await db.execute({
+      sql: `WITH ordered AS (
+              SELECT a.amount_mc,
+                     a.expires_at,
+                     COALESCE(SUM(a.amount_mc) OVER (
+                       ORDER BY a.expires_at ASC, a.lot_id ASC
+                       ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING
+                     ), 0) AS prior_mc
+              FROM billing_debit_allocations a
+              WHERE a.debit_idempotency_key = ?
+            ), refunds AS (
+              SELECT expires_at,
+                     amount_mc - MIN(amount_mc, MAX(0, ? - prior_mc)) AS refund_mc
+              FROM ordered
+            )
+            SELECT (SELECT COUNT(*) FROM ordered) AS allocation_count,
+                   COALESCE(SUM(CASE WHEN expires_at > ? THEN refund_mc ELSE 0 END), 0) AS credited_refund_mc
+            FROM refunds`,
+      args: [debitIdempotencyKey, durableFinalAmountMc, String(row.settled_at)]
+    });
+    const allocationCount = Number(allocationRefund.rows[0]?.allocation_count ?? 0);
+    const creditedRefundMc = allocationCount > 0 ? Number(allocationRefund.rows[0]?.credited_refund_mc ?? 0) : 0;
     const balance = await db.execute({ sql: "SELECT balance_mc FROM users WHERE id = ?", args: [userId] });
     return {
       balance_mc: Number(balance.rows[0]?.balance_mc ?? 0),
       final_amount_mc: durableFinalAmountMc,
-      refund_mc: heldAmountMc - durableFinalAmountMc,
+      refund_mc: creditedRefundMc,
+      expired_refund_mc: nominalRefundMc - creditedRefundMc,
       duplicate: true
     };
   };
@@ -1961,13 +2350,34 @@ async function settleDebitMcIdempotent(userId, debitIdempotencyKey, finalAmountM
         args: [eventId, userId, settlementKey, billingClass, sourceSurface, finalAmountMc, metadata]
       },
       {
-        sql: `UPDATE users
-              SET balance_mc = balance_mc + (
-                SELECT d.amount_mc - e.amount_mc
-                FROM billing_events e
-                JOIN billing_debits d ON d.idempotency_key = ?
-                WHERE e.idempotency_key = ?
+        sql: `WITH ordered AS (
+                SELECT a.lot_id,
+                       a.amount_mc,
+                       a.expires_at,
+                       COALESCE(SUM(a.amount_mc) OVER (
+                         ORDER BY a.expires_at ASC, a.lot_id ASC
+                         ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING
+                       ), 0) AS prior_mc
+                FROM billing_debit_allocations a
+                WHERE a.debit_idempotency_key = ?
+              ), refunds AS (
+                SELECT lot_id,
+                       expires_at,
+                       amount_mc - MIN(amount_mc, MAX(0, ? - prior_mc)) AS refund_mc
+                FROM ordered
               )
+              UPDATE users
+              SET balance_mc = balance_mc + CASE
+                WHEN EXISTS (SELECT 1 FROM ordered) THEN COALESCE(
+                  (SELECT SUM(refund_mc) FROM refunds WHERE expires_at > datetime('now')),
+                  0
+                )
+                -- Holds created before allocation provenance cannot be safely
+                -- tied back to a source lot. Treat their unused portion as
+                -- expired instead of minting spendable credits with a guessed
+                -- expiry.
+                ELSE 0
+              END
               WHERE id = ?
                 AND EXISTS (
                   SELECT 1
@@ -1984,7 +2394,7 @@ async function settleDebitMcIdempotent(userId, debitIdempotencyKey, finalAmountM
                 )`,
         args: [
           debitIdempotencyKey,
-          settlementKey,
+          finalAmountMc,
           userId,
           debitIdempotencyKey,
           settlementKey,
@@ -2005,34 +2415,74 @@ async function settleDebitMcIdempotent(userId, debitIdempotencyKey, finalAmountM
         args: [settlementKey, userId, billingClass, sourceSurface]
       },
       {
-        sql: `INSERT INTO credit_lots
-                (user_id, amount_mc, remaining_mc, source, expires_at, never_expires)
-              SELECT e.user_id,
-                     d.amount_mc - e.amount_mc,
-                     d.amount_mc - e.amount_mc,
-                     ?,
-                     CASE WHEN u.subscription_tier LIKE 'sonic%' THEN '9999-12-31 23:59:59' ELSE datetime('now', ?) END,
-                     CASE WHEN u.subscription_tier LIKE 'sonic%' THEN 1 ELSE 0 END
-              FROM billing_events e
-              JOIN billing_debits d ON d.idempotency_key = ?
-              JOIN users u ON u.id = e.user_id
-              WHERE e.idempotency_key = ?
-                AND e.status = 'applying'
-                AND d.amount_mc > e.amount_mc`,
-        args: [refundOperation, CREDIT_LOT_TTL, debitIdempotencyKey, settlementKey]
+        sql: `WITH ordered AS (
+                SELECT a.lot_id,
+                       a.amount_mc,
+                       a.expires_at,
+                       COALESCE(SUM(a.amount_mc) OVER (
+                         ORDER BY a.expires_at ASC, a.lot_id ASC
+                         ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING
+                       ), 0) AS prior_mc
+                FROM billing_debit_allocations a
+                WHERE a.debit_idempotency_key = ?
+              ), refunds AS (
+                SELECT lot_id,
+                       expires_at,
+                       amount_mc - MIN(amount_mc, MAX(0, ? - prior_mc)) AS refund_mc
+                FROM ordered
+              )
+              UPDATE credit_lots
+              SET remaining_mc = remaining_mc + COALESCE((SELECT refund_mc FROM refunds WHERE refunds.lot_id = credit_lots.id), 0)
+              WHERE id IN (
+                SELECT lot_id FROM refunds
+                WHERE refund_mc > 0 AND expires_at > datetime('now')
+              )
+                AND EXISTS (SELECT 1 FROM billing_events WHERE idempotency_key = ? AND status = 'applying')`,
+        args: [debitIdempotencyKey, finalAmountMc, settlementKey]
       },
       {
-        sql: `INSERT INTO ledger (user_id, amount_mc, operation, description)
-              SELECT e.user_id,
-                     d.amount_mc - e.amount_mc,
+        sql: `WITH ordered AS (
+                SELECT a.amount_mc,
+                       a.expires_at,
+                       COALESCE(SUM(a.amount_mc) OVER (
+                         ORDER BY a.expires_at ASC, a.lot_id ASC
+                         ROWS BETWEEN UNBOUNDED PRECEDING AND 1 PRECEDING
+                       ), 0) AS prior_mc
+                FROM billing_debit_allocations a
+                WHERE a.debit_idempotency_key = ?
+              ), refunds AS (
+                SELECT expires_at,
+                       amount_mc - MIN(amount_mc, MAX(0, ? - prior_mc)) AS refund_mc
+                FROM ordered
+              ), credited AS (
+                SELECT e.user_id,
+                       CASE
+                         WHEN EXISTS (SELECT 1 FROM ordered) THEN COALESCE(
+                           (SELECT SUM(refund_mc) FROM refunds WHERE expires_at > datetime('now')),
+                           0
+                         )
+                         ELSE 0
+                       END AS refund_mc
+                FROM billing_events e
+                JOIN billing_debits d ON d.idempotency_key = ?
+                WHERE e.idempotency_key = ?
+                  AND e.status = 'applying'
+              )
+              INSERT INTO ledger (user_id, amount_mc, operation, description)
+              SELECT user_id,
+                     refund_mc,
                      ?,
                      ?
-              FROM billing_events e
-              JOIN billing_debits d ON d.idempotency_key = ?
-              WHERE e.idempotency_key = ?
-                AND e.status = 'applying'
-                AND d.amount_mc > e.amount_mc`,
-        args: [refundOperation, description, debitIdempotencyKey, settlementKey]
+              FROM credited
+              WHERE refund_mc > 0`,
+        args: [
+          debitIdempotencyKey,
+          finalAmountMc,
+          debitIdempotencyKey,
+          settlementKey,
+          refundOperation,
+          description
+        ]
       },
       {
         sql: `UPDATE billing_events
@@ -2228,6 +2678,7 @@ async function listActiveUserIds() {
 }
 
 export {
+  CORE_SCHEMA_VERSION,
   getDb,
   setDbForTesting,
   migrate,
@@ -2311,6 +2762,9 @@ export {
   setExtraConcurrencySlots,
   setConcurrencySubId,
   setSubscriptionTier,
+  getConnectedAccountBillingState,
+  setConnectedAccountBillingState,
+  listUsersDueForConnectedAccountBillingReconciliation,
   setMemoryPlan,
   getMemoryPlan,
   getMemoryProvisioned,
@@ -2320,6 +2774,7 @@ export {
   expireOldLots,
   migrateExistingBalancesToLots,
   creditMc,
+  creditMcIdempotent,
   ledgerExistsForOperation,
   claimMonthlyFreeRefresh,
   debitMc,
@@ -2338,4 +2793,4 @@ export {
   insertInboxMessage,
   listActiveUserIds
 };
-//# sourceMappingURL=chunk-62DQAWPF.js.map
+//# sourceMappingURL=chunk-CSCD2HNS.js.map