officecli 迁入技能层:skills/office 封装 + executor 预览托管,双盘同步整条退役
- skills/office:SKILL.md + scripts/office 封装层(命令闸门/help 对齐/get-pos 语义糖/create、open 出 ui_card marker);install.sh 按技能双跑约定把二进制拉到技能卷 bin/(不进 git/不进镜像,GitHub→gh-proxy 备源) - executor/preview.js:预览槽位+网关(原 mcp 侧 watch/gateway 移植),工作区=tasks 卷真实文件, /__session-kill 供 core 清槽;Dockerfile 零 officecli 痕迹,入口符号链接进 /usr/local/bin/office - core:preview-proxy 默认上游改 agent-executor:3100;tools/executor.js 通用 drainUiCards(terminal 输出 ::ui_card 标记行 → 剥离 + ctx.onCard,任意命令可产卡);engine 删会话改走 rexec.killPreviewSession - compose:agent-executor expose 3100(只走内网);.gitignore 排除技能二进制
This commit is contained in:
@@ -8,6 +8,8 @@ data/
|
||||
tasks/
|
||||
skills/deps/
|
||||
skills/*/.deps_installed
|
||||
# officecli 二进制资产:skills/office/install.sh 运行期拉取,不进 git
|
||||
skills/office/bin/
|
||||
skills/**/__pycache__/
|
||||
*.log
|
||||
.DS_Store
|
||||
|
||||
@@ -6,6 +6,7 @@ const { buildMessages, callModel, encodeBlocks, decodeBlocks, compressMessages,
|
||||
const { executeTool, resolveInTask } = require('./tools/executor');
|
||||
const publicFiles = require('./public-files');
|
||||
const mcp = require('./mcp');
|
||||
const rexec = require('./remote-exec');
|
||||
const log = require('./log');
|
||||
const profile = require('./user-profile');
|
||||
const memory = require('./memory');
|
||||
@@ -1089,8 +1090,8 @@ function deleteSession(sessionId, deleteDir) {
|
||||
const session = getSession(sessionId);
|
||||
if (!session) throw Object.assign(new Error('会话不存在'), { status_code: 404 });
|
||||
stop(sessionId);
|
||||
// 尽力清理该会话在 officecli 桥里的预览槽位与工作区目录副本(--purge;没配 officecli 则静默,失败只记日志,不阻断删除)
|
||||
mcp.notifyTool('officecli', { command: 'unwatch --session ' + String(sessionId).replace(/[^0-9A-Za-z_-]/g, '') + ' --purge' }, 5000, { 'X-Session-Dir': taskDirOf(sessionId) });
|
||||
// 尽力清理该会话在 executor 侧的预览槽(officecli 预览已迁 executor/preview.js;未配 executor 静默,失败只记日志不阻断删除)
|
||||
try { rexec.killPreviewSession(cfg, sessionId); } catch (_) {}
|
||||
db.prepare('DELETE FROM messages WHERE session_id = ?').run(sessionId);
|
||||
db.prepare('DELETE FROM files WHERE session_id = ?').run(sessionId);
|
||||
db.prepare('DELETE FROM sessions WHERE id = ?').run(sessionId);
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
// 与本地 spawn 的行为对齐:stdout+stderr 按到达顺序合并成一个 out 字符串;超时/取消杀远端进程组;
|
||||
// 通过 run.procs 注册句柄(remoteKill),使 engine 的停止/终止会话能连带取消远端任务。
|
||||
'use strict';
|
||||
const http = require('node:http');
|
||||
|
||||
// 单引号安全包裹(内部单引号按 '\'' 规则转义),供拼 sh -c 命令串用。
|
||||
function shq(s) { return "'" + String(s).replace(/'/g, "'\\''") + "'"; }
|
||||
@@ -97,4 +98,25 @@ async function run(cfg, opts) {
|
||||
return { code: exit.code, killed_by: exit.killed_by || localKill, out, truncated: !!exit.truncated };
|
||||
}
|
||||
|
||||
module.exports = { isRemote, run, shq, shellLine };
|
||||
// 预览槽清理:core 删会话后尽力 kill executor 侧该会话的预览槽(executor/preview.js 的 /__session-kill)。
|
||||
// 与 /exec 同容器异端口:主机名取 cfg.executor.url,端口 env EXECUTOR_PREVIEW_PORT(默认 3100,与 preview.js 对齐)。
|
||||
// fire-and-forget:槽是缓存不是承诺,漏网槽闲置回收自然到期,失败只静默不阻断会话删除。
|
||||
function killPreviewSession(cfg, sessionId, timeoutMs) {
|
||||
if (!isRemote(cfg) || !sessionId) return;
|
||||
let host;
|
||||
try { host = new URL(cfg.executor.url).hostname; } catch (_) { return; }
|
||||
const port = Number(process.env.EXECUTOR_PREVIEW_PORT || 3100);
|
||||
const body = JSON.stringify({ session: String(sessionId) });
|
||||
const headers = { 'content-type': 'application/json', 'content-length': String(Buffer.byteLength(body)) };
|
||||
if (cfg.executor.token) headers.authorization = 'Bearer ' + cfg.executor.token;
|
||||
let req;
|
||||
try {
|
||||
req = http.request({ host, port, path: '/__session-kill', method: 'POST', timeout: Number(timeoutMs) || 5000, headers },
|
||||
(res) => { res.resume(); });
|
||||
} catch (_) { return; }
|
||||
req.on('error', () => {});
|
||||
req.on('timeout', () => { req.destroy(); });
|
||||
req.end(body);
|
||||
}
|
||||
|
||||
module.exports = { isRemote, run, shq, shellLine, killPreviewSession };
|
||||
|
||||
@@ -13,19 +13,16 @@ const { Router } = require('express');
|
||||
const log = require('../log');
|
||||
|
||||
let services;
|
||||
const PREVIEW_DEFAULT = [{
|
||||
name: 'office', prefix: '/preview',
|
||||
host: process.env.EXECUTOR_PREVIEW_HOST || 'agent-executor',
|
||||
port: Number(process.env.EXECUTOR_PREVIEW_PORT || 3100),
|
||||
}];
|
||||
try {
|
||||
services = process.env.PREVIEW_PROXIES ? JSON.parse(process.env.PREVIEW_PROXIES) : [{
|
||||
name: 'officecli', prefix: '/preview',
|
||||
host: process.env.OFFICE_MCP_HOST || 'mcp_officecli',
|
||||
port: Number(process.env.OFFICE_PREVIEW_PORT || 3100),
|
||||
}];
|
||||
services = process.env.PREVIEW_PROXIES ? JSON.parse(process.env.PREVIEW_PROXIES) : PREVIEW_DEFAULT;
|
||||
} catch (e) {
|
||||
log.error('preview', 'PREVIEW_PROXIES \u89e3\u6790\u5931\u8d25\uff0c\u56de\u9000\u9ed8\u8ba4\u6ce8\u518c\u8868: ' + (e && e.message));
|
||||
services = [{
|
||||
name: 'officecli', prefix: '/preview',
|
||||
host: process.env.OFFICE_MCP_HOST || 'mcp_officecli',
|
||||
port: Number(process.env.OFFICE_PREVIEW_PORT || 3100),
|
||||
}];
|
||||
services = PREVIEW_DEFAULT;
|
||||
}
|
||||
|
||||
// \u5934\u767d\u540d\u5355\uff1a\u51ed\u636e\u4e0e\u516c\u7f51\u8eab\u4efd\uff08cookie/authorization/sec-fetch-*/connection\uff09\u4e00\u5f8b\u4e0d\u51fa\u5bb9\u5668\uff1b
|
||||
|
||||
@@ -659,6 +659,25 @@ function selectOutput(text, head, tail) {
|
||||
}
|
||||
|
||||
// terminal:spawn + 进程组 kill + 超时 + 输出截断
|
||||
// 通用终端输出 UI 卡片通道:命令行尾部的 ::ui_card {json}:: 标记行 → 从模型面剥离,整块交 ctx.onCard
|
||||
// (与 MCP 回包 ui_card 块同一协议,见 mcp.js:任何命令行都可产卡,不限 officecli 封装层)。
|
||||
// JSON 解析失败/无 action/ctx 不带 onCard 时标记行原样保留(宁可见不丢数据)。
|
||||
function drainUiCards(text, ctx) {
|
||||
if (!text || text.indexOf('::ui_card ') < 0) return text;
|
||||
const keep = [];
|
||||
for (const line of String(text).split('\n')) {
|
||||
const m = /^::ui_card (\{.*\})::$/.exec(line.trim());
|
||||
let card = null;
|
||||
if (m) { try { card = JSON.parse(m[1]); } catch (_) { card = null; } }
|
||||
if (card && typeof card === 'object' && card.action && ctx && typeof ctx.onCard === 'function') {
|
||||
try { ctx.onCard(Object.assign({}, card, { from: 'terminal' })); } catch (_) { /* 卡片是增强,不影响工具结果 */ }
|
||||
continue;
|
||||
}
|
||||
keep.push(line);
|
||||
}
|
||||
return keep.join('\n');
|
||||
}
|
||||
|
||||
async function toolTerminal(ctx, args) {
|
||||
const cfg = ctx.cfg;
|
||||
const timeout = args.timeout_ms || cfg.terminal.default_timeout_ms;
|
||||
@@ -670,6 +689,7 @@ async function toolTerminal(ctx, args) {
|
||||
// 配了 executor.url(或 env EXECUTOR_URL):命令交给远端 agent-executor 执行,文本拼回与本地完全一致。
|
||||
if (rexec.isRemote(cfg)) {
|
||||
const r = await rexec.run(cfg, { command: args.command, cwd, timeout_ms: timeout, run: ctx.run });
|
||||
r.out = drainUiCards(r.out, ctx);
|
||||
let text = selectOutput(r.out.replace(/\n+$/, ''), args.head_lines, args.tail_lines);
|
||||
if (r.killed_by === 'timeout') {
|
||||
text += (text ? '\n' : '') + '(命令超时 ' + timeout + 'ms,已终止;这是超时不是命令本身失败)';
|
||||
@@ -705,7 +725,7 @@ async function toolTerminal(ctx, args) {
|
||||
clearInterval(cancelCheck);
|
||||
ctx.run.procs.delete(child);
|
||||
// head_lines/tail_lines:对齐 Zed,在原始输出上选段(之前被完全忽略)。
|
||||
let text = selectOutput(out.replace(/\n+$/, ''), args.head_lines, args.tail_lines);
|
||||
let text = selectOutput(drainUiCards(out, ctx).replace(/\n+$/, ''), args.head_lines, args.tail_lines);
|
||||
if (killedBy === 'timeout') {
|
||||
// 超时/终止不是“执行失败”,不报 exit code(避免 -1 误导模型)。
|
||||
text += (text ? '\n' : '') + '(命令超时 ' + timeout + 'ms,已终止;这是超时不是命令本身失败)';
|
||||
|
||||
+83
-40
@@ -417,18 +417,20 @@ function saveTaskMedia(s, buf, kind, rawName) {
|
||||
// 3. 结论(不带 tool_calls 的 assistant_message,回合收尾)挂起到 done 再投:
|
||||
// 预算够 → 全文 + 附件卡片;放不下但 ≥2 → 降级「截断头部 + 全文写会话
|
||||
// .md 转文件卡片」(内容零丢失);<2 → 放弃并告警(网页端完整可见)。
|
||||
// 4. 工具台账:tool_call/tool_result 只往 st.tools 记账(✓/✗ 状态前缀 + 工具名 + 参数原文
|
||||
// 不解析;同类计数折叠、失败行尾 (failed))。攒满一屏(8 行)→ 独立「### 工具调用 +
|
||||
// 代码块」消息走串行队列即发(占 1 条配额);done 时零头补发(纯工具轮兜底也在此,
|
||||
// 不依赖任何文本消息);预算保不住结论储备、或直投失败 → 降级搭结论「--- 尾段」便车;
|
||||
// 失败不插队(用户确认:微信端重结果轻过程)。过程正文不再携带工具信息(单一出口防重复)。
|
||||
// 4. 工具台账(重结果轻过程;微信端不再有独立台账消息):tool_call/tool_result 只在 st.tools
|
||||
// 记账;失败即时单发一行「工具调用失败: 名称 + 参数」(预算保不住结论储备则留给尾段汇总);
|
||||
// done 时汇总为一句「本轮工具调用 N 次(name x c, ...),其中 M 次失败」搭结论尾段,
|
||||
// 纯工具轮(无结论文本)则汇总与文件卡片合成一条兜底消息(网页端始终全量可见)。
|
||||
// 5. 通用 ui_card(MCP 工具回包的预览卡片块):按 URL 去重攒进 st.cards,不独立占配额,
|
||||
// done 时作「文件」小节搭结论尾段;每条 markdown 链接 + 原始 URL 各一行(防纯文化退化
|
||||
// 后点不开);未知 action 或未配公网前缀在微信端静默忽略。
|
||||
// 挂起用「证据」判定而非猜测:下一条 assistant_message 或 done 都会把旧的挂起结算掉。
|
||||
function attachBus() {
|
||||
if (busAttached || !bus) return;
|
||||
busAttached = true;
|
||||
bus.onInternal((sessionId, event, data) => {
|
||||
if (event === 'assistant_message') { if (!data) return; }
|
||||
else if (event !== 'done' && event !== 'tool_call' && event !== 'tool_result' && event !== 'reasoning_delta') return;
|
||||
else if (event !== 'done' && event !== 'tool_call' && event !== 'tool_result' && event !== 'reasoning_delta' && event !== 'ui_card') return;
|
||||
try {
|
||||
const cs = db.prepare('SELECT user, channel FROM channel_sessions WHERE session_id = ?').get(sessionId);
|
||||
if (!cs || !String(cs.channel || '').startsWith('wx:')) return;
|
||||
@@ -436,12 +438,14 @@ function attachBus() {
|
||||
if (event === 'assistant_message') enqueueDelivery(bid, () => onAssistantEvent(bid, data, sessionId));
|
||||
else if (event === 'done') enqueueDelivery(bid, () => flushHeld(bid));
|
||||
else {
|
||||
// 工具调用/回执:心跳 + 台账记账;攒满一屏即经串行队列独立发台账(见策略注释第 4 条)。
|
||||
// 工具调用/回执:心跳 + 台账记账(台账不再独立成消息,见策略注释第 4 条);
|
||||
// 失败经串行队列即时单发一行;ui_card 攒进本回合卡片列表(done 时随尾段投)。
|
||||
// reasoning_delta(思考流)不进台账,只走下面的心跳——微信用户能看到「正在输入」在思考。
|
||||
if (event === 'tool_call') {
|
||||
toolDigestPush(bid, data);
|
||||
if (getTurn(bid).tools.length >= DIGEST_MAX_LINES) enqueueDelivery(bid, () => flushLedger(bid, DIGEST_MAX_LINES));
|
||||
} else if (event === 'tool_result') toolDigestMark(bid, data);
|
||||
if (event === 'tool_call') toolDigestPush(bid, data);
|
||||
else if (event === 'tool_result') {
|
||||
toolDigestMark(bid, data);
|
||||
if (data && data.is_error) enqueueDelivery(bid, () => flushFailedLine(bid));
|
||||
} else if (event === 'ui_card') cardCollect(bid, data, sessionId);
|
||||
maybeTypingPing(bid); // 「正在输入」心跳:长工具/思考回合里微信持续看到 AI 还在干活
|
||||
}
|
||||
} catch (e) {
|
||||
@@ -479,7 +483,7 @@ const REPLY_QUOTA = 10; // iLink 单个 context token 的回复条数(
|
||||
const PROC_HEAD_LIMIT = 1; // 直发的开头过程消息条数(用户确认:1 条「我打算怎么做」足够,工具信息归台账)
|
||||
const CONCLUSION_RESERVE = 4; // 过程发送的下限防线:始终给结论留这么多条
|
||||
const turnState = new Map(); // bid -> { sent, proc, omitted, held, tools };内存态,重启即新回合,可接受
|
||||
function resetTurn(bid) { turnState.set(bid, { sent: 0, proc: 0, omitted: 0, held: null, tools: [] }); return turnState.get(bid); }
|
||||
function resetTurn(bid) { turnState.set(bid, { sent: 0, proc: 0, omitted: 0, held: null, tools: [], cards: [] }); return turnState.get(bid); }
|
||||
function getTurn(bid) { return turnState.get(bid) || resetTurn(bid); }
|
||||
|
||||
// 投递前的内容归一(语义同旧 deliverNow):errAck / 空文本 → 不可投;富文本 blocks → 占位文案。
|
||||
@@ -531,13 +535,11 @@ async function onAssistantEvent(bid, m, sessionId) {
|
||||
async function flushHeld(bid) {
|
||||
const st = turnState.get(bid);
|
||||
if (!st) return;
|
||||
await flushLedger(bid);
|
||||
if (!st.held) return;
|
||||
if (!st.held) { await flushTail(bid); return; } // 纯工具轮兜底(汇总 + 文件卡片)
|
||||
const held = st.held;
|
||||
st.held = null;
|
||||
await deliverConclusion(bid, held.m, held.sessionId);
|
||||
}
|
||||
|
||||
function bindReady(bid) {
|
||||
const b = getBinding(bid);
|
||||
return b && b.status === 'online' && b.wx_to_user ? b : null;
|
||||
@@ -556,7 +558,6 @@ function markSeen(b, m) {
|
||||
// ---------- 工具台账(ledger) ----------
|
||||
// 参数原文按固定长度截取,不做 JSON 解析、不按工具选字段;压平换行只为防撑破一行。
|
||||
// write_file 等正文类参数最多露出前 DIGEST_ARG_LEN 字。
|
||||
const DIGEST_MAX_LINES = 8;
|
||||
const DIGEST_ARG_LEN = 120; // 代码块在微信端横向滚动不折行,参数尽量露全,仅防超长撑爆消息体
|
||||
function argHint(args) {
|
||||
try {
|
||||
@@ -584,18 +585,21 @@ function toolDigestMark(bid, data) {
|
||||
if (t) t.err = true;
|
||||
} catch (_) { /* 同上 */ }
|
||||
}
|
||||
// 台账行:✓/✗ 状态前缀(失败在行首才醒目)+ 工具名 + 参数原文 + 计数折叠(独立直发与结论尾段两处共用)。
|
||||
const ledgerLine = t => '- ' + (t.err ? '✗' : '✓') + ' ' + t.name + (t.hint ? ' ' + t.hint : '') + (t.count > 1 ? ' x' + t.count : '');
|
||||
// 降级路径的渲染(peek 不清空):台账单发预算不足/失败时搭结论尾段,结论投递成功后调用方清空。
|
||||
// 若 wxbot 开 WXBOT_STRIP_MARKDOWN 回退纯文化,stripMarkdown 会把围栏/标题降为普通行,信息不丢。
|
||||
// done 尾段的工具汇总(peek 不清空):一句计数 + 未即时送达的失败行;结论投递成功后由调用方清空。
|
||||
function peekToolDigest(st) {
|
||||
const ts = st && st.tools;
|
||||
if (!ts || !ts.length) return '';
|
||||
const lines = ts.slice(0, DIGEST_MAX_LINES).map(ledgerLine);
|
||||
if (ts.length > lines.length) lines.push('- ...等 ' + (ts.length - lines.length) + ' 类');
|
||||
return '---\n\n### 工具调用\n\n```\n' + lines.join('\n') + '\n```';
|
||||
}
|
||||
// 正文与 digest 一起分段:正文照旧 splitText,digest 原子追尾——markdown 代码围栏不能被
|
||||
const total = ts.reduce((n, t) => n + (t.count || 1), 0);
|
||||
const breakdown = ts.map(t => t.name + (t.count > 1 ? ' x' + t.count : '')).join(', ');
|
||||
const errN = ts.filter(t => t.err).length;
|
||||
let s = '---\n\n### 工具\n\n本轮工具调用 ' + total + ' 次(' + breakdown + ')';
|
||||
if (errN) s += ',其中 ' + errN + ' 次失败';
|
||||
const unnotified = ts.filter(t => t.err && !t.warned);
|
||||
if (unnotified.length) s += '\n' + unnotified.map(t => '- 失败: ' + t.name + (t.hint ? ' ' + t.hint : '')).join('\n');
|
||||
return s;
|
||||
}// 正文与 digest 一起分段:正文照旧 splitText,digest 原子追尾——markdown 代码围栏不能被
|
||||
// 1800 字分段拦腰斩断;尾段能与正文同段就同段(不多占配额),放不下才单独成段。
|
||||
function digestSegs(body, digest) {
|
||||
const segs = body ? splitText(body) : [];
|
||||
@@ -607,30 +611,67 @@ function digestSegs(body, digest) {
|
||||
return segs;
|
||||
}
|
||||
// 独立台账消息:一批 ≤8 行整屏渲染,无折叠(零头等下一班车,done 时补发)。
|
||||
function renderLedger(batch) {
|
||||
return '### 工具调用\n\n```\n' + batch.map(ledgerLine).join('\n') + '\n```';
|
||||
}
|
||||
// 台账直发:mid 门槛控制节奏(中途=攒满一屏才发,done=零头都发);预算保不住结论储备就
|
||||
// 留给结论尾段搭便车;直投失败归还队首(串行队列调度,与正文消息天然排队,无并发互踩)。
|
||||
async function flushLedger(bid, min) {
|
||||
// 失败即时单发:一次 tool_result 失败事件触发一次;预算保不住结论储备就留给尾段汇总兜底。
|
||||
async function flushFailedLine(bid) {
|
||||
const st = getTurn(bid);
|
||||
if (!st.tools.length || st.tools.length < (min || 0)) return;
|
||||
const t = st.tools.find(x => x.err && !x.warned);
|
||||
if (!t) return;
|
||||
const b = bindReady(bid);
|
||||
if (!b) return;
|
||||
if (st.sent + 1 > REPLY_QUOTA - CONCLUSION_RESERVE) return; // 台账是锦上添花,结论才是刚需
|
||||
const batch = st.tools.splice(0, DIGEST_MAX_LINES);
|
||||
if (st.sent + 1 > REPLY_QUOTA - CONCLUSION_RESERVE) return;
|
||||
try {
|
||||
await wxbotApi('POST', '/api/deliver', { id: b.id, to: b.wx_to_user, text: renderLedger(batch) }, 15000);
|
||||
await wxbotApi('POST', '/api/deliver', { id: b.id, to: b.wx_to_user, text: '工具调用失败: ' + t.name + (t.hint ? '\n' + t.hint : '') }, 15000);
|
||||
st.sent++;
|
||||
log.debug('wechat', bid + ' 台账直投 ' + batch.length + ' 类调用(余 ' + st.tools.length + ')');
|
||||
} catch (e) {
|
||||
st.tools = batch.concat(st.tools);
|
||||
log.debug('wechat', bid + ' 台账直投失败,归还待搭结论尾段:' + msg(e));
|
||||
}
|
||||
t.warned = true;
|
||||
} catch (_) { /* 投失败不紧:done 时尾段汇总仍会列出 */ }
|
||||
}
|
||||
|
||||
// ---------- 通用 UI 卡片(bus ui_card 事件,见 wechat 策略注释第 5 条)----------
|
||||
// open_preview → 绝对预览 URL:与前端 pvOfficeUrl/网关寻址同款,前缀真相在 core(public_link.base_url)。
|
||||
function uiCardUrl(data, sessionId) {
|
||||
if (!data || data.action !== 'open_preview' || !data.arg) return '';
|
||||
const base = (cfg.public_link && cfg.public_link.base_url) || '';
|
||||
if (!base) return '';
|
||||
const seg = String(data.arg).split('/').filter(Boolean).map(encodeURIComponent).join('/');
|
||||
return seg && base.replace(/\/+$/, '') + '/preview/' + encodeURIComponent(sessionId) + '/' + seg + '/';
|
||||
}
|
||||
function cardCollect(bid, data, sessionId) {
|
||||
try {
|
||||
const url = uiCardUrl(data, sessionId);
|
||||
if (!url) return; // 未知 action / 未配公网前缀:微信端忽略(与前端动作注册表同款向前兼容)
|
||||
const plain = v => String(v || '').replace(/[\[\]\n]/g, ' ').trim();
|
||||
const st = getTurn(bid);
|
||||
const item = { title: plain(data.title || data.arg) || '(未命名文件)', note: plain(data.note), url };
|
||||
const ex = st.cards.find(c => c.url === url);
|
||||
if (ex) Object.assign(ex, item); else st.cards.push(item); // 同文件重复出卡只留最新
|
||||
} catch (_) { /* 卡片是增强,绝不动摇投递 */ }
|
||||
}
|
||||
function peekCardSection(st) {
|
||||
const cs = st && st.cards;
|
||||
if (!cs || !cs.length) return '';
|
||||
// markdown 链接 + 原始 URL 各一行:WXBOT_STRIP_MARKDOWN 或微信渲染退化时链接仍可直接点
|
||||
const lines = cs.map(c => '- [' + c.title + (c.note ? '(' + c.note + ')' : '') + '](' + c.url + ')\n ' + c.url);
|
||||
return '### 文件\n\n' + lines.join('\n');
|
||||
}
|
||||
|
||||
// 纯工具轮兜底:done 时没有挂起的结论,但攒了汇总/卡片 → 合成一条独立消息(预算允许才发)。
|
||||
async function flushTail(bid) {
|
||||
const st = getTurn(bid);
|
||||
const digest = [peekToolDigest(st), peekCardSection(st)].filter(Boolean).join('\n\n');
|
||||
if (!digest) return;
|
||||
const b = bindReady(bid);
|
||||
if (!b || st.sent + 1 > REPLY_QUOTA - CONCLUSION_RESERVE) return;
|
||||
try {
|
||||
await wxbotApi('POST', '/api/deliver', { id: b.id, to: b.wx_to_user, text: digest }, 15000);
|
||||
st.sent++;
|
||||
st.tools = [];
|
||||
st.cards = [];
|
||||
} catch (_) { /* 静默:网页端全量可见 */ }
|
||||
}// 台账直发:mid 门槛控制节奏(中途=攒满一屏才发,done=零头都发);预算保不住结论储备就
|
||||
// 留给结论尾段搭便车;直投失败归还队首(串行队列调度,与正文消息天然排队,无并发互踩)。
|
||||
|
||||
// 过程消息:直发窗口内且投完后仍给结论留足储备才投;否则计入 omitted,并进结论的注记行。
|
||||
// 正文不携带工具信息——台账自有出口(flushLedger 独立直发,预算不足时降级搭结论尾段),不重复。
|
||||
// 正文不携带工具信息——工具信息自有出口(失败即时行/done 尾段汇总),不重复。
|
||||
async function deliverProcess(bid, m, sessionId) {
|
||||
const b = bindReady(bid);
|
||||
if (!b || stale(b, m)) return;
|
||||
@@ -658,7 +699,7 @@ async function deliverConclusion(bid, m, sessionId) {
|
||||
const st = getTurn(bid);
|
||||
let content = normalizeContent(m);
|
||||
if (st.omitted) content = '`以上已省略 ' + st.omitted + ' 条过程消息`\n---\n' + (content || '');
|
||||
const digest = peekToolDigest(st);
|
||||
const digest = [peekToolDigest(st), peekCardSection(st)].filter(Boolean).join('\n\n');
|
||||
if (!content && !digest) { st.omitted = 0; return; } // 只剩注记:不为「省略了什么」单独刷屏
|
||||
const full = content ? (digest ? content + '\n\n' + digest : content) : digest; // 兑底文件/卡片用含 digest 的全文
|
||||
const segs = digestSegs(content, digest);
|
||||
@@ -668,6 +709,7 @@ async function deliverConclusion(bid, m, sessionId) {
|
||||
if (!await sendSegs(b, segs)) return;
|
||||
st.sent += segs.length + await sendAttachments(b, attach);
|
||||
st.tools = [];
|
||||
st.cards = [];
|
||||
} else if (remaining >= 2) {
|
||||
try {
|
||||
const dir = engine.taskDirOf(sessionId);
|
||||
@@ -678,6 +720,7 @@ async function deliverConclusion(bid, m, sessionId) {
|
||||
st.sent++;
|
||||
st.sent += await sendAttachments(b, [{ filename: name, b64: Buffer.from(full).toString('base64') }]);
|
||||
st.tools = [];
|
||||
st.cards = [];
|
||||
if (attach.length) log.warn('wechat', b.id + ' 结论走文件兜底,正文内 ' + attach.length + ' 个附件卡片未投(链接仍在文件里)');
|
||||
} catch (e) {
|
||||
log.warn('wechat', b.id + ' 结论溢出降级投递失败:' + msg(e));
|
||||
|
||||
@@ -24,8 +24,12 @@ services:
|
||||
# 微信接入
|
||||
- WXBOT_URL=http://wxbot:8093
|
||||
- WXBOT_TOKEN=${WXBOT_TOKEN:?WXBOT_TOKEN not set - run scripts/init.sh}
|
||||
- VIRTUAL_HOST=agent.ai.foresh.com
|
||||
- VIRTUAL_PORT=8090
|
||||
- CERT_NAME=default
|
||||
networks:
|
||||
- agent-mcp-net
|
||||
- my-app-network
|
||||
|
||||
# 技能准备(一次性,跑完退出):把各技能的“运行期可变”依赖落到宿主 ./skills——
|
||||
# requirements.txt → 先离线探测,只把镜像缺的包装进共享 deps 目录(镜像已带的不重复装);
|
||||
@@ -69,6 +73,9 @@ services:
|
||||
condition: service_completed_successfully
|
||||
expose:
|
||||
- "9000"
|
||||
# officecli 预览槽位+网关(preview.js,容器内 3100):只走 agent-mcp-net 内网,
|
||||
# 公网访问唯一路径是 core 的 /preview 反代(登录 cookie 门禁);绝不映射到宿主端口。
|
||||
- "3100"
|
||||
volumes:
|
||||
# 核心变更:将宿主机 tasks 挂载到非标准路径 /mnt/host-tasks
|
||||
# 目的:wrapper 启动时先 unmount 此路径,确保未经 wrapper 的进程无法访问其他 session 数据
|
||||
@@ -154,3 +161,5 @@ networks:
|
||||
agent-mcp-net:
|
||||
name: agent-mcp-net
|
||||
driver: bridge
|
||||
my-app-network:
|
||||
external: true
|
||||
|
||||
@@ -61,6 +61,7 @@ RUN pip3 install --no-cache-dir --break-system-packages \
|
||||
# ---- executor 服务(零依赖单文件,仅 Node 内置 http)----
|
||||
WORKDIR /app
|
||||
COPY executor/server.js ./
|
||||
COPY executor/preview.js ./
|
||||
# 技能依赖准备脚本:由 agent-executor-init 服务在启动前执行(pip/资产,无特权)
|
||||
COPY executor/init-skills.js ./
|
||||
|
||||
@@ -105,3 +106,4 @@ RUN for d in /tmp/skills/*/; do \
|
||||
fi; \
|
||||
done; \
|
||||
rm -rf /tmp/skills
|
||||
|
||||
|
||||
@@ -0,0 +1,263 @@
|
||||
// officecli 预览槽位 + 网关(自 mcp/officecli 的 watch.js/gateway.js 迁入 executor,合一)。
|
||||
// 数据面根本变化:预览的文件就是 tasks 卷上的真实文件(EXECUTOR_ISOLATION_BASE 挂载点下),
|
||||
// 不再是另一块盘的拷贝——同步教学 / push / 取件链(/f/) / scratch 清理整条双盘动线随之退役。
|
||||
// 槽位 = 缓存而非承诺:链接按任务路径寻址 <prefix>/<会话id>/<文档相对路径>/,
|
||||
// 闲置回收/挤占后页面再访问由本进程 revive 就地冷启动。
|
||||
// 生命周期:由 executor 服务进程(容器内 PID1)托管 spawn,跨 /exec 存活;
|
||||
// 二进制取技能资产(skills/office/install.sh 由 init 阶段拉到技能卷,executor :ro 挂载执行)。
|
||||
// 监听 EXECUTOR_PREVIEW_PORT(默认 3100,只走内网):core 的通用预览反代(登录 cookie 门禁)是唯一入口;
|
||||
// /__session-kill 供 core 删会话时尽力清槽(Bearer EXECUTOR_TOKEN,与 /exec 同一信任域)。
|
||||
'use strict';
|
||||
const http = require('node:http');
|
||||
const net = require('node:net');
|
||||
const fs = require('node:fs');
|
||||
const path = require('node:path');
|
||||
const { spawn } = require('node:child_process');
|
||||
|
||||
const WORKSPACE = path.resolve(process.env.EXECUTOR_ISOLATION_BASE || '/mnt/host-tasks');
|
||||
const PREFIX = (process.env.OFFICE_PREVIEW_PREFIX || '/preview').replace(/\/+$/, '');
|
||||
const PORT = Number(process.env.EXECUTOR_PREVIEW_PORT || 3100);
|
||||
const SLOTS = Number(process.env.OFFICE_SLOTS || 4);
|
||||
const WATCH_BASE = Number(process.env.OFFICE_WATCH_BASE || 26315); // watch 自身端口(+slot),只绑回环
|
||||
const IDLE_MS = Number(process.env.OFFICE_IDLE_MS || 6 * 3600 * 1000);
|
||||
const BIN = process.env.OFFICECLI_BIN || '/workspace/skills/office/bin/officecli';
|
||||
const TOKEN = String(process.env.EXECUTOR_TOKEN || '');
|
||||
const EXTS = new Set(['.docx', '.xlsx', '.pptx']);
|
||||
|
||||
const slots = new Map(); // slot -> {file, task, rel, port, watch, lastUsed, conns, pageDec, pageEnc}
|
||||
const starting = new Map(); // 文件绝对路径 -> Promise:同文件并发 watch 合并为一次 spawn(vendor 限制同文件单 watch)
|
||||
|
||||
function log(...a) { console.log('[preview]', ...a); }
|
||||
|
||||
// 路径护栏:tasks 卷下的办公文档,禁止穿越;必须挂在会话目录下(至少两层,寻址/鉴权都按会话组织)。
|
||||
function guard(p) {
|
||||
const abs = path.resolve(WORKSPACE, String(p || ''));
|
||||
const rel = path.relative(WORKSPACE, abs);
|
||||
if (rel.startsWith('..') || path.isAbsolute(rel)) throw new Error('Path must be inside the workspace: ' + p);
|
||||
if (!EXTS.has(path.extname(abs).toLowerCase())) throw new Error('Only .docx/.xlsx/.pptx files are supported: ' + p);
|
||||
if (!fs.existsSync(abs)) throw new Error('File not found: ' + p);
|
||||
const segs = rel.split(path.sep).filter(Boolean);
|
||||
if (segs.length < 2) throw new Error('Preview only supports files under a session directory: ' + p);
|
||||
return abs;
|
||||
}
|
||||
|
||||
function pageOf(abs) {
|
||||
const segs = path.relative(WORKSPACE, abs).split(path.sep).filter(Boolean);
|
||||
return {
|
||||
task: segs[0],
|
||||
rel: segs.slice(1).join('/'),
|
||||
pageDec: '/' + segs.join('/'),
|
||||
pageEnc: '/' + segs.map((s) => encodeURIComponent(s)).join('/'),
|
||||
};
|
||||
}
|
||||
|
||||
function portUp(port, tries = 40) {
|
||||
return new Promise((res, rej) => {
|
||||
let n = 0;
|
||||
(function probe() {
|
||||
const s = net.connect(port, '127.0.0.1');
|
||||
s.on('connect', () => { s.destroy(); res(); });
|
||||
s.on('error', () => { s.destroy(); if (++n >= tries) return rej(new Error('watch server did not come up')); setTimeout(probe, 250); });
|
||||
})();
|
||||
});
|
||||
}
|
||||
|
||||
async function startWatch(file) {
|
||||
const abs = guard(file);
|
||||
for (const [, s] of slots) if (s.file === abs) { s.lastUsed = Date.now(); return s; }
|
||||
if (starting.has(abs)) {
|
||||
try { await starting.get(abs); } catch (_) {}
|
||||
for (const [, s] of slots) if (s.file === abs) return s;
|
||||
throw new Error('Failed to start watch (concurrent start for the same file); retry');
|
||||
}
|
||||
const p = spawnWatch(abs).finally(() => starting.delete(abs));
|
||||
starting.set(abs, p);
|
||||
return p;
|
||||
}
|
||||
|
||||
async function spawnWatch(abs) {
|
||||
const page = pageOf(abs);
|
||||
let slot = -1;
|
||||
for (let i = 0; i < SLOTS; i++) if (!slots.has(i)) { slot = i; break; }
|
||||
if (slot < 0) { // 槽满:优先踢「无活动连接且最久未用」;全开着页面才抢最冷的
|
||||
const ent = [...slots.entries()];
|
||||
const idle = ent.filter(([, s]) => !s.conns);
|
||||
slot = (idle.length ? idle : ent).sort((a, b) => a[1].lastUsed - b[1].lastUsed)[0][0];
|
||||
stop(slot);
|
||||
}
|
||||
const wp = WATCH_BASE + slot;
|
||||
const child = spawn(BIN, ['watch', abs, '--port', String(wp)], {
|
||||
stdio: 'ignore',
|
||||
cwd: '/tmp',
|
||||
env: { PATH: process.env.PATH || '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
|
||||
HOME: '/tmp', TMPDIR: '/tmp', TZ: process.env.TZ || 'Asia/Shanghai',
|
||||
// slim 镜像无 ICU:不变式模式跑 .NET;改动即落盘 + 关自动 resident(与命令侧 wrapper 同一组开关)
|
||||
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: '1',
|
||||
OFFICECLI_NO_AUTO_RESIDENT: '1', OFFICECLI_RESIDENT_FLUSH: 'each' },
|
||||
});
|
||||
child.on('exit', () => { if (slots.get(slot)?.watch === child) stop(slot); });
|
||||
const entry = { file: abs, task: page.task, rel: page.rel, port: wp, watch: child, lastUsed: Date.now(), conns: 0, pageDec: page.pageDec, pageEnc: page.pageEnc };
|
||||
slots.set(slot, entry); // 同步占坑:等端口就绪期间并发不会踩同一槽
|
||||
try {
|
||||
await portUp(wp);
|
||||
} catch (e) {
|
||||
child.kill();
|
||||
if (slots.get(slot) === entry) slots.delete(slot);
|
||||
throw new Error('Failed to start watch: ' + e.message);
|
||||
}
|
||||
log(`slot${slot} ${abs} watch:${wp} page=${PREFIX}${page.pageDec}`);
|
||||
return entry;
|
||||
}
|
||||
|
||||
function stop(slot) {
|
||||
const s = slots.get(slot);
|
||||
if (!s) return false;
|
||||
try { s.watch.kill(); } catch (_) {}
|
||||
slots.delete(slot);
|
||||
log(`slot${slot} 已停止`);
|
||||
return true;
|
||||
}
|
||||
|
||||
// core 删会话尽力清槽:不删任何数据(盘上的就是任务本体,删目录是 core 自己的事)。
|
||||
function stopSession(taskId) {
|
||||
const t = String(taskId || '');
|
||||
const stopped = [];
|
||||
for (const [slot, s] of [...slots]) if (s.task === t) { stop(slot); stopped.push(s.rel || s.file); }
|
||||
return { session: t, stopped };
|
||||
}
|
||||
|
||||
// 路由:rel = 已解码、剥掉 PREFIX 的请求路径;exact = 页面本身(缺尾斜杠由 301 补),最长前缀优先。
|
||||
function matchPage(rel) {
|
||||
if (!rel) return null;
|
||||
const rr = rel.startsWith('/') ? rel : '/' + rel;
|
||||
let best = null;
|
||||
for (const s of slots.values()) {
|
||||
if (rr === s.pageDec) return { entry: s, exact: true };
|
||||
if (rr.startsWith(s.pageDec + '/')) {
|
||||
if (!best || s.pageDec.length > best.entry.pageDec.length) best = { entry: s, exact: false };
|
||||
}
|
||||
}
|
||||
return best;
|
||||
}
|
||||
|
||||
// 未命中兜底:请求路径本身就是存在的会话文档 → 回收/挤掉后就地复活;不行 = 维持 404。
|
||||
async function revive(rel) {
|
||||
const rr = (rel || '').replace(/\/+$/, '');
|
||||
if (!rr || rr === '/') return null;
|
||||
try {
|
||||
await startWatch(path.join(WORKSPACE, rr));
|
||||
return matchPage(rr);
|
||||
} catch (_) { return null; }
|
||||
}
|
||||
|
||||
// ---------- 网关转发(原 gateway.js:槽位号不出容器) ----------
|
||||
// 上游(watch)确实用得到的头;cookie/authorization 等一律不进(core 那层已过滤,这是第二道防线)。
|
||||
const PASS = new Set(['accept', 'accept-encoding', 'cache-control', 'pragma', 'content-type', 'content-length', 'last-event-id', 'if-modified-since', 'if-none-match']);
|
||||
|
||||
function forwardTo(entry, req, res, innerPath) {
|
||||
const selfHost = '127.0.0.1:' + entry.port;
|
||||
const fwd = { host: selfHost };
|
||||
for (const k of Object.keys(req.headers)) if (PASS.has(k)) fwd[k] = req.headers[k];
|
||||
if (req.headers.origin) fwd.origin = 'http://' + selfHost;
|
||||
const qpos = req.url.indexOf('?');
|
||||
const search = qpos >= 0 ? req.url.slice(qpos) : '';
|
||||
const inner = innerPath.startsWith('/') ? innerPath : '/' + innerPath;
|
||||
// 槽位续命:建连即续,此后每帧回传再续(SSE 长连接只在建连续会把常驻页面误判成闲置);
|
||||
// conns>0 = 有人正开着预览页,闲置回收/槽位挤占都绕着它走。
|
||||
entry.lastUsed = Date.now();
|
||||
entry.conns = (entry.conns || 0) + 1;
|
||||
let released = false;
|
||||
const release = () => { if (!released) { released = true; entry.conns = Math.max(0, entry.conns - 1); } };
|
||||
res.once('close', release);
|
||||
res.once('finish', release);
|
||||
const upstream = http.request(
|
||||
{ host: '127.0.0.1', port: entry.port, path: encodeURI(inner) + search, method: req.method, headers: fwd },
|
||||
(up) => {
|
||||
const h = Object.assign({}, up.headers);
|
||||
if (String(h['content-type'] || '').includes('text/event-stream')) { h['cache-control'] = 'no-cache'; h['x-accel-buffering'] = 'no'; }
|
||||
res.writeHead(up.statusCode, h);
|
||||
up.on('data', () => { entry.lastUsed = Date.now(); });
|
||||
up.pipe(res);
|
||||
});
|
||||
upstream.on('error', () => {
|
||||
if (!res.headersSent) res.writeHead(502, { 'content-type': 'text/plain; charset=utf-8' }).end('预览槽位不可达(可能刚停止或已到期回收)');
|
||||
else res.destroy();
|
||||
release();
|
||||
});
|
||||
req.pipe(upstream);
|
||||
}
|
||||
|
||||
// vendor 预览页把交互 API 硬编码成根绝对路径(/api/selection、/events…):按 Referer 找回来源槽位,原路径原样转发(不剥页面前缀)。
|
||||
function matchReferer(req) {
|
||||
const ref = req.headers.referer || req.headers.referrer || '';
|
||||
if (!ref) return null;
|
||||
try {
|
||||
const rp = decodeURIComponent(new URL(ref).pathname);
|
||||
if (!rp.startsWith(PREFIX + '/')) return null;
|
||||
return matchPage(rp.slice(PREFIX.length));
|
||||
} catch (_) { return null; }
|
||||
}
|
||||
|
||||
function tokenOk(req) {
|
||||
if (!TOKEN) return true; // 没配 token = 本部署不启用鉴权(与 server.js 同语义)
|
||||
return String(req.headers.authorization || '') === 'Bearer ' + TOKEN;
|
||||
}
|
||||
|
||||
function handleSessionKill(req, res) {
|
||||
if (!tokenOk(req)) { res.writeHead(403).end('bad token'); return; }
|
||||
let body = '';
|
||||
req.on('data', (d) => { body += d; if (body.length > 4096) req.destroy(); });
|
||||
req.on('end', () => {
|
||||
let sid = '';
|
||||
try { sid = String(JSON.parse(body || '{}').session || ''); } catch (_) {}
|
||||
if (!sid || sid === '.' || sid === '..' || /[/\\\0]/.test(sid)) {
|
||||
res.writeHead(400, { 'content-type': 'application/json' }).end('{"error":"bad session"}');
|
||||
return;
|
||||
}
|
||||
res.writeHead(200, { 'content-type': 'application/json' }).end(JSON.stringify(stopSession(sid)));
|
||||
});
|
||||
}
|
||||
|
||||
function notFound(res) {
|
||||
res.writeHead(404, { 'content-type': 'text/plain; charset=utf-8' })
|
||||
.end('无匹配预览(文档不存在/不在会话目录下,或不是 .docx/.xlsx/.pptx)');
|
||||
}
|
||||
|
||||
async function route(req, res) {
|
||||
if (req.method === 'POST' && req.url.split('?')[0] === '/__session-kill') return handleSessionKill(req, res);
|
||||
let u;
|
||||
try { u = decodeURIComponent((req.url || '/').split('?')[0]); } catch (_) { res.writeHead(400).end('bad path'); return; }
|
||||
if (req.method === 'GET' && u === '/gateway-healthz') {
|
||||
const body = JSON.stringify({ ok: true, prefix: PREFIX, slots: slots.size, bin: BIN, bin_ready: fs.existsSync(BIN) });
|
||||
res.writeHead(200, { 'content-type': 'application/json' }).end(body);
|
||||
return;
|
||||
}
|
||||
if (u === PREFIX + '/' || u.startsWith(PREFIX + '/')) {
|
||||
const rel = u.slice(PREFIX.length) || '/';
|
||||
let m = matchPage(rel);
|
||||
if (!m) m = await revive(rel); // 槽=缓存:页面重开/冷槽就地复活
|
||||
if (m) {
|
||||
if (m.exact && !u.endsWith('/')) { res.writeHead(301, { location: (req.url || u) + '/' }).end(); return; } // 相对资源解析需要尾斜杠
|
||||
const cut = PREFIX.length + m.entry.pageDec.length; // 剥掉「前缀+页面路径」才是 watch 的内层路径
|
||||
return forwardTo(m.entry, req, res, u.length > cut ? u.slice(cut) : '/');
|
||||
}
|
||||
}
|
||||
const viaRef = matchReferer(req);
|
||||
if (viaRef) return forwardTo(viaRef.entry, req, res, u);
|
||||
notFound(res);
|
||||
}
|
||||
|
||||
function start() {
|
||||
const srv = http.createServer((req, res) => {
|
||||
route(req, res).catch(() => { if (!res.headersSent) res.writeHead(500, { 'content-type': 'text/plain; charset=utf-8' }).end('预览网关内部错误'); });
|
||||
});
|
||||
srv.listen(PORT, '0.0.0.0', () => log('监听 :' + PORT + ' 前缀=' + PREFIX + ' 工作区=' + WORKSPACE + ' 二进制' + (fs.existsSync(BIN) ? '就位' : '缺失(镜像未烘入?)')));
|
||||
setInterval(() => {
|
||||
const now = Date.now();
|
||||
// 有活动连接的槽 = 有人正开着页面,永不闲置回收(槽满时它最后被抢,见 spawnWatch)
|
||||
for (const [slot, s] of [...slots]) if (!s.conns && now - s.lastUsed > IDLE_MS) { log(`slot${slot} 闲置回收`); stop(slot); }
|
||||
}, 60000).unref();
|
||||
return srv;
|
||||
}
|
||||
|
||||
module.exports = { start, stopSession };
|
||||
@@ -704,6 +704,10 @@ server.listen(PORT, () => {
|
||||
selfCheck();
|
||||
});
|
||||
|
||||
// officecli 预览槽位+网关(preview.js):同容器第二内网端口(默认 3100,不对外映射),
|
||||
// core 的通用预览反代(登录 cookie 门禁)是唯一入口;模块自带闲置回收与自愈复活。
|
||||
try { require('./preview').start(); } catch (e) { log.error('preview 启动失败:', e && e.message); }
|
||||
|
||||
function shutdown(sig) {
|
||||
log.info('收到 ' + sig + ',停止服务');
|
||||
for (const entry of runs.values()) { entry.killedBy = 'shutdown'; killGroup(entry); }
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
---
|
||||
name: office
|
||||
description: Office 文档(docx/xlsx/pptx)创建、精确编辑、结构检视与聊天实时预览
|
||||
---
|
||||
|
||||
## 功能
|
||||
|
||||
Word / Excel / PPT(.docx/.xlsx/.pptx)的创建、读取、精确修改与结构检视。文档直接读写当前任务目录的文件,无需任何同步动作。
|
||||
|
||||
## 调用方式
|
||||
|
||||
所有操作通过 terminal 工具执行同一个入口脚本(cwd 已是任务目录,直接用相对文件名):
|
||||
|
||||
```
|
||||
office <command> [args...]
|
||||
```
|
||||
|
||||
先用 `office help` 看命令清单,用 `office help <主题>`(如 `office help docx paragraph`)查具体元素的属性 schema——参数与属性以 help 为准,不要凭记忆猜。
|
||||
|
||||
常用动线:
|
||||
|
||||
- `office create <file>` 新建文档(成功后聊天流出现预览卡片,用户点击即可实时预览)
|
||||
- `office open <file>` 打开已有文档(同样出预览卡片)
|
||||
- `office set / get / query <file> ...` 按 schema 精确改动与读取;每次改动自动落盘
|
||||
- `office view <file> outline|stats|issues|text` 结构/语义自检(交付前建议跑一遍 issues)
|
||||
- `office save / close <file>` 收尾(改动已自动落盘,save 只是显式冲刷)
|
||||
- `office get-pos <file>` 回读用户在预览里选中的内容(返回 JSON,path 里的 @id 可稳定用于后续 set/get 定位)
|
||||
|
||||
## 预览协作
|
||||
|
||||
create/open 成功后无需拼链接、无需等待:聊天流自动出可点击的预览卡片,用户点开即是该文档的实时预览(预览页上的选区、标注类交互之后都能被 get-pos 读到)。用户反馈"看第几段/选中了哪里"时,用 get-pos 读回再针对性改。
|
||||
|
||||
## 注意
|
||||
|
||||
- 文档就在任务目录里:文件面板、预览、下载指向同一份文件;不要用 curl 或中转链搬运待编辑的文档。
|
||||
- `view` 的渲染族(html/screenshot/pdf 等)本环境不可用;要 PDF 用 x2pdf 技能。
|
||||
- 命令报"文件不存在"时先确认文件是否已在任务目录(`ls`),不要猜路径。
|
||||
Executable
+53
@@ -0,0 +1,53 @@
|
||||
#!/bin/bash
|
||||
# office 技能资产与入口(skills/README 5.2 约定:本脚本在「镜像构建(skills 阶段)」与「启动 init」两处都跑,必须幂等):
|
||||
#
|
||||
# 1) 资产 bin/officecli —— officecli 官方 .NET 单文件二进制(v1.0.157 linux-x64)。
|
||||
# 不进 git(.gitignore 已排除 skills/office/bin/)、不进镜像:init 阶段写进宿主 ./skills 卷,
|
||||
# executor 容器以 :ro 挂到 /workspace/skills —— 运行期只读执行,改动版本=改本文件 pin 重启。
|
||||
# 构建阶段($HERE 在 /tmp 下,产物即弃)跳过下载,只烘 PATH 入口。
|
||||
# 主源 GitHub,备源 gh-proxy(国内网络);sha256 必须等于 pin,宁缺毋错。
|
||||
# 2) PATH 入口 /usr/local/bin/office -> <运行期技能根>/scripts/office —— 构建阶段写进镜像层持久;
|
||||
# init 阶段根只读,|| true 静默(镜像里已就位)。officecli 二进制刻意不进 PATH:模型只见封装层。
|
||||
#
|
||||
# 两个源都拉不到:exit 1(init 不写 marker,下次启动自动重试);救急可手动放置同名二进制到
|
||||
# skills/office/bin/officecli(sha 对上即认),再 docker compose up -d 重跑 init。
|
||||
set -u
|
||||
HERE="$(cd "$(dirname "$0")" && pwd)"
|
||||
VER=v1.0.157
|
||||
SHA=f8eefe88dbfa7464bee421e5421efe57fc26bc3180b30e56eef58594c8245c94
|
||||
ASSET="$HERE/bin/officecli"
|
||||
|
||||
ln -sfn "${EXECUTOR_SKILLS_DIR:-/workspace/skills}/office/scripts/office" /usr/local/bin/office 2>/dev/null || true
|
||||
|
||||
# 构建阶段:PATH 入口已烘,资产交给 init(避免每次 skills 层重建白拉 35MB)
|
||||
case "$HERE" in
|
||||
/tmp/*) echo "[office] build stage: PATH 入口就位;bin/officecli 资产由 init 阶段落到技能卷"; exit 0 ;;
|
||||
esac
|
||||
|
||||
verify() { [ -f "$ASSET" ] && echo "$SHA $ASSET" | sha256sum -c - >/dev/null 2>&1; }
|
||||
|
||||
if verify; then
|
||||
echo "[office] 资产已就位(sha 匹配):$ASSET"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
mkdir -p "$HERE/bin"
|
||||
for u in "https://github.com/iOfficeAI/OfficeCLI/releases/download/$VER/officecli-linux-x64" \
|
||||
"https://gh-proxy.com/https://github.com/iOfficeAI/OfficeCLI/releases/download/$VER/officecli-linux-x64"; do
|
||||
echo "[office] 拉取 $u"
|
||||
if curl -fsSL --retry 2 -o "$ASSET.tmp" "$u" \
|
||||
&& echo "$SHA $ASSET.tmp" | sha256sum -c - >/dev/null 2>&1; then
|
||||
mv -f "$ASSET.tmp" "$ASSET"
|
||||
chmod 755 "$ASSET"
|
||||
break
|
||||
fi
|
||||
rm -f "$ASSET.tmp"
|
||||
done
|
||||
|
||||
if verify; then
|
||||
echo "[office] 就绪:$ASSET"
|
||||
exit 0
|
||||
else
|
||||
echo "[office] 两个源都拉不到 bin/officecli —— 手动放置 $ASSET(sha 对上即认)后 docker compose up -d 重试" >&2
|
||||
exit 1
|
||||
fi
|
||||
Executable
+117
@@ -0,0 +1,117 @@
|
||||
#!/usr/bin/env node
|
||||
// office: officecli 的封装层(技能唯一入口)。
|
||||
// - 二进制不进 PATH、SKILL.md 不提及:可见面 = 可调用面,模型只认识本脚本;路径可用 OFFICECLI_BIN 覆盖。
|
||||
// - 命令治理移植自原 MCP 桥:隐去命令报原生风格 unrecognized;view 渲染族拦截给替代路径;
|
||||
// watch 族不透传(预览由平台托管)。
|
||||
// - create/open 成功在 stdout 尾行发 ui_card marker(::ui_card {json}::):core 剥离后转聊天流卡片,
|
||||
// 模型面不感知 marker;arg 为相对 cwd(会话目录)的文件路径。
|
||||
'use strict';
|
||||
const { spawnSync } = require('node:child_process');
|
||||
const path = require('node:path');
|
||||
|
||||
const BIN = process.env.OFFICECLI_BIN || path.resolve(__dirname, '..', 'bin', 'officecli');
|
||||
|
||||
// 本部署不合适的命令(自锁死 / 装配环境族):原生风格报错,help 清单同步删行(见 help 段)。
|
||||
const unrecognized = (v) => "Unrecognized command or argument '" + v + "'.";
|
||||
const HIDDEN_TOP = /^(mcp|skills|install|plugins)(?:\s|$)/;
|
||||
const HIDDEN_LINE = /^ {2}(?:mcp|skills|install|plugins)\b/; // '\b' 绝不能用字符串拼 RegExp(会变退格符)
|
||||
const HELP_STRIP = /^ {2}(?:watch|unwatch)\b/;
|
||||
const HIDDEN_SUBS = new Set(['mark', 'unmark', 'marks', 'goto']); // 标注/滚动族:预览交互由 get-pos 单点覆盖
|
||||
const VIEW_BLOCKED = new Set(['html', 'screenshot', 'svg', 'pdf', 'forms']); // 需无头浏览器/导出插件,本环境没有
|
||||
const OFFICE_EXT_RE = /\.(?:docx|xlsx|pptx)$/i;
|
||||
const CARD_NOTE = { create: '已创建', open: '已打开' };
|
||||
|
||||
const err = (msg) => { process.stderr.write(msg + '\n'); process.exit(1); };
|
||||
|
||||
// vendor 异常包装拆掉只留内层真错(与原桥 scrubErr 同源)
|
||||
function scrub(text) {
|
||||
return String(text).replace(/Resident process exited\.\s*Unhandled exception:\s*[\w.]*Exception:\s*/g, '');
|
||||
}
|
||||
|
||||
function runVendor(argv) {
|
||||
// 关自动 resident(实测时延零增益,还会堆常驻进程/撞 file_locked);每次改动命令返回前落盘。
|
||||
const env = Object.assign({}, process.env, {
|
||||
OFFICECLI_NO_AUTO_RESIDENT: '1',
|
||||
OFFICECLI_RESIDENT_FLUSH: 'each',
|
||||
// slim 镜像无 ICU;executor 的 env 白名单不透传,必须在这里自己声明 .NET 不变式模式
|
||||
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: '1',
|
||||
});
|
||||
return spawnSync(BIN, argv, { encoding: 'utf8', env, maxBuffer: 64 * 1024 * 1024 });
|
||||
}
|
||||
|
||||
const argv = process.argv.slice(2);
|
||||
if (!argv.length) {
|
||||
process.stdout.write('Usage: office <command> [args...]\nRun `office help` for the full command list.\n');
|
||||
process.exit(0);
|
||||
}
|
||||
const cmd = argv.join(' ');
|
||||
const first = String(argv[0] || '');
|
||||
|
||||
// ---------- 命令面闸门 ----------
|
||||
let m = HIDDEN_TOP.exec(cmd);
|
||||
if (m || (first === 'help' && HIDDEN_TOP.test(argv.slice(1).join(' ')))) err(unrecognized(m ? m[1] : argv[1]));
|
||||
if (HIDDEN_SUBS.has(first)) err(unrecognized(first));
|
||||
if (first === 'watch' || first === 'unwatch') {
|
||||
err('Preview slots are managed by the platform: create/open a document, then click the preview card in the chat.');
|
||||
}
|
||||
|
||||
const helpCmd = first === 'help' || /(?:^|\s)(?:--help|-h)(?:\s|$)/.test(cmd);
|
||||
|
||||
// view 放开结构/语义模式(outline/stats/issues/text/annotated),只拦渲染族,并给替代路径。
|
||||
if (!helpCmd && first === 'view') {
|
||||
const vpos = argv.slice(1).filter((t) => !String(t).startsWith('-')); // [file, mode, ...]
|
||||
const vmode = String(vpos[1] || '').toLowerCase();
|
||||
if (VIEW_BLOCKED.has(vmode)) {
|
||||
err("view " + vmode + " is disabled by environment policy. Use 'view <file> outline' or 'view <file> issues' for structural/semantic checks.");
|
||||
}
|
||||
}
|
||||
|
||||
// get-pos:语义糖,改写为原生选中回读(用户没在预览里选过时 vendor 返回空结果,不是错误)。
|
||||
if (first === 'get-pos') {
|
||||
const file = argv[1];
|
||||
if (!file) err('Usage: get-pos <file> (works once the user opens the preview and selects something)');
|
||||
argv = ['get', file, 'selected', '--json'];
|
||||
}
|
||||
|
||||
// ---------- 透传 ----------
|
||||
let r;
|
||||
try {
|
||||
r = runVendor(argv);
|
||||
} catch (e) {
|
||||
err(String(e && e.message || e));
|
||||
}
|
||||
if (r.error) {
|
||||
if (r.error.code === 'ENOENT') {
|
||||
err('officecli binary missing: ' + BIN + ' (skill asset not fetched: docker compose up -d agent-executor-init to retry, or place it per skills/office/install.sh)');
|
||||
}
|
||||
err(String(r.error.message || r.error));
|
||||
}
|
||||
|
||||
let outRaw = scrub(r.stdout || '');
|
||||
// help 文本对齐可调用面:隐去的命令删行(原生 cwd 已是会话目录,无扩展命令需补录)
|
||||
if (helpCmd && outRaw.includes('Commands:')) {
|
||||
outRaw = outRaw.split('\n').filter((ln) => !HIDDEN_LINE.test(ln) && !HELP_STRIP.test(ln)).join('\n');
|
||||
}
|
||||
if (outRaw) process.stdout.write(outRaw);
|
||||
if (r.stderr) process.stderr.write(scrub(r.stderr || ''));
|
||||
|
||||
// create/open 成功尾行发预览卡片 marker(core 解析后剥离;模型面无感)
|
||||
if (r.status === 0 && /^(create|open)$/.test(first)) {
|
||||
let file = null;
|
||||
for (const t of argv) {
|
||||
const s = String(t);
|
||||
if (s.startsWith('-') || s.includes('=')) continue;
|
||||
if (OFFICE_EXT_RE.test(s)) {
|
||||
const rel = path.relative(process.cwd(), path.resolve(s));
|
||||
if (rel && rel !== '.' && !rel.startsWith('..')) file = rel;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (file) {
|
||||
process.stdout.write('\n::ui_card ' + JSON.stringify({
|
||||
action: 'open_preview', arg: file, title: file, note: CARD_NOTE[first] || '',
|
||||
}) + '::\n');
|
||||
}
|
||||
}
|
||||
|
||||
process.exit(r.status === null ? 1 : r.status);
|
||||
Reference in New Issue
Block a user