dsh-team-bots 0.2.393 → 0.2.455
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +4 -1
- package/scripts/doctor.mjs +14 -3
- package/src/api.js +30 -3
- package/src/config.js +105 -0
- package/src/db-migrations.js +20 -0
- package/src/db.js +4 -0
- package/src/feishu/channel.js +702 -0
- package/src/feishu/commands.js +20 -0
- package/src/feishu/format.js +56 -0
- package/src/feishu/index.js +19 -0
- package/src/feishu/store.js +205 -0
- package/src/service.js +7 -0
- package/src/services/bots.js +42 -0
- package/src/services/chat.js +6 -4
- package/src/services/core.js +153 -8
- package/src/services/external-trigger-schema.js +61 -0
- package/src/services/feishu.js +181 -0
- package/src/services/github-source.js +157 -0
- package/src/services/memory.js +122 -34
- package/src/services/projects.js +2 -0
- package/src/services/reason-codes.js +63 -0
- package/src/services/review-watchdog.js +30 -8
- package/src/services/run-finish.js +33 -9
- package/src/services/runs.js +48 -7
- package/src/services/runtime/context-window.js +53 -0
- package/src/services/runtime/prompt.js +149 -134
- package/src/services/runtime/sandbox-policy.js +65 -0
- package/src/services/runtime/session-continuity.js +38 -0
- package/src/services/runtime/session.js +155 -5
- package/src/services/scheduler.js +9 -2
- package/src/services/system.js +50 -2
- package/src/services/task-dispatch.js +40 -4
- package/src/services/task-notify.js +13 -8
- package/src/services/task-review.js +27 -0
- package/src/services/wechat-trigger-schema.js +62 -0
- package/src/services/wechat.js +129 -19
- package/src/tools.js +11 -2
- package/src/wechat/channel.js +130 -26
- package/src/wechat/commands.js +13 -1
- package/src/wechat/store.js +69 -18
- package/ui/app.js +6 -2
- package/ui/i18n/en/chat.js +1 -0
- package/ui/i18n/en/nav.js +5 -0
- package/ui/i18n/en/settings.js +25 -5
- package/ui/i18n/en/tasks.js +4 -0
- package/ui/i18n/en/wechat.js +25 -3
- package/ui/i18n/zh/chat.js +1 -0
- package/ui/i18n/zh/nav.js +5 -0
- package/ui/i18n/zh/settings.js +25 -5
- package/ui/i18n/zh/tasks.js +4 -0
- package/ui/i18n/zh/wechat.js +25 -3
- package/ui/modules/api.js +23 -1
- package/ui/modules/cards.js +15 -0
- package/ui/modules/chat.js +43 -2
- package/ui/modules/dom-morph.js +14 -7
- package/ui/modules/events-board.js +73 -23
- package/ui/modules/events-click.js +11 -0
- package/ui/modules/global-pages.js +138 -10
- package/ui/modules/settings.js +51 -9
- package/ui/modules/state.js +2 -0
- package/ui/styles/chat-cards.css +28 -0
- package/ui/styles/frame.css +27 -3
- package/ui/styles/global-config.css +28 -3
- package/ui/styles/surfaces.css +2 -0
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
// src/feishu/commands.ts —— 飞书指令接线(DSHBOTS-323 卡②)
|
|
2
|
+
// 复用微信 commands.ts 的通道无关层(/ 前缀指令集 + 答/批 token 回路 + 自由文本
|
|
3
|
+
// 直达 director):路由语义零复制,只把自由文本的落点从微信管理员通道换到飞书
|
|
4
|
+
// 管理员通道(service.feishuChat,source mark 与 solo origin 均按 channel='feishu'
|
|
5
|
+
// 留痕)。service 未实现 feishuChat(测试桩)时原样直通微信命令层。
|
|
6
|
+
import { handleCommand as wechatHandleCommand } from '../wechat/commands.js'
|
|
7
|
+
|
|
8
|
+
/** 群聊非 owner @bot 的礼貌回应文案(60s 冷却,不起 turn)。 */
|
|
9
|
+
export const NON_OWNER_NOTICE = '抱歉,本机器人仅管理员可用,如有需要请联系管理员。'
|
|
10
|
+
|
|
11
|
+
export async function handleCommand(service, rawText, ctx = null) {
|
|
12
|
+
if (!service || typeof (service ).feishuChat !== 'function') {
|
|
13
|
+
return wechatHandleCommand(service, rawText, ctx)
|
|
14
|
+
}
|
|
15
|
+
// 委托代理:只在本次调用里把自由文本路由换到 feishuChat,其余 service 方法
|
|
16
|
+
// (stateView/答/批 token 回路等)经原型链原样复用。
|
|
17
|
+
const adapter = Object.create(service)
|
|
18
|
+
;(adapter ).wechatChat = (key, body) => (service ).feishuChat(key, body)
|
|
19
|
+
return wechatHandleCommand(adapter, rawText, ctx)
|
|
20
|
+
}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
// src/feishu/format.ts —— 飞书出站消息排版层(markdown 文本,DSHBOTS-323 卡①)
|
|
2
|
+
// 角色对齐 src/wechat/format.ts:通道全部回程/回执文案在此集中格式化。
|
|
3
|
+
// 飞书原生支持 markdown(出站走 SDK 的 im.v1.message.reply,含 markdown 记号的走卡片),
|
|
4
|
+
// 不做微信式的 markdown 噪点过滤,只负责长文分块(飞书单条文本有长度上限)与固定文案。
|
|
5
|
+
|
|
6
|
+
/** markdown 分隔线:区分消息头与正文。 */
|
|
7
|
+
export const RULE = '———'
|
|
8
|
+
|
|
9
|
+
/** 单块字符上限:飞书单条消息文本上限约 4096 字符,留余量按段边界切块。 */
|
|
10
|
+
export const CHUNK_MAX_CHARS = 4000
|
|
11
|
+
|
|
12
|
+
/** 出站文本分块:优先按空行(段落)边界切,超长段落再硬切;原文 markdown 语义保留。 */
|
|
13
|
+
export function outboundChunks(text, maxChars = CHUNK_MAX_CHARS) {
|
|
14
|
+
const source = String(text ?? '').trim()
|
|
15
|
+
if (!source) return []
|
|
16
|
+
if (source.length <= maxChars) return [source]
|
|
17
|
+
const chunks = []
|
|
18
|
+
let buffer = ''
|
|
19
|
+
for (const paragraph of source.split(/\n{2,}/)) {
|
|
20
|
+
const piece = buffer ? `${buffer}\n\n${paragraph}` : paragraph
|
|
21
|
+
if (piece.length <= maxChars) {
|
|
22
|
+
buffer = piece
|
|
23
|
+
continue
|
|
24
|
+
}
|
|
25
|
+
if (buffer) {
|
|
26
|
+
chunks.push(buffer)
|
|
27
|
+
buffer = ''
|
|
28
|
+
}
|
|
29
|
+
// 单段超限:按行切,行本身超限再硬切
|
|
30
|
+
for (const line of paragraph.split('\n')) {
|
|
31
|
+
if (!line.length) continue
|
|
32
|
+
let remaining = line
|
|
33
|
+
while (remaining.length > maxChars) {
|
|
34
|
+
chunks.push(remaining.slice(0, maxChars))
|
|
35
|
+
remaining = remaining.slice(maxChars)
|
|
36
|
+
}
|
|
37
|
+
if ((buffer ? `${buffer}\n${remaining}` : remaining).length <= maxChars) {
|
|
38
|
+
buffer = buffer ? `${buffer}\n${remaining}` : remaining
|
|
39
|
+
} else {
|
|
40
|
+
chunks.push(remaining)
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
if (buffer) chunks.push(buffer)
|
|
45
|
+
return chunks
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
/** 管理员绑定欢迎(入站另卡接线时使用)。 */
|
|
49
|
+
export function welcomeAdmin() {
|
|
50
|
+
return '已绑定为本团队管理员\n发送 /? 查看指令'
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/** 用户侧通用失败提示(具体错误只进日志)。 */
|
|
54
|
+
export function failureText() {
|
|
55
|
+
return '消息处理失败,稍后重试'
|
|
56
|
+
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
// src/feishu/index.ts —— 飞书通道公共出口(DSHBOTS-333:传输层换进程内官方 SDK)
|
|
2
|
+
export {
|
|
3
|
+
FeishuChannel,
|
|
4
|
+
FeishuError,
|
|
5
|
+
createSdkTransport,
|
|
6
|
+
toFeishuError,
|
|
7
|
+
isGone,
|
|
8
|
+
isRetryable,
|
|
9
|
+
isConnLimit,
|
|
10
|
+
parseInboundEvent,
|
|
11
|
+
laneOf,
|
|
12
|
+
stripMentionPlaceholders,
|
|
13
|
+
INBOUND_DEDUP_TTL_MS,
|
|
14
|
+
INBOUND_DEDUP_LIMIT,
|
|
15
|
+
NON_OWNER_COOLDOWN_MS,
|
|
16
|
+
} from './channel.js'
|
|
17
|
+
|
|
18
|
+
export { FeishuStore } from './store.js'
|
|
19
|
+
export { outboundChunks, RULE, CHUNK_MAX_CHARS, welcomeAdmin, failureText } from './format.js'
|
|
@@ -0,0 +1,205 @@
|
|
|
1
|
+
import { DatabaseSync } from 'node:sqlite'
|
|
2
|
+
import { chmod, mkdir, stat } from 'node:fs/promises'
|
|
3
|
+
import { dirname } from 'node:path'
|
|
4
|
+
import { nowIso } from '../util.js'
|
|
5
|
+
|
|
6
|
+
/** 通道数据目录只允许属主访问;库文件只允许属主读写(与 WechatStore 同款)。 */
|
|
7
|
+
const DIR_MODE = 0o700
|
|
8
|
+
const FILE_MODE = 0o600
|
|
9
|
+
const DAY_MS = 24 * 60 * 60 * 1000
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* 飞书通道的独立持久化:bot 身份(botId/appId/brand)、管理员 ou_id、
|
|
13
|
+
* 回复锚点与待发件箱。与主库(team 工作台)分离。
|
|
14
|
+
* 凭据模型(DSHBOTS-333):app secret 由配置注入(进程内 SDK 使用),
|
|
15
|
+
* 本库只存 bot 身份标识,secret 不进库不进日志。
|
|
16
|
+
*/
|
|
17
|
+
export class FeishuStore {
|
|
18
|
+
constructor(file) {
|
|
19
|
+
this.db = null
|
|
20
|
+
this.file = file
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
async open() {
|
|
24
|
+
const dir = dirname(this.file)
|
|
25
|
+
await mkdir(dir, { recursive: true, mode: DIR_MODE })
|
|
26
|
+
await ensureMode(dir, DIR_MODE)
|
|
27
|
+
this.db = new DatabaseSync(this.file)
|
|
28
|
+
await this.secureFiles()
|
|
29
|
+
this.db.exec(`
|
|
30
|
+
PRAGMA journal_mode = WAL;
|
|
31
|
+
CREATE TABLE IF NOT EXISTS channel_state (
|
|
32
|
+
id INTEGER PRIMARY KEY CHECK (id = 1),
|
|
33
|
+
cli_path TEXT NOT NULL DEFAULT '',
|
|
34
|
+
bot_id TEXT,
|
|
35
|
+
app_id TEXT,
|
|
36
|
+
brand TEXT NOT NULL DEFAULT 'feishu',
|
|
37
|
+
admin_ou_id TEXT,
|
|
38
|
+
cursor TEXT NOT NULL DEFAULT '',
|
|
39
|
+
reply_message_id TEXT,
|
|
40
|
+
updated_at TEXT NOT NULL DEFAULT ''
|
|
41
|
+
);
|
|
42
|
+
CREATE TABLE IF NOT EXISTS outbox (
|
|
43
|
+
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
44
|
+
text TEXT NOT NULL,
|
|
45
|
+
created_at TEXT NOT NULL,
|
|
46
|
+
sent_at TEXT,
|
|
47
|
+
attempts INTEGER NOT NULL DEFAULT 0,
|
|
48
|
+
gave_up_at TEXT,
|
|
49
|
+
receipt_key TEXT,
|
|
50
|
+
last_error TEXT
|
|
51
|
+
);
|
|
52
|
+
`)
|
|
53
|
+
// 幂等收据键:同键只允许一行在库(存留期内重复推送被吸收);部分唯一索引兜底竞态。
|
|
54
|
+
this.db.exec('CREATE UNIQUE INDEX IF NOT EXISTS outbox_receipt_key_idx ON outbox(receipt_key) WHERE receipt_key IS NOT NULL')
|
|
55
|
+
await this.secureFiles()
|
|
56
|
+
return this
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/** 库文件与 WAL/SHM 侧文件都收紧到 0600(新建与已存在都检查,过宽则收紧)。 */
|
|
60
|
+
async secureFiles() {
|
|
61
|
+
await ensureMode(this.file, FILE_MODE)
|
|
62
|
+
await ensureMode(`${this.file}-wal`, FILE_MODE)
|
|
63
|
+
await ensureMode(`${this.file}-shm`, FILE_MODE)
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
close() {
|
|
67
|
+
this.db?.close()
|
|
68
|
+
this.db = null
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
getState() {
|
|
72
|
+
return this.db.prepare('SELECT * FROM channel_state WHERE id = 1').get() ?? null
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
/** 绑定成功后落 bot 身份(botId/appId/brand);secret 不在此列。 */
|
|
76
|
+
saveBot({ botId, appId, brand = 'feishu' }) {
|
|
77
|
+
this.db.prepare(
|
|
78
|
+
`INSERT INTO channel_state (id, cli_path, bot_id, app_id, brand, updated_at) VALUES (1, '', ?, ?, ?, ?)
|
|
79
|
+
ON CONFLICT(id) DO UPDATE SET
|
|
80
|
+
bot_id = excluded.bot_id,
|
|
81
|
+
app_id = excluded.app_id, brand = excluded.brand, updated_at = excluded.updated_at`,
|
|
82
|
+
).run(String(botId ?? ''), String(appId ?? ''), String(brand ?? 'feishu'), nowIso())
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
saveAdminOu(ouId) {
|
|
86
|
+
this.db.prepare(
|
|
87
|
+
`INSERT INTO channel_state (id, admin_ou_id, updated_at) VALUES (1, ?, ?)
|
|
88
|
+
ON CONFLICT(id) DO UPDATE SET admin_ou_id = excluded.admin_ou_id, updated_at = excluded.updated_at`,
|
|
89
|
+
).run(String(ouId ?? ''), nowIso())
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
saveCursor(cursor) {
|
|
93
|
+
this.db.prepare(
|
|
94
|
+
`INSERT INTO channel_state (id, cursor, updated_at) VALUES (1, ?, ?)
|
|
95
|
+
ON CONFLICT(id) DO UPDATE SET cursor = excluded.cursor, updated_at = excluded.updated_at`,
|
|
96
|
+
).run(String(cursor ?? ''), nowIso())
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
/** 出站回复目标:管理员最近一条入站消息 id(messages-reply 需要它定位话题)。
|
|
100
|
+
* 入站消费另卡接线;本卡由绑定/测试直接写入。同时绑定管理员 ou_id。 */
|
|
101
|
+
saveReplyMessageId(messageId, adminOuId = null) {
|
|
102
|
+
this.db.prepare(
|
|
103
|
+
`INSERT INTO channel_state (id, reply_message_id, admin_ou_id, updated_at) VALUES (1, ?, ?, ?)
|
|
104
|
+
ON CONFLICT(id) DO UPDATE SET
|
|
105
|
+
reply_message_id = excluded.reply_message_id,
|
|
106
|
+
admin_ou_id = COALESCE(excluded.admin_ou_id, channel_state.admin_ou_id),
|
|
107
|
+
updated_at = excluded.updated_at`,
|
|
108
|
+
).run(String(messageId ?? ''), adminOuId ? String(adminOuId) : null, nowIso())
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/** 解绑:绑定信息、cursor、管理员与待发件箱一起清空(与 WechatStore.clearCredentials 同口径)。 */
|
|
112
|
+
clearBinding() {
|
|
113
|
+
this.db.prepare(
|
|
114
|
+
`UPDATE channel_state SET
|
|
115
|
+
cli_path = '', bot_id = NULL, app_id = NULL, brand = 'feishu',
|
|
116
|
+
admin_ou_id = NULL, cursor = '', reply_message_id = NULL, updated_at = ? WHERE id = 1`,
|
|
117
|
+
).run(nowIso())
|
|
118
|
+
this.db.prepare('DELETE FROM outbox').run()
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
/**
|
|
122
|
+
* 入队推送:带 receiptKey 时做幂等吸收——同键在存留期内只入队一次。
|
|
123
|
+
* 返回 'enqueued' | 'duplicate' | 'skipped'。
|
|
124
|
+
*/
|
|
125
|
+
enqueue(text, receiptKey = null) {
|
|
126
|
+
const body = String(text ?? '').trim()
|
|
127
|
+
if (!body) return 'skipped'
|
|
128
|
+
const key = receiptKey ? String(receiptKey) : null
|
|
129
|
+
if (!key) {
|
|
130
|
+
this.db.prepare('INSERT INTO outbox (text, created_at) VALUES (?, ?)').run(body, nowIso())
|
|
131
|
+
return 'enqueued'
|
|
132
|
+
}
|
|
133
|
+
const existing = this.db.prepare('SELECT id FROM outbox WHERE receipt_key = ?').get(key)
|
|
134
|
+
if (existing) return 'duplicate'
|
|
135
|
+
this.db.prepare('INSERT INTO outbox (text, created_at, receipt_key) VALUES (?, ?, ?)').run(body, nowIso(), key)
|
|
136
|
+
return 'enqueued'
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
pendingOutbox(limit = 20) {
|
|
140
|
+
return this.db.prepare(
|
|
141
|
+
'SELECT * FROM outbox WHERE sent_at IS NULL AND gave_up_at IS NULL ORDER BY id LIMIT ?',
|
|
142
|
+
).all(limit)
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
markSent(ids) {
|
|
146
|
+
if (!ids.length) return
|
|
147
|
+
const statement = this.db.prepare('UPDATE outbox SET sent_at = ? WHERE id = ?')
|
|
148
|
+
const at = nowIso()
|
|
149
|
+
for (const id of ids) statement.run(at, id)
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
/** 记一次发送失败(可重试),返回该条累计尝试次数(含本次;持久化,重启不重置)。 */
|
|
153
|
+
markAttempt(id, error = '') {
|
|
154
|
+
const result = this.db.prepare(
|
|
155
|
+
"UPDATE outbox SET attempts = attempts + 1, last_error = ? WHERE id = ? AND sent_at IS NULL AND gave_up_at IS NULL",
|
|
156
|
+
).run(String(error ?? '').slice(0, 500), id)
|
|
157
|
+
if (!Number(result?.changes ?? 0)) return null
|
|
158
|
+
const row = this.db.prepare('SELECT attempts FROM outbox WHERE id = ?').get(id)
|
|
159
|
+
return Number(row?.attempts ?? 0)
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
/** 废弃指定待发条目:仍视为未发送,但永久不再补发(重试超限或目标消息 gone)。 */
|
|
163
|
+
giveUp(ids, error = null) {
|
|
164
|
+
if (!ids.length) return 0
|
|
165
|
+
const statement = error
|
|
166
|
+
? this.db.prepare('UPDATE outbox SET gave_up_at = ?, last_error = ? WHERE id = ? AND sent_at IS NULL AND gave_up_at IS NULL')
|
|
167
|
+
: this.db.prepare('UPDATE outbox SET gave_up_at = ? WHERE id = ? AND sent_at IS NULL AND gave_up_at IS NULL')
|
|
168
|
+
const at = nowIso()
|
|
169
|
+
let changed = 0
|
|
170
|
+
for (const id of ids) {
|
|
171
|
+
changed += Number(
|
|
172
|
+
(error ? statement.run(at, String(error).slice(0, 500), id) : statement.run(at, id))?.changes ?? 0,
|
|
173
|
+
)
|
|
174
|
+
}
|
|
175
|
+
return changed
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
/** 通道重新绑定完成时调用:作废全部存量待发(历史堆积不补发,只发绑定后产生的新事件)。 */
|
|
179
|
+
giveUpAllPending() {
|
|
180
|
+
const result = this.db.prepare(
|
|
181
|
+
'UPDATE outbox SET gave_up_at = ? WHERE sent_at IS NULL AND gave_up_at IS NULL',
|
|
182
|
+
).run(nowIso())
|
|
183
|
+
return Number(result?.changes ?? 0)
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
/** 清理 N 天前已发送或已废弃的记录,默认保留 7 天。 */
|
|
187
|
+
purgeSentOutbox(days = 7) {
|
|
188
|
+
const cutoff = new Date(Date.now() - Math.max(0, days) * DAY_MS).toISOString()
|
|
189
|
+
const result = this.db.prepare(
|
|
190
|
+
'DELETE FROM outbox WHERE (sent_at IS NOT NULL AND sent_at < ?) OR (gave_up_at IS NOT NULL AND gave_up_at < ?)',
|
|
191
|
+
).run(cutoff, cutoff)
|
|
192
|
+
return Number(result?.changes ?? 0)
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
/** 目标权限不符时收紧(新建文件已带对 mode 时不重复改)。 */
|
|
197
|
+
async function ensureMode(path, mode) {
|
|
198
|
+
try {
|
|
199
|
+
const info = await stat(path)
|
|
200
|
+
if ((info.mode & 0o7777) === mode) return
|
|
201
|
+
await chmod(path, mode)
|
|
202
|
+
} catch (error ) {
|
|
203
|
+
if (error?.code !== 'ENOENT') throw error
|
|
204
|
+
}
|
|
205
|
+
}
|
package/src/service.js
CHANGED
|
@@ -42,6 +42,8 @@ import { terminalMethods } from './services/terminal.js'
|
|
|
42
42
|
import { usageMethods } from './services/usage.js'
|
|
43
43
|
import { systemMethods } from './services/system.js'
|
|
44
44
|
import { wechatMethods } from './services/wechat.js'
|
|
45
|
+
import { feishuMethods } from './services/feishu.js'
|
|
46
|
+
import { githubSourceMethods } from './services/github-source.js'
|
|
45
47
|
import { approvalsMethods } from './services/approvals.js'
|
|
46
48
|
import { questionsMethods } from './services/questions.js'
|
|
47
49
|
import { coreMethods } from './services/core.js'
|
|
@@ -68,6 +70,9 @@ export class TeamService {
|
|
|
68
70
|
this.readAuditAlerted = new Map()
|
|
69
71
|
this.lastMaintenanceAt = 0
|
|
70
72
|
this.wechat = null
|
|
73
|
+
// GitHub 触发源的 gh 执行钩子(B4-②/DSHBOTS-335):生产用 spawnSync('gh', ...),
|
|
74
|
+
// 测试注入桩替换;未设置时走真实 gh CLI。
|
|
75
|
+
this.githubRunner = null
|
|
71
76
|
// 运行中的终端命令:commandId → { child, buffer, startedAtMs, timedOut, cancelRequested, timer }。
|
|
72
77
|
// 进程引用与实时 tail 只放内存;结束即释放,历史落 terminal_commands 表。
|
|
73
78
|
this.terminalActive = new Map()
|
|
@@ -109,6 +114,8 @@ defineMethods(TeamService.prototype, [
|
|
|
109
114
|
usageMethods,
|
|
110
115
|
systemMethods,
|
|
111
116
|
wechatMethods,
|
|
117
|
+
feishuMethods,
|
|
118
|
+
githubSourceMethods,
|
|
112
119
|
approvalsMethods,
|
|
113
120
|
questionsMethods,
|
|
114
121
|
coreMethods,
|
package/src/services/bots.js
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
// 因此方法体内的 this 与拆分前完全一致。
|
|
5
5
|
|
|
6
6
|
import { join } from 'node:path'
|
|
7
|
+
import { appendFileSync, mkdirSync } from 'node:fs'
|
|
7
8
|
import { badRequest, conflict, notFound } from '../errors.js'
|
|
8
9
|
import { botWorkspaceDir, botsHome, SLUG_MAX } from '../paths.js'
|
|
9
10
|
import { id, nowIso, slugify, text } from '../util.js'
|
|
@@ -19,6 +20,10 @@ export const avatarSeedPattern = /^[\w-]{1,64}$/
|
|
|
19
20
|
// solo_dir 唯一冲突时事务内重生成候选的 INSERT 尝试上限。
|
|
20
21
|
const SOLO_DIR_INSERT_ATTEMPTS = 5
|
|
21
22
|
|
|
23
|
+
// 版本历史滚动保留(DSHBOTS-336):表内每个 bot 只留最近 REVISION_KEEP 版,
|
|
24
|
+
// 超额最旧行归档进 <dataDir>/archives/bot-revisions/<botId>.jsonl 后删除。
|
|
25
|
+
export const REVISION_KEEP = 10
|
|
26
|
+
|
|
22
27
|
// node:sqlite 的唯一约束错误只能按 message 判列(code 恒为 ERR_SQLITE_ERROR):
|
|
23
28
|
// 'UNIQUE constraint failed: bots.solo_dir'。返回冲突列名;非唯一约束错误返回 null。
|
|
24
29
|
const uniqueColumn = (error) => {
|
|
@@ -167,6 +172,41 @@ export const botsMethods = {
|
|
|
167
172
|
}
|
|
168
173
|
}
|
|
169
174
|
},
|
|
175
|
+
|
|
176
|
+
// 版本历史滚动保留(DSHBOTS-336):查出窗口外(最近 REVISION_KEEP 版以外)的最旧行,
|
|
177
|
+
// 先整行追加进 <dataDir>/archives/bot-revisions/<botId>.jsonl(每行一个 JSON 对象),
|
|
178
|
+
// 再删除并审计留痕一条。追加失败直接抛,DELETE 不会执行——先入档后删除,数据不丢。
|
|
179
|
+
// 调用方负责事务包裹:updateBot 在事务内插行后调用;启动收敛在独立事务里逐 bot 调用。
|
|
180
|
+
archiveExcessBotRevisions(botId, actor = { type: 'system', id: 'system' }) {
|
|
181
|
+
// 倒序跳过最近 REVISION_KEEP 版,剩下的就是窗口外最旧行;反转回时间序依次入档。
|
|
182
|
+
const overflow = this.store.all(
|
|
183
|
+
'SELECT * FROM bot_revisions WHERE bot_id = ? ORDER BY version DESC LIMIT -1 OFFSET ?',
|
|
184
|
+
botId, REVISION_KEEP,
|
|
185
|
+
).reverse()
|
|
186
|
+
if (!overflow.length) return 0
|
|
187
|
+
const dir = join(this.config.dataDir, 'archives', 'bot-revisions')
|
|
188
|
+
const file = join(dir, `${botId}.jsonl`)
|
|
189
|
+
mkdirSync(dir, { recursive: true })
|
|
190
|
+
appendFileSync(file, `${overflow.map(row => JSON.stringify({
|
|
191
|
+
id: row.id,
|
|
192
|
+
bot_id: row.bot_id,
|
|
193
|
+
version: row.version,
|
|
194
|
+
role: row.role,
|
|
195
|
+
instructions: row.instructions,
|
|
196
|
+
created_by: row.created_by,
|
|
197
|
+
created_at: row.created_at,
|
|
198
|
+
})).join('\n')}\n`)
|
|
199
|
+
this.store.run(
|
|
200
|
+
`DELETE FROM bot_revisions WHERE id IN (${overflow.map(() => '?').join(', ')})`,
|
|
201
|
+
...overflow.map(row => row.id),
|
|
202
|
+
)
|
|
203
|
+
this.audit(actor, 'bot.revision_archive', 'bot', botId, {
|
|
204
|
+
archived: overflow.length,
|
|
205
|
+
versions: `${overflow[0].version}-${overflow.at(-1).version}`,
|
|
206
|
+
file: `archives/bot-revisions/${botId}.jsonl`,
|
|
207
|
+
})
|
|
208
|
+
return overflow.length
|
|
209
|
+
},
|
|
170
210
|
async updateBot(botId, patch, actor = this.actor()) {
|
|
171
211
|
const bot = this.botRow(botId)
|
|
172
212
|
// removed 是移除追踪的终态:档案与历史仍可读,但不再接受任何修改(含 status 复活)。
|
|
@@ -258,6 +298,8 @@ export const botsMethods = {
|
|
|
258
298
|
`${actor.type}:${actor.id}`, nowIso(),
|
|
259
299
|
)
|
|
260
300
|
this.store.run('UPDATE bots SET current_revision = ? WHERE id = ?', version, botId)
|
|
301
|
+
// 滚动保留(DSHBOTS-336):插行后立即收敛窗口,超额最旧行先入档再删。
|
|
302
|
+
this.archiveExcessBotRevisions(botId, actor)
|
|
261
303
|
}
|
|
262
304
|
// 同内容重复保存(含回滚到当前内容)是 no-op:不插版本行、不 bump,审计带 unchanged 标记留痕。
|
|
263
305
|
this.audit(actor, 'bot.update', 'bot', botId, snapshotTouched && snapshotUnchanged ? { ...changes, unchanged: true } : changes)
|
package/src/services/chat.js
CHANGED
|
@@ -167,7 +167,8 @@ export const chatMethods = {
|
|
|
167
167
|
for (const bot of targets) {
|
|
168
168
|
this.enqueueOutbox({
|
|
169
169
|
kind: 'chat_run',
|
|
170
|
-
// origin('wechat'
|
|
170
|
+
// origin('wechat'/'feishu'):标记消息来自通道直达(DSHBOTS-208/329),运行结束
|
|
171
|
+
// 把 bot 回复推回该通道管理员;普通 UI 群聊消息不传,保持 'mention' 不推。
|
|
171
172
|
payload: { projectId: project.id, botId: bot.id, messageId, origin },
|
|
172
173
|
projectId: project.id,
|
|
173
174
|
sourceId: messageId,
|
|
@@ -253,9 +254,10 @@ export const chatMethods = {
|
|
|
253
254
|
this.audit(actor, 'chat.solo_clear', 'bot', bot.id, { cleared: count })
|
|
254
255
|
return count
|
|
255
256
|
},
|
|
256
|
-
// options.origin(DSHBOTS-258):'wechat'
|
|
257
|
-
//
|
|
258
|
-
//
|
|
257
|
+
// options.origin(DSHBOTS-258/329):'wechat'/'feishu' 表示消息来自对应通道
|
|
258
|
+
// (项目外 director 专属工作区),随 solo_chat_run 载荷传递,scheduler 据此把 solo
|
|
259
|
+
// 运行打成同名 trigger_type,运行收尾的回复才会推回该通道;普通 UI 单聊不传,保持
|
|
260
|
+
// 'mention' 不推。
|
|
259
261
|
async sendSoloMessage(botId, bodyInput, actor = this.actor(), imagesInput = [], options = {}) {
|
|
260
262
|
const bot = this.botRow(botId)
|
|
261
263
|
if (bot.status !== 'active') throw conflict('Bot 已归档或暂停')
|