jinzd-ai-cli 0.4.216 → 0.4.218

package/dist/electron-server.js

@@ -27,6 +27,7 @@ import {
   MCP_TOOL_PREFIX,
   MEMORY_FILE_NAME,
   MEMORY_MAX_CHARS,
+  MEMORY_STORE_FILE_NAME,
   PLAN_MODE_READONLY_TOOLS,
   PLAN_MODE_SYSTEM_ADDON,
   PLUGINS_DIR_NAME,
@@ -37,7 +38,7 @@ import {
   VERSION,
   buildUserIdentityPrompt,
   runTestsTool
-} from "./chunk-OLN7VUZA.js";
+} from "./chunk-C2Z42DI5.js";
 import {
   hasSemanticIndex,
   semanticSearch
@@ -47,11 +48,13 @@ import {
 } from "./chunk-RWM2GFRC.js";
 import "./chunk-IEQAE3QG.js";
 import {
+  DEFAULT_PATTERNS,
   loadChatIndex,
   redactJson,
+  redactString,
   scanString,
   searchChatMemory
-} from "./chunk-OQGVGPEK.js";
+} from "./chunk-VHY6NVMQ.js";
 import "./chunk-JV5N65KN.js";
 import {
   atomicWriteFileSync
@@ -61,8 +64,8 @@ import {
 import express from "express";
 import { createServer } from "http";
 import { WebSocketServer } from "ws";
-import { join as join22, dirname as dirname6, resolve as resolve9, relative as relative4, sep as sep3 } from "path";
-import { existsSync as existsSync28, readFileSync as readFileSync22, readdirSync as readdirSync13, statSync as statSync10, realpathSync } from "fs";
+import { join as join23, dirname as dirname8, resolve as resolve11, relative as relative4, sep as sep3 } from "path";
+import { existsSync as existsSync28, readFileSync as readFileSync22, readdirSync as readdirSync14, statSync as statSync10, realpathSync } from "fs";
 import { networkInterfaces } from "os";
 
 // src/config/config-manager.ts
@@ -1844,12 +1847,12 @@ function findPhantomClaims(content, extraMessages) {
   const claimed = extractClaimedFilePaths(content);
   if (claimed.length === 0) return [];
   const normalize = (p) => p.replace(/\\/g, "/").toLowerCase().replace(/^\.\//, "");
-  const basename6 = (p) => {
+  const basename7 = (p) => {
     const parts = normalize(p).split("/");
     return parts[parts.length - 1] ?? "";
   };
   const written = extractWrittenFilePaths(extraMessages).map(normalize);
-  const writtenBases = new Set(written.map(basename6));
+  const writtenBases = new Set(written.map(basename7));
   const writtenFull = new Set(written);
   const bashText = extractBashCommands(extraMessages).map((c) => c.replace(/\\/g, "/").toLowerCase()).join("\n");
   return claimed.filter((raw) => {
@@ -1858,8 +1861,8 @@ function findPhantomClaims(content, extraMessages) {
     for (const w of writtenFull) {
       if (w.endsWith("/" + norm2) || norm2.endsWith("/" + w)) return false;
     }
-    if (writtenBases.has(basename6(norm2))) return false;
-    const base = basename6(norm2);
+    if (writtenBases.has(basename7(norm2))) return false;
+    const base = basename7(norm2);
     if (base && bashText.includes(base)) return false;
     return true;
   });
@@ -7179,7 +7182,7 @@ var ToolExecutor = class {
     rl.resume();
     process.stdout.write(prompt);
     this.confirming = true;
-    return new Promise((resolve10) => {
+    return new Promise((resolve12) => {
       let completed = false;
       const cleanup = (result) => {
         if (completed) return;
@@ -7189,7 +7192,7 @@ var ToolExecutor = class {
         rl.pause();
         rlAny.output = savedOutput;
         this.confirming = false;
-        resolve10(result);
+        resolve12(result);
       };
       const onLine = (line) => {
         const trimmed = line.trim();
@@ -7363,7 +7366,7 @@ var ToolExecutor = class {
     rl.resume();
     process.stdout.write(color("Proceed? [y/N] (type y + Enter to confirm) "));
     this.confirming = true;
-    return new Promise((resolve10) => {
+    return new Promise((resolve12) => {
       let completed = false;
       const cleanup = (answer) => {
         if (completed) return;
@@ -7373,7 +7376,7 @@ var ToolExecutor = class {
         rl.pause();
         rlAny.output = savedOutput;
         this.confirming = false;
-        resolve10(answer === "y");
+        resolve12(answer === "y");
       };
       const onLine = (line) => {
         const trimmed = line.trim();
@@ -8622,7 +8625,7 @@ var runInteractiveTool = {
       PYTHONDONTWRITEBYTECODE: "1"
     };
     const prefixWarnings = [argsTypeWarning, stdinTypeWarning].filter(Boolean).join("");
-    return new Promise((resolve10) => {
+    return new Promise((resolve12) => {
       const child = spawn2(executable, cmdArgs.map(String), {
         cwd: process.cwd(),
         env,
@@ -8655,22 +8658,22 @@ var runInteractiveTool = {
       setTimeout(writeNextLine, 400);
       const timer = setTimeout(() => {
         child.kill();
-        resolve10(`${prefixWarnings}[Timeout after ${timeout}ms]
+        resolve12(`${prefixWarnings}[Timeout after ${timeout}ms]
 ${buildOutput(stdout, stderr)}`);
       }, timeout);
       child.on("close", (code) => {
         clearTimeout(timer);
         const output = buildOutput(stdout, stderr);
         if (code !== 0 && code !== null) {
-          resolve10(`${prefixWarnings}Exit code ${code}:
+          resolve12(`${prefixWarnings}Exit code ${code}:
 ${output}`);
         } else {
-          resolve10(`${prefixWarnings}${output || "(no output)"}`);
+          resolve12(`${prefixWarnings}${output || "(no output)"}`);
         }
       });
       child.on("error", (err) => {
         clearTimeout(timer);
-        resolve10(
+        resolve12(
           `${prefixWarnings}Failed to start process "${executable}": ${err.message}
 Hint: On Windows, use the full path to the executable, e.g.:
   C:\\Users\\Jinzd\\anaconda3\\envs\\python312\\python.exe`
@@ -9338,26 +9341,328 @@ Any of these triggers means use save_last_response, NOT write_file:
 };
 
 // src/tools/builtin/save-memory.ts
-import { existsSync as existsSync14, readFileSync as readFileSync11, statSync as statSync6, mkdirSync as mkdirSync7 } from "fs";
-import { join as join9 } from "path";
+import { join as join11 } from "path";
 import { homedir as homedir5 } from "os";
-function getMemoryFilePath() {
-  return join9(homedir5(), CONFIG_DIR_NAME, MEMORY_FILE_NAME);
+
+// src/memory/persistent-memory.ts
+import { existsSync as existsSync15, mkdirSync as mkdirSync7, readFileSync as readFileSync11 } from "fs";
+import { randomUUID, createHash as createHash2 } from "crypto";
+import { dirname as dirname5, join as join10, resolve as resolve6 } from "path";
+
+// src/tools/git-context.ts
+import { execSync as execSync2 } from "child_process";
+import { existsSync as existsSync14 } from "fs";
+import { join as join9 } from "path";
+function runGit(cmd, cwd) {
+  try {
+    return execSync2(`git ${cmd}`, {
+      cwd,
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: 5e3
+    }).trim();
+  } catch {
+    return null;
+  }
 }
-function formatTimestamp() {
-  const now = /* @__PURE__ */ new Date();
-  const pad = (n) => String(n).padStart(2, "0");
-  return `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`;
+function getGitRoot(cwd = process.cwd()) {
+  return runGit("rev-parse --show-toplevel", cwd);
+}
+function getGitContext(cwd = process.cwd()) {
+  if (!existsSync14(join9(cwd, ".git"))) {
+    const result = runGit("rev-parse --git-dir", cwd);
+    if (!result) return null;
+  }
+  const branch = runGit("rev-parse --abbrev-ref HEAD", cwd);
+  if (!branch) return null;
+  const statusOutput = runGit("status --porcelain", cwd) ?? "";
+  const statusLines = statusOutput ? statusOutput.split("\n").filter(Boolean) : [];
+  const stagedFiles = [];
+  const changedFiles = [];
+  for (const line of statusLines) {
+    const xy = line.slice(0, 2);
+    const file = line.slice(3).trim();
+    const indexStatus = xy[0];
+    const workStatus = xy[1];
+    if (indexStatus && indexStatus !== " " && indexStatus !== "?") {
+      stagedFiles.push(`${indexStatus} ${file}`);
+    }
+    if (workStatus && workStatus !== " ") {
+      changedFiles.push(`${workStatus} ${file}`);
+    }
+  }
+  const logOutput = runGit("log --oneline -3", cwd) ?? "";
+  const recentCommits = logOutput ? logOutput.split("\n").filter(Boolean) : [];
+  const unpushedOutput = runGit("log @{u}..HEAD --oneline", cwd);
+  const hasUnpushed = unpushedOutput !== null && unpushedOutput.trim().length > 0;
+  return {
+    branch,
+    changedFiles,
+    stagedFiles,
+    recentCommits,
+    hasUnpushed
+  };
+}
+function formatGitContextForPrompt(ctx) {
+  const lines = ["# Git Repository Status", ""];
+  lines.push(`- **Branch**: \`${ctx.branch}\``);
+  if (ctx.stagedFiles.length > 0) {
+    lines.push(`- **Staged** (${ctx.stagedFiles.length} files):`);
+    for (const f of ctx.stagedFiles.slice(0, 10)) {
+      lines.push(`  - ${f}`);
+    }
+    if (ctx.stagedFiles.length > 10) {
+      lines.push(`  - ... and ${ctx.stagedFiles.length - 10} more`);
+    }
+  }
+  if (ctx.changedFiles.length > 0) {
+    lines.push(`- **Modified** (${ctx.changedFiles.length} files):`);
+    for (const f of ctx.changedFiles.slice(0, 10)) {
+      lines.push(`  - ${f}`);
+    }
+    if (ctx.changedFiles.length > 10) {
+      lines.push(`  - ... and ${ctx.changedFiles.length - 10} more`);
+    }
+  }
+  if (ctx.stagedFiles.length === 0 && ctx.changedFiles.length === 0) {
+    lines.push("- **Working tree**: clean");
+  }
+  if (ctx.recentCommits.length > 0) {
+    lines.push("- **Recent commits**:");
+    for (const c of ctx.recentCommits) {
+      lines.push(`  - ${c}`);
+    }
+  }
+  if (ctx.hasUnpushed) {
+    lines.push("- \u26A0\uFE0F Has unpushed commits");
+  }
+  return lines.join("\n");
+}
+
+// src/memory/persistent-memory.ts
+function memoryStorePath(configDir) {
+  return join10(configDir, MEMORY_STORE_FILE_NAME);
+}
+function memoryMarkdownPath(configDir) {
+  return join10(configDir, MEMORY_FILE_NAME);
+}
+function getProjectKey(cwd = process.cwd()) {
+  return resolve6(getGitRoot(cwd) ?? cwd);
+}
+function nowIso() {
+  return (/* @__PURE__ */ new Date()).toISOString();
+}
+function isValidScope(value) {
+  return value === "personal" || value === "project" || value === "session" || value === "team";
+}
+function isValidSensitivity(value) {
+  return value === "low" || value === "medium" || value === "high";
+}
+function normalizeEntry(value) {
+  if (!value || typeof value !== "object") return null;
+  const raw = value;
+  const content = typeof raw.content === "string" ? raw.content.trim() : "";
+  if (!content) return null;
+  const createdAt = typeof raw.createdAt === "string" ? raw.createdAt : nowIso();
+  return {
+    id: typeof raw.id === "string" && raw.id ? raw.id : randomUUID(),
+    content,
+    scope: isValidScope(raw.scope) ? raw.scope : "personal",
+    sourceSession: typeof raw.sourceSession === "string" && raw.sourceSession ? raw.sourceSession : void 0,
+    sourceProject: typeof raw.sourceProject === "string" && raw.sourceProject ? raw.sourceProject : void 0,
+    createdAt,
+    updatedAt: typeof raw.updatedAt === "string" ? raw.updatedAt : createdAt,
+    expiresAt: typeof raw.expiresAt === "string" && raw.expiresAt ? raw.expiresAt : void 0,
+    sensitivity: isValidSensitivity(raw.sensitivity) ? raw.sensitivity : "low",
+    approved: raw.approved === true,
+    redactedKinds: Array.isArray(raw.redactedKinds) ? raw.redactedKinds.filter((x) => typeof x === "string") : void 0
+  };
+}
+function legacyEntriesFromMarkdown(configDir) {
+  const file = memoryMarkdownPath(configDir);
+  if (!existsSync15(file)) return [];
+  const content = readFileSync11(file, "utf-8").trim();
+  if (!content) return [];
+  const parts = content.split(/\n(?=##\s+\d{4}-\d{2}-\d{2})/g);
+  const chunks = parts.length > 1 ? parts : [content];
+  return chunks.map((chunk, index) => {
+    const match = chunk.match(/^##\s+([^\n]+)\n([\s\S]*)$/);
+    const body = (match ? match[2] : chunk).trim();
+    const parsed = match ? Date.parse(match[1].replace(" ", "T")) : NaN;
+    const createdAt = Number.isFinite(parsed) ? new Date(parsed).toISOString() : nowIso();
+    const id = "legacy-" + createHash2("sha1").update(`${index}
+${chunk}`).digest("hex").slice(0, 12);
+    return normalizeEntry({ id, content: body, scope: "personal", createdAt, updatedAt: createdAt, sensitivity: "low", approved: true });
+  }).filter((entry) => Boolean(entry));
+}
+function loadMemoryEntries(configDir) {
+  const file = memoryStorePath(configDir);
+  if (!existsSync15(file)) return legacyEntriesFromMarkdown(configDir);
+  const text = readFileSync11(file, "utf-8").trim();
+  if (!text) return [];
+  const entries = [];
+  for (const line of text.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    try {
+      const entry = normalizeEntry(JSON.parse(trimmed));
+      if (entry) entries.push(entry);
+    } catch {
+    }
+  }
+  return entries;
+}
+function saveMemoryEntries(configDir, entries) {
+  mkdirSync7(configDir, { recursive: true });
+  const jsonl = entries.map((entry) => JSON.stringify(entry)).join("\n");
+  atomicWriteFileSync(memoryStorePath(configDir), jsonl ? jsonl + "\n" : "");
+  syncLegacyMarkdown(configDir, entries);
+}
+function isMemoryExpired(entry, at = /* @__PURE__ */ new Date()) {
+  return Boolean(entry.expiresAt && Date.parse(entry.expiresAt) <= at.getTime());
+}
+function isMemoryVisibleInProject(entry, cwd = process.cwd()) {
+  if (entry.scope !== "project") return true;
+  return entry.sourceProject === getProjectKey(cwd);
+}
+function listMemoryEntries(configDir, options = {}) {
+  const cwd = options.cwd ?? process.cwd();
+  return loadMemoryEntries(configDir).filter((entry) => options.includeRejected || entry.approved).filter((entry) => options.includeExpired || !isMemoryExpired(entry)).filter((entry) => isMemoryVisibleInProject(entry, cwd));
+}
+function addMemoryEntry(configDir, content, options = {}) {
+  const original = content.trim();
+  if (!original) throw new Error("memory content is required");
+  const redact = options.redact ?? true;
+  const redacted = redact ? redactString(original, { enabled: true, patterns: options.patterns ?? DEFAULT_PATTERNS, customRegexes: options.customPatterns }) : { redacted: original, hits: [] };
+  const sensitivity = options.sensitivity ?? (redacted.hits.length > 0 ? "high" : "low");
+  const approved = options.approved ?? (sensitivity === "low" && redacted.hits.length === 0);
+  const scope = options.scope ?? "personal";
+  const timestamp = nowIso();
+  const entry = {
+    id: randomUUID(),
+    content: redacted.redacted.trim(),
+    scope,
+    sourceSession: options.sourceSession,
+    sourceProject: scope === "project" ? getProjectKey(options.cwd) : void 0,
+    createdAt: timestamp,
+    updatedAt: timestamp,
+    expiresAt: options.expiresAt,
+    sensitivity,
+    approved,
+    redactedKinds: [...new Set(redacted.hits.map((hit) => hit.kind))]
+  };
+  const entries = loadMemoryEntries(configDir);
+  entries.push(entry);
+  saveMemoryEntries(configDir, entries);
+  return entry;
+}
+function updateMemoryApproval(configDir, idPrefix, approved) {
+  const entries = loadMemoryEntries(configDir);
+  const entry = findUnique(entries, idPrefix);
+  entry.approved = approved;
+  entry.updatedAt = nowIso();
+  saveMemoryEntries(configDir, entries);
+  return entry;
+}
+function deleteMemoryEntry(configDir, idPrefix) {
+  const entries = loadMemoryEntries(configDir);
+  const entry = findUnique(entries, idPrefix);
+  saveMemoryEntries(configDir, entries.filter((candidate) => candidate.id !== entry.id));
+  return entry;
+}
+function expireMemoryEntry(configDir, idPrefix, expiresAt = nowIso()) {
+  const entries = loadMemoryEntries(configDir);
+  const entry = findUnique(entries, idPrefix);
+  entry.expiresAt = expiresAt;
+  entry.updatedAt = nowIso();
+  saveMemoryEntries(configDir, entries);
+  return entry;
+}
+function exportMemoryEntries(configDir, cwd = process.cwd()) {
+  return JSON.stringify(listMemoryEntries(configDir, { cwd, includeExpired: true, includeRejected: true }), null, 2);
+}
+function findUnique(entries, idPrefix) {
+  const matches = entries.filter((entry) => entry.id.startsWith(idPrefix));
+  if (matches.length === 0) throw new Error(`memory id not found: ${idPrefix}`);
+  if (matches.length > 1) throw new Error(`memory id is ambiguous: ${idPrefix}`);
+  return matches[0];
+}
+function syncLegacyMarkdown(configDir, entries = loadMemoryEntries(configDir)) {
+  mkdirSync7(dirname5(memoryMarkdownPath(configDir)), { recursive: true });
+  const active = entries.filter((entry) => entry.approved && !isMemoryExpired(entry));
+  const markdown = active.map((entry) => {
+    const date = entry.createdAt.replace("T", " ").slice(0, 19);
+    const source = [
+      `id:${entry.id.slice(0, 8)}`,
+      `scope:${entry.scope}`,
+      entry.sourceSession ? `session:${entry.sourceSession.slice(0, 8)}` : "",
+      entry.sourceProject ? `project:${entry.sourceProject}` : "",
+      `sensitivity:${entry.sensitivity}`
+    ].filter(Boolean).join(" \xB7 ");
+    return `## ${date}
+<!-- ${source} -->
+${entry.content}
+`;
+  }).join("\n");
+  atomicWriteFileSync(memoryMarkdownPath(configDir), markdown);
+}
+function formatMemoryForPrompt(configDir, cwd = process.cwd()) {
+  const entries = listMemoryEntries(configDir, { cwd }).filter((entry) => entry.approved && !isMemoryExpired(entry));
+  if (entries.length === 0) return null;
+  let content = entries.map((entry) => {
+    const source = [
+      `id ${entry.id.slice(0, 8)}`,
+      `scope ${entry.scope}`,
+      entry.sourceSession ? `source session ${entry.sourceSession.slice(0, 8)}` : "source manual/tool",
+      entry.sourceProject ? `project ${entry.sourceProject}` : "",
+      `sensitivity ${entry.sensitivity}`
+    ].filter(Boolean).join(" \xB7 ");
+    return `## ${entry.createdAt.replace("T", " ").slice(0, 19)}
+Source: ${source}
+${entry.content}`;
+  }).join("\n\n");
+  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);
+  }
+  return { content, entryCount: entries.length };
+}
+
+// src/tools/builtin/save-memory.ts
+function getConfigDir() {
+  return join11(homedir5(), CONFIG_DIR_NAME);
+}
+function parseScope(value) {
+  return value === "personal" || value === "project" || value === "session" || value === "team" ? value : void 0;
+}
+function parseSensitivity(value) {
+  return value === "low" || value === "medium" || value === "high" ? value : void 0;
 }
 var saveMemoryTool = {
   definition: {
     name: "save_memory",
-    description: "Save important information to persistent memory that survives across sessions. Use this to remember: user preferences, coding style, project architecture decisions, recurring patterns, key findings, or any knowledge worth preserving. Keep each memory entry concise (1-3 sentences). The content will be automatically timestamped.",
+    description: "Save important information to governed persistent memory. Low-risk memories are approved automatically; sensitive entries are stored as pending and require /memory approve <id>. Use concise entries for user preferences, project decisions, recurring patterns, and key findings.",
     parameters: {
       content: {
         type: "string",
         description: "The information to save to persistent memory. Keep it concise and actionable.",
         required: true
+      },
+      scope: {
+        type: "string",
+        description: "Memory scope: personal, project, session, or team. Defaults to personal. Project memories are only injected in the same project.",
+        required: false
+      },
+      sensitivity: {
+        type: "string",
+        description: "Sensitivity: low, medium, or high. Low-risk entries may be auto-approved; medium/high remain pending unless explicitly approved.",
+        required: false
+      },
+      expiresAt: {
+        type: "string",
+        description: "Optional ISO timestamp after which this memory should no longer be injected.",
+        required: false
       }
     },
     dangerous: false
@@ -9365,20 +9670,16 @@ var saveMemoryTool = {
   async execute(args) {
     const content = String(args["content"] ?? "").trim();
     if (!content) throw new ToolError("save_memory", "content is required");
-    const memoryPath = getMemoryFilePath();
-    const configDir = join9(homedir5(), CONFIG_DIR_NAME);
-    if (!existsSync14(configDir)) {
-      mkdirSync7(configDir, { recursive: true });
-    }
-    const timestamp = formatTimestamp();
-    const entry = `
-## ${timestamp}
-${content}
-`;
-    const previous = existsSync14(memoryPath) ? readFileSync11(memoryPath, "utf-8") : "";
-    atomicWriteFileSync(memoryPath, previous + entry);
-    const byteSize = statSync6(memoryPath).size;
-    return `Memory saved successfully. File size: ${byteSize} bytes in ${MEMORY_FILE_NAME}`;
+    const entry = addMemoryEntry(getConfigDir(), content, {
+      scope: parseScope(args["scope"]) ?? "personal",
+      sensitivity: parseSensitivity(args["sensitivity"]),
+      expiresAt: typeof args["expiresAt"] === "string" ? args["expiresAt"] : void 0,
+      cwd: process.cwd(),
+      redact: true
+    });
+    const status = entry.approved ? "approved and active" : "pending approval";
+    const redacted = entry.redactedKinds?.length ? ` Redacted: ${entry.redactedKinds.join(", ")}.` : "";
+    return `Memory saved (${status}). id=${entry.id.slice(0, 8)} scope=${entry.scope} sensitivity=${entry.sensitivity}.${redacted}`;
   }
 };
 
@@ -9422,7 +9723,7 @@ function promptUser(rl, question) {
   console.log();
   console.log(chalk4.cyan("\u2753 ") + chalk4.bold(question));
   process.stdout.write(chalk4.cyan("> "));
-  return new Promise((resolve10) => {
+  return new Promise((resolve12) => {
     let completed = false;
     const cleanup = (answer) => {
       if (completed) return;
@@ -9432,7 +9733,7 @@ function promptUser(rl, question) {
       rl.pause();
       rlAny.output = savedOutput;
       askUserContext.prompting = false;
-      resolve10(answer);
+      resolve12(answer);
     };
     const onLine = (line) => {
       cleanup(line);
@@ -9664,9 +9965,292 @@ function formatResults2(query, data, _requested) {
 }
 
 // src/agents/agent-config.ts
-import { existsSync as existsSync15, readdirSync as readdirSync7, readFileSync as readFileSync12 } from "fs";
-import { join as join10 } from "path";
+import { existsSync as existsSync17, readdirSync as readdirSync8, readFileSync as readFileSync13 } from "fs";
+import { join as join13 } from "path";
 import { homedir as homedir6 } from "os";
+
+// src/plugins/plugin-manager.ts
+import { existsSync as existsSync16, mkdirSync as mkdirSync8, readdirSync as readdirSync7, readFileSync as readFileSync12, cpSync, rmSync, statSync as statSync6 } from "fs";
+import { basename as basename5, dirname as dirname6, join as join12, resolve as resolve7 } from "path";
+import { createHash as createHash3 } from "crypto";
+import { z as z2 } from "zod";
+var MANIFEST_RELATIVE = ".aicli-plugin/plugin.json";
+var STATE_FILE = "plugin-state.json";
+var HookCommandSchema = z2.union([
+  z2.string(),
+  z2.object({
+    command: z2.string(),
+    source: z2.enum(["user", "project", "managed"]).optional(),
+    description: z2.string().optional(),
+    required: z2.boolean().optional(),
+    timeoutMs: z2.number().int().min(100).max(3e4).optional(),
+    disabled: z2.boolean().optional()
+  }),
+  z2.array(z2.union([
+    z2.string(),
+    z2.object({
+      command: z2.string(),
+      source: z2.enum(["user", "project", "managed"]).optional(),
+      description: z2.string().optional(),
+      required: z2.boolean().optional(),
+      timeoutMs: z2.number().int().min(100).max(3e4).optional(),
+      disabled: z2.boolean().optional()
+    })
+  ]))
+]);
+var HookEventNameSchema = z2.enum([
+  "SessionStart",
+  "UserPromptSubmit",
+  "PreToolUse",
+  "PermissionRequest",
+  "PostToolUse",
+  "PreCompact",
+  "PostCompact",
+  "Stop",
+  "SubagentStart",
+  "SubagentStop"
+]);
+var McpServerSchema = z2.object({
+  command: z2.string(),
+  args: z2.array(z2.string()).default([]),
+  env: z2.record(z2.string()).optional(),
+  timeout: z2.number().default(3e4)
+});
+var PluginManifestSchema = z2.object({
+  name: z2.string().regex(/^[a-zA-Z0-9._-]{1,80}$/),
+  version: z2.string().min(1),
+  description: z2.string().optional(),
+  skills: z2.array(z2.string()).default([]),
+  hooks: z2.object({
+    enabled: z2.boolean().optional(),
+    events: z2.record(HookEventNameSchema, HookCommandSchema).default({})
+  }).default({ events: {} }),
+  commands: z2.array(z2.string()).default([]),
+  mcpServers: z2.record(McpServerSchema).default({}),
+  agents: z2.array(z2.string()).default([]),
+  permissionHints: z2.array(z2.string()).default([])
+}).strict();
+function pluginRoot(configDir) {
+  return join12(configDir, PLUGINS_DIR_NAME);
+}
+function pluginManifestPath(pluginDir) {
+  return join12(pluginDir, MANIFEST_RELATIVE);
+}
+function statePath(configDir) {
+  return join12(pluginRoot(configDir), STATE_FILE);
+}
+function loadState(configDir) {
+  const file = statePath(configDir);
+  if (!existsSync16(file)) return { version: 1, plugins: [] };
+  try {
+    const parsed = JSON.parse(readFileSync12(file, "utf-8"));
+    return { version: 1, plugins: Array.isArray(parsed.plugins) ? parsed.plugins : [] };
+  } catch {
+    return { version: 1, plugins: [] };
+  }
+}
+function saveState(configDir, state2) {
+  mkdirSync8(pluginRoot(configDir), { recursive: true });
+  atomicWriteFileSync(statePath(configDir), JSON.stringify(state2, null, 2));
+}
+function hashPluginManifest(manifestPath) {
+  return createHash3("sha256").update(readFileSync12(manifestPath)).digest("hex");
+}
+function readPluginManifest(manifestPath) {
+  return PluginManifestSchema.parse(JSON.parse(readFileSync12(manifestPath, "utf-8")));
+}
+function findPluginSourceDir(inputPath) {
+  const abs = resolve7(inputPath);
+  const direct = statSync6(abs).isDirectory() ? abs : dirname6(abs);
+  if (existsSync16(pluginManifestPath(direct))) return direct;
+  const nested = join12(direct, ".aicli-plugin");
+  if (existsSync16(join12(nested, "plugin.json"))) return direct;
+  throw new Error(`plugin manifest not found: ${MANIFEST_RELATIVE}`);
+}
+function installPlugin(configDir, inputPath) {
+  const sourceDir = findPluginSourceDir(inputPath);
+  const manifest = readPluginManifest(pluginManifestPath(sourceDir));
+  const targetDir = join12(pluginRoot(configDir), manifest.name);
+  mkdirSync8(pluginRoot(configDir), { recursive: true });
+  if (existsSync16(targetDir)) rmSync(targetDir, { recursive: true, force: true });
+  cpSync(sourceDir, targetDir, { recursive: true });
+  const manifestPath = pluginManifestPath(targetDir);
+  const hash = hashPluginManifest(manifestPath);
+  const state2 = loadState(configDir);
+  const previous = state2.plugins.find((p) => p.name === manifest.name);
+  const next = {
+    name: manifest.name,
+    enabled: previous?.enabled ?? false,
+    trusted: false,
+    hash,
+    installedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  state2.plugins = [...state2.plugins.filter((p) => p.name !== manifest.name), next];
+  saveState(configDir, state2);
+  return { name: manifest.name, dir: targetDir, manifestPath, manifest, hash, enabled: next.enabled, trusted: false, valid: true };
+}
+function setPluginEnabled(configDir, name, enabled) {
+  const plugin = getInstalledPlugin(configDir, name);
+  if (!plugin.valid) throw new Error(plugin.error ?? `invalid plugin: ${name}`);
+  const state2 = loadState(configDir);
+  const current = state2.plugins.find((p) => p.name === plugin.name) ?? {
+    name: plugin.name,
+    enabled: false,
+    trusted: false,
+    hash: plugin.hash,
+    installedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  const next = { ...current, enabled, hash: plugin.hash, enabledAt: enabled ? (/* @__PURE__ */ new Date()).toISOString() : current.enabledAt };
+  state2.plugins = [...state2.plugins.filter((p) => p.name !== plugin.name), next];
+  saveState(configDir, state2);
+  return next;
+}
+function trustPlugin(configDir, name) {
+  const plugin = getInstalledPlugin(configDir, name);
+  if (!plugin.valid) throw new Error(plugin.error ?? `invalid plugin: ${name}`);
+  const state2 = loadState(configDir);
+  const current = state2.plugins.find((p) => p.name === plugin.name) ?? {
+    name: plugin.name,
+    enabled: false,
+    trusted: false,
+    hash: plugin.hash,
+    installedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  const next = { ...current, trusted: true, hash: plugin.hash, trustedAt: (/* @__PURE__ */ new Date()).toISOString() };
+  state2.plugins = [...state2.plugins.filter((p) => p.name !== plugin.name), next];
+  saveState(configDir, state2);
+  return next;
+}
+function getInstalledPlugin(configDir, name) {
+  const plugins = listInstalledPlugins(configDir);
+  const matches = plugins.filter((p) => p.name === name || p.name.startsWith(name));
+  if (matches.length === 0) throw new Error(`plugin not found: ${name}`);
+  if (matches.length > 1) throw new Error(`plugin name is ambiguous: ${name}`);
+  return matches[0];
+}
+function listInstalledPlugins(configDir) {
+  const root = pluginRoot(configDir);
+  if (!existsSync16(root)) return [];
+  const state2 = loadState(configDir);
+  const out = [];
+  for (const entry of readdirSync7(root)) {
+    const dir = join12(root, entry);
+    try {
+      if (!statSync6(dir).isDirectory()) continue;
+    } catch {
+      continue;
+    }
+    const manifestPath = pluginManifestPath(dir);
+    if (!existsSync16(manifestPath)) continue;
+    try {
+      const manifest = readPluginManifest(manifestPath);
+      const hash = hashPluginManifest(manifestPath);
+      const st = state2.plugins.find((p) => p.name === manifest.name);
+      const trusted = st?.trusted === true && st.hash === hash;
+      out.push({
+        name: manifest.name,
+        dir,
+        manifestPath,
+        manifest,
+        hash,
+        enabled: st?.enabled === true,
+        trusted,
+        valid: true
+      });
+    } catch (err) {
+      out.push({
+        name: entry,
+        dir,
+        manifestPath,
+        manifest: { name: entry, version: "invalid", skills: [], commands: [], agents: [], hooks: { events: {} }, mcpServers: {}, permissionHints: [] },
+        hash: "",
+        enabled: false,
+        trusted: false,
+        valid: false,
+        error: err instanceof Error ? err.message : String(err)
+      });
+    }
+  }
+  return out.sort((a, b) => a.name.localeCompare(b.name));
+}
+function activePlugins(configDir) {
+  return listInstalledPlugins(configDir).filter((p) => p.valid && p.enabled && p.trusted);
+}
+function uniqueDirs(plugin, rels) {
+  const dirs = /* @__PURE__ */ new Set();
+  for (const rel of rels) {
+    const abs = resolve7(plugin.dir, rel);
+    if (!abs.startsWith(resolve7(plugin.dir))) continue;
+    if (existsSync16(abs)) dirs.add(statSync6(abs).isDirectory() ? abs : dirname6(abs));
+  }
+  return [...dirs];
+}
+function prefixCommand(plugin, command) {
+  return command.replaceAll("{pluginDir}", plugin.dir).replaceAll("$PLUGIN_DIR", plugin.dir);
+}
+function pluginHooks(plugin) {
+  const events = plugin.manifest.hooks?.events ?? {};
+  const out = {};
+  for (const [event, raw] of Object.entries(events)) {
+    const normalize = (item) => {
+      if (typeof item === "string") return { command: prefixCommand(plugin, item), source: "project", description: `plugin:${plugin.name}` };
+      if (item && typeof item === "object") {
+        const obj = item;
+        return { ...obj, command: prefixCommand(plugin, String(obj.command ?? "")), source: "project", description: obj.description ?? `plugin:${plugin.name}` };
+      }
+      return item;
+    };
+    out[event] = Array.isArray(raw) ? raw.map(normalize) : normalize(raw);
+  }
+  return Object.keys(out).length > 0 ? { enabled: plugin.manifest.hooks?.enabled ?? true, events: out } : void 0;
+}
+function mergePluginHooks(base, configDir) {
+  const plugins = activePlugins(configDir);
+  if (plugins.length === 0) return base;
+  const merged = { ...base ?? {}, enabled: base?.enabled ?? true, events: { ...base?.events ?? {} } };
+  for (const plugin of plugins) {
+    const hooks = pluginHooks(plugin);
+    if (!hooks?.events) continue;
+    for (const [event, entry] of Object.entries(hooks.events)) {
+      const key = event;
+      const existing = merged.events?.[key];
+      const existingItems = existing === void 0 ? [] : Array.isArray(existing) ? existing : [existing];
+      const newItems = Array.isArray(entry) ? entry : [entry];
+      merged.events[key] = [...existingItems, ...newItems];
+    }
+  }
+  return merged;
+}
+function getActivePluginAssets(configDir) {
+  const plugins = activePlugins(configDir);
+  const mcpServers = {};
+  const skillDirs = [];
+  const commandDirs = [];
+  const agentDirs = [];
+  for (const plugin of plugins) {
+    skillDirs.push(...uniqueDirs(plugin, plugin.manifest.skills));
+    commandDirs.push(...uniqueDirs(plugin, plugin.manifest.commands));
+    agentDirs.push(...uniqueDirs(plugin, plugin.manifest.agents));
+    for (const [serverName, server] of Object.entries(plugin.manifest.mcpServers)) {
+      mcpServers[`plugin_${plugin.name}_${serverName}`] = server;
+    }
+  }
+  return { plugins, skillDirs, commandDirs, agentDirs, hooks: mergePluginHooks(void 0, configDir), mcpServers };
+}
+function describePlugin(plugin) {
+  const m = plugin.manifest;
+  return [
+    `${plugin.name}@${m.version}`,
+    `  status: ${plugin.enabled ? "enabled" : "disabled"} \xB7 ${plugin.trusted ? "trusted" : "untrusted"}${plugin.valid ? "" : " \xB7 invalid"}`,
+    `  dir: ${plugin.dir}`,
+    m.description ? `  description: ${m.description}` : void 0,
+    `  assets: ${m.skills.length} skill(s), ${m.commands.length} command(s), ${m.agents.length} agent(s), ${Object.keys(m.mcpServers).length} MCP server(s), ${Object.keys(m.hooks?.events ?? {}).length} hook event(s)`,
+    m.permissionHints.length ? `  permission hints: ${m.permissionHints.join("; ")}` : void 0,
+    plugin.error ? `  error: ${plugin.error}` : void 0
+  ].filter((line) => Boolean(line));
+}
+
+// src/agents/agent-config.ts
 var READ_ONLY_TOOLS2 = /* @__PURE__ */ new Set([
   "read_file",
   "list_dir",
@@ -9760,13 +10344,13 @@ function parseAgentConfig(raw, source, path3) {
   return cfg;
 }
 function loadAgentDir(dir, source) {
-  if (!existsSync15(dir)) return [];
+  if (!existsSync17(dir)) return [];
   const out = [];
-  for (const file of readdirSync7(dir)) {
+  for (const file of readdirSync8(dir)) {
     if (!file.endsWith(".json")) continue;
-    const path3 = join10(dir, file);
+    const path3 = join13(dir, file);
     try {
-      const parsed = JSON.parse(readFileSync12(path3, "utf-8"));
+      const parsed = JSON.parse(readFileSync13(path3, "utf-8"));
       const cfg = parseAgentConfig(parsed, source, path3);
       if (cfg) out.push(cfg);
     } catch {
@@ -9776,8 +10360,8 @@ function loadAgentDir(dir, source) {
 }
 function getAgentDirs(configDir, cwd = process.cwd()) {
   return {
-    user: join10(configDir ?? join10(homedir6(), CONFIG_DIR_NAME), "agents"),
-    project: join10(cwd, CONFIG_DIR_NAME, "agents")
+    user: join13(configDir ?? join13(homedir6(), CONFIG_DIR_NAME), "agents"),
+    project: join13(cwd, CONFIG_DIR_NAME, "agents")
   };
 }
 function listAgentConfigs(configDir, cwd = process.cwd()) {
@@ -9785,6 +10369,11 @@ function listAgentConfigs(configDir, cwd = process.cwd()) {
   const byName = /* @__PURE__ */ new Map();
   for (const cfg of BUILTIN_AGENTS) byName.set(normalizeName(cfg.name), { ...cfg });
   for (const cfg of loadAgentDir(dirs.user, "user")) byName.set(normalizeName(cfg.name), cfg);
+  if (configDir) {
+    for (const dir of getActivePluginAssets(configDir).agentDirs) {
+      for (const cfg of loadAgentDir(dir, "plugin")) byName.set(normalizeName(cfg.name), cfg);
+    }
+  }
   for (const cfg of loadAgentDir(dirs.project, "project")) byName.set(normalizeName(cfg.name), cfg);
   return [...byName.values()].sort((a, b) => a.name.localeCompare(b.name));
 }
@@ -9819,7 +10408,7 @@ var nextId = 1;
 var preferredAgentName = "worker";
 var runs = [];
 var MAX_RUNS = 50;
-function nowIso() {
+function nowIso2() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
 function startAgentRun(input) {
@@ -9828,7 +10417,7 @@ function startAgentRun(input) {
     agentName: input.agentName,
     task: input.task,
     status: "running",
-    startedAt: nowIso(),
+    startedAt: nowIso2(),
     toolNames: [],
     agentIndex: input.agentIndex,
     stopRequested: false
@@ -9846,7 +10435,7 @@ function finishAgentRun(runId, status, summary, error) {
   const run = runs.find((r) => r.id === runId);
   if (!run) return;
   run.status = status;
-  run.finishedAt = nowIso();
+  run.finishedAt = nowIso2();
   if (summary) run.summary = summary;
   if (error) run.error = error;
 }
@@ -10272,7 +10861,7 @@ var spawnAgentTool = {
 
 // src/tools/builtin/task-manager.ts
 import { spawn as spawn3 } from "child_process";
-import { randomUUID } from "crypto";
+import { randomUUID as randomUUID2 } from "crypto";
 import { platform as platform4 } from "os";
 var MAX_OUTPUT_CHARS = 1e4;
 var MAX_OUTPUT_BYTES = 64 * 1024;
@@ -10305,7 +10894,7 @@ function createTask(command, description) {
       }
     }
   }
-  const id = randomUUID().slice(0, 8);
+  const id = randomUUID2().slice(0, 8);
   const { shell, args } = shellInvocation(command);
   const proc = spawn3(shell, args, {
     stdio: ["ignore", "pipe", "pipe"],
@@ -10487,20 +11076,20 @@ var taskStopTool = {
 
 // src/tools/builtin/git-tools.ts
 import { execFileSync as execFileSync2 } from "child_process";
-import { existsSync as existsSync16 } from "fs";
-import { join as join11 } from "path";
+import { existsSync as existsSync18 } from "fs";
+import { join as join14 } from "path";
 function assertGitRepo(cwd) {
   let dir = cwd;
   const root = dir.split(/[\\/]/)[0] + (dir.includes("\\") ? "\\" : "/");
   while (dir && dir !== root) {
-    if (existsSync16(join11(dir, ".git"))) return;
-    const parent = join11(dir, "..");
+    if (existsSync18(join14(dir, ".git"))) return;
+    const parent = join14(dir, "..");
     if (parent === dir) break;
     dir = parent;
   }
   throw new ToolError("git", "Not inside a git repository. Run this command from a directory under a git-tracked project.");
 }
-function runGit(args, cwd, maxBuffer = 10 * 1024 * 1024) {
+function runGit2(args, cwd, maxBuffer = 10 * 1024 * 1024) {
   try {
     const output = execFileSync2("git", args, {
       cwd,
@@ -10535,11 +11124,11 @@ var gitStatusTool = {
     assertGitRepo(cwd);
     let branch = "(unknown)";
     try {
-      branch = runGit(["symbolic-ref", "--short", "HEAD"], cwd).trim();
+      branch = runGit2(["symbolic-ref", "--short", "HEAD"], cwd).trim();
     } catch {
       branch = "(detached)";
     }
-    const porcelain = runGit(["status", "--porcelain=v1", "-b"], cwd);
+    const porcelain = runGit2(["status", "--porcelain=v1", "-b"], cwd);
     const lines = porcelain.split("\n").filter((l) => l.length > 0);
     const branchLine = lines[0]?.startsWith("##") ? lines[0].slice(3) : `${branch}`;
     const fileLines = lines.slice(lines[0]?.startsWith("##") ? 1 : 0);
@@ -10626,7 +11215,7 @@ var gitDiffTool = {
     if (args["file"]) {
       gitArgs.push("--", String(args["file"]));
     }
-    const output = runGit(gitArgs, cwd);
+    const output = runGit2(gitArgs, cwd);
     if (output.trim().length === 0) {
       const label = args["staged"] ? "staged" : args["commit_range"] ? String(args["commit_range"]) : "unstaged";
       return `No ${label} changes.`;
@@ -10688,7 +11277,7 @@ var gitLogTool = {
     if (args["file"]) {
       gitArgs.push("--", String(args["file"]));
     }
-    const output = runGit(gitArgs, cwd);
+    const output = runGit2(gitArgs, cwd);
     if (output.trim().length === 0) {
       return "No commits found matching the filter.";
     }
@@ -10735,9 +11324,9 @@ var gitCommitTool = {
       throw new ToolError("git_commit", "Cannot use both stage_all and files at the same time.");
     }
     if (files.length > 0) {
-      runGit(["add", "--", ...files], cwd);
+      runGit2(["add", "--", ...files], cwd);
     }
-    const statusBefore = runGit(["status", "--porcelain"], cwd);
+    const statusBefore = runGit2(["status", "--porcelain"], cwd);
     const hasStaged = statusBefore.split("\n").some((l) => l.length > 0 && l[0] !== " " && l[0] !== "?");
     const hasUnstaged = statusBefore.split("\n").some((l) => l.length > 1 && l[1] !== " " && l[1] !== "?");
     if (!hasStaged && !stageAll) {
@@ -10748,9 +11337,9 @@ var gitCommitTool = {
     }
     const commitArgs = ["commit", "-m", message];
     if (stageAll) commitArgs.splice(1, 0, "-a");
-    const commitOutput = runGit(commitArgs, cwd);
-    const hash = runGit(["rev-parse", "--short", "HEAD"], cwd).trim();
-    const summary = runGit(["log", "-1", "--pretty=format:%h %s"], cwd).trim();
+    const commitOutput = runGit2(commitArgs, cwd);
+    const hash = runGit2(["rev-parse", "--short", "HEAD"], cwd).trim();
+    const summary = runGit2(["log", "-1", "--pretty=format:%h %s"], cwd).trim();
     return `\u2713 Committed ${hash}
 ${summary}
 
@@ -10759,9 +11348,9 @@ ${commitOutput.trim()}`;
 };
 
 // src/tools/builtin/notebook-edit.ts
-import { readFileSync as readFileSync13, existsSync as existsSync17 } from "fs";
+import { readFileSync as readFileSync14, existsSync as existsSync19 } from "fs";
 import { writeFile } from "fs/promises";
-import { resolve as resolve6, extname as extname2 } from "path";
+import { resolve as resolve8, extname as extname2 } from "path";
 var notebookEditTool = {
   definition: {
     name: "notebook_edit",
@@ -10810,14 +11399,14 @@ var notebookEditTool = {
     if (!Number.isInteger(cellIndexRaw) || cellIndexRaw < 1) {
       throw new ToolError("notebook_edit", "cell_index must be a positive integer (1-based)");
     }
-    const absPath = resolve6(filePath);
+    const absPath = resolve8(filePath);
     if (extname2(absPath).toLowerCase() !== ".ipynb") {
       throw new ToolError("notebook_edit", "path must point to a .ipynb file");
     }
-    if (!existsSync17(absPath)) {
+    if (!existsSync19(absPath)) {
       throw new ToolError("notebook_edit", `Notebook not found: ${filePath}`);
     }
-    const raw = readFileSync13(absPath, "utf-8");
+    const raw = readFileSync14(absPath, "utf-8");
     const nb = parseNotebook(raw);
     const cellIdx0 = cellIndexRaw - 1;
     undoStack.push(absPath, `notebook_edit (${action}): ${filePath}`);
@@ -11234,8 +11823,8 @@ function estimateToolDefinitionTokens(def) {
 
 // src/tools/registry.ts
 import { pathToFileURL } from "url";
-import { existsSync as existsSync18, mkdirSync as mkdirSync8, readdirSync as readdirSync8 } from "fs";
-import { join as join12 } from "path";
+import { existsSync as existsSync20, mkdirSync as mkdirSync9, readdirSync as readdirSync9 } from "fs";
+import { join as join15 } from "path";
 var ToolRegistry = class {
   tools = /* @__PURE__ */ new Map();
   pluginToolNames = /* @__PURE__ */ new Set();
@@ -11396,16 +11985,16 @@ var ToolRegistry = class {
    * Returns the number of successfully loaded plugins.
    */
   async loadPlugins(pluginsDir, allowPlugins = false) {
-    if (!existsSync18(pluginsDir)) {
+    if (!existsSync20(pluginsDir)) {
       try {
-        mkdirSync8(pluginsDir, { recursive: true });
+        mkdirSync9(pluginsDir, { recursive: true });
       } catch {
       }
       return 0;
     }
     let files;
     try {
-      files = readdirSync8(pluginsDir).filter((f) => f.endsWith(".js"));
+      files = readdirSync9(pluginsDir).filter((f) => f.endsWith(".js"));
     } catch {
       return 0;
     }
@@ -11422,12 +12011,12 @@ var ToolRegistry = class {
     process.stderr.write(
       `
 [plugins] \u26A0 Loading ${files.length} plugin(s) with FULL system privileges:
-` + files.map((f) => `  + ${join12(pluginsDir, f)}`).join("\n") + "\n\n"
+` + files.map((f) => `  + ${join15(pluginsDir, f)}`).join("\n") + "\n\n"
     );
     let loaded = 0;
     for (const file of files) {
       try {
-        const fileUrl = pathToFileURL(join12(pluginsDir, file)).href;
+        const fileUrl = pathToFileURL(join15(pluginsDir, file)).href;
         const mod = await import(fileUrl);
         const tool = mod.tool ?? mod.default?.tool ?? mod.default;
         if (!tool || typeof tool.execute !== "function" || !tool.definition?.name) {
@@ -11589,7 +12178,7 @@ var McpClient = class {
   // 内部方法：JSON-RPC 通信
   // ══════════════════════════════════════════════════════════════════
   sendRequest(method, params) {
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve12, reject) => {
       if (!this.process?.stdin?.writable) {
         return reject(new Error(`MCP server [${this.serverId}] stdin not writable`));
       }
@@ -11613,7 +12202,7 @@ var McpClient = class {
       this.pendingRequests.set(id, {
         resolve: (result) => {
           cleanup();
-          resolve10(result);
+          resolve12(result);
         },
         reject: (error) => {
           cleanup();
@@ -11690,13 +12279,13 @@ var McpClient = class {
   }
   /** Promise 超时包装 */
   withTimeout(promise, ms, label) {
-    return new Promise((resolve10, reject) => {
+    return new Promise((resolve12, reject) => {
       const timer = setTimeout(() => {
         reject(new Error(`MCP [${this.serverId}] ${label} timed out after ${ms}ms`));
       }, ms);
       promise.then((val) => {
         clearTimeout(timer);
-        resolve10(val);
+        resolve12(val);
       }).catch((err) => {
         clearTimeout(timer);
         reject(err);
@@ -11973,12 +12562,12 @@ var McpManager = class {
 };
 
 // src/skills/manager.ts
-import { existsSync as existsSync19, readdirSync as readdirSync9, mkdirSync as mkdirSync9, statSync as statSync7 } from "fs";
-import { join as join13 } from "path";
+import { existsSync as existsSync21, readdirSync as readdirSync10, mkdirSync as mkdirSync10, statSync as statSync7 } from "fs";
+import { join as join16 } from "path";
 
 // src/skills/types.ts
-import { readFileSync as readFileSync14 } from "fs";
-import { basename as basename5 } from "path";
+import { readFileSync as readFileSync15 } from "fs";
+import { basename as basename6 } from "path";
 function parseSimpleYaml(yaml) {
   const result = {};
   for (const line of yaml.split("\n")) {
@@ -11999,7 +12588,7 @@ function parseYamlArray(value) {
 function parseSkillFile(filePath) {
   let raw;
   try {
-    raw = readFileSync14(filePath, "utf-8");
+    raw = readFileSync15(filePath, "utf-8");
   } catch {
     return null;
   }
@@ -12007,7 +12596,7 @@ function parseSkillFile(filePath) {
   if (!frontmatterMatch) {
     return {
       meta: {
-        name: basename5(filePath, ".md"),
+        name: basename6(filePath, ".md"),
         description: ""
       },
       content: raw.trim(),
@@ -12018,7 +12607,7 @@ function parseSkillFile(filePath) {
   const parsed = parseSimpleYaml(yaml);
   return {
     meta: {
-      name: parsed["name"] ?? basename5(filePath, ".md"),
+      name: parsed["name"] ?? basename6(filePath, ".md"),
       description: parsed["description"] ?? "",
       tools: parsed["tools"] ? parseYamlArray(parsed["tools"]) : void 0
     },
@@ -12039,36 +12628,40 @@ var SkillManager = class {
     this.skillsDir = skillsDir;
     this.warnThreshold = warnThreshold ?? SKILL_CONTENT_WARN_CHARS_DEFAULT;
   }
-  /** 发现并加载 skillsDir 下所有 .md 文件，返回加载数量 */
-  loadSkills() {
+  /** 发现并加载 skillsDir 以及额外插件目录下的技能，返回加载数量 */
+  loadSkills(extraDirs = []) {
     this.skills.clear();
-    if (!existsSync19(this.skillsDir)) {
-      try {
-        mkdirSync9(this.skillsDir, { recursive: true });
-      } catch {
+    this.loadSkillDir(this.skillsDir, true);
+    for (const dir of extraDirs) this.loadSkillDir(dir, false);
+    return this.skills.size;
+  }
+  loadSkillDir(dir, createIfMissing) {
+    if (!existsSync21(dir)) {
+      if (createIfMissing) {
+        try {
+          mkdirSync10(dir, { recursive: true });
+        } catch {
+        }
       }
-      return 0;
+      return;
     }
     let entries;
     try {
-      entries = readdirSync9(this.skillsDir);
+      entries = readdirSync10(dir);
     } catch {
-      return 0;
+      return;
     }
     for (const entry of entries) {
       let filePath;
-      const fullPath = join13(this.skillsDir, entry);
+      const fullPath = join16(dir, entry);
       if (entry.endsWith(".md")) {
         filePath = fullPath;
       } else {
         try {
           if (statSync7(fullPath).isDirectory()) {
-            const skillMd = join13(fullPath, "SKILL.md");
-            if (existsSync19(skillMd)) {
-              filePath = skillMd;
-            } else {
-              continue;
-            }
+            const skillMd = join16(fullPath, "SKILL.md");
+            if (existsSync21(skillMd)) filePath = skillMd;
+            else continue;
           } else {
             continue;
           }
@@ -12078,13 +12671,10 @@ var SkillManager = class {
       }
       const skill = parseSkillFile(filePath);
       if (skill) {
-        if (skill.meta.name === "SKILL" && !entry.endsWith(".md")) {
-          skill.meta.name = entry;
-        }
-        this.skills.set(skill.meta.name, skill);
+        if (skill.meta.name === "SKILL" && !entry.endsWith(".md")) skill.meta.name = entry;
+        if (!this.skills.has(skill.meta.name)) this.skills.set(skill.meta.name, skill);
       }
     }
-    return this.skills.size;
   }
   /** 列出所有已加载的技能 */
   listSkills() {
@@ -12127,9 +12717,9 @@ var SkillManager = class {
 };
 
 // src/web/tool-executor-web.ts
-import { randomUUID as randomUUID2 } from "crypto";
+import { randomUUID as randomUUID3 } from "crypto";
 import { tmpdir as tmpdir2 } from "os";
-import { existsSync as existsSync20, readFileSync as readFileSync15 } from "fs";
+import { existsSync as existsSync22, readFileSync as readFileSync16 } from "fs";
 var ToolExecutorWeb = class _ToolExecutorWeb {
   constructor(registry, ws) {
     this.registry = registry;
@@ -12199,33 +12789,33 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
   }
   /** Resolve a pending confirm from client response */
   resolveConfirm(requestId, approved) {
-    const resolve10 = this.pendingConfirms.get(requestId);
-    if (resolve10) {
+    const resolve12 = this.pendingConfirms.get(requestId);
+    if (resolve12) {
       this.clearPendingTimer(requestId);
       this.pendingConfirms.delete(requestId);
       this.confirming = false;
-      resolve10(approved);
+      resolve12(approved);
     }
   }
   /** Resolve a pending batch confirm from client response */
   resolveBatchConfirm(requestId, decision) {
-    const resolve10 = this.pendingBatchConfirms.get(requestId);
-    if (resolve10) {
+    const resolve12 = this.pendingBatchConfirms.get(requestId);
+    if (resolve12) {
       this.clearPendingTimer(requestId);
       this.pendingBatchConfirms.delete(requestId);
       this.confirming = false;
       if (decision === "all" || decision === "none") {
-        resolve10(decision);
+        resolve12(decision);
       } else {
-        resolve10(new Set(decision));
+        resolve12(new Set(decision));
       }
     }
   }
   /** Cancel all pending confirms (e.g., on disconnect) */
   cancelAll() {
-    for (const resolve10 of this.pendingConfirms.values()) resolve10(false);
+    for (const resolve12 of this.pendingConfirms.values()) resolve12(false);
     this.pendingConfirms.clear();
-    for (const resolve10 of this.pendingBatchConfirms.values()) resolve10("none");
+    for (const resolve12 of this.pendingBatchConfirms.values()) resolve12("none");
     this.pendingBatchConfirms.clear();
     this.confirming = false;
   }
@@ -12268,9 +12858,9 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
     if (call.name === "write_file") {
       const filePath = String(call.arguments["path"] ?? "");
       const newContent = String(call.arguments["content"] ?? "");
-      if (filePath && existsSync20(filePath)) {
+      if (filePath && existsSync22(filePath)) {
         try {
-          const old = readFileSync15(filePath, "utf-8");
+          const old = readFileSync16(filePath, "utf-8");
           return renderDiff(old, newContent, { filePath });
         } catch {
         }
@@ -12290,7 +12880,7 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
   }
   /** WebSocket-based confirm — sends request, returns Promise resolved by client */
   confirm(call, level) {
-    const requestId = randomUUID2();
+    const requestId = randomUUID3();
     this.confirming = true;
     const msg = {
       type: "confirm_request",
@@ -12301,8 +12891,8 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
       diff: this.getDiffPreview(call)
     };
     this.send(msg);
-    return new Promise((resolve10) => {
-      this.pendingConfirms.set(requestId, resolve10);
+    return new Promise((resolve12) => {
+      this.pendingConfirms.set(requestId, resolve12);
       this.pendingTimers.set(requestId, setTimeout(() => {
         if (this.pendingConfirms.has(requestId)) {
           this.resolveConfirm(requestId, false);
@@ -12312,7 +12902,7 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
   }
   /** WebSocket-based batch confirm */
   batchConfirm(calls) {
-    const requestId = randomUUID2();
+    const requestId = randomUUID3();
     this.confirming = true;
     const files = calls.map((call, i) => ({
       index: i + 1,
@@ -12326,8 +12916,8 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
       files
     };
     this.send(msg);
-    return new Promise((resolve10) => {
-      this.pendingBatchConfirms.set(requestId, resolve10);
+    return new Promise((resolve12) => {
+      this.pendingBatchConfirms.set(requestId, resolve12);
       this.pendingTimers.set(requestId, setTimeout(() => {
         if (this.pendingBatchConfirms.has(requestId)) {
           this.resolveBatchConfirm(requestId, "none");
@@ -12572,21 +13162,17 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
   }
 };
 
-// src/core/system-prompt-builder.ts
-import { existsSync as existsSync22, readFileSync as readFileSync17 } from "fs";
-import { join as join15 } from "path";
-
 // src/repl/dev-state.ts
-import { existsSync as existsSync21, readFileSync as readFileSync16, unlinkSync as unlinkSync4, mkdirSync as mkdirSync10 } from "fs";
-import { join as join14 } from "path";
+import { existsSync as existsSync23, readFileSync as readFileSync17, unlinkSync as unlinkSync4, mkdirSync as mkdirSync11 } from "fs";
+import { join as join17 } from "path";
 import { homedir as homedir7 } from "os";
 function getDevStatePath() {
-  return join14(homedir7(), CONFIG_DIR_NAME, DEV_STATE_FILE_NAME);
+  return join17(homedir7(), CONFIG_DIR_NAME, DEV_STATE_FILE_NAME);
 }
 function loadDevState() {
   const path3 = getDevStatePath();
-  if (!existsSync21(path3)) return null;
-  const content = readFileSync16(path3, "utf-8").trim();
+  if (!existsSync23(path3)) return null;
+  const content = readFileSync17(path3, "utf-8").trim();
   return content || null;
 }
 
@@ -12644,19 +13230,7 @@ ${ctx.activeSkill.content}`);
   return { stable: stableParts.join("\n\n---\n\n"), volatile };
 }
 function loadMemoryContent(configDir) {
-  const memoryPath = join15(configDir, MEMORY_FILE_NAME);
-  if (!existsSync22(memoryPath)) return null;
-  let content = readFileSync17(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/core/pricing.ts
@@ -12855,8 +13429,8 @@ function autoTrimSessionIfNeeded(session, sizeLimit = SESSION_SIZE_LIMIT) {
 }
 
 // src/core/context-files.ts
-import { existsSync as existsSync23, readFileSync as readFileSync18 } from "fs";
-import { join as join16, relative as relative3, resolve as resolve7 } from "path";
+import { existsSync as existsSync24, readFileSync as readFileSync18 } from "fs";
+import { join as join18, relative as relative3, resolve as resolve9 } from "path";
 function uniqueNonEmpty(values) {
   const seen = /* @__PURE__ */ new Set();
   const out = [];
@@ -12879,7 +13453,7 @@ function displayPath(filePath, cwd) {
   return filePath;
 }
 function isInsideOrEqual(parent, child) {
-  const rel = relative3(resolve7(parent), resolve7(child));
+  const rel = relative3(resolve9(parent), resolve9(child));
   return rel === "" || !!rel && !rel.startsWith("..") && !rel.startsWith("/") && !rel.startsWith("\\");
 }
 function readContextFile(level, filePath, cwd, maxBytes) {
@@ -12933,8 +13507,8 @@ function readContextFile(level, filePath, cwd, maxBytes) {
 function findFirstContextFile(level, dir, cwd, candidates, maxBytes) {
   const skipped = [];
   for (const candidate of candidates) {
-    const filePath = join16(dir, candidate);
-    if (!existsSync23(filePath)) continue;
+    const filePath = join18(dir, candidate);
+    if (!existsSync24(filePath)) continue;
     const result = readContextFile(level, filePath, cwd, maxBytes);
     if (result.skipped) skipped.push(result.skipped);
     if (result.layer) return { layer: result.layer, skipped };
@@ -12942,7 +13516,7 @@ function findFirstContextFile(level, dir, cwd, candidates, maxBytes) {
   return { layer: null, skipped };
 }
 function loadContextFiles(options) {
-  const cwd = resolve7(options.cwd);
+  const cwd = resolve9(options.cwd);
   const maxBytes = options.maxBytes ?? CONTEXT_FILE_MAX_BYTES;
   const candidates = options.candidates ?? buildContextFileCandidates(options.fallbackFilenames);
   const skipped = [];
@@ -12950,7 +13524,7 @@ function loadContextFiles(options) {
     return { layers: [], mergedContent: "", skipped, totalChars: 0, totalBytes: 0, maxBytes, candidates };
   }
   if (options.setting && options.setting !== "auto") {
-    const filePath = resolve7(cwd, String(options.setting));
+    const filePath = resolve9(cwd, String(options.setting));
     if (!isInsideOrEqual(cwd, filePath)) {
       skipped.push({
         level: "single",
@@ -12961,7 +13535,7 @@ function loadContextFiles(options) {
       });
       return { layers: [], mergedContent: "", skipped, totalChars: 0, totalBytes: 0, maxBytes, candidates };
     }
-    if (!existsSync23(filePath)) {
+    if (!existsSync24(filePath)) {
       skipped.push({
         level: "single",
         filePath,
@@ -12994,7 +13568,7 @@ function loadContextFiles(options) {
     skipped.push(...result.skipped);
     if (result.layer) layers.push(result.layer);
   }
-  if (resolve7(options.cwd) !== resolve7(options.projectRoot)) {
+  if (resolve9(options.cwd) !== resolve9(options.projectRoot)) {
     const result = findFirstContextFile("local", options.cwd, cwd, candidates, maxBytes);
     skipped.push(...result.skipped);
     if (result.layer) layers.push(result.layer);
@@ -13012,98 +13586,8 @@ function loadContextFiles(options) {
 }
 
 // src/web/session-handler.ts
-import { existsSync as existsSync26, readFileSync as readFileSync20, writeFileSync as writeFileSync2, mkdirSync as mkdirSync11, readdirSync as readdirSync11, statSync as statSync9, createWriteStream } from "fs";
-import { join as join20, resolve as resolve8, dirname as dirname5 } from "path";
-
-// src/tools/git-context.ts
-import { execSync as execSync2 } from "child_process";
-import { existsSync as existsSync24 } from "fs";
-import { join as join17 } from "path";
-function runGit2(cmd, cwd) {
-  try {
-    return execSync2(`git ${cmd}`, {
-      cwd,
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"],
-      timeout: 5e3
-    }).trim();
-  } catch {
-    return null;
-  }
-}
-function getGitRoot(cwd = process.cwd()) {
-  return runGit2("rev-parse --show-toplevel", cwd);
-}
-function getGitContext(cwd = process.cwd()) {
-  if (!existsSync24(join17(cwd, ".git"))) {
-    const result = runGit2("rev-parse --git-dir", cwd);
-    if (!result) return null;
-  }
-  const branch = runGit2("rev-parse --abbrev-ref HEAD", cwd);
-  if (!branch) return null;
-  const statusOutput = runGit2("status --porcelain", cwd) ?? "";
-  const statusLines = statusOutput ? statusOutput.split("\n").filter(Boolean) : [];
-  const stagedFiles = [];
-  const changedFiles = [];
-  for (const line of statusLines) {
-    const xy = line.slice(0, 2);
-    const file = line.slice(3).trim();
-    const indexStatus = xy[0];
-    const workStatus = xy[1];
-    if (indexStatus && indexStatus !== " " && indexStatus !== "?") {
-      stagedFiles.push(`${indexStatus} ${file}`);
-    }
-    if (workStatus && workStatus !== " ") {
-      changedFiles.push(`${workStatus} ${file}`);
-    }
-  }
-  const logOutput = runGit2("log --oneline -3", cwd) ?? "";
-  const recentCommits = logOutput ? logOutput.split("\n").filter(Boolean) : [];
-  const unpushedOutput = runGit2("log @{u}..HEAD --oneline", cwd);
-  const hasUnpushed = unpushedOutput !== null && unpushedOutput.trim().length > 0;
-  return {
-    branch,
-    changedFiles,
-    stagedFiles,
-    recentCommits,
-    hasUnpushed
-  };
-}
-function formatGitContextForPrompt(ctx) {
-  const lines = ["# Git Repository Status", ""];
-  lines.push(`- **Branch**: \`${ctx.branch}\``);
-  if (ctx.stagedFiles.length > 0) {
-    lines.push(`- **Staged** (${ctx.stagedFiles.length} files):`);
-    for (const f of ctx.stagedFiles.slice(0, 10)) {
-      lines.push(`  - ${f}`);
-    }
-    if (ctx.stagedFiles.length > 10) {
-      lines.push(`  - ... and ${ctx.stagedFiles.length - 10} more`);
-    }
-  }
-  if (ctx.changedFiles.length > 0) {
-    lines.push(`- **Modified** (${ctx.changedFiles.length} files):`);
-    for (const f of ctx.changedFiles.slice(0, 10)) {
-      lines.push(`  - ${f}`);
-    }
-    if (ctx.changedFiles.length > 10) {
-      lines.push(`  - ... and ${ctx.changedFiles.length - 10} more`);
-    }
-  }
-  if (ctx.stagedFiles.length === 0 && ctx.changedFiles.length === 0) {
-    lines.push("- **Working tree**: clean");
-  }
-  if (ctx.recentCommits.length > 0) {
-    lines.push("- **Recent commits**:");
-    for (const c of ctx.recentCommits) {
-      lines.push(`  - ${c}`);
-    }
-  }
-  if (ctx.hasUnpushed) {
-    lines.push("- \u26A0\uFE0F Has unpushed commits");
-  }
-  return lines.join("\n");
-}
+import { existsSync as existsSync26, readFileSync as readFileSync20, writeFileSync as writeFileSync2, mkdirSync as mkdirSync12, readdirSync as readdirSync12, statSync as statSync9, createWriteStream } from "fs";
+import { join as join21, resolve as resolve10, dirname as dirname7 } from "path";
 
 // src/cli/review-prompts.ts
 function buildReviewPrompt(diff, gitContextStr, detailed) {
@@ -13164,8 +13648,8 @@ If no security issues found, state "\u2705 No security vulnerabilities detected"
 }
 
 // src/repl/commands/project-init.ts
-import { existsSync as existsSync25, readFileSync as readFileSync19, readdirSync as readdirSync10, statSync as statSync8 } from "fs";
-import { join as join18 } from "path";
+import { existsSync as existsSync25, readFileSync as readFileSync19, readdirSync as readdirSync11, statSync as statSync8 } from "fs";
+import { join as join19 } from "path";
 var SCAN_SKIP_DIRS = /* @__PURE__ */ new Set([
   "node_modules",
   ".git",
@@ -13201,7 +13685,7 @@ function scanDirTree(dir, maxDepth = 2, maxEntries = 80) {
     if (depth > maxDepth || count >= maxEntries) return;
     let entries;
     try {
-      entries = readdirSync10(d);
+      entries = readdirSync11(d);
     } catch {
       return;
     }
@@ -13209,11 +13693,11 @@ function scanDirTree(dir, maxDepth = 2, maxEntries = 80) {
     const sorted = filtered.sort((a, b) => {
       let aIsDir = false, bIsDir = false;
       try {
-        aIsDir = statSync8(join18(d, a)).isDirectory();
+        aIsDir = statSync8(join19(d, a)).isDirectory();
       } catch {
       }
       try {
-        bIsDir = statSync8(join18(d, b)).isDirectory();
+        bIsDir = statSync8(join19(d, b)).isDirectory();
       } catch {
       }
       if (aIsDir !== bIsDir) return aIsDir ? -1 : 1;
@@ -13221,7 +13705,7 @@ function scanDirTree(dir, maxDepth = 2, maxEntries = 80) {
     });
     for (let i = 0; i < sorted.length && count < maxEntries; i++) {
       const name = sorted[i];
-      const fullPath = join18(d, name);
+      const fullPath = join19(d, name);
       const isLast = i === sorted.length - 1;
       const connector = isLast ? "+-- " : "|-- ";
       let isDir;
@@ -13248,7 +13732,7 @@ function scanProject(cwd) {
     configFiles: [],
     directoryStructure: ""
   };
-  const check = (file) => existsSync25(join18(cwd, file));
+  const check = (file) => existsSync25(join19(cwd, file));
   const configCandidates = [
     "package.json",
     "tsconfig.json",
@@ -13275,7 +13759,7 @@ function scanProject(cwd) {
     info.type = "node";
     info.language = check("tsconfig.json") ? "TypeScript" : "JavaScript";
     try {
-      const pkg = JSON.parse(readFileSync19(join18(cwd, "package.json"), "utf-8"));
+      const pkg = JSON.parse(readFileSync19(join19(cwd, "package.json"), "utf-8"));
       const scripts = pkg.scripts ?? {};
       info.buildCommand = scripts.build ? "npm run build" : void 0;
       info.testCommand = scripts.test ? "npm test" : void 0;
@@ -13935,7 +14419,7 @@ function resolveRoleProviders(roles, lookup, defaultProvider, defaultModel, avai
 }
 
 // src/hub/persist.ts
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 function discussionToMessages(state2) {
   const out = [];
   const t0 = state2.messages[0]?.timestamp ?? /* @__PURE__ */ new Date();
@@ -13973,7 +14457,7 @@ async function persistDiscussion(state2, config, defaultProvider, defaultModel)
   session.title = `[Hub] ${state2.topic.slice(0, 48)}`.replace(/\n/g, " ");
   session.titleAiGenerated = true;
   await sm.save();
-  return { id: session.id, path: join19(config.getHistoryDir(), `${session.id}.json`) };
+  return { id: session.id, path: join20(config.getHistoryDir(), `${session.id}.json`) };
 }
 
 // src/web/session-handler.ts
@@ -14069,7 +14553,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";
@@ -14169,10 +14653,10 @@ var SessionHandler = class {
         return;
       }
       case "ask_user_response": {
-        const resolve10 = this.pendingAskUser.get(msg.requestId);
-        if (resolve10) {
+        const resolve12 = this.pendingAskUser.get(msg.requestId);
+        if (resolve12) {
           this.pendingAskUser.delete(msg.requestId);
-          resolve10(msg.answer);
+          resolve12(msg.answer);
         }
         return;
       }
@@ -14182,11 +14666,13 @@ 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 resolve10 = this.pendingAutoPause.get(msg.requestId);
-        if (resolve10) {
+        const resolve12 = this.pendingAutoPause.get(msg.requestId);
+        if (resolve12) {
           this.pendingAutoPause.delete(msg.requestId);
-          resolve10({ action: msg.action, message: msg.message });
+          resolve12({ action: msg.action, message: msg.message });
         }
         return;
       }
@@ -14201,10 +14687,10 @@ var SessionHandler = class {
         this.hubOrchestrator?.abort();
         return;
       case "hub_steer": {
-        const resolve10 = this.pendingHubReview.get(msg.requestId);
-        if (resolve10) {
+        const resolve12 = this.pendingHubReview.get(msg.requestId);
+        if (resolve12) {
           this.pendingHubReview.delete(msg.requestId);
-          resolve10({ action: msg.action, message: msg.message });
+          resolve12({ action: msg.action, message: msg.message });
         }
         return;
       }
@@ -14214,12 +14700,12 @@ 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 resolve10 of this.pendingAskUser.values()) resolve10(null);
+    for (const resolve12 of this.pendingAskUser.values()) resolve12(null);
     this.pendingAskUser.clear();
-    for (const resolve10 of this.pendingAutoPause.values()) resolve10({ action: "stop" });
+    for (const resolve12 of this.pendingAutoPause.values()) resolve12({ action: "stop" });
     this.pendingAutoPause.clear();
     this.saveIfNeeded();
   }
@@ -14353,9 +14839,9 @@ var SessionHandler = class {
     this.hubOrchestrator = orchestrator;
     orchestrator.onEvent = (event) => this.send({ type: "hub_event", event });
     if (config.humanSteer) {
-      orchestrator.onRoundReview = ({ round, maxRounds }) => new Promise((resolve10) => {
+      orchestrator.onRoundReview = ({ round, maxRounds }) => new Promise((resolve12) => {
         const requestId = `hubrev_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-        this.pendingHubReview.set(requestId, resolve10);
+        this.pendingHubReview.set(requestId, resolve12);
         this.send({ type: "hub_review", requestId, round, maxRounds });
       });
     }
@@ -14393,7 +14879,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 }) }
@@ -14688,7 +15174,7 @@ Try: /compact to reduce context, /clear to reset, or switch to a larger-context
           this.send({ type: "response_done", content, usage });
           if (pendingTeeSave && isCleanDocumentBody(content)) {
             try {
-              mkdirSync11(dirname5(pendingTeeSave), { recursive: true });
+              mkdirSync12(dirname7(pendingTeeSave), { recursive: true });
               const bodyToSave = stripOuterCodeFence(content);
               atomicWriteFileSync(pendingTeeSave, bodyToSave);
               undoStack.push(pendingTeeSave, `save_last_response (deferred): ${pendingTeeSave}`);
@@ -14713,8 +15199,8 @@ Try: /compact to reduce context, /clear to reset, or switch to a larger-context
         onMcpToolUsed: (name) => this.usedMcpToolNames.add(name),
         requestAutoPause: async ({ effectiveRound, maxToolRounds: totalRounds, toolSummary }) => {
           const requestId = `pause_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-          const pauseResp = await new Promise((resolve10) => {
-            this.pendingAutoPause.set(requestId, resolve10);
+          const pauseResp = await new Promise((resolve12) => {
+            this.pendingAutoPause.set(requestId, resolve12);
             this.send({
               type: "auto_pause_request",
               requestId,
@@ -14864,7 +15350,7 @@ ${summaryContent}`,
     let isError = false;
     let summary;
     try {
-      mkdirSync11(dirname5(saveToFile), { recursive: true });
+      mkdirSync12(dirname7(saveToFile), { recursive: true });
       fileStream = createWriteStream(saveToFile);
       const teeSystemPrompt = stripToolCallReminder(systemPrompt ?? "") + CONTENT_ONLY_STREAM_REMINDER;
       const teeExtraMessages = extraMessages.length > 0 ? [...extraMessages, { role: "user", content: TEE_FINAL_USER_NUDGE }] : [{ role: "user", content: TEE_FINAL_USER_NUDGE }];
@@ -14893,8 +15379,8 @@ ${summaryContent}`,
         }
         if (chunk.done) break;
       }
-      await new Promise((resolve10, reject) => {
-        fileStream.end((err) => err ? reject(err) : resolve10());
+      await new Promise((resolve12, reject) => {
+        fileStream.end((err) => err ? reject(err) : resolve12());
       });
       const verdict = evaluateTeeContent(fullContent, saveToFile, priorContent);
       if (verdict.kind === "reject") {
@@ -14920,7 +15406,7 @@ ${summaryContent}`,
     } catch (err) {
       if (fileStream) {
         try {
-          await new Promise((resolve10) => fileStream.end(() => resolve10()));
+          await new Promise((resolve12) => fileStream.end(() => resolve12()));
         } catch {
         }
       }
@@ -15235,6 +15721,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",
@@ -15333,7 +15820,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 {
@@ -15655,7 +16142,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
           break;
         }
         const sub = args[0]?.toLowerCase();
-        const resolve10 = (ref) => {
+        const resolve12 = (ref) => {
           const r = session.resolveBranchRef(ref);
           if (r.ok) return r.id;
           if (r.reason === "ambiguous") {
@@ -15709,7 +16196,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
             this.send({ type: "error", message: "Usage: /branch switch <id|title>" });
             break;
           }
-          const id = resolve10(ref);
+          const id = resolve12(ref);
           if (!id) break;
           const ok = session.switchBranch(id);
           if (ok) {
@@ -15729,7 +16216,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
             this.send({ type: "error", message: "Usage: /branch delete <id|title>" });
             break;
           }
-          const id = resolve10(ref);
+          const id = resolve12(ref);
           if (!id) break;
           const ok = session.deleteBranch(id);
           if (ok) {
@@ -15748,7 +16235,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
             this.send({ type: "error", message: "Usage: /branch rename <id|title> <new title>" });
             break;
           }
-          const id = resolve10(ref);
+          const id = resolve12(ref);
           if (!id) break;
           const ok = session.renameBranch(id, title);
           if (ok) {
@@ -15766,7 +16253,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
             this.send({ type: "error", message: "Usage: /branch diff <id|title>" });
             break;
           }
-          const id = resolve10(ref);
+          const id = resolve12(ref);
           if (!id) break;
           const d = session.diffBranches(id);
           if (!d) {
@@ -15808,7 +16295,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
             this.send({ type: "error", message: "Usage: /branch cherry-pick <source-id|title> <msg-index>" });
             break;
           }
-          const id = resolve10(ref);
+          const id = resolve12(ref);
           if (!id) break;
           const idx = parseInt(idxStr, 10);
           if (Number.isNaN(idx)) {
@@ -16070,7 +16557,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-4PKSIVK5.js");
+          const { executeTests } = await import("./run-tests-NXVVKAK2.js");
           const argStr = args.join(" ").trim();
           let testArgs = {};
           if (argStr) {
@@ -16087,7 +16574,7 @@ ${undoResults.map((r) => `  \u2022 ${r}`).join("\n")}` });
       // ── /init ───────────────────────────────────────────────────────
       case "init": {
         const cwd = process.cwd();
-        const targetPath = join20(cwd, "AICLI.md");
+        const targetPath = join21(cwd, "AICLI.md");
         const force = args.includes("--force");
         if (existsSync26(targetPath) && !force) {
           this.send({ type: "info", message: `AICLI.md already exists at ${targetPath}
@@ -16132,9 +16619,9 @@ Use /context reload to load it.` });
           }
           lines.push(`  ${exists ? "\u2713" : "\u2013"}  ${label.padEnd(14)} ${exists ? filePath + extra : "(not found)"}`);
         };
-        checkFile("config.json", join20(configDir, "config.json"));
-        checkFile("memory.md", join20(configDir, MEMORY_FILE_NAME));
-        checkFile("dev-state.md", join20(configDir, "dev-state.md"));
+        checkFile("config.json", join21(configDir, "config.json"));
+        checkFile("memory.md", join21(configDir, MEMORY_FILE_NAME));
+        checkFile("dev-state.md", join21(configDir, "dev-state.md"));
         lines.push("");
         if (this.mcpManager) {
           lines.push("**MCP Servers:**");
@@ -16237,7 +16724,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" : ""})`);
           }
@@ -16321,7 +16808,7 @@ Use /add-dir remove to clear.` : "No directories added.\nUsage: /add-dir <path>
           this.send({ type: "info", message: "\u2713 All added directories removed from context." });
           break;
         }
-        const dirPath = resolve8(sub);
+        const dirPath = resolve10(sub);
         if (!existsSync26(dirPath)) {
           this.send({ type: "error", message: `Directory not found: ${dirPath}` });
           break;
@@ -16338,14 +16825,14 @@ It will be included in AI context for subsequent messages.` });
       // ── /commands ───────────────────────────────────────────────────
       case "commands": {
         const configDir = this.config.getConfigDir();
-        const commandsDir = join20(configDir, CUSTOM_COMMANDS_DIR_NAME);
+        const commandsDir = join21(configDir, CUSTOM_COMMANDS_DIR_NAME);
         if (!existsSync26(commandsDir)) {
           this.send({ type: "info", message: `No custom commands directory.
 Create: ${commandsDir}/ with .md files.` });
           break;
         }
         try {
-          const files = readdirSync11(commandsDir).filter((f) => f.endsWith(".md"));
+          const files = readdirSync12(commandsDir).filter((f) => f.endsWith(".md"));
           if (files.length === 0) {
             this.send({ type: "info", message: `No custom commands found in ${commandsDir}
 Add .md files to create commands.` });
@@ -16362,23 +16849,75 @@ Add .md files to create commands.` });
         }
         break;
       }
-      // ── /plugins ────────────────────────────────────────────────────
+      // ── /plugins / /plugin ──────────────────────────────────────────
       case "plugins": {
         const configDir = this.config.getConfigDir();
-        const pluginsDir = join20(configDir, PLUGINS_DIR_NAME);
+        const pluginsDir = join21(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 state2 = trustPlugin(configDir, name2);
+            this.send({ type: "info", message: `Trusted plugin ${state2.name}.` });
+            break;
+          }
+          if (sub === "enable" || sub === "disable") {
+            const name2 = args[1];
+            if (!name2) throw new Error(`Usage: /plugin ${sub} <name>`);
+            const state2 = setPluginEnabled(configDir, name2, sub === "enable");
+            this.send({ type: "info", message: `${sub === "enable" ? "Enabled" : "Disabled"} plugin ${state2.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;
@@ -16421,7 +16960,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 }) }
@@ -16458,7 +16997,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 }) }
@@ -16562,48 +17101,95 @@ Add .md files to create commands.` });
   }
   memoryShow() {
     const configDir = this.config.getConfigDir();
-    const memPath = join20(configDir, MEMORY_FILE_NAME);
-    let content = "";
-    try {
-      if (existsSync26(memPath)) {
-        content = readFileSync20(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 = join20(configDir, MEMORY_FILE_NAME);
     try {
-      mkdirSync11(configDir, { recursive: true });
-      const timestamp = (/* @__PURE__ */ new Date()).toISOString().slice(0, 19).replace("T", " ");
-      const previous = existsSync26(memPath) ? readFileSync20(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 = join20(configDir, MEMORY_FILE_NAME);
     try {
-      atomicWriteFileSync(memPath, "");
+      atomicWriteFileSync(memoryStorePath(configDir), "");
+      atomicWriteFileSync(join21(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.
@@ -16614,7 +17200,7 @@ Add .md files to create commands.` });
       return;
     }
     try {
-      const { searchChatMemory: searchChatMemory2, loadChatIndex: loadChatIndex2 } = await import("./chat-index-R2E27VXN.js");
+      const { searchChatMemory: searchChatMemory2, loadChatIndex: loadChatIndex2 } = await import("./chat-index-PS274XM7.js");
       const loaded = loadChatIndex2();
       if (!loaded || loaded.idx.chunks.length === 0) {
         this.send({ type: "memory_hits", query: q, hits: [], indexMissing: true });
@@ -16650,7 +17236,7 @@ Add .md files to create commands.` });
   }
   async handleMemoryStatus() {
     try {
-      const { getChatIndexStatus } = await import("./chat-index-R2E27VXN.js");
+      const { getChatIndexStatus } = await import("./chat-index-PS274XM7.js");
       const s = getChatIndexStatus();
       this.send({
         type: "memory_status",
@@ -16675,7 +17261,7 @@ Add .md files to create commands.` });
         type: "info",
         message: full ? "\u{1F9E0} Rebuilding chat memory index (this may take a while on first run \u2014 ~117 MB embedder)." : "\u{1F9E0} Refreshing chat memory index (incremental)\u2026"
       });
-      const { buildChatIndex } = await import("./chat-index-R2E27VXN.js");
+      const { buildChatIndex } = await import("./chat-index-PS274XM7.js");
       const stats = await buildChatIndex({
         full,
         onProgress: (p) => {
@@ -16830,8 +17416,8 @@ async function setupProxy(configProxy) {
 }
 
 // src/web/auth.ts
-import { existsSync as existsSync27, readFileSync as readFileSync21, writeFileSync as writeFileSync3, mkdirSync as mkdirSync12, readdirSync as readdirSync12, copyFileSync } from "fs";
-import { join as join21 } from "path";
+import { existsSync as existsSync27, readFileSync as readFileSync21, writeFileSync as writeFileSync3, mkdirSync as mkdirSync13, readdirSync as readdirSync13, copyFileSync } from "fs";
+import { join as join22 } from "path";
 import { createHmac, randomBytes, timingSafeEqual, pbkdf2Sync } from "crypto";
 var USERS_FILE = "users.json";
 var TOKEN_EXPIRY_HOURS = 24;
@@ -16846,7 +17432,7 @@ var AuthManager = class {
   db;
   constructor(baseDir) {
     this.baseDir = baseDir;
-    this.usersFile = join21(baseDir, USERS_FILE);
+    this.usersFile = join22(baseDir, USERS_FILE);
     this.db = this.loadOrCreate();
   }
   // ── Public API ─────────────────────────────────────────────────
@@ -16875,9 +17461,9 @@ var AuthManager = class {
     }
     const salt = randomBytes(16).toString("hex");
     const passwordHash = this.hashPassword(password, salt);
-    const dataDir = join21(USERS_DIR, username);
-    const fullDataDir = join21(this.baseDir, dataDir);
-    mkdirSync12(join21(fullDataDir, "history"), { recursive: true });
+    const dataDir = join22(USERS_DIR, username);
+    const fullDataDir = join22(this.baseDir, dataDir);
+    mkdirSync13(join22(fullDataDir, "history"), { recursive: true });
     const user = {
       username,
       passwordHash,
@@ -16992,7 +17578,7 @@ var AuthManager = class {
   getUserDataDir(username) {
     const user = this.db.users.find((u) => u.username === username);
     if (!user) throw new Error(`User not found: ${username}`);
-    return join21(this.baseDir, user.dataDir);
+    return join22(this.baseDir, user.dataDir);
   }
   /** List all usernames */
   listUsers() {
@@ -17028,30 +17614,30 @@ var AuthManager = class {
     const err = this.register(username, password);
     if (err) return err;
     const userDir = this.getUserDataDir(username);
-    const globalConfig = join21(this.baseDir, "config.json");
+    const globalConfig = join22(this.baseDir, "config.json");
     if (existsSync27(globalConfig)) {
       try {
         const content = readFileSync21(globalConfig, "utf-8");
-        writeFileSync3(join21(userDir, "config.json"), content, "utf-8");
+        writeFileSync3(join22(userDir, "config.json"), content, "utf-8");
       } catch {
       }
     }
-    const globalMemory = join21(this.baseDir, "memory.md");
+    const globalMemory = join22(this.baseDir, "memory.md");
     if (existsSync27(globalMemory)) {
       try {
         const content = readFileSync21(globalMemory, "utf-8");
-        writeFileSync3(join21(userDir, "memory.md"), content, "utf-8");
+        writeFileSync3(join22(userDir, "memory.md"), content, "utf-8");
       } catch {
       }
     }
-    const globalHistory = join21(this.baseDir, "history");
+    const globalHistory = join22(this.baseDir, "history");
     if (existsSync27(globalHistory)) {
       try {
-        const files = readdirSync12(globalHistory).filter((f) => f.endsWith(".json"));
-        const userHistory = join21(userDir, "history");
+        const files = readdirSync13(globalHistory).filter((f) => f.endsWith(".json"));
+        const userHistory = join22(userDir, "history");
         for (const f of files) {
           try {
-            copyFileSync(join21(globalHistory, f), join21(userHistory, f));
+            copyFileSync(join22(globalHistory, f), join22(userHistory, f));
           } catch {
           }
         }
@@ -17080,7 +17666,7 @@ var AuthManager = class {
     this.saveDB(this.db);
   }
   saveDB(db) {
-    mkdirSync12(this.baseDir, { recursive: true });
+    mkdirSync13(this.baseDir, { recursive: true });
     atomicWriteFileSync(this.usersFile, JSON.stringify(db, null, 2));
   }
   /** Legacy hash — kept only for migrating old users (v0.2.x) */
@@ -17112,11 +17698,11 @@ function getModuleDir() {
     if (typeof import.meta?.url === "string") {
       const url = new URL(import.meta.url);
       const filePath = url.pathname.replace(/^\/([A-Z]:)/i, "$1");
-      return dirname6(filePath);
+      return dirname8(filePath);
     }
   } catch {
   }
-  return resolve9(".");
+  return resolve11(".");
 }
 async function startWebServer(options = {}) {
   const port = options.port ?? 3e3;
@@ -17151,6 +17737,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) {
@@ -17163,7 +17751,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)");
   }
@@ -17181,10 +17769,10 @@ async function startWebServer(options = {}) {
     }
   }
   let skillManager = null;
-  const skillsDir = join22(config.getConfigDir(), SKILLS_DIR_NAME);
+  const skillsDir = join23(config.getConfigDir(), SKILLS_DIR_NAME);
   if (existsSync28(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`);
@@ -17253,18 +17841,18 @@ async function startWebServer(options = {}) {
     next();
   };
   const moduleDir = getModuleDir();
-  let clientDir = join22(moduleDir, "web", "client");
+  let clientDir = join23(moduleDir, "web", "client");
   if (!existsSync28(clientDir)) {
-    clientDir = join22(moduleDir, "client");
+    clientDir = join23(moduleDir, "client");
   }
   if (!existsSync28(clientDir)) {
-    clientDir = join22(moduleDir, "..", "..", "src", "web", "client");
+    clientDir = join23(moduleDir, "..", "..", "src", "web", "client");
   }
   if (!existsSync28(clientDir)) {
-    clientDir = join22(process.cwd(), "src", "web", "client");
+    clientDir = join23(process.cwd(), "src", "web", "client");
   }
   console.log(`   Static files: ${clientDir}`);
-  app.use("/vendor", express.static(join22(clientDir, "vendor"), { maxAge: "1y", immutable: true }));
+  app.use("/vendor", express.static(join23(clientDir, "vendor"), { maxAge: "1y", immutable: true }));
   app.use(express.static(clientDir));
   app.get("/api/status", (_req, res) => {
     res.json({
@@ -17331,10 +17919,10 @@ async function startWebServer(options = {}) {
   app.get("/api/files", requireAuth, (req, res) => {
     const cwd = process.cwd();
     const prefix = req.query.prefix || "";
-    const targetDir = join22(cwd, prefix);
+    const targetDir = join23(cwd, prefix);
     try {
-      const canonicalTarget = realpathSync(resolve9(targetDir));
-      const canonicalCwd = realpathSync(resolve9(cwd));
+      const canonicalTarget = realpathSync(resolve11(targetDir));
+      const canonicalCwd = realpathSync(resolve11(cwd));
       if (!canonicalTarget.startsWith(canonicalCwd + sep3) && canonicalTarget !== canonicalCwd) {
         res.json({ files: [] });
         return;
@@ -17345,10 +17933,10 @@ async function startWebServer(options = {}) {
     }
     try {
       const SKIP = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", "dist-cjs", "release", "__pycache__", ".next", ".nuxt", "coverage", ".cache"]);
-      const entries = readdirSync13(targetDir, { withFileTypes: true });
+      const entries = readdirSync14(targetDir, { withFileTypes: true });
       const files = entries.filter((e) => !SKIP.has(e.name) && !e.name.startsWith(".")).slice(0, 50).map((e) => ({
         name: e.name,
-        path: relative4(cwd, join22(targetDir, e.name)).replace(/\\/g, "/"),
+        path: relative4(cwd, join23(targetDir, e.name)).replace(/\\/g, "/"),
         isDir: e.isDirectory()
       }));
       res.json({ files });
@@ -17384,7 +17972,7 @@ async function startWebServer(options = {}) {
     try {
       const authUser = req._authUser;
       const histDir = authUser ? getUserShared(authUser).config.getHistoryDir() : config.getHistoryDir();
-      const filePath = join22(histDir, `${id}.json`);
+      const filePath = join23(histDir, `${id}.json`);
       if (!existsSync28(filePath)) {
         res.status(404).json({ error: "Session not found" });
         return;
@@ -17413,10 +18001,10 @@ async function startWebServer(options = {}) {
       return;
     }
     const cwd = process.cwd();
-    const fullPath = resolve9(join22(cwd, filePath));
+    const fullPath = resolve11(join23(cwd, filePath));
     try {
       const canonicalFull = realpathSync(fullPath);
-      const canonicalCwd = realpathSync(resolve9(cwd));
+      const canonicalCwd = realpathSync(resolve11(cwd));
       if (!canonicalFull.startsWith(canonicalCwd + sep3) && canonicalFull !== canonicalCwd) {
         res.json({ error: "Access denied" });
         return;
@@ -17635,7 +18223,7 @@ async function startWebServer(options = {}) {
   });
   const MAX_PORT_ATTEMPTS = 10;
   let actualPort = port;
-  const result = await new Promise((resolve10, reject) => {
+  const result = await new Promise((resolve12, reject) => {
     const tryListen = (attempt) => {
       server.once("error", (err) => {
         if (err.code === "EADDRINUSE" && attempt < MAX_PORT_ATTEMPTS) {
@@ -17666,7 +18254,7 @@ async function startWebServer(options = {}) {
         }
         console.log(`   Press Ctrl+C to stop
 `);
-        resolve10({ port: actualPort, host, url });
+        resolve12({ port: actualPort, host, url });
       });
     };
     tryListen(1);
@@ -17686,14 +18274,14 @@ function resolveProjectMcpPath() {
   const cwd = process.cwd();
   const gitRoot = getGitRoot(cwd);
   const projectRoot = gitRoot ?? cwd;
-  const configPath = join22(projectRoot, MCP_PROJECT_CONFIG_NAME);
+  const configPath = join23(projectRoot, MCP_PROJECT_CONFIG_NAME);
   return existsSync28(configPath) ? configPath : null;
 }
 function loadProjectMcpConfig() {
   const cwd = process.cwd();
   const gitRoot = getGitRoot(cwd);
   const projectRoot = gitRoot ?? cwd;
-  const configPath = join22(projectRoot, MCP_PROJECT_CONFIG_NAME);
+  const configPath = join23(projectRoot, MCP_PROJECT_CONFIG_NAME);
   if (!existsSync28(configPath)) return null;
   try {
     const raw = JSON.parse(readFileSync22(configPath, "utf-8"));