@xiaohhhh1/canvas-agent 0.4.13 → 0.4.15

package/README.md

@@ -1,6 +1,6 @@
 # Infinite Canvas Agent
 
-本地 Canvas Agent 用来连接网站和用户自己电脑上的 Codex。它还负责持久化 Flow C 脚本队列、分段调用本机 Codex、自动回传草案，以及在网页关闭后继续把完成视频校验并保存到用户选择的磁盘目录。
+本地 Canvas Agent 用来连接网站和用户自己电脑上的 Codex。它还负责持久化 Flow C 脚本队列、分段调用本机 Codex、自动回传草案，以及在用户明确点击“一键下载本批全部”后把完成视频校验并保存到所选磁盘目录。
 
 ## 启动
 
@@ -87,7 +87,7 @@ npx -y @xiaohhhh1/canvas-agent mcp
 1. 客户在网站添加一个或多个产品，按顺序上传每个产品 1–5 张图片并填写数量。
 2. 点击“交给本机 Codex 写全部脚本”。本机助手每次只处理 10 条并持久化进度，断网或重启后可继续；脚本完成会自动回传网站，不创建付费任务。
 3. 客户审阅脚本并确认费用后，中心 `workflow-runner` 才执行故事板和视频生成。
-4. 客户只需首次选择一个本机目录。Agent 每 10 秒检查交付，先写 `.part`，校验大小与 SHA-256 后原子改名；清单已记录的批次序号不会重复下载，网页关闭后仍会继续。
+4. 客户先选择一个本机目录，再对需要的批次点击“一键下载本批全部”。登录另一台电脑、选择文件夹或查看历史批次都不会触发下载。Agent 以最多四路并行写 `.part`，校验大小与 SHA-256 后原子改名；清单已记录且校验有效的批次序号不会重复下载。
 
 本机持久状态默认保存在 `~/.infinite-canvas/workflow-state.json`，权限设为仅当前用户可读写。这里包含短期能力令牌和本机路径，不应上传、提交到 Git 或发到聊天中。
 

package/dist/server/http.js

@@ -117,6 +117,7 @@ export function startHttpServer() {
     app.get("/agent/workflow/downloads", (_req, res) => res.json({ ok: true, ...workflows.downloadState() }));
     app.post("/agent/workflow/downloads/select-directory", (_req, res) => res.json({ ok: true, selection: workflows.startDownloadDirectorySelection() }));
     app.get("/agent/workflow/downloads/select-directory/:selectionId", route(async (req, res) => res.json({ ok: true, selection: workflows.downloadDirectorySelection(routeParam(req.params.selectionId)), ...workflows.downloadState() })));
+    app.post("/agent/workflow/downloads/set-directory", route(async (req, res) => res.json({ ok: true, ...await workflows.setDownloadDirectory(req.body?.directory) })));
     app.post("/agent/workflow/downloads/clear-directory", (_req, res) => res.json({ ok: true, ...workflows.clearDownloadDirectory() }));
     app.post("/agent/workflow/downloads/subscriptions", route(async (req, res) => res.json({ ok: true, subscription: workflows.subscribeDownload(req.body || {}) })));
     app.post("/agent/workflow/downloads/:batchId/sync", route(async (req, res) => res.json({ ok: true, subscription: await workflows.syncDownload(routeParam(req.params.batchId)) })));

package/dist/workflow/constants.d.ts

@@ -1,4 +1,3 @@
 /** Flow C 脚本分段的唯一上限和自动降级顺序，MCP 与调度器必须共用。 */
 export declare const FLOW_C_SCRIPT_CHUNK_SIZES: readonly [30, 15, 10];
 export declare const FLOW_C_SCRIPT_CHUNK_MAX: 30;
-export declare const FLOW_C_DOWNLOAD_POLL_MS = 3000;

package/dist/workflow/constants.js

@@ -1,4 +1,3 @@
 /** Flow C 脚本分段的唯一上限和自动降级顺序，MCP 与调度器必须共用。 */
 export const FLOW_C_SCRIPT_CHUNK_SIZES = [30, 15, 10];
 export const FLOW_C_SCRIPT_CHUNK_MAX = FLOW_C_SCRIPT_CHUNK_SIZES[0];
-export const FLOW_C_DOWNLOAD_POLL_MS = 3_000;

package/dist/workflow/manager.d.ts

@@ -22,8 +22,8 @@ export declare class WorkflowManager {
     private runningScripts;
     private scriptQueueRunning;
     private syncingDownloads;
+    private pendingDownloadBatchIds;
     private directorySelection?;
-    private downloadTimer?;
     constructor(config: CanvasAgentConfig, emit: AgentEmit);
     /** 接收网站创建的短期交接能力并立即启动本机 Codex。 */
     enqueueScript(input: {
@@ -149,6 +149,19 @@ export declare class WorkflowManager {
             updatedAt: string;
         }[];
     }>;
+    setDownloadDirectory(directoryValue: unknown): Promise<{
+        configured: boolean;
+        directoryName: string | undefined;
+        subscriptions: {
+            batchId: string;
+            status: DownloadStatus;
+            downloaded: number;
+            market: string | undefined;
+            message: string | undefined;
+            expiresAt: string | undefined;
+            updatedAt: string;
+        }[];
+    }>;
     private scheduleScript;
     /** 同一台电脑串行处理脚本交接，避免多个大批次争用一个 Codex app-server。 */
     private pumpScriptQueue;

package/dist/workflow/manager.js

@@ -9,7 +9,7 @@ import { runCodexTurn, startCodexThread } from "../agent/codex.js";
 import { CONFIG_DIR, ensureSiteWorkspace } from "../config.js";
 import { logger } from "../utils/logger.js";
 import { windowsPowerShellExecutable } from "../utils/windows.js";
-import { FLOW_C_DOWNLOAD_POLL_MS, FLOW_C_SCRIPT_CHUNK_MAX, FLOW_C_SCRIPT_CHUNK_SIZES } from "./constants.js";
+import { FLOW_C_SCRIPT_CHUNK_MAX, FLOW_C_SCRIPT_CHUNK_SIZES } from "./constants.js";
 const STATE_FILE = path.join(CONFIG_DIR, "workflow-state.json");
 /** 本机持久化的 Flow C 控制器：脚本交给本机 Codex，视频直接落盘。 */
 export class WorkflowManager {
@@ -19,8 +19,8 @@ export class WorkflowManager {
     runningScripts = new Set();
     scriptQueueRunning = false;
     syncingDownloads = false;
+    pendingDownloadBatchIds = new Set();
     directorySelection;
-    downloadTimer;
     constructor(config, emit) {
         this.config = config;
         this.emit = emit;
@@ -28,9 +28,6 @@ export class WorkflowManager {
             if (record.status === "queued" || record.status === "running")
                 this.scheduleScript(record.id);
         }
-        this.downloadTimer = setInterval(() => void this.syncDownloads(), FLOW_C_DOWNLOAD_POLL_MS);
-        this.downloadTimer.unref?.();
-        void this.syncDownloads();
     }
     /** 接收网站创建的短期交接能力并立即启动本机 Codex。 */
     enqueueScript(input) {
@@ -127,6 +124,7 @@ export class WorkflowManager {
     }
     clearDownloadDirectory() {
         delete this.state.downloadDirectory;
+        this.pendingDownloadBatchIds.clear();
         this.save();
         return this.downloadState();
     }
@@ -137,15 +135,15 @@ export class WorkflowManager {
             batchId,
             apiBase: commerceApiBase(input.apiBase),
             accessToken: secret(input.accessToken, "下载能力令牌"),
-            status: previous?.status === "complete" ? "complete" : "waiting",
+            status: "waiting",
             downloadedOrdinals: previous?.downloadedOrdinals || [],
             market: previous?.market,
             expiresAt: String(input.expiresAt || previous?.expiresAt || "") || undefined,
-            message: this.state.downloadDirectory ? "等待视频完成" : "请先选择本机保存文件夹",
+            message: this.state.downloadDirectory ? "已开始手动下载本批全部成片" : "请先选择本机保存文件夹",
             updatedAt: now(),
         };
         this.save();
-        void this.syncDownloads();
+        void this.syncDownloads(batchId);
         return publicDownload(this.state.downloads[batchId]);
     }
     async syncDownload(batchIdValue) {
@@ -153,6 +151,19 @@ export class WorkflowManager {
         await this.syncDownloads(batchId);
         return batchId ? publicDownload(this.downloadRecord(batchId)) : this.downloadState();
     }
+    async setDownloadDirectory(directoryValue) {
+        const selected = String(directoryValue || "").trim();
+        if (!selected || !path.isAbsolute(selected))
+            throw new Error("请输入本机文件夹的完整路径");
+        const resolved = path.resolve(selected);
+        await mkdir(resolved, { recursive: true });
+        const info = await stat(resolved);
+        if (!info.isDirectory())
+            throw new Error("选择的路径不是文件夹");
+        this.state.downloadDirectory = resolved;
+        this.save();
+        return this.downloadState();
+    }
     scheduleScript(_id) {
         queueMicrotask(() => void this.pumpScriptQueue());
     }
@@ -182,15 +193,8 @@ export class WorkflowManager {
                 this.directorySelection = { id, status: "cancelled" };
                 return;
             }
-            const resolved = path.resolve(selected);
-            await mkdir(resolved, { recursive: true });
-            const info = await stat(resolved);
-            if (!info.isDirectory())
-                throw new Error("选择的路径不是文件夹");
-            this.state.downloadDirectory = resolved;
-            this.save();
-            this.directorySelection = { id, status: "selected", directoryName: path.basename(resolved) };
-            void this.syncDownloads();
+            const state = await this.setDownloadDirectory(selected);
+            this.directorySelection = { id, status: "selected", directoryName: state.directoryName };
         }
         catch (error) {
             this.directorySelection = { id, status: "error", error: error instanceof Error ? error.message : "无法选择本机文件夹" };
@@ -270,13 +274,24 @@ export class WorkflowManager {
         }
     }
     async syncDownloads(onlyBatchId) {
-        if (this.syncingDownloads || !this.state.downloadDirectory)
+        if (!this.state.downloadDirectory)
+            return;
+        if (onlyBatchId)
+            this.pendingDownloadBatchIds.add(onlyBatchId);
+        else
+            for (const record of Object.values(this.state.downloads))
+                this.pendingDownloadBatchIds.add(record.batchId);
+        if (this.syncingDownloads)
             return;
         this.syncingDownloads = true;
         try {
-            const records = Object.values(this.state.downloads).filter((record) => !onlyBatchId || record.batchId === onlyBatchId);
-            for (const record of records)
-                await this.syncDownloadRecord(record);
+            while (this.pendingDownloadBatchIds.size) {
+                const batchId = this.pendingDownloadBatchIds.values().next().value;
+                this.pendingDownloadBatchIds.delete(batchId);
+                const record = this.state.downloads[batchId];
+                if (record)
+                    await this.syncDownloadRecord(record);
+            }
         }
         finally {
             this.syncingDownloads = false;
@@ -286,7 +301,7 @@ export class WorkflowManager {
     async syncDownloadRecord(record) {
         if (record.expiresAt && Date.parse(record.expiresAt) <= Date.now()) {
             record.status = "expired";
-            record.message = "下载授权已过期；打开网站后会自动续期";
+            record.message = "下载授权已过期；请在网站重新点击一键下载全部";
             return;
         }
         try {
@@ -294,21 +309,30 @@ export class WorkflowManager {
             const data = await commerceJson(`${record.apiBase}/workflow-downloads/${encodeURIComponent(record.batchId)}`, record.accessToken, "x-workflow-download-token");
             const batch = data.batch;
             record.market = batch.market;
-            for (const delivery of batch.deliveries || []) {
-                await this.saveDelivery(batch, delivery);
-                if (!record.downloadedOrdinals.includes(delivery.ordinal))
-                    record.downloadedOrdinals.push(delivery.ordinal);
-            }
+            const deliveries = batch.deliveries || [];
+            let cursor = 0;
+            const workers = Array.from({ length: Math.min(4, deliveries.length) }, async () => {
+                while (cursor < deliveries.length) {
+                    const delivery = deliveries[cursor++];
+                    await this.saveDelivery(batch, delivery);
+                    if (!record.downloadedOrdinals.includes(delivery.ordinal))
+                        record.downloadedOrdinals.push(delivery.ordinal);
+                    record.message = `正在保存本批全部成片：${record.downloadedOrdinals.length}/${deliveries.length}`;
+                    record.updatedAt = now();
+                    this.save();
+                }
+            });
+            await Promise.all(workers);
             record.downloadedOrdinals.sort((a, b) => a - b);
             const finished = ["completed", "cancelled", "failed"].includes(batch.status);
             record.status = finished && record.downloadedOrdinals.length >= (batch.deliveries?.length || 0) ? "complete" : "waiting";
             record.message = batch.deliveries?.length
-                ? `已自动保存 ${record.downloadedOrdinals.length} 条视频；${finished ? "本批次已结束" : "继续等待新视频"}`
-                : finished ? "批次已结束，暂无可下载视频" : "等待视频完成";
+                ? `已保存本批 ${record.downloadedOrdinals.length} 条成片；${finished ? "本批次已结束" : "如有新成片请再次点击下载"}`
+                : finished ? "批次已结束，暂无可下载视频" : "当前暂无成片可下载";
         }
         catch (error) {
             record.status = /expired|not found/i.test(error instanceof Error ? error.message : "") ? "expired" : "error";
-            record.message = error instanceof Error ? error.message : "自动下载失败，稍后重试";
+            record.message = error instanceof Error ? error.message : "下载失败，请再次点击下载";
             logger.warn("Local Flow C download sync failed", { batchId: record.batchId, error: record.message });
         }
         finally {
@@ -500,15 +524,15 @@ async function isExistingFile(filePath, expectedBytes, expectedSha256 = "") {
 function selectNativeDirectory() {
     if (process.platform === "win32") {
         const script = "$ErrorActionPreference='Stop'; Add-Type -AssemblyName System.Windows.Forms; $d=New-Object System.Windows.Forms.FolderBrowserDialog; $d.Description='选择抖音小辉跨境工具的本机视频保存位置'; $d.ShowNewFolderButton=$true; if($d.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK){[Console]::OutputEncoding=[Text.Encoding]::UTF8; Write-Output $d.SelectedPath}";
-        return commandOutput(windowsPowerShellExecutable(), ["-NoProfile", "-STA", "-Command", script]);
+        return commandOutput(windowsPowerShellExecutable(), ["-NoProfile", "-STA", "-Command", script], { windowsHide: false });
     }
     if (process.platform === "darwin")
         return commandOutput("osascript", ["-e", "POSIX path of (choose folder with prompt \"选择视频保存位置\")"]);
     return commandOutput("zenity", ["--file-selection", "--directory", "--title=选择视频保存位置"]);
 }
-function commandOutput(command, args) {
+function commandOutput(command, args, options = {}) {
     return new Promise((resolve, reject) => {
-        const child = spawn(command, args, { windowsHide: true, stdio: ["ignore", "pipe", "pipe"] });
+        const child = spawn(command, args, { windowsHide: options.windowsHide ?? true, stdio: ["ignore", "pipe", "pipe"] });
         let stdout = "";
         let stderr = "";
         child.stdout.on("data", (chunk) => { stdout += chunk.toString(); });

package/package.json

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