weacpx 0.6.0 → 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
@@ -10288,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 = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
@@ -10434,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;
     }
@@ -10448,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) {
@@ -10477,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) + `
@@ -10515,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")) {
@@ -13024,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);
@@ -16021,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 = {}) {
@@ -16103,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;
@@ -16785,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) {
@@ -16794,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);
@@ -18295,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,
@@ -19788,6 +19892,27 @@ function handleHelp(topic) {
   }
   return { text: renderHelpTopic(entry) };
 }
+function handleInvalidCommand(recognizedCommand) {
+  const topicName = recognizedCommand.replace(/^\//, "");
+  const entry = getHelpTopic(topicName);
+  if (entry) {
+    return { text: `命令格式不正确，请参考下面的用法：
+
+${renderHelpTopic(entry)}` };
+  }
+  return {
+    text: [
+      "无法识别的命令格式。",
+      "",
+      "正确的会话创建格式：",
+      "/session new <别名> --agent <Agent名> --ws <工作区名>",
+      "",
+      "例如：",
+      "/session new demo --agent claude --ws weacpx"
+    ].join(`
+`)
+  };
+}
 function renderHelpIndex() {
   const topics = listHelpTopics();
   return [
@@ -20925,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":
@@ -24588,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);
@@ -26185,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, {
@@ -26299,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;
@@ -26417,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
@@ -27473,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) {
@@ -27629,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;
   }
@@ -27657,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();
@@ -27677,7 +27830,6 @@ function permissionModeToFlag(permissionMode) {
 }
 
 // src/transport/agent-session-list.ts
-import path15 from "node:path";
 function isUnknownFilterCwdOption(output) {
   return /(?:unknown|unrecognized) option/i.test(output) && output.includes("--filter-cwd");
 }
@@ -27724,27 +27876,12 @@ function isAgentSessionListResult(value) {
 function filterAgentSessionListByCwd(result, cwd) {
   return {
     ...result,
-    sessions: result.sessions.filter((session) => session.cwd && sameAgentSessionCwd(session.cwd, cwd))
+    sessions: result.sessions.filter((session) => session.cwd && isSamePath(session.cwd, cwd))
   };
 }
-function sameAgentSessionCwd(left, right) {
-  const normalizedLeft = normalizeAgentSessionCwd(left);
-  const normalizedRight = normalizeAgentSessionCwd(right);
-  if (isWindowsLikePath2(normalizedLeft) || isWindowsLikePath2(normalizedRight)) {
-    return normalizedLeft.toLowerCase() === normalizedRight.toLowerCase();
-  }
-  return normalizedLeft === normalizedRight;
-}
-function normalizeAgentSessionCwd(input) {
-  if (isWindowsLikePath2(input)) {
-    return path15.win32.normalize(input).replace(/\\/g, "/");
-  }
-  return path15.posix.normalize(input.replace(/\\/g, "/"));
-}
-function isWindowsLikePath2(input) {
-  return /^[a-zA-Z]:[\\/]/.test(input) || input.startsWith("\\\\");
-}
-var init_agent_session_list = () => {};
+var init_agent_session_list = __esm(() => {
+  init_path();
+});
 
 // src/transport/acpx-cli/acpx-cli-transport.ts
 import { createRequire as createRequire5 } from "node:module";
@@ -28263,6 +28400,30 @@ var init_acpx_cli_transport = __esm(() => {
   require4 = createRequire5(import.meta.url);
 });
 
+// src/util/async.ts
+function settleWithinTimeout(work, timeoutMs) {
+  return new Promise((resolve3) => {
+    let settled = false;
+    const finish = () => {
+      if (!settled) {
+        settled = true;
+        resolve3();
+      }
+    };
+    const timer = setTimeout(finish, timeoutMs);
+    if (typeof timer.unref === "function") {
+      timer.unref();
+    }
+    work.then(() => {
+      clearTimeout(timer);
+      finish();
+    }, () => {
+      clearTimeout(timer);
+      finish();
+    });
+  });
+}
+
 // src/transport/queue-owner-reaper.ts
 import { spawn as spawn10 } from "node:child_process";
 async function reapQueueOwners(acpxCommand, targets, deps = {}) {
@@ -28293,28 +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",
@@ -29651,107 +29790,107 @@ async function checkRuntime(options = {}) {
 }
 function createRuntimeFsProbe() {
   return {
-    stat: async (path16) => await stat3(path16),
-    access: async (path16, mode) => await access4(path16, mode)
+    stat: async (path15) => await stat3(path15),
+    access: async (path15, mode) => await access4(path15, mode)
   };
 }
-async function checkDirectoryCreatable(label, path16, probe, platform) {
+async function checkDirectoryCreatable(label, path15, probe, platform) {
   try {
-    const stats = await probe.stat(path16);
+    const stats = await probe.stat(path15);
     if (!stats.isDirectory()) {
       return {
         ok: false,
-        detail: `${label}: ${path16} (exists but is not a directory)`
+        detail: `${label}: ${path15} (exists but is not a directory)`
       };
     }
-    await probe.access(path16, directoryAccessMode(platform));
+    await probe.access(path15, directoryAccessMode(platform));
     return {
       ok: true,
-      detail: `${label}: ${path16} (writable)`
+      detail: `${label}: ${path15} (writable)`
     };
   } catch (error2) {
     if (!isMissingPathError(error2)) {
       return {
         ok: false,
-        detail: `${label}: ${path16} (unusable: ${formatError6(error2)})`
+        detail: `${label}: ${path15} (unusable: ${formatError6(error2)})`
       };
     }
-    const parentCheck = await checkCreatableAncestorDirectory(path16, probe, platform);
+    const parentCheck = await checkCreatableAncestorDirectory(path15, probe, platform);
     if (!parentCheck.ok) {
       return {
         ok: false,
-        detail: `${label}: ${path16} (parent not writable: ${parentCheck.blockingPath})`
+        detail: `${label}: ${path15} (parent not writable: ${parentCheck.blockingPath})`
       };
     }
     return {
       ok: true,
-      detail: `${label}: ${path16} (creatable via ${parentCheck.creatableFrom})`
+      detail: `${label}: ${path15} (creatable via ${parentCheck.creatableFrom})`
     };
   }
 }
-async function checkFileCreatable(label, path16, probe, platform) {
+async function checkFileCreatable(label, path15, probe, platform) {
   try {
-    const stats = await probe.stat(path16);
+    const stats = await probe.stat(path15);
     if (stats.isDirectory()) {
       return {
         ok: false,
-        detail: `${label}: ${path16} (exists but is a directory)`
+        detail: `${label}: ${path15} (exists but is a directory)`
       };
     }
-    await probe.access(path16, constants.W_OK);
+    await probe.access(path15, constants.W_OK);
     return {
       ok: true,
-      detail: `${label}: ${path16} (writable)`
+      detail: `${label}: ${path15} (writable)`
     };
   } catch (error2) {
     if (!isMissingPathError(error2)) {
       return {
         ok: false,
-        detail: `${label}: ${path16} (unusable: ${formatError6(error2)})`
+        detail: `${label}: ${path15} (unusable: ${formatError6(error2)})`
       };
     }
-    const parentCheck = await checkCreatableAncestorDirectory(dirname14(path16), probe, platform);
+    const parentCheck = await checkCreatableAncestorDirectory(dirname14(path15), probe, platform);
     if (!parentCheck.ok) {
       return {
         ok: false,
-        detail: `${label}: ${path16} (parent not writable: ${parentCheck.blockingPath})`
+        detail: `${label}: ${path15} (parent not writable: ${parentCheck.blockingPath})`
       };
     }
     return {
       ok: true,
-      detail: `${label}: ${path16} (creatable via ${parentCheck.creatableFrom})`
+      detail: `${label}: ${path15} (creatable via ${parentCheck.creatableFrom})`
     };
   }
 }
-async function checkCreatableAncestorDirectory(path16, probe, platform) {
+async function checkCreatableAncestorDirectory(path15, probe, platform) {
   try {
-    const stats = await probe.stat(path16);
+    const stats = await probe.stat(path15);
     if (!stats.isDirectory()) {
       return {
         ok: false,
-        creatableFrom: path16,
-        blockingPath: path16
+        creatableFrom: path15,
+        blockingPath: path15
       };
     }
-    await probe.access(path16, directoryAccessMode(platform));
+    await probe.access(path15, directoryAccessMode(platform));
     return {
       ok: true,
-      creatableFrom: path16
+      creatableFrom: path15
     };
   } catch (error2) {
     if (!isMissingPathError(error2)) {
       return {
         ok: false,
-        creatableFrom: path16,
-        blockingPath: path16
+        creatableFrom: path15,
+        blockingPath: path15
       };
     }
-    const parent = dirname14(path16);
-    if (parent === path16) {
+    const parent = dirname14(path15);
+    if (parent === path15) {
       return {
         ok: false,
-        creatableFrom: path16,
-        blockingPath: path16
+        creatableFrom: path15,
+        blockingPath: path15
       };
     }
     const parentCheck = await checkCreatableAncestorDirectory(parent, probe, platform);
@@ -42853,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 });
       })
     },
     {
@@ -43101,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) {
@@ -43122,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(`
 `);
 }
@@ -43166,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}`,
@@ -43181,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)
@@ -43232,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(`
 `);
 }
@@ -43730,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 }
   };
@@ -44096,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
@@ -44222,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) => {
@@ -44267,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 });
@@ -44504,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 {}
@@ -45127,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();
@@ -45137,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 ?? {})) {
@@ -45242,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 ?? {})) {
@@ -45272,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();