@ganglion/xacpx 0.9.3 → 0.10.1

package/dist/cli.js

@@ -93,6 +93,11 @@ var init_session = __esm(() => {
     currentLabel: "[current]",
     sessionListItem: (alias, agent, workspace) => `- ${alias} (${agent} @ ${workspace})`,
     sessionCreated: (alias) => `Session "${alias}" created and switched.`,
+    sessionAlreadyExists: (alias, agent, workspace) => [
+      `Session "${alias}" already exists (${agent} @ ${workspace}).`,
+      `Switch to it with /use ${alias}, or remove it first with /session rm ${alias}.`
+    ].join(`
+`),
     sessionAttachNotFound: (alias, agent, workspace) => [
       "No existing session found to attach.",
       `Check the session name and retry: /session attach ${alias} --agent ${agent} --ws ${workspace} --name <session-name>`
@@ -129,6 +134,7 @@ var init_session = __esm(() => {
     sessionBlockedByTasksHint: "Use /tasks to list tasks, or /task cancel <id> to cancel one.",
     sessionRemoved: (alias) => `Session "${alias}" removed.`,
     sessionRemovedWasActive: "This was the active session. Its chat context has been cleared.",
+    sessionRemovedWasActivePromoted: (alias) => `This was the active session. Switched back to the previous session "${alias}".`,
     sessionTransportShared: (transportSession, count) => `Note: backend session "${transportSession}" is still referenced by ${count} other session(s) and was not closed.`,
     sessionOrchestrationPurgeFailed: (warning) => `Note: failed to purge orchestration references (${warning}). Run /tasks clean manually to clean up.`,
     sessionTransportTeardownFailed: (warning) => `Note: backend session could not be closed automatically (${warning}). Run acpx sessions close manually if needed.`,
@@ -422,7 +428,7 @@ var init_later = __esm(() => {
     helpNote2: "Time must be at least 10 seconds and at most 7 days away",
     helpNote3: "By default runs in a new temporary session that is destroyed after completion",
     helpNote4: "Use --bind to send to the session that was current when the task was created (configurable via later.defaultMode)",
-    helpNote5: "/lt list shows all pending tasks globally; in group chats only the owner can cancel",
+    helpNote5: "/lt list shows only this chat's pending tasks; in group chats only the owner can cancel",
     helpNote6: "Scheduling slash-prefixed xacpx commands is not supported",
     helpNote7: "Full time format reference: docs/later-command.md"
   };
@@ -915,6 +921,8 @@ var init_plugin_cli = __esm(() => {
     noPlugins: "No plugins installed yet.",
     pluginListHeader: "Plugins:",
     unrecognizedArgs: (args) => `Unrecognized arguments: ${args}`,
+    pluginSpecHasDoubleQuote: (spec) => `Invalid plugin spec ${spec}: double quotes (") are never valid in an npm package spec.`,
+    pluginSpecHasPercentOnWindows: (spec) => `Invalid plugin spec ${spec}: "%" would be mangled by cmd.exe on Windows. Install the package with npm directly instead.`,
     pluginInstallFailed: (packageSpec, error) => `Plugin ${packageSpec} install failed: ${error}`,
     pluginValidateFailed: (recordedName, error) => `Plugin ${recordedName} validation failed: ${error}`,
     pluginInstalled: (recordedName) => `Plugin ${recordedName} installed`,
@@ -1026,8 +1034,6 @@ var init_weixin = __esm(() => {
     debugEnabled: "Debug mode enabled",
     debugDisabled: "Debug mode disabled",
     sessionCleared: "✅ Session cleared. Starting a fresh conversation.",
-    noAccountsLoggedIn: "No accounts are currently logged in.",
-    logoutSuccess: "✅ Logged out. All account credentials cleared.",
     commandFailed: (detail) => `❌ Command failed: ${detail}`
   };
 });
@@ -1065,6 +1071,7 @@ var init_misc = __esm(() => {
     quotaOverflowSummary: (count) => `(${count} progress updates omitted due to message limit; see final result below)`,
     finalHeadsUp: (total, sentSoFar, remaining) => `—
 \uD83D\uDCC4 Result: ${total} parts total, ${sentSoFar} sent. Reply /jx to see the next ${remaining} parts.`,
+    finalAllParked: (count) => `\uD83D\uDCC4 Message limit reached: the result (${count} parts) is parked. Reply /jx to receive it.`,
     quotedMessagePrefix: (parts) => `[Quote: ${parts}]`,
     scheduledTaskFailed: (message) => `Scheduled task failed: ${message}`,
     orchestrationTaskCompleted: (taskId, workerSession, result) => `Delegation task "${taskId}" completed
@@ -1093,6 +1100,8 @@ var init_misc = __esm(() => {
     delegateQPackageInstr3: "Do not forward the human's exact words to the worker",
     commandAccessDeniedSuffix: " is restricted to group owner only.",
     commandAccessDeniedHint: "To perform control operations, have the owner send them in the group, or use a private chat.",
+    commandAccessDeniedChatTypeMissingSuffix: " was blocked: this channel did not report the chat type (direct or group), so control commands are disabled here.",
+    commandAccessDeniedChatTypeMissingHint: "Read-only commands and prompts still work. This is a channel metadata issue — update or report the channel plugin.",
     commandLabelThisMessage: "This message",
     sessionResetNoCurrentSession: "No session is currently selected. Run /session new ... or /use <alias> first.",
     sessionResetFailed: (alias) => `Session "${alias}" reset failed. The new backend session was not created, please try again later.`,
@@ -1163,6 +1172,11 @@ var init_session2 = __esm(() => {
     currentLabel: "[当前]",
     sessionListItem: (alias, agent2, workspace2) => `- ${alias} (${agent2} @ ${workspace2})`,
     sessionCreated: (alias) => `会话「${alias}」已创建并切换`,
+    sessionAlreadyExists: (alias, agent2, workspace2) => [
+      `会话「${alias}」已存在（${agent2} @ ${workspace2}）。`,
+      `发送 /use ${alias} 切换到它，或先执行 /session rm ${alias} 删除后再创建。`
+    ].join(`
+`),
     sessionAttachNotFound: (alias, agent2, workspace2) => [
       "没有找到可绑定的已有会话。",
       `请确认会话名是否正确，然后重新执行：/session attach ${alias} --agent ${agent2} --ws ${workspace2} --name <会话名>`
@@ -1199,6 +1213,7 @@ var init_session2 = __esm(() => {
     sessionBlockedByTasksHint: "使用 /tasks 查看任务列表，或 /task cancel <id> 取消任务。",
     sessionRemoved: (alias) => `已删除会话「${alias}」。`,
     sessionRemovedWasActive: "该会话是当前活跃会话，已自动清除相关聊天上下文。",
+    sessionRemovedWasActivePromoted: (alias) => `该会话是当前活跃会话，已切换回上一个会话「${alias}」。`,
     sessionTransportShared: (transportSession, count) => `提示：后端会话「${transportSession}」仍被其他 ${count} 个会话引用，未关闭。`,
     sessionOrchestrationPurgeFailed: (warning) => `提示：清理任务编排引用失败（${warning}），请稍后执行 /tasks clean 手动清理。`,
     sessionTransportTeardownFailed: (warning) => `提示：后端会话未能自动关闭（${warning}），如有残留请手动执行 acpx sessions close。`,
@@ -1492,7 +1507,7 @@ var init_later2 = __esm(() => {
     helpNote2: "时间必须在 10 秒之后、7 天之内",
     helpNote3: "默认在为本次任务新建的临时会话里执行，跑完即销毁",
     helpNote4: "加 --bind 改为发送到创建时绑定的当前会话（默认模式可用 later.defaultMode 配置）",
-    helpNote5: "/lt list 显示全局待执行任务；群聊中只有群主可取消",
+    helpNote5: "/lt list 只显示本聊天创建的待执行任务；群聊中只有群主可取消",
     helpNote6: "不支持延迟执行 / 开头的 xacpx 命令",
     helpNote7: "完整时间格式与说明见 docs/later-command.md"
   };
@@ -1985,6 +2000,8 @@ var init_plugin_cli2 = __esm(() => {
     noPlugins: "还没有安装插件。",
     pluginListHeader: "插件：",
     unrecognizedArgs: (args) => `未识别的参数：${args}`,
+    pluginSpecHasDoubleQuote: (spec) => `非法插件 spec ${spec}：npm 包 spec 不允许包含双引号 (")。`,
+    pluginSpecHasPercentOnWindows: (spec) => `非法插件 spec ${spec}：Windows 上 cmd.exe 会展开 %，无法安全传递。请改用 npm 直接安装该包。`,
     pluginInstallFailed: (packageSpec, error) => `插件 ${packageSpec} 安装失败：${error}`,
     pluginValidateFailed: (recordedName, error) => `插件 ${recordedName} 校验失败：${error}`,
     pluginInstalled: (recordedName) => `插件 ${recordedName} 已安装`,
@@ -2096,8 +2113,6 @@ var init_weixin2 = __esm(() => {
     debugEnabled: "Debug 模式已开启",
     debugDisabled: "Debug 模式已关闭",
     sessionCleared: "✅ 会话已清除，重新开始对话",
-    noAccountsLoggedIn: "当前没有已登录的账号",
-    logoutSuccess: "✅ 已退出登录，清除所有账号凭证",
     commandFailed: (detail) => `❌ 指令执行失败: ${detail}`
   };
 });
@@ -2135,6 +2150,7 @@ var init_misc2 = __esm(() => {
     quotaOverflowSummary: (count) => `（因消息次数限制省略 ${count} 条进度，请继续查看下方最终结果）`,
     finalHeadsUp: (total, sentSoFar, remaining) => `—
 \uD83D\uDCC4 结果共 ${total} 段，已发 ${sentSoFar} 段。回复 /jx 续看后 ${remaining} 段。`,
+    finalAllParked: (count) => `\uD83D\uDCC4 已达消息上限：结果共 ${count} 段已暂存。回复 /jx 接收。`,
     quotedMessagePrefix: (parts) => `[引用: ${parts}]`,
     scheduledTaskFailed: (message) => `定时任务执行失败：${message}`,
     orchestrationTaskCompleted: (taskId, workerSession, result) => `委派任务「${taskId}」已完成
@@ -2163,6 +2179,8 @@ var init_misc2 = __esm(() => {
     delegateQPackageInstr3: "不要直接把 human 原话转发给 worker",
     commandAccessDeniedSuffix: " 仅限群创建者/频道 owner 使用。",
     commandAccessDeniedHint: "如果需要执行控制类操作，请由 owner 在群内发送，或改用私聊。",
+    commandAccessDeniedChatTypeMissingSuffix: " 已被拦截：该频道未上报会话类型（直聊/群聊），控制类命令在此暂不可用。",
+    commandAccessDeniedChatTypeMissingHint: "只读命令与普通对话不受影响。这是频道元数据问题，请升级或反馈该频道插件。",
     commandLabelThisMessage: "该消息",
     sessionResetNoCurrentSession: "当前还没有选中的会话。请先执行 /session new ... 或 /use <alias>。",
     sessionResetFailed: (alias) => `会话「${alias}」重置失败。
@@ -4212,7 +4230,7 @@ var require_lib = __commonJS((exports, module) => {
 import { chmod, mkdir, writeFile } from "node:fs/promises";
 import { chmodSync, mkdirSync as mkdirSync2, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
-async function writePrivateFileAtomic(path, content) {
+async function withPrivateFileLock(path, fn) {
   await mkdir(dirname(path), { recursive: true });
   const release = await lockfile.lock(path, {
     realpath: false,
@@ -4226,23 +4244,31 @@ async function writePrivateFileAtomic(path, content) {
     }
   });
   try {
-    try {
-      await retryTransientWriteErrors(async () => import_write_file_atomic.default(path, content, {
-        mode: PRIVATE_FILE_MODE,
-        encoding: "utf8",
-        fsync: true
-      }));
-    } catch (error) {
-      if (!isTransientWriteError(error, process.platform)) {
-        throw error;
-      }
-      await writeFile(path, content, { encoding: "utf8", mode: PRIVATE_FILE_MODE });
-      await chmod(path, PRIVATE_FILE_MODE).catch(() => {});
-    }
+    return await fn((content) => writePrivateFileAtomicUnlocked(path, content));
   } finally {
     await release();
   }
 }
+async function writePrivateFileAtomic(path, content) {
+  await withPrivateFileLock(path, async (writeLocked) => {
+    await writeLocked(content);
+  });
+}
+async function writePrivateFileAtomicUnlocked(path, content) {
+  try {
+    await retryTransientWriteErrors(async () => import_write_file_atomic.default(path, content, {
+      mode: PRIVATE_FILE_MODE,
+      encoding: "utf8",
+      fsync: true
+    }));
+  } catch (error) {
+    if (!isTransientWriteError(error, process.platform)) {
+      throw error;
+    }
+    await writeFile(path, content, { encoding: "utf8", mode: PRIVATE_FILE_MODE });
+    await chmod(path, PRIVATE_FILE_MODE).catch(() => {});
+  }
+}
 function writePrivateFileSync(path, content, deps = {}) {
   mkdirSync2(dirname(path), { recursive: true });
   const platform = deps.platform ?? process.platform;
@@ -4399,6 +4425,14 @@ function isRecord(value) {
 function isReplyMode(value) {
   return value === "stream" || value === "final" || value === "verbose";
 }
+function parseOwnerIds(value, path2) {
+  if (value === undefined)
+    return;
+  if (!Array.isArray(value) || value.some((entry) => typeof entry !== "string" || entry.trim().length === 0)) {
+    throw new Error(`${path2} must be an array of non-empty strings`);
+  }
+  return value.map((entry) => entry.trim());
+}
 function parseChannelConfig(channel, legacyWechat) {
   if (channel !== undefined) {
     if (!isRecord(channel)) {
@@ -4411,6 +4445,7 @@ function parseChannelConfig(channel, legacyWechat) {
       throw new Error("channel.replyMode must be stream, final, or verbose");
     }
     const type = typeof channel.type === "string" ? channel.type : "weixin";
+    const ownerIds = parseOwnerIds(channel.ownerIds, "channel.ownerIds");
     let options = undefined;
     if ("feishu" in channel && isRecord(channel.feishu)) {
       options = channel.feishu;
@@ -4420,6 +4455,7 @@ function parseChannelConfig(channel, legacyWechat) {
     return {
       type,
       replyMode: isReplyMode(channel.replyMode) ? channel.replyMode : DEFAULT_CHANNEL_CONFIG.replyMode,
+      ...ownerIds ? { ownerIds } : {},
       ...options ? { options } : {}
     };
   }
@@ -4658,6 +4694,7 @@ function parseRuntimeChannelConfig(raw, index) {
   if ("replyMode" in raw && !isReplyMode(raw.replyMode)) {
     throw new Error(`channels[${index}].replyMode must be stream, final, or verbose`);
   }
+  const ownerIds = parseOwnerIds(raw.ownerIds, `channels[${index}].ownerIds`);
   let options = undefined;
   if ("feishu" in raw && isRecord(raw.feishu)) {
     options = raw.feishu;
@@ -4669,6 +4706,7 @@ function parseRuntimeChannelConfig(raw, index) {
     type: raw.type,
     enabled,
     ...isReplyMode(raw.replyMode) ? { replyMode: raw.replyMode } : {},
+    ...ownerIds ? { ownerIds } : {},
     ...options ? { options } : {}
   };
 }
@@ -4753,6 +4791,8 @@ var init_load_config = __esm(() => {
 });
 
 // src/config/config-store.ts
+import { readFile as readFile2 } from "node:fs/promises";
+
 class ConfigStore {
   path;
   constructor(path2) {
@@ -4761,60 +4801,250 @@ class ConfigStore {
   async load() {
     return await loadConfig(this.path);
   }
-  async save(config3) {
-    await writePrivateFileAtomic(this.path, `${JSON.stringify(config3, null, 2)}
-`);
+  async getRawValue(path2) {
+    return readRawConfigValue((await this.readRaw()).raw, path2);
+  }
+  async setRawValue(path2, value) {
+    return await this.patchRaw((raw) => {
+      setRawConfigValue(raw, path2, value);
+    });
+  }
+  async unsetRawValue(path2) {
+    return await this.patchRaw((raw) => {
+      unsetRawConfigValue(raw, path2);
+    });
   }
   async upsertWorkspace(name, cwd, description) {
-    const config3 = await this.load();
-    const workspace3 = {
-      cwd,
-      ...description ? { description } : {}
-    };
-    config3.workspaces[name] = workspace3;
-    await this.save(config3);
-    return config3;
+    assertSafeConfigKey(name);
+    return await this.patchRaw((raw) => {
+      const workspaces = ensureRecordAt(raw, "workspaces");
+      workspaces[name] = {
+        cwd,
+        ...description ? { description } : {}
+      };
+    });
   }
   async removeWorkspace(name) {
-    const config3 = await this.load();
-    delete config3.workspaces[name];
-    await this.save(config3);
-    return config3;
+    assertSafeConfigKey(name);
+    return await this.patchRaw((raw) => {
+      deleteRecordEntry(raw, "workspaces", name);
+    });
   }
   async upsertAgent(name, agent3) {
-    const config3 = await this.load();
-    config3.agents[name] = agent3;
-    await this.save(config3);
-    return config3;
+    assertSafeConfigKey(name);
+    return await this.patchRaw((raw) => {
+      const agents = ensureRecordAt(raw, "agents");
+      agents[name] = {
+        driver: agent3.driver,
+        ...agent3.command ? { command: agent3.command } : {}
+      };
+    });
   }
   async removeAgent(name) {
-    const config3 = await this.load();
-    delete config3.agents[name];
-    await this.save(config3);
-    return config3;
-  }
-  async updateTransport(transport) {
-    const config3 = await this.load();
-    config3.transport = {
-      ...config3.transport,
-      ...transport
-    };
-    await this.save(config3);
-    return config3;
-  }
-  async updateChannel(channel) {
-    const config3 = await this.load();
-    config3.channel = {
-      ...config3.channel,
-      ...channel
-    };
-    await this.save(config3);
-    return config3;
+    assertSafeConfigKey(name);
+    return await this.patchRaw((raw) => {
+      deleteRecordEntry(raw, "agents", name);
+    });
+  }
+  async updateTransport(patch) {
+    return await this.patchRaw((raw) => {
+      applyRecordPatch(ensureRecordAt(raw, "transport"), patch);
+    });
+  }
+  async updateChannel(patch) {
+    return await this.patchRaw((raw) => {
+      applyRecordPatch(ensureRecordAt(raw, "channel"), patch);
+    });
   }
+  async replacePlugins(plugins) {
+    return await this.patchRaw((raw) => {
+      raw.plugins = clonePlain(plugins);
+    });
+  }
+  async replaceChannels(channels) {
+    return await this.patchRaw((raw) => {
+      raw.channels = clonePlain(channels);
+    });
+  }
+  async patchRaw(mutate) {
+    return await withPrivateFileLock(this.path, async (writeLocked) => {
+      const { raw, existed } = await this.readRaw();
+      const doc = existed ? raw : { transport: {}, agents: {}, workspaces: {} };
+      mutate(doc);
+      const parsed = parseConfig({ transport: {}, agents: {}, workspaces: {}, ...doc });
+      await writeLocked(serializeRawConfig(doc));
+      return parsed;
+    });
+  }
+  async readRaw() {
+    let text;
+    try {
+      text = await readFile2(this.path, "utf8");
+    } catch (error) {
+      if (isMissingFileError(error)) {
+        return { raw: {}, existed: false };
+      }
+      throw error;
+    }
+    let parsed;
+    try {
+      parsed = JSON.parse(text);
+    } catch (error) {
+      throw new Error(`refusing to modify ${this.path}: it is not valid JSON (${error instanceof Error ? error.message : String(error)}); fix the file and retry`);
+    }
+    if (!isPlainRecord(parsed)) {
+      throw new Error(`refusing to modify ${this.path}: the top level must be a JSON object`);
+    }
+    return { raw: parsed, existed: true };
+  }
+}
+function serializeRawConfig(raw) {
+  return `${JSON.stringify(raw, null, 2)}
+`;
+}
+function readRawConfigValue(root, path2) {
+  const lastKey = requireObjectKeyTail(path2);
+  let container = root;
+  for (const segment of path2.slice(0, -1)) {
+    const next = descendForRead(container, segment);
+    if (!next.ok) {
+      return { present: false };
+    }
+    container = next.value;
+  }
+  if (!isPlainRecord(container) || !Object.hasOwn(container, lastKey)) {
+    return { present: false };
+  }
+  return { present: true, value: container[lastKey] };
+}
+function setRawConfigValue(root, path2, value) {
+  const lastKey = requireObjectKeyTail(path2);
+  let container = root;
+  for (let index = 0;index < path2.length - 1; index += 1) {
+    const segment = path2[index];
+    const nextSegment = path2[index + 1];
+    container = descendForWrite(container, segment, typeof nextSegment !== "string", path2);
+  }
+  if (!isPlainRecord(container)) {
+    throw new Error(`config path "${describeRawConfigPath(path2)}" does not address an object`);
+  }
+  container[lastKey] = value;
+}
+function unsetRawConfigValue(root, path2) {
+  const lastKey = requireObjectKeyTail(path2);
+  let container = root;
+  for (const segment of path2.slice(0, -1)) {
+    const next = descendForRead(container, segment);
+    if (!next.ok) {
+      return;
+    }
+    container = next.value;
+  }
+  if (isPlainRecord(container)) {
+    delete container[lastKey];
+  }
+}
+function descendForRead(container, segment) {
+  if (typeof segment === "string") {
+    assertSafeConfigKey(segment);
+    if (!isPlainRecord(container) || !Object.hasOwn(container, segment)) {
+      return { ok: false };
+    }
+    return { ok: true, value: container[segment] };
+  }
+  if (!Array.isArray(container)) {
+    return { ok: false };
+  }
+  const entry = container.find((item) => isPlainRecord(item) && item.id === segment.id);
+  return entry === undefined ? { ok: false } : { ok: true, value: entry };
+}
+function descendForWrite(container, segment, nextIsArrayEntry, path2) {
+  if (typeof segment === "string") {
+    assertSafeConfigKey(segment);
+    if (!isPlainRecord(container)) {
+      throw new Error(`config path "${describeRawConfigPath(path2)}" does not address an object at "${segment}"`);
+    }
+    let existing = container[segment];
+    if (existing === undefined) {
+      existing = nextIsArrayEntry ? [] : {};
+      container[segment] = existing;
+    }
+    if (!isPlainRecord(existing) && !Array.isArray(existing)) {
+      throw new Error(`refusing to overwrite config key "${segment}" (path "${describeRawConfigPath(path2)}"): it is not an object`);
+    }
+    return existing;
+  }
+  if (!Array.isArray(container)) {
+    throw new Error(`config path "${describeRawConfigPath(path2)}" expects an array before [id=${segment.id}]`);
+  }
+  const entry = container.find((item) => isPlainRecord(item) && item.id === segment.id);
+  if (entry !== undefined) {
+    return entry;
+  }
+  if (!segment.createWith) {
+    throw new Error(`config path "${describeRawConfigPath(path2)}" has no entry with id "${segment.id}"`);
+  }
+  const created = clonePlain(segment.createWith);
+  container.push(created);
+  return created;
+}
+function requireObjectKeyTail(path2) {
+  const last = path2[path2.length - 1];
+  if (typeof last !== "string") {
+    throw new Error("raw config path must end with an object key");
+  }
+  assertSafeConfigKey(last);
+  return last;
+}
+function assertSafeConfigKey(key) {
+  if (PROTOTYPE_POLLUTING_KEYS.has(key)) {
+    throw new Error(`refusing to use unsafe config key "${key}"`);
+  }
+}
+function describeRawConfigPath(path2) {
+  return path2.map((segment) => typeof segment === "string" ? segment : `[id=${segment.id}]`).join(".");
 }
+function ensureRecordAt(raw, key) {
+  const existing = raw[key];
+  if (existing === undefined) {
+    const created = {};
+    raw[key] = created;
+    return created;
+  }
+  if (!isPlainRecord(existing)) {
+    throw new Error(`refusing to overwrite config key "${key}": it is not a JSON object`);
+  }
+  return existing;
+}
+function deleteRecordEntry(raw, section, name) {
+  const record = raw[section];
+  if (isPlainRecord(record)) {
+    delete record[name];
+  }
+}
+function applyRecordPatch(target, patch) {
+  for (const [key, value] of Object.entries(patch)) {
+    if (value === undefined) {
+      delete target[key];
+    } else {
+      target[key] = value;
+    }
+  }
+}
+function clonePlain(value) {
+  return JSON.parse(JSON.stringify(value));
+}
+function isPlainRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isMissingFileError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
+}
+var PROTOTYPE_POLLUTING_KEYS;
 var init_config_store = __esm(() => {
   init_private_file();
   init_load_config();
+  PROTOTYPE_POLLUTING_KEYS = new Set(["__proto__", "constructor", "prototype"]);
 });
 
 // src/config/default-workspace.ts
@@ -4827,16 +5057,16 @@ var init_default_workspace = __esm(() => {
 });
 
 // src/config/ensure-config.ts
-import { readFile as readFile2 } from "node:fs/promises";
+import { readFile as readFile3 } from "node:fs/promises";
 async function ensureConfigExists(path2, options = {}) {
   try {
     await loadConfig(path2);
   } catch (error) {
-    if (!isMissingFileError(error)) {
+    if (!isMissingFileError2(error)) {
       throw error;
     }
-    const store = new ConfigStore(path2);
-    await store.save(await loadDefaultConfigTemplate(options));
+    const seed = await loadDefaultConfigTemplate(options);
+    await writePrivateFileAtomic(path2, serializeRawConfig(seed));
   }
 }
 async function loadDefaultConfigTemplate(options = {}) {
@@ -4844,7 +5074,7 @@ async function loadDefaultConfigTemplate(options = {}) {
     try {
       return normalizeDefaultConfigTemplate(await options.readDefaultConfigTemplate());
     } catch (error) {
-      if (!isMissingFileError(error)) {
+      if (!isMissingFileError2(error)) {
         throw error;
       }
     }
@@ -4856,10 +5086,10 @@ async function loadDefaultConfigTemplate(options = {}) {
   let raw;
   for (const candidate of candidates) {
     try {
-      raw = await readFile2(candidate, "utf8");
+      raw = await readFile3(candidate, "utf8");
       break;
     } catch (error) {
-      if (!isMissingFileError(error)) {
+      if (!isMissingFileError2(error)) {
         throw error;
       }
     }
@@ -4872,7 +5102,14 @@ async function loadDefaultConfigTemplate(options = {}) {
 function normalizeDefaultConfigTemplate(raw) {
   const template = parseConfig(raw);
   return {
-    ...template,
+    transport: {
+      type: template.transport.type,
+      ...template.transport.command ? { command: template.transport.command } : {}
+    },
+    channel: {
+      type: template.channel.type,
+      replyMode: template.channel.replyMode
+    },
     agents: Object.fromEntries(Object.entries(template.agents).map(([name, agent3]) => [
       name,
       {
@@ -4885,32 +5122,18 @@ function normalizeDefaultConfigTemplate(raw) {
     }
   };
 }
-function isMissingFileError(error) {
+function isMissingFileError2(error) {
   return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
 }
 var BUILTIN_DEFAULT_CONFIG_TEMPLATE;
 var init_ensure_config = __esm(() => {
+  init_private_file();
   init_config_store();
   init_default_workspace();
   init_load_config();
   BUILTIN_DEFAULT_CONFIG_TEMPLATE = {
     transport: {
-      type: "acpx-bridge",
-      sessionInitTimeoutMs: 120000,
-      permissionMode: "approve-all",
-      nonInteractivePermissions: "deny"
-    },
-    logging: {
-      level: "info",
-      maxSizeBytes: 2 * 1024 * 1024,
-      maxFiles: 5,
-      retentionDays: 7,
-      perf: {
-        enabled: false,
-        maxSizeBytes: 5242880,
-        maxFiles: 3,
-        retentionDays: 7
-      }
+      type: "acpx-bridge"
     },
     channel: {
       type: "weixin",
@@ -4922,8 +5145,7 @@ var init_ensure_config = __esm(() => {
     },
     workspaces: {
       [DEFAULT_HOME_WORKSPACE_NAME]: { ...DEFAULT_HOME_WORKSPACE }
-    },
-    plugins: []
+    }
   };
 });
 
@@ -5004,7 +5226,7 @@ var init_agent_templates = __esm(() => {
 });
 
 // src/daemon/daemon-status.ts
-import { mkdir as mkdir2, readFile as readFile3, rm, writeFile as writeFile2 } from "node:fs/promises";
+import { mkdir as mkdir2, readFile as readFile4, rm } from "node:fs/promises";
 import { dirname as dirname2 } from "node:path";
 
 class DaemonStatusStore {
@@ -5014,7 +5236,7 @@ class DaemonStatusStore {
   }
   async load() {
     try {
-      const content = await readFile3(this.path, "utf8");
+      const content = await readFile4(this.path, "utf8");
       if (content.trim() === "") {
         return null;
       }
@@ -5030,18 +5252,37 @@ class DaemonStatusStore {
     }
   }
   async save(status) {
-    await mkdir2(dirname2(this.path), { recursive: true });
-    await writeFile2(this.path, JSON.stringify(status, null, 2));
+    await mkdir2(dirname2(this.path), { recursive: true, mode: 448 });
+    await import_write_file_atomic2.default(this.path, JSON.stringify(status, null, 2), { encoding: "utf8" });
   }
   async clear() {
     await rm(this.path, { force: true });
   }
 }
-var init_daemon_status = () => {};
+var import_write_file_atomic2;
+var init_daemon_status = __esm(() => {
+  import_write_file_atomic2 = __toESM(require_lib(), 1);
+});
+
+// src/daemon/private-runtime-dir.ts
+import { chmod as chmod2, mkdir as mkdir3 } from "node:fs/promises";
+async function ensurePrivateRuntimeDir(runtimeDir, options = {}) {
+  await mkdir3(runtimeDir, { recursive: true, mode: 448 });
+  const platform = options.platform ?? process.platform;
+  if (platform === "win32") {
+    return;
+  }
+  const chmodImpl = options.chmodImpl ?? chmod2;
+  try {
+    await chmodImpl(runtimeDir, 448);
+  } catch (error) {
+    options.onChmodError?.(error);
+  }
+}
+var init_private_runtime_dir = () => {};
 
 // src/daemon/daemon-controller.ts
-import { mkdir as mkdir3, open, readFile as readFile4, rm as rm2 } from "node:fs/promises";
-import { dirname as dirname3 } from "node:path";
+import { open, readFile as readFile5, rm as rm2 } from "node:fs/promises";
 
 class DaemonController {
   paths;
@@ -5060,7 +5301,7 @@ class DaemonController {
     this.deps = deps;
     this.statusStore = new DaemonStatusStore(paths.statusFile);
     this.startupPollIntervalMs = deps.startupPollIntervalMs ?? 50;
-    this.startupTimeoutMs = deps.startupTimeoutMs ?? 5000;
+    this.startupTimeoutMs = deps.startupTimeoutMs ?? 1e4;
     this.onboardingStartupTimeoutMs = deps.onboardingStartupTimeoutMs ?? 300000;
     this.shutdownPollIntervalMs = deps.shutdownPollIntervalMs ?? 50;
     this.shutdownTimeoutMs = deps.shutdownTimeoutMs ?? 5000;
@@ -5129,7 +5370,7 @@ class DaemonController {
   }
   async loadPid() {
     try {
-      const content = await readFile4(this.paths.pidFile, "utf8");
+      const content = await readFile5(this.paths.pidFile, "utf8");
       const pid = Number(content.trim());
       return Number.isFinite(pid) && pid > 0 ? pid : null;
     } catch (error) {
@@ -5140,7 +5381,7 @@ class DaemonController {
     }
   }
   async openPidFileExclusive() {
-    await mkdir3(dirname3(this.paths.pidFile), { recursive: true });
+    await ensurePrivateRuntimeDir(this.paths.runtimeDir);
     try {
       return await open(this.paths.pidFile, "wx", 384);
     } catch (error) {
@@ -5194,6 +5435,7 @@ class DaemonController {
 }
 var init_daemon_controller = __esm(() => {
   init_daemon_status();
+  init_private_runtime_dir();
 });
 
 // src/process/terminate-process-tree.ts
@@ -5245,13 +5487,15 @@ async function defaultRunProcessCommand(command, args) {
 var init_terminate_process_tree = () => {};
 
 // src/daemon/create-daemon-controller.ts
-import { mkdir as mkdir4, open as open2 } from "node:fs/promises";
+import { open as open2 } 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 (spawnOptions) => {
-      await mkdir4(paths.runtimeDir, { recursive: true });
+      await ensurePrivateRuntimeDir(paths.runtimeDir, {
+        ...options.platform ? { platform: options.platform } : {}
+      });
       const stdoutHandle = await open2(paths.stdoutLog, "a", 384);
       const stderrHandle = await open2(paths.stderrLog, "a", 384);
       await stdoutHandle.chmod(384).catch(() => {});
@@ -5323,8 +5567,10 @@ function buildSpawnRequest(paths, options, stdoutFd, stderrFd, spawnOptions = {}
 function buildWindowsLauncherScript() {
   const script = [
     "$env:XACPX_DAEMON_RUN = '1'",
+    `$arg0 = '"' + $env:XACPX_DAEMON_ARG0 + '"'`,
+    `$arg1 = '"' + $env:XACPX_DAEMON_ARG1 + '"'`,
     "$process = Start-Process -FilePath $env:XACPX_DAEMON_COMMAND `",
-    "  -ArgumentList @($env:XACPX_DAEMON_ARG0, $env:XACPX_DAEMON_ARG1) `",
+    "  -ArgumentList @($arg0, $arg1) `",
     "  -WorkingDirectory $env:XACPX_DAEMON_CWD `",
     "  -RedirectStandardOutput $env:XACPX_DAEMON_STDOUT `",
     "  -RedirectStandardError $env:XACPX_DAEMON_STDERR `",
@@ -5395,6 +5641,7 @@ async function defaultTerminateProcess(pid) {
 }
 var init_create_daemon_controller = __esm(() => {
   init_daemon_controller();
+  init_private_runtime_dir();
   init_terminate_process_tree();
 });
 
@@ -5431,7 +5678,7 @@ function encodeOrchestrationRpcResponse(response) {
 var init_orchestration_ipc = () => {};
 
 // src/daemon/daemon-files.ts
-import { dirname as dirname4, join as join4 } from "node:path";
+import { dirname as dirname3, join as join4 } from "node:path";
 function resolveDaemonPaths(options) {
   const runtimeDir = options.runtimeDir ?? (options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : join4(coreHomeDir(options.home), "runtime"));
   return {
@@ -5444,11 +5691,19 @@ function resolveDaemonPaths(options) {
   };
 }
 function resolveRuntimeDirFromConfigPath(configPath) {
-  return join4(dirname4(configPath), "runtime");
+  return join4(dirname3(configPath), "runtime");
 }
 function resolveDaemonOrchestrationSocketPath(runtimeDir, platform = process.platform) {
   return resolveOrchestrationEndpoint(runtimeDir, platform).path;
 }
+function isProcessAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code === "EPERM";
+  }
+}
 var init_daemon_files = __esm(() => {
   init_core_home();
   init_orchestration_ipc();
@@ -12124,10 +12379,24 @@ function createEmptyState() {
 var init_types = () => {};
 
 // src/state/state-store.ts
-import { readFile as readFile5 } from "node:fs/promises";
+import { readFile as readFile6, rename, writeFile as writeFile3 } from "node:fs/promises";
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function sectionRecord(value, section, dropped) {
+  if (value === undefined) {
+    return {};
+  }
+  if (!isRecord2(value)) {
+    dropped.push({
+      section,
+      key: "",
+      reason: `field "${section}" is not an object; reset to empty`
+    });
+    return {};
+  }
+  return value;
+}
 function isString(value) {
   return typeof value === "string";
 }
@@ -12232,73 +12501,82 @@ 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, path3) {
+function parseOrchestrationState(raw, dropped) {
   if (raw === undefined) {
     return createEmptyOrchestrationState();
   }
   if (!isRecord2(raw)) {
-    throw new Error(`state file "${path3}" must contain an object field "orchestration"`);
-  }
-  const tasks = raw.tasks;
-  if (tasks !== undefined && !isRecord2(tasks)) {
-    throw new Error(`state file "${path3}" must contain an object field "orchestration.tasks"`);
-  }
-  const workerBindings = raw.workerBindings;
-  if (workerBindings !== undefined && !isRecord2(workerBindings)) {
-    throw new Error(`state file "${path3}" must contain an object field "orchestration.workerBindings"`);
-  }
-  const groups = raw.groups;
-  if (groups !== undefined && !isRecord2(groups)) {
-    throw new Error(`state file "${path3}" must contain an object field "orchestration.groups"`);
-  }
-  const humanQuestionPackages = raw.humanQuestionPackages;
-  if (humanQuestionPackages !== undefined && !isRecord2(humanQuestionPackages)) {
-    throw new Error(`state file "${path3}" must contain an object field "orchestration.humanQuestionPackages"`);
-  }
-  const coordinatorQuestionState = raw.coordinatorQuestionState;
-  if (coordinatorQuestionState !== undefined && !isRecord2(coordinatorQuestionState)) {
-    throw new Error(`state file "${path3}" must contain an object field "orchestration.coordinatorQuestionState"`);
-  }
-  const coordinatorRoutes = raw.coordinatorRoutes;
-  if (coordinatorRoutes !== undefined && !isRecord2(coordinatorRoutes)) {
-    throw new Error(`state file "${path3}" must contain an object field "orchestration.coordinatorRoutes"`);
-  }
-  const externalCoordinators = raw.externalCoordinators;
-  if (externalCoordinators !== undefined && !isRecord2(externalCoordinators)) {
-    throw new Error(`state file "${path3}" must contain an object field "orchestration.externalCoordinators"`);
+    dropped.push({
+      section: "orchestration",
+      key: "",
+      reason: 'field "orchestration" is not an object; reset to empty'
+    });
+    return createEmptyOrchestrationState();
   }
+  const tasks = sectionRecord(raw.tasks, "orchestration.tasks", dropped);
+  const workerBindings = sectionRecord(raw.workerBindings, "orchestration.workerBindings", dropped);
+  const groups = sectionRecord(raw.groups, "orchestration.groups", dropped);
+  const humanQuestionPackages = sectionRecord(raw.humanQuestionPackages, "orchestration.humanQuestionPackages", dropped);
+  const coordinatorQuestionState = sectionRecord(raw.coordinatorQuestionState, "orchestration.coordinatorQuestionState", dropped);
+  const coordinatorRoutes = sectionRecord(raw.coordinatorRoutes, "orchestration.coordinatorRoutes", dropped);
+  const externalCoordinators = sectionRecord(raw.externalCoordinators, "orchestration.externalCoordinators", dropped);
   const parsedTasks = {};
-  for (const [taskId, task] of Object.entries(tasks ?? {})) {
+  for (const [taskId, task] of Object.entries(tasks)) {
     if (!isTaskRecord(task)) {
-      throw new Error(`state file "${path3}" contains an invalid orchestration task at "${taskId}"`);
+      dropped.push({
+        section: "orchestration.tasks",
+        key: taskId,
+        reason: "malformed orchestration task record"
+      });
+      continue;
     }
     parsedTasks[taskId] = task;
   }
   const parsedWorkerBindings = {};
-  for (const [workerSession, binding] of Object.entries(workerBindings ?? {})) {
+  for (const [workerSession, binding] of Object.entries(workerBindings)) {
     if (!isWorkerBindingRecord(binding)) {
-      throw new Error(`state file "${path3}" contains an invalid orchestration worker binding at "${workerSession}"`);
+      dropped.push({
+        section: "orchestration.workerBindings",
+        key: workerSession,
+        reason: "malformed orchestration worker binding record"
+      });
+      continue;
     }
     parsedWorkerBindings[workerSession] = binding;
   }
   const parsedGroups = {};
-  for (const [groupId, group] of Object.entries(groups ?? {})) {
+  for (const [groupId, group] of Object.entries(groups)) {
     if (!isGroupRecord(group)) {
-      throw new Error(`state file "${path3}" contains an invalid orchestration group at "${groupId}"`);
+      dropped.push({
+        section: "orchestration.groups",
+        key: groupId,
+        reason: "malformed orchestration group record"
+      });
+      continue;
     }
     parsedGroups[groupId] = group;
   }
   const parsedHumanQuestionPackages = {};
-  for (const [packageId, packageRecord] of Object.entries(humanQuestionPackages ?? {})) {
+  for (const [packageId, packageRecord] of Object.entries(humanQuestionPackages)) {
     if (!isHumanQuestionPackageRecord(packageRecord)) {
-      throw new Error(`state file "${path3}" contains an invalid human question package at "${packageId}"`);
+      dropped.push({
+        section: "orchestration.humanQuestionPackages",
+        key: packageId,
+        reason: "malformed human question package record"
+      });
+      continue;
     }
     parsedHumanQuestionPackages[packageId] = packageRecord;
   }
   const parsedCoordinatorQuestionState = {};
-  for (const [coordinatorSession, questionState] of Object.entries(coordinatorQuestionState ?? {})) {
+  for (const [coordinatorSession, questionState] of Object.entries(coordinatorQuestionState)) {
     if (!isCoordinatorQuestionStateRecord(questionState)) {
-      throw new Error(`state file "${path3}" contains an invalid coordinator question state at "${coordinatorSession}"`);
+      dropped.push({
+        section: "orchestration.coordinatorQuestionState",
+        key: coordinatorSession,
+        reason: "malformed coordinator question state record"
+      });
+      continue;
     }
     parsedCoordinatorQuestionState[coordinatorSession] = {
       activePackageId: questionState.activePackageId,
@@ -12306,19 +12584,34 @@ function parseOrchestrationState(raw, path3) {
     };
   }
   const parsedCoordinatorRoutes = {};
-  for (const [coordinatorSession, route] of Object.entries(coordinatorRoutes ?? {})) {
+  for (const [coordinatorSession, route] of Object.entries(coordinatorRoutes)) {
     if (!isCoordinatorRouteContextRecord(route)) {
-      throw new Error(`state file "${path3}" contains an invalid coordinator route at "${coordinatorSession}"`);
+      dropped.push({
+        section: "orchestration.coordinatorRoutes",
+        key: coordinatorSession,
+        reason: "malformed coordinator route record"
+      });
+      continue;
     }
     parsedCoordinatorRoutes[coordinatorSession] = route;
   }
   const parsedExternalCoordinators = {};
-  for (const [coordinatorSession, externalCoordinator] of Object.entries(externalCoordinators ?? {})) {
+  for (const [coordinatorSession, externalCoordinator] of Object.entries(externalCoordinators)) {
     if (!isExternalCoordinatorRecord(externalCoordinator)) {
-      throw new Error(`state file "${path3}" contains an invalid external coordinator at "${coordinatorSession}"`);
+      dropped.push({
+        section: "orchestration.externalCoordinators",
+        key: coordinatorSession,
+        reason: "malformed external coordinator record"
+      });
+      continue;
     }
     if (externalCoordinator.coordinatorSession !== coordinatorSession) {
-      throw new Error(`state file "${path3}" contains an external coordinator key mismatch at "${coordinatorSession}"`);
+      dropped.push({
+        section: "orchestration.externalCoordinators",
+        key: coordinatorSession,
+        reason: `coordinatorSession "${externalCoordinator.coordinatorSession}" does not match map key`
+      });
+      continue;
     }
     parsedExternalCoordinators[coordinatorSession] = externalCoordinator;
   }
@@ -12344,11 +12637,12 @@ function isSessionRecord(value) {
   }
   return isString(value.alias) && isString(value.agent) && isString(value.workspace) && isString(value.transport_session) && isSessionSource(value.source) && isOptionalString(value.agent_session_id) && isOptionalString(value.agent_session_title) && isOptionalString(value.agent_session_updated_at) && isOptionalString(value.attached_at) && isOptionalString(value.transport_agent_command) && isOptionalString(value.mode_id) && (value.reply_mode === undefined || isReplyMode2(value.reply_mode)) && isString(value.created_at) && isString(value.last_used_at);
 }
-function parseSessions(raw, path3) {
+function parseSessions(raw, dropped) {
   const sessions = {};
   for (const [alias, value] of Object.entries(raw)) {
     if (!isSessionRecord(value)) {
-      throw new Error(`state file "${path3}" contains malformed session record "${alias}"`);
+      dropped.push({ section: "sessions", key: alias, reason: "malformed session record" });
+      continue;
     }
     sessions[alias] = value;
   }
@@ -12357,11 +12651,12 @@ function parseSessions(raw, path3) {
 function isChatContextRecord(value) {
   return isRecord2(value) && isString(value.current_session);
 }
-function parseChatContexts(raw, path3) {
+function parseChatContexts(raw, dropped) {
   const chatContexts = {};
   for (const [chatKey, value] of Object.entries(raw)) {
     if (!isChatContextRecord(value)) {
-      throw new Error(`state file "${path3}" contains malformed chat context record "${chatKey}"`);
+      dropped.push({ section: "chat_contexts", key: chatKey, reason: "malformed chat context record" });
+      continue;
     }
     chatContexts[chatKey] = value;
   }
@@ -12402,56 +12697,58 @@ function isScheduledTaskRecord(value) {
     return false;
   return isString(value.id) && isString(value.chat_key) && isString(value.session_alias) && isString(value.execute_at) && isString(value.message) && isScheduledTaskStatus(value.status) && isString(value.created_at) && isOptionalString(value.account_id) && isOptionalString(value.reply_context_token) && isOptionalString(value.source_label) && isOptionalString(value.triggered_at) && isOptionalString(value.executed_at) && isOptionalString(value.cancelled_at) && isOptionalString(value.missed_at) && isOptionalString(value.failed_at) && isOptionalString(value.last_error) && isOptionalScheduledSessionMode(value.session_mode) && isOptionalString(value.agent) && isOptionalString(value.workspace);
 }
-function parseScheduledTasks(raw, path3) {
-  if (raw === undefined)
-    return {};
-  if (!isRecord2(raw)) {
-    throw new Error(`state file "${path3}" must contain an object field "scheduled_tasks"`);
-  }
+function parseScheduledTasks(raw, dropped) {
+  const source = sectionRecord(raw, "scheduled_tasks", dropped);
   const tasks = {};
-  for (const [id, value] of Object.entries(raw)) {
+  for (const [id, value] of Object.entries(source)) {
     if (!isScheduledTaskRecord(value) || value.id !== id) {
-      throw new Error(`state file "${path3}" contains malformed scheduled task record "${id}"`);
+      dropped.push({ section: "scheduled_tasks", key: id, reason: "malformed scheduled task record" });
+      continue;
     }
     tasks[id] = value;
   }
   return tasks;
 }
-function parseState(raw, path3) {
+function parseState(raw, path3, dropped = []) {
   if (!isRecord2(raw)) {
     throw new Error(`state file "${path3}" must contain a JSON object`);
   }
-  const sessions = raw.sessions;
-  if (!isRecord2(sessions)) {
-    throw new Error(`state file "${path3}" must contain an object field "sessions"`);
-  }
-  const chatContexts = raw.chat_contexts;
-  if (!isRecord2(chatContexts)) {
-    throw new Error(`state file "${path3}" must contain an object field "chat_contexts"`);
-  }
-  const parsedSessions = parseSessions(sessions, path3);
-  const orchestration3 = parseOrchestrationState(raw.orchestration, path3);
-  validateExternalCoordinatorIdentityCollisions(parsedSessions, orchestration3, path3);
+  const parsedSessions = parseSessions(sectionRecord(raw.sessions, "sessions", dropped), dropped);
+  const orchestration3 = parseOrchestrationState(raw.orchestration, dropped);
+  repairExternalCoordinatorIdentityCollisions(parsedSessions, orchestration3, dropped);
   return {
     sessions: parsedSessions,
-    chat_contexts: parseChatContexts(chatContexts, path3),
+    chat_contexts: parseChatContexts(sectionRecord(raw.chat_contexts, "chat_contexts", dropped), dropped),
     native_session_lists: parseNativeSessionLists(raw.native_session_lists),
     orchestration: orchestration3,
-    scheduled_tasks: parseScheduledTasks(raw.scheduled_tasks, path3)
+    scheduled_tasks: parseScheduledTasks(raw.scheduled_tasks, dropped)
   };
 }
-function validateExternalCoordinatorIdentityCollisions(sessions, orchestration3, path3) {
+function repairExternalCoordinatorIdentityCollisions(sessions, orchestration3, dropped) {
   for (const coordinatorSession of Object.keys(orchestration3.externalCoordinators)) {
-    if (Object.values(sessions).some((session3) => session3.transport_session === coordinatorSession)) {
-      throw new Error(`state file "${path3}" contains external coordinator "${coordinatorSession}" that conflicts with a logical session`);
-    }
-    if (orchestration3.workerBindings[coordinatorSession]) {
-      throw new Error(`state file "${path3}" contains external coordinator "${coordinatorSession}" that conflicts with a worker binding`);
-    }
-    if (Object.values(orchestration3.tasks).some((task) => task.workerSession === coordinatorSession && (!isTerminalTaskStatus(task.status) || task.reviewPending !== undefined))) {
-      throw new Error(`state file "${path3}" contains external coordinator "${coordinatorSession}" that conflicts with an active task worker session`);
+    const conflict = findExternalCoordinatorConflict(coordinatorSession, sessions, orchestration3);
+    if (!conflict) {
+      continue;
     }
+    delete orchestration3.externalCoordinators[coordinatorSession];
+    dropped.push({
+      section: "orchestration.externalCoordinators",
+      key: coordinatorSession,
+      reason: `conflicts with ${conflict}; dropped (re-registered on next coordinator connect)`
+    });
+  }
+}
+function findExternalCoordinatorConflict(coordinatorSession, sessions, orchestration3) {
+  if (Object.values(sessions).some((session3) => session3.transport_session === coordinatorSession)) {
+    return "a logical session";
+  }
+  if (orchestration3.workerBindings[coordinatorSession]) {
+    return "a worker binding";
   }
+  if (Object.values(orchestration3.tasks).some((task) => task.workerSession === coordinatorSession && (!isTerminalTaskStatus(task.status) || task.reviewPending !== undefined))) {
+    return "an active task worker session";
+  }
+  return null;
 }
 function isTerminalTaskStatus(status) {
   return status === "completed" || status === "failed" || status === "cancelled";
@@ -12459,35 +12756,118 @@ function isTerminalTaskStatus(status) {
 
 class StateStore {
   path;
-  constructor(path3) {
+  options;
+  loadReport = null;
+  constructor(path3, options = {}) {
     this.path = path3;
+    this.options = options;
+  }
+  get lastLoadReport() {
+    return this.loadReport;
   }
   async load() {
+    this.loadReport = null;
+    const read = await this.readAndParse();
+    if (read.kind === "absent") {
+      return createEmptyState();
+    }
+    if (read.kind === "corrupt") {
+      return await this.recoverFromCorruptFile(read.reason);
+    }
+    if (read.dropped.length === 0) {
+      return read.state;
+    }
+    const report = { dropped: read.dropped };
+    const quarantinePath = `${this.path}.quarantine-${this.fileTimestamp()}`;
     try {
-      const content = await readFile5(this.path, "utf8");
-      if (content.trim() === "") {
-        return createEmptyState();
-      }
-      let parsed;
-      try {
-        parsed = JSON.parse(content);
-      } catch (error2) {
-        throw new Error(`failed to parse state file "${this.path}"`, {
-          cause: error2
-        });
-      }
-      return parseState(parsed, this.path);
+      const written = await (this.options.writeBackup ?? defaultWriteBackup)(quarantinePath, read.content);
+      report.quarantinePath = typeof written === "string" ? written : quarantinePath;
+    } catch (error2) {
+      report.backupError = error2 instanceof Error ? error2.message : String(error2);
+    }
+    this.loadReport = report;
+    return read.state;
+  }
+  async inspect() {
+    const read = await this.readAndParse();
+    if (read.kind === "absent") {
+      return { state: createEmptyState(), report: null };
+    }
+    if (read.kind === "corrupt") {
+      return {
+        state: createEmptyState(),
+        report: { dropped: [{ section: "file", key: this.path, reason: read.reason }] }
+      };
+    }
+    return {
+      state: read.state,
+      report: read.dropped.length > 0 ? { dropped: read.dropped } : null
+    };
+  }
+  async readAndParse() {
+    let content;
+    try {
+      content = await readFile6(this.path, "utf8");
     } catch (error2) {
       if (error2.code === "ENOENT") {
-        return createEmptyState();
+        return { kind: "absent" };
       }
       throw error2;
     }
+    if (content.trim() === "") {
+      return { kind: "absent" };
+    }
+    let parsed;
+    try {
+      parsed = JSON.parse(content);
+    } catch (error2) {
+      return {
+        kind: "corrupt",
+        reason: `invalid JSON: ${error2 instanceof Error ? error2.message : String(error2)}`
+      };
+    }
+    if (!isRecord2(parsed)) {
+      return { kind: "corrupt", reason: "top-level value is not an object" };
+    }
+    const dropped = [];
+    return { kind: "parsed", state: parseState(parsed, this.path, dropped), dropped, content };
   }
   async save(state) {
-    await writePrivateFileAtomic(this.path, JSON.stringify(state, null, 2));
+    await writePrivateFileAtomic(this.path, JSON.stringify({ version: STATE_FILE_VERSION, ...state }, null, 2));
+  }
+  fileTimestamp() {
+    const now = this.options.now?.() ?? new Date;
+    return now.toISOString().replace(/[:.]/g, "-");
+  }
+  async recoverFromCorruptFile(reason) {
+    const corruptPath = `${this.path}.corrupt-${this.fileTimestamp()}`;
+    const report = {
+      dropped: [{ section: "file", key: this.path, reason }]
+    };
+    try {
+      await rename(this.path, corruptPath);
+      report.corruptPath = corruptPath;
+    } catch (error2) {
+      report.backupError = error2 instanceof Error ? error2.message : String(error2);
+    }
+    this.loadReport = report;
+    return createEmptyState();
+  }
+}
+async function defaultWriteBackup(targetPath, content) {
+  for (let attempt = 0;; attempt += 1) {
+    const candidate = attempt === 0 ? targetPath : `${targetPath}-${attempt}`;
+    try {
+      await writeFile3(candidate, content, { encoding: "utf8", mode: 384, flag: "wx" });
+      return candidate;
+    } catch (error2) {
+      if (error2.code !== "EEXIST" || attempt >= 9) {
+        throw error2;
+      }
+    }
   }
 }
+var STATE_FILE_VERSION = 1;
 var init_state_store = __esm(() => {
   init_private_file();
   init_types();
@@ -12726,14 +13106,23 @@ class ScheduledTaskService {
       return task;
     });
   }
-  listPending() {
+  listPending(chatKey) {
+    return this.listPendingAllChats().filter((task) => task.chat_key === chatKey);
+  }
+  listPendingAllChats() {
     return Object.values(this.state.scheduled_tasks).filter((task) => task.status === "pending").sort((left, right) => left.execute_at.localeCompare(right.execute_at));
   }
-  async cancelPending(inputId) {
+  async cancelPending(inputId, chatKey) {
+    return await this.cancelPendingWhere(inputId, (task) => task.chat_key === chatKey);
+  }
+  async cancelPendingAnyChat(inputId) {
+    return await this.cancelPendingWhere(inputId, () => true);
+  }
+  async cancelPendingWhere(inputId, allowed) {
     return await this.mutate(async () => {
       const id = normalizeId(inputId);
       const task = this.state.scheduled_tasks[id];
-      if (!task || task.status !== "pending")
+      if (!task || task.status !== "pending" || !allowed(task))
         return false;
       task.status = "cancelled";
       task.cancelled_at = this.now().toISOString();
@@ -12765,7 +13154,7 @@ class ScheduledTaskService {
   async claimDueTasks() {
     return await this.mutate(async () => {
       const nowMs = this.now().getTime();
-      const due = this.listPending().filter((task) => Date.parse(task.execute_at) <= nowMs);
+      const due = this.listPendingAllChats().filter((task) => Date.parse(task.execute_at) <= nowMs);
       if (due.length === 0)
         return [];
       const at = this.now().toISOString();
@@ -12774,7 +13163,16 @@ class ScheduledTaskService {
         task.triggered_at = at;
         this.claimedInThisSession.add(task.id);
       }
-      await this.save();
+      try {
+        await this.save();
+      } catch (error2) {
+        for (const task of due) {
+          task.status = "pending";
+          delete task.triggered_at;
+          this.claimedInThisSession.delete(task.id);
+        }
+        throw error2;
+      }
       return due.map((task) => ({ ...task }));
     });
   }
@@ -12832,20 +13230,20 @@ var init_scheduled_service = () => {};
 
 // src/plugins/plugin-home.ts
 import { readFileSync as readFileSync2 } from "node:fs";
-import { copyFile, mkdir as mkdir6, readFile as readFile6, writeFile as writeFile4 } from "node:fs/promises";
+import { copyFile, mkdir as mkdir4, readFile as readFile7, writeFile as writeFile4 } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
-import { dirname as dirname6, join as join6 } from "node:path";
+import { dirname as dirname4, join as join6 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function resolveCoreRoot() {
   try {
-    let dir = dirname6(fileURLToPath2(import.meta.url));
+    let dir = dirname4(fileURLToPath2(import.meta.url));
     for (let depth = 0;depth < 12; depth++) {
       try {
         const pkg = JSON.parse(readFileSync2(join6(dir, "package.json"), "utf-8"));
         if (pkg.name && CORE_ROOT_NAMES.includes(pkg.name))
           return dir;
       } catch {}
-      const parent = dirname6(dir);
+      const parent = dirname4(dir);
       if (parent === dir)
         break;
       dir = parent;
@@ -12863,7 +13261,7 @@ async function ensureCoreResolution(pluginHome) {
   for (const name of SHIM_SPECIFIERS) {
     const targetDir = join6(pluginHome, "node_modules", name);
     const dstJs = join6(targetDir, "plugin-api.js");
-    await mkdir6(targetDir, { recursive: true });
+    await mkdir4(targetDir, { recursive: true });
     try {
       await copyFile(srcJs, dstJs);
     } catch (error2) {
@@ -12906,7 +13304,7 @@ async function normalizePluginHomeManifest(pluginHome) {
   const manifestPath = join6(pluginHome, "package.json");
   let raw;
   try {
-    raw = await readFile6(manifestPath, "utf8");
+    raw = await readFile7(manifestPath, "utf8");
   } catch {
     return false;
   }
@@ -12924,7 +13322,7 @@ async function normalizePluginHomeManifest(pluginHome) {
   return true;
 }
 async function ensurePluginHome(pluginHome) {
-  await mkdir6(pluginHome, { recursive: true, mode: 448 });
+  await mkdir4(pluginHome, { recursive: true, mode: 448 });
   await writeFile4(join6(pluginHome, "package.json"), JSON.stringify({ private: true, type: "module" }, null, 2) + `
 `, { flag: "wx" }).catch((error2) => {
     if (error2.code !== "EEXIST")
@@ -15540,7 +15938,7 @@ function createConversationExecutor() {
 var DEFAULT_SESSION_KEY = "__chat__";
 
 // src/channels/media-store.ts
-import { access as access2, mkdir as mkdir7, readdir, rm as rm5, stat, writeFile as writeFile5 } from "node:fs/promises";
+import { access as access2, mkdir as mkdir5, readdir, rm as rm5, stat, writeFile as writeFile5 } from "node:fs/promises";
 import path7 from "node:path";
 
 class RuntimeMediaStore {
@@ -15558,7 +15956,7 @@ class RuntimeMediaStore {
     const safeMessageId = safePathSegment(input.messageId || "message");
     const baseFileName = sanitizeMediaFileName(input.fileName ?? "attachment", input.mimeType);
     const dir = path7.join(this.rootDir, input.channelId, safeChatKey, safeMessageId);
-    await mkdir7(dir, { recursive: true });
+    await mkdir5(dir, { recursive: true, mode: 448 });
     const resolvedRoot = path7.resolve(this.rootDir);
     const resolvedFile = path7.resolve(path7.join(dir, await uniqueFileName(dir, baseFileName)));
     if (!isPathInside(resolvedFile, resolvedRoot)) {
@@ -16947,15 +17345,6 @@ async function handleSlashCommand(content, ctx, receivedAt, eventTimestamp) {
         await drainPendingFinalForJx(ctx);
         return { handled: true };
       }
-      case "/logout": {
-        if (listWeixinAccountIds().length === 0) {
-          await sendReply(ctx, t().weixin.noAccountsLoggedIn);
-          return { handled: true };
-        }
-        clearAllWeixinAccounts();
-        await sendReply(ctx, t().weixin.logoutSuccess);
-        return { handled: true };
-      }
       default:
         return { handled: false };
     }
@@ -16968,7 +17357,6 @@ async function handleSlashCommand(content, ctx, receivedAt, eventTimestamp) {
   }
 }
 var init_slash_commands = __esm(() => {
-  init_accounts();
   init_logger();
   init_i18n();
   init_final_heads_up();
@@ -16984,14 +17372,14 @@ function normalizeMediaArray(media) {
 }
 
 // src/logging/rotating-file-writer.ts
-import { readdir as readdir2, rename, rm as rm6, stat as stat2 } from "node:fs/promises";
-import { basename, dirname as dirname7, join as join8 } from "node:path";
+import { readdir as readdir2, rename as rename2, rm as rm6, stat as stat2 } from "node:fs/promises";
+import { basename, dirname as dirname5, join as join8 } from "node:path";
 async function rotateIfNeeded(filePath, incomingSize, maxSizeBytes, maxFiles) {
   let currentSize = 0;
   try {
     currentSize = (await stat2(filePath)).size;
   } catch (error2) {
-    if (!isMissingFileError2(error2)) {
+    if (!isMissingFileError3(error2)) {
       throw error2;
     }
   }
@@ -17009,24 +17397,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 (!isMissingFileError2(error2)) {
+      if (!isMissingFileError3(error2)) {
         throw error2;
       }
     }
   }
-  await rename(filePath, `${filePath}.1`);
+  await rename2(filePath, `${filePath}.1`);
 }
 async function cleanupExpiredRotatedLogs(filePath, retentionDays, now) {
-  const parentDir = dirname7(filePath);
+  const parentDir = dirname5(filePath);
   const prefix = `${basename(filePath)}.`;
   const cutoff = now().getTime() - retentionDays * 24 * 60 * 60 * 1000;
   let files = [];
   try {
     files = await readdir2(parentDir);
   } catch (error2) {
-    if (isMissingFileError2(error2)) {
+    if (isMissingFileError3(error2)) {
       return;
     }
     throw error2;
@@ -17036,23 +17424,31 @@ async function cleanupExpiredRotatedLogs(filePath, retentionDays, now) {
       continue;
     }
     const candidate = join8(parentDir, file);
-    const details = await stat2(candidate);
+    let details;
+    try {
+      details = await stat2(candidate);
+    } catch (error2) {
+      if (isMissingFileError3(error2)) {
+        continue;
+      }
+      throw error2;
+    }
     if (details.mtime.getTime() < cutoff) {
       await rm6(candidate, { force: true });
     }
   }
 }
-function isMissingFileError2(error2) {
+function isMissingFileError3(error2) {
   return typeof error2 === "object" && error2 !== null && "code" in error2 && error2.code === "ENOENT";
 }
 var init_rotating_file_writer = () => {};
 
 // src/perf/perf-log-writer.ts
 import { appendFile as fsAppendFile, mkdir as fsMkdir } from "node:fs/promises";
-import { dirname as dirname8 } from "node:path";
+import { dirname as dirname6 } from "node:path";
 function createPerfLogWriter(options) {
   const append = options.appendImpl ?? ((p, d) => fsAppendFile(p, d, "utf8"));
-  const mkdir8 = options.mkdirImpl ?? ((p, o) => fsMkdir(p, o).then(() => {
+  const mkdir6 = options.mkdirImpl ?? ((p, o) => fsMkdir(p, o).then(() => {
     return;
   }));
   const now = options.now ?? (() => new Date);
@@ -17099,7 +17495,7 @@ function createPerfLogWriter(options) {
       return;
     const data = batch.join("");
     try {
-      await mkdir8(dirname8(options.filePath), { recursive: true });
+      await mkdir6(dirname6(options.filePath), { recursive: true, mode: 448 });
       await rotateIfNeeded(options.filePath, Buffer.byteLength(data), options.maxSizeBytes, options.maxFiles);
       await append(options.filePath, data);
       consecutiveFailures = 0;
@@ -17630,13 +18026,39 @@ async function handleWeixinMessageTurn(full, deps) {
             deps.errLog(`weixin.final.dropped reason=backgrounded_no_store kind=text chatKey=${to}`);
           } else {
             const rawChunks = chunkFinalText(finalText, MAX_FINAL_CHUNK_BYTES);
+            const sendAllParkedNotice = async (count) => {
+              try {
+                await sendMessageWeixin({
+                  to,
+                  text: t().misc.finalAllParked(count),
+                  opts: { baseUrl: deps.baseUrl, token: deps.token, contextToken }
+                });
+              } catch (noticeErr) {
+                deps.errLog(`weixin.final.parked_notice_failed chatKey=${to} err=${String(noticeErr)}`);
+              }
+            };
+            const buildPendingChunk = (text, seq, total) => {
+              const entry = { text, seq, total };
+              if (contextToken !== undefined)
+                entry.contextToken = contextToken;
+              if (deps.accountId !== undefined)
+                entry.accountId = deps.accountId;
+              return entry;
+            };
             if (rawChunks.length > 0) {
               const total = rawChunks.length;
               if (total === 1) {
                 const reserved = deps.reserveFinal ? deps.reserveFinal(to) : true;
                 if (!reserved) {
-                  finalDropped = true;
-                  deps.errLog(`weixin.final.dropped reason=quota_exhausted kind=text chatKey=${to}`);
+                  if (deps.enqueuePendingFinal) {
+                    deps.enqueuePendingFinal(to, [buildPendingChunk(rawChunks[0], 1, 1)]);
+                    finalChunksPending = 1;
+                    deps.errLog(`weixin.final.parked reason=quota_exhausted kind=text chatKey=${to}`);
+                    await sendAllParkedNotice(1);
+                  } else {
+                    finalDropped = true;
+                    deps.errLog(`weixin.final.dropped reason=quota_exhausted kind=text chatKey=${to}`);
+                  }
                 } else {
                   await sendMessageWeixin({
                     to,
@@ -17693,16 +18115,11 @@ ${buildFinalHeadsUp({
                 const restToPark = prefixed.slice(sent);
                 finalChunksPending = restToPark.length;
                 if (restToPark.length > 0 && deps.enqueuePendingFinal) {
-                  const pending = restToPark.map((text, idx) => {
-                    const seq = sent + idx + 1;
-                    const entry = { text, seq, total };
-                    if (contextToken !== undefined)
-                      entry.contextToken = contextToken;
-                    if (deps.accountId !== undefined)
-                      entry.accountId = deps.accountId;
-                    return entry;
-                  });
+                  const pending = restToPark.map((text, idx) => buildPendingChunk(text, sent + idx + 1, total));
                   deps.enqueuePendingFinal(to, pending);
+                  if (sent === 0) {
+                    await sendAllParkedNotice(restToPark.length);
+                  }
                 }
               }
             }
@@ -17898,7 +18315,7 @@ function shouldFetchTypingConfig(textBody) {
   const command = parseSlashCommand(textBody);
   if (!command)
     return true;
-  return !["/cancel", "/stop", "/jx", "/echo", "/toggle-debug", "/logout"].includes(command);
+  return !["/cancel", "/stop", "/jx", "/echo", "/toggle-debug"].includes(command);
 }
 async function monitorWeixinProvider(opts) {
   const {
@@ -18621,7 +19038,7 @@ ${buildFinalHeadsUp({
     let sent = 0;
     for (let index = 0;index < wave.length; index += 1) {
       if (!deps.reserveFinal(quotaKey)) {
-        await deps.logger.info("scheduled.final_dropped", "scheduled turn final response dropped due to quota", { chatKey: input.chatKey, reason: "quota_exhausted", chunk: index + 1, total });
+        await deps.logger.info(deps.enqueuePendingFinal ? "scheduled.final_parked" : "scheduled.final_dropped", deps.enqueuePendingFinal ? "scheduled turn final response parked due to quota" : "scheduled turn final response dropped due to quota", { chatKey: input.chatKey, reason: "quota_exhausted", chunk: index + 1, total });
         break;
       }
       const delivered = await sendTextViaAvailableAccount(wave[index], "scheduled.final_send_failed");
@@ -18630,7 +19047,7 @@ ${buildFinalHeadsUp({
       sent += 1;
     }
     const restToPark = chunks.slice(sent);
-    if (total > 1 && restToPark.length > 0 && deps.enqueuePendingFinal) {
+    if (restToPark.length > 0 && deps.enqueuePendingFinal) {
       const pending = restToPark.map((text, index) => {
         const entry = { text, seq: sent + index + 1, total };
         if (deliveryContextToken)
@@ -18640,6 +19057,12 @@ ${buildFinalHeadsUp({
         return entry;
       });
       deps.enqueuePendingFinal(quotaKey, pending);
+      if (sent === 0) {
+        const noticeDelivered = await sendTextViaAvailableAccount(t().misc.finalAllParked(restToPark.length), "scheduled.final_parked_notice_failed");
+        if (!noticeDelivered) {
+          await deps.logger.info("scheduled.final_parked_notice_failed", "scheduled parked-final notice could not be delivered", { chatKey: input.chatKey, parked: restToPark.length });
+        }
+      }
     }
   }
   async function sendTextViaAvailableAccount(text, errorEvent) {
@@ -18677,8 +19100,8 @@ var init_scheduled_turn = __esm(() => {
 });
 
 // src/weixin/monitor/consumer-lock.ts
-import { mkdir as mkdir8, open as open3, readFile as readFile7, rm as rm7 } from "node:fs/promises";
-import { dirname as dirname9, join as join9 } from "node:path";
+import { mkdir as mkdir6, open as open3, readFile as readFile8, rm as rm7 } from "node:fs/promises";
+import { dirname as dirname7, join as join9 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 function createWeixinConsumerLock(options = {}) {
   const lockFilePath = options.lockFilePath ?? join9(coreHomeDir(homedir4()), "runtime", "weixin-consumer.lock.json");
@@ -18686,7 +19109,7 @@ function createWeixinConsumerLock(options = {}) {
   const onDiagnostic = options.onDiagnostic;
   return {
     async acquire(meta2) {
-      await mkdir8(dirname9(lockFilePath), { recursive: true });
+      await mkdir6(dirname7(lockFilePath), { recursive: true, mode: 448 });
       while (true) {
         try {
           const handle = await open3(lockFilePath, "wx");
@@ -18759,7 +19182,7 @@ function createWeixinConsumerLock(options = {}) {
 }
 async function loadLockMetadata(path14) {
   try {
-    const raw = await readFile7(path14, "utf8");
+    const raw = await readFile8(path14, "utf8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed.pid !== "number" || !parsed.mode || !parsed.configPath || !parsed.statePath) {
       return null;
@@ -18824,6 +19247,13 @@ class WeixinChannel {
   logout() {
     logout();
   }
+  stop() {
+    this.agent = null;
+    this.quota = null;
+    this.logger = null;
+    this.markDelivered = null;
+    this.markFailed = null;
+  }
   createConsumerLock(options) {
     return createWeixinConsumerLock({
       ...options?.lockFilePath ? { lockFilePath: options.lockFilePath } : {},
@@ -19393,6 +19823,122 @@ var init_plugin_loader = __esm(() => {
   init_plugin_home();
 });
 
+// src/plugins/plugin-doctor.ts
+import { readFile as readFile10 } from "node:fs/promises";
+import { join as join12 } from "node:path";
+function suggestedPluginPackageForChannel(type) {
+  return findKnownPluginByChannel(type)?.packageName ?? `<npm-package-that-provides-${type}>`;
+}
+async function readDependencyEntries(pluginHome) {
+  try {
+    const raw = await readFile10(join12(pluginHome, "package.json"), "utf8");
+    const parsed = JSON.parse(raw);
+    const out = {};
+    for (const [name, value] of Object.entries(parsed.dependencies ?? {})) {
+      if (typeof value === "string")
+        out[name] = value;
+    }
+    return out;
+  } catch (error2) {
+    const message = error2 instanceof Error ? error2.message : String(error2);
+    throw new Error(`failed to read plugin home package.json: ${message}`);
+  }
+}
+async function inspectPlugins(input) {
+  const issues = [];
+  let dependencies;
+  try {
+    dependencies = await readDependencyEntries(input.pluginHome);
+  } catch (error2) {
+    const message = error2 instanceof Error ? error2.message : String(error2);
+    return [{ level: "error", message }];
+  }
+  const importPlugin = input.importPlugin ?? importPluginFromHome;
+  const allConfigured = input.config.plugins;
+  const filterByName = input.pluginName ? normalizePluginPackageName(input.pluginName) : null;
+  if (filterByName && !allConfigured.some((plugin) => normalizePluginPackageName(plugin.name) === filterByName)) {
+    return [{ level: "error", plugin: filterByName, message: `plugin is not configured; run xacpx plugin add ${filterByName}` }];
+  }
+  const pushIfRelevant = (issue2) => {
+    if (!filterByName || issue2.plugin === filterByName)
+      issues.push(issue2);
+  };
+  const channelProviders = new Map;
+  for (const configPlugin of allConfigured) {
+    if (!(configPlugin.name in dependencies)) {
+      pushIfRelevant({ level: "error", plugin: configPlugin.name, message: `package not installed in plugin home; run xacpx plugin add ${configPlugin.name}`, suggestion: `xacpx plugin add ${configPlugin.name} && xacpx restart` });
+      continue;
+    }
+    let moduleValue;
+    try {
+      moduleValue = await importPlugin(configPlugin.name, input.pluginHome);
+    } catch (error2) {
+      const message = error2 instanceof Error ? error2.message : String(error2);
+      pushIfRelevant({ level: "error", plugin: configPlugin.name, message: `failed to import plugin: ${message}`, suggestion: `xacpx plugin add ${configPlugin.name} && xacpx restart` });
+      continue;
+    }
+    try {
+      const plugin = validateWeacpxPlugin(moduleValue, configPlugin.name, {
+        ...input.currentXacpxVersion !== undefined ? { currentXacpxVersion: input.currentXacpxVersion } : {}
+      });
+      const channels = plugin.channels ?? [];
+      const channelTypes = channels.map((channel) => channel.type);
+      for (const type of channelTypes) {
+        const existing = channelProviders.get(type);
+        if (existing) {
+          pushIfRelevant({ level: "error", plugin: configPlugin.name, message: `channel type ${type} is already provided by ${existing.plugin}` });
+        } else {
+          channelProviders.set(type, { plugin: configPlugin.name, enabled: configPlugin.enabled });
+        }
+      }
+      pushIfRelevant({
+        level: configPlugin.enabled ? "ok" : "warn",
+        plugin: configPlugin.name,
+        message: configPlugin.enabled ? `plugin is installed and valid; channels: ${channelTypes.length > 0 ? channelTypes.join(", ") : "none"}` : `plugin is installed and valid but disabled; run xacpx plugin enable ${configPlugin.name}`,
+        ...configPlugin.enabled ? {} : { suggestion: `xacpx plugin enable ${configPlugin.name}` }
+      });
+    } catch (error2) {
+      const message = error2 instanceof Error ? error2.message : String(error2);
+      pushIfRelevant({ level: "error", plugin: configPlugin.name, message });
+    }
+  }
+  const builtInChannelTypes = new Set(listKnownChannelIds());
+  for (const channel of input.config.channels) {
+    if (channel.enabled === false)
+      continue;
+    if (builtInChannelTypes.has(channel.type))
+      continue;
+    const provider = channelProviders.get(channel.type);
+    if (!provider) {
+      if (!filterByName) {
+        const suggestedPackage = suggestedPluginPackageForChannel(channel.type);
+        issues.push({
+          level: "error",
+          message: `channel ${channel.type} is configured but no enabled plugin provides it; run xacpx plugin add ${suggestedPackage} or another plugin that provides type "${channel.type}"`,
+          suggestion: `xacpx plugin add ${suggestedPackage}`
+        });
+      }
+      continue;
+    }
+    if (!provider.enabled) {
+      pushIfRelevant({
+        level: "error",
+        plugin: provider.plugin,
+        message: `channel ${channel.type} is configured but provider plugin is disabled; run xacpx plugin enable ${provider.plugin}`,
+        suggestion: `xacpx plugin enable ${provider.plugin}`
+      });
+    }
+  }
+  return issues;
+}
+var init_plugin_doctor = __esm(() => {
+  init_channel_scope();
+  init_plugin_loader();
+  init_validate_plugin();
+  init_known_plugins();
+  init_plugin_renames();
+});
+
 // src/channels/bootstrap.ts
 function bootstrapBuiltinChannels() {
   bootstrapBuiltinChannelFactories();
@@ -19404,8 +19950,8 @@ var init_bootstrap = __esm(() => {
 });
 
 // src/logging/app-logger.ts
-import { appendFile, chmod as chmod2, mkdir as mkdir9 } from "node:fs/promises";
-import { dirname as dirname11 } from "node:path";
+import { appendFile, chmod as chmod3, mkdir as mkdir7 } from "node:fs/promises";
+import { dirname as dirname9 } from "node:path";
 function createNoopAppLogger() {
   return {
     debug: async () => {},
@@ -19419,6 +19965,7 @@ function createAppLogger(options) {
   const now = options.now ?? (() => new Date);
   let writeChain = Promise.resolve();
   let modeEnsured = false;
+  let writeErrorLatched = false;
   return {
     debug: async (event, message, context) => {
       await enqueueWrite("debug", event, message, context);
@@ -19430,14 +19977,21 @@ function createAppLogger(options) {
       await enqueueWrite("error", event, message, context);
     },
     cleanup: async () => {
-      await cleanupExpiredRotatedLogs(options.filePath, options.retentionDays, now);
+      try {
+        await cleanupExpiredRotatedLogs(options.filePath, options.retentionDays, now);
+      } catch {}
     },
     flush: async () => {
       await writeChain;
     }
   };
   function enqueueWrite(level, event, message, context = {}) {
-    const writePromise = writeChain.catch(() => {}).then(() => writeLog2(level, event, message, context));
+    const writePromise = writeChain.then(() => writeLog2(level, event, message, context)).catch((error2) => {
+      if (!writeErrorLatched) {
+        writeErrorLatched = true;
+        console.error("[xacpx] app-logger: log file write failed — further write errors will be suppressed.", error2 instanceof Error ? error2.message : String(error2));
+      }
+    });
     writeChain = writePromise;
     return writePromise;
   }
@@ -19446,13 +20000,14 @@ function createAppLogger(options) {
       return;
     }
     const line = formatLogLine(now(), level, event, message, context);
-    await mkdir9(dirname11(options.filePath), { recursive: true });
+    await mkdir7(dirname9(options.filePath), { recursive: true, mode: 448 });
     if (!modeEnsured) {
       modeEnsured = true;
-      await chmod2(options.filePath, 384).catch(() => {});
+      await chmod3(options.filePath, 384).catch(() => {});
     }
     await rotateIfNeeded(options.filePath, Buffer.byteLength(line), options.maxSizeBytes, options.maxFiles);
     await appendFile(options.filePath, line, { encoding: "utf8", mode: 384 });
+    writeErrorLatched = false;
   }
 }
 function formatLogLine(time3, level, event, message, context) {
@@ -19481,7 +20036,7 @@ var init_app_logger = __esm(() => {
 });
 
 // src/transport/acpx-session-index.ts
-import { readFile as readFile11 } from "node:fs/promises";
+import { readFile as readFile12 } from "node:fs/promises";
 import { homedir as homedir5 } from "node:os";
 import { resolve as resolve2 } from "node:path";
 async function resolveSessionAgentCommandFromIndex(session3) {
@@ -19490,7 +20045,7 @@ async function resolveSessionAgentCommandFromIndex(session3) {
     return;
   }
   try {
-    const raw = await readFile11(resolve2(home, ".acpx", "sessions", "index.json"), "utf8");
+    const raw = await readFile12(resolve2(home, ".acpx", "sessions", "index.json"), "utf8");
     const parsed = JSON.parse(raw);
     const targetCwd = resolve2(session3.cwd);
     const match = parsed.entries?.find((entry) => entry.name === session3.transportSession && entry.cwd === targetCwd && typeof entry.agentCommand === "string" && entry.agentCommand.trim().length > 0);
@@ -19672,7 +20227,9 @@ function parseCommand(input) {
   if (!trimmed.startsWith("/")) {
     return { kind: "prompt", text: trimmed };
   }
-  const parts = tokenizeCommand(trimmed);
+  const tokens = tokenizeCommand(trimmed);
+  const parts = tokens.map((token) => token.value);
+  const rawTail = (index) => index < tokens.length ? trimmed.slice(tokens[index]?.start ?? 0) : "";
   const command = normalizeCommand(parts[0] ?? "");
   if (command === "/help" && parts.length === 1)
     return { kind: "help" };
@@ -19781,7 +20338,7 @@ function parseCommand(input) {
     return { kind: "invalid", text: trimmed, recognizedCommand: "/session" };
   }
   if (command === "/group" && parts[1] === "new" && parts.length > 2) {
-    const title = parts.slice(2).join(" ");
+    const title = rawTail(2);
     if (title.trim().length > 0) {
       return { kind: "group.new", title };
     }
@@ -19805,7 +20362,7 @@ function parseCommand(input) {
       }
       break;
     }
-    const task = parts.slice(index).join(" ");
+    const task = rawTail(index);
     if (groupId.trim().length > 0 && targetAgent.trim().length > 0 && task.trim().length > 0) {
       return {
         kind: "group.delegate",
@@ -19859,7 +20416,7 @@ function parseCommand(input) {
     return { kind: "agent.rm", name: parts[2] };
   }
   if ((command === "/delegate" || command === "/dg") && parts[1]) {
-    const parsedDelegate = parseDelegateRequest(parts);
+    const parsedDelegate = parseDelegateRequest(parts, rawTail);
     if (parsedDelegate) {
       return parsedDelegate;
     }
@@ -19887,7 +20444,11 @@ function parseCommand(input) {
     if (parts[1] === "cancel" && parts[2] && parts.length === 3) {
       return { kind: "later.cancel", id: parts[2] };
     }
-    return { kind: "later.create", tokens: parts.slice(1) };
+    return {
+      kind: "later.create",
+      tokens: parts.slice(1),
+      tails: tokens.slice(1).map((_, index) => rawTail(index + 1))
+    };
   }
   if (command === "/workspace" && parts[1] === "new" && parts[2]) {
     const name = parts[2];
@@ -20140,17 +20701,18 @@ function readNativeAttachCommand(parts, identifierIndex) {
   return { kind: "session.native.attach", identifier };
 }
 function normalizeCommand(command) {
-  if (command === "/ss")
+  const lowered = command.toLowerCase();
+  if (lowered === "/ss")
     return "/session";
-  if (command === "/ws")
+  if (lowered === "/ws")
     return "/workspace";
-  if (command === "/pm")
+  if (lowered === "/pm")
     return "/permission";
-  if (command === "/stop")
+  if (lowered === "/stop")
     return "/cancel";
-  if (command === "/lt")
+  if (lowered === "/lt")
     return "/later";
-  return command;
+  return lowered;
 }
 function isRecognizedCommand(command) {
   return isKnownXacpxCommandPrefix(command);
@@ -20173,31 +20735,41 @@ function toNonInteractivePermission(value) {
 function tokenizeCommand(input) {
   const tokens = [];
   let current = "";
-  let quote = null;
+  let start2 = -1;
+  let closingQuote = null;
+  let offset = 0;
   for (const char of input) {
-    if (quote) {
-      if (char === quote) {
-        quote = null;
+    const charStart = offset;
+    offset += char.length;
+    if (closingQuote) {
+      if (char === closingQuote) {
+        closingQuote = null;
       } else {
         current += char;
       }
       continue;
     }
-    if (char === '"' || char === "'") {
-      quote = char;
+    const close = QUOTE_PAIRS[char];
+    if (close) {
+      if (start2 === -1)
+        start2 = charStart;
+      closingQuote = close;
       continue;
     }
     if (/\s/.test(char)) {
       if (current.length > 0) {
-        tokens.push(current);
+        tokens.push({ value: current, start: start2 });
         current = "";
       }
+      start2 = -1;
       continue;
     }
+    if (start2 === -1)
+      start2 = charStart;
     current += char;
   }
   if (current.length > 0) {
-    tokens.push(current);
+    tokens.push({ value: current, start: start2 });
   }
   return tokens;
 }
@@ -20240,7 +20812,7 @@ function parseListFilterFlags(parts, validStatuses) {
   }
   return { filter, ok: true };
 }
-function parseDelegateRequest(parts) {
+function parseDelegateRequest(parts, rawTail) {
   const targetAgent = parts[1];
   if (!targetAgent) {
     return null;
@@ -20268,7 +20840,7 @@ function parseDelegateRequest(parts) {
     }
     break;
   }
-  const task = parts.slice(index).join(" ");
+  const task = rawTail(index);
   if (task.trim().length === 0) {
     return null;
   }
@@ -20280,9 +20852,16 @@ function parseDelegateRequest(parts) {
     task
   };
 }
-var TASK_STATUS_VALUES, GROUP_STATUS_VALUES;
+var QUOTE_PAIRS, TASK_STATUS_VALUES, GROUP_STATUS_VALUES;
 var init_parse_command = __esm(() => {
   init_command_list();
+  QUOTE_PAIRS = {
+    '"': '"',
+    "'": "'",
+    "“": "”",
+    "‘": "’",
+    "＂": "＂"
+  };
   TASK_STATUS_VALUES = [
     "pending",
     "needs_confirmation",
@@ -20295,7 +20874,50 @@ var init_parse_command = __esm(() => {
 });
 
 // src/commands/command-policy.ts
+function isInternalScheduledTurn(metadata) {
+  return Boolean(metadata?.scheduledSessionAlias || metadata?.scheduledSessionDescriptor);
+}
+function resolveChannelOwnerIds(config4, channel) {
+  if (!config4 || !channel) {
+    return;
+  }
+  let configured = false;
+  const ids = new Set;
+  if (config4.channel?.type === channel && config4.channel.ownerIds) {
+    configured = true;
+    for (const id of config4.channel.ownerIds)
+      ids.add(id);
+  }
+  for (const entry of config4.channels ?? []) {
+    if ((entry.type === channel || entry.id === channel) && entry.ownerIds) {
+      configured = true;
+      for (const id of entry.ownerIds)
+        ids.add(id);
+    }
+  }
+  return configured ? [...ids] : undefined;
+}
+function withEffectiveOwner(metadata, config4) {
+  if (!metadata?.channel || isInternalScheduledTurn(metadata)) {
+    return metadata;
+  }
+  const ownerIds = resolveChannelOwnerIds(config4, metadata.channel);
+  if (ownerIds === undefined) {
+    return metadata;
+  }
+  const isOwner = metadata.isOwner === true || typeof metadata.senderId === "string" && ownerIds.includes(metadata.senderId);
+  return { ...metadata, isOwner };
+}
 function authorizeCommandForChat(command, metadata) {
+  if (metadata?.channel && !isInternalScheduledTurn(metadata) && metadata.chatType !== "direct" && metadata.chatType !== "group") {
+    if (GROUP_PUBLIC_COMMAND_KINDS.has(command.kind)) {
+      return { allowed: true };
+    }
+    return {
+      allowed: false,
+      reason: "chat-type-missing"
+    };
+  }
   if (metadata?.chatType !== "group") {
     return { allowed: true };
   }
@@ -20310,7 +20932,14 @@ function authorizeCommandForChat(command, metadata) {
     reason: "group-owner-required"
   };
 }
-function renderCommandAccessDenied(command) {
+function renderCommandAccessDenied(command, reason) {
+  if (reason === "chat-type-missing") {
+    return [
+      `⚠️ ${renderCommandLabel(command)}${t().misc.commandAccessDeniedChatTypeMissingSuffix}`,
+      t().misc.commandAccessDeniedChatTypeMissingHint
+    ].join(`
+`);
+  }
   return [
     `⚠️ ${renderCommandLabel(command)}${t().misc.commandAccessDeniedSuffix}`,
     t().misc.commandAccessDeniedHint
@@ -20436,13 +21065,18 @@ async function handlePermissionModeSet(context, mode) {
     return { text: p.noWritableConfig };
   }
   const previous = cloneAppConfig(context.config);
+  const previousRaw = await context.configStore.getRawValue(["transport", "permissionMode"]);
   const updated = await context.configStore.updateTransport({
     permissionMode: mode
   });
   try {
     await context.transport.updatePermissionPolicy?.(updated.transport);
   } catch (error2) {
-    await context.configStore.save(previous);
+    if (previousRaw.present) {
+      await context.configStore.setRawValue(["transport", "permissionMode"], previousRaw.value);
+    } else {
+      await context.configStore.unsetRawValue(["transport", "permissionMode"]);
+    }
     context.replaceConfig(previous);
     throw error2;
   }
@@ -20458,13 +21092,18 @@ async function handlePermissionAutoSet(context, policy) {
     return { text: p.noWritableConfig };
   }
   const previous = cloneAppConfig(context.config);
+  const previousRaw = await context.configStore.getRawValue(["transport", "nonInteractivePermissions"]);
   const updated = await context.configStore.updateTransport({
     nonInteractivePermissions: policy
   });
   try {
     await context.transport.updatePermissionPolicy?.(updated.transport);
   } catch (error2) {
-    await context.configStore.save(previous);
+    if (previousRaw.present) {
+      await context.configStore.setRawValue(["transport", "nonInteractivePermissions"], previousRaw.value);
+    } else {
+      await context.configStore.unsetRawValue(["transport", "nonInteractivePermissions"]);
+    }
     context.replaceConfig(previous);
     throw error2;
   }
@@ -20514,99 +21153,83 @@ async function handleConfigSet(context, path14, rawValue) {
   if (!context.config || !context.configStore) {
     return { text: c.noWritableConfig };
   }
-  const previous = cloneAppConfig(context.config);
-  const updated = cloneAppConfig(context.config);
-  const result = applySupportedConfigUpdate(updated, path14, rawValue);
-  if ("error" in result) {
-    return { text: result.error };
+  const plan = planSupportedConfigUpdate(context.config, path14, rawValue);
+  if ("error" in plan) {
+    return { text: plan.error };
   }
-  await context.configStore.save(updated);
+  const previousConfig = cloneAppConfig(context.config);
+  const previousRaw = await context.configStore.getRawValue(plan.rawPath);
+  const updated = await context.configStore.setRawValue(plan.rawPath, plan.value);
   if (path14 === "transport.permissionMode" || path14 === "transport.nonInteractivePermissions" || path14 === "transport.permissionPolicy") {
     try {
       await context.transport.updatePermissionPolicy?.(updated.transport);
     } catch (error2) {
-      await context.configStore.save(previous);
-      context.replaceConfig(previous);
+      if (previousRaw.present) {
+        await context.configStore.setRawValue(plan.rawPath, previousRaw.value);
+      } else {
+        await context.configStore.unsetRawValue(plan.rawPath);
+      }
+      context.replaceConfig(previousConfig);
       throw error2;
     }
   }
   context.replaceConfig(updated);
-  return { text: c.updated(path14, result.renderedValue) };
+  return { text: c.updated(path14, plan.renderedValue) };
 }
-function applySupportedConfigUpdate(config4, path14, rawValue) {
+function planSupportedConfigUpdate(config4, path14, rawValue) {
   const c = t().config;
   switch (path14) {
     case "language": {
       if (!isLocale(rawValue))
         return { error: c.languageInvalid };
-      config4.language = rawValue;
-      return { renderedValue: rawValue };
+      return { rawPath: ["language"], value: rawValue, renderedValue: rawValue };
     }
     case "transport.type": {
       const parsed = parseEnum(rawValue, ["acpx-cli", "acpx-bridge"]);
       if (!parsed)
         return { error: c.transportTypeInvalid };
-      config4.transport.type = parsed;
-      return { renderedValue: parsed };
+      return { rawPath: ["transport", "type"], value: parsed, renderedValue: parsed };
     }
     case "transport.command":
       if (!rawValue.trim())
         return { error: c.transportCommandEmpty };
-      config4.transport.command = rawValue;
-      return { renderedValue: rawValue };
+      return { rawPath: ["transport", "command"], value: rawValue, renderedValue: rawValue };
     case "transport.sessionInitTimeoutMs": {
       const parsed = parsePositiveNumber(rawValue, "transport.sessionInitTimeoutMs");
       if ("error" in parsed)
         return parsed;
-      config4.transport.sessionInitTimeoutMs = parsed.value;
-      return { renderedValue: String(parsed.value) };
+      return { rawPath: ["transport", "sessionInitTimeoutMs"], value: parsed.value, renderedValue: String(parsed.value) };
     }
     case "transport.permissionMode": {
       const parsed = parseEnum(rawValue, ["approve-all", "approve-reads", "deny-all"]);
       if (!parsed)
         return { error: c.transportPermissionModeInvalid };
-      config4.transport.permissionMode = parsed;
-      return { renderedValue: parsed };
+      return { rawPath: ["transport", "permissionMode"], value: parsed, renderedValue: parsed };
     }
     case "transport.nonInteractivePermissions": {
       const parsed = parseEnum(rawValue, ["deny", "fail"]);
       if (!parsed)
         return { error: c.transportNonInteractiveInvalid };
-      config4.transport.nonInteractivePermissions = parsed;
-      return { renderedValue: parsed };
+      return { rawPath: ["transport", "nonInteractivePermissions"], value: parsed, renderedValue: parsed };
     }
     case "transport.permissionPolicy":
       if (!rawValue.trim())
         return { error: c.transportPermissionPolicyEmpty };
-      config4.transport.permissionPolicy = rawValue;
-      return { renderedValue: rawValue };
+      return { rawPath: ["transport", "permissionPolicy"], value: rawValue, renderedValue: rawValue };
     case "logging.level": {
       const parsed = parseEnum(rawValue, ["error", "info", "debug"]);
       if (!parsed)
         return { error: c.loggingLevelInvalid };
-      config4.logging.level = parsed;
-      return { renderedValue: parsed };
-    }
-    case "logging.maxSizeBytes": {
-      const parsed = parsePositiveNumber(rawValue, "logging.maxSizeBytes");
-      if ("error" in parsed)
-        return parsed;
-      config4.logging.maxSizeBytes = parsed.value;
-      return { renderedValue: String(parsed.value) };
-    }
-    case "logging.maxFiles": {
-      const parsed = parsePositiveNumber(rawValue, "logging.maxFiles");
-      if ("error" in parsed)
-        return parsed;
-      config4.logging.maxFiles = parsed.value;
-      return { renderedValue: String(parsed.value) };
+      return { rawPath: ["logging", "level"], value: parsed, renderedValue: parsed };
     }
+    case "logging.maxSizeBytes":
+    case "logging.maxFiles":
     case "logging.retentionDays": {
-      const parsed = parsePositiveNumber(rawValue, "logging.retentionDays");
+      const field = path14.slice("logging.".length);
+      const parsed = parsePositiveNumber(rawValue, path14);
       if ("error" in parsed)
         return parsed;
-      config4.logging.retentionDays = parsed.value;
-      return { renderedValue: String(parsed.value) };
+      return { rawPath: ["logging", field], value: parsed.value, renderedValue: String(parsed.value) };
     }
     case "channel.type":
       return { error: c.channelTypeDisabled };
@@ -20614,15 +21237,15 @@ function applySupportedConfigUpdate(config4, path14, rawValue) {
       const parsed = parseEnum(rawValue, ["stream", "final", "verbose"]);
       if (!parsed)
         return { error: c.channelReplyModeInvalid };
-      config4.channel.replyMode = parsed;
-      return { renderedValue: parsed };
+      return { rawPath: ["channel", "replyMode"], value: parsed, renderedValue: parsed };
     }
     case "wechat.replyMode": {
       const parsed = parseEnum(rawValue, ["stream", "final", "verbose"]);
       if (!parsed)
         return { error: c.wechatReplyModeInvalid };
-      config4.channel.replyMode = parsed;
       return {
+        rawPath: ["channel", "replyMode"],
+        value: parsed,
         renderedValue: c.wechatReplyModeMapped(parsed)
       };
     }
@@ -20630,42 +21253,30 @@ function applySupportedConfigUpdate(config4, path14, rawValue) {
   const agentMatch = path14.match(/^agents\.([^.]+)\.(driver|command)$/);
   if (agentMatch) {
     const [, name, field] = agentMatch;
-    if (!name || !field) {
+    if (!name || !field || isPrototypePollutingKey(name)) {
       return { error: c.pathNotSupported(path14) };
     }
-    const agent3 = config4.agents[name];
-    if (!agent3) {
+    if (!Object.hasOwn(config4.agents, name)) {
       return { error: c.agentNotFound(name) };
     }
     if (!rawValue.trim()) {
       return { error: c.fieldEmpty(path14) };
     }
-    if (field === "driver") {
-      agent3.driver = rawValue;
-    } else {
-      agent3.command = rawValue;
-    }
-    return { renderedValue: rawValue };
+    return { rawPath: ["agents", name, field], value: rawValue, renderedValue: rawValue };
   }
   const workspaceMatch = path14.match(/^workspaces\.([^.]+)\.(cwd|description)$/);
   if (workspaceMatch) {
     const [, name, field] = workspaceMatch;
-    if (!name || !field) {
+    if (!name || !field || isPrototypePollutingKey(name)) {
       return { error: c.pathNotSupported(path14) };
     }
-    const workspace3 = config4.workspaces[name];
-    if (!workspace3) {
+    if (!Object.hasOwn(config4.workspaces, name)) {
       return { error: c.workspaceNotFound(name) };
     }
     if (!rawValue.trim()) {
       return { error: c.fieldEmpty(path14) };
     }
-    if (field === "cwd") {
-      workspace3.cwd = rawValue;
-    } else {
-      workspace3.description = rawValue;
-    }
-    return { renderedValue: rawValue };
+    return { rawPath: ["workspaces", name, field], value: rawValue, renderedValue: rawValue };
   }
   const channelMatch = path14.match(/^channels\.([^.]+)\.replyMode$/);
   if (channelMatch) {
@@ -20681,11 +21292,21 @@ function applySupportedConfigUpdate(config4, path14, rawValue) {
     if (!parsed) {
       return { error: c.channelRuntimeReplyModeInvalid(id) };
     }
-    channel.replyMode = parsed;
-    return { renderedValue: parsed };
+    return {
+      rawPath: [
+        "channels",
+        { id, createWith: { id: channel.id, type: channel.type, enabled: channel.enabled } },
+        "replyMode"
+      ],
+      value: parsed,
+      renderedValue: parsed
+    };
   }
   return { error: c.pathNotSupported(path14) };
 }
+function isPrototypePollutingKey(key) {
+  return key === "__proto__" || key === "constructor" || key === "prototype";
+}
 function parseEnum(value, allowed) {
   return allowed.includes(value) ? value : null;
 }
@@ -21227,6 +21848,10 @@ async function handleSessions(context, chatKey) {
 async function handleSessionNew(context, chatKey, alias, agent3, workspace3) {
   const channelId = getChannelIdFromChatKey(chatKey);
   const internalAlias = scopeDisplayAliasToInternal(channelId, alias);
+  const existing = context.sessions.getResolvedSessionByInternalAlias(internalAlias);
+  if (existing) {
+    return { text: t().session.sessionAlreadyExists(alias, existing.agent, existing.workspace) };
+  }
   const session3 = context.lifecycle.resolveSession(internalAlias, agent3, workspace3, `${workspace3}:${internalAlias}`);
   const releaseTransportReservation = await context.lifecycle.reserveTransportSession(session3.transportSession);
   try {
@@ -21497,7 +22122,9 @@ async function handleSessionRemove(context, chatKey, alias) {
     }
   }
   const sharedAliasCount = context.sessions.countAliasesSharingTransport(session3.transportSession, internalAlias);
+  const wasCurrentInThisChat = context.sessions.peekCurrentSessionAlias(chatKey) === internalAlias;
   const { wasActive } = await context.sessions.removeSession(internalAlias);
+  const promotedAlias = wasCurrentInThisChat ? context.sessions.peekCurrentSessionAlias(chatKey) || undefined : undefined;
   let orchestrationPurgeWarning;
   if (context.orchestration) {
     try {
@@ -21535,7 +22162,7 @@ async function handleSessionRemove(context, chatKey, alias) {
   const s = t().session;
   const lines = [s.sessionRemoved(alias)];
   if (wasActive) {
-    lines.push(s.sessionRemovedWasActive);
+    lines.push(promotedAlias ? s.sessionRemovedWasActivePromoted(toDisplaySessionAlias(promotedAlias)) : s.sessionRemovedWasActive);
   }
   if (!shouldTeardownTransport) {
     lines.push(s.sessionTransportShared(session3.transportSession, sharedAliasCount));
@@ -22363,7 +22990,7 @@ async function handleWorkspaceCreate(context, workspaceName, cwd, options = {})
     name = allocateWorkspaceName(base, context.config.workspaces);
     notice = w.nameSanitized(workspaceName, name);
   }
-  const updated = await context.configStore.upsertWorkspace(name, normalizedCwd);
+  const updated = await context.configStore.upsertWorkspace(name, cwd);
   context.replaceConfig(updated);
   const savedLine = w.saved(name);
   return { text: notice ? `${notice}
@@ -22479,10 +23106,10 @@ function validateResult(executeAt, messageStartIndex, tokens, now, pastTodayValu
   if (tokens.slice(messageStartIndex).join(" ").trim().length === 0)
     return { ok: false, code: "missing_message" };
   const delta = executeAt.getTime() - now.getTime();
+  if (isNaN(delta) || delta > LATER_MAX_DELAY_MS)
+    return { ok: false, code: "out_of_range" };
   if (delta < LATER_MIN_DELAY_MS)
     return { ok: false, code: "too_soon" };
-  if (delta > LATER_MAX_DELAY_MS)
-    return { ok: false, code: "out_of_range" };
   return { ok: true, executeAt, messageStartIndex };
 }
 var WEEKDAYS, ZH_MIN = "分钟", ZH_HOUR = "小时", ZH_DAY_UNIT = "天", ZH_TODAY = "今天", ZH_TOMORROW = "明天", ZH_DAY_AFTER = "后天", ZH_AFTER = "后", ZH_RELATIVE_RE;
@@ -22558,16 +23185,17 @@ function laterHelp() {
 function handleLaterHelp() {
   return { text: renderLaterHelp() };
 }
-async function handleLaterCreate(tokens, scheduled, chatKey, currentSession, defaultMode, accountId, replyContextToken) {
+async function handleLaterCreate(tokens, tails, scheduled, chatKey, currentSession, defaultMode, accountId, replyContextToken) {
   const l = t().later;
-  let rest = tokens;
+  let restStart = 0;
   const seenFlags = new Set;
   let flagMode;
-  while (rest.length > 0 && (rest[0] === "--bind" || rest[0] === "--temp")) {
-    seenFlags.add(rest[0]);
-    flagMode = rest[0] === "--bind" ? "bound" : "temp";
-    rest = rest.slice(1);
+  while (restStart < tokens.length && (tokens[restStart] === "--bind" || tokens[restStart] === "--temp")) {
+    seenFlags.add(tokens[restStart] ?? "");
+    flagMode = tokens[restStart] === "--bind" ? "bound" : "temp";
+    restStart += 1;
   }
+  const rest = tokens.slice(restStart);
   if (seenFlags.size > 1) {
     return { text: l.bindAndTempMutuallyExclusive };
   }
@@ -22588,7 +23216,7 @@ async function handleLaterCreate(tokens, scheduled, chatKey, currentSession, def
   if (!result.ok) {
     return { text: renderTimeParseError(result.code, result.value) };
   }
-  const message = rest.slice(result.messageStartIndex).join(" ").trim();
+  const message = (tails[restStart + result.messageStartIndex] ?? "").trim();
   if (message.startsWith("/")) {
     return {
       text: [
@@ -22612,12 +23240,12 @@ async function handleLaterCreate(tokens, scheduled, chatKey, currentSession, def
   });
   return { text: renderTaskCreated(task, toDisplaySessionAlias(currentSession.alias)) };
 }
-function handleLaterList(scheduled) {
-  const tasks = scheduled.listPending();
+function handleLaterList(scheduled, chatKey) {
+  const tasks = scheduled.listPending(chatKey);
   return { text: renderLaterList(tasks, (alias) => toDisplaySessionAlias(alias)) };
 }
-async function handleLaterCancel(id, scheduled) {
-  const ok = await scheduled.cancelPending(id);
+async function handleLaterCancel(id, scheduled, chatKey) {
+  const ok = await scheduled.cancelPending(id, chatKey);
   const displayId = id.replace(/^#/, "").toLowerCase();
   if (ok) {
     return { text: t().later.cancelSuccess(displayId) };
@@ -23454,7 +24082,7 @@ var init_session_recovery_handler = __esm(() => {
 // src/recovery/auto-install-optional-dep.ts
 import { spawn as spawn5 } from "node:child_process";
 import { createWriteStream } from "node:fs";
-import { mkdir as mkdir10 } from "node:fs/promises";
+import { mkdir as mkdir8 } from "node:fs/promises";
 import { homedir as homedir6 } from "node:os";
 import { join as join14 } from "node:path";
 async function autoInstallOptionalDep(pkg, parentPackages, options = {}) {
@@ -23572,7 +24200,7 @@ ${err.message}`, reason: "spawn" });
   });
 }, defaultLogSink = async () => {
   const dir = join14(coreHomeDir(homedir6()), "logs");
-  await mkdir10(dir, { recursive: true });
+  await mkdir8(dir, { recursive: true });
   const timestamp = new Date().toISOString().replace(/[:.]/g, "").replace(/-/g, "");
   const path14 = join14(dir, `auto-install-${timestamp}.log`);
   const stream = createWriteStream(path14, { flags: "a" });
@@ -23601,7 +24229,7 @@ import { spawn as spawn6 } from "node:child_process";
 import { createRequire as createRequire3 } from "node:module";
 import { access as access3 } from "node:fs/promises";
 import { homedir as homedir7 } from "node:os";
-import { dirname as dirname12, join as join15 } from "node:path";
+import { dirname as dirname10, join as join15 } 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))?$/, "");
 }
@@ -23674,7 +24302,7 @@ function defaultResolveFromCwd(name, cwd) {
     const pkgJson = require2.resolve(`${name}/package.json`, {
       paths: [cwd, ...require2.resolve.paths(name) ?? []]
     });
-    return dirname12(pkgJson);
+    return dirname10(pkgJson);
   } catch {
     return null;
   }
@@ -23809,11 +24437,11 @@ async function handleSessionResetCommand(context, ops, chatKey) {
       chatKey,
       native: wasNative && Boolean(freshAgentSessionId)
     });
-    if (wasNative && context.transport.removeSession && context.sessions.countAliasesSharingTransport(previous.transportSession) === 0) {
+    if (context.transport.removeSession && context.sessions.countAliasesSharingTransport(previous.transportSession) === 0) {
       try {
         await context.transport.removeSession(previous);
       } catch (error2) {
-        await context.logger.info("session.reset.close_previous_failed", "failed to close previous native session after reset", {
+        await context.logger.info("session.reset.close_previous_failed", "failed to close previous session after reset", {
           transportSession: previous.transportSession,
           error: error2 instanceof Error ? error2.message : String(error2)
         });
@@ -23875,9 +24503,20 @@ class CommandRouter {
       chatKey,
       kind: command.kind
     });
+    await this.refreshConfigFromStore();
+    perfSpan?.mark("router.config_refreshed");
+    metadata = withEffectiveOwner(metadata, this.config);
     const access4 = authorizeCommandForChat(command, metadata);
     perfSpan?.mark("router.authorized", { decision: access4.allowed ? "allow" : "deny" });
     if (!access4.allowed) {
+      if (access4.reason === "chat-type-missing") {
+        await this.logger.error("channel.chat_type_missing", "channel turn carried no chatType; denying privileged command (channel metadata contract violation)", {
+          chatKey,
+          kind: command.kind,
+          channel: metadata?.channel,
+          senderId: metadata?.senderId
+        });
+      }
       await this.logger.info("command.blocked", "blocked command by chat policy", {
         chatKey,
         kind: command.kind,
@@ -23885,10 +24524,8 @@ class CommandRouter {
         channel: metadata?.channel,
         senderId: metadata?.senderId
       });
-      return { text: renderCommandAccessDenied(command) };
+      return { text: renderCommandAccessDenied(command, access4.reason) };
     }
-    await this.refreshConfigFromStore();
-    perfSpan?.mark("router.config_refreshed");
     return await this.executeCommand(chatKey, command.kind, startedAt, async () => {
       switch (command.kind) {
         case "invalid":
@@ -23990,7 +24627,7 @@ class CommandRouter {
         case "later.list":
           if (!this.scheduled)
             return { text: t().later.serviceNotEnabled };
-          return handleLaterList(this.scheduled);
+          return handleLaterList(this.scheduled, chatKey);
         case "later.create": {
           if (!this.scheduled)
             return { text: t().later.serviceNotEnabled };
@@ -23998,12 +24635,12 @@ class CommandRouter {
             return { text: renderLaterUnsupportedChannel() };
           }
           const currentSession = await this.sessions.getCurrentSession(chatKey);
-          return await handleLaterCreate(command.tokens, this.scheduled, chatKey, currentSession ? { alias: currentSession.alias, agent: currentSession.agent, workspace: currentSession.workspace } : null, this.config?.later?.defaultMode === "bind" ? "bound" : "temp", accountId, replyContextToken);
+          return await handleLaterCreate(command.tokens, command.tails, this.scheduled, chatKey, currentSession ? { alias: currentSession.alias, agent: currentSession.agent, workspace: currentSession.workspace } : null, this.config?.later?.defaultMode === "bind" ? "bound" : "temp", accountId, replyContextToken);
         }
         case "later.cancel":
           if (!this.scheduled)
             return { text: t().later.serviceNotEnabled };
-          return await handleLaterCancel(command.id, this.scheduled);
+          return await handleLaterCancel(command.id, this.scheduled, chatKey);
         case "prompt": {
           const sessionContext = this.createSessionHandlerContext(undefined, perfSpan);
           if (metadata?.scheduledSessionDescriptor) {
@@ -24507,7 +25144,7 @@ var init_console_agent = __esm(() => {
 });
 
 // src/orchestration/orchestration-server.ts
-import { rm as rm8 } from "node:fs/promises";
+import { chmod as chmod4, rm as rm8 } from "node:fs/promises";
 import { createServer } from "node:net";
 
 class OrchestrationServer {
@@ -24554,6 +25191,7 @@ class OrchestrationServer {
       });
     });
     await this.listenWithUnixSocketRecovery();
+    await this.hardenUnixSocketPermissions();
     this.started = true;
   }
   async stop() {
@@ -24742,17 +25380,19 @@ class OrchestrationServer {
     return task;
   }
   parseRequestDelegateRpcInput(params) {
-    requireOnlyKeys(params, ["sourceHandle", "targetAgent", "task", "cwd", "role", "groupId"], "params");
+    requireOnlyKeys(params, ["sourceHandle", "targetAgent", "task", "cwd", "role", "groupId", "parallel"], "params");
     const cwd = requireOptionalString(params, "cwd");
     const role = requireOptionalString(params, "role");
     const groupId = requireOptionalString(params, "groupId");
+    const parallel = requireOptionalBoolean(params, "parallel");
     return {
       sourceHandle: requireString(params, "sourceHandle"),
       targetAgent: requireString(params, "targetAgent"),
       task: requireString(params, "task"),
       ...cwd !== undefined ? { cwd } : {},
       ...role !== undefined ? { role } : {},
-      ...groupId !== undefined ? { groupId } : {}
+      ...groupId !== undefined ? { groupId } : {},
+      ...parallel !== undefined ? { parallel } : {}
     };
   }
   parseTaskListFilter(params) {
@@ -24835,6 +25475,17 @@ class OrchestrationServer {
       whatIsNeeded: requireString(params, "whatIsNeeded")
     };
   }
+  async hardenUnixSocketPermissions() {
+    if (this.endpoint.kind !== "unix") {
+      return;
+    }
+    const chmodFile = this.deps.chmodFile ?? chmod4;
+    try {
+      await chmodFile(this.endpoint.path, 384);
+    } catch (error2) {
+      this.deps.onSocketHardenError?.(error2);
+    }
+  }
   async cleanupEndpoint() {
     if (this.endpoint.kind !== "unix") {
       return;
@@ -28316,18 +28967,39 @@ class ScheduledTaskScheduler {
       return;
     this.ticking = true;
     try {
-      const dueTasks = await this.service.claimDueTasks();
+      let dueTasks;
+      try {
+        dueTasks = await this.service.claimDueTasks();
+      } catch (claimError) {
+        await this.logger?.error("scheduled.claim.failed", "claimDueTasks threw; skipping tick", { message: claimError instanceof Error ? claimError.message : String(claimError) });
+        return;
+      }
       for (const task of dueTasks) {
         try {
           await this.dispatchWithTimeout(task);
-          await this.service.markExecuted(task.id);
         } catch (error2) {
           const message = error2 instanceof Error ? error2.message : String(error2);
           await this.logger?.error("scheduled.dispatch.failed", "failed to dispatch scheduled task", {
             taskId: task.id,
             message
           });
-          await this.service.markFailed(task.id, error2);
+          try {
+            await this.service.markFailed(task.id, error2);
+          } catch (markError) {
+            await this.logger?.error("scheduled.dispatch.mark_failed", "markFailed threw; task state may be stale", {
+              taskId: task.id,
+              message: markError instanceof Error ? markError.message : String(markError)
+            });
+          }
+          continue;
+        }
+        try {
+          await this.service.markExecuted(task.id);
+        } catch (markError) {
+          await this.logger?.error("scheduled.dispatch.mark_executed_failed", "markExecuted threw after a successful dispatch; leaving task state for startup reconciliation", {
+            taskId: task.id,
+            message: markError instanceof Error ? markError.message : String(markError)
+          });
         }
       }
     } finally {
@@ -28507,12 +29179,12 @@ var init_scheduled_route_create = __esm(() => {
 
 // src/scheduled/scheduled-route-manage.ts
 async function listScheduledTasksFromRoute(input, deps) {
-  resolveOwnedCoordinatorRoute(input.coordinatorSession, deps.state, "scheduled_list");
-  return deps.scheduled.listPending();
+  const route = resolveOwnedCoordinatorRoute(input.coordinatorSession, deps.state, "scheduled_list");
+  return deps.scheduled.listPending(route.chatKey);
 }
 async function cancelScheduledTaskFromRoute(input, deps) {
-  resolveOwnedCoordinatorRoute(input.coordinatorSession, deps.state, "scheduled_cancel");
-  const cancelled = await deps.scheduled.cancelPending(input.id);
+  const route = resolveOwnedCoordinatorRoute(input.coordinatorSession, deps.state, "scheduled_cancel");
+  const cancelled = await deps.scheduled.cancelPending(input.id, route.chatKey);
   return { id: normalizeId(input.id), cancelled };
 }
 function resolveOwnedCoordinatorRoute(coordinatorSession, state, label) {
@@ -28557,25 +29229,37 @@ class SessionService {
     const seen = new Set;
     const resolved = [];
     for (const session3 of Object.values(this.state.sessions)) {
-      if (seen.has(session3.transport_session)) {
+      let candidate;
+      try {
+        candidate = this.toResolvedSession(session3);
+      } catch {
         continue;
       }
-      seen.add(session3.transport_session);
-      try {
-        resolved.push(this.toResolvedSession(session3));
-      } catch {}
+      const key = JSON.stringify([
+        candidate.agent,
+        candidate.agentCommand ?? null,
+        candidate.cwd,
+        candidate.transportSession
+      ]);
+      if (seen.has(key)) {
+        continue;
+      }
+      seen.add(key);
+      resolved.push(candidate);
     }
     return resolved;
   }
   resolveSession(alias, agent3, workspace3, transportSession) {
     this.validateSession(alias, agent3, workspace3);
+    const existing = this.state.sessions[alias];
+    const sameAgentExisting = existing && existing.agent === agent3 ? existing : undefined;
     return this.toResolvedSession({
       alias,
       agent: agent3,
       workspace: workspace3,
       transport_session: transportSession,
-      transport_agent_command: this.state.sessions[alias]?.transport_agent_command,
-      created_at: this.state.sessions[alias]?.created_at ?? new Date().toISOString(),
+      transport_agent_command: sameAgentExisting?.transport_agent_command,
+      created_at: existing?.created_at ?? new Date().toISOString(),
       last_used_at: new Date().toISOString()
     });
   }
@@ -28647,10 +29331,13 @@ class SessionService {
       const previousCurrent = prevCtx?.current_session;
       const carriedPrevious = previousCurrent && previousCurrent !== internalAlias ? previousCurrent : prevCtx?.previous_session;
       session3.last_used_at = new Date().toISOString();
-      this.state.chat_contexts[chatKey] = {
-        current_session: internalAlias,
-        ...carriedPrevious ? { previous_session: carriedPrevious } : {}
-      };
+      const nextCtx = { ...prevCtx, current_session: internalAlias };
+      if (carriedPrevious) {
+        nextCtx.previous_session = carriedPrevious;
+      } else {
+        delete nextCtx.previous_session;
+      }
+      this.state.chat_contexts[chatKey] = nextCtx;
       await this.persist();
       return {
         alias: toDisplaySessionAlias(session3.alias),
@@ -28677,10 +29364,13 @@ class SessionService {
       }
       const currentInternal = ctx?.current_session;
       prevSession.last_used_at = new Date().toISOString();
-      this.state.chat_contexts[chatKey] = {
-        current_session: prevInternal,
-        ...currentInternal && currentInternal !== prevInternal ? { previous_session: currentInternal } : {}
-      };
+      const nextCtx = { ...ctx, current_session: prevInternal };
+      if (currentInternal && currentInternal !== prevInternal) {
+        nextCtx.previous_session = currentInternal;
+      } else {
+        delete nextCtx.previous_session;
+      }
+      this.state.chat_contexts[chatKey] = nextCtx;
       await this.persist();
       return {
         alias: toDisplaySessionAlias(prevSession.alias),
@@ -28851,13 +29541,26 @@ class SessionService {
       const wasActive = Object.values(this.state.chat_contexts).some((ctx) => ctx.current_session === alias);
       delete this.state.sessions[alias];
       for (const [chatKey, ctx] of Object.entries(this.state.chat_contexts)) {
-        if (ctx.current_session === alias) {
-          delete this.state.chat_contexts[chatKey];
-          continue;
-        }
         if (ctx.previous_session === alias) {
           delete ctx.previous_session;
         }
+        if (ctx.current_session === alias) {
+          if (ctx.previous_session) {
+            ctx.current_session = ctx.previous_session;
+            delete ctx.previous_session;
+          } else {
+            ctx.current_session = "";
+          }
+        }
+        if (ctx.background_results && alias in ctx.background_results) {
+          delete ctx.background_results[alias];
+          if (Object.keys(ctx.background_results).length === 0) {
+            delete ctx.background_results;
+          }
+        }
+        if (!ctx.current_session && !ctx.previous_session && !ctx.background_results) {
+          delete this.state.chat_contexts[chatKey];
+        }
       }
       await this.persist();
       return { wasActive };
@@ -28971,6 +29674,7 @@ class SessionService {
         throw new Error(`transport session "${transportSession}" conflicts with an external coordinator`);
       }
       const existingSession = this.state.sessions[alias];
+      const sameAgentExisting = existingSession && existingSession.agent === agent3 ? existingSession : undefined;
       const now = new Date(this.now()).toISOString();
       const normalizedTransportAgentCommand = transportAgentCommand?.trim();
       const session3 = {
@@ -28983,9 +29687,9 @@ class SessionService {
         agent_session_title: native?.title ?? undefined,
         agent_session_updated_at: native?.updatedAt,
         attached_at: native ? now : undefined,
-        ...normalizedTransportAgentCommand ? { transport_agent_command: normalizedTransportAgentCommand } : existingSession?.transport_agent_command ? { transport_agent_command: existingSession.transport_agent_command } : {},
-        mode_id: existingSession?.mode_id,
-        reply_mode: existingSession?.reply_mode,
+        ...normalizedTransportAgentCommand ? { transport_agent_command: normalizedTransportAgentCommand } : sameAgentExisting?.transport_agent_command ? { transport_agent_command: sameAgentExisting.transport_agent_command } : {},
+        mode_id: sameAgentExisting?.mode_id,
+        reply_mode: sameAgentExisting?.reply_mode,
         created_at: existingSession?.created_at ?? now,
         last_used_at: now
       };
@@ -29235,8 +29939,9 @@ async function runConsole(paths, deps) {
         throw error2;
       }
     }
-    await runtime.reapStaleQueueOwners();
+    const reapPromise = Promise.resolve(runtime.reapStaleQueueOwners()).catch(() => {});
     if (deps.beforeReady) {
+      await reapPromise;
       await deps.beforeReady(runtime);
     }
     if (deps.daemonRuntime) {
@@ -29250,6 +29955,7 @@ async function runConsole(paths, deps) {
         deps.daemonRuntime?.heartbeat().catch(() => {});
       }, deps.heartbeatIntervalMs ?? 30000);
     }
+    await reapPromise;
     const channelStartPromise = deps.channels.startAll({
       agent: runtime.agent,
       abortSignal: shutdownController.signal,
@@ -29431,15 +30137,15 @@ class AcpxBridgeClient {
         onEvent
       });
       try {
-        const didWrite = this.writeLine(encodeBridgeRequest({
+        this.writeLine(encodeBridgeRequest({
           id,
           method,
           params
-        }));
-        if (didWrite === false) {
-          this.pending.delete(id);
-          reject(new Error("bridge write buffer is full"));
-        }
+        }), (error2) => {
+          if (error2 && this.pending.delete(id)) {
+            reject(error2);
+          }
+        });
       } catch (error2) {
         this.pending.delete(id);
         reject(error2);
@@ -29519,6 +30225,17 @@ class AcpxBridgeClient {
     }
   }
 }
+function buildBridgeSpawnEnv(options = {}) {
+  return {
+    XACPX_LANG: getLocale(),
+    XACPX_BRIDGE_ACPX_COMMAND: options.acpxCommand ?? "acpx",
+    XACPX_BRIDGE_PERMISSION_MODE: options.permissionMode ?? "approve-all",
+    XACPX_BRIDGE_NON_INTERACTIVE_PERMISSIONS: options.nonInteractivePermissions ?? "deny",
+    ...typeof options.permissionPolicy === "string" && options.permissionPolicy.trim().length > 0 ? { XACPX_BRIDGE_PERMISSION_POLICY: options.permissionPolicy } : {},
+    ...typeof options.queueOwnerTtlSeconds === "number" && Number.isFinite(options.queueOwnerTtlSeconds) ? { XACPX_BRIDGE_QUEUE_OWNER_TTL_SECONDS: String(options.queueOwnerTtlSeconds) } : {},
+    ...typeof options.sessionInitTimeoutMs === "number" && Number.isFinite(options.sessionInitTimeoutMs) && options.sessionInitTimeoutMs > 0 ? { XACPX_BRIDGE_SESSION_INIT_TIMEOUT_MS: String(options.sessionInitTimeoutMs) } : {}
+  };
+}
 function buildBridgeSpawnSpec(options) {
   if (options.execPath.endsWith("bun")) {
     return {
@@ -29541,15 +30258,17 @@ async function spawnAcpxBridgeClient(options = {}) {
     cwd: options.cwd ?? process.cwd(),
     env: {
       ...process.env,
-      XACPX_LANG: getLocale(),
-      XACPX_BRIDGE_ACPX_COMMAND: options.acpxCommand ?? "acpx",
-      XACPX_BRIDGE_PERMISSION_MODE: options.permissionMode ?? "approve-all",
-      XACPX_BRIDGE_NON_INTERACTIVE_PERMISSIONS: options.nonInteractivePermissions ?? "deny",
-      ...typeof options.queueOwnerTtlSeconds === "number" && Number.isFinite(options.queueOwnerTtlSeconds) ? { XACPX_BRIDGE_QUEUE_OWNER_TTL_SECONDS: String(options.queueOwnerTtlSeconds) } : {}
+      ...buildBridgeSpawnEnv(options)
     },
     stdio: ["pipe", "pipe", "inherit"]
   });
-  const client = new AcpxBridgeClient((line) => child.stdin.write(line));
+  const client = manageBridgeChild(child);
+  await client.waitUntilReady();
+  return client;
+}
+function manageBridgeChild(child) {
+  const client = new AcpxBridgeClient((line, onWriteError) => child.stdin.write(line, onWriteError));
+  child.stdin.on("error", () => {});
   const output = createInterface({
     input: child.stdout,
     crlfDelay: Infinity
@@ -29575,7 +30294,6 @@ async function spawnAcpxBridgeClient(options = {}) {
       await terminateProcessTree(child.pid ?? 0, { detachedProcessGroup: false });
     }
   };
-  await client.waitUntilReady();
   return client;
 }
 function awaitable(executor) {
@@ -30417,19 +31135,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 dirname13, join as join16 } from "node:path";
+import { dirname as dirname11, join as join16 } from "node:path";
 function resolveNodePtyHelperPath(packageJsonPath, platform, arch) {
   if (platform === "win32") {
     return null;
   }
-  return join16(dirname13(packageJsonPath), "prebuilds", `${platform}-${arch}`, "spawn-helper");
+  return join16(dirname11(packageJsonPath), "prebuilds", `${platform}-${arch}`, "spawn-helper");
 }
-async function ensureNodePtyHelperExecutable(helperPath, chmod3 = chmodFs) {
+async function ensureNodePtyHelperExecutable(helperPath, chmod5 = chmodFs) {
   if (!helperPath) {
     return;
   }
   try {
-    await chmod3(helperPath, 493);
+    await chmod5(helperPath, 493);
   } catch (error2) {
     if (error2.code === "ENOENT") {
       return;
@@ -30442,7 +31160,7 @@ var init_node_pty_helper = () => {};
 // src/transport/acpx-queue-owner-launcher.ts
 import { createHash as createHash3 } from "node:crypto";
 import { spawn as spawn8 } from "node:child_process";
-import { readFile as readFile12, unlink } from "node:fs/promises";
+import { readFile as readFile13, unlink } from "node:fs/promises";
 import { homedir as homedir8 } from "node:os";
 import { join as join17 } from "node:path";
 function buildXacpxMcpServerSpec(input) {
@@ -30605,7 +31323,7 @@ async function terminateAcpxQueueOwner(sessionId) {
   const lockPath = queueLockFilePath(sessionId);
   let owner;
   try {
-    owner = JSON.parse(await readFile12(lockPath, "utf8"));
+    owner = JSON.parse(await readFile13(lockPath, "utf8"));
   } catch {
     return;
   }
@@ -31264,10 +31982,11 @@ async function reapQueueOwners(acpxCommand, targets, deps = {}) {
   const timeoutMs = deps.timeoutMs ?? 5000;
   const seen = new Set;
   const unique = targets.filter((target) => {
-    if (seen.has(target.transportSession)) {
+    const key = JSON.stringify([target.agent, target.agentCommand ?? null, target.cwd, target.transportSession]);
+    if (seen.has(key)) {
       return false;
     }
-    seen.add(target.transportSession);
+    seen.add(key);
     return true;
   });
   let terminated = 0;
@@ -31419,10 +32138,21 @@ class MessageChannelRegistry {
       throw new Error("all channels failed to start");
     }
   }
-  stopAll() {
+  async stopAll() {
+    let firstError;
     for (const channel of this.channels.values()) {
-      channel.logout();
+      try {
+        if (channel.stop) {
+          await channel.stop();
+        } else {
+          channel.logout();
+        }
+      } catch (error2) {
+        firstError ??= error2;
+      }
     }
+    if (firstError !== undefined)
+      throw firstError;
   }
   getByChatKey(chatKey) {
     return this.channels.get(getChannelIdFromChatKey(chatKey)) ?? null;
@@ -31670,7 +32400,7 @@ __export(exports_main, {
 });
 import { randomUUID as randomUUID3 } from "node:crypto";
 import { homedir as homedir9 } from "node:os";
-import { dirname as dirname14, join as join18 } from "node:path";
+import { dirname as dirname12, join as join18 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 function startProgressHeartbeat(orchestration3, config4, logger2, channel) {
   const thresholdSeconds = config4.orchestration.progressHeartbeatSeconds;
@@ -31742,6 +32472,35 @@ async function buildApp(paths, deps = {}) {
   const acpxCommand = resolveAcpxCommand({ configuredCommand: config4.transport.command });
   const stateStore = new StateStore(paths.statePath);
   const state = await stateStore.load();
+  const stateLoadReport = stateStore.lastLoadReport;
+  if (stateLoadReport) {
+    for (const record3 of stateLoadReport.dropped) {
+      await logger2.error("state.record_quarantined", "dropped malformed state.json record", {
+        statePath: paths.statePath,
+        section: record3.section,
+        key: record3.key,
+        reason: record3.reason
+      });
+    }
+    if (stateLoadReport.corruptPath) {
+      await logger2.error("state.file_corrupt", "state.json was unreadable; renamed aside and starting empty", {
+        statePath: paths.statePath,
+        corruptPath: stateLoadReport.corruptPath
+      });
+    }
+    if (stateLoadReport.quarantinePath) {
+      await logger2.error("state.file_quarantined", "original state.json backed up before dropping records", {
+        statePath: paths.statePath,
+        quarantinePath: stateLoadReport.quarantinePath
+      });
+    }
+    if (stateLoadReport.backupError) {
+      await logger2.error("state.quarantine_backup_failed", "failed to back up the original state.json", {
+        statePath: paths.statePath,
+        message: stateLoadReport.backupError
+      });
+    }
+  }
   const stateMutex = new AsyncMutex;
   const debouncedStateStore = new DebouncedStateStore({
     delegate: stateStore,
@@ -31761,7 +32520,9 @@ async function buildApp(paths, deps = {}) {
     bridgeEntryPath: resolveBridgeEntryPath(),
     permissionMode: config4.transport.permissionMode,
     nonInteractivePermissions: config4.transport.nonInteractivePermissions,
-    ...typeof config4.transport.queueOwnerTtlSeconds === "number" ? { queueOwnerTtlSeconds: config4.transport.queueOwnerTtlSeconds } : {}
+    ...typeof config4.transport.permissionPolicy === "string" ? { permissionPolicy: config4.transport.permissionPolicy } : {},
+    ...typeof config4.transport.queueOwnerTtlSeconds === "number" ? { queueOwnerTtlSeconds: config4.transport.queueOwnerTtlSeconds } : {},
+    ...typeof config4.transport.sessionInitTimeoutMs === "number" ? { sessionInitTimeoutMs: config4.transport.sessionInitTimeoutMs } : {}
   })))) : deps.createCliTransport?.(acpxCommand) ?? new AcpxCliTransport({ ...config4.transport, command: acpxCommand });
   const quota = new QuotaManager({
     onInbound: (chatKey) => {
@@ -32114,6 +32875,9 @@ async function buildApp(paths, deps = {}) {
   const progressHeartbeatInterval = startProgressHeartbeat(orchestration3, config4, logger2, deps.channel ?? null);
   const orchestrationEndpoint = createOrchestrationEndpoint(paths.orchestrationSocketPath ?? resolveOrchestrationSocketPathFromConfigPath(paths.configPath));
   const orchestrationServer = new OrchestrationServer(orchestrationEndpoint, orchestration3, {
+    onSocketHardenError: (error2) => {
+      logger2.error("orchestration.socket.chmod_failed", "failed to restrict orchestration socket to owner-only (0600); falling back to runtime dir permissions", { message: error2 instanceof Error ? error2.message : String(error2) });
+    },
     createScheduledTaskFromRoute: async (input) => await createScheduledTaskFromRoute(input, {
       state,
       config: config4,
@@ -32251,7 +33015,7 @@ async function main() {
   }
 }
 async function prepareChannelMedia(configPath, config4) {
-  const runtimeDir = join18(dirname14(configPath), "runtime");
+  const runtimeDir = join18(dirname12(configPath), "runtime");
   const mediaRootDir = join18(runtimeDir, "media");
   const mediaStore = new RuntimeMediaStore({ rootDir: mediaRootDir });
   await mediaStore.cleanupExpired().catch((error2) => {
@@ -32266,7 +33030,7 @@ function resolveRuntimePaths() {
     throw new Error("Unable to resolve the current user home directory");
   }
   const configPath = coreEnv("CONFIG") ?? join18(coreHomeDir(home), "config.json");
-  const runtimeDir = join18(dirname14(configPath), "runtime");
+  const runtimeDir = join18(dirname12(configPath), "runtime");
   return {
     configPath,
     statePath: coreEnv("STATE") ?? join18(coreHomeDir(home), "state.json"),
@@ -32281,12 +33045,12 @@ function resolveBridgeEntryPath() {
   return fileURLToPath5(new URL("./bridge/bridge-main.ts", import.meta.url));
 }
 function resolveAppLogPath(configPath) {
-  const rootDir = dirname14(configPath);
+  const rootDir = dirname12(configPath);
   const runtimeDir = join18(rootDir, "runtime");
   return join18(runtimeDir, "app.log");
 }
 function resolvePerfLogPath(configPath) {
-  const rootDir = dirname14(configPath);
+  const rootDir = dirname12(configPath);
   const runtimeDir = join18(rootDir, "runtime");
   return join18(runtimeDir, "perf.log");
 }
@@ -32523,8 +33287,10 @@ var init_config_check = __esm(async () => {
 });
 
 // src/doctor/checks/daemon-check.ts
+import { readdir as readdir3, readFile as readFile14, rm as rm10 } from "node:fs/promises";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 import { homedir as homedir10 } from "node:os";
+import { join as join19 } from "node:path";
 async function checkDaemon(options = {}) {
   const home = options.home ?? process.env.HOME ?? homedir10();
   const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
@@ -32532,15 +33298,25 @@ async function checkDaemon(options = {}) {
     home,
     ...runtimeDir ? { runtimeDir } : {}
   });
+  const isProcessRunning = options.isProcessRunning ?? isProcessAlive;
+  const listConsumerLocks = options.listConsumerLocks ?? defaultListConsumerLocks;
+  const readConsumerLock = options.readConsumerLock ?? defaultReadConsumerLock;
+  const removeConsumerLock = options.removeConsumerLock ?? defaultRemoveConsumerLock;
   const controller = createDaemonController(paths, {
     processExecPath: options.processExecPath ?? process.execPath,
     cliEntryPath: options.cliEntryPath ?? resolveCliEntryPath(),
     cwd: options.cwd ?? process.cwd(),
     env: options.env ?? process.env,
-    isProcessRunning: options.isProcessRunning ?? defaultIsProcessRunning5
+    isProcessRunning
   });
   try {
     const status = await controller.getStatus();
+    const staleLockFix = status.state === "stopped" ? await detectStaleConsumerLockFix(paths.runtimeDir, {
+      isProcessRunning,
+      listConsumerLocks,
+      readConsumerLock,
+      removeConsumerLock
+    }) : undefined;
     switch (status.state) {
       case "running":
         return {
@@ -32562,6 +33338,7 @@ async function checkDaemon(options = {}) {
           summary: status.stale ? "daemon was stopped and stale runtime files were cleared" : "daemon is not running",
           details: status.stale ? ["stale runtime files were cleared"] : undefined,
           suggestions: ["run: xacpx start"],
+          ...staleLockFix ? { fixes: [staleLockFix] } : {},
           metadata: {
             paths,
             status
@@ -32608,25 +33385,210 @@ async function checkDaemon(options = {}) {
     };
   }
 }
-function defaultIsProcessRunning5(pid) {
+async function detectStaleConsumerLockFix(runtimeDir, deps) {
+  const lockFiles = await deps.listConsumerLocks(runtimeDir);
+  const stalePaths = [];
+  for (const fileName of lockFiles) {
+    if (!fileName.endsWith(CONSUMER_LOCK_SUFFIX)) {
+      continue;
+    }
+    const lockPath = join19(runtimeDir, fileName);
+    const lock2 = await deps.readConsumerLock(lockPath);
+    if (lock2 && !deps.isProcessRunning(lock2.pid)) {
+      stalePaths.push(lockPath);
+    }
+  }
+  if (stalePaths.length === 0) {
+    return;
+  }
+  return {
+    id: "daemon.clear-stale-lock",
+    title: "remove stale consumer lock(s)",
+    run: async () => {
+      const removed = [];
+      let skipped = 0;
+      for (const lockPath of stalePaths) {
+        const lock2 = await deps.readConsumerLock(lockPath);
+        if (!lock2 || deps.isProcessRunning(lock2.pid)) {
+          skipped += 1;
+          continue;
+        }
+        await deps.removeConsumerLock(lockPath);
+        removed.push(lockPath);
+      }
+      const skippedNote = skipped > 0 ? `; left ${skipped} no-longer-stale lock(s) alone` : "";
+      return {
+        ok: true,
+        message: removed.length > 0 ? `removed ${removed.length} stale consumer lock(s): ${removed.join(", ")}${skippedNote}` : `no locks removed${skippedNote}`
+      };
+    }
+  };
+}
+async function defaultListConsumerLocks(runtimeDir) {
   try {
-    process.kill(pid, 0);
-    return true;
+    return await readdir3(runtimeDir);
   } catch {
-    return false;
+    return [];
+  }
+}
+async function defaultReadConsumerLock(path15) {
+  try {
+    const raw = await readFile14(path15, "utf8");
+    const parsed = JSON.parse(raw);
+    return typeof parsed.pid === "number" ? { pid: parsed.pid } : null;
+  } catch {
+    return null;
   }
 }
+async function defaultRemoveConsumerLock(path15) {
+  await rm10(path15, { force: true });
+}
 function resolveCliEntryPath() {
   return process.argv[1] ?? fileURLToPath6(import.meta.url);
 }
 function formatError5(error2) {
   return error2 instanceof Error ? error2.message : String(error2);
 }
+var CONSUMER_LOCK_SUFFIX = "-consumer.lock.json";
 var init_daemon_check = __esm(() => {
   init_create_daemon_controller();
   init_daemon_files();
 });
 
+// src/doctor/checks/logs-check.ts
+import { stat as stat3, readdir as readdir4 } from "node:fs/promises";
+import { basename as basename3, join as join20 } from "node:path";
+import { homedir as homedir11 } from "node:os";
+async function checkLogs(options = {}) {
+  const home = options.home ?? process.env.HOME ?? homedir11();
+  const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
+  const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({
+    home,
+    ...runtimeDir ? { runtimeDir } : {}
+  });
+  const probe = options.probe ?? createLogsFsProbe();
+  const singleFileWarnBytes = options.singleFileWarnBytes ?? DEFAULT_SINGLE_FILE_WARN_BYTES;
+  const totalWarnBytes = options.totalWarnBytes ?? DEFAULT_TOTAL_WARN_BYTES;
+  let entries;
+  try {
+    const dirStat = await probe.stat(paths.runtimeDir);
+    if (!dirStat.isDirectory()) {
+      return skip("runtime log directory could not be read", [
+        `runtimeDir: ${paths.runtimeDir} (exists but is not a directory)`
+      ]);
+    }
+    entries = await probe.readdir(paths.runtimeDir);
+  } catch (error2) {
+    if (isMissingPathError(error2)) {
+      return skip("no runtime logs yet", [`runtimeDir: ${paths.runtimeDir} (missing)`]);
+    }
+    return skip("runtime log directory could not be read", [
+      `runtimeDir: ${paths.runtimeDir}`,
+      `error: ${formatError6(error2)}`
+    ]);
+  }
+  const baseNames = [basename3(paths.appLog), basename3(paths.stdoutLog), basename3(paths.stderrLog)];
+  const tracked = new Set(baseNames);
+  const matched = entries.filter((entry) => isTrackedLogName(entry, tracked));
+  const files = [];
+  for (const name of matched) {
+    const path15 = join20(paths.runtimeDir, name);
+    try {
+      const fileStat = await probe.stat(path15);
+      if (fileStat.isDirectory()) {
+        continue;
+      }
+      files.push({ name, path: path15, size: fileStat.size });
+    } catch {
+      continue;
+    }
+  }
+  const total = files.reduce((sum, file) => sum + file.size, 0);
+  const largestSingle = files.reduce((max, file) => Math.max(max, file.size), 0);
+  const overSingle = files.some((file) => file.size > singleFileWarnBytes);
+  const overTotal = total > totalWarnBytes;
+  const sorted = [...files].sort((a, b) => b.size - a.size);
+  const details = [
+    ...sorted.map((file) => `${file.name}: ${formatBytes(file.size)}`),
+    `total: ${formatBytes(total)}`
+  ];
+  if (overSingle || overTotal) {
+    const reason = overSingle ? `largest single log is ${formatBytes(largestSingle)}` : `total is ${formatBytes(total)}`;
+    return {
+      id: "logs",
+      label: "Logs",
+      severity: "warn",
+      summary: `log growth high: ${reason} (total ${formatBytes(total)})`,
+      details,
+      suggestions: [
+        "logs are large; check disk space and that log rotation is configured (logging.maxSizeBytes / maxFiles)"
+      ]
+    };
+  }
+  return {
+    id: "logs",
+    label: "Logs",
+    severity: "pass",
+    summary: `logs total ${formatBytes(total)}`,
+    details
+  };
+}
+function skip(summary, details) {
+  return {
+    id: "logs",
+    label: "Logs",
+    severity: "skip",
+    summary,
+    details
+  };
+}
+function isTrackedLogName(name, baseNames) {
+  if (baseNames.has(name)) {
+    return true;
+  }
+  for (const base of baseNames) {
+    const prefix = `${base}.`;
+    if (name.startsWith(prefix)) {
+      const suffix = name.slice(prefix.length);
+      if (/^\d+$/.test(suffix) && Number(suffix) > 0) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function formatBytes(bytes) {
+  if (bytes < 1024) {
+    return `${bytes} B`;
+  }
+  const units = ["KB", "MB", "GB", "TB"];
+  let value = bytes / 1024;
+  let unitIndex = 0;
+  while (value >= 1024 && unitIndex < units.length - 1) {
+    value /= 1024;
+    unitIndex += 1;
+  }
+  return `${value.toFixed(1)} ${units[unitIndex]}`;
+}
+function createLogsFsProbe() {
+  return {
+    stat: async (path15) => await stat3(path15),
+    readdir: async (path15) => await readdir4(path15)
+  };
+}
+function formatError6(error2) {
+  return error2 instanceof Error ? error2.message : String(error2);
+}
+function isMissingPathError(error2) {
+  return typeof error2 === "object" && error2 !== null && "code" in error2 && (error2.code === "ENOENT" || error2.code === "ENOTDIR");
+}
+var DEFAULT_SINGLE_FILE_WARN_BYTES, DEFAULT_TOTAL_WARN_BYTES;
+var init_logs_check = __esm(() => {
+  init_daemon_files();
+  DEFAULT_SINGLE_FILE_WARN_BYTES = 50 * 1024 * 1024;
+  DEFAULT_TOTAL_WARN_BYTES = 200 * 1024 * 1024;
+});
+
 // src/doctor/checks/orchestration-health.ts
 async function checkOrchestrationHealth(options) {
   const state = await options.loadState();
@@ -32679,13 +33641,187 @@ var init_orchestration_health = __esm(() => {
   init_i18n();
 });
 
+// src/doctor/checks/orchestration-socket-check.ts
+import { homedir as homedir12 } from "node:os";
+async function checkOrchestrationSocket(options = {}) {
+  const home = options.home ?? process.env.HOME ?? homedir12();
+  const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
+  const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({
+    home,
+    ...runtimeDir ? { runtimeDir } : {}
+  });
+  const getDaemonStatus = options.getDaemonStatus ?? ((p) => defaultGetDaemonStatus(p, options));
+  const probe = options.canConnectToEndpoint ?? canConnectToEndpoint;
+  const resolveEndpoint = options.resolveOrchestrationEndpoint ?? ((dir) => resolveOrchestrationEndpoint(dir));
+  let status;
+  try {
+    status = await getDaemonStatus(paths);
+  } catch (error2) {
+    return {
+      id: "orchestration-socket",
+      label: "Orchestration IPC",
+      severity: "skip",
+      summary: "daemon status could not be read",
+      details: [`runtime dir: ${paths.runtimeDir}`, `error: ${formatError7(error2)}`]
+    };
+  }
+  if (status.state === "stopped") {
+    return {
+      id: "orchestration-socket",
+      label: "Orchestration IPC",
+      severity: "skip",
+      summary: "daemon stopped"
+    };
+  }
+  let endpoint;
+  let reachable;
+  try {
+    endpoint = resolveEndpoint(paths.runtimeDir);
+    reachable = await probe(endpoint.path);
+  } catch (error2) {
+    return {
+      id: "orchestration-socket",
+      label: "Orchestration IPC",
+      severity: "skip",
+      summary: "orchestration IPC liveness could not be probed",
+      details: [`runtime dir: ${paths.runtimeDir}`, `error: ${formatError7(error2)}`]
+    };
+  }
+  if (reachable) {
+    return {
+      id: "orchestration-socket",
+      label: "Orchestration IPC",
+      severity: "pass",
+      summary: "orchestration IPC is accepting connections",
+      details: [`endpoint: ${endpoint.path}`]
+    };
+  }
+  return {
+    id: "orchestration-socket",
+    label: "Orchestration IPC",
+    severity: "fail",
+    summary: "daemon is running but orchestration IPC is not accepting connections",
+    details: [`endpoint: ${endpoint.path}`],
+    suggestions: ["run: xacpx restart"]
+  };
+}
+async function defaultGetDaemonStatus(paths, options) {
+  const controller = createDaemonController(paths, {
+    processExecPath: options.processExecPath ?? process.execPath,
+    cliEntryPath: options.cliEntryPath ?? process.argv[1] ?? "",
+    cwd: options.cwd ?? process.cwd(),
+    env: options.env ?? process.env,
+    isProcessRunning: options.isProcessRunning ?? isProcessAlive
+  });
+  return await controller.getStatus();
+}
+function formatError7(error2) {
+  return error2 instanceof Error ? error2.message : String(error2);
+}
+var init_orchestration_socket_check = __esm(() => {
+  init_create_daemon_controller();
+  init_daemon_files();
+  init_endpoint_probe();
+  init_orchestration_ipc();
+});
+
+// src/doctor/checks/plugin-check.ts
+async function checkPlugins(options = {}) {
+  const runtimePaths = (options.resolveRuntimePaths ?? resolveRuntimePaths)();
+  let config4;
+  try {
+    config4 = await (options.loadConfig ?? loadConfig)(runtimePaths.configPath);
+  } catch (error2) {
+    return {
+      id: "plugins",
+      label: "Plugins",
+      severity: "skip",
+      summary: "plugin check skipped because configuration could not be loaded",
+      details: [`config path: ${runtimePaths.configPath}`, `error: ${formatError8(error2)}`],
+      suggestions: ["fix the Config check first, then run: xacpx doctor"]
+    };
+  }
+  if (!hasPluginSurface(config4)) {
+    return {
+      id: "plugins",
+      label: "Plugins",
+      severity: "skip",
+      summary: "no plugins configured"
+    };
+  }
+  const pluginHome = (options.resolvePluginHome ?? resolvePluginHome)({ home: options.home });
+  const inspect = options.inspectPlugins ?? inspectPlugins;
+  let issues;
+  try {
+    issues = await inspect({
+      config: config4,
+      pluginHome,
+      currentXacpxVersion: options.currentXacpxVersion ?? XACPX_CORE_VERSION
+    });
+  } catch (error2) {
+    return {
+      id: "plugins",
+      label: "Plugins",
+      severity: "fail",
+      summary: "plugin health check failed",
+      details: [`plugin home: ${pluginHome}`, `error: ${formatError8(error2)}`]
+    };
+  }
+  const errorCount = issues.filter((issue2) => issue2.level === "error").length;
+  const warnCount = issues.filter((issue2) => issue2.level === "warn").length;
+  const severity = errorCount > 0 ? "fail" : warnCount > 0 ? "warn" : "pass";
+  const problemCount = errorCount + warnCount;
+  return {
+    id: "plugins",
+    label: "Plugins",
+    severity,
+    summary: problemCount > 0 ? `${problemCount} plugin issue(s)` : "all plugins healthy",
+    details: issues.filter((issue2) => issue2.level !== "ok").map(formatIssueDetail),
+    suggestions: collectSuggestions(issues),
+    metadata: { pluginHome, errorCount, warnCount }
+  };
+}
+function hasPluginSurface(config4) {
+  if ((config4.plugins ?? []).length > 0) {
+    return true;
+  }
+  const builtInChannelTypes = new Set(listKnownChannelIds());
+  return (config4.channels ?? []).some((channel) => channel.enabled !== false && !builtInChannelTypes.has(channel.type));
+}
+function formatIssueDetail(issue2) {
+  return issue2.plugin ? `${issue2.plugin}: ${issue2.message}` : issue2.message;
+}
+function collectSuggestions(issues) {
+  const suggestions = [];
+  const seen = new Set;
+  for (const issue2 of issues) {
+    const suggestion = issue2.suggestion;
+    if (suggestion && !seen.has(suggestion)) {
+      seen.add(suggestion);
+      suggestions.push(`run: ${suggestion}`);
+    }
+  }
+  return suggestions;
+}
+function formatError8(error2) {
+  return error2 instanceof Error ? error2.message : String(error2);
+}
+var init_plugin_check = __esm(async () => {
+  init_load_config();
+  init_channel_scope();
+  init_plugin_doctor();
+  init_plugin_home();
+  init_version();
+  await init_main();
+});
+
 // src/doctor/checks/runtime-check.ts
 import { constants } from "node:fs";
-import { access as access4, stat as stat3 } from "node:fs/promises";
-import { dirname as dirname15 } from "node:path";
-import { homedir as homedir11 } from "node:os";
+import { access as access4, stat as stat4 } from "node:fs/promises";
+import { dirname as dirname13 } from "node:path";
+import { homedir as homedir13 } from "node:os";
 async function checkRuntime(options = {}) {
-  const home = options.home ?? process.env.HOME ?? homedir11();
+  const home = options.home ?? process.env.HOME ?? homedir13();
   const runtimeDir = options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : undefined;
   const paths = (options.resolveDaemonPaths ?? resolveDaemonPaths)({
     home,
@@ -32711,6 +33847,20 @@ async function checkRuntime(options = {}) {
       details: checks3.map((check) => check.detail)
     };
   }
+  const privacy = await inspectRuntimeDirPrivacy(paths.runtimeDir, probe, platform);
+  if (privacy.needsRepair) {
+    return {
+      id: "runtime",
+      label: "Runtime",
+      severity: "warn",
+      summary: "daemon runtime dir should be private (mode 0700)",
+      details: [...checks3.map((check) => check.detail), privacy.detail],
+      fixes: [createEnsurePrivateDirFix(paths.runtimeDir, options.ensurePrivateRuntimeDir)],
+      metadata: {
+        paths
+      }
+    };
+  }
   return {
     id: "runtime",
     label: "Runtime",
@@ -32722,9 +33872,50 @@ async function checkRuntime(options = {}) {
     }
   };
 }
+async function inspectRuntimeDirPrivacy(runtimeDir, probe, platform) {
+  if (platform === "win32") {
+    return { needsRepair: false, detail: "" };
+  }
+  try {
+    const stats = await probe.stat(runtimeDir);
+    if (typeof stats.mode !== "number") {
+      return { needsRepair: false, detail: "" };
+    }
+    const mode = stats.mode & 511;
+    if (mode === PRIVATE_DIR_MODE) {
+      return { needsRepair: false, detail: "" };
+    }
+    return {
+      needsRepair: true,
+      detail: `runtimeDir: ${runtimeDir} (mode ${formatMode(mode)} is not 0700; group/other access should be removed)`
+    };
+  } catch (error2) {
+    if (isMissingPathError2(error2)) {
+      return {
+        needsRepair: true,
+        detail: `runtimeDir: ${runtimeDir} (missing; will be created with mode 0700)`
+      };
+    }
+    return { needsRepair: false, detail: "" };
+  }
+}
+function createEnsurePrivateDirFix(runtimeDir, ensureImpl) {
+  const ensure = ensureImpl ?? ((dir) => ensurePrivateRuntimeDir(dir));
+  return {
+    id: "runtime.ensure-private-dir",
+    title: "create/repair runtime dir with mode 0700",
+    run: async () => {
+      await ensure(runtimeDir);
+      return { ok: true, message: `runtime dir ${runtimeDir} created/repaired with mode 0700` };
+    }
+  };
+}
+function formatMode(mode) {
+  return `0${(mode & 511).toString(8)}`;
+}
 function createRuntimeFsProbe() {
   return {
-    stat: async (path15) => await stat3(path15),
+    stat: async (path15) => await stat4(path15),
     access: async (path15, mode) => await access4(path15, mode)
   };
 }
@@ -32743,10 +33934,10 @@ async function checkDirectoryCreatable(label, path15, probe, platform) {
       detail: `${label}: ${path15} (writable)`
     };
   } catch (error2) {
-    if (!isMissingPathError(error2)) {
+    if (!isMissingPathError2(error2)) {
       return {
         ok: false,
-        detail: `${label}: ${path15} (unusable: ${formatError6(error2)})`
+        detail: `${label}: ${path15} (unusable: ${formatError9(error2)})`
       };
     }
     const parentCheck = await checkCreatableAncestorDirectory(path15, probe, platform);
@@ -32777,13 +33968,13 @@ async function checkFileCreatable(label, path15, probe, platform) {
       detail: `${label}: ${path15} (writable)`
     };
   } catch (error2) {
-    if (!isMissingPathError(error2)) {
+    if (!isMissingPathError2(error2)) {
       return {
         ok: false,
-        detail: `${label}: ${path15} (unusable: ${formatError6(error2)})`
+        detail: `${label}: ${path15} (unusable: ${formatError9(error2)})`
       };
     }
-    const parentCheck = await checkCreatableAncestorDirectory(dirname15(path15), probe, platform);
+    const parentCheck = await checkCreatableAncestorDirectory(dirname13(path15), probe, platform);
     if (!parentCheck.ok) {
       return {
         ok: false,
@@ -32812,14 +34003,14 @@ async function checkCreatableAncestorDirectory(path15, probe, platform) {
       creatableFrom: path15
     };
   } catch (error2) {
-    if (!isMissingPathError(error2)) {
+    if (!isMissingPathError2(error2)) {
       return {
         ok: false,
         creatableFrom: path15,
         blockingPath: path15
       };
     }
-    const parent = dirname15(path15);
+    const parent = dirname13(path15);
     if (parent === path15) {
       return {
         ok: false,
@@ -32840,21 +34031,22 @@ async function checkCreatableAncestorDirectory(path15, probe, platform) {
 function directoryAccessMode(platform) {
   return platform === "win32" ? constants.W_OK : DIRECTORY_USABLE;
 }
-function isMissingPathError(error2) {
+function isMissingPathError2(error2) {
   return isErrnoError(error2) && (error2.code === "ENOENT" || error2.code === "ENOTDIR");
 }
 function isErrnoError(error2) {
   return typeof error2 === "object" && error2 !== null && "code" in error2;
 }
-function formatError6(error2) {
+function formatError9(error2) {
   if (error2 instanceof Error) {
     return error2.message;
   }
   return String(error2);
 }
-var DIRECTORY_USABLE;
+var DIRECTORY_USABLE, PRIVATE_DIR_MODE = 448;
 var init_runtime_check = __esm(() => {
   init_daemon_files();
+  init_private_runtime_dir();
   DIRECTORY_USABLE = constants.W_OK | constants.X_OK;
 });
 
@@ -32966,7 +34158,7 @@ async function checkSmoke(options = {}, deps = {}) {
       label: "Smoke",
       severity: "fail",
       summary: "smoke transport probe failed",
-      details: [`config path: ${runtimePaths.configPath}`, `error: ${formatError7(error2)}`]
+      details: [`config path: ${runtimePaths.configPath}`, `error: ${formatError10(error2)}`]
     };
   }
 }
@@ -33093,7 +34285,7 @@ function buildDetails3(options) {
   }
   return details;
 }
-function formatError7(error2) {
+function formatError10(error2) {
   return error2 instanceof Error ? error2.message : String(error2);
 }
 var SMOKE_PROMPT = "Reply with exactly: ok";
@@ -33118,7 +34310,7 @@ async function checkWechat(options = {}) {
     } catch (error2) {
       return {
         accountId,
-        error: formatError8(error2)
+        error: formatError11(error2)
       };
     }
   });
@@ -33159,7 +34351,7 @@ function buildVerboseDetails(loggedIn, verbose, accounts) {
   }
   return details;
 }
-function formatError8(error2) {
+function formatError11(error2) {
   return error2 instanceof Error ? error2.message : String(error2);
 }
 var init_wechat_check = __esm(() => {
@@ -33168,43 +34360,60 @@ var init_wechat_check = __esm(() => {
 
 // src/doctor/render-doctor.ts
 function renderDoctor(report, options = {}) {
-  return options.verbose ? renderVerboseDoctor(report) : renderDefaultDoctor(report);
+  const fixMode = options.fix === true;
+  return options.verbose ? renderVerboseDoctor(report, fixMode) : renderDefaultDoctor(report, fixMode);
 }
-function renderDefaultDoctor(report) {
+function renderDefaultDoctor(report, fixMode) {
   const lines = [];
   for (const check of report.checks) {
-    lines.push(renderCheckLine(check));
+    lines.push(renderCheckLine(check, fixMode));
   }
+  appendRepairs(lines, report, fixMode);
   lines.push(renderSummaryLine(report.checks));
-  const suggestions = collectSuggestions(report.checks);
-  if (suggestions.length > 0) {
-    lines.push("Next steps:");
-    for (const suggestion of suggestions) {
-      lines.push(`- ${suggestion}`);
-    }
-  }
+  appendNextSteps(lines, report.checks);
   return lines;
 }
-function renderVerboseDoctor(report) {
+function renderVerboseDoctor(report, fixMode) {
   const lines = [];
   for (const check of report.checks) {
-    lines.push(renderCheckLine(check));
+    lines.push(renderCheckLine(check, fixMode));
     for (const detail of check.details ?? []) {
       lines.push(`  detail: ${detail}`);
     }
   }
+  appendRepairs(lines, report, fixMode);
   lines.push(renderSummaryLine(report.checks));
-  const suggestions = collectSuggestions(report.checks);
+  appendNextSteps(lines, report.checks);
+  return lines;
+}
+function appendNextSteps(lines, checks3) {
+  const suggestions = collectSuggestions2(checks3);
   if (suggestions.length > 0) {
     lines.push("Next steps:");
     for (const suggestion of suggestions) {
       lines.push(`- ${suggestion}`);
     }
   }
-  return lines;
 }
-function renderCheckLine(check) {
-  return `${SEVERITY_LABELS[check.severity]} ${check.label}: ${check.summary}`;
+function appendRepairs(lines, report, fixMode) {
+  if (!fixMode) {
+    return;
+  }
+  const repairs = report.repairs ?? [];
+  if (repairs.length === 0) {
+    return;
+  }
+  lines.push("Repairs:");
+  for (const repair of repairs) {
+    lines.push(`- ${repair.title}: ${repair.status} (${repair.message})`);
+  }
+}
+function renderCheckLine(check, fixMode) {
+  const base = `${SEVERITY_LABELS[check.severity]} ${check.label}: ${check.summary}`;
+  if (!fixMode && (check.fixes?.length ?? 0) > 0) {
+    return `${base} (fixable — run: xacpx doctor --fix)`;
+  }
+  return base;
 }
 function renderSummaryLine(checks3) {
   const counts = summarizeChecks(checks3);
@@ -33216,7 +34425,7 @@ function summarizeChecks(checks3) {
     return counts;
   }, { pass: 0, warn: 0, fail: 0, skip: 0 });
 }
-function collectSuggestions(checks3) {
+function collectSuggestions2(checks3) {
   const seen = new Set;
   const suggestions = [];
   for (const check of checks3) {
@@ -33241,47 +34450,112 @@ var init_render_doctor = __esm(() => {
 });
 
 // src/doctor/doctor.ts
-import { homedir as homedir12 } from "node:os";
-import { join as join19 } from "node:path";
+import { homedir as homedir14 } from "node:os";
+import { join as join21 } from "node:path";
 async function runDoctor(options = {}, deps = {}) {
-  const home = deps.home ?? process.env.HOME ?? homedir12();
+  const home = deps.home ?? process.env.HOME ?? homedir14();
   const runtimePaths = resolveDoctorRuntimePaths(home, deps.resolveRuntimePaths);
   const sharedLoadConfig = createSharedLoadConfig(runtimePaths, deps.loadConfig ?? loadConfig);
+  const runners = [
+    {
+      id: "config",
+      run: () => (deps.checkConfig ?? checkConfig)({
+        loadConfig: sharedLoadConfig,
+        resolveRuntimePaths: () => runtimePaths
+      })
+    },
+    {
+      id: "runtime",
+      run: () => (deps.checkRuntime ?? checkRuntime)({
+        home,
+        configPath: runtimePaths.configPath
+      })
+    },
+    {
+      id: "logs",
+      run: () => (deps.checkLogs ?? checkLogs)({
+        home,
+        configPath: runtimePaths.configPath
+      })
+    },
+    {
+      id: "daemon",
+      run: () => (deps.checkDaemon ?? checkDaemon)({
+        home,
+        configPath: runtimePaths.configPath
+      })
+    },
+    {
+      id: "wechat",
+      run: () => (deps.checkWechat ?? checkWechat)({
+        verbose: options.verbose
+      })
+    },
+    {
+      id: "acpx",
+      run: () => (deps.checkAcpx ?? checkAcpx)({
+        verbose: options.verbose,
+        loadConfig: sharedLoadConfig,
+        resolveRuntimePaths: () => runtimePaths
+      })
+    },
+    {
+      id: "bridge",
+      run: () => (deps.checkBridge ?? checkBridge)({
+        verbose: options.verbose,
+        loadConfig: sharedLoadConfig,
+        resolveRuntimePaths: () => runtimePaths
+      })
+    },
+    {
+      id: "plugins",
+      run: () => (deps.checkPlugins ?? checkPlugins)({
+        home,
+        loadConfig: sharedLoadConfig,
+        resolveRuntimePaths: () => runtimePaths
+      })
+    },
+    {
+      id: "orchestration",
+      run: () => (deps.checkOrchestrationHealth ?? (() => defaultCheckOrchestrationHealth({
+        runtimePaths,
+        loadConfig: sharedLoadConfig,
+        isDaemonRunning: deps.isDaemonRunning ?? (() => defaultIsDaemonRunning(home, runtimePaths, deps.getDaemonStatus))
+      })))()
+    },
+    {
+      id: "orchestration-socket",
+      run: () => (deps.checkOrchestrationSocket ?? checkOrchestrationSocket)({
+        home,
+        configPath: runtimePaths.configPath
+      })
+    },
+    {
+      id: "smoke",
+      run: () => options.smoke === true ? (deps.checkSmoke ?? ((runOptions) => defaultCheckSmoke(runOptions, {
+        resolveRuntimePaths: () => runtimePaths,
+        loadConfig: sharedLoadConfig
+      })))(options) : Promise.resolve(createSmokeSkipResult("smoke probe not requested"))
+    }
+  ];
+  const runnersById = new Map(runners.map((runner) => [runner.id, runner.run]));
   const checks3 = [];
-  checks3.push(await (deps.checkConfig ?? checkConfig)({
-    loadConfig: sharedLoadConfig,
-    resolveRuntimePaths: () => runtimePaths
-  }));
-  checks3.push(await (deps.checkRuntime ?? checkRuntime)({
-    home,
-    configPath: runtimePaths.configPath
-  }));
-  checks3.push(await (deps.checkDaemon ?? checkDaemon)({
-    home,
-    configPath: runtimePaths.configPath
-  }));
-  checks3.push(await (deps.checkWechat ?? checkWechat)({
-    verbose: options.verbose
-  }));
-  checks3.push(await (deps.checkAcpx ?? checkAcpx)({
-    verbose: options.verbose,
-    loadConfig: sharedLoadConfig,
-    resolveRuntimePaths: () => runtimePaths
-  }));
-  checks3.push(await (deps.checkBridge ?? checkBridge)({
-    verbose: options.verbose,
-    loadConfig: sharedLoadConfig,
-    resolveRuntimePaths: () => runtimePaths
-  }));
-  checks3.push(await (deps.checkOrchestrationHealth ?? (() => defaultCheckOrchestrationHealth({
-    runtimePaths,
-    loadConfig: sharedLoadConfig
-  })))());
-  checks3.push(options.smoke === true ? await (deps.checkSmoke ?? ((runOptions) => defaultCheckSmoke(runOptions, {
-    resolveRuntimePaths: () => runtimePaths,
-    loadConfig: sharedLoadConfig
-  })))(options) : createSmokeSkipResult("smoke probe not requested"));
+  for (const runner of runners) {
+    checks3.push(await runner.run());
+  }
   const report = { checks: checks3 };
+  if (options.fix === true) {
+    const { repairs, repairedCheckIds } = await applyRepairs(checks3);
+    report.repairs = repairs;
+    for (const checkId of repairedCheckIds) {
+      const index = checks3.findIndex((check) => check.id === checkId);
+      const rerun = runnersById.get(checkId);
+      if (index === -1 || !rerun) {
+        continue;
+      }
+      checks3[index] = await rerun();
+    }
+  }
   const output = (deps.renderDoctor ?? renderDoctor)(report, options);
   return {
     report,
@@ -33289,6 +34563,41 @@ async function runDoctor(options = {}, deps = {}) {
     exitCode: checks3.some((check) => check.severity === "fail") ? 1 : 0
   };
 }
+async function applyRepairs(checks3) {
+  const repairs = [];
+  const repairedCheckIds = [];
+  for (const check of checks3) {
+    for (const fix of check.fixes ?? []) {
+      if (fix.withheld !== undefined) {
+        repairs.push({
+          checkId: check.id,
+          fixId: fix.id,
+          title: fix.title,
+          status: "skipped",
+          message: fix.withheld
+        });
+        continue;
+      }
+      let outcome;
+      try {
+        outcome = await fix.run();
+      } catch (error2) {
+        outcome = { ok: false, message: formatError12(error2) };
+      }
+      repairs.push({
+        checkId: check.id,
+        fixId: fix.id,
+        title: fix.title,
+        status: outcome.ok ? "applied" : "failed",
+        message: outcome.message
+      });
+      if (outcome.ok && !repairedCheckIds.includes(check.id)) {
+        repairedCheckIds.push(check.id);
+      }
+    }
+  }
+  return { repairs, repairedCheckIds };
+}
 function resolveDoctorRuntimePaths(home, resolver) {
   if (resolver) {
     return resolver();
@@ -33297,8 +34606,8 @@ function resolveDoctorRuntimePaths(home, resolver) {
     return resolveRuntimePaths();
   }
   return {
-    configPath: join19(coreHomeDir(home), "config.json"),
-    statePath: join19(coreHomeDir(home), "state.json")
+    configPath: join21(coreHomeDir(home), "config.json"),
+    statePath: join21(coreHomeDir(home), "state.json")
   };
 }
 function depsUseExplicitRuntimeOverrides() {
@@ -33338,36 +34647,116 @@ async function defaultCheckOrchestrationHealth(deps) {
       label: "Orchestration",
       severity: "skip",
       summary: "orchestration check skipped because configuration could not be loaded",
-      details: [`config path: ${deps.runtimePaths.configPath}`, `error: ${formatError9(error2)}`],
+      details: [`config path: ${deps.runtimePaths.configPath}`, `error: ${formatError12(error2)}`],
       suggestions: ["fix the Config check first, then run: xacpx doctor"]
     };
   }
   try {
     const store = new StateStore(deps.runtimePaths.statePath);
-    return await checkOrchestrationHealth({
-      loadState: () => store.load(),
+    const inspection = await store.inspect();
+    const result = await checkOrchestrationHealth({
+      loadState: async () => inspection.state,
       now: () => new Date,
       heartbeatThresholdSeconds: config4.orchestration.progressHeartbeatSeconds
     });
+    const daemonRunning = inspection.report ? await deps.isDaemonRunning() : false;
+    return applyStateInspectionReport(result, inspection.report, deps.runtimePaths.statePath, daemonRunning, deps.isDaemonRunning);
   } catch (error2) {
     return {
       id: "orchestration",
       label: "Orchestration",
       severity: "fail",
       summary: "orchestration health check failed",
-      details: [`state path: ${deps.runtimePaths.statePath}`, `error: ${formatError9(error2)}`]
+      details: [`state path: ${deps.runtimePaths.statePath}`, `error: ${formatError12(error2)}`]
     };
   }
 }
-function formatError9(error2) {
+function applyStateInspectionReport(result, report, statePath, daemonRunning, isDaemonRunning) {
+  if (!report) {
+    return result;
+  }
+  const fileCorrupt = report.dropped.some((record3) => record3.section === "file");
+  const details = [
+    ...result.details ?? [],
+    `state path: ${statePath}`,
+    ...report.dropped.map((record3) => record3.section === "file" ? `state.json is unreadable: ${record3.reason}` : `invalid state record ${record3.section}["${record3.key}"]: ${record3.reason}`)
+  ];
+  return {
+    ...result,
+    severity: result.severity === "fail" ? "fail" : "warn",
+    summary: fileCorrupt ? `state.json is unreadable and will be reset (renamed to state.json.corrupt-*) at next daemon startup; ${result.summary}` : `state.json has ${report.dropped.length} invalid record(s) that will be quarantined at next daemon startup; ${result.summary}`,
+    details,
+    suggestions: [
+      ...result.suggestions ?? [],
+      fileCorrupt ? "back up the state file before the next daemon start if you want to attempt manual recovery" : "the daemon backs the original file up as state.json.quarantine-* before dropping these records"
+    ],
+    fixes: [createStateQuarantineFix(statePath, daemonRunning, isDaemonRunning)]
+  };
+}
+function createStateQuarantineFix(statePath, daemonRunning, isDaemonRunning) {
+  return {
+    id: "state.quarantine",
+    title: "quarantine invalid state.json records",
+    ...daemonRunning ? { withheld: "stop the daemon first: xacpx stop" } : {},
+    run: async () => {
+      if (await isDaemonRunning()) {
+        return {
+          ok: false,
+          message: "a daemon started since detection; stop it first: xacpx stop"
+        };
+      }
+      const store = new StateStore(statePath);
+      await store.load();
+      const report = store.lastLoadReport;
+      if (!report) {
+        return { ok: true, message: "state.json was already valid; nothing to quarantine" };
+      }
+      if (report.corruptPath) {
+        return { ok: true, message: `state.json was unreadable; renamed to ${report.corruptPath} and reset` };
+      }
+      const backup = report.quarantinePath ? ` (original backed up to ${report.quarantinePath})` : "";
+      return {
+        ok: true,
+        message: `quarantined ${report.dropped.length} invalid state.json record(s)${backup}`
+      };
+    }
+  };
+}
+async function defaultIsDaemonRunning(home, runtimePaths, getDaemonStatus = () => defaultGetDaemonStatus2(home, runtimePaths)) {
+  try {
+    const status = await getDaemonStatus();
+    return status.state === "running" || status.state === "indeterminate";
+  } catch {
+    return true;
+  }
+}
+async function defaultGetDaemonStatus2(home, runtimePaths) {
+  const paths = resolveDaemonPaths({
+    home,
+    runtimeDir: resolveRuntimeDirFromConfigPath(runtimePaths.configPath)
+  });
+  const controller = createDaemonController(paths, {
+    processExecPath: process.execPath,
+    cliEntryPath: process.argv[1] ?? "",
+    cwd: process.cwd(),
+    env: process.env,
+    isProcessRunning: isProcessAlive
+  });
+  return await controller.getStatus();
+}
+function formatError12(error2) {
   return error2 instanceof Error ? error2.message : String(error2);
 }
 var init_doctor = __esm(async () => {
   init_core_home();
   init_load_config();
+  init_create_daemon_controller();
+  init_daemon_files();
   init_state_store();
   init_daemon_check();
+  init_logs_check();
   init_orchestration_health();
+  init_orchestration_socket_check();
   init_runtime_check();
   init_wechat_check();
   init_render_doctor();
@@ -33376,6 +34765,7 @@ var init_doctor = __esm(async () => {
     init_acpx_check(),
     init_bridge_check(),
     init_config_check(),
+    init_plugin_check(),
     init_smoke_check()
   ]);
 });
@@ -33400,8 +34790,8 @@ var init_doctor2 = __esm(async () => {
 // src/cli.ts
 init_core_home();
 import { randomUUID as randomUUID4 } from "node:crypto";
-import { homedir as homedir13 } from "node:os";
-import { dirname as dirname16, join as join20, sep } from "node:path";
+import { homedir as homedir15 } from "node:os";
+import { dirname as dirname14, join as join22, sep } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 
 // src/runtime/migrate-core-home.ts
@@ -33485,8 +34875,8 @@ init_daemon_files();
 
 // src/daemon/daemon-runtime.ts
 init_daemon_status();
-import { mkdir as mkdir5, rm as rm3, writeFile as writeFile3 } from "node:fs/promises";
-import { dirname as dirname5 } from "node:path";
+init_private_runtime_dir();
+import { rm as rm3, writeFile as writeFile2 } from "node:fs/promises";
 
 class DaemonRuntime {
   paths;
@@ -33512,8 +34902,8 @@ class DaemonRuntime {
       stdout_log: this.paths.stdoutLog,
       stderr_log: this.paths.stderrLog
     };
-    await mkdir5(dirname5(this.paths.pidFile), { recursive: true });
-    await writeFile3(this.paths.pidFile, `${this.options.pid}
+    await ensurePrivateRuntimeDir(this.paths.runtimeDir);
+    await writeFile2(this.paths.pidFile, `${this.options.pid}
 `);
     await this.statusStore.save(this.currentStatus);
   }
@@ -46188,7 +47578,7 @@ function buildXacpxMcpToolRegistry(input) {
     });
     tools.push({
       name: "scheduled_list",
-      description: "List pending one-shot scheduled tasks (global). Use to recover task ids before cancelling, or to see what is scheduled. Owner-only in group chats. Routing and account are resolved from the current session; pass no other arguments.",
+      description: "List pending one-shot scheduled tasks created in the current chat. Use to recover task ids before cancelling, or to see what is scheduled. Owner-only in group chats. Routing and account are resolved from the current session; pass no other arguments.",
       inputSchema: exports_external.object({}).strict(),
       handler: async () => await asToolResult(async () => {
         const tasks = await transport.scheduledList({ coordinatorSession });
@@ -46206,7 +47596,7 @@ function buildXacpxMcpToolRegistry(input) {
     });
     tools.push({
       name: "scheduled_cancel",
-      description: "Cancel a pending scheduled task by id. Owner-only in group chats. Returns whether a pending task with that id was found and cancelled. Routing is resolved from the current session.",
+      description: "Cancel a pending scheduled task by id (only tasks created in the current chat). Owner-only in group chats. Returns whether a pending task with that id was found and cancelled. Routing is resolved from the current session.",
       inputSchema: exports_external.object({
         id: exports_external.string().min(1).describe("The scheduled task id, e.g. 'k8f2' (a leading # is allowed).")
       }).strict(),
@@ -47416,7 +48806,10 @@ async function maybeRunFirstUseOnboarding(input) {
   const agentExisted = Boolean(input.config.agents[agentName]);
   input.config.workspaces[workspaceName] = { cwd };
   input.config.agents[agentName] = template;
-  await input.saveConfig(input.config);
+  await input.saveFirstRunConfig({
+    workspace: { name: workspaceName, cwd },
+    agent: { name: agentName, config: template }
+  });
   const alias = `${workspaceName}:${agentName}`;
   input.deps.print(t().misc.onboardingCreatedWorkspace(workspaceName, alias));
   return {
@@ -47439,8 +48832,8 @@ function resolveTemplateChoice(answer, names) {
 // src/cli-update.ts
 init_plugin_home();
 import { spawn as spawn4 } from "node:child_process";
-import { readFile as readFile8 } from "node:fs/promises";
-import { dirname as dirname10, join as join11 } from "node:path";
+import { readFile as readFile9 } from "node:fs/promises";
+import { dirname as dirname8, join as join11 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 
 // src/plugins/package-manager.ts
@@ -47448,9 +48841,14 @@ init_plugin_home();
 import { spawn as spawn3 } from "node:child_process";
 import { rm as rm4 } from "node:fs/promises";
 import { join as join7 } from "node:path";
+function shellSpawnPlan(args) {
+  const shell = process.platform === "win32";
+  return { shell, args: shell ? args.map((arg) => `"${arg}"`) : args };
+}
 async function defaultRunCommand(command, args, options) {
   await new Promise((resolve, reject) => {
-    const child = spawn3(command, args, { cwd: options.cwd, stdio: "inherit" });
+    const plan = shellSpawnPlan(args);
+    const child = spawn3(command, plan.args, { cwd: options.cwd, stdio: "inherit", shell: plan.shell });
     child.on("error", reject);
     child.on("exit", (code) => {
       if (code === 0)
@@ -47462,7 +48860,8 @@ async function defaultRunCommand(command, args, options) {
 }
 async function silentRun(command, args, options) {
   await new Promise((resolve, reject) => {
-    const child = spawn3(command, args, { cwd: options.cwd, stdio: "ignore" });
+    const plan = shellSpawnPlan(args);
+    const child = spawn3(command, plan.args, { cwd: options.cwd, stdio: "ignore", shell: plan.shell });
     child.on("error", reject);
     child.on("exit", (code) => {
       if (code === 0)
@@ -47638,7 +49037,7 @@ async function handleUpdateCli(args, deps) {
   }
   if (selected.targets.some((target) => target.kind === "plugin")) {
     config4.plugins = updatedPlugins;
-    await deps.saveConfig(config4);
+    await deps.savePlugins(updatedPlugins);
   }
   return 0;
 }
@@ -47748,9 +49147,10 @@ function compareSemver2(a, b) {
     return 0;
   return left.prerelease ? -1 : 1;
 }
+var spawnUsesShell = () => process.platform === "win32";
 async function runCapture(command, args) {
   return await new Promise((resolve, reject) => {
-    const child = spawn4(command, args, { stdio: ["ignore", "pipe", "pipe"] });
+    const child = spawn4(command, args, { stdio: ["ignore", "pipe", "pipe"], shell: spawnUsesShell() });
     let stdout2 = "";
     let stderr = "";
     child.stdout.setEncoding("utf8");
@@ -47767,7 +49167,7 @@ async function runCapture(command, args) {
 }
 async function runInherit(command, args) {
   await new Promise((resolve, reject) => {
-    const child = spawn4(command, args, { stdio: "inherit" });
+    const child = spawn4(command, args, { stdio: "inherit", shell: spawnUsesShell() });
     child.on("error", reject);
     child.on("exit", (code) => {
       if (code === 0)
@@ -47779,10 +49179,10 @@ async function runInherit(command, args) {
 }
 async function readPackageName() {
   try {
-    const here = dirname10(fileURLToPath3(import.meta.url));
+    const here = dirname8(fileURLToPath3(import.meta.url));
     for (const candidate of [join11(here, "..", "package.json"), join11(here, "..", "..", "package.json")]) {
       try {
-        const parsed = JSON.parse(await readFile8(candidate, "utf8"));
+        const parsed = JSON.parse(await readFile9(candidate, "utf8"));
         if (typeof parsed.name === "string" && parsed.name.trim())
           return parsed.name.trim();
       } catch {}
@@ -48024,7 +49424,7 @@ async function addChannel(type, rawArgs, deps) {
     return 1;
   }
   config4.channels = [...config4.channels ?? [], candidate];
-  await deps.saveConfig(config4);
+  await deps.saveChannels(config4.channels);
   deps.print(t().channelCli.channelAdded(type));
   for (const line of provider.renderSummary(candidate))
     deps.print(line);
@@ -48125,7 +49525,7 @@ async function removeChannel(type, rawArgs, deps) {
     return 1;
   }
   config4.channels = config4.channels.filter((entry) => entry.id !== channel.id);
-  await deps.saveConfig(config4);
+  await deps.saveChannels(config4.channels);
   deps.print(t().channelCli.channelRemoved(channel.id));
   return await maybeRestartAfterMutation(restartFlags.restart, deps);
 }
@@ -48147,7 +49547,7 @@ async function setChannelEnabled(type, enabled, rawArgs, deps) {
     return 1;
   }
   channel.enabled = enabled;
-  await deps.saveConfig(config4);
+  await deps.saveChannels(config4.channels);
   deps.print(t().channelCli.channelEnabledToggled(channel.id, enabled));
   return await maybeRestartAfterMutation(restartFlags.restart, deps);
 }
@@ -48169,7 +49569,7 @@ async function setChannelReplyMode(type, mode, rawArgs, deps) {
     return 1;
   }
   channel.replyMode = mode;
-  await deps.saveConfig(config4);
+  await deps.saveChannels(config4.channels);
   deps.print(t().channelCli.channelReplyModeSet(channel.id, mode));
   return await maybeRestartAfterMutation(restartFlags.restart, deps);
 }
@@ -48315,7 +49715,7 @@ async function addChannelAccount(type, accountId, rawArgs, deps) {
     deps.print(validation.map((issue2) => issue2.message).join("；"));
     return 1;
   }
-  await deps.saveConfig(config4);
+  await deps.saveChannels(config4.channels);
   deps.print(t().channelCli.channelAccountAdded(type, accountId));
   if (reEnabledChannel)
     deps.print(t().channelCli.channelReEnabled(type));
@@ -48355,7 +49755,7 @@ async function removeChannelAccount(type, accountId, rawArgs, deps) {
       return 1;
     }
     config4.channels = config4.channels.filter((channel) => channel.id !== existing.id);
-    await deps.saveConfig(config4);
+    await deps.saveChannels(config4.channels);
     deps.print(t().channelCli.channelAccountRemovedWithChannel(type, accountId));
     return await maybeRestartAfterMutation(restartFlags.restart, deps);
   }
@@ -48372,7 +49772,7 @@ async function removeChannelAccount(type, accountId, rawArgs, deps) {
     deps.print(t().channelCli.channelAccountDefaultSwitched(options.defaultAccount));
   }
   existing.options = options;
-  await deps.saveConfig(config4);
+  await deps.saveChannels(config4.channels);
   deps.print(t().channelCli.channelAccountRemoved(type, accountId));
   return await maybeRestartAfterMutation(restartFlags.restart, deps);
 }
@@ -48426,7 +49826,7 @@ async function setChannelAccountEnabled(type, accountId, enabled, rawArgs, deps)
     return 1;
   }
   existing.options = options;
-  await deps.saveConfig(config4);
+  await deps.saveChannels(config4.channels);
   deps.print(t().channelCli.channelAccountEnabledToggled(type, accountId, enabled));
   return await maybeRestartAfterMutation(restartFlags.restart, deps);
 }
@@ -48434,128 +49834,39 @@ async function setChannelAccountEnabled(type, accountId, enabled, rawArgs, deps)
 // src/plugins/plugin-cli.ts
 init_core_home();
 init_plugin_home();
-import { readFile as readFile10 } from "node:fs/promises";
+import { readFile as readFile11 } from "node:fs/promises";
 import { isAbsolute, join as join13, resolve } from "node:path";
 init_plugin_loader();
 init_validate_plugin();
-
-// src/plugins/plugin-doctor.ts
-init_channel_scope();
-init_plugin_loader();
-init_validate_plugin();
+init_plugin_doctor();
 init_known_plugins();
-import { readFile as readFile9 } from "node:fs/promises";
-import { join as join12 } from "node:path";
-function suggestedPluginPackageForChannel(type) {
-  return findKnownPluginByChannel(type)?.packageName ?? `<npm-package-that-provides-${type}>`;
-}
-async function readDependencyEntries(pluginHome) {
-  try {
-    const raw = await readFile9(join12(pluginHome, "package.json"), "utf8");
-    const parsed = JSON.parse(raw);
-    const out = {};
-    for (const [name, value] of Object.entries(parsed.dependencies ?? {})) {
-      if (typeof value === "string")
-        out[name] = value;
-    }
-    return out;
-  } catch (error2) {
-    const message = error2 instanceof Error ? error2.message : String(error2);
-    throw new Error(`failed to read plugin home package.json: ${message}`);
-  }
+init_plugin_renames();
+init_i18n();
+function findPluginSpecViolation(spec, platform) {
+  if (spec.includes('"'))
+    return "double-quote";
+  if (platform === "win32" && spec.includes("%"))
+    return "percent-on-windows";
+  return null;
 }
-async function inspectPlugins(input) {
-  const issues = [];
-  let dependencies;
-  try {
-    dependencies = await readDependencyEntries(input.pluginHome);
-  } catch (error2) {
-    const message = error2 instanceof Error ? error2.message : String(error2);
-    return [{ level: "error", message }];
-  }
-  const importPlugin = input.importPlugin ?? importPluginFromHome;
-  const allConfigured = input.config.plugins;
-  const filterByName = input.pluginName ?? null;
-  if (filterByName && !allConfigured.some((plugin) => plugin.name === filterByName)) {
-    return [{ level: "error", plugin: filterByName, message: `plugin is not configured; run xacpx plugin add ${filterByName}` }];
-  }
-  const pushIfRelevant = (issue2) => {
-    if (!filterByName || issue2.plugin === filterByName)
-      issues.push(issue2);
-  };
-  const channelProviders = new Map;
-  for (const configPlugin of allConfigured) {
-    if (!(configPlugin.name in dependencies)) {
-      pushIfRelevant({ level: "error", plugin: configPlugin.name, message: `package not installed in plugin home; run xacpx plugin add ${configPlugin.name}` });
+function invalidSpecMessage(specs, platform) {
+  for (const spec of specs) {
+    if (!spec)
       continue;
-    }
-    let moduleValue;
-    try {
-      moduleValue = await importPlugin(configPlugin.name, input.pluginHome);
-    } catch (error2) {
-      const message = error2 instanceof Error ? error2.message : String(error2);
-      pushIfRelevant({ level: "error", plugin: configPlugin.name, message: `failed to import plugin: ${message}` });
-      continue;
-    }
-    try {
-      const plugin = validateWeacpxPlugin(moduleValue, configPlugin.name, {
-        ...input.currentXacpxVersion !== undefined ? { currentXacpxVersion: input.currentXacpxVersion } : {}
-      });
-      const channels = plugin.channels ?? [];
-      const channelTypes = channels.map((channel) => channel.type);
-      for (const type of channelTypes) {
-        const existing = channelProviders.get(type);
-        if (existing) {
-          pushIfRelevant({ level: "error", plugin: configPlugin.name, message: `channel type ${type} is already provided by ${existing.plugin}` });
-        } else {
-          channelProviders.set(type, { plugin: configPlugin.name, enabled: configPlugin.enabled });
-        }
-      }
-      pushIfRelevant({
-        level: configPlugin.enabled ? "ok" : "warn",
-        plugin: configPlugin.name,
-        message: configPlugin.enabled ? `plugin is installed and valid; channels: ${channelTypes.length > 0 ? channelTypes.join(", ") : "none"}` : `plugin is installed and valid but disabled; run xacpx plugin enable ${configPlugin.name}`
-      });
-    } catch (error2) {
-      const message = error2 instanceof Error ? error2.message : String(error2);
-      pushIfRelevant({ level: "error", plugin: configPlugin.name, message });
-    }
+    const violation = findPluginSpecViolation(spec, platform);
+    if (violation === "double-quote")
+      return t().pluginCli.pluginSpecHasDoubleQuote(spec);
+    if (violation === "percent-on-windows")
+      return t().pluginCli.pluginSpecHasPercentOnWindows(spec);
   }
-  const builtInChannelTypes = new Set(listKnownChannelIds());
-  for (const channel of input.config.channels) {
-    if (builtInChannelTypes.has(channel.type))
-      continue;
-    const provider = channelProviders.get(channel.type);
-    if (!provider) {
-      if (!filterByName) {
-        issues.push({
-          level: "error",
-          message: `channel ${channel.type} is configured but no enabled plugin provides it; run xacpx plugin add ${suggestedPluginPackageForChannel(channel.type)} or another plugin that provides type "${channel.type}"`
-        });
-      }
-      continue;
-    }
-    if (!provider.enabled) {
-      pushIfRelevant({
-        level: "error",
-        plugin: provider.plugin,
-        message: `channel ${channel.type} is configured but provider plugin is disabled; run xacpx plugin enable ${provider.plugin}`
-      });
-    }
-  }
-  return issues;
+  return null;
 }
-
-// src/plugins/plugin-cli.ts
-init_known_plugins();
-init_plugin_renames();
-init_i18n();
 function looksLikePath(spec) {
   return spec === "." || spec.startsWith("./") || spec.startsWith("../") || spec.startsWith("/") || spec.startsWith(".\\") || spec.startsWith("..\\") || spec.startsWith("\\") || /^[a-zA-Z]:[\\/]/.test(spec) || isAbsolute(spec);
 }
 async function readDependencyEntries2(pluginHome) {
   try {
-    const raw = await readFile10(join13(pluginHome, "package.json"), "utf8");
+    const raw = await readFile11(join13(pluginHome, "package.json"), "utf8");
     const parsed = JSON.parse(raw);
     const out = {};
     for (const [name, value] of Object.entries(parsed.dependencies ?? {})) {
@@ -48581,7 +49892,7 @@ async function resolveLocalPluginName(installSpec, pluginHome, namesBeforeInstal
       return name;
   }
   try {
-    const raw = await readFile10(join13(installSpec, "package.json"), "utf8");
+    const raw = await readFile11(join13(installSpec, "package.json"), "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed.name === "string" && parsed.name.trim())
       return parsed.name.trim();
@@ -48724,6 +50035,11 @@ async function addPlugin(packageSpec, rawArgs, deps) {
     deps.print(t().pluginCli.unrecognizedArgs(flags.rest.join(" ")));
     return 1;
   }
+  const invalidSpec = invalidSpecMessage([packageSpec, flags.version], deps.platform ?? process.platform);
+  if (invalidSpec) {
+    deps.print(invalidSpec);
+    return 1;
+  }
   const pluginHome = deps.pluginHome ?? resolvePluginHome();
   await ensurePluginHome(pluginHome);
   const installSpec = looksLikePath(packageSpec) && !isAbsolute(packageSpec) ? resolve(process.cwd(), packageSpec) : packageSpec;
@@ -48761,7 +50077,7 @@ async function addPlugin(packageSpec, rawArgs, deps) {
   } else {
     config4.plugins = [...config4.plugins, next];
   }
-  await deps.saveConfig(config4);
+  await deps.savePlugins(config4.plugins);
   deps.print(t().pluginCli.pluginInstalled(recordedName));
   if (summary.channels.length > 0) {
     deps.print(t().pluginCli.providesChannels(summary.channels.join(", ")));
@@ -48787,7 +50103,7 @@ async function removePlugin(packageName, rawArgs, deps) {
   }
   const pluginHome = deps.pluginHome ?? resolvePluginHome();
   const validate = deps.validateInstalledPlugin ?? ((name) => validateInstalledPluginDefault(name, pluginHome));
-  const guard = await dependencyGuard(packageName, config4, validate);
+  const guard = await dependencyGuard(existing.name, config4, validate);
   if (!guard.allow) {
     if (guard.reason)
       deps.print(guard.reason);
@@ -48797,14 +50113,14 @@ async function removePlugin(packageName, rawArgs, deps) {
     await removePluginPackage({ packageName: name, pluginHome });
   });
   try {
-    await remove(packageName);
+    await remove(existing.name);
   } catch (error2) {
-    deps.print(t().pluginCli.pluginUninstallFailed(packageName, describeError(error2)));
+    deps.print(t().pluginCli.pluginUninstallFailed(existing.name, describeError(error2)));
     return 1;
   }
-  config4.plugins = config4.plugins.filter((entry) => entry.name !== packageName);
-  await deps.saveConfig(config4);
-  deps.print(t().pluginCli.pluginRemoved(packageName));
+  config4.plugins = config4.plugins.filter((entry) => entry.name !== existing.name);
+  await deps.savePlugins(config4.plugins);
+  deps.print(t().pluginCli.pluginRemoved(existing.name));
   return await maybeRestartAfterMutation2(flags.restart, deps);
 }
 async function updatePlugins(args, deps) {
@@ -48824,6 +50140,11 @@ async function updatePlugins(args, deps) {
     deps.print("--all cannot be combined with --version");
     return 1;
   }
+  const invalidSpec = invalidSpecMessage([flags.version], deps.platform ?? process.platform);
+  if (invalidSpec) {
+    deps.print(invalidSpec);
+    return 1;
+  }
   const config4 = await deps.loadConfig();
   ensurePluginsArray(config4);
   const pluginHome = deps.pluginHome ?? resolvePluginHome();
@@ -48880,7 +50201,7 @@ async function updatePlugins(args, deps) {
       deps.print(t().pluginCli.providesChannels(summary.channels.join(", ")));
     }
   }
-  await deps.saveConfig(config4);
+  await deps.savePlugins(config4.plugins);
   return await maybeRestartAfterMutation2(flags.restart, deps);
 }
 async function setPluginEnabled(packageName, enabled, rawArgs, deps) {
@@ -48911,7 +50232,7 @@ async function setPluginEnabled(packageName, enabled, rawArgs, deps) {
     }
   }
   existing.enabled = enabled;
-  await deps.saveConfig(config4);
+  await deps.savePlugins(config4.plugins);
   deps.print(t().pluginCli.pluginEnabledToggled(packageName, enabled));
   return await maybeRestartAfterMutation2(flags.restart, deps);
 }
@@ -49429,7 +50750,9 @@ async function defaultUpdate(args, input) {
   const store = await createCliConfigStore();
   const deps = {
     loadConfig: async () => await store.load(),
-    saveConfig: async (config4) => await store.save(config4),
+    savePlugins: async (plugins) => {
+      await store.replacePlugins(plugins);
+    },
     readCurrentVersion: readVersion,
     print: input.print,
     isInteractive: input.isInteractive ?? defaultIsInteractive,
@@ -49438,6 +50761,27 @@ async function defaultUpdate(args, input) {
   };
   return await handleUpdateCli(args, deps);
 }
+function warnStateLoadReport(store, writeStderr = (text) => process.stderr.write(text)) {
+  const report = store.lastLoadReport;
+  if (!report)
+    return;
+  for (const record3 of report.dropped) {
+    writeStderr(`[xacpx] state.record_quarantined section=${record3.section}${record3.key ? ` key=${record3.key}` : ""} reason=${record3.reason}
+`);
+  }
+  if (report.corruptPath) {
+    writeStderr(`[xacpx] state.file_corrupt unreadable state.json renamed to ${report.corruptPath}
+`);
+  }
+  if (report.quarantinePath) {
+    writeStderr(`[xacpx] state.file_quarantined original state.json backed up to ${report.quarantinePath}
+`);
+  }
+  if (report.backupError) {
+    writeStderr(`[xacpx] state.quarantine_backup_failed ${report.backupError}
+`);
+  }
+}
 async function runOnboardingBeforeStart(input) {
   const runtimePaths = (await init_main().then(() => exports_main)).resolveRuntimePaths();
   await ensureConfigExists(runtimePaths.configPath);
@@ -49445,10 +50789,14 @@ async function runOnboardingBeforeStart(input) {
   const stateStore = new StateStore(runtimePaths.statePath);
   const config4 = await configStore.load();
   const state = await stateStore.load();
+  warnStateLoadReport(stateStore);
   const result = await maybeRunFirstUseOnboarding({
     config: config4,
     state,
-    saveConfig: async (next) => await configStore.save(next),
+    saveFirstRunConfig: async ({ workspace: workspace3, agent: agent3 }) => {
+      await configStore.upsertWorkspace(workspace3.name, workspace3.cwd);
+      await configStore.upsertAgent(agent3.name, agent3.config);
+    },
     deps: {
       print: input.print,
       cwd: input.cwd,
@@ -49659,7 +51007,7 @@ async function handleLaterCli(args, deps) {
 }
 async function laterList(print) {
   const scheduled = await createCliScheduledTaskService();
-  print(renderLaterList(scheduled.listPending(), (alias) => toDisplaySessionAlias(alias)));
+  print(renderLaterList(scheduled.listPendingAllChats(), (alias) => toDisplaySessionAlias(alias)));
   return 0;
 }
 async function laterCancel(rawId, print) {
@@ -49669,7 +51017,7 @@ async function laterCancel(rawId, print) {
     return 1;
   }
   const scheduled = await createCliScheduledTaskService();
-  const ok = await scheduled.cancelPending(id);
+  const ok = await scheduled.cancelPendingAnyChat(id);
   if (!ok) {
     print(t().cli.laterNotFound(id));
     print(t().cli.laterNotFoundHint);
@@ -49682,10 +51030,11 @@ async function createCliScheduledTaskService() {
   const runtimePaths = (await init_main().then(() => exports_main)).resolveRuntimePaths();
   const stateStore = new StateStore(runtimePaths.statePath);
   const state = await stateStore.load();
+  warnStateLoadReport(stateStore);
   return new ScheduledTaskService(state, stateStore);
 }
 function resolveConfigPathForCurrentEnv() {
-  return coreEnv("CONFIG") ?? join20(coreHomeDir(requireHome2()), "config.json");
+  return coreEnv("CONFIG") ?? join22(coreHomeDir(requireHome2()), "config.json");
 }
 function resolveDaemonPathsForCurrentConfig() {
   const configPath = resolveConfigPathForCurrentEnv();
@@ -49784,14 +51133,12 @@ async function createFirstRunSession(runtime, plan) {
 }
 async function rollbackFirstRunConfig(runtime, plan) {
   try {
-    const config4 = await runtime.configStore.load();
-    if (!plan.rollback.workspaceExisted && config4.workspaces[plan.workspace]) {
-      delete config4.workspaces[plan.workspace];
+    if (!plan.rollback.workspaceExisted) {
+      await runtime.configStore.removeWorkspace(plan.workspace);
     }
-    if (!plan.rollback.agentExisted && config4.agents[plan.agent]) {
-      delete config4.agents[plan.agent];
+    if (!plan.rollback.agentExisted) {
+      await runtime.configStore.removeAgent(plan.agent);
     }
-    await runtime.configStore.save(config4);
   } catch (error2) {
     await runtime.logger.error("onboarding.rollback_failed", "failed to roll back first-run config", {
       alias: plan.alias,
@@ -49823,7 +51170,9 @@ async function defaultMcpStdio(args, deps = {}) {
     await ensureConfigExists(runtimePaths.configPath);
     const config4 = await loadConfig(runtimePaths.configPath);
     availableAgents = Object.keys(config4.agents);
-    const state = await new StateStore(runtimePaths.statePath).load();
+    const stateStore = new StateStore(runtimePaths.statePath);
+    const state = await stateStore.load();
+    warnStateLoadReport(stateStore, deps.stderr ?? ((text) => process.stderr.write(text)));
     const resolveIdentity = createMcpStdioIdentityResolver({
       parsedCoordinatorSession,
       sourceHandle,
@@ -49887,7 +51236,9 @@ async function createChannelCliDeps(input) {
   const controller = input.controller ?? createDefaultController();
   const base = {
     loadConfig: async () => await store.load(),
-    saveConfig: async (config4) => await store.save(config4),
+    saveChannels: async (channels) => {
+      await store.replaceChannels(channels);
+    },
     print: input.print,
     stderr: input.stderr ?? ((text) => process.stderr.write(text)),
     isInteractive: input.isInteractive ?? defaultIsInteractive,
@@ -49910,7 +51261,9 @@ async function createPluginCliDeps(input) {
   const controller = input.controller ?? createDefaultController();
   const base = {
     loadConfig: async () => await store.load(),
-    saveConfig: async (config4) => await store.save(config4),
+    savePlugins: async (plugins) => {
+      await store.replacePlugins(plugins);
+    },
     print: input.print,
     isInteractive: input.isInteractive ?? defaultIsInteractive,
     promptText: input.promptText ?? defaultPromptText,
@@ -50028,7 +51381,7 @@ function decodeFirstRunOnboarding(raw) {
   return null;
 }
 function requireHome2() {
-  const home = process.env.HOME ?? homedir13();
+  const home = process.env.HOME ?? homedir15();
   if (!home) {
     throw new Error("Unable to resolve the current user home directory");
   }
@@ -50052,7 +51405,7 @@ function safeDaemonLogPaths() {
     const configPath = resolveConfigPathForCurrentEnv();
     const paths = resolveDaemonPathsForCurrentConfig();
     return {
-      appLog: join20(dirname16(configPath), "runtime", "app.log"),
+      appLog: join22(dirname14(configPath), "runtime", "app.log"),
       stderrLog: paths.stderrLog
     };
   } catch {
@@ -50076,6 +51429,9 @@ function parseDoctorArgs(args) {
       case "--smoke":
         options.smoke = true;
         break;
+      case "--fix":
+        options.fix = true;
+        break;
       case "--agent": {
         const value = args[index + 1];
         if (!value || value.startsWith("--")) {