@steerable/agent-shell-web 0.6.18 → 0.6.20

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@steerable/agent-shell-web",
-  "version": "0.6.18",
+  "version": "0.6.20",
   "type": "module",
-  "description": "Steerable framework — product-neutral renderer SPA source for @steerable/agent-shell (React + Vite). Consumed by product web entry points via the `@/` alias (anchored at this package's src/) and the createProductViteConfig factory. Published as a source package (src/ + vite.base.ts), not a build artifact.",
+  "description": "Steerable framework — product-neutral renderer SPA source for @steerable/agent-shell (React + Vite). Consumed by product web entry points via the `@/` alias (anchored at this package's src/) and the createProductViteConfig factory. Published as a source package (src/), plus the compiled vite.base config factory (vite.base.js + .d.ts) for Node-side config loading.",
   "license": "Apache-2.0",
   "homepage": "https://steerableframework.com/",
   "repository": {
@@ -14,13 +14,19 @@
     "url": "https://github.com/pathlyapp/steerable-framework/issues"
   },
   "exports": {
-    "./vite.base": "./vite.base.ts",
+    "./vite.base": {
+      "types": "./vite.base.d.ts",
+      "default": "./vite.base.js"
+    },
     "./package.json": "./package.json"
   },
   "files": [
     "src",
+    "!src/**/*.test.ts",
+    "!src/**/*.test.tsx",
     "public",
-    "vite.base.ts",
+    "vite.base.js",
+    "vite.base.d.ts",
     "README.md"
   ],
   "publishConfig": {
@@ -39,8 +45,8 @@
     "react-router-dom": "^6.30.0",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.1",
-    "@steerable/agent-protocol": "0.6.18",
-    "@steerable/agent-ui": "0.6.18"
+    "@steerable/agent-ui": "0.6.20",
+    "@steerable/agent-protocol": "0.6.20"
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.3.0",
@@ -53,11 +59,12 @@
     "typescript": "^5.8.3",
     "vite": "^5.4.21",
     "vitest": "^3.2.4",
-    "@steerable/pack-sdk": "0.6.18"
+    "@steerable/pack-sdk": "0.6.20"
   },
   "scripts": {
     "gen": "echo agent-shell-web",
-    "build": "tsc --noEmit",
+    "build": "tsc --noEmit && npm run build:vite-base",
+    "build:vite-base": "tsc vite.base.ts --module esnext --target es2022 --moduleResolution bundler --declaration --skipLibCheck --outDir .",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "lint": "tsc --noEmit",

package/src/lib/chat-transport.ts

@@ -20,8 +20,7 @@
  *   - Standard content tokens:    `data: {"content":"..."}\n\n`
  *   - User message echo:          `data: {"type":"user_message", "message":{...}}\n\n`
  *   - Tool execution summary:     `data: {"type":"executed_actions", "actions":[...]}\n\n`
- *   - Per-round completion:       `data: {"type":"completion", "status":"...", "reason":"..."}\n\n`
- *   - Budget exhausted:           `data: {"type":"budget_exhausted", "budget":{...}}\n\n`
+ *   - Budget exhausted:           `data: {"type":"budget_exhausted", "budget":{"kind":"..."}, "message":"..."}\n\n`
  *   - Persisted message id:       `data: {"type":"message_id", "messageId":"..."}\n\n`
  *   - Named error event:          `event: error\ndata: {"message":"..."}\n\n`
  *   - Stream terminator:          `data: [DONE]\n\n`

package/src/lib/electron-bridge.ts

@@ -164,10 +164,10 @@ export interface ElectronBridge {
   ) => () => void;
   /**
    * 4.6a 后台任务状态推送。任务到达终态或 worktree 合并/丢弃完成时主进程
-   * 广播；载荷只有 chatId/taskId/status，面板收到后重新拉列表。
+   * 广播；载荷只有 chatId/taskId，面板收到后重新拉列表。
    */
   onTaskUpdated?: (
-    callback: (payload: { chatId: string; taskId: string; status: string }) => void,
+    callback: (payload: { chatId: string; taskId: string }) => void,
   ) => () => void;
   /**
    * 场景包广播事件订阅（3.1 通用化）：按通道名订阅主进程/BS 后端的

package/src/lib/http-bridge.ts

@@ -28,6 +28,8 @@ interface BsBootstrap {
   platform: NodeJS.Platform;
   flavor: string;
   brandName: string;
+  /** 每次启动生成的 Bearer token；/api/v2/* 与 /host/* 全部要求携带。 */
+  token?: string;
 }
 
 function bootstrap(): BsBootstrap {
@@ -37,10 +39,18 @@ function bootstrap(): BsBootstrap {
     : { platform: 'linux', flavor: 'generic', brandName: '' };
 }
 
+function authHeaders(): Record<string, string> {
+  const token = bootstrap().token;
+  return token ? { Authorization: `Bearer ${token}` } : {};
+}
+
 async function http<T>(method: string, path: string, body?: unknown): Promise<T> {
   const res = await fetch(path, {
     method,
-    headers: body !== undefined ? { 'Content-Type': 'application/json' } : undefined,
+    headers: {
+      ...(body !== undefined ? { 'Content-Type': 'application/json' } : {}),
+      ...authHeaders(),
+    },
     body: body !== undefined ? JSON.stringify(body) : undefined,
   });
   const data = (await res.json().catch(() => null)) as T & { detail?: string };
@@ -63,7 +73,11 @@ let eventSource: EventSource | null = null;
 
 function ensureEventSource(): EventSource {
   if (eventSource) return eventSource;
-  eventSource = new EventSource('/api/v2/events');
+  // EventSource 不能设请求头，token 走 query（server 端两种都收）。
+  const token = bootstrap().token;
+  eventSource = new EventSource(
+    `/api/v2/events${token ? `?token=${encodeURIComponent(token)}` : ''}`,
+  );
   return eventSource;
 }
 
@@ -112,7 +126,7 @@ async function startStream(
   try {
     res = await fetch(input.path, {
       method: input.method,
-      headers: { 'Content-Type': 'application/json' },
+      headers: { 'Content-Type': 'application/json', ...authHeaders() },
       body: input.body !== undefined ? JSON.stringify(input.body) : undefined,
       signal: controller.signal,
     });
@@ -231,7 +245,7 @@ export function createHttpBridge(): ElectronBridge {
       subscribeChannel<{ chatId: string; agentId?: string | null }>('chat-created', callback),
 
     onTaskUpdated: (callback) =>
-      subscribeChannel<{ chatId: string; taskId: string; status: string }>(
+      subscribeChannel<{ chatId: string; taskId: string }>(
         'task-updated',
         callback,
       ),

package/vite.base.d.ts

@@ -0,0 +1,7 @@
+export interface ProductViteConfigOptions {
+    /** 产品目录（products/<id>/web 的上一级…即 products/<id>）。 */
+    productDir: string;
+    /** 产品 flavor（决定品牌 define 与激活包集合）。 */
+    flavor: string;
+}
+export declare function createProductViteConfig(options: ProductViteConfigOptions): import("vite").UserConfig;

package/vite.base.js

@@ -0,0 +1,83 @@
+/**
+ * 产品 web 构建的共享 vite 配置工厂（2.3）。
+ *
+ * 每个产品（products/<id>/web/）有自己的 vite 入口：index.html +
+ * main.tsx（静态注册本产品的包渲染层贡献）+ vite.config.ts（调本工厂）。
+ * 产品的编译单元只含自己的包——未激活包代码不进 bundle，不依赖树摇
+ * 正确性（物理隔离与 node 侧对称）。
+ *
+ * Electron 加载产物时走 file:// 协议，必须用相对路径，否则资源 404。
+ * dev server 跑在固定端口，主进程的 IS_DEV 分支 loadURL('http://localhost:5173')。
+ */
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+import tailwindcss from '@tailwindcss/vite';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { existsSync, readFileSync } from 'node:fs';
+const HERE = path.dirname(fileURLToPath(import.meta.url));
+export function createProductViteConfig(options) {
+    const { productDir, flavor } = options;
+    const repoRoot = path.resolve(productDir, '../..');
+    // shell 渲染层源码锚到本包自身（3.2 起住在框架仓库
+    // packages/agent-shell/web/src），产品经 `@/` 别名引用。
+    const webSrcDir = path.resolve(HERE, 'src');
+    const readJson = (p) => JSON.parse(readFileSync(p, 'utf8'));
+    // 产品品牌（3.1）：product.json 的 brand 字段优先（无包产品的品牌
+    // 来源）；否则取激活包 pack.json 的 brand（0.3g 机制，读
+    // products/manifest.json 的 flavor→包映射，第一个带 brand 的包）。
+    // 都没有则用 shell 中性默认（Agent Shell）。
+    const productJsonPath = path.join(productDir, 'product.json');
+    const product = existsSync(productJsonPath) ? readJson(productJsonPath) : {};
+    const manifest = readJson(path.join(repoRoot, 'products/manifest.json'));
+    let packBrand = null;
+    for (const packId of manifest.flavors?.[flavor] ?? []) {
+        const pack = readJson(path.join(repoRoot, 'packages', `pack-${packId}`, 'pack.json'));
+        if (pack.brand) {
+            packBrand = pack.brand;
+            break;
+        }
+    }
+    const brand = product.brand ?? packBrand;
+    return defineConfig({
+        // root 默认取 config 文件所在目录（products/<id>/web）。
+        base: './',
+        plugins: [react(), tailwindcss()],
+        define: {
+            // 显式 define 让 flavor 条件在构建期可静态折叠。
+            'import.meta.env.VITE_APP_FLAVOR': JSON.stringify(flavor),
+            // 品牌 define：产品/包声明覆盖 shell 中性默认（Agent Shell）。
+            // logo 不走 define——资产必须静态 import 才进 bundle，由包 web 模块
+            // 在注册时经 setBrandLogoUrl 注入（本包 src/brand.ts）。
+            'import.meta.env.VITE_BRAND_NAME': JSON.stringify(brand?.displayName ?? 'Steerable Shell'),
+            'import.meta.env.VITE_BRAND_TAGLINE': JSON.stringify(brand?.tagline ?? '一款本地桌面 AI 伙伴'),
+            'import.meta.env.VITE_DEFAULT_AGENT_ID': JSON.stringify(brand?.defaultAgentId ?? 'local-assistant'),
+        },
+        resolve: {
+            alias: {
+                // shell 渲染层源码（产品入口与包 web 模块都以 `@/` 引用它）。
+                '@': webSrcDir,
+            },
+        },
+        // 静态资产（favicon 等中性默认）随 shell web 包分发；产品可在自己的
+        // web root 放 public/ 覆盖（vite 不合并双 publicDir——需要产品级资产
+        // 时在产品 vite.config 里显式覆盖本字段）。
+        publicDir: path.resolve(HERE, 'public'),
+        server: {
+            port: 5173,
+            strictPort: true,
+            host: '127.0.0.1',
+            // 产品 root 在 products/<id>/web；shell 渲染层源码在框架仓库
+            // （3.2 起经 file: 依赖符号链接）——两个根都放行。
+            fs: { allow: [repoRoot, path.resolve(webSrcDir, '..')] },
+        },
+        build: {
+            // 产物落在产品目录：products/<id>/web/dist（打包期被 electron-builder
+            // 映射为包内 web-dist/）。
+            outDir: 'dist',
+            emptyOutDir: true,
+            sourcemap: true,
+            target: 'chrome120',
+        },
+    });
+}

package/src/brand.test.ts

@@ -1,22 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { LOCAL_ASSISTANT_AGENT_ID, pickDefaultAgentId } from './brand';
-
-describe('pickDefaultAgentId', () => {
-  const catalog = [
-    { id: LOCAL_ASSISTANT_AGENT_ID },
-    { id: 'data-analyst' },
-    { id: 'all-round-assistant' },
-  ];
-
-  it('returns null when the catalog is empty', () => {
-    expect(pickDefaultAgentId([])).toBeNull();
-  });
-
-  it('prefers the build-time default (shell: 电脑操作员) even when it is not first', () => {
-    expect(pickDefaultAgentId(catalog)).toBe(LOCAL_ASSISTANT_AGENT_ID);
-  });
-
-  it('falls back to the first visible agent when the build default is absent', () => {
-    expect(pickDefaultAgentId([{ id: 'writer' }, { id: 'reader' }])).toBe('writer');
-  });
-});