diff --git a/app/server/config.js b/app/server/config.js
index 6344782..90cef60 100644
--- a/app/server/config.js
+++ b/app/server/config.js
@@ -32,7 +32,7 @@ const DEFAULTS = {
// 只在回合循环结束、finalize 之后检查,AI↔工具交互过程中绝不触发;压缩回合自身不再复查(防递归)。
// 满足条件后延迟 1.5s 再推送(避开超长回合刚结束时前端收尾渲染的高峰;期间会话有变动则撤回提议)。
// 改后重启生效。
- agent: { temperature: 1.0, max_tool_iterations: 50, max_retries: 2, language: '中文', auto_compress_tokens: 60000 },
+ agent: { temperature: 1.0, max_tool_iterations: 50, max_retries: 2, language: 'Simplified Chinese', auto_compress_tokens: 60000 },
// 大图上传预处理:图片文件超过 threshold_kb 时,浏览器端询问用户后用 canvas 压缩
// (长边 ≤ max_dim,JPEG quality)再上传,减轻服务器带宽与存储压力。参数经 /api/system/status 下发给前端。
upload: { image_compress_threshold_kb: 1536, image_max_dim: 2000, image_quality: 0.85 },
diff --git a/app/server/engine.js b/app/server/engine.js
index 7a211c3..6bed575 100644
--- a/app/server/engine.js
+++ b/app/server/engine.js
@@ -2,7 +2,7 @@
// 单进程内存模型:JS 单线程 + better-sqlite3 同步 API,不存在跨进程竞争。
const fs = require('fs');
const path = require('path');
-const { buildMessages, callModel, encodeBlocks, compressPromptText, historyTranscript } = require('./llm');
+const { buildMessages, callModel, encodeBlocks, compressPromptText, historyTranscript, titleMessages } = require('./llm');
const { executeTool, resolveInTask } = require('./tools/executor');
const mcp = require('./mcp');
const log = require('./log');
@@ -11,6 +11,7 @@ const TOOL_DEFINITIONS = require('./tools/definitions.json');
let cfg, db, bus;
const runs = new Map(); // session_id -> {cancelled, procs:Set, abortController, looping:boolean}
+const titling = new Set(); // 正在生成标题的会话(防重入;标题落库后靠 title 非空自然不再触发)
// ---------- 小工具 ----------
const now = () => Date.now();
@@ -410,6 +411,42 @@ function finalize(sessionId, run) {
runs.delete(sessionId);
bus.emit(sessionId, 'done', { status: 'held' });
emitStatus(sessionId);
+ maybeGenerateTitle(sessionId, s);
+}
+
+// 首次交互结束后自动生成会话标题:fire-and-forget,不阻塞回合收尾。
+// 不带 system prompt:历史 user/assistant 原文 + 末尾一条标题指令 user(见 llm.titleMessages),
+// 用会话当前 model_id 发一次不传 tools 的调用。失败静默(title 仍空,下个回合结束自动重试)。
+function maybeGenerateTitle(sessionId, s) {
+ try {
+ if (s.title) return;
+ const modelId = s.model_id;
+ if (!modelId || titling.has(sessionId)) return;
+ titling.add(sessionId);
+ const messages = titleMessages(loadHistory(sessionId), cfg.agent.language);
+ callModel(cfg, modelId, messages, null, {})
+ .then(r => {
+ const title = cleanTitle(r && r.content);
+ if (!title) return;
+ touch(sessionId, { title });
+ bus.emit(sessionId, 'title', { title }); // 前端监听:刷新详情页标题 + 重拉会话列表
+ log.info('task', sessionId + ' 自动生成标题「' + title + '」');
+ })
+ .catch(err => log.warn('task', sessionId + ' 生成标题失败:' + String(err && err.message || err)))
+ .finally(() => titling.delete(sessionId));
+ } catch (e) {
+ titling.delete(sessionId);
+ log.warn('task', sessionId + ' 生成标题异常:' + String(e && e.message || e));
+ }
+}
+
+// 清洗模型返回的标题:压成单行、去包裹引号,截断到 60 字(手动重命名上限 100,留余量)。
+function cleanTitle(raw) {
+ let t = String(raw || '').replace(/\s+/g, ' ').trim();
+ const q = ['"', '\'', '“', '”', '‘', '’', '「', '」', '『', '』', '《', '》'];
+ while (t.length > 2 && q.includes(t[0])) t = t.slice(1).trimStart();
+ while (t.length > 1 && q.includes(t[t.length - 1])) t = t.slice(0, -1).trimEnd();
+ return t.slice(0, 60);
}
async function runLoopInner(sessionId, run) {
@@ -779,9 +816,6 @@ function postUserMessage(sessionId, content, opts) {
const session = getSession(sessionId);
if (!session) throw Object.assign(new Error('会话不存在'), { status_code: 404 });
const messageId = saveMessage(sessionId, { role: 'user', content });
- if (!session.title) {
- touch(sessionId, { title: content.slice(0, 24) });
- }
// 预建/更新 run 记录,记下本轮的 deepThink(被 runLoop / callModel 读取)
const run = getRun(sessionId, true);
run.deepThink = !!(opts && opts.deepThink);
diff --git a/app/server/llm.js b/app/server/llm.js
index 6ef1ff6..6e8da2d 100644
--- a/app/server/llm.js
+++ b/app/server/llm.js
@@ -51,6 +51,30 @@ function compressPromptText(conversation) {
return COMPRESS_PROMPT_TEMPLATE + '\n\n## 对话记录\n' + rec;
}
+// 自动生成会话标题提示词(templates/title-prompt.txt):会话建立后第 1 次交互完成时触发。
+// 与压缩回合不同,这里**不带 system prompt**:直接复用历史里的 user/assistant 文本消息,
+// 末尾追加一条 user(本模板,{{language}} 占位符替换为配置语言),见 titleMessages。
+const TITLE_PROMPT_TEMPLATE = fs.readFileSync(path.join(__dirname, 'templates', 'title-prompt.txt'), 'utf8');
+
+// 拼标题回合的 messages:历史原样(只留 user/assistant 纯文本行)+ 末尾一条标题指令 user。
+// 与 historyTranscript 同取舍:archived 行不进;__blocks__ 哨兵 JSON 还原为文字,图片以 [图片] 占位;
+// 含 tool_calls 的 assistant 行无文本内容则跳过,tool 回执行整体跳过(只要对话主干)。
+function titleMessages(history, language) {
+ const messages = [];
+ for (const row of history || []) {
+ if (row.type === 'archived') continue;
+ if (row.role !== 'user' && row.role !== 'assistant') continue;
+ let content = row.content || '';
+ const blocks = decodeBlocks(content);
+ if (blocks) content = blocks.map(b => (b && b.type === 'text' ? b.text : '[图片]')).join('\n');
+ if (!content.trim()) continue;
+ messages.push({ role: row.role, content });
+ }
+ const lang = String(language || '').trim() || 'the same language as the conversation';
+ messages.push({ role: 'user', content: TITLE_PROMPT_TEMPLATE.replaceAll('{{language}}', () => lang) });
+ return messages;
+}
+
// system prompt 完全静态:所有会话共用同一份内容,利于上游前缀缓存。
function buildSystemPrompt() {
return SYSTEM_PROMPT_TEMPLATE;
@@ -386,4 +410,4 @@ async function callModel(cfg, modelId, messages, tools, options) {
return { content, reasoning, tool_calls: Array.from(toolCalls.values()), finish_reason: finishReason, usage, aborted, sseFrames };
}
-module.exports = { callModel, buildMessages, buildSystemPrompt, systemPromptText, setSkillListText, encodeBlocks, decodeBlocks, compressPromptText, historyTranscript };
+module.exports = { callModel, buildMessages, buildSystemPrompt, systemPromptText, setSkillListText, encodeBlocks, decodeBlocks, compressPromptText, historyTranscript, titleMessages };
diff --git a/app/server/public/index.html b/app/server/public/index.html
index 8bb411f..81b3053 100644
--- a/app/server/public/index.html
+++ b/app/server/public/index.html
@@ -2125,6 +2125,12 @@
updateScrollBottomBtn();
loadSessionList();
});
+ // 服务端首次交互后自动生成的标题(finalize 后约 1s 到达):即时刷新顶栏 + 重拉会话列表(PC 常驻侧边栏/移动抽屉)
+ es.addEventListener('title', ev => {
+ const d = JSON.parse(ev.data);
+ if (d && d.title) { state.sessionTitle = d.title; renderHeader(); }
+ loadSessionList();
+ });
es.addEventListener('error', ev => {
removeTyping();
try {
diff --git a/app/server/public/js/core.js b/app/server/public/js/core.js
deleted file mode 100644
index c863aa3..0000000
--- a/app/server/public/js/core.js
+++ /dev/null
@@ -1,184 +0,0 @@
-// Agent 任务台前端核心(2.0):共享工具函数 + 底部导航路由。
-// 页面拆分:core.js(本文件)/ tasks.js / skills.js / models.js / settings.js。
-// 约定:各业务文件把自身注册进 window.tabModules[tabName] = { onShow() {...} },
-// 路由在对应 Tab 每次显示时调用其 onShow()。
-'use strict';
-
-if (typeof marked !== 'undefined') {
- marked.setOptions({ breaks: true, gfm: true });
-}
-
-// 全局共享状态(目前主要被 tasks.js 使用;core 仅用 sessionId 处理 Tab 切换时的聊天收尾)
-const state = {
- sessionId: null,
- status: '',
- es: null,
- streamEl: null,
- streamText: '',
- turnEl: null,
- toolCards: {},
- filePanelOpen: false,
- pendingDeleteId: null,
- pendingEl: null,
- pendingTimer: null,
- pendingStart: 0,
- streaming: false, // AI 是否正在输出(用于滚动到底部按钮显示加载提示)
-};
-
-window.tabModules = window.tabModules || {};
-
-// ---------- API ----------
-async function req(method, url, body, isForm) {
- const opt = { method, headers: {} };
- if (body && !isForm) {
- opt.headers['Content-Type'] = 'application/json';
- opt.body = JSON.stringify(body);
- } else if (body && isForm) {
- opt.body = body;
- }
- const res = await fetch(url, opt);
- if (res.status === 401) { location.href = '/login'; throw new Error('未登录'); }
- if (!res.ok) {
- let msg = 'HTTP ' + res.status;
- try { msg = (await res.json()).error || msg; } catch (_) {}
- const err = new Error(msg);
- err.status = res.status; // 供调用方区分 409(重启保护/重名)等状态
- throw err;
- }
- return res.json();
-}
-
-// ---------- 工具函数 ----------
-function $(id) { return document.getElementById(id); }
-function esc(s) { const d = document.createElement('div'); d.textContent = s == null ? '' : String(s); return d.innerHTML; }
-function fmtSize(n) {
- if (n == null) return '';
- if (n < 1024) return n + ' B';
- if (n < 1024 * 1024) return (n / 1024).toFixed(1) + ' KB';
- return (n / 1024 / 1024).toFixed(1) + ' MB';
-}
-function fmtTime(ts) {
- if (!ts) return '';
- const d = new Date(ts);
- const p = n => String(n).padStart(2, '0');
- const now = new Date();
- const hm = p(d.getHours()) + ':' + p(d.getMinutes());
- if (now.toDateString() === d.toDateString()) return hm;
- const md = (d.getMonth() + 1) + '/' + d.getDate();
- // 跨天带日期,跨年再带年份
- return (d.getFullYear() === now.getFullYear() ? md : d.getFullYear() + '/' + md) + ' ' + hm;
-}
-// 剪贴板:优先 navigator.clipboard(https/localhost),失败时降级 execCommand。
-// 降级用 readonly textarea + 只 select 不 focus:不选焦点,手机上不弹软键盘。
-async function copyText(text) {
- try {
- if (navigator.clipboard && window.isSecureContext) { await navigator.clipboard.writeText(text); return true; }
- } catch (_) { /* 落入降级 */ }
- try {
- const ta = document.createElement('textarea');
- ta.value = text;
- ta.setAttribute('readonly', '');
- ta.style.position = 'fixed'; ta.style.top = '0'; ta.style.left = '-9999px';
- ta.style.opacity = '0';
- document.body.appendChild(ta);
- ta.select();
- ta.setSelectionRange(0, ta.value.length);
- const ok = document.execCommand('copy');
- document.body.removeChild(ta);
- return ok;
- } catch (_) { return false; }
-}
-function toast(msg) {
- const el = $('toast');
- el.textContent = msg;
- el.classList.remove('hidden');
- clearTimeout(toast._t);
- toast._t = setTimeout(() => el.classList.add('hidden'), 2500);
-}
-
-// ---------- 统一弹窗(替代原生 confirm/prompt;同屏仅弹一个) ----------
-let _dlgResolve = null;
-function _dlgSettle(val) {
- $('confirm-modal').classList.add('hidden');
- $('prompt-modal').classList.add('hidden');
- const r = _dlgResolve;
- _dlgResolve = null;
- if (r) r(val);
-}
-// 确认框:resolve(true/false);danger=true 时确定钮红色
-function confirmModal(title, text, okText, danger) {
- return new Promise(resolve => {
- _dlgResolve = resolve;
- $('confirm-title').textContent = title || '请确认';
- $('confirm-text').textContent = text || '';
- const ok = $('confirm-ok-btn');
- ok.textContent = okText || '确定';
- ok.style.background = danger ? 'linear-gradient(135deg,#a3352a,#d2483c)' : '';
- $('confirm-modal').classList.remove('hidden');
- });
-}
-function confirmClose(v) { _dlgSettle(v); }
-// 输入框:resolve(字符串) 或取消 resolve(null);opts.type 可指定 password 等输入类型
-function promptModal(title, placeholder, initial, opts) {
- return new Promise(resolve => {
- _dlgResolve = resolve;
- $('prompt-title').textContent = title || '请输入';
- const inp = $('prompt-input');
- inp.placeholder = placeholder || '';
- inp.value = initial || '';
- inp.type = opts && opts.type ? opts.type : 'text';
- $('prompt-modal').classList.remove('hidden');
- setTimeout(() => inp.focus(), 60);
- });
-}
-function promptOk() { _dlgSettle($('prompt-input').value); }
-function promptCancel() { _dlgSettle(null); }
-(function () {
- const inp = document.getElementById('prompt-input');
- if (inp) inp.addEventListener('keydown', e => {
- if (e.key === 'Enter') { e.preventDefault(); promptOk(); }
- });
-})();
-
-// ---------- 底部导航路由(hash) ----------
-const TABS = ['tasks', 'skills', 'models', 'settings'];
-
-function currentTabFromHash() {
- const m = /^#\/(\w+)/.exec(location.hash || '');
- const t = m && m[1];
- return TABS.indexOf(t) >= 0 ? t : 'tasks';
-}
-
-function showTab(name) {
- for (const t of TABS) {
- const el = $('tab-' + t);
- if (el) el.classList.toggle('hidden', t !== name);
- }
- for (const a of document.querySelectorAll('.tab-item')) {
- a.classList.toggle('active', a.dataset.tab === name);
- }
- const mod = window.tabModules[name];
- if (mod && typeof mod.onShow === 'function') {
- try { mod.onShow(); } catch (e) { console.error('[tab ' + name + '] onShow 失败', e); }
- }
-}
-
-function initRouter() {
- for (const a of document.querySelectorAll('.tab-item')) {
- a.addEventListener('click', () => {
- // 点当前已激活的 Tab 不会触发 hashchange:若正停在聊天详情,直接返回列表
- if (a.dataset.tab === currentTabFromHash() && state.sessionId && window.ui) ui.backToList();
- });
- }
- window.addEventListener('hashchange', () => {
- // 跨 Tab 导航(含浏览器返回键)时,先收尾打开中的聊天详情
- if (state.sessionId && window.ui) ui.backToList();
- showTab(currentTabFromHash());
- });
-}
-
-function boot() {
- initRouter();
- showTab(currentTabFromHash());
-}
-document.addEventListener('DOMContentLoaded', boot);
diff --git a/app/server/public/js/models.js b/app/server/public/js/models.js
deleted file mode 100644
index a812417..0000000
--- a/app/server/public/js/models.js
+++ /dev/null
@@ -1,361 +0,0 @@
-// 模型 Tab(阶段 5):模型池状态 + 模型增 / 改 / 删(仅写 config.yml,到「设置」页重启才生效)。
-// 配置为 platforms 层级(平台 → models + keys):url/type/models 在平台层,api_key/concurrency 在 Key 层,
-// 同一份 models 被该平台下所有 key 共用。模型项 {id, display_name, vision, enable, ...};id 只需同平台内唯一
-// (内部唯一键 = 平台名/模型id,effective.models 的 id 即该键、mid 为原始模型名)。
-// 页面 PATCH 用 platforms[i].models[k] 定位(key_index 不进入路径,因为模型与 key 解耦);
-// 新增一律走 append(只动目标数组,脱敏 key 绝不整体回写文件);已有 Key 的 api_key 修改请走配置原文编辑器。
-// 展示层暂按「平台名 + 脱敏 Key」分组(cf. models.js modelGroupHtml):每组都展示该平台下所有 models
-// (key 间重复),等后续 UI 重构再去重;余额按 key 拆开,每个 key 一行。
-'use strict';
-
-window.tabModules = window.tabModules || {};
-
-let cfgPlatforms = []; // effective.platforms(服务端已对 api_key 脱敏)
-let cfgModels = []; // 打平后的 effective.models(含 platform_index/key_index/model_index)
- // 注:同一 (name/id) 在 cfgModels 里出现 N 次(N=key 数),key_index 区分 key 副本
-let runtimeById = {}; // 运行池状态,按 id 关联
-let modelsPendingRestart = false;
-let moeIdx = -1; // 当前编辑弹窗对应的打平下标;-1 = 新增
-let expandedGroups = {}; // 模型池分组展开态,key =「pi-ki」;余额按 key 拆,分组即 Key 槽位,默认折叠
-let balanceByGroup = {}; // 余额查询结果缓存,key =「pi-ki」;切 Tab/写配置时清空
-let balanceRequested = {}; // 本 Tab 会话内该分组是否已自动查过(首次展开只自动查一次)
-let balanceTypes = []; // 后端已接入余额查询的平台类型(GET /api/config 的 balance_types)
-
-// api_key 脱敏显示:sk-***1234 样式。后端 GET effective 已脱敏,这里仅兜底(幂等)。
-function maskKey(k) {
- k = k || '';
- if (k.includes('***')) return k;
- if (k.length > 8) return k.slice(0, 3) + '***' + k.slice(-4);
- if (k.length > 0) return '***' + k.slice(-2);
- return '';
-}
-
-// token 用量紧凑显示:1.2k / 9.1M 这种 human-friendly 量级,一眼看出多少。
-// <1000 原样;1k~1M 用 k(1 位小数,去尾零);≥1M 用 M。0 显示为 0。
-function fmtTok(n) {
- n = Number(n) || 0;
- if (n < 1000) return String(n);
- if (n < 1000000) { const v = (n / 1000).toFixed(1).replace(/\.0$/, ''); return v + 'k'; }
- const v = (n / 1000000).toFixed(1).replace(/\.0$/, '');
- return v + 'M';
-}
-
-// ---------- 模型池卡片:按「平台 + Key」分组 ----------
-// 余额由 platform.name + key 决定,故父级 = 平台名 · 脱敏 key,子级 = 该 Key 下的模型;默认折叠。
-
-function toggleModelGroup(gk) {
- const on = !expandedGroups[gk];
- expandedGroups[gk] = on;
- const el = $('mgrp-' + gk);
- if (!el) return;
- el.classList.toggle('open', on);
- const body = el.querySelector('.model-group-body');
- if (body) body.classList.toggle('hidden', !on);
- // 首次展开自动查一次余额(mbal 存在 = 该类型已接入);标记随切 Tab 重置,
- // 故每次切到模型 Tab 后,每个分组只自动查一次,反复折叠展开不重复请求
- if (on && !balanceRequested[gk] && $('mbal-' + gk)) {
- const parts = gk.split('-');
- fetchBalance(gk, Number(parts[0]), Number(parts[1]), false);
- }
-}
-
-// 单个模型的子卡片;余额是 Key 级概念,统一在分组头显示,模型卡不再重复。
-function modelCardHtml(m) {
- const run = runtimeById[m.id];
- // 运行池里没有 = 配置新增但还没重启生效
- const stateHtml = run
- ? '' + (run.is_busy ? '占用中' : '空闲') + ' '
- : '待重启 ';
- return '
' +
- '
' +
- '' + esc(m.display_name || m.mid || m.id) + ' ' +
- // 模型 id / 会话号紧跟名字同行,卡片更紧凑
- '' + esc(m.mid || m.id) +
- (run && run.is_busy && run.current_session_id ? ' · 会话 ' + esc(run.current_session_id) : '') + ' ' +
- stateHtml +
- '
' +
- // token 紧凑显示:输入 / 输出
- '
今日 token ' + (run ? fmtTok(run.today_prompt) + ' / ' + fmtTok(run.today_completion) : '--') + '
' +
- '
累计 token ' + (run ? fmtTok(run.total_prompt) + ' / ' + fmtTok(run.total_completion) : '--') + '
' +
- '
';
-}
-
-// 余额展示文案与悬停详情(查询成功后才有值,默认 --)
-function balText(gk) {
- const b = balanceByGroup[gk];
- if (!b) return '余额 --';
- if (b.error) return '余额 查询失败';
- return '余额 ' + (b.total_balance == null ? '--' : b.total_balance) + (b.currency ? ' ' + esc(b.currency) : '');
-}
-function balTitle(gk) {
- const b = balanceByGroup[gk];
- if (!b) return '';
- if (b.error) return '查询失败:' + b.error;
- const parts = [];
- if (b.available === false) parts.push('上游报告余额不可用');
- if (b.granted_balance != null) parts.push('赠送 ' + b.granted_balance);
- if (b.topped_up_balance != null) parts.push('充值 ' + b.topped_up_balance);
- return parts.join(' · ');
-}
-
-async function fetchBalance(gk, pi, ki, manual) {
- balanceRequested[gk] = true; // 无论成败,本 Tab 会话不再自动重查(手动刷新不受限)
- const btn = $('mbrg-' + gk);
- if (btn) btn.classList.add('spin');
- const el = $('mbal-' + gk);
- if (el) el.textContent = '余额 …';
- try {
- const r = await req('GET', '/api/platforms/balance?pi=' + pi + '&ki=' + ki);
- const b = r.balance || {};
- balanceByGroup[gk] = {
- total_balance: b.total_balance, currency: b.currency,
- granted_balance: b.granted_balance, topped_up_balance: b.topped_up_balance,
- available: b.is_available,
- };
- } catch (e) {
- balanceByGroup[gk] = { error: e.message };
- if (manual) toast('查余额失败:' + e.message); // 自动查询失败只落悬停详情,不打扰
- }
- if (btn) btn.classList.remove('spin');
- const el2 = $('mbal-' + gk);
- if (el2) { el2.textContent = balText(gk); el2.title = balTitle(gk); }
-}
-
-// 点刷新图标:无视「本轮已查过」标记,总是重新请求
-function refreshBalance(ev, pi, ki) {
- if (ev) ev.stopPropagation(); // 冒泡到分组头会误触折叠/展开
- fetchBalance(pi + '-' + ki, pi, ki, true);
-}
-
-// 余额行刷新图标(环形箭头)
-const BAL_REFRESH_SVG = ' ';
-
-function modelGroupHtml(pi, ki) {
- const p = cfgPlatforms[pi] || {};
- const k = (p.keys || [])[ki] || {};
- const gk = pi + '-' + ki;
- // 该平台下所有 models(不按 key_index 过滤;key 间会重复展示,等后续 UI 重构再去重)
- const models = cfgModels.filter(m => m.platform_index === pi && m.key_index === ki);
- // 同 id 在 cfgModels 里出现 N 次(每个 key 副本),卡片只画一次以避免视觉重复;
- // 取该 key 副本下首条即可(同 id 字段相同,渲染无差异)。
- const seen = new Set();
- const dedup = [];
- for (const m of models) { if (!seen.has(m.id)) { seen.add(m.id); dedup.push(m); } }
- const open = !!expandedGroups[gk];
- // 仅已接入余额查询的类型显示余额行(未接入的显示出来也只会是报错,不如不显示)
- const hasBal = balanceTypes.indexOf(String(p.type || '')) >= 0;
- return '' +
- '
' +
- '
' +
- '
' + esc(p.name || ('平台' + pi)) + ' ' +
- '
' + esc(k.api_key ? maskKey(k.api_key) : '无 key') + ' ' +
- '
' + dedup.length + ' 模型 ' +
- '
' +
- '
' +
- (hasBal ?
- '
' +
- '' + balText(gk) + ' ' +
- '' + BAL_REFRESH_SVG + ' ' +
- '
' : '') +
- (dedup.length ? dedup.map(modelCardHtml).join('') : '
该 Key 下暂无模型
') +
- '
' +
- '
';
-}
-
-async function loadModelCards() {
- const el = $('model-cards');
- if (!el) return;
- try {
- const [rt, cg] = await Promise.all([req('GET', '/api/models'), req('GET', '/api/config')]);
- runtimeById = {};
- for (const m of rt || []) runtimeById[m.id] = m;
- cfgPlatforms = (cg.effective && cg.effective.platforms) || [];
- cfgModels = (cg.effective && cg.effective.models) || [];
- balanceTypes = cg.balance_types || [];
- if (!cfgModels.length) {
- el.innerHTML = '尚未配置模型,点右上角 + 添加。
';
- return;
- }
- let html = '';
- cfgPlatforms.forEach((p, pi) => (p.keys || []).forEach((k, ki) => {
- html += modelGroupHtml(pi, ki);
- }));
- el.innerHTML = html +
- (modelsPendingRestart
- ? '已写入 config.yml,到「设置」页重启服务后生效。
'
- : 'token 格式为「输入 / 输出」;余额在分组首次展开时自动查询,点刷新图标可重查;改动写入 config.yml,重启服务后生效。
');
- } catch (e) {
- el.innerHTML = '加载失败:' + esc(e.message) + '
';
- }
-}
-
-function idxOf(id) {
- for (let i = 0; i < cfgModels.length; i++) if (cfgModels[i].id === id) return i;
- return -1;
-}
-function afterWrite() {
- modelsPendingRestart = true;
- balanceByGroup = {}; // 配置变了,旧余额不再对应现有 pi/ki 槽位
- balanceRequested = {};
- toast('已写入 config.yml,到「设置」页重启后生效');
- loadModelCards();
-}
-
-// ---------- 编辑/新增弹窗 ----------
-// Key 标签:「平台名 · sk-***1234」;下拉里用它标识可挂模型的目标 Key(新增模式下展示,实际模型与 key 解耦,
-// 所有 key 都共享 platforms.models)。
-function keyLabel(pi, ki) {
- const p = cfgPlatforms[pi] || {};
- const k = (p.keys || [])[ki] || {};
- return (p.name || ('平台' + pi)) + ' · ' + (k.api_key ? maskKey(k.api_key) : '无 key');
-}
-
-function targetOptions() {
- let html = '';
- cfgPlatforms.forEach((p, pi) => {
- const n = (p.models || []).length;
- html += '' +
- esc(p.name || ('平台' + pi)) + '(' + n + ' 模型) ';
- });
- html += '+ 在已有平台下新增 Key ';
- html += '+ 新增平台 ';
- return html;
-}
-
-// 切换「新增 Key / 新增平台」时显隐对应字段。
-function onTargetChange() {
- const t = $('moe-target').value || '';
- $('moe-newkey-wrap').classList.toggle('hidden', t !== 'newkey');
- $('moe-newplat-wrap').classList.toggle('hidden', t !== 'newplat');
-}
-
-function fillNewKeyPlatforms() {
- $('moe-nk-plat').innerHTML = cfgPlatforms.map((p, i) =>
- '' + esc(p.name || ('平台' + i)) + ' ').join('');
-}
-
-function openModelEditor(rawId) {
- const add = rawId == null;
- moeIdx = add ? -1 : idxOf(decodeURIComponent(rawId));
- if (!add && moeIdx < 0) return toast('模型不存在');
- const m = add ? null : cfgModels[moeIdx];
- $('moe-title').textContent = add ? '添加模型' : '编辑模型';
- const idIn = $('moe-id');
- idIn.value = m ? (m.mid || m.id) : '';
- idIn.disabled = !add; // 编辑时禁改 id(历史会话按「平台名/模型id」绑定,改 id 等于换模型)
- $('moe-name').value = m ? (m.display_name || '') : '';
- $('moe-vision').checked = m ? !!m.vision : false;
- const tgt = $('moe-target');
- if (add) {
- tgt.disabled = false;
- tgt.innerHTML = targetOptions();
- fillNewKeyPlatforms();
- } else {
- // 编辑时锁定目标为本模型所属平台(模型与 key 解耦后,移动模型 = 改 platforms[pi],已不支持)
- const p = cfgPlatforms[m.platform_index] || {};
- tgt.innerHTML = '' + esc(p.name || ('平台' + m.platform_index)) + ' ';
- tgt.disabled = true;
- }
- tgt.onchange = onTargetChange;
- onTargetChange(); // add 模式默认 plat:0 → 两组附加字段都隐藏
- $('moe-del-btn').classList.toggle('hidden', add);
- $('model-edit-modal').classList.remove('hidden');
-}
-function closeModelEditor() { $('model-edit-modal').classList.add('hidden'); }
-
-async function saveModelEditor() {
- const id = $('moe-id').value.trim();
- if (!id) return toast('请填写 id');
- // 模型项本身只含 id/display_name/vision;url/type 在平台层,api_key/concurrency 在 Key 层,这里不动。
- const model = {
- id,
- display_name: $('moe-name').value.trim() || id,
- vision: $('moe-vision').checked,
- };
- const add = moeIdx < 0;
- let body;
- if (!add) {
- // 编辑:改到 platforms[pi].models[mi](与 key 解耦,所有 key 共享同一份 models)
- const m = cfgModels[moeIdx];
- body = { path: ['platforms', m.platform_index, 'models', m.model_index], value: model };
- } else {
- const t = $('moe-target').value;
- // id 唯一性只看同平台(内部键 = 平台名/模型id);不同平台可同名。
- let platIdx = -1;
- if (t === 'newkey') platIdx = parseInt($('moe-nk-plat').value, 10);
- else if (t.indexOf('plat:') === 0) platIdx = Number(t.split(':')[1]);
- if (platIdx >= 0) {
- const p = cfgPlatforms[platIdx] || {};
- if (cfgModels.some(x => x.platform === p.name && x.mid === id)) {
- return toast('平台「' + (p.name || '') + '」下已有模型 id:' + id);
- }
- }
- if (t === 'newplat') {
- const url = $('moe-np-url').value.trim().replace(/\/+$/, '');
- if (!url) return toast('请填写平台上游地址');
- // append 一整个新平台:含一份 models 和一个 key;key 明文只在此时输入一次。
- body = { op: 'append', path: ['platforms'], value: {
- name: $('moe-np-name').value.trim(),
- url,
- type: $('moe-np-type').value.trim(),
- models: [model],
- keys: [{ api_key: $('moe-np-key').value.trim(), concurrency: parseInt($('moe-np-con').value, 10) || 1 }],
- } };
- } else if (t === 'newkey') {
- if (!(platIdx >= 0)) return toast('请选择平台');
- // append 一个新 Key 到已有平台(models 与 key 解耦,这里只追加 key,不重复 model)
- body = { op: 'append', path: ['platforms', platIdx, 'keys'], value: {
- api_key: $('moe-nk-key').value.trim(), concurrency: parseInt($('moe-nk-con').value, 10) || 1 } };
- // 紧接着把模型 append 到 platforms[platIdx].models
- await req('PATCH', '/api/config', body);
- try {
- await req('PATCH', '/api/config', { op: 'append', path: ['platforms', platIdx, 'models'], value: model });
- } catch (e) { throw e; }
- closeModelEditor();
- afterWrite();
- return;
- } else {
- // plat:pi → append 模型到 platforms[pi].models
- body = { op: 'append', path: ['platforms', platIdx, 'models'], value: model };
- }
- }
- try {
- await req('PATCH', '/api/config', body);
- closeModelEditor();
- afterWrite();
- } catch (e) { toast('保存失败:' + e.message); }
-}
-
-async function delModelFromModal() {
- if (moeIdx < 0) return;
- const m = cfgModels[moeIdx];
- closeModelEditor();
- // 唯一性:同 id 在 cfgModels 里出现 N 次(N=key 数);删之前确认至少还剩一个平台的模型数 > 0
- const otherIds = new Set(cfgModels.filter(x => x.id !== m.id).map(x => x.id));
- if (otherIds.size < 1) return toast('至少要保留一个模型');
- const ok = await confirmModal('删除模型', '删除模型「' + (m.display_name || m.id) + '」?将从 platforms 中移除该模型项(该平台下所有 key 都不再可用此模型)。', '删除', true);
- if (!ok) return;
- try {
- // delete 到 platforms[pi].models[mi](与 key 解耦);YAML 数组删项会自动收紧,不影响其他行注释。
- await req('PATCH', '/api/config', { path: ['platforms', m.platform_index, 'models', m.model_index], op: 'delete' });
- SET.deletedModels[m.id] = true; // 重启前后端仍会返回该模型,本地标记隐藏
- afterWrite();
- } catch (e) { toast('删除失败:' + e.message); }
-}
-
-window.modelsUI = {
- openAdd: function () { openModelEditor(null); },
- openEdit: openModelEditor,
- close: closeModelEditor,
- save: saveModelEditor,
- del: delModelFromModal,
- onTargetChange: onTargetChange,
- toggleGroup: toggleModelGroup,
- refreshBalance: refreshBalance,
-};
-
-tabModules.models = {
- // 每次切到模型 Tab:余额结果与「本 Tab 已自动查过」标记一并重置,
- // 分组首次点开时重新自动查一次(对应需求:每次切 Tab 后只首次点开自动更新)
- onShow() { balanceByGroup = {}; balanceRequested = {}; loadModelCards(); },
-};
diff --git a/app/server/public/js/settings.js b/app/server/public/js/settings.js
deleted file mode 100644
index 0e9f522..0000000
--- a/app/server/public/js/settings.js
+++ /dev/null
@@ -1,290 +0,0 @@
-// 设置 Tab(阶段 5):账号 / 服务状态与重启 / config.yml 表单化编辑。
-// 语义:所有写入 = 服务端校验 → 写盘;多数改动需「重启服务」生效(本项目不做热重载)。
-// 表单值展示的是「当前生效值」;改完未重启前显示旧值属正常,保存按钮统一写盘。
-// 模型池 / 登录账号 / MCP / 路径类配置不在本页编辑,请用顶栏「配置文件」图标改原文。
-'use strict';
-
-window.tabModules = window.tabModules || {};
-
-let effCfg = null; // 当前生效配置(GET /api/config 的 effective)
-let cfgOrig = ''; // 原文编辑器打开/上次保存内容(脏检测)
-const pendingKeys = new Set(); // 本次会话已写盘、但尚未通过重启生效的顶层段
-
-const sleep = ms => new Promise(r => setTimeout(r, ms));
-
-function getByPath(obj, p) {
- return String(p).split('.').reduce((o, k) => (o == null ? undefined : o[k]), obj);
-}
-function fmtUptime(ms) {
- const s = Math.floor((ms || 0) / 1000);
- const d = Math.floor(s / 86400), h = Math.floor(s % 86400 / 3600), m = Math.floor(s % 3600 / 60);
- if (d) return d + ' 天 ' + h + ' 小时';
- if (h) return h + ' 小时 ' + m + ' 分';
- if (m) return m + ' 分 ' + (s % 60) + ' 秒';
- return s + ' 秒';
-}
-function dispVal(v) {
- if (v === undefined || v === null || v === '') return '(未设置)';
- if (typeof v === 'boolean') return v ? '是' : '否';
- return String(v);
-}
-// 属性上下文转义(esc 不处理引号)
-function att(s) { return esc(s).replace(/"/g, '"'); }
-
-// ---------- 表单 schema:path 点分路径;type:int|float ----------
-const CFG_FORM = [
- { group: 'Agent 会话', items: [
- { path: 'agent.temperature', label: '温度 temperature', type: 'float' },
- { path: 'agent.max_tool_iterations', label: '单会话最大工具轮次', type: 'int' },
- { path: 'agent.max_retries', label: '上游失败重试次数', type: 'int' },
- { path: 'agent.language', label: '回复语言(留空不限)', type: 'text' },
- ] },
- { group: '终端工具', items: [
- { path: 'terminal.default_timeout_ms', label: '命令默认超时(ms)', type: 'int' },
- { path: 'terminal.max_output_chars', label: '输出最大字符数', type: 'int' },
- ] },
- { group: '技能', items: [
- { path: 'skills.timeout_ms', label: '技能执行超时(ms)', type: 'int' },
- ] },
- { group: '图片上传压缩(浏览器端)', items: [
- { path: 'upload.image_compress_threshold_kb', label: '大图阈值(KB)', type: 'int' },
- { path: 'upload.image_max_dim', label: '压缩后长边上限(px)', type: 'int' },
- { path: 'upload.image_quality', label: 'JPEG 质量(0~1)', type: 'float' },
- ] },
- { group: '模型租约(会话结束后的保持)', items: [
- { path: 'model_hold.idle_release_ms', label: '无人观看释放(ms)', type: 'int' },
- { path: 'model_hold.active_max_ms', label: '最长保持(ms)', type: 'int' },
- { path: 'model_hold.sweep_ms', label: '巡检间隔(ms)', type: 'int' },
- ] },
-];
-
-// ---------- 渲染 ----------
-function kvPlain(label, v) {
- return '' + esc(label) + ' ' + esc(dispVal(v)) + '
';
-}
-
-// 用户信息卡(仅启用认证时显示,页面顶部):Google 风双字母头像 + 用户名 + 操作按钮。
-// 头像字母/配色均前端本地生成,无外部依赖。
-const AVATAR_COLORS = ['#4285F4', '#EA4335', '#FBBC05', '#34A853', '#5C6BC0', '#00897B', '#8E24AA', '#F4511E'];
-
-// 取用户名前两个字符:首字母大写、次字母小写(kicer→Ki);单字符只显一个;
-// 中文取前两字,charAt 大小写对汉字无副作用,无需特判
-function userInitials(name) {
- const s = String(name || '').trim();
- if (!s) return '?';
- const two = s.slice(0, 2);
- return two.charAt(0).toUpperCase() + (two.length > 1 ? two.charAt(1).toLowerCase() : '');
-}
-function avatarColor(name) {
- let h = 0;
- for (const ch of String(name || '')) h = (h * 31 + ch.codePointAt(0)) >>> 0;
- return AVATAR_COLORS[h % AVATAR_COLORS.length];
-}
-
-function userCard(me) {
- return '' +
- '
' + esc(userInitials(me)) + '
' +
- '
' + esc(me) + '
' +
- '
' +
- '修改密码 ' +
- '退出登录 ' +
- '
';
-}
-
-async function changePassword() {
- try {
- const newP = await promptModal('修改密码', '新密码,至少 6 位', '', { type: 'password' });
- if (newP == null) return;
- if (newP.length < 6) { toast('新密码至少 6 位'); return; }
- await req('POST', '/api/password', { new_password: newP });
- toast('密码已修改,立即生效');
- } catch (e) {
- toast('修改失败:' + e.message);
- }
-}
-
-function svcCard(st) {
- let html = '服务状态' +
- (pendingKeys.size ? ' 待重启生效 ' : '') + ' ';
- html += kvPlain('版本 / Node', st.version + ' / ' + st.node);
- html += kvPlain('已运行', fmtUptime(st.uptime_ms) + '(启动于 ' + new Date(st.started_at).toLocaleString() + ')');
- html += kvPlain('端口', st.port);
- html += kvPlain('配置文件', st.config_path);
- html += kvPlain('工作区', st.workspace_root);
- html += kvPlain('数据目录', st.data_root);
- html += kvPlain('技能目录', st.skills_root);
- html += kvPlain('命令执行', st.executor_url ? st.executor_url + '(远端)' : '本地');
- if (pendingKeys.size) html += kvPlain('待生效改动', Array.from(pendingKeys).join(', '));
- html += '
重启服务 ' +
- '
配置改动重启后生效;重启约需十几秒,期间页面暂不可用。非 Docker 部署不会自动拉起。
';
- return html;
-}
-
-function cfgInput(it) {
- const cur = getByPath(effCfg, it.path);
- const v = cur == null ? '' : String(cur);
- if (it.type === 'text') {
- return '' + esc(it.label) + ' ' +
- '
';
- }
- const step = it.type === 'float' ? ' step="any"' : ' step="1"';
- return '' + esc(it.label) + ' ' +
- '
';
-}
-
-function formCard() {
- let html = '';
- for (const g of CFG_FORM) {
- html += '
' + esc(g.group) + ' ';
- html += g.items.map(cfgInput).join('');
- html += '';
- }
- html += '更新配置 ' +
- '更新即写入 config.yml(注释保留);多数配置需重启服务后生效。' +
- '模型、账号、MCP 等请用右上角配置文件编辑。
';
- return html;
-}
-
-async function loadSettings() {
- bindDirtyMark();
- const el = $('cfg-sections');
- if (!el) return;
- el.innerHTML = '加载中…
';
- try {
- const [st, cg, me] = await Promise.all([
- req('GET', '/api/system/status'),
- req('GET', '/api/config'),
- req('GET', '/api/me').catch(function () { return { user: null }; }), // 未启用认证时无此路由
- ]);
- effCfg = cg.effective || {};
- el.innerHTML = (st.auth_enabled && me && me.user ? userCard(me.user) : '') + svcCard(st) + formCard();
- } catch (e) {
- el.innerHTML = '加载失败:' + esc(e.message) + '
';
- }
-}
-
-// 未保存改动标红:委托监听(#cfg-sections 容器常驻,innerHTML 重建不影响)
-let dirtyBound = false;
-function bindDirtyMark() {
- if (dirtyBound) return;
- const box = $('cfg-sections');
- if (!box) return;
- dirtyBound = true;
- box.addEventListener('input', function (ev) {
- const inp = ev.target;
- if (inp.classList && inp.classList.contains('cfg-input')) {
- inp.classList.toggle('cfg-dirty', inp.value.trim() !== inp.dataset.orig);
- }
- });
-}
-
-// ---------- 表单保存(收集与打开时不同的项,逐项 PATCH) ----------
-async function saveForm() {
- const inputs = document.querySelectorAll('#cfg-sections .cfg-input');
- const edits = [];
- for (const inp of inputs) {
- const v = inp.value.trim();
- if (v === inp.dataset.orig) continue;
- let val = v;
- if (inp.dataset.type === 'int' || inp.dataset.type === 'float') {
- val = Number(v);
- if (v === '' || !isFinite(val)) { toast('「' + inp.dataset.label + '」需填数字'); return; }
- if (inp.dataset.type === 'int' && !Number.isInteger(val)) { toast('「' + inp.dataset.label + '」需为整数'); return; }
- }
- edits.push({ path: inp.dataset.path, value: val });
- }
- if (!edits.length) { toast('没有改动'); return; }
- const btn = $('cfg-save-btn');
- if (btn) btn.disabled = true;
- let lastChanged = [];
- try {
- for (const e of edits) {
- const r = await req('PATCH', '/api/config', { path: e.path, value: e.value });
- lastChanged = r.changed || [];
- lastChanged.forEach(k => pendingKeys.add(k));
- }
- toast('已保存 ' + edits.length + ' 项' + (lastChanged.length ? ',重启后生效' : ''));
- } catch (e) {
- toast('保存失败:' + e.message);
- } finally {
- if (btn) btn.disabled = false;
- }
- loadSettings();
-}
-
-// ---------- 重启 ----------
-async function restart() {
- if (!await confirmModal('重启服务', '重启服务使新配置生效?正在执行的 AI 会话会被打断。', '重启')) return;
- try {
- await req('POST', '/api/system/restart');
- } catch (e) {
- if (e.status === 409 && /个任务.*执行中/.test(e.message)) {
- // 仅「有会话在跑」值得二次确认强打;配置不合法等 409 强打也无法启动,直接报给用户
- if (!await confirmModal('有任务在跑', e.message, '强制重启', true)) return;
- try { await req('POST', '/api/system/restart?force=true'); }
- catch (e2) { toast('重启失败:' + e2.message); return; }
- } else { toast('重启失败:' + e.message); return; }
- }
- const btn = $('restart-btn');
- if (btn) { btn.disabled = true; btn.textContent = '重启中,请勿关闭页面…'; }
- toast('服务重启中…');
- for (let i = 0; i < 90; i++) {
- await sleep(1000);
- try { const r = await fetch('/api/health'); if (r.ok) { location.reload(); return; } } catch (_) {}
- }
- toast('90 秒内未恢复,请检查容器状态(非 Docker 部署需手动启动)');
- if (btn) { btn.disabled = false; btn.textContent = '重启服务'; }
-}
-
-// ---------- config.yml 原文编辑器(顶栏图标打开) ----------
-async function openCfgEditor() {
- try {
- const cg = await req('GET', '/api/config');
- cfgOrig = cg.text;
- $('cfg-editor-area').value = cg.text;
- $('cfg-editor-err').classList.add('hidden');
- $('cfg-editor').classList.remove('hidden');
- } catch (e) { toast('读取失败:' + e.message); }
-}
-async function saveCfgEditor() {
- const text = $('cfg-editor-area').value;
- const errEl = $('cfg-editor-err');
- errEl.classList.add('hidden');
- try {
- await req('POST', '/api/config/validate', { text }); // 先干跑,错误信息更友好
- const r = await req('PUT', '/api/config', { text });
- cfgOrig = text;
- (r.changed || []).forEach(k => pendingKeys.add(k));
- toast('配置已保存');
- $('cfg-editor').classList.add('hidden');
- loadSettings(); // 保存成功直接退出编辑页
- } catch (e) {
- errEl.textContent = '校验失败:' + e.message;
- errEl.classList.remove('hidden');
- toast('配置不合法,未写入');
- }
-}
-async function closeCfgEditor() {
- if ($('cfg-editor-area').value !== cfgOrig &&
- !await confirmModal('未保存的修改', '有未保存的修改,确定关闭并丢弃?', '关闭', true)) return;
- $('cfg-editor').classList.add('hidden');
- loadSettings(); // 原文可能改了生效值相关的显示,回到本页时刷新
-}
-
-window.cfgUI = {
- saveForm: saveForm,
- changePassword: changePassword,
- restart: restart,
- open: openCfgEditor,
- save: saveCfgEditor,
- close: closeCfgEditor,
-};
-
-tabModules.settings = {
- onShow() { loadSettings(); },
-};
diff --git a/app/server/public/js/skills.js b/app/server/public/js/skills.js
deleted file mode 100644
index 82a932e..0000000
--- a/app/server/public/js/skills.js
+++ /dev/null
@@ -1,248 +0,0 @@
-// 技能 Tab:SKILL 管理(技能增删改 + 技能内文件管理)。
-// 只做文件管理,不执行技能;技能是否生效由用户在任务里自行测试。
-// 视图:列表(list) / 技能详情(detail) / 文件编辑器(editor,全屏覆盖本 Tab)。
-'use strict';
-
-window.tabModules = window.tabModules || {};
-
-// 当前技能名(详情/编辑视图有效)与编辑器状态
-let curSkill = null;
-let editorPath = null; // 正在编辑的文件相对路径
-let editorOrig = ''; // 打开/上次保存时的内容,用于脏检测
-
-// ---------- 视图切换 ----------
-function setSkillsView(v) {
- $('skills-back-btn').classList.toggle('hidden', v === 'list');
- $('skill-new-btn').classList.toggle('hidden', v !== 'list');
- $('skill-upload-btn').classList.toggle('hidden', v !== 'detail');
- $('skills-list').classList.toggle('hidden', v !== 'list');
- $('skill-detail').classList.toggle('hidden', v !== 'detail');
- $('skill-editor').classList.toggle('hidden', v !== 'editor');
-}
-
-// ---------- 列表 ----------
-async function loadSkillList() {
- curSkill = null;
- setSkillsView('list');
- $('skills-title').textContent = '技能管理';
- const el = $('skills-list');
- el.innerHTML = '加载中…
';
- try {
- const rows = await req('GET', '/api/skills');
- if (!rows.length) {
- el.innerHTML = '还没有技能,点右上角 + 新建一个。
';
- return;
- }
- el.innerHTML = rows.map(s => {
- const a = encodeURIComponent(s.name);
- return '' +
- '
' +
- '
' + esc(s.name) +
- (s.has_md ? '' : ' 缺 SKILL.md ') +
- (s.entry ? ' ' + s.entry + ' 入口 ' : '') +
- '
' +
- '
' + esc(s.description || '') + '
' +
- '
' + s.file_count + ' 个文件 ' +
- '' + fmtSize(s.size) + ' ' +
- (s.mtime ? '' + fmtTime(s.mtime) + ' ' : '') + '
' +
- '
' +
- '
' +
- '改名 ' +
- '删除 ' +
- '
' +
- '
';
- }).join('');
- } catch (e) {
- el.innerHTML = '加载失败:' + esc(e.message) + '
';
- }
-}
-
-// ---------- 详情(文件列表) ----------
-async function loadSkillDetail() {
- if (!curSkill) return loadSkillList();
- const el = $('skill-detail');
- el.innerHTML = '加载中…
';
- try {
- const d = await req('GET', '/api/skills/' + encodeURIComponent(curSkill));
- $('skills-title').textContent = d.name;
- const newBtn = '+ 新建文件 ';
- if (!d.files.length) {
- el.innerHTML = '' + newBtn;
- return;
- }
- el.innerHTML = '' + d.files.map(f => {
- const a = encodeURIComponent(f.filename);
- return '
' +
- '
' +
- '
' + esc(f.filename) + ' ' +
- '
' + fmtSize(f.size) + ' ' +
- '
编辑 ' +
- '
删除 ' +
- '
';
- }).join('') + '
' + newBtn;
- } catch (e) {
- el.innerHTML = '加载失败:' + esc(e.message) + '
';
- }
-}
-
-async function openSkill(name) {
- curSkill = decodeURIComponent(name);
- setSkillsView('detail');
- await loadSkillDetail();
-}
-
-function backFromSkill() {
- // 编辑器内的返回由 closeEditor 处理;这里只处理顶部返回(先提醒未保存)
- loadSkillList();
-}
-
-// ---------- 技能增删改 ----------
-function openCreateSkill() {
- $('skill-new-name').value = '';
- $('skill-new-desc').value = '';
- $('skill-create-modal').classList.remove('hidden');
- $('skill-new-name').focus();
-}
-function closeCreateSkill() { $('skill-create-modal').classList.add('hidden'); }
-
-async function createSkill() {
- const name = $('skill-new-name').value.trim();
- if (!name) { toast('请填写技能名'); return; }
- try {
- await req('POST', '/api/skills', { name, description: $('skill-new-desc').value.trim() });
- closeCreateSkill();
- toast('已创建 ' + name);
- // 新建后直接进入详情,方便继续编辑 SKILL.md
- await openSkill(encodeURIComponent(name));
- } catch (e) { toast('创建失败:' + e.message); }
-}
-
-async function renameSkill(nameEnc) {
- const name = nameEnc ? decodeURIComponent(nameEnc) : curSkill;
- if (!name) return;
- const nn = await promptModal('重命名技能', '新的技能名', name);
- if (nn == null) return;
- const newName = nn.trim();
- if (!newName || newName === name) return;
- try {
- await req('POST', '/api/skills/' + encodeURIComponent(name) + '/rename', { newName });
- toast('已重命名为 ' + newName);
- if (curSkill === name) { curSkill = newName; await loadSkillDetail(); }
- else await loadSkillList();
- } catch (e) { toast('重命名失败:' + e.message); }
-}
-
-async function deleteSkill(nameEnc) {
- const name = nameEnc ? decodeURIComponent(nameEnc) : curSkill;
- if (!name) return;
- if (!await confirmModal('删除技能', '确定删除技能「' + name + '」?目录下所有文件将不可恢复。', '删除', true)) return;
- try {
- await req('DELETE', '/api/skills/' + encodeURIComponent(name));
- toast('已删除 ' + name);
- if (curSkill === name) curSkill = null;
- loadSkillList();
- } catch (e) { toast('删除失败:' + e.message); }
-}
-
-// ---------- 技能内文件 ----------
-async function openFileEditor(path) {
- const rel = decodeURIComponent(path);
- try {
- const f = await req('GET', '/api/skills/' + encodeURIComponent(curSkill) + '/file?path=' + encodeURIComponent(rel));
- editorPath = f.path; editorOrig = f.content;
- $('skill-editor-name').textContent = curSkill + ' / ' + f.path;
- $('skill-editor-area').value = f.content;
- setSkillsView('editor');
- } catch (e) { toast('打开失败:' + e.message); }
-}
-
-async function saveSkillFile() {
- if (!curSkill || editorPath == null) return;
- const content = $('skill-editor-area').value;
- try {
- await req('PUT', '/api/skills/' + encodeURIComponent(curSkill) + '/file', { path: editorPath, content });
- editorOrig = content;
- toast('已保存 ' + editorPath);
- // 保存成功直接退出编辑页回文件列表
- editorPath = null;
- setSkillsView('detail');
- loadSkillDetail();
- } catch (e) { toast('保存失败:' + e.message); }
-}
-
-async function closeSkillEditor() {
- if ($('skill-editor-area').value !== editorOrig &&
- !await confirmModal('未保存的修改', '有未保存的修改,确定关闭编辑器并丢弃?', '关闭', true)) return;
- editorPath = null; editorOrig = '';
- setSkillsView('detail');
- loadSkillDetail();
-}
-
-async function newSkillFile() {
- if (!curSkill) return;
- const p = await promptModal('新建文件', '相对技能目录的路径,可含子目录(如 scripts/run.sh)', '');
- if (p == null) return;
- const rel = p.trim();
- if (!rel) { toast('路径为空'); return; }
- editorPath = rel; editorOrig = '';
- $('skill-editor-name').textContent = curSkill + ' / ' + rel + '(新建)';
- $('skill-editor-area').value = '';
- setSkillsView('editor');
- $('skill-editor-area').focus();
-}
-
-async function deleteSkillFile(path) {
- const rel = decodeURIComponent(path);
- if (!await confirmModal('删除文件', '删除文件 ' + rel + ' ?', '删除', true)) return;
- try {
- await req('DELETE', '/api/skills/' + encodeURIComponent(curSkill) + '/file?path=' + encodeURIComponent(rel));
- toast('已删除');
- loadSkillDetail();
- } catch (e) { toast('删除失败:' + e.message); }
-}
-
-// 单文件上传;重名默认 409,询问后带 overwrite 重试
-async function uploadSkillFile(ev) {
- const input = ev.target;
- const file = input.files && input.files[0];
- input.value = '';
- if (!file || !curSkill) return;
- const send = async function (overwrite) {
- const fd = new FormData();
- fd.append('file', file);
- return req('POST', '/api/skills/' + encodeURIComponent(curSkill) + '/upload' + (overwrite ? '?overwrite=true' : ''), fd, true);
- };
- try {
- await send(false);
- toast('已上传 ' + file.name);
- } catch (e) {
- if (/已存在/.test(e.message)) {
- if (!await confirmModal('文件已存在', file.name + ' 已存在,覆盖?', '覆盖')) return;
- try { await send(true); toast('已覆盖 ' + file.name); }
- catch (e2) { toast('上传失败:' + e2.message); }
- } else {
- toast('上传失败:' + e.message);
- }
- }
- loadSkillDetail();
-}
-
-window.skillsUI = {
- back: backFromSkill,
- open: openSkill,
- openCreate: openCreateSkill,
- closeCreate: closeCreateSkill,
- createSkill: createSkill,
- renameSkill: renameSkill,
- deleteSkill: deleteSkill,
- editFile: openFileEditor,
- saveFile: saveSkillFile,
- closeEditor: closeSkillEditor,
- newFile: newSkillFile,
- deleteFile: deleteSkillFile,
- onUpload: uploadSkillFile,
-};
-
-tabModules.skills = {
- onShow() { loadSkillList(); },
-};
diff --git a/app/server/public/js/tasks.js b/app/server/public/js/tasks.js
deleted file mode 100644
index eae93b4..0000000
--- a/app/server/public/js/tasks.js
+++ /dev/null
@@ -1,1154 +0,0 @@
-// 任务 Tab:会话列表 / 聊天(SSE 流式)/ 文件管理 / 阶段开关。
-// 交互沿用 1.0:移动优先,聊天详情为全屏覆盖页(盖住底部导航),右滑返回列表。
-'use strict';
-
-// ---------- 工具摘要(工具卡片用) ----------
-function toolArgsSummary(name, argsStr) {
- let s = '';
- try {
- const o = JSON.parse(argsStr || '{}');
- const key = ['path', 'command', 'regex', 'glob', 'url', 'query', 'source_path', 'destination_path'];
- for (const k of key) if (o[k]) { s = String(o[k]); break; }
- if (!s) s = argsStr || '';
- } catch (_) { s = argsStr || ''; }
- if (s.length > 80) s = s.slice(0, 80) + '…';
- return s;
-}
-function toolArgsFull(argsStr) {
- try { return JSON.stringify(JSON.parse(argsStr || '{}'), null, 2); }
- catch (_) { return argsStr || ''; }
-}
-
-// ---------- 聊天详情覆盖页进出(底部导航随之隐藏/恢复) ----------
-function showChat() {
- $('tabbar').classList.add('hidden');
- const cp = $('chat-page');
- cp.classList.remove('hidden');
- cp.classList.add('off-right');
- requestAnimationFrame(() => {
- requestAnimationFrame(() => cp.classList.remove('off-right'));
- });
-}
-function showList() {
- const cp = $('chat-page');
- cp.classList.add('off-right');
- setTimeout(() => cp.classList.add('hidden'), 50);
- $('tabbar').classList.remove('hidden');
-}
-
-// 滑动切换:聊天页右滑返回列表
-(function bindSwipe() {
- let x0 = null, y0 = null;
- const cp = $('chat-page');
- if (!cp) return;
- cp.addEventListener('touchstart', e => {
- if (e.touches.length !== 1) return;
- x0 = e.touches[0].clientX; y0 = e.touches[0].clientY;
- }, { passive: true });
- cp.addEventListener('touchend', e => {
- if (x0 == null) return;
- const t = e.changedTouches[0];
- const dx = t.clientX - x0, dy = t.clientY - y0;
- x0 = null;
- if (dx > 70 && Math.abs(dy) < 60) ui.backToList();
- }, { passive: true });
-})();
-
-// ---------- 会话列表(活跃 + 归档分页 + 搜索) ----------
-const DONE_PAGE = 10; // 归档每页条数
-let activeRows = []; // 当前活跃会话(含排队/保持)
-let searchMode = false; // 搜索模式:列表区显示搜索结果
-let doneRows = []; // 已加载的归档行
-let doneTotal = 0; // 归档总数
-let doneCursor = null; // 下一页游标 {updated_at, id}
-let doneLoading = false;
-
-// 单张会话卡片(活跃/归档/搜索结果共用)
-function sessionCard(s) {
- const st = { queued: '排队中', active: '活跃中', held: '保持中', completed: '已完成', cancelled: '已终止' }[s.status] || s.status;
- const badge = '' + st + (s.status === 'queued' && s.queue_pos ? ' #' + s.queue_pos : '') + ' ';
- return '' +
- '
' +
- '
' + esc(s.title || s.id) + '
' +
- '
' + esc(s.id) + ' ' + badge +
- (s.model_id ? '' + esc(s.model_id) + ' ' : '') + '
' +
- '
' +
- '
删除 ' +
- '
';
-}
-
-function renderSessionList() {
- const el = $('session-list');
- let html = activeRows.map(sessionCard).join('');
- html += doneRows.map(sessionCard).join('');
- if (!activeRows.length && !doneTotal) {
- html += '还没有任务,点右上角 + 新建
';
- }
- const remain = doneTotal - doneRows.length;
- if (remain > 0) {
- // 括号内是剩余未展示的归档数,如总共 100、已显 10 则显示「加载更多(90)」
- html += '加载更多(' + remain + ') ';
- }
- el.innerHTML = html;
-}
-
-async function loadSessions() {
- if (searchMode) return doSearch();
- try {
- const lists = await Promise.all([
- req('GET', '/api/sessions?status=active&limit=100'),
- req('GET', '/api/sessions?status=done&limit=' + DONE_PAGE + '&with_total=1'),
- ]);
- activeRows = lists[0];
- doneRows = lists[1].rows;
- doneTotal = lists[1].total;
- const last = doneRows[doneRows.length - 1];
- doneCursor = last ? { updated_at: last.updated_at, id: last.id } : null;
- renderSessionList();
- } catch (e) { toast('加载会话失败:' + e.message); }
-}
-
-async function loadMoreDone() {
- if (doneLoading || !doneCursor) return;
- doneLoading = true;
- renderSessionList(); // 按钮置灰
- try {
- const r = await req('GET', '/api/sessions?status=done&limit=' + DONE_PAGE + '&with_total=1' +
- '&before=' + encodeURIComponent(doneCursor.updated_at) + '&before_id=' + encodeURIComponent(doneCursor.id));
- doneRows = doneRows.concat(r.rows);
- doneTotal = r.total;
- const last = r.rows[r.rows.length - 1];
- if (last) doneCursor = { updated_at: last.updated_at, id: last.id };
- else doneTotal = doneRows.length; // 防御:数据变少导致翻页空转,直接隐藏按钮
- } catch (e) { toast('加载更多失败:' + e.message); }
- doneLoading = false;
- renderSessionList();
-}
-
-function toggleSearch() {
- searchMode = !searchMode;
- $('search-bar').classList.toggle('hidden', !searchMode);
- const input = $('search-input');
- if (searchMode) {
- input.focus();
- if (input.value.trim()) doSearch();
- } else {
- input.value = '';
- loadSessions();
- }
-}
-
-async function doSearch() {
- const q = $('search-input').value.trim();
- if (!q) return loadSessions();
- try {
- const r = await req('GET', '/api/sessions?q=' + encodeURIComponent(q) + '&limit=50&with_total=1');
- const el = $('session-list');
- if (!r.rows.length) {
- el.innerHTML = '没有找到包含「' + esc(q) + '」的任务
';
- return;
- }
- el.innerHTML = '找到 ' + r.total + ' 个相关任务
' + r.rows.map(sessionCard).join('');
- } catch (e) { toast('搜索失败:' + e.message); }
-}
-
-// ---------- 待发送附件 ----------
-// 选定文件后立即传到任务目录,但**不通知 AI**;下一条用户消息发送时,
-// 由服务端在正文前拼【系统通知】一并送达(见 routes/messages.js)。
-let pendingFiles = []; // { name, size, pct, status: 'up'|'ok'|'err', xhr? }
-
-function renderAttach() {
- const row = $('attach-row');
- if (!row) return;
- row.classList.toggle('hidden', !pendingFiles.length);
- row.innerHTML = pendingFiles.map(function (f, i) {
- const st = f.status === 'up' ? (f.pct + '%') : f.status === 'ok' ? '✓' : '失败';
- return '' +
- '' + esc(f.name) + ' ' + st + ' ' +
- '× ';
- }).join('');
- // 输入框里的回形针图标在上传中换成总进度百分比
- const lb = document.getElementById('attach-btn');
- const pctEl = $('up-pct');
- if (lb && pctEl) {
- const ups = pendingFiles.filter(function (f) { return f.status === 'up'; });
- lb.classList.toggle('uploading', ups.length > 0);
- if (ups.length) {
- let done = 0, tot = 0;
- for (const f of pendingFiles) { if (f.status === 'err') continue; done += f.size * f.pct / 100; tot += f.size; }
- pctEl.textContent = (tot ? Math.round(done / tot * 100) : 0) + '%';
- }
- }
-}
-
-// ---------- 大图上传前压缩 ----------
-// 阈值/参数由服务端下发(config.upload,经 /api/system/status 透出)。超过阈值的图片
-// 先询问用户,同意后在浏览器端 canvas 压缩再上传,减轻服务器带宽与存储压力。
-const DEFAULT_UPLOAD_CFG = { image_compress_threshold_kb: 1536, image_max_dim: 2000, image_quality: 0.85 };
-let uploadCfgCache = null;
-async function getUploadCfg() {
- if (!uploadCfgCache) {
- uploadCfgCache = Object.assign({}, DEFAULT_UPLOAD_CFG);
- try {
- const s = await req('GET', '/api/system/status');
- uploadCfgCache = Object.assign(uploadCfgCache, (s && s.upload) || {});
- } catch (_) { /* 取不到配置就用默认阈值 */ }
- }
- return uploadCfgCache;
-}
-function loadImageEl(file) {
- return new Promise(function (resolve, reject) {
- const fr = new FileReader();
- fr.onload = function () {
- const im = new Image();
- im.onload = function () { resolve(im); };
- im.onerror = function () { reject(new Error('图片解码失败')); };
- im.src = fr.result;
- };
- fr.onerror = function () { reject(new Error('读取文件失败')); };
- fr.readAsDataURL(file);
- });
-}
-// 返回待上传的 File:需要时询问并压缩;取消/失败/无收益都按原文件上传。
-async function maybeCompressImage(file) {
- const cfg = await getUploadCfg();
- const isImg = /^image\//.test(file.type || '') || /\.(png|jpe?g|gif|bmp|webp)$/i.test(file.name || '');
- const threshold = Number(cfg.image_compress_threshold_kb || 1536) * 1024;
- if (!isImg || file.size <= threshold) return file;
- const maxDim = Number(cfg.image_max_dim || 2000);
- const quality = Number(cfg.image_quality || 0.85);
- const ok = await confirmModal('图片文件过大',
- '「' + file.name + '」有 ' + fmtSize(file.size) + ',超过 ' + fmtSize(threshold) +
- '。建议在浏览器本地压缩为 JPEG(长边≤' + maxDim + 'px)后再上传。是否压缩?', '压缩后上传');
- if (!ok) return file;
- try {
- const img = await loadImageEl(file);
- const iw = img.naturalWidth || img.width, ih = img.naturalHeight || img.height;
- if (!iw || !ih) throw new Error('无法读取图片尺寸');
- const scale = Math.min(1, maxDim / Math.max(iw, ih));
- const w = Math.max(1, Math.round(iw * scale)), h = Math.max(1, Math.round(ih * scale));
- const canvas = document.createElement('canvas');
- canvas.width = w; canvas.height = h;
- const ctx = canvas.getContext('2d');
- // 透明底(PNG)转 JPEG 前先铺白,避免变黑
- ctx.fillStyle = '#fff'; ctx.fillRect(0, 0, w, h);
- ctx.drawImage(img, 0, 0, w, h);
- const blob = await new Promise(function (res) { canvas.toBlob(function (b) { res(b); }, 'image/jpeg', quality); });
- if (!blob || blob.size >= file.size) {
- toast('压缩无收益,已按原文件上传');
- return file;
- }
- const newName = String(file.name || 'image').replace(/\.[^.]+$/, '') + '.jpg';
- toast('已压缩 ' + fmtSize(file.size) + ' → ' + fmtSize(blob.size));
- return new File([blob], newName, { type: 'image/jpeg' });
- } catch (e) {
- toast('压缩失败(' + (e && e.message || e) + '),按原文件上传');
- return file;
- }
-}
-
-function startUpload(file) {
- if (!state.sessionId) return;
- const item = { name: file.name, size: file.size, pct: 0, status: 'up' };
- pendingFiles.push(item);
- renderAttach();
- const fd = new FormData();
- fd.append('files', file);
- const xhr = new XMLHttpRequest();
- item.xhr = xhr;
- xhr.open('POST', '/api/sessions/' + state.sessionId + '/files');
- xhr.upload.onprogress = function (e) {
- if (e.lengthComputable) { item.pct = Math.min(99, Math.round(e.loaded / e.total * 100)); renderAttach(); }
- };
- xhr.onload = function () {
- let r = {};
- try { r = JSON.parse(xhr.responseText); } catch (_) {}
- if (xhr.status === 200 && r.uploaded && r.uploaded[0]) {
- item.name = r.uploaded[0].filename; // 以服务端清洗/重命名后的文件名为准
- item.size = r.uploaded[0].size;
- item.pct = 100;
- item.status = 'ok';
- } else {
- item.status = 'err';
- toast('上传失败:' + (r.error || xhr.status));
- }
- item.xhr = null;
- renderAttach();
- };
- xhr.onerror = function () { item.status = 'err'; item.xhr = null; renderAttach(); toast('上传失败:网络错误'); };
- xhr.send(fd);
-}
-
-function removeAttach(i) {
- const f = pendingFiles[i];
- if (!f) return;
- if (f.xhr) { try { f.xhr.abort(); } catch (_) {} }
- else if (f.status === 'ok' && state.sessionId) {
- // 已传完成的附件被移除:连带删掉已落盘的文件,避免任务目录里残留孤儿文件
- req('DELETE', '/api/sessions/' + state.sessionId + '/files?path=' + encodeURIComponent(f.name)).catch(function () {});
- }
- pendingFiles.splice(i, 1);
- renderAttach();
-}
-
-// 历史消息里的【系统通知】行:展示层拆成附件胶囊行 + 用户原文
-function parseUploadNotice(content) {
- const m = /^【系统通知】用户上传了文件:([^\n]*)(?:\n([\s\S]*))?$/.exec(content || '');
- if (!m) return { text: content || '', files: null };
- const files = m[1].split('、').map(function (s) { return s.replace(/(大小[^)]*)$/, '').trim(); }).filter(Boolean);
- return { text: m[2] || '', files: files };
-}
-
-function attachBubbleLine(names) {
- return names && names.length ? '📎 ' + names.map(esc).join(' ') + '
' : '';
-}
-
-// ---------- 消息渲染 ----------
-function md(text) {
- if (typeof marked === 'undefined') return esc(text);
- try { return marked.parse(text || ''); } catch (_) { return esc(text); }
-}
-
-function renderToolCard(id, name, argsStr, createdAt) {
- const div = document.createElement('div');
- div.className = 'tool-card';
- div.id = 'tool-' + id;
- div.innerHTML =
- '◌ ' +
- '' + esc(name) + ' ' +
- '' + esc(toolArgsSummary(name, argsStr)) + ' ' +
- '' + esc(toolArgsFull(argsStr)) + ' ' +
- '执行中… ' +
- // 时间行/复制按钮在折叠体内:展开卡片才可见
- '' + fmtTime(createdAt || Date.now()) + '
';
- return div;
-}
-
-// tool 消息 content:纯文本,或含图片时的哨兵 JSON {"__blocks__":[...]}(read_file 读图回传,见 llm.js)
-function parseToolContent(content) {
- if (typeof content === 'string' && content.startsWith('{"__blocks__":')) {
- try {
- const blocks = JSON.parse(content).__blocks__ || [];
- const img = blocks.find(b => b.type === 'image_url');
- return {
- text: blocks.filter(b => b.type === 'text').map(b => b.text).join('\n'),
- imageUrl: img && img.image_url && img.image_url.url || null,
- };
- } catch (_) { /* 解析失败按原文显示 */ }
- }
- return { text: content, imageUrl: null };
-}
-
-function fillToolResult(id, content, isError, liveImageUrl) {
- const card = document.getElementById('tool-' + id);
- if (!card) return;
- if (isError) card.classList.add('error');
- card.querySelector('.spin').textContent = isError ? '✕' : '✓';
- const parsed = parseToolContent(content);
- const pre = card.querySelector('.tool-result');
- if (!pre) return;
- pre.textContent = parsed.text || '(空)';
- // 结果就绪后在卡片时间行补复制按钮(复制工具输出)
- const timeRow = card.querySelector('.tool-time');
- if (timeRow && !timeRow.querySelector('.copy-btn')) {
- timeRow.insertAdjacentHTML('beforeend', copyBtnHtml(parsed.text || ''));
- }
- const img = liveImageUrl || parsed.imageUrl;
- if (img && !card.querySelector('.tool-img')) {
- const el = document.createElement('img');
- el.className = 'tool-img';
- el.src = img;
- el.title = '点击放大查看';
- pre.insertAdjacentElement('afterend', el);
- }
-}
-
-// 每条消息的复制按钮:原文存 Map(内容可能含引号/换行,不适合嵌进属性),按钮只带自增 id。
-// renderDetail 重建列表时清空,防长会话累积。
-const COPY_SVG = ' ';
-const copyMap = new Map();
-let copySeq = 0;
-function copyBtnHtml(text) {
- if (!text) return '';
- const id = ++copySeq;
- copyMap.set(id, text);
- return '' + COPY_SVG + ' ';
-}
-
-function msgNode(m, cardMap) {
- if (m.role === 'tool') {
- if (m.tool_call_id && cardMap && cardMap[m.tool_call_id]) {
- fillToolResult(m.tool_call_id, m.content, false);
- }
- return null;
- }
- const wrap = document.createElement('div');
- if (m.role === 'user') {
- const p = parseUploadNotice(m.content);
- wrap.className = 'msg me';
- wrap.innerHTML = '我
' +
- '' + attachBubbleLine(p.files) + esc(p.text) + '
' +
- '' + fmtTime(m.created_at) + copyBtnHtml(p.text) + '
';
- return wrap;
- }
- if (m.role === 'assistant') {
- wrap.className = 'msg other';
- const gray = state.status === 'queued' ? ' gray' : '';
- let inner = ' AI' +
- (m.model_tag ? ' · ' + esc(m.model_tag) : '') + '
';
- // 纯工具调用的应答为空或仅空白:不渲染空气泡,只保留 AI 头与时间行
- const hasText = !!(m.content && m.content.trim());
- if (hasText) inner += '' + md(m.content) + '
';
- inner += '' + fmtTime(m.created_at) + (hasText ? copyBtnHtml(m.content) : '') + '
';
- wrap.innerHTML = inner;
- return wrap;
- }
- return null;
-}
-
-function appendToolCardsFromAssistant(m, container) {
- if (!m.tool_calls) return;
- let calls;
- try { calls = typeof m.tool_calls === 'string' ? JSON.parse(m.tool_calls) : m.tool_calls; } catch (_) { return; }
- for (const c of calls) {
- const id = c.id || ('c' + Math.random().toString(36).slice(2, 10));
- if (state.toolCards[id]) continue; // tool_call 事件已经建过同一张卡,不重复创建
- const card = renderToolCard(id, c.function.name, c.function.arguments, m.created_at);
- container.appendChild(card);
- state.toolCards[id] = card;
- }
-}
-
-async function renderDetail(detail) {
- const box = $('messages');
- box.innerHTML = '';
- removePendingBubble();
- state.streamEl = null;
- state.streamText = '';
- state.turnEl = null;
- state.toolCards = {};
- // 切换会话后重置滚动跟随状态
- userPaused = false;
- state.streaming = false;
- updateScrollBottomBtn();
- copyMap.clear(); copySeq = 0;
- const s = detail.session;
- state.status = s.status;
- updatePhaseUI({ model_id: s.model_id, queue_pos: detail.queue_pos });
- updateScrollBottomBtn(); // 打开仍在运行中的会话时,立即恢复右下角转圈
- $('chat-title').textContent = s.title || s.id;
- for (const m of detail.messages) {
- const node = msgNode(m, state.toolCards);
- if (node) box.appendChild(node);
- if (m.role === 'assistant') appendToolCardsFromAssistant(m, box);
- }
- if (!detail.messages.length) {
- box.innerHTML = '描述你的需求,AI 会和你讨论并直接干活。
';
- }
- scrollBottom();
- loadFiles();
-}
-
-// ---------- 滚动跟随 ----------
-// 判断是否「贴近底部」:用户在底部附近时,新内容到来自动滚动跟随;
-// 一旦手动上翻阅读历史,暂停自动滚动以免打斷阅读。
-const SCROLL_BOTTOM_THRESHOLD = 80; // px:距底 80px 内视为「在底部」
-function isNearBottom() {
- const box = $('messages');
- return box.scrollHeight - box.scrollTop - box.clientHeight < SCROLL_BOTTOM_THRESHOLD;
-}
-// 智能滚动到底部:仅当用户当前贴近底部且未主动暂停时才跟随
-// 关键:userPaused 由 wheel/touchmove(用户主动输入)设置,程序滚动(scrollBottom 设 scrollTop)
-// 不会触发 wheel/touchmove,因此能可靠区分用户主动滚动 vs 程序滚动,避免被反复拉回底部。
-let userPaused = false;
-function maybeAutoScroll() {
- if (!userPaused && isNearBottom()) scrollBottom();
-}
-function scrollBottom() {
- const box = $('messages');
- box.scrollTop = box.scrollHeight;
-}
-// 监听用户滚动意图:向上翻阅历史时立即暂停跟随,回到底部时恢复。
-// 关键:用 wheel/touchmove 捕获「用户主动向上」的意图(程序滚动不会触发这二者),
-// 避免被自动跟随的 scrollBottom 反复拉回底部而无法上翻。
-// scroll 事件只负责「回到底部时清除暂停」(程序 scrollBottom 到底部也会触发,清暂停无副作用)。
-function bindScroll() {
- const box = $('messages');
- let touchY = 0;
- // 滚轮向上(看历史)→ 立即暂停跟随
- box.addEventListener('wheel', e => {
- if (e.deltaY < 0) userPaused = true;
- }, { passive: true });
- // 触摸下拖(向上看历史)→ 立即暂停跟随
- box.addEventListener('touchstart', e => { touchY = e.touches[0].clientY; }, { passive: true });
- box.addEventListener('touchmove', e => {
- const dy = e.touches[0].clientY - touchY;
- if (dy > 3) userPaused = true;
- touchY = e.touches[0].clientY;
- }, { passive: true });
- // 回到贴近底部时清除暂停(不在此处设暂停,避免程序滚动误判)
- box.addEventListener('scroll', () => {
- if (isNearBottom()) userPaused = false;
- updateScrollBottomBtn();
- }, { passive: true });
-}
-// 右下角「移动到底部」按钮:不在底部时显示;AI 正在输出时叠加加载转圈
-// AI 是否「正在干活」:流式输出中,或会话处于 active(含工具执行与多轮模型调用的间隙)。
-function runBusy() { return state.streaming || state.status === 'active'; }
-
-function updateScrollBottomBtn() {
- const btn = $('scroll-bottom-btn');
- if (!btn) return;
- const busy = runBusy();
- // 运行中即使贴着底部也保持显示:转圈即「AI 还活着」指示,多轮工具间隙不至于看着像挂掉
- const show = busy || !isNearBottom();
- btn.classList.toggle('hidden', !show);
- const spinner = btn.querySelector('.sb-spinner');
- if (spinner) spinner.classList.toggle('hidden', !busy);
- const arrow = btn.querySelector('.sb-arrow');
- if (arrow) arrow.classList.toggle('hidden', busy);
-}
-function clickScrollBottom() {
- userPaused = false;
- scrollBottom();
- updateScrollBottomBtn();
-}
-
-// ---------- AI 处理中占位 ----------
-// 发送后立即挂一个「思考中 + 秒计时」占位气泡,首个增量/回复/工具卡到达时移除,
-// 避免上游慢时长时间无反馈像卡死。
-function addPendingBubble() {
- removePendingBubble();
- const wrap = document.createElement('div');
- wrap.className = 'msg other';
- const box = $('messages');
- const tip = box.querySelector('.empty-tip');
- if (tip) tip.remove();
- wrap.innerHTML = ' AI
' +
- '思考中 ' +
- '0s
';
- box.appendChild(wrap);
- state.pendingEl = wrap;
- state.pendingStart = Date.now();
- state.pendingTimer = setInterval(() => {
- const t = state.pendingEl && state.pendingEl.querySelector('.pending-timer');
- if (t) t.textContent = Math.floor((Date.now() - state.pendingStart) / 1000) + 's';
- }, 500);
- scrollBottom();
-}
-
-function removePendingBubble() {
- if (state.pendingTimer) { clearInterval(state.pendingTimer); state.pendingTimer = null; }
- if (state.pendingEl) { state.pendingEl.remove(); state.pendingEl = null; }
-}
-
-// ---------- 当前 assistant 回合头行 ----------
-// 历史渲染里每次模型调用对应一条 assistant 消息(AI 头行 + 可选文本气泡 + 后续工具卡)。
-// 流式同样按此结构:纯工具调用没有文本气泡,但 AI 头像+名头行必须出现在工具卡前面。
-function ensureTurnWrap() {
- if (state.turnEl && document.body.contains(state.turnEl)) return state.turnEl;
- const wrap = document.createElement('div');
- wrap.className = 'msg other';
- wrap.innerHTML = ' AI
';
- $('messages').appendChild(wrap);
- state.turnEl = wrap;
- return wrap;
-}
-
-
-// ---------- SSE ----------
-function connectStream() {
- if (state.es) { state.es.close(); state.es = null; }
- const es = new EventSource('/api/sessions/' + state.sessionId + '/stream');
- state.es = es;
- es.addEventListener('status', ev => {
- const d = JSON.parse(ev.data);
- state.status = d.status;
- updatePhaseUI(d);
- updateScrollBottomBtn(); // 状态切换同步右下角转圈(开始/结束干活)
- });
- es.addEventListener('assistant_delta', ev => {
- const d = JSON.parse(ev.data);
- removePendingBubble();
- state.streamText += d.text;
- if (!state.streamEl) {
- // 纯工具调用常见只有空白增量:先不产出空气泡,等有真实文本再建
- if (!state.streamText.trim()) return;
- const wrap = ensureTurnWrap();
- const bubble = document.createElement('div');
- bubble.className = 'msg-bubble';
- wrap.appendChild(bubble);
- state.streamEl = bubble;
- state.streamText = d.text; // 本轮首个可见增量:丢弃可能的旧轮残留文本
- }
- state.streamEl.textContent = state.streamText;
- state.streaming = true;
- maybeAutoScroll();
- updateScrollBottomBtn();
- });
- es.addEventListener('assistant_message', ev => {
- const d = JSON.parse(ev.data);
- removePendingBubble();
- const hasText = !!(d.content && d.content.trim());
- if (state.streamEl) {
- const bubble = state.streamEl;
- state.streamEl = null;
- state.streamText = '';
- if (hasText) {
- bubble.innerHTML = md(d.content);
- const timeEl = document.createElement('div');
- timeEl.className = 'msg-time';
- timeEl.innerHTML = fmtTime(Date.now()) + copyBtnHtml(d.content);
- bubble.parentElement.appendChild(timeEl);
- } else {
- // 终稿为空/仅空白(纯工具调用):收走已建的气泡,保留 AI 头行(与历史渲染一致)
- bubble.remove();
- }
- } else if (hasText) {
- // 无流式增量时的兑底(如 SSE 断线重连错过 delta):在当前回合头行里补气泡与时间行
- const wrap = ensureTurnWrap();
- wrap.insertAdjacentHTML('beforeend',
- '' + md(d.content) + '
' +
- '' + fmtTime(Date.now()) + copyBtnHtml(d.content) + '
');
- }
- if (d.tool_calls) {
- ensureTurnWrap(); // 纯工具调用无文本:补上 AI 头行,工具卡不孤悬
- appendToolCardsFromAssistant({ tool_calls: d.tool_calls }, $('messages'));
- maybeAutoScroll();
- }
- // 本次模型调用结束:下一次调用(工具结果后的回合)另起头行,与历史逐条 assistant 消息一致
- state.turnEl = null;
- state.streaming = false;
- updateScrollBottomBtn();
- });
- es.addEventListener('tool_call', ev => {
- const d = JSON.parse(ev.data);
- removePendingBubble(); // 工具卡出现也算即时反馈
- if (state.toolCards[d.id]) return; // assistant_message 已建卡(含完整参数),不重复创建
- ensureTurnWrap(); // 纯工具调用回合:头行(头像+AI)先于工具卡出现,不能随占位气泡一起消失
- const card = renderToolCard(d.id, d.name, d.arguments, Date.now());
- $('messages').appendChild(card);
- state.toolCards[d.id] = card;
- maybeAutoScroll();
- });
- es.addEventListener('tool_result', ev => {
- const d = JSON.parse(ev.data);
- fillToolResult(d.tool_call_id, d.content, d.is_error, d.image_url);
- maybeAutoScroll();
- });
- es.addEventListener('done', ev => {
- removePendingBubble(); // 本轮结束,占位兼终止(如模型报错无回复)
- state.streaming = false;
- state.streamEl = null; // 防御性清理:回合异常结束(如终止)时不留悬空气泡/头行到下一轮
- state.streamText = '';
- state.turnEl = null;
- updateScrollBottomBtn();
- loadSessions();
- });
- es.addEventListener('error', ev => {
- removePendingBubble();
- try {
- const d = JSON.parse(ev.data);
- if (d && d.message) toast('错误:' + d.message);
- } catch (_) { /* EventSource 连接错误,自动重连 */ }
- });
-}
-
-// ---------- 任务状态 ----------
-function updatePhaseUI(d) {
- const pill = $('status-pill');
- const stMap = { queued: '排队中', active: '活跃中', held: '保持中', completed: '已完成', cancelled: '已终止' };
- let text = stMap[state.status] || state.status || '--';
- if (d && d.queue_pos) text += '(第 ' + d.queue_pos + ' 位)';
- // active/held 时附带当前占用的模型
- if ((state.status === 'active' || state.status === 'held') && d && d.model_id) {
- text += ' · ' + d.model_id;
- }
- pill.textContent = text;
- // 状态胶囊配色:活跃中绿(执行中)、保持中黄(已答完、保持模型中)等;状态栏整体同步染色
- pill.className = 'status-pill ' + (state.status || '');
- $('phase-bar').className = 'phase-bar ' + (state.status || '');
- // 活跃中提供「终止」;保持中改为「断开」(主动放弃保持租约,会话结为已完成)
- const btn = $('stop-btn');
- const actionable = state.status === 'active' || state.status === 'held';
- btn.classList.toggle('hidden', !actionable);
- btn.textContent = state.status === 'held' ? '断开' : '终止';
- btn.classList.toggle('muted', state.status === 'held');
- // 已完成/已终止时提供「选择模型」,手动指定空闲模型后继续对话
- const msBtn = $('model-switch-btn');
- if (msBtn) msBtn.classList.toggle('hidden', !(state.sessionId && (state.status === 'completed' || state.status === 'cancelled')));
- // 执行中(active)不提供「清空」——运行回合内删除历史会破坏上下文;其余状态(含排队中)可清空
- const clrBtn = $('clear-msg-btn');
- if (clrBtn) clrBtn.classList.toggle('hidden', !(state.sessionId && state.status && state.status !== 'active'));
-}
-
-// ---------- 文件 ----------
-// 下载:先换一枚短时效签名链接,再 window.location.href 交给浏览器原生下载。
-// (fetch+blob 在移动端浏览器会被改名 uuid.bin;原生导航下载按服务端
-// Content-Disposition 保留原名,同源自动携带登录 cookie。)
-async function downloadFile(name) {
- if (!state.sessionId) return;
- try {
- const r = await req('GET', '/api/sessions/' + state.sessionId + '/files/download-token?path=' + encodeURIComponent(name));
- window.location.href = r.url;
- } catch (e) {
- toast('下载失败:' + e.message);
- }
-}
-
-async function loadFiles() {
- if (!state.sessionId) return;
- try {
- const files = await req('GET', '/api/sessions/' + state.sessionId + '/files');
- const el = $('files-list');
- if (!files.length) {
- el.innerHTML = '还没有文件。上传文件或在对话中让 AI 生成。
';
- return;
- }
- el.innerHTML = files.map(f => {
- return '' + esc(f.filename.split('/').pop() || f.filename) + ' ' +
- '' + fmtSize(f.size) + ' ' +
- '下载 ' +
- '删
';
- }).join('');
- } catch (e) { toast('读取文件失败:' + e.message); }
-}
-
-// ---------- 主逻辑 ----------
-const ui = {
- downloadFile(name) { return downloadFile(name); },
- async openCreate() {
- // 每次打开时刷新一次空闲模型列表
- const sel = $('new-model');
- try {
- const rows = await req('GET', '/api/models');
- const free = rows.filter(m => !m.is_busy);
- sel.innerHTML = free.length
- ? '自动分配 ' + free.map(m =>
- '' + esc(m.display_name || m.id) + ' ').join('')
- : '排队等待 ';
- } catch (_) { /* 保留默认选项 */ }
- $('create-modal').classList.remove('hidden');
- $('new-title').focus();
- },
- closeCreate() { $('create-modal').classList.add('hidden'); },
- openFullscreen(el) {
- const body = $('fs-body');
- body.innerHTML = '';
- body.style.zoom = '';
- // 深拷贝并去掉 id:保留原类名使气泡/工具卡样式在查看器内照常生效,且避免 id 重复
- const clone = el.cloneNode(true);
- clone.removeAttribute('id');
- clone.querySelectorAll('[id]').forEach(function (n) { n.removeAttribute('id'); });
- // 全屏查看直接展开参数/结果,方便观看
- clone.querySelectorAll('details').forEach(function (d) { d.open = true; });
- body.appendChild(clone);
- $('fs-viewer').classList.remove('hidden');
- },
- closeFullscreen() { $('fs-viewer').classList.add('hidden'); },
- async copyMsg(id, btn) {
- const t = copyMap.get(Number(id));
- if (t == null) return;
- if (await copyText(t)) {
- // 图标短暂变绿作反馈
- const svg = btn && btn.querySelector && btn.querySelector('svg');
- if (svg) { svg.classList.add('copied'); setTimeout(function () { svg.classList.remove('copied'); }, 1200); }
- toast('已复制');
- } else toast('复制失败');
- },
- async renameSession() {
- if (!state.sessionId) return;
- const cur = $('chat-title').textContent;
- const t = await promptModal('重命名会话', '输入新的会话名称', cur === state.sessionId ? '' : cur);
- if (t === null) return; // 取消
- try {
- await req('PATCH', '/api/sessions/' + state.sessionId, { title: t });
- toast('已重命名');
- $('chat-title').textContent = t.trim();
- loadSessions();
- } catch (e) { toast('重命名失败:' + e.message); }
- },
- async openModelSwitch() {
- if (!state.sessionId) return;
- const list = $('bind-model-list');
- const footer = $('bind-model-footer');
- list.innerHTML = '加载中…
';
- footer && (footer.textContent = '');
- $('bind-model-modal').classList.remove('hidden');
- try {
- // /api/models 已按平台补齐 platform/mid/vision/key_count(见 server.js);行按模型 id 唯一。
- const rows = (await req('GET', '/api/models')) || [];
- if (!rows.length) {
- list.innerHTML = '还没有配置模型。
';
- return;
- }
- const DOT_COLORS = ['#3B82F6','#10B981','#F59E0B','#EF4444','#8B5CF6','#EC4899','#06B6D4','#F97316'];
- // 按平台分组;一个会话占用一个 key → 平台空闲 key 数 = key_count - 占用模型数
- const platMap = new Map();
- for (const m of rows) {
- const pk = m.platform || '';
- if (!platMap.has(pk)) {
- platMap.set(pk, { name: pk || '未知平台', keyCount: m.key_count || 0, models: [], busyCount: 0 });
- }
- const g = platMap.get(pk);
- g.models.push(m);
- if (m.is_busy) g.busyCount++;
- }
- const groups = [];
- for (const g of platMap.values()) {
- g.freeKeys = Math.max(0, g.keyCount - g.busyCount);
- groups.push(g);
- }
- // 可选 = 模型自身空闲 且 该平台还有空闲 key
- let avail = 0;
- for (const g of groups) for (const m of g.models) if (!m.is_busy && g.freeKeys > 0) avail++;
- list.innerHTML = groups.map((g, gi) => {
- const dotColor = DOT_COLORS[gi % DOT_COLORS.length];
- const itemHtml = g.models.map(m => {
- const disabled = !!m.is_busy || g.freeKeys <= 0;
- const title = m.is_busy ? ' 占用中' : (g.freeKeys <= 0 ? ' 无空闲 Key' : '');
- return '' +
- '
' +
- '
' +
- '
' + esc(m.display_name || m.mid || m.id) +
- (title ? ' ' + title.trim() + ' ' : '') + '
' +
- '
' +
- (m.vision ? 'Vision ' : '') +
- 'Thinking ' +
- '
' +
- '
' +
- '
';
- }).join('');
- return '' +
- '' +
- itemHtml +
- '
';
- }).join('');
- footer && (footer.textContent = '共 ' + avail + ' 个模型可用');
- } catch (e) {
- list.innerHTML = '读取模型列表失败:' + e.message + '
';
- }
- },
- closeModelSwitch() { $('bind-model-modal').classList.add('hidden'); },
- async bindModel(modelId) {
- if (!state.sessionId) return;
- const sid = state.sessionId;
- this.closeModelSwitch();
- try {
- await req('POST', '/api/sessions/' + sid + '/bind', { model_id: modelId });
- toast('已绑定模型 ' + modelId);
- } catch (e) { toast('绑定失败:' + e.message); }
- try { await renderDetail(await req('GET', '/api/sessions/' + sid)); } catch (_) {}
- },
- async createSession() {
- try {
- const title = $('new-title').value.trim();
- const model_id = $('new-model') ? $('new-model').value : '';
- const s = await req('POST', '/api/sessions', { title, model_id });
- this.closeCreate();
- $('new-title').value = '';
- await loadSessions();
- this.openSession(s.id);
- } catch (e) { toast('创建失败:' + e.message); }
- },
- deleteSession(id) {
- state.pendingDeleteId = id;
- $('del-dir-check').checked = true;
- $('delete-modal-text').textContent = '确定删除会话 ' + id + '?';
- $('delete-modal').classList.remove('hidden');
- },
- closeDelete() {
- $('delete-modal').classList.add('hidden');
- state.pendingDeleteId = null;
- },
- async confirmDelete() {
- const id = state.pendingDeleteId;
- if (!id) { this.closeDelete(); return; }
- const delDir = $('del-dir-check').checked;
- this.closeDelete();
- try {
- await req('DELETE', '/api/sessions/' + id + '?delete_dir=' + (delDir ? 'true' : 'false'));
- if (state.sessionId === id) this.backToList();
- loadSessions();
- } catch (e) { toast('删除失败:' + e.message); }
- },
- async openSession(id) {
- // 切会话前收尾上一会话:关闭 SSE、清占位,避免跨会话残留
- if (state.es) { state.es.close(); state.es = null; }
- removePendingBubble();
- state.sessionId = id;
- // 待发送附件属于上一个会话的语境,切会话时清空展示(文件已落盘,可在文件面板查看)
- pendingFiles = [];
- renderAttach();
- // 先清空旧内容并重置状态,避免拉取新会话详情期间仍展示上一会话内容
- const box = $('messages');
- box.innerHTML = '加载中…
';
- state.streamEl = null;
- state.streamText = '';
- state.turnEl = null;
- state.toolCards = {};
- state.status = '';
- userPaused = false;
- state.streaming = false;
- updateScrollBottomBtn();
- copyMap.clear(); copySeq = 0;
- $('chat-title').textContent = '';
- updatePhaseUI({ model_id: null, queue_pos: null });
- showChat();
- try {
- const detail = await req('GET', '/api/sessions/' + id);
- // 防止在请求期间已切到别的会话(用户操作很快)
- if (state.sessionId !== id) return;
- await renderDetail(detail);
- connectStream();
- } catch (e) {
- if (state.sessionId === id) toast('打开会话失败:' + e.message);
- }
- },
- backToList() {
- if (state.es) { state.es.close(); state.es = null; }
- removePendingBubble();
- state.streaming = false;
- updateScrollBottomBtn();
- state.sessionId = null;
- showList();
- loadSessions();
- },
- async send() {
- const ta = $('msg-input');
- const content = ta.value.trim();
- if (!state.sessionId) return;
- if (pendingFiles.some(f => f.status === 'up')) { toast('附件上传中,请稍候'); return; }
- const atts = pendingFiles.filter(f => f.status === 'ok').map(f => ({ name: f.name, size: f.size }));
- if (!content && !atts.length) return;
- ta.value = '';
- ta.style.height = 'auto';
- const box = $('messages');
- const tip = box.querySelector('.empty-tip');
- if (tip) tip.remove();
- try {
- const body = { content };
- if (atts.length) body.attachments = atts;
- const r = await req('POST', '/api/sessions/' + state.sessionId + '/messages', body);
- const wrap = document.createElement('div');
- wrap.className = 'msg me';
- wrap.innerHTML = '我' + (r.delivered === 'queued' ? '(排队中,暂存)' : '') + '
' +
- '' + attachBubbleLine(atts.map(a => a.name)) + esc(content) + '
';
- box.appendChild(wrap);
- // 发送成功后附件已随消息告知 AI;失败的保留,由用户决定重试或移除
- pendingFiles = pendingFiles.filter(f => f.status === 'err');
- renderAttach();
- // 立即给出回馈:占位气泡 + 等待计时,首个增量/回复到达时移除并填充内容
- if (r.delivered !== 'queued') addPendingBubble();
- userPaused = false;
- scrollBottom();
- } catch (e) { toast('发送失败:' + e.message); }
- },
- toggleFiles(ev) {
- // 阻断冒泡,避免开启面板的同一次点击被「点外部自动关闭」监听器立刻关掉
- if (ev) ev.stopPropagation();
- state.filePanelOpen = !state.filePanelOpen;
- $('files-panel').classList.toggle('hidden', !state.filePanelOpen);
- if (state.filePanelOpen) loadFiles();
- },
- async stopSession() {
- if (!state.sessionId) return;
- const held = state.status === 'held';
- try {
- if (held) {
- await req('POST', '/api/sessions/' + state.sessionId + '/release');
- toast('已断开,模型已释放');
- } else {
- await req('POST', '/api/sessions/' + state.sessionId + '/stop');
- toast('已发送终止指令');
- }
- } catch (e) { toast((held ? '断开失败:' : '终止失败:') + e.message); }
- },
- async clearChat() {
- if (!state.sessionId) return;
- const ok = await confirmModal('清空会话内容',
- '将删除本会话的全部聊天记录,AI 后续对话不再携带这段历史(从零开始,更省 token)。任务文件全部保留,不受影响。此操作不可恢复。',
- '清空', true);
- if (!ok) return;
- const id = state.sessionId;
- try {
- await req('DELETE', '/api/sessions/' + id + '/messages');
- toast('会话内容已清空,文件已保留');
- // 服务端已把会话收尾为 completed 并清空消息:重新拉取详情即为干净起点
- const detail = await req('GET', '/api/sessions/' + id);
- await renderDetail(detail);
- loadSessions();
- } catch (e) { toast('清空失败:' + e.message); }
- },
- async uploadFiles(ev) {
- const input = ev.target;
- // 必须先快照成数组再清空 input:input.files 是实时 FileList,
- // input.value='' 会把它同步掏空(Chrome/Safari),直接 return 导致点了没反应。
- const files = Array.prototype.slice.call(input.files || []);
- input.value = '';
- if (!files.length || !state.sessionId) return;
- // 大图逐个串行询问压缩(模态弹窗不能并行),完成后再并行上传
- const ready = [];
- for (const f of files) ready.push(await maybeCompressImage(f));
- for (const f of ready) startUpload(f); // 多个文件并行上传,进度在回形针图标上汇总
- },
- removeAttach(i) { removeAttach(i); },
- async deleteFile(name) {
- if (!await confirmModal('删除文件', '删除文件 ' + name + ' ?', '删除', true)) return;
- try {
- await req('DELETE', '/api/sessions/' + state.sessionId + '/files?path=' + encodeURIComponent(name));
- loadFiles();
- } catch (e) { toast('删除失败:' + e.message); }
- },
- logout() { location.href = '/logout'; },
- toggleSearch() { toggleSearch(); },
- doSearch() { doSearch(); },
- loadMoreDone() { return loadMoreDone(); },
-};
-
-// 文件面板展开时,点击面板以外的区域自动关闭
-document.addEventListener('click', e => {
- if (!state.filePanelOpen) return;
- if ($('files-panel').contains(e.target)) return;
- state.filePanelOpen = false;
- $('files-panel').classList.add('hidden');
-});
-
-// ---------- 输入框行为 ----------
-document.addEventListener('input', e => {
- if (e.target.id === 'msg-input') {
- e.target.style.height = 'auto';
- e.target.style.height = Math.min(e.target.scrollHeight, 120) + 'px';
- }
-});
-document.addEventListener('keydown', e => {
- if (e.target.id !== 'msg-input' || e.key !== 'Enter') return;
- if (e.isComposing) return; // 中文输入法候选中,回车不拦截
- // 桌面:Ctrl/⌘/⌥+Enter 发送;其余 Enter(含手机软键盘)保持默认换行,发送用右侧按钮
- if (e.ctrlKey || e.metaKey || e.altKey) {
- e.preventDefault();
- ui.send();
- }
-});
-
-// 搜索框:回车触发搜索;清空后退回普通列表
-document.addEventListener('keydown', e => {
- if (e.target.id === 'search-input' && e.key === 'Enter' && !e.isComposing) {
- e.preventDefault();
- doSearch();
- }
-});
-document.addEventListener('input', e => {
- if (e.target.id === 'search-input' && !e.target.value.trim()) loadSessions();
-});
-
-// 双击消息气泡/工具卡全屏查看(长回复/代码更好读)
-document.getElementById('messages').addEventListener('dblclick', function (e) {
- if (e.target.closest('#fs-viewer')) return;
- if (e.target.closest('.copy-btn') || e.target.closest('img')) return; // 复制按钮/图片不误触全屏
- const el = e.target.closest('.msg-bubble, .tool-card');
- if (el) ui.openFullscreen(el);
-});
-
-// 点击消息/工具卡里的图片 → 图片全屏查看器(#fs-viewer 里的克隆图也生效)
-function imgViewerDelegate(e) {
- const im = e.target.closest('.msg-bubble img, .tool-card img');
- if (im && im.src) openImageViewer(im.src, im.alt || '');
-}
-document.getElementById('messages').addEventListener('click', imgViewerDelegate);
-document.getElementById('fs-viewer').addEventListener('click', imgViewerDelegate);
-
-// 图片全屏查看器:transform 缩放+平移。双指捻合缩放(1~6x)、放大后单指/鼠标拖动、双击切 2.5x。
-let openImageViewer, closeImageViewer;
-(function () {
- const viewer = document.getElementById('img-viewer');
- const img = document.getElementById('img-viewer-img');
- let scale = 1, tx = 0, ty = 0, mode = null;
- let sx = 0, sy = 0, stx = 0, sty = 0, pDist = 0, pScale = 1;
- const tdist = t => Math.hypot(t[0].clientX - t[1].clientX, t[0].clientY - t[1].clientY);
- function apply() {
- img.style.transform = 'translate(' + tx + 'px,' + ty + 'px) scale(' + scale + ')';
- img.style.cursor = scale > 1 ? 'grab' : 'zoom-in';
- }
- openImageViewer = function (src, alt) {
- scale = 1; tx = ty = 0; mode = null;
- apply();
- img.src = src; img.alt = alt || '';
- viewer.classList.remove('hidden');
- };
- closeImageViewer = function () { viewer.classList.add('hidden'); };
- // 点背景(非图片)关闭
- viewer.addEventListener('click', function (e) { if (e.target === viewer) closeImageViewer(); });
- img.addEventListener('dblclick', function () {
- scale = scale > 1 ? 1 : 2.5;
- if (scale === 1) { tx = ty = 0; }
- apply();
- });
- img.addEventListener('touchstart', function (e) {
- if (e.touches.length === 2) { mode = 'pinch'; pDist = tdist(e.touches) || 1; pScale = scale; }
- else if (e.touches.length === 1 && scale > 1) { mode = 'pan'; sx = e.touches[0].clientX; sy = e.touches[0].clientY; stx = tx; sty = ty; }
- else mode = null;
- }, { passive: true });
- img.addEventListener('touchmove', function (e) {
- if (mode === 'pinch' && e.touches.length >= 2) {
- e.preventDefault();
- scale = Math.min(6, Math.max(1, pScale * tdist(e.touches) / pDist));
- if (scale === 1) { tx = ty = 0; }
- apply();
- } else if (mode === 'pan' && e.touches.length === 1) {
- e.preventDefault();
- tx = stx + e.touches[0].clientX - sx;
- ty = sty + e.touches[0].clientY - sy;
- apply();
- }
- }, { passive: false });
- img.addEventListener('touchend', function (e) { if (e.touches.length < 2) { if (mode === 'pinch') mode = null; } if (!e.touches.length) mode = null; }, { passive: true });
- img.addEventListener('touchcancel', function () { mode = null; }, { passive: true });
- // 桌面:放大后按住拖动平移
- img.addEventListener('mousedown', function (e) {
- if (scale <= 1) return;
- e.preventDefault();
- const x0 = e.clientX, y0 = e.clientY, tx0 = tx, ty0 = ty;
- const mv = function (ev) { tx = tx0 + ev.clientX - x0; ty = ty0 + ev.clientY - y0; apply(); };
- const up = function () { window.removeEventListener('mousemove', mv); window.removeEventListener('mouseup', up); };
- window.addEventListener('mousemove', mv); window.addEventListener('mouseup', up);
- });
-})();
-
-// 全屏查看器双指缩放:页面 viewport 是 user-scalable=no(原生捏合被禁),
-// 在查看器内接管双指手势,用 CSS zoom 缩放内容(1~4 倍,关闭时重置)。
-(function () {
- const viewer = document.getElementById('fs-viewer');
- if (!viewer) return;
- let startDist = 0, startZoom = 1, pinching = false;
- const tdist = t => Math.hypot(t[0].clientX - t[1].clientX, t[0].clientY - t[1].clientY);
- viewer.addEventListener('touchstart', function (e) {
- if (e.touches.length !== 2) { pinching = false; return; }
- pinching = true;
- startDist = tdist(e.touches) || 1;
- startZoom = Number($('fs-body').style.zoom) || 1;
- }, { passive: true });
- viewer.addEventListener('touchmove', function (e) {
- if (!pinching || e.touches.length < 2) return;
- e.preventDefault(); // 双指期间阻止滚动,手势归缩放
- $('fs-body').style.zoom = Math.min(4, Math.max(1, startZoom * tdist(e.touches) / startDist)) || '';
- }, { passive: false });
- viewer.addEventListener('touchend', function (e) { if (e.touches.length < 2) pinching = false; }, { passive: true });
- viewer.addEventListener('touchcancel', function () { pinching = false; }, { passive: true });
-})();
-
-// ---------- Tab 注册 ----------
-window.tabModules = window.tabModules || {};
-tabModules.tasks = {
- onShow() {
- loadSessions();
- },
-};
-
-// 绑定聊天滚动跟随(只绑一次)
-bindScroll();
diff --git a/app/server/templates/title-prompt.txt b/app/server/templates/title-prompt.txt
new file mode 100644
index 0000000..6dd4ab0
--- /dev/null
+++ b/app/server/templates/title-prompt.txt
@@ -0,0 +1,5 @@
+Generate a concise title for this conversation in {{language}}, omitting punctuation.
+Aim for 3-7 words, or 6-14 Chinese characters if the title is in Chinese.
+Go straight to the title, without any preamble and prefix like `Here's a concise suggestion:...` or `Title:`.
+If the conversation is about a specific subject, include it in the title.
+Be descriptive. DO NOT speak in the first person.
diff --git a/docker-compose.yml b/docker-compose.yml
index d85f324..008fab2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,7 @@ services:
- ./skills:/workspace/skills # 技能目录:所有任务/会话共享同一份技能
- ./data:/workspace/data # 持久化:数据目录
- ./config.yml:/app/config.yml # 允许设置页写配置(写前服务端会校验)
+ - ./app/server:/app/server
environment:
- PORT=8090
- AGENT_CONFIG=/app/config.yml
@@ -20,8 +21,12 @@ services:
# 调用鉴权 token:两侧同一值。从 .env 读取(已 gitignore),不再硬编码进仓库;
# 未设置则 compose 直接报错,避免静默无鉴权。生成:openssl rand -hex 32
- EXECUTOR_TOKEN=${EXECUTOR_TOKEN:?EXECUTOR_TOKEN not set - see .env.example}
+ - VIRTUAL_HOST=agent.ai.foresh.com
+ - VIRTUAL_PORT=8090
+ - CERT_NAME=default
networks:
- agent-mcp-net
+ - my-app-network
# 技能准备(一次性,跑完退出):把各技能的“运行期可变”依赖落到宿主 ./skills——
# requirements.txt → 先离线探测,只把镜像缺的包装进共享 deps 目录(镜像已带的不重复装);
@@ -131,3 +136,5 @@ networks:
agent-mcp-net:
name: agent-mcp-net
driver: bridge
+ my-app-network:
+ external: true