@ganglion/xacpx 0.9.0 → 0.9.2

package/dist/cli.js

@@ -113,10 +113,11 @@ var init_session = __esm(() => {
     replyModeHeader: "Current reply mode:",
     replyModeSessionLabel: (alias) => `- Session: ${alias}`,
     replyModeGlobalDefault: (value) => `- Global default: ${value}`,
+    replyModeChannelDefault: (value) => `- Channel default: ${value}`,
     replyModeSessionOverride: (value) => `- Session override: ${value}`,
     replyModeEffective: (value) => `- Effective: ${value}`,
     replyModeSet: (replyMode) => `Current session reply mode set to: ${replyMode}`,
-    replyModeReset: (globalDefault) => `Session reply mode reset. Falling back to global default: ${globalDefault}`,
+    replyModeReset: (effective) => `Session reply mode reset. Now effective: ${effective}`,
     statusHeader: "Current session:",
     statusNameLabel: (alias) => `- Name: ${alias}`,
     statusAgentLabel: (agent) => `- Agent: ${agent}`,
@@ -659,6 +660,8 @@ var init_config = __esm(() => {
     mustBePositiveNumber: (path) => `${path} must be a positive number.`,
     channelTypeDisabled: "channel.type is a legacy single-channel field; /config set writes are disabled. Use `xacpx channel ...` to manage channels[], then restart xacpx.",
     channelReplyModeInvalid: "channel.replyMode only supports: stream, final, verbose",
+    channelRuntimeNotFound: (id) => `Channel "${id}" does not exist; add it first with \`xacpx channel add ${id}\`.`,
+    channelRuntimeReplyModeInvalid: (id) => `channels.${id}.replyMode only supports: stream, final, verbose`,
     wechatReplyModeInvalid: "wechat.replyMode only supports: stream, final, verbose",
     wechatReplyModeMapped: (value) => `${value} (mapped to channel.replyMode)`,
     agentNotFound: (name) => `Agent "${name}" does not exist. Create it first.`,
@@ -879,6 +882,8 @@ var init_channel_cli = __esm(() => {
     channelRemoved: (id) => `Channel ${id} removed`,
     cannotDisableLastEnabled: "Cannot disable the last enabled channel.",
     channelEnabledToggled: (id, enabled) => `Channel ${id} ${enabled ? "enabled" : "disabled"}`,
+    channelReplyModeSet: (id, mode) => `Channel ${id} default reply mode set to: ${mode}`,
+    channelReplyModeInvalid: (mode) => `reply mode must be stream / final / verbose, got: ${mode}`,
     channelAccountAlreadyExists: (type, accountId) => `Account ${accountId} already exists on channel ${type}; run xacpx channel rm ${type} --account ${accountId} first`,
     channelAccountAdded: (type, accountId) => `Channel ${type} account ${accountId} added`,
     channelReEnabled: (type) => `Channel ${type} was disabled; it has been automatically re-enabled.`,
@@ -1179,10 +1184,11 @@ var init_session2 = __esm(() => {
     replyModeHeader: "当前 reply mode：",
     replyModeSessionLabel: (alias) => `- 会话：${alias}`,
     replyModeGlobalDefault: (value) => `- 全局默认：${value}`,
+    replyModeChannelDefault: (value) => `- 频道默认：${value}`,
     replyModeSessionOverride: (value) => `- 当前会话覆盖：${value}`,
     replyModeEffective: (value) => `- 当前生效：${value}`,
     replyModeSet: (replyMode) => `已设置当前会话 reply mode：${replyMode}`,
-    replyModeReset: (globalDefault) => `已重置当前会话 reply mode，当前回退到全局默认：${globalDefault}`,
+    replyModeReset: (effective) => `已重置当前会话 reply mode，当前生效：${effective}`,
     statusHeader: "当前会话：",
     statusNameLabel: (alias) => `- 名称：${alias}`,
     statusAgentLabel: (agent2) => `- Agent：${agent2}`,
@@ -1725,6 +1731,8 @@ var init_config2 = __esm(() => {
     mustBePositiveNumber: (path) => `${path} 必须是正数。`,
     channelTypeDisabled: "channel.type 是旧单频道字段，/config set 已禁用写入；请使用 `xacpx channel ...` 管理 channels[]，然后重启 xacpx。",
     channelReplyModeInvalid: "channel.replyMode 只支持：stream、final、verbose",
+    channelRuntimeNotFound: (id) => `频道「${id}」不存在；请先用 \`xacpx channel add ${id}\` 添加。`,
+    channelRuntimeReplyModeInvalid: (id) => `channels.${id}.replyMode 只支持：stream、final、verbose`,
     wechatReplyModeInvalid: "wechat.replyMode 只支持：stream、final、verbose",
     wechatReplyModeMapped: (value) => `${value}（已映射到 channel.replyMode）`,
     agentNotFound: (name) => `Agent「${name}」不存在，请先创建。`,
@@ -1945,6 +1953,8 @@ var init_channel_cli2 = __esm(() => {
     channelRemoved: (id) => `频道 ${id} 已删除`,
     cannotDisableLastEnabled: "不能禁用最后一个启用的频道。",
     channelEnabledToggled: (id, enabled) => `频道 ${id} 已${enabled ? "启用" : "禁用"}`,
+    channelReplyModeSet: (id, mode) => `频道 ${id} 的默认 reply mode 已设置为：${mode}`,
+    channelReplyModeInvalid: (mode) => `reply mode 只支持 stream / final / verbose，收到：${mode}`,
     channelAccountAlreadyExists: (type, accountId) => `频道 ${type} 的账号 ${accountId} 已存在；先 xacpx channel rm ${type} --account ${accountId}`,
     channelAccountAdded: (type, accountId) => `频道 ${type} 账号 ${accountId} 已添加`,
     channelReEnabled: (type) => `频道 ${type} 此前是 disabled 状态，已自动启用。`,
@@ -2209,12 +2219,22 @@ var init_zh = __esm(() => {
 function isLocale(value) {
   return typeof value === "string" && VALID.includes(value);
 }
+function detectSystemLocale() {
+  try {
+    return Intl.DateTimeFormat().resolvedOptions().locale || "";
+  } catch {
+    return "";
+  }
+}
 function resolveLocale(input = {}) {
   const { configLanguage, env = process.env } = input;
   if (isLocale(configLanguage))
     return configLanguage;
   const raw = env.LC_ALL || env.LC_MESSAGES || env.LANG || "";
-  return /^zh/i.test(raw) ? "zh" : "en";
+  if (raw)
+    return /^zh/i.test(raw) ? "zh" : "en";
+  const systemLocale = input.systemLocale ?? detectSystemLocale();
+  return /^zh/i.test(systemLocale) ? "zh" : "en";
 }
 var VALID;
 var init_resolve_locale = __esm(() => {
@@ -4637,6 +4657,9 @@ function parseRuntimeChannelConfig(raw, index) {
     throw new Error(`channels[${index}].type must be a non-empty string`);
   }
   const enabled = raw.enabled !== false;
+  if ("replyMode" in raw && !isReplyMode(raw.replyMode)) {
+    throw new Error(`channels[${index}].replyMode must be stream, final, or verbose`);
+  }
   let options = undefined;
   if ("feishu" in raw && isRecord(raw.feishu)) {
     options = raw.feishu;
@@ -4647,6 +4670,7 @@ function parseRuntimeChannelConfig(raw, index) {
     id,
     type: raw.type,
     enabled,
+    ...isReplyMode(raw.replyMode) ? { replyMode: raw.replyMode } : {},
     ...options ? { options } : {}
   };
 }
@@ -4892,7 +4916,7 @@ var init_ensure_config = __esm(() => {
     },
     channel: {
       type: "weixin",
-      replyMode: "stream"
+      replyMode: "verbose"
     },
     agents: {
       codex: { driver: "codex" },
@@ -5384,7 +5408,7 @@ function resolveOrchestrationEndpoint(runtimeDir, platform = process.platform) {
     const suffix = createHash("sha256").update(runtimeDir).digest("hex").slice(0, 12);
     return {
       kind: "named-pipe",
-      path: `\\\\.\\pipe\\weacpx-orchestration-${suffix}`
+      path: `\\\\.\\pipe\\xacpx-orchestration-${suffix}`
     };
   }
   return {
@@ -11930,9 +11954,9 @@ function readVersion(moduleUrl = import.meta.url) {
   }
   return "unknown";
 }
-var PACKAGE_NAME = "@ganglion/xacpx", WEACPX_CORE_VERSION;
+var PACKAGE_NAME = "@ganglion/xacpx", XACPX_CORE_VERSION;
 var init_version = __esm(() => {
-  WEACPX_CORE_VERSION = readVersion();
+  XACPX_CORE_VERSION = readVersion();
 });
 
 // src/orchestration/task-watch-timeouts.ts
@@ -12271,7 +12295,7 @@ function isReplyMode2(value) {
   return value === "stream" || value === "final" || value === "verbose";
 }
 function isSessionSource(value) {
-  return value === undefined || value === "weacpx" || value === "agent-side";
+  return value === undefined || value === "weacpx" || value === "xacpx" || value === "agent-side";
 }
 function isSessionRecord(value) {
   if (!isRecord2(value)) {
@@ -12803,7 +12827,7 @@ async function ensureCoreResolution(pluginHome) {
       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.`);
+      console.warn(`xacpx: 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(join6(targetDir, "package.json"), JSON.stringify({
@@ -13702,7 +13726,7 @@ async function sendTyping(params) {
     label: "sendTyping"
   });
 }
-var CHANNEL_VERSION, ILINK_APP_CLIENT_VERSION, ILINK_APP_ID, DEFAULT_BOT_AGENT = "weacpx", BOT_AGENT_MAX_LEN = 256, DEFAULT_LONG_POLL_TIMEOUT_MS = 35000, DEFAULT_API_TIMEOUT_MS = 15000, DEFAULT_CONFIG_TIMEOUT_MS = 1e4;
+var CHANNEL_VERSION, ILINK_APP_CLIENT_VERSION, ILINK_APP_ID, DEFAULT_BOT_AGENT = "xacpx", BOT_AGENT_MAX_LEN = 256, DEFAULT_LONG_POLL_TIMEOUT_MS = 35000, DEFAULT_API_TIMEOUT_MS = 15000, DEFAULT_CONFIG_TIMEOUT_MS = 1e4;
 var init_api = __esm(() => {
   init_version();
   init_accounts();
@@ -19148,19 +19172,19 @@ function cmpTuple(a, b) {
   return 0;
 }
 function validatePluginCompatibility(metadata, context) {
-  const { packageName, currentWeacpxVersion } = context;
+  const { packageName, currentXacpxVersion } = context;
   const apiVersion = metadata.apiVersion;
   if (typeof apiVersion !== "number") {
     throw new Error(t().pluginCli.compatMissingApiVersion(packageName));
   }
-  if (!WEACPX_PLUGIN_API_SUPPORTED_VERSIONS.includes(apiVersion)) {
-    const supported = WEACPX_PLUGIN_API_SUPPORTED_VERSIONS.join(", ");
+  if (!XACPX_PLUGIN_API_SUPPORTED_VERSIONS.includes(apiVersion)) {
+    const supported = XACPX_PLUGIN_API_SUPPORTED_VERSIONS.join(", ");
     throw new Error(t().pluginCli.compatUnsupportedApiVersion(packageName, apiVersion, supported));
   }
-  if (!currentWeacpxVersion || currentWeacpxVersion === "unknown") {
+  if (!currentXacpxVersion || currentXacpxVersion === "unknown") {
     return;
   }
-  const normalizedCurrent = normalizeCoreVersionForCompat(currentWeacpxVersion);
+  const normalizedCurrent = normalizeCoreVersionForCompat(currentXacpxVersion);
   const minVersion = metadata.minXacpxVersion ?? metadata.minWeacpxVersion;
   const minVersionField = metadata.minXacpxVersion !== undefined ? "minXacpxVersion" : "minWeacpxVersion";
   if (minVersion !== undefined) {
@@ -19175,7 +19199,7 @@ function validatePluginCompatibility(metadata, context) {
       throw new Error(t().pluginCli.compatInvalidMinVersionDetail(packageName, minVersionField, detail));
     }
     if (!satisfied) {
-      throw new Error(t().pluginCli.compatMinVersionNotSatisfied(packageName, minVersion, currentWeacpxVersion));
+      throw new Error(t().pluginCli.compatMinVersionNotSatisfied(packageName, minVersion, currentXacpxVersion));
     }
   }
   const compatibleVersions = metadata.compatibleXacpxVersions ?? metadata.compatibleWeacpxVersions;
@@ -19192,14 +19216,17 @@ function validatePluginCompatibility(metadata, context) {
       throw new Error(t().pluginCli.compatInvalidCompatibleVersionsDetail(packageName, compatibleField, detail));
     }
     if (!satisfied) {
-      throw new Error(t().pluginCli.compatCompatibleVersionsNotSatisfied(packageName, compatibleVersions, currentWeacpxVersion));
+      throw new Error(t().pluginCli.compatCompatibleVersionsNotSatisfied(packageName, compatibleVersions, currentXacpxVersion));
     }
   }
 }
-var WEACPX_PLUGIN_API_VERSION = 1, WEACPX_PLUGIN_API_SUPPORTED_VERSIONS, WEACPX_PLUGIN_MIN_CORE_VERSION = "0.5.0", SEMVER_RE;
+var XACPX_PLUGIN_API_VERSION = 1, XACPX_PLUGIN_API_SUPPORTED_VERSIONS, XACPX_PLUGIN_MIN_CORE_VERSION = "0.5.0", WEACPX_PLUGIN_API_VERSION, WEACPX_PLUGIN_API_SUPPORTED_VERSIONS, WEACPX_PLUGIN_MIN_CORE_VERSION, SEMVER_RE;
 var init_compatibility = __esm(() => {
   init_i18n();
-  WEACPX_PLUGIN_API_SUPPORTED_VERSIONS = [1];
+  XACPX_PLUGIN_API_SUPPORTED_VERSIONS = [1];
+  WEACPX_PLUGIN_API_VERSION = XACPX_PLUGIN_API_VERSION;
+  WEACPX_PLUGIN_API_SUPPORTED_VERSIONS = XACPX_PLUGIN_API_SUPPORTED_VERSIONS;
+  WEACPX_PLUGIN_MIN_CORE_VERSION = XACPX_PLUGIN_MIN_CORE_VERSION;
   SEMVER_RE = /^(\d+)\.(\d+)\.(\d+)$/;
 });
 
@@ -19214,14 +19241,14 @@ function validateWeacpxPlugin(value, packageName, options = {}) {
   if (!isRecord(plugin)) {
     throw new Error(t().pluginCli.pluginNoDefaultExport(packageName));
   }
-  const currentWeacpxVersion = options.currentWeacpxVersion ?? readVersion();
+  const currentXacpxVersion = options.currentXacpxVersion ?? readVersion();
   validatePluginCompatibility({
     apiVersion: plugin.apiVersion,
     minWeacpxVersion: plugin.minWeacpxVersion,
     compatibleWeacpxVersions: plugin.compatibleWeacpxVersions,
     minXacpxVersion: plugin.minXacpxVersion,
     compatibleXacpxVersions: plugin.compatibleXacpxVersions
-  }, { packageName, currentWeacpxVersion });
+  }, { packageName, currentXacpxVersion });
   if ("name" in plugin && typeof plugin.name === "string" && plugin.name.trim() && plugin.name.trim() !== packageName) {
     throw new Error(t().pluginCli.pluginNameMismatch(packageName, plugin.name));
   }
@@ -19250,7 +19277,7 @@ function validateWeacpxPlugin(value, packageName, options = {}) {
     }
   }
   const normalized = {
-    apiVersion: WEACPX_PLUGIN_API_VERSION,
+    apiVersion: XACPX_PLUGIN_API_VERSION,
     ...typeof plugin.name === "string" && plugin.name.trim() ? { name: plugin.name.trim() } : { name: packageName },
     channels
   };
@@ -19304,7 +19331,7 @@ async function loadConfiguredPlugins(input) {
         throw new Error(`failed to load plugin ${config4.name}: ${message}`);
       }
       const plugin = validateWeacpxPlugin(moduleValue, config4.name, {
-        ...input.currentWeacpxVersion !== undefined ? { currentWeacpxVersion: input.currentWeacpxVersion } : {}
+        ...input.currentXacpxVersion !== undefined ? { currentXacpxVersion: input.currentXacpxVersion } : {}
       });
       const channels = plugin.channels ?? [];
       for (const channel of channels) {
@@ -19556,16 +19583,16 @@ var init_prompt_output = __esm(() => {
 });
 
 // src/commands/command-list.ts
-function isKnownWeacpxCommandPrefix(prefix) {
+function isKnownXacpxCommandPrefix(prefix) {
   return KNOWN_COMMAND_PREFIX_SET.has(prefix.toLowerCase());
 }
-function isKnownWeacpxCommandText(text) {
+function isKnownXacpxCommandText(text) {
   const firstToken = text.trim().split(/\s+/, 1)[0];
-  return Boolean(firstToken && isKnownWeacpxCommandPrefix(firstToken));
+  return Boolean(firstToken && isKnownXacpxCommandPrefix(firstToken));
 }
-var WEACPX_KNOWN_COMMAND_PREFIXES, KNOWN_COMMAND_PREFIX_SET;
+var XACPX_KNOWN_COMMAND_PREFIXES, KNOWN_COMMAND_PREFIX_SET;
 var init_command_list = __esm(() => {
-  WEACPX_KNOWN_COMMAND_PREFIXES = [
+  XACPX_KNOWN_COMMAND_PREFIXES = [
     "/help",
     "/agents",
     "/workspaces",
@@ -19595,7 +19622,7 @@ var init_command_list = __esm(() => {
     "/later",
     "/lt"
   ];
-  KNOWN_COMMAND_PREFIX_SET = new Set(WEACPX_KNOWN_COMMAND_PREFIXES);
+  KNOWN_COMMAND_PREFIX_SET = new Set(XACPX_KNOWN_COMMAND_PREFIXES);
 });
 
 // src/commands/parse-command.ts
@@ -20085,7 +20112,7 @@ function normalizeCommand(command) {
   return command;
 }
 function isRecognizedCommand(command) {
-  return isKnownWeacpxCommandPrefix(command);
+  return isKnownXacpxCommandPrefix(command);
 }
 function toPermissionMode(value) {
   if (value === "allow")
@@ -20599,6 +20626,23 @@ function applySupportedConfigUpdate(config4, path14, rawValue) {
     }
     return { renderedValue: rawValue };
   }
+  const channelMatch = path14.match(/^channels\.([^.]+)\.replyMode$/);
+  if (channelMatch) {
+    const [, id] = channelMatch;
+    if (!id) {
+      return { error: c.pathNotSupported(path14) };
+    }
+    const channel = config4.channels.find((entry) => entry.id === id);
+    if (!channel) {
+      return { error: c.channelRuntimeNotFound(id) };
+    }
+    const parsed = parseEnum(rawValue, ["stream", "final", "verbose"]);
+    if (!parsed) {
+      return { error: c.channelRuntimeReplyModeInvalid(id) };
+    }
+    channel.replyMode = parsed;
+    return { renderedValue: parsed };
+  }
   return { error: c.pathNotSupported(path14) };
 }
 function parseEnum(value, allowed) {
@@ -20628,6 +20672,7 @@ var init_config_handler = __esm(() => {
     "logging.maxFiles",
     "logging.retentionDays",
     "channel.replyMode",
+    "channels.<id>.replyMode",
     "agents.<name>.driver",
     "agents.<name>.command",
     "workspaces.<name>.cwd",
@@ -20968,6 +21013,20 @@ var init_build_coordinator_prompt = __esm(() => {
   init_render_delegate_question_package();
 });
 
+// src/commands/handlers/resolve-reply-mode.ts
+function resolveChannelDefaultReplyMode(config4, chatKey) {
+  if (!config4)
+    return;
+  const channelId = getChannelIdFromChatKey(chatKey);
+  return config4.channels.find((channel) => channel.id === channelId)?.replyMode;
+}
+function resolveEffectiveReplyMode(config4, chatKey, sessionOverride) {
+  return sessionOverride ?? resolveChannelDefaultReplyMode(config4, chatKey) ?? config4?.channel.replyMode ?? "verbose";
+}
+var init_resolve_reply_mode = __esm(() => {
+  init_channel_scope();
+});
+
 // src/commands/handlers/session-list-marker.ts
 function decorateUnread(label, hasUnread) {
   return hasUnread ? `● ${label}` : label;
@@ -21272,14 +21331,16 @@ async function handleReplyModeShow(context, chatKey) {
     return { text: t().session.noCurrent };
   }
   const globalDefault = context.config?.channel.replyMode ?? "verbose";
+  const channelDefault = resolveChannelDefaultReplyMode(context.config, chatKey);
   const sessionOverride = session3.replyMode;
-  const effective = sessionOverride ?? globalDefault;
+  const effective = resolveEffectiveReplyMode(context.config, chatKey, sessionOverride);
   const s = t().session;
   return {
     text: [
       s.replyModeHeader,
       s.replyModeSessionLabel(toDisplaySessionAlias(session3.alias)),
       s.replyModeGlobalDefault(globalDefault),
+      s.replyModeChannelDefault(channelDefault ?? s.modeNotSet),
       s.replyModeSessionOverride(sessionOverride ?? s.modeNotSet),
       s.replyModeEffective(effective)
     ].join(`
@@ -21300,8 +21361,8 @@ async function handleReplyModeReset(context, chatKey) {
     return { text: t().session.noCurrent };
   }
   await context.sessions.setCurrentSessionReplyMode(chatKey, undefined);
-  const globalDefault = context.config?.channel.replyMode ?? "verbose";
-  return { text: t().session.replyModeReset(globalDefault) };
+  const fallback = resolveEffectiveReplyMode(context.config, chatKey, undefined);
+  return { text: t().session.replyModeReset(fallback) };
 }
 async function handleStatus(context, chatKey) {
   const session3 = await context.sessions.getCurrentSession(chatKey);
@@ -21448,7 +21509,7 @@ async function handleSessionRemove(context, chatKey, alias) {
 `) };
 }
 async function promptWithSession(context, session3, chatKey, text, reply, replyContextToken, accountId, media, abortSignal, onToolEvent, onThought, perfSpan, metadata) {
-  const effectiveReplyMode = session3.replyMode ?? context.config?.channel.replyMode ?? "verbose";
+  const effectiveReplyMode = resolveEffectiveReplyMode(context.config, chatKey, session3.replyMode);
   if (!session3.replyMode)
     session3.replyMode = effectiveReplyMode;
   const transportReply = effectiveReplyMode !== "final" ? reply : undefined;
@@ -21596,6 +21657,7 @@ var DEFAULT_SESSION_TAIL_LINES = 50, MAX_SESSION_TAIL_LINES = 500;
 var init_session_handler = __esm(() => {
   init_build_coordinator_prompt();
   init_channel_scope();
+  init_resolve_reply_mode();
   init_workspace_name();
   init_i18n();
 });
@@ -23647,23 +23709,43 @@ var init_translate_acpx_note = __esm(() => {
 
 // src/commands/handlers/session-reset-handler.ts
 async function handleSessionResetCommand(context, ops, chatKey) {
-  const session3 = await context.sessions.getCurrentSession(chatKey);
-  if (!session3) {
+  const previous = await context.sessions.getCurrentSession(chatKey);
+  if (!previous) {
     return { text: t().misc.sessionResetNoCurrentSession };
   }
-  const resetSession = ops.resolveSession(session3.alias, session3.agent, session3.workspace, buildResetTransportSessionName(session3, ops.now()));
+  const wasNative = previous.source === "agent-side";
+  const resetSession = ops.resolveSession(previous.alias, previous.agent, previous.workspace, buildResetTransportSessionName(previous, ops.now()));
   const releaseTransportReservation = await ops.reserveTransportSession(resetSession.transportSession);
   try {
     try {
       await ops.ensureTransportSession(resetSession);
       const exists = await ops.checkTransportSession(resetSession);
       if (!exists) {
-        return { text: t().misc.sessionResetFailed(session3.alias) };
+        return { text: t().misc.sessionResetFailed(previous.alias) };
       }
     } catch (error2) {
       return renderTransportError(resetSession, error2);
     }
-    await context.sessions.attachSession(resetSession.alias, resetSession.agent, resetSession.workspace, resetSession.transportSession);
+    let freshAgentSessionId;
+    if (wasNative) {
+      try {
+        freshAgentSessionId = await context.transport.getAgentSessionId?.(resetSession);
+      } catch (error2) {
+        await context.logger.info("session.reset.native_id_unavailable", "failed to read fresh agent session id; falling back to xacpx session", { alias: resetSession.alias, error: error2 instanceof Error ? error2.message : String(error2) });
+      }
+    }
+    if (wasNative && freshAgentSessionId) {
+      await context.sessions.attachNativeSession({
+        alias: resetSession.alias,
+        agent: resetSession.agent,
+        workspace: resetSession.workspace,
+        transportSession: resetSession.transportSession,
+        agentSessionId: freshAgentSessionId,
+        updatedAt: new Date(ops.now()).toISOString()
+      });
+    } else {
+      await context.sessions.attachSession(resetSession.alias, resetSession.agent, resetSession.workspace, resetSession.transportSession);
+    }
     await ops.refreshSessionTransportAgentCommand(resetSession.alias);
     await context.sessions.useSession(chatKey, resetSession.alias);
     await context.logger.info("session.reset", "reset current logical session", {
@@ -23671,8 +23753,19 @@ async function handleSessionResetCommand(context, ops, chatKey) {
       agent: resetSession.agent,
       workspace: resetSession.workspace,
       transportSession: resetSession.transportSession,
-      chatKey
+      chatKey,
+      native: wasNative && Boolean(freshAgentSessionId)
     });
+    if (wasNative && context.transport.removeSession && context.sessions.countAliasesSharingTransport(previous.transportSession) === 0) {
+      try {
+        await context.transport.removeSession(previous);
+      } catch (error2) {
+        await context.logger.info("session.reset.close_previous_failed", "failed to close previous native session after reset", {
+          transportSession: previous.transportSession,
+          error: error2 instanceof Error ? error2.message : String(error2)
+        });
+      }
+    }
   } finally {
     await releaseTransportReservation();
   }
@@ -24341,7 +24434,7 @@ class ConsoleAgent {
     return await this.router.handle(request.conversationId, request.text, request.reply, request.replyContextToken, request.accountId, promptMedia, request.metadata, request.abortSignal, request.onToolEvent, request.onThought, request.perfSpan);
   }
   isKnownCommand(text) {
-    return isKnownWeacpxCommandText(text);
+    return isKnownXacpxCommandText(text);
   }
   async clearSession(conversationId) {
     await this.router.clearSession?.(conversationId);
@@ -29165,7 +29258,7 @@ class DebouncedStateStore {
 }
 
 // src/commands/command-hints.ts
-function listWeacpxCommandHints() {
+function listXacpxCommandHints() {
   const hints3 = [{ name: "/help", description: t().hints.helpDescription }];
   for (const topic of listHelpTopics()) {
     const name = PRIMARY_COMMAND_BY_TOPIC[topic.topic];
@@ -29313,8 +29406,8 @@ async function runConsole(paths, deps) {
       activeTurns: runtime.activeTurns,
       logger: runtime.logger,
       perfTracer: runtime.perfTracer,
-      commandHints: listWeacpxCommandHints(),
-      coreVersion: WEACPX_CORE_VERSION,
+      commandHints: listXacpxCommandHints(),
+      coreVersion: XACPX_CORE_VERSION,
       locale: getLocale()
     });
     channelStartPromise.catch(() => {});
@@ -30006,6 +30099,10 @@ ${result.text}` : "" };
   async removeSession(session3) {
     await this.client.request("removeSession", this.toParams(session3));
   }
+  async getAgentSessionId(session3) {
+    const result = await this.client.request("getAgentSessionId", this.toParams(session3));
+    return result.agentSessionId;
+  }
   async hasSession(session3) {
     const result = await this.client.request("hasSession", this.toParams(session3));
     return result.exists;
@@ -30500,10 +30597,10 @@ import { spawn as spawn8 } from "node:child_process";
 import { readFile as readFile12, unlink } from "node:fs/promises";
 import { homedir as homedir8 } from "node:os";
 import { join as join17 } from "node:path";
-function buildWeacpxMcpServerSpec(input) {
-  const { command, args } = splitCommandLine(input.weacpxCommand);
+function buildXacpxMcpServerSpec(input) {
+  const { command, args } = splitCommandLine(input.xacpxCommand);
   return {
-    name: "weacpx",
+    name: "xacpx",
     type: "stdio",
     command,
     args: [
@@ -30530,7 +30627,7 @@ function buildQueueOwnerPayload(input) {
 
 class AcpxQueueOwnerLauncher {
   acpxCommand;
-  weacpxCommand;
+  xacpxCommand;
   spawnOwner;
   terminateOwner;
   baseEnv;
@@ -30539,7 +30636,7 @@ class AcpxQueueOwnerLauncher {
   launchLocks = new Map;
   constructor(options) {
     this.acpxCommand = options.acpxCommand;
-    this.weacpxCommand = options.weacpxCommand ?? resolveDefaultWeacpxCommand(options.baseEnv ?? process.env);
+    this.xacpxCommand = options.xacpxCommand ?? resolveDefaultXacpxCommand(options.baseEnv ?? process.env);
     this.spawnOwner = options.spawnOwner ?? defaultQueueOwnerSpawner;
     this.terminateOwner = options.terminateOwner ?? createDefaultQueueOwnerTerminator(options.acpxCommand);
     this.baseEnv = options.baseEnv ?? process.env;
@@ -30567,8 +30664,8 @@ class AcpxQueueOwnerLauncher {
       nonInteractivePermissions: input.nonInteractivePermissions,
       ttlMs: this.ttlMs,
       maxQueueDepth: this.maxQueueDepth,
-      mcpServers: [buildWeacpxMcpServerSpec({
-        weacpxCommand: this.weacpxCommand,
+      mcpServers: [buildXacpxMcpServerSpec({
+        xacpxCommand: this.xacpxCommand,
         coordinatorSession: input.coordinatorSession,
         ...input.sourceHandle ? { sourceHandle: input.sourceHandle } : {}
       })]
@@ -30623,13 +30720,13 @@ function splitCommandLine(value) {
     current += "\\";
   }
   if (quote) {
-    throw new Error("weacpx MCP command has an unterminated quote");
+    throw new Error("xacpx MCP command has an unterminated quote");
   }
   if (current.length > 0) {
     parts.push(current);
   }
   if (parts.length === 0) {
-    throw new Error("weacpx MCP command must not be empty");
+    throw new Error("xacpx MCP command must not be empty");
   }
   return { command: parts[0], args: parts.slice(1) };
 }
@@ -30675,7 +30772,7 @@ function queueLockFilePath(sessionId) {
 function shortHash(value, length) {
   return createHash3("sha256").update(value).digest("hex").slice(0, length);
 }
-function resolveDefaultWeacpxCommand(env) {
+function resolveDefaultXacpxCommand(env) {
   const cliCommand = coreEnv("CLI_COMMAND", env);
   if (cliCommand?.trim()) {
     return cliCommand.trim();
@@ -31026,8 +31123,9 @@ ${baseText}` : "" };
     try {
       const parsed = JSON.parse(result.stdout);
       const acpxRecordId = typeof parsed.acpxRecordId === "string" ? parsed.acpxRecordId : typeof parsed.id === "string" ? parsed.id : undefined;
+      const agentSessionId = typeof parsed.agentSessionId === "string" ? parsed.agentSessionId : undefined;
       if (acpxRecordId) {
-        return { acpxRecordId };
+        return { acpxRecordId, agentSessionId };
       }
     } catch {
       const firstLine = result.stdout.trim().split(/\r?\n/, 1)[0];
@@ -31037,6 +31135,10 @@ ${baseText}` : "" };
     }
     throw new Error("failed to resolve acpx session record id");
   }
+  async getAgentSessionId(session3) {
+    const record3 = await this.readSessionRecord(session3);
+    return record3.agentSessionId;
+  }
   async run(args, options) {
     const result = await this.runCommandWithTimeout(this.runCommand, args, options);
     if (result.code !== 0) {
@@ -33573,7 +33675,7 @@ class DaemonRuntime {
   }
 }
 
-// src/mcp/weacpx-mcp-server.ts
+// src/mcp/xacpx-mcp-server.ts
 import { stdin, stdout } from "node:process";
 
 // node_modules/@modelcontextprotocol/sdk/node_modules/zod/v4/core/core.js
@@ -45929,7 +46031,7 @@ class StdioServerTransport {
   }
 }
 
-// src/mcp/weacpx-mcp-server.ts
+// src/mcp/xacpx-mcp-server.ts
 init_version();
 
 // src/mcp/resolve-endpoint.ts
@@ -45957,7 +46059,7 @@ function requireHome(env) {
   return home;
 }
 
-// src/mcp/weacpx-mcp-tools.ts
+// src/mcp/xacpx-mcp-tools.ts
 init_task_watch_timeouts();
 init_quota_errors();
 var taskStatusSchema = exports_external.enum([
@@ -45978,7 +46080,7 @@ var taskQuestionSchema = exports_external.object({
   taskId: exports_external.string().min(1),
   questionId: exports_external.string().min(1)
 }).strict();
-function buildWeacpxMcpToolRegistry(input) {
+function buildXacpxMcpToolRegistry(input) {
   const { transport, coordinatorSession, sourceHandle, isExternalCoordinator, internalSessionTools, availableAgents } = input;
   const tools = [
     {
@@ -46136,7 +46238,7 @@ function buildWeacpxMcpToolRegistry(input) {
       }).strict(),
       handler: async (args) => await asToolResult(async () => {
         if (!sourceHandle || sourceHandle.trim().length === 0) {
-          throw new Error("worker_raise_question requires a bound sourceHandle; start mcp-stdio with --source-handle or WEACPX_SOURCE_HANDLE");
+          throw new Error("worker_raise_question requires a bound sourceHandle; start mcp-stdio with --source-handle or XACPX_SOURCE_HANDLE");
         }
         const result = await transport.workerRaiseQuestion({
           sourceHandle,
@@ -46199,7 +46301,7 @@ function buildWeacpxMcpToolRegistry(input) {
   if (internalSessionTools && !isExternalCoordinator && !sourceHandle) {
     tools.push({
       name: "scheduled_create",
-      description: "Schedule a one-shot task to run a natural-language message at a future time, using the recorded chat route. By default — and like /later — the task runs in a FRESH TEMPORARY session (it snapshots the current agent and workspace but starts with brand-new history and is destroyed after running, so it does not pollute this conversation); the reply is still pushed back to this chat. Provide only timeText and message and OMIT mode to get this default. Routing, session, and account are resolved by weacpx.",
+      description: "Schedule a one-shot task to run a natural-language message at a future time, using the recorded chat route. By default — and like /later — the task runs in a FRESH TEMPORARY session (it snapshots the current agent and workspace but starts with brand-new history and is destroyed after running, so it does not pollute this conversation); the reply is still pushed back to this chat. Provide only timeText and message and OMIT mode to get this default. Routing, session, and account are resolved by xacpx.",
       inputSchema: exports_external.object({
         timeText: exports_external.string().min(1).describe("Time expression, e.g. 'in 2h', '30分钟后', 'tomorrow 09:00', or '周五 09:00'."),
         message: exports_external.string().min(1).describe("Natural-language message to run at the scheduled time."),
@@ -46609,7 +46711,7 @@ function getWatchRequestTimeoutMs(watchTimeoutMs, defaultTimeoutMs) {
   return Math.max(defaultTimeoutMs, boundedWatchTimeoutMs + TASK_WATCH_RPC_TIMEOUT_PADDING_MS);
 }
 
-// src/mcp/weacpx-mcp-transport.ts
+// src/mcp/xacpx-mcp-transport.ts
 function createOrchestrationTransport(endpoint, deps = {}) {
   const client = deps.client ?? new OrchestrationClient(endpoint);
   return {
@@ -46637,7 +46739,7 @@ function createOrchestrationTransport(endpoint, deps = {}) {
     workerRaiseQuestion: async (input) => {
       const sourceHandle = input.sourceHandle.trim();
       if (sourceHandle.length === 0) {
-        throw new Error("worker_raise_question requires a bound sourceHandle; start mcp-stdio with --source-handle or WEACPX_SOURCE_HANDLE");
+        throw new Error("worker_raise_question requires a bound sourceHandle; start mcp-stdio with --source-handle or XACPX_SOURCE_HANDLE");
       }
       return await client.workerRaiseQuestion({
         taskId: input.taskId,
@@ -46671,11 +46773,11 @@ function createOrchestrationTransport(endpoint, deps = {}) {
   };
 }
 
-// src/mcp/weacpx-mcp-server.ts
+// src/mcp/xacpx-mcp-server.ts
 var TASK_OPTIONS_CACHE_LIMIT = 1000;
 var TASKS_LIST_PAGE_SIZE = 100;
 var WATCH_TASKS_CACHE_LIMIT = 256;
-var WEACPX_MCP_SERVER_INSTRUCTIONS = [
+var XACPX_MCP_SERVER_INSTRUCTIONS = [
   "Use these tools to orchestrate work across other agents under your coordinator session.",
   "",
   "Delegate with delegate_request (one task) or delegate_batch (several at once). Each returns a taskId and a status.",
@@ -46686,12 +46788,12 @@ var WEACPX_MCP_SERVER_INSTRUCTIONS = [
   "worker_raise_question is worker-side only — call it from inside a delegated task when you are blocked, not from the coordinator waiting on a delegation."
 ].join(`
 `);
-function createWeacpxMcpServer(options) {
+function createXacpxMcpServer(options) {
   let getToolState;
   const taskOptionsById = new Map;
   const watchTasksById = new Map;
   const server = new Server({
-    name: "weacpx",
+    name: "xacpx",
     version: readVersion()
   }, {
     capabilities: {
@@ -46702,8 +46804,8 @@ function createWeacpxMcpServer(options) {
         requests: { tools: { call: {} } }
       }
     },
-    instructions: WEACPX_MCP_SERVER_INSTRUCTIONS,
-    taskStore: createWeacpxTaskStore(async () => await getToolState(), taskOptionsById, watchTasksById)
+    instructions: XACPX_MCP_SERVER_INSTRUCTIONS,
+    taskStore: createXacpxTaskStore(async () => await getToolState(), taskOptionsById, watchTasksById)
   });
   let toolState = null;
   let toolStatePromise = null;
@@ -46716,7 +46818,7 @@ function createWeacpxMcpServer(options) {
     }
     toolStatePromise = resolveMcpIdentity(server, options).then((identity) => {
       if (!options.transport) {
-        throw new Error("weacpx MCP transport is not configured");
+        throw new Error("xacpx MCP transport is not configured");
       }
       toolState = buildToolState({
         transport: options.transport,
@@ -46797,7 +46899,7 @@ function createWeacpxMcpServer(options) {
   return server;
 }
 function buildToolState(options) {
-  const tools = buildWeacpxMcpToolRegistry(options);
+  const tools = buildXacpxMcpToolRegistry(options);
   return {
     tools,
     toolMap: new Map(tools.map((tool) => [tool.name, tool])),
@@ -46956,10 +47058,10 @@ function renderWatchMcpTaskResult(result, watchTaskId) {
     structuredContent: { watchTaskId, ...result }
   };
 }
-function createWeacpxTaskStore(resolveState, taskOptionsById, watchTasksById) {
+function createXacpxTaskStore(resolveState, taskOptionsById, watchTasksById) {
   return {
     createTask: async () => {
-      throw new Error("weacpx native MCP tasks are created by delegate_request");
+      throw new Error("xacpx native MCP tasks are created by delegate_request");
     },
     getTask: async (taskId) => {
       const watchTask = watchTasksById.get(taskId);
@@ -46970,7 +47072,7 @@ function createWeacpxTaskStore(resolveState, taskOptionsById, watchTasksById) {
       return task ? toMcpTask(task, taskOptionsById.get(taskId)) : null;
     },
     storeTaskResult: async () => {
-      throw new Error("weacpx native MCP task results are stored by orchestration");
+      throw new Error("xacpx native MCP task results are stored by orchestration");
     },
     getTaskResult: async (taskId) => {
       const watchTask = watchTasksById.get(taskId);
@@ -46994,7 +47096,7 @@ function createWeacpxTaskStore(resolveState, taskOptionsById, watchTasksById) {
         await state.transport.cancelTask({ coordinatorSession: state.coordinatorSession, taskId });
         return;
       }
-      throw new Error(`weacpx MCP task status is read-only (${status}${statusMessage ? `: ${statusMessage}` : ""})`);
+      throw new Error(`xacpx MCP task status is read-only (${status}${statusMessage ? `: ${statusMessage}` : ""})`);
     },
     listTasks: async (cursor) => {
       const state = await resolveState();
@@ -47254,9 +47356,9 @@ function defaultIsProcessRunning3(pid) {
     return code !== "ESRCH";
   }
 }
-async function runWeacpxMcpServer(options) {
+async function runXacpxMcpServer(options) {
   const transport = options.transport ?? createOrchestrationTransport(options.endpoint ?? resolveDefaultOrchestrationEndpoint(process.env, process.platform));
-  const server = createWeacpxMcpServer({
+  const server = createXacpxMcpServer({
     transport,
     ...options.coordinatorSession ? { coordinatorSession: options.coordinatorSession } : {},
     ...options.sourceHandle ? { sourceHandle: options.sourceHandle } : {},
@@ -47841,6 +47943,10 @@ async function handleChannelCli(args, deps) {
       if (args.length < 2 || !args[1])
         return null;
       return await dispatchSetEnabled(args[1], false, args.slice(2), deps);
+    case "set-reply-mode":
+      if (args.length < 3 || !args[1] || !args[2])
+        return null;
+      return await setChannelReplyMode(args[1], args[2], args.slice(3), deps);
     default:
       return null;
   }
@@ -48157,6 +48263,28 @@ async function setChannelEnabled(type, enabled, rawArgs, deps) {
   deps.print(t().channelCli.channelEnabledToggled(channel.id, enabled));
   return await maybeRestartAfterMutation(restartFlags.restart, deps);
 }
+async function setChannelReplyMode(type, mode, rawArgs, deps) {
+  const restartFlags = parseRestartFlags(rawArgs);
+  if (!restartFlags.ok) {
+    deps.print(restartFlags.message);
+    return 1;
+  }
+  if (mode !== "stream" && mode !== "final" && mode !== "verbose") {
+    deps.print(t().channelCli.channelReplyModeInvalid(mode));
+    return 1;
+  }
+  const config4 = await deps.loadConfig();
+  ensureChannelsArray(config4);
+  const channel = findChannel(config4.channels, type);
+  if (!channel) {
+    deps.print(t().channelCli.channelNotFound(type));
+    return 1;
+  }
+  channel.replyMode = mode;
+  await deps.saveConfig(config4);
+  deps.print(t().channelCli.channelReplyModeSet(channel.id, mode));
+  return await maybeRestartAfterMutation(restartFlags.restart, deps);
+}
 function requireMultiAccountProvider(type, deps) {
   const provider = getChannelCliProvider(type);
   if (!provider) {
@@ -48483,7 +48611,7 @@ async function inspectPlugins(input) {
     }
     try {
       const plugin = validateWeacpxPlugin(moduleValue, configPlugin.name, {
-        ...input.currentWeacpxVersion !== undefined ? { currentWeacpxVersion: input.currentWeacpxVersion } : {}
+        ...input.currentXacpxVersion !== undefined ? { currentXacpxVersion: input.currentXacpxVersion } : {}
       });
       const channels = plugin.channels ?? [];
       const channelTypes = channels.map((channel) => channel.type);
@@ -49826,7 +49954,7 @@ async function defaultMcpStdio(args, deps = {}) {
 `);
     return 2;
   }
-  await runWeacpxMcpServer({
+  await runXacpxMcpServer({
     transport,
     ...coordinatorSession ? { coordinatorSession } : {},
     ...sourceHandle ? { sourceHandle } : {},