@tokenbuddy/tokenbuddy 1.0.35 → 1.0.37

package/src/seller-catalog.ts

@@ -1,505 +0,0 @@
-import { createModuleLogger } from "@tokenbuddy/logging";
-import * as crypto from "crypto";
-import {
-  shouldVerifyRegistry,
-  signatureUrlForRegistryUrl,
-  verifyTrustedRegistrySignature
-} from "./registry-trust.js";
-
-const logger = createModuleLogger("tb-proxyd");
-
-/**
- * buyer 端协议偏好（用于按协议过滤 catalog）。`messages` 是 anthropic 协议的简称。
- */
-export type ProtocolPreference = "chat_completions" | "responses" | "messages" | "images_generations";
-
-/**
- * wallet-bootstrap `/registry/sellers` 里的 seller 描述。
- * v1.2 起 `models` 是 buyer model-index 路由的权威依据；缺省会被报告为
- * `models_refresh.seller_missing_models` 事件。
- */
-export interface RegistrySeller {
-  /** seller 全局唯一 ID（也作为 token class） */
-  id: string;
-  /** 人类可读名称 */
-  name?: string;
-  /** registry 发布状态；只有 `active` 参与 buyer 自动路由，缺省兼容旧 registry 为可用 */
-  status?: string;
-  /** seller 服务的公网 URL（去掉尾部 `/`） */
-  url: string;
-  /** seller 支持的协议列表（包含 `anthropic_messages` 时内部 alias 到 `messages`） */
-  supportedProtocols?: string[];
-  /** seller 支持的支付方式 */
-  paymentMethods?: string[];
-  /**
-   * v1.2: authoritative model list for buyer-side model-index routing.
-   * Optional at the buyer boundary for backward compatibility with older
-   * registry payloads, but the upstream wallet-bootstrap registry schema
-   * requires it. Missing entries are reported via `models_refresh.seller_missing_models`.
-   */
-  models?: string[];
-}
-
-/**
- * `/registry/sellers` 响应的最小形状（去掉了 buyer 不关心的 metadata）。
- */
-export interface SellerRegistryDocument {
-  /** schema 版本号 */
-  version: number;
-  /** 默认 seller ID（buyer 未指定时回落的目标） */
-  defaultSeller?: string;
-  /** seller 列表 */
-  sellers: RegistrySeller[];
-}
-
-export interface SellerRegistryTrustMetadata {
-  registryUrl: string;
-  registrySha256: string;
-  verified: boolean;
-  signatureUrl?: string;
-  signature?: string;
-  signingKeyId?: string;
-}
-
-export interface FetchedSellerRegistry {
-  registry: SellerRegistryDocument;
-  registryJson: string;
-  trust: SellerRegistryTrustMetadata;
-}
-
-/**
- * Buyer 自动路由 / 模型目录可见性门禁。
- * 新 registry 会显式写 `status`，只有 `active` 参与 buyer 可见路径；
- * 旧 registry 缺省 status 时按历史行为保留可用，避免升级后隐藏存量节点。
- *
- * @param seller registry seller
- * @returns seller 是否应进入 buyer 路由和模型目录
- */
-export function isBuyerVisibleRegistrySeller(seller: RegistrySeller): boolean {
-  const status = seller.status?.trim().toLowerCase();
-  return !status || status === "active";
-}
-
-/**
- * 单个 seller 的 `/manifest` 响应，兼容 snake_case 与 camelCase 字段。
- */
-export interface SellerManifest {
-  /** manifest schema 版本（camelCase） */
-  manifestVersion?: string;
-  /** manifest schema 版本（snake_case 兼容） */
-  manifest_version?: string;
-  /** seller 实例 ID（camelCase） */
-  sellerId?: string;
-  /** seller 实例 ID（snake_case 兼容） */
-  seller_id?: string;
-  /** seller 支持的协议（camelCase） */
-  supportedProtocols?: string[];
-  /** seller 支持的协议（snake_case 兼容） */
-  supported_protocols?: string[];
-  /** seller 支持的支付方式（camelCase） */
-  paymentMethods?: string[];
-  /** seller 支持的支付方式（snake_case 兼容） */
-  payment_methods?: string[];
-  /** 模型清单（含价格） */
-  models?: ManifestModelRecord[];
-  /** 选择策略块（折扣等） */
-  selection?: {
-    /** 折扣系数（camelCase） */
-    discountRatio?: number;
-    /** 折扣系数（snake_case 兼容） */
-    discount_ratio?: number;
-    /** 服务手续费系数（camelCase） */
-    serviceFeeRatio?: number;
-    /** 服务手续费系数（snake_case 兼容） */
-    service_fee_ratio?: number;
-  };
-}
-
-/**
- * `/manifest` 响应里单个模型记录（兼容 snake_case）。
- */
-export interface ManifestModelRecord {
-  /** 模型 ID */
-  id: string;
-  /** 输入价格 USD micros/1M（camelCase） */
-  inputPriceMicrosPer1m?: number;
-  /** 输出价格 USD micros/1M（camelCase） */
-  outputPriceMicrosPer1m?: number;
-  /** 输入价格 USD micros/1M（snake_case 兼容） */
-  input_price_micros_per_1m?: number;
-  /** 输出价格 USD micros/1M（snake_case 兼容） */
-  output_price_micros_per_1m?: number;
-  /** 其它扩展字段（保留以便透传） */
-  [key: string]: unknown;
-}
-
-/**
- * 聚合后的模型目录条目（catalog 渲染 / provider install 选择的最小可消费形状）。
- */
-export interface ModelCatalogEntry {
-  /** 模型 ID */
-  id: string;
-  /** 所属 seller ID */
-  sellerId: string;
-  /** seller 名称（可选） */
-  sellerName?: string;
-  /** seller 公网 URL（去尾 `/`） */
-  sellerUrl: string;
-  /** seller 支持的协议 */
-  supportedProtocols: string[];
-  /** seller 支持的支付方式 */
-  paymentMethods: string[];
-  /** 输入价格 USD micros/1M */
-  inputPriceMicrosPer1m?: number;
-  /** 输出价格 USD micros/1M */
-  outputPriceMicrosPer1m?: number;
-}
-
-/**
- * seller 目录条目（聚合 seller 元信息 + manifest 拉取结果）。
- * 用于 `tb doctor` 和 CLI 表格展示。
- */
-export interface SellerCatalogEntry {
-  /** seller ID */
-  id: string;
-  /** 人类可读名称 */
-  name?: string;
-  /** seller 公网 URL（去尾 `/`） */
-  url: string;
-  /** 当前状态（`active` / `error` / `manifest_unavailable`） */
-  status: string;
-  /** manifest 报告的 sellerId（可能与 id 不同，跨 namespace 时有用） */
-  manifestSellerId?: string;
-  /** 折扣系数（来自 manifest.selection） */
-  discountRatio?: number;
-  /** 服务手续费系数（来自 manifest.selection） */
-  serviceFeeRatio?: number;
-  /** 最近一次 TTFT（毫秒），来自本地 seller pool 运行时指标 */
-  ttftMs?: number;
-  /** 最近 10 分钟窗口内的平均输出吞吐（tokens/s），来自本地 seller pool 运行时指标 */
-  avgTokensPerSecond?: number;
-  /** 模型数（来自 manifest） */
-  modelCount?: number;
-  /** seller 支持的协议（manifest > registry fallback） */
-  supportedProtocols?: string[];
-  /** seller 支持的支付方式（manifest > registry fallback） */
-  paymentMethods?: string[];
-  /** manifest 拉取失败时的错误消息 */
-  errorMessage?: string;
-}
-
-/**
- * `discoverSellerBackedModels` 的返回结果。
- * 包含聚合后的 `models[]` 和 `sellers[]`，供 provider install / catalog 渲染消费。
- */
-export interface SellerCatalogResult {
-  /** 拉取的 registry URL（去尾 `/`） */
-  registryUrl: string;
-  /** registry schema 版本 */
-  version: number;
-  /** 默认 seller ID（来自 registry） */
-  defaultSeller?: string;
-  /** fetched registry document */
-  registry?: SellerRegistryDocument;
-  /** fetched registry bytes used for hashing/signature verification */
-  registryJson?: string;
-  /** 模型目录条目列表（去重后） */
-  models: ModelCatalogEntry[];
-  /** seller 元信息列表（拉取 manifest 后的快照） */
-  sellers: SellerCatalogEntry[];
-  /** registry trust metadata for the fetched registry document */
-  registryTrust?: SellerRegistryTrustMetadata;
-}
-
-/**
- * 去掉 seller URL 尾部的 `/`，避免路径拼接时出现 `//v1/messages`。
- *
- * @param seller registry seller
- * @returns 规范化后的 URL
- */
-export function normalizeSellerUrl(seller: RegistrySeller): string {
-  return seller.url.replace(/\/+$/, "");
-}
-
-/**
- * 解析 seller 实际支持的协议列表。
- * 优先级：manifest.camelCase > manifest.snake_case > registry fallback。
- * 包含 `anthropic_messages` 时内部 alias 到 `messages`（更短、内部统一用简称）。
- *
- * @param manifest seller 的 `/manifest` 响应
- * @param seller 兜底用的 registry seller
- * @returns 归一化后的协议列表
- */
-export function manifestProtocols(manifest: SellerManifest, seller: RegistrySeller): string[] {
-  const protocols = manifest.supportedProtocols || manifest.supported_protocols || seller.supportedProtocols || [];
-  return protocols.includes("anthropic_messages") && !protocols.includes("messages")
-    ? [...protocols, "messages"]
-    : protocols;
-}
-
-/**
- * 解析 seller 支持的支付方式。
- * 优先级：manifest.camelCase > manifest.snake_case > registry fallback。
- *
- * @param manifest seller 的 `/manifest` 响应
- * @param seller 兜底用的 registry seller
- * @returns 支付方式列表
- */
-export function manifestPaymentMethods(manifest: SellerManifest, seller: RegistrySeller): string[] {
-  return manifest.paymentMethods || manifest.payment_methods || seller.paymentMethods || [];
-}
-
-/**
- * 从 manifest 抽取所有模型 ID，过滤非字符串与空串、trim 空白。
- *
- * @param manifest seller 的 `/manifest` 响应
- * @returns 清理后的模型 ID 列表（保序）
- */
-export function manifestModelIds(manifest: SellerManifest): string[] {
-  return (manifest.models || [])
-    .map((model) => model.id)
-    .filter((id): id is string => typeof id === "string" && id.trim().length > 0)
-    .map((id) => id.trim());
-}
-
-function numericPriceField(value: unknown): number | undefined {
-  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
-}
-
-function manifestModels(manifest: SellerManifest): ManifestModelRecord[] {
-  return (manifest.models || [])
-    .filter((model): model is ManifestModelRecord => Boolean(model?.id && typeof model.id === "string"));
-}
-
-/**
- * v1.2 §18.9：bootstrap 的 `/registry/sellers` 返回 413 + `X-TokenBuddy-Registry-Too-Large: 1` 时抛出的错误。
- * daemon 在 `TokenbuddyDaemon.fetchRegistry` 捕获并回退到上次成功快照，保证 buyer 仍可路由。
- */
-export class RegistryTooLargeError extends Error {
-  readonly status: number;
-  readonly sizeBytes: number;
-  readonly sellerCount: number;
-  readonly maxBytes: number;
-  constructor(detail: { status: number; sizeBytes: number; sellerCount: number; maxBytes: number }) {
-    super(`registry response exceeds ${detail.maxBytes} bytes (got ${detail.sizeBytes}, ${detail.sellerCount} sellers, status ${detail.status})`);
-    this.name = "RegistryTooLargeError";
-    this.status = detail.status;
-    this.sizeBytes = detail.sizeBytes;
-    this.sellerCount = detail.sellerCount;
-    this.maxBytes = detail.maxBytes;
-  }
-}
-
-/**
- * 拉取 `/registry/sellers` 响应。
- * - HTTP 413：抛 `RegistryTooLargeError`（带 `sizeBytes` / `sellerCount` / `maxBytes` 元信息），让 daemon 决定是否回退快照。
- * - 其它非 2xx：抛通用 Error。
- * - 2xx 但缺 `sellers` 数组：抛 Error。
- *
- * @param registryUrl wallet-bootstrap 的 `/registry/sellers` 完整 URL
- * @returns 解析后的注册表文档
- * @throws RegistryTooLargeError / Error
- */
-export async function fetchSellerRegistry(registryUrl: string): Promise<SellerRegistryDocument> {
-  return (await fetchSellerRegistryWithTrust(registryUrl)).registry;
-}
-
-export async function fetchSellerRegistryWithTrust(registryUrl: string): Promise<FetchedSellerRegistry> {
-  const response = await fetch(registryUrl);
-  if (response.status === 413) {
-    // v1.2 §18.9: parse the structured 413 body so the caller can
-    // decide whether to fall back to a stale snapshot.
-    let sizeBytes = 0;
-    let sellerCount = 0;
-    let maxBytes = 0;
-    try {
-      const body = (await response.json()) as { sizeBytes?: number; sellerCount?: number; maxBytes?: number };
-      sizeBytes = body.sizeBytes ?? 0;
-      sellerCount = body.sellerCount ?? 0;
-      maxBytes = body.maxBytes ?? 0;
-    } catch {
-      // Fall through with zeroes; the error message still carries the
-      // status code which is enough for the daemon's stale-cache
-      // branch to fire.
-    }
-    throw new RegistryTooLargeError({ status: response.status, sizeBytes, sellerCount, maxBytes });
-  }
-  if (!response.ok) {
-    throw new Error(`registry returned ${response.status}`);
-  }
-  const text = await response.text();
-  const trust: SellerRegistryTrustMetadata = {
-    registryUrl,
-    registrySha256: crypto.createHash("sha256").update(text).digest("hex"),
-    verified: false
-  };
-  if (shouldVerifyRegistry(registryUrl)) {
-    const signatureUrl = signatureUrlForRegistryUrl(registryUrl);
-    const signatureResponse = await fetch(signatureUrl);
-    if (!signatureResponse.ok) {
-      logger.warn("registry.signature.invalid", "registry signature fetch failed", {
-        registryUrl,
-        signatureUrl,
-        status: signatureResponse.status
-      });
-      throw new Error(`registry signature returned ${signatureResponse.status}`);
-    }
-    const signature = (await signatureResponse.text()).trim();
-    const signingKeyId = verifyTrustedRegistrySignature(text, signature);
-    trust.verified = true;
-    trust.signatureUrl = signatureUrl;
-    trust.signature = signature;
-    trust.signingKeyId = signingKeyId;
-    logger.info("registry.signature.verified", "registry signature verified", {
-      registryUrl,
-      signingKeyId
-    });
-  }
-  const data = JSON.parse(text) as SellerRegistryDocument;
-  if (!data || !Array.isArray(data.sellers)) {
-    throw new Error("registry response missing sellers");
-  }
-  return { registry: data, registryJson: text, trust };
-}
-
-/**
- * 拉取单个 seller 的 `/manifest` 响应。
- *
- * @param seller registry seller
- * @returns 解析后的 manifest
- * @throws Error 非 2xx
- */
-export async function fetchSellerManifest(seller: RegistrySeller): Promise<SellerManifest> {
-  const response = await fetch(`${normalizeSellerUrl(seller)}/manifest`);
-  if (!response.ok) {
-    throw new Error(`manifest returned ${response.status}`);
-  }
-  return await response.json() as SellerManifest;
-}
-
-/**
- * 端到端发现 seller-backed 模型目录：
- * 1. 拉取 `/registry/sellers`。
- * 2. 并发拉取每个 seller 的 `/manifest`（失败转成 `errorMessage` 字段，不阻断整体）。
- * 3. 合并 model 列表、按 `(modelId, sellerId)` 去重。
- * 4. 输出 `SellerCatalogResult`（含聚合的 `models[]` 与 `sellers[]`）。
- *
- * @param registryUrl wallet-bootstrap 注册表 URL
- * @returns 聚合后的目录
- */
-export async function discoverSellerBackedModels(registryUrl: string): Promise<SellerCatalogResult> {
-  const fetched = await fetchSellerRegistryWithTrust(registryUrl);
-  const registry = fetched.registry;
-  const visibleSellers = registry.sellers.filter(isBuyerVisibleRegistrySeller);
-  const sellerResults = await Promise.all(visibleSellers.map(async (seller) => {
-    try {
-      const manifest = await fetchSellerManifest(seller);
-      const protocols = manifestProtocols(manifest, seller);
-      const paymentMethods = manifestPaymentMethods(manifest, seller);
-      const models = manifestModels(manifest).map((model) => ({
-        id: model.id.trim(),
-        sellerId: seller.id,
-        sellerName: seller.name,
-        sellerUrl: seller.url,
-        supportedProtocols: protocols,
-        paymentMethods,
-        inputPriceMicrosPer1m: numericPriceField(model.inputPriceMicrosPer1m) ?? numericPriceField(model.input_price_micros_per_1m),
-        outputPriceMicrosPer1m: numericPriceField(model.outputPriceMicrosPer1m) ?? numericPriceField(model.output_price_micros_per_1m),
-      }));
-      return {
-        seller: {
-          id: seller.id,
-          name: seller.name,
-          url: seller.url,
-          status: "ok",
-          manifestSellerId: manifest.sellerId || manifest.seller_id || seller.id,
-          discountRatio: manifest.selection?.discountRatio ?? manifest.selection?.discount_ratio,
-          serviceFeeRatio: manifest.selection?.serviceFeeRatio ?? manifest.selection?.service_fee_ratio,
-          modelCount: models.length,
-          supportedProtocols: protocols,
-          paymentMethods,
-        },
-        models
-      };
-    } catch (error: unknown) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      logger.warn("models.refresh.seller_failed", "seller manifest refresh failed", {
-        sellerId: seller.id,
-        errorMessage
-      });
-      return {
-        seller: {
-          id: seller.id,
-          name: seller.name,
-          url: seller.url,
-          status: "failed",
-          errorMessage
-        },
-        models: [] as ModelCatalogEntry[]
-      };
-    }
-  }));
-
-  return {
-    registryUrl,
-    version: registry.version,
-    defaultSeller: registry.defaultSeller,
-    registry,
-    registryJson: fetched.registryJson,
-    models: sellerResults.flatMap((entry) => entry.models),
-    sellers: sellerResults.map((entry) => entry.seller),
-    registryTrust: fetched.trust
-  };
-}
-
-/**
- * 按协议过滤 catalog 条目。
- *
- * @param models 目录条目
- * @param protocol 目标协议
- * @returns 仅包含该协议的条目
- */
-export function filterCatalogByProtocol(
-  models: ModelCatalogEntry[],
-  protocol: ProtocolPreference
-): ModelCatalogEntry[] {
-  return models.filter((entry) => entry.supportedProtocols.includes(protocol));
-}
-
-/**
- * 按 seller ID 过滤 catalog 条目。
- * `sellerId` 缺省时返回原列表。
- *
- * @param models 目录条目
- * @param sellerId 目标 seller ID
- * @returns 仅包含该 seller 的条目
- */
-export function filterCatalogBySeller(
-  models: ModelCatalogEntry[],
-  sellerId: string | undefined
-): ModelCatalogEntry[] {
-  if (!sellerId) {
-    return models;
-  }
-  return models.filter((entry) => entry.sellerId === sellerId);
-}
-
-/**
- * 按 `(sellerId, modelId)` 去重 catalog 条目，保留首次出现的顺序。
- *
- * @param models 目录条目
- * @returns 去重后的条目
- */
-export function dedupeCatalogEntries(models: ModelCatalogEntry[]): ModelCatalogEntry[] {
-  const seen = new Set<string>();
-  const output: ModelCatalogEntry[] = [];
-  for (const entry of models) {
-    const key = `${entry.sellerId}:${entry.id}`;
-    if (seen.has(key)) {
-      continue;
-    }
-    seen.add(key);
-    output.push(entry);
-  }
-  return output;
-}

package/src/seller-concurrency-limiter.ts

@@ -1,161 +0,0 @@
-import { createModuleLogger } from "@tokenbuddy/logging";
-
-const logger = createModuleLogger("tb-proxyd:seller-concurrency");
-
-const DEFAULT_MAX_IN_FLIGHT_PER_SELLER = 2;
-const DEFAULT_LEASE_TTL_MS = 185_000;
-
-export interface SellerConcurrencyLimiterOptions {
-  enabled?: boolean;
-  maxInFlightPerSeller?: number;
-  leaseTtlMs?: number;
-}
-
-export interface SellerConcurrencyLease {
-  sellerId: string;
-  activeCount: number;
-  maxInFlight: number;
-  refresh(): void;
-  release(): void;
-}
-
-export interface SellerConcurrencySnapshot {
-  enabled: boolean;
-  maxInFlightPerSeller: number;
-  leaseTtlMs: number;
-  active: Array<{ sellerId: string; activeCount: number }>;
-}
-
-export class SellerConcurrencyLimiter {
-  private readonly enabled: boolean;
-  private readonly maxInFlightPerSeller: number;
-  private readonly leaseTtlMs: number;
-  private readonly active = new Map<string, number>();
-
-  constructor(options: SellerConcurrencyLimiterOptions = {}) {
-    this.enabled = options.enabled === true;
-    this.maxInFlightPerSeller = positiveIntegerOrDefault(
-      options.maxInFlightPerSeller,
-      DEFAULT_MAX_IN_FLIGHT_PER_SELLER
-    );
-    this.leaseTtlMs = positiveIntegerOrDefault(options.leaseTtlMs, DEFAULT_LEASE_TTL_MS);
-  }
-
-  isEnabled(): boolean {
-    return this.enabled;
-  }
-
-  tryAcquire(sellerId: string, context: { requestId?: string; modelId?: string; endpoint?: string } = {}): SellerConcurrencyLease | undefined {
-    if (!this.enabled) {
-      return {
-        sellerId,
-        activeCount: 0,
-        maxInFlight: this.maxInFlightPerSeller,
-        refresh: () => undefined,
-        release: () => undefined
-      };
-    }
-
-    const activeCount = this.active.get(sellerId) ?? 0;
-    if (activeCount >= this.maxInFlightPerSeller) {
-      logger.info("seller_concurrency.local_full", "seller local concurrency limit reached", {
-        sellerId,
-        requestId: context.requestId,
-        model: context.modelId,
-        endpoint: context.endpoint,
-        activeCount,
-        maxInFlight: this.maxInFlightPerSeller
-      });
-      return undefined;
-    }
-
-    const nextCount = activeCount + 1;
-    this.active.set(sellerId, nextCount);
-    logger.info("seller_concurrency.lease_acquired", "seller local concurrency lease acquired", {
-      sellerId,
-      requestId: context.requestId,
-      model: context.modelId,
-      endpoint: context.endpoint,
-      activeCount: nextCount,
-      maxInFlight: this.maxInFlightPerSeller
-    });
-
-    let released = false;
-    let timer: NodeJS.Timeout | undefined;
-    const scheduleExpiry = (): void => {
-      timer = setTimeout(() => {
-        if (released) {
-          return;
-        }
-        logger.warn("seller_concurrency.lease_expired", "seller local concurrency lease expired", {
-          sellerId,
-          requestId: context.requestId,
-          model: context.modelId,
-          endpoint: context.endpoint,
-          leaseTtlMs: this.leaseTtlMs
-        });
-        release();
-      }, this.leaseTtlMs);
-      timer.unref?.();
-    };
-    const refresh = (): void => {
-      if (released) {
-        return;
-      }
-      if (timer) {
-        clearTimeout(timer);
-      }
-      scheduleExpiry();
-    };
-    scheduleExpiry();
-
-    const release = (): void => {
-      if (released) {
-        return;
-      }
-      released = true;
-      if (timer) {
-        clearTimeout(timer);
-        timer = undefined;
-      }
-      const current = this.active.get(sellerId) ?? 0;
-      const remaining = Math.max(0, current - 1);
-      if (remaining === 0) {
-        this.active.delete(sellerId);
-      } else {
-        this.active.set(sellerId, remaining);
-      }
-      logger.info("seller_concurrency.lease_released", "seller local concurrency lease released", {
-        sellerId,
-        requestId: context.requestId,
-        model: context.modelId,
-        endpoint: context.endpoint,
-        activeCount: remaining,
-        maxInFlight: this.maxInFlightPerSeller
-      });
-    };
-
-    return {
-      sellerId,
-      activeCount: nextCount,
-      maxInFlight: this.maxInFlightPerSeller,
-      refresh,
-      release
-    };
-  }
-
-  snapshot(): SellerConcurrencySnapshot {
-    return {
-      enabled: this.enabled,
-      maxInFlightPerSeller: this.maxInFlightPerSeller,
-      leaseTtlMs: this.leaseTtlMs,
-      active: Array.from(this.active.entries())
-        .sort(([a], [b]) => a.localeCompare(b))
-        .map(([sellerId, activeCount]) => ({ sellerId, activeCount }))
-    };
-  }
-}
-
-function positiveIntegerOrDefault(value: number | undefined, fallback: number): number {
-  return Number.isInteger(value) && (value as number) > 0 ? value as number : fallback;
-}