mosse-agent-bridge 0.1.9 → 0.1.10
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/drivers/hermes.d.ts +28 -1
- package/dist/drivers/hermes.js +69 -3
- package/dist/drivers/hermes.js.map +1 -1
- package/package.json +1 -1
package/dist/drivers/hermes.d.ts
CHANGED
|
@@ -23,10 +23,37 @@ export interface AgentDirFs {
|
|
|
23
23
|
}): void;
|
|
24
24
|
}
|
|
25
25
|
/**
|
|
26
|
-
*
|
|
26
|
+
* Hermes 全部 16 个内置 auxiliary task(来自 Hermes DEFAULT_CONFIG)。用常量数组生成 overlay,避免手抄漏。
|
|
27
|
+
* 改这里 = 改覆盖范围;顺序不影响语义(Hermes leaf 级 deep-merge)。
|
|
28
|
+
*/
|
|
29
|
+
export declare const HERMES_AUXILIARY_TASKS: readonly ["vision", "web_extract", "compression", "skills_hub", "approval", "mcp", "title_generation", "tts_audio_tags", "triage_specifier", "kanban_decomposer", "profile_describer", "curator", "monitor", "background_review", "moa_reference", "moa_aggregator"];
|
|
30
|
+
/**
|
|
31
|
+
* 生成 HERMES_MANAGED_DIR overlay 的 config.yaml 内容(纯函数,便于单测)。
|
|
32
|
+
*
|
|
33
|
+
* 只含 `auxiliary:` 段,把全部 16 个内置 task 的 `provider` 强制设为 `main`。`main` 由 Hermes 的
|
|
34
|
+
* `agent/auxiliary_client.py:_normalize_aux_provider` 解析成实际主 provider(如 deepseek),专为非聚合
|
|
35
|
+
* provider 设计。这样 auxiliary 侧任务不再因 auto 模式找不到 openrouter/nous(用户没配)而崩(-32603)。
|
|
36
|
+
*
|
|
37
|
+
* Hermes 把本文件 leaf 级 deep-merge 覆盖到用户 `~/.hermes/config.yaml` 之上(managed 胜),只动
|
|
38
|
+
* `auxiliary.*.provider` 这些 leaf,用户其它配置(telegram/whatsapp/model 等)原封不动。
|
|
39
|
+
*/
|
|
40
|
+
export declare function buildAuxiliaryOverlayYaml(): string;
|
|
41
|
+
/**
|
|
42
|
+
* per-agent overlay 目录(放 HERMES_MANAGED_DIR 的 config.yaml)。
|
|
43
|
+
*
|
|
44
|
+
* 刻意放 agentDir 的 `.hermes-managed` 子目录而非 agentDir 本身:agentDir 同时被 TERMINAL_CWD 指着,
|
|
45
|
+
* Hermes 从 cwd 读 AGENTS.md/.hermes.md(人格)、从 HERMES_MANAGED_DIR 读 config.yaml(overlay),两套
|
|
46
|
+
* 机制读不同路径互不干扰;隔到子目录更无歧义。
|
|
47
|
+
*/
|
|
48
|
+
export declare function managedDirFor(agentDir: string): string;
|
|
49
|
+
/**
|
|
50
|
+
* 准备 per-agent 目录(人格 + auxiliary overlay + 工作目录起点,**非** hermes home):
|
|
27
51
|
* 1. mkdir -p(确保存在)。
|
|
28
52
|
* 2. 写 `AGENTS.md` = 人格(systemPromptAppend)。Hermes 把 cwd(我们用 TERMINAL_CWD 指到这里)当前层的
|
|
29
53
|
* AGENTS.md 当 rules 加载。幂等覆盖;无人格写空字符串(清掉上一轮残留,避免串味)。
|
|
54
|
+
* 3. 写 `<agentDir>/.hermes-managed/config.yaml` = HERMES_MANAGED_DIR overlay,把 16 个 auxiliary task 的
|
|
55
|
+
* provider 强制为 `main`(修 DeepSeek 等非聚合 provider 的 -32603)。leaf 级 deep-merge,不碰用户 ~/.hermes。
|
|
56
|
+
* 幂等覆盖(内容固定,二次准备不堆叠)。
|
|
30
57
|
*
|
|
31
58
|
* **绝不写 SOUL.md、绝不 symlink/copy ~/.hermes 的 config.yaml/.env、绝不碰用户真实 home。**
|
|
32
59
|
*/
|
package/dist/drivers/hermes.js
CHANGED
|
@@ -31,11 +31,64 @@ const HERMES_BIN = process.env.MOSSE_HERMES_BIN ?? "hermes";
|
|
|
31
31
|
const NODE_DIR = dirname(process.execPath);
|
|
32
32
|
const DEFAULT_IDLE_MS = Number(process.env.MOSSE_HERMES_IDLE_MS) || 120_000;
|
|
33
33
|
const realFs = { mkdirSync, writeFileSync };
|
|
34
|
+
// ───────────────────── auxiliary overlay(修非聚合 provider 的 -32603 崩)─────────────────────
|
|
34
35
|
/**
|
|
35
|
-
*
|
|
36
|
+
* Hermes 全部 16 个内置 auxiliary task(来自 Hermes DEFAULT_CONFIG)。用常量数组生成 overlay,避免手抄漏。
|
|
37
|
+
* 改这里 = 改覆盖范围;顺序不影响语义(Hermes leaf 级 deep-merge)。
|
|
38
|
+
*/
|
|
39
|
+
export const HERMES_AUXILIARY_TASKS = [
|
|
40
|
+
"vision",
|
|
41
|
+
"web_extract",
|
|
42
|
+
"compression",
|
|
43
|
+
"skills_hub",
|
|
44
|
+
"approval",
|
|
45
|
+
"mcp",
|
|
46
|
+
"title_generation",
|
|
47
|
+
"tts_audio_tags",
|
|
48
|
+
"triage_specifier",
|
|
49
|
+
"kanban_decomposer",
|
|
50
|
+
"profile_describer",
|
|
51
|
+
"curator",
|
|
52
|
+
"monitor",
|
|
53
|
+
"background_review",
|
|
54
|
+
"moa_reference",
|
|
55
|
+
"moa_aggregator",
|
|
56
|
+
];
|
|
57
|
+
/**
|
|
58
|
+
* 生成 HERMES_MANAGED_DIR overlay 的 config.yaml 内容(纯函数,便于单测)。
|
|
59
|
+
*
|
|
60
|
+
* 只含 `auxiliary:` 段,把全部 16 个内置 task 的 `provider` 强制设为 `main`。`main` 由 Hermes 的
|
|
61
|
+
* `agent/auxiliary_client.py:_normalize_aux_provider` 解析成实际主 provider(如 deepseek),专为非聚合
|
|
62
|
+
* provider 设计。这样 auxiliary 侧任务不再因 auto 模式找不到 openrouter/nous(用户没配)而崩(-32603)。
|
|
63
|
+
*
|
|
64
|
+
* Hermes 把本文件 leaf 级 deep-merge 覆盖到用户 `~/.hermes/config.yaml` 之上(managed 胜),只动
|
|
65
|
+
* `auxiliary.*.provider` 这些 leaf,用户其它配置(telegram/whatsapp/model 等)原封不动。
|
|
66
|
+
*/
|
|
67
|
+
export function buildAuxiliaryOverlayYaml() {
|
|
68
|
+
const lines = ["auxiliary:"];
|
|
69
|
+
for (const task of HERMES_AUXILIARY_TASKS) {
|
|
70
|
+
lines.push(` ${task}: { provider: main }`);
|
|
71
|
+
}
|
|
72
|
+
return `${lines.join("\n")}\n`;
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* per-agent overlay 目录(放 HERMES_MANAGED_DIR 的 config.yaml)。
|
|
76
|
+
*
|
|
77
|
+
* 刻意放 agentDir 的 `.hermes-managed` 子目录而非 agentDir 本身:agentDir 同时被 TERMINAL_CWD 指着,
|
|
78
|
+
* Hermes 从 cwd 读 AGENTS.md/.hermes.md(人格)、从 HERMES_MANAGED_DIR 读 config.yaml(overlay),两套
|
|
79
|
+
* 机制读不同路径互不干扰;隔到子目录更无歧义。
|
|
80
|
+
*/
|
|
81
|
+
export function managedDirFor(agentDir) {
|
|
82
|
+
return join(agentDir, ".hermes-managed");
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* 准备 per-agent 目录(人格 + auxiliary overlay + 工作目录起点,**非** hermes home):
|
|
36
86
|
* 1. mkdir -p(确保存在)。
|
|
37
87
|
* 2. 写 `AGENTS.md` = 人格(systemPromptAppend)。Hermes 把 cwd(我们用 TERMINAL_CWD 指到这里)当前层的
|
|
38
88
|
* AGENTS.md 当 rules 加载。幂等覆盖;无人格写空字符串(清掉上一轮残留,避免串味)。
|
|
89
|
+
* 3. 写 `<agentDir>/.hermes-managed/config.yaml` = HERMES_MANAGED_DIR overlay,把 16 个 auxiliary task 的
|
|
90
|
+
* provider 强制为 `main`(修 DeepSeek 等非聚合 provider 的 -32603)。leaf 级 deep-merge,不碰用户 ~/.hermes。
|
|
91
|
+
* 幂等覆盖(内容固定,二次准备不堆叠)。
|
|
39
92
|
*
|
|
40
93
|
* **绝不写 SOUL.md、绝不 symlink/copy ~/.hermes 的 config.yaml/.env、绝不碰用户真实 home。**
|
|
41
94
|
*/
|
|
@@ -45,6 +98,10 @@ export function prepareAgentDir(opts) {
|
|
|
45
98
|
fs.writeFileSync(join(opts.agentDir, "AGENTS.md"), opts.systemPromptAppend ?? "", {
|
|
46
99
|
mode: 0o600,
|
|
47
100
|
});
|
|
101
|
+
// auxiliary overlay:隔到 .hermes-managed 子目录(见 managedDirFor),只覆盖 auxiliary.*.provider leaf。
|
|
102
|
+
const managedDir = managedDirFor(opts.agentDir);
|
|
103
|
+
fs.mkdirSync(managedDir, { recursive: true });
|
|
104
|
+
fs.writeFileSync(join(managedDir, "config.yaml"), buildAuxiliaryOverlayYaml(), { mode: 0o600 });
|
|
48
105
|
}
|
|
49
106
|
/** per-agent 目录默认路径:优先 turn.agentHome(理想来源=daemon 传 ~/.mosse/agents/<agentId>/);否则由 cwd 稳定派生。 */
|
|
50
107
|
function defaultResolveAgentDir(turn) {
|
|
@@ -114,6 +171,10 @@ export function createHermesDriver(deps) {
|
|
|
114
171
|
const env = deps.buildEnv(turn.env);
|
|
115
172
|
env.HERMES_HOME = deps.userHermesDir; // 真实 home:auxiliary/Nous/skills/memory/config/state.db 全活。
|
|
116
173
|
env.TERMINAL_CWD = agentDir; // context-file 的 cwd → 加载 agentDir/AGENTS.md(人格,按 agent 隔离)。
|
|
174
|
+
// HERMES_MANAGED_DIR overlay:把 16 个 auxiliary task 的 provider 强制为 main(leaf 级 deep-merge 到
|
|
175
|
+
// 用户 ~/.hermes 之上)→ 修 DeepSeek 等非聚合 provider 在 auto 模式下找不到 openrouter/nous 的崩(-32603)。
|
|
176
|
+
// 目录的 config.yaml 由 prepareAgentDir 写好(Hermes 要求该路径 is_dir 才生效,prepareAgentDir 已 mkdir)。
|
|
177
|
+
env.HERMES_MANAGED_DIR = managedDirFor(agentDir);
|
|
117
178
|
// 文件工具的工作目录(独立于 TERMINAL_CWD 人格):用户设的工作目录(turn.cwd)或回退 agentDir。
|
|
118
179
|
const sessionCwd = turn.cwd?.trim() || agentDir;
|
|
119
180
|
const child = deps.spawn(bin, ["acp"], { cwd: sessionCwd, env });
|
|
@@ -193,8 +254,13 @@ export function createHermesDriver(deps) {
|
|
|
193
254
|
if (!currentSessionId)
|
|
194
255
|
throw new Error("hermes acp: no session id");
|
|
195
256
|
// D6:Mosse 指定 model 则覆盖会话模型;否则用 Hermes 本地配置默认(~/.hermes/config.yaml)。
|
|
196
|
-
|
|
197
|
-
|
|
257
|
+
// Hermes 的 set-model 要 `provider:model`(冒号);我们存的是 `provider/model`(斜杠,toModelSpec)。
|
|
258
|
+
// 斜杠会被 Hermes 当成 OpenRouter vendor/model slug → 把会话 provider 切去 openrouter(用户多半没 key)
|
|
259
|
+
// → 抛 "No LLM provider configured"(-32603)。转成冒号(只换第一个 /)→ 正确解析 provider,不切走。
|
|
260
|
+
if (turn.model) {
|
|
261
|
+
const modelId = turn.model.includes(":") ? turn.model : turn.model.replace("/", ":");
|
|
262
|
+
await client.setSessionModel(currentSessionId, modelId);
|
|
263
|
+
}
|
|
198
264
|
await client.prompt({
|
|
199
265
|
sessionId: currentSessionId,
|
|
200
266
|
content: [{ type: "text", text: turn.prompt }],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hermes.js","sourceRoot":"","sources":["../../src/drivers/hermes.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,gGAAgG;AAChG,EAAE;AACF,oEAAoE;AACpE,uFAAuF;AACvF,2FAA2F;AAC3F,mDAAmD;AACnD,oGAAoG;AACpG,wFAAwF;AACxF,kFAAkF;AAClF,2EAA2E;AAC3E,6BAA6B;AAC7B,yFAAyF;AACzF,mDAAmD;AACnD,mFAAmF;AACnF,EAAE;AACF,uBAAuB;AACvB,qFAAqF;AACrF,2FAA2F;AAC3F,iCAAiC;AACjC,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG9D,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,QAAQ,CAAC;AAC5D,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC3C,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,OAAO,CAAC;AA4B5E,MAAM,MAAM,GAAe,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC;AAExD
|
|
1
|
+
{"version":3,"file":"hermes.js","sourceRoot":"","sources":["../../src/drivers/hermes.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED