@zaofan/dsh-qqbot 1.5.5 → 1.5.6
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/dist/shared/utils.d.ts.map +1 -1
- package/dist/shared/utils.js +3 -1
- package/dist/shared/utils.js.map +1 -1
- package/package.json +4 -1
- package/settings-host.js +92 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":"AAuCA;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,OAAO,GAAE,MAAoB,GAAG,MAAM,GAAG,IAAI,CAkB1E;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":"AAuCA;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAAC,OAAO,GAAE,MAAoB,GAAG,MAAM,GAAG,IAAI,CAkB1E;AA2CD;;GAEG;AACH,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAKtE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAOtD"}
|
package/dist/shared/utils.js
CHANGED
|
@@ -76,7 +76,9 @@ export function getProfileDir(baseDir = PLUGIN_ROOT) {
|
|
|
76
76
|
}
|
|
77
77
|
/** 遍历 ~/.dsh/profiles/<name>，返回装着本插件的 profile 根目录（找不到返回 null） */
|
|
78
78
|
function scanDshProfiles() {
|
|
79
|
-
|
|
79
|
+
// 与宿主保持一致: 优先环境变量 DSH_HOME, 否则回落 ~/.dsh
|
|
80
|
+
const dshHome = ((process.env.DSH_HOME ?? '').trim()) || join(os.homedir(), '.dsh');
|
|
81
|
+
const profilesRoot = join(dshHome, 'profiles');
|
|
80
82
|
let entries;
|
|
81
83
|
try {
|
|
82
84
|
entries = readdirSync(profilesRoot);
|
package/dist/shared/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE7D,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACtC,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAEhD,uCAAuC;AACvC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;AAErC,+BAA+B;AAC/B,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAC;AAE3C,SAAS,cAAc;IACrB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAsB,CAAC;QACxG,OAAO,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;IACxB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB;IACxB,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QACrD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAyB,CAAC;QAC9E,OAAO,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc;IAC5B,OAAO,aAAa,cAAc,UAAU,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC;AACzF,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,aAAa,CAAC,UAAkB,WAAW;IACzD,UAAU;IACV,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9D,IAAI,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,QAAQ,CAAC;IAEtD,oDAAoD;IACpD,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;IAClC,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC;IAE5B,kCAAkC;IAClC,IAAI,GAAG,GAAG,OAAO,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,cAAc;YAAE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,MAAM,KAAK,GAAG;YAAE,MAAM;QAC1B,GAAG,GAAG,MAAM,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,iEAAiE;AACjE,SAAS,eAAe;IACtB,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zaofan/dsh-qqbot",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.6",
|
|
4
4
|
"description": "QQ Bot IM channel plugin for deepseek-harness (dsh)",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -75,6 +75,9 @@
|
|
|
75
75
|
"client": {
|
|
76
76
|
"platform": "web",
|
|
77
77
|
"inject": []
|
|
78
|
+
},
|
|
79
|
+
"engines": {
|
|
80
|
+
"dsh": "0.1.5-rc.2 || 0.1.6-alpha.2 || 0.1.7-rc.1"
|
|
78
81
|
}
|
|
79
82
|
},
|
|
80
83
|
"dependencies": {
|
package/settings-host.js
CHANGED
|
@@ -55,8 +55,12 @@ function resolveProfileRoot() {
|
|
|
55
55
|
const PROFILE_ROOT = resolveProfileRoot();
|
|
56
56
|
/** cordis.patch.yml = 宿主插件装配文件(账号实例声明处; 改它需重启 dsh 生效) */
|
|
57
57
|
const PATCH_FILE = join(PROFILE_ROOT, 'cordis.patch.yml');
|
|
58
|
-
/**
|
|
59
|
-
const
|
|
58
|
+
/** dsh 家目录(与宿主保持一致: 优先环境变量 DSH_HOME, 否则回落 ~/.dsh) */
|
|
59
|
+
const DSH_HOME_DIR = ((process.env.DSH_HOME ?? '').trim()) || join(homedir(), '.dsh');
|
|
60
|
+
/** agent 预设根目录 —— ⚠️ 仅 ≤0.1.6 的**旧机制**(每预设一个子目录, 目录名=预设 id)。
|
|
61
|
+
* dsh 0.1.7 起预设改为「profile 配置里的声明行」(@deepseek-ai/dsh-agent-preset),
|
|
62
|
+
* 既没有目录、也没有写接口, 所以这里只作为旧版回落路径保留。 */
|
|
63
|
+
const PRESET_ROOT = join(DSH_HOME_DIR, '.agent-presets');
|
|
60
64
|
/** 复制预设时排除的备份/压缩类文件(不把主人的隐私压缩包带进新预设) */
|
|
61
65
|
const COPY_SKIP = /\.(rar|zip|7z|bak|tmp|log|diag)$/i;
|
|
62
66
|
/** 预设 id 校验: 文件夹命名规范(字母数字开头, 允许 - _) */
|
|
@@ -137,7 +141,9 @@ export function apply(ctx) {
|
|
|
137
141
|
// ── 桥装载诊断(2026-09-10 排查路由全 404): 落 ~/.dsh/qqbot-bridge-diag.log ──
|
|
138
142
|
// 用途: 宿主重启后可确认 apply 是否真的被 cordis 调用(以及当时 ctx 上有哪些服务)。
|
|
139
143
|
try {
|
|
140
|
-
|
|
144
|
+
// ⚠️ 未在 inject 声明的服务裸访问会抛 "without inject"（0.1.7 实测）→ 逐个 try 探测
|
|
145
|
+
const probe = (n) => { try { return (ctx && ctx[n]) ? 'Y' : 'N'; } catch { return 'NO-INJECT'; } };
|
|
146
|
+
const services = ['settings', 'webServer', 'agentPresets'].map((s) => s + '=' + probe(s)).join(' ');
|
|
141
147
|
appendFileSync(
|
|
142
148
|
join(homedir(), '.dsh', 'qqbot-bridge-diag.log'),
|
|
143
149
|
`[${new Date().toISOString()}] bridge apply 被调用 inject=${JSON.stringify(inject)} ${services}\n`,
|
|
@@ -670,11 +676,83 @@ export function apply(ctx) {
|
|
|
670
676
|
}
|
|
671
677
|
return out.sort((a, b) => b.mtime - a.mtime);
|
|
672
678
|
}
|
|
679
|
+
/**
|
|
680
|
+
* 列出可用预设（双模式，2026-09-23 适配 dsh 0.1.7）。
|
|
681
|
+
* - dsh 0.1.7+：走宿主 `agentPresets.list()` —— 新版预设是 profile 配置里的
|
|
682
|
+
* 「声明行」(@deepseek-ai/dsh-agent-preset)，**已无目录**，扫目录只会得到空列表；
|
|
683
|
+
* - dsh ≤0.1.6：回落 `scanPresets()` 扫 {DSH_HOME}/.agent-presets 目录（旧机制）。
|
|
684
|
+
* 统一返回 [{id, name, description, source}]，source=registry|dir。
|
|
685
|
+
*/
|
|
686
|
+
/**
|
|
687
|
+
* 安全取宿主 agentPresets 服务（2026-09-23 实测修正）。
|
|
688
|
+
* ⚠️ cordis 对**未在 inject 里声明**的服务, 裸访问 `ctx.xxx` 会直接抛
|
|
689
|
+
* "cannot get property \"agentPresets\" without inject"（0.1.7 上实测命中）。
|
|
690
|
+
* 而桥的 inject 只声明 settings/webServer（多声明会让宿主缺服务时整个 apply 不执行），
|
|
691
|
+
* 所以这里必须用 **ctx.get()**（不抛）探测，拿不到返回 null 走旧目录回落。
|
|
692
|
+
*/
|
|
693
|
+
function getAgentPresets() {
|
|
694
|
+
try {
|
|
695
|
+
if (ctx && typeof ctx.get === 'function') {
|
|
696
|
+
const svc = ctx.get('agentPresets');
|
|
697
|
+
if (svc) return svc;
|
|
698
|
+
}
|
|
699
|
+
} catch { /* ignore */ }
|
|
700
|
+
try { return (ctx && ctx.agentPresets) || null; } catch { return null; }
|
|
701
|
+
}
|
|
702
|
+
async function listPresets() {
|
|
703
|
+
const ap = getAgentPresets();
|
|
704
|
+
if (ap && typeof ap.list === 'function') {
|
|
705
|
+
try {
|
|
706
|
+
const arr = await ap.list();
|
|
707
|
+
if (Array.isArray(arr) && arr.length) {
|
|
708
|
+
return arr
|
|
709
|
+
.map((p) => ({
|
|
710
|
+
id: String((p && p.id) || ''),
|
|
711
|
+
name: String((p && (p.name || p.id)) || ''),
|
|
712
|
+
description: String((p && p.description) || ''),
|
|
713
|
+
source: 'registry',
|
|
714
|
+
}))
|
|
715
|
+
.filter((p) => p.id);
|
|
716
|
+
}
|
|
717
|
+
} catch { /* registry 不可用 → 回落旧目录 */ }
|
|
718
|
+
}
|
|
719
|
+
return scanPresets().map((p) => ({
|
|
720
|
+
id: p.id,
|
|
721
|
+
name: p.name,
|
|
722
|
+
description: '',
|
|
723
|
+
source: 'dir',
|
|
724
|
+
mtime: p.mtime,
|
|
725
|
+
hasChannelTools: p.hasChannelTools,
|
|
726
|
+
}));
|
|
727
|
+
}
|
|
728
|
+
/**
|
|
729
|
+
* 写操作在新版下的统一提示（2026-09-23）。
|
|
730
|
+
* dsh 0.1.7+ 的注册表「不写入任何声明、没有任何接口接受 YAML 写回」，
|
|
731
|
+
* 新增/覆盖预设只能写 profile 的 bundle 补丁 —— 与其静默失败，不如给出明确指引。
|
|
732
|
+
* 返回 null 表示走旧版目录流程。
|
|
733
|
+
*/
|
|
734
|
+
function presetWriteBlocked() {
|
|
735
|
+
const ap = getAgentPresets();
|
|
736
|
+
if (ap && typeof ap.list === 'function') {
|
|
737
|
+
return '当前 dsh 版本的预设是「profile 配置里的声明行」，不再是目录文件（官方注册表不接受任何写回）。'
|
|
738
|
+
+ '请在 profile 的 cordis.patch.yml 里用 `- insert:` 添加/修改 `@deepseek-ai/dsh-agent-preset` 行'
|
|
739
|
+
+ '（或用创造模式生成 bundle），保存后由 patchReload 热生效。';
|
|
740
|
+
}
|
|
741
|
+
return null;
|
|
742
|
+
}
|
|
673
743
|
route(ctx, 'GET', '/api/qqbot-settings/presets', async (_req, res) => {
|
|
674
|
-
|
|
744
|
+
try {
|
|
745
|
+
const presets = await listPresets();
|
|
746
|
+
const viaRegistry = presets.some((p) => p.source === 'registry');
|
|
747
|
+
writeJson(res, 200, { root: viaRegistry ? null : PRESET_ROOT, presets, mode: viaRegistry ? 'registry' : 'dir' });
|
|
748
|
+
} catch (e) {
|
|
749
|
+
writeJson(res, 500, { error: String((e && e.message) || e) });
|
|
750
|
+
}
|
|
675
751
|
});
|
|
676
752
|
// 复制并双名: {sourceId, newId, newName}
|
|
677
753
|
route(ctx, 'POST', '/api/qqbot-settings/presets/copy', async (req, res) => {
|
|
754
|
+
const blocked = presetWriteBlocked();
|
|
755
|
+
if (blocked) return writeJson(res, 501, { error: blocked });
|
|
678
756
|
const body = await readJsonBody(req);
|
|
679
757
|
if (!body || typeof body.sourceId !== 'string' || typeof body.newId !== 'string') {
|
|
680
758
|
return writeJson(res, 400, { error: 'sourceId/newId 必填' });
|
|
@@ -703,12 +781,14 @@ export function apply(ctx) {
|
|
|
703
781
|
// 从内置"标准模式(standard)"新建一个预设(空机器起步用): 复制宿主 standard + 自动补 QQ 通道工具行
|
|
704
782
|
// 复用宿主原生 agentPresets.copy(from,id,name) —— 复制出的正是宿主当前标准版, 保证能跑; 无需自己拼组合。
|
|
705
783
|
route(ctx, 'POST', '/api/qqbot-settings/presets/new', async (req, res) => {
|
|
784
|
+
const blocked = presetWriteBlocked();
|
|
785
|
+
if (blocked) return writeJson(res, 501, { error: blocked });
|
|
706
786
|
const body = await readJsonBody(req);
|
|
707
787
|
const newId = String(body?.id ?? '').trim();
|
|
708
788
|
const newName = String(body?.name ?? '').trim() || undefined;
|
|
709
789
|
if (!ID_RE.test(newId)) return writeJson(res, 400, { error: '预设 id 只能字母/数字开头，含 - _（也是文件夹名）' });
|
|
710
790
|
try {
|
|
711
|
-
const ap = (
|
|
791
|
+
const ap = getAgentPresets();
|
|
712
792
|
if (!ap || typeof ap.copy !== 'function') {
|
|
713
793
|
return writeJson(res, 500, { error: '宿主未提供 agentPresets 服务, 无法从标准模式新建' });
|
|
714
794
|
}
|
|
@@ -725,6 +805,8 @@ export function apply(ctx) {
|
|
|
725
805
|
});
|
|
726
806
|
// 打开预设文件夹(本机弹资源管理器; 仅限 presetRoot 内白名单路径)
|
|
727
807
|
route(ctx, 'POST', '/api/qqbot-settings/presets/open', async (req, res) => {
|
|
808
|
+
const blocked = presetWriteBlocked();
|
|
809
|
+
if (blocked) return writeJson(res, 501, { error: blocked });
|
|
728
810
|
const body = await readJsonBody(req);
|
|
729
811
|
const id = String(body?.id ?? '').trim();
|
|
730
812
|
if (!ID_RE.test(id)) return writeJson(res, 400, { error: '非法的预设 id' });
|
|
@@ -757,6 +839,9 @@ export function apply(ctx) {
|
|
|
757
839
|
return !!(p && p.hasChannelTools);
|
|
758
840
|
}
|
|
759
841
|
route(ctx, 'GET', '/api/qqbot-settings/presets/files', async (req, res) => {
|
|
842
|
+
// 新版(0.1.7+)没有预设目录了 → 给明确指引, 免得前端只看到"预设不存在"
|
|
843
|
+
const blockedFiles = presetWriteBlocked();
|
|
844
|
+
if (blockedFiles) return writeJson(res, 501, { error: blockedFiles });
|
|
760
845
|
const q = new URL(req.url, 'http://x').searchParams;
|
|
761
846
|
const dir = presetDirSafe(q.get('id') || '');
|
|
762
847
|
if (!dir) return writeJson(res, 404, { error: '预设不存在' });
|
|
@@ -769,6 +854,8 @@ export function apply(ctx) {
|
|
|
769
854
|
} catch (e) { writeJson(res, 500, { error: String(e?.message ?? e) }); }
|
|
770
855
|
});
|
|
771
856
|
route(ctx, ['GET', 'PUT'], '/api/qqbot-settings/presets/file', async (req, res) => {
|
|
857
|
+
const blockedFile = presetWriteBlocked();
|
|
858
|
+
if (blockedFile) return writeJson(res, 501, { error: blockedFile });
|
|
772
859
|
if (req.method === 'PUT') {
|
|
773
860
|
const body = await readJsonBody(req);
|
|
774
861
|
const id = String(body?.id ?? '');
|