jinzd-ai-cli 0.4.216 → 0.4.218

package/dist/index.js

@@ -15,7 +15,7 @@ import {
   scanProject,
   sessionHasMeaningfulContent,
   setupProxy
-} from "./chunk-PNTLA3MN.js";
+} from "./chunk-H2UIHGHH.js";
 import {
   buildReviewPrompt,
   buildSecurityReviewPrompt
@@ -23,18 +23,34 @@ import {
 import {
   ToolExecutor,
   ToolRegistry,
+  addMemoryEntry,
   askUserContext,
   cleanupRejectedTeeFile,
   clearRecentlyDeniedAutoActions,
+  deleteMemoryEntry,
+  describePlugin,
   estimateTokens,
+  expireMemoryEntry,
+  exportMemoryEntries,
+  formatMemoryForPrompt,
   formatPermissionProfileWarning,
+  getActivePluginAssets,
+  getInstalledPlugin,
   getPendingHookTrust,
   getRecentlyDeniedAutoActions,
   googleSearchContext,
   initTheme,
+  installPlugin,
   isInterrupted,
+  isMemoryExpired,
   lastResponseStore,
   listHooks,
+  listInstalledPlugins,
+  listMemoryEntries,
+  memoryMarkdownPath,
+  memoryStorePath,
+  mergePluginHooks,
+  pluginRoot,
   renderDiff,
   requestInterrupt,
   resetInterrupt,
@@ -42,15 +58,18 @@ import {
   runLifecycleHooks,
   setContextWindow,
   setMaxOutputCap,
+  setPluginEnabled,
   spawnAgentContext,
   theme,
   trustHook,
+  trustPlugin,
   undoStack,
-  untrustHook
-} from "./chunk-TCOC4AUI.js";
+  untrustHook,
+  updateMemoryApproval
+} from "./chunk-GX3HSGJX.js";
 import "./chunk-T2NL5ZIA.js";
 import "./chunk-BXP6YZ2P.js";
-import "./chunk-VW7Y27WW.js";
+import "./chunk-VGFTM3XT.js";
 import {
   SessionManager,
   getContentText
@@ -67,7 +86,7 @@ import {
   getConfigDirUsage,
   listRecentCrashes,
   writeCrashLog
-} from "./chunk-6HLKCSB3.js";
+} from "./chunk-OUC75QCF.js";
 import {
   ProviderRegistry
 } from "./chunk-QMXC327F.js";
@@ -76,7 +95,7 @@ import {
   getTopFailingTools,
   getTopUsedTools,
   installFlushOnExit
-} from "./chunk-77HDCGTN.js";
+} from "./chunk-MWKE2TNS.js";
 import {
   CONTENT_ONLY_STREAM_REMINDER,
   TEE_FINAL_USER_NUDGE,
@@ -98,7 +117,7 @@ import {
 } from "./chunk-XPBEJB27.js";
 import {
   ConfigManager
-} from "./chunk-WAI3WPV2.js";
+} from "./chunk-P4VBLXKS.js";
 import {
   AuthError,
   ProviderError,
@@ -117,14 +136,13 @@ import {
   DEV_STATE_FILE_NAME,
   MCP_PROJECT_CONFIG_NAME,
   MEMORY_FILE_NAME,
-  MEMORY_MAX_CHARS,
   PLAN_MODE_READONLY_TOOLS,
   PLAN_MODE_SYSTEM_ADDON,
   REPO_URL,
   SKILLS_DIR_NAME,
   VERSION,
   buildUserIdentityPrompt
-} from "./chunk-7YWS3JLU.js";
+} from "./chunk-NTCB7CMT.js";
 import {
   formatGitContextForPrompt,
   getGitContext,
@@ -280,7 +298,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)",
@@ -907,6 +925,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"],
@@ -1367,7 +1386,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) {
@@ -1652,6 +1671,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",
@@ -1661,7 +1765,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-APSORFOH.js");
+          const { MCP_PROJECT_CONFIG_NAME: MCP_PROJECT_CONFIG_NAME2 } = await import("./constants-NCTFSHDU.js");
           const { approveProject, hashMcpFile } = await import("./project-trust-NKYHL3VZ.js");
           const cwd = process.cwd();
           const projectRoot = getGitRoot2(cwd) ?? cwd;
@@ -1970,7 +2074,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;
         }
@@ -2697,7 +2801,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;
         }
@@ -2720,7 +2824,7 @@ ${hint}` : "")
       usage: "/test [command|filter]",
       async execute(args, ctx) {
         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) {
@@ -2875,10 +2979,10 @@ ${hint}` : "")
     // ── /memory ────────────────────────────────────────────────────────────────
     {
       name: "memory",
-      description: "Persistent memory (memory.md) + chat memory recall index (v0.4.89+)",
-      usage: "/memory [show|add <text>|clear|path|rebuild|refresh|status|recall <query>|index-clear]",
+      description: "Governed persistent memory + chat memory recall index",
+      usage: "/memory [show|add|approve|reject|delete|expire|export|path|rebuild|refresh|status|recall|index-clear]",
       async execute(args, ctx) {
-        const memoryFile = join2(ctx.config.getConfigDir(), MEMORY_FILE_NAME);
+        const configDir = ctx.config.getConfigDir();
         const sub = args[0] ?? "show";
         if (sub === "rebuild" || sub === "refresh") {
           const full = sub === "rebuild";
@@ -2912,6 +3016,13 @@ ${hint}` : "")
         }
         if (sub === "status") {
           const s = getChatIndexStatus();
+          const memories = listMemoryEntries(configDir, { includeExpired: true, includeRejected: true });
+          const active = memories.filter((m) => m.approved && !isMemoryExpired(m)).length;
+          const pending = memories.filter((m) => !m.approved && !isMemoryExpired(m)).length;
+          console.log(theme.heading("\n\u{1F9E0} Governed Memory"));
+          console.log(`    active       : ${active}`);
+          console.log(`    pending      : ${pending}`);
+          console.log(`    store        : ${memoryStorePath(configDir)}`);
           console.log(theme.heading("\n\u{1F9E0} Chat Memory Index"));
           if (!s.exists) {
             console.log(theme.dim("    not built yet \u2014 run /memory rebuild\n"));
@@ -2958,60 +3069,116 @@ ${hint}` : "")
         }
         if (sub === "index-clear") {
           clearChatIndex();
-          ctx.renderer.printSuccess("Chat memory index cleared (memory.md untouched).");
+          ctx.renderer.printSuccess("Chat memory index cleared (persistent memory untouched).");
           return;
         }
-        if (sub === "show" || sub === "view") {
-          if (!existsSync2(memoryFile)) {
-            ctx.renderer.printInfo("Memory is empty (memory.md not found)");
-            return;
+        const parseFlags = (items) => {
+          const flags = {};
+          const text = [];
+          for (let i = 0; i < items.length; i++) {
+            const item = items[i];
+            if (item.startsWith("--")) {
+              const key = item.slice(2);
+              const next = items[i + 1];
+              if (next && !next.startsWith("--")) {
+                flags[key] = next;
+                i++;
+              } else {
+                flags[key] = true;
+              }
+            } else {
+              text.push(item);
+            }
           }
-          const content = readFileSync(memoryFile, "utf-8").trim();
-          if (!content) {
+          return { flags, text: text.join(" ").trim() };
+        };
+        const asScope = (value) => value === "personal" || value === "project" || value === "session" || value === "team" ? value : void 0;
+        const asSensitivity = (value) => value === "low" || value === "medium" || value === "high" ? value : void 0;
+        if (sub === "show" || sub === "view" || sub === "list") {
+          const entries = listMemoryEntries(configDir, { includeExpired: true, includeRejected: true });
+          if (entries.length === 0) {
             ctx.renderer.printInfo("Memory is empty");
             return;
           }
-          const lines = content.split("\n").length;
-          console.log(theme.heading("\n\u{1F4DD} Persistent Memory:\n") + theme.dim("\u2500".repeat(60)));
-          console.log(chalk2.white(content));
-          console.log(theme.dim("\u2500".repeat(60)));
-          console.log(theme.dim(`  ${content.length} chars \xB7 ${lines} lines
+          console.log(theme.heading("\n\u{1F4DD} Governed Persistent Memory:\n") + theme.dim("\u2500".repeat(72)));
+          for (const entry of entries) {
+            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";
+            console.log(theme.accent(`  ${entry.id.slice(0, 8)}  ${status}  scope:${entry.scope}  sensitivity:${entry.sensitivity}`));
+            console.log(theme.dim(`      source: ${source} \xB7 created: ${entry.createdAt.replace("T", " ").slice(0, 19)}${entry.expiresAt ? ` \xB7 expires: ${entry.expiresAt}` : ""}`));
+            console.log("      " + entry.content.replace(/\n/g, "\n      "));
+            console.log();
+          }
+          console.log(theme.dim("\u2500".repeat(72)));
+          console.log(theme.dim(`  store: ${memoryStorePath(configDir)}
 `));
         } else if (sub === "add") {
-          const text = args.slice(1).join(" ").trim();
-          if (!text) {
-            ctx.renderer.printInfo("Usage: /memory add <text>");
+          const parsed = parseFlags(args.slice(1));
+          if (!parsed.text) {
+            ctx.renderer.printInfo("Usage: /memory add [--scope personal|project|session|team] [--sensitivity low|medium|high] [--expires-at ISO] <text>");
             return;
           }
-          const now = /* @__PURE__ */ new Date();
-          const dateStr = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}`;
-          const entry = `
-## ${dateStr}
-${text}
-`;
           try {
-            mkdirSync2(dirname2(memoryFile), { recursive: true });
-            const previous = existsSync2(memoryFile) ? readFileSync(memoryFile, "utf-8") : "";
-            atomicWriteFileSync(memoryFile, previous + entry);
-            ctx.renderer.printSuccess(`Added to memory: "${text.slice(0, 60)}${text.length > 60 ? "\u2026" : ""}"`);
+            const entry = addMemoryEntry(configDir, parsed.text, {
+              scope: asScope(parsed.flags.scope) ?? "personal",
+              sensitivity: asSensitivity(parsed.flags.sensitivity),
+              expiresAt: typeof parsed.flags["expires-at"] === "string" ? parsed.flags["expires-at"] : void 0,
+              approved: parsed.flags.pending === true ? false : void 0,
+              cwd: process.cwd(),
+              redact: true
+            });
+            const status = entry.approved ? "approved" : "pending approval";
+            ctx.renderer.printSuccess(`Added memory ${entry.id.slice(0, 8)} (${status}, scope:${entry.scope}, sensitivity:${entry.sensitivity})`);
           } catch (err) {
             ctx.renderer.renderError(`Failed to write memory: ${err instanceof Error ? err.message : String(err)}`);
           }
-        } else if (sub === "clear") {
-          if (!existsSync2(memoryFile)) {
-            ctx.renderer.printInfo("Memory is already empty");
+        } else if (sub === "approve" || sub === "reject") {
+          const id = args[1];
+          if (!id) {
+            ctx.renderer.printInfo(`Usage: /memory ${sub} <id>`);
+            return;
+          }
+          try {
+            const entry = updateMemoryApproval(configDir, id, sub === "approve");
+            ctx.renderer.printSuccess(`${sub === "approve" ? "Approved" : "Rejected"} memory ${entry.id.slice(0, 8)}`);
+          } catch (err) {
+            ctx.renderer.renderError(err instanceof Error ? err.message : String(err));
+          }
+        } else if (sub === "delete") {
+          const id = args[1];
+          if (!id) {
+            ctx.renderer.printInfo("Usage: /memory delete <id>");
+            return;
+          }
+          try {
+            const entry = deleteMemoryEntry(configDir, id);
+            ctx.renderer.printSuccess(`Deleted memory ${entry.id.slice(0, 8)}`);
+          } catch (err) {
+            ctx.renderer.renderError(err instanceof Error ? err.message : String(err));
+          }
+        } else if (sub === "expire") {
+          const id = args[1];
+          if (!id) {
+            ctx.renderer.printInfo("Usage: /memory expire <id> [ISO timestamp]");
             return;
           }
           try {
-            atomicWriteFileSync(memoryFile, "");
-            ctx.renderer.printSuccess("Memory cleared (memory.md emptied)");
+            const entry = expireMemoryEntry(configDir, id, args[2]);
+            ctx.renderer.printSuccess(`Expired memory ${entry.id.slice(0, 8)}`);
           } catch (err) {
-            ctx.renderer.renderError(`Failed to clear memory: ${err instanceof Error ? err.message : String(err)}`);
+            ctx.renderer.renderError(err instanceof Error ? err.message : String(err));
           }
+        } else if (sub === "export") {
+          console.log(exportMemoryEntries(configDir, process.cwd()));
+        } else if (sub === "clear") {
+          atomicWriteFileSync(memoryStorePath(configDir), "");
+          atomicWriteFileSync(memoryMarkdownPath(configDir), "");
+          ctx.renderer.printSuccess("Memory cleared (memory.jsonl and memory.md emptied)");
         } else if (sub === "path") {
-          console.log(theme.accent(memoryFile));
+          console.log(theme.accent(memoryStorePath(configDir)));
+          console.log(theme.dim(memoryMarkdownPath(configDir)));
         } else {
-          ctx.renderer.printInfo("Usage: /memory [show|add <text>|clear|path]");
+          ctx.renderer.printInfo("Usage: /memory [show|add|approve|reject|delete|expire|export|path|rebuild|refresh|status|recall|index-clear]");
         }
       }
     },
@@ -3305,7 +3472,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"));
@@ -3384,7 +3551,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();
@@ -4205,22 +4372,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()];
@@ -4598,7 +4765,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",
@@ -4608,11 +4775,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;
     }
@@ -4945,19 +5113,7 @@ ${content}
     return { layers: result.layers, mergedContent: result.mergedContent };
   }
   loadMemoryContent() {
-    const memoryPath = join4(this.config.getConfigDir(), MEMORY_FILE_NAME);
-    if (!existsSync4(memoryPath)) return null;
-    let content = readFileSync3(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(this.config.getConfigDir(), process.cwd());
   }
   /**
    * 将项目上下文内容合并到 system prompt。
@@ -5085,7 +5241,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") }
@@ -5161,7 +5317,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") }
@@ -5363,14 +5519,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)
 `));
@@ -5426,6 +5583,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"));
@@ -5447,10 +5605,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");
     }
@@ -5458,6 +5619,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;
@@ -5603,7 +5765,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") }
@@ -7092,7 +7254,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) {
@@ -7207,7 +7369,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-FXUF5P64.js");
+  const { startWebServer } = await import("./server-LHYSS6CK.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) => {
@@ -7374,16 +7536,16 @@ 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-X7MJX4YD.js");
+  const { runUsageCli } = await import("./usage-6ZUUJBI2.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-GUIX4X5F.js");
+  const { runDoctorCli } = await import("./doctor-cli-EWMFBP5Q.js");
   await runDoctorCli({ json: !!options.json, resetStats: !!options.resetStats });
 });
 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-C6HCXZIG.js");
+    const batch = await import("./batch-7V7OTMUP.js");
     switch (action) {
       case "submit":
         if (!arg) {
@@ -7426,7 +7588,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-O3XHT56X.js");
+  const { startMcpServer } = await import("./server-WUT7VYTD.js");
   await startMcpServer({
     allowDestructive: !!options.allowDestructive,
     allowOutsideCwd: !!options.allowOutsideCwd,
@@ -7439,7 +7601,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-JOL3IAGV.js");
+  const { runPrCli } = await import("./pr-D6PEKEGK.js");
   const result = await runPrCli({
     action,
     target,
@@ -7459,8 +7621,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-6ZTFO3LX.js");
-  const { formatCiResult } = await import("./ci-format-CLZ6QJRL.js");
+  const { runCi } = await import("./ci-L6GH2WVC.js");
+  const { formatCiResult } = await import("./ci-format-WW7454AY.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.");
@@ -7617,7 +7779,7 @@ program.command("hub [topic]").description("Start multi-agent hub (discuss / bra
     }),
     config.get("customProviders")
   );
-  const { startHub } = await import("./hub-ZGHQWNWE.js");
+  const { startHub } = await import("./hub-CDL6T7CP.js");
   await startHub(
     {
       topic: topic ?? "",