weacpx 0.3.0 → 0.3.1

package/dist/cli.js

@@ -48,18 +48,386 @@ var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __promiseAll = (args) => Promise.all(args);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
+// src/util/private-file.ts
+import { randomBytes } from "node:crypto";
+import { chmod, mkdir, rename, unlink, writeFile } from "node:fs/promises";
+import { basename, dirname, join } from "node:path";
+async function writePrivateFileAtomic(path, content) {
+  const dir = dirname(path);
+  await mkdir(dir, { recursive: true });
+  const tmpPath = join(dir, `.${basename(path)}.${process.pid}.${randomBytes(6).toString("hex")}.tmp`);
+  try {
+    await writeFile(tmpPath, content, { encoding: "utf8", mode: PRIVATE_FILE_MODE });
+    await chmodPrivate(tmpPath);
+    await rename(tmpPath, path);
+    await chmodPrivate(path);
+  } catch (error) {
+    await unlinkIfExists(tmpPath);
+    throw error;
+  }
+}
+async function chmodPrivate(path) {
+  if (process.platform === "win32")
+    return;
+  await chmod(path, PRIVATE_FILE_MODE).catch(() => {});
+}
+async function unlinkIfExists(path) {
+  await unlink(path).catch(() => {});
+}
+var PRIVATE_FILE_MODE = 384;
+var init_private_file = () => {};
+
+// src/commands/workspace-path.ts
+import { access } from "node:fs/promises";
+import { homedir } from "node:os";
+import path from "node:path";
+function normalizeWorkspacePath(input) {
+  const expanded = expandHome(input);
+  if (isWindowsLikePath(expanded)) {
+    return path.win32.normalize(expanded).replace(/\\/g, "/");
+  }
+  return path.posix.normalize(expanded.replace(/\\/g, "/"));
+}
+function basenameForWorkspacePath(input) {
+  const normalized = normalizeWorkspacePath(input);
+  if (ROOT_PATH_RE.test(normalized)) {
+    return normalized;
+  }
+  const base = path.posix.basename(normalized);
+  return base || normalized;
+}
+function sameWorkspacePath(left, right) {
+  const normalizedLeft = normalizeWorkspacePath(left);
+  const normalizedRight = normalizeWorkspacePath(right);
+  if (isWindowsLikePath(normalizedLeft) || isWindowsLikePath(normalizedRight)) {
+    return normalizedLeft.toLowerCase() === normalizedRight.toLowerCase();
+  }
+  return normalizedLeft === normalizedRight;
+}
+function expandHome(input) {
+  return input.startsWith("~") ? homedir() + input.slice(1) : input;
+}
+async function pathExists(filePath) {
+  try {
+    await access(filePath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isWindowsLikePath(input) {
+  return WINDOWS_DRIVE_PATH_RE.test(input) || WINDOWS_UNC_PATH_RE.test(input);
+}
+var WINDOWS_DRIVE_PATH_RE, WINDOWS_UNC_PATH_RE, ROOT_PATH_RE;
+var init_workspace_path = __esm(() => {
+  WINDOWS_DRIVE_PATH_RE = /^[a-zA-Z]:[\\/]/;
+  WINDOWS_UNC_PATH_RE = /^\\\\/;
+  ROOT_PATH_RE = /^(\/|[a-zA-Z]:\/?)$/;
+});
+
+// src/config/resolve-agent-command.ts
+function resolveAgentCommand(driver, command) {
+  if (!command) {
+    return;
+  }
+  if (driver === "codex" && isLegacyCodexCommand(command)) {
+    return;
+  }
+  return command;
+}
+function isLegacyCodexCommand(command) {
+  const normalized = command.trim().replaceAll("\\", "/").toLowerCase();
+  return normalized === "./node_modules/.bin/codex-acp" || normalized === "./node_modules/.bin/codex-acp.exe" || normalized.endsWith("/node_modules/.bin/codex-acp") || normalized.endsWith("/node_modules/.bin/codex-acp.exe") || normalized.includes("/@zed-industries/codex-acp/bin/codex-acp.js") || normalized.includes("@zed-industries/codex-acp/bin/codex-acp.js");
+}
+
+// src/config/load-config.ts
+import { readFile } from "node:fs/promises";
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+async function loadConfig(path2, options = {}) {
+  const raw = JSON.parse(await readFile(path2, "utf8"));
+  return parseConfig(raw, options);
+}
+function parseConfig(raw, options = {}) {
+  if (!isRecord(raw)) {
+    throw new Error("config must be a JSON object");
+  }
+  const transport = raw.transport;
+  if (!isRecord(transport)) {
+    throw new Error("transport must be an object");
+  }
+  if ("type" in transport && transport.type !== "acpx-cli" && transport.type !== "acpx-bridge") {
+    throw new Error("transport.type must be acpx-cli or acpx-bridge");
+  }
+  if ("sessionInitTimeoutMs" in transport && (typeof transport.sessionInitTimeoutMs !== "number" || !Number.isFinite(transport.sessionInitTimeoutMs) || transport.sessionInitTimeoutMs <= 0)) {
+    throw new Error("transport.sessionInitTimeoutMs must be a positive number");
+  }
+  if ("permissionMode" in transport && transport.permissionMode !== "approve-all" && transport.permissionMode !== "approve-reads" && transport.permissionMode !== "deny-all") {
+    throw new Error("transport.permissionMode must be approve-all, approve-reads, or deny-all");
+  }
+  if ("nonInteractivePermissions" in transport && transport.nonInteractivePermissions !== "deny" && transport.nonInteractivePermissions !== "fail") {
+    throw new Error("transport.nonInteractivePermissions must be deny or fail");
+  }
+  if (!isRecord(raw.agents)) {
+    throw new Error("agents must be an object");
+  }
+  if (!isRecord(raw.workspaces)) {
+    throw new Error("workspaces must be an object");
+  }
+  const logging = raw.logging;
+  const wechat = raw.wechat;
+  const orchestration = raw.orchestration;
+  if (logging !== undefined && !isRecord(logging)) {
+    throw new Error("logging must be an object");
+  }
+  if (wechat !== undefined && !isRecord(wechat)) {
+    throw new Error("wechat must be an object");
+  }
+  if (orchestration !== undefined && !isRecord(orchestration)) {
+    throw new Error("orchestration must be an object");
+  }
+  if (isRecord(logging) && "level" in logging && logging.level !== "error" && logging.level !== "info" && logging.level !== "debug") {
+    throw new Error("logging.level must be error, info, or debug");
+  }
+  for (const field of ["maxSizeBytes", "maxFiles", "retentionDays"]) {
+    if (isRecord(logging) && field in logging && (typeof logging[field] !== "number" || !Number.isFinite(logging[field]) || logging[field] <= 0)) {
+      throw new Error(`logging.${field} must be a positive number`);
+    }
+  }
+  if (isRecord(wechat) && "replyMode" in wechat && wechat.replyMode !== "stream" && wechat.replyMode !== "final" && wechat.replyMode !== "verbose") {
+    throw new Error("wechat.replyMode must be stream, final, or verbose");
+  }
+  for (const [name, agent] of Object.entries(raw.agents)) {
+    if (!isRecord(agent) || typeof agent.driver !== "string" || agent.driver.length === 0) {
+      throw new Error(`agent "${name}" must define a non-empty driver`);
+    }
+    if ("command" in agent && (typeof agent.command !== "string" || agent.command.length === 0)) {
+      throw new Error(`agent "${name}" command must be a non-empty string`);
+    }
+  }
+  for (const [name, workspace] of Object.entries(raw.workspaces)) {
+    if (!isRecord(workspace) || typeof workspace.cwd !== "string" || workspace.cwd.length === 0) {
+      throw new Error(`workspace "${name}" must define a non-empty cwd`);
+    }
+    if ("allowed_agents" in workspace && (!Array.isArray(workspace.allowed_agents) || workspace.allowed_agents.some((value) => typeof value !== "string"))) {
+      throw new Error(`workspace "${name}" allowed_agents must be an array of strings`);
+    }
+  }
+  const rawAgents = raw.agents;
+  const agents = {};
+  for (const [name, agent] of Object.entries(rawAgents)) {
+    const driver = agent.driver;
+    const command = typeof agent.command === "string" ? resolveAgentCommand(driver, agent.command) : undefined;
+    agents[name] = {
+      driver,
+      ...command ? { command } : {}
+    };
+  }
+  const rawWorkspaces = raw.workspaces;
+  const workspaces = {};
+  for (const [name, workspace] of Object.entries(rawWorkspaces)) {
+    workspaces[name] = {
+      cwd: normalizeWorkspacePath(workspace.cwd),
+      ...typeof workspace.description === "string" ? { description: workspace.description } : {}
+    };
+  }
+  const transportType = transport.type === "acpx-cli" || transport.type === "acpx-bridge" ? transport.type : "acpx-bridge";
+  const permissionMode = transport.permissionMode === "approve-all" || transport.permissionMode === "approve-reads" || transport.permissionMode === "deny-all" ? transport.permissionMode : DEFAULT_PERMISSION_MODE;
+  const nonInteractivePermissions = transport.nonInteractivePermissions === "deny" || transport.nonInteractivePermissions === "fail" ? transport.nonInteractivePermissions : DEFAULT_NON_INTERACTIVE_PERMISSIONS;
+  const loggingLevel = logging?.level;
+  const resolvedLoggingLevel = loggingLevel === "error" || loggingLevel === "info" || loggingLevel === "debug" ? loggingLevel : options.defaultLoggingLevel ?? DEFAULT_LOGGING_CONFIG.level;
+  const replyMode = wechat?.replyMode === "stream" || wechat?.replyMode === "final" || wechat?.replyMode === "verbose" ? wechat.replyMode : DEFAULT_WECHAT_REPLY_MODE;
+  const orchestrationConfig = parseOrchestrationConfig(orchestration);
+  return {
+    transport: {
+      ...typeof transport.command === "string" ? { command: transport.command } : {},
+      ...typeof transport.sessionInitTimeoutMs === "number" ? { sessionInitTimeoutMs: transport.sessionInitTimeoutMs } : {},
+      type: transportType,
+      permissionMode,
+      nonInteractivePermissions
+    },
+    logging: {
+      level: resolvedLoggingLevel,
+      maxSizeBytes: typeof logging?.maxSizeBytes === "number" ? logging.maxSizeBytes : DEFAULT_LOGGING_CONFIG.maxSizeBytes,
+      maxFiles: typeof logging?.maxFiles === "number" ? logging.maxFiles : DEFAULT_LOGGING_CONFIG.maxFiles,
+      retentionDays: typeof logging?.retentionDays === "number" ? logging.retentionDays : DEFAULT_LOGGING_CONFIG.retentionDays
+    },
+    wechat: {
+      replyMode
+    },
+    agents,
+    workspaces,
+    orchestration: orchestrationConfig
+  };
+}
+function parseOrchestrationConfig(raw) {
+  if (!isRecord(raw)) {
+    return {
+      ...DEFAULT_ORCHESTRATION_CONFIG
+    };
+  }
+  return {
+    maxPendingAgentRequestsPerCoordinator: typeof raw.maxPendingAgentRequestsPerCoordinator === "number" && Number.isFinite(raw.maxPendingAgentRequestsPerCoordinator) && raw.maxPendingAgentRequestsPerCoordinator > 0 ? raw.maxPendingAgentRequestsPerCoordinator : DEFAULT_ORCHESTRATION_CONFIG.maxPendingAgentRequestsPerCoordinator,
+    allowWorkerChainedRequests: raw.allowWorkerChainedRequests === true,
+    allowedAgentRequestTargets: Array.isArray(raw.allowedAgentRequestTargets) ? raw.allowedAgentRequestTargets.filter((value) => typeof value === "string") : [...DEFAULT_ORCHESTRATION_CONFIG.allowedAgentRequestTargets],
+    allowedAgentRequestRoles: Array.isArray(raw.allowedAgentRequestRoles) ? raw.allowedAgentRequestRoles.filter((value) => typeof value === "string") : [...DEFAULT_ORCHESTRATION_CONFIG.allowedAgentRequestRoles],
+    progressHeartbeatSeconds: typeof raw.progressHeartbeatSeconds === "number" && Number.isFinite(raw.progressHeartbeatSeconds) ? raw.progressHeartbeatSeconds : DEFAULT_ORCHESTRATION_CONFIG.progressHeartbeatSeconds
+  };
+}
+var DEFAULT_LOGGING_CONFIG, DEFAULT_PERMISSION_MODE = "approve-all", DEFAULT_NON_INTERACTIVE_PERMISSIONS = "deny", DEFAULT_WECHAT_REPLY_MODE = "verbose", DEFAULT_ORCHESTRATION_CONFIG;
+var init_load_config = __esm(() => {
+  init_workspace_path();
+  DEFAULT_LOGGING_CONFIG = {
+    level: "info",
+    maxSizeBytes: 2 * 1024 * 1024,
+    maxFiles: 5,
+    retentionDays: 7
+  };
+  DEFAULT_ORCHESTRATION_CONFIG = {
+    maxPendingAgentRequestsPerCoordinator: 3,
+    allowWorkerChainedRequests: false,
+    allowedAgentRequestTargets: [],
+    allowedAgentRequestRoles: [],
+    progressHeartbeatSeconds: 300
+  };
+});
+
+// src/config/config-store.ts
+class ConfigStore {
+  path;
+  constructor(path2) {
+    this.path = path2;
+  }
+  async load() {
+    return await loadConfig(this.path);
+  }
+  async save(config) {
+    await writePrivateFileAtomic(this.path, `${JSON.stringify(config, null, 2)}
+`);
+  }
+  async upsertWorkspace(name, cwd, description) {
+    const config = await this.load();
+    const workspace = {
+      cwd,
+      ...description ? { description } : {}
+    };
+    config.workspaces[name] = workspace;
+    await this.save(config);
+    return config;
+  }
+  async removeWorkspace(name) {
+    const config = await this.load();
+    delete config.workspaces[name];
+    await this.save(config);
+    return config;
+  }
+  async upsertAgent(name, agent) {
+    const config = await this.load();
+    config.agents[name] = agent;
+    await this.save(config);
+    return config;
+  }
+  async removeAgent(name) {
+    const config = await this.load();
+    delete config.agents[name];
+    await this.save(config);
+    return config;
+  }
+  async updateTransport(transport) {
+    const config = await this.load();
+    config.transport = {
+      ...config.transport,
+      ...transport
+    };
+    await this.save(config);
+    return config;
+  }
+  async updateWechat(wechat) {
+    const config = await this.load();
+    config.wechat = {
+      ...config.wechat,
+      ...wechat
+    };
+    await this.save(config);
+    return config;
+  }
+}
+var init_config_store = __esm(() => {
+  init_private_file();
+  init_load_config();
+});
+
+// src/config/ensure-config.ts
+import { readFile as readFile2 } from "node:fs/promises";
+async function ensureConfigExists(path2) {
+  try {
+    await loadConfig(path2);
+  } catch (error) {
+    if (!isMissingFileError(error)) {
+      throw error;
+    }
+    const store = new ConfigStore(path2);
+    await store.save(await loadDefaultConfigTemplate());
+  }
+}
+async function loadDefaultConfigTemplate() {
+  const candidates = [
+    new URL("../../config.example.json", import.meta.url),
+    new URL("../config.example.json", import.meta.url)
+  ];
+  let raw;
+  let lastError;
+  for (const candidate of candidates) {
+    try {
+      raw = await readFile2(candidate, "utf8");
+      break;
+    } catch (error) {
+      if (!isMissingFileError(error)) {
+        throw error;
+      }
+      lastError = error;
+    }
+  }
+  if (!raw) {
+    throw lastError;
+  }
+  return normalizeDefaultConfigTemplate(JSON.parse(raw));
+}
+function normalizeDefaultConfigTemplate(raw) {
+  const template = parseConfig(raw);
+  return {
+    ...template,
+    agents: Object.fromEntries(Object.entries(template.agents).map(([name, agent]) => [
+      name,
+      {
+        driver: agent.driver,
+        ...resolveAgentCommand(agent.driver, agent.command) ? { command: resolveAgentCommand(agent.driver, agent.command) } : {}
+      }
+    ])),
+    workspaces: {}
+  };
+}
+function isMissingFileError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
+}
+var init_ensure_config = __esm(() => {
+  init_config_store();
+  init_load_config();
+});
+
 // src/daemon/daemon-status.ts
-import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
-import { dirname } from "node:path";
+import { mkdir as mkdir2, readFile as readFile3, rm, writeFile as writeFile2 } from "node:fs/promises";
+import { dirname as dirname2 } from "node:path";
 
 class DaemonStatusStore {
   path;
-  constructor(path) {
-    this.path = path;
+  constructor(path2) {
+    this.path = path2;
   }
   async load() {
     try {
-      const content = await readFile(this.path, "utf8");
+      const content = await readFile3(this.path, "utf8");
       if (content.trim() === "") {
         return null;
       }
@@ -72,8 +440,8 @@ class DaemonStatusStore {
     }
   }
   async save(status) {
-    await mkdir(dirname(this.path), { recursive: true });
-    await writeFile(this.path, JSON.stringify(status, null, 2));
+    await mkdir2(dirname2(this.path), { recursive: true });
+    await writeFile2(this.path, JSON.stringify(status, null, 2));
   }
   async clear() {
     await rm(this.path, { force: true });
@@ -82,8 +450,8 @@ class DaemonStatusStore {
 var init_daemon_status = () => {};
 
 // src/daemon/daemon-controller.ts
-import { mkdir as mkdir2, readFile as readFile2, rm as rm2, writeFile as writeFile2 } from "node:fs/promises";
-import { dirname as dirname2 } from "node:path";
+import { mkdir as mkdir3, readFile as readFile4, rm as rm2, writeFile as writeFile3 } from "node:fs/promises";
+import { dirname as dirname3 } from "node:path";
 
 class DaemonController {
   paths;
@@ -157,7 +525,7 @@ class DaemonController {
   }
   async loadPid() {
     try {
-      const content = await readFile2(this.paths.pidFile, "utf8");
+      const content = await readFile4(this.paths.pidFile, "utf8");
       const pid = Number(content.trim());
       return Number.isFinite(pid) && pid > 0 ? pid : null;
     } catch (error) {
@@ -168,8 +536,8 @@ class DaemonController {
     }
   }
   async writePid(pid) {
-    await mkdir2(dirname2(this.paths.pidFile), { recursive: true });
-    await writeFile2(this.paths.pidFile, `${pid}
+    await mkdir3(dirname3(this.paths.pidFile), { recursive: true });
+    await writeFile3(this.paths.pidFile, `${pid}
 `);
   }
   async clearRuntimeFiles() {
@@ -211,7 +579,7 @@ var init_daemon_controller = __esm(() => {
 
 // src/process/terminate-process-tree.ts
 import { spawn } from "node:child_process";
-async function terminateProcessTree(pid, platform = process.platform, runCommand = defaultRunProcessCommand, killProcess = (targetPid, signal) => {
+async function terminateProcessTree(pid, options = {}, platform = process.platform, runCommand = defaultRunProcessCommand, killProcess = (targetPid, signal) => {
   process.kill(targetPid, signal);
 }, isProcessRunning = defaultIsProcessRunning) {
   if (pid <= 0) {
@@ -223,7 +591,7 @@ async function terminateProcessTree(pid, platform = process.platform, runCommand
     } catch {}
     return;
   }
-  const targetPid = pid > 0 ? -pid : pid;
+  const targetPid = options.detachedProcessGroup ? -pid : pid;
   try {
     killProcess(targetPid, "SIGTERM");
   } catch {
@@ -258,13 +626,13 @@ async function defaultRunProcessCommand(command, args) {
 var init_terminate_process_tree = () => {};
 
 // src/daemon/create-daemon-controller.ts
-import { mkdir as mkdir3, open } from "node:fs/promises";
+import { mkdir as mkdir4, open } from "node:fs/promises";
 import { spawn as spawn2 } from "node:child_process";
 function createDaemonController(paths, options) {
   return new DaemonController(paths, {
     isProcessRunning: options.isProcessRunning ?? defaultIsProcessRunning2,
     spawnDetached: async () => {
-      await mkdir3(paths.runtimeDir, { recursive: true });
+      await mkdir4(paths.runtimeDir, { recursive: true });
       const stdoutHandle = await open(paths.stdoutLog, "a");
       const stderrHandle = await open(paths.stderrLog, "a");
       try {
@@ -395,7 +763,7 @@ async function spawnWindowsHiddenProcess(request) {
   });
 }
 async function defaultTerminateProcess(pid) {
-  await terminateProcessTree(pid);
+  await terminateProcessTree(pid, { detachedProcessGroup: true });
 }
 var init_create_daemon_controller = __esm(() => {
   init_daemon_controller();
@@ -404,7 +772,7 @@ var init_create_daemon_controller = __esm(() => {
 
 // src/orchestration/orchestration-ipc.ts
 import { createHash } from "node:crypto";
-import { join } from "node:path";
+import { join as join2 } from "node:path";
 function resolveOrchestrationEndpoint(runtimeDir, platform = process.platform) {
   if (platform === "win32") {
     const suffix = createHash("sha256").update(runtimeDir).digest("hex").slice(0, 12);
@@ -415,13 +783,13 @@ function resolveOrchestrationEndpoint(runtimeDir, platform = process.platform) {
   }
   return {
     kind: "unix",
-    path: join(runtimeDir, "orchestration.sock")
+    path: join2(runtimeDir, "orchestration.sock")
   };
 }
-function createOrchestrationEndpoint(path, platform = process.platform) {
+function createOrchestrationEndpoint(path2, platform = process.platform) {
   return {
-    kind: platform === "win32" || path.startsWith("\\\\.\\pipe\\") ? "named-pipe" : "unix",
-    path
+    kind: platform === "win32" || path2.startsWith("\\\\.\\pipe\\") ? "named-pipe" : "unix",
+    path: path2
   };
 }
 function encodeOrchestrationRpcRequest(request) {
@@ -435,20 +803,20 @@ function encodeOrchestrationRpcResponse(response) {
 var init_orchestration_ipc = () => {};
 
 // src/daemon/daemon-files.ts
-import { dirname as dirname3, join as join2 } from "node:path";
+import { dirname as dirname4, join as join3 } from "node:path";
 function resolveDaemonPaths(options) {
-  const runtimeDir = options.runtimeDir ?? join2(options.home, ".weacpx", "runtime");
+  const runtimeDir = options.runtimeDir ?? join3(options.home, ".weacpx", "runtime");
   return {
     runtimeDir,
-    pidFile: join2(runtimeDir, "daemon.pid"),
-    statusFile: join2(runtimeDir, "status.json"),
-    stdoutLog: join2(runtimeDir, "stdout.log"),
-    stderrLog: join2(runtimeDir, "stderr.log"),
-    appLog: join2(runtimeDir, "app.log")
+    pidFile: join3(runtimeDir, "daemon.pid"),
+    statusFile: join3(runtimeDir, "status.json"),
+    stdoutLog: join3(runtimeDir, "stdout.log"),
+    stderrLog: join3(runtimeDir, "stderr.log"),
+    appLog: join3(runtimeDir, "app.log")
   };
 }
 function resolveRuntimeDirFromConfigPath(configPath) {
-  return join2(dirname3(configPath), "runtime");
+  return join3(dirname4(configPath), "runtime");
 }
 function resolveDaemonOrchestrationSocketPath(runtimeDir, platform = process.platform) {
   return resolveOrchestrationEndpoint(runtimeDir, platform).path;
@@ -3581,8 +3949,8 @@ var require_utils = __commonJS((exports, module) => {
     }
     return ind;
   }
-  function removeDotSegments(path) {
-    let input = path;
+  function removeDotSegments(path2) {
+    let input = path2;
     const output = [];
     let nextSlash = -1;
     let len = 0;
@@ -3772,8 +4140,8 @@ var require_schemes = __commonJS((exports, module) => {
       wsComponent.secure = undefined;
     }
     if (wsComponent.resourceName) {
-      const [path, query] = wsComponent.resourceName.split("?");
-      wsComponent.path = path && path !== "/" ? path : undefined;
+      const [path2, query] = wsComponent.resourceName.split("?");
+      wsComponent.path = path2 && path2 !== "/" ? path2 : undefined;
       wsComponent.query = query;
       wsComponent.resourceName = undefined;
     }
@@ -6931,12 +7299,12 @@ var require_dist = __commonJS((exports, module) => {
 
 // src/version.ts
 import fs from "node:fs";
-import path from "node:path";
+import path2 from "node:path";
 import { fileURLToPath } from "node:url";
 function readVersion() {
   try {
-    const dir = path.dirname(fileURLToPath(import.meta.url));
-    const pkgPath = path.resolve(dir, "..", "..", "package.json");
+    const dir = path2.dirname(fileURLToPath(import.meta.url));
+    const pkgPath = path2.resolve(dir, "..", "..", "package.json");
     const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
     return pkg.version ?? "unknown";
   } catch {
@@ -7167,16 +7535,16 @@ var init_quota_errors = __esm(() => {
 });
 
 // src/weixin/monitor/consumer-lock.ts
-import { mkdir as mkdir5, open as open2, readFile as readFile3, rm as rm4 } from "node:fs/promises";
-import { dirname as dirname5, join as join3 } from "node:path";
-import { homedir as homedir2 } from "node:os";
+import { mkdir as mkdir6, open as open2, readFile as readFile5, rm as rm4 } from "node:fs/promises";
+import { dirname as dirname6, join as join4 } from "node:path";
+import { homedir as homedir3 } from "node:os";
 function createWeixinConsumerLock(options = {}) {
-  const lockFilePath = options.lockFilePath ?? join3(homedir2(), ".weacpx", "runtime", "weixin-consumer.lock.json");
+  const lockFilePath = options.lockFilePath ?? join4(homedir3(), ".weacpx", "runtime", "weixin-consumer.lock.json");
   const isProcessRunning = options.isProcessRunning ?? defaultIsProcessRunning3;
   const onDiagnostic = options.onDiagnostic;
   return {
     async acquire(meta2) {
-      await mkdir5(dirname5(lockFilePath), { recursive: true });
+      await mkdir6(dirname6(lockFilePath), { recursive: true });
       while (true) {
         try {
           const handle = await open2(lockFilePath, "wx");
@@ -7247,9 +7615,9 @@ function createWeixinConsumerLock(options = {}) {
     }
   };
 }
-async function loadLockMetadata(path2) {
+async function loadLockMetadata(path3) {
   try {
-    const raw = await readFile3(path2, "utf8");
+    const raw = await readFile5(path3, "utf8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed.pid !== "number" || !parsed.mode || !parsed.configPath || !parsed.statePath) {
       return null;
@@ -8308,15 +8676,15 @@ var require_main = __commonJS((exports, module) => {
 
 // src/weixin/storage/state-dir.ts
 import os from "node:os";
-import path2 from "node:path";
+import path3 from "node:path";
 function resolveStateDir() {
-  return process.env.OPENCLAW_STATE_DIR?.trim() || process.env.CLAWDBOT_STATE_DIR?.trim() || path2.join(os.homedir(), ".openclaw");
+  return process.env.OPENCLAW_STATE_DIR?.trim() || process.env.CLAWDBOT_STATE_DIR?.trim() || path3.join(os.homedir(), ".openclaw");
 }
 var init_state_dir = () => {};
 
 // src/weixin/auth/accounts.ts
 import fs2 from "node:fs";
-import path3 from "node:path";
+import path4 from "node:path";
 function normalizeAccountId(raw) {
   return raw.trim().toLowerCase().replace(/[@.]/g, "-");
 }
@@ -8330,10 +8698,10 @@ function deriveRawAccountId(normalizedId) {
   return;
 }
 function resolveWeixinStateDir() {
-  return path3.join(resolveStateDir(), "openclaw-weixin");
+  return path4.join(resolveStateDir(), "openclaw-weixin");
 }
 function resolveAccountIndexPath() {
-  return path3.join(resolveWeixinStateDir(), "accounts.json");
+  return path4.join(resolveWeixinStateDir(), "accounts.json");
 }
 function listIndexedWeixinAccountIds() {
   const filePath = resolveAccountIndexPath();
@@ -8355,13 +8723,13 @@ function registerWeixinAccountId(accountId) {
   fs2.writeFileSync(resolveAccountIndexPath(), JSON.stringify([accountId], null, 2), "utf-8");
 }
 function resolveAccountsDir() {
-  return path3.join(resolveWeixinStateDir(), "accounts");
+  return path4.join(resolveWeixinStateDir(), "accounts");
 }
 function resolveAccountPath(accountId) {
-  return path3.join(resolveAccountsDir(), `${accountId}.json`);
+  return path4.join(resolveAccountsDir(), `${accountId}.json`);
 }
 function loadLegacyToken() {
-  const legacyPath = path3.join(resolveStateDir(), "credentials", "openclaw-weixin", "credentials.json");
+  const legacyPath = path4.join(resolveStateDir(), "credentials", "openclaw-weixin", "credentials.json");
   try {
     if (!fs2.existsSync(legacyPath))
       return;
@@ -8431,7 +8799,7 @@ function resolveConfigPath() {
   const envPath = process.env.OPENCLAW_CONFIG?.trim();
   if (envPath)
     return envPath;
-  return path3.join(resolveStateDir(), "openclaw.json");
+  return path4.join(resolveStateDir(), "openclaw.json");
 }
 function loadConfigRouteTag(accountId) {
   try {
@@ -8488,7 +8856,7 @@ var init_accounts = __esm(() => {
 // src/weixin/util/logger.ts
 import fs3 from "node:fs";
 import os2 from "node:os";
-import path4 from "node:path";
+import path5 from "node:path";
 function resolveMinLevel() {
   const env = process.env.OPENCLAW_LOG_LEVEL?.toUpperCase();
   if (env && env in LEVEL_IDS)
@@ -8507,7 +8875,7 @@ function localDateKey(now) {
 }
 function resolveMainLogPath() {
   const dateKey = localDateKey(new Date);
-  return path4.join(MAIN_LOG_DIR, `openclaw-${dateKey}.log`);
+  return path5.join(MAIN_LOG_DIR, `openclaw-${dateKey}.log`);
 }
 function buildLoggerName(accountId) {
   return accountId ? `${SUBSYSTEM}/${accountId}` : SUBSYSTEM;
@@ -8568,7 +8936,7 @@ function createLogger(accountId) {
 }
 var MAIN_LOG_DIR, SUBSYSTEM = "gateway/channels/openclaw-weixin", RUNTIME = "node", RUNTIME_VERSION, HOSTNAME, PARENT_NAMES, LEVEL_IDS, DEFAULT_LOG_LEVEL = "INFO", minLevelId, logDirEnsured = false, logger;
 var init_logger = __esm(() => {
-  MAIN_LOG_DIR = path4.join("/tmp", "openclaw");
+  MAIN_LOG_DIR = path5.join("/tmp", "openclaw");
   RUNTIME_VERSION = process.versions.node;
   HOSTNAME = os2.hostname() || "unknown";
   PARENT_NAMES = ["openclaw"];
@@ -8602,6 +8970,49 @@ function redactToken(token, prefixLen = DEFAULT_TOKEN_PREFIX_LEN) {
 function redactBody(body, maxLen = DEFAULT_BODY_MAX_LEN) {
   if (!body)
     return "(empty)";
+  const parsed = parseJson(body);
+  if (parsed !== undefined) {
+    return truncateForBody(JSON.stringify(redactJsonValue(parsed)), maxLen);
+  }
+  return truncateForBody(body, maxLen);
+}
+function parseJson(body) {
+  try {
+    return JSON.parse(body);
+  } catch {
+    return;
+  }
+}
+function redactJsonValue(value, key) {
+  const normalizedKey = key?.toLowerCase();
+  if (normalizedKey && SECRET_KEYS.has(normalizedKey)) {
+    return redactScalar(value);
+  }
+  if (normalizedKey && CONTENT_KEYS.has(normalizedKey)) {
+    return redactContent(value);
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => redactJsonValue(item));
+  }
+  if (value && typeof value === "object") {
+    return Object.fromEntries(Object.entries(value).map(([entryKey, entryValue]) => [
+      entryKey,
+      redactJsonValue(entryValue, entryKey)
+    ]));
+  }
+  return value;
+}
+function redactScalar(value) {
+  const len = typeof value === "string" ? value.length : JSON.stringify(value)?.length ?? 0;
+  return `<redacted len=${len}>`;
+}
+function redactContent(value) {
+  if (typeof value === "string") {
+    return `<redacted len=${value.length}>`;
+  }
+  return redactJsonValue(value);
+}
+function truncateForBody(body, maxLen) {
   if (body.length <= maxLen)
     return body;
   return `${body.slice(0, maxLen)}…(truncated, totalLen=${body.length})`;
@@ -8615,7 +9026,27 @@ function redactUrl(rawUrl) {
     return truncate(rawUrl, 80);
   }
 }
-var DEFAULT_BODY_MAX_LEN = 200, DEFAULT_TOKEN_PREFIX_LEN = 6;
+var DEFAULT_BODY_MAX_LEN = 200, DEFAULT_TOKEN_PREFIX_LEN = 6, SECRET_KEYS, CONTENT_KEYS;
+var init_redact = __esm(() => {
+  SECRET_KEYS = new Set([
+    "authorization",
+    "access_token",
+    "aes_key",
+    "aeskey",
+    "context_token",
+    "replycontexttoken",
+    "secret",
+    "signature",
+    "token"
+  ]);
+  CONTENT_KEYS = new Set([
+    "content",
+    "message",
+    "msg",
+    "rawtext",
+    "text"
+  ]);
+});
 
 // src/weixin/messaging/send-errors.ts
 function formatMessage(input) {
@@ -8900,6 +9331,7 @@ var init_api = __esm(() => {
   init_version();
   init_accounts();
   init_logger();
+  init_redact();
   init_send_errors();
   CHANNEL_VERSION = readVersion();
 });
@@ -9129,6 +9561,7 @@ var ACTIVE_LOGIN_TTL_MS, GET_QRCODE_TIMEOUT_MS = 5000, QR_LONG_POLL_TIMEOUT_MS =
 var init_login_qr = __esm(() => {
   init_api();
   init_logger();
+  init_redact();
   ACTIVE_LOGIN_TTL_MS = 5 * 60000;
   activeLogins = new Map;
 });
@@ -9350,111 +9783,16 @@ var init_types = __esm(() => {
   };
 });
 
-// src/weixin/cdn/aes-ecb.ts
-import { createCipheriv, createDecipheriv } from "node:crypto";
-function encryptAesEcb(plaintext, key) {
-  const cipher = createCipheriv("aes-128-ecb", key, null);
-  return Buffer.concat([cipher.update(plaintext), cipher.final()]);
-}
-function decryptAesEcb(ciphertext, key) {
-  const decipher = createDecipheriv("aes-128-ecb", key, null);
-  return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
-}
-function aesEcbPaddedSize(plaintextSize) {
-  return Math.ceil((plaintextSize + 1) / 16) * 16;
-}
-var init_aes_ecb = () => {};
-
-// src/weixin/cdn/cdn-url.ts
-function buildCdnDownloadUrl(encryptedQueryParam, cdnBaseUrl) {
-  return `${cdnBaseUrl}/download?encrypted_query_param=${encodeURIComponent(encryptedQueryParam)}`;
-}
-function buildCdnUploadUrl(params) {
-  return `${params.cdnBaseUrl}/upload?encrypted_query_param=${encodeURIComponent(params.uploadParam)}&filekey=${encodeURIComponent(params.filekey)}`;
-}
-
-// src/weixin/cdn/cdn-upload.ts
-async function uploadBufferToCdn(params) {
-  const { buf, uploadFullUrl, uploadParam, filekey, cdnBaseUrl, label, aeskey } = params;
-  const ciphertext = encryptAesEcb(buf, aeskey);
-  const trimmedFull = uploadFullUrl?.trim();
-  let cdnUrl;
-  if (trimmedFull) {
-    cdnUrl = trimmedFull;
-  } else if (uploadParam) {
-    cdnUrl = buildCdnUploadUrl({ cdnBaseUrl, uploadParam, filekey });
-  } else {
-    throw new Error(`${label}: CDN upload URL missing (need upload_full_url or upload_param)`);
-  }
-  logger.debug(`${label}: CDN POST url=${redactUrl(cdnUrl)} ciphertextSize=${ciphertext.length}`);
-  let downloadParam;
-  let lastError;
-  for (let attempt = 1;attempt <= UPLOAD_MAX_RETRIES; attempt++) {
-    try {
-      const res = await fetch(cdnUrl, {
-        method: "POST",
-        headers: { "Content-Type": "application/octet-stream" },
-        body: new Uint8Array(ciphertext)
-      });
-      if (res.status >= 400 && res.status < 500) {
-        const errMsg = res.headers.get("x-error-message") ?? await res.text();
-        logger.error(`${label}: CDN client error attempt=${attempt} status=${res.status} errMsg=${errMsg}`);
-        throw new Error(`CDN upload client error ${res.status}: ${errMsg}`);
-      }
-      if (res.status !== 200) {
-        const errMsg = res.headers.get("x-error-message") ?? `status ${res.status}`;
-        logger.error(`${label}: CDN server error attempt=${attempt} status=${res.status} errMsg=${errMsg}`);
-        throw new Error(`CDN upload server error: ${errMsg}`);
-      }
-      downloadParam = res.headers.get("x-encrypted-param") ?? undefined;
-      if (!downloadParam) {
-        logger.error(`${label}: CDN response missing x-encrypted-param header attempt=${attempt}`);
-        throw new Error("CDN upload response missing x-encrypted-param header");
-      }
-      logger.debug(`${label}: CDN upload success attempt=${attempt}`);
-      break;
-    } catch (err) {
-      lastError = err;
-      if (err instanceof Error && err.message.includes("client error"))
-        throw err;
-      if (attempt < UPLOAD_MAX_RETRIES) {
-        logger.error(`${label}: attempt ${attempt} failed, retrying... err=${String(err)}`);
-      } else {
-        logger.error(`${label}: all ${UPLOAD_MAX_RETRIES} attempts failed err=${String(err)}`);
-      }
-    }
-  }
-  if (!downloadParam) {
-    throw lastError instanceof Error ? lastError : new Error(`CDN upload failed after ${UPLOAD_MAX_RETRIES} attempts`);
-  }
-  return { downloadParam };
-}
-var UPLOAD_MAX_RETRIES = 3;
-var init_cdn_upload = __esm(() => {
-  init_aes_ecb();
-  init_logger();
-});
-
 // src/weixin/media/mime.ts
-import path5 from "node:path";
+import path6 from "node:path";
 function getMimeFromFilename(filename) {
-  const ext = path5.extname(filename).toLowerCase();
+  const ext = path6.extname(filename).toLowerCase();
   return EXTENSION_TO_MIME[ext] ?? "application/octet-stream";
 }
 function getExtensionFromMime(mimeType) {
   const ct = (mimeType.split(";")[0] ?? "").trim().toLowerCase();
   return MIME_TO_EXTENSION[ct] ?? ".bin";
 }
-function getExtensionFromContentTypeOrUrl(contentType, url) {
-  if (contentType) {
-    const ext2 = getExtensionFromMime(contentType);
-    if (ext2 !== ".bin")
-      return ext2;
-  }
-  const ext = path5.extname(new URL(url).pathname).toLowerCase();
-  const knownExts = new Set(Object.keys(EXTENSION_TO_MIME));
-  return knownExts.has(ext) ? ext : ".bin";
-}
 var EXTENSION_TO_MIME, MIME_TO_EXTENSION;
 var init_mime = __esm(() => {
   EXTENSION_TO_MIME = {
@@ -9509,111 +9847,28 @@ var init_mime = __esm(() => {
   };
 });
 
-// src/weixin/util/random.ts
-import crypto2 from "node:crypto";
-function generateId(prefix) {
-  return `${prefix}:${Date.now()}-${crypto2.randomBytes(4).toString("hex")}`;
-}
-function tempFileName(prefix, ext) {
-  return `${prefix}-${Date.now()}-${crypto2.randomBytes(4).toString("hex")}${ext}`;
-}
-var init_random = () => {};
-
-// src/weixin/cdn/upload.ts
-import crypto3 from "node:crypto";
-import fs4 from "node:fs/promises";
-import path6 from "node:path";
-async function downloadRemoteImageToTemp(url, destDir) {
-  logger.debug(`downloadRemoteImageToTemp: fetching url=${url}`);
-  const res = await fetch(url);
-  if (!res.ok) {
-    const msg = `remote media download failed: ${res.status} ${res.statusText} url=${url}`;
-    logger.error(`downloadRemoteImageToTemp: ${msg}`);
-    throw new Error(msg);
-  }
-  const buf = Buffer.from(await res.arrayBuffer());
-  logger.debug(`downloadRemoteImageToTemp: downloaded ${buf.length} bytes`);
-  await fs4.mkdir(destDir, { recursive: true });
-  const ext = getExtensionFromContentTypeOrUrl(res.headers.get("content-type"), url);
-  const name = tempFileName("weixin-remote", ext);
-  const filePath = path6.join(destDir, name);
-  await fs4.writeFile(filePath, buf);
-  logger.debug(`downloadRemoteImageToTemp: saved to ${filePath} ext=${ext}`);
-  return filePath;
+// src/weixin/cdn/aes-ecb.ts
+import { createCipheriv, createDecipheriv } from "node:crypto";
+function encryptAesEcb(plaintext, key) {
+  const cipher = createCipheriv("aes-128-ecb", key, null);
+  return Buffer.concat([cipher.update(plaintext), cipher.final()]);
 }
-async function uploadMediaToCdn(params) {
-  const { filePath, toUserId, opts, cdnBaseUrl, mediaType, label } = params;
-  const plaintext = await fs4.readFile(filePath);
-  const rawsize = plaintext.length;
-  const rawfilemd5 = crypto3.createHash("md5").update(plaintext).digest("hex");
-  const filesize = aesEcbPaddedSize(rawsize);
-  const filekey = crypto3.randomBytes(16).toString("hex");
-  const aeskey = crypto3.randomBytes(16);
-  logger.debug(`${label}: file=${filePath} rawsize=${rawsize} filesize=${filesize} md5=${rawfilemd5} filekey=${filekey}`);
-  const uploadUrlResp = await getUploadUrl({
-    ...opts,
-    filekey,
-    media_type: mediaType,
-    to_user_id: toUserId,
-    rawsize,
-    rawfilemd5,
-    filesize,
-    no_need_thumb: true,
-    aeskey: aeskey.toString("hex")
-  });
-  const uploadFullUrl = uploadUrlResp.upload_full_url?.trim();
-  const uploadParam = uploadUrlResp.upload_param;
-  if (!uploadFullUrl && !uploadParam) {
-    logger.error(`${label}: getUploadUrl returned no upload URL (need upload_full_url or upload_param), resp=${JSON.stringify(uploadUrlResp)}`);
-    throw new Error(`${label}: getUploadUrl returned no upload URL`);
-  }
-  const { downloadParam: downloadEncryptedQueryParam } = await uploadBufferToCdn({
-    buf: plaintext,
-    uploadFullUrl: uploadFullUrl || undefined,
-    uploadParam: uploadParam ?? undefined,
-    filekey,
-    cdnBaseUrl,
-    aeskey,
-    label: `${label}[orig filekey=${filekey}]`
-  });
-  return {
-    filekey,
-    downloadEncryptedQueryParam,
-    aeskey: aeskey.toString("hex"),
-    fileSize: rawsize,
-    fileSizeCiphertext: filesize
-  };
+function decryptAesEcb(ciphertext, key) {
+  const decipher = createDecipheriv("aes-128-ecb", key, null);
+  return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
 }
-async function uploadFileToWeixin(params) {
-  return uploadMediaToCdn({
-    ...params,
-    mediaType: UploadMediaType.IMAGE,
-    label: "uploadFileToWeixin"
-  });
+function aesEcbPaddedSize(plaintextSize) {
+  return Math.ceil((plaintextSize + 1) / 16) * 16;
 }
-async function uploadVideoToWeixin(params) {
-  return uploadMediaToCdn({
-    ...params,
-    mediaType: UploadMediaType.VIDEO,
-    label: "uploadVideoToWeixin"
-  });
+var init_aes_ecb = () => {};
+
+// src/weixin/cdn/cdn-url.ts
+function buildCdnDownloadUrl(encryptedQueryParam, cdnBaseUrl) {
+  return `${cdnBaseUrl}/download?encrypted_query_param=${encodeURIComponent(encryptedQueryParam)}`;
 }
-async function uploadFileAttachmentToWeixin(params) {
-  return uploadMediaToCdn({
-    ...params,
-    mediaType: UploadMediaType.FILE,
-    label: "uploadFileAttachmentToWeixin"
-  });
+function buildCdnUploadUrl(params) {
+  return `${params.cdnBaseUrl}/upload?encrypted_query_param=${encodeURIComponent(params.uploadParam)}&filekey=${encodeURIComponent(params.filekey)}`;
 }
-var init_upload = __esm(() => {
-  init_api();
-  init_aes_ecb();
-  init_cdn_upload();
-  init_logger();
-  init_mime();
-  init_random();
-  init_types();
-});
 
 // src/weixin/cdn/pic-decrypt.ts
 async function fetchCdnBytes(url, label) {
@@ -9830,6 +10085,13 @@ function buildFinalHeadsUp(input) {
 \uD83D\uDCC4 结果共 ${total} 段，已发 ${sentSoFar} 段。回复 /jx 续看后 ${remaining} 段。`;
 }
 
+// src/weixin/util/random.ts
+import crypto2 from "node:crypto";
+function generateId(prefix) {
+  return `${prefix}:${Date.now()}-${crypto2.randomBytes(4).toString("hex")}`;
+}
+var init_random = () => {};
+
 // src/weixin/messaging/inbound.ts
 function contextTokenKey(accountId, userId) {
   return `${accountId}:${userId}`;
@@ -10069,6 +10331,146 @@ var init_error_notice = __esm(() => {
   init_send();
 });
 
+// src/weixin/cdn/cdn-upload.ts
+async function uploadBufferToCdn(params) {
+  const { buf, uploadFullUrl, uploadParam, filekey, cdnBaseUrl, label, aeskey } = params;
+  const ciphertext = encryptAesEcb(buf, aeskey);
+  const trimmedFull = uploadFullUrl?.trim();
+  let cdnUrl;
+  if (trimmedFull) {
+    cdnUrl = trimmedFull;
+  } else if (uploadParam) {
+    cdnUrl = buildCdnUploadUrl({ cdnBaseUrl, uploadParam, filekey });
+  } else {
+    throw new Error(`${label}: CDN upload URL missing (need upload_full_url or upload_param)`);
+  }
+  logger.debug(`${label}: CDN POST url=${redactUrl(cdnUrl)} ciphertextSize=${ciphertext.length}`);
+  let downloadParam;
+  let lastError;
+  for (let attempt = 1;attempt <= UPLOAD_MAX_RETRIES; attempt++) {
+    try {
+      const res = await fetch(cdnUrl, {
+        method: "POST",
+        headers: { "Content-Type": "application/octet-stream" },
+        body: new Uint8Array(ciphertext)
+      });
+      if (res.status >= 400 && res.status < 500) {
+        const errMsg = res.headers.get("x-error-message") ?? await res.text();
+        logger.error(`${label}: CDN client error attempt=${attempt} status=${res.status} errMsg=${errMsg}`);
+        throw new Error(`CDN upload client error ${res.status}: ${errMsg}`);
+      }
+      if (res.status !== 200) {
+        const errMsg = res.headers.get("x-error-message") ?? `status ${res.status}`;
+        logger.error(`${label}: CDN server error attempt=${attempt} status=${res.status} errMsg=${errMsg}`);
+        throw new Error(`CDN upload server error: ${errMsg}`);
+      }
+      downloadParam = res.headers.get("x-encrypted-param") ?? undefined;
+      if (!downloadParam) {
+        logger.error(`${label}: CDN response missing x-encrypted-param header attempt=${attempt}`);
+        throw new Error("CDN upload response missing x-encrypted-param header");
+      }
+      logger.debug(`${label}: CDN upload success attempt=${attempt}`);
+      break;
+    } catch (err) {
+      lastError = err;
+      if (err instanceof Error && err.message.includes("client error"))
+        throw err;
+      if (attempt < UPLOAD_MAX_RETRIES) {
+        logger.error(`${label}: attempt ${attempt} failed, retrying... err=${String(err)}`);
+      } else {
+        logger.error(`${label}: all ${UPLOAD_MAX_RETRIES} attempts failed err=${String(err)}`);
+      }
+    }
+  }
+  if (!downloadParam) {
+    throw lastError instanceof Error ? lastError : new Error(`CDN upload failed after ${UPLOAD_MAX_RETRIES} attempts`);
+  }
+  return { downloadParam };
+}
+var UPLOAD_MAX_RETRIES = 3;
+var init_cdn_upload = __esm(() => {
+  init_aes_ecb();
+  init_logger();
+  init_redact();
+});
+
+// src/weixin/cdn/upload.ts
+import crypto3 from "node:crypto";
+import fs4 from "node:fs/promises";
+async function uploadMediaToCdn(params) {
+  const { filePath, toUserId, opts, cdnBaseUrl, mediaType, label } = params;
+  const plaintext = await fs4.readFile(filePath);
+  const rawsize = plaintext.length;
+  const rawfilemd5 = crypto3.createHash("md5").update(plaintext).digest("hex");
+  const filesize = aesEcbPaddedSize(rawsize);
+  const filekey = crypto3.randomBytes(16).toString("hex");
+  const aeskey = crypto3.randomBytes(16);
+  logger.debug(`${label}: file=${filePath} rawsize=${rawsize} filesize=${filesize} md5=${rawfilemd5} filekey=${filekey}`);
+  const uploadUrlResp = await getUploadUrl({
+    ...opts,
+    filekey,
+    media_type: mediaType,
+    to_user_id: toUserId,
+    rawsize,
+    rawfilemd5,
+    filesize,
+    no_need_thumb: true,
+    aeskey: aeskey.toString("hex")
+  });
+  const uploadFullUrl = uploadUrlResp.upload_full_url?.trim();
+  const uploadParam = uploadUrlResp.upload_param;
+  if (!uploadFullUrl && !uploadParam) {
+    logger.error(`${label}: getUploadUrl returned no upload URL (need upload_full_url or upload_param), resp=${JSON.stringify(uploadUrlResp)}`);
+    throw new Error(`${label}: getUploadUrl returned no upload URL`);
+  }
+  const { downloadParam: downloadEncryptedQueryParam } = await uploadBufferToCdn({
+    buf: plaintext,
+    uploadFullUrl: uploadFullUrl || undefined,
+    uploadParam: uploadParam ?? undefined,
+    filekey,
+    cdnBaseUrl,
+    aeskey,
+    label: `${label}[orig filekey=${filekey}]`
+  });
+  return {
+    filekey,
+    downloadEncryptedQueryParam,
+    aeskey: aeskey.toString("hex"),
+    fileSize: rawsize,
+    fileSizeCiphertext: filesize
+  };
+}
+async function uploadFileToWeixin(params) {
+  return uploadMediaToCdn({
+    ...params,
+    mediaType: UploadMediaType.IMAGE,
+    label: "uploadFileToWeixin"
+  });
+}
+async function uploadVideoToWeixin(params) {
+  return uploadMediaToCdn({
+    ...params,
+    mediaType: UploadMediaType.VIDEO,
+    label: "uploadVideoToWeixin"
+  });
+}
+async function uploadFileAttachmentToWeixin(params) {
+  return uploadMediaToCdn({
+    ...params,
+    mediaType: UploadMediaType.FILE,
+    label: "uploadFileAttachmentToWeixin"
+  });
+}
+var init_upload = __esm(() => {
+  init_api();
+  init_aes_ecb();
+  init_cdn_upload();
+  init_logger();
+  init_mime();
+  init_random();
+  init_types();
+});
+
 // src/weixin/messaging/send-media.ts
 import path7 from "node:path";
 async function sendWeixinMediaFile(params) {
@@ -10387,6 +10789,35 @@ function hardCutByCodepoint(s, maxBytes) {
 function resolveMediaTempDir(customRoot) {
   return customRoot ?? path9.join(tmpdir(), "weacpx", "media");
 }
+async function resolveSafeOutboundMediaPath(mediaUrl, mediaTempDir) {
+  if (mediaUrl.startsWith("http://") || mediaUrl.startsWith("https://")) {
+    return null;
+  }
+  const candidate = path9.isAbsolute(mediaUrl) ? mediaUrl : path9.resolve(mediaUrl);
+  const allowedRoots = [mediaTempDir, process.cwd()];
+  const realCandidate = await realpathOrNull(candidate);
+  if (!realCandidate) {
+    return null;
+  }
+  for (const root of allowedRoots) {
+    const realRoot = await realpathOrNull(root);
+    if (realRoot && isPathInside(realCandidate, realRoot)) {
+      return realCandidate;
+    }
+  }
+  return null;
+}
+async function realpathOrNull(filePath) {
+  try {
+    return await fs6.realpath(filePath);
+  } catch {
+    return null;
+  }
+}
+function isPathInside(candidate, root) {
+  const relative = path9.relative(root, candidate);
+  return relative === "" || !relative.startsWith("..") && !path9.isAbsolute(relative);
+}
 function createSaveMediaBuffer(mediaTempDir) {
   return async function saveMediaBuffer(buffer, contentType, subdir, _maxBytes, originalFilename) {
     const dir = path9.join(resolveMediaTempDir(mediaTempDir), subdir ?? "");
@@ -10573,12 +11004,11 @@ async function handleWeixinMessageTurn(full, deps) {
       onReplySegment: sendReplySegment
     });
     if (turn.media) {
-      let filePath;
       const mediaUrl = turn.media.url;
-      if (mediaUrl.startsWith("http://") || mediaUrl.startsWith("https://")) {
-        filePath = await downloadRemoteImageToTemp(mediaUrl, path9.join(resolveMediaTempDir(deps.mediaTempDir), "outbound"));
-      } else {
-        filePath = path9.isAbsolute(mediaUrl) ? mediaUrl : path9.resolve(mediaUrl);
+      const filePath = await resolveSafeOutboundMediaPath(mediaUrl, resolveMediaTempDir(deps.mediaTempDir));
+      if (!filePath) {
+        deps.errLog(`outbound media rejected: url=${mediaUrl}`);
+        return;
       }
       const reservedMedia = deps.reserveFinal ? deps.reserveFinal(to) : true;
       if (!reservedMedia) {
@@ -10685,7 +11115,6 @@ var MAX_FINAL_CHUNK_BYTES = 1800, hasDownloadableMedia = (media) => media?.encry
 var init_handle_weixin_message_turn = __esm(() => {
   init_api();
   init_types();
-  init_upload();
   init_media_download();
   init_mime();
   init_inbound();
@@ -11071,8 +11500,8 @@ var init_weixin_sdk = __esm(() => {
 });
 
 // src/logging/app-logger.ts
-import { appendFile, mkdir as mkdir6, readdir, rename, rm as rm5, stat } from "node:fs/promises";
-import { basename, dirname as dirname6, join as join4 } from "node:path";
+import { appendFile, mkdir as mkdir7, readdir, rename as rename2, rm as rm5, stat } from "node:fs/promises";
+import { basename as basename2, dirname as dirname7, join as join5 } from "node:path";
 function createNoopAppLogger() {
   return {
     debug: async () => {},
@@ -11112,7 +11541,7 @@ function createAppLogger(options) {
       return;
     }
     const line = formatLogLine(now(), level, event, message, context);
-    await mkdir6(dirname6(options.filePath), { recursive: true });
+    await mkdir7(dirname7(options.filePath), { recursive: true });
     await rotateIfNeeded(options.filePath, Buffer.byteLength(line), options.maxSizeBytes, options.maxFiles);
     await appendFile(options.filePath, line, "utf8");
   }
@@ -11122,7 +11551,7 @@ async function rotateIfNeeded(filePath, incomingSize, maxSizeBytes, maxFiles) {
   try {
     currentSize = (await stat(filePath)).size;
   } catch (error2) {
-    if (!isMissingFileError(error2)) {
+    if (!isMissingFileError2(error2)) {
       throw error2;
     }
   }
@@ -11140,24 +11569,24 @@ async function rotateIfNeeded(filePath, incomingSize, maxSizeBytes, maxFiles) {
   for (let index = maxFiles - 1;index >= 1; index -= 1) {
     const source = `${filePath}.${index}`;
     try {
-      await rename(source, `${filePath}.${index + 1}`);
+      await rename2(source, `${filePath}.${index + 1}`);
     } catch (error2) {
-      if (!isMissingFileError(error2)) {
+      if (!isMissingFileError2(error2)) {
         throw error2;
       }
     }
   }
-  await rename(filePath, `${filePath}.1`);
+  await rename2(filePath, `${filePath}.1`);
 }
 async function cleanupExpiredRotatedLogs(filePath, retentionDays, now) {
-  const parentDir = dirname6(filePath);
-  const prefix = `${basename(filePath)}.`;
+  const parentDir = dirname7(filePath);
+  const prefix = `${basename2(filePath)}.`;
   const cutoff = now().getTime() - retentionDays * 24 * 60 * 60 * 1000;
   let files = [];
   try {
     files = await readdir(parentDir);
   } catch (error2) {
-    if (isMissingFileError(error2)) {
+    if (isMissingFileError2(error2)) {
       return;
     }
     throw error2;
@@ -11166,7 +11595,7 @@ async function cleanupExpiredRotatedLogs(filePath, retentionDays, now) {
     if (!file.startsWith(prefix) || !/^\d+$/.test(file.slice(prefix.length))) {
       continue;
     }
-    const candidate = join4(parentDir, file);
+    const candidate = join5(parentDir, file);
     const details = await stat(candidate);
     if (details.mtime.getTime() < cutoff) {
       await rm5(candidate, { force: true });
@@ -11188,7 +11617,7 @@ function formatValue(value) {
   }
   return JSON.stringify(value);
 }
-function isMissingFileError(error2) {
+function isMissingFileError2(error2) {
   return typeof error2 === "object" && error2 !== null && "code" in error2 && error2.code === "ENOENT";
 }
 var LEVEL_ORDER;
@@ -11201,16 +11630,16 @@ var init_app_logger = __esm(() => {
 });
 
 // src/transport/acpx-session-index.ts
-import { readFile as readFile4 } from "node:fs/promises";
-import { homedir as homedir3 } from "node:os";
+import { readFile as readFile6 } from "node:fs/promises";
+import { homedir as homedir4 } from "node:os";
 import { resolve } from "node:path";
 async function resolveSessionAgentCommandFromIndex(session) {
-  const home = process.env.HOME ?? homedir3();
+  const home = process.env.HOME ?? homedir4();
   if (!home) {
     return;
   }
   try {
-    const raw = await readFile4(resolve(home, ".acpx", "sessions", "index.json"), "utf8");
+    const raw = await readFile6(resolve(home, ".acpx", "sessions", "index.json"), "utf8");
     const parsed = JSON.parse(raw);
     const targetCwd = resolve(session.cwd);
     const match = parsed.entries?.find((entry) => entry.name === session.transportSession && entry.cwd === targetCwd && typeof entry.agentCommand === "string" && entry.agentCommand.trim().length > 0);
@@ -13222,54 +13651,6 @@ var init_agent_handler = __esm(() => {
   };
 });
 
-// src/commands/workspace-path.ts
-import { access } from "node:fs/promises";
-import { homedir as homedir4 } from "node:os";
-import path11 from "node:path";
-function normalizeWorkspacePath(input) {
-  const expanded = expandHome(input);
-  if (isWindowsLikePath(expanded)) {
-    return path11.win32.normalize(expanded).replace(/\\/g, "/");
-  }
-  return path11.posix.normalize(expanded.replace(/\\/g, "/"));
-}
-function basenameForWorkspacePath(input) {
-  const normalized = normalizeWorkspacePath(input);
-  if (ROOT_PATH_RE.test(normalized)) {
-    return normalized;
-  }
-  const base = path11.posix.basename(normalized);
-  return base || normalized;
-}
-function sameWorkspacePath(left, right) {
-  const normalizedLeft = normalizeWorkspacePath(left);
-  const normalizedRight = normalizeWorkspacePath(right);
-  if (isWindowsLikePath(normalizedLeft) || isWindowsLikePath(normalizedRight)) {
-    return normalizedLeft.toLowerCase() === normalizedRight.toLowerCase();
-  }
-  return normalizedLeft === normalizedRight;
-}
-function expandHome(input) {
-  return input.startsWith("~") ? homedir4() + input.slice(1) : input;
-}
-async function pathExists(filePath) {
-  try {
-    await access(filePath);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function isWindowsLikePath(input) {
-  return WINDOWS_DRIVE_PATH_RE.test(input) || WINDOWS_UNC_PATH_RE.test(input);
-}
-var WINDOWS_DRIVE_PATH_RE, WINDOWS_UNC_PATH_RE, ROOT_PATH_RE;
-var init_workspace_path = __esm(() => {
-  WINDOWS_DRIVE_PATH_RE = /^[a-zA-Z]:[\\/]/;
-  WINDOWS_UNC_PATH_RE = /^\\\\/;
-  ROOT_PATH_RE = /^(\/|[a-zA-Z]:\/?)$/;
-});
-
 // src/commands/handlers/workspace-handler.ts
 function handleWorkspaces(context) {
   return { text: context.config ? renderWorkspaces(context.config) : "No config loaded." };
@@ -13667,9 +14048,9 @@ var init_session_recovery_handler = __esm(() => {
 // src/recovery/auto-install-optional-dep.ts
 import { spawn as spawn3 } from "node:child_process";
 import { createWriteStream } from "node:fs";
-import { mkdir as mkdir7 } from "node:fs/promises";
+import { mkdir as mkdir8 } from "node:fs/promises";
 import { homedir as homedir5 } from "node:os";
-import { join as join5 } from "node:path";
+import { join as join6 } from "node:path";
 async function autoInstallOptionalDep(pkg, parentPackages, options = {}) {
   const runCli = options.runCli ?? defaultRunCli;
   const openLog = options.openLog ?? defaultLogSink;
@@ -13784,13 +14165,13 @@ ${err.message}`, reason: "spawn" });
     });
   });
 }, defaultLogSink = async () => {
-  const dir = join5(homedir5(), ".weacpx", "logs");
-  await mkdir7(dir, { recursive: true });
+  const dir = join6(homedir5(), ".weacpx", "logs");
+  await mkdir8(dir, { recursive: true });
   const timestamp = new Date().toISOString().replace(/[:.]/g, "").replace(/-/g, "");
-  const path12 = join5(dir, `auto-install-${timestamp}.log`);
-  const stream = createWriteStream(path12, { flags: "a" });
+  const path11 = join6(dir, `auto-install-${timestamp}.log`);
+  const stream = createWriteStream(path11, { flags: "a" });
   return {
-    path: path12,
+    path: path11,
     append: async (chunk) => {
       await new Promise((resolve2, reject) => stream.write(chunk, (err) => err ? reject(err) : resolve2()));
     },
@@ -13810,9 +14191,10 @@ var init_auto_install_optional_dep = __esm(() => {
 
 // src/recovery/discover-parent-package-paths.ts
 import { spawn as spawn4 } from "node:child_process";
+import { createRequire as createRequire2 } from "node:module";
 import { access as access2 } from "node:fs/promises";
 import { homedir as homedir6 } from "node:os";
-import { dirname as dirname7, join as join6 } from "node:path";
+import { dirname as dirname8, join as join7 } from "node:path";
 function deriveParentPackageName(platformPackage) {
   return platformPackage.replace(/-(?:linux|darwin|win32|windows|freebsd|openbsd|sunos|aix)(?:-(?:x64|arm64|ia32|arm|ppc64|s390x))?(?:-(?:baseline|musl|gnu|gnueabihf|musleabihf|msvc))?$/, "");
 }
@@ -13825,7 +14207,7 @@ async function discoverParentPackagePaths(platformPackage, seedPath, deps = {})
   const queryRoot = deps.queryPackageManagerRoot ?? defaultQueryPackageManagerRoot;
   const parentName = deriveParentPackageName(platformPackage);
   const rawCandidates = [];
-  const bunGlobalRoot = env.BUN_INSTALL ? join6(env.BUN_INSTALL, "install", "global", "node_modules") : join6(home, ".bun", "install", "global", "node_modules");
+  const bunGlobalRoot = env.BUN_INSTALL ? join7(env.BUN_INSTALL, "install", "global", "node_modules") : join7(home, ".bun", "install", "global", "node_modules");
   const [npmRoot, pnpmRoot, yarnRoot] = await Promise.all([
     queryRoot("npm"),
     queryRoot("pnpm"),
@@ -13848,20 +14230,20 @@ async function discoverParentPackagePaths(platformPackage, seedPath, deps = {})
     if (resolved)
       rawCandidates.push({ path: resolved, manager: classify(resolved) });
   }
-  rawCandidates.push({ path: join6(bunGlobalRoot, parentName), manager: "bun" });
+  rawCandidates.push({ path: join7(bunGlobalRoot, parentName), manager: "bun" });
   if (npmRoot)
-    rawCandidates.push({ path: join6(npmRoot, parentName), manager: "npm" });
+    rawCandidates.push({ path: join7(npmRoot, parentName), manager: "npm" });
   if (pnpmRoot)
-    rawCandidates.push({ path: join6(pnpmRoot, parentName), manager: "pnpm" });
+    rawCandidates.push({ path: join7(pnpmRoot, parentName), manager: "pnpm" });
   if (yarnRoot)
-    rawCandidates.push({ path: join6(yarnRoot, parentName), manager: "yarn" });
+    rawCandidates.push({ path: join7(yarnRoot, parentName), manager: "yarn" });
   const seen = new Set;
   const verified = [];
   for (const candidate of rawCandidates) {
     if (seen.has(candidate.path))
       continue;
     seen.add(candidate.path);
-    if (await fsExists(join6(candidate.path, "package.json"))) {
+    if (await fsExists(join7(candidate.path, "package.json"))) {
       verified.push(candidate);
     }
   }
@@ -13872,9 +14254,9 @@ function isUnder(child, parent) {
   const p = parent.replace(/[\\/]+$/, "");
   return c === p || c.startsWith(p + "/") || c.startsWith(p + "\\");
 }
-async function defaultFsExists(path12) {
+async function defaultFsExists(path11) {
   try {
-    await access2(path12);
+    await access2(path11);
     return true;
   } catch {
     return false;
@@ -13882,10 +14264,10 @@ async function defaultFsExists(path12) {
 }
 function defaultResolveFromCwd(name, cwd) {
   try {
-    const pkgJson = __require.resolve(`${name}/package.json`, {
-      paths: [cwd, ...__require.resolve.paths(name) ?? []]
+    const pkgJson = require2.resolve(`${name}/package.json`, {
+      paths: [cwd, ...require2.resolve.paths(name) ?? []]
     });
-    return dirname7(pkgJson);
+    return dirname8(pkgJson);
   } catch {
     return null;
   }
@@ -13932,11 +14314,14 @@ async function defaultQueryPackageManagerRoot(tool) {
       const trimmed = stdout2.trim().split(/\r?\n/).pop()?.trim() ?? "";
       if (!trimmed)
         return done(null);
-      done(spec.postfix ? join6(trimmed, spec.postfix) : trimmed);
+      done(spec.postfix ? join7(trimmed, spec.postfix) : trimmed);
     });
   });
 }
-var init_discover_parent_package_paths = () => {};
+var require2;
+var init_discover_parent_package_paths = __esm(() => {
+  require2 = createRequire2(import.meta.url);
+});
 
 // src/commands/translate-acpx-note.ts
 function translateAcpxNote(raw) {
@@ -14415,284 +14800,9 @@ var init_command_router = __esm(() => {
   init_session_reset_handler();
 });
 
-// src/config/resolve-agent-command.ts
-function resolveAgentCommand(driver, command) {
-  if (!command) {
-    return;
-  }
-  if (driver === "codex" && isLegacyCodexCommand(command)) {
-    return;
-  }
-  return command;
-}
-function isLegacyCodexCommand(command) {
-  const normalized = command.trim().replaceAll("\\", "/").toLowerCase();
-  return normalized === "./node_modules/.bin/codex-acp" || normalized === "./node_modules/.bin/codex-acp.exe" || normalized.endsWith("/node_modules/.bin/codex-acp") || normalized.endsWith("/node_modules/.bin/codex-acp.exe") || normalized.includes("/@zed-industries/codex-acp/bin/codex-acp.js") || normalized.includes("@zed-industries/codex-acp/bin/codex-acp.js");
-}
-
-// src/config/load-config.ts
-import { readFile as readFile5 } from "node:fs/promises";
-function isRecord(value) {
-  return typeof value === "object" && value !== null;
-}
-async function loadConfig(path12, options = {}) {
-  const raw = JSON.parse(await readFile5(path12, "utf8"));
-  return parseConfig(raw, options);
-}
-function parseConfig(raw, options = {}) {
-  if (!isRecord(raw)) {
-    throw new Error("config must be a JSON object");
-  }
-  const transport = raw.transport;
-  if (!isRecord(transport)) {
-    throw new Error("transport must be an object");
-  }
-  if ("type" in transport && transport.type !== "acpx-cli" && transport.type !== "acpx-bridge") {
-    throw new Error("transport.type must be acpx-cli or acpx-bridge");
-  }
-  if ("sessionInitTimeoutMs" in transport && (typeof transport.sessionInitTimeoutMs !== "number" || !Number.isFinite(transport.sessionInitTimeoutMs) || transport.sessionInitTimeoutMs <= 0)) {
-    throw new Error("transport.sessionInitTimeoutMs must be a positive number");
-  }
-  if ("permissionMode" in transport && transport.permissionMode !== "approve-all" && transport.permissionMode !== "approve-reads" && transport.permissionMode !== "deny-all") {
-    throw new Error("transport.permissionMode must be approve-all, approve-reads, or deny-all");
-  }
-  if ("nonInteractivePermissions" in transport && transport.nonInteractivePermissions !== "deny" && transport.nonInteractivePermissions !== "fail") {
-    throw new Error("transport.nonInteractivePermissions must be deny or fail");
-  }
-  if (!isRecord(raw.agents)) {
-    throw new Error("agents must be an object");
-  }
-  if (!isRecord(raw.workspaces)) {
-    throw new Error("workspaces must be an object");
-  }
-  const logging = raw.logging;
-  const wechat = raw.wechat;
-  const orchestration = raw.orchestration;
-  if (logging !== undefined && !isRecord(logging)) {
-    throw new Error("logging must be an object");
-  }
-  if (wechat !== undefined && !isRecord(wechat)) {
-    throw new Error("wechat must be an object");
-  }
-  if (orchestration !== undefined && !isRecord(orchestration)) {
-    throw new Error("orchestration must be an object");
-  }
-  if (isRecord(logging) && "level" in logging && logging.level !== "error" && logging.level !== "info" && logging.level !== "debug") {
-    throw new Error("logging.level must be error, info, or debug");
-  }
-  for (const field of ["maxSizeBytes", "maxFiles", "retentionDays"]) {
-    if (isRecord(logging) && field in logging && (typeof logging[field] !== "number" || !Number.isFinite(logging[field]) || logging[field] <= 0)) {
-      throw new Error(`logging.${field} must be a positive number`);
-    }
-  }
-  if (isRecord(wechat) && "replyMode" in wechat && wechat.replyMode !== "stream" && wechat.replyMode !== "final" && wechat.replyMode !== "verbose") {
-    throw new Error("wechat.replyMode must be stream, final, or verbose");
-  }
-  for (const [name, agent] of Object.entries(raw.agents)) {
-    if (!isRecord(agent) || typeof agent.driver !== "string" || agent.driver.length === 0) {
-      throw new Error(`agent "${name}" must define a non-empty driver`);
-    }
-    if ("command" in agent && (typeof agent.command !== "string" || agent.command.length === 0)) {
-      throw new Error(`agent "${name}" command must be a non-empty string`);
-    }
-  }
-  for (const [name, workspace] of Object.entries(raw.workspaces)) {
-    if (!isRecord(workspace) || typeof workspace.cwd !== "string" || workspace.cwd.length === 0) {
-      throw new Error(`workspace "${name}" must define a non-empty cwd`);
-    }
-    if ("allowed_agents" in workspace && (!Array.isArray(workspace.allowed_agents) || workspace.allowed_agents.some((value) => typeof value !== "string"))) {
-      throw new Error(`workspace "${name}" allowed_agents must be an array of strings`);
-    }
-  }
-  const rawAgents = raw.agents;
-  const agents = {};
-  for (const [name, agent] of Object.entries(rawAgents)) {
-    const driver = agent.driver;
-    const command = typeof agent.command === "string" ? resolveAgentCommand(driver, agent.command) : undefined;
-    agents[name] = {
-      driver,
-      ...command ? { command } : {}
-    };
-  }
-  const rawWorkspaces = raw.workspaces;
-  const workspaces = {};
-  for (const [name, workspace] of Object.entries(rawWorkspaces)) {
-    workspaces[name] = {
-      cwd: normalizeWorkspacePath(workspace.cwd),
-      ...typeof workspace.description === "string" ? { description: workspace.description } : {}
-    };
-  }
-  const transportType = transport.type === "acpx-cli" || transport.type === "acpx-bridge" ? transport.type : "acpx-bridge";
-  const permissionMode = transport.permissionMode === "approve-all" || transport.permissionMode === "approve-reads" || transport.permissionMode === "deny-all" ? transport.permissionMode : DEFAULT_PERMISSION_MODE;
-  const nonInteractivePermissions = transport.nonInteractivePermissions === "deny" || transport.nonInteractivePermissions === "fail" ? transport.nonInteractivePermissions : DEFAULT_NON_INTERACTIVE_PERMISSIONS;
-  const loggingLevel = logging?.level;
-  const resolvedLoggingLevel = loggingLevel === "error" || loggingLevel === "info" || loggingLevel === "debug" ? loggingLevel : options.defaultLoggingLevel ?? DEFAULT_LOGGING_CONFIG.level;
-  const replyMode = wechat?.replyMode === "stream" || wechat?.replyMode === "final" || wechat?.replyMode === "verbose" ? wechat.replyMode : DEFAULT_WECHAT_REPLY_MODE;
-  const orchestrationConfig = parseOrchestrationConfig(orchestration);
-  return {
-    transport: {
-      ...typeof transport.command === "string" ? { command: transport.command } : {},
-      ...typeof transport.sessionInitTimeoutMs === "number" ? { sessionInitTimeoutMs: transport.sessionInitTimeoutMs } : {},
-      type: transportType,
-      permissionMode,
-      nonInteractivePermissions
-    },
-    logging: {
-      level: resolvedLoggingLevel,
-      maxSizeBytes: typeof logging?.maxSizeBytes === "number" ? logging.maxSizeBytes : DEFAULT_LOGGING_CONFIG.maxSizeBytes,
-      maxFiles: typeof logging?.maxFiles === "number" ? logging.maxFiles : DEFAULT_LOGGING_CONFIG.maxFiles,
-      retentionDays: typeof logging?.retentionDays === "number" ? logging.retentionDays : DEFAULT_LOGGING_CONFIG.retentionDays
-    },
-    wechat: {
-      replyMode
-    },
-    agents,
-    workspaces,
-    orchestration: orchestrationConfig
-  };
-}
-function parseOrchestrationConfig(raw) {
-  if (!isRecord(raw)) {
-    return {
-      ...DEFAULT_ORCHESTRATION_CONFIG
-    };
-  }
-  return {
-    maxPendingAgentRequestsPerCoordinator: typeof raw.maxPendingAgentRequestsPerCoordinator === "number" && Number.isFinite(raw.maxPendingAgentRequestsPerCoordinator) && raw.maxPendingAgentRequestsPerCoordinator > 0 ? raw.maxPendingAgentRequestsPerCoordinator : DEFAULT_ORCHESTRATION_CONFIG.maxPendingAgentRequestsPerCoordinator,
-    allowWorkerChainedRequests: raw.allowWorkerChainedRequests === true,
-    allowedAgentRequestTargets: Array.isArray(raw.allowedAgentRequestTargets) ? raw.allowedAgentRequestTargets.filter((value) => typeof value === "string") : [...DEFAULT_ORCHESTRATION_CONFIG.allowedAgentRequestTargets],
-    allowedAgentRequestRoles: Array.isArray(raw.allowedAgentRequestRoles) ? raw.allowedAgentRequestRoles.filter((value) => typeof value === "string") : [...DEFAULT_ORCHESTRATION_CONFIG.allowedAgentRequestRoles],
-    progressHeartbeatSeconds: typeof raw.progressHeartbeatSeconds === "number" && Number.isFinite(raw.progressHeartbeatSeconds) ? raw.progressHeartbeatSeconds : DEFAULT_ORCHESTRATION_CONFIG.progressHeartbeatSeconds
-  };
-}
-var DEFAULT_LOGGING_CONFIG, DEFAULT_PERMISSION_MODE = "approve-all", DEFAULT_NON_INTERACTIVE_PERMISSIONS = "deny", DEFAULT_WECHAT_REPLY_MODE = "verbose", DEFAULT_ORCHESTRATION_CONFIG;
-var init_load_config = __esm(() => {
-  init_workspace_path();
-  DEFAULT_LOGGING_CONFIG = {
-    level: "info",
-    maxSizeBytes: 2 * 1024 * 1024,
-    maxFiles: 5,
-    retentionDays: 7
-  };
-  DEFAULT_ORCHESTRATION_CONFIG = {
-    maxPendingAgentRequestsPerCoordinator: 3,
-    allowWorkerChainedRequests: false,
-    allowedAgentRequestTargets: [],
-    allowedAgentRequestRoles: [],
-    progressHeartbeatSeconds: 300
-  };
-});
-
-// src/config/config-store.ts
-import { mkdir as mkdir8, writeFile as writeFile5 } from "node:fs/promises";
-import { dirname as dirname8 } from "node:path";
-
-class ConfigStore {
-  path;
-  constructor(path12) {
-    this.path = path12;
-  }
-  async load() {
-    return await loadConfig(this.path);
-  }
-  async save(config2) {
-    await mkdir8(dirname8(this.path), { recursive: true });
-    await writeFile5(this.path, `${JSON.stringify(config2, null, 2)}
-`, "utf8");
-  }
-  async upsertWorkspace(name, cwd, description) {
-    const config2 = await this.load();
-    const workspace = {
-      cwd,
-      ...description ? { description } : {}
-    };
-    config2.workspaces[name] = workspace;
-    await this.save(config2);
-    return config2;
-  }
-  async removeWorkspace(name) {
-    const config2 = await this.load();
-    delete config2.workspaces[name];
-    await this.save(config2);
-    return config2;
-  }
-  async upsertAgent(name, agent) {
-    const config2 = await this.load();
-    config2.agents[name] = agent;
-    await this.save(config2);
-    return config2;
-  }
-  async removeAgent(name) {
-    const config2 = await this.load();
-    delete config2.agents[name];
-    await this.save(config2);
-    return config2;
-  }
-  async updateTransport(transport) {
-    const config2 = await this.load();
-    config2.transport = {
-      ...config2.transport,
-      ...transport
-    };
-    await this.save(config2);
-    return config2;
-  }
-  async updateWechat(wechat) {
-    const config2 = await this.load();
-    config2.wechat = {
-      ...config2.wechat,
-      ...wechat
-    };
-    await this.save(config2);
-    return config2;
-  }
-}
-var init_config_store = __esm(() => {
-  init_load_config();
-});
-
-// src/config/ensure-config.ts
-import { readFile as readFile6 } from "node:fs/promises";
-async function ensureConfigExists(path12) {
-  try {
-    await loadConfig(path12);
-  } catch (error2) {
-    if (!isMissingFileError2(error2)) {
-      throw error2;
-    }
-    const store = new ConfigStore(path12);
-    await store.save(await loadDefaultConfigTemplate());
-  }
-}
-async function loadDefaultConfigTemplate() {
-  const templatePath = new URL("../../config.example.json", import.meta.url);
-  return normalizeDefaultConfigTemplate(JSON.parse(await readFile6(templatePath, "utf8")));
-}
-function normalizeDefaultConfigTemplate(raw) {
-  const template = parseConfig(raw);
-  return {
-    ...template,
-    agents: Object.fromEntries(Object.entries(template.agents).map(([name, agent]) => [
-      name,
-      {
-        driver: agent.driver,
-        ...resolveAgentCommand(agent.driver, agent.command) ? { command: resolveAgentCommand(agent.driver, agent.command) } : {}
-      }
-    ])),
-    workspaces: {}
-  };
-}
-function isMissingFileError2(error2) {
-  return typeof error2 === "object" && error2 !== null && "code" in error2 && error2.code === "ENOENT";
-}
-var init_ensure_config = __esm(() => {
-  init_config_store();
-  init_load_config();
-});
-
 // src/config/resolve-acpx-command.ts
 import { readFileSync } from "node:fs";
-import { createRequire as createRequire2 } from "node:module";
+import { createRequire as createRequire3 } from "node:module";
 import { posix, win32 } from "node:path";
 function resolveAcpxCommand(options = {}) {
   return resolveAcpxCommandMetadata(options).command;
@@ -14706,8 +14816,8 @@ function resolveAcpxCommandMetadata(options = {}) {
     };
   }
   const platform = options.platform ?? process.platform;
-  const resolvePackageJson = options.resolvePackageJson ?? ((id) => require2.resolve(id));
-  const readPackageJson = options.readPackageJson ?? ((path12) => JSON.parse(readFileSync(path12, "utf8")));
+  const resolvePackageJson = options.resolvePackageJson ?? ((id) => require3.resolve(id));
+  const readPackageJson = options.readPackageJson ?? ((path11) => JSON.parse(readFileSync(path11, "utf8")));
   try {
     const packageJsonPath = resolvePackageJson("acpx/package.json");
     const pkg = readPackageJson(packageJsonPath);
@@ -14728,9 +14838,9 @@ function resolveAcpxCommandMetadata(options = {}) {
     explanation: "transport.command is unset and no bundled acpx was found, so PATH is the fallback."
   };
 }
-var require2;
+var require3;
 var init_resolve_acpx_command = __esm(() => {
-  require2 = createRequire2(import.meta.url);
+  require3 = createRequire3(import.meta.url);
 });
 
 // src/console-agent.ts
@@ -14979,8 +15089,8 @@ class OrchestrationServer {
     if (this.endpoint.kind !== "unix") {
       return;
     }
-    const removeFile = this.deps.removeFile ?? (async (path12) => {
-      await rm6(path12, { force: true });
+    const removeFile = this.deps.removeFile ?? (async (path11) => {
+      await rm6(path11, { force: true });
     });
     await removeFile(this.endpoint.path);
   }
@@ -15113,9 +15223,9 @@ function requireTaskQuestions(params, key) {
     };
   });
 }
-async function canConnectToEndpoint(path12) {
+async function canConnectToEndpoint(path11) {
   return await new Promise((resolve2) => {
-    const socket = createConnection2(path12);
+    const socket = createConnection2(path11);
     let settled = false;
     const finish = (result) => {
       if (settled) {
@@ -15136,7 +15246,7 @@ async function canConnectToEndpoint(path12) {
     });
   });
 }
-async function listen(server, path12) {
+async function listen(server, path11) {
   await new Promise((resolve2, reject) => {
     const onError = (error2) => {
       server.off("listening", onListening);
@@ -15148,7 +15258,7 @@ async function listen(server, path12) {
     };
     server.once("error", onError);
     server.once("listening", onListening);
-    server.listen(path12);
+    server.listen(path11);
   });
 }
 function isServerNotRunningError(error2) {
@@ -17748,8 +17858,7 @@ function createEmptyState() {
 var init_types2 = () => {};
 
 // src/state/state-store.ts
-import { mkdir as mkdir9, readFile as readFile7, writeFile as writeFile6 } from "node:fs/promises";
-import { dirname as dirname9 } from "node:path";
+import { readFile as readFile7 } from "node:fs/promises";
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -17842,69 +17951,69 @@ function isHumanQuestionPackageRecord(value) {
   const messages = value.messages;
   return isString(value.packageId) && isString(value.coordinatorSession) && (value.status === "active" || value.status === "closed") && isString(value.createdAt) && isString(value.updatedAt) && isOptionalString(value.closedAt) && Array.isArray(initialTaskIds) && initialTaskIds.every(isString) && Array.isArray(openTaskIds) && openTaskIds.every(isString) && Array.isArray(resolvedTaskIds) && resolvedTaskIds.every(isString) && Array.isArray(messages) && messages.every(isHumanQuestionPackageMessageRecord) && isOptionalString(value.awaitingReplyMessageId);
 }
-function parseOrchestrationState(raw, path12) {
+function parseOrchestrationState(raw, path11) {
   if (raw === undefined) {
     return createEmptyOrchestrationState();
   }
   if (!isRecord2(raw)) {
-    throw new Error(`state file "${path12}" must contain an object field "orchestration"`);
+    throw new Error(`state file "${path11}" must contain an object field "orchestration"`);
   }
   const tasks = raw.tasks;
   if (tasks !== undefined && !isRecord2(tasks)) {
-    throw new Error(`state file "${path12}" must contain an object field "orchestration.tasks"`);
+    throw new Error(`state file "${path11}" must contain an object field "orchestration.tasks"`);
   }
   const workerBindings = raw.workerBindings;
   if (workerBindings !== undefined && !isRecord2(workerBindings)) {
-    throw new Error(`state file "${path12}" must contain an object field "orchestration.workerBindings"`);
+    throw new Error(`state file "${path11}" must contain an object field "orchestration.workerBindings"`);
   }
   const groups = raw.groups;
   if (groups !== undefined && !isRecord2(groups)) {
-    throw new Error(`state file "${path12}" must contain an object field "orchestration.groups"`);
+    throw new Error(`state file "${path11}" must contain an object field "orchestration.groups"`);
   }
   const humanQuestionPackages = raw.humanQuestionPackages;
   if (humanQuestionPackages !== undefined && !isRecord2(humanQuestionPackages)) {
-    throw new Error(`state file "${path12}" must contain an object field "orchestration.humanQuestionPackages"`);
+    throw new Error(`state file "${path11}" must contain an object field "orchestration.humanQuestionPackages"`);
   }
   const coordinatorQuestionState = raw.coordinatorQuestionState;
   if (coordinatorQuestionState !== undefined && !isRecord2(coordinatorQuestionState)) {
-    throw new Error(`state file "${path12}" must contain an object field "orchestration.coordinatorQuestionState"`);
+    throw new Error(`state file "${path11}" must contain an object field "orchestration.coordinatorQuestionState"`);
   }
   const coordinatorRoutes = raw.coordinatorRoutes;
   if (coordinatorRoutes !== undefined && !isRecord2(coordinatorRoutes)) {
-    throw new Error(`state file "${path12}" must contain an object field "orchestration.coordinatorRoutes"`);
+    throw new Error(`state file "${path11}" must contain an object field "orchestration.coordinatorRoutes"`);
   }
   const parsedTasks = {};
   for (const [taskId, task] of Object.entries(tasks ?? {})) {
     if (!isTaskRecord(task)) {
-      throw new Error(`state file "${path12}" contains an invalid orchestration task at "${taskId}"`);
+      throw new Error(`state file "${path11}" contains an invalid orchestration task at "${taskId}"`);
     }
     parsedTasks[taskId] = task;
   }
   const parsedWorkerBindings = {};
   for (const [workerSession, binding] of Object.entries(workerBindings ?? {})) {
     if (!isWorkerBindingRecord(binding)) {
-      throw new Error(`state file "${path12}" contains an invalid orchestration worker binding at "${workerSession}"`);
+      throw new Error(`state file "${path11}" contains an invalid orchestration worker binding at "${workerSession}"`);
     }
     parsedWorkerBindings[workerSession] = binding;
   }
   const parsedGroups = {};
   for (const [groupId, group] of Object.entries(groups ?? {})) {
     if (!isGroupRecord(group)) {
-      throw new Error(`state file "${path12}" contains an invalid orchestration group at "${groupId}"`);
+      throw new Error(`state file "${path11}" contains an invalid orchestration group at "${groupId}"`);
     }
     parsedGroups[groupId] = group;
   }
   const parsedHumanQuestionPackages = {};
   for (const [packageId, packageRecord] of Object.entries(humanQuestionPackages ?? {})) {
     if (!isHumanQuestionPackageRecord(packageRecord)) {
-      throw new Error(`state file "${path12}" contains an invalid human question package at "${packageId}"`);
+      throw new Error(`state file "${path11}" contains an invalid human question package at "${packageId}"`);
     }
     parsedHumanQuestionPackages[packageId] = packageRecord;
   }
   const parsedCoordinatorQuestionState = {};
   for (const [coordinatorSession, questionState] of Object.entries(coordinatorQuestionState ?? {})) {
     if (!isCoordinatorQuestionStateRecord(questionState)) {
-      throw new Error(`state file "${path12}" contains an invalid coordinator question state at "${coordinatorSession}"`);
+      throw new Error(`state file "${path11}" contains an invalid coordinator question state at "${coordinatorSession}"`);
     }
     parsedCoordinatorQuestionState[coordinatorSession] = {
       activePackageId: questionState.activePackageId,
@@ -17914,7 +18023,7 @@ function parseOrchestrationState(raw, path12) {
   const parsedCoordinatorRoutes = {};
   for (const [coordinatorSession, route] of Object.entries(coordinatorRoutes ?? {})) {
     if (!isCoordinatorRouteContextRecord(route)) {
-      throw new Error(`state file "${path12}" contains an invalid coordinator route at "${coordinatorSession}"`);
+      throw new Error(`state file "${path11}" contains an invalid coordinator route at "${coordinatorSession}"`);
     }
     parsedCoordinatorRoutes[coordinatorSession] = route;
   }
@@ -17927,30 +18036,62 @@ function parseOrchestrationState(raw, path12) {
     coordinatorRoutes: parsedCoordinatorRoutes
   };
 }
-function parseState(raw, path12) {
+function isReplyMode(value) {
+  return value === "stream" || value === "final" || value === "verbose";
+}
+function isSessionRecord(value) {
+  if (!isRecord2(value)) {
+    return false;
+  }
+  return isString(value.alias) && isString(value.agent) && isString(value.workspace) && isString(value.transport_session) && isOptionalString(value.transport_agent_command) && isOptionalString(value.mode_id) && (value.reply_mode === undefined || isReplyMode(value.reply_mode)) && isString(value.created_at) && isString(value.last_used_at);
+}
+function parseSessions(raw, path11) {
+  const sessions = {};
+  for (const [alias, value] of Object.entries(raw)) {
+    if (!isSessionRecord(value)) {
+      throw new Error(`state file "${path11}" contains malformed session record "${alias}"`);
+    }
+    sessions[alias] = value;
+  }
+  return sessions;
+}
+function isChatContextRecord(value) {
+  return isRecord2(value) && isString(value.current_session);
+}
+function parseChatContexts(raw, path11) {
+  const chatContexts = {};
+  for (const [chatKey, value] of Object.entries(raw)) {
+    if (!isChatContextRecord(value)) {
+      throw new Error(`state file "${path11}" contains malformed chat context record "${chatKey}"`);
+    }
+    chatContexts[chatKey] = value;
+  }
+  return chatContexts;
+}
+function parseState(raw, path11) {
   if (!isRecord2(raw)) {
-    throw new Error(`state file "${path12}" must contain a JSON object`);
+    throw new Error(`state file "${path11}" must contain a JSON object`);
   }
   const sessions = raw.sessions;
   if (!isRecord2(sessions)) {
-    throw new Error(`state file "${path12}" must contain an object field "sessions"`);
+    throw new Error(`state file "${path11}" must contain an object field "sessions"`);
   }
   const chatContexts = raw.chat_contexts;
   if (!isRecord2(chatContexts)) {
-    throw new Error(`state file "${path12}" must contain an object field "chat_contexts"`);
+    throw new Error(`state file "${path11}" must contain an object field "chat_contexts"`);
   }
-  const orchestration = parseOrchestrationState(raw.orchestration, path12);
+  const orchestration = parseOrchestrationState(raw.orchestration, path11);
   return {
-    sessions,
-    chat_contexts: chatContexts,
+    sessions: parseSessions(sessions, path11),
+    chat_contexts: parseChatContexts(chatContexts, path11),
     orchestration
   };
 }
 
 class StateStore {
   path;
-  constructor(path12) {
-    this.path = path12;
+  constructor(path11) {
+    this.path = path11;
   }
   async load() {
     try {
@@ -17975,11 +18116,11 @@ class StateStore {
     }
   }
   async save(state) {
-    await mkdir9(dirname9(this.path), { recursive: true });
-    await writeFile6(this.path, JSON.stringify(state, null, 2));
+    await writePrivateFileAtomic(this.path, JSON.stringify(state, null, 2));
   }
 }
 var init_state_store = __esm(() => {
+  init_private_file();
   init_types2();
 });
 
@@ -18318,7 +18459,7 @@ async function spawnAcpxBridgeClient(options = {}) {
       await client.request("shutdown", {});
     } finally {
       child.stdin.end();
-      await terminateProcessTree(child.pid ?? 0);
+      await terminateProcessTree(child.pid ?? 0, { detachedProcessGroup: false });
     }
   };
   await client.waitUntilReady();
@@ -18781,19 +18922,19 @@ var init_streaming_prompt = __esm(() => {
 
 // src/transport/acpx-cli/node-pty-helper.ts
 import { chmod as chmodFs } from "node:fs/promises";
-import { dirname as dirname10, join as join7 } from "node:path";
+import { dirname as dirname9, join as join8 } from "node:path";
 function resolveNodePtyHelperPath(packageJsonPath, platform, arch) {
   if (platform === "win32") {
     return null;
   }
-  return join7(dirname10(packageJsonPath), "prebuilds", `${platform}-${arch}`, "spawn-helper");
+  return join8(dirname9(packageJsonPath), "prebuilds", `${platform}-${arch}`, "spawn-helper");
 }
-async function ensureNodePtyHelperExecutable(helperPath, chmod = chmodFs) {
+async function ensureNodePtyHelperExecutable(helperPath, chmod2 = chmodFs) {
   if (!helperPath) {
     return;
   }
   try {
-    await chmod(helperPath, 493);
+    await chmod2(helperPath, 493);
   } catch (error2) {
     if (error2.code === "ENOENT") {
       return;
@@ -18806,9 +18947,9 @@ var init_node_pty_helper = () => {};
 // src/transport/acpx-queue-owner-launcher.ts
 import { createHash as createHash2 } from "node:crypto";
 import { spawn as spawn6 } from "node:child_process";
-import { readFile as readFile8, unlink } from "node:fs/promises";
+import { readFile as readFile8, unlink as unlink2 } from "node:fs/promises";
 import { homedir as homedir7 } from "node:os";
-import { join as join8 } from "node:path";
+import { join as join9 } from "node:path";
 function buildWeacpxMcpServerSpec(input) {
   const { command, args } = splitCommandLine(input.weacpxCommand);
   return {
@@ -18965,12 +19106,12 @@ async function terminateAcpxQueueOwner(sessionId) {
     return;
   }
   if (typeof owner.pid === "number" && Number.isInteger(owner.pid) && owner.pid > 0) {
-    await terminateProcessTree(owner.pid);
+    await terminateProcessTree(owner.pid, { detachedProcessGroup: true });
   }
-  await unlink(lockPath).catch(() => {});
+  await unlink2(lockPath).catch(() => {});
 }
 function queueLockFilePath(sessionId) {
-  return join8(homedir7(), ".acpx", "queues", `${shortHash(sessionId, 24)}.lock`);
+  return join9(homedir7(), ".acpx", "queues", `${shortHash(sessionId, 24)}.lock`);
 }
 function shortHash(value, length) {
   return createHash2("sha256").update(value).digest("hex").slice(0, length);
@@ -19008,7 +19149,7 @@ function permissionModeToFlag(permissionMode) {
 }
 
 // src/transport/acpx-cli/acpx-cli-transport.ts
-import { createRequire as createRequire3 } from "node:module";
+import { createRequire as createRequire4 } from "node:module";
 import { spawn as spawn7 } from "node:child_process";
 import { spawn as spawnPty } from "node-pty";
 async function defaultRunner(command, args, options) {
@@ -19017,8 +19158,12 @@ async function defaultRunner(command, args, options) {
     const child = spawn7(spawnSpec.command, spawnSpec.args, { stdio: ["ignore", "pipe", "pipe"] });
     let stdout2 = "";
     let stderr = "";
+    const onAbort = () => {
+      terminateProcessTree(child.pid ?? 0, { detachedProcessGroup: false });
+    };
+    options?.signal?.addEventListener("abort", onAbort, { once: true });
     const timeoutId = options?.timeoutMs ? setTimeout(() => {
-      terminateProcessTree(child.pid ?? 0);
+      onAbort();
       reject(new Error(`acpx command timed out after ${options.timeoutMs}ms: ${renderCommandForError(args)}`));
     }, options.timeoutMs) : undefined;
     child.stdout.on("data", (chunk) => {
@@ -19028,11 +19173,13 @@ async function defaultRunner(command, args, options) {
       stderr += String(chunk);
     });
     child.on("error", (error2) => {
+      options?.signal?.removeEventListener("abort", onAbort);
       if (timeoutId)
         clearTimeout(timeoutId);
       reject(error2);
     });
     child.on("close", (code) => {
+      options?.signal?.removeEventListener("abort", onAbort);
       if (timeoutId)
         clearTimeout(timeoutId);
       resolve2({ code: code ?? 1, stdout: stdout2, stderr });
@@ -19040,7 +19187,7 @@ async function defaultRunner(command, args, options) {
   });
 }
 async function defaultPtyRunner(command, args, options) {
-  const helperPath = resolveNodePtyHelperPath(require3.resolve("node-pty/package.json"), process.platform, process.arch);
+  const helperPath = resolveNodePtyHelperPath(require4.resolve("node-pty/package.json"), process.platform, process.arch);
   await ensureNodePtyHelperExecutable(helperPath);
   return await new Promise((resolve2, reject) => {
     const spawnSpec = resolveSpawnCommand(command, args);
@@ -19052,14 +19199,19 @@ async function defaultPtyRunner(command, args, options) {
       env: process.env
     });
     let output = "";
-    const timeoutId = options?.timeoutMs ? setTimeout(() => {
+    const onAbort = () => {
       child.kill();
+    };
+    options?.signal?.addEventListener("abort", onAbort, { once: true });
+    const timeoutId = options?.timeoutMs ? setTimeout(() => {
+      onAbort();
       reject(new Error(`acpx command timed out after ${options.timeoutMs}ms: ${renderCommandForError(args)}`));
     }, options.timeoutMs) : undefined;
     child.onData((chunk) => {
       output += chunk;
     });
     child.onExit(({ exitCode }) => {
+      options?.signal?.removeEventListener("abort", onAbort);
       if (timeoutId)
         clearTimeout(timeoutId);
       resolve2({ code: exitCode, stdout: output, stderr: "" });
@@ -19217,15 +19369,17 @@ ${baseText}` : "" };
     if (!options?.timeoutMs) {
       return await runner(spawnSpec.command, spawnSpec.args, undefined);
     }
+    const abortController = new AbortController;
     let timeoutId;
     return await Promise.race([
-      runner(spawnSpec.command, spawnSpec.args, options).finally(() => {
+      runner(spawnSpec.command, spawnSpec.args, { ...options, signal: abortController.signal }).finally(() => {
         if (timeoutId)
           clearTimeout(timeoutId);
       }),
       new Promise((_, reject) => {
         timeoutId = setTimeout(() => {
           reject(new Error(`acpx command timed out after ${options.timeoutMs}ms: ${renderCommandForError(args)}`));
+          abortController.abort();
         }, options.timeoutMs);
       })
     ]);
@@ -19349,7 +19503,7 @@ function renderCommandForError(args) {
   }
   return rendered.join(" ");
 }
-var require3;
+var require4;
 var init_acpx_cli_transport = __esm(() => {
   init_spawn_command();
   init_prompt_output();
@@ -19358,7 +19512,7 @@ var init_acpx_cli_transport = __esm(() => {
   init_node_pty_helper();
   init_terminate_process_tree();
   init_acpx_queue_owner_launcher();
-  require3 = createRequire3(import.meta.url);
+  require4 = createRequire4(import.meta.url);
 });
 
 // src/weixin/messaging/orchestration-notice-accounts.ts
@@ -19700,7 +19854,7 @@ __export(exports_main, {
 });
 import { randomUUID as randomUUID3 } from "node:crypto";
 import { homedir as homedir8 } from "node:os";
-import { dirname as dirname11, join as join9 } from "node:path";
+import { dirname as dirname10, join as join10 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function startProgressHeartbeat(orchestration, config2, logger2, quota) {
   const thresholdSeconds = config2.orchestration.progressHeartbeatSeconds;
@@ -20111,7 +20265,7 @@ function resolveRuntimePaths() {
     throw new Error("Unable to resolve the current user home directory");
   }
   const configPath = process.env.WEACPX_CONFIG ?? `${home}/.weacpx/config.json`;
-  const runtimeDir = join9(dirname11(configPath), "runtime");
+  const runtimeDir = join10(dirname10(configPath), "runtime");
   return {
     configPath,
     statePath: process.env.WEACPX_STATE ?? `${home}/.weacpx/state.json`,
@@ -20125,9 +20279,9 @@ function resolveBridgeEntryPath() {
   return fileURLToPath3(new URL("./bridge/bridge-main.ts", import.meta.url));
 }
 function resolveAppLogPath(configPath) {
-  const rootDir = dirname11(configPath);
-  const runtimeDir = join9(rootDir, "runtime");
-  return join9(runtimeDir, "app.log");
+  const rootDir = dirname10(configPath);
+  const runtimeDir = join10(rootDir, "runtime");
+  return join10(runtimeDir, "app.log");
 }
 function resolveOrchestrationSocketPathFromConfigPath(configPath) {
   const runtimeDir = resolveRuntimeDirFromConfigPath(configPath);
@@ -20530,7 +20684,7 @@ async function checkOrchestrationHealth(options) {
 // src/doctor/checks/runtime-check.ts
 import { constants } from "node:fs";
 import { access as access3, stat as stat2 } from "node:fs/promises";
-import { dirname as dirname12 } from "node:path";
+import { dirname as dirname11 } from "node:path";
 import { homedir as homedir10 } from "node:os";
 async function checkRuntime(options = {}) {
   const home = options.home ?? process.env.HOME ?? homedir10();
@@ -20568,107 +20722,107 @@ async function checkRuntime(options = {}) {
 }
 function createRuntimeFsProbe() {
   return {
-    stat: async (path12) => await stat2(path12),
-    access: async (path12, mode) => await access3(path12, mode)
+    stat: async (path11) => await stat2(path11),
+    access: async (path11, mode) => await access3(path11, mode)
   };
 }
-async function checkDirectoryCreatable(label, path12, probe, platform) {
+async function checkDirectoryCreatable(label, path11, probe, platform) {
   try {
-    const stats = await probe.stat(path12);
+    const stats = await probe.stat(path11);
     if (!stats.isDirectory()) {
       return {
         ok: false,
-        detail: `${label}: ${path12} (exists but is not a directory)`
+        detail: `${label}: ${path11} (exists but is not a directory)`
       };
     }
-    await probe.access(path12, directoryAccessMode(platform));
+    await probe.access(path11, directoryAccessMode(platform));
     return {
       ok: true,
-      detail: `${label}: ${path12} (writable)`
+      detail: `${label}: ${path11} (writable)`
     };
   } catch (error2) {
     if (!isMissingPathError(error2)) {
       return {
         ok: false,
-        detail: `${label}: ${path12} (unusable: ${formatError6(error2)})`
+        detail: `${label}: ${path11} (unusable: ${formatError6(error2)})`
       };
     }
-    const parentCheck = await checkCreatableAncestorDirectory(path12, probe, platform);
+    const parentCheck = await checkCreatableAncestorDirectory(path11, probe, platform);
     if (!parentCheck.ok) {
       return {
         ok: false,
-        detail: `${label}: ${path12} (parent not writable: ${parentCheck.blockingPath})`
+        detail: `${label}: ${path11} (parent not writable: ${parentCheck.blockingPath})`
       };
     }
     return {
       ok: true,
-      detail: `${label}: ${path12} (creatable via ${parentCheck.creatableFrom})`
+      detail: `${label}: ${path11} (creatable via ${parentCheck.creatableFrom})`
     };
   }
 }
-async function checkFileCreatable(label, path12, probe, platform) {
+async function checkFileCreatable(label, path11, probe, platform) {
   try {
-    const stats = await probe.stat(path12);
+    const stats = await probe.stat(path11);
     if (stats.isDirectory()) {
       return {
         ok: false,
-        detail: `${label}: ${path12} (exists but is a directory)`
+        detail: `${label}: ${path11} (exists but is a directory)`
       };
     }
-    await probe.access(path12, constants.W_OK);
+    await probe.access(path11, constants.W_OK);
     return {
       ok: true,
-      detail: `${label}: ${path12} (writable)`
+      detail: `${label}: ${path11} (writable)`
     };
   } catch (error2) {
     if (!isMissingPathError(error2)) {
       return {
         ok: false,
-        detail: `${label}: ${path12} (unusable: ${formatError6(error2)})`
+        detail: `${label}: ${path11} (unusable: ${formatError6(error2)})`
       };
     }
-    const parentCheck = await checkCreatableAncestorDirectory(dirname12(path12), probe, platform);
+    const parentCheck = await checkCreatableAncestorDirectory(dirname11(path11), probe, platform);
     if (!parentCheck.ok) {
       return {
         ok: false,
-        detail: `${label}: ${path12} (parent not writable: ${parentCheck.blockingPath})`
+        detail: `${label}: ${path11} (parent not writable: ${parentCheck.blockingPath})`
       };
     }
     return {
       ok: true,
-      detail: `${label}: ${path12} (creatable via ${parentCheck.creatableFrom})`
+      detail: `${label}: ${path11} (creatable via ${parentCheck.creatableFrom})`
     };
   }
 }
-async function checkCreatableAncestorDirectory(path12, probe, platform) {
+async function checkCreatableAncestorDirectory(path11, probe, platform) {
   try {
-    const stats = await probe.stat(path12);
+    const stats = await probe.stat(path11);
     if (!stats.isDirectory()) {
       return {
         ok: false,
-        creatableFrom: path12,
-        blockingPath: path12
+        creatableFrom: path11,
+        blockingPath: path11
       };
     }
-    await probe.access(path12, directoryAccessMode(platform));
+    await probe.access(path11, directoryAccessMode(platform));
     return {
       ok: true,
-      creatableFrom: path12
+      creatableFrom: path11
     };
   } catch (error2) {
     if (!isMissingPathError(error2)) {
       return {
         ok: false,
-        creatableFrom: path12,
-        blockingPath: path12
+        creatableFrom: path11,
+        blockingPath: path11
       };
     }
-    const parent = dirname12(path12);
-    if (parent === path12) {
+    const parent = dirname11(path11);
+    if (parent === path11) {
       return {
         ok: false,
-        creatableFrom: path12,
-        blockingPath: path12
+        creatableFrom: path11,
+        blockingPath: path11
       };
     }
     const parentCheck = await checkCreatableAncestorDirectory(parent, probe, platform);
@@ -21086,7 +21240,7 @@ var init_render_doctor = __esm(() => {
 
 // src/doctor/doctor.ts
 import { homedir as homedir11 } from "node:os";
-import { join as join10 } from "node:path";
+import { join as join11 } from "node:path";
 async function runDoctor(options = {}, deps = {}) {
   const home = deps.home ?? process.env.HOME ?? homedir11();
   const runtimePaths = resolveDoctorRuntimePaths(home, deps.resolveRuntimePaths);
@@ -21139,8 +21293,8 @@ function resolveDoctorRuntimePaths(home, resolver) {
     return resolveRuntimePaths();
   }
   return {
-    configPath: join10(home, ".weacpx", "config.json"),
-    statePath: join10(home, ".weacpx", "state.json")
+    configPath: join11(home, ".weacpx", "config.json"),
+    statePath: join11(home, ".weacpx", "state.json")
   };
 }
 function depsUseExplicitRuntimeOverrides() {
@@ -21238,6 +21392,8 @@ var init_doctor2 = __esm(async () => {
 });
 
 // src/cli.ts
+init_config_store();
+init_ensure_config();
 init_create_daemon_controller();
 init_daemon_files();
 import { homedir as homedir12 } from "node:os";
@@ -21246,8 +21402,8 @@ import { fileURLToPath as fileURLToPath5 } from "node:url";
 
 // src/daemon/daemon-runtime.ts
 init_daemon_status();
-import { mkdir as mkdir4, rm as rm3, writeFile as writeFile3 } from "node:fs/promises";
-import { dirname as dirname4 } from "node:path";
+import { mkdir as mkdir5, rm as rm3, writeFile as writeFile4 } from "node:fs/promises";
+import { dirname as dirname5 } from "node:path";
 
 class DaemonRuntime {
   paths;
@@ -21273,8 +21429,8 @@ class DaemonRuntime {
       stdout_log: this.paths.stdoutLog,
       stderr_log: this.paths.stderrLog
     };
-    await mkdir4(dirname4(this.paths.pidFile), { recursive: true });
-    await writeFile3(this.paths.pidFile, `${this.options.pid}
+    await mkdir5(dirname5(this.paths.pidFile), { recursive: true });
+    await writeFile4(this.paths.pidFile, `${this.options.pid}
 `);
     await this.statusStore.save(this.currentStatus);
   }
@@ -21544,10 +21700,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path) {
-  if (!path)
+function getElementAtPath(obj, path2) {
+  if (!path2)
     return obj;
-  return path.reduce((acc, key) => acc?.[key], obj);
+  return path2.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -21928,11 +22084,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path, issues) {
+function prefixIssues(path2, issues) {
   return issues.map((iss) => {
     var _a;
     (_a = iss).path ?? (_a.path = []);
-    iss.path.unshift(path);
+    iss.path.unshift(path2);
     return iss;
   });
 }
@@ -27554,8 +27710,8 @@ function getErrorMap() {
 }
 // node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path, errorMaps, issueData } = params;
-  const fullPath = [...path, ...issueData.path || []];
+  const { data, path: path2, errorMaps, issueData } = params;
+  const fullPath = [...path2, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -27667,11 +27823,11 @@ var errorUtil;
 
 // node_modules/zod/v3/types.js
 class ParseInputLazyPath {
-  constructor(parent, value, path, key) {
+  constructor(parent, value, path2, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path;
+    this._path = path2;
     this._key = key;
   }
   get path() {
@@ -33657,7 +33813,7 @@ init_version();
 // src/mcp/resolve-endpoint.ts
 init_daemon_files();
 init_orchestration_ipc();
-import { homedir } from "node:os";
+import { homedir as homedir2 } from "node:os";
 function resolveDefaultOrchestrationEndpoint(env = process.env, platform = process.platform) {
   if (typeof env.WEACPX_ORCHESTRATION_SOCKET === "string" && env.WEACPX_ORCHESTRATION_SOCKET.trim().length > 0) {
     return createOrchestrationEndpoint(env.WEACPX_ORCHESTRATION_SOCKET.trim(), platform);
@@ -33668,7 +33824,7 @@ function resolveDefaultOrchestrationEndpoint(env = process.env, platform = proce
   return resolveOrchestrationEndpoint(runtimeDir, platform);
 }
 function requireHome(env) {
-  const home = env.HOME ?? homedir();
+  const home = env.HOME ?? homedir2();
   if (!home) {
     throw new Error("Unable to resolve the current user home directory");
   }
@@ -34226,8 +34382,8 @@ function normalizeInputSchemaJson(schema) {
 }
 function formatZodError(error2) {
   return error2.issues.map((issue2) => {
-    const path2 = issue2.path.length > 0 ? issue2.path.join(".") : "arguments";
-    return `${path2}: ${issue2.message}`;
+    const path3 = issue2.path.length > 0 ? issue2.path.join(".") : "arguments";
+    return `${path3}: ${issue2.message}`;
   }).join("; ");
 }
 
@@ -34264,6 +34420,7 @@ function parseSourceHandle(args, env = process.env) {
 }
 
 // src/cli.ts
+init_workspace_path();
 init_version();
 init_consumer_lock();
 var HELP_LINES = [
@@ -34276,6 +34433,7 @@ var HELP_LINES = [
   "weacpx stop   - 停止服务",
   "weacpx doctor - 运行诊断",
   "weacpx version - 查看版本",
+  "weacpx workspace list|add|rm - 管理本机工作区（别名：ws）",
   "weacpx mcp-stdio --coordinator-session <session> [--source-handle <handle>] - 启动 MCP stdio 服务"
 ];
 async function runCli(args, deps = {}) {
@@ -34313,6 +34471,20 @@ async function runCli(args, deps = {}) {
       }
       return await (deps.doctor ?? defaultDoctor)(parsed.options);
     }
+    case "workspace":
+    case "ws": {
+      const result = await handleWorkspaceCli(args.slice(1), {
+        print,
+        cwd: deps.cwd ?? (() => process.cwd())
+      });
+      if (result === null) {
+        for (const line of HELP_LINES) {
+          print(line);
+        }
+        return 1;
+      }
+      return result;
+    }
     case "mcp-stdio":
       return await (deps.mcpStdio ?? ((subArgs) => defaultMcpStdio(subArgs, { stderr: deps.stderr })))(args.slice(1));
     case "start": {
@@ -34367,6 +34539,83 @@ async function runCli(args, deps = {}) {
       return 1;
   }
 }
+async function handleWorkspaceCli(args, deps) {
+  const subcommand = args[0];
+  switch (subcommand) {
+    case "list":
+      if (args.length !== 1)
+        return null;
+      return await workspaceList(deps.print);
+    case "add":
+      if (args.length > 2)
+        return null;
+      return await workspaceAdd(args[1], deps);
+    case "rm":
+      if (args.length !== 2 || !args[1])
+        return null;
+      return await workspaceRemove(args[1], deps.print);
+    default:
+      return null;
+  }
+}
+async function workspaceList(print) {
+  const store = await createCliConfigStore();
+  const config2 = await store.load();
+  const entries = Object.entries(config2.workspaces);
+  if (entries.length === 0) {
+    print("还没有工作区。");
+    return 0;
+  }
+  print("工作区列表：");
+  for (const [name, workspace] of entries) {
+    print(`- ${name}: ${workspace.cwd}`);
+  }
+  return 0;
+}
+async function workspaceAdd(rawName, deps) {
+  const cwd = normalizeWorkspacePath(deps.cwd());
+  const name = rawName === undefined ? basenameForWorkspacePath(cwd) : rawName.trim();
+  if (name.trim().length === 0) {
+    deps.print("工作区名称不能为空。");
+    return 1;
+  }
+  const store = await createCliConfigStore();
+  const config2 = await store.load();
+  const existing = config2.workspaces[name];
+  if (existing) {
+    if (sameWorkspacePath(existing.cwd, cwd)) {
+      deps.print(`工作区「${name}」已存在：${existing.cwd}`);
+      return 0;
+    }
+    deps.print(`工作区「${name}」已存在，但路径不同：${existing.cwd}`);
+    deps.print(`请换一个名称，或先执行：weacpx workspace rm ${name}`);
+    return 1;
+  }
+  await store.upsertWorkspace(name, cwd);
+  deps.print(`工作区「${name}」已保存：${cwd}`);
+  return 0;
+}
+async function workspaceRemove(rawName, print) {
+  const name = rawName.trim();
+  if (name.length === 0) {
+    print("工作区名称不能为空。");
+    return 1;
+  }
+  const store = await createCliConfigStore();
+  const config2 = await store.load();
+  if (!config2.workspaces[name]) {
+    print(`没有找到工作区「${name}」。`);
+    return 1;
+  }
+  await store.removeWorkspace(name);
+  print(`工作区「${name}」已删除`);
+  return 0;
+}
+async function createCliConfigStore() {
+  const configPath = process.env.WEACPX_CONFIG ?? `${requireHome2()}/.weacpx/config.json`;
+  await ensureConfigExists(configPath);
+  return new ConfigStore(configPath);
+}
 async function defaultLogin() {
   const { main: main4 } = await init_login().then(() => exports_login);
   await main4();