diff --git a/app/config.example.yml b/app/config.example.yml index c67c180..60331f9 100644 --- a/app/config.example.yml +++ b/app/config.example.yml @@ -21,6 +21,10 @@ models: workspace_root: "./data/tasks" # db_path: "/data/.agent.db" +# 日志等级(改后重启生效):debug < info < warn < error < none,只输出 ≥ 该等级的日志;none=全部静默。 +# info(默认)=关键动作;debug 另加工具调用参数/结果等排查细节。 +log_level: info + terminal: default_timeout_ms: 30000 max_output_chars: 10000 diff --git a/app/server/auth.js b/app/server/auth.js index 9869a2d..18bb954 100644 --- a/app/server/auth.js +++ b/app/server/auth.js @@ -5,6 +5,7 @@ const express = require('express'); const crypto = require('crypto'); const path = require('path'); const { readConfigText, applyEditsToText, loadConfigFromText, writeConfigText } = require('./config'); +const log = require('./log'); const COOKIE_NAME = 'agent_token'; const DEFAULT_TTL_MS = 30 * 24 * 3600 * 1000; // 30 天 @@ -94,7 +95,7 @@ function createAuth(cfg) { const secret = (cfg.auth.secret && String(cfg.auth.secret)) || crypto.randomBytes(32).toString('hex'); if (!cfg.auth.secret) { - console.log('[auth] 未配置 auth.secret,已使用随机密钥:进程重启后所有登录态失效'); + log.warn('[auth] 未配置 auth.secret,已使用随机密钥:进程重启后所有登录态失效'); } const ttlMs = Number(cfg.auth.ttl_ms) || DEFAULT_TTL_MS; const validUsers = new Map(users.map(u => [String(u.user), String(u.password)])); @@ -158,7 +159,7 @@ function createAuth(cfg) { // 内存同步:users 与 engine.cfg 是同一对象,Basic 认证实时生效;cookie 登录查 validUsers users[idx].password = newP; validUsers.set(me, newP); - console.log('[auth] 用户 ' + me + ' 修改了密码'); + log.info('[auth] 用户 ' + me + ' 修改了密码'); res.json({ ok: true }); } catch (e) { res.status(500).json({ error: String(e && e.message || e) }); diff --git a/app/server/config.js b/app/server/config.js index ad4ccc4..e48f9c0 100644 --- a/app/server/config.js +++ b/app/server/config.js @@ -2,6 +2,7 @@ const fs = require('fs'); const path = require('path'); const YAML = require('yaml'); +const log = require('./log'); const DEFAULTS = { port: 8080, @@ -16,6 +17,8 @@ const DEFAULTS = { // 即便一直有人观看,最长也只保持 active_max_ms;sweep_ms 为巡检间隔。 // 「绑定模型但闲置」的会话(从未发言、无未回应消息)同样按此租约释放,防建而不用霸占模型。 model_hold: { idle_release_ms: 180000, active_max_ms: 1800000, sweep_ms: 10000 }, + // 日志等级:debug < info < warn < error < none,只输出 >= 阈值等级的日志;none=全部静默。 + log_level: 'info', models: [], // 登录认证:{ users: [{user, password}], secret?, ttl_ms? },密码明文存配置(自用场景)。 // users 为空则不启用认证(可交给前置 nginx-proxy,但手机浏览器原生下载不带 Basic 头,不推荐)。 @@ -59,6 +62,11 @@ function parseAndValidate(rawText, configPath) { cfg.workspace_root = path.resolve(cfg.workspace_root); if (!cfg.db_path) cfg.db_path = path.join(cfg.workspace_root, '.agent.db'); + // 日志等级:只认 debug/info/warn/error/none(off 是 none 别名),非法值按 info(不影响启动) + cfg.log_level = String(cfg.log_level || 'info').trim().toLowerCase(); + if (cfg.log_level === 'off') cfg.log_level = 'none'; + if (['debug', 'info', 'warn', 'error', 'none'].indexOf(cfg.log_level) < 0) cfg.log_level = 'info'; + // 技能根目录:显式配置优先;缺省取 workspace_root 的同级 skills 目录(容器内 /workspace/tasks → /workspace/skills)。 if (!cfg.skills || !cfg.skills.skills_root) { cfg.skills_root = path.resolve(cfg.workspace_root, '..', 'skills'); @@ -88,7 +96,7 @@ function parseAndValidate(rawText, configPath) { url: ws.url, headers: ws.authorization ? { Authorization: ws.authorization } : {}, }]; - console.log('[config] 检测到旧配置 web_search.*,已自动转为一条 mcp_servers;建议更新 config.yml 为 mcp_servers 格式'); + log.info('[config] 检测到旧配置 web_search.*,已自动转为一条 mcp_servers;建议更新 config.yml 为 mcp_servers 格式'); } // MCP 服务规范化:url 必填;name 缺省取主机名首段;headers 为普通键值对象(如 Authorization) diff --git a/app/server/engine.js b/app/server/engine.js index 1091a13..3fbfc86 100644 --- a/app/server/engine.js +++ b/app/server/engine.js @@ -5,6 +5,7 @@ const path = require('path'); const { buildMessages, callModel } = require('./llm'); const { executeTool, resolveInTask } = require('./tools/executor'); const mcp = require('./mcp'); +const log = require('./log'); const TOOL_DEFINITIONS = require('./tools/definitions.json'); @@ -79,7 +80,7 @@ function saveMessage(sessionId, msg) { // 关键动作日志:AI 每轮回复落库(含纯工具调用轮) if (msg.role === 'assistant') { const nTools = msg.tool_calls ? msg.tool_calls.length : 0; - console.log('[msg] ' + sessionId + ' AI 回复:文本 ' + String(msg.content || '').length + ' 字' + + log.info('[msg] ' + sessionId + ' AI 回复:文本 ' + String(msg.content || '').length + ' 字' + (nTools ? ',工具调用 ×' + nTools : '')); } return info.lastInsertRowid; @@ -324,7 +325,7 @@ async function runLoop(sessionId) { try { await runLoopInner(sessionId, run); } catch (err) { - console.error('[engine] runLoop ' + sessionId + ' 异常:', err && err.stack || err); + log.error('[engine] runLoop ' + sessionId + ' 异常:', err && err.stack || err); bus.emit(sessionId, 'error', { message: String(err && err.message || err) }); } finally { run.looping = false; @@ -412,6 +413,7 @@ async function runLoopInner(sessionId, run) { for (const tc of msgRow.tool_calls) { if (run.cancelled) break; const id = tc.id || ('call_' + Math.random().toString(36).slice(2, 10)); + log.debug('[tool] ' + sessionId + ' 调用 ' + tc.function.name + ' 参数: ' + String(tc.function.arguments || '').slice(0, 500)); bus.emit(sessionId, 'tool_call', { id, name: tc.function.name, arguments: tc.function.arguments }); let output; let isError = false; @@ -423,6 +425,7 @@ async function runLoopInner(sessionId, run) { isError = true; } if (run.cancelled && !isError) output = (output ? output + '\n' : '') + '(用户已终止任务)'; + log.debug('[tool] ' + sessionId + ' ' + tc.function.name + (isError ? ' 失败: ' : ' 完成: ') + String(output || '').slice(0, 500)); bus.emit(sessionId, 'tool_result', { tool_call_id: id, name: tc.function.name, content: output.slice(0, 20000), is_error: isError }); saveMessage(sessionId, { role: 'tool', tool_call_id: id, name: tc.function.name, content: output }); } diff --git a/app/server/mcp.js b/app/server/mcp.js index 5c427c1..d174d95 100644 --- a/app/server/mcp.js +++ b/app/server/mcp.js @@ -6,6 +6,8 @@ // 与内置工具严格分离:本模块不碰内置定义;MCP 工具默认沿用原始名, // 仅当与内置工具或其他 MCP 工具重名时加「服务名__」前缀。 +const log = require('./log'); + let toolDefs = []; // OpenAI function 格式(所有 MCP 工具) const toolIndex = new Map(); // 发送名 -> { server, tool }(服务配置 + 原始工具名) let builtinNames = new Set(); @@ -78,9 +80,9 @@ async function init(cfg) { }, }); } - console.log('[mcp] ' + s.name + ': 发现 ' + tools.length + ' 个工具'); + log.info('[mcp] ' + s.name + ': 发现 ' + tools.length + ' 个工具'); } catch (err) { - console.error('[mcp] ' + s.name + ' 工具发现失败(本轮运行该服务不可用): ' + (err && err.message || err)); + log.warn('[mcp] ' + s.name + ' 工具发现失败(本轮运行该服务不可用): ' + (err && err.message || err)); } } } diff --git a/app/server/routes/config.js b/app/server/routes/config.js index 5c5063c..3aa878e 100644 --- a/app/server/routes/config.js +++ b/app/server/routes/config.js @@ -4,6 +4,7 @@ const express = require('express'); const engine = require('../engine'); const { loadConfigFromText, readConfigText, applyEditsToText, writeConfigText } = require('../config'); +const log = require('../log'); const router = express.Router(); @@ -61,7 +62,7 @@ router.put('/', wrap((req, res) => { let next; try { next = loadConfigFromText(text, cfg.config_path); } catch (e) { return badRequest(res, e); } writeConfigText(cfg, text); - console.log('[config] ' + (req.user || '-') + ' 整文件保存配置,变更段:' + (diffTop(cfg, next).join(',') || '无')); + log.info('[config] ' + (req.user || '-') + ' 整文件保存配置,变更段:' + (diffTop(cfg, next).join(',') || '无')); res.json({ ok: true, changed: diffTop(cfg, next), restart_required: true }); })); @@ -84,7 +85,7 @@ router.patch('/', wrap((req, res) => { let next; try { next = loadConfigFromText(nextText, cfg.config_path); } catch (e) { return badRequest(res, e); } writeConfigText(cfg, nextText); - console.log('[config] ' + (req.user || '-') + ' 修改配置项 ' + pathArr.join('.') + (body.op === 'delete' ? '(删除)' : '') + ',变更段:' + (diffTop(cfg, next).join(',') || '无')); + log.info('[config] ' + (req.user || '-') + ' 修改配置项 ' + pathArr.join('.') + (body.op === 'delete' ? '(删除)' : '') + ',变更段:' + (diffTop(cfg, next).join(',') || '无')); res.json({ ok: true, changed: diffTop(cfg, next), restart_required: true }); })); diff --git a/app/server/routes/files.js b/app/server/routes/files.js index 14ac4e9..a6cb800 100644 --- a/app/server/routes/files.js +++ b/app/server/routes/files.js @@ -7,6 +7,7 @@ const crypto = require('crypto'); const engine = require('../engine'); const { listTaskFiles } = require('./sessions'); const { resolveInTask } = require('../tools/executor'); +const log = require('../log'); const router = express.Router(); @@ -65,7 +66,7 @@ router.post('/:id/files', upload.array('files', 10), function (req, res) { } // 不再自动通知 AI:附件随用户下一条消息统一告知(见 routes/messages.js 的 attachments) if (uploaded.length) { - console.log('[file] ' + (req.user || '-') + ' ' + req.params.id + ' 上传 ' + uploaded.length + ' 个文件:' + + log.info('[file] ' + (req.user || '-') + ' ' + req.params.id + ' 上传 ' + uploaded.length + ' 个文件:' + uploaded.map(f => f.filename + '(' + f.size + 'B)').join('、')); } res.json({ uploaded }); @@ -163,7 +164,7 @@ router.delete('/:id/files', function (req, res) { fs.rmSync(abs, { recursive: true, force: true }); engine.getDb().prepare('DELETE FROM files WHERE session_id = ? AND filename = ?') .run(req.params.id, rel); - console.log('[file] ' + (req.user || '-') + ' ' + req.params.id + ' 删除文件 ' + rel); + log.info('[file] ' + (req.user || '-') + ' ' + req.params.id + ' 删除文件 ' + rel); res.json({ ok: true }); } catch (err) { res.status(404).json({ error: '文件不存在' }); diff --git a/app/server/routes/messages.js b/app/server/routes/messages.js index e83809c..ed06e26 100644 --- a/app/server/routes/messages.js +++ b/app/server/routes/messages.js @@ -1,6 +1,7 @@ // 消息与交互 API(README 10.2):发消息 / SSE 流 / 开始执行 / 终止 const express = require('express'); const engine = require('../engine'); +const log = require('../log'); const router = express.Router(); @@ -41,7 +42,7 @@ router.post('/:id/messages', wrap((req, res) => { ); if (!content) return res.status(400).json({ error: 'content 不能为空' }); const r = engine.postUserMessage(req.params.id, content); - console.log('[msg] ' + (req.user || '-') + ' ' + req.params.id + ' 用户消息(' + (r && r.delivered || '?') + '):' + + log.info('[msg] ' + (req.user || '-') + ' ' + req.params.id + ' 用户消息(' + (r && r.delivered || '?') + '):' + content.slice(0, 60).replace(/\s+/g, ' ')); res.json(r); })); diff --git a/app/server/routes/sessions.js b/app/server/routes/sessions.js index f082964..8ace35a 100644 --- a/app/server/routes/sessions.js +++ b/app/server/routes/sessions.js @@ -3,6 +3,7 @@ const express = require('express'); const fs = require('fs'); const path = require('path'); const engine = require('../engine'); +const log = require('../log'); const router = express.Router(); @@ -49,7 +50,7 @@ router.post('/', wrap((req, res) => { const title = (req.body && req.body.title || '').trim(); const modelId = (req.body && req.body.model_id || '').trim(); const session = engine.createSession(title, modelId); - console.log('[task] ' + (req.user || '-') + ' 新建任务 ' + session.id + '「' + (session.title || '未命名') + '」model=' + (modelId || '自动')); + log.info('[task] ' + (req.user || '-') + ' 新建任务 ' + session.id + '「' + (session.title || '未命名') + '」model=' + (modelId || '自动')); res.json(session); })); @@ -121,7 +122,7 @@ router.get('/:id', wrap((req, res) => { router.delete('/:id', wrap((req, res) => { const delDir = req.query.delete_dir === 'true' || req.query.delete_dir === ''; - console.log('[task] ' + (req.user || '-') + ' 删除任务 ' + req.params.id + (delDir ? '(含任务目录)' : '')); + log.info('[task] ' + (req.user || '-') + ' 删除任务 ' + req.params.id + (delDir ? '(含任务目录)' : '')); res.json(engine.deleteSession(req.params.id, delDir)); })); diff --git a/app/server/routes/system.js b/app/server/routes/system.js index e631081..a047e10 100644 --- a/app/server/routes/system.js +++ b/app/server/routes/system.js @@ -6,6 +6,7 @@ const express = require('express'); const engine = require('../engine'); const { loadConfig } = require('../config'); const versionInfo = require('../version'); +const log = require('../log'); const router = express.Router(); @@ -62,7 +63,7 @@ router.post('/restart', wrap((req, res) => { try { loadConfig(cfg.config_path); } catch (e) { return res.status(409).json({ error: '配置文件当前内容不合法,重启将无法启动:' + String(e && e.message || e) }); } - console.log('[system] 收到重启请求(force=' + force + ',打断 ' + running.length + ' 个回合),进程退出,等待 Docker 拉起'); + log.info('[system] 收到重启请求(force=' + force + ',打断 ' + running.length + ' 个回合),进程退出,等待 Docker 拉起'); res.json({ ok: true, restarting: true }); // 稍候再退出,确保响应已发出;容器由 Docker restart 策略自动重启 setTimeout(() => process.exit(0), 300); diff --git a/app/server/server.js b/app/server/server.js index 718b4a5..bf9dfe6 100644 --- a/app/server/server.js +++ b/app/server/server.js @@ -10,8 +10,10 @@ const { createBus } = require('./sse'); const { createAuth } = require('./auth'); const engine = require('./engine'); const mcp = require('./mcp'); +const log = require('./log'); const cfg = loadConfig(process.env.AGENT_CONFIG); +log.setLevel(cfg.log_level); // 分级日志开关(log.js;config.yml log_level,重启生效) const db = initDb(cfg.db_path); const bus = createBus(); @@ -59,11 +61,12 @@ const PORT = process.env.PORT || cfg.port; // 启动时先发现各 MCP 服务的工具(单个服务失败只警告,不阻止启动),发现完成后再开始监听。 mcp.init(cfg).then(() => { server.listen(PORT, () => { - console.log('Agent server listening on ' + PORT); - console.log(' workspace_root=' + cfg.workspace_root); - console.log(' models=' + cfg.models.map(m => m.id + '@' + m.url).join(', ')); + log.info('Agent server listening on ' + PORT); + log.info(' workspace_root=' + cfg.workspace_root); + log.info(' models=' + cfg.models.map(m => m.id + '@' + m.url).join(', ')); const mcpList = (cfg.mcp_servers || []).map(s => s.name + '@' + s.url).join(', '); - console.log(' mcp_servers=' + (mcpList || '(none)')); - console.log(' auth=' + (auth.enabled ? 'login (' + cfg.auth.users.map(u => u.user).join(', ') + ')' : '(disabled)')); + log.info(' mcp_servers=' + (mcpList || '(none)')); + log.info(' auth=' + (auth.enabled ? 'login (' + cfg.auth.users.map(u => u.user).join(', ') + ')' : '(disabled)')); + log.info(' log_level=' + cfg.log_level); }); }); diff --git a/app/server/tools/skills.js b/app/server/tools/skills.js index 2eba2bb..3a52164 100644 --- a/app/server/tools/skills.js +++ b/app/server/tools/skills.js @@ -8,6 +8,7 @@ const path = require('path'); const crypto = require('crypto'); const { spawn } = require('child_process'); const YAML = require('yaml'); +const log = require('../log'); class SkillNotFoundError extends Error { constructor(msg) { super(msg); this.name = 'SkillNotFoundError'; } @@ -52,7 +53,7 @@ function extractDescription(content) { async function listSkills(ctx) { const root = skillsRoot(ctx); if (!fs.existsSync(root)) { - console.log('[skills] 技能根目录不存在:' + root); + log.warn('[skills] 技能根目录不存在:' + root); return []; } const out = []; @@ -141,7 +142,7 @@ async function ensureDeps(ctx, dir, skillName) { const need = 'req:' + hashFile(reqPath) + '|install:' + hashFile(installPath); const markerPath = path.join(dir, '.deps_installed'); if (fs.existsSync(markerPath) && fs.readFileSync(markerPath, 'utf8') === need) { - console.log('[skills] ' + skillName + ' 依赖已安装(命中缓存)'); + log.debug('[skills] ' + skillName + ' 依赖已安装(命中缓存)'); return; } @@ -149,11 +150,11 @@ async function ensureDeps(ctx, dir, skillName) { if (hasReq) { const target = depsRoot(ctx); fs.mkdirSync(target, { recursive: true }); - console.log('[skills] ' + skillName + ':pip install --target ' + target); + log.debug('[skills] ' + skillName + ':pip install --target ' + target); await execSyncCapture('python3', ['-m', 'pip', 'install', '--target', target, '-r', reqPath], dir); } if (hasInstall) { - console.log('[skills] ' + skillName + ':执行 install.sh'); + log.debug('[skills] ' + skillName + ':执行 install.sh'); await execSyncCapture('bash', ['install.sh'], dir); } } catch (e) { @@ -161,7 +162,7 @@ async function ensureDeps(ctx, dir, skillName) { throw new DependencyInstallError('依赖安装失败:' + e.message, -1); } fs.writeFileSync(markerPath, need, 'utf8'); - console.log('[skills] ' + skillName + ':依赖安装完成'); + log.debug('[skills] ' + skillName + ':依赖安装完成'); } // ---------- 参数路径预处理 ---------- @@ -282,7 +283,7 @@ async function runSkill(ctx, skillName, inputArgs) { } const timeoutMs = (ctx.cfg && ctx.cfg.skills && ctx.cfg.skills.timeout_ms) || 120000; - console.log('[skills] 执行 ' + skillName + ':' + entry + ' ' + cmdArgs.join(' ')); + log.info('[skills] 执行 ' + skillName + ':' + entry + ' ' + cmdArgs.join(' ')); return runEntry(ctx, entry, cmdArgs, dir, timeoutMs); }