mosse-agent-bridge 0.1.4 → 0.1.6

package/dist/drivers/hermes-map.js

@@ -0,0 +1,126 @@
+function str(v) {
+    return typeof v === "string" ? v : "";
+}
+/** 从 ACP content(可能是 string 或 {type:"text",text} 或 ContentBlock)里取文本。 */
+function readText(content) {
+    if (typeof content === "string")
+        return content;
+    if (content && typeof content === "object") {
+        const t = content.text;
+        if (typeof t === "string")
+            return t;
+    }
+    return "";
+}
+function truncate(s, n) {
+    return s.length > n ? `${s.slice(0, n)}…` : s;
+}
+/** 计划摘要:有 entries/plan 数组就报步数,否则报标题/泛称。 */
+function summarizePlan(update) {
+    const entries = update.entries ?? update.plan;
+    if (Array.isArray(entries))
+        return `${entries.length} step(s)`;
+    return str(update.title) || "plan";
+}
+/**
+ * ACP `session_update` → CcEvent(或 null=忽略)。映射表(§9.2):
+ *  - agent_message_chunk                       → {type:"text", delta}     (driver 累积成最终文本)
+ *  - agent_thought_chunk                       → {type:"activity", tool:"thinking"}   (思考摘要)
+ *  - tool_call / tool_call_update / tool_start / tool_complete
+ *                                              → {type:"activity", tool, summary}     (工具摘要)
+ *  - plan / plan_update                        → {type:"activity", tool:"plan"}       (计划摘要)
+ *  - usage_update                              → null(忽略;用量并入 result 由 driver 处理)
+ *  - user_message_chunk                        → null(resume 时历史重放,非本轮 agent 产出)
+ *  - 其它/未知                                 → null
+ */
+export function mapSessionUpdate(update) {
+    switch (update.sessionUpdate) {
+        case "agent_message_chunk": {
+            const delta = readText(update.content);
+            return delta ? { type: "text", delta } : null;
+        }
+        case "agent_thought_chunk": {
+            const text = readText(update.content);
+            return { type: "activity", tool: "thinking", summary: truncate(text, 200) };
+        }
+        case "tool_call":
+        case "tool_call_update":
+        case "tool_start":
+        case "tool_complete": {
+            const tool = str(update.title) || str(update.kind) || str(update.toolName) || "tool";
+            const status = str(update.status);
+            const summary = [str(update.title) || tool, status].filter(Boolean).join(" · ");
+            return { type: "activity", tool, summary };
+        }
+        case "plan":
+        case "plan_update":
+            return { type: "activity", tool: "plan", summary: summarizePlan(update) };
+        case "usage_update":
+        case "user_message_chunk":
+            return null;
+        default:
+            return null;
+    }
+}
+function toPairs(obj) {
+    if (!obj || typeof obj !== "object")
+        return undefined;
+    const out = Object.entries(obj).map(([name, value]) => ({
+        name,
+        value: String(value),
+    }));
+    return out.length ? out : undefined;
+}
+/**
+ * daemon 的 `mcpConfig`(claude `--mcp-config` 形状:`{mcpServers:{name:{type,url,headers}|{command,args,env}}}`)
+ * → ACP `session/new` 的 `mcpServers` 数组(F2.6)。
+ *
+ * **knowledge token 透传与 claude 对齐**:daemon 给 claude 和 hermes 两个 driver 的是**同一个** mcpConfig JSON
+ * (见 agent-bridge/src/index.ts cc_turn:知识 MCP = `{type:"http", url, headers:{Authorization:"Bearer <turnToken>"}}`)。
+ * claude 经 `--mcp-config` 注入;hermes 在此转成 ACP `mcpServers`,token 原样落到 ACP http server 的 `headers`
+ * (或 stdio server 的 `env`)。Mosse 不在此处生成/改写 token —— 只搬运 daemon 已组好的形状。
+ *
+ * 形状判别:
+ *  - http / sse transport:有 `type:"http"|"sse"` 或仅有 `url`(claude http 配置必带 url);headers → ACP `{name,value}[]`。
+ *  - stdio transport:有 `command`;`args` 透传、`env`(可携带 token,如 `*_API_KEY`/`MOSSE_KNOWLEDGE_TOKEN`)→ `{name,value}[]`。
+ *  - 既无 url 也无 command 的坏项跳过(不注入坏 server)。
+ */
+export function mcpConfigToAcpServers(mcpConfig) {
+    if (!mcpConfig)
+        return undefined;
+    let parsed;
+    try {
+        parsed = JSON.parse(mcpConfig);
+    }
+    catch {
+        return undefined;
+    }
+    const servers = parsed?.mcpServers;
+    if (!servers || typeof servers !== "object")
+        return undefined;
+    const out = [];
+    for (const [name, raw] of Object.entries(servers)) {
+        const c = (raw ?? {});
+        const url = str(c.url);
+        const command = typeof c.command === "string" ? c.command : "";
+        // http / sse:显式 type,或缺 type 但有 url(且非 stdio)→ 按 http 处理。
+        if (c.type === "http" || c.type === "sse" || (url && !command)) {
+            if (!url)
+                continue; // http/sse 必带 url,否则是坏配置 → 跳过。
+            const type = c.type === "sse" ? "sse" : "http";
+            out.push({ type, name, url, headers: toPairs(c.headers) });
+        }
+        else if (command) {
+            // stdio:command + args + env(env 可带 token)。
+            out.push({
+                name,
+                command,
+                args: Array.isArray(c.args) ? c.args : undefined,
+                env: toPairs(c.env),
+            });
+        }
+        // 既无 url 也无 command:跳过。
+    }
+    return out.length ? out : undefined;
+}
+//# sourceMappingURL=hermes-map.js.map

package/dist/drivers/hermes-map.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hermes-map.js","sourceRoot":"","sources":["../../src/drivers/hermes-map.ts"],"names":[],"mappings":"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"}

package/dist/drivers/hermes.d.ts

@@ -0,0 +1,66 @@
+import type { Readable, Writable } from "node:stream";
+import type { AgentTurn, CliDriver } from "./types.js";
+/** spawn 出的子进程最小形状(node ChildProcess 满足此结构 → 默认实现直接用)。 */
+export interface HermesChild {
+    stdin: Writable | null;
+    stdout: Readable | null;
+    stderr: Readable | null;
+    killed: boolean;
+    kill(signal?: NodeJS.Signals | number): boolean;
+    on(event: string, listener: (...args: unknown[]) => void): unknown;
+}
+export type SpawnHermes = (bin: string, args: string[], opts: {
+    cwd: string;
+    env: NodeJS.ProcessEnv;
+}) => HermesChild;
+/** 写隔离目录所需的 fs 操作(可注入,便于单测不碰真盘)。 */
+export interface HermesHomeFs {
+    mkdirSync(p: string, opts: {
+        recursive: boolean;
+    }): void;
+    existsSync(p: string): boolean;
+    symlinkSync(target: string, path: string): void;
+    copyFileSync(src: string, dst: string): void;
+    writeFileSync(p: string, data: string, opts?: {
+        mode?: number;
+    }): void;
+    rmSync(p: string, opts?: {
+        force?: boolean;
+    }): void;
+}
+/**
+ * 准备 per-agent 的隔离 HERMES_HOME:
+ *  1. 建目录。
+ *  2. **配置继承**:把用户真实 `~/.hermes/config.yaml` + `.env`(M1 写的 LLM 配置)**symlink** 进隔离目录
+ *     —— LLM 配置保持单一真相源(用户重配即时反映、无双写漂移),而 state.db / session 留隔离目录独立(消除多 agent 串味)。
+ *     symlink 不可用(如某些 FS / Windows)时退回 copy。
+ *  3. F2.3 system prompt:把 systemPromptAppend 写进隔离目录的 `AGENTS.md`(Hermes 启动读 rules),幂等覆盖。
+ */
+export declare function prepareHermesHome(opts: {
+    homeDir: string;
+    userHermesDir: string;
+    systemPromptAppend?: string;
+    fs?: HermesHomeFs;
+}): void;
+export interface HermesDeps {
+    spawn: SpawnHermes;
+    /** 解析 hermes 绝对路径(找不到返回 null)。 */
+    resolveBin(): string | null;
+    /** 构造子进程 env(剥 daemon 机密 + 合并 inject 白名单 + 补 PATH)。 */
+    buildEnv(inject?: Record<string, string>): NodeJS.ProcessEnv;
+    /** 准备隔离 HERMES_HOME + 写 AGENTS.md。 */
+    prepareHome(opts: {
+        homeDir: string;
+        userHermesDir: string;
+        systemPromptAppend?: string;
+    }): void;
+    /** 解析该 turn 的隔离目录。 */
+    resolveHome(turn: AgentTurn): string;
+    /** 用户真实 hermes 配置目录(继承 LLM 配置的源)。 */
+    userHermesDir: string;
+    /** 无事件多久判 idle 取消(F2.8)。 */
+    idleTimeoutMs: number;
+}
+/** 用注入依赖造一个 hermes driver(生产用 defaultDeps;测试传 mock spawn/fs)。 */
+export declare function createHermesDriver(deps: HermesDeps): CliDriver;
+export declare const hermesDriver: CliDriver;

package/dist/drivers/hermes.js

@@ -0,0 +1,232 @@
+// Hermes CLI driver:通过 ACP(`hermes acp` = `python -m acp_adapter`)驱动 Hermes 跑一轮 agent 回合。
+// 实现 CliDriver(F2.2 + F2.2a + F2.3 + F2.4 + F2.8)。设计见 docs/hermes-engine-adaptation.md §5.3/§9。
+//
+// 与 claude driver 的异同:
+//  - 同:per-turn spawn 子进程、stdin/stdout 协议、stderr 仅日志、流式 onEvent、返回 {text,sessionId}。
+//  - 异:协议是 ACP JSON-RPC(非 stream-json);system prompt 无协议字段 → 写隔离目录 AGENTS.md(F2.3);
+//        per-agent HERMES_HOME 隔离(F2.3/D5)+ symlink 用户 LLM 配置继承;支持 abort/idle 取消(F2.8)。
+import { spawn as spawnNode } from "node:child_process";
+import { createHash } from "node:crypto";
+import { copyFileSync, existsSync, mkdirSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+import { AcpClient } from "../acp/client.js";
+import { buildSpawnEnv } from "./env.js";
+import { mapSessionUpdate, mcpConfigToAcpServers } from "./hermes-map.js";
+import { defaultResolveDeps, resolveBin } from "./resolve.js";
+const HERMES_BIN = process.env.MOSSE_HERMES_BIN ?? "hermes";
+const NODE_DIR = dirname(process.execPath);
+const DEFAULT_IDLE_MS = Number(process.env.MOSSE_HERMES_IDLE_MS) || 120_000;
+const realFs = {
+    mkdirSync,
+    existsSync,
+    symlinkSync,
+    copyFileSync,
+    writeFileSync,
+    rmSync,
+};
+/**
+ * 准备 per-agent 的隔离 HERMES_HOME:
+ *  1. 建目录。
+ *  2. **配置继承**:把用户真实 `~/.hermes/config.yaml` + `.env`(M1 写的 LLM 配置)**symlink** 进隔离目录
+ *     —— LLM 配置保持单一真相源(用户重配即时反映、无双写漂移),而 state.db / session 留隔离目录独立(消除多 agent 串味)。
+ *     symlink 不可用(如某些 FS / Windows)时退回 copy。
+ *  3. F2.3 system prompt:把 systemPromptAppend 写进隔离目录的 `AGENTS.md`(Hermes 启动读 rules),幂等覆盖。
+ */
+export function prepareHermesHome(opts) {
+    const fs = opts.fs ?? realFs;
+    fs.mkdirSync(opts.homeDir, { recursive: true });
+    for (const name of ["config.yaml", ".env"]) {
+        const src = join(opts.userHermesDir, name);
+        const dst = join(opts.homeDir, name);
+        if (!fs.existsSync(src))
+            continue;
+        try {
+            fs.rmSync(dst, { force: true }); // 刷新:删旧链接/拷贝,保证指向当前用户配置。
+        }
+        catch {
+            // 不存在即可忽略。
+        }
+        try {
+            fs.symlinkSync(src, dst);
+        }
+        catch {
+            fs.copyFileSync(src, dst); // symlink 失败兜底拷贝。
+        }
+    }
+    // 隔离目录的 AGENTS.md 完全由我们托管:有则写、无则清空(避免上一轮 system prompt 残留串味)。
+    fs.writeFileSync(join(opts.homeDir, "AGENTS.md"), opts.systemPromptAppend ?? "", { mode: 0o600 });
+}
+/** per-agent HERMES_HOME 默认路径:优先 turn.agentHome(理想来源=daemon 传);否则由 cwd 稳定派生。 */
+function defaultResolveHome(turn) {
+    const explicit = turn.agentHome?.trim();
+    if (explicit)
+        return explicit;
+    const base = process.env.MOSSE_HERMES_HOMES_DIR?.trim() || join(homedir(), ".mosse", "hermes-homes");
+    const key = createHash("sha256").update(turn.cwd).digest("hex").slice(0, 16);
+    return join(base, key);
+}
+function defaultDeps() {
+    return {
+        spawn: (bin, args, opts) => spawnNode(bin, args, { cwd: opts.cwd, env: opts.env, stdio: ["pipe", "pipe", "pipe"] }),
+        resolveBin: () => resolveBin(HERMES_BIN, defaultResolveDeps(buildSpawnEnv({ base: process.env, nodeDir: NODE_DIR }))),
+        buildEnv: (inject) => buildSpawnEnv({ base: process.env, inject, nodeDir: NODE_DIR }),
+        prepareHome: (o) => prepareHermesHome(o),
+        resolveHome: defaultResolveHome,
+        // HERMES_HOME 在子进程里被我们覆盖为隔离目录;用户真实配置仍在原 HERMES_HOME 或 ~/.hermes。
+        userHermesDir: process.env.HERMES_HOME?.trim() || join(homedir(), ".hermes"),
+        idleTimeoutMs: DEFAULT_IDLE_MS,
+    };
+}
+/** 杀子进程并保证不留僵尸:SIGTERM → 2s 内未退则 SIGKILL(node 自动 reap 已退进程)。 */
+function makeKiller(child) {
+    let exited = false;
+    child.on("exit", () => {
+        exited = true;
+    });
+    child.on("close", () => {
+        exited = true;
+    });
+    return () => {
+        if (exited || child.killed)
+            return;
+        try {
+            child.kill("SIGTERM");
+        }
+        catch {
+            // 进程已不存在即可忽略。
+        }
+        const t = setTimeout(() => {
+            if (!exited) {
+                try {
+                    child.kill("SIGKILL");
+                }
+                catch {
+                    // 同上。
+                }
+            }
+        }, 2000);
+        t.unref?.();
+    };
+}
+/** 用注入依赖造一个 hermes driver(生产用 defaultDeps;测试传 mock spawn/fs)。 */
+export function createHermesDriver(deps) {
+    return {
+        id: "hermes",
+        async detect() {
+            const bin = deps.resolveBin();
+            return bin ? { id: "hermes", bin } : null;
+        },
+        async run(turn, onEvent, signal) {
+            // F2.3/D5:先备好隔离 HERMES_HOME(含 LLM 配置继承 + AGENTS.md),Hermes 启动才读得到。
+            const homeDir = deps.resolveHome(turn);
+            deps.prepareHome({
+                homeDir,
+                userHermesDir: deps.userHermesDir,
+                systemPromptAppend: turn.systemPromptAppend,
+            });
+            const bin = deps.resolveBin() ?? HERMES_BIN;
+            const env = deps.buildEnv(turn.env);
+            env.HERMES_HOME = homeDir; // 隔离:state.db / session / rules 全落这里。
+            const child = deps.spawn(bin, ["acp"], { cwd: turn.cwd, env });
+            if (!child.stdin || !child.stdout) {
+                throw new Error("hermes acp: missing stdio pipes");
+            }
+            // stderr 仅日志,绝不混入协议帧。
+            child.stderr?.on("data", (d) => process.stderr.write(`[hermes stderr] ${String(d)}`));
+            const client = new AcpClient(child.stdout, child.stdin);
+            const killChild = makeKiller(child);
+            const mcpServers = mcpConfigToAcpServers(turn.mcpConfig);
+            const state = { text: "" };
+            let currentSessionId = turn.sessionId ?? null;
+            // ── F2.8 取消/超时:任一触发 → ACP cancel + kill,受控结束 race ──
+            let stopped = false;
+            let resolveStopped;
+            const stoppedPromise = new Promise((r) => {
+                resolveStopped = () => r("stopped");
+            });
+            let idleTimer;
+            function triggerStop() {
+                if (stopped)
+                    return;
+                stopped = true;
+                try {
+                    if (currentSessionId)
+                        client.cancel(currentSessionId); // 通知 agent 取消进行中的回合。
+                }
+                catch {
+                    // 子进程已挂即可忽略。
+                }
+                killChild();
+                resolveStopped();
+            }
+            function resetIdle() {
+                if (idleTimer)
+                    clearTimeout(idleTimer);
+                idleTimer = setTimeout(triggerStop, deps.idleTimeoutMs);
+                idleTimer.unref?.();
+            }
+            resetIdle();
+            // ── F2.2a:session_update → CcEvent;text 累积成最终文本 ──
+            client.onSessionUpdate((n) => {
+                resetIdle(); // 有活动就续命,避免误判 idle。
+                const ev = mapSessionUpdate(n.update);
+                if (!ev)
+                    return;
+                if (ev.type === "text")
+                    state.text += ev.delta;
+                onEvent(ev);
+            });
+            const onAbort = () => triggerStop();
+            if (signal) {
+                if (signal.aborted)
+                    triggerStop();
+                else
+                    signal.addEventListener("abort", onAbort, { once: true });
+            }
+            // ── ACP 主流程 ──
+            async function mainFlow() {
+                await client.initialize();
+                if (turn.sessionId) {
+                    // F2.4 会话恢复:有 sessionId 走 resume,延续历史;失败则丢旧会话新开一个(对齐 claude driver)。
+                    try {
+                        await client.resumeSession({ sessionId: turn.sessionId, cwd: turn.cwd, mcpServers });
+                        currentSessionId = turn.sessionId;
+                    }
+                    catch {
+                        const r = await client.newSession({ cwd: turn.cwd, mcpServers });
+                        currentSessionId = r.sessionId;
+                    }
+                }
+                else {
+                    const r = await client.newSession({ cwd: turn.cwd, mcpServers });
+                    currentSessionId = r.sessionId;
+                }
+                if (!currentSessionId)
+                    throw new Error("hermes acp: no session id");
+                // D6:Mosse 指定 model 则覆盖会话模型;否则用 Hermes 本地配置默认。
+                if (turn.model)
+                    await client.setSessionModel(currentSessionId, turn.model);
+                await client.prompt({
+                    sessionId: currentSessionId,
+                    content: [{ type: "text", text: turn.prompt }],
+                });
+                return "done";
+            }
+            try {
+                // 自然完成 vs 取消/超时,谁先到都受控返回累积文本 + sessionId。
+                await Promise.race([mainFlow(), stoppedPromise]);
+                return { text: state.text.trim(), sessionId: currentSessionId };
+            }
+            finally {
+                if (idleTimer)
+                    clearTimeout(idleTimer);
+                if (signal)
+                    signal.removeEventListener("abort", onAbort);
+                killChild(); // 每轮 spawn / 每轮收;无僵尸。
+            }
+        },
+    };
+}
+export const hermesDriver = createHermesDriver(defaultDeps());
+//# sourceMappingURL=hermes.js.map

package/dist/drivers/hermes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hermes.js","sourceRoot":"","sources":["../../src/drivers/hermes.ts"],"names":[],"mappings":"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"}

package/dist/drivers/index.js

@@ -1,7 +1,9 @@
 // 运行时分发:按 runtime id 选 driver。codex/gemini 之后在此注册(预留位)。
 import { claudeDriver } from "./claude.js";
+import { hermesDriver } from "./hermes.js";
 const DRIVERS = {
     [claudeDriver.id]: claudeDriver,
+    [hermesDriver.id]: hermesDriver, // Hermes(ACP driver,M2)
     // "local:codex": codexDriver,    // 未来
     // "local:gemini": geminiDriver,  // 未来
 };

package/dist/drivers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/drivers/index.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,MAAM,OAAO,GAA8B;IACzC,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,YAAY;IAC/B,uCAAuC;IACvC,uCAAuC;CACxC,CAAC;AAEF,sCAAsC;AACtC,MAAM,UAAU,SAAS,CAAC,EAAU;IAClC,OAAO,OAAO,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/drivers/index.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,MAAM,OAAO,GAA8B;IACzC,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,YAAY;IAC/B,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,wBAAwB;IACzD,uCAAuC;IACvC,uCAAuC;CACxC,CAAC;AAEF,sCAAsC;AACtC,MAAM,UAAU,SAAS,CAAC,EAAU;IAClC,OAAO,OAAO,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;AAC7B,CAAC"}

package/dist/drivers/resolve.d.ts

@@ -11,6 +11,9 @@ export interface ResolveDeps {
 export declare function whichWith(env: NodeJS.ProcessEnv): (cmd: string) => string | null;
 /** 登录 shell 兜底:`$SHELL -lc 'command -v <cmd>'`(固定命令名,白名单防注入,带超时)。 */
 export declare function loginShellWhich(): (cmd: string) => string | null;
+/** 通用 bin 解析:PATH → 已知绝对路径 → 登录 shell 兜底(无 Claude Desktop 特例)。找不到返回 null。
+ *  非 claude 的 CLI(如 hermes)用这个;claude 在其上再加 Desktop 兜底(resolveClaudeBin)。 */
+export declare function resolveBin(cmd: string, deps: ResolveDeps): string | null;
 /** 解析 claude 绝对路径:PATH → 已知路径 → 登录 shell → macOS Claude Desktop。找不到返回 null。 */
 export declare function resolveClaudeBin(cmd: string, deps: ResolveDeps): string | null;
 /** 生产默认 deps(用补全过 PATH 的 env 跑 which + 登录 shell 兜底)。 */

package/dist/drivers/resolve.js

@@ -50,6 +50,14 @@ function knownPaths(cmd, home) {
         join(home, ".bun/bin", cmd),
     ];
 }
+/** 通用 bin 解析:PATH → 已知绝对路径 → 登录 shell 兜底(无 Claude Desktop 特例)。找不到返回 null。
+ *  非 claude 的 CLI(如 hermes)用这个;claude 在其上再加 Desktop 兜底(resolveClaudeBin)。 */
+export function resolveBin(cmd, deps) {
+    return (deps.which(cmd) ??
+        knownPaths(cmd, deps.home).find((p) => deps.existsSync(p)) ??
+        deps.loginShellWhich?.(cmd) ??
+        null);
+}
 /** 解析 claude 绝对路径:PATH → 已知路径 → 登录 shell → macOS Claude Desktop。找不到返回 null。 */
 export function resolveClaudeBin(cmd, deps) {
     const onPath = deps.which(cmd);

package/dist/drivers/resolve.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/drivers/resolve.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/drivers/resolve.ts"],"names":[],"mappings":"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"}

package/dist/drivers/types.d.ts

@@ -12,6 +12,12 @@ export interface AgentTurn {
     env?: Record<string, string>;
     /** MCP 配置 JSON 字符串(如知识服务);传则加 `--mcp-config <json>`。 */
     mcpConfig?: string;
+    /**
+     * per-agent 的隔离配置根(Hermes 用作 `HERMES_HOME`,见 hermes.ts / docs §9.1 D5)。
+     * **理想来源**:daemon 传 `<DATA_DIR>/agents/<agentId>/.hermes-home`(与 agent 私有目录同源、跨重启稳定);
+     * 不传时 driver 用 cwd 派生稳定默认(不强依赖上游改动)。对 claude driver 无意义(忽略)。
+     */
+    agentHome?: string;
 }
 /** 流式事件:文本增量 / 工具活动。 */
 export type CcEvent = {
@@ -28,7 +34,7 @@ export interface TurnResult {
     sessionId: string | null;
 }
 export interface DriverInfo {
-    /** moss runtime id,如 "local:claude-code"。 */
+    /** mosse runtime id,如 "local:claude-code"。 */
     id: string;
     /** 解析出的绝对可执行路径(M2 起带绝对路径)。 */
     bin: string;
@@ -38,6 +44,10 @@ export interface CliDriver {
     id: string;
     /** 本机是否可用 + 解析路径;不可用返回 null(供 detectRuntimes 与 run 共用)。 */
     detect(): Promise<DriverInfo | null>;
-    /** 跑一轮,流式回调事件,最终返回全文 + sessionId。 */
-    run(turn: AgentTurn, onEvent: (ev: CcEvent) => void): Promise<TurnResult>;
+    /**
+     * 跑一轮,流式回调事件,最终返回全文 + sessionId。
+     * @param signal 可选取消信号(F2.8):abort → driver 取消进行中的回合并 kill 子进程,受控返回。
+     *   旧 driver(如 claude)实现可只接 `(turn, onEvent)`——结构化类型下省略尾参仍兼容本接口。
+     */
+    run(turn: AgentTurn, onEvent: (ev: CcEvent) => void, signal?: AbortSignal): Promise<TurnResult>;
 }

package/dist/hermes-config.d.ts

@@ -0,0 +1,33 @@
+/**
+ * 纯函数:合并写 config.yaml 的 `model:` 段。对标 Rust `merge_config_yaml`(逐行等价)。
+ * - 设置/更新 `model.default`、`model.provider`,有 base_url 则设 `model.base_url`。
+ * - 保留文件里其它所有内容(其它顶层段、model 段下未触及的子键、缩进、注释)。
+ * - 文件无 `model:` 段则在末尾创建最小段。
+ */
+export declare function mergeConfigYaml(existing: string, model: string, provider: string, baseUrl?: string): string;
+/**
+ * 纯函数:合并写 .env。对标 Rust `merge_env`。
+ * - 每个 {name,value}:文件已有同名 KEY(含 `export ` 前缀)→ 覆盖其值(保留 `export `);否则追加。
+ * - 其它行(不相关 key、注释、空行)原样保留。
+ */
+export declare function mergeEnv(existing: string, pairs: {
+    name: string;
+    value: string;
+}[]): string;
+/** 写入结果:只回 ok + authReady(读回磁盘真相);绝不回显 key / 文件内容。 */
+export interface WriteHermesConfigResult {
+    ok: boolean;
+    authReady: boolean;
+    error?: string;
+}
+/**
+ * IO:合并写指定 HERMES_HOME 的 config.yaml + .env,.env chmod 0600,写后复用 hermes-detect 判 authReady。
+ * 对标 Rust `write_hermes_config`(但目录由调用方传入,本机/远程统一走此一份)。
+ * **绝不日志/返回 key**;失败返回 {ok:false,error}(不抛)。
+ */
+export declare function writeHermesConfigToDisk(hermesDir: string, opts: {
+    provider: string;
+    model: string;
+    apiKey?: string;
+    baseUrl?: string;
+}): Promise<WriteHermesConfigResult>;