weacpx 0.6.0 → 0.7.0

package/dist/cli.js

@@ -48,6 +48,17 @@ var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __promiseAll = (args) => Promise.all(args);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
+// src/runtime/core-home.ts
+import { join } from "node:path";
+function coreHomeDir(home) {
+  return join(home, CORE_HOME_DIR_NAME);
+}
+function coreHomeDisplayPath(...segments) {
+  return ["~", CORE_HOME_DIR_NAME, ...segments].join("/");
+}
+var CORE_HOME_DIR_NAME = ".weacpx";
+var init_core_home = () => {};
+
 // node_modules/graceful-fs/polyfills.js
 var require_polyfills = __commonJS((exports, module) => {
   var constants = __require("constants");
@@ -2088,36 +2099,56 @@ var init_private_file = __esm(() => {
   import_write_file_atomic = __toESM(require_lib(), 1);
 });
 
-// src/commands/workspace-path.ts
-import { access } from "node:fs/promises";
-import { homedir } from "node:os";
+// src/util/path.ts
 import path from "node:path";
-function normalizeWorkspacePath(input) {
+import { homedir } from "node:os";
+function normalizePath(input) {
   const expanded = expandHome(input);
   if (isWindowsLikePath(expanded)) {
     return path.win32.normalize(expanded).replace(/\\/g, "/");
   }
   return path.posix.normalize(expanded.replace(/\\/g, "/"));
 }
-function basenameForWorkspacePath(input) {
-  const normalized = normalizeWorkspacePath(input);
+function basenameForPath(input) {
+  const normalized = normalizePath(input);
   if (ROOT_PATH_RE.test(normalized)) {
     return normalized;
   }
   const base = path.posix.basename(normalized);
   return base || normalized;
 }
-function sameWorkspacePath(left, right) {
-  const normalizedLeft = normalizeWorkspacePath(left);
-  const normalizedRight = normalizeWorkspacePath(right);
+function isSamePath(left, right) {
+  const normalizedLeft = normalizePath(left);
+  const normalizedRight = normalizePath(right);
   if (isWindowsLikePath(normalizedLeft) || isWindowsLikePath(normalizedRight)) {
     return normalizedLeft.toLowerCase() === normalizedRight.toLowerCase();
   }
   return normalizedLeft === normalizedRight;
 }
+function isWindowsLikePath(input) {
+  return WINDOWS_DRIVE_PATH_RE.test(input) || WINDOWS_UNC_PATH_RE.test(input);
+}
 function expandHome(input) {
   return input.startsWith("~") ? homedir() + input.slice(1) : input;
 }
+var WINDOWS_DRIVE_PATH_RE, WINDOWS_UNC_PATH_RE, ROOT_PATH_RE;
+var init_path = __esm(() => {
+  WINDOWS_DRIVE_PATH_RE = /^[a-zA-Z]:[\\/]/;
+  WINDOWS_UNC_PATH_RE = /^\\\\/;
+  ROOT_PATH_RE = /^(\/|[a-zA-Z]:\/?)$/;
+});
+
+// src/commands/workspace-path.ts
+import { access } from "node:fs/promises";
+function normalizeWorkspacePath(input) {
+  return normalizePath(input);
+}
+function basenameForWorkspacePath(input) {
+  return basenameForPath(input);
+}
+function sameWorkspacePath(left, right) {
+  return isSamePath(left, right);
+}
 async function pathExists(filePath) {
   try {
     await access(filePath);
@@ -2126,14 +2157,8 @@ async function pathExists(filePath) {
     return false;
   }
 }
-function isWindowsLikePath(input) {
-  return WINDOWS_DRIVE_PATH_RE.test(input) || WINDOWS_UNC_PATH_RE.test(input);
-}
-var WINDOWS_DRIVE_PATH_RE, WINDOWS_UNC_PATH_RE, ROOT_PATH_RE;
 var init_workspace_path = __esm(() => {
-  WINDOWS_DRIVE_PATH_RE = /^[a-zA-Z]:[\\/]/;
-  WINDOWS_UNC_PATH_RE = /^\\\\/;
-  ROOT_PATH_RE = /^(\/|[a-zA-Z]:\/?)$/;
+  init_path();
 });
 
 // src/config/resolve-agent-command.ts
@@ -2763,6 +2788,9 @@ class DaemonStatusStore {
       if (error.code === "ENOENT") {
         return null;
       }
+      if (error instanceof SyntaxError) {
+        return null;
+      }
       throw error;
     }
   }
@@ -3137,7 +3165,7 @@ var init_create_daemon_controller = __esm(() => {
 
 // src/orchestration/orchestration-ipc.ts
 import { createHash } from "node:crypto";
-import { join } from "node:path";
+import { join as join2 } from "node:path";
 function resolveOrchestrationEndpoint(runtimeDir, platform = process.platform) {
   if (platform === "win32") {
     const suffix = createHash("sha256").update(runtimeDir).digest("hex").slice(0, 12);
@@ -3148,7 +3176,7 @@ function resolveOrchestrationEndpoint(runtimeDir, platform = process.platform) {
   }
   return {
     kind: "unix",
-    path: join(runtimeDir, "orchestration.sock")
+    path: join2(runtimeDir, "orchestration.sock")
   };
 }
 function createOrchestrationEndpoint(path2, platform = process.platform) {
@@ -3168,25 +3196,26 @@ function encodeOrchestrationRpcResponse(response) {
 var init_orchestration_ipc = () => {};
 
 // src/daemon/daemon-files.ts
-import { dirname as dirname4, join as join2 } from "node:path";
+import { dirname as dirname4, join as join3 } from "node:path";
 function resolveDaemonPaths(options) {
-  const runtimeDir = options.runtimeDir ?? (options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : join2(options.home, ".weacpx", "runtime"));
+  const runtimeDir = options.runtimeDir ?? (options.configPath ? resolveRuntimeDirFromConfigPath(options.configPath) : join3(coreHomeDir(options.home), "runtime"));
   return {
     runtimeDir,
-    pidFile: join2(runtimeDir, "daemon.pid"),
-    statusFile: join2(runtimeDir, "status.json"),
-    stdoutLog: join2(runtimeDir, "stdout.log"),
-    stderrLog: join2(runtimeDir, "stderr.log"),
-    appLog: join2(runtimeDir, "app.log")
+    pidFile: join3(runtimeDir, "daemon.pid"),
+    statusFile: join3(runtimeDir, "status.json"),
+    stdoutLog: join3(runtimeDir, "stdout.log"),
+    stderrLog: join3(runtimeDir, "stderr.log"),
+    appLog: join3(runtimeDir, "app.log")
   };
 }
 function resolveRuntimeDirFromConfigPath(configPath) {
-  return join2(dirname4(configPath), "runtime");
+  return join3(dirname4(configPath), "runtime");
 }
 function resolveDaemonOrchestrationSocketPath(runtimeDir, platform = process.platform) {
   return resolveOrchestrationEndpoint(runtimeDir, platform).path;
 }
 var init_daemon_files = __esm(() => {
+  init_core_home();
   init_orchestration_ipc();
 });
 
@@ -9688,8 +9717,10 @@ function readVersion(moduleUrl = import.meta.url) {
   }
   return "unknown";
 }
-var PACKAGE_NAME = "weacpx";
-var init_version = () => {};
+var PACKAGE_NAME = "weacpx", WEACPX_CORE_VERSION;
+var init_version = __esm(() => {
+  WEACPX_CORE_VERSION = readVersion();
+});
 
 // src/orchestration/task-watch-timeouts.ts
 var DEFAULT_TASK_WATCH_TIMEOUT_MS = 60000, MAX_TASK_WATCH_TIMEOUT_MS, DEFAULT_TASK_WATCH_POLL_INTERVAL_MS = 1000, MAX_TASK_WATCH_POLL_INTERVAL_MS = 1e4, TASK_WATCH_RPC_TIMEOUT_PADDING_MS = 5000;
@@ -9713,10 +9744,60 @@ var init_quota_errors = __esm(() => {
   };
 });
 
+// src/util/sanitize.ts
+function sanitizeString(input, options = {}) {
+  const {
+    replacement = "-",
+    collapse = false,
+    trim = false,
+    lowercase: lowercase2 = false,
+    fallback
+  } = options;
+  let result = lowercase2 ? input.toLowerCase() : input;
+  if (options.allow) {
+    const pattern = new RegExp(`[^${options.allow.source.slice(1, -1)}]+`, "g");
+    result = result.replace(pattern, replacement);
+  } else if (options.deny) {
+    result = result.replace(options.deny, replacement);
+  }
+  if (collapse) {
+    const escaped = escapeRegExp(replacement);
+    result = result.replace(new RegExp(`${escaped}+`, "g"), replacement);
+  }
+  if (trim) {
+    const escaped = escapeRegExp(replacement);
+    result = result.replace(new RegExp(`^${escaped}+|${escaped}+$`, "g"), "");
+  }
+  if (fallback !== undefined && result.length === 0) {
+    return fallback;
+  }
+  return result;
+}
+function escapeRegExp(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+// src/util/text.ts
+function truncateText(text, maxLength, ellipsis = "…") {
+  if (text.length <= maxLength)
+    return text;
+  return text.slice(0, maxLength - ellipsis.length) + ellipsis;
+}
+function escapeForDoubleQuotes(input) {
+  return input.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
+}
+function quoteIfNeeded(input) {
+  return `"${escapeForDoubleQuotes(input)}"`;
+}
+
 // src/commands/workspace-name.ts
 function sanitizeWorkspaceName(input, fallback = "workspace") {
-  const sanitized = input.trim().replace(UNSAFE_RUN_RE, "-").replace(TRIM_DASHES_RE, "");
-  return sanitized.length > 0 ? sanitized : fallback;
+  return sanitizeString(input.trim(), {
+    allow: /[a-zA-Z0-9._-]/,
+    replacement: "-",
+    trim: true,
+    fallback
+  });
 }
 function allocateWorkspaceName(base, existing) {
   if (!Object.prototype.hasOwnProperty.call(existing, base))
@@ -9732,13 +9813,11 @@ function isWorkspaceNameValid(input) {
 function quoteWorkspaceNameIfNeeded(input) {
   if (isWorkspaceNameValid(input))
     return input;
-  return `"${input.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
+  return quoteIfNeeded(input);
 }
-var VALID_WORKSPACE_NAME_RE, UNSAFE_RUN_RE, TRIM_DASHES_RE;
+var VALID_WORKSPACE_NAME_RE;
 var init_workspace_name = __esm(() => {
   VALID_WORKSPACE_NAME_RE = /^[a-zA-Z0-9._-]+$/;
-  UNSAFE_RUN_RE = /[^a-zA-Z0-9._-]+/g;
-  TRIM_DASHES_RE = /^-+|-+$/g;
 });
 
 // src/orchestration/orchestration-types.ts
@@ -10288,7 +10367,7 @@ function renderLaterList(tasks, displaySession) {
 `).trimEnd();
 }
 function preview(text) {
-  return text.length <= LATER_MESSAGE_PREVIEW_CHARS ? text : `${text.slice(0, LATER_MESSAGE_PREVIEW_CHARS - 1)}…`;
+  return truncateText(text, LATER_MESSAGE_PREVIEW_CHARS);
 }
 function formatLocalDateTime(date4) {
   const weekdays = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
@@ -10434,7 +10513,10 @@ class ScheduledTaskService {
   }
   nextId() {
     for (let attempt = 0;attempt < 20; attempt += 1) {
-      const id = normalizeId(this.generateId()).replace(/[^0-9a-z]/g, "").slice(0, 6);
+      const id = sanitizeString(normalizeId(this.generateId()), {
+        allow: /[0-9a-z]/,
+        replacement: ""
+      }).slice(0, 6);
       if (id.length >= 4 && !this.state.scheduled_tasks[id])
         return id;
     }
@@ -10448,14 +10530,65 @@ class ScheduledTaskService {
   }
 }
 function normalizeId(input) {
-  return input.trim().replace(/^#/, "").toLowerCase();
+  return sanitizeString(input.trim(), {
+    deny: /^#/,
+    replacement: "",
+    lowercase: true
+  });
 }
 var init_scheduled_service = () => {};
 
 // src/plugins/plugin-home.ts
-import { mkdir as mkdir6, writeFile as writeFile4 } from "node:fs/promises";
+import { readFileSync } from "node:fs";
+import { copyFile, mkdir as mkdir6, readFile as readFile6, writeFile as writeFile4 } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
-import { join as join3 } from "node:path";
+import { dirname as dirname6, join as join5 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+function resolveCoreRoot() {
+  try {
+    let dir = dirname6(fileURLToPath2(import.meta.url));
+    for (let depth = 0;depth < 12; depth++) {
+      try {
+        const pkg = JSON.parse(readFileSync(join5(dir, "package.json"), "utf-8"));
+        if (pkg.name && CORE_PACKAGE_NAMES.includes(pkg.name))
+          return dir;
+      } catch {}
+      const parent = dirname6(dir);
+      if (parent === dir)
+        break;
+      dir = parent;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+async function ensureCoreResolution(pluginHome) {
+  const root = resolveCoreRoot();
+  if (!root)
+    return;
+  const srcJs = join5(root, "dist", "plugin-api.js");
+  for (const name of CORE_PACKAGE_NAMES) {
+    const targetDir = join5(pluginHome, "node_modules", name);
+    const dstJs = join5(targetDir, "plugin-api.js");
+    await mkdir6(targetDir, { recursive: true });
+    try {
+      await copyFile(srcJs, dstJs);
+    } catch (error2) {
+      const message = error2 instanceof Error ? error2.message : String(error2);
+      console.warn(`weacpx: skipped plugin-api resolution shim for "${name}" — could not copy ${srcJs} (${message}). ` + `Channel plugins importing "${name}/plugin-api" at runtime may fail to load.`);
+      continue;
+    }
+    await writeFile4(join5(targetDir, "package.json"), JSON.stringify({
+      name,
+      type: "module",
+      exports: {
+        "./plugin-api": "./plugin-api.js"
+      }
+    }, null, 2) + `
+`);
+  }
+}
 function coerceMissing(value) {
   if (value === undefined)
     return;
@@ -10475,17 +10608,43 @@ function resolvePluginHome(input = {}) {
   if (envOverride)
     return envOverride;
   const home = coerceMissing(input.home) ?? coerceMissing(process.env.HOME) ?? homedir3();
-  return join3(home, ".weacpx", "plugins");
+  return join5(coreHomeDir(home), "plugins");
+}
+async function normalizePluginHomeManifest(pluginHome) {
+  const manifestPath = join5(pluginHome, "package.json");
+  let raw;
+  try {
+    raw = await readFile6(manifestPath, "utf8");
+  } catch {
+    return false;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return false;
+  }
+  const normalized = JSON.stringify(parsed, null, 2) + `
+`;
+  if (normalized === raw)
+    return false;
+  await writeFile4(manifestPath, normalized, { mode: 384 });
+  return true;
 }
 async function ensurePluginHome(pluginHome) {
   await mkdir6(pluginHome, { recursive: true, mode: 448 });
-  await writeFile4(join3(pluginHome, "package.json"), JSON.stringify({ private: true, type: "module" }, null, 2) + `
+  await writeFile4(join5(pluginHome, "package.json"), JSON.stringify({ private: true, type: "module" }, null, 2) + `
 `, { flag: "wx" }).catch((error2) => {
     if (error2.code !== "EEXIST")
       throw error2;
   });
+  await ensureCoreResolution(pluginHome);
 }
-var init_plugin_home = () => {};
+var CORE_PACKAGE_NAMES;
+var init_plugin_home = __esm(() => {
+  init_core_home();
+  CORE_PACKAGE_NAMES = ["weacpx", "xacpx"];
+});
 
 // src/weixin/storage/ensure-dir.ts
 import fs2 from "node:fs";
@@ -10515,7 +10674,11 @@ var init_state_dir = () => {};
 import fs3 from "node:fs";
 import path4 from "node:path";
 function normalizeAccountId(raw) {
-  return raw.trim().toLowerCase().replace(/[@.]/g, "-");
+  return sanitizeString(raw.trim(), {
+    deny: /[@.]/g,
+    replacement: "-",
+    lowercase: true
+  });
 }
 function deriveRawAccountId(normalizedId) {
   if (normalizedId.endsWith("-im-bot")) {
@@ -12724,11 +12887,13 @@ function resolveContextTokenFilePath(accountId) {
   return path6.join(resolveStateDir(), "openclaw-weixin", "accounts", `${accountId}.context-tokens.json`);
 }
 function persistContextTokens(accountId) {
+  pruneContextTokensForAccount(accountId);
   const prefix = `${accountId}:`;
   const tokens = {};
-  for (const [k, v] of contextTokenStore) {
-    if (k.startsWith(prefix))
-      tokens[k.slice(prefix.length)] = v;
+  for (const [k, entry] of contextTokenStore) {
+    if (k.startsWith(prefix)) {
+      tokens[k.slice(prefix.length)] = { token: entry.token, updatedAt: entry.updatedAt };
+    }
   }
   const filePath = resolveContextTokenFilePath(accountId);
   try {
@@ -12745,12 +12910,15 @@ function restoreContextTokens(accountId) {
     const raw = fs5.readFileSync(filePath, "utf-8");
     const tokens = JSON.parse(raw);
     let count = 0;
-    for (const [userId, token] of Object.entries(tokens)) {
-      if (typeof token === "string" && token) {
-        contextTokenStore.set(contextTokenKey(accountId, userId), token);
+    for (const [userId, value] of Object.entries(tokens)) {
+      const entry = parsePersistedContextToken(value);
+      if (entry) {
+        contextTokenStore.set(contextTokenKey(accountId, userId), entry);
         count++;
       }
     }
+    pruneContextTokensForAccount(accountId);
+    persistContextTokens(accountId);
     logger.info(`restoreContextTokens: restored ${count} tokens for account=${accountId}`);
   } catch (err) {
     logger.warn(`restoreContextTokens: failed to read ${filePath}: ${String(err)}`);
@@ -12774,15 +12942,64 @@ function clearContextTokensForAccount(accountId) {
 function setContextToken(accountId, userId, token) {
   const k = contextTokenKey(accountId, userId);
   logger.debug(`setContextToken: key=${k}`);
-  contextTokenStore.set(k, token);
+  contextTokenStore.set(k, { token, updatedAt: contextTokenRetention.now() });
   persistContextTokens(accountId);
 }
 function getContextToken(accountId, userId) {
   const k = contextTokenKey(accountId, normalizeWeixinUserIdFromChatKey(userId));
-  const val = contextTokenStore.get(k);
+  pruneContextTokensForAccount(accountId);
+  const val = contextTokenStore.get(k)?.token;
   logger.debug(`getContextToken: key=${k} found=${val !== undefined} storeSize=${contextTokenStore.size}`);
   return val;
 }
+function parsePersistedContextToken(value) {
+  if (typeof value === "string" && value) {
+    return { token: value, updatedAt: contextTokenRetention.now() };
+  }
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return null;
+  }
+  const record3 = value;
+  if (typeof record3.token !== "string" || record3.token.length === 0) {
+    return null;
+  }
+  const updatedAt = typeof record3.updatedAt === "number" && Number.isFinite(record3.updatedAt) ? record3.updatedAt : contextTokenRetention.now();
+  return { token: record3.token, updatedAt };
+}
+function pruneContextTokensForAccount(accountId) {
+  const prefix = `${accountId}:`;
+  const now = contextTokenRetention.now();
+  const entries = [...contextTokenStore.entries()].filter(([key]) => key.startsWith(prefix));
+  for (const [key, entry] of entries) {
+    if (now - entry.updatedAt > contextTokenRetention.tokenTtlMs) {
+      contextTokenStore.delete(key);
+    }
+  }
+  const freshEntries = [...contextTokenStore.entries()].filter(([key]) => key.startsWith(prefix)).sort((a, b) => a[1].updatedAt - b[1].updatedAt);
+  const excess = freshEntries.length - contextTokenRetention.maxTokensPerAccount;
+  for (let i = 0;i < excess; i++) {
+    const key = freshEntries[i]?.[0];
+    if (key)
+      contextTokenStore.delete(key);
+  }
+}
+function normalizeContextTokenRetention(options = {}) {
+  return {
+    maxTokensPerAccount: normalizePositiveInt(options.maxTokensPerAccount, DEFAULT_CONTEXT_TOKEN_MAX_PER_ACCOUNT),
+    tokenTtlMs: normalizeNonNegativeMs(options.tokenTtlMs, DEFAULT_CONTEXT_TOKEN_TTL_MS),
+    now: options.now ?? (() => Date.now())
+  };
+}
+function normalizePositiveInt(value, fallback) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 1)
+    return fallback;
+  return Math.floor(value);
+}
+function normalizeNonNegativeMs(value, fallback) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0)
+    return fallback;
+  return value;
+}
 function normalizeWeixinUserIdFromChatKey(chatKey) {
   const parts = chatKey.split(":");
   if (parts[0] === "weixin" && parts[2]) {
@@ -12849,14 +13066,16 @@ function descriptorFromItem(item) {
     return { item, kind: "audio" };
   return;
 }
-var contextTokenStore;
+var DEFAULT_CONTEXT_TOKEN_MAX_PER_ACCOUNT = 5000, DEFAULT_CONTEXT_TOKEN_TTL_MS, contextTokenStore, contextTokenRetention;
 var init_inbound = __esm(() => {
   init_logger();
   init_random();
   init_types2();
   init_state_dir();
   init_private_file();
+  DEFAULT_CONTEXT_TOKEN_TTL_MS = 30 * 24 * 60 * 60 * 1000;
   contextTokenStore = new Map;
+  contextTokenRetention = normalizeContextTokenRetention();
 });
 
 // src/weixin/api/config-cache.ts
@@ -12864,18 +13083,27 @@ class WeixinConfigManager {
   apiOpts;
   log;
   cache = new Map;
-  constructor(apiOpts, log) {
+  maxEntries;
+  entryTtlMs;
+  now;
+  fetchConfig;
+  constructor(apiOpts, log, options = {}) {
     this.apiOpts = apiOpts;
     this.log = log;
+    this.maxEntries = normalizePositiveInt2(options.maxEntries, CONFIG_CACHE_DEFAULT_MAX_ENTRIES);
+    this.entryTtlMs = normalizeNonNegativeMs2(options.entryTtlMs, CONFIG_CACHE_ENTRY_TTL_MS);
+    this.now = options.now ?? (() => Date.now());
+    this.fetchConfig = options.getConfig ?? getConfig;
   }
   async getForUser(userId, contextToken) {
-    const now = Date.now();
+    const now = this.now();
+    this.prune(now);
     const entry = this.cache.get(userId);
     const shouldFetch = !entry || now >= entry.nextFetchAt;
     if (shouldFetch) {
       let fetchOk = false;
       try {
-        const resp = await getConfig({
+        const resp = await this.fetchConfig({
           baseUrl: this.apiOpts.baseUrl,
           token: this.apiOpts.token,
           ilinkUserId: userId,
@@ -12886,7 +13114,8 @@ class WeixinConfigManager {
             config: { typingTicket: resp.typing_ticket ?? "" },
             everSucceeded: true,
             nextFetchAt: now + Math.random() * CONFIG_CACHE_TTL_MS,
-            retryDelayMs: CONFIG_CACHE_INITIAL_RETRY_MS
+            retryDelayMs: CONFIG_CACHE_INITIAL_RETRY_MS,
+            lastTouchedAt: now
           });
           this.log(`[weixin] config ${entry?.everSucceeded ? "refreshed" : "cached"} for ${userId}`);
           fetchOk = true;
@@ -12900,24 +13129,72 @@ class WeixinConfigManager {
         if (entry) {
           entry.nextFetchAt = now + nextDelay;
           entry.retryDelayMs = nextDelay;
+          entry.lastTouchedAt = now;
         } else {
           this.cache.set(userId, {
             config: { typingTicket: "" },
             everSucceeded: false,
             nextFetchAt: now + CONFIG_CACHE_INITIAL_RETRY_MS,
-            retryDelayMs: CONFIG_CACHE_INITIAL_RETRY_MS
+            retryDelayMs: CONFIG_CACHE_INITIAL_RETRY_MS,
+            lastTouchedAt: now
           });
         }
       }
+    } else {
+      entry.lastTouchedAt = now;
     }
+    this.enforceMaxEntries();
     return this.cache.get(userId)?.config ?? { typingTicket: "" };
   }
+  cacheSizeForTests() {
+    this.prune(this.now());
+    return this.cache.size;
+  }
+  hasCachedUserForTests(userId) {
+    this.prune(this.now());
+    return this.cache.has(userId);
+  }
+  prune(now) {
+    const cutoff = now - this.entryTtlMs;
+    for (const [key, entry] of this.cache) {
+      if (entry.lastTouchedAt < cutoff) {
+        this.cache.delete(key);
+      }
+    }
+    this.enforceMaxEntries();
+  }
+  enforceMaxEntries() {
+    while (this.cache.size > this.maxEntries) {
+      let oldestKey;
+      let oldestTouchedAt = Number.POSITIVE_INFINITY;
+      for (const [key, entry] of this.cache) {
+        if (entry.lastTouchedAt < oldestTouchedAt) {
+          oldestTouchedAt = entry.lastTouchedAt;
+          oldestKey = key;
+        }
+      }
+      if (oldestKey === undefined)
+        return;
+      this.cache.delete(oldestKey);
+    }
+  }
+}
+function normalizePositiveInt2(value, fallback) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 1)
+    return fallback;
+  return Math.floor(value);
 }
-var CONFIG_CACHE_TTL_MS, CONFIG_CACHE_INITIAL_RETRY_MS = 2000, CONFIG_CACHE_MAX_RETRY_MS;
+function normalizeNonNegativeMs2(value, fallback) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0)
+    return fallback;
+  return value;
+}
+var CONFIG_CACHE_TTL_MS, CONFIG_CACHE_INITIAL_RETRY_MS = 2000, CONFIG_CACHE_MAX_RETRY_MS, CONFIG_CACHE_DEFAULT_MAX_ENTRIES = 5000, CONFIG_CACHE_ENTRY_TTL_MS;
 var init_config_cache = __esm(() => {
   init_api();
   CONFIG_CACHE_TTL_MS = 24 * 60 * 60 * 1000;
   CONFIG_CACHE_MAX_RETRY_MS = 60 * 60 * 1000;
+  CONFIG_CACHE_ENTRY_TTL_MS = 7 * 24 * 60 * 60 * 1000;
 });
 
 // src/weixin/api/session-guard.ts
@@ -12936,24 +13213,24 @@ var init_session_guard = __esm(() => {
   pauseUntilMap = new Map;
 });
 
-// src/weixin/messaging/conversation-executor.ts
+// src/runtime/conversation-executor.ts
 function createConversationExecutor() {
   const states = new Map;
   const getState = (conversationId) => {
     const existing = states.get(conversationId);
     if (existing)
       return existing;
-    const created = { activeControls: 0 };
+    const created = { normalTails: new Map, activeControls: 0 };
     states.set(conversationId, created);
     return created;
   };
   const cleanupState = (conversationId, state) => {
-    if (!state.normalTail && state.activeControls === 0) {
+    if (state.normalTails.size === 0 && state.activeControls === 0) {
       states.delete(conversationId);
     }
   };
   return {
-    run(conversationId, lane, task) {
+    run(conversationId, lane, task, sessionKey) {
       const state = getState(conversationId);
       if (lane === "control") {
         state.activeControls += 1;
@@ -12962,23 +13239,23 @@ function createConversationExecutor() {
           cleanupState(conversationId, state);
         });
       }
-      const previous = state.normalTail ?? Promise.resolve();
-      const next = previous.catch(() => {
-        return;
-      }).then(task);
-      state.normalTail = next;
+      const key = sessionKey ?? DEFAULT_SESSION_KEY;
+      const previous = state.normalTails.get(key) ?? Promise.resolve();
+      const next = previous.then(() => task(), () => task());
+      state.normalTails.set(key, next);
       return next.finally(() => {
-        if (state.normalTail === next) {
-          state.normalTail = undefined;
+        if (state.normalTails.get(key) === next) {
+          state.normalTails.delete(key);
         }
         cleanupState(conversationId, state);
       });
     }
   };
 }
+var DEFAULT_SESSION_KEY = "__chat__";
 
 // src/channels/media-store.ts
-import { access as access2, mkdir as mkdir7, readdir, rm as rm4, stat, writeFile as writeFile5 } from "node:fs/promises";
+import { access as access2, mkdir as mkdir7, readdir, rm as rm5, stat, writeFile as writeFile5 } from "node:fs/promises";
 import path7 from "node:path";
 
 class RuntimeMediaStore {
@@ -13024,16 +13301,24 @@ class RuntimeMediaStore {
 }
 function sanitizeMediaFileName(fileName, mimeType) {
   const base = path7.basename(fileName.trim() || "attachment");
-  const replaced = base.replace(/[\\/:*?"<>|\s]+/g, "-").replace(/^-+|-+$/g, "");
-  const safe = replaced || "attachment";
+  const safe = sanitizeString(base, {
+    deny: /[\\/:*?"<>|\s]+/g,
+    replacement: "-",
+    trim: true,
+    fallback: "attachment"
+  });
   const ext = path7.extname(safe);
   if (ext)
     return safe;
   return `${safe}${extensionFromMime(mimeType)}`;
 }
 function safePathSegment(value) {
-  const safe = value.replace(/[^A-Za-z0-9._-]+/g, "_").replace(/^_+|_+$/g, "");
-  return safe || "unknown";
+  return sanitizeString(value, {
+    allow: /[A-Za-z0-9._-]/,
+    replacement: "_",
+    trim: true,
+    fallback: "unknown"
+  });
 }
 async function uniqueFileName(dir, baseName) {
   const ext = path7.extname(baseName);
@@ -13089,7 +13374,7 @@ async function cleanupDir(dir, cutoffMs) {
     if (entry.isDirectory()) {
       const childEmpty = await cleanupDir(full, cutoffMs);
       if (childEmpty) {
-        await rm4(full, { recursive: true, force: true });
+        await rm5(full, { recursive: true, force: true });
       } else {
         empty = false;
       }
@@ -13099,7 +13384,7 @@ async function cleanupDir(dir, cutoffMs) {
     if (!s)
       continue;
     if (s.mtimeMs < cutoffMs) {
-      await rm4(full, { force: true });
+      await rm5(full, { force: true });
     } else {
       empty = false;
     }
@@ -13464,6 +13749,18 @@ var init_media_download = __esm(() => {
   WEIXIN_MEDIA_MAX_BYTES = 100 * 1024 * 1024;
 });
 
+// src/weixin/messaging/completion-notice.ts
+function buildBackgroundCompletionNotice(internalAlias, status) {
+  const display = toDisplaySessionAlias(internalAlias);
+  return status === "done" ? `✅ ${display} 已完成，/use ${display} 查看结果` : `⚠️ ${display} 失败，/use ${display} 查看详情`;
+}
+function shouldSendBackgroundNotice(reserve) {
+  return reserve ? reserve() : true;
+}
+var init_completion_notice = __esm(() => {
+  init_channel_scope();
+});
+
 // src/weixin/messaging/execute-chat-turn.ts
 async function executeChatTurn(params) {
   let usedReply = false;
@@ -13491,6 +13788,16 @@ function buildFinalHeadsUp(input) {
 \uD83D\uDCC4 结果共 ${total} 段，已发 ${sentSoFar} 段。回复 /jx 续看后 ${remaining} 段。`;
 }
 
+// src/weixin/messaging/foreground-gate.ts
+function shouldDeliverSegment(isForeground) {
+  return isForeground ? isForeground() : true;
+}
+function resolveFinalDisposition(isForeground, canStore) {
+  if (isForeground)
+    return "send";
+  return canStore ? "store" : "drop";
+}
+
 // src/weixin/messaging/markdown-filter.ts
 class StreamingMarkdownFilter {
   buf = "";
@@ -14387,8 +14694,8 @@ function normalizeMediaArray(media) {
 }
 
 // src/logging/rotating-file-writer.ts
-import { readdir as readdir2, rename, rm as rm5, stat as stat2 } from "node:fs/promises";
-import { basename, dirname as dirname6, join as join4 } from "node:path";
+import { readdir as readdir2, rename, rm as rm6, stat as stat2 } from "node:fs/promises";
+import { basename, dirname as dirname7, join as join7 } from "node:path";
 async function rotateIfNeeded(filePath, incomingSize, maxSizeBytes, maxFiles) {
   let currentSize = 0;
   try {
@@ -14405,10 +14712,10 @@ async function rotateIfNeeded(filePath, incomingSize, maxSizeBytes, maxFiles) {
     return;
   }
   if (maxFiles <= 0) {
-    await rm5(filePath, { force: true });
+    await rm6(filePath, { force: true });
     return;
   }
-  await rm5(`${filePath}.${maxFiles}`, { force: true });
+  await rm6(`${filePath}.${maxFiles}`, { force: true });
   for (let index = maxFiles - 1;index >= 1; index -= 1) {
     const source = `${filePath}.${index}`;
     try {
@@ -14422,7 +14729,7 @@ async function rotateIfNeeded(filePath, incomingSize, maxSizeBytes, maxFiles) {
   await rename(filePath, `${filePath}.1`);
 }
 async function cleanupExpiredRotatedLogs(filePath, retentionDays, now) {
-  const parentDir = dirname6(filePath);
+  const parentDir = dirname7(filePath);
   const prefix = `${basename(filePath)}.`;
   const cutoff = now().getTime() - retentionDays * 24 * 60 * 60 * 1000;
   let files = [];
@@ -14438,10 +14745,10 @@ async function cleanupExpiredRotatedLogs(filePath, retentionDays, now) {
     if (!file.startsWith(prefix) || !/^\d+$/.test(file.slice(prefix.length))) {
       continue;
     }
-    const candidate = join4(parentDir, file);
+    const candidate = join7(parentDir, file);
     const details = await stat2(candidate);
     if (details.mtime.getTime() < cutoff) {
-      await rm5(candidate, { force: true });
+      await rm6(candidate, { force: true });
     }
   }
 }
@@ -14452,7 +14759,7 @@ 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 dirname7 } from "node:path";
+import { dirname as dirname8 } 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(() => {
@@ -14502,7 +14809,7 @@ function createPerfLogWriter(options) {
       return;
     const data = batch.join("");
     try {
-      await mkdir8(dirname7(options.filePath), { recursive: true });
+      await mkdir8(dirname8(options.filePath), { recursive: true });
       await rotateIfNeeded(options.filePath, Buffer.byteLength(data), options.maxSizeBytes, options.maxFiles);
       await append(options.filePath, data);
       consecutiveFailures = 0;
@@ -14812,7 +15119,9 @@ function isSlashCommandText(textBody) {
 }
 function getWeixinMessageTurnLane(full) {
   const textBody = extractTextBody(full.item_list).trim().toLowerCase();
-  return textBody === "/cancel" || textBody === "/stop" || textBody === "/jx" ? "control" : "normal";
+  const command = textBody.split(/\s+/)[0] ?? "";
+  const isSwitch = command === "/use" || command === "/ss";
+  return command === "/cancel" || command === "/stop" || command === "/jx" || isSwitch ? "control" : "normal";
 }
 function buildWeixinChatKey(accountId, userId) {
   return `weixin:${accountId}:${userId}`;
@@ -14962,6 +15271,9 @@ async function handleWeixinMessageTurn(full, deps) {
     }
     let midFirstSent = false;
     const sendReplySegment = async (text) => {
+      if (!shouldDeliverSegment(deps.isForeground)) {
+        return false;
+      }
       const plainText = markdownToPlainText(text).trim();
       if (plainText.length === 0) {
         return false;
@@ -14993,7 +15305,8 @@ async function handleWeixinMessageTurn(full, deps) {
         channel: "weixin",
         chatType: full.group_id ? "group" : "direct",
         ...full.from_user_id ? { senderId: full.from_user_id } : {},
-        ...full.group_id ? { groupId: full.group_id } : {}
+        ...full.group_id ? { groupId: full.group_id } : {},
+        ...deps.boundSessionAlias ? { boundSessionAlias: deps.boundSessionAlias } : {}
       },
       perfSpan
     };
@@ -15011,80 +15324,96 @@ async function handleWeixinMessageTurn(full, deps) {
       if (turn.text) {
         const finalText = markdownToPlainText(turn.text).trim();
         if (finalText.length > 0) {
-          const rawChunks = chunkFinalText(finalText, MAX_FINAL_CHUNK_BYTES);
-          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}`);
-              } else {
-                await sendMessageWeixin({
-                  to,
-                  text: rawChunks[0],
-                  opts: { baseUrl: deps.baseUrl, token: deps.token, contextToken }
-                });
-                finalChunksSent += 1;
-                if (!finalFirstSent) {
-                  finalFirstSent = true;
-                  perfSpan.mark("reply.final_first_sent", { bytes: utf8ByteLength(rawChunks[0]), chunkIndex: 1 });
-                }
-              }
+          const disposition = resolveFinalDisposition(shouldDeliverSegment(deps.isForeground), Boolean(deps.boundSessionAlias && deps.onBackgroundFinal));
+          if (disposition === "store") {
+            await deps.onBackgroundFinal(deps.boundSessionAlias, finalText, "done");
+            if (shouldSendBackgroundNotice(deps.reserveFinal ? () => deps.reserveFinal(to) : undefined)) {
+              await sendMessageWeixin({
+                to,
+                text: buildBackgroundCompletionNotice(deps.boundSessionAlias, "done"),
+                opts: { baseUrl: deps.baseUrl, token: deps.token, contextToken }
+              }).catch((e) => deps.errLog(`bg completion notice failed: ${String(e)}`));
             } else {
-              const prefixed = rawChunks.map((body, i) => `(${i + 1}/${total}) ${body}`);
-              const available = deps.finalRemaining ? deps.finalRemaining(to) : total;
-              const waveSize = Math.max(Math.min(available, total), 0);
-              const wave = prefixed.slice(0, waveSize);
-              const rest = prefixed.slice(waveSize);
-              if (wave.length > 0 && rest.length > 0) {
-                const sentSoFar = wave.length;
-                wave[wave.length - 1] = `${wave[wave.length - 1]}
-
-${buildFinalHeadsUp({
-                  total,
-                  sentSoFar
-                })}`;
-              }
-              let sent = 0;
-              for (let i = 0;i < wave.length; i += 1) {
+              deps.errLog(`weixin.final.dropped reason=quota_exhausted kind=bg_notice chatKey=${to}`);
+            }
+          } else if (disposition === "drop") {
+            deps.errLog(`weixin.final.dropped reason=backgrounded_no_store kind=text chatKey=${to}`);
+          } else {
+            const rawChunks = chunkFinalText(finalText, MAX_FINAL_CHUNK_BYTES);
+            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_paginated chatKey=${to} chunk=${i + 1}/${total}`);
-                  break;
-                }
-                try {
+                  deps.errLog(`weixin.final.dropped reason=quota_exhausted kind=text chatKey=${to}`);
+                } else {
                   await sendMessageWeixin({
                     to,
-                    text: wave[i],
+                    text: rawChunks[0],
                     opts: { baseUrl: deps.baseUrl, token: deps.token, contextToken }
                   });
-                  sent += 1;
                   finalChunksSent += 1;
                   if (!finalFirstSent) {
                     finalFirstSent = true;
-                    perfSpan.mark("reply.final_first_sent", { bytes: utf8ByteLength(wave[i]), chunkIndex: i + 1 });
+                    perfSpan.mark("reply.final_first_sent", { bytes: utf8ByteLength(rawChunks[0]), chunkIndex: 1 });
                   }
-                } catch (sendErr) {
-                  finalDropped = true;
-                  deps.errLog(`weixin.final.dropped reason=send_failed kind=text_paginated chatKey=${to} chunk=${i + 1}/${total} err=${String(sendErr)}`);
-                  break;
                 }
-              }
-              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;
-                });
-                deps.enqueuePendingFinal(to, pending);
+              } else {
+                const prefixed = rawChunks.map((body, i) => `(${i + 1}/${total}) ${body}`);
+                const available = deps.finalRemaining ? deps.finalRemaining(to) : total;
+                const waveSize = Math.max(Math.min(available, total), 0);
+                const wave = prefixed.slice(0, waveSize);
+                const rest = prefixed.slice(waveSize);
+                if (wave.length > 0 && rest.length > 0) {
+                  const sentSoFar = wave.length;
+                  wave[wave.length - 1] = `${wave[wave.length - 1]}
+
+${buildFinalHeadsUp({
+                    total,
+                    sentSoFar
+                  })}`;
+                }
+                let sent = 0;
+                for (let i = 0;i < wave.length; i += 1) {
+                  const reserved = deps.reserveFinal ? deps.reserveFinal(to) : true;
+                  if (!reserved) {
+                    finalDropped = true;
+                    deps.errLog(`weixin.final.dropped reason=quota_exhausted kind=text_paginated chatKey=${to} chunk=${i + 1}/${total}`);
+                    break;
+                  }
+                  try {
+                    await sendMessageWeixin({
+                      to,
+                      text: wave[i],
+                      opts: { baseUrl: deps.baseUrl, token: deps.token, contextToken }
+                    });
+                    sent += 1;
+                    finalChunksSent += 1;
+                    if (!finalFirstSent) {
+                      finalFirstSent = true;
+                      perfSpan.mark("reply.final_first_sent", { bytes: utf8ByteLength(wave[i]), chunkIndex: i + 1 });
+                    }
+                  } catch (sendErr) {
+                    finalDropped = true;
+                    deps.errLog(`weixin.final.dropped reason=send_failed kind=text_paginated chatKey=${to} chunk=${i + 1}/${total} err=${String(sendErr)}`);
+                    break;
+                  }
+                }
+                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;
+                  });
+                  deps.enqueuePendingFinal(to, pending);
+                }
               }
             }
           }
@@ -15155,18 +15484,35 @@ ${buildFinalHeadsUp({
       perfSpan.setOutcome("error", { reason: "turn_error" });
       const errorText = err instanceof Error ? err.stack ?? err.message : JSON.stringify(err);
       deps.errLog(`handleWeixinMessageTurn: agent or send failed: ${errorText}`);
-      const reservedErr = deps.reserveFinal ? deps.reserveFinal(to) : true;
-      if (!reservedErr) {
-        deps.errLog(`weixin.final.dropped reason=quota_exhausted kind=error_notice chatKey=${to}`);
+      const errMessage = `⚠️ 执行出错：${err instanceof Error ? err.message : JSON.stringify(err)}`;
+      const errDisposition = resolveFinalDisposition(shouldDeliverSegment(deps.isForeground), Boolean(deps.boundSessionAlias && deps.onBackgroundFinal));
+      if (errDisposition === "store") {
+        await deps.onBackgroundFinal(deps.boundSessionAlias, errMessage, "error");
+        if (shouldSendBackgroundNotice(deps.reserveFinal ? () => deps.reserveFinal(to) : undefined)) {
+          await sendMessageWeixin({
+            to,
+            text: buildBackgroundCompletionNotice(deps.boundSessionAlias, "error"),
+            opts: { baseUrl: deps.baseUrl, token: deps.token, contextToken }
+          }).catch((e) => deps.errLog(`bg completion notice failed: ${String(e)}`));
+        } else {
+          deps.errLog(`weixin.final.dropped reason=quota_exhausted kind=bg_notice chatKey=${to}`);
+        }
+      } else if (errDisposition === "drop") {
+        deps.errLog(`weixin.final.dropped reason=backgrounded_no_store kind=error_notice chatKey=${to}`);
       } else {
-        sendWeixinErrorNotice({
-          to,
-          contextToken,
-          message: `⚠️ 执行出错：${err instanceof Error ? err.message : JSON.stringify(err)}`,
-          baseUrl: deps.baseUrl,
-          token: deps.token,
-          errLog: deps.errLog
-        });
+        const reservedErr = deps.reserveFinal ? deps.reserveFinal(to) : true;
+        if (!reservedErr) {
+          deps.errLog(`weixin.final.dropped reason=quota_exhausted kind=error_notice chatKey=${to}`);
+        } else {
+          sendWeixinErrorNotice({
+            to,
+            contextToken,
+            message: errMessage,
+            baseUrl: deps.baseUrl,
+            token: deps.token,
+            errLog: deps.errLog
+          });
+        }
       }
     } finally {
       stopTypingIndicator();
@@ -15184,6 +15530,7 @@ var init_handle_weixin_message_turn = __esm(() => {
   init_outbound_media_safety();
   init_media_download();
   init_mime();
+  init_completion_notice();
   init_inbound();
   init_error_notice();
   init_send_media();
@@ -15385,7 +15732,15 @@ async function monitorWeixinProvider(opts) {
             }
           }
         }
-        conversationExecutor.run(full.from_user_id ?? "", getWeixinMessageTurnLane(full), () => handleWeixinMessageTurn(full, {
+        const chatKey = buildWeixinChatKey(accountId, fromUserId);
+        const isSlash = inboundText.trim().startsWith("/");
+        const boundAlias = isSlash ? undefined : opts.peekCurrentSessionAlias?.(chatKey);
+        const sessionKey = boundAlias ?? "__chat__";
+        const isForeground = boundAlias ? () => opts.peekCurrentSessionAlias?.(chatKey) === boundAlias : undefined;
+        if (boundAlias) {
+          opts.activeTurns?.markActive(chatKey, boundAlias);
+        }
+        const runPromise = conversationExecutor.run(full.from_user_id ?? "", getWeixinMessageTurnLane(full), () => handleWeixinMessageTurn(full, {
           accountId,
           agent,
           baseUrl,
@@ -15403,9 +15758,25 @@ async function monitorWeixinProvider(opts) {
           ...opts.prependPendingFinal ? { prependPendingFinal: opts.prependPendingFinal } : {},
           ...opts.mediaStore ? { mediaStore: opts.mediaStore } : {},
           ...opts.allowedMediaRoots ? { allowedMediaRoots: opts.allowedMediaRoots } : {},
-          ...opts.perfTracer ? { perfTracer: opts.perfTracer } : {}
-        })).catch((err) => {
+          ...opts.perfTracer ? { perfTracer: opts.perfTracer } : {},
+          ...boundAlias ? { boundSessionAlias: boundAlias } : {},
+          ...isForeground ? { isForeground } : {},
+          ...opts.setBackgroundResult ? {
+            onBackgroundFinal: async (alias, text, status) => {
+              await opts.setBackgroundResult(chatKey, alias, {
+                text,
+                status,
+                finished_at: new Date().toISOString()
+              });
+            }
+          } : {}
+        }), sessionKey);
+        runPromise.catch((err) => {
           errLog(`[weixin] message turn failed: ${String(err)}`);
+        }).finally(() => {
+          if (boundAlias) {
+            opts.activeTurns?.markInactive(chatKey, boundAlias);
+          }
         });
       }
     } catch (err) {
@@ -15589,7 +15960,10 @@ async function start(agent, opts) {
     ...opts?.enqueuePendingFinal ? { enqueuePendingFinal: opts.enqueuePendingFinal } : {},
     ...opts?.dropPendingFinal ? { dropPendingFinal: opts.dropPendingFinal } : {},
     ...opts?.mediaStore ? { mediaStore: opts.mediaStore } : {},
-    ...opts?.perfTracer ? { perfTracer: opts.perfTracer } : {}
+    ...opts?.perfTracer ? { perfTracer: opts.perfTracer } : {},
+    ...opts?.peekCurrentSessionAlias ? { peekCurrentSessionAlias: opts.peekCurrentSessionAlias } : {},
+    ...opts?.setBackgroundResult ? { setBackgroundResult: opts.setBackgroundResult } : {},
+    ...opts?.activeTurns ? { activeTurns: opts.activeTurns } : {}
   });
 }
 var init_bot = __esm(() => {
@@ -16021,16 +16395,16 @@ var init_scheduled_turn = __esm(() => {
 });
 
 // src/weixin/monitor/consumer-lock.ts
-import { mkdir as mkdir8, open as open3, readFile as readFile6, rm as rm6 } from "node:fs/promises";
-import { dirname as dirname8, join as join5 } from "node:path";
+import { mkdir as mkdir8, open as open3, readFile as readFile7, rm as rm7 } from "node:fs/promises";
+import { dirname as dirname9, join as join8 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 function createWeixinConsumerLock(options = {}) {
-  const lockFilePath = options.lockFilePath ?? join5(homedir4(), ".weacpx", "runtime", "weixin-consumer.lock.json");
+  const lockFilePath = options.lockFilePath ?? join8(coreHomeDir(homedir4()), "runtime", "weixin-consumer.lock.json");
   const isProcessRunning = options.isProcessRunning ?? defaultIsProcessRunning4;
   const onDiagnostic = options.onDiagnostic;
   return {
     async acquire(meta2) {
-      await mkdir8(dirname8(lockFilePath), { recursive: true });
+      await mkdir8(dirname9(lockFilePath), { recursive: true });
       while (true) {
         try {
           const handle = await open3(lockFilePath, "wx");
@@ -16061,7 +16435,7 @@ function createWeixinConsumerLock(options = {}) {
           });
           const existing = await loadLockMetadata(lockFilePath);
           if (!existing) {
-            await rm6(lockFilePath, { force: true });
+            await rm7(lockFilePath, { force: true });
             await onDiagnostic?.("lock_invalid_removed", {
               lockFilePath,
               reason: "invalid_or_unreadable_metadata"
@@ -16069,7 +16443,7 @@ function createWeixinConsumerLock(options = {}) {
             continue;
           }
           if (!isProcessRunning(existing.pid)) {
-            await rm6(lockFilePath, { force: true });
+            await rm7(lockFilePath, { force: true });
             await onDiagnostic?.("lock_stale_removed", {
               lockFilePath,
               stalePid: existing.pid,
@@ -16094,7 +16468,7 @@ function createWeixinConsumerLock(options = {}) {
       }
     },
     async release() {
-      await rm6(lockFilePath, { force: true });
+      await rm7(lockFilePath, { force: true });
       await onDiagnostic?.("lock_released", {
         lockFilePath
       });
@@ -16103,7 +16477,7 @@ function createWeixinConsumerLock(options = {}) {
 }
 async function loadLockMetadata(path14) {
   try {
-    const raw = await readFile6(path14, "utf8");
+    const raw = await readFile7(path14, "utf8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed.pid !== "number" || !parsed.mode || !parsed.configPath || !parsed.statePath) {
       return null;
@@ -16123,6 +16497,7 @@ function defaultIsProcessRunning4(pid) {
 }
 var ActiveWeixinConsumerLockError;
 var init_consumer_lock = __esm(() => {
+  init_core_home();
   ActiveWeixinConsumerLockError = class ActiveWeixinConsumerLockError extends Error {
     existing;
     lockFilePath;
@@ -16185,6 +16560,7 @@ class WeixinChannel {
       console.log("[weacpx] 未检测到登录凭证，正在启动扫码登录...");
       await this.login();
     }
+    const sessions = input.sessions;
     await start(input.agent, {
       abortSignal: input.abortSignal,
       ...this.mediaStore ? { mediaStore: this.mediaStore } : {},
@@ -16197,7 +16573,12 @@ class WeixinChannel {
       prependPendingFinal: (chatKey, chunks) => input.quota.prependPendingFinal(chatKey, chunks),
       enqueuePendingFinal: (chatKey, chunks) => input.quota.enqueuePendingFinal(chatKey, chunks),
       dropPendingFinal: (chatKey) => input.quota.clearPendingFinal(chatKey),
-      ...input.perfTracer ? { perfTracer: input.perfTracer } : {}
+      ...input.perfTracer ? { perfTracer: input.perfTracer } : {},
+      ...sessions ? {
+        peekCurrentSessionAlias: (chatKey) => sessions.peekCurrentSessionAlias(chatKey),
+        setBackgroundResult: (chatKey, alias, result) => sessions.setBackgroundResult(chatKey, alias, result)
+      } : {},
+      ...input.activeTurns ? { activeTurns: input.activeTurns } : {}
     });
   }
   async notifyTaskCompletion(task) {
@@ -16652,9 +17033,9 @@ __export(exports_plugin_loader, {
 });
 import { createRequire as createRequire2 } from "node:module";
 import { pathToFileURL } from "node:url";
-import { join as join6 } from "node:path";
+import { join as join9 } from "node:path";
 async function importPluginFromHome(packageName, pluginHome) {
-  const requireFromHome = createRequire2(join6(pluginHome, "package.json"));
+  const requireFromHome = createRequire2(join9(pluginHome, "package.json"));
   const entry = requireFromHome.resolve(packageName);
   return await import(pathToFileURL(entry).href);
 }
@@ -16709,7 +17090,7 @@ var init_bootstrap = __esm(() => {
 
 // src/logging/app-logger.ts
 import { appendFile, chmod as chmod2, mkdir as mkdir9 } from "node:fs/promises";
-import { dirname as dirname10 } from "node:path";
+import { dirname as dirname11 } from "node:path";
 function createNoopAppLogger() {
   return {
     debug: async () => {},
@@ -16750,7 +17131,7 @@ function createAppLogger(options) {
       return;
     }
     const line = formatLogLine(now(), level, event, message, context);
-    await mkdir9(dirname10(options.filePath), { recursive: true });
+    await mkdir9(dirname11(options.filePath), { recursive: true });
     if (!modeEnsured) {
       modeEnsured = true;
       await chmod2(options.filePath, 384).catch(() => {});
@@ -16785,7 +17166,7 @@ var init_app_logger = __esm(() => {
 });
 
 // src/transport/acpx-session-index.ts
-import { readFile as readFile10 } from "node:fs/promises";
+import { readFile as readFile11 } from "node:fs/promises";
 import { homedir as homedir5 } from "node:os";
 import { resolve as resolve2 } from "node:path";
 async function resolveSessionAgentCommandFromIndex(session) {
@@ -16794,7 +17175,7 @@ async function resolveSessionAgentCommandFromIndex(session) {
     return;
   }
   try {
-    const raw = await readFile10(resolve2(home, ".acpx", "sessions", "index.json"), "utf8");
+    const raw = await readFile11(resolve2(home, ".acpx", "sessions", "index.json"), "utf8");
     const parsed = JSON.parse(raw);
     const targetCwd = resolve2(session.cwd);
     const match = parsed.entries?.find((entry) => entry.name === session.transportSession && entry.cwd === targetCwd && typeof entry.agentCommand === "string" && entry.agentCommand.trim().length > 0);
@@ -17004,8 +17385,10 @@ function parseCommand(input) {
   }
   if (command === "/status")
     return { kind: "status" };
-  if (command === "/cancel")
-    return { kind: "cancel" };
+  if (command === "/cancel") {
+    const alias = parts[1];
+    return alias ? { kind: "cancel", alias } : { kind: "cancel" };
+  }
   if (command === "/clear")
     return { kind: "session.reset" };
   if (command === "/mode" && parts.length === 1)
@@ -17139,6 +17522,9 @@ function parseCommand(input) {
   if (command === "/config" && parts[1] === "set" && parts.length === 4) {
     return { kind: "config.set", path: parts[2] ?? "", value: parts[3] ?? "" };
   }
+  if (command === "/use" && parts[1] === "-") {
+    return { kind: "session.use.previous" };
+  }
   if (command === "/use" && parts[1]) {
     return { kind: "session.use", alias: parts[1] };
   }
@@ -18295,7 +18681,7 @@ async function buildCoordinatorPrompt(input) {
 
 `) : input.userText ?? "";
   if (input.maxPromptLength && promptText.length > input.maxPromptLength) {
-    promptText = promptText.slice(0, input.maxPromptLength - 3) + "...";
+    promptText = truncateText(promptText, input.maxPromptLength, "...");
   }
   return {
     promptText,
@@ -18306,6 +18692,11 @@ async function buildCoordinatorPrompt(input) {
 }
 var init_build_coordinator_prompt = () => {};
 
+// src/commands/handlers/session-list-marker.ts
+function decorateUnread(label, hasUnread) {
+  return hasUnread ? `● ${label}` : label;
+}
+
 // src/commands/handlers/session-handler.ts
 async function handleSessions(context, chatKey) {
   const sessions = await context.sessions.listSessions(chatKey);
@@ -18328,10 +18719,11 @@ async function handleSessions(context, chatKey) {
     return { text: lines.join(`
 `) };
   }
+  const unread = new Set(context.sessions.listBackgroundResultAliases(chatKey));
   return {
     text: [
       "会话列表：",
-      ...sessions.map((session) => `- ${session.alias} (${session.agent} @ ${session.workspace})${session.isCurrent ? " [当前]" : ""}`)
+      ...sessions.map((session) => `- ${decorateUnread(session.alias, unread.has(session.internalAlias))} (${session.agent} @ ${session.workspace})${session.isCurrent ? " [当前]" : ""}`)
     ].join(`
 `)
   };
@@ -18408,13 +18800,55 @@ async function refreshSessionTransportAgentCommandBestEffort(context, alias, eve
     });
   }
 }
-async function handleSessionUse(context, chatKey, alias) {
-  await context.sessions.useSession(chatKey, alias);
+function renderSwitched(switched) {
+  const base = `已切到 ${switched.alias} · ${switched.agent} · ${switched.workspace}`;
+  return switched.previousAlias ? `${base}（上一个：${switched.previousAlias}）` : base;
+}
+async function appendSwitchBackContext(context, chatKey, internalAlias, baseText) {
+  const result = await context.sessions.takeBackgroundResult(chatKey, internalAlias);
+  if (result) {
+    return `${baseText}
+
+${result.text}`;
+  }
+  if (context.activeTurns?.isActive(chatKey, internalAlias)) {
+    return `${baseText}
+
+⏳ ${toDisplaySessionAlias(internalAlias)} 仍在执行中…`;
+  }
+  return baseText;
+}
+async function handleSessionUse(context, chatKey, input) {
+  const result = context.sessions.resolveFuzzyAlias(chatKey, input);
+  if (result.kind === "none") {
+    return { text: `没有匹配「${input}」的会话。发 /sessions 看看有哪些。` };
+  }
+  if (result.kind === "ambiguous") {
+    const lines = result.candidates.map((candidate) => `• ${candidate.alias} · ${candidate.agent} · ${candidate.workspace}`);
+    return { text: [`「${input}」匹配到多个会话，请指定：`, ...lines].join(`
+`) };
+  }
+  const switched = await context.sessions.useSession(chatKey, result.alias);
   await context.logger.info("session.selected", "selected logical session", {
-    alias,
+    alias: switched.alias,
+    chatKey
+  });
+  const internalAlias = context.sessions.peekCurrentSessionAlias(chatKey) ?? result.alias;
+  const text = await appendSwitchBackContext(context, chatKey, internalAlias, renderSwitched(switched));
+  return { text };
+}
+async function handleSessionUsePrevious(context, chatKey) {
+  const switched = await context.sessions.usePreviousSession(chatKey);
+  if (!switched) {
+    return { text: "还没有上一个会话，发 /sessions 看看有哪些。" };
+  }
+  await context.logger.info("session.selected", "selected previous logical session", {
+    alias: switched.alias,
     chatKey
   });
-  return { text: `已切换到会话「${alias}」` };
+  const internalAlias = context.sessions.peekCurrentSessionAlias(chatKey) ?? switched.alias;
+  const text = await appendSwitchBackContext(context, chatKey, internalAlias, renderSwitched(switched));
+  return { text };
 }
 async function handleModeShow(context, chatKey) {
   const session = await context.sessions.getCurrentSession(chatKey);
@@ -18490,7 +18924,34 @@ async function handleStatus(context, chatKey) {
 `)
   };
 }
-async function handleCancel(context, chatKey) {
+async function handleCancel(context, chatKey, alias) {
+  if (alias !== undefined) {
+    const result = context.sessions.resolveFuzzyAlias(chatKey, alias);
+    if (result.kind === "none") {
+      return { text: `没有匹配「${alias}」的会话。发 /sessions 看看有哪些。` };
+    }
+    if (result.kind === "ambiguous") {
+      const lines = result.candidates.map((candidate) => `• ${candidate.alias} · ${candidate.agent} · ${candidate.workspace}`);
+      return { text: [`「${alias}」匹配到多个会话，请指定：`, ...lines].join(`
+`) };
+    }
+    const internalAlias = await context.sessions.resolveAliasForChat(chatKey, result.alias);
+    const target = await context.sessions.getSession(internalAlias);
+    if (!target) {
+      return { text: `没有匹配「${alias}」的会话。发 /sessions 看看有哪些。` };
+    }
+    try {
+      const cancelResult = await context.interaction.cancelTransportSession(target);
+      return { text: cancelResult.message || "cancelled" };
+    } catch (error2) {
+      const recovered = await context.recovery.tryRecoverMissingSession(target, error2);
+      if (recovered) {
+        const cancelResult = await context.interaction.cancelTransportSession(recovered);
+        return { text: cancelResult.message || "cancelled" };
+      }
+      return context.recovery.renderTransportError(target, error2);
+    }
+  }
   const session = await context.sessions.getCurrentSession(chatKey);
   if (!session) {
     return { text: NO_CURRENT_SESSION_TEXT };
@@ -18655,7 +19116,7 @@ async function handlePromptWithSession(context, session, chatKey, text, reply, r
   }
 }
 async function handlePrompt(context, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata) {
-  const session = await context.sessions.getCurrentSession(chatKey);
+  const session = metadata?.boundSessionAlias ? context.sessions.getResolvedSessionByInternalAlias(metadata.boundSessionAlias) : await context.sessions.getCurrentSession(chatKey);
   if (!session) {
     return { text: NO_CURRENT_SESSION_TEXT };
   }
@@ -18756,6 +19217,8 @@ var init_session_handler = __esm(() => {
       { usage: "/session tail [N]", description: "补拉当前会话的历史输出（默认 50 行）" },
       { usage: "/session rm <alias>", description: "删除逻辑会话" },
       { usage: "/use <alias>", description: "切换当前会话" },
+      { usage: "/use <片段>", description: "按别名片段切换（精确>前缀>子串；多命中会列候选）" },
+      { usage: "/use -", description: "切回上一个会话（像 shell 的 cd -）" },
       { usage: "/session reset 或 /clear", description: "重置当前会话上下文" }
     ],
     examples: [
@@ -18763,6 +19226,8 @@ var init_session_handler = __esm(() => {
       "/ssn",
       "/ssn 1",
       "/use backend-fix",
+      "/use back",
+      "/use -",
       "/session rm old-session",
       "/session reset"
     ]
@@ -18828,12 +19293,14 @@ var init_session_handler = __esm(() => {
   cancelHelp = {
     topic: "cancel",
     aliases: ["stop"],
-    summary: "取消当前会话里正在执行的任务。",
+    summary: "取消会话里正在执行的任务。",
     commands: [
-      { usage: "/cancel", description: "取消当前任务" },
-      { usage: "/stop", description: "取消当前任务（/cancel 别名）" }
+      { usage: "/cancel", description: "取消当前前台会话的任务" },
+      { usage: "/cancel <alias>", description: "取消指定（含后台）会话的任务" },
+      { usage: "/stop", description: "取消当前任务（/cancel 别名）" },
+      { usage: "/stop <alias>", description: "取消指定会话的任务（/cancel <alias> 别名）" }
     ],
-    examples: ["/cancel"]
+    examples: ["/cancel", "/cancel backend"]
   };
 });
 
@@ -19788,6 +20255,27 @@ function handleHelp(topic) {
   }
   return { text: renderHelpTopic(entry) };
 }
+function handleInvalidCommand(recognizedCommand) {
+  const topicName = recognizedCommand.replace(/^\//, "");
+  const entry = getHelpTopic(topicName);
+  if (entry) {
+    return { text: `命令格式不正确，请参考下面的用法：
+
+${renderHelpTopic(entry)}` };
+  }
+  return {
+    text: [
+      "无法识别的命令格式。",
+      "",
+      "正确的会话创建格式：",
+      "/session new <别名> --agent <Agent名> --ws <工作区名>",
+      "",
+      "例如：",
+      "/session new demo --agent claude --ws weacpx"
+    ].join(`
+`)
+  };
+}
 function renderHelpIndex() {
   const topics = listHelpTopics();
   return [
@@ -20520,7 +21008,7 @@ import { spawn as spawn5 } from "node:child_process";
 import { createWriteStream } from "node:fs";
 import { mkdir as mkdir10 } from "node:fs/promises";
 import { homedir as homedir6 } from "node:os";
-import { join as join10 } from "node:path";
+import { join as join13 } from "node:path";
 async function autoInstallOptionalDep(pkg, parentPackages, options = {}) {
   const runCli = options.runCli ?? defaultRunCli;
   const openLog = options.openLog ?? defaultLogSink;
@@ -20635,10 +21123,10 @@ ${err.message}`, reason: "spawn" });
     });
   });
 }, defaultLogSink = async () => {
-  const dir = join10(homedir6(), ".weacpx", "logs");
+  const dir = join13(coreHomeDir(homedir6()), "logs");
   await mkdir10(dir, { recursive: true });
   const timestamp = new Date().toISOString().replace(/[:.]/g, "").replace(/-/g, "");
-  const path14 = join10(dir, `auto-install-${timestamp}.log`);
+  const path14 = join13(dir, `auto-install-${timestamp}.log`);
   const stream = createWriteStream(path14, { flags: "a" });
   return {
     path: path14,
@@ -20651,6 +21139,7 @@ ${err.message}`, reason: "spawn" });
   };
 };
 var init_auto_install_optional_dep = __esm(() => {
+  init_core_home();
   PRECISE_COMMANDS = {
     npm: { cmd: "npm", args: (pkg) => ["install", pkg, "--no-save", "--no-audit", "--no-fund"] },
     bun: { cmd: "bun", args: (pkg) => ["add", pkg] },
@@ -20664,7 +21153,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 dirname11, join as join11 } from "node:path";
+import { dirname as dirname12, join as join14 } 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))?$/, "");
 }
@@ -20677,7 +21166,7 @@ async function discoverParentPackagePaths(platformPackage, seedPath, deps = {})
   const queryRoot = deps.queryPackageManagerRoot ?? defaultQueryPackageManagerRoot;
   const parentName = deriveParentPackageName(platformPackage);
   const rawCandidates = [];
-  const bunGlobalRoot = env.BUN_INSTALL ? join11(env.BUN_INSTALL, "install", "global", "node_modules") : join11(home, ".bun", "install", "global", "node_modules");
+  const bunGlobalRoot = env.BUN_INSTALL ? join14(env.BUN_INSTALL, "install", "global", "node_modules") : join14(home, ".bun", "install", "global", "node_modules");
   const [npmRoot, pnpmRoot, yarnRoot] = await Promise.all([
     queryRoot("npm"),
     queryRoot("pnpm"),
@@ -20700,20 +21189,20 @@ async function discoverParentPackagePaths(platformPackage, seedPath, deps = {})
     if (resolved)
       rawCandidates.push({ path: resolved, manager: classify(resolved) });
   }
-  rawCandidates.push({ path: join11(bunGlobalRoot, parentName), manager: "bun" });
+  rawCandidates.push({ path: join14(bunGlobalRoot, parentName), manager: "bun" });
   if (npmRoot)
-    rawCandidates.push({ path: join11(npmRoot, parentName), manager: "npm" });
+    rawCandidates.push({ path: join14(npmRoot, parentName), manager: "npm" });
   if (pnpmRoot)
-    rawCandidates.push({ path: join11(pnpmRoot, parentName), manager: "pnpm" });
+    rawCandidates.push({ path: join14(pnpmRoot, parentName), manager: "pnpm" });
   if (yarnRoot)
-    rawCandidates.push({ path: join11(yarnRoot, parentName), manager: "yarn" });
+    rawCandidates.push({ path: join14(yarnRoot, parentName), manager: "yarn" });
   const seen = new Set;
   const verified = [];
   for (const candidate of rawCandidates) {
     if (seen.has(candidate.path))
       continue;
     seen.add(candidate.path);
-    if (await fsExists(join11(candidate.path, "package.json"))) {
+    if (await fsExists(join14(candidate.path, "package.json"))) {
       verified.push(candidate);
     }
   }
@@ -20737,7 +21226,7 @@ function defaultResolveFromCwd(name, cwd) {
     const pkgJson = require2.resolve(`${name}/package.json`, {
       paths: [cwd, ...require2.resolve.paths(name) ?? []]
     });
-    return dirname11(pkgJson);
+    return dirname12(pkgJson);
   } catch {
     return null;
   }
@@ -20784,7 +21273,7 @@ async function defaultQueryPackageManagerRoot(tool) {
       const trimmed = stdout2.trim().split(/\r?\n/).pop()?.trim() ?? "";
       if (!trimmed)
         return done(null);
-      done(spec.postfix ? join11(trimmed, spec.postfix) : trimmed);
+      done(spec.postfix ? join14(trimmed, spec.postfix) : trimmed);
     });
   });
 }
@@ -20888,7 +21377,8 @@ class CommandRouter {
   __setDiscoverPathsForTest(fn) {
     this.discoverPaths = fn;
   }
-  constructor(sessions, transport, config2, configStore, logger2, resolveSessionAgentCommand = resolveSessionAgentCommandFromIndex, orchestration, quota, scheduled, scheduledDelivery, resolveNativeSessionListFormat) {
+  activeTurns;
+  constructor(sessions, transport, config2, configStore, logger2, resolveSessionAgentCommand = resolveSessionAgentCommandFromIndex, orchestration, quota, scheduled, scheduledDelivery, resolveNativeSessionListFormat, activeTurns) {
     this.sessions = sessions;
     this.transport = transport;
     this.config = config2;
@@ -20900,6 +21390,7 @@ class CommandRouter {
     this.scheduledDelivery = scheduledDelivery;
     this.resolveNativeSessionListFormat = resolveNativeSessionListFormat;
     this.logger = logger2 ?? createNoopAppLogger();
+    this.activeTurns = activeTurns;
   }
   async handle(chatKey, input, reply, replyContextToken, accountId, media, metadata, abortSignal, onToolEvent, onThought, perfSpan) {
     const startedAt = Date.now();
@@ -20925,18 +21416,7 @@ class CommandRouter {
     return await this.executeCommand(chatKey, command.kind, startedAt, async () => {
       switch (command.kind) {
         case "invalid":
-          return {
-            text: [
-              "无法识别的命令格式。",
-              "",
-              "正确的会话创建格式：",
-              "/session new <别名> --agent <Agent名> --ws <工作区名>",
-              "",
-              "例如：",
-              "/session new demo --agent claude --ws weacpx"
-            ].join(`
-`)
-          };
+          return handleInvalidCommand(command.recognizedCommand);
         case "help":
           return handleHelp(command.topic);
         case "agents":
@@ -20981,6 +21461,8 @@ class CommandRouter {
           return await handleNativeSessionSelect(this.createSessionHandlerContext(undefined, perfSpan), chatKey, command.identifier, command.alias);
         case "session.use":
           return await handleSessionUse(this.createSessionHandlerContext(undefined, perfSpan), chatKey, command.alias);
+        case "session.use.previous":
+          return await handleSessionUsePrevious(this.createSessionHandlerContext(undefined, perfSpan), chatKey);
         case "mode.show":
           return await handleModeShow(this.createSessionHandlerContext(undefined, perfSpan), chatKey);
         case "mode.set":
@@ -20994,7 +21476,7 @@ class CommandRouter {
         case "status":
           return await handleStatus(this.createSessionHandlerContext(undefined, perfSpan), chatKey);
         case "cancel":
-          return await handleCancel(this.createSessionHandlerContext(undefined, perfSpan), chatKey);
+          return await handleCancel(this.createSessionHandlerContext(undefined, perfSpan), chatKey, command.alias);
         case "session.reset":
           return await handleSessionReset(this.createSessionHandlerContext(reply, perfSpan), chatKey);
         case "session.tail":
@@ -21089,7 +21571,8 @@ class CommandRouter {
       ...this.createHandlerContext(),
       lifecycle: this.createSessionLifecycleOps(reply, perfSpan),
       interaction: this.createSessionInteractionOps(perfSpan),
-      recovery: this.createSessionRenderRecoveryOps()
+      recovery: this.createSessionRenderRecoveryOps(),
+      ...this.activeTurns ? { activeTurns: this.activeTurns } : {}
     };
   }
   createSessionLifecycleOps(reply, perfSpan) {
@@ -21454,7 +21937,7 @@ var init_command_router = __esm(() => {
 });
 
 // src/config/resolve-acpx-command.ts
-import { readFileSync } from "node:fs";
+import { readFileSync as readFileSync2 } from "node:fs";
 import { createRequire as createRequire4 } from "node:module";
 import { posix, win32 } from "node:path";
 function resolveAcpxCommand(options = {}) {
@@ -21470,7 +21953,7 @@ function resolveAcpxCommandMetadata(options = {}) {
   }
   const platform = options.platform ?? process.platform;
   const resolvePackageJson = options.resolvePackageJson ?? ((id) => require3.resolve(id));
-  const readPackageJson = options.readPackageJson ?? ((path14) => JSON.parse(readFileSync(path14, "utf8")));
+  const readPackageJson = options.readPackageJson ?? ((path14) => JSON.parse(readFileSync2(path14, "utf8")));
   try {
     const packageJsonPath = resolvePackageJson("acpx/package.json");
     const pkg = readPackageJson(packageJsonPath);
@@ -21544,7 +22027,7 @@ var init_console_agent = __esm(() => {
 });
 
 // src/orchestration/orchestration-server.ts
-import { rm as rm7 } from "node:fs/promises";
+import { rm as rm8 } from "node:fs/promises";
 import { createConnection as createConnection2, createServer } from "node:net";
 
 class OrchestrationServer {
@@ -21877,7 +22360,7 @@ class OrchestrationServer {
       return;
     }
     const removeFile = this.deps.removeFile ?? (async (path14) => {
-      await rm7(path14, { force: true });
+      await rm8(path14, { force: true });
     });
     await removeFile(this.endpoint.path);
   }
@@ -24588,7 +25071,11 @@ class OrchestrationService {
   }
   workspaceLabelFromCwd(cwd) {
     const base = basename2(cwd).trim() || "cwd";
-    return base.replace(/[^a-zA-Z0-9._-]+/g, "_") || "cwd";
+    return sanitizeString(base, {
+      allow: /[a-zA-Z0-9._-]/,
+      replacement: "_",
+      fallback: "cwd"
+    });
   }
   cwdWorkerSessionPart(cwd) {
     const label = this.workspaceLabelFromCwd(cwd);
@@ -25822,6 +26309,20 @@ class SessionService {
     }
     return this.toResolvedSession(session);
   }
+  getResolvedSessionByInternalAlias(alias) {
+    const session = this.state.sessions[alias];
+    if (!session) {
+      return null;
+    }
+    try {
+      return this.toResolvedSession(session);
+    } catch {
+      return null;
+    }
+  }
+  peekCurrentSessionAlias(chatKey) {
+    return this.state.chat_contexts[chatKey]?.current_session;
+  }
   async getPreferredSessionForTransport(transportSession) {
     const matches = Object.values(this.state.sessions).filter((session) => session.transport_session === transportSession).sort((left, right) => right.last_used_at.localeCompare(left.last_used_at));
     const expectedAlias = transportSession.split(":").at(-1);
@@ -25846,18 +26347,123 @@ class SessionService {
     return null;
   }
   async useSession(chatKey, alias) {
-    await this.mutate(async () => {
+    return await this.mutate(async () => {
       const channelId = getChannelIdFromChatKey(chatKey);
       const internalAlias = resolveSessionAliasForInput(channelId, alias, Object.keys(this.state.sessions));
       const session = this.state.sessions[internalAlias];
       if (!session) {
         throw new Error(`session "${alias}" does not exist`);
       }
+      const prevCtx = this.state.chat_contexts[chatKey];
+      const previousCurrent = prevCtx?.current_session;
+      const carriedPrevious = previousCurrent && previousCurrent !== internalAlias ? previousCurrent : prevCtx?.previous_session;
       session.last_used_at = new Date().toISOString();
-      this.state.chat_contexts[chatKey] = { current_session: internalAlias };
+      this.state.chat_contexts[chatKey] = {
+        current_session: internalAlias,
+        ...carriedPrevious ? { previous_session: carriedPrevious } : {}
+      };
       await this.persist();
+      return {
+        alias: toDisplaySessionAlias(session.alias),
+        agent: session.agent,
+        workspace: session.workspace,
+        previousAlias: carriedPrevious ? toDisplaySessionAlias(carriedPrevious) : undefined
+      };
     });
   }
+  async usePreviousSession(chatKey) {
+    return await this.mutate(async () => {
+      const ctx = this.state.chat_contexts[chatKey];
+      const prevInternal = ctx?.previous_session;
+      if (!prevInternal) {
+        return null;
+      }
+      const prevSession = this.state.sessions[prevInternal];
+      if (!prevSession) {
+        if (ctx) {
+          delete ctx.previous_session;
+          await this.persist();
+        }
+        return null;
+      }
+      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 } : {}
+      };
+      await this.persist();
+      return {
+        alias: toDisplaySessionAlias(prevSession.alias),
+        agent: prevSession.agent,
+        workspace: prevSession.workspace,
+        previousAlias: currentInternal && currentInternal !== prevInternal ? toDisplaySessionAlias(currentInternal) : undefined
+      };
+    });
+  }
+  async setBackgroundResult(chatKey, alias, result) {
+    await this.mutate(async () => {
+      const ctx = this.state.chat_contexts[chatKey] ?? { current_session: "" };
+      const results = { ...ctx.background_results ?? {}, [alias]: result };
+      this.state.chat_contexts[chatKey] = { ...ctx, background_results: results };
+      await this.persist();
+    });
+  }
+  async takeBackgroundResult(chatKey, alias) {
+    return await this.mutate(async () => {
+      const ctx = this.state.chat_contexts[chatKey];
+      const found = ctx?.background_results?.[alias];
+      if (!ctx || !found)
+        return null;
+      const remaining = { ...ctx.background_results };
+      delete remaining[alias];
+      if (Object.keys(remaining).length > 0) {
+        this.state.chat_contexts[chatKey] = { ...ctx, background_results: remaining };
+      } else {
+        const { background_results: _omit, ...rest } = ctx;
+        this.state.chat_contexts[chatKey] = rest;
+      }
+      await this.persist();
+      return found;
+    });
+  }
+  listBackgroundResultAliases(chatKey) {
+    const results = this.state.chat_contexts[chatKey]?.background_results;
+    return results ? Object.keys(results) : [];
+  }
+  resolveFuzzyAlias(chatKey, fragment) {
+    const channelId = getChannelIdFromChatKey(chatKey);
+    const frag = fragment.trim();
+    const items = Object.values(this.state.sessions).filter((session) => isSessionAliasVisibleInChannel(session.alias, channelId)).map((session) => ({
+      display: toDisplaySessionAlias(session.alias),
+      agent: session.agent,
+      workspace: session.workspace
+    }));
+    const toCandidate = (item) => ({
+      alias: item.display,
+      agent: item.agent,
+      workspace: item.workspace
+    });
+    const exact = items.find((item) => item.display === frag);
+    if (exact) {
+      return { kind: "match", alias: exact.display };
+    }
+    const prefix = items.filter((item) => item.display.startsWith(frag));
+    if (prefix.length === 1) {
+      return { kind: "match", alias: prefix[0].display };
+    }
+    if (prefix.length > 1) {
+      return { kind: "ambiguous", candidates: prefix.map(toCandidate) };
+    }
+    const substring = items.filter((item) => item.display.includes(frag));
+    if (substring.length === 1) {
+      return { kind: "match", alias: substring[0].display };
+    }
+    if (substring.length > 1) {
+      return { kind: "ambiguous", candidates: substring.map(toCandidate) };
+    }
+    return { kind: "none" };
+  }
   async resolveAliasForChat(chatKey, displayAlias) {
     const channelId = getChannelIdFromChatKey(chatKey);
     const candidate = resolveSessionAliasForInput(channelId, displayAlias, Object.keys(this.state.sessions));
@@ -25958,6 +26564,10 @@ class SessionService {
       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;
         }
       }
       await this.persist();
@@ -25989,9 +26599,11 @@ class SessionService {
     }
     const createdAt = Date.parse(cached2.created_at);
     if (Number.isNaN(createdAt)) {
+      await this.deleteNativeSessionListIfCurrent(chatKey, cached2);
       return null;
     }
     if (this.now() - createdAt > ttlMs) {
+      await this.deleteNativeSessionListIfCurrent(chatKey, cached2);
       return null;
     }
     return {
@@ -26007,6 +26619,15 @@ class SessionService {
       ...cached2.next_cursor !== undefined ? { nextCursor: cached2.next_cursor } : {}
     };
   }
+  async deleteNativeSessionListIfCurrent(chatKey, cached2) {
+    await this.mutate(async () => {
+      if (this.state.native_session_lists[chatKey] !== cached2) {
+        return;
+      }
+      delete this.state.native_session_lists[chatKey];
+      await this.persist();
+    });
+  }
   toResolvedSession(session) {
     const agentConfig = this.config.agents[session.agent];
     if (!agentConfig) {
@@ -26106,6 +26727,29 @@ var init_session_service = __esm(() => {
   init_channel_scope();
 });
 
+// src/sessions/active-turn-registry.ts
+function createActiveTurnRegistry() {
+  const byChat = new Map;
+  return {
+    markActive(chatKey, alias) {
+      const set2 = byChat.get(chatKey) ?? new Set;
+      set2.add(alias);
+      byChat.set(chatKey, set2);
+    },
+    markInactive(chatKey, alias) {
+      const set2 = byChat.get(chatKey);
+      if (!set2)
+        return;
+      set2.delete(alias);
+      if (set2.size === 0)
+        byChat.delete(chatKey);
+    },
+    isActive(chatKey, alias) {
+      return byChat.get(chatKey)?.has(alias) ?? false;
+    }
+  };
+}
+
 // src/state/debounced-state-store.ts
 class DebouncedStateStore {
   deps;
@@ -26185,6 +26829,37 @@ class DebouncedStateStore {
   }
 }
 
+// src/commands/command-hints.ts
+function listWeacpxCommandHints() {
+  const hints = [{ name: "/help", description: "查看命令帮助。" }];
+  for (const topic of HELP_TOPICS) {
+    const name = PRIMARY_COMMAND_BY_TOPIC[topic.topic];
+    if (!name) {
+      throw new Error(`command-hints: 未登记 help topic 的主命令: ${topic.topic}`);
+    }
+    hints.push({ name, description: topic.summary });
+  }
+  return hints;
+}
+var PRIMARY_COMMAND_BY_TOPIC;
+var init_command_hints = __esm(() => {
+  init_help_registry();
+  PRIMARY_COMMAND_BY_TOPIC = {
+    session: "/session",
+    native: "/ssn",
+    workspace: "/workspace",
+    agent: "/agent",
+    permission: "/permission",
+    config: "/config",
+    orchestration: "/delegate",
+    mode: "/mode",
+    replymode: "/replymode",
+    status: "/status",
+    cancel: "/cancel",
+    later: "/later"
+  };
+});
+
 // src/run-console.ts
 var exports_run_console = {};
 __export(exports_run_console, {
@@ -26298,8 +26973,12 @@ async function runConsole(paths, deps) {
       agent: runtime.agent,
       abortSignal: shutdownController.signal,
       quota: runtime.quota,
+      sessions: runtime.sessions,
+      activeTurns: runtime.activeTurns,
       logger: runtime.logger,
-      perfTracer: runtime.perfTracer
+      perfTracer: runtime.perfTracer,
+      commandHints: listWeacpxCommandHints(),
+      coreVersion: WEACPX_CORE_VERSION
     });
     channelStartPromise.catch(() => {});
     let channelStartSettled = false;
@@ -26417,6 +27096,8 @@ async function runCleanupSequence(input) {
 }
 var init_run_console = __esm(() => {
   init_consumer_lock();
+  init_command_hints();
+  init_version();
 });
 
 // src/transport/acpx-bridge/acpx-bridge-protocol.ts
@@ -26447,7 +27128,7 @@ function encodeBridgeSessionNoteEvent(event) {
 
 // src/transport/acpx-bridge/acpx-bridge-client.ts
 import { spawn as spawn7 } from "node:child_process";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
+import { fileURLToPath as fileURLToPath4 } from "node:url";
 import { createInterface } from "node:readline";
 
 class AcpxBridgeClient {
@@ -26572,7 +27253,7 @@ function buildBridgeSpawnSpec(options) {
   };
 }
 async function spawnAcpxBridgeClient(options = {}) {
-  const bridgeEntryPath = options.bridgeEntryPath ?? fileURLToPath3(new URL("../../bridge/bridge-main.ts", import.meta.url));
+  const bridgeEntryPath = options.bridgeEntryPath ?? fileURLToPath4(new URL("../../bridge/bridge-main.ts", import.meta.url));
   const spawnSpec = buildBridgeSpawnSpec({
     execPath: process.execPath,
     bridgeEntryPath
@@ -27024,7 +27705,7 @@ var init_spawn_command = __esm(() => {
 });
 
 // src/transport/prompt-media.ts
-import { mkdtemp, open as open4, rm as rm8, writeFile as writeFile7 } from "node:fs/promises";
+import { mkdtemp, open as open4, rm as rm9, writeFile as writeFile7 } from "node:fs/promises";
 import { tmpdir as defaultTmpdir } from "node:os";
 import path14 from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
@@ -27149,7 +27830,7 @@ var init_prompt_media = __esm(() => {
     readImageFile: readImageFileBounded,
     mkdtemp,
     writeFile: writeFile7,
-    rm: rm8,
+    rm: rm9,
     tmpdir: defaultTmpdir
   };
 });
@@ -27448,12 +28129,12 @@ var init_streaming_prompt = __esm(() => {
 
 // src/transport/acpx-cli/node-pty-helper.ts
 import { chmod as chmodFs } from "node:fs/promises";
-import { dirname as dirname12, join as join12 } from "node:path";
+import { dirname as dirname13, join as join15 } from "node:path";
 function resolveNodePtyHelperPath(packageJsonPath, platform, arch) {
   if (platform === "win32") {
     return null;
   }
-  return join12(dirname12(packageJsonPath), "prebuilds", `${platform}-${arch}`, "spawn-helper");
+  return join15(dirname13(packageJsonPath), "prebuilds", `${platform}-${arch}`, "spawn-helper");
 }
 async function ensureNodePtyHelperExecutable(helperPath, chmod3 = chmodFs) {
   if (!helperPath) {
@@ -27473,9 +28154,9 @@ 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 readFile11, unlink } from "node:fs/promises";
+import { readFile as readFile12, unlink } from "node:fs/promises";
 import { homedir as homedir8 } from "node:os";
-import { join as join13 } from "node:path";
+import { join as join16 } from "node:path";
 function buildWeacpxMcpServerSpec(input) {
   const { command, args } = splitCommandLine(input.weacpxCommand);
   return {
@@ -27526,7 +28207,13 @@ class AcpxQueueOwnerLauncher {
     const key = input.acpxRecordId;
     const previous = this.launchLocks.get(key) ?? Promise.resolve();
     const next = previous.then(() => this.doLaunch(input), () => this.doLaunch(input));
-    this.launchLocks.set(key, next.catch(() => {}));
+    const tracked = next.catch(() => {});
+    this.launchLocks.set(key, tracked);
+    tracked.finally(() => {
+      if (this.launchLocks.get(key) === tracked) {
+        this.launchLocks.delete(key);
+      }
+    });
     return next;
   }
   async doLaunch(input) {
@@ -27629,7 +28316,7 @@ async function terminateAcpxQueueOwner(sessionId) {
   const lockPath = queueLockFilePath(sessionId);
   let owner;
   try {
-    owner = JSON.parse(await readFile11(lockPath, "utf8"));
+    owner = JSON.parse(await readFile12(lockPath, "utf8"));
   } catch {
     return;
   }
@@ -27639,7 +28326,7 @@ async function terminateAcpxQueueOwner(sessionId) {
   await unlink(lockPath).catch(() => {});
 }
 function queueLockFilePath(sessionId) {
-  return join13(homedir8(), ".acpx", "queues", `${shortHash(sessionId, 24)}.lock`);
+  return join16(homedir8(), ".acpx", "queues", `${shortHash(sessionId, 24)}.lock`);
 }
 function shortHash(value, length) {
   return createHash3("sha256").update(value).digest("hex").slice(0, length);
@@ -27657,7 +28344,7 @@ function resolveDefaultWeacpxCommand(env) {
   return "weacpx";
 }
 function quoteCommandPart(value) {
-  return `"${value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
+  return quoteIfNeeded(value);
 }
 var init_acpx_queue_owner_launcher = __esm(() => {
   init_spawn_command();
@@ -27677,7 +28364,6 @@ function permissionModeToFlag(permissionMode) {
 }
 
 // src/transport/agent-session-list.ts
-import path15 from "node:path";
 function isUnknownFilterCwdOption(output) {
   return /(?:unknown|unrecognized) option/i.test(output) && output.includes("--filter-cwd");
 }
@@ -27724,27 +28410,12 @@ function isAgentSessionListResult(value) {
 function filterAgentSessionListByCwd(result, cwd) {
   return {
     ...result,
-    sessions: result.sessions.filter((session) => session.cwd && sameAgentSessionCwd(session.cwd, cwd))
+    sessions: result.sessions.filter((session) => session.cwd && isSamePath(session.cwd, cwd))
   };
 }
-function sameAgentSessionCwd(left, right) {
-  const normalizedLeft = normalizeAgentSessionCwd(left);
-  const normalizedRight = normalizeAgentSessionCwd(right);
-  if (isWindowsLikePath2(normalizedLeft) || isWindowsLikePath2(normalizedRight)) {
-    return normalizedLeft.toLowerCase() === normalizedRight.toLowerCase();
-  }
-  return normalizedLeft === normalizedRight;
-}
-function normalizeAgentSessionCwd(input) {
-  if (isWindowsLikePath2(input)) {
-    return path15.win32.normalize(input).replace(/\\/g, "/");
-  }
-  return path15.posix.normalize(input.replace(/\\/g, "/"));
-}
-function isWindowsLikePath2(input) {
-  return /^[a-zA-Z]:[\\/]/.test(input) || input.startsWith("\\\\");
-}
-var init_agent_session_list = () => {};
+var init_agent_session_list = __esm(() => {
+  init_path();
+});
 
 // src/transport/acpx-cli/acpx-cli-transport.ts
 import { createRequire as createRequire5 } from "node:module";
@@ -28263,6 +28934,30 @@ var init_acpx_cli_transport = __esm(() => {
   require4 = createRequire5(import.meta.url);
 });
 
+// src/util/async.ts
+function settleWithinTimeout(work, timeoutMs) {
+  return new Promise((resolve3) => {
+    let settled = false;
+    const finish = () => {
+      if (!settled) {
+        settled = true;
+        resolve3();
+      }
+    };
+    const timer = setTimeout(finish, timeoutMs);
+    if (typeof timer.unref === "function") {
+      timer.unref();
+    }
+    work.then(() => {
+      clearTimeout(timer);
+      finish();
+    }, () => {
+      clearTimeout(timer);
+      finish();
+    });
+  });
+}
+
 // src/transport/queue-owner-reaper.ts
 import { spawn as spawn10 } from "node:child_process";
 async function reapQueueOwners(acpxCommand, targets, deps = {}) {
@@ -28293,28 +28988,6 @@ async function reapQueueOwners(acpxCommand, targets, deps = {}) {
   await settleWithinTimeout(Promise.all(unique.map(reapOne)), timeoutMs);
   return { terminated, attempted: unique.length };
 }
-function settleWithinTimeout(work, timeoutMs) {
-  return new Promise((resolve3) => {
-    let settled = false;
-    const finish = () => {
-      if (!settled) {
-        settled = true;
-        resolve3();
-      }
-    };
-    const timer = setTimeout(finish, timeoutMs);
-    if (typeof timer.unref === "function") {
-      timer.unref();
-    }
-    work.then(() => {
-      clearTimeout(timer);
-      finish();
-    }, () => {
-      clearTimeout(timer);
-      finish();
-    });
-  });
-}
 async function defaultResolveRecordId(acpxCommand, target) {
   const args = [
     "--format",
@@ -28498,23 +29171,33 @@ var init_channel_registry = __esm(() => {
 });
 
 // src/weixin/messaging/quota-manager.ts
-function freshState() {
-  return { midUsed: 0, finalUsed: 0, pendingFinalChunks: [] };
+function freshState(now) {
+  return { midUsed: 0, finalUsed: 0, pendingFinalChunks: [], lastTouchedAt: now };
 }
 
 class QuotaManager {
   states = new Map;
   observer;
   normalizeKey;
-  constructor(observer, normalizeKey) {
+  maxStates;
+  stateTtlMs;
+  maxPendingFinalChunksPerChat;
+  now;
+  constructor(observer, normalizeKey, options = {}) {
     this.observer = observer;
     this.normalizeKey = normalizeKey ?? ((key) => key);
+    this.maxStates = normalizePositiveInt3(options.maxStates, DEFAULT_MAX_STATES);
+    this.stateTtlMs = normalizeNonNegativeMs3(options.stateTtlMs, DEFAULT_STATE_TTL_MS);
+    this.maxPendingFinalChunksPerChat = normalizePositiveInt3(options.maxPendingFinalChunksPerChat, DEFAULT_MAX_PENDING_FINAL_CHUNKS_PER_CHAT);
+    this.now = options.now ?? (() => Date.now());
   }
   onInbound(chatKey) {
     const key = this.normalizeKey(chatKey);
+    this.prune();
     const existing = this.states.get(key);
     const pending = existing?.pendingFinalChunks ?? [];
-    this.states.set(key, { midUsed: 0, finalUsed: 0, pendingFinalChunks: pending });
+    this.states.set(key, { midUsed: 0, finalUsed: 0, pendingFinalChunks: pending, lastTouchedAt: this.now() });
+    this.enforceMaxStates();
     this.observer?.onInbound?.(key);
   }
   reserveMidSegment(chatKey) {
@@ -28547,36 +29230,48 @@ class QuotaManager {
       return;
     const state = this.getOrCreate(this.normalizeKey(chatKey));
     state.pendingFinalChunks.push(...chunks);
+    this.trimPendingFinalChunks(state, "front");
   }
   prependPendingFinal(chatKey, chunks) {
     if (chunks.length === 0)
       return;
     const state = this.getOrCreate(this.normalizeKey(chatKey));
     state.pendingFinalChunks.unshift(...chunks);
+    this.trimPendingFinalChunks(state, "back");
   }
   drainPendingFinalUpToBudget(chatKey, available) {
     if (available <= 0)
       return [];
-    const state = this.getOrCreate(this.normalizeKey(chatKey));
+    const key = this.normalizeKey(chatKey);
+    const state = this.getOrCreate(key);
     if (state.pendingFinalChunks.length === 0)
       return [];
-    return state.pendingFinalChunks.splice(0, available);
+    const drained = state.pendingFinalChunks.splice(0, available);
+    state.lastTouchedAt = this.now();
+    this.deleteIfEmpty(key, state);
+    return drained;
   }
   hasPendingFinal(chatKey) {
+    this.prune();
     return (this.states.get(this.normalizeKey(chatKey))?.pendingFinalChunks.length ?? 0) > 0;
   }
   countPendingFinal(chatKey) {
+    this.prune();
     return this.states.get(this.normalizeKey(chatKey))?.pendingFinalChunks.length ?? 0;
   }
   clearPendingFinal(chatKey) {
-    const state = this.states.get(this.normalizeKey(chatKey));
+    const key = this.normalizeKey(chatKey);
+    const state = this.states.get(key);
     if (!state)
       return;
     state.pendingFinalChunks = [];
+    state.lastTouchedAt = this.now();
+    this.deleteIfEmpty(key, state);
   }
   snapshot(chatKey) {
     const key = this.normalizeKey(chatKey);
-    const state = this.states.get(key) ?? freshState();
+    this.prune();
+    const state = this.states.get(key) ?? freshState(this.now());
     const midRemaining = MID_BUDGET - state.midUsed;
     const finalRemaining = FINAL_BUDGET - state.finalUsed;
     return {
@@ -28588,15 +29283,72 @@ class QuotaManager {
     };
   }
   getOrCreate(key) {
+    this.prune();
     let state = this.states.get(key);
     if (!state) {
-      state = freshState();
+      state = freshState(this.now());
       this.states.set(key, state);
+      this.enforceMaxStates();
+    } else {
+      state.lastTouchedAt = this.now();
     }
     return state;
   }
+  prune() {
+    const cutoff = this.now() - this.stateTtlMs;
+    for (const [key, state] of this.states) {
+      if (state.lastTouchedAt < cutoff) {
+        this.states.delete(key);
+      }
+    }
+    this.enforceMaxStates();
+  }
+  enforceMaxStates() {
+    while (this.states.size > this.maxStates) {
+      let oldestKey;
+      let oldestTouchedAt = Number.POSITIVE_INFINITY;
+      for (const [key, state] of this.states) {
+        if (state.lastTouchedAt < oldestTouchedAt) {
+          oldestTouchedAt = state.lastTouchedAt;
+          oldestKey = key;
+        }
+      }
+      if (oldestKey === undefined)
+        return;
+      this.states.delete(oldestKey);
+    }
+  }
+  trimPendingFinalChunks(state, side) {
+    state.lastTouchedAt = this.now();
+    const excess = state.pendingFinalChunks.length - this.maxPendingFinalChunksPerChat;
+    if (excess <= 0)
+      return;
+    if (side === "front") {
+      state.pendingFinalChunks.splice(0, excess);
+    } else {
+      state.pendingFinalChunks.splice(state.pendingFinalChunks.length - excess, excess);
+    }
+  }
+  deleteIfEmpty(key, state) {
+    if (state.midUsed === 0 && state.finalUsed === 0 && state.pendingFinalChunks.length === 0) {
+      this.states.delete(key);
+    }
+  }
+}
+function normalizePositiveInt3(value, fallback) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 1)
+    return fallback;
+  return Math.floor(value);
 }
-var MID_BUDGET = 6, FINAL_BUDGET = 4;
+function normalizeNonNegativeMs3(value, fallback) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0)
+    return fallback;
+  return value;
+}
+var MID_BUDGET = 6, FINAL_BUDGET = 4, DEFAULT_MAX_STATES = 5000, DEFAULT_STATE_TTL_MS, DEFAULT_MAX_PENDING_FINAL_CHUNKS_PER_CHAT = 40;
+var init_quota_manager = __esm(() => {
+  DEFAULT_STATE_TTL_MS = 7 * 24 * 60 * 60 * 1000;
+});
 
 // src/main.ts
 var exports_main = {};
@@ -28609,8 +29361,8 @@ __export(exports_main, {
 });
 import { randomUUID as randomUUID3 } from "node:crypto";
 import { homedir as homedir9 } from "node:os";
-import { dirname as dirname13, join as join14 } from "node:path";
-import { fileURLToPath as fileURLToPath4 } from "node:url";
+import { dirname as dirname14, join as join17 } from "node:path";
+import { fileURLToPath as fileURLToPath5 } from "node:url";
 function startProgressHeartbeat(orchestration, config2, logger2, channel) {
   const thresholdSeconds = config2.orchestration.progressHeartbeatSeconds;
   if (thresholdSeconds <= 0) {
@@ -28690,6 +29442,7 @@ async function buildApp(paths, deps = {}) {
     }
   });
   const sessions = new SessionService(config2, debouncedStateStore, state, { stateMutex });
+  const activeTurns = createActiveTurnRegistry();
   const scheduledService = new ScheduledTaskService(state, debouncedStateStore, { stateMutex });
   const pendingWorkerDispatches = new Set;
   const transport = config2.transport.type === "acpx-bridge" ? await (deps.createBridgeTransport?.() ?? Promise.resolve(new AcpxBridgeTransport(await spawnAcpxBridgeClient({
@@ -29060,7 +29813,7 @@ async function buildApp(paths, deps = {}) {
     listScheduledTasksFromRoute: async (input) => await listScheduledTasksFromRoute(input, { state, scheduled: scheduledService }),
     cancelScheduledTaskFromRoute: async (input) => await cancelScheduledTaskFromRoute(input, { state, scheduled: scheduledService })
   });
-  const router = new CommandRouter(sessions, transport, config2, configStore, logger2, undefined, orchestration, quota, scheduledService, deps.channel?.supportsScheduledMessages ? { supportsScheduledMessages: deps.channel.supportsScheduledMessages.bind(deps.channel) } : undefined, deps.channel?.nativeSessionListFormat ? deps.channel.nativeSessionListFormat.bind(deps.channel) : undefined);
+  const router = new CommandRouter(sessions, transport, config2, configStore, logger2, undefined, orchestration, quota, scheduledService, deps.channel?.supportsScheduledMessages ? { supportsScheduledMessages: deps.channel.supportsScheduledMessages.bind(deps.channel) } : undefined, deps.channel?.nativeSessionListFormat ? deps.channel.nativeSessionListFormat.bind(deps.channel) : undefined, activeTurns);
   const agent = new ConsoleAgent(router, logger2);
   const scheduledScheduler = new ScheduledTaskScheduler(scheduledService, {
     dispatchTask: buildScheduledDispatchTask({
@@ -29081,6 +29834,7 @@ async function buildApp(paths, deps = {}) {
     agent,
     router,
     sessions,
+    activeTurns,
     stateStore,
     configStore,
     logger: logger2,
@@ -29186,8 +29940,8 @@ async function main() {
   }
 }
 async function prepareChannelMedia(configPath, config2) {
-  const runtimeDir = join14(dirname13(configPath), "runtime");
-  const mediaRootDir = join14(runtimeDir, "media");
+  const runtimeDir = join17(dirname14(configPath), "runtime");
+  const mediaRootDir = join17(runtimeDir, "media");
   const mediaStore = new RuntimeMediaStore({ rootDir: mediaRootDir });
   await mediaStore.cleanupExpired().catch((error2) => {
     console.error("[weacpx] media cleanup failed:", error2 instanceof Error ? error2.message : String(error2));
@@ -29200,30 +29954,30 @@ function resolveRuntimePaths() {
   if (!home) {
     throw new Error("Unable to resolve the current user home directory");
   }
-  const configPath = process.env.WEACPX_CONFIG ?? `${home}/.weacpx/config.json`;
-  const runtimeDir = join14(dirname13(configPath), "runtime");
+  const configPath = process.env.WEACPX_CONFIG ?? join17(coreHomeDir(home), "config.json");
+  const runtimeDir = join17(dirname14(configPath), "runtime");
   return {
     configPath,
-    statePath: process.env.WEACPX_STATE ?? `${home}/.weacpx/state.json`,
-    perfLogPath: join14(runtimeDir, "perf.log"),
+    statePath: process.env.WEACPX_STATE ?? join17(coreHomeDir(home), "state.json"),
+    perfLogPath: join17(runtimeDir, "perf.log"),
     orchestrationSocketPath: process.env.WEACPX_ORCHESTRATION_SOCKET ?? resolveDaemonOrchestrationSocketPath(runtimeDir)
   };
 }
 function resolveBridgeEntryPath() {
   if (import.meta.url.includes("/dist/")) {
-    return fileURLToPath4(new URL("./bridge/bridge-main.js", import.meta.url));
+    return fileURLToPath5(new URL("./bridge/bridge-main.js", import.meta.url));
   }
-  return fileURLToPath4(new URL("./bridge/bridge-main.ts", import.meta.url));
+  return fileURLToPath5(new URL("./bridge/bridge-main.ts", import.meta.url));
 }
 function resolveAppLogPath(configPath) {
-  const rootDir = dirname13(configPath);
-  const runtimeDir = join14(rootDir, "runtime");
-  return join14(runtimeDir, "app.log");
+  const rootDir = dirname14(configPath);
+  const runtimeDir = join17(rootDir, "runtime");
+  return join17(runtimeDir, "app.log");
 }
 function resolvePerfLogPath(configPath) {
-  const rootDir = dirname13(configPath);
-  const runtimeDir = join14(rootDir, "runtime");
-  return join14(runtimeDir, "perf.log");
+  const rootDir = dirname14(configPath);
+  const runtimeDir = join17(rootDir, "runtime");
+  return join17(runtimeDir, "perf.log");
 }
 function resolveOrchestrationSocketPathFromConfigPath(configPath) {
   const runtimeDir = resolveRuntimeDirFromConfigPath(configPath);
@@ -29233,6 +29987,7 @@ function shouldNotifyTaskCompletion(task) {
   return Boolean(task.chatKey && task.replyContextToken && (task.status === "completed" || task.status === "failed"));
 }
 var init_main = __esm(async () => {
+  init_core_home();
   init_command_router();
   init_config_store();
   init_ensure_config();
@@ -29262,6 +30017,7 @@ var init_main = __esm(async () => {
   init_media_store();
   init_quota_errors();
   init_inbound();
+  init_quota_manager();
   init_perf_tracer();
   init_bootstrap();
   if (false) {}
@@ -29453,7 +30209,7 @@ var init_config_check = __esm(async () => {
 });
 
 // src/doctor/checks/daemon-check.ts
-import { fileURLToPath as fileURLToPath5 } from "node:url";
+import { fileURLToPath as fileURLToPath6 } from "node:url";
 import { homedir as homedir10 } from "node:os";
 async function checkDaemon(options = {}) {
   const home = options.home ?? process.env.HOME ?? homedir10();
@@ -29547,7 +30303,7 @@ function defaultIsProcessRunning5(pid) {
   }
 }
 function resolveCliEntryPath() {
-  return process.argv[1] ?? fileURLToPath5(import.meta.url);
+  return process.argv[1] ?? fileURLToPath6(import.meta.url);
 }
 function formatError5(error2) {
   return error2 instanceof Error ? error2.message : String(error2);
@@ -29609,7 +30365,7 @@ async function checkOrchestrationHealth(options) {
 // 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 dirname14 } from "node:path";
+import { dirname as dirname15 } from "node:path";
 import { homedir as homedir11 } from "node:os";
 async function checkRuntime(options = {}) {
   const home = options.home ?? process.env.HOME ?? homedir11();
@@ -29651,107 +30407,107 @@ async function checkRuntime(options = {}) {
 }
 function createRuntimeFsProbe() {
   return {
-    stat: async (path16) => await stat3(path16),
-    access: async (path16, mode) => await access4(path16, mode)
+    stat: async (path15) => await stat3(path15),
+    access: async (path15, mode) => await access4(path15, mode)
   };
 }
-async function checkDirectoryCreatable(label, path16, probe, platform) {
+async function checkDirectoryCreatable(label, path15, probe, platform) {
   try {
-    const stats = await probe.stat(path16);
+    const stats = await probe.stat(path15);
     if (!stats.isDirectory()) {
       return {
         ok: false,
-        detail: `${label}: ${path16} (exists but is not a directory)`
+        detail: `${label}: ${path15} (exists but is not a directory)`
       };
     }
-    await probe.access(path16, directoryAccessMode(platform));
+    await probe.access(path15, directoryAccessMode(platform));
     return {
       ok: true,
-      detail: `${label}: ${path16} (writable)`
+      detail: `${label}: ${path15} (writable)`
     };
   } catch (error2) {
     if (!isMissingPathError(error2)) {
       return {
         ok: false,
-        detail: `${label}: ${path16} (unusable: ${formatError6(error2)})`
+        detail: `${label}: ${path15} (unusable: ${formatError6(error2)})`
       };
     }
-    const parentCheck = await checkCreatableAncestorDirectory(path16, probe, platform);
+    const parentCheck = await checkCreatableAncestorDirectory(path15, probe, platform);
     if (!parentCheck.ok) {
       return {
         ok: false,
-        detail: `${label}: ${path16} (parent not writable: ${parentCheck.blockingPath})`
+        detail: `${label}: ${path15} (parent not writable: ${parentCheck.blockingPath})`
       };
     }
     return {
       ok: true,
-      detail: `${label}: ${path16} (creatable via ${parentCheck.creatableFrom})`
+      detail: `${label}: ${path15} (creatable via ${parentCheck.creatableFrom})`
     };
   }
 }
-async function checkFileCreatable(label, path16, probe, platform) {
+async function checkFileCreatable(label, path15, probe, platform) {
   try {
-    const stats = await probe.stat(path16);
+    const stats = await probe.stat(path15);
     if (stats.isDirectory()) {
       return {
         ok: false,
-        detail: `${label}: ${path16} (exists but is a directory)`
+        detail: `${label}: ${path15} (exists but is a directory)`
       };
     }
-    await probe.access(path16, constants.W_OK);
+    await probe.access(path15, constants.W_OK);
     return {
       ok: true,
-      detail: `${label}: ${path16} (writable)`
+      detail: `${label}: ${path15} (writable)`
     };
   } catch (error2) {
     if (!isMissingPathError(error2)) {
       return {
         ok: false,
-        detail: `${label}: ${path16} (unusable: ${formatError6(error2)})`
+        detail: `${label}: ${path15} (unusable: ${formatError6(error2)})`
       };
     }
-    const parentCheck = await checkCreatableAncestorDirectory(dirname14(path16), probe, platform);
+    const parentCheck = await checkCreatableAncestorDirectory(dirname15(path15), probe, platform);
     if (!parentCheck.ok) {
       return {
         ok: false,
-        detail: `${label}: ${path16} (parent not writable: ${parentCheck.blockingPath})`
+        detail: `${label}: ${path15} (parent not writable: ${parentCheck.blockingPath})`
       };
     }
     return {
       ok: true,
-      detail: `${label}: ${path16} (creatable via ${parentCheck.creatableFrom})`
+      detail: `${label}: ${path15} (creatable via ${parentCheck.creatableFrom})`
     };
   }
 }
-async function checkCreatableAncestorDirectory(path16, probe, platform) {
+async function checkCreatableAncestorDirectory(path15, probe, platform) {
   try {
-    const stats = await probe.stat(path16);
+    const stats = await probe.stat(path15);
     if (!stats.isDirectory()) {
       return {
         ok: false,
-        creatableFrom: path16,
-        blockingPath: path16
+        creatableFrom: path15,
+        blockingPath: path15
       };
     }
-    await probe.access(path16, directoryAccessMode(platform));
+    await probe.access(path15, directoryAccessMode(platform));
     return {
       ok: true,
-      creatableFrom: path16
+      creatableFrom: path15
     };
   } catch (error2) {
     if (!isMissingPathError(error2)) {
       return {
         ok: false,
-        creatableFrom: path16,
-        blockingPath: path16
+        creatableFrom: path15,
+        blockingPath: path15
       };
     }
-    const parent = dirname14(path16);
-    if (parent === path16) {
+    const parent = dirname15(path15);
+    if (parent === path15) {
       return {
         ok: false,
-        creatableFrom: path16,
-        blockingPath: path16
+        creatableFrom: path15,
+        blockingPath: path15
       };
     }
     const parentCheck = await checkCreatableAncestorDirectory(parent, probe, platform);
@@ -30169,7 +30925,7 @@ var init_render_doctor = __esm(() => {
 
 // src/doctor/doctor.ts
 import { homedir as homedir12 } from "node:os";
-import { join as join15 } from "node:path";
+import { join as join18 } from "node:path";
 async function runDoctor(options = {}, deps = {}) {
   const home = deps.home ?? process.env.HOME ?? homedir12();
   const runtimePaths = resolveDoctorRuntimePaths(home, deps.resolveRuntimePaths);
@@ -30224,8 +30980,8 @@ function resolveDoctorRuntimePaths(home, resolver) {
     return resolveRuntimePaths();
   }
   return {
-    configPath: join15(home, ".weacpx", "config.json"),
-    statePath: join15(home, ".weacpx", "state.json")
+    configPath: join18(coreHomeDir(home), "config.json"),
+    statePath: join18(coreHomeDir(home), "state.json")
   };
 }
 function depsUseExplicitRuntimeOverrides() {
@@ -30290,6 +31046,7 @@ function formatError9(error2) {
   return error2 instanceof Error ? error2.message : String(error2);
 }
 var init_doctor = __esm(async () => {
+  init_core_home();
   init_load_config();
   init_state_store();
   init_daemon_check();
@@ -30323,6 +31080,7 @@ var init_doctor2 = __esm(async () => {
 });
 
 // src/cli.ts
+init_core_home();
 init_config_store();
 init_load_config();
 init_ensure_config();
@@ -30331,8 +31089,8 @@ init_create_daemon_controller();
 init_daemon_files();
 import { randomUUID as randomUUID4 } from "node:crypto";
 import { homedir as homedir13 } from "node:os";
-import { dirname as dirname15, join as join16, sep } from "node:path";
-import { fileURLToPath as fileURLToPath6 } from "node:url";
+import { dirname as dirname16, join as join19, sep } from "node:path";
+import { fileURLToPath as fileURLToPath7 } from "node:url";
 
 // src/daemon/daemon-runtime.ts
 init_daemon_status();
@@ -42745,15 +43503,17 @@ class StdioServerTransport {
 init_version();
 
 // src/mcp/resolve-endpoint.ts
+init_core_home();
 init_daemon_files();
 init_orchestration_ipc();
 import { homedir as homedir2 } from "node:os";
+import { join as join4 } from "node:path";
 function resolveDefaultOrchestrationEndpoint(env = process.env, platform = process.platform) {
   if (typeof env.WEACPX_ORCHESTRATION_SOCKET === "string" && env.WEACPX_ORCHESTRATION_SOCKET.trim().length > 0) {
     return createOrchestrationEndpoint(env.WEACPX_ORCHESTRATION_SOCKET.trim(), platform);
   }
   const home = requireHome(env);
-  const configPath = typeof env.WEACPX_CONFIG === "string" && env.WEACPX_CONFIG.trim().length > 0 ? env.WEACPX_CONFIG.trim() : `${home}/.weacpx/config.json`;
+  const configPath = typeof env.WEACPX_CONFIG === "string" && env.WEACPX_CONFIG.trim().length > 0 ? env.WEACPX_CONFIG.trim() : join4(coreHomeDir(home), "config.json");
   const runtimeDir = resolveRuntimeDirFromConfigPath(configPath);
   return resolveOrchestrationEndpoint(runtimeDir, platform);
 }
@@ -42853,16 +43613,15 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_get",
-      description: "Fetch a single task under the current coordinator, including the worker's final result and any pending question. Use to inspect a task snapshot non-blockingly, read the actual output after completion, or inspect a task that requires attention.",
+      description: "Fetch a single task under the current coordinator: its summary, latest progress, and — once terminal — the worker's final result. Prefer task_watch to follow a task; its terminal result already carries the output, so a follow-up task_get is unnecessary. Reach for task_get to recover a task you lost track of, to inspect one that requires attention, or to re-read the original delegated prompt. The full prompt is included only for needs_confirmation tasks unless you pass includePrompt:true.",
       inputSchema: exports_external.object({
-        taskId: exports_external.string().min(1)
+        taskId: exports_external.string().min(1),
+        includePrompt: exports_external.boolean().optional()
       }).strict(),
       handler: async (args) => await asToolResult(async () => {
-        const task = await transport.getTask({
-          coordinatorSession,
-          taskId: args.taskId
-        });
-        return createSuccessResult(task ? renderTaskSummary(task) : "Task not found.", { task });
+        const { taskId, includePrompt } = args;
+        const task = await transport.getTask({ coordinatorSession, taskId });
+        return createSuccessResult(task ? renderTaskSummary(task, { includePrompt: includePrompt ?? false }) : "Task not found.", { task });
       })
     },
     {
@@ -43101,12 +43860,23 @@ function renderTaskWatchResult(result) {
   const events = result.events.length > 0 ? [
     "- Events:",
     ...result.events.map((event) => {
-      const detail = event.summary ?? event.message ?? event.status ?? "";
-      return `  - #${event.seq} ${event.type} at ${event.at}${detail ? `: ${detail}` : ""}`;
+      const detail2 = event.summary ?? event.message ?? event.status ?? "";
+      return `  - #${event.seq} ${event.type} at ${event.at}${detail2 ? `: ${detail2}` : ""}`;
     })
   ] : ["- Events: none"];
-  const next = result.status === "terminal" ? "Next: call task_get to read the final result." : result.status === "attention_required" ? "Next: call task_get to inspect openQuestion / reviewPending, then resolve it with the recommended action tool." : `Next: call task_watch again with afterSeq=${result.nextAfterSeq} to keep watching, preferably as an MCP task if your client supports background task execution.`;
-  return [...header, ...events, next].join(`
+  const detail = [];
+  if (result.status === "terminal") {
+    const resultText = result.task.resultText?.trim() ?? "";
+    const summary = result.task.summary?.trim() ?? "";
+    if (resultText.length > 0)
+      detail.push(`- Result: ${resultText}`);
+    else if (summary.length > 0)
+      detail.push(`- Summary: ${summary}`);
+  } else if (result.status === "attention_required" && result.task.openQuestion) {
+    detail.push(`- Open question: ${result.task.openQuestion.question}`);
+  }
+  const next = result.status === "terminal" ? "Next: summarize this result for the user." : result.status === "attention_required" ? "Next: resolve the pending question / contested review with the recommended action tool (coordinator_answer_question or coordinator_review_contested_result); call task_get only if you need more detail." : `Next: call task_watch again with afterSeq=${result.nextAfterSeq} to keep watching, preferably as an MCP task if your client supports background task execution.`;
+  return [...header, ...events, ...detail, next].join(`
 `);
 }
 function createSuccessResult(text, structuredContent) {
@@ -43122,7 +43892,7 @@ function createErrorResult(message) {
   };
 }
 function renderDelegateSuccess(result) {
-  const next = result.status === "needs_confirmation" ? `Next: this delegation requires user approval. Tell the user, then call task_approve or task_cancel based on their response.` : result.status === "queued" ? `Next: task "${result.taskId}" is queued (agent at parallel capacity). It will start automatically when a slot frees. Call task_watch to long-poll for the transition to running, or task_get/task_list for non-blocking snapshots.` : `Next: task "${result.taskId}" is running. Return this taskId to the user, call task_get/task_list for non-blocking progress snapshots, or task_watch to long-poll for the next event or terminal state.`;
+  const next = result.status === "needs_confirmation" ? `Next: this delegation requires user approval. Tell the user, then call task_approve or task_cancel based on their response.` : result.status === "queued" ? `Next: task "${result.taskId}" is queued (agent at parallel capacity). It will start automatically when a slot frees. Call task_watch to long-poll until it runs and then finishes — the terminal watch carries the result. Use task_list only to resurvey in-flight tasks.` : `Next: task "${result.taskId}" is running. Return this taskId to the user, then call task_watch to long-poll until it finishes — the terminal watch carries the worker's result, so no follow-up task_get is needed. Use task_list only to resurvey in-flight tasks.`;
   return [`Delegation task "${result.taskId}" created.`, `- Status: ${result.status}`, next].join(`
 `);
 }
@@ -43166,7 +43936,7 @@ function renderTaskListItem(task) {
   ].filter(Boolean).map((item) => `; ${item}`).join("");
   return `- ${task.taskId} [${task.status}] ${task.targetAgent}${role} -> ${task.workerSession ?? "unassigned"}${group}${source}${summary}${reliability}`;
 }
-function renderTaskSummary(task) {
+function renderTaskSummary(task, options = {}) {
   const header = [
     `Task "${task.taskId}"`,
     `- Status: ${task.status}`,
@@ -43181,7 +43951,9 @@ function renderTaskSummary(task) {
   if (task.status === "needs_confirmation") {
     header.push(`- Source: ${task.sourceKind} / ${task.sourceHandle}${task.role ? ` / ${task.role}` : ""}`);
   }
-  header.push(`- Task: ${task.task}`);
+  if (task.status === "needs_confirmation" || options.includePrompt) {
+    header.push(`- Task: ${task.task}`);
+  }
   if (task.summary.trim().length > 0)
     header.push(`- Summary: ${task.summary}`);
   if (task.lastProgressSummary)
@@ -43232,7 +44004,7 @@ function renderTaskApprovalSuccess(task) {
   return [
     `Task "${task.taskId}" approved.`,
     `- Current status: ${task.status}`,
-    `Next: use task_get/task_list for non-blocking progress snapshots, or task_watch to long-poll until the worker finishes; then task_get to read the final result.`
+    `Next: call task_watch to long-poll until the worker finishes — the terminal watch returns the result directly, so no follow-up task_get is needed. Use task_list only to resurvey in-flight tasks.`
   ].join(`
 `);
 }
@@ -43730,13 +44502,24 @@ function renderWatchMcpTaskResult(result, watchTaskId) {
   const events = result.events.length > 0 ? [
     "Events:",
     ...result.events.map((event) => {
-      const detail = event.summary ?? event.message ?? event.status ?? "";
-      return `- #${event.seq} ${event.type} at ${event.at}${detail ? `: ${detail}` : ""}`;
+      const detail2 = event.summary ?? event.message ?? event.status ?? "";
+      return `- #${event.seq} ${event.type} at ${event.at}${detail2 ? `: ${detail2}` : ""}`;
     })
   ] : ["Events: none"];
-  const next = result.status === "terminal" ? "Next: call task_get on the watched task to read the final result." : result.status === "attention_required" ? "Next: call task_get on the watched task, then resolve openQuestion / reviewPending with the recommended action tool." : `Next: call task_watch again with afterSeq=${result.nextAfterSeq} to keep watching.`;
+  const detail = [];
+  if (result.status === "terminal") {
+    const resultText = result.task.resultText.trim();
+    const summary = result.task.summary.trim();
+    if (resultText.length > 0)
+      detail.push(`Result: ${resultText}`);
+    else if (summary.length > 0)
+      detail.push(`Summary: ${summary}`);
+  } else if (result.status === "attention_required" && result.task.openQuestion) {
+    detail.push(`Open question: ${result.task.openQuestion.question}`);
+  }
+  const next = result.status === "terminal" ? "Next: summarize this result for the user." : result.status === "attention_required" ? "Next: resolve the pending question / contested review with the recommended action tool (coordinator_answer_question or coordinator_review_contested_result)." : `Next: call task_watch again with afterSeq=${result.nextAfterSeq} to keep watching.`;
   return {
-    content: [{ type: "text", text: [...header, ...events, next].join(`
+    content: [{ type: "text", text: [...header, ...events, ...detail, next].join(`
 `) }],
     structuredContent: { watchTaskId, ...result }
   };
@@ -44096,8 +44879,14 @@ function inferExternalCoordinatorSession(input) {
   return `external_${sanitizeMcpClientName(input.clientName)}:${suffix}`;
 }
 function sanitizeMcpClientName(input) {
-  const normalized = (input ?? "").trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
-  return normalized.length > 0 ? normalized : "mcp-host";
+  return sanitizeString((input ?? "").trim(), {
+    allow: /[a-z0-9._-]/,
+    replacement: "-",
+    lowercase: true,
+    collapse: true,
+    trim: true,
+    fallback: "mcp-host"
+  });
 }
 
 // src/mcp/parse-string-flag.ts
@@ -44222,12 +45011,15 @@ function resolveTemplateChoice(answer, names) {
 // src/cli-update.ts
 init_plugin_home();
 import { spawn as spawn4 } from "node:child_process";
-import { readFile as readFile7 } from "node:fs/promises";
-import { dirname as dirname9, join as join7 } from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { readFile as readFile8 } from "node:fs/promises";
+import { dirname as dirname10, join as join10 } from "node:path";
+import { fileURLToPath as fileURLToPath3 } from "node:url";
 
 // src/plugins/package-manager.ts
+init_plugin_home();
 import { spawn as spawn3 } from "node:child_process";
+import { rm as rm4 } from "node:fs/promises";
+import { join as join6 } from "node:path";
 async function defaultRunCommand(command, args, options) {
   await new Promise((resolve, reject) => {
     const child = spawn3(command, args, { cwd: options.cwd, stdio: "inherit" });
@@ -44267,6 +45059,10 @@ async function detectPackageManager(runCommand) {
 async function installPluginPackage(input) {
   const runCommand = input.runCommand ?? defaultRunCommand;
   const packageManager = input.packageManager ?? await detectPackageManager();
+  await normalizePluginHomeManifest(input.pluginHome);
+  if (packageManager === "bun") {
+    await rm4(join6(input.pluginHome, "bun.lock"), { force: true }).catch(() => {});
+  }
   const spec = input.version ? `${input.packageName}@${input.version}` : input.packageName;
   if (packageManager === "bun") {
     await runCommand("bun", ["add", spec], { cwd: input.pluginHome });
@@ -44290,6 +45086,7 @@ async function removePluginPackage(input) {
 // src/cli-update.ts
 init_plugin_loader();
 init_validate_plugin();
+var SUCCESSOR = { from: "weacpx", package: "xacpx", minVersion: "0.8.0" };
 async function handleUpdateCli(args, deps) {
   let all = false;
   const explicitTargets = [];
@@ -44306,14 +45103,20 @@ async function handleUpdateCli(args, deps) {
   const config2 = await deps.loadConfig();
   const packageName = deps.packageName ?? await readPackageName();
   const latestOf = deps.getLatestVersion ?? getLatestNpmVersion;
-  const targets = [
-    {
-      kind: "self",
-      name: packageName,
-      currentVersion: deps.readCurrentVersion(),
-      latestVersion: await latestOf(packageName)
-    }
-  ];
+  const successor = await resolveSuccessor(packageName, latestOf);
+  const selfTarget = successor ? {
+    kind: "self",
+    name: packageName,
+    currentVersion: deps.readCurrentVersion(),
+    latestVersion: successor.version,
+    successorPackage: successor.package
+  } : {
+    kind: "self",
+    name: packageName,
+    currentVersion: deps.readCurrentVersion(),
+    latestVersion: await latestOf(packageName)
+  };
+  const targets = [selfTarget];
   for (const plugin of config2.plugins ?? []) {
     targets.push({
       kind: "plugin",
@@ -44333,7 +45136,7 @@ async function handleUpdateCli(args, deps) {
     deps.print(`以下项目无法检查最新版本，已取消更新：${unavailable.map((target) => target.name).join(", ")}`);
     return 1;
   }
-  const candidates = targets.filter((target) => target.latestVersion && (target.kind !== "plugin" || target.pinned) && target.currentVersion !== target.latestVersion);
+  const candidates = targets.filter((target) => target.latestVersion && (target.kind !== "plugin" || target.pinned) && (target.successorPackage ? true : target.currentVersion !== target.latestVersion));
   const selected = await selectTargets(targets, candidates, { all, explicitTarget: explicitTargets[0], deps });
   if (!selected.ok) {
     deps.print(selected.message);
@@ -44344,6 +45147,8 @@ async function handleUpdateCli(args, deps) {
     return 0;
   }
   const selfUpdater = deps.updateSelf ?? defaultUpdateSelf;
+  const selfMigrator = deps.migrateSelf ?? defaultMigrateSelf;
+  const stopDaemon = deps.stopDaemon ?? (async () => {});
   const pluginHome = deps.pluginHome ?? resolvePluginHome();
   const pluginUpdater = deps.updatePlugin ?? (async (input) => {
     await ensurePluginHome(pluginHome);
@@ -44354,17 +45159,25 @@ async function handleUpdateCli(args, deps) {
   for (const target of selected.targets) {
     try {
       if (target.kind === "self") {
+        const successorPackage = target.successorPackage;
         if (!all && !explicitTargets[0]) {
           if (!deps.isInteractive()) {
-            deps.print("更新 weacpx 本体需要确认；非交互模式请使用 `weacpx update --all` 或 `weacpx update weacpx`。");
+            deps.print(successorPackage ? `weacpx 已更名为 ${successorPackage}；非交互模式请使用 \`weacpx update --all\` 或 \`weacpx update weacpx\` 确认迁移。` : "更新 weacpx 本体需要确认；非交互模式请使用 `weacpx update --all` 或 `weacpx update weacpx`。");
             return 1;
           }
-          const answer = (await deps.promptText("确认更新 weacpx 本体？[y/N] ")).trim().toLowerCase();
+          const question = successorPackage ? `weacpx 已更名为 ${successorPackage}，确认迁移到 ${successorPackage}？[y/N] ` : "确认更新 weacpx 本体？[y/N] ";
+          const answer = (await deps.promptText(question)).trim().toLowerCase();
           if (answer !== "y" && answer !== "yes") {
-            deps.print("已取消更新 weacpx 本体。");
+            deps.print(successorPackage ? `已取消迁移到 ${successorPackage}。` : "已取消更新 weacpx 本体。");
             continue;
           }
         }
+        if (successorPackage) {
+          await stopDaemon();
+          await selfMigrator({ from: target.name, to: successorPackage, toVersion: target.latestVersion ?? undefined });
+          deps.print(`weacpx 已更名为 ${successorPackage}，已迁移至 ${successorPackage} ${target.latestVersion ?? "latest"}。今后请使用 \`${successorPackage}\` 命令；若此前在后台运行，请用 \`${successorPackage} start\` 重新启动。`);
+          continue;
+        }
         await selfUpdater(target.name);
         deps.print(`weacpx 已更新：${target.latestVersion ?? "latest"}`);
         continue;
@@ -44404,19 +45217,21 @@ async function handleUpdateCli(args, deps) {
 function formatTarget(target) {
   const current = target.currentVersion ?? "未锁定";
   const latest = target.latestVersion ?? "无法检查";
-  const label = target.kind === "self" ? "weacpx" : `插件 ${target.name}`;
-  return `${label} (${current} -> ${latest})`;
+  if (target.kind === "self") {
+    return target.successorPackage ? `weacpx → ${target.successorPackage} (${current} -> ${latest}，改名)` : `weacpx (${current} -> ${latest})`;
+  }
+  return `插件 ${target.name} (${current} -> ${latest})`;
 }
 async function selectTargets(targets, candidates, input) {
   if (input.explicitTarget) {
-    const target = targets.find((entry) => entry.name === input.explicitTarget || input.explicitTarget === "weacpx" && entry.kind === "self");
+    const target = targets.find((entry) => entry.name === input.explicitTarget || entry.kind === "self" && (input.explicitTarget === "weacpx" || input.explicitTarget === entry.successorPackage));
     if (!target)
       return { ok: false, message: `没有找到更新项：${input.explicitTarget}`, exitCode: 1 };
     if (!target.latestVersion)
       return { ok: false, message: `${target.name} 无法检查最新版本，已跳过。`, exitCode: 1 };
     if (target.kind === "plugin" && !target.pinned)
       return { ok: false, message: `${target.name} 未记录当前版本；请先使用 \`weacpx plugin update ${target.name}\` 或显式选择版本。`, exitCode: 1 };
-    if (target.currentVersion === target.latestVersion)
+    if (!target.successorPackage && target.currentVersion === target.latestVersion)
       return { ok: true, targets: [] };
     return { ok: true, targets: [target] };
   }
@@ -44441,7 +45256,7 @@ async function selectTargets(targets, candidates, input) {
       return { ok: false, message: `${target.name} 无法检查最新版本，已跳过。`, exitCode: 1 };
     if (target.kind === "plugin" && !target.pinned)
       return { ok: false, message: `${target.name} 未记录当前版本；请先使用 \`weacpx plugin update ${target.name}\` 或显式选择版本。`, exitCode: 1 };
-    if (target.currentVersion === target.latestVersion)
+    if (!target.successorPackage && target.currentVersion === target.latestVersion)
       continue;
     if (!selected.includes(target))
       selected.push(target);
@@ -44470,6 +45285,45 @@ async function defaultUpdateSelf(packageName) {
   }
   await runInherit("npm", ["install", "-g", packageName]);
 }
+async function defaultMigrateSelf(input) {
+  const manager = process.env.WEACPX_PACKAGE_MANAGER?.trim().toLowerCase() === "bun" ? "bun" : "npm";
+  const spec = input.toVersion ? `${input.to}@${input.toVersion}` : `${input.to}@latest`;
+  if (manager === "bun") {
+    await runInherit("bun", ["add", "-g", spec]);
+    await runInherit("bun", ["remove", "-g", input.from]);
+    return;
+  }
+  await runInherit("npm", ["install", "-g", spec]);
+  await runInherit("npm", ["uninstall", "-g", input.from]);
+}
+async function resolveSuccessor(currentPackage, latestOf) {
+  if (currentPackage !== SUCCESSOR.from)
+    return null;
+  const version2 = await latestOf(SUCCESSOR.package);
+  if (!version2 || !meetsMinVersion(version2, SUCCESSOR.minVersion))
+    return null;
+  return { package: SUCCESSOR.package, version: version2 };
+}
+function meetsMinVersion(candidate, min) {
+  return compareSemver2(candidate, min) >= 0;
+}
+function compareSemver2(a, b) {
+  const parse5 = (value) => {
+    const match = /^\s*v?(\d+)\.(\d+)\.(\d+)(-[^\s]*)?/.exec(value);
+    if (!match)
+      return { nums: [0, 0, 0], prerelease: false };
+    return { nums: [Number(match[1]), Number(match[2]), Number(match[3])], prerelease: Boolean(match[4]) };
+  };
+  const left = parse5(a);
+  const right = parse5(b);
+  for (let i = 0;i < 3; i += 1) {
+    if (left.nums[i] !== right.nums[i])
+      return left.nums[i] < right.nums[i] ? -1 : 1;
+  }
+  if (left.prerelease === right.prerelease)
+    return 0;
+  return left.prerelease ? -1 : 1;
+}
 async function runCapture(command, args) {
   return await new Promise((resolve, reject) => {
     const child = spawn4(command, args, { stdio: ["ignore", "pipe", "pipe"] });
@@ -44501,10 +45355,10 @@ async function runInherit(command, args) {
 }
 async function readPackageName() {
   try {
-    const here = dirname9(fileURLToPath2(import.meta.url));
-    for (const candidate of [join7(here, "..", "package.json"), join7(here, "..", "..", "package.json")]) {
+    const here = dirname10(fileURLToPath3(import.meta.url));
+    for (const candidate of [join10(here, "..", "package.json"), join10(here, "..", "..", "package.json")]) {
       try {
-        const parsed = JSON.parse(await readFile7(candidate, "utf8"));
+        const parsed = JSON.parse(await readFile8(candidate, "utf8"));
         if (typeof parsed.name === "string" && parsed.name.trim())
           return parsed.name.trim();
       } catch {}
@@ -44521,6 +45375,7 @@ async function validatePluginDefault(packageName, pluginHome) {
 init_version();
 
 // src/channels/cli/channel-cli.ts
+init_core_home();
 init_registry();
 init_create_channel();
 import { isDeepStrictEqual } from "node:util";
@@ -44815,7 +45670,7 @@ async function runRestart(deps) {
   } catch (error2) {
     const message = error2 instanceof Error ? error2.message : String(error2);
     deps.print(`配置已保存，但重启失败：${message}`);
-    deps.print("请查看日志：~/.weacpx/runtime/stderr.log");
+    deps.print(`请查看日志：${coreHomeDisplayPath("runtime", "stderr.log")}`);
     deps.print("也可以稍后执行：weacpx start");
     return 1;
   }
@@ -45126,9 +45981,10 @@ async function setChannelAccountEnabled(type, accountId, enabled, rawArgs, deps)
 }
 
 // src/plugins/plugin-cli.ts
+init_core_home();
 init_plugin_home();
-import { readFile as readFile9 } from "node:fs/promises";
-import { isAbsolute, join as join9, resolve } from "node:path";
+import { readFile as readFile10 } from "node:fs/promises";
+import { isAbsolute, join as join12, resolve } from "node:path";
 init_plugin_loader();
 init_validate_plugin();
 
@@ -45137,14 +45993,14 @@ init_channel_scope();
 init_plugin_loader();
 init_validate_plugin();
 init_known_plugins();
-import { readFile as readFile8 } from "node:fs/promises";
-import { join as join8 } from "node:path";
+import { readFile as readFile9 } from "node:fs/promises";
+import { join as join11 } from "node:path";
 function suggestedPluginPackageForChannel(type) {
   return findKnownPluginByChannel(type)?.packageName ?? `<npm-package-that-provides-${type}>`;
 }
 async function readDependencyEntries(pluginHome) {
   try {
-    const raw = await readFile8(join8(pluginHome, "package.json"), "utf8");
+    const raw = await readFile9(join11(pluginHome, "package.json"), "utf8");
     const parsed = JSON.parse(raw);
     const out = {};
     for (const [name, value] of Object.entries(parsed.dependencies ?? {})) {
@@ -45242,11 +46098,11 @@ async function inspectPlugins(input) {
 // src/plugins/plugin-cli.ts
 init_known_plugins();
 function looksLikePath(spec) {
-  return spec.startsWith("./") || spec.startsWith("../") || spec.startsWith("/") || isAbsolute(spec) || 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 readFile9(join9(pluginHome, "package.json"), "utf8");
+    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 ?? {})) {
@@ -45272,7 +46128,7 @@ async function resolveLocalPluginName(installSpec, pluginHome, namesBeforeInstal
       return name;
   }
   try {
-    const raw = await readFile9(join9(installSpec, "package.json"), "utf8");
+    const raw = await readFile10(join12(installSpec, "package.json"), "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed.name === "string" && parsed.name.trim())
       return parsed.name.trim();
@@ -45694,7 +46550,7 @@ async function runRestart2(deps) {
     return await deps.restartDaemon();
   } catch (error2) {
     deps.print(`配置已保存，但重启失败：${describeError(error2)}`);
-    deps.print("请查看日志：~/.weacpx/runtime/stderr.log");
+    deps.print(`请查看日志：${coreHomeDisplayPath("runtime", "stderr.log")}`);
     deps.print("也可以稍后执行：weacpx start");
     return 1;
   }
@@ -45927,7 +46783,12 @@ async function runCli(args, deps = {}) {
         print,
         isInteractive: deps.isInteractive,
         promptText: deps.promptText,
-        overrides: deps.updateCliDeps
+        overrides: {
+          stopDaemon: async () => {
+            await (deps.controller ?? createDefaultController(deps)).stop();
+          },
+          ...deps.updateCliDeps
+        }
       })))(args.slice(1));
       if (result === null) {
         for (const line of HELP_LINES)
@@ -46373,7 +47234,7 @@ async function createCliScheduledTaskService() {
   return new ScheduledTaskService(state, stateStore);
 }
 function resolveConfigPathForCurrentEnv() {
-  return process.env.WEACPX_CONFIG ?? `${requireHome2()}/.weacpx/config.json`;
+  return process.env.WEACPX_CONFIG ?? join19(coreHomeDir(requireHome2()), "config.json");
 }
 function resolveDaemonPathsForCurrentConfig() {
   const configPath = resolveConfigPathForCurrentEnv();
@@ -46740,7 +47601,7 @@ function safeDaemonLogPaths() {
     const configPath = resolveConfigPathForCurrentEnv();
     const paths = resolveDaemonPathsForCurrentConfig();
     return {
-      appLog: join16(dirname15(configPath), "runtime", "app.log"),
+      appLog: join19(dirname16(configPath), "runtime", "app.log"),
       stderrLog: paths.stderrLog
     };
   } catch {
@@ -46751,7 +47612,7 @@ function resolveCliEntryPath2() {
   if (process.argv[1]) {
     return process.argv[1];
   }
-  return fileURLToPath6(import.meta.url);
+  return fileURLToPath7(import.meta.url);
 }
 function parseDoctorArgs(args) {
   const options = {};