@ganglion/xacpx 0.8.1 → 0.8.3

package/dist/cli.js

@@ -2023,7 +2023,7 @@ var require_lib = __commonJS((exports, module) => {
 
 // src/util/private-file.ts
 import { chmod, mkdir, writeFile } from "node:fs/promises";
-import { chmodSync, mkdirSync, writeFileSync } from "node:fs";
+import { chmodSync, mkdirSync as mkdirSync2, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 async function writePrivateFileAtomic(path, content) {
   await mkdir(dirname(path), { recursive: true });
@@ -2057,7 +2057,7 @@ async function writePrivateFileAtomic(path, content) {
   }
 }
 function writePrivateFileSync(path, content, deps = {}) {
-  mkdirSync(dirname(path), { recursive: true });
+  mkdirSync2(dirname(path), { recursive: true });
   const platform = deps.platform ?? process.platform;
   const atomicWrite = deps.atomicWrite ?? ((p, c) => import_write_file_atomic.default.sync(p, c, { mode: PRIVATE_FILE_MODE, encoding: "utf8", fsync: true }));
   try {
@@ -2174,6 +2174,21 @@ var init_workspace_path = __esm(() => {
   init_path();
 });
 
+// src/plugins/plugin-renames.ts
+function normalizePluginPackageName(packageName) {
+  return LEGACY_PLUGIN_PACKAGE_RENAMES.get(packageName) ?? packageName;
+}
+function isLegacyPluginPackageName(packageName) {
+  return LEGACY_PLUGIN_PACKAGE_RENAMES.has(packageName);
+}
+var LEGACY_PLUGIN_PACKAGE_RENAMES;
+var init_plugin_renames = __esm(() => {
+  LEGACY_PLUGIN_PACKAGE_RENAMES = new Map([
+    ["@ganglion/weacpx-channel-feishu", "@ganglion/xacpx-channel-feishu"],
+    ["@ganglion/weacpx-channel-yuanbao", "@ganglion/xacpx-channel-yuanbao"]
+  ]);
+});
+
 // src/config/resolve-agent-command.ts
 function resolveAgentCommand(driver, command) {
   if (!command) {
@@ -2395,7 +2410,8 @@ function parsePluginConfig(raw, index) {
   if (!isRecord(raw)) {
     throw new Error(`plugins[${index}] must be an object`);
   }
-  const name = typeof raw.name === "string" ? raw.name.trim() : "";
+  const rawName = typeof raw.name === "string" ? raw.name.trim() : "";
+  const name = normalizePluginPackageName(rawName);
   if (!name) {
     throw new Error(`plugins[${index}].name must be a non-empty string`);
   }
@@ -2417,15 +2433,26 @@ function parsePlugins(rawPlugins) {
   if (!Array.isArray(rawPlugins)) {
     throw new Error("plugins must be an array");
   }
-  const parsed = rawPlugins.map((entry, index) => parsePluginConfig(entry, index));
-  const names = new Set;
+  const parsed = rawPlugins.map((entry, index) => ({
+    plugin: parsePluginConfig(entry, index),
+    originalName: isRecord(entry) && typeof entry.name === "string" ? entry.name.trim() : ""
+  }));
+  const pluginsByName = new Map;
   for (const entry of parsed) {
-    if (names.has(entry.name)) {
+    const existing = pluginsByName.get(entry.plugin.name);
+    if (!existing) {
+      pluginsByName.set(entry.plugin.name, entry);
+      continue;
+    }
+    const hasLegacyName = isLegacyPluginPackageName(existing.originalName) || isLegacyPluginPackageName(entry.originalName);
+    if (!hasLegacyName) {
       throw new Error("plugins names must be unique");
     }
-    names.add(entry.name);
+    if (isLegacyPluginPackageName(existing.originalName) && !isLegacyPluginPackageName(entry.originalName)) {
+      pluginsByName.set(entry.plugin.name, entry);
+    }
   }
-  return parsed;
+  return Array.from(pluginsByName.values()).map((entry) => entry.plugin);
 }
 function parseRuntimeChannelConfig(raw, index) {
   if (!isRecord(raw)) {
@@ -2500,6 +2527,7 @@ function parseOrchestrationConfig(raw) {
 var DEFAULT_PERF_LOG_CONFIG, DEFAULT_LOGGING_CONFIG, DEFAULT_PERMISSION_MODE = "approve-all", DEFAULT_NON_INTERACTIVE_PERMISSIONS = "deny", DEFAULT_QUEUE_OWNER_TTL_SECONDS = 1800, DEFAULT_CHANNEL_CONFIG, DEFAULT_ORCHESTRATION_CONFIG, DEFAULT_LATER_CONFIG;
 var init_load_config = __esm(() => {
   init_workspace_path();
+  init_plugin_renames();
   DEFAULT_PERF_LOG_CONFIG = {
     enabled: false,
     maxSizeBytes: 5 * 1024 * 1024,
@@ -31114,24 +31142,24 @@ import { fileURLToPath as fileURLToPath7 } from "node:url";
 
 // src/runtime/migrate-core-home.ts
 init_core_home();
-import { cpSync, existsSync as existsSync2, readFileSync } from "node:fs";
+import { copyFileSync, cpSync, existsSync as existsSync2, mkdirSync, readFileSync } from "node:fs";
 import { join as join2 } from "node:path";
 function migrateCoreHome(home, deps = {}) {
   const log = deps.log ?? ((message) => console.error(message));
   const isProcessAlive = deps.isProcessAlive ?? defaultIsProcessAlive;
   const primary = join2(home, CORE_HOME_DIR_NAME);
-  if (existsSync2(primary)) {
-    return { migrated: false, reason: "already-current" };
-  }
   const legacy = join2(home, CORE_HOME_LEGACY_DIR_NAME);
   if (!existsSync2(legacy)) {
-    return { migrated: false, reason: "no-legacy" };
+    return existsSync2(primary) ? { migrated: false, reason: "already-current" } : { migrated: false, reason: "no-legacy" };
   }
   const legacyPid = readLegacyDaemonPid(legacy);
   if (legacyPid !== null && isProcessAlive(legacyPid)) {
     log(`检测到运行中的旧守护进程 (pid ${legacyPid})，暂不迁移 ${legacy} → ${primary}；` + `请先停止守护进程（weacpx stop / xacpx stop）后重试，期间仍使用旧目录。`);
     return { migrated: false, reason: "daemon-running", from: legacy };
   }
+  if (existsSync2(primary)) {
+    return supplementMissingCoreFiles({ legacy, primary, log });
+  }
   try {
     cpSync(legacy, primary, { recursive: true });
     log(`已将状态目录从 ${legacy} 复制到 ${primary}（旧目录保留为备份，可手动删除）。`);
@@ -31142,6 +31170,28 @@ function migrateCoreHome(home, deps = {}) {
     return { migrated: false, reason: "failed", from: legacy };
   }
 }
+function supplementMissingCoreFiles(input) {
+  const copied = [];
+  for (const fileName of ["config.json", "state.json"]) {
+    const from = join2(input.legacy, fileName);
+    const to = join2(input.primary, fileName);
+    if (!existsSync2(from) || existsSync2(to))
+      continue;
+    try {
+      mkdirSync(input.primary, { recursive: true });
+      copyFileSync(from, to);
+      copied.push(fileName);
+    } catch (error) {
+      const detail = error instanceof Error ? error.message : String(error);
+      input.log(`补迁移 ${from} → ${to} 失败，已跳过：${detail}`);
+    }
+  }
+  if (copied.length === 0) {
+    return { migrated: false, reason: "already-current" };
+  }
+  input.log(`已从旧目录补迁移 ${copied.join(", ")} 到 ${input.primary}（未覆盖任何现有文件）。`);
+  return { migrated: true, reason: "supplemented", from: input.legacy, to: input.primary };
+}
 function readLegacyDaemonPid(legacyHome) {
   try {
     const content = readFileSync(join2(legacyHome, "runtime", "daemon.pid"), "utf8");
@@ -46175,6 +46225,7 @@ async function inspectPlugins(input) {
 
 // src/plugins/plugin-cli.ts
 init_known_plugins();
+init_plugin_renames();
 function looksLikePath(spec) {
   return spec === "." || spec.startsWith("./") || spec.startsWith("../") || spec.startsWith("/") || spec.startsWith(".\\") || spec.startsWith("..\\") || spec.startsWith("\\") || /^[a-zA-Z]:[\\/]/.test(spec) || isAbsolute(spec);
 }
@@ -46276,7 +46327,8 @@ function parseRestartAndVersionFlags(args) {
   return { ok: true, rest, restart: restart ? "restart" : noRestart ? "no-restart" : "ask", ...version2 ? { version: version2 } : {} };
 }
 function findPlugin(plugins, name) {
-  return plugins.find((plugin) => plugin.name === name);
+  const normalizedName = normalizePluginPackageName(name);
+  return plugins.find((plugin) => normalizePluginPackageName(plugin.name) === normalizedName);
 }
 async function validateInstalledPluginDefault(packageName, pluginHome) {
   const moduleValue = await importPluginFromHome(packageName, pluginHome);
@@ -46363,7 +46415,7 @@ async function addPlugin(packageSpec, rawArgs, deps) {
     deps.print(`插件 ${packageSpec} 安装失败：${describeError(error2)}`);
     return 1;
   }
-  const recordedName = looksLikePath(packageSpec) ? await resolveLocalPluginName(installSpec, pluginHome, namesBeforeInstall) : packageSpec;
+  const recordedName = normalizePluginPackageName(looksLikePath(packageSpec) ? await resolveLocalPluginName(installSpec, pluginHome, namesBeforeInstall) : packageSpec);
   const validate = deps.validateInstalledPlugin ?? ((name) => validateInstalledPluginDefault(name, pluginHome));
   let summary;
   try {
@@ -46381,7 +46433,7 @@ async function addPlugin(packageSpec, rawArgs, deps) {
     enabled: true
   };
   if (existing) {
-    config2.plugins = config2.plugins.map((entry) => entry.name === recordedName ? next : entry);
+    config2.plugins = config2.plugins.filter((entry) => normalizePluginPackageName(entry.name) !== recordedName).concat(next);
   } else {
     config2.plugins = [...config2.plugins, next];
   }

package/dist/plugins/plugin-renames.d.ts

@@ -0,0 +1,2 @@
+export declare function normalizePluginPackageName(packageName: string): string;
+export declare function isLegacyPluginPackageName(packageName: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ganglion/xacpx",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "随时随地通过聊天频道（微信 / 飞书 / 元宝等）远程控制 `acpx` 上的 Claude Code、Codex 等 Agents。",
   "keywords": [
     "acpx",