cartethyia 2.7.6 → 2.7.8

package/src/console/cli-tools/cartethyia-websearch-plugin.ts

@@ -0,0 +1,186 @@
+/**
+ * OpenCode websearch provider plugin generation.
+ *
+ * The Console writes `websearch.provider = "<provider>"` into the user's
+ * opencode.jsonc. That value resolves to a WebSearch provider the local plugin
+ * below registers with OpenCode. The plugin reads the gateway URL and API key
+ * from the matching provider entry in opencode.jsonc — the same provider block
+ * the injector writes — so the search route follows the configured provider.
+ *
+ * OpenCode loads every `.js` file under `~/.config/opencode/plugins/`
+ * (or `<config-dir>/plugins/`) as a plugin; no registration step is needed
+ * beyond writing the file.
+ */
+import { ensureDir, fileExists, join, removeFile, writeTextFileWithBackup } from "./fs-ops";
+
+const PLUGIN_FILENAME = (providerName: string) => `${providerName}-websearch.js`;
+
+/** Escapes the provider name for use inside a JS double-quoted string. */
+function jsStringLiteral(value: string): string {
+  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n");
+}
+
+/**
+ * Renders the websearch plugin source for one provider name.
+ *
+ * `providerName` is the exact provider key written into opencode.jsonc (e.g.
+ * `Cartethyia`, `CarteLocal`). The plugin reads that block's `baseURL` and
+ * `apiKey` as the single source of truth, so no secret is duplicated anywhere.
+ */
+export function renderWebsearchPlugin(providerName: string): string {
+  const quoted = jsStringLiteral(providerName);
+  return `// ${quoted}-websearch — route OpenCode's built-in websearch tool through the
+// Cartethyia gateway's /v1/search native route, using the "${quoted}"
+// provider block in opencode.jsonc as the single source of truth.
+//
+// Generated by the Cartethyia console (CLI tools → OpenCode). Do not edit by
+// hand; re-apply the tool config to regenerate.
+//
+// Env overrides (all optional):
+//   CARTETHYIA_SEARCH_URL      (default: the provider's baseURL + /search)
+//   CARTETHYIA_SEARCH_API_KEY  (default: the provider's apiKey)
+//   CARTETHYIA_SEARCH_BACKEND  (default: "exa"; "parallel" also works)
+
+import { Plugin } from "@opencode/plugin";
+import { readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+function pick(obj, keys) {
+  for (const k of keys) {
+    const v = obj?.[k];
+    if (v !== undefined && v !== null) return v;
+  }
+  return undefined;
+}
+
+// Pull the "${quoted}" provider's baseURL/apiKey out of opencode.jsonc.
+// The file is JSONC (comments allowed) so search for the provider block
+// loosely rather than parsing strictly.
+function readProviderSettings() {
+  const candidates = [
+    process.env.OPENCODE_CONFIG,
+    join(homedir(), ".config", "opencode", "opencode.jsonc"),
+    join(homedir(), ".config", "opencode", "opencode.json"),
+  ];
+  for (const path of candidates) {
+    if (!path) continue;
+    let text;
+    try {
+      text = readFileSync(path, "utf8");
+    } catch {
+      continue;
+    }
+    // Find the provider block, then the next provider block or closing brace.
+    const providerStart = text.indexOf(\`"\${PROVIDER_NAME}"\`);
+    if (providerStart < 0) continue;
+    const settingsMatch = text.slice(providerStart).match(/"settings"\\s*:\\s*\\{/);
+    if (!settingsMatch) continue;
+    const settingsStart = providerStart + settingsMatch.index + settingsMatch[0].length - 1;
+    let depth = 0;
+    let end = -1;
+    for (let i = settingsStart; i < text.length; i++) {
+      const ch = text[i];
+      if (ch === "{") depth += 1;
+      else if (ch === "}") {
+        depth -= 1;
+        if (depth === 0) {
+          end = i;
+          break;
+        }
+      }
+    }
+    if (end < 0) continue;
+    const settings = text.slice(settingsStart, end + 1);
+    const baseURL = settings.match(/"baseURL"\\s*:\\s*"([^"]+)"/)?.[1];
+    const apiKey = settings.match(/"apiKey"\\s*:\\s*"([^"]+)"/)?.[1];
+    if (baseURL) {
+      return { baseURL, apiKey };
+    }
+  }
+  return { baseURL: undefined, apiKey: undefined };
+}
+
+const PROVIDER_NAME = "${quoted}";
+const local = readProviderSettings();
+const BASE_URL = (process.env.CARTETHYIA_SEARCH_URL || (local.baseURL ? \`\${local.baseURL.replace(/\\/+$/, "")}/search\` : "")).replace(/\\/+$/, "");
+const API_KEY = process.env.CARTETHYIA_SEARCH_API_KEY || local.apiKey || "";
+const BACKEND = process.env.CARTETHYIA_SEARCH_BACKEND || "exa";
+
+export default Plugin.define({
+  id: "${quoted}-websearch",
+  async setup(ctx) {
+    await ctx.websearch.transform((editor) => {
+      editor.add({
+        id: "${quoted}",
+        name: "Cartethyia Search",
+        execute: async ({ query }, { signal }) => {
+          if (!BASE_URL) {
+            throw new Error(
+              "Cartethyia search gateway is not configured: set CARTETHYIA_SEARCH_URL or add a ${quoted} provider with baseURL in opencode.jsonc",
+            );
+          }
+          const response = await fetch(BASE_URL, {
+            method: "POST",
+            headers: {
+              "content-type": "application/json",
+              ...(API_KEY ? { authorization: \`Bearer \${API_KEY}\` } : {}),
+            },
+            body: JSON.stringify({
+              model: BACKEND,
+              query,
+              max_results: 8,
+            }),
+            signal,
+          });
+          if (!response.ok) {
+            const text = await response.text().catch(() => "");
+            throw new Error(
+              \`Cartethyia search failed (HTTP \${response.status}): \${text.slice(0, 200)}\`,
+            );
+          }
+          const data = await response.json();
+          const results = Array.isArray(data?.results) ? data.results : [];
+          return results.map((item) => ({
+            url: String(item?.url ?? ""),
+            title: typeof item?.title === "string" && item.title ? item.title : undefined,
+            content: typeof item?.snippet === "string" && item.snippet ? item.snippet : undefined,
+            time:
+              typeof item?.published_at === "string" && item.published_at
+                ? { published: Date.parse(item.published_at) || undefined }
+                : {},
+          }));
+        },
+      });
+      editor.default.set("${quoted}");
+    });
+  },
+});
+`;
+}
+
+/** Writes the websearch plugin for a provider into the OpenCode config dir. */
+export async function writeWebsearchPlugin(
+  configDir: string,
+  providerName: string,
+): Promise<string> {
+  const pluginsDir = join(configDir, "plugins");
+  await ensureDir(pluginsDir);
+  const filename = PLUGIN_FILENAME(providerName);
+  const target = join(pluginsDir, filename);
+  await writeTextFileWithBackup(target, renderWebsearchPlugin(providerName));
+  return target;
+}
+
+/** Removes the websearch plugin for a provider from the OpenCode config dir. */
+export async function removeWebsearchPlugin(
+  configDir: string,
+  providerName: string,
+): Promise<boolean> {
+  const target = join(configDir, "plugins", PLUGIN_FILENAME(providerName));
+  if (await fileExists(target)) {
+    await removeFile(target);
+    return true;
+  }
+  return false;
+}

package/src/console/cli-tools/injectors/opencode.ts

@@ -2,6 +2,7 @@ import type {} from "../contracts";
 import { ensureV1Suffix, homeDir, join, readJsonFile, writeJsonFileWithBackup } from "../fs-ops";
 import type { InjectorSpec } from "../contracts";
 import { DEFAULT_SDK } from "../contracts";
+import { writeWebsearchPlugin, removeWebsearchPlugin } from "../cartethyia-websearch-plugin";
 
 
 // OpenCode injector spec.
@@ -19,6 +20,7 @@ interface OpencodeProvider {
 interface OpencodeConfig {
   provider?: Record<string, OpencodeProvider>;
   model?: string;
+  websearch?: { provider?: string };
   agent?: {
     explorer?: {
       description?: string;
@@ -51,11 +53,14 @@ export const opencodeSpec: InjectorSpec = {
     if (!config) {
       return { configured: false, currentEndpoint: null, rawApiKey: null, currentModels: null };
     }
-    const provider = config.provider?.cartethyia;
+    // The provider key written by this injector is the websearch provider name
+    // when one is configured, otherwise the default `cartethyia`.
+    const providerId = config.websearch?.provider ?? "cartethyia";
+    const provider = config.provider?.[providerId];
     const endpoint = provider?.options?.baseURL ?? null;
     const models = provider?.models ? Object.keys(provider.models) : null;
     const active =
-      typeof config.model === "string" && config.model.startsWith("cartethyia/")
+      typeof config.model === "string" && config.model.startsWith(`${providerId}/`)
         ? config.model.split("/").slice(1).join("/")
         : null;
     return {
@@ -70,10 +75,15 @@ export const opencodeSpec: InjectorSpec = {
     const existing = (await readJsonFile(path)) as OpencodeConfig | null;
     const config: OpencodeConfig = (existing ?? {}) as OpencodeConfig;
 
+    // The provider key written into opencode.jsonc follows the websearch
+    // provider name when one is chosen, which keeps the websearch plugin and
+    // the provider block pointing at the same entry.
+    const providerId = input.websearch ?? "cartethyia";
+
     if (!config.provider) config.provider = {};
-    const prior = config.provider.cartethyia;
-    const otherProviders = Object.keys(config.provider).filter((id) => id !== "cartethyia");
-    config.provider.cartethyia = {
+    const prior = config.provider[providerId];
+    const otherProviders = Object.keys(config.provider).filter((id) => id !== providerId);
+    config.provider[providerId] = {
       npm: input.sdk ?? prior?.npm ?? DEFAULT_SDK,
       options: {
         ...(prior?.options ?? {}),
@@ -84,7 +94,7 @@ export const opencodeSpec: InjectorSpec = {
     };
 
     const activeModel = input.activeModel ?? input.modelIds[0] ?? "";
-    config.model = activeModel === "" ? "" : `cartethyia/${activeModel}`;
+    config.model = activeModel === "" ? "" : `${providerId}/${activeModel}`;
 
     if (input.websearch !== undefined) {
       config.websearch = { provider: input.websearch };
@@ -107,13 +117,20 @@ export const opencodeSpec: InjectorSpec = {
     config.agent.explorer = {
       description: "Fast explorer subagent",
       mode: "subagent",
-      model: `cartethyia/${subagentModel}`,
+      model: `${providerId}/${subagentModel}`,
     };
 
     await writeJsonFileWithBackup(path, config);
+
+    // Write (or refresh) the websearch provider plugin when web search is
+    // routed through the gateway. The plugin id follows the provider name.
+    if (input.websearch !== undefined) {
+      await writeWebsearchPlugin(opencodeSpec.resolveDir?.() ?? join(homeDir(), ".config", "opencode"), providerId);
+    }
+
     return otherProviders.length > 0
       ? [
-          `Config already has other provider(s): ${otherProviders.join(", ")}. They were kept as-is — only cartethyia was written/updated.`,
+          `Config already has other provider(s): ${otherProviders.join(", ")}. They were kept as-is — only ${providerId} was written/updated.`,
         ]
       : undefined;
   },
@@ -122,29 +139,39 @@ export const opencodeSpec: InjectorSpec = {
     const config = (await readJsonFile(path)) as OpencodeConfig | null;
     if (!config) return false;
 
+    const providerId = config.websearch?.provider ?? "cartethyia";
+
     if (config.provider) {
-      delete config.provider.cartethyia;
+      delete config.provider[providerId];
       if (Object.keys(config.provider).length === 0) delete config.provider;
     }
 
-    if (typeof config.model === "string" && config.model.startsWith("cartethyia/")) {
+    if (typeof config.model === "string" && config.model.startsWith(`${providerId}/`)) {
       delete config.model;
     }
 
-    if (config.agent?.explorer?.model?.startsWith("cartethyia/")) {
+    if (config.agent?.explorer?.model?.startsWith(`${providerId}/`)) {
       delete config.agent.explorer;
       if (Object.keys(config.agent).length === 0) delete config.agent;
     }
 
+    if (config.websearch) {
+      delete config.websearch;
+    }
+
     await writeJsonFileWithBackup(path, config);
+
+    // Remove the generated websearch plugin when present.
+    await removeWebsearchPlugin(opencodeSpec.resolveDir?.() ?? join(homeDir(), ".config", "opencode"), providerId);
   },
 
   download(input) {
     const activeModel = input.activeModel ?? input.modelIds[0] ?? "";
     const subagentModel = input.subagentModel ?? input.modelIds[0] ?? activeModel;
+    const providerId = input.websearch ?? "cartethyia";
     const config: OpencodeConfig = {
       provider: {
-        cartethyia: {
+        [providerId]: {
           npm: input.sdk ?? DEFAULT_SDK,
           options: {
             baseURL: ensureV1Suffix(input.endpoint),
@@ -153,12 +180,13 @@ export const opencodeSpec: InjectorSpec = {
           models: buildOpencodeModels(input.modelIds),
         },
       },
-      model: activeModel === "" ? "" : `cartethyia/${activeModel}`,
+      model: activeModel === "" ? "" : `${providerId}/${activeModel}`,
+      ...(input.websearch !== undefined ? { websearch: { provider: input.websearch } } : {}),
       agent: {
         explorer: {
           description: "Fast explorer subagent",
           mode: "subagent",
-          model: `cartethyia/${subagentModel}`,
+          model: `${providerId}/${subagentModel}`,
         },
       },
     };

package/src/console/providers/catalog/contracts.ts

@@ -935,6 +935,8 @@ export interface ProviderRoutingResponse {
   readonly skipProxy: boolean;
   /** Built-in API-key upstream User-Agent; OAuth and custom providers retain their own identity. */
   readonly userAgent: string;
+  /** Operator-set custom User-Agent override; `null` = no override (native identity is used). */
+  readonly customUserAgent: string | null;
 }
 
 /**
@@ -966,4 +968,6 @@ export interface UpdateProviderRoutingRequest {
   readonly skipProxy?: boolean;
   /** Built-in API-key upstream User-Agent. */
   readonly userAgent?: string;
+  /** Operator-set custom User-Agent override; `null` clears it back to native. */
+  readonly customUserAgent?: string | null;
 }

package/src/console/providers/catalog/routes.ts

@@ -126,6 +126,7 @@ const probeModelBody = t.Object({
   reasoningEffort: t.Optional(literalUnion(PROBE_REASONING_EFFORTS)),
   maxOutputTokens: t.Optional(t.Integer({ minimum: 1, maximum: 131072 })),
   stream: t.Optional(t.Boolean()),
+  surface: t.Optional(literalUnion(["default", "cosy", "grpc", "ide"])),
 });
 const byokConnectionTestBody = t.Object({
   baseUrl: t.String(),

package/src/console/providers/detail/routes.ts

@@ -100,6 +100,13 @@ function createProviderDetailOperations(deps: ProviderDetailConfig) {
       ) {
         throw new ConsoleDomainError("invalid_request", 400, "userAgent must be a header value up to 4096 characters");
       }
+      if (
+        patch.customUserAgent !== undefined &&
+        patch.customUserAgent !== null &&
+        (patch.customUserAgent.length > 4096 || /[\u0000-\u001f\u007f]/.test(patch.customUserAgent))
+      ) {
+        throw new ConsoleDomainError("invalid_request", 400, "customUserAgent must be a header value up to 4096 characters, or null");
+      }
       const updated = await deps.store.updateRouting(providerId, a.tenantId, patch);
       await deps.auditSink?.record({
         access: a,
@@ -157,6 +164,7 @@ const updateRoutingBody = t.Object({
   usageFloorUnit: t.Optional(t.Union([t.Literal("credit"), t.Literal("percent")])),
   skipProxy: t.Optional(t.Boolean()),
   userAgent: t.Optional(t.String({ minLength: 0, maxLength: 4096 })),
+  customUserAgent: t.Optional(t.Nullable(t.String({ minLength: 0, maxLength: 4096 }))),
 });
 
 

package/src/console/providers/detail/store.ts

@@ -41,6 +41,7 @@ function mapRow(row: typeof providerRoutingSettings.$inferSelect): ProviderRouti
     enabled: row.enabled,
     skipProxy: row.skipProxy,
     userAgent: row.userAgent,
+    customUserAgent: row.customUserAgent,
   };
 }
 
@@ -94,6 +95,7 @@ export class DrizzleProviderDetailStore implements ProviderDetailStore {
       enabled: false,
       skipProxy: defaultSkipProxy(providerId),
       userAgent: buildClaudeCliUserAgent(),
+      customUserAgent: null,
     };
   }
   async updateRouting(
@@ -116,6 +118,7 @@ export class DrizzleProviderDetailStore implements ProviderDetailStore {
       enabled: patch.enabled ?? false,
       skipProxy: patch.skipProxy ?? defaultSkipProxy(providerId),
       userAgent: patch.userAgent ?? buildClaudeCliUserAgent(),
+      customUserAgent: patch.customUserAgent ?? null,
     };
     const setClause: Record<string, unknown> = {};
     if (patch.strategy !== undefined) setClause.strategy = patch.strategy;
@@ -128,6 +131,7 @@ export class DrizzleProviderDetailStore implements ProviderDetailStore {
     if (patch.enabled !== undefined) setClause.enabled = patch.enabled;
     if (patch.skipProxy !== undefined) setClause.skipProxy = patch.skipProxy;
     if (patch.userAgent !== undefined) setClause.userAgent = patch.userAgent;
+    if (patch.customUserAgent !== undefined) setClause.customUserAgent = patch.customUserAgent;
     const upserted = await this.db
       .insert(providerRoutingSettings)
       .values(values)

package/src/console/quota/account-quota-tenant.ts

@@ -48,6 +48,11 @@ import {
   fetchQoderDailyCheckin,
   isQoderCheckinProvider,
 } from "../../providers/integrations/qoder/qoder-checkin";
+import {
+  claimQoderCredits,
+  QODER_CREDIT_PROVIDER_IDS,
+  type QoderCreditClaimResult,
+} from "../../providers/integrations/qoder/claim-qoder-credits";
 import {
   DrizzleQoderNativeIdentityStore,
   type QoderNativeIdentityStore,
@@ -1136,6 +1141,75 @@ export function registerAccountQuotaTenantRoutes(
                 : (result.detail ?? "Claim it in the ZCode app"),
       };
     })
+    // Qoder daily-credits claim is likewise an explicit operator action: the
+    // CREDITS campaign only surfaces with the real UMID headers, so the claim
+    // mints/binds a native identity first (same store the check-in worker uses).
+    .post("/accounts/:id/claim-qoder-credits", async ({ request, params, set }) => {
+      const access = requireTenantScope(accessResolver(request), "dashboard:write");
+      const rows = await db
+        .select()
+        .from(providerAccounts)
+        .where(
+          and(eq(providerAccounts.id, params.id), eq(providerAccounts.tenantId, access.tenantId)),
+        )
+        .limit(1);
+      const account = rows[0];
+      if (!account) {
+        set.status = 404;
+        return { error: `Account ${params.id} not found`, code: "not_found" };
+      }
+      if (!QODER_CREDIT_PROVIDER_IDS.includes(account.providerId as (typeof QODER_CREDIT_PROVIDER_IDS)[number])) {
+        set.status = 400;
+        return {
+          error: "Daily credits are only claimable for qoder accounts",
+          code: "qoder_credits_unsupported",
+        };
+      }
+      let result: QoderCreditClaimResult;
+      try {
+        const credential = await refreshDeps.resolveCredential(account.providerId as ProviderId, account.id);
+        const fetcher = networkBindingFactory
+          ? await dailyCheckinEgressForPass({ db, networkBindingFactory })(account.id, access.tenantId)
+          : globalThis.fetch;
+        result = await claimQoderCredits({ db, providerId: account.providerId, accountId: account.id, credential, fetcher });
+      } catch {
+        set.status = 502;
+        return {
+          ok: false, status: 502,
+          data: { id: account.id, state: "error", amount: 0, detail: "Qoder credit claim request failed" },
+          message: "Qoder credit claim request failed", code: "qoder_credit_claim_failed",
+        };
+      }
+      if (result.state === "claimed") {
+        // Cold readers must not resurrect the balance from before the grant.
+        await db.update(providerAccounts).set({ quotaSnapshot: null }).where(
+          and(eq(providerAccounts.id, account.id), eq(providerAccounts.tenantId, access.tenantId)),
+        );
+        await invalidateQuotaCacheForAccount(account.id, redis);
+        await snapshotInvalidator?.invalidate();
+      }
+      if (result.state === "error") {
+        set.status = 502;
+        return {
+          ok: false,
+          status: 502,
+          data: { id: account.id, ...result },
+          message: result.detail ?? "Qoder credit claim failed",
+          code: "qoder_credit_claim_failed",
+        };
+      }
+      return {
+        ok: true,
+        status: 200,
+        data: { id: account.id, ...result },
+        message:
+          result.state === "nothing"
+            ? "No CREDITS campaign to claim"
+            : result.state === "claimed"
+              ? `Claimed ${result.amount} credits`
+              : "CREDITS campaign already claimed",
+      };
+    })
     .post("/accounts/:id/activity-report", async ({ request, params, set }) => {
       const access = requireTenantScope(accessResolver(request), "dashboard:write");
       const rows = await db

package/src/observability/telemetry-buffer.ts

@@ -153,7 +153,8 @@ function telemetryEventRow(event: TelemetryEventInput) {
       event.usage?.estimated_cost === null || event.usage === undefined
         ? null
         : String(event.usage.estimated_cost),
-    // Buddy-meter credit; NULL when the upstream reported no credit field.
+    // Provider-billed credit (Tencent buddy-meter `credit`, Qoder `credits`);
+    // NULL when the upstream reported no credit field.
     // Numeric columns are string-typed in Drizzle, like `estimatedCostUsd`.
     creditUsed: event.usage?.credit_used != null ? String(event.usage.credit_used) : null,
     resolveMs: event.resolveMs ?? null,

package/src/persistence/boot.ts

@@ -11,18 +11,27 @@ import { applySqlMigrations, createPgHandle, getPool, isPgHandle } from "./db-pg
 import { applySqliteMigrations, buildSqliteHandle, createSqliteDatabase } from "./db-sqlite";
 
 /**
- * True when `error` is a Postgres unique-violation (SQLSTATE 23505).
+ * True when `error` is a unique-violation from either supported dialect:
+ *
+ * - Postgres: SQLSTATE 23505 (`code: "23505"`).
+ * - SQLite: `UNIQUE constraint failed: <index>` (message text) or the
+ *   driver's `SQLITE_CONSTRAINT_UNIQUE` code (19).
  *
  * Lives at the persistence boundary because it is a fact about the driver's
  * error shape, not about any one domain. It walks a bounded `cause` chain
- * because Drizzle wraps driver errors, so the SQLSTATE is not always on the
- * error the caller catches.
+ * because Drizzle wraps driver errors, so the code/message is not always on
+ * the error the caller catches.
  */
 export function isUniqueViolation(error: unknown): boolean {
   let current: unknown = error;
   for (let depth = 0; depth < 3; depth += 1) {
     if (typeof current !== "object" || current === null) return false;
-    if ("code" in current && current.code === "23505") return true;
+    const record = current as { code?: unknown; message?: unknown };
+    const code = typeof record.code === "string" ? record.code : "";
+    const message = typeof record.message === "string" ? record.message : "";
+    if (code === "23505" || code === "SQLITE_CONSTRAINT_UNIQUE") return true;
+    if (message.includes("UNIQUE constraint failed:")) return true;
+    if (code === "19" && message.includes("constraint")) return true;
     if (!("cause" in current)) return false;
     current = current.cause;
   }

package/src/persistence/schema.ts

@@ -793,6 +793,12 @@ export const providerRoutingSettings = pgTable(
     // row that never set one is `buildClaudeCliUserAgent()` in
     // providers/operations/custom-cli-headers.ts, which this mirrors.
     userAgent: text("user_agent").notNull().default("claude-cli/2.1.293 (external, cli)"),
+    // Operator-set custom User-Agent, stored separately from the provider's
+    // native client identity (`user_agent`). NULL = no override — dispatch
+    // uses the native identity. A non-NULL value is an explicit override
+    // applied at the request edge, even when the provider would otherwise
+    // stamp its own identity.
+    customUserAgent: text("custom_user_agent"),
     // When true, this provider's requests always dial direct. When false,
     // dispatch automatically selects among every active network pool the
     // tenant owns (least-loaded/non-cooldown) — never an admin-pinned pool.
@@ -1458,7 +1464,7 @@ export const telemetryEvents = pgTable(
     outputTokens: integer("output_tokens"),
     reasoningTokens: integer("reasoning_tokens"),
     estimatedCostUsd: numeric("estimated_cost_usd", { precision: 12, scale: 6 }),
-    /** Provider-billed credits (Tencent buddy-meter `credit`); NULL when unreported. */
+    /** Provider-billed credits (Tencent buddy-meter `credit`, Qoder `credits`); NULL when unreported. */
     creditUsed: numeric("credit_used", { precision: 12, scale: 4 }),
     /**
      * Gateway-side time before the upstream dispatch began: routing,

package/src/protocol/canonical-model.ts

@@ -370,6 +370,13 @@ export interface CanonicalTerminalEvent {
   readonly response_id?: string;
   /** Event timestamp in milliseconds since epoch (optional for profiling). */
   readonly timestamp?: number;
+  /**
+   * Provider-specific upstream metadata about the model that actually served
+   * the turn — its native model id, supply target, tier, etc. Not a client
+   * surface: probes read it to report what the upstream really ran when the
+   * transport's model echo is an opaque id.
+   */
+  readonly provider_metadata?: Record<string, unknown>;
   /**
    * Set by an adapter whose turn is not finished: the stream ended because the
    * model asked for a tool the client must answer, and the provider's

package/src/protocol/request/gemini.ts

@@ -287,7 +287,26 @@ export function buildGeminiPayload(
     });
   const payload: Record<string, unknown> = { contents };
   if (systemParts.length > 0) payload["systemInstruction"] = { role: "user", parts: systemParts };
-  const functionTools = (request.tools ?? []).filter((t) => t.name);
+  // Gemini's native hosted tools are declared as bare object keys, not
+  // function declarations: `{ googleSearch: {} }` (and codeExecution/urlContext)
+  // enable Google-backed grounding. Accept both spellings the gateway's search
+  // adapters use (`web_search` tool_type and `googleSearch` name) and map them
+  // to the native declaration so the upstream actually grounds the query.
+  const HOSTED_TOOL_NAMES = new Set(["googleSearch", "codeExecution", "urlContext"]);
+  const hostedTools: Record<string, Record<string, unknown>>[] = [];
+  for (const tool of request.tools ?? []) {
+    if (tool.name === "googleSearch" || tool.tool_type === "web_search") {
+      hostedTools.push({ googleSearch: {} });
+    } else if (tool.name === "codeExecution") {
+      hostedTools.push({ codeExecution: {} });
+    } else if (tool.name === "urlContext") {
+      hostedTools.push({ urlContext: {} });
+    }
+  }
+  const functionTools = (request.tools ?? []).filter(
+    (t) => t.name && !HOSTED_TOOL_NAMES.has(t.name) && t.tool_type !== "web_search",
+  );
+  if (hostedTools.length > 0) payload["tools"] = hostedTools;
   if (functionTools.length > 0) {
     payload["tools"] = [
       {

package/src/protocol/tool-identity.ts

@@ -73,9 +73,23 @@ export function trackToolCall(
   fallbackIndex?: number,
 ): { index: number; isFirst: boolean; state: ToolCallState } {
   const priorIndex = tracker.indexById.get(tool.id);
+  // A wire index is only honored when this id already owns it, or when it is
+  // not yet claimed by another call. Upstream Qoder parallel calls frequently
+  // repeat the same wire index (0,0) for different ids, which would otherwise
+  // collapse two calls into one at the encoder (`Map` keyed by index). When
+  // the wire index collides with another id, synthesize a fresh index so every
+  // logical call keeps a distinct wire position.
   const index =
     tool.index !== undefined && Number.isInteger(tool.index) && tool.index >= 0
-      ? tool.index
+      ? (() => {
+          if (priorIndex !== undefined) return priorIndex;
+          for (const [id, assigned] of tracker.indexById) {
+            if (id !== tool.id && assigned === tool.index) {
+              return tracker.nextIndex++;
+            }
+          }
+          return tool.index;
+        })()
       : (priorIndex ?? fallbackIndex ?? tracker.nextIndex++);
   tracker.indexById.set(tool.id, index);
   tracker.nextIndex = Math.max(tracker.nextIndex, index + 1);

package/src/providers/default-registry.ts

@@ -202,7 +202,10 @@ export const PROVIDER_CAPABILITIES = {
   },
   codex: {
     loadAdapter: async () => (await import("./integrations/codex/codex")).createCodexAdapter({ provider_id: "codex" }),
-    loadModels: async () => (await import("./integrations/codex/codex")).CODEX_MODELS,
+    loadModels: async () => {
+      const { CODEX_MODELS, CODEX_SEARCH_MODELS } = await import("./integrations/codex/codex");
+      return [...CODEX_MODELS, ...CODEX_SEARCH_MODELS];
+    },
     loadAuthentication: oauthCapability(() => import("./integrations/codex/codex-oauth"), "codexOAuthClient", { withRefresher: true }),
     loadQuotaCollector: quotaCapability(() => import("./integrations/codex/codex-quota"), "fetchCodexQuota"),
     loadModelDiscovery: async () => async ({ credential, fetcher }) =>
@@ -235,7 +238,10 @@ export const PROVIDER_CAPABILITIES = {
   },
   antigravity: {
     loadAdapter: async () => (await import("./integrations/antigravity/antigravity")).antigravityAdapter,
-    loadModels: async () => (await import("./integrations/antigravity/antigravity")).ANTIGRAVITY_MODELS,
+    loadModels: async () => {
+      const { ANTIGRAVITY_MODELS, ANTIGRAVITY_SEARCH_MODELS } = await import("./integrations/antigravity/antigravity");
+      return [...ANTIGRAVITY_MODELS, ...ANTIGRAVITY_SEARCH_MODELS];
+    },
     loadAuthentication: oauthCapability(() => import("./integrations/antigravity/antigravity-oauth"), "antigravityOAuthClient", { withRefresher: true }),
     loadQuotaCollector: quotaCapability(() => import("./integrations/antigravity/antigravity-quota"), "fetchAntigravityQuota"),
     loadModelDiscovery: async () => async ({ baseUrl, credential, fetcher }) => {