@tokagent/tokagentos 2.0.17 → 2.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokagent/tokagentos",
-  "version": "2.0.17",
+  "version": "2.0.19",
   "description": "tokagentOS CLI - Create and upgrade tokagentOS project templates",
   "type": "module",
   "bin": {

package/scaffold-patches/packages/agent/src/runtime/core-plugins.ts

@@ -77,6 +77,50 @@ function configureLitellmEnvMirror(): void {
 }
 configureLitellmEnvMirror();
 
+/**
+ * Tokagent billing gateway → OpenAI-compatible chat provider.
+ *
+ * When the user has set `BILLING_CHAT_KEY=sk-ai-...` in their .env (the
+ * minted billing API key) AND `TOKAGENT_GATEWAY_URL` is set (always true on
+ * v2.0.7+ scaffolds — defaults to the Tokamak-hosted Railway gateway), wire
+ * them onto OPENAI_* so plugin-openai treats the gateway as its provider.
+ *
+ * Effect: chat composer activates without the user needing to set
+ * OPENAI_API_KEY/OPENAI_BASE_URL manually. The minted sk-ai-* key is sent
+ * as `Authorization: Bearer sk-ai-...`, which the billing-server's
+ * resolveBillingIdentity recognizes (v2.0.18+) and routes through the
+ * billing rail (auth → reserve → upstream LiteLLM → commit).
+ *
+ * Coupled like the LiteLLM mirror — if only one of the two is set, this is
+ * a no-op (we don't want to point OpenAI plugin at the gateway with no key,
+ * or send the billing key to api.openai.com).
+ *
+ * Explicit OPENAI_* in .env still wins over BILLING_* — same precedence
+ * model as the LiteLLM block above.
+ */
+function configureBillingChatMirror(): void {
+  const hasKey = !!process.env.BILLING_CHAT_KEY?.trim();
+  const hasUrl = !!process.env.TOKAGENT_GATEWAY_URL?.trim();
+  if (!hasKey || !hasUrl) return;
+  if (process.env.OPENAI_API_KEY?.trim() || process.env.OPENAI_BASE_URL?.trim()) {
+    // User configured OpenAI explicitly — respect their choice.
+    return;
+  }
+  // The billing gateway exposes /v1/chat/completions + /v1/messages at the
+  // root of TOKAGENT_GATEWAY_URL. plugin-openai appends `/v1/...` itself, so
+  // strip any trailing /v1 the user may have appended and a trailing slash.
+  const base = process.env
+    .TOKAGENT_GATEWAY_URL!.trim()
+    .replace(/\/$/, "")
+    .replace(/\/v1$/, "");
+  process.env.OPENAI_API_KEY = process.env.BILLING_CHAT_KEY!.trim();
+  process.env.OPENAI_BASE_URL = `${base}/v1`;
+  console.info(
+    "[tokagent] BILLING_CHAT_KEY + TOKAGENT_GATEWAY_URL detected — wired as OpenAI-compatible provider for chat.",
+  );
+}
+configureBillingChatMirror();
+
 /**
  * Plugins that depend on PTY/native workspace tooling.
  * Keep them out of cloud images where those binaries are intentionally absent.

package/scaffold-patches/packages/billing/src/auth/api-keys.ts

@@ -163,6 +163,40 @@ export async function revokeApiKey(
     .where(eq(apiKeys.id, id));
 }
 
+/**
+ * Hard-delete an API key row from the database (vs. {@link revokeApiKey},
+ * which sets `revokedAt` and keeps the row for audit trail).
+ *
+ * Use this when the operator wants to reclaim disk space or when revoked
+ * keys would otherwise accumulate unbounded over the lifetime of a wallet.
+ * The historical `billing_call_log` rows still reference `apiKeyId` as a
+ * plain text column (no FK constraint), so call-log history survives.
+ *
+ * Authorization: the caller MUST already have proven ownership — same
+ * checks as {@link revokeApiKey}.
+ *
+ * Idempotent: if the key doesn't exist, returns silently (no throw).
+ */
+export async function deleteApiKey(
+  db: BillingDatabase,
+  id: string,
+  wallet: Address,
+): Promise<void> {
+  const rows = await db
+    .select({ id: apiKeys.id, wallet: apiKeys.wallet })
+    .from(apiKeys)
+    .where(eq(apiKeys.id, id));
+
+  if (rows.length === 0) return; // already gone — idempotent
+
+  const row = rows[0]!;
+  if (row.wallet.toLowerCase() !== wallet.toLowerCase()) {
+    throw new Error(`deleteApiKey: key ${id} does not belong to wallet ${wallet}`);
+  }
+
+  await db.delete(apiKeys).where(eq(apiKeys.id, id));
+}
+
 /**
  * Batch-update `last_used_at` for a set of key IDs.
  * Called by the Phase 5 cron worker, not on the hot request path.

package/templates/fullstack-app/.env.example

@@ -202,6 +202,14 @@ BILLING_MODE=client
 TOKAGENT_GATEWAY_URL=https://billing-service-production-a8e7.up.railway.app
 # TOKAGENT_GATEWAY_TIMEOUT_MS=30000  # default 30s; bump for slow connections
 
+# Paste your minted API key here (from the billing dashboard "Keys" tab) to
+# enable the agent's chat composer. With BILLING_CHAT_KEY + the gateway URL
+# above, the runtime auto-wires OPENAI_API_KEY / OPENAI_BASE_URL so
+# plugin-openai routes inference through the billing rail — every billed
+# call debits PTON from your on-chain balance.
+# Mint a key at: <TOKAGENT_GATEWAY_URL>/v1/billing/dashboard/  (Keys tab)
+# BILLING_CHAT_KEY=sk-ai-...
+
 # ─────────────────────────────────────────────────────────────────────
 # ADVANCED — self-host the billing rail
 # ─────────────────────────────────────────────────────────────────────

package/templates/fullstack-app/plugins/plugin-tokagent-billing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokagent/plugin-tokagent-billing",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "elizaOS plugin: Web3 credit-billing routes and middleware for the tokagentos LLM gateway.",
   "type": "module",
   "publishConfig": { "access": "public" },

package/templates/fullstack-app/plugins/plugin-tokagent-billing/src/dashboard/app.js

@@ -857,8 +857,9 @@ async function renderKeysTable() {
     const tr = document.createElement("tr");
     const status = k.revokedAt ? `<span class="outcome-pill outcome-failed">revoked</span>` : `<span class="outcome-pill outcome-success">active</span>`;
     const action = k.revokedAt
-      ? ""
-      : `<button class="btn btn-danger" type="button" data-revoke="${escape(k.id)}">Revoke</button>`;
+      ? `<button class="btn btn-danger" type="button" data-delete="${escape(k.id)}" title="Permanently remove this revoked key from the database">Delete</button>`
+      : `<button class="btn btn-danger" type="button" data-revoke="${escape(k.id)}">Revoke</button>
+         <button class="btn btn-ghost" type="button" data-delete="${escape(k.id)}" title="Skip the revoke step and hard-delete immediately">Delete</button>`;
     tr.innerHTML = `
       <td><code>${escape(k.id)}</code></td>
       <td>${escape(k.name ?? "—")}</td>
@@ -883,6 +884,25 @@ async function renderKeysTable() {
       }
     });
   }
+  // Hard-delete (?hard=true) removes the row from the DB instead of soft-
+  // revoking. Soft revoke keeps the row for audit trail but accumulates
+  // unbounded over time; hard delete reclaims the row. Call-log history
+  // survives because billing_call_log.api_key_id has no FK constraint.
+  for (const btn of tbody.querySelectorAll("[data-delete]")) {
+    btn.addEventListener("click", async () => {
+      const id = btn.getAttribute("data-delete");
+      if (!window.confirm(`Permanently delete API key ${id}?\nThis cannot be undone.`)) return;
+      btn.disabled = true;
+      try {
+        await apiJson(`/v1/keys/${encodeURIComponent(id)}?hard=true`, { method: "DELETE" });
+        await renderKeysTable();
+      } catch (e) {
+        setStatus($("#key-create-status"), `Delete failed: ${e.message}`, "err");
+      } finally {
+        btn.disabled = false;
+      }
+    });
+  }
 }
 
 // ----------------------------- Charts (zero-dep canvas) -----------------------------

package/templates/fullstack-app/plugins/plugin-tokagent-billing/src/middleware/api-key-resolve.ts

@@ -81,9 +81,22 @@ export async function resolveBillingIdentity(
     }
   }
 
-  // ---- 2. Authorization: Bearer <jwt> ----
+  // ---- 2. Authorization: Bearer (API key OR SIWE JWT) ----
+  // Anthropic and OpenAI SDKs (plus elizaOS's plugin-openai) send the API key
+  // as `Authorization: Bearer <key>`. Try as sk-ai-* API key first so a user
+  // can plug the billing gateway into any OpenAI-compatible client by setting
+  // OPENAI_API_KEY=sk-ai-... + OPENAI_BASE_URL=<gateway>. Falls back to SIWE
+  // JWT for the dashboard's wallet-signed session path.
   const bearer = bearerToken(req);
   if (bearer) {
+    if (bearer.startsWith("sk-ai-")) {
+      const result = await resolveApiKey(db, bearer, authSecret);
+      if (result) {
+        return { wallet: result.wallet, apiKeyId: result.id };
+      }
+      // Fall through to JWT path — defensive, in case some future API key
+      // format collides with the prefix check.
+    }
     const result = await verifySession(bearer, authSecret);
     if (result) {
       return { wallet: result.wallet };

package/templates/fullstack-app/plugins/plugin-tokagent-billing/src/routes/keys-routes.ts

@@ -17,6 +17,7 @@ import {
   mintApiKey,
   listApiKeys,
   revokeApiKey,
+  deleteApiKey,
 } from "@tokagentos/billing";
 import {
   getBillingState,
@@ -153,9 +154,24 @@ async function handleRevokeKey(
     return;
   }
 
+  // `?hard=true` hard-deletes the row instead of soft-revoking. Soft revoke
+  // sets `revoked_at` and leaves the row in `billing_api_keys` for audit
+  // trail — useful but accumulates rows over time. Hard delete reclaims the
+  // row entirely; the historical `billing_call_log` rows still reference
+  // `api_key_id` as a plain text column (no FK), so call-log history is not
+  // affected. The default remains soft-revoke for backward compatibility.
+  const hardFlag = req.query?.["hard"];
+  const hardDelete =
+    hardFlag === "true" || hardFlag === "1" || hardFlag === "";
+
   try {
-    await revokeApiKey(db, keyId, identity.wallet);
-    res.status(200).json({ revoked: true, id: keyId });
+    if (hardDelete) {
+      await deleteApiKey(db, keyId, identity.wallet);
+      res.status(200).json({ deleted: true, id: keyId });
+    } else {
+      await revokeApiKey(db, keyId, identity.wallet);
+      res.status(200).json({ revoked: true, id: keyId });
+    }
   } catch (err: unknown) {
     const message = err instanceof Error ? err.message : "revoke failed";
     if (message.includes("not found")) {

package/templates-manifest.json

@@ -1,6 +1,6 @@
 {
   "version": "1.0.0",
-  "generatedAt": "2026-05-19T18:38:05.516Z",
+  "generatedAt": "2026-05-19T20:00:04.880Z",
   "repoUrl": "https://github.com/elizaos/eliza",
   "templates": [
     {