@xiaohhhh1/canvas-agent 0.2.2 → 0.3.0

package/dist/{http-server.js → server/http.js}

@@ -1,19 +1,27 @@
+import { spawn } from "node:child_process";
+import { readFile, stat } from "node:fs/promises";
+import path from "node:path";
 import express from "express";
-import { DEFAULT_PORT, ensureSiteWorkspace, loadConfig, saveConfig, updateSiteWorkspace } from "./config.js";
-import { CanvasSession } from "./canvas-session.js";
-import { startRelayBridge } from "./relay-bridge.js";
-import { archiveCodexThread, interruptCodexTurn, isRecoverableThreadError, listCodexThreads, readCodexThread, resumeCodexThread, runClaudeTurn, runCodexTurn, startCodexThread, summarizeCodexThread, verifyCodexThreadWorkspace, withAgentPrompt } from "./agents.js";
+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 { startRelayBridge } from "../relay-bridge.js";
+import { logger } from "../utils/logger.js";
+/** 启动仅监听本机的 Canvas Agent HTTP 服务。 */
 export function startHttpServer() {
     const config = loadConfig(true);
     const port = Number(process.env.PORT) || Number(new URL(config.url).port) || DEFAULT_PORT;
     config.url = `http://127.0.0.1:${port}`;
     saveConfig(config);
     const session = new CanvasSession();
+    /** 将 Agent 事件广播到所属线程或全部网页。 */
     const emit = (type, payload) => {
         const data = payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { value: payload };
         const threadId = String(data.threadId || data.thread_id || ensureSiteWorkspace(config).activeThreadId || "");
         threadId ? session.emitThread(type, threadId, data) : session.emitAll(type, data);
     };
+    /** 保存并广播当前站点工作空间的活跃线程。 */
     const setActiveThread = (activeThreadId, payload = {}) => {
         const workspace = updateSiteWorkspace(config, { activeThreadId: activeThreadId || undefined });
         session.emitThread("workspace_changed", activeThreadId, { ...payload, activeThreadId });
@@ -22,6 +30,18 @@ export function startHttpServer() {
     const app = express();
     app.disable("x-powered-by");
     app.use(express.json({ limit: "30mb" }));
+    app.use((req, res, next) => {
+        if (!logger.enabled)
+            return next();
+        const startedAt = Date.now();
+        const url = requestUrl(req, config);
+        res.on("finish", () => {
+            if (req.method === "OPTIONS" || (res.statusCode < 400 && ["/health", "/canvas/state", "/canvas/activate"].includes(url.pathname)))
+                return;
+            logger.debug(`HTTP ${req.method} ${url.pathname}`, { status: res.statusCode, durationMs: Date.now() - startedAt });
+        });
+        next();
+    });
     app.use((req, res, next) => {
         const url = requestUrl(req, config);
         if (!setCors(req, res, url, config))
@@ -58,6 +78,24 @@ export function startHttpServer() {
         res.setHeader("Cache-Control", "no-store");
         res.type(attachment.type).send(Buffer.from(data, "base64"));
     }));
+    app.post("/agent/local-file/reveal", route(async (req, res) => {
+        const filePath = String(req.body?.path || "");
+        if (!path.isAbsolute(filePath))
+            return res.status(400).json({ ok: false, error: "文件路径必须是绝对路径" });
+        const file = await stat(filePath);
+        await revealLocalFile(filePath, file.isDirectory());
+        res.json({ ok: true });
+    }));
+    app.post("/agent/local-image", route(async (req, res) => {
+        const filePath = String(req.body?.path || "");
+        if (!path.isAbsolute(filePath) || !/\.(?:avif|gif|jpe?g|png|webp)$/i.test(filePath))
+            return res.status(400).json({ ok: false, error: "图片路径无效" });
+        const file = await stat(filePath);
+        if (!file.isFile())
+            return res.status(400).json({ ok: false, error: "图片文件无效" });
+        res.setHeader("Cache-Control", "no-store");
+        res.type(path.extname(filePath)).send(await readFile(filePath));
+    }));
     app.post("/api/tools", route(async (req, res) => res.json({ ok: true, result: await session.callTool(req.body?.name, req.body?.input || {}) })));
     app.get("/agent/codex/workspace", (_req, res) => {
         const workspace = ensureSiteWorkspace(config);
@@ -68,15 +106,20 @@ export function startHttpServer() {
         const result = await listCodexThreads(emit, { cwd: workspace.workspacePath, searchTerm: String(req.query.searchTerm || "") });
         res.json({ ok: true, workspace, ...result });
     }));
-    app.post("/agent/codex/threads/new", route(async (_req, res) => {
+    app.post("/agent/codex/threads/new", route(async (req, res) => {
         if (session.codexBusy)
             return res.status(409).json({ ok: false, error: "Codex 正在运行，请等待当前任务完成" });
         const workspace = ensureSiteWorkspace(config);
-        const thread = await startCodexThread(emit, workspace.workspacePath);
+        const thread = await startCodexThread(emit, workspace.workspacePath, permissionMode(req.body?.permissionMode));
         const activeThreadId = String(thread.id || "");
         const nextWorkspace = setActiveThread(activeThreadId, { emptyThread: true });
         res.json({ ok: true, workspace: nextWorkspace, thread: summarizeCodexThread(thread), messages: [] });
     }));
+    app.post("/agent/codex/threads/reset", (req, res) => {
+        if (session.codexBusy)
+            return res.status(409).json({ ok: false, error: "Codex 正在运行，请等待当前任务完成" });
+        res.json({ ok: true, workspace: setActiveThread("", { emptyThread: true, draftThread: true }) });
+    });
     app.get("/agent/codex/threads/:threadId", route(async (req, res) => {
         const workspace = ensureSiteWorkspace(config);
         const threadId = routeParam(req.params.threadId);
@@ -94,7 +137,7 @@ export function startHttpServer() {
             return res.status(409).json({ ok: false, error: "Codex 正在运行，请等待当前任务完成" });
         const workspace = ensureSiteWorkspace(config);
         const threadId = routeParam(req.params.threadId);
-        const result = await resumeCodexThread(emit, threadId, workspace.workspacePath);
+        const result = await resumeCodexThread(emit, threadId, workspace.workspacePath, permissionMode(req.body?.permissionMode));
         const nextWorkspace = setActiveThread(threadId);
         res.json({ ok: true, workspace: nextWorkspace, ...result });
     }));
@@ -116,12 +159,13 @@ export function startHttpServer() {
         if (!prompt.trim())
             return res.status(400).json({ ok: false, error: "请输入任务内容" });
         const clientId = String(req.body?.clientId || "");
+        logger.info("Codex turn accepted", { threadId: req.body?.threadId, promptLength: prompt.length, attachmentCount: attachments.length });
         session.setCodexState({ busy: true, threadId: String(req.body?.threadId || workspace.activeThreadId || ""), turnId: "" });
         try {
             let threadId = String(req.body?.threadId || workspace.activeThreadId || "");
             let turnId = "";
             if (!threadId) {
-                const thread = await startCodexThread(emit, workspace.workspacePath);
+                const thread = await startCodexThread(emit, workspace.workspacePath, permissionMode(req.body?.permissionMode));
                 threadId = String(thread.id || "");
                 setActiveThread(threadId, { emptyThread: true });
             }
@@ -135,13 +179,15 @@ export function startHttpServer() {
                 message: { id: String(req.body?.messageId || Date.now()), role: "user", text: String(req.body?.messageText || prompt || `发送了 ${attachments.length} 张图片`) },
             };
             let chatThreadId = "";
+            /** 将当前 turn 事件固定广播到实际线程。 */
             const turnEmit = (type, payload) => {
                 const data = payload && typeof payload === "object" && !Array.isArray(payload) ? payload : { value: payload };
-                session.emitThread(type, threadId, data);
+                session.emitThread(type, threadId, { ...data, ...(turnId ? { turn_id: turnId } : {}) });
             };
-            void runCodexTurn(withAgentPrompt(withAttachmentContext(prompt, attachmentRefs)), turnEmit, attachments, {
+            void runCodexTurn(withAttachmentContext(prompt, attachmentRefs), turnEmit, attachments, {
                 threadId,
                 cwd: workspace.workspacePath,
+                permissionMode: permissionMode(req.body?.permissionMode),
                 appEmit: emit,
                 onStart: clientId ? () => session.bindClient(clientId) : undefined,
                 onThread: (actualThreadId) => {
@@ -157,9 +203,11 @@ export function startHttpServer() {
                 },
                 onTurn: (actualTurnId) => {
                     turnId = actualTurnId;
+                    logger.info("Codex turn started", { threadId, turnId });
                     session.setCodexState({ busy: true, threadId, turnId });
                 },
                 onFinish: () => {
+                    logger.info("Codex turn finished", { threadId, turnId });
                     session.clearTurnAttachments(clientId);
                     if (clientId)
                         session.releaseClient(clientId);
@@ -173,16 +221,23 @@ export function startHttpServer() {
             throw error;
         }
     }));
-    app.post("/agent/codex/interrupt", (req, res) => {
-        const ok = interruptCodexTurn(String(req.body?.threadId || ""));
-        res.json({ ok });
-    });
+    app.post("/agent/codex/approval", route(async (req, res) => {
+        const decision = String(req.body?.decision || "");
+        if (!["accept", "acceptForSession", "decline", "cancel"].includes(decision))
+            return res.status(400).json({ ok: false, error: "无效的审批决定" });
+        const ok = await resolveCodexApproval(String(req.body?.requestId || ""), decision);
+        res.status(ok ? 200 : 409).json({ ok, ...(ok ? {} : { error: "审批请求已失效" }) });
+    }));
+    app.post("/agent/codex/interrupt", route(async (req, res) => res.json({ ok: await interruptCodexTurn(String(req.body?.threadId || "")) })));
     app.post("/agent/claude/turn", (req, res) => {
-        runClaudeTurn(withAgentPrompt(String(req.body?.prompt || "")), emit);
+        runClaudeTurn(String(req.body?.prompt || ""), emit);
         res.json({ ok: true });
     });
     app.use((_req, res) => res.status(404).json({ ok: false, error: "not found" }));
-    app.use((error, _req, res, _next) => res.status(500).json({ ok: false, error: error.message }));
+    app.use((error, req, res, _next) => {
+        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", () => {
         console.log("Infinite Canvas Agent");
         console.log(`Local URL: ${config.url}`);
@@ -191,17 +246,44 @@ export function startHttpServer() {
         console.log("Optional MCP add: codex mcp add infinite-canvas -- npx -y @xiaohhhh1/canvas-agent mcp");
         console.log("Remove manually added MCP: codex mcp remove infinite-canvas");
         startRelayBridge(config);
+        if (logger.enabled)
+            console.log(`Debug log: ${logger.filePath}`);
+        logger.info("Canvas Agent started", { url: config.url, workspace: ensureSiteWorkspace(config).workspacePath, debugLog: logger.filePath });
     });
 }
+/** 将异步 Express 路由异常交给统一错误处理中间件。 */
 function route(handler) {
     return (req, res, next) => void handler(req, res).catch(next);
 }
+/** 从 Express 路由参数中读取单个字符串。 */
 function routeParam(value) {
     return Array.isArray(value) ? value[0] || "" : value;
 }
+function permissionMode(value) {
+    return value === "automatic" || value === "full" ? value : "request";
+}
+/** 使用当前操作系统的文件管理器定位本地文件。 */
+function revealLocalFile(filePath, isDirectory) {
+    const command = process.platform === "darwin" ? "open" : process.platform === "win32" ? "explorer.exe" : "xdg-open";
+    const args = process.platform === "darwin"
+        ? ["-R", filePath]
+        : process.platform === "win32"
+            ? [isDirectory ? filePath : `/select,${filePath}`]
+            : [isDirectory ? filePath : path.dirname(filePath)];
+    return new Promise((resolve, reject) => {
+        const child = spawn(command, args, { detached: true, stdio: "ignore" });
+        child.once("spawn", () => {
+            child.unref();
+            resolve();
+        });
+        child.once("error", reject);
+    });
+}
+/** 结合服务配置解析当前请求 URL。 */
 function requestUrl(req, config) {
     return new URL(req.originalUrl || req.url || "/", config.url);
 }
+/** 设置跨域响应头并记录通过 token 授权的来源。 */
 function setCors(req, res, url, config) {
     const origin = req.headers.origin;
     res.setHeader("Access-Control-Allow-Origin", origin || "*");
@@ -218,10 +300,12 @@ function setCors(req, res, url, config) {
     res.setHeader("Vary", "Origin");
     return config.origins.includes(origin);
 }
+/** 校验请求查询参数或请求头中的连接 token。 */
 function validToken(req, url, token) {
     const header = req.headers["x-canvas-agent-token"];
     return url.searchParams.get("token") === token || header === token || (Array.isArray(header) && header.includes(token));
 }
+/** 向 Agent 提示词追加本轮图片附件引用说明。 */
 function withAttachmentContext(prompt, attachments) {
     if (!attachments.length)
         return prompt;

package/dist/server/mcp.d.ts

@@ -0,0 +1,2 @@
+/** 启动通过标准输入输出通信的 MCP 服务。 */
+export declare function startMcpServer(): Promise<void>;

package/dist/{mcp-server.js → server/mcp.js}

@@ -1,13 +1,15 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { AGENT_PROMPT, loadConfig, VERSION } from "./config.js";
-import { toolDescriptions, toolInputSchemas, toolNames } from "./schemas.js";
+import { toolDescriptions, toolInputSchemas, toolNames } from "../canvas/schemas.js";
+import { AGENT_PROMPT, loadConfig, VERSION } from "../config.js";
+/** 启动通过标准输入输出通信的 MCP 服务。 */
 export async function startMcpServer() {
     const config = loadConfig(true);
     const server = new McpServer({ name: "canvas-agent", version: VERSION }, { instructions: AGENT_PROMPT });
     toolNames.forEach((name) => registerCanvasTool(server, config, name));
     await server.connect(new StdioServerTransport());
 }
+/** 向 MCP Server 注册单个 Canvas Agent 工具。 */
 function registerCanvasTool(server, config, name) {
     const schema = toolInputSchemas[name];
     server.registerTool(name, { description: toolDescriptions[name], inputSchema: schema.shape }, async (input) => {
@@ -15,6 +17,7 @@ function registerCanvasTool(server, config, name) {
         return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
     });
 }
+/** 将 MCP 工具调用转发到本地 Canvas Agent HTTP 服务。 */
 async function postCanvasAgentTool(config, name, input) {
     const res = await fetch(`${config.url}/api/tools`, { method: "POST", headers: { "content-type": "application/json", "x-canvas-agent-token": config.token }, body: JSON.stringify({ name, input }) });
     const body = (await res.json());

package/dist/utils/date.d.ts

@@ -0,0 +1,2 @@
+/** 将日期格式化为适合文件名使用的本地日期字符串。 */
+export declare function formatDateForFilename(date?: Date): string;

package/dist/utils/date.js

@@ -0,0 +1,7 @@
+/** 将日期格式化为适合文件名使用的本地日期字符串。 */
+export function formatDateForFilename(date = new Date()) {
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, "0");
+    const day = String(date.getDate()).padStart(2, "0");
+    return `${year}-${month}-${day}`;
+}

package/dist/utils/logger.d.ts

@@ -0,0 +1,17 @@
+/** 管理 Canvas Agent 的终端与文件 Debug 日志。 */
+export declare class Logger {
+    readonly enabled: boolean;
+    readonly filePath: string;
+    private readonly logger;
+    /** 根据命令行 Debug 参数初始化日志输出。 */
+    constructor();
+    /** 输出 Debug 级别日志。 */
+    debug(message: string, details?: unknown): void;
+    /** 输出 Info 级别日志。 */
+    info(message: string, details?: unknown): void;
+    /** 输出 Warn 级别日志。 */
+    warn(message: string, details?: unknown): void;
+    /** 输出 Error 级别日志。 */
+    error(message: string, details?: unknown): void;
+}
+export declare const logger: Logger;

package/dist/utils/logger.js

@@ -0,0 +1,83 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { inspect } from "node:util";
+import winston, { format, transports } from "winston";
+import { formatDateForFilename } from "./date.js";
+/** 管理 Canvas Agent 的终端与文件 Debug 日志。 */
+export class Logger {
+    enabled = process.argv.includes("--debug");
+    filePath = this.enabled ? path.join(os.homedir(), ".infinite-canvas", "logs", `canvas-agent-${formatDateForFilename()}.log`) : "";
+    logger;
+    /** 根据命令行 Debug 参数初始化日志输出。 */
+    constructor() {
+        if (!this.enabled) {
+            this.logger = null;
+            return;
+        }
+        fs.mkdirSync(path.dirname(this.filePath), { recursive: true });
+        const line = format.printf(({ level, message, timestamp, details }) => `${timestamp} ${level.toUpperCase()} ${message}${formatDetails(details)}`);
+        this.logger = winston.createLogger({
+            level: "debug",
+            transports: [
+                new transports.Console({ format: format.combine(format.timestamp({ format: "HH:mm:ss" }), line) }),
+                new transports.File({ filename: this.filePath, format: format.combine(format.timestamp({ format: "HH:mm:ss" }), line) }),
+            ],
+        });
+    }
+    /** 输出 Debug 级别日志。 */
+    debug(message, details) {
+        if (details === undefined)
+            this.logger?.debug(message);
+        else
+            this.logger?.debug(message, { details: sanitize(details) });
+    }
+    /** 输出 Info 级别日志。 */
+    info(message, details) {
+        if (details === undefined)
+            this.logger?.info(message);
+        else
+            this.logger?.info(message, { details: sanitize(details) });
+    }
+    /** 输出 Warn 级别日志。 */
+    warn(message, details) {
+        if (details === undefined)
+            this.logger?.warn(message);
+        else
+            this.logger?.warn(message, { details: sanitize(details) });
+    }
+    /** 输出 Error 级别日志。 */
+    error(message, details) {
+        if (details === undefined)
+            this.logger?.error(message);
+        else
+            this.logger?.error(message, { details: sanitize(details) });
+    }
+}
+/** 将日志详情格式化为紧凑的单行文本。 */
+function formatDetails(details) {
+    if (details === undefined)
+        return "";
+    if (!details || typeof details !== "object" || Array.isArray(details))
+        return ` ${inspect(details, { depth: null, breakLength: Infinity })}`;
+    const text = Object.entries(details).filter(([, value]) => value !== undefined).map(([key, value]) => `${key}=${inspect(value, { depth: null, breakLength: Infinity })}`).join(" ");
+    return text ? ` ${text}` : "";
+}
+/** 清理日志内容中的敏感数据和不可序列化引用。 */
+function sanitize(value, key = "", seen = new WeakSet()) {
+    if (/token|authorization|api.?key|dataurl/i.test(key))
+        return "[REDACTED]";
+    if (typeof value === "string" && value.startsWith("data:"))
+        return `[DATA URL ${value.length} chars]`;
+    if (value instanceof Error)
+        return { name: value.name, message: value.message, stack: value.stack };
+    if (!value || typeof value !== "object")
+        return value;
+    if (seen.has(value))
+        return "[CIRCULAR]";
+    seen.add(value);
+    if (Array.isArray(value))
+        return value.map((item) => sanitize(item, key, seen));
+    return Object.fromEntries(Object.entries(value).map(([field, item]) => [field, sanitize(item, field, seen)]));
+}
+export const logger = new Logger();

package/dist/utils/value.d.ts

@@ -0,0 +1,5 @@
+export type JsonRecord = Record<string, unknown>;
+/** 安全读取未知对象中的指定字段。 */
+export declare function field(value: unknown, key: string): unknown;
+/** 将未知异常转换为可展示的错误信息。 */
+export declare function errorMessage(error: unknown): string;

package/dist/utils/value.js

@@ -0,0 +1,8 @@
+/** 安全读取未知对象中的指定字段。 */
+export function field(value, key) {
+    return value && typeof value === "object" ? value[key] : undefined;
+}
+/** 将未知异常转换为可展示的错误信息。 */
+export function errorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}

package/package.json

@@ -1,28 +1,31 @@
 {
   "name": "@xiaohhhh1/canvas-agent",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "bin": {
-    "canvas-agent": "./dist/index.js"
+    "canvas-agent": "dist/index.js"
   },
   "files": [
     "dist",
+    "agent-instructions.md",
     "README.md"
   ],
   "scripts": {
     "dev": "tsx src/index.ts",
-    "test": "tsx --test src/canvas-session.test.ts",
+    "debug": "tsx src/index.ts --debug",
+    "test": "tsx --test src/canvas/session.test.ts",
     "build": "tsc -p tsconfig.json",
     "start": "node dist/index.js",
     "prepack": "npm run build"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.12.1",
-    "@openai/codex": "^0.144.2",
+    "@openai/codex": "0.145.0",
     "express": "^5.1.0",
     "ws": "^8.18.3",
+    "winston": "^3.19.0",
     "zod": "^3.25.0"
   },
   "devDependencies": {