@ian2018cs/agenthub 0.1.30 → 0.1.31

package/server/database/db.js

@@ -210,6 +210,43 @@ const runMigrations = () => {
       )
     `);
 
+    // Create Feishu integration tables
+    db.exec(`
+      CREATE TABLE IF NOT EXISTS feishu_bindings (
+        id             INTEGER PRIMARY KEY AUTOINCREMENT,
+        feishu_open_id TEXT NOT NULL UNIQUE,
+        user_uuid      TEXT NOT NULL,
+        created_at     DATETIME DEFAULT CURRENT_TIMESTAMP,
+        FOREIGN KEY (user_uuid) REFERENCES users(uuid)
+      )
+    `);
+    db.exec('CREATE INDEX IF NOT EXISTS idx_feishu_open_id ON feishu_bindings(feishu_open_id)');
+
+    db.exec(`
+      CREATE TABLE IF NOT EXISTS feishu_session_state (
+        feishu_open_id   TEXT PRIMARY KEY,
+        claude_session_id TEXT,
+        cwd              TEXT NOT NULL DEFAULT '',
+        permission_mode  TEXT NOT NULL DEFAULT 'default',
+        updated_at       DATETIME DEFAULT CURRENT_TIMESTAMP
+      )
+    `);
+
+    // 为已有 feishu_session_state 表补充 chat_id 列（存储 p2p 会话的 chat_id，供菜单事件主动发消息使用）
+    try {
+      db.exec('ALTER TABLE feishu_session_state ADD COLUMN chat_id TEXT');
+    } catch (_) {
+      // 列已存在，忽略
+    }
+
+    // 飞书已处理消息 ID 去重表（持久化，防止服务重启后重复处理）
+    db.exec(`
+      CREATE TABLE IF NOT EXISTS feishu_processed_messages (
+        message_id  TEXT PRIMARY KEY,
+        processed_at DATETIME DEFAULT CURRENT_TIMESTAMP
+      )
+    `);
+
     console.log('Database migrations completed successfully');
   } catch (error) {
     console.error('Error running migrations:', error.message);
@@ -1046,6 +1083,76 @@ const settingsDb = {
   }
 };
 
+const feishuDb = {
+  getBinding: (feishuOpenId) => {
+    return db.prepare('SELECT * FROM feishu_bindings WHERE feishu_open_id = ?').get(feishuOpenId) || null;
+  },
+
+  createBinding: (feishuOpenId, userUuid) => {
+    db.prepare(`
+      INSERT INTO feishu_bindings (feishu_open_id, user_uuid)
+      VALUES (?, ?)
+      ON CONFLICT(feishu_open_id) DO UPDATE SET user_uuid = excluded.user_uuid
+    `).run(feishuOpenId, userUuid);
+  },
+
+  removeBinding: (feishuOpenId) => {
+    db.prepare('DELETE FROM feishu_bindings WHERE feishu_open_id = ?').run(feishuOpenId);
+  },
+
+  getSessionState: (feishuOpenId) => {
+    return db.prepare('SELECT * FROM feishu_session_state WHERE feishu_open_id = ?').get(feishuOpenId) || null;
+  },
+
+  updateSessionState: (feishuOpenId, updates) => {
+    const state = db.prepare('SELECT * FROM feishu_session_state WHERE feishu_open_id = ?').get(feishuOpenId);
+    if (state) {
+      const fields = [];
+      const values = [];
+      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 ('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 (?, ?, ?, ?, ?)
+      `).run(
+        feishuOpenId,
+        updates.claude_session_id ?? null,
+        updates.cwd ?? '',
+        updates.permission_mode ?? 'default',
+        updates.chat_id ?? null
+      );
+    }
+  },
+
+  clearSession: (feishuOpenId) => {
+    db.prepare('UPDATE feishu_session_state SET claude_session_id = NULL, updated_at = CURRENT_TIMESTAMP WHERE feishu_open_id = ?').run(feishuOpenId);
+  },
+
+  // 消息去重：检查消息是否已处理
+  isProcessed: (messageId) => {
+    const row = db.prepare('SELECT 1 FROM feishu_processed_messages WHERE message_id = ?').get(messageId);
+    return !!row;
+  },
+
+  // 消息去重：标记消息为已处理，并清理 48 小时前的旧记录
+  markProcessed: (messageId) => {
+    db.prepare(`
+      INSERT OR IGNORE INTO feishu_processed_messages (message_id) VALUES (?)
+    `).run(messageId);
+    // 清理 48 小时前的记录，防止表无限增长
+    db.prepare(`
+      DELETE FROM feishu_processed_messages
+      WHERE processed_at < datetime('now', '-48 hours')
+    `).run();
+  }
+};
+
 export {
   db,
   initializeDatabase,
@@ -1053,5 +1160,6 @@ export {
   usageDb,
   verificationDb,
   domainWhitelistDb,
-  settingsDb
+  settingsDb,
+  feishuDb
 };

package/server/index.js

@@ -58,6 +58,7 @@ import { initializeDatabase, userDb } from './database/db.js';
 import { validateApiKey, authenticateToken, authenticateWebSocket } from './middleware/auth.js';
 import { getUserPaths, initCodexDirectories, initGeminiDirectories } from './services/user-directories.js';
 import { startUsageScanner } from './services/usage-scanner.js';
+import { startFeishuService, stopFeishuService } from './services/feishu/index.js';
 
 // File system watcher for projects folder - per user
 const userWatchers = new Map(); // Map<userUuid, { watcher, clients: Set<ws> }>
@@ -2246,6 +2247,15 @@ async function startServer() {
             // Start usage scanner service
             startUsageScanner();
 
+            // Start Feishu integration service (if configured)
+            if (process.env.FEISHU_APP_ID && process.env.FEISHU_APP_SECRET) {
+                startFeishuService().catch(err =>
+                    console.error('[Feishu] Service startup error:', err.message)
+                );
+            } else {
+                console.log('[Feishu] Skipped: FEISHU_APP_ID or FEISHU_APP_SECRET not set');
+            }
+
             // Migrate existing users: ensure codex directories and config files exist
             try {
                 const allUsers = userDb.getAllUsers();

package/server/projects.js

@@ -812,6 +812,12 @@ async function deleteProject(projectName, userUuid, options = {}) {
   const sessionDir = path.join(getUserPaths(userUuid).claudeDir, 'projects', projectName);
 
   try {
+    // If deleteFolder requested, resolve the actual path BEFORE removing config
+    let actualProjectDir = null;
+    if (deleteFolder) {
+      actualProjectDir = await extractProjectDirectory(projectName, userUuid);
+    }
+
     // Remove the Claude sessions directory
     try {
       await fs.rm(sessionDir, { recursive: true, force: true });
@@ -827,16 +833,13 @@ async function deleteProject(projectName, userUuid, options = {}) {
     await saveProjectConfig(config, userUuid);
 
     // Optionally delete the actual project folder
-    if (deleteFolder) {
-      const actualProjectDir = await extractProjectDirectory(projectName, userUuid);
-      if (actualProjectDir) {
-        try {
-          await fs.rm(actualProjectDir, { recursive: true, force: true });
-        } catch (err) {
-          if (err.code !== 'ENOENT') {
-            console.error(`Error deleting project folder ${actualProjectDir}:`, err);
-            // Non-fatal: sessions already deleted, log and continue
-          }
+    if (deleteFolder && actualProjectDir) {
+      try {
+        await fs.rm(actualProjectDir, { recursive: true, force: true });
+      } catch (err) {
+        if (err.code !== 'ENOENT') {
+          console.error(`Error deleting project folder ${actualProjectDir}:`, err);
+          // Non-fatal: sessions already deleted, log and continue
         }
       }
     }

package/server/routes/auth.js

@@ -1,8 +1,9 @@
 import express from 'express';
 import bcrypt from 'bcrypt';
+import jwt from 'jsonwebtoken';
 import { v4 as uuidv4 } from 'uuid';
 import { userDb, verificationDb, domainWhitelistDb, usageDb, settingsDb } from '../database/db.js';
-import { generateToken, authenticateToken } from '../middleware/auth.js';
+import { generateToken, authenticateToken, JWT_SECRET } from '../middleware/auth.js';
 import { initUserDirectories } from '../services/user-directories.js';
 import { initBuiltinSkills } from '../services/builtin-skills.js';
 import { sendVerificationCode, isSmtpConfigured } from '../services/email.js';
@@ -281,4 +282,20 @@ router.get('/limit-status', authenticateToken, (req, res) => {
   }
 });
 
+// Generate a short-lived token for binding a Feishu account
+// The user opens the web UI, calls this endpoint, then sends /auth <token> in Feishu private chat
+router.post('/feishu-bind-token', authenticateToken, (req, res) => {
+  try {
+    const token = jwt.sign(
+      { userId: req.user.id, uuid: req.user.uuid, email: req.user.email },
+      JWT_SECRET,
+      { expiresIn: '24h' }
+    );
+    res.json({ success: true, token, expiresIn: '24h' });
+  } catch (error) {
+    console.error('Error generating Feishu bind token:', error);
+    res.status(500).json({ error: '生成绑定 Token 失败' });
+  }
+});
+
 export default router;

package/server/routes/skills.js

@@ -465,12 +465,14 @@ router.delete('/:name', async (req, res) => {
 
     // Check the symlink target to determine source
     let realPath = null;
+    let isSymlink = false;
     let isImported = false;
     let isBuiltin = false;
 
     try {
       const stat = await fs.lstat(linkPath);
-      if (stat.isSymbolicLink()) {
+      isSymlink = stat.isSymbolicLink();
+      if (isSymlink) {
         realPath = await fs.realpath(linkPath);
         isImported = realPath.includes('/skills-import/');
         isBuiltin = isBuiltinSkillPath(realPath);
@@ -479,8 +481,13 @@ router.delete('/:name', async (req, res) => {
       return res.status(404).json({ error: 'Skill not found' });
     }
 
-    // Remove symlink
-    await fs.unlink(linkPath);
+    // Remove symlink or directory
+    if (isSymlink) {
+      await fs.unlink(linkPath);
+    } else {
+      // Real directory (local skill) — remove recursively
+      await fs.rm(linkPath, { recursive: true, force: true });
+    }
 
     // If imported, also delete the actual files
     if (isImported && realPath) {