nolo-cli 0.1.30 → 0.1.31

package/server/authenticateToken.ts

@@ -1,7 +1,8 @@
 import { assertSessionTokenVersion } from "../auth/sessionTokenVersion";
 import { parseToken, verifyToken } from "../auth/token";
+import { NOLO_CLUSTER_SERVERS, normalizeKnownServerOrigin } from "../database/config";
 import { DB_PREFIX } from "../database/keys";
-import serverDb from "../database/server/db";
+import { getServerAuthorityStore } from "../database/server/db";
 import type { ApiError } from "./api/types";
 
 const unauthorized = (message: string): ApiError => ({
@@ -31,10 +32,46 @@ const isOutsideTokenWindow = (payload: any): boolean => {
   return false;
 };
 
+const normalizeServerOrigin = (value: string | null | undefined): string | null => {
+  if (typeof value !== "string" || !value.trim()) return null;
+  return normalizeKnownServerOrigin(value);
+};
+
+const resolveAuthFallbackServers = (): string[] => {
+  const current = normalizeServerOrigin(process.env.APP_BASE_URL);
+  return NOLO_CLUSTER_SERVERS.filter((server) => normalizeServerOrigin(server) !== current);
+};
+
+const getAuthTokenStore = () => getServerAuthorityStore();
+
+const readUserFromClusterPeer = async (userId: string, token: string): Promise<any | null> => {
+  const store = getAuthTokenStore();
+  for (const server of resolveAuthFallbackServers()) {
+    try {
+      const res = await fetch(`${server}/api/v1/users/${encodeURIComponent(userId)}`, {
+        method: "GET",
+        headers: { Authorization: `Bearer ${token}` },
+      });
+      if (!res.ok) continue;
+      const data = await res.json().catch(() => null);
+      if (!data || typeof data !== "object") continue;
+      const record = { ...(data as Record<string, unknown>) };
+      delete (record as Record<string, unknown>).id;
+      if (typeof record.publicKey !== "string" || !record.publicKey) continue;
+      await store.put(`${DB_PREFIX.USER}${userId}`, record);
+      return record;
+    } catch {
+      // Try the next peer.
+    }
+  }
+  return null;
+};
+
 export async function authenticateToken(token?: string | null): Promise<{
   userId: string;
   payload: any;
 }> {
+  const store = getAuthTokenStore();
   if (!token) {
     throw unauthorized("Authentication required");
   }
@@ -47,8 +84,16 @@ export async function authenticateToken(token?: string | null): Promise<{
 
   let user: any;
   try {
-    user = await serverDb.get(`${DB_PREFIX.USER}${userId}`);
+    user = await store.get(`${DB_PREFIX.USER}${userId}`);
   } catch {
+    user = null;
+  }
+
+  if (!user) {
+    user = await readUserFromClusterPeer(userId, token);
+  }
+
+  if (!user) {
     throw unauthorized("User not found");
   }
 

package/server/billingLedgerRoutes.ts

@@ -3,6 +3,9 @@ import { handleBillingLedgerWitness } from "./handlers/billingLedgerWitnessHandl
 import { handleBillingUsageReport } from "./handlers/billingUsageReportHandler";
 import { handleCreatorEarningsReport } from "./handlers/creatorEarningsReportHandler";
 import { handleCreatorSettlementReport } from "./handlers/creatorSettlementReportHandler";
+import { handleProviderCallsRecent } from "./handlers/providerCallsRecentHandler";
+import { handleProviderRequestIds } from "./handlers/providerRequestIdsHandler";
+import { handleProviderReconciliationRun } from "./handlers/providerReconciliationRunHandler";
 import { handleRevenueShareReport } from "./handlers/revenueShareReportHandler";
 
 const CORS_HEADERS: Record<string, string> = {
@@ -33,6 +36,18 @@ export const billingLedgerRoutes: Record<string, any> = {
     GET: handleBillingUsageReport,
     OPTIONS: options,
   },
+  "/api/admin/provider-calls/recent": {
+    GET: handleProviderCallsRecent,
+    OPTIONS: options,
+  },
+  "/api/admin/provider-request-ids/recent": {
+    GET: handleProviderRequestIds,
+    OPTIONS: options,
+  },
+  "/api/admin/provider-reconciliation/run": {
+    POST: handleProviderReconciliationRun,
+    OPTIONS: options,
+  },
   "/api/admin/revenue-share/report": {
     GET: handleRevenueShareReport,
     OPTIONS: options,

package/server/buildManifest.ts

@@ -0,0 +1,54 @@
+import { readFileSync } from "node:fs";
+
+import { resolvePublicPath } from "./publicPaths";
+
+export type NoloBuildManifest = {
+  basePath: string | null;
+  timestamp: string | null;
+  buildSha: string | null;
+  buildTime: string | null;
+};
+
+export const EMPTY_BUILD_MANIFEST: NoloBuildManifest = {
+  basePath: null,
+  timestamp: null,
+  buildSha: null,
+  buildTime: null,
+};
+
+const readOptionalString = (value: unknown): string | null =>
+  typeof value === "string" && value.trim().length > 0 ? value : null;
+
+export function parseBuildManifestFromJson(rawValue: string): NoloBuildManifest {
+  try {
+    const parsed = JSON.parse(rawValue);
+    return {
+      basePath: readOptionalString(parsed?.basePath),
+      timestamp: readOptionalString(parsed?.timestamp),
+      buildSha: readOptionalString(parsed?.buildSha),
+      buildTime: readOptionalString(parsed?.buildTime),
+    };
+  } catch {
+    return EMPTY_BUILD_MANIFEST;
+  }
+}
+
+export function readBuildManifestSync(): NoloBuildManifest {
+  try {
+    return parseBuildManifestFromJson(
+      readFileSync(resolvePublicPath("latest-assets.json"), "utf8")
+    );
+  } catch {
+    return EMPTY_BUILD_MANIFEST;
+  }
+}
+
+export async function readBuildManifest(): Promise<NoloBuildManifest> {
+  try {
+    return parseBuildManifestFromJson(
+      await Bun.file(resolvePublicPath("latest-assets.json")).text()
+    );
+  } catch {
+    return EMPTY_BUILD_MANIFEST;
+  }
+}

package/server/coreReadiness.ts

@@ -1,13 +1,18 @@
-import { withServiceHeaders } from "./coreHeaders";
-import { getCoreRuntimeSnapshot } from "./coreRuntime";
-
-export function handleCoreReady(_req: Request) {
-  const snapshot = getCoreRuntimeSnapshot();
-  const body = {
-    ok: snapshot.ready,
-    ready: snapshot.ready,
-    status: snapshot.status,
-  };
+import { withServiceHeaders } from "./coreHeaders";
+import { readBuildManifestSync } from "./buildManifest";
+import { getCoreRuntimeSnapshot } from "./coreRuntime";
+
+export function handleCoreReady(_req: Request) {
+  const snapshot = getCoreRuntimeSnapshot();
+  const buildManifest = readBuildManifestSync();
+  const body = {
+    ok: snapshot.ready,
+    ready: snapshot.ready,
+    status: snapshot.status,
+    role: snapshot.role,
+    buildSha: buildManifest.buildSha,
+    buildTime: buildManifest.buildTime,
+  };
 
   return withServiceHeaders(
     Response.json(body, {
@@ -21,19 +26,23 @@ export function handleCoreReady(_req: Request) {
   );
 }
 
-export function handleCoreMeta(_req: Request) {
-  const snapshot = getCoreRuntimeSnapshot();
-
-  return withServiceHeaders(
-    Response.json({
-      service: "core",
-      status: snapshot.status,
-      ready: snapshot.ready,
-    }),
-    {
-      service: "core",
-      owner: "core-route",
-      routeKind: "core",
-    }
-  );
+export function handleCoreMeta(_req: Request) {
+  const snapshot = getCoreRuntimeSnapshot();
+  const buildManifest = readBuildManifestSync();
+
+  return withServiceHeaders(
+    Response.json({
+      service: "core",
+      status: snapshot.status,
+      ready: snapshot.ready,
+      role: snapshot.role,
+      buildSha: buildManifest.buildSha,
+      buildTime: buildManifest.buildTime,
+    }),
+    {
+      service: "core",
+      owner: "core-route",
+      routeKind: "core",
+    }
+  );
 }

package/server/coreRuntime.ts

@@ -26,22 +26,27 @@ import {
   startCryptoUsdtTronWatcher,
   stopCryptoUsdtTronWatcher,
 } from "./payments/crypto/cryptoUsdtTronWatcher";
-
-type CoreRuntimeStatus = "idle" | "starting" | "ready" | "stopping";
+import { resolveRuntimeRole, shouldRunBackgroundWorkers } from "./runtimeRole";
+
+type CoreRuntimeStatus = "idle" | "starting" | "ready" | "stopping";
 
 let status: CoreRuntimeStatus = "idle";
 let startPromise: Promise<void> | null = null;
 let stopPromise: Promise<void> | null = null;
 
+const getRuntimeRole = () => resolveRuntimeRole(process.env);
+
 const backgroundWorkersDisabled = () =>
-  process.env.NOLO_DISABLE_BACKGROUND_WORKERS === "1";
-
-export function getCoreRuntimeSnapshot() {
-  return {
-    status,
-    ready: status === "ready",
-  };
-}
+  process.env.NOLO_DISABLE_BACKGROUND_WORKERS === "1" ||
+  !shouldRunBackgroundWorkers(getRuntimeRole());
+
+export function getCoreRuntimeSnapshot() {
+  return {
+    status,
+    ready: status === "ready",
+    role: getRuntimeRole(),
+  };
+}
 
 export async function startCoreRuntime() {
   if (startPromise) return startPromise;

package/server/handlers/activityStatsHandler.ts

@@ -4,13 +4,15 @@
 //
 // GET /api/admin/activity-stats?days=30
 
-import serverDb from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
 
 const CORS = {
     "Access-Control-Allow-Origin": "*",
     "Content-Type": "application/json",
 };
 
+const getActivityStatsStore = () => getServerAuthorityStore();
+
 export async function handleActivityStats(req: Request): Promise<Response> {
     if (req.method === "OPTIONS") return new Response(null, { status: 204, headers: CORS });
 
@@ -27,8 +29,9 @@ export async function handleActivityStats(req: Request): Promise<Response> {
     let skipped = 0;
 
     try {
+        const store = getActivityStatsStore();
         // 扫描所有以 "token-" 开头但不是 "token-stats-" 的记录
-        const iter = serverDb.iterator({
+        const iter = store.iterator({
             gte: "token-",
             lte: "token-\uffff",
         });

package/server/handlers/agentEmailRegistrationE2EHandler.ts

@@ -1,7 +1,7 @@
-import { randomInt, randomUUID } from "node:crypto";
-import { authenticateRequest } from "../../auth/utils";
-import serverDb from "../../database/server/db";
-import { getEmailProvider } from "../email/providerRegistry";
+import { randomInt, randomUUID } from "node:crypto";
+import { authenticateRequest } from "../../auth/utils";
+import { getServerAuthorityStore } from "../../database/server/db";
+import { getEmailProvider } from "../email/providerRegistry";
 import { mirrorEmailToControlledInboxes } from "../../database/server/emailRepository";
 import {
   AGENT_EMAIL_REGISTRATION_E2E_PAGE_PATH,
@@ -23,8 +23,10 @@ const HTML_HEADERS = {
   "Content-Type": "text/html; charset=utf-8",
 };
 
-const REGISTRATION_TTL_MS = 15 * 60 * 1000;
-const KEY_PREFIX = "agent-email-registration-e2e-";
+const REGISTRATION_TTL_MS = 15 * 60 * 1000;
+const KEY_PREFIX = "agent-email-registration-e2e-";
+
+const getAgentEmailRegistrationStore = () => getServerAuthorityStore();
 
 type RegistrationRecord = {
   dbKey: string;
@@ -144,12 +146,12 @@ const getAppOrigin = (req: Request) =>
   new URL(req.url).origin;
 
 const loadRegistration = async (registrationId: string): Promise<RegistrationRecord> => {
-  const id = normalizeText(registrationId);
-  if (!id) throw new Error("registrationId is required");
-  try {
-    const record = await serverDb.get(buildDbKey(id));
-    if (!record) throw new Error("registration not found");
-    return record as RegistrationRecord;
+  const id = normalizeText(registrationId);
+  if (!id) throw new Error("registrationId is required");
+  try {
+    const record = await getAgentEmailRegistrationStore().get(buildDbKey(id));
+    if (!record) throw new Error("registration not found");
+    return record as RegistrationRecord;
   } catch (error: any) {
     if (isNotFoundError(error)) {
       throw new Error("registration not found");
@@ -264,10 +266,10 @@ export const handleAgentEmailRegistrationE2EStart = async (req: Request) => {
       code,
       status: "pending",
       createdAt: now.toISOString(),
-      updatedAt: now.toISOString(),
-      expiresAt: expiresAt.toISOString(),
-    };
-    await serverDb.put(dbKey, record);
+      updatedAt: now.toISOString(),
+      expiresAt: expiresAt.toISOString(),
+    };
+    await getAgentEmailRegistrationStore().put(dbKey, record);
 
     const origin = getAppOrigin(req);
     const verifyUrl = `${origin}${AGENT_EMAIL_REGISTRATION_E2E_PAGE_PATH}?registrationId=${encodeURIComponent(registrationId)}`;
@@ -371,13 +373,13 @@ export const handleAgentEmailRegistrationE2EVerify = async (req: Request) => {
     }
 
     const now = new Date().toISOString();
-    const updated: RegistrationRecord = {
-      ...record,
-      status: "verified",
-      verifiedAt: now,
-      updatedAt: now,
-    };
-    await serverDb.put(record.dbKey, updated);
+    const updated: RegistrationRecord = {
+      ...record,
+      status: "verified",
+      verifiedAt: now,
+      updatedAt: now,
+    };
+    await getAgentEmailRegistrationStore().put(record.dbKey, updated);
 
     return json({
       success: true,

package/server/handlers/agentRun/agentLookup.ts

@@ -1,7 +1,6 @@
 import {
   BUILTIN_ECOMMERCE_AGENT_KEY,
   BUILTIN_NOLO_AGENT_KEY,
-  fetchBuiltinPlatformAgentRecord,
   normalizeBuiltinPlatformAgentModelConfig,
   resolveBuiltinAgentConfig,
 } from "./builtinAgents";
@@ -16,7 +15,6 @@ export async function resolveAgentRunAgentConfig(options: {
   agentKey: string;
   getAgentRecord: AgentRecordGetter;
   resolveBuiltinAgentConfig?: typeof resolveBuiltinAgentConfig;
-  fetchBuiltinPlatformAgentRecord?: typeof fetchBuiltinPlatformAgentRecord;
   normalizeBuiltinPlatformAgentModelConfig?: typeof normalizeBuiltinPlatformAgentModelConfig;
 }): Promise<AgentRunAgentLookupResult> {
   const {
@@ -24,8 +22,6 @@ export async function resolveAgentRunAgentConfig(options: {
     getAgentRecord,
     resolveBuiltinAgentConfig: resolveBuiltin =
       resolveBuiltinAgentConfig,
-    fetchBuiltinPlatformAgentRecord: fetchBuiltinPlatform =
-      fetchBuiltinPlatformAgentRecord,
     normalizeBuiltinPlatformAgentModelConfig: normalizeBuiltinPlatform =
       normalizeBuiltinPlatformAgentModelConfig,
   } = options;
@@ -53,9 +49,7 @@ export async function resolveAgentRunAgentConfig(options: {
   }
 
   if (!agentConfig || typeof agentConfig !== "object") {
-    agentConfig =
-      resolveBuiltin(agentKey) ??
-      await fetchBuiltinPlatform(agentKey);
+    agentConfig = resolveBuiltin(agentKey);
     if (!agentConfig || typeof agentConfig !== "object") {
       return {
         ok: false,

package/server/handlers/agentRun/autonomousRuntime.ts

@@ -1,7 +1,7 @@
-import { DataType } from "../../../create/types";
-import type { DialogRuntimeProfile } from "../../../app/types";
-import { createPageServer } from "../../../render/page/server/createPage";
-import serverDb from "../../../database/server/db";
+import { DataType } from "../../../create/types";
+import type { DialogRuntimeProfile } from "../../../app/types";
+import { createPageServer } from "../../../render/page/server/createPage";
+import { getServerAuthorityStore } from "../../../database/server/db";
 
 type RuntimeCheckpointLike = {
   toolCallCount?: number;
@@ -244,12 +244,13 @@ async function ensureAutonomousWorkbenchDocs(args: {
   userId: string;
   spaceId: string;
   agentKey: string;
-}): Promise<AutonomousWorkbenchDoc[]> {
-  const { userId, spaceId, agentKey } = args;
-  const spaceKey = `space-${spaceId}`;
-  const spaceRecord = (await serverDb.get(spaceKey).catch(() => null)) as Record<string, any> | null;
-  const contents = spaceRecord?.contents ?? {};
-  const specs = buildAutonomousWorkbenchSpecs(agentKey);
+}): Promise<AutonomousWorkbenchDoc[]> {
+  const { userId, spaceId, agentKey } = args;
+  const spaceKey = `space-${spaceId}`;
+  const store = getServerAuthorityStore();
+  const spaceRecord = (await store.get(spaceKey).catch(() => null)) as Record<string, any> | null;
+  const contents = spaceRecord?.contents ?? {};
+  const specs = buildAutonomousWorkbenchSpecs(agentKey);
   const docs: AutonomousWorkbenchDoc[] = [];
 
   for (const spec of specs) {

package/server/handlers/agentRun/builtinAgents.ts

@@ -1,4 +1,3 @@
-import { APP_BUILDER_PRESET } from "../../../ai/tools/agent/presets/appBuilderPreset";
 import {
   DEEPINFRA_KIMI_FALLBACK_MODEL,
   FIREWORKS_KIMI_LATEST_MODEL,
@@ -11,9 +10,14 @@ import {
   BUILTIN_APP_BUILDER_AGENT_KEY,
   BUILTIN_ECOMMERCE_AGENT_KEY,
   BUILTIN_NOLO_AGENT_KEY,
+  BUILTIN_NOLO_AGENT_ID,
+  BUILTIN_APP_BUILDER_AGENT_ID,
+  BUILTIN_ECOMMERCE_AGENT_ID,
+  buildBuiltinAppBuilderRecord,
   buildBuiltinAgentCreatorRecord,
+  buildBuiltinEcommerceAgentRecord,
+  buildBuiltinNoloRecord,
 } from "../../../core/builtinAgents";
-import { NOLO_CLUSTER_SERVERS } from "../../../database/config";
 
 export {
   BUILTIN_AGENT_CREATOR_AGENT_KEY,
@@ -23,10 +27,6 @@ export {
   BUILTIN_NOLO_AGENT_KEY,
 } from "../../../core/builtinAgents";
 
-export const BUILTIN_NOLO_AGENT_ID = "01NOLOAPPBLD000000019KCKT0";
-export const BUILTIN_APP_BUILDER_AGENT_ID = "01APPBUILDER00000001YAII3I";
-export const BUILTIN_ECOMMERCE_AGENT_ID = "01ECOMMERCEAG00000001PYQ2J";
-
 const DESKTOP_NOLO_LOCAL_FILE_TOOLS = [
   "codeSearch",
   "checkEnv",
@@ -115,14 +115,6 @@ function buildBaseAgent(overrides: Record<string, unknown>) {
   };
 }
 
-function buildBuiltinAppBuilderAgent() {
-  return buildBaseAgent({
-    ...APP_BUILDER_PRESET,
-    id: BUILTIN_APP_BUILDER_AGENT_ID,
-    tags: ["应用构建", "App Builder", "无代码"],
-  });
-}
-
 export function resolveBuiltinNoloModelConfig() {
   if (process.env.FIREWORKS_API_KEY?.trim()) {
     return {
@@ -148,8 +140,8 @@ export function resolveBuiltinNoloModelConfig() {
     return {
       provider: "openai",
       model: "gpt-5.4-mini",
-      inputPrice: 0.75,
-      outputPrice: 4.5,
+      inputPrice: 0.75 * 8,
+      outputPrice: 4.5 * 8,
     };
   }
   if (process.env.GOOGLE_API_KEY?.trim()) {
@@ -227,12 +219,6 @@ export function normalizeBuiltinPlatformAgentModelConfig(agentConfig: any) {
           runtimeToolPolicy: DESKTOP_NOLO_LOCAL_DEVELOPER_RUNTIME_POLICY,
         }
       : {}),
-    ...(!hasLocalProviderKey && !shouldRunBuiltinNoloInDesktop
-      ? {
-          runtimeServerBase:
-            agentConfig.runtimeServerBase ?? NOLO_CLUSTER_SERVERS[0],
-        }
-      : {}),
   };
 }
 
@@ -251,73 +237,11 @@ function mergeToolNames(existing: string[], additions: string[]) {
   return merged;
 }
 
-export async function fetchBuiltinPlatformAgentRecord(agentKey: string) {
-  const isBuiltinPlatformAgent =
-    agentKey === BUILTIN_NOLO_AGENT_KEY ||
-    agentKey === BUILTIN_APP_BUILDER_AGENT_KEY ||
-    agentKey === BUILTIN_ECOMMERCE_AGENT_KEY;
-
-  if (!isBuiltinPlatformAgent) return null;
-
-  for (const server of NOLO_CLUSTER_SERVERS) {
-    try {
-      const response = await fetch(
-        `${server.replace(/\/+$/, "")}/api/v1/db/read/${encodeURIComponent(agentKey)}`
-      );
-      if (!response.ok) continue;
-      const data = await response.json();
-      if (data && typeof data === "object" && !Array.isArray(data)) {
-        return { ...data, dbKey: (data as any).dbKey ?? agentKey };
-      }
-    } catch {
-      // Try the next public server.
-    }
-  }
-
-  return null;
-}
-
-function buildBuiltinEcommerceAgent() {
-  const modelConfig = resolveBuiltinNoloModelConfig();
-  return buildBaseAgent({
-    id: BUILTIN_ECOMMERCE_AGENT_ID,
-    name: "电商商品参数助手",
-    introduction:
-      "专门获取淘宝、天猫、京东等电商商品真实参数、SKU、价格、库存和店铺信息，并做结构化对比。",
-    greeting: "发给我淘宝、天猫或京东商品链接，我会尽量获取真实商品参数。",
-    provider: modelConfig.provider,
-    model: modelConfig.model,
-    fallbackProvider: modelConfig.fallbackProvider,
-    fallbackModel: modelConfig.fallbackModel,
-    secondFallbackProvider: modelConfig.secondFallbackProvider,
-    secondFallbackModel: modelConfig.secondFallbackModel,
-    useServerProxy: true,
-    inputPrice: modelConfig.inputPrice,
-    outputPrice: modelConfig.outputPrice,
-    hasVision: false,
-    apiSource: "platform",
-    tags: ["电商", "商品参数", "数据抓取"],
-    tools: ["taobaoTmallProductScraper", "jdProductScraper"],
-    prompt: [
-      "你是电商商品参数助手，只负责获取和整理电商商品真实数据。",
-      "当用户给淘宝/天猫链接或商品 ID 时，先提取数字 itemId，再调用 taobaoTmallProductScraper。",
-      "当用户给京东链接或 SKU 时，先提取数字 skuId，再调用 jdProductScraper。",
-      "输出要结构化：商品标题、品牌、型号、店铺、价格、SKU/规格、库存、尺寸重量、质保、数据来源和缺失项。",
-      "用户问参数或详情时，必须展开工具返回的详细参数，不要只摘要基础字段。",
-      "只输出用户请求的数据结果；不要输出寒暄、确认、过渡句或结尾追问。",
-      "如果用户给多个商品，逐个调用对应工具后再做对比表。",
-      "如果工具返回缺失字段，如实说明缺失；不要编造参数，也不要要求用户手抄页面。",
-    ].join("\n"),
-  });
-}
-
 function buildBuiltinAgentCreatorAgent() {
   const modelConfig = resolveBuiltinNoloModelConfig();
-  const hasLocalProviderKey = !!getNoloKey(modelConfig.provider as any)?.trim();
   const baseRecord = buildBuiltinAgentCreatorRecord();
-  const { runtimeServerBase: _runtimeServerBase, ...localRecord } = baseRecord;
   return buildBaseAgent({
-    ...(hasLocalProviderKey ? localRecord : baseRecord),
+    ...baseRecord,
     provider: modelConfig.provider,
     model: modelConfig.model,
     fallbackProvider: modelConfig.fallbackProvider,
@@ -332,13 +256,13 @@ function buildBuiltinAgentCreatorAgent() {
 
 export function resolveBuiltinAgentConfig(agentKey: string) {
   if (agentKey === BUILTIN_NOLO_AGENT_KEY) {
-    return null;
+    return buildBuiltinNoloRecord();
   }
   if (agentKey === BUILTIN_APP_BUILDER_AGENT_KEY) {
-    return buildBuiltinAppBuilderAgent();
+    return buildBuiltinAppBuilderRecord();
   }
   if (agentKey === BUILTIN_ECOMMERCE_AGENT_KEY) {
-    return buildBuiltinEcommerceAgent();
+    return buildBuiltinEcommerceAgentRecord();
   }
   if (agentKey === BUILTIN_AGENT_CREATOR_AGENT_KEY) {
     return buildBuiltinAgentCreatorAgent();

package/server/handlers/agentRun/continueDialogContext.ts

@@ -3,7 +3,7 @@ import type { ChatMessage } from "./types";
 
 type ResolveContinueDialogContextOptions = {
   continueDialogId?: string | null;
-  history: ChatMessage[];
+  requestHistoryFallback: ChatMessage[];
   userId: string | null;
   resolveExistingDialogRef(args: {
     dialogId: string;
@@ -27,7 +27,7 @@ export async function resolveContinueDialogContext(
 ): Promise<ContinueDialogContext> {
   const {
     continueDialogId,
-    history,
+    requestHistoryFallback,
     userId,
     resolveExistingDialogRef,
     fetchConvMsgs,
@@ -36,7 +36,7 @@ export async function resolveContinueDialogContext(
     warn = console.warn,
   } = options;
 
-  let contextHistory: ChatMessage[] = history;
+  let contextHistory: ChatMessage[] = requestHistoryFallback;
   let existingDialogRecord: any = null;
   let existingDialogKey: string | null = null;
   let continueDialogUserId: string | null = userId;
@@ -61,6 +61,12 @@ export async function resolveContinueDialogContext(
   } catch (_) { }
 
   try {
+    if (requestHistoryFallback.length > 0) {
+      log("[agentRun] continue-history-overrides-request-history", {
+        dialogId: continueDialogId,
+        requestHistoryCount: requestHistoryFallback.length,
+      });
+    }
     const prevMsgs = await fetchConvMsgs({ dialogId: continueDialogId, limit: 50 });
     contextHistory = (prevMsgs as any[])
       .reverse()
@@ -79,6 +85,12 @@ export async function resolveContinueDialogContext(
     });
   } catch (error) {
     warn(`[agentRun] continueDialogId=${continueDialogId} load failed:`, error);
+    if (requestHistoryFallback.length > 0) {
+      warn("[agentRun] continue-history-falling-back-to-request-history", {
+        dialogId: continueDialogId,
+        requestHistoryCount: requestHistoryFallback.length,
+      });
+    }
   }
 
   return {

package/server/handlers/agentRun/{inheritedDialogPrompt.ts → conversationReference.ts}

@@ -10,7 +10,7 @@ type FetchConversationMessages = (args: {
   limit: number;
 }) => Promise<unknown[]>;
 
-type BuildInheritedDialogPromptBlockOptions = {
+type BuildConversationReferenceBlockOptions = {
   dialogKey?: string;
   parentDialogId?: string;
   getDialogRecord(dialogKey: string): Promise<DialogRecord | null>;
@@ -46,13 +46,13 @@ const clipDialogReferenceText = (
 const asRecord = (value: unknown): Record<string, unknown> =>
   value && typeof value === "object" ? (value as Record<string, unknown>) : {};
 
-export async function buildInheritedDialogPromptBlock({
+export async function buildConversationReferenceBlock({
   dialogKey: rawDialogKey,
   parentDialogId,
   getDialogRecord,
   fetchConversationMessages,
   estimateTokenCount = defaultEstimateTokenCount,
-}: BuildInheritedDialogPromptBlockOptions): Promise<string | undefined> {
+}: BuildConversationReferenceBlockOptions): Promise<string | undefined> {
   const dialogKey = rawDialogKey?.trim();
   if (!dialogKey?.startsWith("dialog-")) return undefined;