@co0ontty/wand 1.26.0 → 1.29.1

package/dist/server.js

@@ -151,6 +151,63 @@ async function resolveLatestApkVersion(configDir, config) {
     }
     return null;
 }
+let cachedGitHubDmg = null;
+let gitHubDmgCacheTs = 0;
+const GITHUB_DMG_CACHE_TTL = 10 * 60 * 1000; // 10 minutes
+async function fetchGitHubLatestDmg(forceRefresh = false) {
+    const now = Date.now();
+    if (!forceRefresh && cachedGitHubDmg && (now - gitHubDmgCacheTs < GITHUB_DMG_CACHE_TTL)) {
+        return cachedGitHubDmg;
+    }
+    try {
+        const apiUrl = PKG_REPO_URL.replace("github.com", "api.github.com/repos") + "/releases/latest";
+        const resp = await fetch(apiUrl, {
+            headers: { "Accept": "application/vnd.github.v3+json", "User-Agent": "wand-server" },
+            signal: AbortSignal.timeout(10000),
+        });
+        if (!resp.ok)
+            return cachedGitHubDmg ?? null;
+        const release = await resp.json();
+        const dmgAsset = release.assets.find(a => a.name.toLowerCase().endsWith(".dmg"));
+        if (!dmgAsset)
+            return cachedGitHubDmg ?? null;
+        const version = extractMacosDmgVersion(release.tag_name) ?? release.tag_name.replace(/^v/, "");
+        cachedGitHubDmg = {
+            version,
+            downloadUrl: dmgAsset.browser_download_url,
+            fileName: dmgAsset.name,
+            size: dmgAsset.size,
+        };
+        gitHubDmgCacheTs = now;
+        return cachedGitHubDmg;
+    }
+    catch {
+        return cachedGitHubDmg ?? null;
+    }
+}
+async function resolveLatestDmgVersion(configDir, config) {
+    const localDmg = await resolveMacosDmgAsset(configDir, config);
+    if (localDmg && localDmg.version) {
+        return {
+            version: localDmg.version,
+            downloadUrl: localDmg.downloadUrl,
+            fileName: localDmg.fileName,
+            size: localDmg.size,
+            source: "local",
+        };
+    }
+    const ghDmg = await fetchGitHubLatestDmg();
+    if (ghDmg) {
+        return {
+            version: ghDmg.version,
+            downloadUrl: ghDmg.downloadUrl,
+            fileName: ghDmg.fileName,
+            size: ghDmg.size,
+            source: "github",
+        };
+    }
+    return null;
+}
 function isExternalAvatarSource(value) {
     return /^(https?:|data:)/i.test(value);
 }
@@ -354,6 +411,11 @@ function decodeConnectCode(code) {
 function normalizeMode(input, fallback) {
     return isExecutionMode(input) ? input : fallback;
 }
+/** Match a semver-looking token in a file name (with optional pre-release / build metadata). */
+function extractSemverFromName(name) {
+    const match = name.match(/(\d+\.\d+\.\d+(?:[-+][A-Za-z0-9.-]+)?)/);
+    return match ? match[1] : null;
+}
 function resolveAndroidApkDir(configDir, config) {
     const configuredDir = config.android?.apkDir?.trim();
     if (!configuredDir) {
@@ -362,9 +424,7 @@ function resolveAndroidApkDir(configDir, config) {
     return path.isAbsolute(configuredDir) ? configuredDir : path.resolve(configDir, configuredDir);
 }
 function extractAndroidApkVersion(fileName) {
-    const nameWithoutExt = fileName.replace(/\.apk$/i, "");
-    const match = nameWithoutExt.match(/(\d+\.\d+\.\d+(?:[-+][A-Za-z0-9.-]+)?)/);
-    return match ? match[1] : null;
+    return extractSemverFromName(fileName.replace(/\.apk$/i, ""));
 }
 async function resolveAndroidApkAsset(configDir, config) {
     if (config.android?.enabled !== true)
@@ -417,6 +477,67 @@ async function resolveAndroidApkAsset(configDir, config) {
         source: "local",
     };
 }
+function resolveMacosDmgDir(configDir, config) {
+    const configuredDir = config.macos?.dmgDir?.trim();
+    if (!configuredDir) {
+        return path.join(configDir, "macos");
+    }
+    return path.isAbsolute(configuredDir) ? configuredDir : path.resolve(configDir, configuredDir);
+}
+function extractMacosDmgVersion(fileName) {
+    return extractSemverFromName(fileName.replace(/\.dmg$/i, ""));
+}
+async function resolveMacosDmgAsset(configDir, config) {
+    if (config.macos?.enabled !== true)
+        return null;
+    const dmgDir = resolveMacosDmgDir(configDir, config);
+    await mkdir(dmgDir, { recursive: true });
+    const configuredFile = config.macos?.currentDmgFile?.trim();
+    if (configuredFile) {
+        const filePath = path.join(dmgDir, path.basename(configuredFile));
+        try {
+            const fileStat = await stat(filePath);
+            if (!fileStat.isFile())
+                return null;
+            return {
+                fileName: path.basename(filePath),
+                filePath,
+                size: fileStat.size,
+                updatedAt: fileStat.mtime.toISOString(),
+                version: extractMacosDmgVersion(path.basename(filePath)),
+                downloadUrl: "/macos/download",
+                source: "local",
+            };
+        }
+        catch {
+            return null;
+        }
+    }
+    const entries = await readdir(dmgDir, { withFileTypes: true });
+    const dmgFiles = entries.filter((entry) => entry.isFile() && entry.name.toLowerCase().endsWith(".dmg"));
+    if (dmgFiles.length === 0)
+        return null;
+    const candidates = await Promise.all(dmgFiles.map(async (entry) => {
+        const filePath = path.join(dmgDir, entry.name);
+        const fileStat = await stat(filePath);
+        return {
+            entry,
+            filePath,
+            fileStat,
+        };
+    }));
+    candidates.sort((a, b) => b.fileStat.mtimeMs - a.fileStat.mtimeMs);
+    const selected = candidates[0];
+    return {
+        fileName: selected.entry.name,
+        filePath: selected.filePath,
+        size: selected.fileStat.size,
+        updatedAt: selected.fileStat.mtime.toISOString(),
+        version: extractMacosDmgVersion(selected.entry.name),
+        downloadUrl: "/macos/download",
+        source: "local",
+    };
+}
 async function listPathSuggestions(input, fallbackCwd) {
     const normalizedInput = input.trim();
     const baseInput = normalizedInput || fallbackCwd;
@@ -817,6 +938,44 @@ export async function startServer(config, configPath) {
         res.setHeader("Content-Disposition", `attachment; filename="${encodeURIComponent(androidApk.fileName)}"`);
         createReadStream(androidApk.filePath).pipe(res);
     });
+    // ── macOS DMG update & download (no auth required) ──
+    app.get("/api/macos-dmg-update", async (req, res) => {
+        const currentVersion = req.query.currentVersion?.trim();
+        if (!currentVersion) {
+            res.status(400).json({ error: "Missing currentVersion query parameter." });
+            return;
+        }
+        const latest = await resolveLatestDmgVersion(configDir, config);
+        if (!latest) {
+            res.json({ updateAvailable: false, currentVersion, latestVersion: null, downloadUrl: null, source: null });
+            return;
+        }
+        const updateAvailable = compareSemver(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: latest.source,
+        });
+    });
+    app.get("/macos/download", async (_req, res) => {
+        if (config.macos?.enabled !== true) {
+            res.status(404).json({ error: "macOS DMG 下载未启用。" });
+            return;
+        }
+        const macosDmg = await resolveMacosDmgAsset(configDir, config);
+        if (!macosDmg) {
+            res.status(404).json({ error: "当前没有可下载的 DMG 文件。" });
+            return;
+        }
+        res.setHeader("Content-Type", "application/x-apple-diskimage");
+        res.setHeader("Content-Length", String(macosDmg.size));
+        res.setHeader("Content-Disposition", `attachment; filename="${encodeURIComponent(macosDmg.fileName)}"`);
+        createReadStream(macosDmg.filePath).pipe(res);
+    });
     app.use("/api", requireAuth);
     // ── Config & Session info ──
     app.get("/api/config", async (_req, res) => {
@@ -855,6 +1014,14 @@ export async function startServer(config, configPath) {
             : ghApk
                 ? { hasApk: true, fileName: ghApk.fileName, version: ghApk.version, size: ghApk.size, updatedAt: null, downloadUrl: ghApk.downloadUrl, source: "github" }
                 : null;
+        const localDmg = await resolveMacosDmgAsset(configDir, config);
+        const ghDmg = await fetchGitHubLatestDmg();
+        const dmgDir = resolveMacosDmgDir(configDir, config);
+        const resolvedDmg = localDmg
+            ? { hasDmg: true, fileName: localDmg.fileName, version: localDmg.version, size: localDmg.size, updatedAt: localDmg.updatedAt, downloadUrl: localDmg.downloadUrl, source: "local" }
+            : ghDmg
+                ? { hasDmg: true, fileName: ghDmg.fileName, version: ghDmg.version, size: ghDmg.size, updatedAt: null, downloadUrl: ghDmg.downloadUrl, source: "github" }
+                : null;
         res.json({
             version: PKG_VERSION,
             packageName: PKG_NAME,
@@ -867,6 +1034,7 @@ export async function startServer(config, configPath) {
             autoUpdate: {
                 web: storage.getConfigValue("autoUpdateWeb") === "true",
                 apk: storage.getConfigValue("autoUpdateApk") === "true",
+                dmg: storage.getConfigValue("autoUpdateDmg") === "true",
             },
             androidApk: {
                 enabled: config.android?.enabled === true,
@@ -881,6 +1049,19 @@ export async function startServer(config, configPath) {
                 local: localApk ? { fileName: localApk.fileName, version: localApk.version, size: localApk.size, updatedAt: localApk.updatedAt, downloadUrl: localApk.downloadUrl } : null,
                 github: ghApk ? { fileName: ghApk.fileName, version: ghApk.version, size: ghApk.size, downloadUrl: ghApk.downloadUrl } : null,
             },
+            macosDmg: {
+                enabled: config.macos?.enabled === true,
+                dmgDir,
+                hasDmg: resolvedDmg?.hasDmg ?? false,
+                fileName: resolvedDmg?.fileName ?? null,
+                version: resolvedDmg?.version ?? null,
+                size: resolvedDmg?.size ?? null,
+                updatedAt: resolvedDmg?.updatedAt ?? null,
+                downloadUrl: resolvedDmg?.downloadUrl ?? null,
+                source: resolvedDmg?.source ?? null,
+                local: localDmg ? { fileName: localDmg.fileName, version: localDmg.version, size: localDmg.size, updatedAt: localDmg.updatedAt, downloadUrl: localDmg.downloadUrl } : null,
+                github: ghDmg ? { fileName: ghDmg.fileName, version: ghDmg.version, size: ghDmg.size, downloadUrl: ghDmg.downloadUrl } : null,
+            },
         });
     });
     app.get("/api/android-apk", async (_req, res) => {
@@ -906,6 +1087,29 @@ export async function startServer(config, configPath) {
             github: ghApk ? { fileName: ghApk.fileName, version: ghApk.version, size: ghApk.size, downloadUrl: ghApk.downloadUrl } : null,
         });
     });
+    app.get("/api/macos-dmg", async (_req, res) => {
+        const localDmg = await resolveMacosDmgAsset(configDir, config);
+        const ghDmg = await fetchGitHubLatestDmg();
+        const dmgDir = resolveMacosDmgDir(configDir, config);
+        const resolvedDmg = localDmg
+            ? { hasDmg: true, fileName: localDmg.fileName, version: localDmg.version, size: localDmg.size, updatedAt: localDmg.updatedAt, downloadUrl: localDmg.downloadUrl, source: "local" }
+            : ghDmg
+                ? { hasDmg: true, fileName: ghDmg.fileName, version: ghDmg.version, size: ghDmg.size, updatedAt: null, downloadUrl: ghDmg.downloadUrl, source: "github" }
+                : null;
+        res.json({
+            enabled: config.macos?.enabled === true,
+            dmgDir,
+            hasDmg: resolvedDmg?.hasDmg ?? false,
+            fileName: resolvedDmg?.fileName ?? null,
+            version: resolvedDmg?.version ?? null,
+            size: resolvedDmg?.size ?? null,
+            updatedAt: resolvedDmg?.updatedAt ?? null,
+            downloadUrl: resolvedDmg?.downloadUrl ?? null,
+            source: resolvedDmg?.source ?? null,
+            local: localDmg ? { fileName: localDmg.fileName, version: localDmg.version, size: localDmg.size, updatedAt: localDmg.updatedAt, downloadUrl: localDmg.downloadUrl } : null,
+            github: ghDmg ? { fileName: ghDmg.fileName, version: ghDmg.version, size: ghDmg.size, downloadUrl: ghDmg.downloadUrl } : null,
+        });
+    });
     // 返回当前 inheritEnv 配置下，wand 启动 PTY / 结构化子进程时实际会传给
     // claude / codex 的环境变量集合。值会按下面的规则做掩码：
     //   - 名字里含 KEY/TOKEN/SECRET/PASSWORD/AUTH/CREDENTIAL/COOKIE/SESSION 的视为敏感
@@ -1697,19 +1901,24 @@ export async function startServer(config, configPath) {
     app.get("/api/auto-update", (_req, res) => {
         const web = storage.getConfigValue("autoUpdateWeb") === "true";
         const apk = storage.getConfigValue("autoUpdateApk") === "true";
-        res.json({ web, apk });
+        const dmg = storage.getConfigValue("autoUpdateDmg") === "true";
+        res.json({ web, apk, dmg });
     });
     app.post("/api/auto-update", express.json(), (req, res) => {
-        const { web, apk } = req.body;
+        const { web, apk, dmg } = req.body;
         if (typeof web === "boolean") {
             storage.setConfigValue("autoUpdateWeb", String(web));
         }
         if (typeof apk === "boolean") {
             storage.setConfigValue("autoUpdateApk", String(apk));
         }
+        if (typeof dmg === "boolean") {
+            storage.setConfigValue("autoUpdateDmg", String(dmg));
+        }
         res.json({
             web: storage.getConfigValue("autoUpdateWeb") === "true",
             apk: storage.getConfigValue("autoUpdateApk") === "true",
+            dmg: storage.getConfigValue("autoUpdateDmg") === "true",
         });
     });
     // ── Auto-update logic ──

package/dist/storage.d.ts

@@ -28,6 +28,11 @@ export declare class WandStorage {
     setPassword(password: string): void;
     /** Check if password has been set (not default) */
     hasCustomPassword(): boolean;
+    /** Get appSecret from database (used to mint Android appTokens) */
+    getAppSecret(): string | null;
+    /** Persist appSecret in database (DB is the authoritative source after first migration) */
+    setAppSecret(value: string): void;
+    hasAppSecret(): boolean;
     saveAuthSession(token: string, expiresAt: number): void;
     getAuthSession(token: string): PersistedAuthSession | null;
     deleteAuthSession(token: string): void;

package/dist/storage.js

@@ -302,6 +302,17 @@ export class WandStorage {
     hasCustomPassword() {
         return this.getPassword() !== null;
     }
+    /** Get appSecret from database (used to mint Android appTokens) */
+    getAppSecret() {
+        return this.getConfigValue("appSecret");
+    }
+    /** Persist appSecret in database (DB is the authoritative source after first migration) */
+    setAppSecret(value) {
+        this.setConfigValue("appSecret", value);
+    }
+    hasAppSecret() {
+        return this.getAppSecret() !== null;
+    }
     // ============ Auth Session Methods ============
     saveAuthSession(token, expiresAt) {
         this.db

package/dist/structured-session-manager.d.ts

@@ -11,6 +11,20 @@ interface CreateStructuredSessionOptions {
     /** 用户指定的 Claude 模型（别名或完整 ID）。留空则 spawn 时不加 --model。 */
     model?: string;
 }
+/**
+ * 把任意外部输入收敛到合法的 thinkingEffort 枚举值。`null` / 非法值都视为
+ * "未设置"——上层调用方再根据 provider 决定是否填默认值。
+ */
+export declare function normalizeThinkingEffort(value: unknown): SessionSnapshot["thinkingEffort"];
+/** Claude SDK 用：把 thinkingEffort 映射成 `thinking.budget_tokens`。off / 空 → 0（不启用）。 */
+export declare function thinkingEffortToSdkBudget(effort: SessionSnapshot["thinkingEffort"]): number;
+/**
+ * Claude CLI 用：在 prompt 前注入魔法词，让 claude code 自动识别为思考请求。
+ * off → 原 prompt 不变。
+ */
+export declare function applyThinkingEffortToPrompt(prompt: string, effort: SessionSnapshot["thinkingEffort"]): string;
+/** Codex CLI 用：把 thinkingEffort 映射到 --reasoning-effort 参数。off → minimal（不显式思考）。 */
+export declare function thinkingEffortToCodexFlag(effort: SessionSnapshot["thinkingEffort"]): string | null;
 export declare class StructuredSessionManager {
     private readonly storage;
     private readonly config;
@@ -62,6 +76,12 @@ export declare class StructuredSessionManager {
     denyPermission(sessionId: string): SessionSnapshot;
     /** Update the selected model for a structured session. Takes effect on the next spawn. */
     setSessionModel(sessionId: string, model: string | null): SessionSnapshot;
+    /**
+     * Update the thinking-effort level for a structured session. Takes effect on
+     * the next spawn / next message (SDK runner injects `thinking`, CLI runner
+     * prepends magic words, codex runner adds --reasoning-effort).
+     */
+    setSessionThinkingEffort(sessionId: string, effort: SessionSnapshot["thinkingEffort"]): SessionSnapshot;
     /** Toggle auto-approve for the session. */
     toggleAutoApprove(sessionId: string): SessionSnapshot;
     /** Resolve a specific escalation by requestId. */

package/dist/structured-session-manager.js

@@ -1,7 +1,9 @@
 import { randomUUID } from "node:crypto";
 import { spawn } from "node:child_process";
 import { createRequire } from "node:module";
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync, statSync } from "node:fs";
+import { homedir } from "node:os";
+import path from "node:path";
 import { query as sdkQuery } from "@anthropic-ai/claude-agent-sdk";
 import { prepareSessionWorktree } from "./git-worktree.js";
 import { truncateMessagesForTransport } from "./message-truncator.js";
@@ -18,6 +20,69 @@ function defaultStructuredState(provider, runner = defaultStructuredRunner(provi
         activeRequestId: null,
     };
 }
+/**
+ * 把任意外部输入收敛到合法的 thinkingEffort 枚举值。`null` / 非法值都视为
+ * "未设置"——上层调用方再根据 provider 决定是否填默认值。
+ */
+export function normalizeThinkingEffort(value) {
+    if (typeof value !== "string")
+        return null;
+    const v = value.trim().toLowerCase();
+    if (v === "off" || v === "standard" || v === "deep" || v === "max")
+        return v;
+    return null;
+}
+/** Claude SDK 用：把 thinkingEffort 映射成 `thinking.budget_tokens`。off / 空 → 0（不启用）。 */
+export function thinkingEffortToSdkBudget(effort) {
+    switch (effort) {
+        case "standard": return 4096;
+        case "deep": return 16000;
+        case "max": return 31999;
+        case "off":
+        default: return 0;
+    }
+}
+/**
+ * Claude CLI 用：在 prompt 前注入魔法词，让 claude code 自动识别为思考请求。
+ * off → 原 prompt 不变。
+ */
+export function applyThinkingEffortToPrompt(prompt, effort) {
+    const trimmed = prompt.trimStart();
+    if (!trimmed)
+        return prompt;
+    let prefix = "";
+    switch (effort) {
+        case "standard":
+            prefix = "think. ";
+            break;
+        case "deep":
+            prefix = "think hard. ";
+            break;
+        case "max":
+            prefix = "ultrathink. ";
+            break;
+        case "off":
+        default: return prompt;
+    }
+    // 用户已经手写了相同强度的指令时不重复加，避免把 "ultrathink. ultrathink." 喂给模型。
+    const lower = trimmed.toLowerCase();
+    if (lower.startsWith("ultrathink") || lower.startsWith("think hard") || lower.startsWith("think very") || lower.startsWith("think harder")) {
+        return prompt;
+    }
+    if (effort === "standard" && lower.startsWith("think"))
+        return prompt;
+    return prefix + trimmed;
+}
+/** Codex CLI 用：把 thinkingEffort 映射到 --reasoning-effort 参数。off → minimal（不显式思考）。 */
+export function thinkingEffortToCodexFlag(effort) {
+    switch (effort) {
+        case "standard": return "low";
+        case "deep": return "medium";
+        case "max": return "high";
+        case "off": return "minimal";
+        default: return null;
+    }
+}
 const STREAM_EMIT_DEBOUNCE_MS = 16;
 /** Min interval between full saveSession() calls for an in-progress streaming turn.
  *  saveSession serializes the entire messages array, so doing it on every NDJSON
@@ -131,25 +196,104 @@ function shouldAutoApproveForMode(mode) {
 const ROOT_FALLBACK_ALLOWED_TOOLS = [
     "Bash", "Edit", "Write", "Read", "Glob", "Grep", "NotebookEdit", "WebFetch", "WebSearch",
 ];
+/**
+ * 收集当前会话可见的 MCP server 名字。
+ * claude -p / SDK runner 没有交互式权限弹窗，碰到 mcp__* 工具会直接 fail with
+ * "haven't granted"。用户已经在 claude 这边配过的 MCP server 视为可信，
+ * 在 --allowedTools 里加 `mcp__<server>` 放行整台 server 的所有工具。
+ *
+ * 来源（取并集）：
+ *   - ~/.claude.json 顶层 mcpServers
+ *   - ~/.claude.json projects[<cwd>].mcpServers（仅当前 cwd 精确匹配）
+ *   - <cwd>/.mcp.json mcpServers
+ *
+ * 结果按 (cwd, 各文件 mtime) 缓存，避免每次 spawn 都重读。
+ */
+const mcpServerCache = new Map();
+function readJsonSafe(filePath) {
+    try {
+        const raw = readFileSync(filePath, "utf-8");
+        const parsed = JSON.parse(raw);
+        if (parsed && typeof parsed === "object")
+            return parsed;
+    }
+    catch { /* missing/invalid — return null */ }
+    return null;
+}
+function mtimeOf(filePath) {
+    try {
+        return statSync(filePath).mtimeMs;
+    }
+    catch {
+        return 0;
+    }
+}
+function extractMcpServerKeys(node) {
+    if (!node || typeof node !== "object")
+        return [];
+    const mcpServers = node.mcpServers;
+    if (!mcpServers || typeof mcpServers !== "object")
+        return [];
+    return Object.keys(mcpServers);
+}
+function collectMcpServerNames(cwd) {
+    const userConfigPath = path.join(homedir(), ".claude.json");
+    const projectMcpPath = path.join(cwd, ".mcp.json");
+    const fingerprint = `${mtimeOf(userConfigPath)}:${mtimeOf(projectMcpPath)}`;
+    const cached = mcpServerCache.get(cwd);
+    if (cached && cached.mtimeFingerprint === fingerprint)
+        return cached.names;
+    const names = new Set();
+    const userConfig = readJsonSafe(userConfigPath);
+    if (userConfig) {
+        for (const k of extractMcpServerKeys(userConfig))
+            names.add(k);
+        const projects = userConfig.projects;
+        if (projects && typeof projects === "object") {
+            const entry = projects[cwd];
+            for (const k of extractMcpServerKeys(entry))
+                names.add(k);
+        }
+    }
+    const projectMcp = readJsonSafe(projectMcpPath);
+    for (const k of extractMcpServerKeys(projectMcp))
+        names.add(k);
+    const result = Array.from(names);
+    mcpServerCache.set(cwd, { mtimeFingerprint: fingerprint, names: result });
+    return result;
+}
+function mcpAllowEntries(cwd) {
+    // `mcp__<server>` 形式放行该 server 的所有工具，等价于 `mcp__<server>__*`。
+    return collectMcpServerNames(cwd).map((name) => `mcp__${name}`);
+}
 /**
  * 把 (执行模式, 自动批准开关) 映射成 Claude CLI / SDK 的权限决策。
  * CLI runner 把它转成 --permission-mode / --allowedTools flag，
  * SDK runner 直接塞进 Options。两边的决策规则保持一字不差。
+ *
+ * cwd 用来枚举该会话能看到的 MCP server，把 `mcp__<server>` 加进 allowedTools；
+ * bypassPermissions 模式下整个白名单都没意义，不附加。
  */
-function derivePermissionPolicy(mode, autoApprove) {
+function derivePermissionPolicy(mode, autoApprove, cwd) {
     const shouldBypass = autoApprove || mode === "full-access" || mode === "managed";
     const shouldAcceptEdits = mode === "auto-edit";
+    const mcpAllow = shouldBypass ? [] : mcpAllowEntries(cwd);
+    const withMcp = (base) => {
+        if (!mcpAllow.length)
+            return base;
+        return base ? [...base, ...mcpAllow] : [...mcpAllow];
+    };
     if (!isRunningAsRoot()) {
         if (shouldBypass)
             return { permissionMode: "bypassPermissions", allowedTools: undefined };
         if (shouldAcceptEdits)
-            return { permissionMode: "acceptEdits", allowedTools: undefined };
-        return { permissionMode: "default", allowedTools: undefined };
+            return { permissionMode: "acceptEdits", allowedTools: withMcp(undefined) };
+        return { permissionMode: "default", allowedTools: withMcp(undefined) };
     }
     if (shouldBypass || shouldAcceptEdits) {
-        return { permissionMode: "acceptEdits", allowedTools: ROOT_FALLBACK_ALLOWED_TOOLS };
+        return { permissionMode: "acceptEdits", allowedTools: withMcp(ROOT_FALLBACK_ALLOWED_TOOLS) };
     }
-    return { permissionMode: "default", allowedTools: undefined };
+    return { permissionMode: "default", allowedTools: withMcp(undefined) };
 }
 /**
  * 拼装要追加到系统提示词里的片段：托管模式的自主决策提示 + 用户配置的语言偏好。
@@ -566,6 +710,27 @@ export class StructuredSessionManager {
         });
         return updated;
     }
+    /**
+     * Update the thinking-effort level for a structured session. Takes effect on
+     * the next spawn / next message (SDK runner injects `thinking`, CLI runner
+     * prepends magic words, codex runner adds --reasoning-effort).
+     */
+    setSessionThinkingEffort(sessionId, effort) {
+        const session = this.requireSession(sessionId);
+        const normalized = normalizeThinkingEffort(effort);
+        const updated = {
+            ...session,
+            thinkingEffort: normalized,
+        };
+        this.sessions.set(sessionId, updated);
+        this.storage.saveSession(updated);
+        this.emit({
+            type: "status",
+            sessionId,
+            data: { sessionKind: "structured", thinkingEffort: normalized },
+        });
+        return updated;
+    }
     /** Toggle auto-approve for the session. */
     toggleAutoApprove(sessionId) {
         const session = this.requireSession(sessionId);
@@ -1113,7 +1278,7 @@ export class StructuredSessionManager {
             // 紧跟其后的所有非 flag 形 token 都会被吞进工具列表，因此后面任何位置参数
             // 都得是 -- 开头的 flag——下面追加 --append-system-prompt / --model / --resume
             // 都满足这个条件。
-            const permPolicy = derivePermissionPolicy(session.mode, session.autoApprovePermissions ?? false);
+            const permPolicy = derivePermissionPolicy(session.mode, session.autoApprovePermissions ?? false, session.cwd);
             if (permPolicy.permissionMode !== "default") {
                 args.push("--permission-mode", permPolicy.permissionMode);
             }
@@ -1207,15 +1372,23 @@ export class StructuredSessionManager {
                     blocksByKey.set(key, blocks);
                     return;
                 }
-                // claude -p 在同一 message.id 的多次 assistant 事件里**应当**每次发出累加内容。
-                // 但偶发会观察到某次重发只带其中一部分 block（典型场景：text 后又开始一段
-                // tool_use，下一帧 text 字段意外为空字符串），导致先前已渲染的文本被覆盖
-                // 为空——刷新页面后从持久化又恢复出来，就是用户反馈的"显示了又消失"。
-                // 这里按 index 逐块取较"重"的版本，类型一致则取信息量大者，否则信任 incoming
-                // 但**绝不**让 incoming 比 prev 的总块数少（短数组拼接 prev 的尾部）。
+                // claude -p 在同一 message.id 的多次 assistant 事件里是**累积**协议：
+                // 每次 event 的 content 总是包含之前所有 blocks + 可能的新 block，
+                // 长度只增不减、同位置类型不变。两条额外的防御性规则：
+                //
+                // 1) blocks.length < prev.length —— 短数组覆盖。上游异常 frame，直接拒绝
+                //    本次更新，下一帧正常累积 emit 会自然修正。
+                //
+                // 2) 同 index 类型不一致 —— 比如 prev[0]=text 而 incoming[0]=tool_use。
+                //    正常累积下不会发生；一旦发生，**保留 prev[i]**。早期版本走"取
+                //    volume 大者"，会让 tool_use（input JSON 通常更长）抢占 text 位，
+                //    导致流式过程中已经渲染的文字突然消失，只剩工具卡片——直到 result
+                //    event 给出最终 turnState.result，compactContentBlocks 的 fallback
+                //    才补回 text。用户反馈"文字消失，回复完成后又出现"就是这条路径。
+                if (blocks.length < prev.length)
+                    return;
                 const merged = [];
-                const maxLen = Math.max(prev.length, blocks.length);
-                for (let i = 0; i < maxLen; i++) {
+                for (let i = 0; i < blocks.length; i++) {
                     const a = prev[i];
                     const b = blocks[i];
                     if (a && !b) {
@@ -1228,11 +1401,12 @@ export class StructuredSessionManager {
                     }
                     if (a && b) {
                         if (a.type === b.type) {
+                            // 同类型：取信息量大者，避免短回退覆盖已经累积的内容。
                             merged.push(blockVolume(b) >= blockVolume(a) ? b : a);
                         }
                         else {
-                            // 类型变了（极少见，多半是上游 bug）——保留信息量大者，不丢字。
-                            merged.push(blockVolume(b) >= blockVolume(a) ? b : a);
+                            // 类型变了：保留 prev，不让 tool_use 等抢占 text 位。
+                            merged.push(a);
                         }
                     }
                 }
@@ -1605,7 +1779,7 @@ export class StructuredSessionManager {
         const isManaged = session.mode === "managed";
         let killedForAskUserQuestion = false;
         // 权限策略 + 系统提示词都通过共享 helper 派生，与 CLI runner 一字不差。
-        const permPolicy = derivePermissionPolicy(session.mode, session.autoApprovePermissions ?? false);
+        const permPolicy = derivePermissionPolicy(session.mode, session.autoApprovePermissions ?? false, session.cwd);
         const systemPromptParts = buildAppendSystemPromptParts(this.config.language, session.mode);
         const sdkClaudeBinary = resolveSdkClaudeBinary();
         // SDK 默认会把整个 process.env 透传给 claude 子进程；这里显式按 inheritEnv 配置组装，