dsh-plugin-console-oh 0.6.0 → 0.6.2
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/README.md +7 -1
- package/lib/index.js +57 -1
- package/lib/server.mjs +39 -2
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -14,7 +14,13 @@ DSH 里的控制台面板:出 6 位配对码、起局域网服务、按需拉
|
|
|
14
14
|
|
|
15
15
|
**方式一 · 添加插件对话框**(推荐):DSH 插件页 → 添加插件 → 输入包名 `dsh-plugin-console-oh` → 安装 → 完全退出 DSH(含托盘)重启。
|
|
16
16
|
|
|
17
|
-
**方式二 ·
|
|
17
|
+
**方式二 · 命令行**(官方网页版 `dsh web`,或社区插件中心标准命令):
|
|
18
|
+
|
|
19
|
+
```powershell
|
|
20
|
+
dsh plugin --profile web add dsh-plugin-console-oh
|
|
21
|
+
```
|
|
22
|
+
|
|
23
|
+
**方式二(桌面 profile)**:桌面 profile 由应用独占管理,请在应用内「插件 → 添加插件」输入包名安装;或手动:
|
|
18
24
|
|
|
19
25
|
```powershell
|
|
20
26
|
cd ~/.dsh/profiles/desktop
|
package/lib/index.js
CHANGED
|
@@ -328,6 +328,45 @@ export function apply(ctx, config = {}) {
|
|
|
328
328
|
// 会话 → { asOf, at, turns }:完整正文比摘要贵,按 asOfSeq 复用
|
|
329
329
|
const histCache = new Map()
|
|
330
330
|
|
|
331
|
+
// ── 交付文件:AI 用 present 工具发给用户的文件(会话事件 deliverables/presented)────
|
|
332
|
+
// 从历史事件流里提取 { turn, path, name, description, size };/v1/turns 按轮附带,
|
|
333
|
+
// /v1/file 下载前用它校验路径确实属于本会话的交付,防止接口被当任意文件读取器。
|
|
334
|
+
async function collectDeliverables(sessionId) {
|
|
335
|
+
const c = ctl()
|
|
336
|
+
if (!c) return []
|
|
337
|
+
const hit = histCache.get(sessionId)
|
|
338
|
+
let evs = hit && Array.isArray(hit.events) ? hit.events : []
|
|
339
|
+
if (evs.length === 0 || !(hit && hit.fromSeq === 0)) {
|
|
340
|
+
try {
|
|
341
|
+
const got = await readSessionHistory(c, sessionId, 16)
|
|
342
|
+
evs = got.events
|
|
343
|
+
} catch (_) {
|
|
344
|
+
evs = []
|
|
345
|
+
}
|
|
346
|
+
}
|
|
347
|
+
const out = []
|
|
348
|
+
for (const one of evs) {
|
|
349
|
+
const ev = one && typeof one === 'object' && one.event ? one.event : one
|
|
350
|
+
if (String(ev && ev.type) !== 'deliverables/presented') continue
|
|
351
|
+
const d = (ev && ev.data) || {}
|
|
352
|
+
const tn = Number(d.turn) || 0
|
|
353
|
+
for (const f of (Array.isArray(d.files) ? d.files : [])) {
|
|
354
|
+
const p = String((f && f.path) || '')
|
|
355
|
+
if (p === '') continue
|
|
356
|
+
let size = 0
|
|
357
|
+
try { size = fs.statSync(p).size } catch (_) { size = 0 }
|
|
358
|
+
out.push({
|
|
359
|
+
turn: tn,
|
|
360
|
+
path: p,
|
|
361
|
+
name: path.basename(p) || 'file',
|
|
362
|
+
description: String((f && f.description) || ''),
|
|
363
|
+
size
|
|
364
|
+
})
|
|
365
|
+
}
|
|
366
|
+
}
|
|
367
|
+
return out
|
|
368
|
+
}
|
|
369
|
+
|
|
331
370
|
// ── 已删除会话:DSH 没有删除接口,只能把会话目录挪进回收站 ─────────────
|
|
332
371
|
// 直接 rm 太狠(误删没救),挪到 dataDir/trash/<id> 还能手工捞回来;
|
|
333
372
|
// hidden.json 记住 id,列表里过滤掉(DSH 进程内可能仍持有会话对象)。
|
|
@@ -711,6 +750,19 @@ export function apply(ctx, config = {}) {
|
|
|
711
750
|
if (th.length > thinkBudget) mergedTurns[i].thinking = ''
|
|
712
751
|
else thinkBudget -= th.length
|
|
713
752
|
}
|
|
753
|
+
// 交付文件按轮附带(AI 用 present 发的文件),App 据此渲染文件卡
|
|
754
|
+
let dels = []
|
|
755
|
+
try { dels = await collectDeliverables(sessionId) } catch (_) { dels = [] }
|
|
756
|
+
const filesByTurn = new Map()
|
|
757
|
+
for (const d of dels) {
|
|
758
|
+
const arr = filesByTurn.get(d.turn) || []
|
|
759
|
+
arr.push({ path: d.path, name: d.name, description: d.description, size: d.size })
|
|
760
|
+
filesByTurn.set(d.turn, arr)
|
|
761
|
+
}
|
|
762
|
+
const turnsOut = mergedTurns.map((t) => {
|
|
763
|
+
const fl = filesByTurn.get(Number(t.turn) || 0)
|
|
764
|
+
return fl !== undefined && fl.length > 0 ? { ...t, files: fl } : t
|
|
765
|
+
})
|
|
714
766
|
return {
|
|
715
767
|
sessionId,
|
|
716
768
|
title: clean(values.title || '', 120),
|
|
@@ -718,7 +770,7 @@ export function apply(ctx, config = {}) {
|
|
|
718
770
|
// 当前会话跑的是哪个 agent preset(模式);空会话才有意义
|
|
719
771
|
preset: String(values.agentPreset || ''),
|
|
720
772
|
asOfSeq: Number(raw && raw.asOfSeq) || 0,
|
|
721
|
-
turns:
|
|
773
|
+
turns: turnsOut,
|
|
722
774
|
stats: { turns: Number(stats.turns) || 0, steps: Number(stats.steps) || 0 },
|
|
723
775
|
tokens: (() => {
|
|
724
776
|
const tk = values.tokenUsage || {}
|
|
@@ -749,6 +801,10 @@ export function apply(ctx, config = {}) {
|
|
|
749
801
|
}
|
|
750
802
|
},
|
|
751
803
|
|
|
804
|
+
async deliverables(sessionId) {
|
|
805
|
+
return collectDeliverables(sessionId)
|
|
806
|
+
},
|
|
807
|
+
|
|
752
808
|
async command(op, p) {
|
|
753
809
|
const c = ctl()
|
|
754
810
|
if (!c) throw new Error('拿不到 sessionController')
|
package/lib/server.mjs
CHANGED
|
@@ -14,7 +14,7 @@ import fs from 'node:fs'
|
|
|
14
14
|
import os from 'node:os'
|
|
15
15
|
import path from 'node:path'
|
|
16
16
|
|
|
17
|
-
export const VERSION = '0.6.
|
|
17
|
+
export const VERSION = '0.6.2'
|
|
18
18
|
|
|
19
19
|
const CODE_TTL_MS = 15 * 60 * 1000
|
|
20
20
|
const TICKET_TTL_MS = 2 * 60 * 1000
|
|
@@ -366,7 +366,19 @@ export function createConsoleServer(opts) {
|
|
|
366
366
|
}
|
|
367
367
|
|
|
368
368
|
if (p === '/health') {
|
|
369
|
-
|
|
369
|
+
// 诊断字段:给手机端「网络诊断」用。只含低敏环境描述(运行时长 / 隧道状态 / 开关),
|
|
370
|
+
// 不含端口、主机名、局域网地址、隧道 URL、令牌与设备记录——免鉴权端点按最小暴露原则。
|
|
371
|
+
const t = tunnel ? tunnel.status() : { state: 'off' }
|
|
372
|
+
return sendJson(res, 200, {
|
|
373
|
+
ok: true,
|
|
374
|
+
app: 'dsh-console-oh',
|
|
375
|
+
version: VERSION,
|
|
376
|
+
uptimeSec: startedAt > 0 ? Math.round((Date.now() - startedAt) / 1000) : 0,
|
|
377
|
+
readOnly,
|
|
378
|
+
remotePair,
|
|
379
|
+
lanAccess,
|
|
380
|
+
tunnelState: t.state
|
|
381
|
+
})
|
|
370
382
|
}
|
|
371
383
|
|
|
372
384
|
// 配对:唯一一条不需要访问码的写路由
|
|
@@ -514,6 +526,31 @@ export function createConsoleServer(opts) {
|
|
|
514
526
|
return sendJson(res, 200, { ok: true, count: list.length, sessions: list })
|
|
515
527
|
}
|
|
516
528
|
|
|
529
|
+
// 交付文件下载:AI 用 present 发给用户的文件。
|
|
530
|
+
// path 必须是本会话交付列表里的成员(服务端重新从会话事件校验),防止接口被当任意文件读取器。
|
|
531
|
+
if (p === '/v1/file' && req.method === 'GET') {
|
|
532
|
+
const sessionId = String(url.searchParams.get('sessionId') || '')
|
|
533
|
+
const fp = String(url.searchParams.get('path') || '')
|
|
534
|
+
if (sessionId === '' || fp === '') return sendJson(res, 400, { ok: false, error: '缺少 sessionId 或 path' })
|
|
535
|
+
let list = []
|
|
536
|
+
try { list = await bridge.deliverables(sessionId) } catch (e) { return sendJson(res, 500, { ok: false, error: safeMsg(e) }) }
|
|
537
|
+
const hit = list.find((f) => f.path === fp)
|
|
538
|
+
if (hit === undefined) return sendJson(res, 404, { ok: false, error: '文件不在本会话的交付列表里' })
|
|
539
|
+
let st = null
|
|
540
|
+
try { st = fs.statSync(hit.path) } catch (_) { return sendJson(res, 404, { ok: false, error: '文件在电脑上已不存在' }) }
|
|
541
|
+
if (!st.isFile()) return sendJson(res, 404, { ok: false, error: '目标不是常规文件' })
|
|
542
|
+
res.writeHead(200, {
|
|
543
|
+
'content-type': 'application/octet-stream',
|
|
544
|
+
'content-length': st.size,
|
|
545
|
+
'cache-control': 'no-store',
|
|
546
|
+
'x-file-name': encodeURIComponent(hit.name)
|
|
547
|
+
})
|
|
548
|
+
const stream = fs.createReadStream(hit.path)
|
|
549
|
+
stream.on('error', () => { try { res.destroy() } catch (_) { } })
|
|
550
|
+
stream.pipe(res)
|
|
551
|
+
return
|
|
552
|
+
}
|
|
553
|
+
|
|
517
554
|
// 信任凭据注册:已配对设备把设备公钥挂到自己的设备记录上(可重复调用换新钥)
|
|
518
555
|
if (p === '/v1/device-key' && req.method === 'POST') {
|
|
519
556
|
let body = {}
|