@ian2018cs/agenthub 0.1.46 → 0.1.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ian2018cs/agenthub",
-  "version": "0.1.46",
+  "version": "0.1.48",
   "description": "A web-based UI for AI Agents",
   "type": "module",
   "main": "server/index.js",
@@ -51,7 +51,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.69",
+    "@anthropic-ai/claude-agent-sdk": "^0.2.70",
     "@codemirror/lang-css": "^6.3.1",
     "@codemirror/lang-html": "^6.4.9",
     "@codemirror/lang-javascript": "^6.2.4",

package/server/database/db.js

@@ -239,6 +239,13 @@ const runMigrations = () => {
       // 列已存在，忽略
     }
 
+    // 为已有 feishu_session_state 表补充 claude_model 列
+    try {
+      db.exec("ALTER TABLE feishu_session_state ADD COLUMN claude_model TEXT NOT NULL DEFAULT 'sonnet'");
+    } catch (_) {
+      // 列已存在，忽略
+    }
+
     // 飞书已处理消息 ID 去重表（持久化，防止服务重启后重复处理）
     db.exec(`
       CREATE TABLE IF NOT EXISTS feishu_processed_messages (
@@ -1180,19 +1187,21 @@ const feishuDb = {
       if ('claude_session_id' in updates) { fields.push('claude_session_id = ?'); values.push(updates.claude_session_id); }
       if ('cwd' in updates) { fields.push('cwd = ?'); values.push(updates.cwd); }
       if ('permission_mode' in updates) { fields.push('permission_mode = ?'); values.push(updates.permission_mode); }
+      if ('claude_model' in updates) { fields.push('claude_model = ?'); values.push(updates.claude_model); }
       if ('chat_id' in updates) { fields.push('chat_id = ?'); values.push(updates.chat_id); }
       fields.push('updated_at = CURRENT_TIMESTAMP');
       values.push(feishuOpenId);
       db.prepare(`UPDATE feishu_session_state SET ${fields.join(', ')} WHERE feishu_open_id = ?`).run(...values);
     } else {
       db.prepare(`
-        INSERT INTO feishu_session_state (feishu_open_id, claude_session_id, cwd, permission_mode, chat_id)
-        VALUES (?, ?, ?, ?, ?)
+        INSERT INTO feishu_session_state (feishu_open_id, claude_session_id, cwd, permission_mode, claude_model, chat_id)
+        VALUES (?, ?, ?, ?, ?, ?)
       `).run(
         feishuOpenId,
         updates.claude_session_id ?? null,
         updates.cwd ?? '',
         updates.permission_mode ?? 'default',
+        updates.claude_model ?? 'sonnet',
         updates.chat_id ?? null
       );
     }

package/server/routes/skills.js

@@ -44,9 +44,21 @@ async function parseSkillMetadata(skillPath) {
     if (fmMatch) {
       const fm = fmMatch[1];
       const nameMatch = fm.match(/^name:\s*(.+)$/m);
-      const descMatch = fm.match(/^description:\s*(.+)$/m);
       if (nameMatch) title = nameMatch[1].trim();
-      if (descMatch) description = descMatch[1].trim();
+
+      // Handle YAML block scalars: `description: >` (folded) or `description: |` (literal)
+      const descBlockMatch = fm.match(/^description:\s*[>|]\s*\n((?:[ \t]+[^\n]*\n?)*)/m);
+      if (descBlockMatch) {
+        description = descBlockMatch[1]
+          .split('\n')
+          .map(line => line.trimStart())
+          .filter(line => line.length > 0)
+          .join(' ')
+          .trim();
+      } else {
+        const descMatch = fm.match(/^description:\s*(.+)$/m);
+        if (descMatch) description = descMatch[1].trim();
+      }
     }
 
     return { title, description };

package/server/services/feishu/card-builder.js

@@ -11,6 +11,13 @@ const MODE_LABELS = {
   bypassPermissions: 'YOLO 模式',
 };
 
+const MODEL_OPTIONS = [
+  { key: 'sonnet', label: 'Sonnet', desc: '均衡性能，适合大多数任务' },
+  { key: 'opus',   label: 'Opus',   desc: '最强能力，复杂任务首选' },
+  { key: 'haiku',  label: 'Haiku',  desc: '极速轻量，简单任务专用' },
+];
+const MODEL_LABELS = Object.fromEntries(MODEL_OPTIONS.map(m => [m.key, m.label]));
+
 /**
  * 隐藏用户项目目录前缀，只保留相对项目路径。
  * 例：/data/user-projects/597ef057-.../test → test
@@ -265,16 +272,18 @@ function buildModeSelectCardDirect(currentMode) {
 
 /**
  * 状态卡片（直接 JSON）
- * 显示当前项目、路径、会话 ID、权限模式，底部提供「新建会话」和「切换模式」快捷按钮
+ * 显示当前项目、路径、会话 ID、权限模式、模型，底部提供「新建会话」「选择会话」「切换模型」「切换模式」快捷按钮
  */
 function buildStatusCardDirect(state) {
-  const { cwd, claude_session_id, permission_mode } = state || {};
+  const { cwd, claude_session_id, permission_mode, claude_model } = state || {};
   const projectPath = cwd || '';
   const displayPath = stripProjectPrefix(projectPath);
   const projectName = displayPath ? displayPath.split('/').filter(Boolean).pop() || displayPath : '未设置';
   const sessionId = claude_session_id ? claude_session_id.slice(0, 8) : '新建';
   const mode = permission_mode || 'default';
   const modeLabel = MODE_LABELS[mode] || mode;
+  const model = claude_model || 'sonnet';
+  const modelLabel = MODEL_LABELS[model] || model;
 
   const card = {
     schema: '2.0',
@@ -311,6 +320,7 @@ function buildStatusCardDirect(state) {
               elements: [
                 { tag: 'markdown', content: `**会话**\n\`${sessionId}\`` },
                 { tag: 'markdown', content: `**模式**\n${modeLabel}` },
+                { tag: 'markdown', content: `**模型**\n${modelLabel}` },
               ],
             },
           ],
@@ -337,6 +347,34 @@ function buildStatusCardDirect(state) {
                 behaviors: [{ type: 'callback', value: { action: 'new_session' } }],
               }],
             },
+            {
+              tag: 'column',
+              width: 'auto',
+              vertical_spacing: '4px',
+              horizontal_align: 'left',
+              vertical_align: 'center',
+              elements: [{
+                tag: 'button',
+                type: 'default',
+                width: 'default',
+                text: { tag: 'plain_text', content: '选择会话' },
+                behaviors: [{ type: 'callback', value: { action: 'show_sessions' } }],
+              }],
+            },
+            {
+              tag: 'column',
+              width: 'auto',
+              vertical_spacing: '4px',
+              horizontal_align: 'left',
+              vertical_align: 'center',
+              elements: [{
+                tag: 'button',
+                type: 'default',
+                width: 'default',
+                text: { tag: 'plain_text', content: '切换模型' },
+                behaviors: [{ type: 'callback', value: { action: 'show_model_select' } }],
+              }],
+            },
             {
               tag: 'column',
               width: 'auto',
@@ -366,7 +404,71 @@ function buildStatusCardDirect(state) {
 }
 
 /**
- * 列表卡片（直接 JSON）
+ * 模型选择卡片（直接 JSON）
+ * 每个模型渲染为一行：左侧显示名称与说明，右侧显示切换按钮
+ */
+function buildModelSelectCardDirect(currentModel) {
+  const current = currentModel || 'sonnet';
+
+  const rows = [];
+  MODEL_OPTIONS.forEach((m, i) => {
+    const isCurrent = m.key === current;
+    rows.push({
+      tag: 'column_set',
+      flex_mode: 'stretch',
+      horizontal_spacing: '12px',
+      horizontal_align: 'left',
+      margin: '4px 0px 4px 0px',
+      columns: [
+        {
+          tag: 'column',
+          width: 'weighted',
+          weight: 1,
+          vertical_spacing: '4px',
+          horizontal_align: 'left',
+          vertical_align: 'center',
+          elements: [{
+            tag: 'markdown',
+            content: `${isCurrent ? '✅ ' : ''}**${m.label}**\n${m.desc}`,
+          }],
+        },
+        {
+          tag: 'column',
+          width: 'auto',
+          vertical_spacing: '4px',
+          horizontal_align: 'right',
+          vertical_align: 'center',
+          elements: [{
+            tag: 'button',
+            type: isCurrent ? 'primary_filled' : 'default',
+            width: 'default',
+            margin: '0px 0px 0px 0px',
+            text: { tag: 'plain_text', content: isCurrent ? '当前' : '切换' },
+            disabled: isCurrent,
+            behaviors: [{ type: 'callback', value: { action: 'set_claude_model', model: m.key } }],
+          }],
+        },
+      ],
+    });
+    if (i < MODEL_OPTIONS.length - 1) rows.push({ tag: 'hr' });
+  });
+
+  const card = {
+    schema: '2.0',
+    config: { update_multi: true },
+    body: { direction: 'vertical', elements: rows },
+    header: {
+      title: { tag: 'plain_text', content: '模型选择' },
+      subtitle: { tag: 'plain_text', content: `当前：${MODEL_LABELS[current] || current}` },
+      template: 'purple',
+      icon: { tag: 'standard_icon', token: 'robot_outlined' },
+      padding: '12px 8px 12px 8px',
+    },
+  };
+  return JSON.stringify(card);
+}
+
+/**
  * 使用下拉选择组件（select_static），用户从下拉框选取后点击「确认」提交。
  *
  * @param {string}   title       卡片标题
@@ -929,10 +1031,12 @@ function splitMessage(text, maxLen = 4000) {
 
 export {
   MODE_LABELS,
+  MODEL_LABELS,
   stripProjectPrefix,
   buildToolApprovalCardDirect,
   buildToolApprovalResultCardDirect,
   buildModeSelectCardDirect,
+  buildModelSelectCardDirect,
   buildStatusCardDirect,
   buildListCardDirect,
   buildDeleteListCardDirect,

package/server/services/feishu/command-handler.js

@@ -28,8 +28,10 @@ import { getProjects, getSessions } from '../../projects.js';
 import { JWT_SECRET } from '../../middleware/auth.js';
 import {
   MODE_LABELS,
+  MODEL_LABELS,
   stripProjectPrefix,
   buildModeSelectCardDirect,
+  buildModelSelectCardDirect,
   buildStatusCardDirect,
   buildListCardDirect,
   buildDeleteListCardDirect,
@@ -71,6 +73,7 @@ export class CommandHandler {
       case '/project': return this._handleProject(feishuOpenId, chatId, messageId, args);
       case '/delete':  return this._handleDeleteSession(feishuOpenId, chatId, messageId);
       case '/mode':    return this._handleMode(feishuOpenId, chatId, messageId, args[0]);
+      case '/model':   return this._handleModel(feishuOpenId, chatId, messageId, args[0]);
       case '/stop':    return this._handleStop(feishuOpenId, chatId, messageId);
       case '/help':    return this._handleHelp(feishuOpenId, chatId, messageId);
       default:
@@ -378,10 +381,35 @@ export class CommandHandler {
     return true;
   }
 
-  async _handleDeleteSession(feishuOpenId, chatId, messageId) {
+  async _handleModel(feishuOpenId, chatId, messageId, arg) {
     const binding = feishuDb.getBinding(feishuOpenId);
     if (!binding) { return this._requireAuth(chatId, messageId); }
 
+    const state = feishuDb.getSessionState(feishuOpenId) || {};
+
+    if (!arg) {
+      const card = buildModelSelectCardDirect(state.claude_model || 'sonnet');
+      await this._replyCard(chatId, messageId, card, 'interactive');
+      return true;
+    }
+
+    const VALID_MODELS = new Set(['sonnet', 'opus', 'haiku']);
+    if (!VALID_MODELS.has(arg)) {
+      await this._reply(chatId, messageId,
+        `❌ 不支持的模型 \`${arg}\`\n可用：${[...VALID_MODELS].join(', ')}`
+      );
+      return true;
+    }
+
+    feishuDb.updateSessionState(feishuOpenId, { claude_model: arg });
+    await this._reply(chatId, messageId,
+      `✅ 已切换到 **${MODEL_LABELS[arg]}** (\`${arg}\`)`
+    );
+    return true;
+  }
+
+  async _handleDeleteSession(feishuOpenId, chatId, messageId) {
+
     const state = feishuDb.getSessionState(feishuOpenId) || {};
     const cwd = state.cwd;
 

package/server/services/feishu/feishu-engine.js

@@ -16,6 +16,7 @@ import { resolveToolApproval } from '../../claude-sdk.js';
 import {
   buildToolApprovalResultCardDirect,
   buildModeSelectCardDirect,
+  buildModelSelectCardDirect,
   buildStatusCardDirect,
   buildListCardDirect,
   buildDeleteResultCard,
@@ -275,6 +276,25 @@ export class FeishuEngine {
         return toCardResponse(cardStr);
       }
 
+      case 'show_model_select': {
+        const state = feishuDb.getSessionState(feishuOpenId) || {};
+        const cardStr = buildModelSelectCardDirect(state.claude_model || 'sonnet');
+        return toCardResponse(cardStr);
+      }
+
+      case 'set_claude_model': {
+        const model = action.model;
+        const validModels = new Set(['sonnet', 'opus', 'haiku']);
+        if (!validModels.has(model)) return {};
+        feishuDb.updateSessionState(feishuOpenId, { claude_model: model });
+        const cardStr = buildModelSelectCardDirect(model);
+        return toCardResponse(cardStr);
+      }
+
+      case 'show_sessions':
+        await this.commandHandler._handleList(feishuOpenId, feishuOpenId, null);
+        return {};
+
       case 'new_session': {
         feishuDb.clearSession(feishuOpenId);
         const state = feishuDb.getSessionState(feishuOpenId) || {};

package/server/services/feishu/sdk-bridge.js

@@ -426,7 +426,7 @@ async function runQuery({
     }
   }
 
-  const { claude_session_id, cwd, permission_mode } = state || {};
+  const { claude_session_id, cwd, permission_mode, claude_model } = state || {};
 
   const writer = new FakeSendWriter({
     feishuOpenId,
@@ -449,6 +449,7 @@ async function runQuery({
       userUuid,
       cwd:                cwd || undefined,
       permissionMode:     permission_mode || 'default',
+      model:              claude_model || undefined,
       images:             imageOptions,
       toolsSettings:      { allowedTools: [], disallowedTools: [], skipPermissions: false },
       appendSystemPrompt: FEISHU_SYSTEM_PROMPT,