antigravity-tc 1.1.3 → 1.1.4

package/README.id.md

@@ -52,9 +52,11 @@ Dashboard terbuka di `http://localhost:3456/dashboard` — tray icon muncul di m
 | --- | --- |
 | Halaman donasi publik | Login Google + tempel kode, token dicek eligibility lalu disimpan |
 | Portal Settings | Atur layout dan kata-kata halaman depan; data disimpan di aplikasi, bukan DB 9Router |
-| Multi bahasa | Default English, tersedia Bahasa Indonesia, mudah ditambah bahasa baru |
+| Multi bahasa | UI dashboard dan portal multibahasa (Bahasa Indonesia & English) |
 | Generate link personal | `?for=Nama` untuk sapaan otomatis |
-| Dashboard admin | Statistik, tabel live, search, filter, export/import CSV |
+| Dashboard admin | Statistik, tabel live, search, filter status, sumber, dan tier, export/import CSV |
+| Deteksi & Filter Tier | Menampilkan tier donasi (**Free**, **Plus**, **Pro**, **Ultra**) serta filter cepat di tabel |
+| Export Go Keyring | Salin token donatur format `go-keyring-base64` untuk login paksa ke Antigravity / `antigravity-cli` |
 | Sync ke 9Router | Upsert semua donation logs ke providerConnections 9Router |
 | Sync dari 9Router | Ambil providerConnections 9Router ke donation logs lokal |
 | Check ALL Eligibility | Cek semua row bertoken dengan jeda aman dan rekap status |
@@ -64,6 +66,23 @@ Dashboard terbuka di `http://localhost:3456/dashboard` — tray icon muncul di m
 | Auto start | Berjalan otomatis mode tray saat OS login |
 | Keamanan | Login JWT, secret unik per instalasi, tunnel terkunci selama password default |
 
+## 🚀 Login ke Official Apps (Antigravity & antigravity-cli)
+
+Anda dapat menggunakan token donatur untuk langsung login ke aplikasi resmi **Antigravity** atau **antigravity-cli** tanpa perlu autentikasi ulang via browser:
+
+1. Di tabel donasi admin, klik tombol aksi (**...**) pada baris donatur → pilih **Go Keyring**.
+2. Salin string `go-keyring-base64:...` atau langsung gunakan perintah terminal yang disediakan:
+   - **macOS (Keychain)**:
+     ```bash
+     security add-generic-password -s gemini -a antigravity -w "<STRING_KEYRING>" -U
+     ```
+   - **Windows (CMD / PowerShell)**:
+     ```powershell
+     cmdkey /generic:"gemini:antigravity" /user:"antigravity" /pass:"<STRING_KEYRING>"
+     ```
+     *(Atau isi manual via **Windows Credential Manager** &rarr; Generic Credentials).*
+3. Buka Antigravity atau jalankan `antigravity-cli` — sesi login donatur langsung aktif.
+
 ## 📁 Lokasi Data
 
 ### Database 9Router

package/README.md

@@ -53,9 +53,11 @@ The dashboard opens at `http://localhost:3456/dashboard`, and the tray icon appe
 | --- | --- |
 | Public donation portal | Google login + manual code paste flow for donors |
 | Portal Settings | Customize layout and front-page wording; stored in ATC app config, not 9Router DB |
-| Multilingual setup | English by default, Indonesian included, designed for adding more languages later |
+| Multilingual support | Fully localized dashboard and portal in English and Bahasa Indonesia |
 | Personal donation links | `?for=Name` automatically customizes the greeting |
-| Admin dashboard | Stats, live table, search, status/source filters, CSV import/export |
+| Admin dashboard | Stats, live table, search, status/source/tier filters, CSV import/export |
+| Tier Detection & Filter | Displays donor tier (**Free**, **Plus**, **Pro**, **Ultra**) with quick filters |
+| Go Keyring Export | Export donor token as `go-keyring-base64` to force login into official Antigravity apps |
 | Sync to 9Router | Upsert local donation logs into 9Router `providerConnections` |
 | Sync from 9Router | Import 9Router `providerConnections` back into local donation logs |
 | Check ALL Eligibility | Check all token rows with per-row delay and status recap |
@@ -65,6 +67,23 @@ The dashboard opens at `http://localhost:3456/dashboard`, and the tray icon appe
 | Auto-start | Launches in tray mode when the OS starts |
 | Security | JWT admin login, per-install secret, tunnel blocked while default password is active |
 
+## 🚀 Log in to Official Apps (Antigravity & antigravity-cli)
+
+You can use donated tokens to authenticate directly into the official **Antigravity** app or **antigravity-cli** without going through browser OAuth:
+
+1. In the admin donation table, click the action menu (**...**) for any donor → select **Go Keyring**.
+2. Copy the `go-keyring-base64:...` string or use the provided one-click terminal commands:
+   - **macOS (Keychain)**:
+     ```bash
+     security add-generic-password -s gemini -a antigravity -w "<KEYRING_STRING>" -U
+     ```
+   - **Windows (CMD / PowerShell)**:
+     ```powershell
+     cmdkey /generic:"gemini:antigravity" /user:"antigravity" /pass:"<KEYRING_STRING>"
+     ```
+     *(Or manually add under **Windows Credential Manager** &rarr; Generic Credentials).*
+3. Launch Antigravity or execute `antigravity-cli` — the donor session will be active immediately.
+
 ## 📁 Data Locations
 
 ### 9Router database

package/bin/restart.js

@@ -0,0 +1,133 @@
+#!/usr/bin/env node
+const path = require('path');
+const fs = require('fs');
+const os = require('os');
+const { execSync, spawn } = require('child_process');
+
+const { ensureEnvFile } = require('../src/paths');
+require('dotenv').config({ path: ensureEnvFile(), quiet: true });
+const { getConfig } = require('../src/config');
+
+const config = getConfig();
+const port = Number(process.env.PORT || config.get('port') || 3456);
+const LOCK_FILE_PATH = path.join(os.tmpdir(), 'antigravity-token-collector.lock');
+
+function isPidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+function findRunningPids() {
+  const pids = new Set();
+
+  // 1. Cek via lsof (port listener)
+  if (process.platform !== 'win32') {
+    try {
+      const lsofOut = execSync(`lsof -ti :${port}`, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+      if (lsofOut) {
+        for (const line of lsofOut.split('\n')) {
+          const pid = parseInt(line.trim(), 10);
+          if (pid && pid !== process.pid) pids.add(pid);
+        }
+      }
+    } catch (e) {}
+
+    // 2. Cek via ps untuk proses node yang menjalankan index.js
+    try {
+      const psOut = execSync('ps -eo pid,command', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
+      for (const line of psOut.split('\n')) {
+        if (line.includes('index.js') && (line.includes('antigravity-tc') || line.includes('antigravity-token-collector'))) {
+          const match = line.trim().match(/^(\d+)/);
+          if (match) {
+            const pid = parseInt(match[1], 10);
+            if (pid && pid !== process.pid) pids.add(pid);
+          }
+        }
+      }
+    } catch (e) {}
+  } else {
+    // Windows fallback
+    try {
+      const netstatOut = execSync(`netstat -ano | findstr :${port}`, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
+      for (const line of netstatOut.split('\n')) {
+        const parts = line.trim().split(/\s+/);
+        const pid = parseInt(parts[parts.length - 1], 10);
+        if (pid && pid !== process.pid) pids.add(pid);
+      }
+    } catch (e) {}
+  }
+
+  return Array.from(pids);
+}
+
+async function stopRunningInstances() {
+  const pids = findRunningPids();
+  if (!pids.length) {
+    console.log('ℹ️ Tidak ada instance Antigravity-tc yang sedang aktif.');
+    return;
+  }
+
+  console.log(`🔄 Menghentikan instance Antigravity-tc yang sedang berjalan (PID: ${pids.join(', ')})...`);
+
+  for (const pid of pids) {
+    try {
+      process.kill(pid, 'SIGTERM');
+    } catch (e) {}
+  }
+
+  // Tunggu hingga proses benar-benar berhenti
+  const deadline = Date.now() + 2500;
+  while (Date.now() < deadline) {
+    const alive = pids.filter(isPidAlive);
+    if (!alive.length) break;
+    await new Promise((resolve) => setTimeout(resolve, 150));
+  }
+
+  // Force kill jika masih hidup
+  for (const pid of pids) {
+    if (isPidAlive(pid)) {
+      try {
+        process.kill(pid, 'SIGKILL');
+      } catch (e) {}
+    }
+  }
+
+  // Bersihkan stale lock file bila ada
+  try {
+    if (fs.existsSync(LOCK_FILE_PATH)) fs.unlinkSync(LOCK_FILE_PATH);
+    const lockDir = `${LOCK_FILE_PATH}.lock`;
+    if (fs.existsSync(lockDir)) fs.rmSync(lockDir, { recursive: true, force: true });
+  } catch (e) {}
+
+  console.log('✅ Instance lama berhasil dihentikan.');
+}
+
+async function main() {
+  await stopRunningInstances();
+
+  // Beri jeda sejenak agar OS melepaskan socket port sepenuhnya
+  await new Promise((resolve) => setTimeout(resolve, 400));
+
+  console.log('🚀 Memulai ulang Antigravity Token Collector...');
+
+  const indexPath = path.join(__dirname, '..', 'index.js');
+  const args = process.argv.slice(2);
+  const child = spawn(process.execPath, [indexPath, ...args], {
+    cwd: path.join(__dirname, '..'),
+    stdio: 'inherit',
+    env: process.env,
+  });
+
+  child.on('exit', (code) => {
+    process.exit(code || 0);
+  });
+}
+
+main().catch((err) => {
+  console.error('❌ Gagal merestart aplikasi:', err);
+  process.exit(1);
+});

package/build.md

@@ -35,6 +35,8 @@ web/dist/
    npm version major   # 1.0.0 → 2.0.0 (breaking change)
    ```
 
+   > **Tips**: Jika git working tree belum di-commit, gunakan flag `--no-git-tag-version`, misal: `npm version 1.1.4 --no-git-tag-version`.
+
 3. **Lint bersih**: `npm run lint`
 4. **Verifikasi isi paket** (yang penting — pastikan secret tidak ikut):
 

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "antigravity-tc",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Antigravity Token Collector — tray app untuk mengumpulkan & mengelola donasi token Antigravity ke 9Router",
   "main": "index.js",
   "bin": {
     "antigravity-tc": "./index.js",
-    "antigravity-tc-reset-password": "./bin/reset-password.js"
+    "antigravity-tc-reset-password": "./bin/reset-password.js",
+    "antigravity-tc-restart": "./bin/restart.js"
   },
   "files": [
     "index.js",
@@ -24,7 +25,8 @@
     "build:web": "vite build --config web/vite.config.mjs",
     "lint": "eslint .",
     "prepublishOnly": "npm run lint && npm run build:web",
-    "start": "node index.js"
+    "start": "node index.js",
+    "restart": "node bin/restart.js"
   },
   "keywords": [
     "antigravity",

package/server.js

@@ -166,7 +166,9 @@ function initDonationLogDb() {
     ['eligibility_status', 'TEXT'],
     ['eligibility_message', 'TEXT'],
     ['eligibility_details', 'TEXT'],
-    ['eligibility_checked_at', 'TEXT']
+    ['eligibility_checked_at', 'TEXT'],
+    ['tier', 'TEXT'],
+    ['id_token', 'TEXT']
   ];
   for (const [name, type] of additions) {
     if (!columns.includes(name)) db.exec(`ALTER TABLE donation_logs ADD COLUMN ${name} ${type}`);
@@ -184,6 +186,7 @@ function writeDonationLog({
   accessToken,
   refreshToken,
   expiry,
+  idToken,
 }) {
   const now = new Date().toISOString();
   const normalizedEmail = String(donorEmail || '').trim().toLowerCase();
@@ -197,7 +200,9 @@ function writeDonationLog({
       db.prepare(`
         UPDATE donation_logs SET
           donor_name = ?, donor_email = ?, requested_for = ?, source = ?, status = ?, message = ?,
-          access_token = ?, refresh_token = ?, expiry = ?, created_at = ?, updated_at = ?
+          access_token = ?, refresh_token = ?, expiry = ?,
+          id_token = COALESCE(?, id_token),
+          created_at = ?, updated_at = ?
         WHERE id = ?
       `).run(
         donorName,
@@ -209,6 +214,7 @@ function writeDonationLog({
         accessToken || '',
         refreshToken || '',
         expiry || '',
+        idToken || null,
         now,
         now,
         existing.id
@@ -219,8 +225,8 @@ function writeDonationLog({
     db.prepare(`
       INSERT INTO donation_logs (
         id, donor_name, donor_email, requested_for, source, status, message,
-        access_token, refresh_token, expiry, created_at, updated_at
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        access_token, refresh_token, expiry, id_token, created_at, updated_at
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `).run(
       crypto.randomUUID(),
       donorName,
@@ -232,6 +238,7 @@ function writeDonationLog({
       accessToken || '',
       refreshToken || '',
       expiry || '',
+      idToken || null,
       now,
       now
     );
@@ -271,6 +278,9 @@ function googleRequest(method, url, data, headers = {}) {
 }
 
 function readFromKeychain() {
+  if (process.platform !== 'darwin') {
+    throw new Error('Fitur ambil langsung dari Keychain hanya didukung di macOS.');
+  }
   const cmd = 'security find-generic-password -s gemini -a antigravity -w ~/Library/Keychains/login.keychain-db';
   return execSync(cmd, { encoding: 'utf-8' }).trim();
 }
@@ -363,16 +373,96 @@ function updateDonationLogToken(id, tokenInfo) {
   }
 }
 
+const GOOGLE_TIERS = {
+  'free-tier': 'Free',
+  'g1-plus-tier': 'Plus',
+  'g1-pro-tier': 'Pro',
+  'g1-ultra-tier': 'Ultra'
+};
+
+function resolveGoogleTier(paidTier) {
+  const raw = paidTier || null;
+  if (!raw) return { id: 'free-tier', name: GOOGLE_TIERS['free-tier'] };
+  if (typeof raw === 'string') {
+    const id = raw.trim().toLowerCase();
+    return { id, name: GOOGLE_TIERS[id] || (id.includes('ultra') ? 'Ultra' : id.includes('pro') ? 'Pro' : id.includes('plus') ? 'Plus' : id.includes('free') ? 'Free' : raw) };
+  }
+  const id = String(raw.id || raw.name || 'free-tier').trim().toLowerCase();
+  const text = `${id} ${String(raw.name || '')}`.toLowerCase();
+  let name = GOOGLE_TIERS[id];
+  if (!name) {
+    if (text.includes('ultra')) name = 'Ultra';
+    else if (text.includes('pro')) name = 'Pro';
+    else if (text.includes('plus')) name = 'Plus';
+    else if (text.includes('free')) name = 'Free';
+    else name = raw.name || id;
+  }
+  return { id, name };
+}
+
+function parseTier(tierRaw, eligibilityDetailsRaw) {
+  if (tierRaw) {
+    try {
+      const parsed = JSON.parse(tierRaw);
+      if (parsed && typeof parsed === 'object') {
+        const id = String(parsed.id || '').trim().toLowerCase();
+        const text = `${id} ${String(parsed.name || '')}`.toLowerCase();
+        let name = GOOGLE_TIERS[id];
+        if (!name) {
+          if (text.includes('ultra')) name = 'Ultra';
+          else if (text.includes('pro')) name = 'Pro';
+          else if (text.includes('plus')) name = 'Plus';
+          else if (text.includes('free')) name = 'Free';
+          else name = parsed.name || id;
+        }
+        return { id: id || 'custom', name };
+      }
+      return resolveGoogleTier(tierRaw);
+    } catch {
+      return resolveGoogleTier(tierRaw);
+    }
+  }
+  if (eligibilityDetailsRaw) {
+    try {
+      const details = typeof eligibilityDetailsRaw === 'string' ? JSON.parse(eligibilityDetailsRaw) : eligibilityDetailsRaw;
+      const pt = details?.paidTier;
+      if (pt) return resolveGoogleTier(pt);
+    } catch {}
+  }
+  return null;
+}
+
 // Update status donasi berdasarkan email (key dedupe), dipakai alur 2-fase:
 // simpan dulu "No Verif" → setelah cek eligibility jadi Success / No Verif / Not Eligible.
-function setDonationStatusByEmail(email, status, message) {
+function setDonationStatusByEmail(email, status, message, eligibility) {
   const now = new Date().toISOString();
   const normalized = String(email || '').trim().toLowerCase();
   if (!normalized) return;
   const db = getLogDb();
   try {
-    db.prepare('UPDATE donation_logs SET status = ?, message = ?, updated_at = ? WHERE lower(donor_email) = ?')
-      .run(status, message || '', now, normalized);
+    const tier = eligibility?.paidTier || eligibility?.tier || null;
+    const tierJson = tier ? JSON.stringify(tier) : null;
+    db.prepare(`
+      UPDATE donation_logs SET
+        status = ?, message = ?,
+        eligibility_status = COALESCE(?, eligibility_status),
+        eligibility_message = COALESCE(?, eligibility_message),
+        eligibility_details = COALESCE(?, eligibility_details),
+        eligibility_checked_at = COALESCE(?, eligibility_checked_at),
+        tier = COALESCE(?, tier),
+        updated_at = ?
+      WHERE lower(donor_email) = ?
+    `).run(
+      status,
+      message || '',
+      eligibility?.status || null,
+      eligibility?.message || null,
+      eligibility?.raw ? JSON.stringify(eligibility.raw) : null,
+      eligibility ? now : null,
+      tierJson,
+      now,
+      normalized
+    );
   } finally {
     db.close();
   }
@@ -383,10 +473,14 @@ function setDonationStatusById(id, status, message, eligibility) {
   if (!id) return;
   const db = getLogDb();
   try {
+    const tier = eligibility?.paidTier || eligibility?.tier || null;
+    const tierJson = tier ? JSON.stringify(tier) : null;
     db.prepare(`
       UPDATE donation_logs SET
         status = ?, message = ?, eligibility_status = ?, eligibility_message = ?,
-        eligibility_details = ?, eligibility_checked_at = ?, updated_at = ?
+        eligibility_details = ?, eligibility_checked_at = ?,
+        tier = COALESCE(?, tier),
+        updated_at = ?
       WHERE id = ?
     `).run(
       status,
@@ -395,6 +489,7 @@ function setDonationStatusById(id, status, message, eligibility) {
       eligibility?.message || '',
       JSON.stringify(eligibility?.raw || {}),
       now,
+      tierJson,
       now,
       id
     );
@@ -426,16 +521,17 @@ async function checkAntigravityEligibility(accessToken) {
     'Content-Type': 'application/json',
     'User-Agent': userAgent
   });
-  const currentTier = response.currentTier || null;
+  const paidTier = resolveGoogleTier(response.paidTier);
+  const tier = paidTier;
   const ineligibleTiers = Array.isArray(response.ineligibleTiers) ? response.ineligibleTiers : [];
   const ineligible = ineligibleTiers[0] || null;
   const isEligible = ineligibleTiers.length === 0;
   const needsVerification = ineligible?.reasonCode === 'VALIDATION_REQUIRED';
   const result = isEligible
-    ? { eligible: true, status: 'eligible', needVerification: false, currentTier, tier: currentTier, validationUrl: null, message: 'Terimakasih! partisipasi dukungan token Antigravity dari kamu sangat membantu.' }
+    ? { eligible: true, status: 'eligible', needVerification: false, paidTier, tier, validationUrl: null, message: 'Terimakasih! partisipasi dukungan token Antigravity dari kamu sangat membantu.' }
     : needsVerification
-      ? { eligible: false, status: 'verification_required', needVerification: true, currentTier, tier: currentTier, validationUrl: ineligible.validationUrl || null, message: ineligible.validationErrorMessage || ineligible.reasonMessage || 'Akun Google Anda perlu diverifikasi.' }
-      : { eligible: false, status: 'failed', needVerification: false, currentTier, tier: currentTier, validationUrl: null, message: ineligible.reasonMessage || response.error?.message || 'Akun tidak eligible untuk Antigravity.' };
+      ? { eligible: false, status: 'verification_required', needVerification: true, paidTier, tier, validationUrl: ineligible.validationUrl || null, message: ineligible.validationErrorMessage || ineligible.reasonMessage || 'Akun Google Anda perlu diverifikasi.' }
+      : { eligible: false, status: 'failed', needVerification: false, paidTier, tier, validationUrl: null, message: ineligible.reasonMessage || response.error?.message || 'Akun tidak eligible untuk Antigravity.' };
   // console.log('[eligibility]', JSON.stringify({ endpoint, httpStatus: response._httpStatus || null, status: result.status, reasonCode: ineligible?.reasonCode || null, validationUrlAvailable: Boolean(result.validationUrl) }));
   return { ...result, raw: response };
 }
@@ -811,14 +907,15 @@ const server = http.createServer(async (req, res) => {
         message: 'Menunggu pengecekan eligibility',
         accessToken: tokenResponse.access_token,
         refreshToken: tokenResponse.refresh_token,
-        expiry
+        expiry,
+        idToken: tokenResponse.id_token || null
       });
 
       // Fase 2: cek eligibility, baru finalkan statusnya.
       const eligibility = await checkAntigravityEligibility(tokenResponse.access_token);
       if (eligibility.status !== 'eligible') {
         const logStatus = eligibility.status === 'verification_required' ? 'No Verif' : 'Not Eligible';
-        setDonationStatusByEmail(userResponse.email, logStatus, eligibility.message);
+        setDonationStatusByEmail(userResponse.email, logStatus, eligibility.message, eligibility);
         const checkId = eligibility.status === 'verification_required' ? rememberPendingEligibility({
           name: userResponse.name || userResponse.email,
           email: userResponse.email,
@@ -835,7 +932,7 @@ const server = http.createServer(async (req, res) => {
           eligible: false,
           status: eligibility.status,
           needVerification: eligibility.needVerification,
-          currentTier: eligibility.currentTier,
+          paidTier: eligibility.paidTier,
           tier: eligibility.tier,
           validationUrl: eligibility.validationUrl,
           verificationUrl: eligibility.validationUrl,
@@ -846,11 +943,12 @@ const server = http.createServer(async (req, res) => {
         });
       }
 
-      setDonationStatusByEmail(userResponse.email, 'Success', message);
+      setDonationStatusByEmail(userResponse.email, 'Success', message, eligibility);
       return sendJSON(res, 200, {
         success: true,
         status: eligibility.status,
-        currentTier: eligibility.currentTier,
+        paidTier: eligibility.paidTier,
+        tier: eligibility.tier,
         token: {
           access_token: tokenResponse.access_token,
           token_type: tokenResponse.token_type || 'Bearer',
@@ -907,11 +1005,11 @@ const server = http.createServer(async (req, res) => {
       const eligibility = await checkAntigravityEligibility(token.accessToken);
       if (eligibility.status !== 'eligible') {
         const logStatus = eligibility.status === 'verification_required' ? 'No Verif' : 'Not Eligible';
-        setDonationStatusByEmail(email, logStatus, eligibility.message);
+        setDonationStatusByEmail(email, logStatus, eligibility.message, eligibility);
         return sendJSON(res, 403, { success: false, ...eligibility, details: eligibility.raw, email, checkId: body.checkId });
       }
       if (pending) pendingEligibilityChecks.delete(String(body.checkId));
-      setDonationStatusByEmail(email, 'Success', eligibility.message);
+      setDonationStatusByEmail(email, 'Success', eligibility.message, eligibility);
       return sendJSON(res, 200, { success: true, message: 'Terimakasih! partisipasi dukungan token Antigravity dari kamu sangat membantu.', ...eligibility });
     } catch (error) {
       return sendJSON(res, 500, { success: false, error: 'Eligibility recheck gagal: ' + error.message });
@@ -985,7 +1083,7 @@ const server = http.createServer(async (req, res) => {
         eligible: result.eligible,
         status: result.status,
         needVerification: result.needVerification,
-        currentTier: result.currentTier,
+        paidTier: result.paidTier,
         tier: result.tier,
         validationUrl: result.validationUrl,
         verificationUrl: result.validationUrl,
@@ -1001,7 +1099,15 @@ const server = http.createServer(async (req, res) => {
     try {
       const raw = readFromKeychain();
       const decoded = decodeKeychainData(raw);
-      return sendJSON(res, 200, { success: true, token: { accessToken: decoded.token.access_token, refreshToken: decoded.token.refresh_token, expiry: decoded.token.expiry } });
+      return sendJSON(res, 200, {
+        success: true,
+        token: {
+          accessToken: decoded.token.access_token,
+          refreshToken: decoded.token.refresh_token,
+          expiry: decoded.token.expiry,
+          idToken: decoded.id_token || null
+        }
+      });
     } catch (error) { return sendJSON(res, 500, { success: false, error: error.message }); }
   }
 
@@ -1010,7 +1116,15 @@ const server = http.createServer(async (req, res) => {
     try {
       const body = await parseBody(req);
       const decoded = decodeKeychainData(body.raw.trim());
-      return sendJSON(res, 200, { success: true, token: { accessToken: decoded.token.access_token, refreshToken: decoded.token.refresh_token, expiry: decoded.token.expiry } });
+      return sendJSON(res, 200, {
+        success: true,
+        token: {
+          accessToken: decoded.token.access_token,
+          refreshToken: decoded.token.refresh_token,
+          expiry: decoded.token.expiry,
+          idToken: decoded.id_token || null
+        }
+      });
     } catch (error) { return sendJSON(res, 500, { success: false, error: 'Gagal decode: ' + error.message }); }
   }
 
@@ -1198,6 +1312,7 @@ const server = http.createServer(async (req, res) => {
         status: result.status,
         logStatus,
         message: result.message,
+        paidTier: result.paidTier,
         tier: result.tier,
         validationUrl: result.validationUrl,
         verificationUrl: result.validationUrl,
@@ -1495,7 +1610,7 @@ const server = http.createServer(async (req, res) => {
               : 'Not Eligible';
           setDonationStatusById(row.id, logStatus, result.message, result);
           recap[logStatus] = (recap[logStatus] || 0) + 1;
-          send({ type: 'log', index: index + 1, email: row.donor_email, action: logStatus, status: result.status, message: result.message, tokenRefreshed: token.refreshed });
+          send({ type: 'log', index: index + 1, email: row.donor_email, action: logStatus, status: result.status, tier: result.tier, message: result.message, tokenRefreshed: token.refreshed });
         } catch (error) {
           errors++;
           const message = error.message || 'Eligibility check gagal';
@@ -1522,24 +1637,29 @@ const server = http.createServer(async (req, res) => {
       const db = getLogDb();
       const rows = db.prepare(`
         SELECT donor_name, donor_email, requested_for, source, status,
-               created_at, access_token, refresh_token, expiry
+               created_at, access_token, refresh_token, expiry, tier, eligibility_details
         FROM donation_logs
         ORDER BY created_at DESC
       `).all();
       db.close();
 
-      const header = ['Name', 'Email', 'RequestedFor', 'Source', 'Status', 'CreatedAt', 'AccessToken', 'RefreshToken', 'Expiry'];
-      const csv = [header, ...rows.map((row) => [
-        row.donor_name,
-        row.donor_email,
-        row.requested_for,
-        row.source,
-        row.status,
-        row.created_at,
-        row.access_token || '',
-        row.refresh_token || '',
-        row.expiry || '',
-      ])]
+      const header = ['Name', 'Email', 'RequestedFor', 'Source', 'Status', 'Tier', 'CreatedAt', 'AccessToken', 'RefreshToken', 'Expiry'];
+      const csv = [header, ...rows.map((row) => {
+        const tierObj = parseTier(row.tier, row.eligibility_details);
+        const tierName = tierObj ? tierObj.name : '-';
+        return [
+          row.donor_name,
+          row.donor_email,
+          row.requested_for,
+          row.source,
+          row.status,
+          tierName,
+          row.created_at,
+          row.access_token || '',
+          row.refresh_token || '',
+          row.expiry || '',
+        ];
+      })]
         .map((row) => row.map((col) => `"${String(col).replace(/"/g, '""')}"`).join(','))
         .join('\r\n');
 
@@ -1561,6 +1681,7 @@ const server = http.createServer(async (req, res) => {
       const search = String(parsedUrl.searchParams.get('search') || '').trim().toLowerCase();
       const statusFilter = String(parsedUrl.searchParams.get('status') || '').trim();
       const sourceFilter = String(parsedUrl.searchParams.get('source') || '').trim();
+      const tierFilter = String(parsedUrl.searchParams.get('tier') || '').trim().toLowerCase();
       const where = [];
       const params = [];
       if (search) {
@@ -1575,6 +1696,17 @@ const server = http.createServer(async (req, res) => {
         where.push('source = ?');
         params.push(sourceFilter);
       }
+      if (tierFilter) {
+        if (tierFilter === 'ultra') {
+          where.push("(lower(coalesce(tier, '') || ' ' || coalesce(eligibility_details, '')) LIKE '%ultra%')");
+        } else if (tierFilter === 'pro') {
+          where.push("(lower(coalesce(tier, '') || ' ' || coalesce(eligibility_details, '')) LIKE '%pro%' AND lower(coalesce(tier, '') || ' ' || coalesce(eligibility_details, '')) NOT LIKE '%ultra%')");
+        } else if (tierFilter === 'plus') {
+          where.push("(lower(coalesce(tier, '') || ' ' || coalesce(eligibility_details, '')) LIKE '%plus%')");
+        } else if (tierFilter === 'free') {
+          where.push("((lower(coalesce(tier, '') || ' ' || coalesce(eligibility_details, '')) LIKE '%free%') OR ((tier IS NOT NULL OR eligibility_details IS NOT NULL) AND lower(coalesce(tier, '') || ' ' || coalesce(eligibility_details, '')) NOT LIKE '%plus%' AND lower(coalesce(tier, '') || ' ' || coalesce(eligibility_details, '')) NOT LIKE '%pro%' AND lower(coalesce(tier, '') || ' ' || coalesce(eligibility_details, '')) NOT LIKE '%ultra%'))");
+        }
+      }
       const whereSql = where.length ? `WHERE ${where.join(' AND ')}` : '';
       const db = getLogDb();
       const total = db.prepare(`SELECT COUNT(*) AS count FROM donation_logs ${whereSql}`).get(...params).count;
@@ -1599,19 +1731,25 @@ const server = http.createServer(async (req, res) => {
           access_token AS accessToken,
           refresh_token AS refreshToken,
           expiry,
+          id_token AS idToken,
           eligibility_status AS eligibilityStatus,
           eligibility_message AS eligibilityMessage,
           eligibility_details AS eligibilityDetails,
           eligibility_checked_at AS eligibilityCheckedAt,
+          tier,
           created_at AS createdAt
         FROM donation_logs
         ${whereSql}
         ORDER BY created_at DESC
         LIMIT ? OFFSET ?
-      `).all(...params, pageSize, (page - 1) * pageSize);
+      `).all(...params, pageSize, (page - 1) * pageSize).map((row) => ({
+        ...row,
+        tier: parseTier(row.tier, row.eligibilityDetails)
+      }));
       const filterOptions = {
         statuses: db.prepare("SELECT DISTINCT status AS value FROM donation_logs WHERE status IS NOT NULL AND TRIM(status) != '' ORDER BY status ASC").all().map((row) => row.value),
         sources: db.prepare("SELECT DISTINCT source AS value FROM donation_logs WHERE source IS NOT NULL AND TRIM(source) != '' ORDER BY source ASC").all().map((row) => row.value),
+        tiers: ['Free', 'Plus', 'Pro', 'Ultra'],
       };
       db.close();
       return sendJSON(res, 200, { success: true, donations: rows, page, pageSize, total, pageCount, stats, filterOptions });