Update server.js

server.js

@@ -546,10 +546,10 @@ const {
 } = require('@aws-sdk/client-s3');
 
 // ============================================================
-// 0) 配置
+// 0. 配置
 // ============================================================
 
-const PORT = parseInt(process.env.PORT || '7860', 10);
+const PORT = Number(process.env.PORT || 7860);
 const {
   OPENWEBUI_BASE_URL,
   OPENWEBUI_API_KEY,
@@ -557,7 +557,6 @@ const {
   OPENCLAW_TOKEN,
   BOT_USERNAME = 'openman',
   POLL_INTERVAL = '5000',
-
   STORAGE_EXTERNAL_ENDPOINT,
   STORAGE_S3_FORCE_PATH_STYLE = 'true',
   STORAGE_PUBLIC_BUCKET,
@@ -568,19 +567,13 @@ const {
 
 const S3_CONFIG_KEY = 'openclaw/channels.json';
 const S3_UPLOAD_PREFIX = 'openclaw/uploads/';
-const CLEAN_BEFORE_MS = 3 * 24 * 60 * 60 * 1000; // 3天
+const MAX_LOG_LINES = 100;
 
-if (!OPENWEBUI_BASE_URL || !OPENWEBUI_API_KEY || !OPENCLAW_WS_URL || !OPENCLAW_TOKEN) {
-  console.error('缺少必要环境变量: OPENWEBUI_BASE_URL / OPENWEBUI_API_KEY / OPENCLAW_WS_URL / OPENCLAW_TOKEN');
-  process.exit(1);
-}
-if (!STORAGE_EXTERNAL_ENDPOINT || !STORAGE_PUBLIC_BUCKET || !STORAGE_ACCESS_KEY_ID || !STORAGE_SECRET_ACCESS_KEY) {
-  console.error('缺少 S3 环境变量: STORAGE_EXTERNAL_ENDPOINT / STORAGE_PUBLIC_BUCKET / STORAGE_ACCESS_KEY_ID / STORAGE_SECRET_ACCESS_KEY');
-  process.exit(1);
-}
+// 强制：不补历史（你要求的）
+const STRICT_NO_HISTORY_REPLAY = true;
 
 // ============================================================
-// 1) 日志
+// 1. 日志
 // ============================================================
 
 const logBuffer = [];
@@ -591,37 +584,35 @@ function pushLog(type, msg) {
   else console.log(line);
 
   logBuffer.unshift(line);
-  if (logBuffer.length > 100) logBuffer.pop();
+  if (logBuffer.length > MAX_LOG_LINES) logBuffer.pop();
 }
 const log = (m) => pushLog('info', m);
 const err = (m) => pushLog('err', m);
 
 // ============================================================
-// 2) 客户端
+// 2. 客户端
 // ============================================================
 
 const webuiApi = axios.create({
   baseURL: OPENWEBUI_BASE_URL,
   headers: {
-    'Content-Type': 'application/json',
-    Authorization: `Bearer ${OPENWEBUI_API_KEY}`
+    Authorization: `Bearer ${OPENWEBUI_API_KEY}`,
+    'Content-Type': 'application/json'
   },
   timeout: 15000
 });
 
 const fileDownloader = axios.create({
   baseURL: OPENWEBUI_BASE_URL,
-  headers: {
-    Authorization: `Bearer ${OPENWEBUI_API_KEY}`
-  },
+  headers: { Authorization: `Bearer ${OPENWEBUI_API_KEY}` },
   responseType: 'arraybuffer',
-  timeout: 45000
+  timeout: 30000
 });
 
 const s3 = new S3Client({
   region: STORAGE_REGION,
   endpoint: STORAGE_EXTERNAL_ENDPOINT,
-  forcePathStyle: String(STORAGE_S3_FORCE_PATH_STYLE).toLowerCase() === 'true',
+  forcePathStyle: STORAGE_S3_FORCE_PATH_STYLE === 'true',
   credentials: {
     accessKeyId: STORAGE_ACCESS_KEY_ID,
     secretAccessKey: STORAGE_SECRET_ACCESS_KEY
@@ -629,155 +620,51 @@ const s3 = new S3Client({
 });
 
 // ============================================================
-// 3) 状态
+// 3. 运行时状态
 // ============================================================
 
-const channelRuntime = new Map(); // id -> {id, name, lastMsgId, syncing, syncStartTime}
-const pendingRequests = new Map();
+/**
+ * state:
+ * {
+ *  id, name,
+ *  lastMsgId,
+ *  syncing,
+ *  syncStartTime
+ * }
+ */
+const channelRuntime = new Map();
 
 let ws = null;
 let isClawReady = false;
 let isReconnecting = false;
 let pingInterval = null;
 let reconnectTimer = null;
+const pendingRequests = new Map();
 
 // ============================================================
-// 4) 工具函数
+// 4. S3 工具
 // ============================================================
 
-function sleep(ms) {
-  return new Promise((r) => setTimeout(r, ms));
-}
-
-function sanitizeFilename(name = 'file.bin') {
-  return String(name).replace(/[^a-zA-Z0-9._-]/g, '_');
-}
-
-function toB64Url(buf) {
-  return buf.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
-}
-
 async function streamToString(stream) {
   return await new Promise((resolve, reject) => {
     const chunks = [];
     stream.on('data', (c) => chunks.push(c));
     stream.on('error', reject);
-    stream.on('end', () => resolve(Buffer.concat(chunks).toString('utf8')));
+    stream.on('end', () => resolve(Buffer.concat(chunks).toString('utf-8')));
   });
 }
 
-function buildS3PublicUrl(key) {
-  // path style: endpoint/bucket/key
-  const base = STORAGE_EXTERNAL_ENDPOINT.replace(/\/+$/, '');
-  return `${base}/${STORAGE_PUBLIC_BUCKET}/${key}`;
-}
-
-function guessMimeByExt(filename = '') {
-  const ext = filename.toLowerCase().split('.').pop();
-  const map = {
-    jpg: 'image/jpeg', jpeg: 'image/jpeg', png: 'image/png', gif: 'image/gif', webp: 'image/webp', bmp: 'image/bmp', svg: 'image/svg+xml',
-    mp3: 'audio/mpeg', wav: 'audio/wav', ogg: 'audio/ogg', m4a: 'audio/mp4', aac: 'audio/aac', flac: 'audio/flac',
-    mp4: 'video/mp4', webm: 'video/webm', mov: 'video/quicktime', mkv: 'video/x-matroska',
-    txt: 'text/plain', md: 'text/markdown', pdf: 'application/pdf', json: 'application/json'
-  };
-  return map[ext] || 'application/octet-stream';
-}
-
-// ============================================================
-// 5) OpenWebUI 回传格式化（关键）
-// ============================================================
-
-function renderUrlForOpenWebUI(url) {
-  const clean = String(url || '').trim();
-  if (!clean) return '';
-
-  const lower = clean.toLowerCase().split('?')[0];
-
-  // 音频
-  if (/\.(mp3|wav|ogg|m4a|aac|flac)$/.test(lower)) {
-    const ext = lower.split('.').pop();
-    const mimeMap = {
-      mp3: 'audio/mpeg',
-      wav: 'audio/wav',
-      ogg: 'audio/ogg',
-      m4a: 'audio/mp4',
-      aac: 'audio/aac',
-      flac: 'audio/flac'
-    };
-    const mime = mimeMap[ext] || 'audio/mpeg';
-    return `<audio controls>
-  <source src="${clean}" type="${mime}">
-  您的浏览器不支持音频播放。
-</audio>`;
-  }
-
-  // 图片
-  if (/\.(png|jpg|jpeg|gif|webp|bmp|svg)$/.test(lower)) {
-    return `![image](${clean})`;
-  }
-
-  // 视频
-  if (/\.(mp4|webm|mov|mkv)$/.test(lower)) {
-    return `<video controls style="max-width:100%;">
-  <source src="${clean}">
-  您的浏览器不支持视频播放。
-</video>`;
-  }
-
-  // 其它
-  return `[文件下载](${clean})`;
-}
-
-function normalizeAssistantContent(hMsg) {
-  const c = hMsg?.content;
-  if (!c) return '';
-
-  if (typeof c === 'string') {
-    return c.trim();
-  }
-
-  if (Array.isArray(c)) {
-    const parts = [];
-    for (const block of c) {
-      if (!block) continue;
-
-      if (typeof block.text === 'string' && block.text.trim()) {
-        parts.push(block.text.trim());
-        continue;
-      }
-      if (typeof block.value === 'string' && block.value.trim()) {
-        parts.push(block.value.trim());
-        continue;
-      }
-
-      // URL 字段兼容
-      const url = block.url || block.href || block.link || block.src;
-      if (url) {
-        parts.push(renderUrlForOpenWebUI(url));
-        continue;
-      }
-    }
-    return parts.join('\n\n').trim();
-  }
-
-  return String(c).trim();
-}
-
-// ============================================================
-// 6) S3：配置/上传/清理
-// ============================================================
-
 async function loadChannelsFromS3() {
   try {
     log('☁️ [S3] 读取频道配置...');
-    const res = await s3.send(new GetObjectCommand({
+    const obj = await s3.send(new GetObjectCommand({
       Bucket: STORAGE_PUBLIC_BUCKET,
       Key: S3_CONFIG_KEY
     }));
-    const text = await streamToString(res.Body);
-    const json = JSON.parse(text);
+    const content = await streamToString(obj.Body);
+    const data = JSON.parse(content);
+    const list = Array.isArray(data.channels) ? data.channels : [];
 
-    const list = Array.isArray(json?.channels) ? json.channels : [];
     for (const ch of list) {
       if (!channelRuntime.has(ch.id)) {
         channelRuntime.set(ch.id, {
@@ -791,22 +678,15 @@ async function loadChannelsFromS3() {
     }
     log(`✅ [S3] 恢复频道 ${list.length} 个`);
   } catch (e) {
-    if (e.name === 'NoSuchKey') {
-      log('ℹ️ [S3] channels.json 不存在，首次启动');
-    } else {
-      err(`[S3] 读取配置失败: ${e.message}`);
-    }
+    if (e.name === 'NoSuchKey') log('ℹ️ [S3] 首次运行，无配置文件');
+    else err(`[S3] 读取配置失败: ${e.message}`);
   }
 }
 
 async function saveChannelsToS3() {
   try {
-    const list = Array.from(channelRuntime.values()).map((x) => ({ id: x.id, name: x.name }));
-    const body = JSON.stringify({
-      version: '2.2.0',
-      updatedAt: new Date().toISOString(),
-      channels: list
-    }, null, 2);
+    const channels = Array.from(channelRuntime.values()).map(c => ({ id: c.id, name: c.name }));
+    const body = JSON.stringify({ version: '1.0', channels, updatedAt: new Date().toISOString() }, null, 2);
 
     await s3.send(new PutObjectCommand({
       Bucket: STORAGE_PUBLIC_BUCKET,
@@ -815,70 +695,175 @@ async function saveChannelsToS3() {
       ContentType: 'application/json'
     }));
   } catch (e) {
-    err(`[S3] 保存配置失败: ${e.message}`);
+    err(`[S3] 保存频道失败: ${e.message}`);
   }
 }
 
-async function uploadToS3(filename, buffer, mimeType) {
+async function uploadToS3(filename, buffer, contentType = 'application/octet-stream') {
   const key = `${S3_UPLOAD_PREFIX}${filename}`;
   try {
-    log(`☁️ [Debug] S3上传开始: ${filename}, ${buffer.length} bytes, mime=${mimeType}`);
+    log(`☁️ [Debug] 上传S3: ${filename}, ${buffer.length} bytes`);
     await s3.send(new PutObjectCommand({
       Bucket: STORAGE_PUBLIC_BUCKET,
       Key: key,
       Body: buffer,
-      ContentType: mimeType || 'application/octet-stream'
-      // 不强行 ACL，避免部分 S3 报 AccessControlListNotSupported
+      ContentType: contentType,
+      ACL: 'public-read'
     }));
-    const url = buildS3PublicUrl(key);
+
+    let endpoint = STORAGE_EXTERNAL_ENDPOINT || '';
+    endpoint = endpoint.replace(/\/+$/, '');
+    const url = `${endpoint}/${STORAGE_PUBLIC_BUCKET}/${key}`;
     log(`✅ [Debug] S3上传成功: ${url}`);
     return url;
   } catch (e) {
-    err(`S3上传失败 ${filename}: ${e.message}`);
+    err(`[S3] 上传失败 ${filename}: ${e.message}`);
     return null;
   }
 }
 
 async function cleanOldS3Files() {
   try {
-    log('🧹 [S3] 清理任务开始');
-    const threshold = Date.now() - CLEAN_BEFORE_MS;
-    let token = undefined;
-    let removed = 0;
+    const threshold = Date.now() - 3 * 24 * 3600 * 1000;
+    let token;
+    let deleted = 0;
 
     do {
-      const res = await s3.send(new ListObjectsV2Command({
+      const resp = await s3.send(new ListObjectsV2Command({
         Bucket: STORAGE_PUBLIC_BUCKET,
         Prefix: S3_UPLOAD_PREFIX,
         ContinuationToken: token
       }));
-      const list = res.Contents || [];
 
-      for (const obj of list) {
-        if (obj.LastModified && obj.LastModified.getTime() < threshold) {
+      for (const o of (resp.Contents || [])) {
+        if (o.LastModified && o.LastModified.getTime() < threshold) {
           await s3.send(new DeleteObjectCommand({
             Bucket: STORAGE_PUBLIC_BUCKET,
-            Key: obj.Key
+            Key: o.Key
           }));
-          removed += 1;
+          deleted++;
         }
       }
-      token = res.NextContinuationToken;
+      token = resp.NextContinuationToken;
     } while (token);
 
-    log(`🧹 [S3] 清理完成，删除 ${removed} 个文件`);
+    if (deleted > 0) log(`🧹 [S3] 清理过期文件 ${deleted} 个`);
   } catch (e) {
     err(`[S3] 清理失败: ${e.message}`);
   }
 }
 
 // ============================================================
-// 7) OpenClaw WS
+// 5. Web 管理页
+// ============================================================
+
+const app = express();
+app.use(express.json());
+
+app.get('/', (req, res) => {
+  res.send(`<!doctype html>
+<html lang="zh"><head><meta charset="UTF-8"><title>Bridge Console</title>
+<style>
+body{font-family:system-ui;max-width:920px;margin:20px auto;background:#f3f4f6}
+.card{background:#fff;padding:16px;border-radius:10px;margin-bottom:12px}
+input{padding:8px;border:1px solid #ddd;border-radius:6px}
+button{padding:8px 12px;border:0;border-radius:6px;background:#2563eb;color:#fff;cursor:pointer}
+.small{font-size:12px;color:#666}
+#logs{background:#0f172a;color:#10b981;padding:10px;height:360px;overflow:auto;border-radius:8px;font-family:monospace;font-size:12px}
+td,th{padding:8px;border-bottom:1px solid #eee;text-align:left}
+</style></head><body>
+<div class="card">
+  <h2 style="margin:0 0 8px 0;">Bridge Console</h2>
+  <div>OpenClaw: <b id="st">...</b></div>
+</div>
+
+<div class="card">
+  <div style="display:flex;gap:8px;margin-bottom:8px">
+    <input id="cid" style="flex:1" placeholder="Channel UUID">
+    <input id="cname" style="flex:1" placeholder="Name">
+    <button onclick="add()">Add</button>
+  </div>
+  <table style="width:100%;border-collapse:collapse">
+    <thead><tr><th>Name</th><th>ID</th><th>Status</th><th>Action</th></tr></thead>
+    <tbody id="tb"></tbody>
+  </table>
+  <div class="small">严格模式：不补历史（删除会重置基准，不重发旧消息）</div>
+</div>
+
+<div class="card">
+  <h3 style="margin-top:0;">最近日志(100行)</h3>
+  <div id="logs"></div>
+</div>
+
+<script>
+async function refresh(){
+  try{
+    const h = await (await fetch('/health')).json();
+    document.getElementById('st').innerText = h.wsConnected ? 'Connected' : 'Disconnected';
+
+    const cs = await (await fetch('/api/channels')).json();
+    document.getElementById('tb').innerHTML = cs.map(c=>\`
+      <tr><td>\${c.name}</td><td>\${c.id}</td><td>\${c.syncing?'🔄':'💤'}</td>
+      <td><button style="background:#dc2626" onclick="delCh('\${c.id}')">Delete</button></td></tr>\`).join('');
+
+    const logs = await (await fetch('/api/logs')).json();
+    document.getElementById('logs').innerHTML = logs.map(x=>'<div>'+x.replace(/</g,'&lt;')+'</div>').join('');
+  }catch(e){}
+}
+async function add(){
+  await fetch('/api/channels',{method:'POST',headers:{'content-type':'application/json'},
+    body:JSON.stringify({id:cid.value.trim(),name:cname.value.trim()})});
+  cid.value=''; cname.value=''; refresh();
+}
+async function delCh(id){
+  if(!confirm('Delete '+id+' ?')) return;
+  await fetch('/api/channels/'+encodeURIComponent(id),{method:'DELETE'});
+  refresh();
+}
+setInterval(refresh,3000); refresh();
+</script></body></html>`);
+});
+
+app.get('/api/logs', (req, res) => res.json(logBuffer));
+app.get('/api/channels', (req, res) => res.json(Array.from(channelRuntime.values())));
+app.get('/health', (req, res) => res.json({ ok: true, wsConnected: isClawReady }));
+
+app.post('/api/channels', async (req, res) => {
+  const { id, name } = req.body || {};
+  if (!id) return res.status(400).json({ ok: false, error: 'id required' });
+
+  if (!channelRuntime.has(id)) {
+    channelRuntime.set(id, {
+      id,
+      name: name || id,
+      lastMsgId: null,
+      syncing: false,
+      syncStartTime: 0
+    });
+    await saveChannelsToS3();
+    await initChannelBaseline(id);
+    log(`➕ 频道已添加: ${id}`);
+  }
+  res.json({ ok: true });
+});
+
+app.delete('/api/channels/:id', async (req, res) => {
+  const id = req.params.id;
+  if (channelRuntime.delete(id)) {
+    await saveChannelsToS3();
+    log(`➖ 频道已删除: ${id}`);
+  }
+  res.json({ ok: true });
+});
+
+// ============================================================
+// 6. OpenClaw 连接
 // ============================================================
 
 const { publicKey, privateKey } = crypto.generateKeyPairSync('ed25519');
 const rawPublicKey = publicKey.export({ type: 'spki', format: 'der' }).subarray(12);
 const deviceId = crypto.createHash('sha256').update(rawPublicKey).digest('hex');
+const toB64Url = (buf) => buf.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
 
 function cleanupConnection() {
   if (pingInterval) clearInterval(pingInterval);
@@ -889,42 +874,38 @@ function cleanupConnection() {
     try { ws.terminate(); } catch {}
     ws = null;
   }
-
   isClawReady = false;
   pendingRequests.clear();
 
-  for (const st of channelRuntime.values()) {
-    st.syncing = false;
-  }
+  for (const st of channelRuntime.values()) st.syncing = false;
 }
 
-function handleDisconnect(retryCount) {
+function handleDisconnect(retry = 0) {
   cleanupConnection();
   isReconnecting = false;
-  const delay = Math.min(5000 * Math.pow(1.5, retryCount), 60000);
+  const delay = Math.min(5000 * Math.pow(1.5, retry), 60000);
   if (reconnectTimer) clearTimeout(reconnectTimer);
-  reconnectTimer = setTimeout(() => connectOpenClaw(retryCount + 1), delay);
+  reconnectTimer = setTimeout(() => connectOpenClaw(retry + 1), delay);
 }
 
-function connectOpenClaw(retryCount = 0) {
+function connectOpenClaw(retry = 0) {
   if (isReconnecting || ws) return;
   isReconnecting = true;
-  log(`🔌 连接 OpenClaw (${retryCount + 1})...`);
+  log(`🔌 连接 OpenClaw (${retry + 1})...`);
 
   try {
     ws = new WebSocket(OPENCLAW_WS_URL.replace(/\/+$/, '') + '/ws');
 
     ws.on('open', () => {
-      log('✅ WS 握手成功');
       isReconnecting = false;
-
       ws.isAlive = true;
-      ws.on('pong', () => { ws.isAlive = true; });
+      log('✅ WS 握手成功');
 
+      ws.on('pong', () => { ws.isAlive = true; });
       pingInterval = setInterval(() => {
         if (!ws) return;
         if (ws.isAlive === false) {
-          err('WS 心跳超时，终止连接');
+          err('WS 心跳超时');
           return ws.terminate();
         }
         ws.isAlive = false;
@@ -932,28 +913,24 @@ function connectOpenClaw(retryCount = 0) {
       }, 10000);
     });
 
-    ws.on('message', handleClawMessage);
+    ws.on('message', onClawMessage);
     ws.on('close', (code) => {
-      log(`🔌 WS断开 (${code})`);
-      handleDisconnect(retryCount);
+      log(`🔌 WS断开: ${code}`);
+      handleDisconnect(retry);
     });
     ws.on('error', (e) => err(`WS错误: ${e.message}`));
   } catch (e) {
     err(`WS初始化失败: ${e.message}`);
-    handleDisconnect(retryCount);
+    handleDisconnect(retry);
   }
 }
 
-function handleClawMessage(data) {
+function onClawMessage(raw) {
   let msg;
-  try {
-    msg = JSON.parse(data.toString());
-  } catch {
-    return;
-  }
+  try { msg = JSON.parse(raw.toString()); } catch { return; }
 
   if (msg.event === 'connect.challenge') {
-    const { nonce } = msg.payload || {};
+    const { nonce } = msg.payload;
     const signedAt = Date.now();
     const payload = [
       'v2',
@@ -964,7 +941,7 @@ function handleClawMessage(data) {
       'operator.admin,operator.approvals,operator.pairing',
       String(signedAt),
       OPENCLAW_TOKEN || '',
-      nonce || ''
+      nonce
     ].join('|');
 
     const signature = crypto.sign(null, Buffer.from(payload), privateKey);
@@ -976,12 +953,7 @@ function handleClawMessage(data) {
       params: {
         minProtocol: 3,
         maxProtocol: 3,
-        client: {
-          id: 'openclaw-control-ui',
-          version: 'dev',
-          platform: 'linux',
-          mode: 'webchat'
-        },
+        client: { id: 'openclaw-control-ui', version: 'dev', platform: 'linux', mode: 'webchat' },
         device: {
           id: deviceId,
           publicKey: toB64Url(rawPublicKey),
@@ -1002,422 +974,247 @@ function handleClawMessage(data) {
   }
 
   if (msg.type === 'res' && msg.id && pendingRequests.has(msg.id)) {
-    const cb = pendingRequests.get(msg.id);
+    const fn = pendingRequests.get(msg.id);
     pendingRequests.delete(msg.id);
-    try { cb(msg.payload); } catch {}
+    try { fn(msg.payload); } catch {}
   }
 }
 
-function fetchClawHistory(cid, uid) {
-  return new Promise((resolve) => {
-    if (!isClawReady || !ws) return resolve([]);
-    const reqId = crypto.randomUUID();
-
-    const timer = setTimeout(() => {
-      pendingRequests.delete(reqId);
-      resolve([]);
-    }, 5000);
-
-    pendingRequests.set(reqId, (payload) => {
-      clearTimeout(timer);
-      resolve(payload?.messages || []);
-    });
-
-    try {
-      ws.send(JSON.stringify({
-        type: 'req',
-        id: reqId,
-        method: 'chat.history',
-        params: {
-          sessionKey: `agent:main:${cid}`,
-          limit: 5
-        }
-      }));
-    } catch {
-      clearTimeout(timer);
-      pendingRequests.delete(reqId);
-      resolve([]);
-    }
-  });
-}
-
-function triggerAgent(cid, uid, senderName, text, isCommand = false) {
+function triggerAgent(cid, uid, senderName, text, isCommand) {
   if (!isClawReady || !ws) return;
-  const finalMsg = isCommand ? text : `${senderName} 说: ${text}`;
-
-  ws.send(JSON.stringify({
+  const method = isCommand ? 'chat.send' : 'agent';
+  const content = isCommand ? text : `${senderName} 说: ${text}`;
+  const payload = {
     type: 'req',
     id: crypto.randomUUID(),
-    method: isCommand ? 'chat.send' : 'agent',
+    method,
     params: {
-      sessionKey: `agent:main:${cid}`,
-      message: finalMsg,
+      sessionKey: `agent:main:${cid}:${uid}`,
+      message: content,
       idempotencyKey: crypto.randomUUID(),
       deliver: isCommand ? false : undefined
     }
-  }));
-
-  log(`🚀 [发送到Claw] ${senderName}: ${String(text).slice(0, 60)}`);
+  };
+  ws.send(JSON.stringify(payload));
+  log(`🚀 [发送] ${senderName}: ${String(text).slice(0, 50)}`);
 }
 
 // ============================================================
-// 8) 频道初始化
+// 7. 频道基准线 + 新接口附件解析
 // ============================================================
 
 async function initChannelBaseline(cid) {
-  const state = channelRuntime.get(cid);
-  if (!state) return;
+  const st = channelRuntime.get(cid);
+  if (!st) return;
+
   try {
-    const { data } = await webuiApi.get(`/api/v1/channels/${cid}/messages?limit=1`);
-    state.lastMsgId = (Array.isArray(data) && data.length > 0) ? data[0].id : 'EMPTY_START';
-    log(`✅ [${state.name}] 基准线: ${state.lastMsgId}`);
+    const { data: msgs } = await webuiApi.get(`/api/v1/channels/${cid}/messages?skip=0&limit=1`);
+    if (Array.isArray(msgs) && msgs.length > 0) {
+      st.lastMsgId = msgs[0].id; // 最新一条作基准
+    } else {
+      st.lastMsgId = 'EMPTY_START';
+    }
+    log(`✅ [${st.name}] 基准线: ${st.lastMsgId}`);
   } catch (e) {
-    err(`[${state.name}] 初始化失败，5秒后重试: ${e.message}`);
+    err(`[${st.name}] 初始化基准失败: ${e.message}`);
     setTimeout(() => initChannelBaseline(cid), 5000);
   }
 }
 
-// ============================================================
-// 9) 核心同步
-// ============================================================
+async function resolveMessageFiles(cid, msg) {
+  // 兼容新旧接口：
+  // 1) 新版: msg.data === true -> /messages/{id}/data
+  // 2) 旧版: msg.data.files 直接存在
+  let files = [];
 
-async function fetchMessageDataIfNeeded(cid, msg) {
-  // 新版: msg.data === true，需要拉详情接口
-  if (msg?.data === true) {
-    log(`📡 [Debug] 懒加载消息，拉取详情: messageId=${msg.id}`);
+  if (msg.data === true) {
+    log(`📡 [Debug] data=true，拉取详情: ${msg.id}`);
     try {
       const { data } = await webuiApi.get(`/api/v1/channels/${cid}/messages/${msg.id}/data`);
-      return data || {};
+      if (data && Array.isArray(data.files)) {
+        files = data.files;
+        log(`   ✅ 详情返回 files=${files.length}`);
+      } else {
+        log(`   ℹ️ 详情无 files`);
+      }
     } catch (e) {
-      err(`消息详情获取失败 ${msg.id}: ${e.message}`);
-      return {};
+      err(`   ❌ 拉取详情失败: ${e.message}`);
     }
+  } else if (msg.data && typeof msg.data === 'object' && Array.isArray(msg.data.files)) {
+    files = msg.data.files;
   }
 
-  // 旧版: msg.data 是对象
-  if (msg?.data && typeof msg.data === 'object') return msg.data;
-
-  return {};
+  return files;
 }
 
-async function processAttachmentsToMarkdown(cid, msg) {
-  const messageData = await fetchMessageDataIfNeeded(cid, msg);
-  const files = Array.isArray(messageData?.files) ? messageData.files : [];
-
-  if (!files.length) return [];
+async function buildAttachmentLinks(cid, files) {
+  const atts = [];
+  if (!files.length) return atts;
 
-  log(`🔎 [Debug] message=${msg.id} 附件数=${files.length}`);
+  log(`🔎 [Debug] 开始处理附件 ${files.length} 个`);
 
-  const atts = [];
-  for (const fItem of files) {
+  for (const item of files) {
     try {
-      const f = fItem?.file || fItem || {};
       let buffer = null;
-      let filename = null;
-      let mimeType = null;
-
-      // 1) 兼容粘贴 data URL
-      if (typeof fItem?.url === 'string' && fItem.url.startsWith('data:')) {
-        log(`📸 [Debug] 处理 Base64 附件`);
-        const m = fItem.url.match(/^data:([a-zA-Z0-9/+\-.]+);base64,(.+)$/);
-        if (m) {
-          mimeType = m[1];
-          const ext = (mimeType.split('/')[1] || 'bin').replace('jpeg', 'jpg');
-          filename = `img_${Date.now()}_${Math.random().toString(36).slice(2)}.${ext}`;
-          buffer = Buffer.from(m[2], 'base64');
+      let mime = item.content_type || item?.file?.meta?.content_type || 'application/octet-stream';
+      let originName = item.name || item?.file?.filename || 'file.bin';
+
+      // A. base64
+      if (item.url && typeof item.url === 'string' && item.url.startsWith('data:')) {
+        const m = item.url.match(/^data:([a-zA-Z0-9/+.-]+);base64,(.+)$/);
+        if (!m) {
+          err(`   ❌ Base64 格式无效: ${originName}`);
+          continue;
         }
+        mime = m[1];
+        buffer = Buffer.from(m[2], 'base64');
       }
 
-      // 2) 通过 file id 下载（新版主流程）
-      if (!buffer && f?.id) {
-        const originalName = f.filename || fItem.name || 'file.bin';
-        log(`⬇️ [Debug] 下载文件: id=${f.id}, name=${originalName}`);
-        const { data } = await fileDownloader.get(`/api/v1/files/${f.id}/content`);
+      // B. file-id 下载（新版主要走这个）
+      if (!buffer) {
+        const fid = item?.file?.id || item?.id;
+        if (!fid) {
+          err(`   ❌ 缺少文件ID: ${originName}`);
+          continue;
+        }
+        log(`⬇️ [Debug] 下载文件: ${fid} (${originName})`);
+        const { data } = await fileDownloader.get(`/api/v1/files/${fid}/content`);
         buffer = data;
-        filename = `${Date.now()}_${sanitizeFilename(originalName)}`;
-        mimeType = fItem.content_type || f.meta?.content_type || guessMimeByExt(originalName);
-      }
-
-      if (!buffer || !filename) {
-        log(`⚠️ [Debug] 附件跳过（无可用数据）: ${JSON.stringify({ id: f?.id, name: fItem?.name || f?.filename || '' })}`);
-        continue;
       }
 
-      const url = await uploadToS3(filename, buffer, mimeType);
+      const safeName = `${Date.now()}_${originName.replace(/[^a-zA-Z0-9._-]/g, '_')}`;
+      const url = await uploadToS3(safeName, buffer, mime);
       if (!url) continue;
 
-      const isImage = String(mimeType || '').startsWith('image/');
-      atts.push(`[${isImage ? '图片' : '文件'}: ${filename}](${url}) (附件)`);
-      log(`✅ [Debug] 附件转链成功: ${filename}`);
+      const isImage = (mime || '').startsWith('image/');
+      atts.push(`[${isImage ? '图片' : '文件'}: ${safeName}](${url}) (附件)`);
+      log(`   ✅ 附件转链成功: ${safeName}`);
     } catch (e) {
-      err(`附件处理失败: ${e.message}`);
+      err(`   ❌ 附件处理异常: ${e.message}`);
     }
   }
 
   return atts;
 }
 
-async function syncChannel(cid) {
-  const state = channelRuntime.get(cid);
-  if (!state || !state.lastMsgId || !isClawReady) return;
+// ============================================================
+// 8. 同步循环（严格不补历史）
+// ============================================================
 
-  if (state.syncing) {
-    if (Date.now() - (state.syncStartTime || 0) > 60000) {
-      log(`⚠️ [${state.name}] 同步超时，强制释放`);
-      state.syncing = false;
+async function syncChannel(cid) {
+  const st = channelRuntime.get(cid);
+  if (!st || !isClawReady) return;
+  if (!st.lastMsgId) return;
+
+  if (st.syncing) {
+    if (Date.now() - (st.syncStartTime || 0) > 60000) {
+      err(`[${st.name}] 同步超时，强制复位`);
+      st.syncing = false;
     } else {
       return;
     }
   }
 
-  state.syncing = true;
-  state.syncStartTime = Date.now();
+  st.syncing = true;
+  st.syncStartTime = Date.now();
 
   try {
-    // 拉最近消息
     const { data: msgs } = await webuiApi.get(`/api/v1/channels/${cid}/messages?skip=0&limit=10`);
-    if (!Array.isArray(msgs) || !msgs.length) throw new Error('No messages');
-
-    // A) 回信补发：Claw -> WebUI
-    const webuiFingerprints = new Set(
-      msgs
-        .map((m) => (m.content || m.data?.content || '').trim())
-        .filter(Boolean)
-    );
-
-    const activeUsers = new Map();
-    msgs.slice(0, 5).forEach((m) => {
-      if (m.user_id) activeUsers.set(m.user_id, { id: m.user_id, name: m.user?.name || 'User' });
-    });
+    if (!Array.isArray(msgs) || msgs.length === 0) return;
 
-    for (const u of activeUsers.values()) {
-      await sleep(120);
-      const history = await fetchClawHistory(cid, u.id);
-      const replies = history.filter((x) => x.role === 'assistant').slice(-3);
-
-      for (const hMsg of replies) {
-        const txt = normalizeAssistantContent(hMsg);
-        if (txt && !webuiFingerprints.has(txt)) {
-          log(`🧪 [Debug] 回传内容预览: ${txt.slice(0, 180).replace(/\n/g, ' ')}`);
-          await webuiApi.post(`/api/v1/channels/${cid}/messages/post`, {
-            content: txt,
-            data: { files: [] },
-            reply_to_id: null
-          });
-          webuiFingerprints.add(txt);
-          log(`📥 [回传OpenWebUI] -> ${u.name}`);
-        }
+    const sorted = msgs.slice().reverse(); // oldest -> newest
+    const newestId = sorted[sorted.length - 1].id;
+
+    // --- 关键：严格不补历史 ---
+    const startIdx = sorted.findIndex(m => m.id === st.lastMsgId);
+
+    // 首次空基准（或 empty）直接挂到最新，不发���何旧消息
+    if (st.lastMsgId === 'EMPTY_START') {
+      st.lastMsgId = newestId;
+      return;
+    }
+
+    // 基准失效（例如对话删除重建）=> 重置基准并跳过本轮
+    if (startIdx === -1) {
+      if (STRICT_NO_HISTORY_REPLAY) {
+        log(`⛔ [${st.name}] 基准失效，重置到最新，跳过本轮（不补历史）`);
+        st.lastMsgId = newestId;
+        return;
       }
     }
 
-    // B) 新消息转发：WebUI -> Claw
-    const sorted = msgs.reverse(); // 旧->新
-    const idx = sorted.findIndex((m) => m.id === state.lastMsgId);
-    const newMsgs = (idx !== -1) ? sorted.slice(idx + 1) : (state.lastMsgId !== 'EMPTY_START' ? sorted : []);
+    const newMsgs = sorted.slice(startIdx + 1);
+    if (newMsgs.length === 0) {
+      st.lastMsgId = newestId;
+      return;
+    }
 
-    if (newMsgs.length > 0) {
-      state.lastMsgId = sorted[sorted.length - 1].id;
+    // 处理“新消息”
+    for (const m of newMsgs) {
+      const sender = m.user?.name || 'User';
+      if (sender.toLowerCase() === BOT_USERNAME.toLowerCase()) continue;
 
-      for (const m of newMsgs) {
-        const sender = m.user?.name || 'User';
-        if (sender.toLowerCase() === BOT_USERNAME.toLowerCase()) continue;
+      let txt = String(m.content || m?.data?.content || '')
+        .replace(/<@U:[^>]+>/g, '')
+        .replace(new RegExp(`@${BOT_USERNAME}`, 'ig'), '')
+        .trim();
 
-        let txt = String(m.content || m.data?.content || '')
-          .replace(/<@U:[^>]+>/g, '')
-          .replace(new RegExp(`@${BOT_USERNAME}`, 'gi'), '')
-          .trim();
+      const files = await resolveMessageFiles(cid, m);
+      const atts = await buildAttachmentLinks(cid, files);
 
-        // 处理附件（新接口）
-        const atts = await processAttachmentsToMarkdown(cid, m);
-        if (atts.length) txt += (txt ? '\n\n' : '') + atts.join('\n');
+      if (atts.length) {
+        txt += (txt ? '\n\n' : '') + atts.join('\n');
+      }
 
-        if (!txt && atts.length > 0) txt = '发送了附件。';
-        if (!txt) continue;
+      if (!txt && atts.length > 0) txt = '发送了附件。';
+      if (!txt) continue;
 
-        const isCommand = txt.trim().startsWith('/');
-        await sleep(180);
-        triggerAgent(cid, m.user_id, sender, txt, isCommand);
-      }
+      const isCommand = txt.startsWith('/');
+      triggerAgent(cid, m.user_id, sender, txt, isCommand);
+      await new Promise(r => setTimeout(r, 250));
     }
+
+    // 完成本轮后推进基准
+    st.lastMsgId = newestId;
+
   } catch (e) {
-    if (e.message !== 'No messages') err(`[${state.name}] 同步错误: ${e.message}`);
+    err(`[${st.name}] 同步失败: ${e.message}`);
   } finally {
-    state.syncing = false;
+    st.syncing = false;
   }
 }
 
-async function pollingLoop() {
-  const interval = Math.max(parseInt(POLL_INTERVAL, 10) || 5000, 2000);
-
+async function pollLoop() {
+  const delay = Math.max(Number(POLL_INTERVAL || 5000), 2000);
   if (isClawReady) {
-    const ids = Array.from(channelRuntime.keys());
-    for (const cid of ids) {
+    for (const cid of channelRuntime.keys()) {
       await syncChannel(cid);
-      await sleep(120);
+      await new Promise(r => setTimeout(r, 100));
     }
   }
-
-  setTimeout(pollingLoop, interval);
-}
-
-// ============================================================
-// 10) Web 控制台
-// ============================================================
-
-const app = express();
-app.use(express.json());
-
-const HTML_PAGE = `
-<!doctype html>
-<html lang="zh">
-<head>
-<meta charset="UTF-8" />
-<meta name="viewport" content="width=device-width,initial-scale=1" />
-<title>Bridge Console</title>
-<style>
-body{font-family:system-ui;background:#f4f6f8;margin:0;padding:20px}
-.wrap{max-width:980px;margin:0 auto;display:grid;gap:16px}
-.card{background:#fff;border-radius:12px;padding:16px;box-shadow:0 1px 4px rgba(0,0,0,.08)}
-.row{display:flex;gap:8px;align-items:center;flex-wrap:wrap}
-input{padding:8px;border:1px solid #ddd;border-radius:8px}
-button{padding:8px 12px;border:0;border-radius:8px;background:#2563eb;color:#fff;cursor:pointer}
-button.del{background:#dc2626}
-.badge{padding:3px 8px;border-radius:999px;font-size:12px}
-.ok{background:#dcfce7;color:#166534}.bad{background:#fee2e2;color:#991b1b}
-table{width:100%;border-collapse:collapse}
-th,td{padding:8px;border-bottom:1px solid #eee;text-align:left}
-#logs{height:340px;overflow:auto;background:#111827;color:#86efac;padding:10px;border-radius:8px;font-family:monospace;font-size:12px;white-space:pre-wrap}
-</style>
-</head>
-<body>
-<div class="wrap">
-  <div class="card row" style="justify-content:space-between">
-    <h2 style="margin:0">🌉 OpenWebUI ↔ OpenClaw Bridge</h2>
-    <div>WS: <span id="ws" class="badge bad">Disconnected</span></div>
-  </div>
-
-  <div class="card">
-    <h3 style="margin-top:0">频道管理（S3持久化）</h3>
-    <div class="row">
-      <input id="cid" placeholder="Channel UUID" style="flex:1;min-width:260px" />
-      <input id="cname" placeholder="Name(可选)" style="flex:1;min-width:180px" />
-      <button onclick="addCh()">添加</button>
-    </div>
-    <table id="tbl">
-      <thead><tr><th>Name</th><th>ID</th><th>Status</th><th>Action</th></tr></thead>
-      <tbody></tbody>
-    </table>
-  </div>
-
-  <div class="card">
-    <h3 style="margin-top:0">运行日志（最近100条）</h3>
-    <div id="logs"></div>
-  </div>
-</div>
-
-<script>
-async function refresh(){
-  try{
-    const h = await (await fetch('/health')).json();
-    const ws = document.getElementById('ws');
-    ws.textContent = h.wsConnected ? 'Connected' : 'Disconnected';
-    ws.className = 'badge ' + (h.wsConnected ? 'ok' : 'bad');
-
-    const ch = await (await fetch('/api/channels')).json();
-    const tb = document.querySelector('#tbl tbody');
-    tb.innerHTML = ch.map(c => \`
-      <tr>
-        <td>\${c.name}</td>
-        <td style="font-family:monospace">\${c.id}</td>
-        <td>\${c.syncing ? '🔄 syncing' : '💤 idle'}</td>
-        <td><button class="del" onclick="delCh('\${c.id}')">删除</button></td>
-      </tr>\`
-    ).join('') || '<tr><td colspan="4" style="color:#999">暂无频道</td></tr>';
-
-    const logs = await (await fetch('/api/logs')).json();
-    document.getElementById('logs').innerHTML = logs.map(x => x.replace(/</g,'&lt;')).join('\\n');
-  }catch(e){}
-}
-async function addCh(){
-  const id = document.getElementById('cid').value.trim();
-  const name = document.getElementById('cname').value.trim();
-  if(!id) return alert('请输入频道ID');
-  await fetch('/api/channels',{method:'POST',headers:{'content-type':'application/json'},body:JSON.stringify({id,name})});
-  document.getElementById('cid').value = '';
-  refresh();
+  setTimeout(pollLoop, delay);
 }
-async function delCh(id){
-  if(!confirm('确认删除?')) return;
-  await fetch('/api/channels/'+encodeURIComponent(id),{method:'DELETE'});
-  refresh();
-}
-refresh();
-setInterval(refresh,3000);
-</script>
-</body>
-</html>
-`;
-
-app.get('/', (req, res) => res.send(HTML_PAGE));
-app.get('/api/logs', (req, res) => res.json(logBuffer));
-app.get('/api/channels', (req, res) => res.json(Array.from(channelRuntime.values())));
-app.get('/health', (req, res) => res.json({ status: 'ok', wsConnected: isClawReady }));
-
-app.post('/api/channels', async (req, res) => {
-  const { id, name } = req.body || {};
-  if (!id) return res.status(400).json({ success: false, error: 'id required' });
-
-  if (!channelRuntime.has(id)) {
-    channelRuntime.set(id, {
-      id,
-      name: name || id,
-      lastMsgId: null,
-      syncing: false,
-      syncStartTime: 0
-    });
-    await saveChannelsToS3();
-    initChannelBaseline(id);
-    log(`➕ 新增频道: ${id}`);
-  }
-  res.json({ success: true });
-});
-
-app.delete('/api/channels/:id', async (req, res) => {
-  const id = req.params.id;
-  if (channelRuntime.delete(id)) {
-    await saveChannelsToS3();
-    log(`➖ 删除频道: ${id}`);
-  }
-  res.json({ success: true });
-});
 
 // ============================================================
-// 11) 启动
+// 9. 启动
 // ============================================================
 
 async function init() {
-  log(`🚀 服务启动端口: ${PORT}`);
-  log(`🧩 BOT_USERNAME: ${BOT_USERNAME}`);
-  log(`📦 S3 Bucket: ${STORAGE_PUBLIC_BUCKET}`);
-
+  log(`🚀 启动端口: ${PORT}`);
+  log(`📦 Bucket: ${STORAGE_PUBLIC_BUCKET}`);
   await loadChannelsFromS3();
 
-  // 启动后为所有频道建立基线
+  // 启动时给每个频道建立基准（不补历史）
   for (const cid of channelRuntime.keys()) {
-    initChannelBaseline(cid);
+    await initChannelBaseline(cid);
   }
 
   connectOpenClaw();
-
-  // 每小时清理一次
   setInterval(cleanOldS3Files, 60 * 60 * 1000);
   cleanOldS3Files();
-
-  pollingLoop();
+  pollLoop();
 }
 
 app.listen(PORT, () => {
-  init().catch((e) => err(`初始化失败: ${e.message}`));
-});
-
-
+  init().catch(e => err(`初始化失败: ${e.message}`));
+});