jinzd-ai-cli 0.4.241 → 0.4.243

package/dist/electron-server.js

@@ -1,9 +1,47 @@
+import {
+  listFromIndex,
+  loadChatIndex,
+  readSessionMeta,
+  removeSessionFromIndex,
+  safeDate,
+  searchCandidates,
+  searchChatMemory,
+  updateSessionInIndex
+} from "./chunk-NV63EYFL.js";
 import {
   fileCheckpoints
 } from "./chunk-SKET65WZ.js";
 import {
   indexProject
 } from "./chunk-BNERFXVO.js";
+import {
+  addMemoryEntry,
+  clearMemoryEntries,
+  deleteMemoryEntry,
+  expireMemoryEntry,
+  exportMemoryEntries,
+  findSimilarMemory,
+  formatGitContextForPrompt,
+  formatMemoryForPrompt,
+  getGitContext,
+  getGitRoot,
+  isMemoryExpired,
+  listMemoryEntries,
+  loadMemoryEntries,
+  memoryStorePath,
+  parseWritableScope,
+  searchPersistentMemories,
+  touchMemoryReferences,
+  updateMemoryApproval,
+  updateMemoryEntry
+} from "./chunk-PNNZRJ67.js";
+import {
+  redactJson,
+  scanString
+} from "./chunk-YVTASHS5.js";
+import {
+  runTestsTool
+} from "./chunk-PLEXBFCR.js";
 import {
   AGENTIC_BEHAVIOR_GUIDELINE,
   APP_NAME,
@@ -26,8 +64,6 @@ import {
   MCP_PROTOCOL_VERSION,
   MCP_TOOL_PREFIX,
   MEMORY_FILE_NAME,
-  MEMORY_MAX_CHARS,
-  MEMORY_STORE_FILE_NAME,
   PLAN_MODE_READONLY_TOOLS,
   PLAN_MODE_SYSTEM_ADDON,
   PLUGINS_DIR_NAME,
@@ -36,9 +72,8 @@ import {
   SUBAGENT_DEFAULT_MAX_ROUNDS,
   SUBAGENT_MAX_ROUNDS_LIMIT,
   VERSION,
-  buildUserIdentityPrompt,
-  runTestsTool
-} from "./chunk-ZPXMT2B6.js";
+  buildUserIdentityPrompt
+} from "./chunk-GEWPLNKA.js";
 import {
   hasSemanticIndex,
   semanticSearch
@@ -47,20 +82,6 @@ import {
   loadIndex
 } from "./chunk-RWM2GFRC.js";
 import "./chunk-IEQAE3QG.js";
-import {
-  DEFAULT_PATTERNS,
-  listFromIndex,
-  loadChatIndex,
-  readSessionMeta,
-  redactJson,
-  redactString,
-  removeSessionFromIndex,
-  safeDate,
-  scanString,
-  searchCandidates,
-  searchChatMemory,
-  updateSessionInIndex
-} from "./chunk-UO3XWZFE.js";
 import "./chunk-JV5N65KN.js";
 import {
   atomicWriteFileSync
@@ -70,8 +91,8 @@ import {
 import express from "express";
 import { createServer } from "http";
 import { WebSocketServer } from "ws";
-import { join as join28, dirname as dirname11, resolve as resolve13, relative as relative6, sep as sep4 } from "path";
-import { existsSync as existsSync33, readFileSync as readFileSync25, readdirSync as readdirSync16, statSync as statSync14, realpathSync as realpathSync3 } from "fs";
+import { join as join27, dirname as dirname10, resolve as resolve12, relative as relative6, sep as sep4 } from "path";
+import { existsSync as existsSync31, readFileSync as readFileSync24, readdirSync as readdirSync16, statSync as statSync14, realpathSync as realpathSync3 } from "fs";
 import { networkInterfaces } from "os";
 
 // src/config/config-manager.ts
@@ -192,6 +213,12 @@ var ConfigSchema = z.object({
     projectDocMaxBytes: z.number().int().positive().default(32 * 1024),
     showLoadedContextSources: z.boolean().default(false)
   }).default({}),
+  // 持久记忆注入配置（MEM-005）
+  // maxChars: 注入 system prompt 的字符预算，超出丢最老条目并显式标注截断。
+  // 注意 CJK ≈ 1 字符/token——中文记忆的 token 开销约等于字符数。
+  memory: z.object({
+    maxChars: z.number().int().positive().max(2e5).default(1e4)
+  }).default({}),
   // Google Custom Search API 的 Search Engine ID (cx 参数)
   // API Key 通过 apiKeys['google-search'] 或 AICLI_API_KEY_GOOGLESEARCH 环境变量配置
   // CX 也可通过 AICLI_GOOGLE_CX 环境变量覆盖
@@ -4927,7 +4954,7 @@ async function execInPool(sessionKey, command, timeout, cwd, abortSignal) {
   const markerStart = `AICLI_MARKER_START:${id}`;
   const markerEnd = `AICLI_MARKER_END:${id}`;
   const wrappedCmd = IS_WINDOWS2 ? `${WIN_UTF8_PREAMBLE} echo "${markerStart}"; ${command}; echo "${markerEnd}:0"` : `echo "${markerStart}"; ${command}; echo "${markerEnd}:$?"`;
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     let stdout = "";
     let stderr = "";
     let timedOut = false;
@@ -4943,7 +4970,7 @@ async function execInPool(sessionKey, command, timeout, cwd, abortSignal) {
         stdout = stripMarkerOutput(stdout, markerStartPattern, markerEndPattern);
         resolved = true;
         cleanup();
-        resolve14({ stdout, stderr, exitCode, timedOut, aborted });
+        resolve13({ stdout, stderr, exitCode, timedOut, aborted });
       }
     };
     const onErr = (chunk) => {
@@ -4958,7 +4985,7 @@ async function execInPool(sessionKey, command, timeout, cwd, abortSignal) {
       resolved = true;
       stdout = stripMarkerOutput(stdout, markerStartPattern, markerEndPattern);
       cleanup();
-      resolve14({ stdout, stderr, exitCode: null, timedOut, aborted });
+      resolve13({ stdout, stderr, exitCode: null, timedOut, aborted });
       try {
         proc.kill();
       } catch {
@@ -4971,7 +4998,7 @@ async function execInPool(sessionKey, command, timeout, cwd, abortSignal) {
       resolved = true;
       cleanup();
       stdout = stripMarkerOutput(stdout, markerStartPattern, markerEndPattern);
-      resolve14({ stdout, stderr, exitCode: null, timedOut, aborted });
+      resolve13({ stdout, stderr, exitCode: null, timedOut, aborted });
       try {
         proc.kill();
       } catch {
@@ -4989,7 +5016,7 @@ async function execInPool(sessionKey, command, timeout, cwd, abortSignal) {
       stderr += `
 [pool error] ${err.message}`;
       cleanup();
-      resolve14({ stdout, stderr, exitCode: null, timedOut, aborted });
+      resolve13({ stdout, stderr, exitCode: null, timedOut, aborted });
       pool.delete(sessionKey);
     };
     proc.on("error", onError);
@@ -7384,7 +7411,7 @@ var ToolExecutor = class {
     rl.resume();
     process.stdout.write(prompt);
     this.confirming = true;
-    return new Promise((resolve14) => {
+    return new Promise((resolve13) => {
       let completed = false;
       const cleanup = (result) => {
         if (completed) return;
@@ -7394,7 +7421,7 @@ var ToolExecutor = class {
         rl.pause();
         rlAny.output = savedOutput;
         this.confirming = false;
-        resolve14(result);
+        resolve13(result);
       };
       const onLine = (line) => {
         const trimmed = line.trim();
@@ -7568,7 +7595,7 @@ var ToolExecutor = class {
     rl.resume();
     process.stdout.write(color("Proceed? [y/N] (type y + Enter to confirm) "));
     this.confirming = true;
-    return new Promise((resolve14) => {
+    return new Promise((resolve13) => {
       let completed = false;
       const cleanup = (answer) => {
         if (completed) return;
@@ -7578,7 +7605,7 @@ var ToolExecutor = class {
         rl.pause();
         rlAny.output = savedOutput;
         this.confirming = false;
-        resolve14(answer === "y");
+        resolve13(answer === "y");
       };
       const onLine = (line) => {
         const trimmed = line.trim();
@@ -8827,7 +8854,7 @@ var runInteractiveTool = {
       PYTHONDONTWRITEBYTECODE: "1"
     };
     const prefixWarnings = [argsTypeWarning, stdinTypeWarning].filter(Boolean).join("");
-    return new Promise((resolve14) => {
+    return new Promise((resolve13) => {
       const child = spawn3(executable, cmdArgs.map(String), {
         cwd: process.cwd(),
         env,
@@ -8860,22 +8887,22 @@ var runInteractiveTool = {
       setTimeout(writeNextLine, 400);
       const timer = setTimeout(() => {
         child.kill();
-        resolve14(`${prefixWarnings}[Timeout after ${timeout}ms]
+        resolve13(`${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) {
-          resolve14(`${prefixWarnings}Exit code ${code}:
+          resolve13(`${prefixWarnings}Exit code ${code}:
 ${output}`);
         } else {
-          resolve14(`${prefixWarnings}${output || "(no output)"}`);
+          resolve13(`${prefixWarnings}${output || "(no output)"}`);
         }
       });
       child.on("error", (err) => {
         clearTimeout(timer);
-        resolve14(
+        resolve13(
           `${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`
@@ -9587,280 +9614,10 @@ Any of these triggers means use save_last_response, NOT write_file:
 };
 
 // src/tools/builtin/save-memory.ts
-import { join as join12 } from "path";
-import { homedir as homedir5 } from "os";
-
-// src/memory/persistent-memory.ts
-import { existsSync as existsSync17, mkdirSync as mkdirSync8, readFileSync as readFileSync12 } from "fs";
-import { randomUUID, createHash as createHash2 } from "crypto";
-import { dirname as dirname7, join as join11, resolve as resolve6 } from "path";
-
-// src/tools/git-context.ts
-import { execSync as execSync2 } from "child_process";
-import { existsSync as existsSync16 } from "fs";
 import { join as join10 } 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 getGitRoot(cwd = process.cwd()) {
-  return runGit("rev-parse --show-toplevel", cwd);
-}
-function getGitContext(cwd = process.cwd()) {
-  if (!existsSync16(join10(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 join11(configDir, MEMORY_STORE_FILE_NAME);
-}
-function memoryMarkdownPath(configDir) {
-  return join11(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 (!existsSync17(file)) return [];
-  const content = readFileSync12(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 (!existsSync17(file)) return legacyEntriesFromMarkdown(configDir);
-  const text = readFileSync12(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) {
-  mkdirSync8(configDir, { recursive: true });
-  const jsonl = entries.map((entry) => JSON.stringify(entry)).join("\n");
-  atomicWriteFileSync(memoryStorePath(configDir), jsonl ? jsonl + "\n" : "");
-}
-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 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
+import { homedir as homedir5 } from "os";
 function getConfigDir() {
-  return join12(homedir5(), CONFIG_DIR_NAME);
-}
-function parseScope(value) {
-  return value === "personal" || value === "project" || value === "session" || value === "team" ? value : void 0;
+  return join10(homedir5(), CONFIG_DIR_NAME);
 }
 function parseSensitivity(value) {
   return value === "low" || value === "medium" || value === "high" ? value : void 0;
@@ -9868,7 +9625,7 @@ function parseSensitivity(value) {
 var saveMemoryTool = {
   definition: {
     name: "save_memory",
-    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.",
+    description: "Save important information to governed persistent memory. Entries saved by this tool are stored as PENDING and only take effect after the user runs /memory approve <id> \u2014 tell the user the returned id so they can approve it. Use concise entries for user preferences, project decisions, recurring patterns, and key findings.",
     parameters: {
       content: {
         type: "string",
@@ -9877,7 +9634,7 @@ var saveMemoryTool = {
       },
       scope: {
         type: "string",
-        description: "Memory scope: personal, project, session, or team. Defaults to personal. Project memories are only injected in the same project.",
+        description: "Memory scope: personal (default, injected everywhere) or project (only injected inside the current project).",
         required: false
       },
       sensitivity: {
@@ -9889,6 +9646,11 @@ var saveMemoryTool = {
         type: "string",
         description: "Optional ISO timestamp after which this memory should no longer be injected.",
         required: false
+      },
+      updateId: {
+        type: "string",
+        description: "Optional id (or unique id prefix) of an existing memory entry to update in place instead of creating a new one. Use this when a previously saved memory is outdated \u2014 do not save a contradicting duplicate. Updated entries go back to pending and need user re-approval.",
+        required: false
       }
     },
     dangerous: false
@@ -9896,16 +9658,29 @@ var saveMemoryTool = {
   async execute(args) {
     const content = String(args["content"] ?? "").trim();
     if (!content) throw new ToolError("save_memory", "content is required");
+    const updateId = typeof args["updateId"] === "string" ? args["updateId"].trim() : "";
+    if (updateId) {
+      try {
+        const updated = updateMemoryEntry(getConfigDir(), updateId, content, { source: "tool", redact: true });
+        const redactedNote = updated.redactedKinds?.length ? ` Redacted: ${updated.redactedKinds.join(", ")}.` : "";
+        return `Memory ${updated.id.slice(0, 8)} updated (pending approval \u2014 the user must run \`/memory approve ${updated.id.slice(0, 8)}\` before the new content is injected; mention this to the user). scope=${updated.scope} sensitivity=${updated.sensitivity}.${redactedNote}`;
+      } catch (err) {
+        throw new ToolError("save_memory", err instanceof Error ? err.message : String(err));
+      }
+    }
+    const similar = findSimilarMemory(loadMemoryEntries(getConfigDir()), content);
     const entry = addMemoryEntry(getConfigDir(), content, {
-      scope: parseScope(args["scope"]) ?? "personal",
+      scope: parseWritableScope(args["scope"]) ?? "personal",
+      source: "tool",
       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 status = entry.approved ? "approved and active" : `pending approval \u2014 the user must run \`/memory approve ${entry.id.slice(0, 8)}\` before it is injected; mention this to the user`;
     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}`;
+    const similarNote = similar ? ` Warning: a similar entry already exists (id=${similar.id.slice(0, 8)}) \u2014 next time pass updateId to revise it instead of duplicating.` : "";
+    return `Memory saved (${status}). id=${entry.id.slice(0, 8)} scope=${entry.scope} sensitivity=${entry.sensitivity}.${redacted}${similarNote}`;
   }
 };
 
@@ -9949,7 +9724,7 @@ function promptUser(rl, question) {
   console.log();
   console.log(chalk4.cyan("\u2753 ") + chalk4.bold(question));
   process.stdout.write(chalk4.cyan("> "));
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     let completed = false;
     const cleanup = (answer) => {
       if (completed) return;
@@ -9959,7 +9734,7 @@ function promptUser(rl, question) {
       rl.pause();
       rlAny.output = savedOutput;
       askUserContext.prompting = false;
-      resolve14(answer);
+      resolve13(answer);
     };
     const onLine = (line) => {
       cleanup(line);
@@ -10191,14 +9966,14 @@ function formatResults2(query, data, _requested) {
 }
 
 // src/agents/agent-config.ts
-import { existsSync as existsSync19, readdirSync as readdirSync8, readFileSync as readFileSync14 } from "fs";
-import { join as join14 } from "path";
+import { existsSync as existsSync17, readdirSync as readdirSync8, readFileSync as readFileSync13 } from "fs";
+import { join as join12 } from "path";
 import { homedir as homedir6 } from "os";
 
 // src/plugins/plugin-manager.ts
-import { existsSync as existsSync18, mkdirSync as mkdirSync9, readdirSync as readdirSync7, readFileSync as readFileSync13, realpathSync as realpathSync2, cpSync, rmSync, statSync as statSync7 } from "fs";
-import { basename as basename6, dirname as dirname8, join as join13, relative as relative3, resolve as resolve7, sep as sep3 } from "path";
-import { createHash as createHash3 } from "crypto";
+import { existsSync as existsSync16, mkdirSync as mkdirSync8, readdirSync as readdirSync7, readFileSync as readFileSync12, realpathSync as realpathSync2, cpSync, rmSync, statSync as statSync7 } from "fs";
+import { basename as basename6, dirname as dirname7, join as join11, relative as relative3, resolve as resolve6, sep as sep3 } from "path";
+import { createHash as createHash2 } from "crypto";
 import { z as z2 } from "zod";
 var MANIFEST_RELATIVE = ".aicli-plugin/plugin.json";
 var STATE_FILE = "plugin-state.json";
@@ -10257,19 +10032,19 @@ var PluginManifestSchema = z2.object({
   permissionHints: z2.array(z2.string()).default([])
 }).strict();
 function pluginRoot(configDir) {
-  return join13(configDir, PLUGINS_DIR_NAME);
+  return join11(configDir, PLUGINS_DIR_NAME);
 }
 function pluginManifestPath(pluginDir) {
-  return join13(pluginDir, MANIFEST_RELATIVE);
+  return join11(pluginDir, MANIFEST_RELATIVE);
 }
 function statePath(configDir) {
-  return join13(pluginRoot(configDir), STATE_FILE);
+  return join11(pluginRoot(configDir), STATE_FILE);
 }
 function loadState(configDir) {
   const file = statePath(configDir);
-  if (!existsSync18(file)) return { version: 2, plugins: [] };
+  if (!existsSync16(file)) return { version: 2, plugins: [] };
   try {
-    const parsed = JSON.parse(readFileSync13(file, "utf-8"));
+    const parsed = JSON.parse(readFileSync12(file, "utf-8"));
     const rawPlugins = Array.isArray(parsed.plugins) ? parsed.plugins : [];
     return { version: 2, plugins: rawPlugins.map((p) => migrateEntry(p)) };
   } catch {
@@ -10292,7 +10067,7 @@ function migrateEntry(entry) {
   };
 }
 function saveState(configDir, state2) {
-  mkdirSync9(pluginRoot(configDir), { recursive: true });
+  mkdirSync8(pluginRoot(configDir), { recursive: true });
   atomicWriteFileSync(statePath(configDir), JSON.stringify(state2, null, 2));
 }
 function normalizeForHash(buf) {
@@ -10300,7 +10075,7 @@ function normalizeForHash(buf) {
   return Buffer.from(str, "utf-8");
 }
 function extractCommandPaths(command, pluginDir) {
-  const resolvedDir = resolve7(pluginDir);
+  const resolvedDir = resolve6(pluginDir);
   const refs = [];
   for (const m of command.matchAll(/\$PLUGIN_DIR[\\/]([^"'\s]+)/g)) {
     refs.push(m[1]);
@@ -10317,9 +10092,9 @@ function extractCommandPaths(command, pluginDir) {
     if (seen.has(ref)) continue;
     seen.add(ref);
     try {
-      const abs = resolve7(resolvedDir, ref);
+      const abs = resolve6(resolvedDir, ref);
       if (!abs.startsWith(resolvedDir + sep3)) continue;
-      if (existsSync18(abs)) {
+      if (existsSync16(abs)) {
         const real = realpathSync2(abs);
         if (!real.startsWith(resolvedDir + sep3)) continue;
         valid.push(relative3(resolvedDir, real));
@@ -10330,7 +10105,7 @@ function extractCommandPaths(command, pluginDir) {
   return valid;
 }
 function hashPluginContent(pluginDir, manifest) {
-  const resolvedDir = resolve7(pluginDir);
+  const resolvedDir = resolve6(pluginDir);
   const assetRels = /* @__PURE__ */ new Set(
     [...manifest.skills, ...manifest.commands, ...manifest.agents]
   );
@@ -10350,11 +10125,11 @@ function hashPluginContent(pluginDir, manifest) {
     }
   }
   const sorted = [...assetRels].sort();
-  const hasher = createHash3("sha256");
-  const manifestPath = join13(resolvedDir, MANIFEST_RELATIVE);
-  hasher.update(normalizeForHash(readFileSync13(manifestPath)));
+  const hasher = createHash2("sha256");
+  const manifestPath = join11(resolvedDir, MANIFEST_RELATIVE);
+  hasher.update(normalizeForHash(readFileSync12(manifestPath)));
   for (const rel of sorted) {
-    const abs = resolve7(resolvedDir, rel);
+    const abs = resolve6(resolvedDir, rel);
     if (!abs.startsWith(resolvedDir + sep3)) {
       throw new Error(`plugin asset escapes plugin dir: ${rel}`);
     }
@@ -10372,7 +10147,7 @@ function hashPluginContent(pluginDir, manifest) {
     if (!realPath.startsWith(resolvedDir + sep3)) {
       throw new Error(`plugin asset symlink escapes plugin dir: ${rel} \u2192 ${realPath}`);
     }
-    hasher.update(normalizeForHash(readFileSync13(abs)));
+    hasher.update(normalizeForHash(readFileSync12(abs)));
   }
   return hasher.digest("hex");
 }
@@ -10380,22 +10155,22 @@ function effectiveHash(entry) {
   return entry.contentHash ?? entry.hash ?? "";
 }
 function readPluginManifest(manifestPath) {
-  return PluginManifestSchema.parse(JSON.parse(readFileSync13(manifestPath, "utf-8")));
+  return PluginManifestSchema.parse(JSON.parse(readFileSync12(manifestPath, "utf-8")));
 }
 function findPluginSourceDir(inputPath) {
-  const abs = resolve7(inputPath);
-  const direct = statSync7(abs).isDirectory() ? abs : dirname8(abs);
-  if (existsSync18(pluginManifestPath(direct))) return direct;
-  const nested = join13(direct, ".aicli-plugin");
-  if (existsSync18(join13(nested, "plugin.json"))) return direct;
+  const abs = resolve6(inputPath);
+  const direct = statSync7(abs).isDirectory() ? abs : dirname7(abs);
+  if (existsSync16(pluginManifestPath(direct))) return direct;
+  const nested = join11(direct, ".aicli-plugin");
+  if (existsSync16(join11(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 = join13(pluginRoot(configDir), manifest.name);
-  mkdirSync9(pluginRoot(configDir), { recursive: true });
-  if (existsSync18(targetDir)) rmSync(targetDir, { recursive: true, force: true });
+  const targetDir = join11(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 contentHash = hashPluginContent(targetDir, manifest);
@@ -10453,18 +10228,18 @@ function getInstalledPlugin(configDir, name) {
 }
 function listInstalledPlugins(configDir) {
   const root = pluginRoot(configDir);
-  if (!existsSync18(root)) return [];
+  if (!existsSync16(root)) return [];
   const state2 = loadState(configDir);
   const out = [];
   for (const entry of readdirSync7(root)) {
-    const dir = join13(root, entry);
+    const dir = join11(root, entry);
     try {
       if (!statSync7(dir).isDirectory()) continue;
     } catch {
       continue;
     }
     const manifestPath = pluginManifestPath(dir);
-    if (!existsSync18(manifestPath)) continue;
+    if (!existsSync16(manifestPath)) continue;
     try {
       const manifest = readPluginManifest(manifestPath);
       const contentHash = hashPluginContent(dir, manifest);
@@ -10502,9 +10277,9 @@ function activePlugins(configDir) {
 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 (existsSync18(abs)) dirs.add(statSync7(abs).isDirectory() ? abs : dirname8(abs));
+    const abs = resolve6(plugin.dir, rel);
+    if (!abs.startsWith(resolve6(plugin.dir))) continue;
+    if (existsSync16(abs)) dirs.add(statSync7(abs).isDirectory() ? abs : dirname7(abs));
   }
   return [...dirs];
 }
@@ -10667,13 +10442,13 @@ function parseAgentConfig(raw, source, path3) {
   return cfg;
 }
 function loadAgentDir(dir, source) {
-  if (!existsSync19(dir)) return [];
+  if (!existsSync17(dir)) return [];
   const out = [];
   for (const file of readdirSync8(dir)) {
     if (!file.endsWith(".json")) continue;
-    const path3 = join14(dir, file);
+    const path3 = join12(dir, file);
     try {
-      const parsed = JSON.parse(readFileSync14(path3, "utf-8"));
+      const parsed = JSON.parse(readFileSync13(path3, "utf-8"));
       const cfg = parseAgentConfig(parsed, source, path3);
       if (cfg) out.push(cfg);
     } catch {
@@ -10683,8 +10458,8 @@ function loadAgentDir(dir, source) {
 }
 function getAgentDirs(configDir, cwd = process.cwd()) {
   return {
-    user: join14(configDir ?? join14(homedir6(), CONFIG_DIR_NAME), "agents"),
-    project: join14(cwd, CONFIG_DIR_NAME, "agents")
+    user: join12(configDir ?? join12(homedir6(), CONFIG_DIR_NAME), "agents"),
+    project: join12(cwd, CONFIG_DIR_NAME, "agents")
   };
 }
 function listAgentConfigs(configDir, cwd = process.cwd()) {
@@ -10731,7 +10506,7 @@ var nextId = 1;
 var preferredAgentName = "worker";
 var runs = [];
 var MAX_RUNS = 50;
-function nowIso2() {
+function nowIso() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
 function startAgentRun(input) {
@@ -10740,7 +10515,7 @@ function startAgentRun(input) {
     agentName: input.agentName,
     task: input.task,
     status: "running",
-    startedAt: nowIso2(),
+    startedAt: nowIso(),
     toolNames: [],
     agentIndex: input.agentIndex,
     stopRequested: false
@@ -10758,7 +10533,7 @@ function finishAgentRun(runId, status, summary, error) {
   const run = runs.find((r) => r.id === runId);
   if (!run) return;
   run.status = status;
-  run.finishedAt = nowIso2();
+  run.finishedAt = nowIso();
   if (summary) run.summary = summary;
   if (error) run.error = error;
 }
@@ -11184,7 +10959,7 @@ var spawnAgentTool = {
 
 // src/tools/builtin/task-manager.ts
 import { spawn as spawn4 } from "child_process";
-import { randomUUID as randomUUID2 } from "crypto";
+import { randomUUID } from "crypto";
 import { platform as platform5 } from "os";
 var MAX_OUTPUT_CHARS = 1e4;
 var MAX_OUTPUT_BYTES = 64 * 1024;
@@ -11217,7 +10992,7 @@ function createTask(command, description) {
       }
     }
   }
-  const id = randomUUID2().slice(0, 8);
+  const id = randomUUID().slice(0, 8);
   const { shell, args } = shellInvocation(command);
   const proc = spawn4(shell, args, {
     stdio: ["ignore", "pipe", "pipe"],
@@ -11399,20 +11174,20 @@ var taskStopTool = {
 
 // src/tools/builtin/git-tools.ts
 import { execFileSync as execFileSync2 } from "child_process";
-import { existsSync as existsSync20 } from "fs";
-import { join as join15 } from "path";
+import { existsSync as existsSync18 } from "fs";
+import { join as join13 } from "path";
 function assertGitRepo(cwd) {
   let dir = cwd;
   const root = dir.split(/[\\/]/)[0] + (dir.includes("\\") ? "\\" : "/");
   while (dir && dir !== root) {
-    if (existsSync20(join15(dir, ".git"))) return;
-    const parent = join15(dir, "..");
+    if (existsSync18(join13(dir, ".git"))) return;
+    const parent = join13(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 runGit2(args, cwd, maxBuffer = 10 * 1024 * 1024) {
+function runGit(args, cwd, maxBuffer = 10 * 1024 * 1024) {
   try {
     const output = execFileSync2("git", args, {
       cwd,
@@ -11447,11 +11222,11 @@ var gitStatusTool = {
     assertGitRepo(cwd);
     let branch = "(unknown)";
     try {
-      branch = runGit2(["symbolic-ref", "--short", "HEAD"], cwd).trim();
+      branch = runGit(["symbolic-ref", "--short", "HEAD"], cwd).trim();
     } catch {
       branch = "(detached)";
     }
-    const porcelain = runGit2(["status", "--porcelain=v1", "-b"], cwd);
+    const porcelain = runGit(["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);
@@ -11538,7 +11313,7 @@ var gitDiffTool = {
     if (args["file"]) {
       gitArgs.push("--", String(args["file"]));
     }
-    const output = runGit2(gitArgs, cwd);
+    const output = runGit(gitArgs, cwd);
     if (output.trim().length === 0) {
       const label = args["staged"] ? "staged" : args["commit_range"] ? String(args["commit_range"]) : "unstaged";
       return `No ${label} changes.`;
@@ -11600,7 +11375,7 @@ var gitLogTool = {
     if (args["file"]) {
       gitArgs.push("--", String(args["file"]));
     }
-    const output = runGit2(gitArgs, cwd);
+    const output = runGit(gitArgs, cwd);
     if (output.trim().length === 0) {
       return "No commits found matching the filter.";
     }
@@ -11647,9 +11422,9 @@ var gitCommitTool = {
       throw new ToolError("git_commit", "Cannot use both stage_all and files at the same time.");
     }
     if (files.length > 0) {
-      runGit2(["add", "--", ...files], cwd);
+      runGit(["add", "--", ...files], cwd);
     }
-    const statusBefore = runGit2(["status", "--porcelain"], cwd);
+    const statusBefore = runGit(["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) {
@@ -11660,9 +11435,9 @@ var gitCommitTool = {
     }
     const commitArgs = ["commit", "-m", message];
     if (stageAll) commitArgs.splice(1, 0, "-a");
-    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();
+    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();
     return `\u2713 Committed ${hash}
 ${summary}
 
@@ -11671,9 +11446,9 @@ ${commitOutput.trim()}`;
 };
 
 // src/tools/builtin/notebook-edit.ts
-import { readFileSync as readFileSync15, existsSync as existsSync21 } from "fs";
+import { readFileSync as readFileSync14, existsSync as existsSync19 } from "fs";
 import { writeFile } from "fs/promises";
-import { resolve as resolve8, extname as extname2 } from "path";
+import { resolve as resolve7, extname as extname2 } from "path";
 var notebookEditTool = {
   definition: {
     name: "notebook_edit",
@@ -11722,14 +11497,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 = resolve8(filePath);
+    const absPath = resolve7(filePath);
     if (extname2(absPath).toLowerCase() !== ".ipynb") {
       throw new ToolError("notebook_edit", "path must point to a .ipynb file");
     }
-    if (!existsSync21(absPath)) {
+    if (!existsSync19(absPath)) {
       throw new ToolError("notebook_edit", `Notebook not found: ${filePath}`);
     }
-    const raw = readFileSync15(absPath, "utf-8");
+    const raw = readFileSync14(absPath, "utf-8");
     const nb = parseNotebook(raw);
     const cellIdx0 = cellIndexRaw - 1;
     undoStack.push(absPath, `notebook_edit (${action}): ${filePath}`);
@@ -12055,6 +11830,8 @@ ${lines.join("\n")}`;
 };
 
 // src/tools/builtin/recall-memory.ts
+import { join as join14 } from "path";
+import { homedir as homedir7 } from "os";
 function formatHit(h, i) {
   const ts = h.chunk.timestamp.slice(0, 16).replace("T", " ");
   const title = h.chunk.sessionTitle ? ` \xB7 ${h.chunk.sessionTitle}` : "";
@@ -12067,7 +11844,7 @@ function formatHit(h, i) {
 var recallMemoryTool = {
   definition: {
     name: "recall_memory",
-    description: 'Semantic search over past chat sessions. Call this whenever the user references something that may have been discussed before ("last time", "remember", "\u4E4B\u524D", "\u4E0A\u6B21"), when context is ambiguous and continuity matters, or when you want to check what decisions or preferences have been established across prior conversations. Returns up to `topK` relevant snippets with session id, timestamp, and cosine similarity score. Prefer this over asking the user "can you remind me".',
+    description: 'Search long-term memory: governed persistent memory entries (keyword match) plus semantic search over past chat sessions. Call this whenever the user references something that may have been discussed before ("last time", "remember", "\u4E4B\u524D", "\u4E0A\u6B21"), when context is ambiguous and continuity matters, or when you want to check what decisions or preferences have been established across prior conversations \u2014 including memories that were dropped from the injected system prompt by the size budget. Returns persistent-memory hits first, then up to `topK` chat snippets with session id, timestamp, and cosine similarity score. Prefer this over asking the user "can you remind me".',
     parameters: {
       query: {
         type: "string",
@@ -12104,9 +11881,21 @@ var recallMemoryTool = {
     const excludeCurrent = Boolean(args["excludeCurrentSession"]);
     const currentId = args["currentSessionId"] ? String(args["currentSessionId"]) : void 0;
     const minScore = args["minScore"] !== void 0 ? Number(args["minScore"]) : 0.25;
+    const configDir = join14(homedir7(), CONFIG_DIR_NAME);
+    let persistentSection = "";
+    try {
+      const persistentHits = searchPersistentMemories(configDir, query, process.cwd(), 3);
+      if (persistentHits.length > 0) {
+        touchMemoryReferences(configDir, persistentHits.map((h) => h.entry.id));
+        persistentSection = `\u2500\u2500 Persistent memory (${persistentHits.length} hit(s)) \u2500\u2500
+` + persistentHits.map((h) => `[id ${h.entry.id.slice(0, 8)} \xB7 ${h.entry.scope} \xB7 coverage ${h.score.toFixed(2)}]
+${h.entry.content}`).join("\n\n") + "\n\n";
+      }
+    } catch {
+    }
     const status = loadChatIndex();
     if (!status) {
-      return "No chat memory index found. The index is built on REPL startup, or run `/memory rebuild` manually. If you have no past sessions yet, this is expected.";
+      return persistentSection + "No chat memory index found. The index is built on REPL startup, or run `/memory rebuild` manually. If you have no past sessions yet, this is expected.";
     }
     const hits = await searchChatMemory(query, {
       topK,
@@ -12114,11 +11903,11 @@ var recallMemoryTool = {
       excludeSessionId: excludeCurrent ? currentId : void 0
     });
     if (hits.length === 0) {
-      return `No memories matched "${query}" above score ${minScore}. Index has ${status.idx.chunks.length} chunks across ${Object.keys(status.idx.sessionMtimes).length} sessions. Consider lowering minScore to 0.15 or rephrasing the query.`;
+      return persistentSection + `No chat-history memories matched "${query}" above score ${minScore}. Index has ${status.idx.chunks.length} chunks across ${Object.keys(status.idx.sessionMtimes).length} sessions. Consider lowering minScore to 0.15 or rephrasing the query.`;
     }
-    const header = `Found ${hits.length} memory hit(s) for "${query}" (min-score ${minScore}):
+    const header = `Found ${hits.length} chat-history hit(s) for "${query}" (min-score ${minScore}):
 `;
-    return header + "\n" + hits.map(formatHit).join("\n\n");
+    return persistentSection + header + "\n" + hits.map(formatHit).join("\n\n");
   }
 };
 
@@ -12146,8 +11935,8 @@ function estimateToolDefinitionTokens(def) {
 
 // src/tools/registry.ts
 import { pathToFileURL } from "url";
-import { existsSync as existsSync22, mkdirSync as mkdirSync10, readdirSync as readdirSync9 } from "fs";
-import { join as join16 } 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();
@@ -12308,9 +12097,9 @@ var ToolRegistry = class {
    * Returns the number of successfully loaded plugins.
    */
   async loadPlugins(pluginsDir, allowPlugins = false) {
-    if (!existsSync22(pluginsDir)) {
+    if (!existsSync20(pluginsDir)) {
       try {
-        mkdirSync10(pluginsDir, { recursive: true });
+        mkdirSync9(pluginsDir, { recursive: true });
       } catch {
       }
       return 0;
@@ -12334,12 +12123,12 @@ var ToolRegistry = class {
     process.stderr.write(
       `
 [plugins] \u26A0 Loading ${files.length} plugin(s) with FULL system privileges:
-` + files.map((f) => `  + ${join16(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(join16(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) {
@@ -12501,7 +12290,7 @@ var McpClient = class {
   // 内部方法：JSON-RPC 通信
   // ══════════════════════════════════════════════════════════════════
   sendRequest(method, params) {
-    return new Promise((resolve14, reject) => {
+    return new Promise((resolve13, reject) => {
       if (!this.process?.stdin?.writable) {
         return reject(new Error(`MCP server [${this.serverId}] stdin not writable`));
       }
@@ -12525,7 +12314,7 @@ var McpClient = class {
       this.pendingRequests.set(id, {
         resolve: (result) => {
           cleanup();
-          resolve14(result);
+          resolve13(result);
         },
         reject: (error) => {
           cleanup();
@@ -12602,13 +12391,13 @@ var McpClient = class {
   }
   /** Promise 超时包装 */
   withTimeout(promise, ms, label) {
-    return new Promise((resolve14, reject) => {
+    return new Promise((resolve13, reject) => {
       const timer = setTimeout(() => {
         reject(new Error(`MCP [${this.serverId}] ${label} timed out after ${ms}ms`));
       }, ms);
       promise.then((val) => {
         clearTimeout(timer);
-        resolve14(val);
+        resolve13(val);
       }).catch((err) => {
         clearTimeout(timer);
         reject(err);
@@ -12885,11 +12674,11 @@ var McpManager = class {
 };
 
 // src/skills/manager.ts
-import { existsSync as existsSync23, readdirSync as readdirSync10, mkdirSync as mkdirSync11, statSync as statSync8 } from "fs";
-import { join as join17 } from "path";
+import { existsSync as existsSync21, readdirSync as readdirSync10, mkdirSync as mkdirSync10, statSync as statSync8 } from "fs";
+import { join as join16 } from "path";
 
 // src/skills/types.ts
-import { readFileSync as readFileSync16 } from "fs";
+import { readFileSync as readFileSync15 } from "fs";
 import { basename as basename7 } from "path";
 function parseSimpleYaml(yaml) {
   const result = {};
@@ -12911,7 +12700,7 @@ function parseYamlArray(value) {
 function parseSkillFile(filePath) {
   let raw;
   try {
-    raw = readFileSync16(filePath, "utf-8");
+    raw = readFileSync15(filePath, "utf-8");
   } catch {
     return null;
   }
@@ -12959,10 +12748,10 @@ var SkillManager = class {
     return this.skills.size;
   }
   loadSkillDir(dir, createIfMissing) {
-    if (!existsSync23(dir)) {
+    if (!existsSync21(dir)) {
       if (createIfMissing) {
         try {
-          mkdirSync11(dir, { recursive: true });
+          mkdirSync10(dir, { recursive: true });
         } catch {
         }
       }
@@ -12976,14 +12765,14 @@ var SkillManager = class {
     }
     for (const entry of entries) {
       let filePath;
-      const fullPath = join17(dir, entry);
+      const fullPath = join16(dir, entry);
       if (entry.endsWith(".md")) {
         filePath = fullPath;
       } else {
         try {
           if (statSync8(fullPath).isDirectory()) {
-            const skillMd = join17(fullPath, "SKILL.md");
-            if (existsSync23(skillMd)) filePath = skillMd;
+            const skillMd = join16(fullPath, "SKILL.md");
+            if (existsSync21(skillMd)) filePath = skillMd;
             else continue;
           } else {
             continue;
@@ -13040,9 +12829,9 @@ var SkillManager = class {
 };
 
 // src/web/tool-executor-web.ts
-import { randomUUID as randomUUID3 } from "crypto";
+import { randomUUID as randomUUID2 } from "crypto";
 import { tmpdir as tmpdir2 } from "os";
-import { existsSync as existsSync24, readFileSync as readFileSync17 } from "fs";
+import { existsSync as existsSync22, readFileSync as readFileSync16 } from "fs";
 var ToolExecutorWeb = class _ToolExecutorWeb {
   constructor(registry, ws) {
     this.registry = registry;
@@ -13112,33 +12901,33 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
   }
   /** Resolve a pending confirm from client response */
   resolveConfirm(requestId, approved) {
-    const resolve14 = this.pendingConfirms.get(requestId);
-    if (resolve14) {
+    const resolve13 = this.pendingConfirms.get(requestId);
+    if (resolve13) {
       this.clearPendingTimer(requestId);
       this.pendingConfirms.delete(requestId);
       this.confirming = false;
-      resolve14(approved);
+      resolve13(approved);
     }
   }
   /** Resolve a pending batch confirm from client response */
   resolveBatchConfirm(requestId, decision) {
-    const resolve14 = this.pendingBatchConfirms.get(requestId);
-    if (resolve14) {
+    const resolve13 = this.pendingBatchConfirms.get(requestId);
+    if (resolve13) {
       this.clearPendingTimer(requestId);
       this.pendingBatchConfirms.delete(requestId);
       this.confirming = false;
       if (decision === "all" || decision === "none") {
-        resolve14(decision);
+        resolve13(decision);
       } else {
-        resolve14(new Set(decision));
+        resolve13(new Set(decision));
       }
     }
   }
   /** Cancel all pending confirms (e.g., on disconnect) */
   cancelAll() {
-    for (const resolve14 of this.pendingConfirms.values()) resolve14(false);
+    for (const resolve13 of this.pendingConfirms.values()) resolve13(false);
     this.pendingConfirms.clear();
-    for (const resolve14 of this.pendingBatchConfirms.values()) resolve14("none");
+    for (const resolve13 of this.pendingBatchConfirms.values()) resolve13("none");
     this.pendingBatchConfirms.clear();
     this.confirming = false;
   }
@@ -13181,9 +12970,9 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
     if (call.name === "write_file") {
       const filePath = String(call.arguments["path"] ?? "");
       const newContent = String(call.arguments["content"] ?? "");
-      if (filePath && existsSync24(filePath)) {
+      if (filePath && existsSync22(filePath)) {
         try {
-          const old = readFileSync17(filePath, "utf-8");
+          const old = readFileSync16(filePath, "utf-8");
           return renderDiff(old, newContent, { filePath });
         } catch {
         }
@@ -13203,7 +12992,7 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
   }
   /** WebSocket-based confirm — sends request, returns Promise resolved by client */
   confirm(call, level) {
-    const requestId = randomUUID3();
+    const requestId = randomUUID2();
     this.confirming = true;
     const msg = {
       type: "confirm_request",
@@ -13214,8 +13003,8 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
       diff: this.getDiffPreview(call)
     };
     this.send(msg);
-    return new Promise((resolve14) => {
-      this.pendingConfirms.set(requestId, resolve14);
+    return new Promise((resolve13) => {
+      this.pendingConfirms.set(requestId, resolve13);
       this.pendingTimers.set(requestId, setTimeout(() => {
         if (this.pendingConfirms.has(requestId)) {
           this.resolveConfirm(requestId, false);
@@ -13225,7 +13014,7 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
   }
   /** WebSocket-based batch confirm */
   batchConfirm(calls) {
-    const requestId = randomUUID3();
+    const requestId = randomUUID2();
     this.confirming = true;
     const files = calls.map((call, i) => ({
       index: i + 1,
@@ -13239,8 +13028,8 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
       files
     };
     this.send(msg);
-    return new Promise((resolve14) => {
-      this.pendingBatchConfirms.set(requestId, resolve14);
+    return new Promise((resolve13) => {
+      this.pendingBatchConfirms.set(requestId, resolve13);
       this.pendingTimers.set(requestId, setTimeout(() => {
         if (this.pendingBatchConfirms.has(requestId)) {
           this.resolveBatchConfirm(requestId, "none");
@@ -13487,16 +13276,16 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
 };
 
 // src/repl/dev-state.ts
-import { existsSync as existsSync25, readFileSync as readFileSync18, unlinkSync as unlinkSync5, mkdirSync as mkdirSync12 } from "fs";
-import { join as join18 } from "path";
-import { homedir as homedir7 } from "os";
+import { existsSync as existsSync23, readFileSync as readFileSync17, unlinkSync as unlinkSync5, mkdirSync as mkdirSync11 } from "fs";
+import { join as join17 } from "path";
+import { homedir as homedir8 } from "os";
 function getDevStatePath() {
-  return join18(homedir7(), CONFIG_DIR_NAME, DEV_STATE_FILE_NAME);
+  return join17(homedir8(), CONFIG_DIR_NAME, DEV_STATE_FILE_NAME);
 }
 function loadDevState() {
   const path3 = getDevStatePath();
-  if (!existsSync25(path3)) return null;
-  const content = readFileSync18(path3, "utf-8").trim();
+  if (!existsSync23(path3)) return null;
+  const content = readFileSync17(path3, "utf-8").trim();
   return content || null;
 }
 
@@ -13521,7 +13310,7 @@ Working directory: ${process.cwd()}`;
   }
   stableParts.push(AGENTIC_BEHAVIOR_GUIDELINE);
   if (ctx.configDir) {
-    const memory = loadMemoryContent(ctx.configDir);
+    const memory = loadMemoryContent(ctx.configDir, ctx.memoryMaxChars);
     if (memory) stableParts.push(`# Persistent Memory
 
 ${memory.content}`);
@@ -13553,8 +13342,8 @@ ${ctx.activeSkill.content}`);
   if (ctx.planMode) stableParts.push(PLAN_MODE_SYSTEM_ADDON);
   return { stable: stableParts.join("\n\n---\n\n"), volatile };
 }
-function loadMemoryContent(configDir) {
-  return formatMemoryForPrompt(configDir, process.cwd());
+function loadMemoryContent(configDir, maxChars) {
+  return formatMemoryForPrompt(configDir, process.cwd(), maxChars);
 }
 
 // src/core/pricing.ts
@@ -13753,8 +13542,8 @@ function autoTrimSessionIfNeeded(session, sizeLimit = SESSION_SIZE_LIMIT) {
 }
 
 // src/core/context-files.ts
-import { existsSync as existsSync26, readFileSync as readFileSync19 } from "fs";
-import { join as join19, relative as relative4, resolve as resolve9 } from "path";
+import { existsSync as existsSync24, readFileSync as readFileSync18 } from "fs";
+import { join as join18, relative as relative4, resolve as resolve8 } from "path";
 function uniqueNonEmpty(values) {
   const seen = /* @__PURE__ */ new Set();
   const out = [];
@@ -13777,14 +13566,14 @@ function displayPath(filePath, cwd) {
   return filePath;
 }
 function isInsideOrEqual(parent, child) {
-  const rel = relative4(resolve9(parent), resolve9(child));
+  const rel = relative4(resolve8(parent), resolve8(child));
   return rel === "" || !!rel && !rel.startsWith("..") && !rel.startsWith("/") && !rel.startsWith("\\");
 }
 function readContextFile(level, filePath, cwd, maxBytes) {
   const name = filePath.split(/[\\/]/).pop() ?? filePath;
   const shown = displayPath(filePath, cwd);
   try {
-    const raw = readFileSync19(filePath);
+    const raw = readFileSync18(filePath);
     const byteCount = raw.byteLength;
     if (byteCount === 0) {
       return {
@@ -13831,8 +13620,8 @@ function readContextFile(level, filePath, cwd, maxBytes) {
 function findFirstContextFile(level, dir, cwd, candidates, maxBytes) {
   const skipped = [];
   for (const candidate of candidates) {
-    const filePath = join19(dir, candidate);
-    if (!existsSync26(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 };
@@ -13840,7 +13629,7 @@ function findFirstContextFile(level, dir, cwd, candidates, maxBytes) {
   return { layer: null, skipped };
 }
 function loadContextFiles(options) {
-  const cwd = resolve9(options.cwd);
+  const cwd = resolve8(options.cwd);
   const maxBytes = options.maxBytes ?? CONTEXT_FILE_MAX_BYTES;
   const candidates = options.candidates ?? buildContextFileCandidates(options.fallbackFilenames);
   const skipped = [];
@@ -13848,7 +13637,7 @@ function loadContextFiles(options) {
     return { layers: [], mergedContent: "", skipped, totalChars: 0, totalBytes: 0, maxBytes, candidates };
   }
   if (options.setting && options.setting !== "auto") {
-    const filePath = resolve9(cwd, String(options.setting));
+    const filePath = resolve8(cwd, String(options.setting));
     if (!isInsideOrEqual(cwd, filePath)) {
       skipped.push({
         level: "single",
@@ -13859,7 +13648,7 @@ function loadContextFiles(options) {
       });
       return { layers: [], mergedContent: "", skipped, totalChars: 0, totalBytes: 0, maxBytes, candidates };
     }
-    if (!existsSync26(filePath)) {
+    if (!existsSync24(filePath)) {
       skipped.push({
         level: "single",
         filePath,
@@ -13892,7 +13681,7 @@ function loadContextFiles(options) {
     skipped.push(...result.skipped);
     if (result.layer) layers.push(result.layer);
   }
-  if (resolve9(options.cwd) !== resolve9(options.projectRoot)) {
+  if (resolve8(options.cwd) !== resolve8(options.projectRoot)) {
     const result = findFirstContextFile("local", options.cwd, cwd, candidates, maxBytes);
     skipped.push(...result.skipped);
     if (result.layer) layers.push(result.layer);
@@ -13910,12 +13699,12 @@ function loadContextFiles(options) {
 }
 
 // src/web/session-handler.ts
-import { mkdirSync as mkdirSync15, createWriteStream as createWriteStream2 } from "fs";
-import { join as join26, dirname as dirname10 } from "path";
+import { mkdirSync as mkdirSync14, createWriteStream as createWriteStream2 } from "fs";
+import { dirname as dirname9 } from "path";
 
 // src/repl/commands/project-init.ts
-import { existsSync as existsSync27, readFileSync as readFileSync20, readdirSync as readdirSync11, statSync as statSync9 } from "fs";
-import { join as join20 } from "path";
+import { existsSync as existsSync25, readFileSync as readFileSync19, readdirSync as readdirSync11, statSync as statSync9 } from "fs";
+import { join as join19 } from "path";
 var SCAN_SKIP_DIRS = /* @__PURE__ */ new Set([
   "node_modules",
   ".git",
@@ -13959,11 +13748,11 @@ function scanDirTree(dir, maxDepth = 2, maxEntries = 80) {
     const sorted = filtered.sort((a, b) => {
       let aIsDir = false, bIsDir = false;
       try {
-        aIsDir = statSync9(join20(d, a)).isDirectory();
+        aIsDir = statSync9(join19(d, a)).isDirectory();
       } catch {
       }
       try {
-        bIsDir = statSync9(join20(d, b)).isDirectory();
+        bIsDir = statSync9(join19(d, b)).isDirectory();
       } catch {
       }
       if (aIsDir !== bIsDir) return aIsDir ? -1 : 1;
@@ -13971,7 +13760,7 @@ function scanDirTree(dir, maxDepth = 2, maxEntries = 80) {
     });
     for (let i = 0; i < sorted.length && count < maxEntries; i++) {
       const name = sorted[i];
-      const fullPath = join20(d, name);
+      const fullPath = join19(d, name);
       const isLast = i === sorted.length - 1;
       const connector = isLast ? "+-- " : "|-- ";
       let isDir;
@@ -13998,7 +13787,7 @@ function scanProject(cwd) {
     configFiles: [],
     directoryStructure: ""
   };
-  const check = (file) => existsSync27(join20(cwd, file));
+  const check = (file) => existsSync25(join19(cwd, file));
   const configCandidates = [
     "package.json",
     "tsconfig.json",
@@ -14025,7 +13814,7 @@ function scanProject(cwd) {
     info.type = "node";
     info.language = check("tsconfig.json") ? "TypeScript" : "JavaScript";
     try {
-      const pkg = JSON.parse(readFileSync20(join20(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;
@@ -14674,7 +14463,7 @@ function resolveRoleProviders(roles, lookup, defaultProvider, defaultModel, avai
 }
 
 // src/hub/persist.ts
-import { join as join21 } from "path";
+import { join as join20 } from "path";
 function discussionToMessages(state2) {
   const out = [];
   const t0 = state2.messages[0]?.timestamp ?? /* @__PURE__ */ new Date();
@@ -14712,7 +14501,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: join21(config.getHistoryDir(), `${session.id}.json`) };
+  return { id: session.id, path: join20(config.getHistoryDir(), `${session.id}.json`) };
 }
 
 // src/web/commands/provider-commands.ts
@@ -14800,8 +14589,8 @@ async function handlePlan(args, ctx) {
 }
 
 // src/web/commands/_shared.ts
-import { existsSync as existsSync30, readFileSync as readFileSync22, writeFileSync as writeFileSync3, mkdirSync as mkdirSync14, readdirSync as readdirSync13, statSync as statSync12, createWriteStream } from "fs";
-import { join as join24, resolve as resolve10, dirname as dirname9 } from "path";
+import { existsSync as existsSync28, readFileSync as readFileSync21, writeFileSync as writeFileSync3, mkdirSync as mkdirSync13, readdirSync as readdirSync13, statSync as statSync12, createWriteStream } from "fs";
+import { join as join23, resolve as resolve9, dirname as dirname8 } from "path";
 
 // src/cli/review-prompts.ts
 function buildReviewPrompt(diff, gitContextStr, detailed) {
@@ -14873,34 +14662,34 @@ function readGitDiff(options = {}) {
 }
 
 // src/diagnostics/doctor-report.ts
-import { existsSync as existsSync29, statSync as statSync11 } from "fs";
-import { join as join23 } from "path";
+import { existsSync as existsSync27, statSync as statSync11 } from "fs";
+import { join as join22 } from "path";
 import { arch as arch2, platform as platform7, release as release2 } from "os";
 
 // src/diagnostics/crash-log.ts
 import {
-  existsSync as existsSync28,
-  mkdirSync as mkdirSync13,
+  existsSync as existsSync26,
+  mkdirSync as mkdirSync12,
   readdirSync as readdirSync12,
-  readFileSync as readFileSync21,
+  readFileSync as readFileSync20,
   statSync as statSync10,
   unlinkSync as unlinkSync6,
   writeFileSync as writeFileSync2
 } from "fs";
-import { join as join22 } from "path";
-import { homedir as homedir8, platform as platform6, release, arch } from "os";
+import { join as join21 } from "path";
+import { homedir as homedir9, platform as platform6, release, arch } from "os";
 var LOGS_DIR_NAME = "logs";
 var CRASH_LOG_PREFIX = "crash-";
 function getLogsDir(configDir) {
-  const base = configDir ?? join22(homedir8(), CONFIG_DIR_NAME);
-  return join22(base, LOGS_DIR_NAME);
+  const base = configDir ?? join21(homedir9(), CONFIG_DIR_NAME);
+  return join21(base, LOGS_DIR_NAME);
 }
 function truncate(s, n) {
   return s.length <= n ? s : s.slice(0, n) + "\u2026";
 }
 function listRecentCrashes(limit = 10, configDir) {
   const dir = getLogsDir(configDir);
-  if (!existsSync28(dir)) return [];
+  if (!existsSync26(dir)) return [];
   const files = [];
   let names;
   try {
@@ -14910,10 +14699,10 @@ function listRecentCrashes(limit = 10, configDir) {
   }
   for (const name of names) {
     if (!name.startsWith(CRASH_LOG_PREFIX) || !name.endsWith(".log")) continue;
-    const full = join22(dir, name);
+    const full = join21(dir, name);
     try {
       const st = statSync10(full);
-      const head = readFileSync21(full, "utf-8").split("\n").slice(0, 20);
+      const head = readFileSync20(full, "utf-8").split("\n").slice(0, 20);
       const tsLine = head.find((l) => l.startsWith("timestamp:"));
       const kindLine = head.find((l) => l.startsWith("kind:"));
       const msgIdx = head.findIndex((l) => l.trim() === "## message");
@@ -14932,8 +14721,8 @@ function listRecentCrashes(limit = 10, configDir) {
   return files.slice(0, limit);
 }
 function getConfigDirUsage(configDir) {
-  const base = configDir ?? join22(homedir8(), CONFIG_DIR_NAME);
-  if (!existsSync28(base)) return { totalBytes: 0, entries: [] };
+  const base = configDir ?? join21(homedir9(), CONFIG_DIR_NAME);
+  if (!existsSync26(base)) return { totalBytes: 0, entries: [] };
   const entries = [];
   let total = 0;
   let names;
@@ -14943,7 +14732,7 @@ function getConfigDirUsage(configDir) {
     return { totalBytes: 0, entries: [] };
   }
   for (const name of names) {
-    const full = join22(base, name);
+    const full = join21(base, name);
     const bytes = dirSize(full);
     entries.push({ name, bytes });
     total += bytes;
@@ -14958,7 +14747,7 @@ function dirSize(path3) {
     if (!st.isDirectory()) return 0;
     let sum = 0;
     for (const name of readdirSync12(path3)) {
-      sum += dirSize(join22(path3, name));
+      sum += dirSize(join21(path3, name));
     }
     return sum;
   } catch {
@@ -14968,7 +14757,7 @@ function dirSize(path3) {
 
 // src/diagnostics/doctor-report.ts
 function checkFile(label, path3) {
-  const exists = existsSync29(path3);
+  const exists = existsSync27(path3);
   let sizeBytes = null;
   if (exists) {
     try {
@@ -15011,12 +14800,12 @@ function buildDoctorReport(options) {
     configDir,
     providers: options.providers.listAll().map((p) => ({ id: p.id, displayName: p.displayName, configured: p.configured })),
     files: [
-      checkFile("config.json", join23(configDir, "config.json")),
-      checkFile("memory.md", join23(configDir, MEMORY_FILE_NAME)),
-      checkFile("memory.jsonl", join23(configDir, "memory.jsonl")),
-      checkFile("dev-state.md", join23(configDir, DEV_STATE_FILE_NAME)),
-      checkFile("hooks-trust.json", join23(configDir, "hooks-trust.json")),
-      checkFile("plugin-state.json", join23(configDir, "plugins", "plugin-state.json"))
+      checkFile("config.json", join22(configDir, "config.json")),
+      checkFile("memory.md", join22(configDir, MEMORY_FILE_NAME)),
+      checkFile("memory.jsonl", join22(configDir, "memory.jsonl")),
+      checkFile("dev-state.md", join22(configDir, DEV_STATE_FILE_NAME)),
+      checkFile("hooks-trust.json", join22(configDir, "hooks-trust.json")),
+      checkFile("plugin-state.json", join22(configDir, "plugins", "plugin-state.json"))
     ],
     context: {
       enabled: contextSetting !== false,
@@ -15051,7 +14840,7 @@ function buildDoctorReport(options) {
       disabled: hooks.filter((h) => h.disabled).length
     },
     plugins: {
-      root: join23(configDir, "plugins"),
+      root: join22(configDir, "plugins"),
       installed: plugins.length,
       active: activeAssets.plugins.length,
       invalid: plugins.filter((p) => !p.valid).length,
@@ -15066,7 +14855,7 @@ function buildDoctorReport(options) {
     mcp: {
       enabled: config.get("mcpEnabled"),
       configured: Object.keys(mcpServers).length,
-      projectConfigExists: existsSync29(join23(projectRoot, MCP_PROJECT_CONFIG_NAME)),
+      projectConfigExists: existsSync27(join22(projectRoot, MCP_PROJECT_CONFIG_NAME)),
       statuses: options.mcpStatuses ?? []
     },
     recentCrashes: listRecentCrashes(5, configDir),
@@ -15292,12 +15081,20 @@ async function handleStatus(_args, ctx) {
 Cache:  write=${cacheCreate} read=${cacheRead}` : "";
   const costLine = cost != null ? `
 Cost:   ${formatCost(cost)}` : "";
+  let memoryLine = "";
+  try {
+    const { countPendingMemories } = await import("./persistent-memory-ZCQKLIC5.js");
+    const pending = countPendingMemories(ctx.config.getConfigDir());
+    if (pending > 0) memoryLine = `
+Memory: \u26A0 ${pending} pending approval \u2014 see the Memory panel or /memory`;
+  } catch {
+  }
   ctx.send({
     type: "info",
     message: `Provider: ${ctx.currentProvider}
 Model: ${ctx.currentModel}
 Session: ${session?.id ?? "none"} (${session?.messages.length ?? 0} messages)
-Tokens: in=${ctx.sessionTokenUsage.inputTokens} out=${ctx.sessionTokenUsage.outputTokens}${cacheLine}${costLine}`
+Tokens: in=${ctx.sessionTokenUsage.inputTokens} out=${ctx.sessionTokenUsage.outputTokens}${cacheLine}${costLine}${memoryLine}`
   });
 }
 async function handleSession(args, ctx) {
@@ -15593,7 +15390,7 @@ async function handleBranch(args, ctx) {
     return;
   }
   const sub = args[0]?.toLowerCase();
-  const resolve14 = (ref) => {
+  const resolve13 = (ref) => {
     const r = session.resolveBranchRef(ref);
     if (r.ok) return r.id;
     if (r.reason === "ambiguous") {
@@ -15647,7 +15444,7 @@ async function handleBranch(args, ctx) {
       ctx.send({ type: "error", message: "Usage: /branch switch <id|title>" });
       return;
     }
-    const id = resolve14(ref);
+    const id = resolve13(ref);
     if (!id) return;
     const ok = session.switchBranch(id);
     if (ok) {
@@ -15667,7 +15464,7 @@ async function handleBranch(args, ctx) {
       ctx.send({ type: "error", message: "Usage: /branch delete <id|title>" });
       return;
     }
-    const id = resolve14(ref);
+    const id = resolve13(ref);
     if (!id) return;
     const ok = session.deleteBranch(id);
     if (ok) {
@@ -15686,7 +15483,7 @@ async function handleBranch(args, ctx) {
       ctx.send({ type: "error", message: "Usage: /branch rename <id|title> <new title>" });
       return;
     }
-    const id = resolve14(ref);
+    const id = resolve13(ref);
     if (!id) return;
     const ok = session.renameBranch(id, title);
     if (ok) {
@@ -15704,7 +15501,7 @@ async function handleBranch(args, ctx) {
       ctx.send({ type: "error", message: "Usage: /branch diff <id|title>" });
       return;
     }
-    const id = resolve14(ref);
+    const id = resolve13(ref);
     if (!id) return;
     const d = session.diffBranches(id);
     if (!d) {
@@ -15746,7 +15543,7 @@ async function handleBranch(args, ctx) {
       ctx.send({ type: "error", message: "Usage: /branch cherry-pick <source-id|title> <msg-index>" });
       return;
     }
-    const id = resolve14(ref);
+    const id = resolve13(ref);
     if (!id) return;
     const idx = parseInt(idxStr, 10);
     if (Number.isNaN(idx)) {
@@ -15870,7 +15667,7 @@ async function handlePlugin(args, ctx) {
           lines.push("");
         }
         if (pluginTools.length > 0) {
-          const legacyDir = join24(configDir, PLUGINS_DIR_NAME);
+          const legacyDir = join23(configDir, PLUGINS_DIR_NAME);
           lines.push(`**Legacy JS tools** (${pluginTools.length}):`);
           lines.push(`Dir: ${legacyDir}`);
           for (const t of pluginTools) lines.push(`  \u2022 ${t.definition.name} \u2014 ${t.definition.description}`);
@@ -15994,8 +15791,8 @@ ${activated.meta.description || ""}` });
 }
 async function handleCommands(_args, ctx) {
   const configDir = ctx.config.getConfigDir();
-  const commandsDir = join24(configDir, CUSTOM_COMMANDS_DIR_NAME);
-  if (!existsSync30(commandsDir)) {
+  const commandsDir = join23(configDir, CUSTOM_COMMANDS_DIR_NAME);
+  if (!existsSync28(commandsDir)) {
     ctx.send({ type: "info", message: `No custom commands directory.
 Create: ${commandsDir}/ with .md files.` });
     return;
@@ -16095,7 +15892,7 @@ async function handleSecurityReview(args, ctx) {
 async function handleTest(args, ctx) {
   ctx.send({ type: "info", message: "\u{1F9EA} Running tests..." });
   try {
-    const { executeTests } = await import("./run-tests-EWMU34A4.js");
+    const { executeTests } = await import("./run-tests-WCZBWQFS.js");
     const argStr = args.join(" ").trim();
     let testArgs = {};
     if (argStr) {
@@ -16125,9 +15922,9 @@ async function handleDiff(args, ctx) {
   let modifiedFiles = 0;
   const diffLines2 = [];
   for (const [filePath, { earliest }] of fileMap) {
-    const currentContent = existsSync30(filePath) ? (() => {
+    const currentContent = existsSync28(filePath) ? (() => {
       try {
-        return readFileSync22(filePath, "utf-8");
+        return readFileSync21(filePath, "utf-8");
       } catch {
         return null;
       }
@@ -16162,9 +15959,9 @@ async function handleDiff(args, ctx) {
 }
 async function handleInit(args, ctx) {
   const cwd = process.cwd();
-  const targetPath = join24(cwd, "AICLI.md");
+  const targetPath = join23(cwd, "AICLI.md");
   const force = args.includes("--force");
-  if (existsSync30(targetPath) && !force) {
+  if (existsSync28(targetPath) && !force) {
     ctx.send({ type: "info", message: `AICLI.md already exists at ${targetPath}
 Use /init --force to overwrite.` });
     return;
@@ -16326,9 +16123,58 @@ async function handleIndex(args, ctx) {
 async function handleMemory(args, ctx) {
   const sub = args[0];
   if (sub === "add" && args.length > 1) {
-    ctx.memoryAdd(args.slice(1).join(" "));
+    const rest = args.slice(1);
+    const opts = {};
+    const text = [];
+    for (let i = 0; i < rest.length; i++) {
+      if (rest[i] === "--scope" && rest[i + 1]) {
+        opts.scope = rest[++i];
+      } else if (rest[i] === "--sensitivity" && rest[i + 1]) {
+        opts.sensitivity = rest[++i];
+      } else if (rest[i] === "--expires-at" && rest[i + 1]) {
+        opts.expiresAt = rest[++i];
+      } else text.push(rest[i]);
+    }
+    if (text.length === 0) {
+      ctx.send({ type: "info", message: "Usage: /memory add [--scope personal|project] [--sensitivity low|medium|high] [--expires-at ISO] <text>" });
+      return;
+    }
+    ctx.memoryAdd(text.join(" "), opts);
+  } else if (sub === "edit") {
+    const id = args[1];
+    const text = args.slice(2).join(" ").trim();
+    if (!id || !text) {
+      ctx.send({ type: "info", message: "Usage: /memory edit <id> <new text>" });
+      return;
+    }
+    ctx.memoryEdit(id, text);
+  } else if (sub === "approve" || sub === "reject" || sub === "delete" || sub === "expire") {
+    if (!args[1]) {
+      ctx.send({ type: "info", message: `Usage: /memory ${sub} <id>` });
+      return;
+    }
+    ctx.handleMemoryManage(sub, args[1], sub === "expire" ? args[2] : void 0);
+  } else if (sub === "export") {
+    if (args[1] === "md") {
+      const { exportMemoryEntries: exportMemoryEntries2 } = await import("./persistent-memory-ZCQKLIC5.js");
+      ctx.send({
+        type: "export_data",
+        format: "md",
+        filename: `aicli-memory-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}.md`,
+        content: exportMemoryEntries2(ctx.config.getConfigDir(), process.cwd(), "md")
+      });
+    } else {
+      ctx.handleMemoryManage("export");
+    }
   } else if (sub === "clear") {
-    ctx.memoryClear();
+    if (args[1] === "confirm") {
+      ctx.memoryClear();
+    } else {
+      ctx.send({
+        type: "info",
+        message: "\u26A0 This permanently clears ALL persistent memory (a timestamped .bak backup is kept next to memory.jsonl).\nRun `/memory clear confirm` to proceed, or manage individual entries in the Memory panel."
+      });
+    }
   } else {
     ctx.memoryShow();
   }
@@ -16347,8 +16193,8 @@ Use /add-dir remove to clear.` : "No directories added.\nUsage: /add-dir <path>
     ctx.send({ type: "info", message: "\u2713 All added directories removed from context." });
     return;
   }
-  const dirPath = resolve10(sub);
-  if (!existsSync30(dirPath)) {
+  const dirPath = resolve9(sub);
+  if (!existsSync28(dirPath)) {
     ctx.send({ type: "error", message: `Directory not found: ${dirPath}` });
     return;
   }
@@ -16913,10 +16759,10 @@ var SessionHandler = class {
         return;
       }
       case "ask_user_response": {
-        const resolve14 = this.pendingAskUser.get(msg.requestId);
-        if (resolve14) {
+        const resolve13 = this.pendingAskUser.get(msg.requestId);
+        if (resolve13) {
           this.pendingAskUser.delete(msg.requestId);
-          resolve14(msg.answer);
+          resolve13(msg.answer);
         }
         return;
       }
@@ -16929,10 +16775,10 @@ var SessionHandler = class {
       case "memory_manage":
         return this.handleMemoryManage(msg.action, msg.id, msg.expiresAt);
       case "auto_pause_response": {
-        const resolve14 = this.pendingAutoPause.get(msg.requestId);
-        if (resolve14) {
+        const resolve13 = this.pendingAutoPause.get(msg.requestId);
+        if (resolve13) {
           this.pendingAutoPause.delete(msg.requestId);
-          resolve14({ action: msg.action, message: msg.message });
+          resolve13({ action: msg.action, message: msg.message });
         }
         return;
       }
@@ -16947,10 +16793,10 @@ var SessionHandler = class {
         this.hubOrchestrator?.abort();
         return;
       case "hub_steer": {
-        const resolve14 = this.pendingHubReview.get(msg.requestId);
-        if (resolve14) {
+        const resolve13 = this.pendingHubReview.get(msg.requestId);
+        if (resolve13) {
           this.pendingHubReview.delete(msg.requestId);
-          resolve14({ action: msg.action, message: msg.message });
+          resolve13({ action: msg.action, message: msg.message });
         }
         return;
       }
@@ -16963,9 +16809,9 @@ var SessionHandler = class {
     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 resolve14 of this.pendingAskUser.values()) resolve14(null);
+    for (const resolve13 of this.pendingAskUser.values()) resolve13(null);
     this.pendingAskUser.clear();
-    for (const resolve14 of this.pendingAutoPause.values()) resolve14({ action: "stop" });
+    for (const resolve13 of this.pendingAutoPause.values()) resolve13({ action: "stop" });
     this.pendingAutoPause.clear();
     this.saveIfNeeded();
     if (this._bashSessionKey) clearBashSession(this._bashSessionKey);
@@ -17100,9 +16946,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((resolve14) => {
+      orchestrator.onRoundReview = ({ round, maxRounds }) => new Promise((resolve13) => {
         const requestId = `hubrev_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-        this.pendingHubReview.set(requestId, resolve14);
+        this.pendingHubReview.set(requestId, resolve13);
         this.send({ type: "hub_review", requestId, round, maxRounds });
       });
     }
@@ -17435,7 +17281,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 {
-              mkdirSync15(dirname10(pendingTeeSave), { recursive: true });
+              mkdirSync14(dirname9(pendingTeeSave), { recursive: true });
               const bodyToSave = stripOuterCodeFence(content);
               atomicWriteFileSync(pendingTeeSave, bodyToSave);
               undoStack.push(pendingTeeSave, `save_last_response (deferred): ${pendingTeeSave}`);
@@ -17460,8 +17306,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((resolve14) => {
-            this.pendingAutoPause.set(requestId, resolve14);
+          const pauseResp = await new Promise((resolve13) => {
+            this.pendingAutoPause.set(requestId, resolve13);
             this.send({
               type: "auto_pause_request",
               requestId,
@@ -17611,7 +17457,7 @@ ${summaryContent}`,
     let isError = false;
     let summary;
     try {
-      mkdirSync15(dirname10(saveToFile), { recursive: true });
+      mkdirSync14(dirname9(saveToFile), { recursive: true });
       fileStream = createWriteStream2(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 }];
@@ -17640,8 +17486,8 @@ ${summaryContent}`,
         }
         if (chunk.done) break;
       }
-      await new Promise((resolve14, reject) => {
-        fileStream.end((err) => err ? reject(err) : resolve14());
+      await new Promise((resolve13, reject) => {
+        fileStream.end((err) => err ? reject(err) : resolve13());
       });
       const verdict = evaluateTeeContent(fullContent, saveToFile, priorContent);
       if (verdict.kind === "reject") {
@@ -17667,7 +17513,7 @@ ${summaryContent}`,
     } catch (err) {
       if (fileStream) {
         try {
-          await new Promise((resolve14) => fileStream.end(() => resolve14()));
+          await new Promise((resolve13) => fileStream.end(() => resolve13()));
         } catch {
         }
       }
@@ -17874,7 +17720,11 @@ ${summaryContent}`,
     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";
+      const source = [
+        entry.source ?? "unknown",
+        entry.sourceSession ? `session ${entry.sourceSession.slice(0, 8)}` : "",
+        entry.sourceProject ? `project ${entry.sourceProject}` : ""
+      ].filter(Boolean).join(" \xB7 ");
       return `## ${entry.id.slice(0, 8)} \xB7 ${status} \xB7 scope:${entry.scope} \xB7 sensitivity:${entry.sensitivity}
 Source: ${source}
 ${entry.content}`;
@@ -17886,26 +17736,41 @@ ${entry.content}`;
     });
     this.sendMemoryEntries();
   }
-  memoryAdd(text) {
+  memoryAdd(text, opts) {
+    const asSensitivity = (v) => v === "low" || v === "medium" || v === "high" ? v : void 0;
     try {
       const entry = addMemoryEntry(this.config.getConfigDir(), text, {
-        scope: "personal",
+        scope: parseWritableScope(opts?.scope) ?? "personal",
+        source: "manual",
+        sensitivity: asSensitivity(opts?.sensitivity),
+        expiresAt: opts?.expiresAt,
         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.send({ type: "info", message: `\u{1F4DD} Memory entry ${entry.id.slice(0, 8)} added (${status}, scope:${entry.scope}).` });
       this.sendMemoryEntries();
     } catch (err) {
       this.send({ type: "error", message: `Failed to write memory: ${err.message}` });
     }
   }
+  memoryEdit(id, text) {
+    try {
+      const entry = updateMemoryEntry(this.config.getConfigDir(), id, text, { source: "manual", redact: true });
+      const status = entry.approved ? "approved" : `pending approval \u2014 approve it in the Memory panel or /memory approve ${entry.id.slice(0, 8)}`;
+      this.send({ type: "info", message: `\u{1F4DD} Memory ${entry.id.slice(0, 8)} updated (${status}).` });
+      this.sendMemoryEntries();
+    } catch (err) {
+      this.send({ type: "error", message: `Failed to update memory: ${err.message}` });
+    }
+  }
   memoryClear() {
     const configDir = this.config.getConfigDir();
     try {
-      atomicWriteFileSync(memoryStorePath(configDir), "");
-      atomicWriteFileSync(join26(configDir, MEMORY_FILE_NAME), "");
-      this.send({ type: "info", message: "\u{1F5D1}\uFE0F Persistent memory cleared." });
+      const result = clearMemoryEntries(configDir);
+      const backupNote = result.backupPath ? `
+Backup saved: ${result.backupPath}` : "";
+      this.send({ type: "info", message: `\u{1F5D1}\uFE0F Persistent memory cleared (${result.cleared} entries).${backupNote}` });
       this.sendMemoryEntries();
     } catch (err) {
       this.send({ type: "error", message: `Failed to clear memory: ${err.message}` });
@@ -17921,6 +17786,7 @@ ${entry.content}`;
         id: entry.id,
         content: entry.content,
         scope: entry.scope,
+        source: entry.source,
         sourceSession: entry.sourceSession,
         sourceProject: entry.sourceProject,
         createdAt: entry.createdAt,
@@ -17970,7 +17836,7 @@ ${entry.content}`;
       return;
     }
     try {
-      const { searchChatMemory: searchChatMemory2, loadChatIndex: loadChatIndex2 } = await import("./chat-index-WYXYD7YP.js");
+      const { searchChatMemory: searchChatMemory2, loadChatIndex: loadChatIndex2 } = await import("./chat-index-ML5FF5L6.js");
       const loaded = loadChatIndex2();
       if (!loaded || loaded.idx.chunks.length === 0) {
         this.send({ type: "memory_hits", query: q, hits: [], indexMissing: true });
@@ -18006,7 +17872,7 @@ ${entry.content}`;
   }
   async handleMemoryStatus() {
     try {
-      const { getChatIndexStatus } = await import("./chat-index-WYXYD7YP.js");
+      const { getChatIndexStatus } = await import("./chat-index-ML5FF5L6.js");
       const s = getChatIndexStatus();
       this.send({
         type: "memory_status",
@@ -18031,7 +17897,7 @@ ${entry.content}`;
         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-WYXYD7YP.js");
+      const { buildChatIndex } = await import("./chat-index-ML5FF5L6.js");
       const stats = await buildChatIndex({
         full,
         onProgress: (p) => {
@@ -18105,6 +17971,7 @@ ${entry.content}`;
       activeSkill,
       planMode: this.planMode,
       configDir: this.config.getConfigDir(),
+      memoryMaxChars: this.config.get("memory")?.maxChars,
       userProfile: this.config.get("userProfile")
     });
     let stable = baseStable;
@@ -18186,8 +18053,8 @@ async function setupProxy(configProxy) {
 }
 
 // src/web/auth.ts
-import { existsSync as existsSync32, readFileSync as readFileSync24, writeFileSync as writeFileSync5, mkdirSync as mkdirSync16, readdirSync as readdirSync15, copyFileSync } from "fs";
-import { isAbsolute as isAbsolute3, join as join27, relative as relative5 } from "path";
+import { existsSync as existsSync30, readFileSync as readFileSync23, writeFileSync as writeFileSync5, mkdirSync as mkdirSync15, readdirSync as readdirSync15, copyFileSync } from "fs";
+import { isAbsolute as isAbsolute3, join as join26, relative as relative5 } from "path";
 import { createHmac, randomBytes, timingSafeEqual, pbkdf2Sync } from "crypto";
 var USERS_FILE = "users.json";
 var TOKEN_EXPIRY_HOURS = 24;
@@ -18202,7 +18069,7 @@ var AuthManager = class {
   db;
   constructor(baseDir) {
     this.baseDir = baseDir;
-    this.usersFile = join27(baseDir, USERS_FILE);
+    this.usersFile = join26(baseDir, USERS_FILE);
     this.db = this.loadOrCreate();
   }
   // ── Public API ─────────────────────────────────────────────────
@@ -18231,9 +18098,9 @@ var AuthManager = class {
     }
     const salt = randomBytes(16).toString("hex");
     const passwordHash = this.hashPassword(password, salt);
-    const dataDir = join27(USERS_DIR, username);
-    const fullDataDir = join27(this.baseDir, dataDir);
-    mkdirSync16(join27(fullDataDir, "history"), { recursive: true });
+    const dataDir = join26(USERS_DIR, username);
+    const fullDataDir = join26(this.baseDir, dataDir);
+    mkdirSync15(join26(fullDataDir, "history"), { recursive: true });
     const user = {
       username,
       passwordHash,
@@ -18348,7 +18215,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 join27(this.baseDir, user.dataDir);
+    return join26(this.baseDir, user.dataDir);
   }
   /** List all usernames */
   listUsers() {
@@ -18384,30 +18251,30 @@ var AuthManager = class {
     const err = this.register(username, password);
     if (err) return err;
     const userDir = this.getUserDataDir(username);
-    const globalConfig = join27(this.baseDir, "config.json");
-    if (existsSync32(globalConfig)) {
+    const globalConfig = join26(this.baseDir, "config.json");
+    if (existsSync30(globalConfig)) {
       try {
-        const content = readFileSync24(globalConfig, "utf-8");
-        writeFileSync5(join27(userDir, "config.json"), content, "utf-8");
+        const content = readFileSync23(globalConfig, "utf-8");
+        writeFileSync5(join26(userDir, "config.json"), content, "utf-8");
       } catch {
       }
     }
-    const globalMemory = join27(this.baseDir, "memory.md");
-    if (existsSync32(globalMemory)) {
+    const globalMemory = join26(this.baseDir, "memory.md");
+    if (existsSync30(globalMemory)) {
       try {
-        const content = readFileSync24(globalMemory, "utf-8");
-        writeFileSync5(join27(userDir, "memory.md"), content, "utf-8");
+        const content = readFileSync23(globalMemory, "utf-8");
+        writeFileSync5(join26(userDir, "memory.md"), content, "utf-8");
       } catch {
       }
     }
-    const globalHistory = join27(this.baseDir, "history");
-    if (existsSync32(globalHistory)) {
+    const globalHistory = join26(this.baseDir, "history");
+    if (existsSync30(globalHistory)) {
       try {
         const files = readdirSync15(globalHistory).filter((f) => f.endsWith(".json"));
-        const userHistory = join27(userDir, "history");
+        const userHistory = join26(userDir, "history");
         for (const f of files) {
           try {
-            copyFileSync(join27(globalHistory, f), join27(userHistory, f));
+            copyFileSync(join26(globalHistory, f), join26(userHistory, f));
           } catch {
           }
         }
@@ -18418,9 +18285,9 @@ var AuthManager = class {
   }
   // ── Private methods ────────────────────────────────────────────
   loadOrCreate() {
-    if (existsSync32(this.usersFile)) {
+    if (existsSync30(this.usersFile)) {
       try {
-        const parsed = JSON.parse(readFileSync24(this.usersFile, "utf-8"));
+        const parsed = JSON.parse(readFileSync23(this.usersFile, "utf-8"));
         if (!this.isValidUsersDB(parsed)) {
           throw new Error("database structure is invalid");
         }
@@ -18454,7 +18321,7 @@ var AuthManager = class {
       if (typeof record.username !== "string" || !/^[a-z0-9_-]{2,32}$/.test(record.username) || usernames.has(record.username) || typeof record.passwordHash !== "string" || record.passwordHash.length === 0 || typeof record.salt !== "string" || record.salt.length === 0 || typeof record.createdAt !== "string" || typeof record.dataDir !== "string" || record.dataDir.length === 0 || isAbsolute3(record.dataDir)) {
         return false;
       }
-      const dataDirFromBase = relative5(this.baseDir, join27(this.baseDir, record.dataDir));
+      const dataDirFromBase = relative5(this.baseDir, join26(this.baseDir, record.dataDir));
       if (dataDirFromBase.startsWith("..") || isAbsolute3(dataDirFromBase)) return false;
       if (record.hashVersion !== void 0 && record.hashVersion !== 1 && record.hashVersion !== 2) return false;
       if (record.tokensRevokedBefore !== void 0 && !Number.isFinite(record.tokensRevokedBefore)) return false;
@@ -18466,7 +18333,7 @@ var AuthManager = class {
     this.saveDB(this.db);
   }
   saveDB(db) {
-    mkdirSync16(this.baseDir, { recursive: true });
+    mkdirSync15(this.baseDir, { recursive: true });
     atomicWriteFileSync(this.usersFile, JSON.stringify(db, null, 2));
   }
   /** Legacy hash — kept only for migrating old users (v0.2.x) */
@@ -18498,11 +18365,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 dirname11(filePath);
+      return dirname10(filePath);
     }
   } catch {
   }
-  return resolve13(".");
+  return resolve12(".");
 }
 async function startWebServer(options = {}) {
   const port = options.port ?? 3e3;
@@ -18570,8 +18437,8 @@ async function startWebServer(options = {}) {
     }
   }
   let skillManager = null;
-  const skillsDir = join28(config.getConfigDir(), SKILLS_DIR_NAME);
-  if (existsSync33(skillsDir)) {
+  const skillsDir = join27(config.getConfigDir(), SKILLS_DIR_NAME);
+  if (existsSync31(skillsDir)) {
     skillManager = new SkillManager(skillsDir, config.get("ui").skillSizeWarn);
     skillManager.loadSkills(pluginAssets.skillDirs);
     const count = skillManager.listSkills().length;
@@ -18642,18 +18509,18 @@ async function startWebServer(options = {}) {
     next();
   };
   const moduleDir = getModuleDir();
-  let clientDir = join28(moduleDir, "web", "client");
-  if (!existsSync33(clientDir)) {
-    clientDir = join28(moduleDir, "client");
+  let clientDir = join27(moduleDir, "web", "client");
+  if (!existsSync31(clientDir)) {
+    clientDir = join27(moduleDir, "client");
   }
-  if (!existsSync33(clientDir)) {
-    clientDir = join28(moduleDir, "..", "..", "src", "web", "client");
+  if (!existsSync31(clientDir)) {
+    clientDir = join27(moduleDir, "..", "..", "src", "web", "client");
   }
-  if (!existsSync33(clientDir)) {
-    clientDir = join28(process.cwd(), "src", "web", "client");
+  if (!existsSync31(clientDir)) {
+    clientDir = join27(process.cwd(), "src", "web", "client");
   }
   console.log(`   Static files: ${clientDir}`);
-  app.use("/vendor", express.static(join28(clientDir, "vendor"), { maxAge: "1y", immutable: true }));
+  app.use("/vendor", express.static(join27(clientDir, "vendor"), { maxAge: "1y", immutable: true }));
   app.use(express.static(clientDir));
   app.get("/api/status", (_req, res) => {
     res.json({
@@ -18720,10 +18587,10 @@ async function startWebServer(options = {}) {
   app.get("/api/files", requireAuth, (req, res) => {
     const cwd = process.cwd();
     const prefix = req.query.prefix || "";
-    const targetDir = join28(cwd, prefix);
+    const targetDir = join27(cwd, prefix);
     try {
-      const canonicalTarget = realpathSync3(resolve13(targetDir));
-      const canonicalCwd = realpathSync3(resolve13(cwd));
+      const canonicalTarget = realpathSync3(resolve12(targetDir));
+      const canonicalCwd = realpathSync3(resolve12(cwd));
       if (!canonicalTarget.startsWith(canonicalCwd + sep4) && canonicalTarget !== canonicalCwd) {
         res.json({ files: [] });
         return;
@@ -18737,7 +18604,7 @@ async function startWebServer(options = {}) {
       const entries = readdirSync16(targetDir, { withFileTypes: true });
       const files = entries.filter((e) => !SKIP.has(e.name) && !e.name.startsWith(".")).slice(0, 50).map((e) => ({
         name: e.name,
-        path: relative6(cwd, join28(targetDir, e.name)).replace(/\\/g, "/"),
+        path: relative6(cwd, join27(targetDir, e.name)).replace(/\\/g, "/"),
         isDir: e.isDirectory()
       }));
       res.json({ files });
@@ -18777,8 +18644,8 @@ async function startWebServer(options = {}) {
     try {
       const authUser = req._authUser;
       const histDir = authUser ? getUserShared(authUser).config.getHistoryDir() : config.getHistoryDir();
-      const filePath = join28(histDir, `${id}.json`);
-      if (!existsSync33(filePath)) {
+      const filePath = join27(histDir, `${id}.json`);
+      if (!existsSync31(filePath)) {
         res.status(404).json({ error: "Session not found" });
         return;
       }
@@ -18793,7 +18660,7 @@ async function startWebServer(options = {}) {
         res.status(404).json({ error: "Session not found" });
         return;
       }
-      const data = JSON.parse(readFileSync25(filePath, "utf-8"));
+      const data = JSON.parse(readFileSync24(filePath, "utf-8"));
       res.json({ session: data });
     } catch (err) {
       res.status(500).json({ error: err instanceof Error ? err.message : String(err) });
@@ -18806,10 +18673,10 @@ async function startWebServer(options = {}) {
       return;
     }
     const cwd = process.cwd();
-    const fullPath = resolve13(join28(cwd, filePath));
+    const fullPath = resolve12(join27(cwd, filePath));
     try {
       const canonicalFull = realpathSync3(fullPath);
-      const canonicalCwd = realpathSync3(resolve13(cwd));
+      const canonicalCwd = realpathSync3(resolve12(cwd));
       if (!canonicalFull.startsWith(canonicalCwd + sep4) && canonicalFull !== canonicalCwd) {
         res.json({ error: "Access denied" });
         return;
@@ -18824,7 +18691,7 @@ async function startWebServer(options = {}) {
         res.json({ error: `File too large (${(stat.size / 1024).toFixed(0)} KB, max 512 KB)` });
         return;
       }
-      const content = readFileSync25(fullPath, "utf-8");
+      const content = readFileSync24(fullPath, "utf-8");
       res.json({ content, size: stat.size });
     } catch {
       res.json({ error: "Cannot read file" });
@@ -19028,7 +18895,7 @@ async function startWebServer(options = {}) {
   });
   const MAX_PORT_ATTEMPTS = 10;
   let actualPort = port;
-  const result = await new Promise((resolve14, reject) => {
+  const result = await new Promise((resolve13, reject) => {
     const tryListen = (attempt) => {
       server.once("error", (err) => {
         if (err.code === "EADDRINUSE" && attempt < MAX_PORT_ATTEMPTS) {
@@ -19059,7 +18926,7 @@ async function startWebServer(options = {}) {
         }
         console.log(`   Press Ctrl+C to stop
 `);
-        resolve14({ port: actualPort, host, url });
+        resolve13({ port: actualPort, host, url });
       });
     };
     tryListen(1);
@@ -19079,17 +18946,17 @@ function resolveProjectMcpPath() {
   const cwd = process.cwd();
   const gitRoot = getGitRoot(cwd);
   const projectRoot = gitRoot ?? cwd;
-  const configPath = join28(projectRoot, MCP_PROJECT_CONFIG_NAME);
-  return existsSync33(configPath) ? configPath : null;
+  const configPath = join27(projectRoot, MCP_PROJECT_CONFIG_NAME);
+  return existsSync31(configPath) ? configPath : null;
 }
 function loadProjectMcpConfig() {
   const cwd = process.cwd();
   const gitRoot = getGitRoot(cwd);
   const projectRoot = gitRoot ?? cwd;
-  const configPath = join28(projectRoot, MCP_PROJECT_CONFIG_NAME);
-  if (!existsSync33(configPath)) return null;
+  const configPath = join27(projectRoot, MCP_PROJECT_CONFIG_NAME);
+  if (!existsSync31(configPath)) return null;
   try {
-    const raw = JSON.parse(readFileSync25(configPath, "utf-8"));
+    const raw = JSON.parse(readFileSync24(configPath, "utf-8"));
     return raw.mcpServers ?? raw;
   } catch {
     return null;