mu-agent-bridge 1.0.71 → 1.0.78

package/dist/tests-ts/channel-sessions.test.js

@@ -161,6 +161,33 @@ const message = (text, extra = {}) => ({
         await (0, promises_1.rm)(root, { recursive: true, force: true });
     }
 });
+(0, node_test_1.default)("逻辑会话 ID 在 Agent 调用前可见且续用，调用失败不保存新绑定", async () => {
+    const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-session-logical-callback-"));
+    try {
+        const sessions = new channel_sessions_1.ChannelSessions(root);
+        let firstId = "";
+        await sessions.run(message("首次"), "agent", async (_sessionId, _newSession, logicalSessionId) => {
+            strict_1.default.match(logicalSessionId, /^[0-9a-f-]{36}$/i);
+            firstId = logicalSessionId;
+            return { text: "完成" };
+        });
+        await sessions.run(message("继续"), "agent", async (_sessionId, _newSession, logicalSessionId) => {
+            strict_1.default.equal(logicalSessionId, firstId);
+            return { text: "继续完成" };
+        });
+        const other = message("另一个话题", { threadId: "topic-2" });
+        let failedId = "";
+        await strict_1.default.rejects(sessions.run(other, "agent", async (_sessionId, _newSession, logicalSessionId) => {
+            failedId = logicalSessionId;
+            strict_1.default.notEqual(failedId, firstId);
+            throw new Error("Agent失败");
+        }), /Agent失败/);
+        strict_1.default.equal((await sessions.current(other, "agent")).logicalSessionId === failedId, false);
+    }
+    finally {
+        await (0, promises_1.rm)(root, { recursive: true, force: true });
+    }
+});
 (0, node_test_1.default)("切换插件的普通调用失败时保留原活动会话和后端续聊目标", async () => {
     const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-session-plugin-failure-"));
     try {

package/dist/tests-ts/chatgpt-plugin.test.js

@@ -38,7 +38,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const strict_1 = __importDefault(require("node:assert/strict"));
 const node_test_1 = __importDefault(require("node:test"));
+const node_vm_1 = require("node:vm");
 const chatgpt_1 = require("../src-ts/plugins/chatgpt");
+const desktopLaunch = __importStar(require("../src-ts/plugins/desktop-launch"));
+(0, node_test_1.default)("ChatGPT 升级清理保留桌面，普通停止仍关闭桥接持有的进程", async (t) => {
+    const terminated = [];
+    t.mock.method(desktopLaunch, "terminateOwnedProcess", async (child) => { if (child)
+        terminated.push(child); });
+    let closed = 0;
+    const plugin = new chatgpt_1.ChatgptPlugin({ client: { connect: async () => undefined, close: () => { closed++; }, connected: () => true, direct: async () => "回复" } });
+    const context = { config: {}, logger: { info() { }, warn() { }, error() { } } };
+    const owned = { pid: 12345 };
+    await plugin.activate(context);
+    plugin.ownedProcess = owned;
+    await plugin.deactivate("reload", { preserveDesktop: true });
+    strict_1.default.equal(closed, 1);
+    strict_1.default.deepEqual(terminated, []);
+    await plugin.activate(context);
+    plugin.ownedProcess = owned;
+    await plugin.deactivate();
+    strict_1.default.deepEqual(terminated, [owned]);
+});
 (0, node_test_1.default)("ChatGPT 插件通过已连接 CDP 客户端转发请求", async () => {
     const calls = [];
     const plugin = new chatgpt_1.ChatgptPlugin({ client: { connect: async () => undefined, close() { }, connected: () => true, direct: async (text) => { calls.push(text); return "回复"; } } });
@@ -94,6 +114,35 @@ const chatgpt_1 = require("../src-ts/plugins/chatgpt");
         await rm(dataDir, { recursive: true, force: true });
     }
 });
+(0, node_test_1.default)("ChatGPT 模型来源为个人助理建立专用会话，不复用桌面当前会话", async () => {
+    const { mkdtemp, rm } = await Promise.resolve().then(() => __importStar(require("node:fs/promises")));
+    const { tmpdir } = await Promise.resolve().then(() => __importStar(require("node:os")));
+    const { join } = await Promise.resolve().then(() => __importStar(require("node:path")));
+    const dataDir = await mkdtemp(join(tmpdir(), "chatgpt-model-provider-"));
+    const existing = { id: "user-chat", host: "h", title: "用户会话" };
+    const dedicated = { id: "pa-chat", host: "h", title: "个人助理模型" };
+    let active = existing;
+    const calls = [];
+    const client = {
+        connect: async () => undefined, close() { }, connected: () => true,
+        listSessions: async () => [existing, dedicated],
+        activeSession: async () => active,
+        createSession: async () => { active = dedicated; return dedicated; },
+        switchSession: async (session) => { active = session; },
+        direct: async (text) => { calls.push(`${active.id}:${text}`); return "模型 JSON"; },
+    };
+    const plugin = new chatgpt_1.ChatgptPlugin({ client });
+    try {
+        await plugin.activate({ config: {}, dataDir, logger: { info() { }, warn() { }, error() { } } });
+        strict_1.default.deepEqual(await plugin.modelProvider.complete({ prompt: "模型提示", sessionId: "pa-thread", timeoutMs: 5000, signal: new AbortController().signal }), { text: "模型 JSON" });
+        strict_1.default.deepEqual(calls, ["pa-chat:模型提示"]);
+        strict_1.default.equal(active.id, "user-chat");
+    }
+    finally {
+        await plugin.deactivate();
+        await rm(dataDir, { recursive: true, force: true });
+    }
+});
 (0, node_test_1.default)("ChatGPT 一个来源待确认的新会话不阻塞其他来源", async () => {
     const { mkdtemp, rm } = await Promise.resolve().then(() => __importStar(require("node:fs/promises")));
     const { tmpdir } = await Promise.resolve().then(() => __importStar(require("node:os")));
@@ -773,3 +822,72 @@ const chatgpt_1 = require("../src-ts/plugins/chatgpt");
     });
     strict_1.default.deepEqual(await client.direct("返回附件", 5000), { text: "", attachments: [attachment] });
 });
+(0, node_test_1.default)("ChatGPT 模型取消立即结束等待并保留原队列，普通消息恢复用户会话", async () => {
+    const user = { id: "user", host: "h", title: "用户任务" };
+    const model = { id: "model", host: "h", title: "模型会话" };
+    let active = user;
+    let release;
+    const calls = [];
+    const plugin = new chatgpt_1.ChatgptPlugin({ client: {
+            connect: async () => undefined, close() { }, connected: () => true,
+            listSessions: async () => [user, model], activeSession: async () => active,
+            createSession: async () => { calls.push("create"); active = model; return model; },
+            switchSession: async (session) => { active = session; },
+            direct: async (text) => { calls.push(`${active.id}:${text}`); if (text === "模型提示")
+                await new Promise(resolve => { release = resolve; }); return "回复"; },
+        } });
+    await plugin.activate({ config: {}, logger: { info() { }, warn() { }, error() { } } });
+    const controller = new AbortController();
+    let error;
+    const generating = plugin.modelProvider.complete({ prompt: "模型提示", sessionId: "pa-cancel", timeoutMs: 5000, signal: controller.signal }).catch((value) => { error = value; });
+    await new Promise(resolve => setImmediate(resolve));
+    const normal = plugin.handle({ task: "用户续聊" });
+    controller.abort(new Error("取消模型等待"));
+    await new Promise(resolve => setImmediate(resolve));
+    const canceledImmediately = Boolean(error);
+    const callsBeforeReply = [...calls];
+    release();
+    await generating;
+    await normal;
+    await plugin.deactivate();
+    strict_1.default.equal(canceledImmediately, true);
+    strict_1.default.match(error.stage, /generate/);
+    strict_1.default.deepEqual(callsBeforeReply, ["create", "model:模型提示"]);
+    strict_1.default.deepEqual(calls, ["create", "model:模型提示", "user:用户续聊"]);
+});
+(0, node_test_1.default)("ChatGPT 模型来源在断线时拒绝且不调用桌面恢复", async () => {
+    let connected = true;
+    let reconnects = 0;
+    let creates = 0;
+    const chat = { id: "user", host: "h", title: "用户任务" };
+    const plugin = new chatgpt_1.ChatgptPlugin({ client: {
+            connect: async () => undefined, close() { }, connected: () => connected,
+            listSessions: async () => [chat], activeSession: async () => chat,
+            createSession: async () => { creates++; return chat; }, switchSession: async () => undefined,
+            direct: async () => "回复",
+        } });
+    await plugin.activate({ config: {}, logger: { info() { }, warn() { }, error() { } } });
+    plugin.reconnect = async () => { reconnects++; connected = true; };
+    connected = false;
+    const error = await plugin.modelProvider.complete({ prompt: "模型提示", sessionId: "pa-offline", timeoutMs: 5000, signal: new AbortController().signal }).then(() => undefined, (value) => value);
+    await plugin.deactivate();
+    strict_1.default.match(String(error), /连接|断开/);
+    strict_1.default.equal(reconnects, 0);
+    strict_1.default.equal(creates, 0);
+});
+(0, node_test_1.default)("ChatGPT 模型新建、切换和提交时保留用户草稿", async () => {
+    for (const operation of ["create", "switch", "direct"]) {
+        const client = new chatgpt_1.ChatgptCdpClient();
+        const editor = { innerText: "用户正在编辑" };
+        let edits = 0, clicks = 0;
+        client.recoverDraft = async () => { edits++; editor.innerText = ""; };
+        client.waitFor = async () => undefined;
+        client.activeSession = async () => undefined;
+        client.evaluate = async (expression) => (0, node_vm_1.runInNewContext)(expression, {
+            document: { querySelector: (selector) => selector.includes("contenteditable") ? editor : null, querySelectorAll: (selector) => selector.includes("sidebar-thread-id") || selector.startsWith("button,") ? [{ textContent: "新聊天", getAttribute: (key) => key.endsWith("thread-id") ? "model" : key.endsWith("host-id") ? "h" : null, click() { clicks++; } }] : [] },
+        });
+        const run = () => operation === "create" ? client.createSession(undefined, true) : operation === "switch" ? client.switchSession({ id: "model", host: "h", title: "模型" }, true) : client.directTurn("模型提示", 1, undefined, "slot", "out", Date.now(), undefined, true);
+        await strict_1.default.rejects(run(), /未发送内容/);
+        strict_1.default.deepEqual({ edits, clicks, text: editor.innerText }, { edits: 0, clicks: 0, text: "用户正在编辑" });
+    }
+});

package/dist/tests-ts/control-server.test.js

@@ -47,7 +47,27 @@ const promises_1 = require("node:fs/promises");
 const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const node_crypto_1 = require("node:crypto");
+const node_child_process_1 = __importDefault(require("node:child_process"));
 const plugin_manager_1 = require("../src-ts/plugin-manager");
+(0, node_test_1.default)("ABWeb 后台升级调用当前安装的统一升级器并记录启动错误", async (t) => {
+    const logs = [];
+    const calls = [];
+    const child = Object.assign(new node_events_1.EventEmitter(), { unref() { } });
+    t.mock.method(node_child_process_1.default, "spawn", (...args) => { calls.push(args); return child; });
+    t.mock.timers.enable({ apis: ["setTimeout"] });
+    const server = new control_server_1.ControlServer({ manager: { log: (...args) => logs.push(args) } });
+    const request = { method: "POST", url: "/api/update", headers: {}, socket: { remoteAddress: "127.0.0.1" } };
+    const response = { statusCode: 0, setHeader() { }, end() { } };
+    await server.handle(request, response);
+    strict_1.default.equal(response.statusCode, 202);
+    strict_1.default.equal(calls.length, 0);
+    t.mock.timers.tick(1500);
+    strict_1.default.equal(calls.length, 1);
+    strict_1.default.equal(calls[0][0], process.execPath);
+    strict_1.default.deepEqual(calls[0][1], [(0, node_path_1.join)(__dirname, "../src-ts/cli.js"), "update"]);
+    child.emit("error", new Error("无法启动升级进程"));
+    strict_1.default.ok(logs.some(line => JSON.stringify(line).includes("无法启动升级进程")));
+});
 (0, node_test_1.default)("桌面重启请求交给 mab 后台执行并保留失败原因", async () => {
     const calls = [];
     const manager = { restartDesktop: async (id) => { calls.push(id); if (id !== "workbuddy")
@@ -118,6 +138,20 @@ const plugin_manager_1 = require("../src-ts/plugin-manager");
         await server.stop();
     }
 });
+(0, node_test_1.default)("control server exposes dynamic model provider status without plugin configuration", async () => {
+    const modelProviders = [{ id: "qwenwork", displayName: "千问办公", status: "ready", available: true, reason: "" }];
+    const manager = { list: () => [], listModelProviders: () => modelProviders };
+    const server = new control_server_1.ControlServer({ manager, host: "127.0.0.1", port: 0 });
+    const address = await server.start();
+    try {
+        const response = await fetch(`http://${address.host}:${address.port}/api/model-providers`);
+        strict_1.default.equal(response.status, 200);
+        strict_1.default.deepEqual(await response.json(), { providers: modelProviders });
+    }
+    finally {
+        await server.stop();
+    }
+});
 (0, node_test_1.default)("信任管理 API 支持查询、变更和拒绝无效配置", async () => {
     const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-trust-api-"));
     const previous = process.env.AGENT_BRIDGE_TRUSTED_PACKAGES;
@@ -182,6 +216,28 @@ const plugin_manager_1 = require("../src-ts/plugin-manager");
         await server.stop();
     }
 });
+(0, node_test_1.default)("版本和下载 API 使用已安装插件的真实 npm 包名", async () => {
+    const calls = [];
+    const record = { id: "personal-assistant", packageName: "agent-bridge-pa", version: "1.0.0" };
+    const status = { packageName: "agent-bridge-pa", state: "update-available" };
+    const manager = {
+        list: () => [record], versions: { get: (name) => name === "agent-bridge-pa" ? status : undefined },
+        packageInfo: () => ({ packageName: record.packageName }),
+        downloadPackage: async (...args) => { calls.push(args); return "下载目录"; },
+    };
+    const server = new control_server_1.ControlServer({ manager, host: "127.0.0.1", port: 0 });
+    const address = await server.start();
+    try {
+        const base = `http://${address.host}:${address.port}`;
+        strict_1.default.deepEqual((await (await fetch(`${base}/api/versions`)).json()).plugins[0].versionStatus, status);
+        const response = await fetch(`${base}/api/plugins/personal-assistant/download`, { method: "POST", body: JSON.stringify({ version: "1.0.1" }) });
+        strict_1.default.equal(response.status, 200);
+        strict_1.default.deepEqual(calls, [["agent-bridge-pa", "1.0.1"]]);
+    }
+    finally {
+        await server.stop();
+    }
+});
 (0, node_test_1.default)("control server dispatches plugin HTTP routes and unregisters them on stop", async () => {
     const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "agent-bridge-http-plugin-"));
     try {

package/dist/tests-ts/core-updater.test.js

@@ -4,85 +4,254 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const strict_1 = __importDefault(require("node:assert/strict"));
+const node_child_process_1 = require("node:child_process");
 const promises_1 = require("node:fs/promises");
 const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
 const node_test_1 = __importDefault(require("node:test"));
+const node_util_1 = require("node:util");
 const core_updater_1 = require("../src-ts/core-updater");
-async function fixture() {
+const execFileAsync = (0, node_util_1.promisify)(node_child_process_1.execFile);
+async function fixture(directory = "测试目录/package", version = "1.0.0") {
     const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-core-update-"));
-    const packageRoot = (0, node_path_1.join)(root, "node_modules", "mu-agent-bridge");
-    const globalRoot = (0, node_path_1.join)(root, "node_modules");
+    const packageRoot = (0, node_path_1.join)(root, directory);
     await (0, promises_1.mkdir)((0, node_path_1.join)(packageRoot, "dist", "src-ts"), { recursive: true });
-    await (0, promises_1.writeFile)((0, node_path_1.join)(packageRoot, "package.json"), JSON.stringify({ name: "mu-agent-bridge", version: "1.0.0" }));
-    await (0, promises_1.writeFile)((0, node_path_1.join)(packageRoot, "dist", "src-ts", "cli.js"), "old");
-    return { root, packageRoot, globalRoot };
+    await (0, promises_1.writeFile)((0, node_path_1.join)(packageRoot, "package.json"), JSON.stringify({ name: "mu-agent-bridge", version }));
+    await (0, promises_1.writeFile)((0, node_path_1.join)(packageRoot, "dist", "src-ts", "cli.js"), `console.log(${JSON.stringify(version)});`);
+    await (0, promises_1.writeFile)((0, node_path_1.join)(packageRoot, "dist", "obsolete.js"), "旧发布文件");
+    await (0, promises_1.writeFile)((0, node_path_1.join)(packageRoot, "local-config.json"), "保留本地配置");
+    await (0, promises_1.mkdir)((0, node_path_1.join)(packageRoot, "node_modules", "local-tool"), { recursive: true });
+    await (0, promises_1.writeFile)((0, node_path_1.join)(packageRoot, "node_modules", "local-tool", "index.js"), "保留本地依赖");
+    await (0, promises_1.mkdir)((0, node_path_1.join)(packageRoot, "plugins", "local-plugin"), { recursive: true });
+    await (0, promises_1.mkdir)((0, node_path_1.join)(packageRoot, "plugins", "dsh", "9.0.0"), { recursive: true });
+    await (0, promises_1.writeFile)((0, node_path_1.join)(packageRoot, "plugins", "local-plugin", "plugin.json"), "本地插件");
+    await (0, promises_1.writeFile)((0, node_path_1.join)(packageRoot, "plugins", "dsh", "9.0.0", "plugin.json"), "高版本插件");
+    return { root, packageRoot, stateDir: (0, node_path_1.join)(root, "state") };
 }
-(0, node_test_1.default)("mab start 在核心有新版本时安装、启动并等待健康检查", async () => {
+async function stagePackage(args, version = "1.1.0") {
+    const prefixIndex = args.indexOf("--prefix");
+    strict_1.default.notEqual(prefixIndex, -1, "安装应在暂存目录执行");
+    strict_1.default.ok(args.includes("--install-strategy=nested"), "依赖需要随核心一起迁移");
+    const candidate = (0, node_path_1.join)(args[prefixIndex + 1], "node_modules", "mu-agent-bridge");
+    await (0, promises_1.mkdir)((0, node_path_1.join)(candidate, "dist", "src-ts"), { recursive: true });
+    await (0, promises_1.mkdir)((0, node_path_1.join)(candidate, "node_modules", "fixture-dependency"), { recursive: true });
+    await (0, promises_1.writeFile)((0, node_path_1.join)(candidate, "package.json"), JSON.stringify({ name: "mu-agent-bridge", version }));
+    await (0, promises_1.writeFile)((0, node_path_1.join)(candidate, "dist", "src-ts", "cli.js"), 'console.log(require("../../package.json").version + ":" + require("fixture-dependency"));');
+    await (0, promises_1.writeFile)((0, node_path_1.join)(candidate, "node_modules", "fixture-dependency", "index.js"), 'module.exports="依赖可用";');
+    if (process.platform !== "win32") {
+        await (0, promises_1.mkdir)((0, node_path_1.join)(candidate, "node_modules", ".bin"));
+        await (0, promises_1.symlink)("../fixture-dependency/index.js", (0, node_path_1.join)(candidate, "node_modules", ".bin", "fixture"));
+    }
+    await (0, promises_1.writeFile)((0, node_path_1.join)(candidate, "LICENSE"), "新发布文件");
+    await (0, promises_1.mkdir)((0, node_path_1.join)(candidate, "plugins", "dsh"), { recursive: true });
+    await (0, promises_1.writeFile)((0, node_path_1.join)(candidate, "plugins", "dsh", "plugin.json"), "新版内置插件");
+    return "";
+}
+for (const directory of ["node_modules/mu-agent-bridge", "测试目录/package"]) {
+    (0, node_test_1.default)(`${directory} 的低版本升级后仍由原路径运行新核心及依赖`, async () => {
+        const value = await fixture(directory);
+        const events = [];
+        try {
+            const updated = await (0, core_updater_1.updateCoreAtStartup)({
+                ...value,
+                npm: async (args) => {
+                    events.push(args[0]);
+                    if (args[0] === "root")
+                        return (0, node_path_1.join)(value.root, "node_modules");
+                    if (args[0] === "view")
+                        return '"1.1.0"';
+                    return stagePackage(args);
+                },
+                stopDaemon: async () => { events.push("stop"); },
+                startDaemon: async () => {
+                    events.push("start");
+                    const { stdout } = await execFileAsync(process.execPath, [(0, node_path_1.join)(value.packageRoot, "dist", "src-ts", "cli.js")]);
+                    strict_1.default.equal(stdout.trim(), "1.1.0:依赖可用");
+                },
+                waitForHealth: async () => true,
+            });
+            strict_1.default.equal(updated, true);
+            strict_1.default.deepEqual(events, ["view", "install", "stop", "start"]);
+            strict_1.default.equal(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "local-config.json"), "utf8"), "保留本地配置");
+            strict_1.default.equal(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "node_modules", "local-tool", "index.js"), "utf8"), "保留本地依赖");
+            strict_1.default.equal(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "plugins", "local-plugin", "plugin.json"), "utf8"), "本地插件");
+            strict_1.default.equal(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "plugins", "dsh", "9.0.0", "plugin.json"), "utf8"), "高版本插件");
+            strict_1.default.equal(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "plugins", "dsh", "plugin.json"), "utf8"), "新版内置插件");
+            if (process.platform !== "win32")
+                strict_1.default.equal(await (0, promises_1.readlink)((0, node_path_1.join)(value.packageRoot, "node_modules", ".bin", "fixture")), "../fixture-dependency/index.js");
+            await strict_1.default.rejects((0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "dist", "obsolete.js")), { code: "ENOENT" });
+            strict_1.default.deepEqual(await (0, promises_1.readdir)(value.stateDir), []);
+        }
+        finally {
+            await (0, promises_1.rm)(value.root, { recursive: true, force: true });
+        }
+    });
+    for (const currentVersion of ["1.1.0", "9.0.0"]) {
+        (0, node_test_1.default)(`${directory} 的当前版本 ${currentVersion} 不被 npmjs 的相同或较低版本覆盖`, async () => {
+            const value = await fixture(directory, currentVersion);
+            const calls = [];
+            try {
+                const updated = await (0, core_updater_1.updateCoreAtStartup)({
+                    ...value,
+                    npm: async (args) => { calls.push(args[0]); return args[0] === "root" ? (0, node_path_1.join)(value.root, "node_modules") : '"1.1.0"'; },
+                    stopDaemon: async () => { strict_1.default.fail("不应停止当前后台"); },
+                    startDaemon: async () => { strict_1.default.fail("不应启动其他版本"); },
+                    waitForHealth: async () => true,
+                });
+                strict_1.default.equal(updated, false);
+                strict_1.default.deepEqual(calls, ["view"]);
+                strict_1.default.equal(JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "package.json"), "utf8")).version, currentVersion);
+            }
+            finally {
+                await (0, promises_1.rm)(value.root, { recursive: true, force: true });
+            }
+        });
+    }
+}
+(0, node_test_1.default)("新 daemon 健康检查失败时恢复原路径的旧核心及文件", async () => {
     const value = await fixture();
     const events = [];
+    let healthChecks = 0;
     try {
         const updated = await (0, core_updater_1.updateCoreAtStartup)({
-            packageRoot: value.packageRoot,
-            globalRoot: value.globalRoot,
-            stateDir: (0, node_path_1.join)(value.root, "state"),
-            npm: async (args) => {
-                events.push(args.join(" "));
-                if (args[0] === "view")
-                    return '"1.1.0"';
-                await (0, promises_1.writeFile)((0, node_path_1.join)(value.packageRoot, "package.json"), JSON.stringify({ name: "mu-agent-bridge", version: "1.1.0" }));
-                await (0, promises_1.writeFile)((0, node_path_1.join)(value.packageRoot, "dist", "src-ts", "cli.js"), "new");
-                return "";
-            },
+            ...value,
+            npm: async (args) => args[0] === "root" ? (0, node_path_1.join)(value.root, "node_modules") : args[0] === "view" ? '"1.1.0"' : stagePackage(args),
             stopDaemon: async () => { events.push("stop"); },
-            startDaemon: async () => { events.push("start"); },
-            waitForHealth: async () => true,
+            startDaemon: async () => {
+                const { stdout } = await execFileAsync(process.execPath, [(0, node_path_1.join)(value.packageRoot, "dist", "src-ts", "cli.js")]);
+                events.push(stdout.trim());
+            },
+            waitForHealth: async () => ++healthChecks > 1,
         });
-        strict_1.default.equal(updated, true);
-        strict_1.default.equal(JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "package.json"), "utf8")).version, "1.1.0");
-        strict_1.default.deepEqual(events, ["view mu-agent-bridge version --json", "stop", "install -g mu-agent-bridge@1.1.0 --no-fund --no-audit", "start"]);
+        strict_1.default.equal(updated, false);
+        strict_1.default.deepEqual(events, ["stop", "1.1.0:依赖可用", "stop", "1.0.0"]);
+        strict_1.default.equal(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "dist", "obsolete.js"), "utf8"), "旧发布文件");
+        strict_1.default.equal(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "local-config.json"), "utf8"), "保留本地配置");
+        await strict_1.default.rejects((0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "LICENSE")), { code: "ENOENT" });
     }
     finally {
         await (0, promises_1.rm)(value.root, { recursive: true, force: true });
     }
 });
-(0, node_test_1.default)("新 daemon 健康检查失败时恢复旧核心包并继续旧进程", async () => {
+(0, node_test_1.default)("并发检查遇到已有进程的升级锁时中止，避免启动入口继续覆盖后台", async () => {
     const value = await fixture();
-    const events = [];
+    const lock = (0, node_path_1.join)(value.stateDir, "core-update.lock");
+    await (0, promises_1.mkdir)(lock, { recursive: true });
+    await (0, promises_1.writeFile)((0, node_path_1.join)(lock, String(process.pid)), "");
+    try {
+        await strict_1.default.rejects((0, core_updater_1.updateCoreAtStartup)({
+            ...value,
+            npm: async () => strict_1.default.fail("锁冲突时不能调用 npm"),
+            stopDaemon: async () => strict_1.default.fail("锁冲突时不能停止后台"),
+            startDaemon: async () => strict_1.default.fail("锁冲突时不能启动后台"),
+            waitForHealth: async () => false,
+        }), /已有核心升级检查正在运行/);
+        strict_1.default.equal(JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "package.json"), "utf8")).version, "1.0.0");
+        strict_1.default.deepEqual(await (0, promises_1.readdir)(lock), [String(process.pid)]);
+    }
+    finally {
+        await (0, promises_1.rm)(value.root, { recursive: true, force: true });
+    }
+});
+(0, node_test_1.default)("回滚后的旧后台仍不健康时清理本次进程并保留备份", async () => {
+    const value = await fixture();
+    const stops = [];
+    let launches = 0;
+    try {
+        await strict_1.default.rejects((0, core_updater_1.updateCoreAtStartup)({
+            ...value,
+            npm: async (args) => args[0] === "view" ? '"1.1.0"' : stagePackage(args),
+            stopDaemon: async (pid) => { stops.push(pid); },
+            startDaemon: async () => ({ pid: 1000 + ++launches }),
+            waitForHealth: async () => false,
+        }), /旧 daemon 恢复后的健康检查失败/);
+        strict_1.default.deepEqual(stops, [undefined, 1001, 1002]);
+        strict_1.default.equal(JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "package.json"), "utf8")).version, "1.0.0");
+        const remaining = await (0, promises_1.readdir)(value.stateDir);
+        strict_1.default.equal(remaining.length, 1);
+        strict_1.default.match(remaining[0], /^mab-core-update-/);
+        strict_1.default.equal(JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(value.stateDir, remaining[0], "backup", "package.json"), "utf8")).version, "1.0.0");
+    }
+    finally {
+        await (0, promises_1.rm)(value.root, { recursive: true, force: true });
+    }
+});
+(0, node_test_1.default)("退出进程遗留的升级锁由下一次检查清理", async () => {
+    const value = await fixture();
+    const lock = (0, node_path_1.join)(value.stateDir, "core-update.lock");
+    await (0, promises_1.mkdir)(lock, { recursive: true });
+    await (0, promises_1.writeFile)((0, node_path_1.join)(lock, "2147483647"), "");
+    let views = 0;
     try {
         const updated = await (0, core_updater_1.updateCoreAtStartup)({
-            packageRoot: value.packageRoot,
-            globalRoot: value.globalRoot,
-            stateDir: (0, node_path_1.join)(value.root, "state"),
-            npm: async (args) => {
-                if (args[0] === "view")
-                    return '"1.1.0"';
-                await (0, promises_1.writeFile)((0, node_path_1.join)(value.packageRoot, "package.json"), JSON.stringify({ name: "mu-agent-bridge", version: "1.1.0" }));
-                return "";
-            },
-            stopDaemon: async () => { events.push("stop"); },
-            startDaemon: async () => { events.push("start"); },
-            waitForHealth: async () => { events.push("health"); return false; },
+            ...value,
+            npm: async () => { views++; return '"1.0.0"'; },
+            stopDaemon: async () => strict_1.default.fail("版本相同时不能停止后台"),
+            startDaemon: async () => strict_1.default.fail("版本相同时不能启动后台"),
+            waitForHealth: async () => false,
         });
         strict_1.default.equal(updated, false);
-        strict_1.default.equal(JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "package.json"), "utf8")).version, "1.0.0");
-        strict_1.default.deepEqual(events, ["stop", "start", "health", "stop", "start"]);
+        strict_1.default.equal(views, 1);
+        strict_1.default.deepEqual(await (0, promises_1.readdir)(value.stateDir), []);
     }
     finally {
         await (0, promises_1.rm)(value.root, { recursive: true, force: true });
     }
 });
-(0, node_test_1.default)("核心已是最新或不是 npm 全局安装时不停止 daemon", async () => {
+(0, node_test_1.default)("两个检查并发时只有锁持有者可以调用 npm", async () => {
     const value = await fixture();
-    let stops = 0;
+    let release;
+    let entered;
+    const pending = new Promise(done => { release = done; });
+    const started = new Promise(done => { entered = done; });
+    let checks = 0;
+    const options = {
+        ...value,
+        npm: async () => { checks++; entered(); await pending; return '"1.0.0"'; },
+        stopDaemon: async () => strict_1.default.fail("版本相同时不能停止后台"),
+        startDaemon: async () => strict_1.default.fail("版本相同时不能启动后台"),
+        waitForHealth: async () => false,
+    };
+    const first = (0, core_updater_1.updateCoreAtStartup)(options);
     try {
-        const current = await (0, core_updater_1.updateCoreAtStartup)({ packageRoot: value.packageRoot, globalRoot: value.globalRoot, stateDir: (0, node_path_1.join)(value.root, "state"), npm: async () => '"1.0.0"', stopDaemon: async () => { stops++; }, startDaemon: async () => undefined, waitForHealth: async () => true });
-        const local = await (0, core_updater_1.updateCoreAtStartup)({ packageRoot: value.packageRoot, globalRoot: value.root, stateDir: (0, node_path_1.join)(value.root, "state"), npm: async () => '"2.0.0"', stopDaemon: async () => { stops++; }, startDaemon: async () => undefined, waitForHealth: async () => true });
-        strict_1.default.equal(current, false);
-        strict_1.default.equal(local, false);
-        strict_1.default.equal(stops, 0);
+        await started;
+        await strict_1.default.rejects((0, core_updater_1.updateCoreAtStartup)(options), /已有核心升级检查正在运行/);
+        strict_1.default.equal(checks, 1);
     }
     finally {
+        release();
+        await first;
         await (0, promises_1.rm)(value.root, { recursive: true, force: true });
     }
 });
+for (const failure of ["下载失败", "包版本不匹配"]) {
+    (0, node_test_1.default)(`${failure} 时保留原后台和安装内容`, async () => {
+        const value = await fixture();
+        const logs = [];
+        try {
+            const updated = await (0, core_updater_1.updateCoreAtStartup)({
+                ...value,
+                npm: async (args) => {
+                    if (args[0] === "root")
+                        return (0, node_path_1.join)(value.root, "node_modules");
+                    if (args[0] === "view")
+                        return '"1.1.0"';
+                    if (failure === "下载失败")
+                        throw new Error(failure);
+                    return stagePackage(args, "1.0.9");
+                },
+                stopDaemon: async () => { strict_1.default.fail("下载和验证完成前不能停止后台"); },
+                startDaemon: async () => { strict_1.default.fail("不应启动无效包"); },
+                waitForHealth: async () => true,
+                log: (_level, message, fields) => { logs.push(message + JSON.stringify(fields)); },
+            });
+            strict_1.default.equal(updated, false);
+            strict_1.default.equal(JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(value.packageRoot, "package.json"), "utf8")).version, "1.0.0");
+            strict_1.default.ok(logs.some(line => /下载失败|版本不匹配/.test(line)), JSON.stringify(logs));
+            strict_1.default.deepEqual(await (0, promises_1.readdir)(value.stateDir), []);
+        }
+        finally {
+            await (0, promises_1.rm)(value.root, { recursive: true, force: true });
+        }
+    });
+}