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

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

@@ -4,12 +4,15 @@
  * 共用同一份 set/get，避免双 store 断裂。
  */
 import { create } from 'zustand';
-import { createCoreChatState, getWsUrl, configureHelloContext, configureWsScopeErrorHandler } from '@tbox.cn/app-sdk/client';
+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 type { CoreChatState } from '@tbox.cn/app-sdk/client';
-import { resolveHistoryMessage, buildHistoryToolCalls } from '@tbox.cn/app-sdk/client';
-import type { CardSnapshot, TboxCardPayload } from '@tbox.cn/app-contracts';
-import type { SkillRecord } from '@tbox.cn/app-contracts';
-import type { PreToolRecord } from '@tbox.cn/app-contracts';
+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';
@@ -17,78 +20,23 @@ import { isSessionExpiredError } from '@/utils/session-error';
 import { toast } from '@/utils/toast';
 import { authClient, platformApi } from '@/platform/agent-runtime';
 
-interface HistoryMessageInfo {
-  messageId?: string;
-  query?: string;
-  answer?: string;
-  content?: string;
-  outerBusinessId?: string;
-  createTime?: number;
-  multiModalInputs?: Record<string, unknown>;
-  /** P3 W1：服务端已恢复（migrate + isHistory=true）的卡片快照 */
-  cards?: CardSnapshot[];
-  /** 009 D10：服务端已恢复的 skill 加载记录（inputs.skills） */
-  skills?: SkillRecord[];
-  /** 010：服务端已恢复的前置工具记录（inputs.preTools） */
-  preTools?: PreToolRecord[];
-}
-
-function convertHistoryMessages(messages: HistoryMessageInfo[]): ChatMessage[] {
-  let idSeq = 0;
-  const nextId = (prefix: string) => `${prefix}_${Date.now()}_${idSeq++}`;
-  const result: ChatMessage[] = [];
-  for (const info of messages) {
-    // 009 D10 + 010：skill/preTool 双表达组合（B1 结构化；skill B2 query 解析补齐）
-    // —— 010 下沉 S4：解析与组合规则在 SDK，模板只消费组合入口
-    const resolved = resolveHistoryMessage(info);
-    if (info.query) {
-      const userMsg: ChatMessage = {
-        id: `history-user-${info.messageId}`,
-        role: 'user',
-        content: resolved.content,
-        status: 'done',
-        createdAt: info.createTime || Date.now(),
-        ...(info.outerBusinessId && { requestId: info.outerBusinessId }),
-      };
-      const imageUrls = info.multiModalInputs?.imageUrls as string[] | undefined;
-      if (imageUrls && imageUrls.length > 0) {
-        userMsg.mediaItems = imageUrls.map((url) => ({
-          id: nextId('history-img'),
-          type: 'image' as const,
-          src: url,
-        }));
-      }
-      result.push(userMsg);
-    }
-    if (info.answer || info.content) {
-      result.push({
-        id: `history-asst-${info.messageId}`,
-        role: 'assistant',
-        content: info.answer || info.content || '',
-        status: 'done',
-        createdAt: info.createTime || Date.now(),
-        ...(info.outerBusinessId && { requestId: info.outerBusinessId }),
-        // 009 D10 + 010：skill/preTool 加载标记挂在 user 消息后的 assistant 消息（ToolCallBlock 渲染）
-        ...(resolved.skills.length > 0 || resolved.preTools.length > 0
-          ? {
-              toolCalls: buildHistoryToolCalls(
-                resolved,
-                info.messageId ?? nextId('history-skill'),
-              ),
-            }
-          : {}),
-      });
-    }
-  }
-  return result;
-}
+// ── 历史加载代际标志（模块级）：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',
@@ -115,28 +63,58 @@ export const useChatStore = create<ChatState>((set, get) => ({
       let conversationId: string | null = null;
       // 006：create 的 userId 只来自 token 身份（body 废弃）；匿名（无 token）不可建会话 → 直接走 no-conv 分支
       if (!authClient.getAuthState()?.token) {
-        console.warn('[CONVERSATION] anonymous: skip create conversation (no-conv)');
+        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 {
-            // retry
+          } catch (e) {
+            conversationLogger.warn(`createConversation 失败（重试 ${i + 1}/2）：err=${(e as Error).message}`);
           }
         }
       }
       if (conversationId) set({ conversationId });
       get().init();
     } catch (err) {
-      console.error('[CONVERSATION] init error:', 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;
@@ -154,22 +132,16 @@ export const useChatStore = create<ChatState>((set, get) => ({
           : { userId: get().userId }),
         ...(earliestRequestId ? { beforeId: earliestRequestId } : {}),
       });
+      // stale 响应（newConversation 已重置态）：整段丢弃——含 isLoadingHistory 复位也不落
+      if (epoch !== historyEpoch) return;
       if (status === 200 && data) {
-        const rawList: HistoryMessageInfo[] = (data.data as HistoryMessageInfo[]) || [];
+        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),
         );
-        const newMessages = convertHistoryMessages(filtered.reverse());
-        // P3 W1：历史卡片按 messageId 挂载到 assistant 气泡（isHistory 已由服务端标记）
-        const cardsByMessageId: Record<string, TboxCardPayload[]> = {};
-        for (const info of filtered) {
-          if (!info.messageId || !info.cards || info.cards.length === 0) continue;
-          cardsByMessageId[`history-asst-${info.messageId}`] = info.cards.map((s) => ({
-            ...s,
-            isHistory: true,
-          }));
-        }
+        // SDK 单真源：消息对 + 历史卡片桶同 key 派生（平台 id 字段归一；isHistory 已由服务端标记）
+        const { messages: newMessages, cardsByMessageId } = convertHistoryMessages(filtered.reverse());
         set((s) => ({
           historyMessages: [...newMessages, ...s.historyMessages],
           historyHasMore: rawList.length >= pageSize,
@@ -180,7 +152,8 @@ export const useChatStore = create<ChatState>((set, get) => ({
         set({ isLoadingHistory: false });
       }
     } catch (err) {
-      console.error('[HISTORY] load more error:', err);
+      historyLogger.error('load more error:', err);
+      if (epoch !== historyEpoch) return; // stale：newConversation 已重置 isLoadingHistory
       set({ isLoadingHistory: false });
     }
   },
@@ -190,7 +163,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
     const oldFeedbackState = oldMsg?.feedbackState ?? 'none';
     const feedbackRequestId = oldMsg?.requestId;
     if (!feedbackRequestId) {
-      console.warn('[FEEDBACK] no requestId for message', messageId);
+      feedbackLogger.warn('no requestId for message', messageId);
       return;
     }
     const newFeedbackState = type === 'cancel' ? 'none' : type;
@@ -210,7 +183,7 @@ export const useChatStore = create<ChatState>((set, get) => ({
             return;
           }
         } catch (retryErr) {
-          console.error('[FEEDBACK] retry failed:', retryErr);
+          feedbackLogger.error('retry failed:', retryErr);
         }
       }
       get().updateMessage(messageId, { feedbackState: oldFeedbackState });
@@ -226,7 +199,4 @@ configureHelloContext(() => {
   return { mall: { mallId, ...(miniAppId ? { miniAppId } : {}) } };
 });
 
-// 011 评审 7.2：4002 scope 拒绝 → 停止重连 + 轻提示（L4「切 mall = 新会话 + 轻提示」UI 端接线）
-configureWsScopeErrorHandler((message) => {
-  toast(message);
-});
+// 4002 scope 拒绝 / 4001 鉴权耗尽的终态提示与禁用由 SDK 统一出站（chat-store configureWsFatalCloseHandler）

package/apps/client/vite.config.ts

@@ -1,11 +1,12 @@
-import { defineConfig } from 'vite';
+import { defineConfig, type Plugin } from 'vite';
 import react from '@vitejs/plugin-react';
 import pxToRem from 'postcss-pxtorem';
+import { existsSync } from 'node:fs';
 import { resolve } from 'node:path';
-// 平台微调配套 babel plugin：给每个 JSX 注入 data-code-inspect-* 源码位置属性，
-// 供 inspector runtime(/__vs_inspector__.js) 点选元素→定位源码。仅 dev 启用（见下）。
-// @ts-expect-error 平台 babel plugin（CJS、无类型声明），运行时由 esbuild 解析。
-import codeInspectPlugin from './babel-plugins/code-inspect.cjs';
+import { pathToFileURL } from 'node:url';
+// 平台微调配套 babel plugin（随 @tbox.cn/app-sdk 分发）：给每个 JSX 注入 data-code-inspect-*
+// 源码位置属性，供 inspector runtime(/__vs_inspector__.js) 点选元素→定位源码。仅 dev 启用（见下）。
+import codeInspectPlugin from '@tbox.cn/app-sdk/platform/code-inspect';
 
 const pxToRemPlugin = pxToRem({
   rootValue: 100,
@@ -14,27 +15,46 @@ const pxToRemPlugin = pxToRem({
   selectorBlackList: ['.no-rem'],
   minPixelValue: 1,
   mediaQuery: false,
-  exclude: /node_modules/,
+  // 0.3.2/0.2.4 D3：排除 node_modules 内三方样式，但放行 pnpm 布局下的 @tbox.cn 模块 CSS。
+  // pxtorem 6.1.0 regex 语义为全路径任意 match（源码 index.js:131-140）；五形态推演：
+  //   1) pnpm 装 @tbox.cn 模块（.pnpm/@tbox.cn+x/node_modules/@tbox.cn/x/...）→ 转换 ✓
+  //   2) pnpm 装三方（antd-mobile 等）→ 排除 ✓
+  //   3) npm flat 装 @tbox.cn（node_modules/@tbox.cn/x）→ 转换 ✓
+  //   4) npm flat 装三方 → 排除 ✓
+  //   5) dev 软链（Vite 解析真实路径，无 node_modules 前缀）→ 转换 ✓
+  exclude: /node_modules\/(?!\.pnpm|@tbox\.cn)/,
 });
 
-export default defineConfig(({ command }) => ({
-  plugins: [
-    react({
-      babel: { plugins: command === 'serve' ? [codeInspectPlugin] : [] },
-    }),
-  ],
-  resolve: {
-    alias: {
-      '@': resolve(__dirname, 'src'),
-      fs: resolve(__dirname, 'src/shims/node-stub.ts'),
-      path: resolve(__dirname, 'src/shims/node-stub.ts'),
+export default defineConfig(async ({ command }) => {
+  // tbox-app dev 探测行（dev 探针常量；构件区在位时启用原地装配改指，缺席零行为变化。
+  // guard 断言本标记在场——重定位需同步 cli 探针与 guard 两处）
+  // __dirname 基准 = apps/client：构件区在模板根（上一级×2）
+  const devOverridePath = resolve(__dirname, '../../.tbox-dev.local/vite-override.mjs');
+  const devPlugins: Plugin[] = [];
+  if (existsSync(devOverridePath)) {
+    const { default: tboxDevOverride } = await import(pathToFileURL(devOverridePath).href);
+    devPlugins.push(tboxDevOverride());
+  }
+  return {
+    plugins: [
+      react({
+        babel: { plugins: command === 'serve' ? [codeInspectPlugin] : [] },
+      }),
+      ...devPlugins,
+    ],
+    resolve: {
+      alias: {
+        '@': resolve(__dirname, 'src'),
+        fs: resolve(__dirname, 'src/shims/node-stub.ts'),
+        path: resolve(__dirname, 'src/shims/node-stub.ts'),
+      },
     },
-  },
-  css: {
-    postcss: { plugins: [pxToRemPlugin] },
-  },
-  build: {
-    rollupOptions: { input: { index: resolve(__dirname, 'index.html') } },
-  },
-  // middlewareMode 下不需要 server 配置（由 server 端 vite middleware 托管）
-}));
+    css: {
+      postcss: { plugins: [pxToRemPlugin] },
+    },
+    build: {
+      rollupOptions: { input: { index: resolve(__dirname, 'index.html') } },
+    },
+    // middlewareMode 下不需要 server 配置（由 server 端 vite middleware 托管）
+  };
+});

package/apps/server/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "tsx watch --exclude ../../apps/client src/index.ts",
+    "dev": "tsx watch --exclude ../../apps/client src/dev.ts",
     "build": "tsup",
     "start": "node dist/index.js",
     "test": "vitest run",
@@ -12,30 +12,24 @@
   },
   "dependencies": {
     "@app/module-weather": "workspace:*",
-    "@ag-ui/core": "catalog:",
     "@tbox.cn/agent-plugin": "catalog:",
     "@tbox.cn/app-sdk": "catalog:",
     "@tbox.cn/app-contracts": "catalog:",
-    "@tbox.cn/app-contracts-mall": "catalog:",
+    "@app/contracts-mall": "workspace:*",
     "@tbox-dev-js/sdk": "catalog:",
-    "ai": "catalog:",
     "cors": "catalog:",
     "express": "catalog:",
-    "ws": "catalog:",
-    "zod": "catalog:"
-  },
-  "peerDependencies": {
-    "vite": "catalog:"
+    "zod": "catalog:",
+    "@app/provider-custom": "workspace:*"
   },
   "devDependencies": {
     "@types/cors": "catalog:",
     "@types/express": "catalog:",
     "@types/node": "catalog:",
-    "@types/ws": "catalog:",
     "tsx": "catalog:",
     "tsup": "catalog:",
     "typescript": "catalog:",
     "vite": "catalog:",
     "vitest": "catalog:"
   }
-}
+}