n9router 0.3.90 → 0.3.93

package/.next/standalone/src/app/(dashboard)/dashboard/providers/[id]/page.js

@@ -5,12 +5,18 @@ import PropTypes from "prop-types";
 import { useParams, useRouter } from "next/navigation";
 import Link from "next/link";
 import Image from "next/image";
-import { Card, Button, Badge, Input, Modal, CardSkeleton, OAuthModal, KiroOAuthWrapper, CursorAuthModal, IFlowCookieModal, GitLabAuthModal, Toggle, Select } from "@/shared/components";
+import { Card, Button, Badge, Input, Modal, CardSkeleton, OAuthModal, KiroOAuthWrapper, CursorAuthModal, IFlowCookieModal, GitLabAuthModal, Toggle, Select, Tooltip } from "@/shared/components";
 import { OAUTH_PROVIDERS, APIKEY_PROVIDERS, FREE_PROVIDERS, FREE_TIER_PROVIDERS, getProviderAlias, isOpenAICompatibleProvider, isAnthropicCompatibleProvider } from "@/shared/constants/providers";
 import { getModelsByProviderId } from "@/shared/constants/models";
 import { useCopyToClipboard } from "@/shared/hooks/useCopyToClipboard";
 import { fetchSuggestedModels } from "@/shared/utils/providerModelsFetcher";
 
+const ANTIGRAVITY_TOOLTIP_IMPORT_AGT =
+  "Imports accounts from ~/.antigravity_tools on this machine (Antigravity IDE local data). Requires that folder to exist and contain signed-in accounts.";
+
+const ANTIGRAVITY_TOOLTIP_IMPORT_REFRESH =
+  "Paste Google OAuth refresh tokens: one per line (1//…), a JSON array with refresh_token, or any text containing \"refresh_token\": \"…\". Each token is refreshed and accounts are added or updated by Google email.";
+
 export default function ProviderDetailPage() {
   const params = useParams();
   const router = useRouter();
@@ -26,6 +32,9 @@ export default function ProviderDetailPage() {
   const [showEditNodeModal, setShowEditNodeModal] = useState(false);
   const [showBulkProxyModal, setShowBulkProxyModal] = useState(false);
   const [importingAgt, setImportingAgt] = useState(false);
+  const [importingAgtRefresh, setImportingAgtRefresh] = useState(false);
+  const [showAgtRefreshModal, setShowAgtRefreshModal] = useState(false);
+  const [agtRefreshTokenInput, setAgtRefreshTokenInput] = useState("");
   const [importResult, setImportResult] = useState(null);
   const [selectedConnection, setSelectedConnection] = useState(null);
   const [modelAliases, setModelAliases] = useState({});
@@ -425,6 +434,8 @@ export default function ProviderDetailPage() {
   };
 
 
+  const agtImportBusy = importingAgt || importingAgtRefresh;
+
   const handleImportFromAgt = async () => {
     setImportingAgt(true);
     setImportResult(null);
@@ -443,6 +454,36 @@ export default function ProviderDetailPage() {
     setImportingAgt(false);
   };
 
+  const handleImportFromRefreshTokens = async () => {
+    if (!agtRefreshTokenInput.trim()) return;
+    setImportingAgtRefresh(true);
+    setImportResult(null);
+    try {
+      const res = await fetch("/api/antigravity-tools/import-refresh-tokens", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ text: agtRefreshTokenInput }),
+      });
+      const data = await res.json();
+      if (res.ok) {
+        setImportResult(data);
+        await fetchConnections();
+        setShowAgtRefreshModal(false);
+        setAgtRefreshTokenInput("");
+      } else {
+        setImportResult({ error: data.error || "Import failed" });
+      }
+    } catch (err) {
+      setImportResult({ error: err.message });
+    }
+    setImportingAgtRefresh(false);
+  };
+
+  const closeAgtRefreshModal = () => {
+    if (importingAgtRefresh) return;
+    setShowAgtRefreshModal(false);
+  };
+
   const isSelected = (connectionId) => selectedConnectionIds.includes(connectionId);
 
   const connectionsList = (
@@ -863,7 +904,15 @@ export default function ProviderDetailPage() {
             <span>
               {importResult.error
                 ? `✗ ${importResult.error}`
-                : `✓ Imported ${importResult.imported}, updated ${importResult.updated}, skipped ${importResult.skipped}`}
+                : (() => {
+                    const parts = [
+                      `imported ${importResult.imported}`,
+                      `updated ${importResult.updated}`,
+                    ];
+                    if (importResult.skipped > 0) parts.push(`skipped ${importResult.skipped}`);
+                    if (importResult.failed > 0) parts.push(`failed ${importResult.failed}`);
+                    return `✓ ${parts.join(", ")}`;
+                  })()}
             </span>
             <button onClick={() => setImportResult(null)} className="text-current opacity-60 hover:opacity-100">✕</button>
           </div>
@@ -887,9 +936,23 @@ export default function ProviderDetailPage() {
                   {providerId === "iflow" ? "OAuth" : "Add Connection"}
                 </Button>
                 {providerId === "antigravity" && (
-                  <Button icon="download" variant="secondary" onClick={handleImportFromAgt} disabled={importingAgt}>
-                    {importingAgt ? "Importing…" : "Import from AGT"}
-                  </Button>
+                  <>
+                    <Tooltip text={ANTIGRAVITY_TOOLTIP_IMPORT_AGT} position="bottom">
+                      <Button icon="download" variant="secondary" onClick={handleImportFromAgt} disabled={agtImportBusy}>
+                        {importingAgt ? "Importing…" : "Import from AGT"}
+                      </Button>
+                    </Tooltip>
+                    <Tooltip text={ANTIGRAVITY_TOOLTIP_IMPORT_REFRESH} position="bottom">
+                      <Button
+                        icon="key"
+                        variant="secondary"
+                        onClick={() => setShowAgtRefreshModal(true)}
+                        disabled={agtImportBusy}
+                      >
+                        Import refresh tokens
+                      </Button>
+                    </Tooltip>
+                  </>
                 )}
               </div>
             )}
@@ -918,9 +981,24 @@ export default function ProviderDetailPage() {
                   Add
                 </Button>
                 {providerId === "antigravity" && (
-                  <Button size="sm" icon="download" variant="secondary" onClick={handleImportFromAgt} disabled={importingAgt}>
-                    {importingAgt ? "Importing…" : "Import from AGT"}
-                  </Button>
+                  <>
+                    <Tooltip text={ANTIGRAVITY_TOOLTIP_IMPORT_AGT} position="bottom">
+                      <Button size="sm" icon="download" variant="secondary" onClick={handleImportFromAgt} disabled={agtImportBusy}>
+                        {importingAgt ? "Importing…" : "Import from AGT"}
+                      </Button>
+                    </Tooltip>
+                    <Tooltip text={ANTIGRAVITY_TOOLTIP_IMPORT_REFRESH} position="bottom">
+                      <Button
+                        size="sm"
+                        icon="key"
+                        variant="secondary"
+                        onClick={() => setShowAgtRefreshModal(true)}
+                        disabled={agtImportBusy}
+                      >
+                        Refresh tokens
+                      </Button>
+                    </Tooltip>
+                  </>
                 )}
               </div>
             )}
@@ -943,6 +1021,43 @@ export default function ProviderDetailPage() {
 
       {bulkActionModal}
 
+      {providerId === "antigravity" && (
+        <Modal isOpen={showAgtRefreshModal} onClose={closeAgtRefreshModal} title="Import accounts (refresh tokens)">
+          <div className="flex flex-col gap-4">
+            <p className="text-sm text-text-muted">
+              Paste one or more Google OAuth refresh tokens. Supported formats: a single token (lines starting with{" "}
+              <code className="text-xs bg-surface-secondary px-1 rounded">1//…</code>
+              ), a JSON array with{" "}
+              <code className="text-xs bg-surface-secondary px-1 rounded">refresh_token</code>
+              , or any text containing{" "}
+              <code className="text-xs bg-surface-secondary px-1 rounded">&quot;refresh_token&quot;: &quot;…&quot;</code>{" "}
+              (values are extracted automatically).
+            </p>
+            <div className="space-y-2">
+              <label className="block text-sm font-medium text-text-primary">Refresh tokens</label>
+              <textarea
+                value={agtRefreshTokenInput}
+                onChange={(e) => setAgtRefreshTokenInput(e.target.value)}
+                placeholder={`Paste your refresh token(s) here (batch supported)\n\nExample:\n"refresh_token": "example_refresh_token"`}
+                className="w-full min-h-[160px] px-3 py-2 bg-surface-secondary border border-border rounded-lg text-sm text-text-primary placeholder:text-text-muted/80 focus:outline-none focus:ring-2 focus:ring-primary resize-y font-mono"
+                disabled={importingAgtRefresh}
+              />
+              <p className="text-xs text-text-muted">
+                Tip: You can paste multiple tokens or a JSON array to import in batch.
+              </p>
+            </div>
+            <div className="flex gap-2">
+              <Button variant="secondary" fullWidth onClick={closeAgtRefreshModal} disabled={importingAgtRefresh}>
+                Cancel
+              </Button>
+              <Button fullWidth onClick={handleImportFromRefreshTokens} disabled={importingAgtRefresh || !agtRefreshTokenInput.trim()}>
+                {importingAgtRefresh ? "Importing…" : "Import"}
+              </Button>
+            </div>
+          </div>
+        </Modal>
+      )}
+
       {/* Modals */}
       {providerId === "kiro" ? (
         <KiroOAuthWrapper

package/.next/standalone/src/app/(dashboard)/dashboard/usage/components/RequestDetailsTab.js

@@ -162,6 +162,17 @@ export default function RequestDetailsTab() {
     setFilters({ provider: "", startDate: "", endDate: "" });
   };
 
+  const getStatusClassName = (status) => {
+    if (status === "success") return "text-green-600";
+    if (status === "input_only" || status === "partial") return "text-amber-600";
+    return "text-red-600";
+  };
+
+  const getStatusLabel = (status) => {
+    if (status === "input_only") return "input only";
+    return status;
+  };
+
   return (
     <div className="flex flex-col gap-6">
       <Card padding="md">
@@ -345,9 +356,9 @@ export default function RequestDetailsTab() {
                 <span className="text-text-muted">Status:</span>{" "}
                 <span className={cn(
                   "font-medium",
-                  selectedDetail.status === "success" ? "text-green-600" : "text-red-600"
+                  getStatusClassName(selectedDetail.status)
                 )}>
-                  {selectedDetail.status}
+                  {getStatusLabel(selectedDetail.status)}
                 </span>
               </div>
               <div>

package/.next/standalone/src/app/api/antigravity-tools/import-refresh-tokens/route.js

@@ -0,0 +1,218 @@
+import { createProviderConnection, getProviderConnections, updateProviderConnection } from "@/lib/localDb";
+import { testSingleConnection } from "@/app/api/providers/[id]/test/testUtils";
+import { ANTIGRAVITY_CONFIG } from "@/lib/oauth/constants/oauth";
+import { refreshGoogleToken } from "open-sse/services/tokenRefresh.js";
+import { getProjectIdForConnection } from "open-sse/services/projectId.js";
+
+const noopLog = {
+  warn: () => {},
+  error: () => {},
+  info: () => {},
+};
+
+function maskToken(t) {
+  if (!t || typeof t !== "string") return "";
+  if (t.length <= 16) return `${t.slice(0, 6)}…`;
+  return `${t.slice(0, 10)}…${t.slice(-4)}`;
+}
+
+/**
+ * Extract Google OAuth refresh tokens from pasted text:
+ * - JSON array of objects with refresh_token or raw strings
+ * - Single JSON object with refresh_token
+ * - "refresh_token": "..." patterns (e.g. from config dumps)
+ * - Lines starting with 1// (typical Google refresh token prefix)
+ * - Any 1//… token embedded in free text
+ */
+function extractRefreshTokensFromText(text) {
+  if (!text || typeof text !== "string") return [];
+  const trimmed = text.trim();
+  const out = new Set();
+
+  const add = (raw) => {
+    if (raw == null) return;
+    const s = String(raw).trim();
+    if (!s) return;
+    out.add(s);
+  };
+
+  if (trimmed.startsWith("[")) {
+    try {
+      const arr = JSON.parse(trimmed);
+      if (Array.isArray(arr)) {
+        for (const item of arr) {
+          if (typeof item === "string") add(item);
+          else if (item && typeof item === "object" && item.refresh_token) add(item.refresh_token);
+        }
+        if (out.size) return [...out];
+      }
+    } catch {
+      /* fall through */
+    }
+  }
+
+  if (trimmed.startsWith("{")) {
+    try {
+      const obj = JSON.parse(trimmed);
+      if (obj && typeof obj === "object" && obj.refresh_token) add(obj.refresh_token);
+      if (out.size) return [...out];
+    } catch {
+      /* fall through */
+    }
+  }
+
+  const keyPat = /"refresh_token"\s*:\s*"([^"]+)"/g;
+  let m;
+  while ((m = keyPat.exec(text)) !== null) {
+    add(m[1]);
+  }
+  if (out.size) return [...out];
+
+  for (const line of text.split(/\r?\n/)) {
+    const lt = line.trim();
+    if (/^1\/\//.test(lt)) {
+      const mm = lt.match(/^(1\/\/[^\s"']+)/);
+      if (mm) add(mm[1]);
+    }
+  }
+  if (out.size) return [...out];
+
+  const anyPat = /\b(1\/\/[A-Za-z0-9_\-+/=]+)/g;
+  while ((m = anyPat.exec(text)) !== null) {
+    add(m[1]);
+  }
+
+  return [...out];
+}
+
+async function fetchGoogleUserEmail(accessToken) {
+  const url = `${ANTIGRAVITY_CONFIG.userInfoUrl}?alt=json`;
+  const res = await fetch(url, {
+    headers: { Authorization: `Bearer ${accessToken}` },
+  });
+  if (!res.ok) {
+    const errText = await res.text().catch(() => "");
+    throw new Error(`userinfo failed: HTTP ${res.status} ${errText.slice(0, 120)}`);
+  }
+  return res.json();
+}
+
+/**
+ * POST /api/antigravity-tools/import-refresh-tokens
+ * Body: { text: string }
+ */
+export async function POST(request) {
+  try {
+    let body = {};
+    try {
+      body = await request.json();
+    } catch {
+      return Response.json({ error: "Invalid JSON body" }, { status: 400 });
+    }
+
+    const text = typeof body.text === "string" ? body.text : "";
+    const tokens = extractRefreshTokensFromText(text);
+
+    if (tokens.length === 0) {
+      return Response.json(
+        { error: "No refresh tokens found. Paste one token per line, a JSON array, or text containing \"refresh_token\": \"…\"." },
+        { status: 400 }
+      );
+    }
+
+    const existingConnections = await getProviderConnections({ provider: "antigravity" });
+    const existingEmails = new Set(existingConnections.map((c) => c.email).filter(Boolean));
+
+    let imported = 0;
+    let updated = 0;
+    const errors = [];
+
+    for (const refreshToken of tokens) {
+      try {
+        const refreshed = await refreshGoogleToken(
+          refreshToken,
+          ANTIGRAVITY_CONFIG.clientId,
+          ANTIGRAVITY_CONFIG.clientSecret,
+          noopLog
+        );
+
+        if (!refreshed?.accessToken) {
+          errors.push({ token: maskToken(refreshToken), error: "Token refresh failed (invalid or revoked refresh token)" });
+          continue;
+        }
+
+        const { accessToken, refreshToken: newRefresh, expiresIn } = refreshed;
+        const effectiveRefresh = newRefresh || refreshToken;
+
+        let expiresAt = null;
+        if (expiresIn) {
+          expiresAt = new Date(Date.now() + expiresIn * 1000).toISOString();
+        }
+
+        const userInfo = await fetchGoogleUserEmail(accessToken);
+        const email =
+          userInfo.email ||
+          (userInfo.id ? `google-${userInfo.id}@google.local` : null);
+
+        if (!email) {
+          errors.push({ token: maskToken(refreshToken), error: "Could not determine account email from Google userinfo" });
+          continue;
+        }
+
+        const isExisting = existingEmails.has(email);
+
+        const connectionData = {
+          provider: "antigravity",
+          authType: "oauth",
+          email,
+          name: userInfo.name || email,
+          accessToken,
+          refreshToken: effectiveRefresh,
+          expiresAt,
+          projectId: null,
+          isActive: true,
+        };
+
+        const connection = await createProviderConnection(connectionData);
+
+        const projectId = await getProjectIdForConnection(connection.id, accessToken);
+        if (projectId) {
+          await updateProviderConnection(connection.id, { projectId });
+        }
+
+        try {
+          await testSingleConnection(connection.id);
+        } catch (testErr) {
+          console.log(`[antigravity-tools/import-refresh-tokens] Test failed for ${email}: ${testErr.message}`);
+        }
+
+        if (isExisting) {
+          updated++;
+        } else {
+          imported++;
+          existingEmails.add(email);
+        }
+      } catch (err) {
+        errors.push({ token: maskToken(refreshToken), error: err.message || String(err) });
+      }
+    }
+
+    const failed = errors.length;
+
+    console.log(
+      `[antigravity-tools/import-refresh-tokens] Done: imported=${imported}, updated=${updated}, failed=${failed}, total=${tokens.length}`
+    );
+
+    return Response.json({
+      imported,
+      updated,
+      skipped: 0,
+      failed,
+      errors,
+      total: tokens.length,
+    });
+  } catch (error) {
+    console.error("[antigravity-tools/import-refresh-tokens] Error:", error);
+    return Response.json({ error: error.message }, { status: 500 });
+  }
+}

package/.next/standalone/src/app/api/internal/request-detail/route.js

@@ -0,0 +1,45 @@
+import { NextResponse } from "next/server";
+import { getRequestDetailById, saveRequestDetail } from "@/lib/usageDb";
+
+const INTERNAL_REQUEST_HEADER = { name: "x-request-source", value: "local" };
+
+function mergeObjects(existingValue, incomingValue) {
+  if (!incomingValue || typeof incomingValue !== "object" || Array.isArray(incomingValue)) {
+    return incomingValue ?? existingValue;
+  }
+
+  return {
+    ...(existingValue && typeof existingValue === "object" && !Array.isArray(existingValue) ? existingValue : {}),
+    ...incomingValue
+  };
+}
+
+export async function POST(request) {
+  if (request.headers.get(INTERNAL_REQUEST_HEADER.name) !== INTERNAL_REQUEST_HEADER.value) {
+    return NextResponse.json({ error: "forbidden" }, { status: 403 });
+  }
+
+  try {
+    const body = await request.json();
+    if (!body?.id) {
+      return NextResponse.json({ error: "missing id" }, { status: 400 });
+    }
+
+    const existing = await getRequestDetailById(body.id);
+    const detail = existing ? {
+      ...existing,
+      ...body,
+      latency: mergeObjects(existing.latency, body.latency),
+      tokens: mergeObjects(existing.tokens, body.tokens),
+      request: mergeObjects(existing.request, body.request),
+      providerRequest: mergeObjects(existing.providerRequest, body.providerRequest),
+      providerResponse: body.providerResponse ?? existing.providerResponse,
+      response: mergeObjects(existing.response, body.response),
+    } : body;
+
+    await saveRequestDetail(detail);
+    return NextResponse.json({ ok: true, id: detail.id });
+  } catch (error) {
+    return NextResponse.json({ error: error.message || "failed to persist request detail" }, { status: 500 });
+  }
+}

package/.next/standalone/src/app/api/internal/usage/route.js

@@ -0,0 +1,59 @@
+import { NextResponse } from "next/server";
+import { saveRequestUsage, appendRequestLog } from "@/lib/usageDb";
+
+const INTERNAL_REQUEST_HEADER = { name: "x-request-source", value: "local" };
+
+function normalizeTokens(tokens) {
+  if (!tokens || typeof tokens !== "object") return null;
+
+  const normalized = {};
+  const assignNumber = (key, value) => {
+    if (value === undefined || value === null) return;
+    const numeric = Number(value);
+    if (Number.isFinite(numeric)) normalized[key] = numeric;
+  };
+
+  assignNumber("prompt_tokens", tokens.prompt_tokens ?? tokens.input_tokens);
+  assignNumber("completion_tokens", tokens.completion_tokens ?? tokens.output_tokens);
+  assignNumber("total_tokens", tokens.total_tokens);
+  assignNumber("cache_read_input_tokens", tokens.cache_read_input_tokens ?? tokens.cached_tokens);
+  assignNumber("cache_creation_input_tokens", tokens.cache_creation_input_tokens);
+  assignNumber("reasoning_tokens", tokens.reasoning_tokens);
+
+  return Object.keys(normalized).length > 0 ? normalized : null;
+}
+
+export async function POST(request) {
+  if (request.headers.get(INTERNAL_REQUEST_HEADER.name) !== INTERNAL_REQUEST_HEADER.value) {
+    return NextResponse.json({ error: "forbidden" }, { status: 403 });
+  }
+
+  try {
+    const body = await request.json();
+    const tokens = normalizeTokens(body?.tokens);
+
+    if (!body?.provider || !body?.model || !body?.connectionId || !tokens) {
+      return NextResponse.json({ error: "invalid payload" }, { status: 400 });
+    }
+
+    await saveRequestUsage({
+      provider: body.provider,
+      model: body.model,
+      connectionId: body.connectionId,
+      tokens,
+      timestamp: new Date().toISOString()
+    });
+
+    await appendRequestLog({
+      model: body.model,
+      provider: body.provider,
+      connectionId: body.connectionId,
+      tokens,
+      status: body.status || "200 OK"
+    });
+
+    return NextResponse.json({ ok: true });
+  } catch (error) {
+    return NextResponse.json({ error: error.message || "failed to persist usage" }, { status: 500 });
+  }
+}

package/.next/standalone/src/mitm/server.js

@@ -10,6 +10,7 @@ const { isTokenSwapEnabled, getAllActiveConnections, triggerRefreshIfNeeded,
         setCooldown, setModelCooldown, getTokenSwapStrategy,
         parseQuotaCooldown, markAccountUsed, getConnectionLabel } = require("./tokenPool");
 const { getCertForDomain } = require("./cert/generate");
+const { buildInputOnlyRequestDetail, createTokenSwapUsageObserver, generateDetailId } = require("./usageTracker");
 
 const DB_FILE = path.join(DATA_DIR, "db.json");
 const LOCAL_PORT = 443;
@@ -180,7 +181,7 @@ async function passthrough(req, res, bodyBuffer, onResponse) {
 // Unlike passthrough(), this checks upstream statusCode BEFORE
 // piping to client — enabling auto-retry on 429/503.
 
-async function tokenSwapForward(req, res, bodyBuffer, connections, model, strategy) {
+async function tokenSwapForward(req, res, bodyBuffer, connections, model, strategy, provider, requestStartTime) {
   const targetHost = (req.headers.host || TARGET_HOSTS[0]).split(":")[0];
   const targetIP = await resolveTargetIP(targetHost);
 
@@ -245,12 +246,57 @@ async function tokenSwapForward(req, res, bodyBuffer, connections, model, strate
       }
 
       const newCount = (conn.consecutiveUseCount || 0) + 1;
+      const statusCode = result.response.statusCode || 0;
       const successModelTag = model ? ` model=${model}` : "";
       const successStrategyTag = strategy === "sticky" ? ` sticky(use #${newCount})` : ` rr`;
-      log(`✅ [token-swap] "${label}" → ${result.response.statusCode}${successModelTag}${successStrategyTag}`);
+      log(`✅ [token-swap] "${label}" → ${statusCode}${successModelTag}${successStrategyTag}`);
       markAccountUsed(conn.id);
-      res.writeHead(result.response.statusCode, result.response.headers);
-      result.response.pipe(res);
+      res.writeHead(statusCode, result.response.headers);
+
+      const detailId = generateDetailId(model);
+      const inputOnlyDetail = buildInputOnlyRequestDetail({
+        detailId,
+        provider,
+        model,
+        connectionId: conn.id,
+        bodyBuffer
+      });
+      fetch("http://127.0.0.1:20128/api/internal/request-detail", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          [INTERNAL_REQUEST_HEADER.name]: INTERNAL_REQUEST_HEADER.value
+        },
+        body: JSON.stringify(inputOnlyDetail)
+      }).catch((detailError) => {
+        err(`[token-swap] failed to create request detail for "${label}": ${detailError.message}`);
+      });
+
+      const usageObserver = createTokenSwapUsageObserver({
+        provider,
+        model,
+        connectionId: conn.id,
+        accountLabel: label,
+        bodyBuffer,
+        contentType: result.response.headers["content-type"] || "",
+        contentEncoding: result.response.headers["content-encoding"] || "",
+        statusCode,
+        detailRecord: inputOnlyDetail,
+        requestStartTime
+      });
+
+      result.response.on("data", (chunk) => {
+        usageObserver.onChunk(chunk);
+        res.write(chunk);
+      });
+      result.response.on("end", () => {
+        res.end();
+        usageObserver.onEnd().catch(() => {});
+      });
+      result.response.on("error", (streamError) => {
+        err(`[token-swap] upstream stream error for "${label}": ${streamError.message}`);
+        if (!res.writableEnded) res.end();
+      });
       return true;
     } catch (e) {
       err(`[token-swap] error for "${label}": ${e.message}`);
@@ -312,7 +358,7 @@ const server = https.createServer(sslOptions, async (req, res) => {
       const poolConns = getAllActiveConnections(swapProvider, model);
       if (poolConns.length > 0) {
         log(`🔑 [${tool}] token-swap: ${poolConns.length} account(s) available (strategy=${strategy}${model ? `, model=${model}` : ""})`);
-        const handled = await tokenSwapForward(req, res, bodyBuffer, poolConns, model, strategy);
+        const handled = await tokenSwapForward(req, res, bodyBuffer, poolConns, model, strategy, swapProvider, bodyCollectStart);
         if (handled) return;
         log(`⚠️ [${tool}] token-swap: all accounts exhausted, falling through to original token`);
       } else {