@co0ontty/wand 4.72.2 → 4.75.0-beta.g1d477a2

package/dist/server-task-routes.js

@@ -10,9 +10,9 @@ import { resolveSystemAiContext } from "./session-ai-context.js";
 import { DEFAULT_WAND_TASK_AGENT_KIND, DEFAULT_WAND_TASK_AGENT_MODE, DEFAULT_WAND_TASK_PRIORITY, isWandTaskAgentKind, isWandTaskAgentMode, normalizeWandTaskAgentMode, WAND_MILESTONE_NAME_MAX_LENGTH } from "./task-types.js";
 import { archiveBoardTask, ensureWorkspaceTaskForBoardTask, isAutoNameableBoardTask, moveSessionToWorkspaceTask, syncClosedBoardTask, syncUngroupedSessionsToBoard, syncWorkspaceTaskToBoard, taskAutoNameSignature, taskAutoNameSourceText } from "./wand-task-sync.js";
 import { isSessionProvider, providerCliCommand } from "./session-provider.js";
+import { isThinkingEffort } from "./structured-provider-common.js";
 const STATUSES = new Set(["todo", "doing", "done", "archived"]);
 const PRIORITIES = new Set(["none", "low", "medium", "high", "urgent"]);
-const AGENT_EFFORTS = new Set(["off", "standard", "deep", "max"]);
 const TASK_BOARD_LAST_AGENT_KEY = "pref:taskBoardLastAgent";
 function defaultTaskBoardAgent() {
     return { provider: "claude", model: "default", thinkingEffort: "off", mode: DEFAULT_WAND_TASK_AGENT_MODE, kind: DEFAULT_WAND_TASK_AGENT_KIND };
@@ -53,6 +53,37 @@ function labelsFrom(value) {
         return [];
     return value.filter((item) => typeof item === "string").map((item) => item.trim()).filter(Boolean).slice(0, 20);
 }
+/** 新认领只能挂到同项目且正在处理的任务；历史归属在父任务完成后仍保留。 */
+function parentTaskIdFrom(storage, value, workspaceId, childId = null, existingParentId = null) {
+    if (value === null || value === "")
+        return null;
+    if (typeof value !== "string" || !value.trim())
+        throw new Error("父任务无效。");
+    const parentId = value.trim();
+    const parent = storage.getWandTask(parentId);
+    if (!parent)
+        throw new Error("父任务不存在。");
+    if (parent.workspaceId !== workspaceId)
+        throw new Error("父任务必须与子任务属于同一项目目录。");
+    if (parent.status !== "doing" && parentId !== existingParentId) {
+        throw new Error("只能认领到正在处理的父任务。");
+    }
+    // 不允许自己做父任务，也不允许把祖先接到后代下。
+    const visited = new Set();
+    let ancestorId = parentId;
+    while (ancestorId) {
+        if (ancestorId === childId || visited.has(ancestorId))
+            throw new Error("父任务不能形成循环。");
+        visited.add(ancestorId);
+        ancestorId = storage.getWandTask(ancestorId)?.parentTaskId ?? null;
+    }
+    return parentId;
+}
+function assertTaskWorkspaceMove(storage, taskId, workspaceId) {
+    if (storage.listWandTasks().some((task) => task.parentTaskId === taskId && task.workspaceId !== workspaceId)) {
+        throw new Error("请先将子任务解除归属，再移动父任务的项目目录。");
+    }
+}
 /** 里程碑名：必填、去首尾空白、限长。 */
 function milestoneNameFrom(value) {
     const name = text(value).slice(0, WAND_MILESTONE_NAME_MAX_LENGTH);
@@ -99,8 +130,8 @@ export function parseTaskAgent(value, fallbackMode = DEFAULT_WAND_TASK_AGENT_MOD
     const model = text(body.model) || "default";
     if (model.length > 128)
         throw new Error("模型名称过长。");
-    const thinkingEffort = (text(body.thinkingEffort) || "off");
-    if (!AGENT_EFFORTS.has(thinkingEffort))
+    const thinkingEffort = text(body.thinkingEffort) || "off";
+    if (!isThinkingEffort(thinkingEffort))
         throw new Error("思考深度无效。");
     const rawMode = body.mode === undefined || body.mode === null || body.mode === "" ? fallbackMode : body.mode;
     if (!isWandTaskAgentMode(rawMode))
@@ -350,9 +381,13 @@ export function registerTaskRoutes(app, deps) {
     app.post("/api/wand-tasks", (req, res) => {
         try {
             const body = bodyObject(req.body);
-            const workspaceId = body.workspaceId === null ? null : text(body.workspaceId) || null;
+            const requestedParent = body.parentTaskId == null ? null : storage.getWandTask(text(body.parentTaskId));
+            const workspaceId = body.workspaceId === undefined && requestedParent
+                ? requestedParent.workspaceId
+                : body.workspaceId === null ? null : text(body.workspaceId) || null;
             if (workspaceId && !storage.getWorkspace(workspaceId))
                 throw new Error("项目不存在。");
+            const parentTaskId = parentTaskIdFrom(storage, body.parentTaskId ?? null, workspaceId);
             const description = text(body.description);
             // 标题是可选字段：用户不写就先用描述首行占位，再由模型在后台覆盖。
             const providedTitle = text(body.title);
@@ -374,6 +409,7 @@ export function registerTaskRoutes(app, deps) {
             const task = storage.transaction(() => {
                 const card = storage.createWandTask({
                     workspaceId,
+                    parentTaskId,
                     title,
                     titleSource,
                     description,
@@ -403,6 +439,11 @@ export function registerTaskRoutes(app, deps) {
     app.patch("/api/wand-tasks/:id", (req, res) => {
         try {
             const body = bodyObject(req.body);
+            const currentTask = storage.getWandTask(req.params.id);
+            if (!currentTask) {
+                res.status(404).json({ error: "未找到该任务。" });
+                return;
+            }
             const patch = {};
             if (body.title !== undefined) {
                 // 显式改标题（包括原生端的可编辑标题框）都算用户自己写的。
@@ -444,10 +485,15 @@ export function registerTaskRoutes(app, deps) {
                 patch.milestoneId = scopedMilestoneId(storage, milestoneId, patch.workspaceId)
                     ?? defaultMilestoneIdForWrite(storage);
             }
+            if (body.parentTaskId !== undefined || body.workspaceId !== undefined) {
+                const workspaceId = patch.workspaceId === undefined ? currentTask.workspaceId : patch.workspaceId;
+                patch.parentTaskId = parentTaskIdFrom(storage, body.parentTaskId === undefined ? currentTask.parentTaskId : body.parentTaskId, workspaceId, currentTask.id, currentTask.parentTaskId);
+                if (workspaceId !== currentTask.workspaceId)
+                    assertTaskWorkspaceMove(storage, currentTask.id, workspaceId);
+            }
             if (body.agent !== undefined) {
                 // 老客户端不传 mode / kind：沿用任务当前值，而不是复位成标准 / 结构化。
-                const current = storage.getWandTask(req.params.id);
-                patch.agent = parseTaskAgent(body.agent, current?.agent?.mode, current?.agent?.kind);
+                patch.agent = parseTaskAgent(body.agent, currentTask.agent?.mode, currentTask.agent?.kind);
                 if (patch.agent)
                     writeTaskBoardLastAgent(storage, patch.agent);
             }
@@ -537,6 +583,9 @@ export function registerTaskRoutes(app, deps) {
                 const workspaceId = body.workspaceId === null ? null : text(body.workspaceId) || null;
                 if (workspaceId && !storage.getWorkspace(workspaceId))
                     throw new Error("项目不存在。");
+                parentTaskIdFrom(storage, task.parentTaskId, workspaceId, task.id, task.parentTaskId);
+                if (workspaceId !== task.workspaceId)
+                    assertTaskWorkspaceMove(storage, task.id, workspaceId);
                 task = storage.updateWandTask(task.id, { workspaceId }) ?? task;
             }
             const workspace = task.workspaceId ? storage.getWorkspace(task.workspaceId) : null;

package/dist/server-update-routes.d.ts

@@ -34,6 +34,8 @@ export interface PublicUpdateRoutesDependencies {
     computeAssetSha256(asset: DownloadAsset): Promise<string | null>;
     resolveLatestDmg(): Promise<ResolvedUpdateAsset | null>;
     resolveMacosDownload(): Promise<DownloadAsset | null>;
+    resolveLatestMacosBeta(): Promise<ResolvedUpdateAsset | null>;
+    resolveMacosBetaDownload(fileName: string): Promise<DownloadAsset | null>;
     resolveLatestIpa(): Promise<ResolvedUpdateAsset | null>;
     resolveIosDownload(): Promise<DownloadAsset | null>;
 }

package/dist/server-update-routes.js

@@ -137,6 +137,50 @@ export function registerPublicUpdateRoutes(app, deps) {
             readErrorMessage: "读取 APK 文件失败。",
         });
     }));
+    // 原生 macOS Beta 只使用当前连接服务端的本地分发文件；旧 DMG 接口保持兼容。
+    app.get("/api/macos-app-update", asyncRoute(async (req, res) => {
+        const currentVersion = requireCurrentVersion(req, res);
+        if (currentVersion === null)
+            return;
+        const latest = await deps.resolveLatestMacosBeta();
+        if (!latest) {
+            res.json({ updateAvailable: false, currentVersion, latestVersion: null, downloadUrl: null, source: null, channel: "beta" });
+            return;
+        }
+        const updateAvailable = compareWandInstallOrder(latest.version, currentVersion) > 0;
+        res.json({
+            updateAvailable,
+            currentVersion,
+            latestVersion: latest.version,
+            downloadUrl: updateAvailable ? latest.downloadUrl : null,
+            fileName: updateAvailable ? latest.fileName : null,
+            size: updateAvailable ? latest.size : null,
+            source: "local",
+            channel: "beta",
+            sha256: updateAvailable ? latest.sha256 : null,
+        });
+    }));
+    app.get("/macos/update-download", asyncRoute(async (req, res) => {
+        const fileName = text(req.query.fileName);
+        const asset = await deps.resolveMacosBetaDownload(fileName);
+        if (!asset) {
+            res.status(404).json({ error: "当前没有可下载的 macOS Beta 更新包。" });
+            return;
+        }
+        const sha256 = await deps.computeAssetSha256(asset);
+        if (!sha256) {
+            res.status(503).json({ error: "无法校验 macOS Beta 更新包。" });
+            return;
+        }
+        streamFileWithRange(req, res, {
+            filePath: asset.filePath,
+            size: asset.size,
+            contentType: asset.fileName.toLowerCase().endsWith(".zip") ? "application/zip" : "application/x-apple-diskimage",
+            disposition: `attachment; filename="${encodeURIComponent(asset.fileName)}"`,
+            headers: { "X-MacOS-Sha256": sha256 },
+            readErrorMessage: "读取 macOS Beta 更新包失败。",
+        });
+    }));
     app.get("/api/macos-dmg-update", asyncRoute(async (req, res) => {
         const currentVersion = requireCurrentVersion(req, res);
         if (currentVersion === null)

package/dist/server.js

@@ -17,7 +17,7 @@ import { ModelCatalogService } from "./models.js";
 import { ProcessManager } from "./process-manager.js";
 import { SessionLogger } from "./session-logger.js";
 import { SessionRegistry } from "./session-registry.js";
-import { resolveSessionAiContext, resolveSystemAiContext } from "./session-ai-context.js";
+import { resolveSystemAiContext } from "./session-ai-context.js";
 import { StructuredSessionManager } from "./structured-session-manager.js";
 import { recordRecentPath, registerFileRoutes } from "./server-file-routes.js";
 import { registerLocalPreviewRoutes } from "./server-local-preview-routes.js";
@@ -55,7 +55,9 @@ import { isLogBusActive, wandTuiLog } from "./tui/log-bus.js";
 import { EMBEDDED_WEB_ASSETS } from "./web-ui/embedded-assets.js";
 import { renderApp } from "./web-ui/index.js";
 import { WsBroadcastManager } from "./ws-broadcast.js";
-import { createTerminalHost, TerminalDaemonClient } from "./terminal-daemon-client.js";
+import { TerminalDaemonClient } from "./terminal-daemon-client.js";
+import { createUpgradeAwareTerminalHost } from "./render-host.js";
+import { createUpgradeAwareStructuredHost } from "./render-structured-host.js";
 import { checkRateLimit, recordFailedLogin, resetRateLimit } from "./middleware/rate-limit.js";
 import { updateProviderClis, verifyProviderCliUpdateResults, } from "./provider-cli-updater.js";
 const SERVER_MODULE_DIR = path.dirname(new URL(import.meta.url).pathname);
@@ -78,7 +80,8 @@ const AVATAR_CONTENT_TYPES = {
 };
 // ── Update check cache ──
 const CACHE_TTL_MS = 10 * 60 * 1000; // 10 minutes
-const MODEL_CATALOG_AUTO_REFRESH_INTERVAL_MS = 30 * 60 * 1000;
+/** CLI 模型目录和思考档位的探测间隔。页面另有更密的快照拉取。 */
+const MODEL_CATALOG_AUTO_REFRESH_INTERVAL_MS = 10 * 60 * 1000;
 /** Cached update result broadcast to new clients on connect. */
 let cachedUpdateInfo = null;
 const packageUpdateCache = new Map();
@@ -317,13 +320,27 @@ export async function startServer(config, configPath, options = {}) {
         config,
         repositoryUrl: PKG_REPO_URL,
     });
-    const terminalHost = options.terminalHost ?? await createTerminalHost(configPath);
+    const knownPtySessionIds = storage.loadSessions()
+        .filter((session) => (session.sessionKind ?? "pty") === "pty" && session.status === "running")
+        .map((session) => session.id);
+    // PTY 所有者可以是 legacy terminald 或常驻的 Rust Render：升级期由复合 host 按所有权
+    // 路由（旧会话留在 legacy，新会话进 Render），对客户端契约没有任何改变。
+    const ptyHosts = options.terminalHost
+        ? { host: options.terminalHost, renderHost: null, legacyHost: null }
+        : await createUpgradeAwareTerminalHost(configPath, {
+            engine: config.render?.engine,
+            binaryPath: config.render?.binaryPath,
+            knownSessionIds: knownPtySessionIds,
+        });
+    const terminalHost = ptyHosts.host;
     const processes = new ProcessManager(config, storage, configDir, terminalHost);
     const structuredLogger = new SessionLogger(configDir, config.shortcutLogMaxBytes);
-    // Production startup requires the daemon-backed host so CLI runs outlive web
-    // restarts. In-process hosts are retained only for explicit test injection.
-    const structuredExecHost = terminalHost instanceof TerminalDaemonClient ? terminalHost : undefined;
-    const structuredSessions = new StructuredSessionManager(storage, config, structuredLogger, undefined, {}, structuredExecHost);
+    // Production startup provides a daemon-backed host for structured CLI runs
+    // even when Render owns every PTY. In-process hosts are for test injection.
+    const legacyStructuredHost = ptyHosts.legacyHost
+        ?? (terminalHost instanceof TerminalDaemonClient ? terminalHost : null);
+    const structuredHosts = await createUpgradeAwareStructuredHost(configPath, legacyStructuredHost, config.structured?.processHost);
+    const structuredSessions = new StructuredSessionManager(storage, config, structuredLogger, undefined, {}, structuredHosts.host);
     const sessionRegistry = new SessionRegistry(processes, structuredSessions, storage);
     const missions = new Missions(storage, structuredSessions, sessionRegistry);
     const updateState = new ServerUpdateState();
@@ -679,8 +696,7 @@ export async function startServer(config, configPath, options = {}) {
                 selectedModel: null,
                 thinkingEffort: config.defaultThinkingEffort,
             };
-            const cli = resolveSessionAiContext(defaultSession, config);
-            ai = config.systemAi?.enabled ? { ...cli, systemAi: config.systemAi } : cli;
+            ai = resolveSystemAiContext(defaultSession, config);
         }
         try {
             const optimized = await optimizePrompt(text, config.language ?? "", cwd, ai);
@@ -809,9 +825,7 @@ export async function startServer(config, configPath, options = {}) {
     wsManager.setup({
         getSession: (id) => sessionRegistry.get(id),
         getTerminalState: (id) => processes.getTerminalState(id),
-        sendPtyInput: (id, input, shortcutKey, userInput) => {
-            processes.sendInput(id, input, "terminal", shortcutKey, userInput);
-        },
+        sendPtyInput: (id, input, shortcutKey, userInput) => processes.sendInputConfirmed(id, input, "terminal", shortcutKey, userInput).then(() => { }),
         resizePty: (id, cols, rows) => {
             processes.resize(id, cols, rows);
         },
@@ -886,6 +900,10 @@ export async function startServer(config, configPath, options = {}) {
                 structuredSessions.dispose();
             }
             catch { /* noop */ }
+            try {
+                structuredHosts.rustClient?.disconnect();
+            }
+            catch { /* noop */ }
             try {
                 structuredLogger.dispose();
             }
@@ -948,6 +966,14 @@ export async function startServer(config, configPath, options = {}) {
     }
     // Model discovery runs exclusively in the server. Its first result is
     // persisted; later checks only write when catalog content changes.
+    // 变化后通知已连接的页面，下拉不用等用户点「刷新模型列表」。
+    modelCatalog.onChanged((result) => {
+        wsManager.emitEvent({
+            type: "notification",
+            sessionId: "__system__",
+            data: { kind: "models", revision: result.revision, refreshedAt: result.refreshedAt },
+        });
+    });
     let modelCatalogRefreshTimer = null;
     if (!testMode) {
         void modelCatalog.refresh().catch(() => { });
@@ -1151,6 +1177,10 @@ export async function startServer(config, configPath, options = {}) {
                 structuredSessions.dispose();
             }
             catch { /* best-effort shutdown */ }
+            try {
+                structuredHosts.rustClient?.disconnect();
+            }
+            catch { /* best-effort shutdown */ }
             try {
                 structuredLogger.dispose();
             }

package/dist/session-ai-context.d.ts

@@ -16,6 +16,6 @@ export declare function resolveSessionProvider(snapshot: Pick<SessionSnapshot, "
 /** Build the provider-specific settings used by session-adjacent AI actions. */
 export declare function resolveSessionAiContext(snapshot: Pick<SessionSnapshot, "provider" | "structuredState" | "runner" | "command" | "selectedModel" | "thinkingEffort">, config: Pick<WandConfig, "defaultModel" | "defaultCodexModel" | "defaultOpenCodeModel" | "defaultGrokModel" | "defaultQoderModel" | "defaultPiModel" | "defaultThinkingEffort" | "inheritEnv">): SessionAiContext;
 /** Build the source order for Wand-owned AI features such as titles. */
-export declare function resolveSystemAiContext(snapshot: Parameters<typeof resolveSessionAiContext>[0], config: Parameters<typeof resolveSessionAiContext>[1] & Pick<WandConfig, "systemAi">): SessionAiContext;
+export declare function resolveSystemAiContext(snapshot: Parameters<typeof resolveSessionAiContext>[0], config: Parameters<typeof resolveSessionAiContext>[1] & Pick<WandConfig, "systemAi" | "systemAiCli" | "systemAiModel">): SessionAiContext;
 /** Build the AI context for quick-commit actions from their global preferences. */
 export declare function resolveCommitAiContext(snapshot: Pick<SessionSnapshot, "provider" | "structuredState" | "runner" | "command" | "selectedModel" | "thinkingEffort">, config: Pick<WandConfig, "defaultModel" | "defaultCodexModel" | "defaultOpenCodeModel" | "defaultGrokModel" | "defaultQoderModel" | "defaultPiModel" | "defaultThinkingEffort" | "inheritEnv" | "commitAiSource" | "systemAi">, discoverApis?: typeof discoverCliSystemAiConfigs): SessionAiContext;

package/dist/session-ai-context.js

@@ -39,10 +39,21 @@ export function resolveSessionAiContext(snapshot, config) {
 /** Build the source order for Wand-owned AI features such as titles. */
 export function resolveSystemAiContext(snapshot, config) {
     const sessionContext = resolveSessionAiContext(snapshot, config);
-    const directApi = config.systemAi ? usableSystemAi(config.systemAi) : undefined;
-    return directApi && config.systemAi?.enabled
-        ? { ...sessionContext, systemAi: directApi }
-        : sessionContext;
+    if (config.systemAi?.enabled) {
+        const directApi = usableSystemAi(config.systemAi);
+        return directApi ? { ...sessionContext, systemAi: directApi } : sessionContext;
+    }
+    // Older installations without a system AI CLI preference still follow the
+    // current session. A chosen CLI must never inherit another provider's model.
+    if (!isSessionProvider(config.systemAiCli))
+        return sessionContext;
+    return {
+        ...sessionContext,
+        provider: config.systemAiCli,
+        model: normalizeModel(config.systemAiModel)
+            ?? normalizeModel(getDefaultModelForProvider(config, config.systemAiCli)),
+        thinkingEffort: config.defaultThinkingEffort,
+    };
 }
 /** Build the AI context for quick-commit actions from their global preferences. */
 export function resolveCommitAiContext(snapshot, config, discoverApis = discoverCliSystemAiConfigs) {

package/dist/session-logger.d.ts

@@ -70,6 +70,8 @@ export declare class SessionLogger {
     appendPtyOutput(sessionId: string, chunk: string): void;
     /** Read the full PTY transcript including rotated logs, oldest first. */
     readPtyOutput(sessionId: string): string | null;
+    /** Only read the tail needed by the transport, including rotated files. */
+    readPtyOutputTail(sessionId: string, maxBytes?: number): string | null;
     /** Append a native mode NDJSON event */
     appendStreamEvent(sessionId: string, event: unknown): void;
     /** Append raw stdout chunk from a structured-mode child process. */

package/dist/session-logger.js

@@ -1,4 +1,4 @@
-import { mkdirSync, rmSync, appendFileSync, writeFileSync, readFileSync, existsSync, statSync, renameSync, unlinkSync } from "node:fs";
+import { mkdirSync, rmSync, appendFileSync, writeFileSync, readFileSync, existsSync, statSync, renameSync, unlinkSync, openSync, readSync, closeSync } from "node:fs";
 import path from "node:path";
 import process from "node:process";
 // ── Constants ──
@@ -148,6 +148,49 @@ export class SessionLogger {
             return null;
         }
     }
+    /** Only read the tail needed by the transport, including rotated files. */
+    readPtyOutputTail(sessionId, maxBytes = 256 * 1024) {
+        try {
+            this.flushSession(sessionId);
+            const dir = this.ensureDir(sessionId);
+            const parts = [];
+            let remaining = Math.max(1, Math.min(maxBytes, 1024 * 1024));
+            for (let index = 0; index <= this.ptyLogMaxRotations && remaining > 0; index++) {
+                const file = path.join(dir, index ? `pty-output.log.${index}` : "pty-output.log");
+                const size = tryStatSize(file);
+                if (!size)
+                    continue;
+                const length = Math.min(remaining, size);
+                const buffer = Buffer.allocUnsafe(length);
+                const fd = openSync(file, "r");
+                try {
+                    let read = 0;
+                    while (read < length) {
+                        const count = readSync(fd, buffer, read, length - read, size - length + read);
+                        if (!count)
+                            break;
+                        read += count;
+                    }
+                    parts.unshift(buffer.subarray(0, read));
+                    remaining -= read;
+                }
+                finally {
+                    closeSync(fd);
+                }
+            }
+            if (!parts.length)
+                return null;
+            const tail = Buffer.concat(parts);
+            // A byte-range may begin inside a multibyte scalar; don't inject U+FFFD.
+            let start = 0;
+            while (start < tail.length && (tail[start] & 0xc0) === 0x80)
+                start++;
+            return tail.subarray(start).toString("utf8");
+        }
+        catch {
+            return null;
+        }
+    }
     /** Append a native mode NDJSON event */
     appendStreamEvent(sessionId, event) {
         if (this.disposed)

package/dist/session-transport.js

@@ -87,7 +87,7 @@ export function toSessionDetailDTO(snapshot, options = {}) {
         outputOffset,
         outputTotal: rawOutput.length,
         outputTruncated: outputOffset > 0,
-        ...(options.messages !== undefined ? { messages: enrichStructuredMessages(options.messages) } : {}),
+        ...(options.messages !== undefined ? { messages: enrichStructuredMessages(options.messages, snapshot.id) } : {}),
         ...(options.messageOffset !== undefined ? { messageOffset: options.messageOffset } : {}),
         ...(options.messageTotal !== undefined ? { messageTotal: options.messageTotal } : {}),
         ...(options.leadingBlockOffset !== undefined ? { leadingBlockOffset: options.leadingBlockOffset } : {}),

package/dist/storage.d.ts

@@ -125,6 +125,7 @@ export declare class WandStorage {
     createWandTask(input: {
         workspaceId?: string | null;
         workspaceTaskId?: string | null;
+        parentTaskId?: string | null;
         title: string;
         titleSource?: import("./task-types.js").WandTaskTitleSource;
         description?: string;
@@ -135,7 +136,7 @@ export declare class WandStorage {
         milestoneId?: string | null;
         agent?: import("./task-types.js").WandTaskAgent | null;
     }): import("./task-types.js").WandTask;
-    updateWandTask(id: string, patch: Partial<Pick<import("./task-types.js").WandTask, "workspaceId" | "workspaceTaskId" | "title" | "titleSource" | "autoTitleSignature" | "description" | "status" | "priority" | "labels" | "dueDate" | "milestoneId" | "sortOrder" | "agent">>): import("./task-types.js").WandTask | null;
+    updateWandTask(id: string, patch: Partial<Pick<import("./task-types.js").WandTask, "workspaceId" | "workspaceTaskId" | "parentTaskId" | "title" | "titleSource" | "autoTitleSignature" | "description" | "status" | "priority" | "labels" | "dueDate" | "milestoneId" | "sortOrder" | "agent">>): import("./task-types.js").WandTask | null;
     deleteWandTask(id: string): void;
     /**
      * 里程碑列表。传工作区 id 时返回「该工作区 + 全局（workspace_id IS NULL）」；

package/dist/storage.js

@@ -755,6 +755,7 @@ const INIT_SQL = `
     sort_order INTEGER NOT NULL DEFAULT 0,
     agent_json TEXT,
     workspace_task_id TEXT,
+    parent_task_id TEXT,
     title_source TEXT,
     auto_title_signature TEXT,
     created_at TEXT NOT NULL,
@@ -784,6 +785,9 @@ function ensureWandTaskSchema(db) {
         db.exec("ALTER TABLE wand_tasks ADD COLUMN agent_json TEXT");
     if (columns.length > 0 && !names.has("workspace_task_id"))
         db.exec("ALTER TABLE wand_tasks ADD COLUMN workspace_task_id TEXT");
+    // 父任务归属只加列；历史任务仍然是顶层任务。
+    if (columns.length > 0 && !names.has("parent_task_id"))
+        db.exec("ALTER TABLE wand_tasks ADD COLUMN parent_task_id TEXT");
     // 标题来源：'user' = 用户手写，'auto' = 由描述/会话内容自动生成。只加列，历史行保持 NULL（读取时视为 user）。
     if (columns.length > 0 && !names.has("title_source"))
         db.exec("ALTER TABLE wand_tasks ADD COLUMN title_source TEXT");
@@ -798,6 +802,7 @@ function ensureWandTaskSchema(db) {
         // INIT_SQL cannot create it: CREATE TABLE IF NOT EXISTS is a no-op on old
         // wand_tasks, and CREATE INDEX would then fail with "no such column".
         db.exec("CREATE INDEX IF NOT EXISTS idx_wand_tasks_workspace_task ON wand_tasks(workspace_task_id)");
+        db.exec("CREATE INDEX IF NOT EXISTS idx_wand_tasks_parent ON wand_tasks(parent_task_id)");
         const rows = db.prepare("SELECT id FROM wand_tasks WHERE identifier IS NULL OR identifier = '' ORDER BY created_at, id").all();
         const update = db.prepare("UPDATE wand_tasks SET identifier = ? WHERE id = ?");
         rows.forEach((row, index) => update.run(`TASK-${index + 1}`, row.id));
@@ -1296,7 +1301,7 @@ export class WandStorage {
     }
     /** GET /api/wand-tasks 的顺序：新创建在前。客户端按此顺序渲染，不再本地排序。 */
     listWandTasks(workspaceId) {
-        const rows = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at
+        const rows = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, parent_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at
        FROM wand_tasks ${workspaceId === undefined ? "" : "WHERE workspace_id IS ?"}
        ORDER BY created_at DESC, rowid DESC`).all(...(workspaceId === undefined ? [] : [workspaceId]));
         return rows.map((row) => this.mapWandTaskRow(row));
@@ -1307,6 +1312,7 @@ export class WandStorage {
             identifier: typeof row.identifier === "string" && row.identifier ? row.identifier : `TASK-${String(row.id).slice(0, 6)}`,
             workspaceId: typeof row.workspace_id === "string" ? row.workspace_id : null,
             workspaceTaskId: typeof row.workspace_task_id === "string" && row.workspace_task_id ? row.workspace_task_id : null,
+            parentTaskId: typeof row.parent_task_id === "string" && row.parent_task_id ? row.parent_task_id : null,
             title: String(row.title),
             titleSource: row.title_source === "auto" ? "auto" : "user",
             autoTitleSignature: typeof row.auto_title_signature === "string" && row.auto_title_signature ? row.auto_title_signature : null,
@@ -1326,7 +1332,7 @@ export class WandStorage {
         return this.listWandTasks().find((task) => task.id === id) ?? null;
     }
     getWandTaskByWorkspaceTaskId(workspaceTaskId) {
-        const row = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at
+        const row = this.db.prepare(`SELECT id, identifier, workspace_id, workspace_task_id, parent_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at
        FROM wand_tasks WHERE workspace_task_id = ? ORDER BY updated_at DESC LIMIT 1`).get(workspaceTaskId);
         return row ? this.mapWandTaskRow(row) : null;
     }
@@ -1338,7 +1344,7 @@ export class WandStorage {
         const max = this.db.prepare("SELECT COALESCE(MAX(sort_order), -1) AS value FROM wand_tasks WHERE workspace_id IS ? AND status = ?").get(input.workspaceId ?? null, status);
         const numberRow = this.db.prepare("SELECT COALESCE(MAX(CAST(substr(identifier, 6) AS INTEGER)), 0) AS value FROM wand_tasks WHERE identifier GLOB 'TASK-[0-9]*'").get();
         const identifier = `TASK-${(numberRow?.value ?? 0) + 1}`;
-        this.db.prepare(`INSERT INTO wand_tasks (id, identifier, workspace_id, workspace_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, identifier, input.workspaceId ?? null, input.workspaceTaskId ?? null, input.title, input.titleSource ?? "user", null, input.description ?? "", status, priority, JSON.stringify(input.labels ?? []), input.dueDate ?? null, input.milestoneId ?? null, (max?.value ?? -1) + 1, input.agent ? JSON.stringify(input.agent) : null, now, now);
+        this.db.prepare(`INSERT INTO wand_tasks (id, identifier, workspace_id, workspace_task_id, parent_task_id, title, title_source, auto_title_signature, description, status, priority, labels_json, due_date, milestone_id, sort_order, agent_json, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, identifier, input.workspaceId ?? null, input.workspaceTaskId ?? null, input.parentTaskId ?? null, input.title, input.titleSource ?? "user", null, input.description ?? "", status, priority, JSON.stringify(input.labels ?? []), input.dueDate ?? null, input.milestoneId ?? null, (max?.value ?? -1) + 1, input.agent ? JSON.stringify(input.agent) : null, now, now);
         return this.getWandTask(id);
     }
     updateWandTask(id, patch) {
@@ -1346,7 +1352,7 @@ export class WandStorage {
         if (!current)
             return null;
         const next = { ...current, ...patch, updatedAt: nowIso() };
-        this.db.prepare(`UPDATE wand_tasks SET workspace_id = ?, workspace_task_id = ?, title = ?, title_source = ?, auto_title_signature = ?, description = ?, status = ?, priority = ?, labels_json = ?, due_date = ?, milestone_id = ?, sort_order = ?, agent_json = ?, updated_at = ? WHERE id = ?`).run(next.workspaceId, next.workspaceTaskId, next.title, next.titleSource, next.autoTitleSignature ?? null, next.description, next.status, next.priority, JSON.stringify(next.labels), next.dueDate, next.milestoneId ?? null, next.sortOrder, next.agent ? JSON.stringify(next.agent) : null, next.updatedAt, id);
+        this.db.prepare(`UPDATE wand_tasks SET workspace_id = ?, workspace_task_id = ?, parent_task_id = ?, title = ?, title_source = ?, auto_title_signature = ?, description = ?, status = ?, priority = ?, labels_json = ?, due_date = ?, milestone_id = ?, sort_order = ?, agent_json = ?, updated_at = ? WHERE id = ?`).run(next.workspaceId, next.workspaceTaskId, next.parentTaskId, next.title, next.titleSource, next.autoTitleSignature ?? null, next.description, next.status, next.priority, JSON.stringify(next.labels), next.dueDate, next.milestoneId ?? null, next.sortOrder, next.agent ? JSON.stringify(next.agent) : null, next.updatedAt, id);
         if (next.workspaceTaskId) {
             const workspaceId = next.workspaceId ?? this.ensureGlobalWorkspace().id;
             this.db.prepare(`UPDATE workspace_tasks SET name = ?, status = ?, milestone_id = ?, workspace_id = ? WHERE id = ?`)
@@ -1356,7 +1362,10 @@ export class WandStorage {
         }
         return next;
     }
-    deleteWandTask(id) { this.db.prepare("DELETE FROM wand_tasks WHERE id = ?").run(id); }
+    deleteWandTask(id) {
+        this.db.prepare("UPDATE wand_tasks SET parent_task_id = NULL WHERE parent_task_id = ?").run(id);
+        this.db.prepare("DELETE FROM wand_tasks WHERE id = ?").run(id);
+    }
     // ── 里程碑（迭代，归属工作区；任务只存 milestoneId）──
     /**
      * 里程碑列表。传工作区 id 时返回「该工作区 + 全局（workspace_id IS NULL）」；

package/dist/structured-client-protocol.d.ts

@@ -3,5 +3,7 @@ export declare const WAND_PROTOCOL_VERSION = 2;
 /**
  * Add Wand-owned semantics without mutating persisted provider blocks.
  * This is the external interface consumed by every client.
+ *
+ * 传 sessionId 时额外把内联图片改写成取图 URL（见 rewriteInlineToolImageUrls）。
  */
-export declare function enrichStructuredMessages(messages: ConversationTurn[]): ConversationTurn[];
+export declare function enrichStructuredMessages(messages: ConversationTurn[], sessionId?: string): ConversationTurn[];