@co0ontty/wand 2.3.1 → 2.3.2

package/dist/build-info.json

@@ -1,6 +1,6 @@
 {
-  "commit": "b2955462eae33bdb72522709e3b5961ba769ce0f",
-  "builtAt": "2026-07-01T23:51:19.505Z",
-  "version": "2.3.1",
+  "commit": "066cdba4a30243d0950ceeb4988754f198bec6db",
+  "builtAt": "2026-07-04T05:33:22.797Z",
+  "version": "2.3.2",
   "channel": "stable"
 }

package/dist/cli.js

@@ -7,7 +7,7 @@ import { request as httpsRequest } from "node:https";
 import net from "node:net";
 import process from "node:process";
 import { hasConfigFile, isPreferenceKey, loadConfigWithStorage, resolveConfigPath, saveConfig, writePreferenceToStorage, } from "./config.js";
-import { isPidAlive, readLiveInstance, removePidfile, removeSocketFile, socketPath, writePidfile, } from "./pidfile.js";
+import { isPidAlive, readPidfile, removePidfile, removeSocketFile, socketPath, writePidfile, } from "./pidfile.js";
 import { getErrorMessage } from "./error-utils.js";
 async function main() {
     const args = process.argv.slice(2);
@@ -392,9 +392,29 @@ async function handlePortInUse(config, configPath, useTui) {
     return true;
 }
 async function discoverAttachableInstance(configPath) {
-    const live = readLiveInstance(configPath);
-    if (live)
-        return live;
+    const live = readPidfile(configPath);
+    if (live && live.pid !== process.pid) {
+        if (!isPidAlive(live.pid)) {
+            removePidfile(configPath);
+            removeSocketFile(configPath);
+        }
+        else if (live.socket && existsSync(live.socket)) {
+            const snapshot = await readIpcSnapshot(live.socket);
+            if (snapshot &&
+                snapshot.header.pid === live.pid &&
+                snapshot.header.configPath === configPath) {
+                return pidInfoFromSnapshot(snapshot);
+            }
+            if (!pidCommandLooksLikeWand(live.pid, configPath)) {
+                removePidfile(configPath);
+                removeSocketFile(configPath);
+            }
+        }
+        else if (!pidCommandLooksLikeWand(live.pid, configPath)) {
+            removePidfile(configPath);
+            removeSocketFile(configPath);
+        }
+    }
     const sockPath = socketPath(configPath);
     if (!sockPath || !existsSync(sockPath))
         return null;
@@ -404,8 +424,13 @@ async function discoverAttachableInstance(configPath) {
     const pid = snapshot.header.pid;
     if (!isPidAlive(pid))
         return null;
+    if (snapshot.header.configPath !== configPath)
+        return null;
+    return pidInfoFromSnapshot(snapshot);
+}
+function pidInfoFromSnapshot(snapshot) {
     return {
-        pid,
+        pid: snapshot.header.pid,
         version: snapshot.header.version,
         startedAt: snapshot.header.startedAtMs,
         url: snapshot.header.url,
@@ -413,9 +438,28 @@ async function discoverAttachableInstance(configPath) {
         bindAddr: snapshot.header.bindAddr,
         configPath: snapshot.header.configPath,
         dbPath: snapshot.header.dbPath,
-        socket: sockPath,
+        socket: socketPath(snapshot.header.configPath),
     };
 }
+function pidCommandLooksLikeWand(pid, configPath) {
+    try {
+        const result = spawnSync("ps", ["-p", String(pid), "-o", "command="], {
+            encoding: "utf8",
+            timeout: 1000,
+        });
+        if (result.status !== 0)
+            return false;
+        const command = result.stdout || "";
+        return (command.includes(configPath) &&
+            (/\bwand\b/.test(command) ||
+                command.includes("/wand ") ||
+                command.includes("/cli.js web") ||
+                command.includes("src/cli.ts web")));
+    }
+    catch {
+        return false;
+    }
+}
 function readIpcSnapshot(sockPath) {
     return new Promise((resolve) => {
         const sock = net.createConnection({ path: sockPath });

package/dist/relaunch.d.ts

@@ -18,8 +18,9 @@ export interface RelaunchPlan {
 /**
  * 计算重启方式。
  *
- * - systemd 托管（存在 INVOCATION_ID）且已装服务 → "exit-only"：仅退出，由 unit 里
- *   （更新自修复后可能刚被重写的）ExecStart 重新拉起，避免 spawn 抢 pidfile 的竞态。
+ * - systemd / launchd 托管且已装服务 → "exit-only"：仅退出，由 unit/plist 里
+ *   （更新自修复后可能刚被重写的）ExecStart/ProgramArguments 重新拉起，
+ *   避免 spawn 抢 pidfile 的竞态。
  * - 否则 → "spawn"：bin 优先用刚装好的全局 CLI（更新后能跑到新版），回退 argv[1]。
  */
 export declare function computeRelaunch(opts: {

package/dist/relaunch.js

@@ -2,13 +2,15 @@ import process from "node:process";
 /**
  * 计算重启方式。
  *
- * - systemd 托管（存在 INVOCATION_ID）且已装服务 → "exit-only"：仅退出，由 unit 里
- *   （更新自修复后可能刚被重写的）ExecStart 重新拉起，避免 spawn 抢 pidfile 的竞态。
+ * - systemd / launchd 托管且已装服务 → "exit-only"：仅退出，由 unit/plist 里
+ *   （更新自修复后可能刚被重写的）ExecStart/ProgramArguments 重新拉起，
+ *   避免 spawn 抢 pidfile 的竞态。
  * - 否则 → "spawn"：bin 优先用刚装好的全局 CLI（更新后能跑到新版），回退 argv[1]。
  */
 export function computeRelaunch(opts) {
     const managedBySystemd = !!process.env.INVOCATION_ID;
-    if (managedBySystemd && opts.serviceInstalled) {
+    const managedByLaunchd = process.platform === "darwin" && process.env.XPC_SERVICE_NAME === "com.wand.web";
+    if ((managedBySystemd || managedByLaunchd) && opts.serviceInstalled) {
         return { mode: "exit-only" };
     }
     const bin = opts.globalCli ?? process.argv[1] ?? "";

package/dist/structured-session-manager.js

@@ -65,7 +65,7 @@ export function thinkingEffortToCodexReasoningEffort(effort) {
     switch (effort) {
         case "standard": return "low";
         case "deep": return "medium";
-        case "max": return "high";
+        case "max": return "xhigh";
         case "off": return "minimal";
         default: return null;
     }
@@ -1128,7 +1128,7 @@ export class StructuredSessionManager {
         if (modelChoice && modelChoice !== "default") {
             args.push("--model", modelChoice);
         }
-        // 思考深度 → model_reasoning_effort（off → minimal，standard → low，deep → medium，max → high）
+        // 思考深度 → model_reasoning_effort（off → minimal，standard → low，deep → medium，max → xhigh）
         // Newer Codex CLI versions removed the old dedicated exec flag, but still
         // accept config overrides through `-c`.
         const reasoningEffort = thinkingEffortToCodexReasoningEffort(session.thinkingEffort);
@@ -2765,12 +2765,16 @@ export class StructuredSessionManager {
             const aggregatedOutput = typeof item.aggregated_output === "string" ? item.aggregated_output : "";
             const exitCode = typeof item.exit_code === "number" ? item.exit_code : null;
             const status = typeof item.status === "string" ? item.status : completed ? "completed" : "in_progress";
+            const input = { command, status };
+            if (exitCode !== null)
+                input.exit_code = exitCode;
             if (!completed) {
                 return [{
                         type: "tool_use",
                         id,
                         name: "Bash",
-                        input: { command, status },
+                        description: "running",
+                        input,
                     }];
             }
             // codex 的 status 可能是 declined（sandbox 拒了命令）/ failed（执行失败）—
@@ -2780,12 +2784,21 @@ export class StructuredSessionManager {
             const fallbackText = status === "declined"
                 ? "command declined by sandbox"
                 : (exitCode === null ? "" : `exit_code: ${exitCode}`);
-            return [{
+            return [
+                {
+                    type: "tool_use",
+                    id,
+                    name: "Bash",
+                    description: exitCode === null ? status : `${status} · exit ${exitCode}`,
+                    input,
+                },
+                {
                     type: "tool_result",
                     tool_use_id: id,
                     content: aggregatedOutput || fallbackText,
                     is_error: isError,
-                }];
+                },
+            ];
         }
         if (type === "file_change") {
             // 注意：codex exec stream 没有 old_string/new_string——只给 path + kind。
@@ -2806,16 +2819,16 @@ export class StructuredSessionManager {
                 let input;
                 if (kind === "add") {
                     toolName = "Write";
-                    input = { file_path: path, content: "" };
+                    input = { file_path: path, content: "", kind, status };
                 }
                 else if (kind === "delete") {
                     // 复用 Bash 终端卡，rm 语义直观
                     toolName = "Bash";
-                    input = { command: `rm ${path}`, description: `delete ${path}`, status };
+                    input = { command: `rm ${path}`, description: `delete ${path}`, kind, status };
                 }
                 else {
                     toolName = "Edit";
-                    input = { file_path: path, old_string: "", new_string: "" };
+                    input = { file_path: path, old_string: "", new_string: "", kind, status };
                 }
                 if (!completed) {
                     blocks.push({ type: "tool_use", id: subId, name: toolName, input });
@@ -2839,12 +2852,14 @@ export class StructuredSessionManager {
             const errObj = item.error && typeof item.error === "object" ? item.error : null;
             const status = typeof item.status === "string" ? item.status : completed ? "completed" : "in_progress";
             const isError = !!errObj || status === "failed";
+            const input = { ...args, status };
             if (!completed) {
                 return [{
                         type: "tool_use",
                         id,
                         name: `${server}__${tool}`,
-                        input: args,
+                        description: status,
+                        input,
                     }];
             }
             let resultText = "";
@@ -2856,29 +2871,58 @@ export class StructuredSessionManager {
                 const inner = this.extractCodexText(resultRec.content);
                 resultText = inner || JSON.stringify(resultRec).slice(0, 4096);
             }
-            return [{
+            return [
+                {
+                    type: "tool_use",
+                    id,
+                    name: `${server}__${tool}`,
+                    description: status,
+                    input,
+                },
+                {
                     type: "tool_result",
                     tool_use_id: id,
                     content: resultText,
                     is_error: isError,
-                }];
+                },
+            ];
         }
         if (type === "web_search") {
             const query = typeof item.query === "string" ? item.query : "";
+            const action = item.action && typeof item.action === "object" ? item.action : null;
+            const actionType = action && typeof action.type === "string" ? action.type : "";
+            const queries = action && Array.isArray(action.queries)
+                ? action.queries.filter((v) => typeof v === "string")
+                : [];
+            const input = { query };
+            if (actionType)
+                input.action = actionType;
+            if (queries.length > 0)
+                input.queries = queries;
             if (!completed) {
                 return [{
                         type: "tool_use",
                         id,
                         name: "WebSearch",
-                        input: { query },
+                        description: actionType || "searching",
+                        input,
                     }];
             }
-            return [{
+            return [
+                {
+                    type: "tool_use",
+                    id,
+                    name: "WebSearch",
+                    description: actionType || "completed",
+                    input,
+                },
+                {
                     type: "tool_result",
                     tool_use_id: id,
                     // codex 不在 exec 流里回 search 结果，这里给个占位让 UI 卡片完成态。
-                    content: query ? `query: ${query}` : "",
-                }];
+                    content: queries.length > 0 ? queries.map((q) => `query: ${q}`).join("\n") : (query ? `query: ${query}` : ""),
+                },
+            ];
         }
         if (type === "collab_tool_call") {
             // codex 的子-agent 编排（spawn_agent / send_input / wait / close_agent）。

package/dist/tui/attach.js

@@ -5,8 +5,7 @@
  * 日志面板：因为日志在主进程里，attach 端没法直接看；这里改成"活动流"——
  *   监听 snapshot 差分，把会话起止 / 总数变化打到 log 面板。
  */
-import { checkUpdate, copyToClipboard, installService, installUpdate, isServiceInstalled, openInBrowser, readUpdateChannel, uninstallService, } from "./commands.js";
-import { spawnSync } from "node:child_process";
+import { checkUpdate, copyToClipboard, installService, installUpdate, isServiceInstalled, openInBrowser, readUpdateChannel, serviceRestart, uninstallService, } from "./commands.js";
 import { repairServiceUnitAfterUpdate } from "../service-self-repair.js";
 import { IpcClient } from "./ipc-client.js";
 import { buildLayout } from "./layout.js";
@@ -159,36 +158,18 @@ export function startAttachTui(deps) {
         void handleUninstallService(); });
     async function handleRestart() {
         const installed = safeServiceInstalled();
-        if (installed && process.platform === "linux") {
+        if (installed) {
             const ok = await layout.confirm({
                 title: "重启 wand 服务",
-                body: "将执行 systemctl --user restart wand.service。当前 attach 会话会随主进程重启被踢掉。",
+                body: "将重启已安装的 wand systemd / launchd 服务。当前 attach 会话会随主进程重启短暂断开。",
             });
             if (!ok)
                 return;
-            layout.showToast("systemctl --user restart wand.service …", "info", 3000);
-            const r = spawnSync("systemctl", ["--user", "restart", "wand.service"], { encoding: "utf8" });
-            if (r.status === 0) {
-                layout.showToast("已请求重启，IPC 会自动重连", "success", 3000);
-            }
-            else {
-                layout.showToast(`systemctl 失败 (exit ${r.status})`, "error", 4000);
-                layout.showDetail("systemctl 输出", (r.stdout || "") + "\n" + (r.stderr || ""));
-            }
-            return;
-        }
-        if (installed && process.platform === "darwin") {
-            const ok = await layout.confirm({
-                title: "重启 wand 服务",
-                body: "将依次 launchctl unload / load com.wand.web。",
-            });
-            if (!ok)
-                return;
-            const plist = `${process.env.HOME}/Library/LaunchAgents/com.wand.web.plist`;
-            const u = spawnSync("launchctl", ["unload", plist], { encoding: "utf8" });
-            const l = spawnSync("launchctl", ["load", plist], { encoding: "utf8" });
-            const ok2 = u.status === 0 && l.status === 0;
-            layout.showToast(ok2 ? "已请求 launchd 重启" : "launchctl 调用失败", ok2 ? "success" : "error", 3500);
+            layout.showToast("正在请求服务重启…", "info", 3000);
+            const r = await runOffMicrotask(() => serviceRestart());
+            layout.showToast(r.ok ? "已请求重启，IPC 会自动重连" : r.message, r.ok ? "success" : "error", 4000);
+            if (r.detail)
+                layout.showDetail(r.ok ? "服务重启输出" : "服务重启失败", r.detail);
             return;
         }
         // 没注册成服务：尝试通过 IPC 让主进程自我退出，再由用户手动重启

package/dist/tui/commands.js

@@ -156,6 +156,8 @@ function clipboardCandidates() {
         { cmd: "xsel", args: ["--clipboard", "--input"] },
     ];
 }
+// ─── 系统服务（systemd system / user / launchd） ─────────────────────────
+const LAUNCHD_LABEL = "com.wand.web";
 export const DEFAULT_SERVICE_SCOPE = "system";
 /** 当前 process 是不是 root（POSIX）。Windows 永远返回 false。 */
 function isRoot() {
@@ -314,26 +316,35 @@ function launchdStatus(scope) {
             platform: "darwin",
         };
     }
-    // launchctl list 输出三列：PID  Status  Label
-    const list = spawnSync("launchctl", ["list", "com.wand.web"], { encoding: "utf8" });
-    if (list.status !== 0) {
+    const target = launchdTarget(scope);
+    const printed = spawnSync("launchctl", ["print", target], { encoding: "utf8", timeout: 10_000 });
+    if (printed.status !== 0) {
         return {
             installed: true,
             state: "inactive",
-            description: `[${scope}] loaded 但未在运行（launchctl list 找不到）`,
-            raw: list.stderr || "",
+            description: `[${scope}] installed 但未 bootstrap · ${target}`,
+            raw: ((printed.stdout || "") + "\n" + (printed.stderr || "")).trim(),
             platform: "darwin",
         };
     }
-    const text = list.stdout;
-    const pidMatch = text.match(/"PID"\s*=\s*(\d+);/);
-    const exitMatch = text.match(/"LastExitStatus"\s*=\s*(-?\d+);/);
-    const pid = pidMatch ? Number(pidMatch[1]) : 0;
-    const lastExit = exitMatch ? Number(exitMatch[1]) : 0;
-    const desc = pid > 0 ? `[${scope}] running · PID ${pid}` : `[${scope}] stopped (last exit=${lastExit})`;
+    const text = printed.stdout || "";
+    const state = matchLaunchdField(text, "state") || "loaded";
+    const pid = Number(matchLaunchdField(text, "pid") || "0");
+    const lastExit = matchLaunchdField(text, "last exit code");
+    const normalized = pid > 0 || state === "running"
+        ? "active"
+        : state === "failed"
+            ? "failed"
+            : "inactive";
+    const tail = pid > 0
+        ? ` · PID ${pid}`
+        : lastExit
+            ? ` · last exit ${lastExit}`
+            : "";
+    const desc = `[${scope}] ${state}${tail} · ${target}`;
     return {
         installed: true,
-        state: pid > 0 ? "active" : "inactive",
+        state: normalized,
         description: desc,
         raw: text,
         platform: "darwin",
@@ -361,39 +372,114 @@ function launchctlLoad(scope) {
     const plist = servicePathFor(scope);
     if (!existsSync(plist))
         return { ok: false, message: `未安装 (${plist} 不存在)` };
-    const r = spawnSync("launchctl", ["load", "-w", plist], { encoding: "utf8", timeout: 10_000 });
-    if (r.status === 0)
-        return { ok: true, message: `已 launchctl load (${scope})` };
-    return {
-        ok: false,
-        message: `launchctl load 失败 (exit ${r.status})`,
-        detail: ((r.stdout || "") + "\n" + (r.stderr || "")).trim(),
-    };
+    return launchdBootstrap(scope, plist, `已启动 launchd ${scope}`);
 }
 function launchctlUnload(scope) {
     const plist = servicePathFor(scope);
     if (!existsSync(plist))
         return { ok: false, message: `未安装 (${plist} 不存在)` };
-    const r = spawnSync("launchctl", ["unload", plist], { encoding: "utf8", timeout: 10_000 });
-    if (r.status === 0)
-        return { ok: true, message: `已 launchctl unload (${scope})` };
+    return launchdBootout(scope, plist, `已停止 launchd ${scope}`);
+}
+function launchdRestart(scope) {
+    const target = launchdTarget(scope);
+    const kicked = spawnSync("launchctl", ["kickstart", "-k", target], { encoding: "utf8", timeout: 10_000 });
+    if (kicked.status === 0)
+        return { ok: true, message: `已重启 launchd ${scope}: ${target}` };
+    const started = launchctlLoad(scope);
+    if (started.ok)
+        return { ok: true, message: `已 bootstrap 并启动 launchd ${scope}: ${target}` };
     return {
         ok: false,
-        message: `launchctl unload 失败 (exit ${r.status})`,
-        detail: ((r.stdout || "") + "\n" + (r.stderr || "")).trim(),
+        message: `launchd 重启失败 (${target})`,
+        detail: [
+            `kickstart: ${formatSpawnResult(kicked)}`,
+            `bootstrap: ${started.message}`,
+            started.detail ?? "",
+        ].filter(Boolean).join("\n"),
     };
 }
-function launchdRestart(scope) {
-    const stop = launchctlUnload(scope);
-    const start = launchctlLoad(scope);
-    if (stop.ok && start.ok)
-        return { ok: true, message: `已 launchd 重启 (${scope})` };
+function launchdDomain(scope) {
+    return scope === "user" ? `gui/${currentUid()}` : "system";
+}
+function launchdTarget(scope) {
+    return `${launchdDomain(scope)}/${LAUNCHD_LABEL}`;
+}
+function currentUid() {
+    const fn = process.getuid;
+    if (typeof fn === "function") {
+        try {
+            return fn.call(process);
+        }
+        catch { /* fall through */ }
+    }
+    const id = spawnSync("id", ["-u"], { encoding: "utf8", timeout: 3000 });
+    const uid = Number((id.stdout || "").trim());
+    return Number.isInteger(uid) && uid >= 0 ? uid : 0;
+}
+function matchLaunchdField(text, field) {
+    const escaped = field.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const match = text.match(new RegExp(`^\\s*${escaped} = (.+)$`, "m"));
+    return match?.[1]?.trim() ?? null;
+}
+function launchdBootstrap(scope, plist, successMessage) {
+    const domain = launchdDomain(scope);
+    const target = launchdTarget(scope);
+    const bootout = spawnSync("launchctl", ["bootout", domain, plist], { encoding: "utf8", timeout: 10_000 });
+    const bootstrap = spawnSync("launchctl", ["bootstrap", domain, plist], { encoding: "utf8", timeout: 10_000 });
+    const enable = spawnSync("launchctl", ["enable", target], { encoding: "utf8", timeout: 10_000 });
+    const kickstart = spawnSync("launchctl", ["kickstart", "-k", target], { encoding: "utf8", timeout: 10_000 });
+    const detail = [
+        `target: ${target}`,
+        `bootout: ${formatSpawnResult(bootout)}`,
+        `bootstrap: ${formatSpawnResult(bootstrap)}`,
+        `enable: ${formatSpawnResult(enable)}`,
+        `kickstart: ${formatSpawnResult(kickstart)}`,
+    ].join("\n");
+    if (bootstrap.status !== 0 && !launchdIsAlreadyBootstrapped(bootstrap)) {
+        return { ok: false, message: `launchctl bootstrap 失败 (${target})`, detail };
+    }
+    if (enable.status !== 0) {
+        return { ok: false, message: `launchctl enable 失败 (${target})`, detail };
+    }
+    if (kickstart.status !== 0) {
+        const status = launchdStatus(scope);
+        if (status.state !== "active") {
+            return { ok: false, message: `launchctl kickstart 失败 (${target})`, detail };
+        }
+    }
+    return { ok: true, message: successMessage, detail };
+}
+function launchdBootout(scope, plist, successMessage) {
+    const domain = launchdDomain(scope);
+    const target = launchdTarget(scope);
+    const bootout = spawnSync("launchctl", ["bootout", domain, plist], { encoding: "utf8", timeout: 10_000 });
+    if (bootout.status === 0 || launchdIsNotBootstrapped(bootout)) {
+        return {
+            ok: true,
+            message: successMessage,
+            detail: `target: ${target}\nbootout: ${formatSpawnResult(bootout)}`,
+        };
+    }
     return {
         ok: false,
-        message: "launchd 重启失败",
-        detail: `unload: ${stop.message}\nload: ${start.message}`,
+        message: `launchctl bootout 失败 (${target})`,
+        detail: formatSpawnResult(bootout),
     };
 }
+function launchdIsAlreadyBootstrapped(result) {
+    const text = `${result.stdout || ""}\n${result.stderr || ""}`;
+    return /already bootstrapped|service already loaded|Bootstrap failed:\s*5/i.test(text);
+}
+function launchdIsNotBootstrapped(result) {
+    const text = `${result.stdout || ""}\n${result.stderr || ""}`;
+    return /No such process|service is not loaded|Bootstrap failed:\s*3/i.test(text);
+}
+function formatSpawnResult(result) {
+    const text = ((result.stdout || "") + "\n" + (result.stderr || "")).trim();
+    return result.status === 0
+        ? "ok"
+        : `failed (${text || `exit ${result.status}`})`;
+}
 function unsupported() {
     return { ok: false, message: `当前平台 ${process.platform} 不支持服务管理` };
 }
@@ -714,17 +800,18 @@ ${userNameField}  <key>WorkingDirectory</key><string>${runHome}</string>
     catch (err) {
         return { ok: false, message: `写入 plist 失败: ${getErrorMessage(err)}` };
     }
-    const load = spawnSync("launchctl", ["load", "-w", plistPath], { encoding: "utf8" });
-    if (load.status !== 0) {
+    const started = launchdBootstrap(scope, plistPath, `已注册 launchd ${scope === "user" ? "用户代理" : "系统守护"}: ${plistPath}`);
+    if (!started.ok) {
         return {
             ok: false,
-            message: "已写入 plist，但 launchctl load 失败",
-            detail: load.stderr.trim() || `exit ${load.status}`,
+            message: "已写入 plist，但 launchctl 启动失败",
+            detail: started.detail,
         };
     }
     return {
         ok: true,
         message: `已注册 launchd ${scope === "user" ? "用户代理" : "系统守护"}: ${plistPath}`,
+        detail: started.detail,
     };
 }
 function uninstallLaunchdService(scope) {
@@ -732,7 +819,8 @@ function uninstallLaunchdService(scope) {
     if (!existsSync(plistPath)) {
         return { ok: false, message: `未检测到已安装的 launchd ${scope} 服务` };
     }
-    const unload = spawnSync("launchctl", ["unload", "-w", plistPath], { encoding: "utf8" });
+    const stopped = launchdBootout(scope, plistPath, `已停止 launchd ${scope}`);
+    const disabled = spawnSync("launchctl", ["disable", launchdTarget(scope)], { encoding: "utf8", timeout: 10_000 });
     try {
         unlinkSync(plistPath);
     }
@@ -742,7 +830,10 @@ function uninstallLaunchdService(scope) {
     return {
         ok: true,
         message: `已卸载 launchd ${scope === "user" ? "用户代理" : "系统守护"}`,
-        detail: unload.status === 0 ? "unload: ok" : `unload: ${unload.stderr.trim()}`,
+        detail: [
+            stopped.detail ?? stopped.message,
+            `disable: ${formatSpawnResult(disabled)}`,
+        ].join("\n"),
     };
 }
 // ─── 工具 ────────────────────────────────────────────────────────────────

package/dist/types.d.ts

@@ -441,7 +441,7 @@ export interface SessionSnapshot {
      *   - off:      不覆盖默认思考深度（SDK: 不传 thinking；Claude CLI: auto/default；Codex: model_reasoning_effort minimal）
      *   - standard: 标准（SDK: budget 4096；Claude CLI: low；Codex: low）
      *   - deep:    深度（SDK: budget 16000；Claude CLI: medium；Codex: medium）
-     *   - max:     最深（SDK: budget 31999；Claude CLI: max；Codex: high）
+     *   - max:     最深（SDK: budget 31999；Claude CLI: max；Codex: xhigh）
      */
     thinkingEffort?: "off" | "standard" | "deep" | "max" | null;
     /** 当前 PTY 列宽，由最近一次 resize 决定。前端用它来判断本端 fit 是否需要校准。 */