jinzd-ai-cli 0.4.217 → 0.4.219

package/dist/index.js

@@ -6,7 +6,6 @@ import {
   autoTrimSessionIfNeeded,
   buildInitPrompt,
   clearDevState,
-  loadContextFiles,
   loadDevState,
   parseSimpleYaml,
   persistToolRound,
@@ -15,7 +14,7 @@ import {
   scanProject,
   sessionHasMeaningfulContent,
   setupProxy
-} from "./chunk-OUAZOE5U.js";
+} from "./chunk-QUFYBR6Q.js";
 import {
   buildReviewPrompt,
   buildSecurityReviewPrompt
@@ -33,14 +32,12 @@ import {
   exportMemoryEntries,
   formatMemoryForPrompt,
   formatPermissionProfileWarning,
-  getPendingHookTrust,
   getRecentlyDeniedAutoActions,
   googleSearchContext,
   initTheme,
   isInterrupted,
   isMemoryExpired,
   lastResponseStore,
-  listHooks,
   listMemoryEntries,
   memoryMarkdownPath,
   memoryStorePath,
@@ -48,19 +45,17 @@ import {
   requestInterrupt,
   resetInterrupt,
   rlInternal,
-  runLifecycleHooks,
   setContextWindow,
   setMaxOutputCap,
   spawnAgentContext,
   theme,
-  trustHook,
   undoStack,
-  untrustHook,
   updateMemoryApproval
-} from "./chunk-MGBMNCHG.js";
+} from "./chunk-GEN4O5QH.js";
+import "./chunk-K3CF65QH.js";
 import "./chunk-T2NL5ZIA.js";
 import "./chunk-BXP6YZ2P.js";
-import "./chunk-VTH7BLXK.js";
+import "./chunk-64NUW3WL.js";
 import {
   SessionManager,
   getContentText
@@ -74,19 +69,45 @@ import {
   getPricing
 } from "./chunk-E44DTERW.js";
 import {
-  getConfigDirUsage,
-  listRecentCrashes,
+  fileCheckpoints
+} from "./chunk-4BKXL7SM.js";
+import {
+  buildChatIndex,
+  clearChatIndex,
+  getChatIndexStatus,
+  searchChatMemory
+} from "./chunk-TB4W4Y4T.js";
+import "./chunk-KHYD3WXE.js";
+import {
+  DEFAULT_PATTERNS,
+  scanString
+} from "./chunk-SLSWPBK3.js";
+import {
+  buildDoctorReport,
+  formatDoctorReport,
+  loadContextFiles,
   writeCrashLog
-} from "./chunk-524WZOKS.js";
+} from "./chunk-3I4RZYYO.js";
 import {
   ProviderRegistry
 } from "./chunk-QMXC327F.js";
 import {
-  getStatsSnapshot,
-  getTopFailingTools,
-  getTopUsedTools,
-  installFlushOnExit
-} from "./chunk-SNJAOXFT.js";
+  describePlugin,
+  getActivePluginAssets,
+  getInstalledPlugin,
+  getPendingHookTrust,
+  installFlushOnExit,
+  installPlugin,
+  listHooks,
+  listInstalledPlugins,
+  mergePluginHooks,
+  pluginRoot,
+  runLifecycleHooks,
+  setPluginEnabled,
+  trustHook,
+  trustPlugin,
+  untrustHook
+} from "./chunk-GGKQHPB3.js";
 import {
   CONTENT_ONLY_STREAM_REMINDER,
   TEE_FINAL_USER_NUDGE,
@@ -108,7 +129,7 @@ import {
 } from "./chunk-XPBEJB27.js";
 import {
   ConfigManager
-} from "./chunk-WKOQ5CYC.js";
+} from "./chunk-KIEZBTVD.js";
 import {
   AuthError,
   ProviderError,
@@ -126,34 +147,18 @@ import {
   DESCRIPTION,
   DEV_STATE_FILE_NAME,
   MCP_PROJECT_CONFIG_NAME,
-  MEMORY_FILE_NAME,
   PLAN_MODE_READONLY_TOOLS,
   PLAN_MODE_SYSTEM_ADDON,
   REPO_URL,
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-XJGEQIYS.js";
+} from "./chunk-U7KVU25H.js";
 import {
   formatGitContextForPrompt,
   getGitContext,
   getGitRoot
 } from "./chunk-HOSJZMQS.js";
-import {
-  fileCheckpoints
-} from "./chunk-4BKXL7SM.js";
-import {
-  buildChatIndex,
-  clearChatIndex,
-  getChatIndexStatus,
-  searchChatMemory
-} from "./chunk-TB4W4Y4T.js";
-import "./chunk-KHYD3WXE.js";
-import {
-  DEFAULT_PATTERNS,
-  scanString
-} from "./chunk-SLSWPBK3.js";
-import "./chunk-K3CF65QH.js";
 import "./chunk-CKH4KQ4E.js";
 import {
   atomicWriteFileSync
@@ -164,7 +169,7 @@ import { program } from "commander";
 
 // src/repl/repl.ts
 import * as readline from "readline";
-import { existsSync as existsSync4, readFileSync as readFileSync3, readdirSync as readdirSync2, statSync as statSync3, mkdirSync as mkdirSync4 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync3, readdirSync as readdirSync2, statSync as statSync2, mkdirSync as mkdirSync4 } from "fs";
 import { join as join4, resolve as resolve2, extname as extname2, dirname as dirname3, basename as basename2 } from "path";
 import chalk4 from "chalk";
 
@@ -289,7 +294,7 @@ var ABOUT_FEATURES = [
   "Sub-agents: spawn_agent delegates complex subtasks to an isolated tool-call loop",
   "Agent Skills: ~/.aicli/skills/ reusable packs (system prompt + tool whitelist)",
   "MCP protocol: connect external MCP server tools; aicli mcp-serve reverses aicli into a server",
-  "Plugin system: ~/.aicli/plugins/*.js custom tools (allowPlugins, off by default)",
+  "Plugin packages: skills/hooks/commands/MCP/agents via trusted .aicli-plugin/plugin.json",
   "Permission rules + hooks: auto-approve/deny/confirm + pre/post tool execution hooks",
   "User identity (/profile): persistent profile injected into every provider",
   "Symbol + semantic code index: find_symbol/get_outline/find_references/search_code (8 languages)",
@@ -657,7 +662,7 @@ Error${typeName}: ${lines.join("\n")}
 };
 
 // src/repl/commands/index.ts
-import { writeFileSync, mkdirSync as mkdirSync2, existsSync as existsSync2, readFileSync, statSync as statSync2 } from "fs";
+import { writeFileSync, mkdirSync as mkdirSync2, existsSync as existsSync2, readFileSync } from "fs";
 import { execSync as execSync2 } from "child_process";
 import { platform } from "os";
 import { resolve, dirname as dirname2, join as join2, basename } from "path";
@@ -916,6 +921,7 @@ function createDefaultCommands() {
             rows: [
               ["/tools", "List all AI tools available"],
               ["/plugins", "Show plugin directory and loaded plugins"],
+              ["/plugin [list|install|enable|disable|inspect|trust]", "Manage package plugins"],
               ["/mcp [reconnect [id]]", "MCP servers / reconnect disconnected"],
               ["/skill [name|off|list]", "Manage agent skills (reusable prompt packs)"],
               ["/context", "Show or reload hierarchical context layers"],
@@ -1376,7 +1382,7 @@ No commands match "${filter}".
         console.log("  PermProf : " + (ctx.config.get("defaultPermissionProfile") ?? "legacy"));
         console.log("  Network  : " + (ctx.config.get("networkPolicy")?.enabled ?? false ? "on" : "off"));
         console.log("  AutoMode : " + (ctx.getToolExecutor().sessionAutoMode ? "on" : "off"));
-        console.log("  Hooks    : " + getPendingHookTrust(ctx.config.get("hooks") ?? void 0, ctx.config.getConfigDir()).length + " pending trust");
+        console.log("  Hooks    : " + getPendingHookTrust(mergePluginHooks(ctx.config.get("hooks") ?? void 0, ctx.config.getConfigDir()), ctx.config.getConfigDir()).length + " pending trust");
         console.log(`  Messages : ${session?.messages.length ?? 0}`);
         console.log(`  Session  : ${session?.id.slice(0, 8) ?? "none"}`);
         if (layers.length > 0) {
@@ -1661,6 +1667,91 @@ No tools match "${filter}".
         console.log();
       }
     },
+    {
+      name: "plugin",
+      description: "Manage package plugins (.aicli-plugin/plugin.json)",
+      usage: "/plugin [list|install <path>|enable <name>|disable <name>|inspect <name>|trust <name>]",
+      async execute(args, ctx) {
+        const sub = args[0] ?? "list";
+        const configDir = ctx.config.getConfigDir();
+        try {
+          if (sub === "list") {
+            const plugins = listInstalledPlugins(configDir);
+            console.log(theme.heading("\n\u{1F50C} Package Plugins\n"));
+            console.log(theme.dim(`  Dir: ${pluginRoot(configDir)}`));
+            if (plugins.length === 0) {
+              console.log(theme.dim("  No package plugins installed."));
+              console.log(theme.dim("  Use: /plugin install <path-to-plugin-dir>"));
+            } else {
+              for (const p of plugins) {
+                const status = `${p.enabled ? theme.success("enabled") : theme.dim("disabled")} / ${p.trusted ? theme.success("trusted") : theme.warning("untrusted")}`;
+                console.log(`  ${theme.accent(p.name.padEnd(22))} ${p.manifest.version.padEnd(10)} ${status}`);
+                if (p.manifest.description) console.log(theme.dim(`      ${p.manifest.description}`));
+                if (!p.valid && p.error) console.log(theme.warning(`      invalid: ${p.error}`));
+              }
+            }
+            console.log();
+            return;
+          }
+          if (sub === "install") {
+            const input2 = args[1];
+            if (!input2) {
+              ctx.renderer.printInfo("Usage: /plugin install <path-to-plugin-dir>");
+              return;
+            }
+            const plugin = installPlugin(configDir, input2);
+            ctx.renderer.printSuccess(`Installed plugin ${plugin.name}@${plugin.manifest.version}. Run /plugin trust ${plugin.name}, then /plugin enable ${plugin.name}.`);
+            return;
+          }
+          if (sub === "trust") {
+            const name = args[1];
+            if (!name) {
+              ctx.renderer.printInfo("Usage: /plugin trust <name>");
+              return;
+            }
+            const state = trustPlugin(configDir, name);
+            ctx.renderer.printSuccess(`Trusted plugin ${state.name}.`);
+            return;
+          }
+          if (sub === "enable" || sub === "disable") {
+            const name = args[1];
+            if (!name) {
+              ctx.renderer.printInfo(`Usage: /plugin ${sub} <name>`);
+              return;
+            }
+            const state = setPluginEnabled(configDir, name, sub === "enable");
+            ctx.renderer.printSuccess(`${sub === "enable" ? "Enabled" : "Disabled"} plugin ${state.name}. Restart aicli or reload affected managers for changes to take effect.`);
+            return;
+          }
+          if (sub === "inspect") {
+            const name = args[1];
+            if (!name) {
+              ctx.renderer.printInfo("Usage: /plugin inspect <name>");
+              return;
+            }
+            const plugin = getInstalledPlugin(configDir, name);
+            console.log();
+            for (const line of describePlugin(plugin)) console.log(line);
+            console.log();
+            return;
+          }
+          if (sub === "active") {
+            const assets = getActivePluginAssets(configDir);
+            console.log(JSON.stringify({
+              plugins: assets.plugins.map((p) => p.name),
+              skillDirs: assets.skillDirs,
+              commandDirs: assets.commandDirs,
+              agentDirs: assets.agentDirs,
+              mcpServers: Object.keys(assets.mcpServers)
+            }, null, 2));
+            return;
+          }
+          ctx.renderer.printInfo("Usage: /plugin [list|install|enable|disable|inspect|trust]");
+        } catch (err) {
+          ctx.renderer.renderError(err instanceof Error ? err.message : String(err));
+        }
+      }
+    },
     {
       name: "mcp",
       description: "Show MCP server connections and tools",
@@ -1670,7 +1761,7 @@ No tools match "${filter}".
           const { join: join5 } = await import("path");
           const { existsSync: existsSync5 } = await import("fs");
           const { getGitRoot: getGitRoot2 } = await import("./git-context-EXOEHQSF.js");
-          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-DIXAD35W.js");
+          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-FJOLBABC.js");
           const { approveProject, hashMcpFile } = await import("./project-trust-NKYHL3VZ.js");
           const cwd = process.cwd();
           const projectRoot = getGitRoot2(cwd) ?? cwd;
@@ -1979,7 +2070,7 @@ No tools match "${filter}".
           return;
         }
         if (sub === "reload") {
-          const count = manager.loadSkills();
+          const count = manager.loadSkills(getActivePluginAssets(ctx.config.getConfigDir()).skillDirs);
           ctx.renderer.printSuccess(`Reloaded: ${count} skill(s) found.`);
           return;
         }
@@ -2706,7 +2797,7 @@ ${hint}` : "")
         }
         const sub = args[0]?.toLowerCase();
         if (sub === "reload") {
-          const count = mgr.loadCommands();
+          const count = mgr.loadCommands(getActivePluginAssets(ctx.config.getConfigDir()).commandDirs);
           console.log(theme.success(`  \u2713 Reloaded ${count} custom command(s).`));
           return;
         }
@@ -2729,7 +2820,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         try {
-          const { executeTests } = await import("./run-tests-ZDSA3QES.js");
+          const { executeTests } = await import("./run-tests-GEZSSNJM.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -3090,126 +3181,16 @@ ${hint}` : "")
     // ── /doctor ────────────────────────────────────────────────────────────────
     {
       name: "doctor",
-      description: "Health check: API keys, config, MCP connections",
+      description: "Health check: context, permissions, hooks, plugins, MCP, config",
       usage: "/doctor",
       execute(_args, ctx) {
-        console.log(theme.heading("\n\u{1FA7A} AI-CLI Health Check\n"));
-        const providers = ctx.providers.listAll();
-        console.log(theme.heading("API Keys:"));
-        for (const p of providers) {
-          const icon = p.configured ? theme.success("  \u2713") : theme.dim("  \u25CB");
-          const status = p.configured ? theme.success("configured") : theme.dim("not configured");
-          console.log(`${icon}  ${p.id.padEnd(14)} ${status}`);
-        }
-        console.log();
-        const configDir = ctx.config.getConfigDir();
-        console.log(theme.heading("Config Files:"));
-        console.log(`  Dir:        ${theme.accent(configDir)}`);
-        const checkFile = (label, filePath) => {
-          const exists = existsSync2(filePath);
-          const icon = exists ? theme.success("\u2713") : theme.dim("\u2013");
-          let extra = "";
-          if (exists) {
-            try {
-              extra = theme.dim(` (${statSync2(filePath).size} bytes)`);
-            } catch {
-            }
-          }
-          console.log(`  ${icon}  ${label.padEnd(14)} ${exists ? filePath : theme.dim("(not found)")}${extra}`);
-        };
-        checkFile("config.json", join2(configDir, "config.json"));
-        checkFile("memory.md", join2(configDir, MEMORY_FILE_NAME));
-        checkFile("dev-state.md", join2(configDir, "dev-state.md"));
-        console.log();
-        const mcpManager = ctx.getMcpManager();
-        if (mcpManager) {
-          console.log(theme.heading("MCP Servers:"));
-          const statuses = mcpManager.getStatus();
-          if (statuses.length === 0) {
-            console.log(theme.dim("  (no servers configured)"));
-          } else {
-            for (const s of statuses) {
-              const icon = s.connected ? theme.success("  \u2713") : theme.error("  \u2717");
-              const state = s.connected ? theme.success(`connected`) + theme.dim(` \xB7 ${s.serverName} \xB7 ${s.toolCount} tools`) : theme.error("disconnected") + (s.error ? theme.dim(` \xB7 ${s.error}`) : "");
-              console.log(`${icon}  ${s.serverId.padEnd(16)} ${state}`);
-            }
-          }
-          console.log();
-        }
-        const provider = ctx.getCurrentProvider();
-        const model = ctx.getCurrentModel();
-        const ctxTokens = ctx.estimateConversationTokens();
-        const ctxWindow = ctx.getContextWindowSize();
-        const pct = ctxWindow > 0 ? Math.round(ctxTokens / ctxWindow * 100) : 0;
-        const pctColor = pct > 80 ? theme.error : pct > 60 ? theme.warning : theme.success;
-        const dirs = ctx.listContextDirs();
-        console.log(theme.heading("Current Session:"));
-        console.log(`  Provider:   ${theme.accent(provider)}`);
-        console.log(`  Model:      ${theme.accent(model)}`);
-        console.log(`  Context:    ${pctColor(`${pct}%`)} (est. ${ctxTokens.toLocaleString()} / ${ctxWindow.toLocaleString()} tokens)`);
-        if (dirs.length > 0) {
-          console.log(`  Extra dirs: ${dirs.map((d) => d.dir).join(", ")}`);
-        }
-        console.log();
-        const crashes = listRecentCrashes(5, configDir);
-        console.log(theme.heading("Recent Crashes (last 5):"));
-        if (crashes.length === 0) {
-          console.log(theme.dim("  (none \u2014 clean!)"));
-        } else {
-          for (const c of crashes) {
-            console.log(`  ${theme.error("\u2717")}  ${c.timestamp}  ${theme.warning(c.kind)}`);
-            console.log(`     ${theme.dim(c.message)}`);
-            console.log(`     ${theme.dim(c.file)}`);
-          }
-        }
-        console.log();
-        const allStats = getStatsSnapshot();
-        const totalCalls = allStats.reduce((a, b) => a + b.calls, 0);
-        const totalFails = allStats.reduce((a, b) => a + b.failures, 0);
-        const topUsed = getTopUsedTools(5);
-        const topFailing = getTopFailingTools(5);
-        console.log(theme.heading("Tool Usage:"));
-        const pctFail = totalCalls ? (totalFails * 100 / totalCalls).toFixed(1) : "0.0";
-        console.log(`  total: ${totalCalls} calls \xB7 ${totalFails} failures (${pctFail}%)`);
-        if (topUsed.length > 0) {
-          console.log(theme.dim("  top used:"));
-          for (const t of topUsed) {
-            const avg = t.calls ? (t.totalDurationMs / t.calls).toFixed(0) : "0";
-            console.log(`    ${t.name.padEnd(20)} ${String(t.calls).padStart(6)} calls \xB7 avg ${avg}ms`);
-          }
-        }
-        if (topFailing.length > 0) {
-          console.log(theme.dim("  top failing:"));
-          for (const t of topFailing) {
-            const rate = (t.failures * 100 / Math.max(1, t.calls)).toFixed(1);
-            const msg = t.lastFailureMessage ? ` \xB7 ${theme.dim(t.lastFailureMessage.slice(0, 80))}` : "";
-            console.log(`    ${theme.error(t.name.padEnd(20))} ${t.failures}/${t.calls} (${rate}%)${msg}`);
-          }
-        }
-        console.log();
-        const usage = getConfigDirUsage(configDir);
-        const fmt = (n) => {
-          if (n < 1024) return `${n} B`;
-          if (n < 1024 * 1024) return `${(n / 1024).toFixed(1)} KB`;
-          if (n < 1024 * 1024 * 1024) return `${(n / 1024 / 1024).toFixed(1)} MB`;
-          return `${(n / 1024 / 1024 / 1024).toFixed(2)} GB`;
-        };
-        const dirAnnotations = {
-          models: "semantic search model  \u2192  /index semantic-clear to free",
-          index: "symbol index           \u2192  /index clear to rebuild",
-          history: "conversation history   \u2192  auto-pruned after 30 days",
-          logs: "crash logs",
-          "memory-index": "chat memory index  \u2192  /memory index-clear to free"
-        };
-        console.log(theme.heading("Disk Usage (~/.aicli):"));
-        console.log(`  total: ${theme.accent(fmt(usage.totalBytes))}`);
-        for (const e of usage.entries.slice(0, 10)) {
-          const note = dirAnnotations[e.name];
-          const noteStr = note ? `  ${theme.dim("\xB7")} ${theme.dim(note)}` : "";
-          console.log(`    ${e.name.padEnd(18)} ${theme.dim(fmt(e.bytes))}${noteStr}`);
-        }
-        console.log();
-        console.log(theme.success("\u2713 Health check complete\n"));
+        const report = buildDoctorReport({
+          config: ctx.config,
+          providers: ctx.providers,
+          cwd: process.cwd(),
+          mcpStatuses: ctx.getMcpManager()?.getStatus() ?? []
+        });
+        console.log(formatDoctorReport(report, true));
       }
     },
     {
@@ -3377,7 +3358,7 @@ Summary: ${fileMap.size} file(s) \u2014 ${newFiles} new, ${modifiedFiles} modifi
       usage: "/hooks [list|inspect <id>|trust <id>|untrust <id>|disable]",
       execute(args, ctx) {
         const sub = (args[0] || "list").toLowerCase();
-        const hooks = listHooks(ctx.config.get("hooks") ?? void 0, ctx.config.getConfigDir());
+        const hooks = listHooks(mergePluginHooks(ctx.config.get("hooks") ?? void 0, ctx.config.getConfigDir()), ctx.config.getConfigDir());
         const findHook = (id) => hooks.find((h) => h.id === id || h.hash.startsWith(id ?? ""));
         if (sub === "list") {
           console.log(theme.heading("  Hooks"));
@@ -3456,7 +3437,7 @@ Summary: ${fileMap.size} file(s) \u2014 ${newFiles} new, ${modifiedFiles} modifi
           console.log("    profile      : " + (ctx.config.get("defaultPermissionProfile") ?? "legacy"));
           console.log("    network      : " + (ctx.config.get("networkPolicy")?.enabled ?? false ? "on" : "off"));
           console.log("    autoMode     : " + (ctx.getToolExecutor().sessionAutoMode ? "on" : "off"));
-          console.log("    hooks        : " + getPendingHookTrust(ctx.config.get("hooks") ?? void 0, ctx.config.getConfigDir()).length + " pending trust");
+          console.log("    hooks        : " + getPendingHookTrust(mergePluginHooks(ctx.config.get("hooks") ?? void 0, ctx.config.getConfigDir()), ctx.config.getConfigDir()).length + " pending trust");
           console.log(`    patterns     : ${DEFAULT_PATTERNS.length} built-in + ${security.customPatterns?.length ?? 0} custom`);
           console.log(`    last save    : ${ctx.sessions.lastRedactionHits} hit(s) redacted`);
           console.log();
@@ -4277,22 +4258,22 @@ var CustomCommandManager = class {
     this.commandsDir = commandsDir;
   }
   commands = /* @__PURE__ */ new Map();
-  loadCommands() {
+  loadCommands(extraDirs = []) {
     this.commands.clear();
-    if (!existsSync3(this.commandsDir)) {
-      mkdirSync3(this.commandsDir, { recursive: true });
-      return 0;
+    this.loadCommandDir(this.commandsDir, true);
+    for (const dir of extraDirs) this.loadCommandDir(dir, false);
+    return this.commands.size;
+  }
+  loadCommandDir(dir, createIfMissing) {
+    if (!existsSync3(dir)) {
+      if (createIfMissing) mkdirSync3(dir, { recursive: true });
+      return;
     }
-    let count = 0;
-    for (const file of readdirSync(this.commandsDir)) {
+    for (const file of readdirSync(dir)) {
       if (extname(file) !== ".md") continue;
-      const cmd = parseCommandFile(join3(this.commandsDir, file));
-      if (cmd) {
-        this.commands.set(cmd.meta.name, cmd);
-        count++;
-      }
+      const cmd = parseCommandFile(join3(dir, file));
+      if (cmd && !this.commands.has(cmd.meta.name)) this.commands.set(cmd.meta.name, cmd);
     }
-    return count;
   }
   listCommands() {
     return [...this.commands.values()];
@@ -4596,7 +4577,7 @@ function parseAtReferences(input2, cwd) {
       continue;
     }
     if (mime) {
-      const fileSize = statSync3(absPath).size;
+      const fileSize = statSync2(absPath).size;
       if (fileSize > MAX_IMAGE_BYTES) {
         refs.push({ path: rawPath, type: "toolarge" });
         continue;
@@ -4670,7 +4651,7 @@ var Repl = class {
     const permissionProfileName = this.config.get("defaultPermissionProfile") ?? "legacy";
     const permissionProfiles = this.config.get("permissionProfiles") ?? {};
     this.toolExecutor.setConfig({
-      hookConfig: this.config.get("hooks") ?? void 0,
+      hookConfig: mergePluginHooks(this.config.get("hooks") ?? void 0, this.config.getConfigDir()),
       hookConfigDir: this.config.getConfigDir(),
       permissionRules: this.config.get("permissionRules") ?? [],
       defaultPermission: this.config.get("defaultPermission") ?? "confirm",
@@ -4680,11 +4661,12 @@ var Repl = class {
       workspaceRoot: process.cwd(),
       networkPolicy: this.config.get("networkPolicy")
     });
-    const pendingHooks = getPendingHookTrust(this.config.get("hooks") ?? void 0, this.config.getConfigDir());
+    const effectiveHooks = mergePluginHooks(this.config.get("hooks") ?? void 0, this.config.getConfigDir());
+    const pendingHooks = getPendingHookTrust(effectiveHooks, this.config.getConfigDir());
     if (pendingHooks.length > 0) {
       process.stderr.write(theme.warning("  \u26A0 " + pendingHooks.length + " project hook(s) require trust. Run /hooks list and /hooks trust <id>.\n"));
     }
-    runLifecycleHooks(this.config.get("hooks") ?? void 0, "SessionStart", { source: "repl" }, { configDir: this.config.getConfigDir() });
+    runLifecycleHooks(effectiveHooks, "SessionStart", { source: "repl" }, { configDir: this.config.getConfigDir() });
     if (this.config.get("alwaysYolo") === true) {
       this.toolExecutor.sessionAutoApprove = true;
     }
@@ -4853,7 +4835,7 @@ var Repl = class {
         const connector = isLast ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
         let isDir;
         try {
-          isDir = statSync3(fullPath).isDirectory();
+          isDir = statSync2(fullPath).isDirectory();
         } catch {
           continue;
         }
@@ -4885,7 +4867,7 @@ ${treeLines.join("\n")}`
         const fullPath = join4(dir, name);
         let st;
         try {
-          st = statSync3(fullPath);
+          st = statSync2(fullPath);
         } catch {
           continue;
         }
@@ -4932,7 +4914,7 @@ ${content}
     }
     let isDir;
     try {
-      isDir = statSync3(absPath).isDirectory();
+      isDir = statSync2(absPath).isDirectory();
     } catch {
       return { success: false, charCount: 0, added: false, error: `Cannot access: ${dirPath}` };
     }
@@ -5145,7 +5127,7 @@ ${skillContent}`);
       return false;
     }
     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: (msg) => process.stdout.write(theme.dim("  [hook] " + msg) + "\n") }
@@ -5221,7 +5203,7 @@ ${response.content.trim()}
       const removedCount = session.compact(summaryMsg, ackMsg, COMPACT_KEEP_LAST);
       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: COMPACT_KEEP_LAST, instruction },
         { configDir: this.config.getConfigDir(), onSummary: (msg) => process.stdout.write(theme.dim("  [hook] " + msg) + "\n") }
@@ -5423,14 +5405,15 @@ Session '${this.resumeSessionId}' not found.
     }
     const skillsDir = join4(this.config.getConfigDir(), SKILLS_DIR_NAME);
     this.skillManager = new SkillManager(skillsDir, this.config.get("ui").skillSizeWarn);
-    const skillCount = this.skillManager.loadSkills();
+    const pluginAssets = getActivePluginAssets(this.config.getConfigDir());
+    const skillCount = this.skillManager.loadSkills(pluginAssets.skillDirs);
     if (skillCount > 0) {
       process.stdout.write(theme.dim(`  \u{1F3AF} Skills: ${skillCount} available (use /skill to manage)
 `));
     }
     const commandsDir = join4(this.config.getConfigDir(), CUSTOM_COMMANDS_DIR_NAME);
     this.customCommandManager = new CustomCommandManager(commandsDir);
-    const customCmdCount = this.customCommandManager.loadCommands();
+    const customCmdCount = this.customCommandManager.loadCommands(pluginAssets.commandDirs);
     if (customCmdCount > 0) {
       process.stdout.write(theme.dim(`  \u{1F4CB} Custom commands: ${customCmdCount} loaded (use /commands to list)
 `));
@@ -5486,6 +5469,7 @@ Session '${this.resumeSessionId}' not found.
     })();
     const mcpEnabled = this.config.get("mcpEnabled") !== false;
     const globalMcpServers = mcpEnabled ? this.config.get("mcpServers") ?? {} : {};
+    const pluginMcpServers = mcpEnabled ? getActivePluginAssets(this.config.getConfigDir()).mcpServers : {};
     const projectMcpResult = mcpEnabled ? this.loadProjectMcpConfig() : null;
     if (!mcpEnabled) {
       process.stdout.write(theme.dim("  \u{1F50C} MCP: disabled (config.mcpEnabled=false)\n"));
@@ -5507,10 +5491,13 @@ Session '${this.resumeSessionId}' not found.
         );
       }
     }
-    const mergedMcpServers = { ...globalMcpServers, ...projectMcpServers };
+    const mergedMcpServers = { ...globalMcpServers, ...pluginMcpServers, ...projectMcpServers };
     for (const id of Object.keys(globalMcpServers)) {
       this.mcpServerSources.set(id, "global");
     }
+    for (const id of Object.keys(pluginMcpServers)) {
+      this.mcpServerSources.set(id, "plugin");
+    }
     for (const id of Object.keys(projectMcpServers)) {
       this.mcpServerSources.set(id, "project");
     }
@@ -5518,6 +5505,7 @@ Session '${this.resumeSessionId}' not found.
     if (Object.keys(mergedMcpServers).length > 0) {
       this.mcpManager = new McpManager();
       const mcpProjectCount = Object.keys(projectMcpServers).length;
+      const mcpPluginCount = Object.keys(pluginMcpServers).length;
       let bannerEmitted = false;
       const emitBanner = (afterDeadline) => {
         if (bannerEmitted) return;
@@ -5663,7 +5651,7 @@ Session '${this.resumeSessionId}' not found.
   }
   runUserPromptHooks(sessionId, userInput) {
     const promptDecisions = runLifecycleHooks(
-      this.config.get("hooks") ?? void 0,
+      mergePluginHooks(this.config.get("hooks") ?? void 0, this.config.getConfigDir()),
       "UserPromptSubmit",
       { sessionId, prompt: userInput },
       { configDir: this.config.getConfigDir(), onSummary: (msg) => process.stdout.write(theme.dim("  [hook] " + msg) + "\n") }
@@ -6096,7 +6084,7 @@ Session '${this.resumeSessionId}' not found.
         if (!entry.toLowerCase().startsWith(prefix.toLowerCase())) continue;
         try {
           const fullPath = join4(absDir, entry);
-          const stat = statSync3(fullPath);
+          const stat = statSync2(fullPath);
           const rel = dir === "." ? entry : `${dir}/${entry}`;
           results.push(stat.isDirectory() ? `${rel}/` : rel);
         } catch {
@@ -7152,7 +7140,7 @@ Tip: You can continue the conversation by asking the AI to proceed.`
     void this.shutdownAsync();
   }
   async shutdownAsync() {
-    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.running = false;
     const sessionId = this.sessions.current?.id;
     if (sessionId) {
@@ -7267,7 +7255,7 @@ program.command("web").description("Start Web UI server with browser-based chat
     console.error("Error: Invalid port number. Must be between 1 and 65535.");
     process.exit(1);
   }
-  const { startWebServer } = await import("./server-QT3SC2KI.js");
+  const { startWebServer } = await import("./server-5E2AIXVX.js");
   await startWebServer({ port, host: options.host });
 });
 program.command("user [action] [username]").description("Manage Web UI users (list | create <name> | delete <name> | reset-password <name> | logout-all <name> | migrate <name>)").action(async (action, username) => {
@@ -7434,16 +7422,20 @@ program.command("sessions").description("List recent conversation sessions").opt
   console.log(footer + "\n");
 });
 program.command("usage").description("Show token + cost usage grouped by provider/model (cross-session)").option("--days <n>", "Only the last N days (inclusive of today)").option("--month <ym>", "Only a specific month, format YYYY-MM (e.g. 2026-06)").option("--json", "Output as JSON (for scripting)").action(async (options) => {
-  const { runUsageCli } = await import("./usage-WZZFSFLM.js");
+  const { runUsageCli } = await import("./usage-BMK6M5U3.js");
   await runUsageCli(options);
 });
 program.command("doctor").description("Health check: API keys, config, MCP, recent crashes, tool usage, disk usage").option("--json", "Output as JSON (for scripting)").option("--reset-stats", "Reset accumulated tool usage statistics").action(async (options) => {
-  const { runDoctorCli } = await import("./doctor-cli-7GOQPULZ.js");
-  await runDoctorCli({ json: !!options.json, resetStats: !!options.resetStats });
+  const { runDoctorCli } = await import("./doctor-cli-KB2LUDF3.js");
+  const argv = process.argv.slice(2);
+  await runDoctorCli({
+    json: !!options.json || argv.includes("--json"),
+    resetStats: !!options.resetStats || argv.includes("--reset-stats")
+  });
 });
 program.command("batch <action> [arg] [arg2]").description("Anthropic Message Batches: submit | list | status <id> | results <id> [out] | cancel <id>").option("--dry-run", "Parse and validate input without submitting (submit only)").action(async (action, arg, arg2, options) => {
   try {
-    const batch = await import("./batch-YCOVKTXD.js");
+    const batch = await import("./batch-CHAPYRVM.js");
     switch (action) {
       case "submit":
         if (!arg) {
@@ -7486,7 +7478,7 @@ program.command("batch <action> [arg] [arg2]").description("Anthropic Message Ba
   }
 });
 program.command("mcp-serve").description("Start an MCP server over STDIO, exposing aicli's built-in tools to Claude Desktop / Cursor / other MCP clients").option("--allow-destructive", "Allow bash / run_interactive / task_create (always destructive in MCP mode)").option("--allow-outside-cwd", "Allow tool path arguments to escape the sandbox root \u2014 disabled by default").option("--tools <list>", "Comma-separated whitelist of tools to expose (default: all eligible tools)").option("--cwd <path>", "Working directory AND sandbox root (default: current directory)").action(async (options) => {
-  const { startMcpServer } = await import("./server-22YF3U34.js");
+  const { startMcpServer } = await import("./server-Z6O3G2LY.js");
   await startMcpServer({
     allowDestructive: !!options.allowDestructive,
     allowOutsideCwd: !!options.allowOutsideCwd,
@@ -7499,7 +7491,7 @@ program.command("pr <action> [target]").description("PR review helpers: review |
     console.error(`Unknown pr action: ${action}. Use review | security-review | summarize.`);
     process.exit(1);
   }
-  const { runPrCli } = await import("./pr-KPQ5RPKB.js");
+  const { runPrCli } = await import("./pr-YQGH72N6.js");
   const result = await runPrCli({
     action,
     target,
@@ -7519,8 +7511,8 @@ program.command("pr <action> [target]").description("PR review helpers: review |
   process.exit(result.exitCode);
 });
 program.command("ci").description("Headless PR review (code + security) \u2014 reads git/gh diff, optionally posts to PR. Designed for GitHub Actions.").option("--pr <num>", "PR number or URL; diff fetched via gh pr diff <value>", (v) => /^#?\d+$/.test(v) ? parseInt(v.replace(/^#/, ""), 10) : v).option("--base <ref>", "Base ref for git diff <ref>...HEAD (ignored when --pr set)").option("--post", "Post review as a PR comment (requires gh CLI + GH_TOKEN, needs --pr)").option("--no-update", "Always create a new comment instead of updating the previous aicli review").option("--skip-code", "Skip the code review section").option("--skip-security", "Skip the security review section").option("--detailed", "Use the detailed code-review prompt").option("--max-diff <n>", "Max diff chars sent to the model (default 30000)", (v) => parseInt(v, 10)).option("--provider <id>", "Override provider (default: config.defaultProvider)").option("--model <id>", "Override model").option("--dry-run", "Print result to stdout instead of posting (overrides --post)").option("--json", "Output a structured JSON report").option("--markdown", "Output Markdown report (default)").option("--sarif", "Output SARIF 2.1.0 for code scanning artifacts").option("--fail-on-security-high", "Fail when the security review contains HIGH/CRITICAL findings (default)").option("--no-fail-on-security-high", "Do not fail on security HIGH/CRITICAL findings").option("--fail-on-test-failure", "Fail when the report mentions test failures (default)").option("--no-fail-on-test-failure", "Do not fail on test failure findings").option("--fail-on-lint-failure", "Fail when the report mentions lint/typecheck failures (default)").option("--no-fail-on-lint-failure", "Do not fail on lint/typecheck failure findings").action(async (options) => {
-  const { runCi } = await import("./ci-52RZIYWB.js");
-  const { formatCiResult } = await import("./ci-format-73UXKE65.js");
+  const { runCi } = await import("./ci-QPP66T53.js");
+  const { formatCiResult } = await import("./ci-format-5S3EEYRK.js");
   const formats = [options.json, options.markdown, options.sarif].filter(Boolean).length;
   if (formats > 1) {
     console.error("Choose only one output format: --json, --markdown, or --sarif.");
@@ -7677,7 +7669,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-GIGBITZN.js");
+  const { startHub } = await import("./hub-DIM7SKKY.js");
   await startHub(
     {
       topic: topic ?? "",