nolo-cli 0.1.29 → 0.1.31

package/database/server/testAuthorityStore.ts

@@ -0,0 +1,76 @@
+import type {
+  AuthorityBatchOperation,
+  AuthorityStore,
+} from "./authorityStoreTypes";
+
+type BatchWriterLike = {
+  put(key: string, value: unknown): void;
+  del(key: string): void;
+  write(): Promise<void>;
+};
+
+type LevelLikeForTests = {
+  readonly location?: string;
+  readonly status?: string;
+  open?(): Promise<void>;
+  close?(): Promise<void>;
+  get<T = any>(key: string): Promise<T>;
+  put(key: string, value: unknown): Promise<void>;
+  del(key: string): Promise<void>;
+  batch(ops: AuthorityBatchOperation[]): Promise<void>;
+  batch(): BatchWriterLike;
+  iterator(
+    options?: {
+      gte?: string;
+      lte?: string;
+      lt?: string;
+      reverse?: boolean;
+    }
+  ): AsyncIterableIterator<[string, unknown]>;
+};
+
+export function createTestAuthorityStore(levelDb: LevelLikeForTests): AuthorityStore {
+  return {
+    get location() {
+      return levelDb.location;
+    },
+    get status() {
+      return levelDb.status;
+    },
+    async open() {
+      await levelDb.open?.();
+    },
+    async close() {
+      await levelDb.close?.();
+    },
+    async get<T = any>(key: string) {
+      return levelDb.get<T>(key);
+    },
+    async put(key: string, value: unknown) {
+      await levelDb.put(key, value);
+    },
+    async del(key: string) {
+      await levelDb.del(key);
+    },
+    async batchWrite(ops: AuthorityBatchOperation[]) {
+      await levelDb.batch(ops);
+    },
+    createBatch() {
+      const batch = levelDb.batch();
+      return {
+        put(key: string, value: unknown) {
+          batch.put(key, value);
+        },
+        del(key: string) {
+          batch.del(key);
+        },
+        async write() {
+          await batch.write();
+        },
+      };
+    },
+    iterator(options = {}) {
+      return levelDb.iterator(options);
+    },
+  };
+}

package/database/server/write.ts

@@ -2,10 +2,10 @@
 
 import { logger } from "../../auth/server/shared";
 import { DataType } from "../../create/types";
-import serverDb, { ensureServerDbOpen } from "./db";
-import { handleToken, handleCybot } from "./dataHandlers";
-import { handleTransaction } from "./handleTransaction";
-import { handleToken as handleAuthToken } from "../../auth/server/token";
+import { getServerAuthorityStore } from "./db";
+import { handleToken, handleCybot } from "./dataHandlers";
+import { handleTransaction } from "./handleTransaction";
+import { handleToken as handleAuthToken } from "../../auth/server/token";
 import {
   CYBOT_READONLY_MESSAGE,
   isCybotReadOnlyMutation,
@@ -18,10 +18,11 @@ import { normalizeRecordIdentityForWrite } from "./recordIdentity";
 import {
   bootstrapReplicatedTable,
   findActiveLiveShareByTable,
-  patchShareMeta,
-  reconcileReplicaTable,
-  replicateSharedTableMutation,
-} from "../../share/server/tableReplication";
+  patchShareMeta,
+  reconcileReplicaTable,
+  replicateSharedTableMutation,
+} from "../../share/server/tableReplication";
+import { ensureDbOpen } from "./ensureDbOpen";
 
 const getRequestOrigin = (req: any): string => {
   try {
@@ -137,9 +138,10 @@ const bootstrapLiveShareFromWrite = async (
   });
 };
 
-export const handleWrite = async (req: any, res: any) => {
-  // 1. 鉴权：从 token 中还原用户
-  req.user = await handleAuthToken(req, res);
+export const handleWrite = async (req: any, res: any) => {
+  const store = getServerAuthorityStore();
+  // 1. 鉴权：从 token 中还原用户
+  req.user = await handleAuthToken(req, res);
 
   const { user } = req;
   const actionUserId = user?.userId;
@@ -194,13 +196,13 @@ export const handleWrite = async (req: any, res: any) => {
     return res.status(400).json({
       message: "local data is not allowed.",
     });
-  }
-
-  // ⭐ 确保 LevelDB 已打开（后面要 get/put）
-  await ensureServerDbOpen();
-
-  // 校验当前操作用户是否存在
-  const userExist = await serverDb.get(`user:${actionUserId}`);
+  }
+
+  // ⭐ 确保 LevelDB 已打开（后面要 get/put）
+  await ensureDbOpen(store);
+
+  // 校验当前操作用户是否存在
+  const userExist = await store.get(`user:${actionUserId}`);
   if (!userExist) {
     logger.warn({
       event: "write_permission_denied",
@@ -312,15 +314,15 @@ export const handleWrite = async (req: any, res: any) => {
               }
             }
 
-            const batch = serverDb.batch();
-            batch.put(customKey, data);
-            for (const ik of indexKeys) {
-              batch.put(ik, customKey);
-            }
-            await batch.write();
-          } else {
-            await serverDb.put(customKey, data);
-          }
+            const batch = store.createBatch();
+            batch.put(customKey, data);
+            for (const ik of indexKeys) {
+              batch.put(ik, customKey);
+            }
+            await batch.write();
+          } else {
+            await store.put(customKey, data);
+          }
 
           if (
             customKey.startsWith("share-") &&

package/dialogReadCommands.ts

@@ -60,7 +60,7 @@ export async function runDialogReadCommand(
     return args[0] ? 0 : 1;
   }
 
-  const authToken = resolveAuthToken(env);
+  const authToken = resolveAuthToken(args, env);
   const fetchImpl = deps.fetchImpl ?? fetch;
   const fallbackFetchImpl = deps.fallbackFetchImpl;
 
@@ -68,6 +68,7 @@ export async function runDialogReadCommand(
     const { base, dialogId, userId, spaceId } = parseDialogInputForCli(parsedArgs.rawInput, env);
     const dialogKey = `dialog-${userId}-${dialogId}`;
     const candidateBases = resolveServerCandidates(
+      args,
       {
         ...env,
         BASE_URL: env.READ_DIALOG_BASE?.trim() || base || env.BASE_URL,

package/dialogStatusCommands.ts

@@ -31,7 +31,7 @@ export async function runDialogStatusCommand(
     return rawInput ? 0 : 1;
   }
 
-  const authToken = resolveAuthToken(env);
+  const authToken = resolveAuthToken(args, env);
   const fetchImpl = deps.fetchImpl ?? fetch;
   const fallbackFetchImpl = deps.fallbackFetchImpl;
 
@@ -39,6 +39,7 @@ export async function runDialogStatusCommand(
     const { base, dialogId, userId } = parseDialogInputForCli(rawInput, env);
     const dialogKey = `dialog-${userId}-${dialogId}`;
     const candidateBases = resolveServerCandidates(
+      args,
       {
         ...env,
         BASE_URL: env.READ_DIALOG_BASE?.trim() || base || env.BASE_URL,

package/integrations/anthropic/anthropicModels.ts

@@ -10,10 +10,10 @@ export const anthropicModels: Model[] = [
     contextWindow: 200000,
     maxOutputTokens: 8192,
     price: {
-      input: 24.0, // $3/MTok * 8
-      output: 120.0, // $15/MTok * 8
-      cachingWrite: 30.0, // $3.75/MTok * 8
-      cachingRead: 2.4, // $0.30/MTok * 8
+      input: 27.0, // $3/MTok * 9
+      output: 135.0, // $15/MTok * 9
+      cachingWrite: 33.75, // $3.75/MTok * 9
+      cachingRead: 2.7, // $0.30/MTok * 9
     },
   },
   {
@@ -24,10 +24,10 @@ export const anthropicModels: Model[] = [
     contextWindow: 200000,
     maxOutputTokens: 8192,
     price: {
-      input: 24.0, // $3/MTok * 8
-      output: 120.0, // $15/MTok * 8
-      cachingWrite: 30.0, // $3.75/MTok * 8
-      cachingRead: 2.4, // $0.30/MTok * 8
+      input: 27.0, // $3/MTok * 9
+      output: 135.0, // $15/MTok * 9
+      cachingWrite: 33.75, // $3.75/MTok * 9
+      cachingRead: 2.7, // $0.30/MTok * 9
     },
   },
   {
@@ -38,10 +38,10 @@ export const anthropicModels: Model[] = [
     contextWindow: 200000,
     maxOutputTokens: 8192,
     price: {
-      input: 6.4, // $0.80/MTok * 8
-      output: 32.0, // $4/MTok * 8
-      cachingWrite: 8.0, // $1/MTok * 8
-      cachingRead: 0.64, // $0.08/MTok * 8
+      input: 7.2, // $0.80/MTok * 9
+      output: 36.0, // $4/MTok * 9
+      cachingWrite: 9.0, // $1/MTok * 9
+      cachingRead: 0.72, // $0.08/MTok * 9
     },
   },
 ];

package/integrations/deepseek/models.ts

@@ -1,67 +1,67 @@
-import { Model } from "../../ai/llm/types";
-
-export const deepSeekModels: Model[] = [
-  {
-    name: "deepseek-v4-flash",
-    displayName: "DeepSeek V4 Flash",
-    hasVision: false,
-    contextWindow: 1_000_000,
-    maxOutputTokens: 384_000,
-    jsonOutput: true,
-    fnCall: true,
-    supportsTool: true,
-    supportsReasoningEffort: true,
-    price: {
-      input: 0.14 * 8,
-      inputCacheHit: 0.0028 * 8,
-      output: 0.28 * 8,
-    },
-  },
-  {
-    name: "deepseek-v4-pro",
-    displayName: "DeepSeek V4 Pro",
-    hasVision: false,
-    contextWindow: 1_000_000,
-    maxOutputTokens: 384_000,
-    jsonOutput: true,
-    fnCall: true,
-    supportsTool: true,
-    supportsReasoningEffort: true,
-    price: {
-      input: 0.435 * 8,
-      inputCacheHit: 0.003625 * 8,
-      output: 0.87 * 8,
-    },
-  },
-  {
-    name: "deepseek-chat",
-    displayName: "DeepSeek Chat (V4 Flash alias)",
-    hasVision: false,
-    contextWindow: 1_000_000,
-    maxOutputTokens: 384_000,
-    jsonOutput: true,
-    fnCall: true,
-    supportsTool: true,
-    price: {
-      input: 0.14 * 8,
-      inputCacheHit: 0.0028 * 8,
-      output: 0.28 * 8,
-    },
-  },
-  {
-    name: "deepseek-reasoner",
-    displayName: "DeepSeek Reasoner (V4 Flash alias)",
-    hasVision: false,
-    contextWindow: 1_000_000,
-    maxOutputTokens: 384_000,
-    jsonOutput: true,
-    fnCall: true,
-    supportsTool: true,
-    supportsReasoningEffort: true,
-    price: {
-      input: 0.14 * 8,
-      inputCacheHit: 0.0028 * 8,
-      output: 0.28 * 8,
-    },
-  },
-];
+import { Model } from "../../ai/llm/types";
+
+export const deepSeekModels: Model[] = [
+  {
+    name: "deepseek-v4-flash",
+    displayName: "DeepSeek V4 Flash",
+    hasVision: false,
+    contextWindow: 1_000_000,
+    maxOutputTokens: 384_000,
+    jsonOutput: true,
+    fnCall: true,
+    supportsTool: true,
+    supportsReasoningEffort: true,
+    price: {
+      input: 0.14 * 8,
+      inputCacheHit: 0.0028 * 8,
+      output: 0.28 * 8,
+    },
+  },
+  {
+    name: "deepseek-v4-pro",
+    displayName: "DeepSeek V4 Pro",
+    hasVision: false,
+    contextWindow: 1_000_000,
+    maxOutputTokens: 384_000,
+    jsonOutput: true,
+    fnCall: true,
+    supportsTool: true,
+    supportsReasoningEffort: true,
+    price: {
+      input: 0.435 * 8,
+      inputCacheHit: 0.003625 * 8,
+      output: 0.87 * 8,
+    },
+  },
+  {
+    name: "deepseek-chat",
+    displayName: "DeepSeek Chat (V4 Flash alias)",
+    hasVision: false,
+    contextWindow: 1_000_000,
+    maxOutputTokens: 384_000,
+    jsonOutput: true,
+    fnCall: true,
+    supportsTool: true,
+    price: {
+      input: 0.14 * 8,
+      inputCacheHit: 0.0028 * 8,
+      output: 0.28 * 8,
+    },
+  },
+  {
+    name: "deepseek-reasoner",
+    displayName: "DeepSeek Reasoner (V4 Flash alias)",
+    hasVision: false,
+    contextWindow: 1_000_000,
+    maxOutputTokens: 384_000,
+    jsonOutput: true,
+    fnCall: true,
+    supportsTool: true,
+    supportsReasoningEffort: true,
+    price: {
+      input: 0.14 * 8,
+      inputCacheHit: 0.0028 * 8,
+      output: 0.28 * 8,
+    },
+  },
+];

package/integrations/google/models.ts

@@ -25,6 +25,8 @@ const createGoogleImageModel = ({
   imageOutputTokenEstimateBySize,
   maxOutputTokens,
   contextWindow,
+  imageGenerationWaitTimeSeconds,
+  imageGenerationProfiles,
 }: {
   name: string;
   displayName: string;
@@ -34,6 +36,8 @@ const createGoogleImageModel = ({
   imageOutputTokenEstimateBySize: NonNullable<Model["imageOutputTokenEstimateBySize"]>;
   maxOutputTokens: number;
   contextWindow: number;
+  imageGenerationWaitTimeSeconds?: Model["imageGenerationWaitTimeSeconds"];
+  imageGenerationProfiles?: Model["imageGenerationProfiles"];
 }): Model => ({
   name,
   displayName,
@@ -54,6 +58,8 @@ const createGoogleImageModel = ({
   imageOutputTokenEstimateBySize,
   maxOutputTokens,
   contextWindow,
+  imageGenerationWaitTimeSeconds,
+  imageGenerationProfiles,
   supportsTool: false,
 });
 
@@ -70,10 +76,10 @@ export const googleModels: Model[] = [
     supportsTool: true,
     supportsReasoningEffort: true,
     price: {
-      input: 1.25 * 8,
-      output: 10 * 8,
-      cachingWrite: 0.2 * 8,
-      cachingRead: 0.2 * 8,
+      input: 1.25 * 7,
+      output: 10 * 7,
+      cachingWrite: 0.2 * 7,
+      cachingRead: 0.2 * 7,
     },
     pricingStrategy: {
       type: "tiered_context",
@@ -81,10 +87,10 @@ export const googleModels: Model[] = [
         {
           minContext: 200001,
           price: {
-            input: 2.5 * 8,
-            output: 15 * 8,
-            cachingWrite: 0.25 * 8,
-            cachingRead: 0.25 * 8,
+            input: 2.5 * 7,
+            output: 15 * 7,
+            cachingWrite: 0.25 * 7,
+            cachingRead: 0.25 * 7,
           },
         },
       ],
@@ -102,10 +108,10 @@ export const googleModels: Model[] = [
     supportsTool: true,
     supportsReasoningEffort: true,
     price: {
-      input: 0.3 * 8,
-      output: 2.5 * 8,
-      cachingWrite: 0.2 * 8,
-      cachingRead: 0.2 * 8,
+      input: 0.3 * 7,
+      output: 2.5 * 7,
+      cachingWrite: 0.2 * 7,
+      cachingRead: 0.2 * 7,
     },
   },
   {
@@ -120,10 +126,10 @@ export const googleModels: Model[] = [
     maxOutputTokens: 4096,
     supportsTool: true,
     price: {
-      input: 0.1 * 8,
-      output: 0.4 * 8,
-      cachingWrite: 0.2 * 8,
-      cachingRead: 0.2 * 8,
+      input: 0.1 * 7,
+      output: 0.4 * 7,
+      cachingWrite: 0.2 * 7,
+      cachingRead: 0.2 * 7,
     },
   },
   {
@@ -139,10 +145,10 @@ export const googleModels: Model[] = [
     supportsTool: true,
     supportsReasoningEffort: true,
     price: {
-      input: 1.5 * 8,
-      output: 9 * 8,
-      cachingWrite: 0.15 * 8,
-      cachingRead: 0.15 * 8,
+      input: 1.5 * 7,
+      output: 9 * 7,
+      cachingWrite: 0.15 * 7,
+      cachingRead: 0.15 * 7,
     },
     serviceTierPriceMultipliers: {
       batch: { inputOutput: 0.5, cache: 0.5 },
@@ -159,10 +165,10 @@ export const googleModels: Model[] = [
     maxOutputTokens: 65500,
     supportsTool: true,
     price: {
-      input: 0.25 * 8,
-      output: 1.5 * 8,
-      cachingWrite: 0.025 * 8,
-      cachingRead: 0.025 * 8,
+      input: 0.25 * 7,
+      output: 1.5 * 7,
+      cachingWrite: 0.025 * 7,
+      cachingRead: 0.025 * 7,
     },
     serviceTierPriceMultipliers: {
       batch: { inputOutput: 0.5, cache: 0.5 },
@@ -180,10 +186,10 @@ export const googleModels: Model[] = [
     supportsTool: true,
     supportsReasoningEffort: true,
     price: {
-      input: 0.5 * 8,
-      output: 3 * 8,
-      cachingWrite: 0.05 * 8,
-      cachingRead: 0.05 * 8,
+      input: 0.5 * 7,
+      output: 3 * 7,
+      cachingWrite: 0.05 * 7,
+      cachingRead: 0.05 * 7,
     },
     serviceTierPriceMultipliers: {
       priority: { inputOutput: 1.8, cache: 1.8 },
@@ -202,10 +208,10 @@ export const googleModels: Model[] = [
     supportsTool: true,
     supportsReasoningEffort: true,
     price: {
-      input: 2 * 8,
-      output: 12 * 8,
-      cachingWrite: 0.2 * 8,
-      cachingRead: 0.2 * 8,
+      input: 2 * 7,
+      output: 12 * 7,
+      cachingWrite: 0.2 * 7,
+      cachingRead: 0.2 * 7,
     },
     pricingStrategy: {
       type: "tiered_context",
@@ -213,10 +219,10 @@ export const googleModels: Model[] = [
         {
           minContext: 200001,
           price: {
-            input: 4 * 8,
-            output: 18 * 8,
-            cachingWrite: 0.4 * 8,
-            cachingRead: 0.4 * 8,
+            input: 4 * 7,
+            output: 18 * 7,
+            cachingWrite: 0.4 * 7,
+            cachingRead: 0.4 * 7,
           },
         },
       ],
@@ -232,10 +238,10 @@ export const googleModels: Model[] = [
     supportsTool: true,
     supportsReasoningEffort: true,
     price: {
-      input: 2 * 8,
-      output: 12 * 8,
-      cachingRead: 0.2 * 8,
-      cachingWrite: 0.2 * 8,
+      input: 2 * 7,
+      output: 12 * 7,
+      cachingRead: 0.2 * 7,
+      cachingWrite: 0.2 * 7,
     },
     serviceTierPriceMultipliers: {
       priority: { inputOutput: 1.8, cache: 1.8 },
@@ -246,10 +252,10 @@ export const googleModels: Model[] = [
         {
           minContext: 200001,
           price: {
-            input: 4 * 8,
-            output: 18 * 8,
-            cachingRead: 0.4 * 8,
-            cachingWrite: 0.4 * 8,
+            input: 4 * 7,
+            output: 18 * 7,
+            cachingRead: 0.4 * 7,
+            cachingWrite: 0.4 * 7,
           },
         },
       ],
@@ -258,9 +264,9 @@ export const googleModels: Model[] = [
   createGoogleImageModel({
     name: "gemini-3-pro-image-preview",
     displayName: "Nano Banana Pro (Gemini 3 Pro Image Preview)",
-    inputPrice: 2 * 8,
-    outputPrice: 12 * 8,
-    imageTokenPricePerMillion: 120 * 8,
+    inputPrice: 2 * 7,
+    outputPrice: 12 * 7,
+    imageTokenPricePerMillion: 120 * 7,
     imageOutputTokenEstimateBySize: {
       "1K": 1120,
       "2K": 1120,
@@ -268,13 +274,37 @@ export const googleModels: Model[] = [
     },
     maxOutputTokens: 8192,
     contextWindow: 65536,
+    imageGenerationWaitTimeSeconds: {
+      min: 25,
+      max: 60,
+    },
+    imageGenerationProfiles: [
+      {
+        key: "speed",
+        label: "速度优先",
+        imageModel: "gemini-3.1-flash-image-preview",
+        waitTimeSeconds: {
+          min: 10,
+          max: 25,
+        },
+      },
+      {
+        key: "quality",
+        label: "质量优先",
+        imageModel: "gemini-3-pro-image-preview",
+        waitTimeSeconds: {
+          min: 25,
+          max: 60,
+        },
+      },
+    ],
   }),
   createGoogleImageModel({
     name: "gemini-3.1-flash-image-preview",
     displayName: "Nano Banana 2 (Gemini 3.1 Flash Image Preview)",
-    inputPrice: 0.5 * 8,
-    outputPrice: 3 * 8,
-    imageTokenPricePerMillion: 60 * 8,
+    inputPrice: 0.5 * 7,
+    outputPrice: 3 * 7,
+    imageTokenPricePerMillion: 60 * 7,
     imageOutputTokenEstimateBySize: {
       "1K": 1120,
       "2K": 1680,
@@ -282,17 +312,45 @@ export const googleModels: Model[] = [
     },
     maxOutputTokens: 65536,
     contextWindow: 65536,
+    imageGenerationWaitTimeSeconds: {
+      min: 10,
+      max: 25,
+    },
+    imageGenerationProfiles: [
+      {
+        key: "speed",
+        label: "速度优先",
+        imageModel: "gemini-3.1-flash-image-preview",
+        waitTimeSeconds: {
+          min: 10,
+          max: 25,
+        },
+      },
+      {
+        key: "quality",
+        label: "质量优先",
+        imageModel: "gemini-3-pro-image-preview",
+        waitTimeSeconds: {
+          min: 25,
+          max: 60,
+        },
+      },
+    ],
   }),
   createGoogleImageModel({
     name: "gemini-2.5-flash-image",
     displayName: "Gemini 2.5 Flash Image (Nano Banana)",
-    inputPrice: 0.3 * 8,
-    outputPrice: 2.5 * 8,
-    imageTokenPricePerMillion: 30 * 8,
+    inputPrice: 0.3 * 7,
+    outputPrice: 2.5 * 7,
+    imageTokenPricePerMillion: 30 * 7,
     imageOutputTokenEstimateBySize: {
       "1K": 1290,
     },
     maxOutputTokens: 4096,
     contextWindow: 32768,
+    imageGenerationWaitTimeSeconds: {
+      min: 8,
+      max: 20,
+    },
   }),
 ];