codemini-cli 0.6.2 → 0.6.4

package/codemini-web/server.js

@@ -11,11 +11,12 @@ import { buildDefaultSystemPrompt } from '../src/core/default-system-prompt.js';
 import { RuntimeBridge } from './lib/runtime-bridge.js';
 import { installSkillSource, listSkillEntries } from '../src/commands/skill.js';
 import { computeFileSha256, readSkillRegistry, upsertSkillRegistryEntry, writeSkillRegistry } from '../src/core/skill-registry.js';
-import { getReplyLanguage } from '../src/core/reply-language.js';
-import { getBaseConfigDir, getFileIndexPath, getProjectSkillsDir, getSkillsDir } from '../src/core/paths.js';
-import { initializeProjectIndex } from '../src/core/project-index.js';
-import { INDEX_SKIP_DIRS } from '../src/core/constants.js';
-import { VERSION } from '../src/core/version.js';
+import { forgetMemory, listMemories, searchMemories } from '../src/core/memory-store.js';
+import { getReplyLanguage } from '../src/core/reply-language.js';
+import { getBaseConfigDir, getFileIndexPath, getProjectSkillsDir, getSkillsDir } from '../src/core/paths.js';
+import { initializeProjectIndex } from '../src/core/project-index.js';
+import { INDEX_SKIP_DIRS } from '../src/core/constants.js';
+import { VERSION } from '../src/core/version.js';
 
 const GENERAL_PROJECT_DIR = (() => {
   const base = getBaseConfigDir();
@@ -25,11 +26,17 @@ const GENERAL_PROJECT_DIR = (() => {
 const SKILL_CATALOG_FILE = 'codemini.skills.json';
 const SKILL_MODES = new Set(['always', 'auto_attach', 'agent_requested', 'manual']);
 const SKILL_SCOPES = new Set(['project', 'global']);
+const MEMORY_SCOPES = new Set(['user', 'global', 'project']);
 
 function normalizeSkillScope(scope) {
   return SKILL_SCOPES.has(scope) ? scope : 'project';
 }
 
+function normalizeMemoryScope(scope) {
+  const value = String(scope || '').trim().toLowerCase();
+  return MEMORY_SCOPES.has(value) ? value : 'user';
+}
+
 function isSafeSkillName(name = '') {
   return /^[A-Za-z0-9][A-Za-z0-9_.-]*$/.test(name);
 }
@@ -265,29 +272,121 @@ async function serveStatic(res, filePath) {
   }
 }
 
-function normalizeProjectPath(value) {
-  const raw = String(value || '').trim();
-  if (!raw) return '';
-  const win = raw.match(/^([A-Za-z]):[\\/](.*)$/);
+function normalizeProjectPath(value) {
+  const raw = String(value || '').trim();
+  if (!raw) return '';
+  const win = raw.match(/^([A-Za-z]):[\\/](.*)$/);
   if (win && process.platform !== 'win32') {
     return path.join('/mnt', win[1].toLowerCase(), win[2].replace(/[\\/]+/g, '/'));
   }
-  return path.resolve(raw);
-}
-
-async function resolveCodeWikiProjectDir(url, fallbackDir) {
-  const requested = normalizeProjectPath(url.searchParams.get('project') || '');
-  if (!requested) return fallbackDir;
-  try {
-    const stat = await fs.stat(requested);
-    if (stat.isDirectory()) return requested;
-  } catch {}
-  return fallbackDir;
-}
-
-function tryParseJson(value) {
-  try { return JSON.parse(String(value || '')); } catch { return null; }
-}
+  return path.resolve(raw);
+}
+
+function projectNameForDir(projectDir) {
+  if (isGeneralProjectDir(projectDir)) return '__codemini_general__';
+  return path.basename(path.resolve(projectDir || '')) || projectDir || '';
+}
+
+async function validProjectDir(value) {
+  const normalized = normalizeProjectPath(value);
+  if (!normalized) return '';
+  try {
+    const stat = await fs.stat(normalized);
+    return stat.isDirectory() ? normalized : '';
+  } catch {
+    return '';
+  }
+}
+
+async function resolveRequestProjectDir(value, fallbackDir) {
+  const resolved = await validProjectDir(value);
+  return resolved || fallbackDir;
+}
+
+async function parseProjectDirsParam(url, fallbackDir) {
+  const raw = url.searchParams.get('projects');
+  const parsed = raw ? tryParseJson(raw) : [];
+  const values = Array.isArray(parsed) ? parsed : [];
+  const seen = new Set();
+  const dirs = [];
+  for (const candidate of [fallbackDir, ...values]) {
+    const resolved = await validProjectDir(candidate);
+    if (!resolved || seen.has(resolved)) continue;
+    seen.add(resolved);
+    dirs.push(resolved);
+  }
+  if (dirs.length === 0 && fallbackDir) {
+    dirs.push(fallbackDir);
+  }
+  return dirs;
+}
+
+async function listSkillsForProjectDirs(projectDirs, fallbackDir) {
+  const dirs = projectDirs.length > 0 ? projectDirs : [fallbackDir];
+  const seen = new Set();
+  const results = [];
+  for (let index = 0; index < dirs.length; index += 1) {
+    const projectDir = dirs[index];
+    const entries = await listSkillEntries({ scope: 'all', cwd: projectDir });
+    for (const entry of entries) {
+      if (entry.scope !== 'project') {
+        const globalKey = `${entry.scope}:${entry.name}:${entry.path || ''}`;
+        if (seen.has(globalKey)) continue;
+        seen.add(globalKey);
+        results.push(entry);
+        continue;
+      }
+      const projectKey = `project:${projectDir}:${entry.name}:${entry.path || ''}`;
+      if (seen.has(projectKey)) continue;
+      seen.add(projectKey);
+      results.push({
+        ...entry,
+        projectDir,
+        projectName: projectNameForDir(projectDir)
+      });
+    }
+  }
+  return results.sort((a, b) => {
+    const left = `${a.scope}:${a.projectName || ''}:${a.name}`;
+    const right = `${b.scope}:${b.projectName || ''}:${b.name}`;
+    return left.localeCompare(right);
+  });
+}
+
+async function listMemoriesForProjectDirs({ scope, query, projectDirs, fallbackDir }) {
+  if (scope !== 'project') {
+    const items = query
+      ? await searchMemories({ scope, query, workspaceRoot: fallbackDir })
+      : await listMemories({ scope, workspaceRoot: fallbackDir });
+    return items;
+  }
+  const dirs = projectDirs.length > 0 ? projectDirs : [fallbackDir];
+  const chunks = await Promise.all(dirs.map(async (projectDir) => {
+    const items = query
+      ? await searchMemories({ scope, query, workspaceRoot: projectDir })
+      : await listMemories({ scope, workspaceRoot: projectDir });
+    return (items || []).map((item) => ({
+      ...item,
+      projectDir,
+      projectName: projectNameForDir(projectDir)
+    }));
+  }));
+  return chunks.flat();
+}
+
+async function resolveCodeWikiProjectDir(url, fallbackDir) {
+  const requested = normalizeProjectPath(url.searchParams.get('project') || '');
+  if (!requested) return fallbackDir;
+  try {
+    const stat = await fs.stat(requested);
+    if (stat.isDirectory()) return requested;
+  } catch {}
+  return fallbackDir;
+}
+
+function tryParseJson(value) {
+  try { return JSON.parse(String(value || '')); } catch { return null; }
+}
 
 function collectSessionPathHints(session) {
   const hints = [];
@@ -337,164 +436,164 @@ function isCodeWikiReportFile(fileName) {
   return CODEWIKI_REPORT_RE.test(String(fileName || ''));
 }
 
-function codeWikiReportTitle(fileName) {
-  return String(fileName || '')
-    .replace(/-project-requirements\.html$/, '')
-    .replace(/-/g, ' ');
-}
-
-function clipGraphList(values, max = 12) {
-  return [...new Set((Array.isArray(values) ? values : []).filter(Boolean))].slice(0, max);
-}
-
-const CODEWIKI_GRAPH_NOISY_NAMES = new Set([
-  '__init__',
-  '__enter__',
-  '__exit__',
-  '__getitem__',
-  '__setitem__',
-  '__delitem__',
-  '__contains__',
-  '__len__',
-  '__iter__',
-  '__next__',
-  '__call__',
-  'get',
-  'set',
-  'add',
-  'run',
-  'close',
-  'open',
-  'read',
-  'write',
-  'send',
-  'recv',
-  'poll',
-  'update',
-  'copy',
-  'size',
-  'apply'
-]);
-
-function normalizeGraphPath(value = '') {
-  return String(value || '').replace(/\\/g, '/').replace(/^\.\/+/, '');
-}
-
-function isDependencyLikeGraphPath(file = '') {
-  const normalized = normalizeGraphPath(file);
-  const segments = normalized.split('/').filter(Boolean);
-  return segments.some(
-    (segment) =>
-      INDEX_SKIP_DIRS.has(segment) ||
-      /^venv[-_]/i.test(segment) ||
-      /\.egg-info$/i.test(segment) ||
-      /^python\d+(?:\.\d+)?$/i.test(segment)
-  );
-}
-
-function isNoisyGraphSymbol(symbol = {}) {
-  const name = String(symbol.name || symbol.symbol_id || '').split('.').pop();
-  if (!name) return true;
-  if (CODEWIKI_GRAPH_NOISY_NAMES.has(name)) return true;
-  return /^__.*__$/.test(name);
-}
-
-function sourceRootScore(file = '') {
-  const normalized = normalizeGraphPath(file);
-  if (normalized.startsWith('src/')) return 8;
-  if (normalized.startsWith('codemini-web/client/src/')) return 8;
-  if (normalized.startsWith('codemini-web/server.js')) return 7;
-  if (normalized.startsWith('codemini-web/')) return 5;
-  if (normalized.startsWith('tests/')) return 1;
-  return 3;
-}
-
-function buildCodeWikiSymbolGraph(fileIndex, { maxNodes = 42 } = {}) {
-  const files = Array.isArray(fileIndex?.files) ? fileIndex.files : [];
-  const sourceFiles = files.filter((entry) => !isDependencyLikeGraphPath(entry.file));
-  const symbols = sourceFiles
-    .flatMap((entry) =>
-      (Array.isArray(entry.symbols) ? entry.symbols : []).map((symbol) => ({
-        ...symbol,
-        file: symbol.file || entry.file
-      }))
-    )
-    .filter((symbol) => !isDependencyLikeGraphPath(symbol.file) && !isNoisyGraphSymbol(symbol));
-  const ranked = symbols
-    .map((symbol) => {
-      const calls = Array.isArray(symbol.calls) ? symbol.calls.length : 0;
-      const calledBy = Array.isArray(symbol.called_by) ? symbol.called_by.length : 0;
-      const writes = Array.isArray(symbol.writes) ? symbol.writes.length : 0;
-      const emits = Array.isArray(symbol.emits) ? symbol.emits.length : 0;
-      const typeBoost = symbol.type === 'class' ? 8 : symbol.type === 'method' ? 4 : 2;
-      return {
-        symbol,
-        score: sourceRootScore(symbol.file) + typeBoost + calledBy * 4 + calls * 2 + writes * 2 + emits * 2
-      };
-    })
-    .sort((a, b) => b.score - a.score || String(a.symbol.symbol_id).localeCompare(String(b.symbol.symbol_id)))
-    .slice(0, maxNodes)
-    .map((item) => item.symbol);
-
-  const byId = new Map(ranked.map((symbol) => [String(symbol.symbol_id || ''), symbol]));
-  const byShortName = new Map();
-  for (const symbol of ranked) {
-    const shortName = String(symbol.name || '').split('.').pop();
-    if (!shortName) continue;
-    if (!byShortName.has(shortName)) byShortName.set(shortName, []);
-    byShortName.get(shortName).push(symbol);
-  }
-
-  const nodes = ranked.map((symbol) => ({
-    id: symbol.symbol_id,
-    label: symbol.name || symbol.symbol_id,
-    type: symbol.type || 'symbol',
-    file: symbol.file || '',
-    range: symbol.range || null,
-    signature: symbol.signature || '',
-    calls: clipGraphList(symbol.calls || [], 8),
-    called_by: clipGraphList(symbol.called_by || [], 8),
-    imports: clipGraphList(symbol.imports || [], 6),
-    writes: clipGraphList(symbol.writes || [], 6),
-    emits: clipGraphList(symbol.emits || [], 6)
-  }));
-
-  const edgeMap = new Map();
-  const addEdge = (source, target, kind, label = '') => {
-    if (!source || !target || source === target) return;
-    if (!byId.has(source) || !byId.has(target)) return;
-    const key = `${source}->${target}:${kind}`;
-    if (!edgeMap.has(key)) edgeMap.set(key, { source, target, kind, label });
-  };
-
-  for (const symbol of ranked) {
-    const source = String(symbol.symbol_id || '');
-    for (const call of symbol.calls || []) {
-      const shortName = String(call || '').split('.').pop();
-      for (const target of byShortName.get(shortName) || []) {
-        addEdge(source, target.symbol_id, 'calls', call);
-      }
-    }
-    for (const caller of symbol.called_by || []) {
-      addEdge(caller, source, 'called_by');
-    }
-  }
-
-  const edges = [...edgeMap.values()].slice(0, 80);
-
-  return {
-    updatedAt: fileIndex?.updatedAt || '',
-    stats: {
-      files: files.length,
-      source_files: sourceFiles.length,
-      symbols: symbols.length,
-      displayed_nodes: nodes.length,
-      displayed_edges: edges.length
-    },
-    nodes,
-    edges
-  };
-}
+function codeWikiReportTitle(fileName) {
+  return String(fileName || '')
+    .replace(/-project-requirements\.html$/, '')
+    .replace(/-/g, ' ');
+}
+
+function clipGraphList(values, max = 12) {
+  return [...new Set((Array.isArray(values) ? values : []).filter(Boolean))].slice(0, max);
+}
+
+const CODEWIKI_GRAPH_NOISY_NAMES = new Set([
+  '__init__',
+  '__enter__',
+  '__exit__',
+  '__getitem__',
+  '__setitem__',
+  '__delitem__',
+  '__contains__',
+  '__len__',
+  '__iter__',
+  '__next__',
+  '__call__',
+  'get',
+  'set',
+  'add',
+  'run',
+  'close',
+  'open',
+  'read',
+  'write',
+  'send',
+  'recv',
+  'poll',
+  'update',
+  'copy',
+  'size',
+  'apply'
+]);
+
+function normalizeGraphPath(value = '') {
+  return String(value || '').replace(/\\/g, '/').replace(/^\.\/+/, '');
+}
+
+function isDependencyLikeGraphPath(file = '') {
+  const normalized = normalizeGraphPath(file);
+  const segments = normalized.split('/').filter(Boolean);
+  return segments.some(
+    (segment) =>
+      INDEX_SKIP_DIRS.has(segment) ||
+      /^venv[-_]/i.test(segment) ||
+      /\.egg-info$/i.test(segment) ||
+      /^python\d+(?:\.\d+)?$/i.test(segment)
+  );
+}
+
+function isNoisyGraphSymbol(symbol = {}) {
+  const name = String(symbol.name || symbol.symbol_id || '').split('.').pop();
+  if (!name) return true;
+  if (CODEWIKI_GRAPH_NOISY_NAMES.has(name)) return true;
+  return /^__.*__$/.test(name);
+}
+
+function sourceRootScore(file = '') {
+  const normalized = normalizeGraphPath(file);
+  if (normalized.startsWith('src/')) return 8;
+  if (normalized.startsWith('codemini-web/client/src/')) return 8;
+  if (normalized.startsWith('codemini-web/server.js')) return 7;
+  if (normalized.startsWith('codemini-web/')) return 5;
+  if (normalized.startsWith('tests/')) return 1;
+  return 3;
+}
+
+function buildCodeWikiSymbolGraph(fileIndex, { maxNodes = 42 } = {}) {
+  const files = Array.isArray(fileIndex?.files) ? fileIndex.files : [];
+  const sourceFiles = files.filter((entry) => !isDependencyLikeGraphPath(entry.file));
+  const symbols = sourceFiles
+    .flatMap((entry) =>
+      (Array.isArray(entry.symbols) ? entry.symbols : []).map((symbol) => ({
+        ...symbol,
+        file: symbol.file || entry.file
+      }))
+    )
+    .filter((symbol) => !isDependencyLikeGraphPath(symbol.file) && !isNoisyGraphSymbol(symbol));
+  const ranked = symbols
+    .map((symbol) => {
+      const calls = Array.isArray(symbol.calls) ? symbol.calls.length : 0;
+      const calledBy = Array.isArray(symbol.called_by) ? symbol.called_by.length : 0;
+      const writes = Array.isArray(symbol.writes) ? symbol.writes.length : 0;
+      const emits = Array.isArray(symbol.emits) ? symbol.emits.length : 0;
+      const typeBoost = symbol.type === 'class' ? 8 : symbol.type === 'method' ? 4 : 2;
+      return {
+        symbol,
+        score: sourceRootScore(symbol.file) + typeBoost + calledBy * 4 + calls * 2 + writes * 2 + emits * 2
+      };
+    })
+    .sort((a, b) => b.score - a.score || String(a.symbol.symbol_id).localeCompare(String(b.symbol.symbol_id)))
+    .slice(0, maxNodes)
+    .map((item) => item.symbol);
+
+  const byId = new Map(ranked.map((symbol) => [String(symbol.symbol_id || ''), symbol]));
+  const byShortName = new Map();
+  for (const symbol of ranked) {
+    const shortName = String(symbol.name || '').split('.').pop();
+    if (!shortName) continue;
+    if (!byShortName.has(shortName)) byShortName.set(shortName, []);
+    byShortName.get(shortName).push(symbol);
+  }
+
+  const nodes = ranked.map((symbol) => ({
+    id: symbol.symbol_id,
+    label: symbol.name || symbol.symbol_id,
+    type: symbol.type || 'symbol',
+    file: symbol.file || '',
+    range: symbol.range || null,
+    signature: symbol.signature || '',
+    calls: clipGraphList(symbol.calls || [], 8),
+    called_by: clipGraphList(symbol.called_by || [], 8),
+    imports: clipGraphList(symbol.imports || [], 6),
+    writes: clipGraphList(symbol.writes || [], 6),
+    emits: clipGraphList(symbol.emits || [], 6)
+  }));
+
+  const edgeMap = new Map();
+  const addEdge = (source, target, kind, label = '') => {
+    if (!source || !target || source === target) return;
+    if (!byId.has(source) || !byId.has(target)) return;
+    const key = `${source}->${target}:${kind}`;
+    if (!edgeMap.has(key)) edgeMap.set(key, { source, target, kind, label });
+  };
+
+  for (const symbol of ranked) {
+    const source = String(symbol.symbol_id || '');
+    for (const call of symbol.calls || []) {
+      const shortName = String(call || '').split('.').pop();
+      for (const target of byShortName.get(shortName) || []) {
+        addEdge(source, target.symbol_id, 'calls', call);
+      }
+    }
+    for (const caller of symbol.called_by || []) {
+      addEdge(caller, source, 'called_by');
+    }
+  }
+
+  const edges = [...edgeMap.values()].slice(0, 80);
+
+  return {
+    updatedAt: fileIndex?.updatedAt || '',
+    stats: {
+      files: files.length,
+      source_files: sourceFiles.length,
+      symbols: symbols.length,
+      displayed_nodes: nodes.length,
+      displayed_edges: edges.length
+    },
+    nodes,
+    edges
+  };
+}
 
 function commonPathPrefix(paths) {
   const normalized = paths.map((p) => path.resolve(p).split(path.sep).filter(Boolean));
@@ -639,20 +738,34 @@ async function main() {
       jsonResponse(res, { ok: true });
       return;
     }
-    if (req.method === 'POST' && url.pathname === '/api/execution-mode') {
-      const { mode } = await readBody(req);
-      if (!mode || !['normal', 'auto', 'plan'].includes(mode)) {
-        jsonResponse(res, { error: true, message: 'Invalid mode' }, 400);
-        return;
-      }
+    if (req.method === 'POST' && url.pathname === '/api/execution-mode') {
+      const { mode } = await readBody(req);
+      if (!mode || !['normal', 'plan'].includes(mode)) {
+        jsonResponse(res, { error: true, message: 'Invalid mode' }, 400);
+        return;
+      }
       if (bridge.isBusy()) {
         jsonResponse(res, { error: true, message: 'Cannot switch execution mode while a request is running' }, 409);
         return;
       }
       const ok = await bridge.setExecutionMode(mode);
-      jsonResponse(res, { ok });
-      return;
-    }
+      jsonResponse(res, { ok });
+      return;
+    }
+    if (req.method === 'POST' && url.pathname === '/api/approval-mode') {
+      const { mode } = await readBody(req);
+      if (!mode || !['review', 'auto', 'full_access'].includes(mode)) {
+        jsonResponse(res, { error: true, message: 'Invalid approval mode' }, 400);
+        return;
+      }
+      if (bridge.isBusy()) {
+        jsonResponse(res, { error: true, message: 'Cannot switch approval mode while a request is running' }, 409);
+        return;
+      }
+      const ok = await bridge.setApprovalMode(mode);
+      jsonResponse(res, { ok });
+      return;
+    }
     if (req.method === 'POST' && url.pathname === '/api/approval') {
       const { id, approved } = await readBody(req);
       jsonResponse(res, { ok: bridge.handleApproval(id, !!approved) });
@@ -708,10 +821,10 @@ async function main() {
       return;
     }
 
-    // ── CodeWiki / project requirements reports ──
-    if (req.method === 'GET' && url.pathname === '/api/codewiki/reports') {
-      const codeWikiProjectDir = await resolveCodeWikiProjectDir(url, currentProjectDir);
-      const requirementsDir = getRequirementsDir(codeWikiProjectDir);
+    // ── CodeWiki / project requirements reports ──
+    if (req.method === 'GET' && url.pathname === '/api/codewiki/reports') {
+      const codeWikiProjectDir = await resolveCodeWikiProjectDir(url, currentProjectDir);
+      const requirementsDir = getRequirementsDir(codeWikiProjectDir);
       try {
         const entries = await fs.readdir(requirementsDir, { withFileTypes: true });
         const reports = [];
@@ -732,38 +845,38 @@ async function main() {
         if (err?.code === 'ENOENT') jsonResponse(res, { reports: [] });
         else jsonResponse(res, { error: true, message: err.message }, 500);
       }
-      return;
-    }
-
-    if (req.method === 'GET' && url.pathname === '/api/codewiki/symbol-graph') {
-      try {
-        const codeWikiProjectDir = await resolveCodeWikiProjectDir(url, currentProjectDir);
-        const initialized = await initializeProjectIndex(codeWikiProjectDir);
-        const projectRoot = initialized?.projectRoot || codeWikiProjectDir;
-        const fileIndexPath = getFileIndexPath(projectRoot);
-        const fileIndex = JSON.parse(await fs.readFile(fileIndexPath, 'utf8'));
-        const maxNodes = Math.max(12, Math.min(80, Number(url.searchParams.get('max_nodes') || 42)));
-        jsonResponse(res, buildCodeWikiSymbolGraph(fileIndex, { maxNodes }));
-      } catch (err) {
-        jsonResponse(res, {
-          updatedAt: '',
-          stats: { files: 0, symbols: 0, displayed_nodes: 0, displayed_edges: 0 },
-          nodes: [],
-          edges: [],
-          error: err?.message || String(err)
-        });
-      }
-      return;
-    }
-
-    if (req.method === 'GET' && url.pathname.startsWith('/api/codewiki/report/')) {
+      return;
+    }
+
+    if (req.method === 'GET' && url.pathname === '/api/codewiki/symbol-graph') {
+      try {
+        const codeWikiProjectDir = await resolveCodeWikiProjectDir(url, currentProjectDir);
+        const initialized = await initializeProjectIndex(codeWikiProjectDir);
+        const projectRoot = initialized?.projectRoot || codeWikiProjectDir;
+        const fileIndexPath = getFileIndexPath(projectRoot);
+        const fileIndex = JSON.parse(await fs.readFile(fileIndexPath, 'utf8'));
+        const maxNodes = Math.max(12, Math.min(80, Number(url.searchParams.get('max_nodes') || 42)));
+        jsonResponse(res, buildCodeWikiSymbolGraph(fileIndex, { maxNodes }));
+      } catch (err) {
+        jsonResponse(res, {
+          updatedAt: '',
+          stats: { files: 0, symbols: 0, displayed_nodes: 0, displayed_edges: 0 },
+          nodes: [],
+          edges: [],
+          error: err?.message || String(err)
+        });
+      }
+      return;
+    }
+
+    if (req.method === 'GET' && url.pathname.startsWith('/api/codewiki/report/')) {
       const fileName = decodeURIComponent(url.pathname.slice('/api/codewiki/report/'.length));
       if (!isCodeWikiReportFile(fileName)) {
         jsonResponse(res, { error: true, message: 'Invalid report file' }, 400);
         return;
       }
-      const codeWikiProjectDir = await resolveCodeWikiProjectDir(url, currentProjectDir);
-      const requirementsDir = path.resolve(getRequirementsDir(codeWikiProjectDir));
+      const codeWikiProjectDir = await resolveCodeWikiProjectDir(url, currentProjectDir);
+      const requirementsDir = path.resolve(getRequirementsDir(codeWikiProjectDir));
       const reportPath = path.resolve(requirementsDir, fileName);
       if (!reportPath.startsWith(`${requirementsDir}${path.sep}`)) {
         jsonResponse(res, { error: true, message: 'Invalid report path' }, 403);
@@ -779,8 +892,8 @@ async function main() {
         jsonResponse(res, { error: true, message: 'Invalid report file' }, 400);
         return;
       }
-      const codeWikiProjectDir = await resolveCodeWikiProjectDir(url, currentProjectDir);
-      const requirementsDir = path.resolve(getRequirementsDir(codeWikiProjectDir));
+      const codeWikiProjectDir = await resolveCodeWikiProjectDir(url, currentProjectDir);
+      const requirementsDir = path.resolve(getRequirementsDir(codeWikiProjectDir));
       const reportPath = path.resolve(requirementsDir, fileName);
       if (!reportPath.startsWith(`${requirementsDir}${path.sep}`)) {
         jsonResponse(res, { error: true, message: 'Invalid report path' }, 403);
@@ -801,23 +914,23 @@ async function main() {
         jsonResponse(res, { error: true, message: 'Runtime is busy' }, 409);
         return;
       }
-      const { depth } = await readBody(req);
-      const normalizedDepth = ['fast', 'standard', 'deep'].includes(String(depth || '').toLowerCase())
-        ? String(depth).toLowerCase()
-        : 'standard';
-      const codeWikiProjectDir = await resolveCodeWikiProjectDir(url, currentProjectDir);
-      if (codeWikiProjectDir !== currentProjectDir) {
-        const { runtime } = await buildRuntimeForSession({
-          model: bridge.getState().model,
-          projectDir: codeWikiProjectDir
-        });
-        await bridge.switchRuntime(runtime);
-        currentProjectDir = process.cwd();
-      }
-      const result = bridge.handleCodeWikiGenerate(`/project-requirements --${normalizedDepth}`);
-      jsonResponse(res, result);
-      return;
-    }
+      const { depth } = await readBody(req);
+      const normalizedDepth = ['fast', 'standard', 'deep'].includes(String(depth || '').toLowerCase())
+        ? String(depth).toLowerCase()
+        : 'standard';
+      const codeWikiProjectDir = await resolveCodeWikiProjectDir(url, currentProjectDir);
+      if (codeWikiProjectDir !== currentProjectDir) {
+        const { runtime } = await buildRuntimeForSession({
+          model: bridge.getState().model,
+          projectDir: codeWikiProjectDir
+        });
+        await bridge.switchRuntime(runtime);
+        currentProjectDir = process.cwd();
+      }
+      const result = bridge.handleCodeWikiGenerate(`/project-requirements --${normalizedDepth}`);
+      jsonResponse(res, result);
+      return;
+    }
 
     if (req.method === 'POST' && url.pathname === '/api/codewiki/ask') {
       const { question, reportFile } = await readBody(req);
@@ -841,16 +954,16 @@ async function main() {
         jsonResponse(res, { error: true, message: 'Runtime is busy' }, 409);
         return;
       }
-      const codeWikiProjectDir = await resolveCodeWikiProjectDir(url, currentProjectDir);
-      const reportPath = selectedReport
-        ? path.join(getRequirementsDir(codeWikiProjectDir), selectedReport)
-        : getRequirementsDir(codeWikiProjectDir);
-      const prompt = buildCodeWikiAskPrompt({
-        question,
-        reportPath,
-        projectDir: codeWikiProjectDir,
-        replyLanguage: bridge.getState()?.replyLanguage
-      });
+      const codeWikiProjectDir = await resolveCodeWikiProjectDir(url, currentProjectDir);
+      const reportPath = selectedReport
+        ? path.join(getRequirementsDir(codeWikiProjectDir), selectedReport)
+        : getRequirementsDir(codeWikiProjectDir);
+      const prompt = buildCodeWikiAskPrompt({
+        question,
+        reportPath,
+        projectDir: codeWikiProjectDir,
+        replyLanguage: bridge.getState()?.replyLanguage
+      });
 
       res.writeHead(200, {
         'Content-Type': 'application/x-ndjson; charset=utf-8',
@@ -869,7 +982,11 @@ async function main() {
 
     // ── Session management ──
     if (req.method === 'GET' && url.pathname === '/api/sessions') {
-      const sessions = await listSessions(1000);
+      const requestedLimit = Number(url.searchParams.get('limit') || 200);
+      const limit = Number.isFinite(requestedLimit)
+        ? Math.max(1, Math.min(1000, Math.round(requestedLimit)))
+        : 200;
+      const sessions = await listSessions(limit);
       const enriched = sessions.map(s => ({ ...s, isGeneral: isGeneralProjectDir(s.projectDir) }));
       jsonResponse(res, enriched);
       return;
@@ -909,7 +1026,17 @@ async function main() {
         });
         await bridge.switchRuntime(newRuntime);
         currentProjectDir = process.cwd();
-        jsonResponse(res, { ok: true, sessionId, cwd: currentProjectDir, isGeneral: isGeneralProjectDir(currentProjectDir) });
+        jsonResponse(res, {
+          ok: true,
+          sessionId,
+          cwd: currentProjectDir,
+          isGeneral: isGeneralProjectDir(currentProjectDir),
+          state: { ...bridge.getState(), cwd: currentProjectDir, isGeneral: isGeneralProjectDir(currentProjectDir) },
+          sessionData: {
+            messages: bridge.getSessionMessages(),
+            compact: bridge.getSessionCompactMeta()
+          }
+        });
       } catch (err) {
         jsonResponse(res, { error: true, message: err.message }, 500);
       }
@@ -929,7 +1056,7 @@ async function main() {
         let nextSessionId = bridge.getSessionId();
         let cwd = currentProjectDir;
         if (deletingCurrent) {
-          const remaining = await listSessions(1000);
+          const remaining = await listSessions(1);
           const next = remaining.find((session) => session.id !== sessionId);
           const built = next
             ? await buildRuntimeForSession({ sessionId: next.id, model: bridge.getState().model })
@@ -939,7 +1066,20 @@ async function main() {
           nextSessionId = built.session.id;
           cwd = currentProjectDir;
         }
-        jsonResponse(res, { ok: true, removed: result.removed, sessionId: nextSessionId, cwd, isGeneral: isGeneralProjectDir(currentProjectDir) });
+        jsonResponse(res, {
+          ok: true,
+          removed: result.removed,
+          sessionId: nextSessionId,
+          cwd,
+          isGeneral: isGeneralProjectDir(currentProjectDir),
+          ...(deletingCurrent ? {
+            state: { ...bridge.getState(), cwd: currentProjectDir, isGeneral: isGeneralProjectDir(currentProjectDir) },
+            sessionData: {
+              messages: bridge.getSessionMessages(),
+              compact: bridge.getSessionCompactMeta()
+            }
+          } : {})
+        });
       } catch (err) {
         jsonResponse(res, { error: true, message: err.message }, 500);
       }
@@ -969,7 +1109,7 @@ async function main() {
       }
       return;
     }
-    if (req.method === 'GET' && url.pathname === '/api/git-diff') {
+    if (req.method === 'GET' && url.pathname === '/api/git-diff') {
       try {
         let patch;
         try {
@@ -1006,9 +1146,35 @@ async function main() {
       } catch {
         jsonResponse(res, { patch: '', files: [] });
       }
-      return;
-    }
-    if (req.method === 'POST' && url.pathname === '/api/git-batch') {
+      return;
+    }
+    if (req.method === 'GET' && url.pathname === '/api/session-changes') {
+      try {
+        jsonResponse(res, { changes: await bridge.getChangeSets() });
+      } catch (err) {
+        jsonResponse(res, { error: true, message: err?.message || 'Failed to read session changes' }, 500);
+      }
+      return;
+    }
+    if (req.method === 'GET' && url.pathname.startsWith('/api/session-changes/') && url.pathname.endsWith('/patch')) {
+      const id = decodeURIComponent(url.pathname.slice('/api/session-changes/'.length, -'/patch'.length));
+      try {
+        jsonResponse(res, { id, patch: await bridge.getChangeSetPatch(id) });
+      } catch (err) {
+        jsonResponse(res, { error: true, message: err?.message || 'Failed to read change patch' }, 404);
+      }
+      return;
+    }
+    if (req.method === 'POST' && url.pathname.startsWith('/api/session-changes/') && url.pathname.endsWith('/undo')) {
+      const id = decodeURIComponent(url.pathname.slice('/api/session-changes/'.length, -'/undo'.length));
+      try {
+        jsonResponse(res, await bridge.undoChangeSet(id));
+      } catch (err) {
+        jsonResponse(res, { error: true, message: err?.message || 'Failed to undo change' }, 409);
+      }
+      return;
+    }
+    if (req.method === 'POST' && url.pathname === '/api/git-batch') {
       const { dirs } = await readBody(req);
       const result = {};
       for (const dir of (Array.isArray(dirs) ? dirs : [])) {
@@ -1121,10 +1287,45 @@ async function main() {
       return;
     }
 
+    // ── Memory management ──
+    if (req.method === 'GET' && url.pathname === '/api/memory') {
+      const scope = normalizeMemoryScope(url.searchParams.get('scope'));
+      const query = String(url.searchParams.get('q') || '').trim();
+      try {
+        const projectDirs = await parseProjectDirsParam(url, currentProjectDir);
+        const items = await listMemoriesForProjectDirs({
+          scope,
+          query,
+          projectDirs,
+          fallbackDir: currentProjectDir
+        });
+        jsonResponse(res, { scope, query, items });
+      } catch (err) {
+        jsonResponse(res, { error: true, message: err.message }, 500);
+      }
+      return;
+    }
+    if (req.method === 'DELETE' && url.pathname.startsWith('/api/memory/')) {
+      const id = decodeURIComponent(url.pathname.slice('/api/memory/'.length));
+      const scope = normalizeMemoryScope(url.searchParams.get('scope'));
+      if (!id) { jsonResponse(res, { error: true, message: 'Missing memory id' }, 400); return; }
+      try {
+        const workspaceRoot = scope === 'project'
+          ? await resolveRequestProjectDir(url.searchParams.get('projectDir'), currentProjectDir)
+          : currentProjectDir;
+        const result = await forgetMemory({ scope, id, workspaceRoot });
+        jsonResponse(res, { ok: true, scope, ...result });
+      } catch (err) {
+        jsonResponse(res, { error: true, message: err.message }, 500);
+      }
+      return;
+    }
+
     // ── Skills management ──
     if (req.method === 'GET' && url.pathname === '/api/skills') {
       try {
-        const skills = await listSkillEntries({ scope: 'all', cwd: currentProjectDir });
+        const projectDirs = await parseProjectDirsParam(url, currentProjectDir);
+        const skills = await listSkillsForProjectDirs(projectDirs, currentProjectDir);
         jsonResponse(res, skills);
       } catch (err) { jsonResponse(res, { error: true, message: err.message }, 500); }
       return;
@@ -1132,7 +1333,8 @@ async function main() {
     if (req.method === 'GET' && url.pathname.startsWith('/api/skills/') && url.pathname.endsWith('/content')) {
       const name = decodeURIComponent(url.pathname.slice('/api/skills/'.length, -'/content'.length));
       try {
-        const entries = await listSkillEntries({ scope: 'all', cwd: currentProjectDir });
+        const targetProjectDir = await resolveRequestProjectDir(url.searchParams.get('projectDir'), currentProjectDir);
+        const entries = await listSkillEntries({ scope: 'all', cwd: targetProjectDir });
         const skill = entries.find(s => s.name === name);
         if (!skill) { jsonResponse(res, { error: true, message: 'Skill not found' }, 404); return; }
         const content = await fs.readFile(skill.path, 'utf8');
@@ -1194,10 +1396,11 @@ async function main() {
     }
     if (req.method === 'PUT' && url.pathname.startsWith('/api/skills/') && url.pathname.endsWith('/content')) {
       const name = decodeURIComponent(url.pathname.slice('/api/skills/'.length, -'/content'.length));
-      const { content } = await readBody(req);
+      const { content, projectDir } = await readBody(req);
       if (!content) { jsonResponse(res, { error: true, message: 'Missing content' }, 400); return; }
       try {
-        const entries = await listSkillEntries({ scope: 'all', cwd: currentProjectDir });
+        const targetProjectDir = await resolveRequestProjectDir(projectDir, currentProjectDir);
+        const entries = await listSkillEntries({ scope: 'all', cwd: targetProjectDir });
         const skill = entries.find(s => s.name === name);
         if (!skill) { jsonResponse(res, { error: true, message: 'Skill not found' }, 404); return; }
         if (skill.scope === 'builtin') { jsonResponse(res, { error: true, message: 'Cannot edit builtin skill' }, 403); return; }
@@ -1210,7 +1413,8 @@ async function main() {
     if (req.method === 'DELETE' && url.pathname.startsWith('/api/skills/')) {
       const name = decodeURIComponent(url.pathname.slice('/api/skills/'.length));
       try {
-        const entries = await listSkillEntries({ scope: 'all', cwd: currentProjectDir });
+        const targetProjectDir = await resolveRequestProjectDir(url.searchParams.get('projectDir'), currentProjectDir);
+        const entries = await listSkillEntries({ scope: 'all', cwd: targetProjectDir });
         const skill = entries.find(s => s.name === name);
         if (!skill) { jsonResponse(res, { error: true, message: 'Skill not found' }, 404); return; }
         if (skill.scope === 'builtin') { jsonResponse(res, { error: true, message: 'Cannot delete builtin skill' }, 403); return; }
@@ -1219,10 +1423,10 @@ async function main() {
         const registry = await readSkillRegistry();
         registry.skills = (registry.skills || []).filter(s => s.name !== name);
         await writeSkillRegistry(undefined, registry);
-        const catalog = await readProjectSkillCatalog(currentProjectDir);
+        const catalog = await readProjectSkillCatalog(targetProjectDir);
         if (catalog.skills?.[name]) {
           delete catalog.skills[name];
-          await writeProjectSkillCatalog(currentProjectDir, catalog);
+          await writeProjectSkillCatalog(targetProjectDir, catalog);
         }
         await deleteSkillCatalogMetadata(getSkillsDir(), name);
         const config = await loadConfig();
@@ -1237,7 +1441,8 @@ async function main() {
       const name = decodeURIComponent(url.pathname.slice('/api/skills/'.length, -'/metadata'.length));
       const body = await readBody(req);
       try {
-        const entries = await listSkillEntries({ scope: 'all', cwd: currentProjectDir });
+        const targetProjectDir = await resolveRequestProjectDir(body?.projectDir, currentProjectDir);
+        const entries = await listSkillEntries({ scope: 'all', cwd: targetProjectDir });
         const skill = entries.find(s => s.name === name);
         if (!skill) { jsonResponse(res, { error: true, message: 'Skill not found' }, 404); return; }
         if (skill.scope === 'builtin' && body?.scope && body.scope !== 'builtin') {
@@ -1251,14 +1456,14 @@ async function main() {
 
         if (skill.scope !== 'builtin' && requestedScope !== skill.scope) {
           const sourceDir = path.dirname(skill.path);
-          const targetBaseDir = skillBaseDirForScope(requestedScope, currentProjectDir);
+          const targetBaseDir = skillBaseDirForScope(requestedScope, targetProjectDir);
           const targetDir = path.join(targetBaseDir, name);
           await fs.rm(targetDir, { recursive: true, force: true });
           await fs.mkdir(path.dirname(targetDir), { recursive: true });
           await fs.cp(sourceDir, targetDir, { recursive: true, force: true });
           await fs.rm(sourceDir, { recursive: true, force: true });
           if (requestedScope === 'global') {
-            await deleteSkillCatalogMetadata(getProjectSkillsDir(currentProjectDir), name);
+            await deleteSkillCatalogMetadata(getProjectSkillsDir(targetProjectDir), name);
             await upsertSkillRegistryEntry(undefined, {
               name,
               version: skill.version || '0.0.0',
@@ -1286,11 +1491,11 @@ async function main() {
           });
           metadata = await upsertSkillCatalogMetadata(getSkillsDir(), name, body || {});
         } else if (nextScope === 'project') {
-          metadata = await upsertProjectSkillMetadata(currentProjectDir, name, body || {});
+          metadata = await upsertProjectSkillMetadata(targetProjectDir, name, body || {});
         } else if (skill.scope !== 'builtin') {
-          metadata = await upsertProjectSkillMetadata(currentProjectDir, name, body || {});
+          metadata = await upsertProjectSkillMetadata(targetProjectDir, name, body || {});
         } else {
-          metadata = await upsertProjectSkillMetadata(currentProjectDir, name, body || {});
+          metadata = await upsertProjectSkillMetadata(targetProjectDir, name, body || {});
         }
         if (skill.scope !== 'builtin' && body?.enabled !== undefined) {
           const config = await loadConfig();
@@ -1309,13 +1514,14 @@ async function main() {
     }
     if (req.method === 'POST' && url.pathname.startsWith('/api/skills/') && url.pathname.endsWith('/toggle')) {
       const name = decodeURIComponent(url.pathname.slice('/api/skills/'.length, -'/toggle'.length));
-      const { enabled } = await readBody(req);
+      const { enabled, projectDir } = await readBody(req);
       try {
-        const entries = await listSkillEntries({ scope: 'all', cwd: currentProjectDir });
+        const targetProjectDir = await resolveRequestProjectDir(projectDir, currentProjectDir);
+        const entries = await listSkillEntries({ scope: 'all', cwd: targetProjectDir });
         const skill = entries.find(s => s.name === name);
         if (!skill) { jsonResponse(res, { error: true, message: 'Skill not found' }, 404); return; }
         if (skill.scope === 'builtin') {
-          const metadata = await upsertProjectSkillMetadata(currentProjectDir, name, { enabled });
+          const metadata = await upsertProjectSkillMetadata(targetProjectDir, name, { enabled });
           await bridge.reloadCommandsAndSkills();
           jsonResponse(res, { ok: true, name, metadata });
           return;