@xiaohhhh1/canvas-agent 0.4.4 → 0.4.6

package/dist/index.js

@@ -2,9 +2,12 @@
 import { startHttpServer } from "./server/http.js";
 import { ensureHttpServer } from "./server/ensure-http.js";
 import { startMcpServer } from "./server/mcp.js";
+import { startHttpSupervisor } from "./server/supervisor.js";
 if (process.argv[2] === "mcp") {
     await ensureHttpServer();
     await startMcpServer();
 }
+else if (process.argv[2] === "watch")
+    startHttpSupervisor();
 else
     startHttpServer();

package/dist/server/ensure-http.d.ts

@@ -1,2 +1,3 @@
-/** 插件 MCP 启动时确保本机 HTTP/后台队列服务常驻，无需客户另开终端。 */
+/** Ensure the local HTTP worker is running the same version as the MCP process. */
 export declare function ensureHttpServer(): Promise<void>;
+export declare function healthVersion(value: unknown): string;

package/dist/server/ensure-http.js

@@ -1,25 +1,57 @@
 import { spawn } from "node:child_process";
-import { loadConfig } from "../config.js";
-/** 插件 MCP 启动时确保本机 HTTP/后台队列服务常驻，无需客户另开终端。 */
+import { loadConfig, VERSION } from "../config.js";
+/** Ensure the local HTTP worker is running the same version as the MCP process. */
 export async function ensureHttpServer() {
     const config = loadConfig(true);
-    if (await healthy(config.url))
+    const current = await probeHealth(config.url);
+    if (current.ok && current.version === VERSION)
         return;
+    if (current.ok) {
+        const stopped = await requestShutdown(config.url, config.token);
+        if (!stopped)
+            throw new Error(`本机 Canvas Agent ${current.version || "旧版本"} 仍在运行，请关闭后重试以升级到 ${VERSION}`);
+        for (let attempt = 0; attempt < 40 && (await probeHealth(config.url)).ok; attempt += 1) {
+            await new Promise((resolve) => setTimeout(resolve, 100));
+        }
+        if ((await probeHealth(config.url)).ok)
+            throw new Error("旧版 Canvas Agent 未能正常退出，请关闭后重试");
+    }
     const entry = process.argv[1];
     if (!entry)
         throw new Error("无法定位 Canvas Agent 启动文件");
-    const child = spawn(process.execPath, [entry, "serve"], { detached: true, stdio: "ignore", windowsHide: true });
+    const child = spawn(process.execPath, [entry, "watch"], { detached: true, stdio: "ignore", windowsHide: true });
     child.unref();
     for (let attempt = 0; attempt < 40; attempt += 1) {
         await new Promise((resolve) => setTimeout(resolve, 250));
-        if (await healthy(config.url))
+        const next = await probeHealth(config.url);
+        if (next.ok && next.version === VERSION)
             return;
     }
     throw new Error("本机 Canvas Agent 后台服务启动失败");
 }
-async function healthy(url) {
+export function healthVersion(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return "";
+    return typeof value.version === "string" ? String(value.version) : "";
+}
+async function probeHealth(url) {
     try {
         const response = await fetch(new URL("/health", url), { signal: AbortSignal.timeout(800) });
+        if (!response.ok)
+            return { ok: false, version: "" };
+        return { ok: true, version: healthVersion(await response.json()) };
+    }
+    catch {
+        return { ok: false, version: "" };
+    }
+}
+async function requestShutdown(url, token) {
+    try {
+        const response = await fetch(new URL("/agent/shutdown", url), {
+            method: "POST",
+            headers: { "x-canvas-agent-token": token },
+            signal: AbortSignal.timeout(1500),
+        });
         return response.ok;
     }
     catch {

package/dist/server/http.js

@@ -5,11 +5,12 @@ import express from "express";
 import { runClaudeTurn } from "../agent/claude.js";
 import { archiveCodexThread, interruptCodexTurn, isRecoverableThreadError, listCodexThreads, readCodexThread, resolveCodexApproval, resumeCodexThread, runCodexTurn, startCodexThread, summarizeCodexThread, verifyCodexThreadWorkspace } from "../agent/codex.js";
 import { CanvasSession } from "../canvas/session.js";
-import { DEFAULT_PORT, ensureSiteWorkspace, loadConfig, saveConfig, updateSiteWorkspace } from "../config.js";
+import { DEFAULT_PORT, ensureSiteWorkspace, loadConfig, saveConfig, updateSiteWorkspace, VERSION } from "../config.js";
 import { startRelayBridge } from "../relay-bridge.js";
 import { logger } from "../utils/logger.js";
 import { windowsRootExecutable, windowsSystemExecutable } from "../utils/windows.js";
 import { WorkflowManager } from "../workflow/manager.js";
+import { AGENT_REPLACED_EXIT_CODE } from "./supervisor.js";
 /** 启动仅监听本机的 Canvas Agent HTTP 服务。 */
 export function startHttpServer() {
     const config = loadConfig(true);
@@ -53,13 +54,21 @@ export function startHttpServer() {
             return void res.json({});
         next();
     });
-    app.get("/health", (_req, res) => res.json(session.health()));
+    app.get("/health", (_req, res) => res.json({ ...session.health(), version: VERSION }));
     app.get("/config", (_req, res) => res.json({ ok: true, url: config.url, hasToken: true }));
     app.use((req, res, next) => {
         if (validToken(req, requestUrl(req, config), config.token))
             return next();
         res.status(401).json({ ok: false, error: "invalid token" });
     });
+    let httpServer;
+    app.post("/agent/shutdown", (_req, res) => {
+        res.json({ ok: true, version: VERSION });
+        setTimeout(() => {
+            httpServer?.close(() => process.exit(AGENT_REPLACED_EXIT_CODE));
+            setTimeout(() => process.exit(AGENT_REPLACED_EXIT_CODE), 2000).unref();
+        }, 50).unref();
+    });
     app.get("/events", (req, res) => session.openEvents(requestUrl(req, config), res));
     app.post("/canvas/state", (req, res) => {
         session.updateState(req.body, String(req.query.clientId || "") || undefined);
@@ -259,7 +268,7 @@ export function startHttpServer() {
         logger.error("HTTP request failed", { method: req.method, path: req.path, error });
         res.status(500).json({ ok: false, error: error.message });
     });
-    app.listen(port, "127.0.0.1", () => {
+    httpServer = app.listen(port, "127.0.0.1", () => {
         console.log("Infinite Canvas Agent");
         console.log(`Local URL: ${config.url}`);
         console.log(`Connect token: ${config.token}`);

package/dist/server/supervisor.d.ts

@@ -0,0 +1,4 @@
+export declare const AGENT_REPLACED_EXIT_CODE = 75;
+export declare function shouldRestartAgent(code: number | null, stopping: boolean): boolean;
+/** Keep the local HTTP worker alive, but step aside when a newer package replaces it. */
+export declare function startHttpSupervisor(): void;

package/dist/server/supervisor.js

@@ -0,0 +1,38 @@
+import { spawn } from "node:child_process";
+export const AGENT_REPLACED_EXIT_CODE = 75;
+const RESTART_DELAY_MS = 1000;
+export function shouldRestartAgent(code, stopping) {
+    return !stopping && code !== AGENT_REPLACED_EXIT_CODE;
+}
+/** Keep the local HTTP worker alive, but step aside when a newer package replaces it. */
+export function startHttpSupervisor() {
+    const entry = process.argv[1];
+    if (!entry)
+        throw new Error("无法定位 Canvas Agent 启动文件");
+    let child;
+    let stopping = false;
+    let restartTimer;
+    const launch = () => {
+        if (stopping)
+            return;
+        child = spawn(process.execPath, [entry, "serve"], { stdio: "ignore", windowsHide: true });
+        child.once("exit", (code) => {
+            child = undefined;
+            if (!shouldRestartAgent(code, stopping))
+                return void process.exit(0);
+            restartTimer = setTimeout(launch, RESTART_DELAY_MS);
+        });
+    };
+    const stop = () => {
+        if (stopping)
+            return;
+        stopping = true;
+        if (restartTimer)
+            clearTimeout(restartTimer);
+        child?.kill();
+        setTimeout(() => process.exit(0), 2000).unref();
+    };
+    process.once("SIGINT", stop);
+    process.once("SIGTERM", stop);
+    launch();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaohhhh1/canvas-agent",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",