jinzd-ai-cli 0.4.216 → 0.4.218

package/dist/{server-FXUF5P64.js → server-LHYSS6CK.js}

@@ -24,7 +24,7 @@ import {
   scanDirTree,
   scanProject,
   setupProxy
-} from "./chunk-PNTLA3MN.js";
+} from "./chunk-H2UIHGHH.js";
 import {
   buildReviewPrompt,
   buildSecurityReviewPrompt
@@ -32,21 +32,36 @@ import {
 import {
   ToolExecutor,
   ToolRegistry,
+  addMemoryEntry,
   askUserContext,
   checkNetworkPolicy,
   checkPermissionWithProfile,
   cleanupRejectedTeeFile,
   clearRecentlyDeniedAutoActions,
   defaultActionClassifier,
+  deleteMemoryEntry,
+  describePlugin,
   estimateTokens,
+  expireMemoryEntry,
+  exportMemoryEntries,
+  formatMemoryForPrompt,
   formatPermissionProfileWarning,
+  getActivePluginAssets,
+  getInstalledPlugin,
   getPendingHookTrust,
   getPreferredAgentName,
   getRecentlyDeniedAutoActions,
   googleSearchContext,
   groupCallsByPhase,
+  installPlugin,
+  isMemoryExpired,
   listAgentConfigs,
   listAgentRuns,
+  listInstalledPlugins,
+  listMemoryEntries,
+  memoryStorePath,
+  mergePluginHooks,
+  pluginRoot,
   recordRecentlyDeniedAutoAction,
   renderDiff,
   requestAgentStop,
@@ -57,14 +72,17 @@ import {
   runWithSessionKey,
   setContextWindow,
   setMaxOutputCap,
+  setPluginEnabled,
   setPreferredAgentName,
   spawnAgentContext,
   truncateOutput,
-  undoStack
-} from "./chunk-TCOC4AUI.js";
+  trustPlugin,
+  undoStack,
+  updateMemoryApproval
+} from "./chunk-GX3HSGJX.js";
 import "./chunk-T2NL5ZIA.js";
 import "./chunk-BXP6YZ2P.js";
-import "./chunk-VW7Y27WW.js";
+import "./chunk-VGFTM3XT.js";
 import {
   SessionManager,
   getContentText
@@ -78,7 +96,7 @@ import {
 } from "./chunk-QMXC327F.js";
 import {
   runTool
-} from "./chunk-77HDCGTN.js";
+} from "./chunk-MWKE2TNS.js";
 import {
   CONTENT_ONLY_STREAM_REMINDER,
   TEE_FINAL_USER_NUDGE,
@@ -97,7 +115,7 @@ import {
 } from "./chunk-XPBEJB27.js";
 import {
   ConfigManager
-} from "./chunk-WAI3WPV2.js";
+} from "./chunk-P4VBLXKS.js";
 import "./chunk-TZQHYZKT.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
@@ -109,14 +127,13 @@ import {
   DESCRIPTION,
   MCP_PROJECT_CONFIG_NAME,
   MEMORY_FILE_NAME,
-  MEMORY_MAX_CHARS,
   PLAN_MODE_READONLY_TOOLS,
   PLAN_MODE_SYSTEM_ADDON,
   PLUGINS_DIR_NAME,
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-7YWS3JLU.js";
+} from "./chunk-NTCB7CMT.js";
 import {
   formatGitContextForPrompt,
   getGitContext,
@@ -138,8 +155,8 @@ import {
 import express from "express";
 import { createServer } from "http";
 import { WebSocketServer } from "ws";
-import { join as join3, dirname as dirname2, resolve as resolve2, relative, sep } from "path";
-import { existsSync as existsSync4, readFileSync as readFileSync4, readdirSync as readdirSync2, statSync as statSync2, realpathSync } from "fs";
+import { join as join2, dirname as dirname2, resolve as resolve2, relative, sep } from "path";
+import { existsSync as existsSync3, readFileSync as readFileSync3, readdirSync as readdirSync2, statSync as statSync2, realpathSync } from "fs";
 import { networkInterfaces } from "os";
 
 // src/web/tool-executor-web.ts
@@ -589,8 +606,6 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
 };
 
 // src/core/system-prompt-builder.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
-import { join } from "path";
 function buildSystemPromptParts(ctx) {
   const now = /* @__PURE__ */ new Date();
   const WEEKDAYS = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
@@ -644,24 +659,12 @@ ${ctx.activeSkill.content}`);
   return { stable: stableParts.join("\n\n---\n\n"), volatile };
 }
 function loadMemoryContent(configDir) {
-  const memoryPath = join(configDir, MEMORY_FILE_NAME);
-  if (!existsSync2(memoryPath)) return null;
-  let content = readFileSync2(memoryPath, "utf-8").trim();
-  if (!content) return null;
-  if (content.length > MEMORY_MAX_CHARS) {
-    content = content.slice(-MEMORY_MAX_CHARS);
-    const firstEntry = content.indexOf("\n## ");
-    if (firstEntry !== -1) {
-      content = content.slice(firstEntry + 1);
-    }
-  }
-  const entryCount = (content.match(/^## \d{4}-\d{2}-\d{2}/gm) ?? []).length;
-  return { content, entryCount };
+  return formatMemoryForPrompt(configDir, process.cwd());
 }
 
 // src/web/session-handler.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3, writeFileSync, mkdirSync, readdirSync, statSync, createWriteStream } from "fs";
-import { join as join2, resolve, dirname } from "path";
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync, mkdirSync, readdirSync, statSync, createWriteStream } from "fs";
+import { join, resolve, dirname } from "path";
 function lastAssistantText(messages) {
   for (let i = messages.length - 1; i >= 0; i--) {
     const m = messages[i];
@@ -754,7 +757,7 @@ var SessionHandler = class {
     }
     this.updateContextWindow();
     this.activeSystemPrompt = this.loadContextFiles();
-    const hooks = this.config.get("hooks");
+    const hooks = mergePluginHooks(this.config.get("hooks") ?? void 0, this.config.getConfigDir());
     const permissionRules = this.config.get("permissionRules");
     const defaultPermission = this.config.get("defaultPermission");
     const permissionProfileName = this.config.get("defaultPermissionProfile") ?? "legacy";
@@ -867,6 +870,8 @@ var SessionHandler = class {
         return this.handleMemoryStatus();
       case "memory_rebuild":
         return this.handleMemoryRebuild(Boolean(msg.full));
+      case "memory_manage":
+        return this.handleMemoryManage(msg.action, msg.id, msg.expiresAt);
       case "auto_pause_response": {
         const resolve3 = this.pendingAutoPause.get(msg.requestId);
         if (resolve3) {
@@ -899,7 +904,7 @@ var SessionHandler = class {
     }
   }
   onDisconnect() {
-    runLifecycleHooks(this.config.get("hooks") ?? void 0, "Stop", { sessionId: this.sessions.current?.id }, { configDir: this.config.getConfigDir() });
+    runLifecycleHooks(mergePluginHooks(this.config.get("hooks") ?? void 0, this.config.getConfigDir()), "Stop", { sessionId: this.sessions.current?.id }, { configDir: this.config.getConfigDir() });
     this.toolExecutor.cancelAll();
     if (this.abortController) this.abortController.abort();
     for (const resolve3 of this.pendingAskUser.values()) resolve3(null);
@@ -1078,7 +1083,7 @@ var SessionHandler = class {
       this.ensureSession();
       const session = this.sessions.current;
       const promptDecisions = runLifecycleHooks(
-        this.config.get("hooks") ?? void 0,
+        mergePluginHooks(this.config.get("hooks") ?? void 0, this.config.getConfigDir()),
         "UserPromptSubmit",
         { sessionId: session.id, prompt: content },
         { configDir: this.config.getConfigDir(), onSummary: (message) => this.send({ type: "info", message: "[hook] " + message }) }
@@ -1920,6 +1925,7 @@ Tokens: in=${this.sessionTokenUsage.inputTokens} out=${this.sessionTokenUsage.ou
             "  /add-dir [path|remove] \u2014 Add/remove directory from AI context",
             "  /mcp [reconnect]     \u2014 Show/manage MCP servers",
             "  /plugins             \u2014 Show loaded plugins",
+            "  /plugin <cmd>        \u2014 Manage package plugins",
             "  /commands            \u2014 List custom commands",
             "  /doctor              \u2014 Health check (API keys, config, MCP)",
             "  /bug                 \u2014 Generate bug report template",
@@ -2018,7 +2024,7 @@ ${lines.join("\n")}` });
           this.sendToolsList();
           this.sendStatus();
         } else if (sub === "reload") {
-          this.skillManager.loadSkills();
+          this.skillManager.loadSkills(getActivePluginAssets(this.config.getConfigDir()).skillDirs);
           this.send({ type: "info", message: `\u{1F504} Reloaded ${this.skillManager.listSkills().length} skill(s).` });
           this.sendToolsList();
         } else {
@@ -2237,9 +2243,9 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
         let modifiedFiles = 0;
         const diffLines = [];
         for (const [filePath, { earliest }] of fileMap) {
-          const currentContent = existsSync3(filePath) ? (() => {
+          const currentContent = existsSync2(filePath) ? (() => {
             try {
-              return readFileSync3(filePath, "utf-8");
+              return readFileSync2(filePath, "utf-8");
             } catch {
               return null;
             }
@@ -2755,7 +2761,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
       case "test": {
         this.send({ type: "info", message: "\u{1F9EA} Running tests..." });
         try {
-          const { executeTests } = await import("./run-tests-ZRK4TQUN.js");
+          const { executeTests } = await import("./run-tests-SWU2XEV7.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -2772,9 +2778,9 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
       // ── /init ───────────────────────────────────────────────────────
       case "init": {
         const cwd = process.cwd();
-        const targetPath = join2(cwd, "AICLI.md");
+        const targetPath = join(cwd, "AICLI.md");
         const force = args.includes("--force");
-        if (existsSync3(targetPath) && !force) {
+        if (existsSync2(targetPath) && !force) {
           this.send({ type: "info", message: `AICLI.md already exists at ${targetPath}
 Use /init --force to overwrite.` });
           break;
@@ -2807,7 +2813,7 @@ Use /context reload to load it.` });
         lines.push("**Config Files:**");
         lines.push(`  Dir: ${configDir}`);
         const checkFile = (label, filePath) => {
-          const exists = existsSync3(filePath);
+          const exists = existsSync2(filePath);
           let extra = "";
           if (exists) {
             try {
@@ -2817,9 +2823,9 @@ Use /context reload to load it.` });
           }
           lines.push(`  ${exists ? "\u2713" : "\u2013"}  ${label.padEnd(14)} ${exists ? filePath + extra : "(not found)"}`);
         };
-        checkFile("config.json", join2(configDir, "config.json"));
-        checkFile("memory.md", join2(configDir, MEMORY_FILE_NAME));
-        checkFile("dev-state.md", join2(configDir, "dev-state.md"));
+        checkFile("config.json", join(configDir, "config.json"));
+        checkFile("memory.md", join(configDir, MEMORY_FILE_NAME));
+        checkFile("dev-state.md", join(configDir, "dev-state.md"));
         lines.push("");
         if (this.mcpManager) {
           lines.push("**MCP Servers:**");
@@ -2922,7 +2928,7 @@ ${this.config.toFormattedJSON()}
         const result = this.contextLoadResult;
         const layers = ["\u{1F4DA} **Context Layers:**", ""];
         if (result && result.layers.length > 0) {
-          const labels = { global: "Global ", project: "Project", local: "Local  " };
+          const labels = { global: "Global ", project: "Project", plugin: "Plugin ", local: "Local  " };
           for (const layer of result.layers) {
             layers.push(`  \u2713 ${labels[layer.level] ?? layer.level}: ${layer.displayPath} (${layer.charCount} chars${layer.truncated ? ", truncated" : ""})`);
           }
@@ -3007,7 +3013,7 @@ Use /add-dir remove to clear.` : "No directories added.\nUsage: /add-dir <path>
           break;
         }
         const dirPath = resolve(sub);
-        if (!existsSync3(dirPath)) {
+        if (!existsSync2(dirPath)) {
           this.send({ type: "error", message: `Directory not found: ${dirPath}` });
           break;
         }
@@ -3023,8 +3029,8 @@ It will be included in AI context for subsequent messages.` });
       // ── /commands ───────────────────────────────────────────────────
       case "commands": {
         const configDir = this.config.getConfigDir();
-        const commandsDir = join2(configDir, CUSTOM_COMMANDS_DIR_NAME);
-        if (!existsSync3(commandsDir)) {
+        const commandsDir = join(configDir, CUSTOM_COMMANDS_DIR_NAME);
+        if (!existsSync2(commandsDir)) {
           this.send({ type: "info", message: `No custom commands directory.
 Create: ${commandsDir}/ with .md files.` });
           break;
@@ -3047,23 +3053,75 @@ Add .md files to create commands.` });
         }
         break;
       }
-      // ── /plugins ────────────────────────────────────────────────────
+      // ── /plugins / /plugin ──────────────────────────────────────────
       case "plugins": {
         const configDir = this.config.getConfigDir();
-        const pluginsDir = join2(configDir, PLUGINS_DIR_NAME);
+        const pluginsDir = join(configDir, PLUGINS_DIR_NAME);
         const pluginTools = this.toolRegistry.listPluginTools();
+        const pluginPackages = listInstalledPlugins(configDir);
         const lines = [`\u{1F50C} **Plugins:**`, `Dir: ${pluginsDir}`, ""];
-        if (pluginTools.length === 0) {
+        if (pluginTools.length === 0 && pluginPackages.length === 0) {
           lines.push("No plugins loaded.");
-          lines.push("Add .js files to the plugins directory and set allowPlugins:true in config.");
+          lines.push("Use /plugin install <path>, /plugin trust <name>, then /plugin enable <name>.");
         } else {
-          for (const t of pluginTools) {
-            lines.push(`  \u2022 ${t.definition.name} \u2014 ${t.definition.description}`);
+          if (pluginPackages.length > 0) {
+            lines.push(`Package plugins (${pluginPackages.length}):`);
+            for (const p of pluginPackages) lines.push(`  \u2022 ${p.name}@${p.manifest.version} \u2014 ${p.enabled ? "enabled" : "disabled"} / ${p.trusted ? "trusted" : "untrusted"}`);
+            lines.push("");
+          }
+          if (pluginTools.length > 0) {
+            lines.push(`Legacy JS plugin tools (${pluginTools.length}):`);
+            for (const t of pluginTools) lines.push(`  \u2022 ${t.definition.name} \u2014 ${t.definition.description}`);
           }
         }
         this.send({ type: "info", message: lines.join("\n") });
         break;
       }
+      case "plugin": {
+        const configDir = this.config.getConfigDir();
+        const sub = args[0] ?? "list";
+        try {
+          if (sub === "list") {
+            const plugins = listInstalledPlugins(configDir);
+            const lines = [`\u{1F50C} **Package Plugins**`, `Dir: ${pluginRoot(configDir)}`, ""];
+            if (plugins.length === 0) lines.push("No package plugins installed.");
+            for (const p of plugins) lines.push(`  \u2022 ${p.name}@${p.manifest.version} \u2014 ${p.enabled ? "enabled" : "disabled"} / ${p.trusted ? "trusted" : "untrusted"}`);
+            this.send({ type: "info", message: lines.join("\n") });
+            break;
+          }
+          if (sub === "install") {
+            const input = args[1];
+            if (!input) throw new Error("Usage: /plugin install <path>");
+            const plugin = installPlugin(configDir, input);
+            this.send({ type: "info", message: `Installed plugin ${plugin.name}@${plugin.manifest.version}. Run /plugin trust ${plugin.name}, then /plugin enable ${plugin.name}.` });
+            break;
+          }
+          if (sub === "trust") {
+            const name2 = args[1];
+            if (!name2) throw new Error("Usage: /plugin trust <name>");
+            const state = trustPlugin(configDir, name2);
+            this.send({ type: "info", message: `Trusted plugin ${state.name}.` });
+            break;
+          }
+          if (sub === "enable" || sub === "disable") {
+            const name2 = args[1];
+            if (!name2) throw new Error(`Usage: /plugin ${sub} <name>`);
+            const state = setPluginEnabled(configDir, name2, sub === "enable");
+            this.send({ type: "info", message: `${sub === "enable" ? "Enabled" : "Disabled"} plugin ${state.name}. Restart Web UI for changes to take effect.` });
+            break;
+          }
+          if (sub === "inspect") {
+            const name2 = args[1];
+            if (!name2) throw new Error("Usage: /plugin inspect <name>");
+            this.send({ type: "info", message: describePlugin(getInstalledPlugin(configDir, name2)).join("\n") });
+            break;
+          }
+          throw new Error("Usage: /plugin [list|install|enable|disable|inspect|trust]");
+        } catch (err) {
+          this.send({ type: "error", message: err instanceof Error ? err.message : String(err) });
+        }
+        break;
+      }
       // ── /bug ────────────────────────────────────────────────────────
       case "bug": {
         const session = this.sessions.current;
@@ -3106,7 +3164,7 @@ Add .md files to create commands.` });
       return;
     }
     const preDecisions = runLifecycleHooks(
-      this.config.get("hooks") ?? void 0,
+      mergePluginHooks(this.config.get("hooks") ?? void 0, this.config.getConfigDir()),
       "PreCompact",
       { sessionId: session.id, messageCount: session.messages.length, instruction },
       { configDir: this.config.getConfigDir(), onSummary: (message) => this.send({ type: "info", message: "[hook] " + message }) }
@@ -3143,7 +3201,7 @@ Add .md files to create commands.` });
       const removedCount = session.compact(summaryMsg, ackMsg, keepLast);
       const afterCount = session.messages.length;
       runLifecycleHooks(
-        this.config.get("hooks") ?? void 0,
+        mergePluginHooks(this.config.get("hooks") ?? void 0, this.config.getConfigDir()),
         "PostCompact",
         { sessionId: session.id, beforeCount, afterCount, removedCount, keepLast, instruction },
         { configDir: this.config.getConfigDir(), onSummary: (message) => this.send({ type: "info", message: "[hook] " + message }) }
@@ -3247,48 +3305,95 @@ Add .md files to create commands.` });
   }
   memoryShow() {
     const configDir = this.config.getConfigDir();
-    const memPath = join2(configDir, MEMORY_FILE_NAME);
-    let content = "";
-    try {
-      if (existsSync3(memPath)) {
-        content = readFileSync3(memPath, "utf-8");
-      }
-    } catch (err) {
-      process.stderr.write(`[web] Failed to read memory file: ${err instanceof Error ? err.message : err}
-`);
-    }
+    const entries = listMemoryEntries(configDir, { includeExpired: true, includeRejected: true });
+    const content = entries.length === 0 ? "(empty \u2014 no persistent memory entries yet)" : entries.map((entry) => {
+      const status = isMemoryExpired(entry) ? "expired" : entry.approved ? "approved" : "pending";
+      const source = entry.sourceSession ? `session ${entry.sourceSession.slice(0, 8)}` : entry.sourceProject ? `project ${entry.sourceProject}` : "manual/tool";
+      return `## ${entry.id.slice(0, 8)} \xB7 ${status} \xB7 scope:${entry.scope} \xB7 sensitivity:${entry.sensitivity}
+Source: ${source}
+${entry.content}`;
+    }).join("\n\n");
     this.send({
       type: "memory_content",
-      content: content || "(empty \u2014 no persistent memory entries yet)",
-      filePath: memPath
+      content,
+      filePath: memoryStorePath(configDir)
     });
+    this.sendMemoryEntries();
   }
   memoryAdd(text) {
-    const configDir = this.config.getConfigDir();
-    const memPath = join2(configDir, MEMORY_FILE_NAME);
     try {
-      mkdirSync(configDir, { recursive: true });
-      const timestamp = (/* @__PURE__ */ new Date()).toISOString().slice(0, 19).replace("T", " ");
-      const previous = existsSync3(memPath) ? readFileSync3(memPath, "utf-8") : "";
-      const entry = `
-- [${timestamp}] ${text}
-`;
-      atomicWriteFileSync(memPath, previous + entry);
-      this.send({ type: "info", message: `\u{1F4DD} Memory entry added: "${text}"` });
+      const entry = addMemoryEntry(this.config.getConfigDir(), text, {
+        scope: "personal",
+        cwd: process.cwd(),
+        redact: true
+      });
+      const status = entry.approved ? "approved" : "pending approval";
+      this.send({ type: "info", message: `\u{1F4DD} Memory entry ${entry.id.slice(0, 8)} added (${status}).` });
+      this.sendMemoryEntries();
     } catch (err) {
       this.send({ type: "error", message: `Failed to write memory: ${err.message}` });
     }
   }
   memoryClear() {
     const configDir = this.config.getConfigDir();
-    const memPath = join2(configDir, MEMORY_FILE_NAME);
     try {
-      atomicWriteFileSync(memPath, "");
+      atomicWriteFileSync(memoryStorePath(configDir), "");
+      atomicWriteFileSync(join(configDir, MEMORY_FILE_NAME), "");
       this.send({ type: "info", message: "\u{1F5D1}\uFE0F Persistent memory cleared." });
+      this.sendMemoryEntries();
     } catch (err) {
       this.send({ type: "error", message: `Failed to clear memory: ${err.message}` });
     }
   }
+  sendMemoryEntries() {
+    const configDir = this.config.getConfigDir();
+    const entries = listMemoryEntries(configDir, { includeExpired: true, includeRejected: true });
+    this.send({
+      type: "memory_entries",
+      storePath: memoryStorePath(configDir),
+      entries: entries.map((entry) => ({
+        id: entry.id,
+        content: entry.content,
+        scope: entry.scope,
+        sourceSession: entry.sourceSession,
+        sourceProject: entry.sourceProject,
+        createdAt: entry.createdAt,
+        updatedAt: entry.updatedAt,
+        expiresAt: entry.expiresAt,
+        sensitivity: entry.sensitivity,
+        approved: entry.approved,
+        expired: isMemoryExpired(entry),
+        redactedKinds: entry.redactedKinds
+      }))
+    });
+  }
+  handleMemoryManage(action, id, expiresAt) {
+    const configDir = this.config.getConfigDir();
+    try {
+      if (action === "approve" || action === "reject") {
+        if (!id) throw new Error(`${action} requires id`);
+        updateMemoryApproval(configDir, id, action === "approve");
+      } else if (action === "delete") {
+        if (!id) throw new Error("delete requires id");
+        deleteMemoryEntry(configDir, id);
+      } else if (action === "expire") {
+        if (!id) throw new Error("expire requires id");
+        expireMemoryEntry(configDir, id, expiresAt);
+      } else if (action === "export") {
+        this.send({
+          type: "export_data",
+          format: "json",
+          filename: `aicli-memory-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}.json`,
+          content: exportMemoryEntries(configDir, process.cwd())
+        });
+      } else if (action !== "list") {
+        throw new Error(`unknown memory action: ${action}`);
+      }
+      this.sendMemoryEntries();
+    } catch (err) {
+      this.send({ type: "error", message: `Memory management failed: ${err instanceof Error ? err.message : String(err)}` });
+    }
+  }
   // ── B4 chat memory recall (v0.4.90+) ──────────────────────────────
   // Lazy-imported so the 117 MB embedder stays out of the load path for
   // clients that never open the Memory panel.
@@ -3548,6 +3653,8 @@ async function startWebServer(options = {}) {
   let mcpManager = null;
   const mcpEnabled = config.get("mcpEnabled") !== false;
   const globalMcpServers = mcpEnabled ? config.get("mcpServers") ?? {} : {};
+  const pluginAssets = getActivePluginAssets(config.getConfigDir());
+  const pluginMcpServers = mcpEnabled ? pluginAssets.mcpServers : {};
   const projectMcpResolved = mcpEnabled ? resolveProjectMcpPath() : null;
   let projectMcpServers = {};
   if (projectMcpResolved) {
@@ -3560,7 +3667,7 @@ async function startWebServer(options = {}) {
       console.log(`     Skipped to prevent unintended RCE. Run "aicli" then "/mcp trust-project" to approve.`);
     }
   }
-  const mergedMcpServers = { ...globalMcpServers, ...projectMcpServers };
+  const mergedMcpServers = { ...globalMcpServers, ...pluginMcpServers, ...projectMcpServers };
   if (!mcpEnabled) {
     console.log("   \u{1F50C} MCP: disabled (config.mcpEnabled=false)");
   }
@@ -3578,10 +3685,10 @@ async function startWebServer(options = {}) {
     }
   }
   let skillManager = null;
-  const skillsDir = join3(config.getConfigDir(), SKILLS_DIR_NAME);
-  if (existsSync4(skillsDir)) {
+  const skillsDir = join2(config.getConfigDir(), SKILLS_DIR_NAME);
+  if (existsSync3(skillsDir)) {
     skillManager = new SkillManager(skillsDir, config.get("ui").skillSizeWarn);
-    skillManager.loadSkills();
+    skillManager.loadSkills(pluginAssets.skillDirs);
     const count = skillManager.listSkills().length;
     if (count > 0) {
       console.log(`   Skills: ${count} available`);
@@ -3650,18 +3757,18 @@ async function startWebServer(options = {}) {
     next();
   };
   const moduleDir = getModuleDir();
-  let clientDir = join3(moduleDir, "web", "client");
-  if (!existsSync4(clientDir)) {
-    clientDir = join3(moduleDir, "client");
+  let clientDir = join2(moduleDir, "web", "client");
+  if (!existsSync3(clientDir)) {
+    clientDir = join2(moduleDir, "client");
   }
-  if (!existsSync4(clientDir)) {
-    clientDir = join3(moduleDir, "..", "..", "src", "web", "client");
+  if (!existsSync3(clientDir)) {
+    clientDir = join2(moduleDir, "..", "..", "src", "web", "client");
   }
-  if (!existsSync4(clientDir)) {
-    clientDir = join3(process.cwd(), "src", "web", "client");
+  if (!existsSync3(clientDir)) {
+    clientDir = join2(process.cwd(), "src", "web", "client");
   }
   console.log(`   Static files: ${clientDir}`);
-  app.use("/vendor", express.static(join3(clientDir, "vendor"), { maxAge: "1y", immutable: true }));
+  app.use("/vendor", express.static(join2(clientDir, "vendor"), { maxAge: "1y", immutable: true }));
   app.use(express.static(clientDir));
   app.get("/api/status", (_req, res) => {
     res.json({
@@ -3728,7 +3835,7 @@ async function startWebServer(options = {}) {
   app.get("/api/files", requireAuth, (req, res) => {
     const cwd = process.cwd();
     const prefix = req.query.prefix || "";
-    const targetDir = join3(cwd, prefix);
+    const targetDir = join2(cwd, prefix);
     try {
       const canonicalTarget = realpathSync(resolve2(targetDir));
       const canonicalCwd = realpathSync(resolve2(cwd));
@@ -3745,7 +3852,7 @@ async function startWebServer(options = {}) {
       const entries = readdirSync2(targetDir, { withFileTypes: true });
       const files = entries.filter((e) => !SKIP.has(e.name) && !e.name.startsWith(".")).slice(0, 50).map((e) => ({
         name: e.name,
-        path: relative(cwd, join3(targetDir, e.name)).replace(/\\/g, "/"),
+        path: relative(cwd, join2(targetDir, e.name)).replace(/\\/g, "/"),
         isDir: e.isDirectory()
       }));
       res.json({ files });
@@ -3781,8 +3888,8 @@ async function startWebServer(options = {}) {
     try {
       const authUser = req._authUser;
       const histDir = authUser ? getUserShared(authUser).config.getHistoryDir() : config.getHistoryDir();
-      const filePath = join3(histDir, `${id}.json`);
-      if (!existsSync4(filePath)) {
+      const filePath = join2(histDir, `${id}.json`);
+      if (!existsSync3(filePath)) {
         res.status(404).json({ error: "Session not found" });
         return;
       }
@@ -3797,7 +3904,7 @@ async function startWebServer(options = {}) {
         res.status(404).json({ error: "Session not found" });
         return;
       }
-      const data = JSON.parse(readFileSync4(filePath, "utf-8"));
+      const data = JSON.parse(readFileSync3(filePath, "utf-8"));
       res.json({ session: data });
     } catch (err) {
       res.status(500).json({ error: err instanceof Error ? err.message : String(err) });
@@ -3810,7 +3917,7 @@ async function startWebServer(options = {}) {
       return;
     }
     const cwd = process.cwd();
-    const fullPath = resolve2(join3(cwd, filePath));
+    const fullPath = resolve2(join2(cwd, filePath));
     try {
       const canonicalFull = realpathSync(fullPath);
       const canonicalCwd = realpathSync(resolve2(cwd));
@@ -3828,7 +3935,7 @@ async function startWebServer(options = {}) {
         res.json({ error: `File too large (${(stat.size / 1024).toFixed(0)} KB, max 512 KB)` });
         return;
       }
-      const content = readFileSync4(fullPath, "utf-8");
+      const content = readFileSync3(fullPath, "utf-8");
       res.json({ content, size: stat.size });
     } catch {
       res.json({ error: "Cannot read file" });
@@ -4083,17 +4190,17 @@ function resolveProjectMcpPath() {
   const cwd = process.cwd();
   const gitRoot = getGitRoot(cwd);
   const projectRoot = gitRoot ?? cwd;
-  const configPath = join3(projectRoot, MCP_PROJECT_CONFIG_NAME);
-  return existsSync4(configPath) ? configPath : null;
+  const configPath = join2(projectRoot, MCP_PROJECT_CONFIG_NAME);
+  return existsSync3(configPath) ? configPath : null;
 }
 function loadProjectMcpConfig() {
   const cwd = process.cwd();
   const gitRoot = getGitRoot(cwd);
   const projectRoot = gitRoot ?? cwd;
-  const configPath = join3(projectRoot, MCP_PROJECT_CONFIG_NAME);
-  if (!existsSync4(configPath)) return null;
+  const configPath = join2(projectRoot, MCP_PROJECT_CONFIG_NAME);
+  if (!existsSync3(configPath)) return null;
   try {
-    const raw = JSON.parse(readFileSync4(configPath, "utf-8"));
+    const raw = JSON.parse(readFileSync3(configPath, "utf-8"));
     return raw.mcpServers ?? raw;
   } catch {
     return null;

package/dist/{server-O3XHT56X.js → server-WUT7VYTD.js}

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 import {
   ToolRegistry
-} from "./chunk-TCOC4AUI.js";
+} from "./chunk-GX3HSGJX.js";
 import "./chunk-T2NL5ZIA.js";
 import "./chunk-BXP6YZ2P.js";
-import "./chunk-VW7Y27WW.js";
+import "./chunk-VGFTM3XT.js";
 import {
   runTool
-} from "./chunk-77HDCGTN.js";
+} from "./chunk-MWKE2TNS.js";
 import {
   getDangerLevel,
   schemaToJsonSchema
@@ -15,7 +15,8 @@ import {
 import "./chunk-TZQHYZKT.js";
 import {
   VERSION
-} from "./chunk-7YWS3JLU.js";
+} from "./chunk-NTCB7CMT.js";
+import "./chunk-HOSJZMQS.js";
 import "./chunk-4BKXL7SM.js";
 import "./chunk-TB4W4Y4T.js";
 import "./chunk-KHYD3WXE.js";