nolo-cli 0.1.30 → 0.1.31

package/ai/token/ratingResult.ts

@@ -0,0 +1,202 @@
+import { findModelConfig } from "../llm/providers";
+import { calculatePrice, type Usage } from "./calculatePrice";
+import {
+  isOpenAIFlexPricedModel,
+  resolveOpenAIServiceTier,
+  type OpenAIServiceTier,
+} from "../../integrations/openai/flexTier";
+import { resolveCommercialMultiplier } from "../policy/commercialMultiplier";
+
+export type RatingResultSnapshot = {
+  provider: string;
+  model: string;
+  serviceTier?: string;
+  providerCurrency: "USD";
+  settlementCurrency: "CREDITS";
+  commercialMultiplier: number;
+  providerUnitPrices: {
+    input: number;
+    output: number;
+    cachingWrite?: number;
+    cachingRead?: number;
+    inputCacheHit?: number;
+  };
+  settlementUnitPrices: {
+    input: number;
+    output: number;
+    cachingWrite?: number;
+    cachingRead?: number;
+    inputCacheHit?: number;
+  };
+  pricingVersion: string;
+  formulaVersion: string;
+  roundingPolicy: "credits_6dp";
+};
+
+export type RatingResult = {
+  id: string;
+  billableEventId: string;
+  provider: string;
+  model: string;
+  platformCredits: number;
+  snapshot: RatingResultSnapshot;
+  createdAt: string;
+};
+
+type CreateRatingResultInput = {
+  ratingId: string;
+  billableEventId: string;
+  provider: string;
+  model: string;
+  serviceTier?: string;
+  usage: Usage;
+  createdAt: string;
+};
+
+export const buildRatingResultKey = (ratingId: string) =>
+  `rating-result-${ratingId}`;
+
+const maybeNumber = (value: unknown) =>
+  typeof value === "number" && Number.isFinite(value) ? value : undefined;
+
+const divideDefined = (value: unknown, divisor: number) => {
+  const numeric = maybeNumber(value);
+  return typeof numeric === "number" ? numeric / divisor : undefined;
+};
+
+const scaleDefined = (value: unknown, multiplier: number) => {
+  const numeric = maybeNumber(value);
+  return typeof numeric === "number" ? numeric * multiplier : undefined;
+};
+
+const compactPrice = <T extends Record<string, number | undefined>>(price: T) =>
+  Object.fromEntries(
+    Object.entries(price).filter(([, value]) => typeof value === "number")
+  ) as { [K in keyof T]: number };
+
+const resolveSettlementUnitPrices = ({
+  provider,
+  model,
+  serviceTier,
+  usage,
+}: {
+  provider: string;
+  model: string;
+  serviceTier?: string;
+  usage: Usage;
+}) => {
+  const modelConfig = findModelConfig(provider, model);
+  if (!modelConfig?.price) {
+    return { input: 0, output: 0 };
+  }
+
+  let input = modelConfig.price.input;
+  let output = modelConfig.price.output;
+  let cachingWrite = modelConfig.price.cachingWrite;
+  let cachingRead = modelConfig.price.cachingRead;
+  let inputCacheHit = modelConfig.price.inputCacheHit;
+
+  const effectiveOpenAIServiceTier = resolveOpenAIServiceTier({
+    providerName: provider,
+    model,
+    requestedServiceTier: serviceTier as OpenAIServiceTier | undefined,
+  });
+  if (
+    provider === "openai" &&
+    effectiveOpenAIServiceTier === "flex" &&
+    !isOpenAIFlexPricedModel(model)
+  ) {
+    input *= 0.5;
+    output *= 0.5;
+    if (typeof cachingWrite === "number") cachingWrite *= 0.5;
+    if (typeof cachingRead === "number") cachingRead *= 0.5;
+    if (typeof inputCacheHit === "number") inputCacheHit *= 0.5;
+  }
+
+  if (modelConfig.pricingStrategy?.type === "tiered_context") {
+    const tiers = [...(modelConfig.pricingStrategy.tiers || [])].sort(
+      (a, b) => a.minContext - b.minContext
+    );
+    for (const tier of tiers) {
+      if ((usage.input_tokens || 0) >= tier.minContext) {
+        input = tier.price.input;
+        output = tier.price.output;
+        cachingWrite = tier.price.cachingWrite;
+        cachingRead = tier.price.cachingRead;
+        inputCacheHit = tier.price.inputCacheHit;
+      }
+    }
+  }
+
+  return compactPrice({
+    input,
+    output,
+    cachingWrite,
+    cachingRead,
+    inputCacheHit,
+  });
+};
+
+export const createRatingResult = (
+  input: CreateRatingResultInput
+): RatingResult => {
+  const price = calculatePrice({
+    provider: input.provider,
+    modelName: input.model,
+    billingServiceTier: input.serviceTier,
+    usage: input.usage,
+  });
+  const commercialMultiplier = resolveCommercialMultiplier(
+    input.provider,
+    input.model
+  );
+  const settlementUnitPrices = resolveSettlementUnitPrices({
+    provider: input.provider,
+    model: input.model,
+    serviceTier: input.serviceTier,
+    usage: input.usage,
+  });
+
+  return {
+    id: input.ratingId,
+    billableEventId: input.billableEventId,
+    provider: input.provider,
+    model: input.model,
+    platformCredits: price.cost,
+    snapshot: {
+      provider: input.provider,
+      model: input.model,
+      serviceTier: input.serviceTier,
+      providerCurrency: "USD",
+      settlementCurrency: "CREDITS",
+      commercialMultiplier,
+      providerUnitPrices: compactPrice({
+        input: settlementUnitPrices.input / commercialMultiplier,
+        output: settlementUnitPrices.output / commercialMultiplier,
+        cachingWrite: divideDefined(
+          settlementUnitPrices.cachingWrite,
+          commercialMultiplier
+        ),
+        cachingRead: divideDefined(
+          settlementUnitPrices.cachingRead,
+          commercialMultiplier
+        ),
+        inputCacheHit: divideDefined(
+          settlementUnitPrices.inputCacheHit,
+          commercialMultiplier
+        ),
+      }),
+      settlementUnitPrices: compactPrice({
+        input: scaleDefined(settlementUnitPrices.input, 1),
+        output: scaleDefined(settlementUnitPrices.output, 1),
+        cachingWrite: scaleDefined(settlementUnitPrices.cachingWrite, 1),
+        cachingRead: scaleDefined(settlementUnitPrices.cachingRead, 1),
+        inputCacheHit: scaleDefined(settlementUnitPrices.inputCacheHit, 1),
+      }),
+      pricingVersion: "model-registry-current",
+      formulaVersion: "token-rating-v1",
+      roundingPolicy: "credits_6dp",
+    },
+    createdAt: input.createdAt,
+  };
+};

package/ai/token/ratingResultWriter.ts

@@ -0,0 +1,33 @@
+import { buildRatingResultKey, type RatingResult } from "./ratingResult";
+
+export type RatingResultStore = {
+  get(key: string): Promise<unknown>;
+  put(key: string, value: unknown): Promise<void>;
+};
+
+const isMissingRecordError = (error: unknown) => {
+  if (!error || typeof error !== "object") return false;
+  const code = (error as { code?: unknown }).code;
+  return code === "LEVEL_NOT_FOUND" || code === "NOT_FOUND";
+};
+
+export async function writeRatingResult({
+  store,
+  rating,
+}: {
+  store: RatingResultStore;
+  rating: RatingResult;
+}): Promise<{ key: string }> {
+  const key = buildRatingResultKey(rating.id);
+  let existing: unknown;
+  try {
+    existing = await store.get(key);
+  } catch (error) {
+    if (!isMissingRecordError(error)) throw error;
+  }
+  if (existing) {
+    throw new Error(`rating result already exists: ${key}`);
+  }
+  await store.put(key, rating);
+  return { key };
+}

package/ai/token/serverDialogProjection.ts

@@ -1,12 +1,13 @@
 import pino from "pino";
 
-import serverDb from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
 import { createKey } from "../../database/keys";
 import { DataType } from "../../create/types";
 import { isLevelNotFoundError } from "../../share/helpers";
 
 const logger = pino({ name: "server-dialog-projection" });
 const dialogProjectionQueue = new Map<string, Promise<void>>();
+const getServerDialogProjectionStore = () => getServerAuthorityStore();
 
 interface ApplyServerDialogProjectionDeltaOpts {
     userId: string;
@@ -19,6 +20,7 @@ interface ApplyServerDialogProjectionDeltaOpts {
 export async function applyServerDialogProjectionDelta(
     opts: ApplyServerDialogProjectionDeltaOpts,
 ): Promise<void> {
+    const store = getServerDialogProjectionStore();
     const {
         userId,
         dialogId,
@@ -35,7 +37,7 @@ export async function applyServerDialogProjectionDelta(
     const nextTask = previousTask.catch(() => undefined).then(async () => {
         let existingDialog: any;
         try {
-            existingDialog = await serverDb.get(dialogKey);
+            existingDialog = await store.get(dialogKey);
         } catch (error) {
             if (isLevelNotFoundError(error)) {
                 logger.warn(
@@ -54,7 +56,7 @@ export async function applyServerDialogProjectionDelta(
             throw error;
         }
 
-        await serverDb.put(dialogKey, {
+        await store.put(dialogKey, {
             ...existingDialog,
             inputTokens: (existingDialog.inputTokens ?? 0) + inputTokensDelta,
             outputTokens: (existingDialog.outputTokens ?? 0) + outputTokensDelta,

package/ai/token/serverTokenWriter.ts

@@ -4,7 +4,7 @@
 
 import { ulid } from "ulid";
 import { format } from "date-fns";
-import serverDb from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
 import { createKey, createTokenKey, createTokenStatsKey } from "../../database/keys";
 import { DataType } from "../../create/types";
 import type { RawUsage } from "./types";
@@ -13,6 +13,7 @@ import { prepareTokenUsageData } from "./prepareTokenUsageData";
 import { applyServerDialogProjectionDelta } from "./serverDialogProjection";
 
 const logger = pino({ name: "server-token-writer" });
+const getServerTokenWriterStore = () => getServerAuthorityStore();
 
 interface WriteTokenOpts {
     userId: string;
@@ -34,6 +35,7 @@ interface WriteTokenOpts {
 }
 
 export async function writeServerTokenRecord(opts: WriteTokenOpts): Promise<{ cost: number; recordKey: string; tokenRecord: any }> {
+    const store = getServerTokenWriterStore();
     const { userId, username = "", agentKey, agentConfig, runId, rawUsage } = opts;
 
     const prepared = prepareTokenUsageData({
@@ -75,6 +77,12 @@ export async function writeServerTokenRecord(opts: WriteTokenOpts): Promise<{ co
         output_tokens: usage.output_tokens,
         cache_creation_input_tokens: usage.cache_creation_input_tokens,
         cache_read_input_tokens: usage.cache_read_input_tokens,
+        ...(usage.provider_response_ids
+            ? { provider_response_ids: usage.provider_response_ids }
+            : {}),
+        ...(usage.provider_request_ids
+            ? { provider_request_ids: usage.provider_request_ids }
+            : {}),
         cost,
         pay,
         createdAt: timestamp,
@@ -86,7 +94,7 @@ export async function writeServerTokenRecord(opts: WriteTokenOpts): Promise<{ co
     const statsKey = createTokenStatsKey(userId, dateKey);
     let stats: any;
     try {
-        stats = await serverDb.get(statsKey);
+        stats = await store.get(statsKey);
     } catch {
         stats = null;
     }
@@ -120,7 +128,7 @@ export async function writeServerTokenRecord(opts: WriteTokenOpts): Promise<{ co
         providers: { ...updatedStats.providers, [providerName]: inc(updatedStats.providers?.[providerName]) },
     };
 
-    await serverDb.batch([
+    await store.batchWrite([
         { type: "put", key: recordKey, value: tokenRecord },
         { type: "put", key: statsKey, value: newStats },
     ]);

package/ai/token/types.ts

@@ -21,6 +21,8 @@ interface BillingUsageMetadata {
   billing_service_tier?: string;
   billing_estimated?: boolean;
   image_generation_count?: number;
+  provider_response_ids?: string[];
+  provider_request_ids?: string[];
 }
 
 // 原始用量类型
@@ -29,6 +31,9 @@ export interface RawUsageType1 extends BillingUsageMetadata {
   input_tokens?: number;
   cache_creation_input_tokens?: number;
   cache_read_input_tokens?: number;
+  input_tokens_details?: {
+    cached_tokens?: number;
+  };
 }
 
 export interface RawUsageType2 extends BillingUsageMetadata {
@@ -37,6 +42,9 @@ export interface RawUsageType2 extends BillingUsageMetadata {
   total_tokens: number;
   prompt_cache_hit_tokens: number;
   prompt_cache_miss_tokens: number;
+  prompt_tokens_details?: {
+    cached_tokens?: number;
+  };
 }
 
 export type RawUsage = RawUsageType1 | RawUsageType2;
@@ -75,6 +83,8 @@ export interface TokenRecord {
   input_tokens: number;
   cost: number;
   image_generation_count?: number;
+  provider_response_ids?: string[];
+  provider_request_ids?: string[];
   pay: any;
   createdAt: number; // UTC timestamp
   type: string;

package/ai/tools/agent/callAgentTool.ts

@@ -10,7 +10,7 @@ import { runAgentBackground } from "../../agent/runAgentBackground";
  *
  * 用于开展一个子对话（sub-dialog），只关心执行结果。支持两种执行模式：
  * - "server"（默认）：通过服务端 agent run 接口后台异步执行，结果写回 DB 并通过 SSE 回传，
- *   适合大多数子任务，也能复用服务端 runtime auto-routing。
+ *   适合大多数子任务，也支持显式指定远端 `serverBase`。
  * - "client"：客户端同步执行，在当前 Redux 上下文中直接调用 runAgent，
  *   适合确认只需本地轻量执行的子任务。
  *
@@ -42,7 +42,7 @@ export const callAgentFunctionSchema = {
                 type: "string",
                 enum: ["client", "server"],
                 description:
-                    "执行模式：'server'（默认）为服务端后台异步执行，能复用 runtime auto-routing；" +
+                    "执行模式：'server'（默认）为服务端后台异步执行，也支持显式指定远端 serverBase；" +
                     "'client' 为客户端同步执行，适合明确只需本地轻量完成的任务。",
                 default: "server",
             },
@@ -50,8 +50,7 @@ export const callAgentFunctionSchema = {
                 type: "string",
                 description:
                     "可选。目标 Agent 所在的 nolo server origin，例如 Windows 机器通过 Cloudflare 暴露的 https://win.example.com。" +
-                    "仅 server 模式使用；跨域目标必须由服务端 AGENT_TOOL_ALLOWED_SERVER_BASES 明确放行。" +
-                    "如果目标 Agent 记录声明了 delegation.serverBase / runtimeServerBase，服务端会在未显式传入时自动路由。",
+                    "仅 server 模式使用；跨域目标必须由服务端 AGENT_TOOL_ALLOWED_SERVER_BASES 明确放行。",
             },
         },
         required: ["agentKey", "task"],

package/ai/tools/agent/presets/appBuilderPreset.ts

@@ -3,11 +3,9 @@
  * 用途：在 AgentForm 中预填充，或通过 createAgent 工具一键创建
  *
  * Maintenance note:
- * - The online App Builder agent record is the runtime source of truth.
- * - Keep this preset as a creation/bootstrap template only.
- * - To make App Builder fully online-truth-only, replace consumers of this
- *   preset with a read/pull of agent-pub-01APPBUILDER00000001YAII3I and leave
- *   only a tiny emergency placeholder here.
+ * - This preset now also backs the built-in runtime fallback record.
+ * - Keep changes here compatible with both guided creation and the built-in
+ *   App Builder entry point.
  */
 import { FIREWORKS_KIMI_LATEST_MODEL } from "../../../llm/kimi";
 
@@ -16,8 +14,8 @@ export const APP_BUILDER_PRESET = {
   introduction: "帮你把想法变成真正可以访问的网站型小应用，无需任何编程知识",
   model: FIREWORKS_KIMI_LATEST_MODEL,
   provider: "fireworks",
-  inputPrice: 7.6,
-  outputPrice: 32,
+  inputPrice: 0.95 * 8,
+  outputPrice: 4 * 8,
   useServerProxy: true,
   greeting:
     `你好！我是 App Builder 🚀

package/ai/tools/agent/runStreamingAgentTool.ts

@@ -32,8 +32,7 @@ export const runStreamingAgentFunctionSchema = {
         type: "string",
         description:
           "可选。目标 Agent 所在的 nolo server origin，例如 Windows 机器通过 Cloudflare 暴露的 https://win.example.com。" +
-          "跨域目标必须由服务端 AGENT_TOOL_ALLOWED_SERVER_BASES 明确放行。" +
-          "如果目标 Agent 记录声明了 delegation.serverBase / runtimeServerBase，服务端会在未显式传入时自动路由。",
+          "跨域目标必须由服务端 AGENT_TOOL_ALLOWED_SERVER_BASES 明确放行。",
       },
     },
     required: ["agentKey", "userInput"],

package/ai/tools/agent/streamParallelAgentsTool.ts

@@ -31,8 +31,7 @@ export const streamParallelAgentsFunctionSchema = {
               type: "string",
               description:
                 "可选：该 Agent 所在的 nolo server origin，例如 Windows 机器通过 Cloudflare 暴露的 https://win.example.com。" +
-                "跨域目标必须由服务端 AGENT_TOOL_ALLOWED_SERVER_BASES 明确放行。" +
-                "如果目标 Agent 记录声明了 delegation.serverBase / runtimeServerBase，服务端会在未显式传入时自动路由。",
+                "跨域目标必须由服务端 AGENT_TOOL_ALLOWED_SERVER_BASES 明确放行。",
             },
           },
           required: ["agentKey"],
@@ -41,7 +40,7 @@ export const streamParallelAgentsFunctionSchema = {
       serverBase: {
         type: "string",
         description:
-          "可选：默认目标 nolo server origin。agents[*].serverBase 会覆盖此值；目标 Agent 记录的 runtime 元数据可在未传值时自动补齐。",
+          "可选：默认目标 nolo server origin。agents[*].serverBase 会覆盖此值；未传时默认使用当前 server。",
       },
       timeoutMs: {
         type: "number",

package/ai/tools/readXPostTool.ts

@@ -170,16 +170,12 @@ async function readWithDefaultBridge(
   >(
     specifier: string,
   ) => Promise<T>;
-  const bridgeModuleUrl = new URL(
-    "../../integrations/x-reader/bridge/readXPostWithBridge.ts",
-    import.meta.url,
-  ).href;
   const { readXPostWithBridge } = await importBridge<{
     readXPostWithBridge: (
       url: string,
       args: { keepOpen?: boolean; profileDir?: string; headless?: boolean },
     ) => Promise<XReadResult<XPost>>;
-  }>(bridgeModuleUrl);
+  }>("../../integrations/x-reader/bridge/readXPostWithBridge.ts");
   return readXPostWithBridge(url, args);
 }
 

package/app/admin/adminPages.ts

@@ -1,9 +1,11 @@
 import { isSystemAdmin, nolotusId, copilotDemoId } from "../../core/init";
+import { hasUsageManagementPermission } from "../../auth/adminPermissions";
 
 export const SYSTEM_ADMIN_USER_IDS = [nolotusId, copilotDemoId];
 
 export const ADMIN_PAGE_PATHS = {
   users: "/life/users",
+  usageManagement: "/life/users/usage",
   email: "/life/users/email",
   providerHealth: "/life/users/provider-health",
   legacyEmail: "/admin/email",
@@ -11,3 +13,10 @@ export const ADMIN_PAGE_PATHS = {
 
 export const canAccessSystemAdminPage = (userId?: string | null) =>
   isSystemAdmin(userId);
+
+export const canAccessUsageManagementPage = (
+  user?: { userId?: string | null; adminPermissions?: unknown } | null
+) => {
+  if (isSystemAdmin(user?.userId)) return true;
+  return hasUsageManagementPermission(user);
+};

package/app/i18n/i18n.config.ts

@@ -8,6 +8,7 @@ import interfaceLocale from "./translations/interface.locale";
 import errorLocale from "./translations/error.locale";
 import seoLocale from "./translations/seo.locale";
 import appBuilderLocale from "./translations/appBuilder.locale";
+import pricingLocale from "./translations/pricing.locale";
 
 export const resources = {
   [Language.EN]: {
@@ -15,6 +16,7 @@ export const resources = {
       ...interfaceLocale[Language.EN].translation,
       ...errorLocale[Language.EN].translation,
       ...appBuilderLocale[Language.EN].translation,
+      ...pricingLocale[Language.EN].translation,
       seo: seoLocale[Language.EN],
     },
     space: spaceLocale[Language.EN].translation,
@@ -26,6 +28,7 @@ export const resources = {
       ...interfaceLocale[Language.ZH_CN].translation,
       ...errorLocale[Language.ZH_CN].translation,
       ...appBuilderLocale[Language.ZH_CN].translation,
+      ...pricingLocale[Language.ZH_CN].translation,
       seo: seoLocale[Language.ZH_CN],
     },
     space: spaceLocale[Language.ZH_CN].translation,
@@ -37,6 +40,7 @@ export const resources = {
       ...interfaceLocale[Language.ZH_HANT].translation,
       ...errorLocale[Language.ZH_HANT].translation,
       ...appBuilderLocale[Language.ZH_HANT].translation,
+      ...pricingLocale[Language.ZH_HANT].translation,
       seo: seoLocale[Language.ZH_HANT],
     },
     space: spaceLocale[Language.ZH_HANT].translation,
@@ -48,6 +52,7 @@ export const resources = {
       ...interfaceLocale[Language.JA].translation,
       ...errorLocale[Language.JA].translation,
       ...appBuilderLocale[Language.JA].translation,
+      ...pricingLocale[Language.JA].translation,
       seo: seoLocale[Language.JA],
     },
     space: spaceLocale[Language.JA].translation,