weacpx 0.5.2 → 0.6.1

package/dist/cli.js

@@ -2088,36 +2088,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 +2146,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
@@ -9688,8 +9702,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 +9729,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 +9798,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
@@ -9759,6 +9823,7 @@ function createEmptyState() {
   return {
     sessions: {},
     chat_contexts: {},
+    native_session_lists: {},
     orchestration: createEmptyOrchestrationState(),
     scheduled_tasks: {}
   };
@@ -9977,11 +10042,14 @@ function parseOrchestrationState(raw, path3) {
 function isReplyMode2(value) {
   return value === "stream" || value === "final" || value === "verbose";
 }
+function isSessionSource(value) {
+  return value === undefined || value === "weacpx" || value === "agent-side";
+}
 function isSessionRecord(value) {
   if (!isRecord2(value)) {
     return false;
   }
-  return isString(value.alias) && isString(value.agent) && isString(value.workspace) && isString(value.transport_session) && isOptionalString(value.transport_agent_command) && isOptionalString(value.mode_id) && (value.reply_mode === undefined || isReplyMode2(value.reply_mode)) && isString(value.created_at) && isString(value.last_used_at);
+  return isString(value.alias) && isString(value.agent) && isString(value.workspace) && isString(value.transport_session) && isSessionSource(value.source) && isOptionalString(value.agent_session_id) && isOptionalString(value.agent_session_title) && isOptionalString(value.agent_session_updated_at) && isOptionalString(value.attached_at) && isOptionalString(value.transport_agent_command) && isOptionalString(value.mode_id) && (value.reply_mode === undefined || isReplyMode2(value.reply_mode)) && isString(value.created_at) && isString(value.last_used_at);
 }
 function parseSessions(raw, path3) {
   const sessions = {};
@@ -10006,6 +10074,30 @@ function parseChatContexts(raw, path3) {
   }
   return chatContexts;
 }
+function isNativeSessionCacheEntry(value) {
+  if (!isRecord2(value)) {
+    return false;
+  }
+  return isString(value.session_id) && isOptionalString(value.cwd) && (value.title === undefined || value.title === null || isString(value.title)) && isOptionalString(value.updated_at);
+}
+function isNativeSessionListCacheRecord(value) {
+  if (!isRecord2(value)) {
+    return false;
+  }
+  return isString(value.created_at) && isString(value.agent) && isOptionalString(value.workspace) && isString(value.cwd) && Array.isArray(value.sessions) && value.sessions.every(isNativeSessionCacheEntry) && (value.next_cursor === undefined || value.next_cursor === null || isString(value.next_cursor));
+}
+function parseNativeSessionLists(raw) {
+  if (!isRecord2(raw)) {
+    return {};
+  }
+  const nativeSessionLists = {};
+  for (const [chatKey, value] of Object.entries(raw)) {
+    if (isNativeSessionListCacheRecord(value)) {
+      nativeSessionLists[chatKey] = value;
+    }
+  }
+  return nativeSessionLists;
+}
 function isScheduledTaskStatus(value) {
   return value === "pending" || value === "triggering" || value === "executed" || value === "cancelled" || value === "missed" || value === "failed";
 }
@@ -10050,6 +10142,7 @@ function parseState(raw, path3) {
   return {
     sessions: parsedSessions,
     chat_contexts: parseChatContexts(chatContexts, path3),
+    native_session_lists: parseNativeSessionLists(raw.native_session_lists),
     orchestration,
     scheduled_tasks: parseScheduledTasks(raw.scheduled_tasks, path3)
   };
@@ -10167,6 +10260,13 @@ function resolveSessionAliasForInput(channelId, displayAlias, existingAliases) {
   }
   return scopedAlias;
 }
+function scopeDisplayAliasToInternal(channelId, displayAlias) {
+  const normalized = displayAlias.trim();
+  if (normalized.length === 0) {
+    throw new Error("display session alias must be non-empty");
+  }
+  return channelId === "weixin" ? normalized : toInternalSessionAlias(channelId, normalized);
+}
 function buildDefaultTransportSession(channelId, displayAlias) {
   const normalized = displayAlias.trim();
   if (normalized.length === 0) {
@@ -10252,7 +10352,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 = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
@@ -10398,7 +10498,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;
     }
@@ -10412,12 +10515,16 @@ 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 { 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";
 function coerceMissing(value) {
@@ -10441,6 +10548,27 @@ function resolvePluginHome(input = {}) {
   const home = coerceMissing(input.home) ?? coerceMissing(process.env.HOME) ?? homedir3();
   return join3(home, ".weacpx", "plugins");
 }
+async function normalizePluginHomeManifest(pluginHome) {
+  const manifestPath = join3(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) + `
@@ -10479,7 +10607,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")) {
@@ -12988,16 +13120,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);
@@ -15985,7 +16125,7 @@ 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 { mkdir as mkdir8, open as open3, readFile as readFile7, rm as rm6 } from "node:fs/promises";
 import { dirname as dirname8, join as join5 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 function createWeixinConsumerLock(options = {}) {
@@ -16067,7 +16207,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;
@@ -16110,6 +16250,7 @@ var init_consumer_lock = __esm(() => {
 // src/channels/weixin-channel.ts
 class WeixinChannel {
   id = "weixin";
+  nativeSessionListFormat = "cards";
   agent = null;
   quota = null;
   logger = null;
@@ -16748,7 +16889,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) {
@@ -16757,7 +16898,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);
@@ -16917,6 +17058,7 @@ var init_command_list = __esm(() => {
     "/pm",
     "/session",
     "/ss",
+    "/ssn",
     "/workspace",
     "/ws",
     "/use",
@@ -16999,6 +17141,51 @@ function parseCommand(input) {
   if (command === "/session" && parts[1] === "rm" && parts[2] && parts.length === 3) {
     return { kind: "session.rm", alias: parts[2] };
   }
+  if (command === "/ssn") {
+    if (parts.length === 1) {
+      return { kind: "session.native.list" };
+    }
+    const identifier = parts[1] ?? "";
+    if (/^\d+$/.test(identifier)) {
+      const selected = readNativeAttachCommand(parts, 1);
+      if (!selected) {
+        return { kind: "invalid", text: trimmed, recognizedCommand: "/ssn" };
+      }
+      return selected.alias ? { kind: "session.native.select", identifier, alias: selected.alias } : { kind: "session.native.select", identifier };
+    }
+    if (parts[1] === "attach") {
+      if (!parts[2]) {
+        return { kind: "invalid", text: trimmed, recognizedCommand: "/ssn" };
+      }
+      const attached = readNativeAttachCommand(parts, 2);
+      if (attached) {
+        return attached;
+      }
+      return { kind: "invalid", text: trimmed, recognizedCommand: "/ssn" };
+    }
+    const nativeList = readNativeListCommand(parts, 1);
+    if (nativeList) {
+      return nativeList;
+    }
+    return { kind: "invalid", text: trimmed, recognizedCommand: "/ssn" };
+  }
+  if (command === "/session" && parts[1] === "native") {
+    const nativeList = readNativeListCommand(parts, 2);
+    if (nativeList) {
+      return nativeList;
+    }
+    return { kind: "invalid", text: trimmed, recognizedCommand: "/session" };
+  }
+  if (command === "/session" && parts[1] === "attach" && parts[2] === "native") {
+    if (!parts[3]) {
+      return { kind: "invalid", text: trimmed, recognizedCommand: "/session" };
+    }
+    const attached = readNativeAttachCommand(parts, 3);
+    if (attached) {
+      return attached;
+    }
+    return { kind: "invalid", text: trimmed, recognizedCommand: "/session" };
+  }
   if (command === "/group" && parts[1] === "new" && parts.length > 2) {
     const title = parts.slice(2).join(" ");
     if (title.trim().length > 0) {
@@ -17264,6 +17451,97 @@ function readSessionShortcutTarget(parts, startIndex) {
   }
   return null;
 }
+function readNativeListCommand(parts, startIndex) {
+  let agent = "";
+  let cwd = "";
+  let workspace = "";
+  let all = false;
+  let cursor = "";
+  let invalid = false;
+  if (startIndex < parts.length && !parts[startIndex]?.startsWith("-")) {
+    agent = parts[startIndex] ?? "";
+    startIndex += 1;
+  }
+  for (let index = startIndex;index < parts.length; index += 1) {
+    const part = parts[index];
+    if (part === "--all") {
+      all = true;
+      continue;
+    }
+    if (part === "--cursor") {
+      const value = parts[index + 1] ?? "";
+      if (index + 1 >= parts.length || value.startsWith("-")) {
+        invalid = true;
+        break;
+      }
+      cursor = value;
+      index += 1;
+      continue;
+    }
+    if (part === "--cwd" || part === "-d") {
+      const value = parts[index + 1] ?? "";
+      if (index + 1 >= parts.length || value.startsWith("-") || workspace) {
+        invalid = true;
+        break;
+      }
+      cwd = value;
+      index += 1;
+      continue;
+    }
+    if (part === "--ws" || part === "-ws") {
+      const value = parts[index + 1] ?? "";
+      if (index + 1 >= parts.length || value.startsWith("-") || cwd) {
+        invalid = true;
+        break;
+      }
+      workspace = value;
+      index += 1;
+      continue;
+    }
+    invalid = true;
+    break;
+  }
+  if (invalid) {
+    return null;
+  }
+  const result = {
+    kind: "session.native.list"
+  };
+  if (agent.trim().length > 0)
+    result.agent = agent;
+  if (cwd.trim().length > 0)
+    result.cwd = cwd;
+  if (workspace.trim().length > 0)
+    result.workspace = workspace;
+  if (all)
+    result.all = true;
+  if (cursor.trim().length > 0)
+    result.cursor = cursor;
+  return Object.keys(result).length > 1 ? result : { kind: "session.native.list" };
+}
+function readNativeAttachCommand(parts, identifierIndex) {
+  const identifier = parts[identifierIndex] ?? "";
+  let alias = "";
+  for (let index = identifierIndex + 1;index < parts.length; index += 1) {
+    if (parts[index] === "-a" || parts[index] === "--alias") {
+      const value = parts[index + 1] ?? "";
+      if (index + 1 >= parts.length || value.startsWith("-")) {
+        return null;
+      }
+      alias = value;
+      index += 1;
+      continue;
+    }
+    return null;
+  }
+  if (identifier.trim().length === 0 || identifier.startsWith("-")) {
+    return null;
+  }
+  if (alias.trim().length > 0) {
+    return { kind: "session.native.attach", identifier, alias };
+  }
+  return { kind: "session.native.attach", identifier };
+}
 function normalizeCommand(command) {
   if (command === "/ss")
     return "/session";
@@ -17501,6 +17779,9 @@ var init_command_policy = __esm(() => {
     "session.shortcut": "/session",
     "session.shortcut.new": "/session",
     "session.attach": "/session attach",
+    "session.native.list": "/ssn",
+    "session.native.select": "/ssn",
+    "session.native.attach": "/ssn attach",
     "later.create": "/later",
     "later.list": "/later list",
     "later.cancel": "/later cancel"
@@ -18118,7 +18399,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,
@@ -18161,7 +18442,7 @@ async function handleSessions(context, chatKey) {
 }
 async function handleSessionNew(context, chatKey, alias, agent, workspace) {
   const channelId = getChannelIdFromChatKey(chatKey);
-  const internalAlias = channelId === "weixin" ? alias : toInternalSessionAlias(channelId, alias);
+  const internalAlias = scopeDisplayAliasToInternal(channelId, alias);
   const session = context.lifecycle.resolveSession(internalAlias, agent, workspace, `${workspace}:${internalAlias}`);
   const releaseTransportReservation = await context.lifecycle.reserveTransportSession(session.transportSession);
   try {
@@ -18192,7 +18473,7 @@ async function handleSessionShortcut(context, chatKey, agent, target, createNew)
 }
 async function handleSessionAttach(context, chatKey, alias, agent, workspace, transportSession) {
   const channelId = getChannelIdFromChatKey(chatKey);
-  const internalAlias = channelId === "weixin" ? alias : toInternalSessionAlias(channelId, alias);
+  const internalAlias = scopeDisplayAliasToInternal(channelId, alias);
   const attached = context.lifecycle.resolveSession(internalAlias, agent, workspace, transportSession);
   const releaseTransportReservation = await context.lifecycle.reserveTransportSession(attached.transportSession);
   try {
@@ -18559,7 +18840,7 @@ async function markCoordinatorResultsInjectionFailed(context, taskIds, groupIds,
     });
   }
 }
-var NO_CURRENT_SESSION_TEXT = "当前还没有选中的会话。请先执行 /session new ... 或 /use <alias>。", DEFAULT_SESSION_TAIL_LINES = 50, MAX_SESSION_TAIL_LINES = 500, sessionHelp, modeHelp, replyModeHelp, statusHelp, cancelHelp;
+var NO_CURRENT_SESSION_TEXT = "当前还没有选中的会话。请先执行 /session new ... 或 /use <alias>。", DEFAULT_SESSION_TAIL_LINES = 50, MAX_SESSION_TAIL_LINES = 500, sessionHelp, nativeSessionHelp, modeHelp, replyModeHelp, statusHelp, cancelHelp;
 var init_session_handler = __esm(() => {
   init_build_coordinator_prompt();
   init_channel_scope();
@@ -18567,7 +18848,7 @@ var init_session_handler = __esm(() => {
   sessionHelp = {
     topic: "session",
     aliases: ["ss", "sessions"],
-    summary: "创建、恢复、切换和重置逻辑会话。",
+    summary: "创建、复用、切换和重置 weacpx 逻辑会话。",
     commands: [
       { usage: "/sessions", description: "查看当前会话列表" },
       { usage: "/session 或 /ss", description: "查看会话列表" },
@@ -18575,12 +18856,48 @@ var init_session_handler = __esm(() => {
       { usage: "/ss new <agent> (-d <path> | --ws <name>)", description: "强制新建会话" },
       { usage: "/ss new <alias> -a <name> --ws <name>", description: "按指定配置新建会话" },
       { usage: "/ss attach <alias> -a <name> --ws <name> --name <transport-session>", description: "绑定已有会话" },
+      { usage: "/ssn 或 /help ssn", description: "接入本地 native 会话（Codex 等 Agent 原生会话）" },
       { usage: "/session tail [N]", description: "补拉当前会话的历史输出（默认 50 行）" },
       { usage: "/session rm <alias>", description: "删除逻辑会话" },
       { usage: "/use <alias>", description: "切换当前会话" },
       { usage: "/session reset 或 /clear", description: "重置当前会话上下文" }
     ],
-    examples: ["/ss codex -d /absolute/path/to/repo", "/use backend-fix", "/session rm old-session", "/session reset"]
+    examples: [
+      "/ss codex -d /absolute/path/to/repo",
+      "/ssn",
+      "/ssn 1",
+      "/use backend-fix",
+      "/session rm old-session",
+      "/session reset"
+    ]
+  };
+  nativeSessionHelp = {
+    topic: "native",
+    aliases: ["ssn", "native-session"],
+    summary: "接入 Codex 等 Agent 的本地原生会话。",
+    commands: [
+      { usage: "/ssn", description: "按当前 weacpx 会话上下文查看本地 native 会话" },
+      { usage: "/ssn <agent> --ws <workspace>", description: "查询指定工作区的本地 native 会话；只有一个候选时自动接入" },
+      { usage: "/ssn <agent> -d <path>", description: "按本机绝对路径查询；只有一个候选时自动接入" },
+      { usage: "/ssn <agent> --ws <workspace> --all", description: "跨 cwd 查看该 agent 的 native 会话" },
+      { usage: "/ssn 1", description: "接入或切换到最近一次列表里的第 1 个候选" },
+      { usage: "/ssn 1 -a <alias>", description: "接入第 1 个候选并指定 weacpx 别名（推荐，无需完整 sessionId）" },
+      { usage: "/ssn attach <sessionId> -a <alias>", description: "按原生 sessionId 接入（适合已知完整 id），并指定 weacpx 别名" },
+      { usage: "/ss attach native <sessionId> -a <alias>", description: "/ssn attach 的长写法" }
+    ],
+    examples: [
+      "/ssn codex --ws backend",
+      "/ssn codex -d /absolute/path/to/repo",
+      "/ssn",
+      "/ssn 1",
+      "/ssn 1 -a fix-ci"
+    ],
+    notes: [
+      "/ss 管 weacpx 逻辑会话；/ssn 只负责查询和接入 Agent 原生会话。",
+      "接入后继续发普通消息，会继续同一个 Agent 原生会话，不是复制一份新上下文。",
+      "如果当前 acpx 或 Agent 不支持 native 会话，请继续使用 /ss。",
+      "完整说明见 docs/native-sessions.md。"
+    ]
   };
   modeHelp = {
     topic: "mode",
@@ -19543,6 +19860,7 @@ var init_help_registry = __esm(() => {
   init_later_handler();
   HELP_TOPICS = [
     sessionHelp,
+    nativeSessionHelp,
     workspaceHelp,
     agentHelp,
     permissionHelp,
@@ -19574,11 +19892,33 @@ 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 [
     "常用入口：",
     "- /ss <agent> (-d <path> | --ws <name>) - 快速新建或切到会话",
+    "- /ssn <agent> (-d <path> | --ws <name>) - 接入本地 Agent 原生会话",
     "- /use <alias> - 切换当前会话",
     "- /status - 查看当前会话状态",
     "",
@@ -19587,7 +19927,7 @@ function renderHelpIndex() {
     "",
     "查看专题说明：",
     "- /help <topic>",
-    "- 例如：/help ss、/help ws、/help pm"
+    "- 例如：/help ss、/help ssn、/help ws、/help pm"
   ].join(`
 `);
 }
@@ -19669,7 +20009,7 @@ async function handleSessionShortcutCommand(context, ops, chatKey, agent, target
   });
   const baseAlias = `${workspace.name}:${agent}`;
   const channelId = getChannelIdFromChatKey(chatKey);
-  const scopedBase = channelId === "weixin" ? baseAlias : `${channelId}:${baseAlias}`;
+  const scopedBase = scopeDisplayAliasToInternal(channelId, baseAlias);
   const alias = createNew ? await allocateUniqueSessionAlias(context, scopedBase, chatKey) : scopedBase;
   const display = toDisplaySessionAlias(alias);
   if (!createNew && await hasLogicalSession(context, alias, chatKey)) {
@@ -19798,6 +20138,404 @@ var init_session_shortcut_handler = __esm(() => {
   init_channel_scope();
 });
 
+// src/commands/handlers/native-session-handler.ts
+async function handleNativeSessionList(context, chatKey, input) {
+  const target = await resolveNativeTarget(context, chatKey, input);
+  if (isRouterResponse(target)) {
+    return target;
+  }
+  const listAgentSessions = context.transport.listAgentSessions?.bind(context.transport);
+  if (!listAgentSessions) {
+    return { text: `当前 transport 不支持列出本地会话，请继续使用 /ss。
+说明：/help ssn` };
+  }
+  const query = {
+    agent: target.agent,
+    agentCommand: target.agentCommand,
+    cwd: target.cwd,
+    ...input.cursor ? { cursor: input.cursor } : {},
+    ...input.all ? {} : { filterCwd: target.cwd }
+  };
+  let result;
+  try {
+    result = await listAgentSessions(query);
+  } catch (error2) {
+    return { text: renderNativeListError(target, error2) };
+  }
+  if (!result) {
+    return { text: `当前 transport 不支持列出本地会话，请继续使用 /ss。
+说明：/help ssn` };
+  }
+  await context.sessions.cacheNativeSessionList(chatKey, {
+    agent: target.agent,
+    workspace: target.workspace,
+    cwd: target.cwd,
+    sessions: result.sessions,
+    ...result.nextCursor !== undefined ? { nextCursor: result.nextCursor } : {}
+  });
+  if (result.sessions.length === 0) {
+    return {
+      text: [
+        `没有找到本地 ${target.agentDisplayName} 会话（${target.workspaceLabel}）。`,
+        `你可以稍后再试，或先通过 /ss 保持当前逻辑会话。`
+      ].join(`
+`)
+    };
+  }
+  const explicitAttachTarget = Boolean(input.workspace || input.cwd);
+  if (explicitAttachTarget && !input.all && !input.cursor && result.sessions.length === 1) {
+    return await attachNativeSession(context, chatKey, target, result.sessions[0], undefined);
+  }
+  const attachedEntries = await buildAttachedEntries(context, chatKey, target.agent, result.sessions);
+  const nativeSessionListOptions = { format: context.resolveNativeSessionListFormat?.(chatKey) ?? "table" };
+  return {
+    text: renderNativeSessionList(target, result, attachedEntries, Boolean(input.all), nativeSessionListOptions)
+  };
+}
+async function handleNativeSessionSelect(context, chatKey, identifier, alias) {
+  const trimmed = identifier.trim();
+  if (!trimmed) {
+    return { text: `请选择要切换的 native 会话编号或 sessionId。
+说明：/help ssn` };
+  }
+  if (/^[0-9]+$/.test(trimmed)) {
+    const cached2 = await context.sessions.getNativeSessionList(chatKey, NATIVE_SESSION_CACHE_TTL_MS);
+    if (!cached2 || cached2.sessions.length === 0) {
+      return { text: `当前没有可用的 native 会话列表，请先执行 /ssn 再选择。
+说明：/help ssn` };
+    }
+    const index = Number(trimmed) - 1;
+    const session = cached2.sessions[index];
+    if (!session) {
+      return { text: "编号超出范围，请先执行 /ssn 重新获取列表。" };
+    }
+    const target2 = await resolveTargetFromCachedSession(context, chatKey, cached2, session);
+    if (isRouterResponse(target2)) {
+      return target2;
+    }
+    return await attachNativeSession(context, chatKey, target2, session, alias);
+  }
+  const target = await resolveNativeTarget(context, chatKey, {});
+  if (isRouterResponse(target)) {
+    return target;
+  }
+  return await attachNativeSession(context, chatKey, target, { sessionId: trimmed }, alias);
+}
+async function attachNativeSession(context, chatKey, target, session, alias) {
+  if (!context.transport.resumeAgentSession) {
+    return { text: "当前 transport 不支持接入本地会话，请继续使用 /ss。" };
+  }
+  const nativeTarget = target;
+  const existing = await context.sessions.findAttachedNativeSession(chatKey, nativeTarget.agent, session.sessionId);
+  if (existing) {
+    await context.sessions.useSession(chatKey, existing.alias);
+    const displayAlias2 = toDisplaySessionAlias(existing.alias);
+    return {
+      text: `已切换到已接入的本地会话：${nativeTarget.agentDisplayName} · ${displayAlias2}`
+    };
+  }
+  const requestedAlias = alias?.trim() || buildDefaultNativeAlias(nativeTarget.agent, session.sessionId);
+  const displayAlias = await allocateUniqueNativeAlias(context, chatKey, requestedAlias);
+  const internalAlias = scopeDisplayAliasToInternal(getChannelIdFromChatKey(chatKey), displayAlias);
+  const transportSession = context.sessions.buildDefaultTransportSessionForChat(chatKey, displayAlias);
+  const resolvedSession = context.lifecycle.resolveSession(internalAlias, nativeTarget.agent, nativeTarget.workspace, transportSession);
+  const releaseReservation = await context.lifecycle.reserveTransportSession(resolvedSession.transportSession);
+  try {
+    try {
+      await context.transport.resumeAgentSession(resolvedSession, session.sessionId);
+    } catch (error2) {
+      return { text: renderNativeResumeError(target, error2) };
+    }
+    const verified = await context.lifecycle.checkTransportSession(resolvedSession);
+    if (!verified) {
+      return { text: `本地 ${target.agentDisplayName} 会话接入失败：未检测到已恢复的后端会话。` };
+    }
+    await context.sessions.attachNativeSession({
+      alias: internalAlias,
+      agent: nativeTarget.agent,
+      workspace: nativeTarget.workspace,
+      transportSession,
+      ...target.agentCommand ? { transportAgentCommand: target.agentCommand } : {},
+      agentSessionId: session.sessionId,
+      title: session.title,
+      updatedAt: session.updatedAt
+    });
+    await context.sessions.useSession(chatKey, internalAlias);
+    await refreshAgentCommandBestEffort(context, internalAlias);
+    return {
+      text: `已接入本地 ${target.agentDisplayName} 会话并切换：${toDisplaySessionAlias(internalAlias)}`
+    };
+  } finally {
+    await releaseReservation();
+  }
+}
+async function resolveNativeTarget(context, chatKey, input) {
+  const currentSession = await context.sessions.getCurrentSession(chatKey);
+  const agent = input.agent?.trim() || currentSession?.agent || "";
+  if (!agent) {
+    return {
+      text: `请先选择上下文，例如：
+/ssn codex --ws project
+/ssn codex -d /Users/me/project
+说明：/help ssn`
+    };
+  }
+  const agentConfig = context.config?.agents[agent];
+  if (!agentConfig) {
+    return { text: `Agent「${agent}」未注册。` };
+  }
+  const workspaceResolution = await resolveNativeWorkspace(context, input, currentSession);
+  if (isRouterResponse(workspaceResolution)) {
+    return workspaceResolution;
+  }
+  return {
+    agent,
+    agentDisplayName: displayAgentName(agent),
+    agentCommand: resolveAgentCommand(agentConfig.driver, agentConfig.command),
+    workspace: workspaceResolution.workspace,
+    workspaceLabel: workspaceResolution.workspaceLabel,
+    cwd: workspaceResolution.cwd,
+    source: workspaceResolution.source
+  };
+}
+async function resolveTargetFromCachedSession(context, chatKey, cached2, session) {
+  if (session.cwd && !sameWorkspacePath(session.cwd, cached2.cwd)) {
+    return await resolveNativeTarget(context, chatKey, {
+      agent: cached2.agent,
+      cwd: session.cwd
+    });
+  }
+  return await resolveNativeTarget(context, chatKey, {
+    agent: cached2.agent,
+    ...cached2.workspace ? { workspace: cached2.workspace } : { cwd: cached2.cwd }
+  });
+}
+async function resolveNativeWorkspace(context, input, currentSession) {
+  if (input.workspace) {
+    const workspaceConfig = context.config?.workspaces[input.workspace];
+    if (!workspaceConfig) {
+      return { text: `工作区「${input.workspace}」未注册。` };
+    }
+    return {
+      workspace: input.workspace,
+      workspaceLabel: input.workspace,
+      cwd: workspaceConfig.cwd,
+      source: "workspace"
+    };
+  }
+  if (input.cwd) {
+    const cwd = normalizeWorkspacePath(input.cwd);
+    const existing = Object.entries(context.config?.workspaces ?? {}).find(([, workspace]) => sameWorkspacePath(workspace.cwd, cwd));
+    if (existing) {
+      return {
+        workspace: existing[0],
+        workspaceLabel: existing[0],
+        cwd: existing[1].cwd,
+        source: "cwd"
+      };
+    }
+    if (!await pathExists(cwd)) {
+      return { text: `工作区路径不存在：${input.cwd}` };
+    }
+    if (!context.configStore || !context.config) {
+      return { text: "当前没有加载可写入的配置，无法根据路径创建工作区。" };
+    }
+    const workspaceName = allocateWorkspaceName(sanitizeWorkspaceName(basenameForWorkspacePath(cwd)), context.config.workspaces);
+    const updated = await context.configStore.upsertWorkspace(workspaceName, cwd);
+    context.replaceConfig(updated);
+    return {
+      workspace: workspaceName,
+      workspaceLabel: workspaceName,
+      cwd,
+      source: "cwd"
+    };
+  }
+  if (currentSession) {
+    return {
+      workspace: currentSession.workspace,
+      workspaceLabel: currentSession.workspace,
+      cwd: currentSession.cwd,
+      source: "workspace"
+    };
+  }
+  return {
+    text: `请先选择上下文，例如：
+/ssn codex --ws project
+/ssn codex -d /Users/me/project
+说明：/help ssn`
+  };
+}
+async function buildAttachedEntries(context, chatKey, agent, sessions) {
+  const currentSession = await context.sessions.getCurrentSession(chatKey);
+  return await Promise.all(sessions.map(async (session) => {
+    const attached = await context.sessions.findAttachedNativeSession(chatKey, agent, session.sessionId);
+    if (!attached) {
+      return { session };
+    }
+    return {
+      session,
+      attached: {
+        alias: attached.alias,
+        displayAlias: toDisplaySessionAlias(attached.alias),
+        isCurrent: currentSession?.alias === attached.alias
+      }
+    };
+  }));
+}
+function renderNativeSessionList(target, result, entries, includeAll, options = {}) {
+  if (options.format === "cards") {
+    return renderNativeSessionCardList(target, result, entries, includeAll);
+  }
+  return renderNativeSessionTableList(target, result, entries, includeAll);
+}
+function renderNativeSessionTableList(target, result, entries, includeAll) {
+  const lines = [`本地 ${target.agentDisplayName} 会话（${target.workspaceLabel}）：`];
+  lines.push("| # | 标题 | 更新时间 | ID |");
+  lines.push("|---|---|---|---|");
+  entries.forEach((entry, index) => {
+    const title = escapeMarkdownTableCell(renderNativeSessionTitle(entry.session.title, entry.session.sessionId));
+    const updatedAt = entry.session.updatedAt ? formatNativeSessionTime(entry.session.updatedAt) : "-";
+    const idParts = [entry.session.sessionId];
+    if (entry.attached) {
+      idParts.push(`已接入：${entry.attached.displayAlias}${entry.attached.isCurrent ? " [当前]" : ""}`);
+    }
+    lines.push(`| ${index + 1} | ${title} | ${escapeMarkdownTableCell(updatedAt)} | ${escapeMarkdownTableCell(idParts.join(" · "))} |`);
+  });
+  lines.push("");
+  lines.push("操作：");
+  lines.push("接入：/ssn 1");
+  lines.push("指定别名：/ssn 1 -a fix-ci");
+  lines.push("说明：/help ssn");
+  if (result.nextCursor) {
+    lines.push(`更多：${renderNextPageCommand(target, result.nextCursor, includeAll)}`);
+  }
+  return lines.join(`
+`);
+}
+function renderNativeSessionCardList(target, result, entries, includeAll) {
+  const lines = [
+    `本地 ${target.agentDisplayName} 会话（${target.workspaceLabel}）：`,
+    "回复编号接入，ID 尾号用于区分。"
+  ];
+  entries.forEach((entry, index) => {
+    const title = renderNativeSessionTitle(entry.session.title, entry.session.sessionId);
+    const updatedAt = entry.session.updatedAt ? formatNativeSessionTime(entry.session.updatedAt) : "-";
+    lines.push("");
+    lines.push(`【${index + 1}】 ${title}`);
+    lines.push(`时间：${updatedAt}`);
+    lines.push(`ID：${formatSessionIdTail(entry.session.sessionId)}`);
+    if (entry.attached) {
+      lines.push(`已接入：${entry.attached.displayAlias}${entry.attached.isCurrent ? " [当前]" : ""}`);
+    }
+  });
+  lines.push("");
+  lines.push("操作：");
+  lines.push("接入：/ssn 1");
+  lines.push("指定别名：/ssn 1 -a fix-ci");
+  lines.push("说明：/help ssn");
+  if (result.nextCursor) {
+    lines.push(`更多：${renderNextPageCommand(target, result.nextCursor, includeAll)}`);
+  }
+  return lines.join(`
+`);
+}
+function renderNativeSessionTitle(title, fallback) {
+  const normalized = (title?.trim() || fallback).replace(/\s+/g, " ");
+  const maxLength = 60;
+  return normalized.length > maxLength ? `${normalized.slice(0, maxLength - 1)}…` : normalized;
+}
+function buildDefaultNativeAlias(agent, sessionId) {
+  return `${agent}-${sessionIdTail(sessionId)}`;
+}
+function formatSessionIdTail(sessionId) {
+  const tail = sessionIdTail(sessionId);
+  return tail.length < sessionId.trim().length ? `…${tail}` : tail;
+}
+function sessionIdTail(sessionId) {
+  const trimmed = sessionId.trim();
+  if (trimmed.length <= 8) {
+    return trimmed;
+  }
+  return trimmed.slice(-8);
+}
+function formatNativeSessionTime(value) {
+  const date4 = new Date(value);
+  if (Number.isNaN(date4.getTime())) {
+    return value;
+  }
+  const pad = (input) => String(input).padStart(2, "0");
+  return `${date4.getFullYear()}-${pad(date4.getMonth() + 1)}-${pad(date4.getDate())} ${pad(date4.getHours())}:${pad(date4.getMinutes())}`;
+}
+function escapeMarkdownTableCell(value) {
+  return value.replace(/\|/g, "\\|").replace(/\r?\n/g, " ");
+}
+function renderNextPageCommand(target, nextCursor, includeAll) {
+  const scope = target.source === "workspace" && target.workspace ? `--ws ${target.workspace}` : `-d ${target.cwd}`;
+  const allFlag = includeAll ? " --all" : "";
+  return `/ssn ${target.agent} ${scope}${allFlag} --cursor ${nextCursor}`;
+}
+async function allocateUniqueNativeAlias(context, chatKey, baseDisplayAlias) {
+  const channelId = getChannelIdFromChatKey(chatKey);
+  const visible = await context.sessions.listSessions(chatKey);
+  const existing = new Set(visible.map((session) => session.internalAlias));
+  const base = baseDisplayAlias.trim() || "native-session";
+  const transportFor = (candidate) => context.sessions.buildDefaultTransportSessionForChat(chatKey, candidate);
+  const isFree = (candidate) => !existing.has(scopeDisplayAliasToInternal(channelId, candidate)) && context.sessions.countAliasesSharingTransport(transportFor(candidate)) === 0;
+  if (isFree(base)) {
+    return base;
+  }
+  let suffix = 2;
+  while (!isFree(`${base}-${suffix}`)) {
+    suffix += 1;
+  }
+  return `${base}-${suffix}`;
+}
+async function refreshAgentCommandBestEffort(context, alias) {
+  try {
+    await context.lifecycle.refreshSessionTransportAgentCommand(alias);
+  } catch (error2) {
+    await context.logger.error("session.native.agent_command_refresh_failed", "failed to refresh native session agent command", {
+      alias,
+      error: error2 instanceof Error ? error2.message : String(error2)
+    });
+  }
+}
+function renderNativeListError(target, error2) {
+  return [
+    `本地 ${target.agentDisplayName} 会话查询失败：${formatErrorMessage(error2)}`,
+    "请确认 acpx/Agent 支持 native 会话查询，或继续使用 /ss。",
+    "说明：/help ssn"
+  ].join(`
+`);
+}
+function renderNativeResumeError(target, error2) {
+  return [
+    `本地 ${target.agentDisplayName} 会话接入失败：${formatErrorMessage(error2)}`,
+    "请确认 acpx/Agent 支持 native 会话恢复，或继续使用 /ss。",
+    "说明：/help ssn"
+  ].join(`
+`);
+}
+function formatErrorMessage(error2) {
+  return error2 instanceof Error ? error2.message : String(error2);
+}
+function isRouterResponse(value) {
+  return typeof value.text === "string";
+}
+function displayAgentName(agent) {
+  if (!agent) {
+    return agent;
+  }
+  return agent.charAt(0).toUpperCase() + agent.slice(1);
+}
+var NATIVE_SESSION_CACHE_TTL_MS;
+var init_native_session_handler = __esm(() => {
+  init_channel_scope();
+  init_workspace_name();
+  init_workspace_path();
+  NATIVE_SESSION_CACHE_TTL_MS = 10 * 60 * 1000;
+});
+
 // src/commands/handlers/session-recovery-handler.ts
 function renderTransportError(session, error2) {
   const message = error2 instanceof Error ? error2.message : String(error2);
@@ -20265,6 +21003,7 @@ class CommandRouter {
   quota;
   scheduled;
   scheduledDelivery;
+  resolveNativeSessionListFormat;
   logger;
   autoInstall = autoInstallOptionalDep;
   discoverPaths = discoverParentPackagePaths;
@@ -20274,7 +21013,7 @@ class CommandRouter {
   __setDiscoverPathsForTest(fn) {
     this.discoverPaths = fn;
   }
-  constructor(sessions, transport, config2, configStore, logger2, resolveSessionAgentCommand = resolveSessionAgentCommandFromIndex, orchestration, quota, scheduled, scheduledDelivery) {
+  constructor(sessions, transport, config2, configStore, logger2, resolveSessionAgentCommand = resolveSessionAgentCommandFromIndex, orchestration, quota, scheduled, scheduledDelivery, resolveNativeSessionListFormat) {
     this.sessions = sessions;
     this.transport = transport;
     this.config = config2;
@@ -20284,6 +21023,7 @@ class CommandRouter {
     this.quota = quota;
     this.scheduled = scheduled;
     this.scheduledDelivery = scheduledDelivery;
+    this.resolveNativeSessionListFormat = resolveNativeSessionListFormat;
     this.logger = logger2 ?? createNoopAppLogger();
   }
   async handle(chatKey, input, reply, replyContextToken, accountId, media, metadata, abortSignal, onToolEvent, onThought, perfSpan) {
@@ -20310,18 +21050,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":
@@ -20358,6 +21087,12 @@ class CommandRouter {
           return await handleSessionShortcut(this.createSessionHandlerContext(reply, perfSpan), chatKey, command.agent, command, true);
         case "session.attach":
           return await handleSessionAttach(this.createSessionHandlerContext(reply, perfSpan), chatKey, command.alias, command.agent, command.workspace, command.transportSession);
+        case "session.native.list":
+          return await handleNativeSessionList(this.createSessionHandlerContext(undefined, perfSpan), chatKey, command);
+        case "session.native.select":
+          return await handleNativeSessionSelect(this.createSessionHandlerContext(undefined, perfSpan), chatKey, command.identifier, command.alias);
+        case "session.native.attach":
+          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 "mode.show":
@@ -20459,7 +21194,8 @@ class CommandRouter {
       configStore: this.configStore,
       logger: this.logger,
       replaceConfig: (updated) => this.replaceConfig(updated),
-      ...this.quota ? { quota: this.quota } : {}
+      ...this.quota ? { quota: this.quota } : {},
+      ...this.resolveNativeSessionListFormat ? { resolveNativeSessionListFormat: this.resolveNativeSessionListFormat } : {}
     };
   }
   createSessionHandlerContext(reply, perfSpan) {
@@ -20821,6 +21557,7 @@ var init_command_router = __esm(() => {
   init_agent_handler();
   init_workspace_handler();
   init_session_shortcut_handler();
+  init_native_session_handler();
   init_later_handler();
   init_session_recovery_handler();
   init_auto_install_optional_dep();
@@ -23965,7 +24702,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);
@@ -25144,11 +25885,13 @@ class SessionService {
   stateStore;
   state;
   stateMutex;
+  now;
   constructor(config2, stateStore, state, options = {}) {
     this.config = config2;
     this.stateStore = stateStore;
     this.state = state;
     this.stateMutex = options.stateMutex ?? new AsyncMutex;
+    this.now = options.now ?? (() => Date.now());
   }
   async createSession(alias, agent, workspace) {
     return await this.createLogicalSession(alias, agent, workspace, `${workspace}:${alias}`);
@@ -25182,6 +25925,14 @@ class SessionService {
   async attachSession(alias, agent, workspace, transportSession, transportAgentCommand) {
     return await this.createLogicalSession(alias, agent, workspace, transportSession, transportAgentCommand);
   }
+  async attachNativeSession(input) {
+    return await this.createLogicalSession(input.alias, input.agent, input.workspace, input.transportSession, input.transportAgentCommand, {
+      source: "agent-side",
+      agentSessionId: input.agentSessionId,
+      title: input.title,
+      updatedAt: input.updatedAt
+    });
+  }
   async getSession(alias) {
     const session = this.state.sessions[alias];
     if (!session) {
@@ -25196,6 +25947,22 @@ class SessionService {
     const preferred = matches.find((session) => session.alias === expectedAlias && session.workspace === expectedWorkspace) ?? matches[0];
     return preferred ? this.toResolvedSession(preferred) : null;
   }
+  async findAttachedNativeSession(chatKey, agent, agentSessionId) {
+    const channelId = getChannelIdFromChatKey(chatKey);
+    for (const session of Object.values(this.state.sessions)) {
+      if (session.source !== "agent-side") {
+        continue;
+      }
+      if (session.agent !== agent || session.agent_session_id !== agentSessionId) {
+        continue;
+      }
+      if (!isSessionAliasVisibleInChannel(session.alias, channelId)) {
+        continue;
+      }
+      return this.toResolvedSession(session);
+    }
+    return null;
+  }
   async useSession(chatKey, alias) {
     await this.mutate(async () => {
       const channelId = getChannelIdFromChatKey(chatKey);
@@ -25315,6 +26082,49 @@ class SessionService {
       return { wasActive };
     });
   }
+  async cacheNativeSessionList(chatKey, input) {
+    await this.mutate(async () => {
+      this.state.native_session_lists[chatKey] = {
+        created_at: new Date(this.now()).toISOString(),
+        agent: input.agent,
+        ...input.workspace !== undefined ? { workspace: input.workspace } : {},
+        cwd: input.cwd,
+        sessions: input.sessions.map((session) => ({
+          session_id: session.sessionId,
+          ...session.cwd !== undefined ? { cwd: session.cwd } : {},
+          ...session.title !== undefined ? { title: session.title } : {},
+          ...session.updatedAt !== undefined ? { updated_at: session.updatedAt } : {}
+        })),
+        ...input.nextCursor !== undefined ? { next_cursor: input.nextCursor } : {}
+      };
+      await this.persist();
+    });
+  }
+  async getNativeSessionList(chatKey, ttlMs = 10 * 60 * 1000) {
+    const cached2 = this.state.native_session_lists[chatKey];
+    if (!cached2) {
+      return null;
+    }
+    const createdAt = Date.parse(cached2.created_at);
+    if (Number.isNaN(createdAt)) {
+      return null;
+    }
+    if (this.now() - createdAt > ttlMs) {
+      return null;
+    }
+    return {
+      agent: cached2.agent,
+      ...cached2.workspace !== undefined ? { workspace: cached2.workspace } : {},
+      cwd: cached2.cwd,
+      sessions: cached2.sessions.map((session) => ({
+        sessionId: session.session_id,
+        ...session.cwd !== undefined ? { cwd: session.cwd } : {},
+        ...session.title !== undefined ? { title: session.title } : {},
+        ...session.updated_at !== undefined ? { updatedAt: session.updated_at } : {}
+      })),
+      ...cached2.next_cursor !== undefined ? { nextCursor: cached2.next_cursor } : {}
+    };
+  }
   toResolvedSession(session) {
     const agentConfig = this.config.agents[session.agent];
     if (!agentConfig) {
@@ -25330,6 +26140,11 @@ class SessionService {
       agentCommand: session.transport_agent_command ?? resolveAgentCommand(agentConfig.driver, agentConfig.command),
       workspace: session.workspace,
       transportSession: session.transport_session,
+      source: session.source,
+      agentSessionId: session.agent_session_id,
+      agentSessionTitle: session.agent_session_title,
+      agentSessionUpdatedAt: session.agent_session_updated_at,
+      attachedAt: session.attached_at,
       modeId: session.mode_id,
       replyMode: session.reply_mode,
       cwd: workspaceConfig.cwd
@@ -25357,20 +26172,25 @@ class SessionService {
   async persist() {
     await this.stateStore.save(this.state);
   }
-  async createLogicalSession(alias, agent, workspace, transportSession, transportAgentCommand) {
+  async createLogicalSession(alias, agent, workspace, transportSession, transportAgentCommand, native) {
     return await this.mutate(async () => {
       this.validateSession(alias, agent, workspace);
       if (this.state.orchestration.externalCoordinators[transportSession]) {
         throw new Error(`transport session "${transportSession}" conflicts with an external coordinator`);
       }
       const existingSession = this.state.sessions[alias];
-      const now = new Date().toISOString();
+      const now = new Date(this.now()).toISOString();
       const normalizedTransportAgentCommand = transportAgentCommand?.trim();
       const session = {
         alias,
         agent,
         workspace,
         transport_session: transportSession,
+        source: native?.source,
+        agent_session_id: native?.agentSessionId,
+        agent_session_title: native?.title ?? undefined,
+        agent_session_updated_at: native?.updatedAt,
+        attached_at: native ? now : undefined,
         ...normalizedTransportAgentCommand ? { transport_agent_command: normalizedTransportAgentCommand } : existingSession?.transport_agent_command ? { transport_agent_command: existingSession.transport_agent_command } : {},
         mode_id: existingSession?.mode_id,
         reply_mode: existingSession?.reply_mode,
@@ -25483,6 +26303,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, {
@@ -25597,7 +26448,9 @@ async function runConsole(paths, deps) {
       abortSignal: shutdownController.signal,
       quota: runtime.quota,
       logger: runtime.logger,
-      perfTracer: runtime.perfTracer
+      perfTracer: runtime.perfTracer,
+      commandHints: listWeacpxCommandHints(),
+      coreVersion: WEACPX_CORE_VERSION
     });
     channelStartPromise.catch(() => {});
     let channelStartSettled = false;
@@ -25715,6 +26568,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
@@ -26167,6 +27022,18 @@ class AcpxBridgeTransport {
       lines
     });
   }
+  async listAgentSessions(query) {
+    return await this.client.request("listAgentSessions", { ...query });
+  }
+  async resumeAgentSession(session, agentSessionId) {
+    await this.client.request("resumeAgentSession", {
+      agent: session.agent,
+      ...session.agentCommand ? { agentCommand: session.agentCommand } : {},
+      cwd: session.cwd,
+      name: session.transportSession,
+      agentSessionId
+    });
+  }
   async prompt(session, text, reply, replyContext, options) {
     const sink = reply ? createQuotaGatedReplySink({
       reply,
@@ -26759,7 +27626,7 @@ var init_node_pty_helper = () => {};
 // src/transport/acpx-queue-owner-launcher.ts
 import { createHash as createHash3 } from "node:crypto";
 import { spawn as spawn8 } from "node:child_process";
-import { readFile as 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";
 function buildWeacpxMcpServerSpec(input) {
@@ -26915,7 +27782,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;
   }
@@ -26943,7 +27810,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();
@@ -26962,6 +27829,60 @@ function permissionModeToFlag(permissionMode) {
   }
 }
 
+// src/transport/agent-session-list.ts
+function isUnknownFilterCwdOption(output) {
+  return /(?:unknown|unrecognized) option/i.test(output) && output.includes("--filter-cwd");
+}
+async function runAgentSessionList(options) {
+  let result = await options.runList(true);
+  let filterLocally = false;
+  if (result.code !== 0 && options.filterCwd && isUnknownFilterCwdOption(result.stdout + result.stderr)) {
+    result = await options.runList(false);
+    filterLocally = true;
+  }
+  if (result.code !== 0) {
+    if ((result.stdout + result.stderr).includes("sessionCapabilities.list")) {
+      return;
+    }
+    throw new Error(options.formatError(result));
+  }
+  return parseAgentSessionListOutput(result.stdout, filterLocally ? options.filterCwd : undefined);
+}
+function parseAgentSessionListOutput(stdout2, filterCwd) {
+  let parsed;
+  try {
+    parsed = JSON.parse(stdout2);
+  } catch {
+    throw new Error("failed to parse acpx sessions list output");
+  }
+  if (!isAgentSessionListResult(parsed)) {
+    return;
+  }
+  return filterCwd ? filterAgentSessionListByCwd(parsed, filterCwd) : parsed;
+}
+function isAgentSessionListResult(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return false;
+  const record3 = value;
+  if (record3.source !== "agent" || !Array.isArray(record3.sessions))
+    return false;
+  return record3.sessions.every((session) => {
+    if (!session || typeof session !== "object" || Array.isArray(session))
+      return false;
+    const item = session;
+    return typeof item.sessionId === "string";
+  });
+}
+function filterAgentSessionListByCwd(result, cwd) {
+  return {
+    ...result,
+    sessions: result.sessions.filter((session) => session.cwd && isSamePath(session.cwd, cwd))
+  };
+}
+var init_agent_session_list = __esm(() => {
+  init_path();
+});
+
 // src/transport/acpx-cli/acpx-cli-transport.ts
 import { createRequire as createRequire5 } from "node:module";
 import { spawn as spawn9 } from "node:child_process";
@@ -27071,6 +27992,23 @@ class AcpxCliTransport {
       timeoutMs: this.sessionInitTimeoutMs
     });
   }
+  async listAgentSessions(query) {
+    return await runAgentSessionList({
+      filterCwd: query.filterCwd,
+      runList: async (includeFilterCwd) => {
+        const args = this.buildAgentQueryArgs(query, "json", [
+          "sessions",
+          "list",
+          ...includeFilterCwd && query.filterCwd ? ["--filter-cwd", query.filterCwd] : [],
+          ...query.cursor ? ["--cursor", query.cursor] : []
+        ]);
+        return await this.runCommandWithTimeout(this.runCommand, args, {
+          timeoutMs: this.sessionInitTimeoutMs
+        });
+      },
+      formatError: (result) => normalizeCommandError(result) ?? `command failed with exit code ${result.code}`
+    });
+  }
   async tailSessionHistory(session, lines) {
     const candidates = [
       ["sessions", "history", "quiet", "-s", session.transportSession, String(lines)],
@@ -27139,6 +28077,20 @@ ${baseText}` : "" };
       message: output.trim()
     };
   }
+  async resumeAgentSession(session, agentSessionId) {
+    const args = this.buildArgs(session, [
+      "sessions",
+      "new",
+      "--name",
+      session.transportSession,
+      "--resume-session",
+      agentSessionId
+    ]);
+    const runResume = session.agentCommand ? this.run : this.runWithPty;
+    await runResume.call(this, args, {
+      timeoutMs: this.sessionInitTimeoutMs
+    });
+  }
   async updatePermissionPolicy(policy) {
     this.permissionMode = policy.permissionMode;
     this.nonInteractivePermissions = policy.nonInteractivePermissions;
@@ -27372,6 +28324,13 @@ ${baseText}` : "" };
     }
     return [...prefix, session.agent, ...tail2];
   }
+  buildAgentQueryArgs(query, format, tail2) {
+    const prefix = ["--format", format, "--cwd", query.cwd, ...this.buildPermissionArgs()];
+    if (query.agentCommand) {
+      return [...prefix, "--agent", query.agentCommand, ...tail2];
+    }
+    return [...prefix, query.agent, ...tail2];
+  }
   buildPromptArgs(session, text, promptFile) {
     const prefix = [
       "--format",
@@ -27437,9 +28396,34 @@ var init_acpx_cli_transport = __esm(() => {
   init_node_pty_helper();
   init_terminate_process_tree();
   init_acpx_queue_owner_launcher();
+  init_agent_session_list();
   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 = {}) {
@@ -27470,28 +28454,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",
@@ -27650,6 +28612,9 @@ class MessageChannelRegistry {
     }
     await channel.sendScheduledMessage(input);
   }
+  nativeSessionListFormat(chatKey) {
+    return this.getByChatKey(chatKey)?.nativeSessionListFormat ?? "table";
+  }
   createConsumerLocks() {
     const result = [];
     for (const channel of this.channels.values()) {
@@ -28234,7 +29199,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);
+  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 agent = new ConsoleAgent(router, logger2);
   const scheduledScheduler = new ScheduledTaskScheduler(scheduledService, {
     dispatchTask: buildScheduledDispatchTask({
@@ -42027,16 +42992,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 });
       })
     },
     {
@@ -42275,12 +43239,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) {
@@ -42296,7 +43271,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(`
 `);
 }
@@ -42340,7 +43315,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}`,
@@ -42355,7 +43330,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)
@@ -42406,7 +43383,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(`
 `);
 }
@@ -42904,13 +43881,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 }
   };
@@ -43270,8 +44258,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
@@ -43396,11 +44390,12 @@ 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 { readFile as readFile8 } from "node:fs/promises";
 import { dirname as dirname9, join as join7 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/plugins/package-manager.ts
+init_plugin_home();
 import { spawn as spawn3 } from "node:child_process";
 async function defaultRunCommand(command, args, options) {
   await new Promise((resolve, reject) => {
@@ -43441,6 +44436,7 @@ async function detectPackageManager(runCommand) {
 async function installPluginPackage(input) {
   const runCommand = input.runCommand ?? defaultRunCommand;
   const packageManager = input.packageManager ?? await detectPackageManager();
+  await normalizePluginHomeManifest(input.pluginHome);
   const spec = input.version ? `${input.packageName}@${input.version}` : input.packageName;
   if (packageManager === "bun") {
     await runCommand("bun", ["add", spec], { cwd: input.pluginHome });
@@ -43678,7 +44674,7 @@ async function readPackageName() {
     const here = dirname9(fileURLToPath2(import.meta.url));
     for (const candidate of [join7(here, "..", "package.json"), join7(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 {}
@@ -44301,7 +45297,7 @@ async function setChannelAccountEnabled(type, accountId, enabled, rawArgs, deps)
 
 // src/plugins/plugin-cli.ts
 init_plugin_home();
-import { readFile as readFile9 } from "node:fs/promises";
+import { readFile as readFile10 } from "node:fs/promises";
 import { isAbsolute, join as join9, resolve } from "node:path";
 init_plugin_loader();
 init_validate_plugin();
@@ -44311,14 +45307,14 @@ init_channel_scope();
 init_plugin_loader();
 init_validate_plugin();
 init_known_plugins();
-import { readFile as readFile8 } from "node:fs/promises";
+import { readFile as readFile9 } from "node:fs/promises";
 import { join as join8 } 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(join8(pluginHome, "package.json"), "utf8");
     const parsed = JSON.parse(raw);
     const out = {};
     for (const [name, value] of Object.entries(parsed.dependencies ?? {})) {
@@ -44416,11 +45412,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(join9(pluginHome, "package.json"), "utf8");
     const parsed = JSON.parse(raw);
     const out = {};
     for (const [name, value] of Object.entries(parsed.dependencies ?? {})) {
@@ -44446,7 +45442,7 @@ async function resolveLocalPluginName(installSpec, pluginHome, namesBeforeInstal
       return name;
   }
   try {
-    const raw = await readFile9(join9(installSpec, "package.json"), "utf8");
+    const raw = await readFile10(join9(installSpec, "package.json"), "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed.name === "string" && parsed.name.trim())
       return parsed.name.trim();