@tbox.cn/app-template-agent 0.7.5 → 0.9.0

package/apps/client/src/store/chat.ts

@@ -1,202 +1,64 @@
 /**
- * 对话状态（Zustand）。
- * 使用 createCoreChatState 在同一个 create() 中合并核心状态与业务方法，
- * 共用同一份 set/get，避免双 store 断裂。
+ * 对话状态（Zustand）薄壳（单一模板统一化 W2-5）：
+ * 会话泳道/历史分页/凭证升级调度全部下沉 SDK createCoreChatState——
+ * 本壳只做域参数注入（HELLO context 采集）+ 排水订阅装配（应用侧一行）。
  */
 import { create } from 'zustand';
-import { createLogger } from '@tbox.cn/app-sdk/client';
-
-const conversationLogger = createLogger('CONVERSATION');
-const historyLogger = createLogger('HISTORY');
-const feedbackLogger = createLogger('FEEDBACK');
-import { createCoreChatState, getWsUrl, configureHelloContext } from '@tbox.cn/app-sdk/client';
+import {
+  createCoreChatState,
+  getWsUrl,
+  getLocation,
+  configureHelloContext,
+  subscribeSessionUpgradeDrain,
+} from '@tbox.cn/app-sdk/client';
 import type { CoreChatState } from '@tbox.cn/app-sdk/client';
-import { convertHistoryMessages } from '@tbox.cn/app-sdk/client';
-import type { PlatformHistoryMessage } from '@tbox.cn/app-sdk/client';
-import type { ChatMessage } from '@/types/chat';
-import type { IFeedbackAdapter } from '@tbox.cn/app-sdk/client';
-import type { AdapterContextValue } from '@tbox.cn/app-sdk/client';
-import { isSessionExpiredError } from '@/utils/session-error';
-import { toast } from '@/utils/toast';
+import { toast } from '@app/agent-ui-kit';
+import { readMallIdFromUrl, readMiniAppIdFromUrl } from '@app/contracts-mall';
 import { authClient, platformApi } from '@/platform/agent-runtime';
 
-// ── 历史加载代际标志（模块级）：newConversation 递增作废在途 loadMoreHistory（stale 响应整段丢弃）──
-let historyEpoch = 0;
-// ── 新建会话 in-flight 标志（模块级）：双击「新对话」防双建会话 ──
-let newConversationInFlight = false;
-// ── 终态阻断重试 in-flight 标志（模块级）：防并发重试 ──
-let retryBootstrapInFlight: Promise<void> | null = null;
-
-interface ChatState extends CoreChatState {
-  historyMessages: ChatMessage[];
-  historyHasMore: boolean;
-  isLoadingHistory: boolean;
-  initConversation: () => Promise<void>;
-  /** 新建会话：清会话态（连接复用）+ 重置历史态 + create 新会话 */
-  newConversation: () => Promise<void>;
-  loadMoreHistory: () => Promise<void>;
-  /** 终态阻断后重试：清匿名降级缓存 → 拆除连接 → 重走 initConversation（重复点击防抖） */
-  retryBootstrap: () => Promise<void>;
-  submitFeedback: (
-    messageId: string,
-    type: 'like' | 'dislike' | 'cancel',
-    adapter: IFeedbackAdapter,
-    refreshSession?: () => Promise<AdapterContextValue>,
-  ) => Promise<void>;
-}
-
-export const useChatStore = create<ChatState>((set, get) => ({
-  // 核心状态：所有 set/get 闭包绑定到此 store（006：不再创建客户端 sessionId）
+export const useChatStore = create<CoreChatState>()((set, get) => ({
+  // 核心状态：所有 set/get 闭包绑定到此 store（006：不再创建客户端 sessionId）；
+  // 会话泳道 deps（platformApi/authClient）注入 SDK 默认实现
   ...createCoreChatState(
-    { getWsUrl: () => getWsUrl(), toast },
+    {
+      getWsUrl: () => getWsUrl(),
+      toast,
+      platformApi,
+      authClient,
+      // session.credentials-refreshed effect → 升级调度（清缓存冷登 + 幂等重连；守卫在 scheduleSessionUpgrade 内）
+      onSessionCredentialsRefreshed: () => void get().scheduleSessionUpgrade(),
+    },
     set as (partial: any) => void,
     get as () => any,
-  ),  // 业务扩展状态
-  historyMessages: [],
-  historyHasMore: true,
-  isLoadingHistory: false,
-
-  initConversation: async () => {
-    const userId = await authClient.resolveUserId();
-    set({ userId });
-    try {
-      let conversationId: string | null = null;
-      // 006：create 的 userId 只来自 token 身份（body 废弃）；匿名（无 token）不可建会话 → 直接走 no-conv 分支
-      if (!authClient.getAuthState()?.token) {
-        conversationLogger.warn('anonymous: skip create conversation (no-conv)');
-      } else {
-        for (let i = 0; i < 2 && !conversationId; i++) {
-          try {
-            const { status, data } = await platformApi.createConversation();
-            if (status === 200 && data?.conversationId) conversationId = data.conversationId;
-          } catch (e) {
-            conversationLogger.warn(`createConversation 失败（重试 ${i + 1}/2）：err=${(e as Error).message}`);
-          }
-        }
-      }
-      if (conversationId) set({ conversationId });
-      get().init();
-    } catch (err) {
-      conversationLogger.error('init error:', err);
-      get().init();
-    }
-  },
-
-  // 终态阻断（登录失败/scope 拒绝）后重试：清匿名降级缓存（不清则必复败）→ 拆连接 → 重走完整引导
-  retryBootstrap: () => {
-    if (retryBootstrapInFlight) return retryBootstrapInFlight; // 并发重试防抖
-    const task = (async () => {
-      authClient.clearAuth(); // 匿名降级结果被缓存，不清则重试必然复败
-      get().destroy();
-      await get().initConversation();
-    })();
-    const tracked = task.finally(() => {
-      if (retryBootstrapInFlight === tracked) retryBootstrapInFlight = null;
-    });
-    retryBootstrapInFlight = tracked;
-    return tracked;
-  },
-
-  // 新建会话：连接复用（clearChat 不断连——连接/身份是身份域），create 拿新会话键
-  newConversation: async () => {
-    if (newConversationInFlight) return; // 双击防双建会话
-    newConversationInFlight = true;
-    try {
-      historyEpoch++; // 作废在途历史加载（stale 响应整段丢弃，含 isLoadingHistory 复位）
-      get().clearChat(); // SDK：内聚取消运行中 run + 清会话态
-      set({ historyMessages: [], historyHasMore: true, isLoadingHistory: false });
-      await get().initConversation(); // create 新会话；init 对 OPEN 连接幂等早返
-    } finally {
-      newConversationInFlight = false;
-    }
-  },
-
-  loadMoreHistory: async () => {
-    const { isLoadingHistory, historyHasMore, historyMessages } = get();
-    if (isLoadingHistory || !historyHasMore) return;
-    const epoch = historyEpoch; // 快照：newConversation 递增后本响应作废
-    set({ isLoadingHistory: true });
-
-    const pageSize = 5;
-    const earliestRequestId =
-      historyMessages.length > 0
-        ? historyMessages[0].requestId
-        : get().messages.find((m) => m.requestId)?.requestId;
-
-    // 006：有 token 身份时服务端按 token 取归属；无 token（匿名/兼容）保留 query userId
-    try {
-      const { status, data } = await platformApi.listMessages({
-        pageSize,
-        ...(authClient.getAuthState()?.token
-          ? {}
-          : { userId: get().userId }),
-        ...(earliestRequestId ? { beforeId: earliestRequestId } : {}),
-      });
-      // stale 响应（newConversation 已重置态）：整段丢弃——含 isLoadingHistory 复位也不落
-      if (epoch !== historyEpoch) return;
-      if (status === 200 && data) {
-        const rawList: PlatformHistoryMessage[] = (data.data as PlatformHistoryMessage[]) || [];
-        const currentRequestIds = new Set(get().messages.map((m) => m.requestId).filter(Boolean));
-        const filtered = rawList.filter(
-          (item) => !item.outerBusinessId || !currentRequestIds.has(item.outerBusinessId),
-        );
-        // SDK 单真源：消息对 + 历史卡片桶同 key 派生（平台 id 字段归一；isHistory 已由服务端标记）
-        const { messages: newMessages, cardsByMessageId } = convertHistoryMessages(filtered.reverse());
-        set((s) => ({
-          historyMessages: [...newMessages, ...s.historyMessages],
-          historyHasMore: rawList.length >= pageSize,
-          isLoadingHistory: false,
-          cardsByMessageId: { ...s.cardsByMessageId, ...cardsByMessageId },
-        }));
-      } else {
-        set({ isLoadingHistory: false });
-      }
-    } catch (err) {
-      historyLogger.error('load more error:', err);
-      if (epoch !== historyEpoch) return; // stale：newConversation 已重置 isLoadingHistory
-      set({ isLoadingHistory: false });
-    }
-  },
-
-  submitFeedback: async (messageId, type, adapter, refreshSession) => {
-    const oldMsg = get().messages.find((m) => m.id === messageId);
-    const oldFeedbackState = oldMsg?.feedbackState ?? 'none';
-    const feedbackRequestId = oldMsg?.requestId;
-    if (!feedbackRequestId) {
-      feedbackLogger.warn('no requestId for message', messageId);
-      return;
-    }
-    const newFeedbackState = type === 'cancel' ? 'none' : type;
-    get().updateMessage(messageId, { feedbackState: newFeedbackState as 'none' | 'like' | 'dislike' });
-
-    const feedbackMap = { like: 'LIKE' as const, dislike: 'DISLIKE' as const, cancel: 'CANCEL' as const };
-    try {
-      const result = await adapter.addTag(feedbackRequestId, feedbackMap[type]);
-      if (!result.success) get().updateMessage(messageId, { feedbackState: oldFeedbackState });
-    } catch (err) {
-      if (isSessionExpiredError(err) && refreshSession) {
-        try {
-          const newAdapters = await refreshSession();
-          if (newAdapters.feedback) {
-            const retry = await newAdapters.feedback.addTag(feedbackRequestId, feedbackMap[type]);
-            if (!retry.success) get().updateMessage(messageId, { feedbackState: oldFeedbackState });
-            return;
-          }
-        } catch (retryErr) {
-          feedbackLogger.error('retry failed:', retryErr);
-        }
-      }
-      get().updateMessage(messageId, { feedbackState: oldFeedbackState });
-    }
-  },
+  ),
 }));
 
 // 011 L4：HELLO context 采集——mallId 经 URL query 采集（mall 部署；无 mallId 时不携带 context）
+// 停车缴费按用户就近车场查（服务端 #ensureParkingId 用 lbs 反查 cityId→最近车场），
+// 故伴采集实时 lbs（best-effort：H5/无定位权限时静默丢弃，服务端自行降级 plaza）。
+// getter 同步签名，不能现 await getLocation() → 装配期先发起，缓存供 getter 同步读取。
+let cachedLbs: { latitude: string; longitude: string } | undefined;
+void getLocation()
+  .then((loc) => {
+    if (Number.isFinite(loc.latitude) && Number.isFinite(loc.longitude)) {
+      cachedLbs = { latitude: String(loc.latitude), longitude: String(loc.longitude) };
+    }
+  })
+  .catch(() => {
+    // 定位不可用（H5 沙箱/未授权）→ 不带 location，服务端走 plaza 降级
+  });
 configureHelloContext(() => {
-  const mallId = new URLSearchParams(window.location.search).get('mallId');
-  const miniAppId = new URLSearchParams(window.location.search).get('miniAppId');
+  // 读源收敛（CS-8）：mallId ?? plazaId 单一 helper（contracts-mall runtime 唯一真源）
+  const mallId = readMallIdFromUrl();
+  const miniAppId = readMiniAppIdFromUrl();
   if (!mallId) return undefined;
-  return { mall: { mallId, ...(miniAppId ? { miniAppId } : {}) } };
+  return {
+    mall: { mallId, ...(miniAppId ? { miniAppId } : {}) },
+    ...(cachedLbs ? { location: cachedLbs } : {}),
+  };
 });
 
 // 4002 scope 拒绝 / 4001 鉴权耗尽的终态提示与禁用由 SDK 统一出站（chat-store configureWsFatalCloseHandler）
+
+// 凭证升级排水（W2-2 SDK 装配位）：生成中排队的升级在 isGenerating true→false 跃迁时执行
+subscribeSessionUpgradeDrain(useChatStore);

package/apps/client/src/test/setup.ts

@@ -0,0 +1,7 @@
+/**
+ * vitest 全局 setup：React act() 环境声明单一真源。
+ * 此前散落各用例内联声明、多数漏声明（act 告警刷屏 CI 日志）；
+ * 统一收敛后新用例自动继承，无需逐文件记忆。node 环境纯逻辑用例设此全局无副作用。
+ */
+(globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean })
+  .IS_REACT_ACT_ENVIRONMENT = true;

package/apps/client/vite.config.ts

@@ -1,3 +1,4 @@
+/// <reference types="vitest" />
 import { defineConfig, type Plugin } from 'vite';
 import react from '@vitejs/plugin-react';
 import pxToRem from 'postcss-pxtorem';
@@ -31,7 +32,9 @@ export default defineConfig(async ({ command }) => {
   // __dirname 基准 = apps/client：构件区在模板根（上一级×2）
   const devOverridePath = resolve(__dirname, '../../.tbox-dev.local/vite-override.mjs');
   const devPlugins: Plugin[] = [];
-  if (existsSync(devOverridePath)) {
+  // 作用域门：override 仅 dev-serve 生效——build/vitest 不受 dev 会话残留影响
+  // （G2 防线；门与探针标记同文件，guard 另断言门条件在场）
+  if (command === 'serve' && !process.env.VITEST && existsSync(devOverridePath)) {
     const { default: tboxDevOverride } = await import(pathToFileURL(devOverridePath).href);
     devPlugins.push(tboxDevOverride());
   }
@@ -48,6 +51,18 @@ export default defineConfig(async ({ command }) => {
         fs: resolve(__dirname, 'src/shims/node-stub.ts'),
         path: resolve(__dirname, 'src/shims/node-stub.ts'),
       },
+      // dev 域 React 单实例（G1/G2 防线）：双 dev 入口经本文件合并生效（middleware
+      // dev 加载本文件且 command==='serve'）；build 恒不继承——产物位稳定性。
+      ...(command === 'serve' ? { dedupe: ['react', 'react-dom'] } : {}),
+    },
+    // vitest 并入同一 config（vitest 无专属 config 文件时本就加载本文件）：
+    // act() 环境声明统一入口——此前散落各用例内联、多数漏声明 → act 告警刷屏 CI 日志。
+    // environment 保持每文件 @vitest-environment pragma（纯逻辑用例不付 DOM 开销）。
+    test: {
+      setupFiles: ['src/test/setup.ts'],
+      // W3-2：client 测试随域迁 module-mall-home（页级集成测试 = 模块 tests/index.test.tsx）；
+      // 模板仅留薄页装配，零测试文件合法（新增客户端测试时移除本旗标）
+      passWithNoTests: true,
     },
     css: {
       postcss: { plugins: [pxToRemPlugin] },

package/apps/server/package.json

@@ -11,19 +11,16 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@app/module-weather": "workspace:*",
     "@tbox.cn/agent-plugin": "catalog:",
     "@tbox.cn/app-sdk": "catalog:",
     "@tbox.cn/app-contracts": "catalog:",
     "@app/contracts-mall": "workspace:*",
     "@tbox-dev-js/sdk": "catalog:",
-    "cors": "catalog:",
     "express": "catalog:",
     "zod": "catalog:",
     "@app/provider-custom": "workspace:*"
   },
   "devDependencies": {
-    "@types/cors": "catalog:",
     "@types/express": "catalog:",
     "@types/node": "catalog:",
     "tsx": "catalog:",

package/apps/server/src/app-tools.ts

@@ -3,9 +3,10 @@ import { translateTool } from './tools/translate.js';
 import { clockTool } from './tools/clock.js';
 
 /**
- * apps 级演示工具统一注册面（010：双注册面同步）：
+ * apps 级工具统一注册面（010：双注册面同步）：
  * start()（运行时）与 cli/collect-registry.ts（doctor/inspect 视图）两处同调本函数，
  * 未来新增 apps 级工具只改此处，避免两处注册面失同步（R 评审修正）。
+ * W3-1：mall-info（含 preTool/缓存）迁 module-mall-core（模块注册面自持）。
  */
 export function registerAppTools(ctx: ServerContext): void {
   ctx.tools.register(translateTool);