codemini-cli 0.6.3 → 0.6.5

package/codemini-web/server.js

@@ -8,11 +8,11 @@ import { loadConfig, saveConfig, setConfigValue, getConfigValue } from '../src/c
 import { createChatRuntime } from '../src/core/chat-runtime.js';
 import { createSession, loadSession, listSessions, resolveSession, deleteSession } from '../src/core/session-store.js';
 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 { forgetMemory, listMemories, searchMemories } from '../src/core/memory-store.js';
-import { getReplyLanguage } from '../src/core/reply-language.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 { 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';
@@ -23,19 +23,19 @@ const GENERAL_PROJECT_DIR = (() => {
   return path.join(base, 'workspace');
 })();
 
-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';
-}
+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);
@@ -272,107 +272,107 @@ 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);
-}
-
-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();
-}
+  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') || '');
@@ -738,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) });
@@ -968,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;
@@ -1008,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);
       }
@@ -1028,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 })
@@ -1038,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);
       }
@@ -1068,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 {
@@ -1105,9 +1146,44 @@ 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 !== '/api/session-changes/undo' && 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/session-changes/undo') {
+      const { ids } = await readBody(req);
+      try {
+        jsonResponse(res, await bridge.undoChangeSets(ids));
+      } catch (err) {
+        jsonResponse(res, { error: true, message: err?.message || 'Failed to undo changes' }, 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 : [])) {
@@ -1213,64 +1289,64 @@ async function main() {
       }
       return;
     }
-    if (req.method === 'GET' && url.pathname.startsWith('/api/config/get/')) {
-      const key = url.pathname.slice('/api/config/get/'.length);
-      const value = await getConfigValue(key);
-      jsonResponse(res, { key, value });
-      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 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;
-    }
-    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 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');
+    if (req.method === 'GET' && url.pathname.startsWith('/api/config/get/')) {
+      const key = url.pathname.slice('/api/config/get/'.length);
+      const value = await getConfigValue(key);
+      jsonResponse(res, { key, value });
+      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 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;
+    }
+    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 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');
         jsonResponse(res, { name: skill.name, content, scope: skill.scope });
       } catch (err) { jsonResponse(res, { error: true, message: err.message }, 500); }
       return;
@@ -1327,40 +1403,40 @@ async function main() {
       } catch (err) { jsonResponse(res, { error: true, message: err.message }, 500); }
       return;
     }
-    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, projectDir } = await readBody(req);
-      if (!content) { jsonResponse(res, { error: true, message: 'Missing content' }, 400); return; }
-      try {
-        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; }
+    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, projectDir } = await readBody(req);
+      if (!content) { jsonResponse(res, { error: true, message: 'Missing content' }, 400); return; }
+      try {
+        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; }
         await fs.writeFile(skill.path, content, 'utf8');
         await bridge.reloadCommandsAndSkills();
         jsonResponse(res, { ok: true });
       } catch (err) { jsonResponse(res, { error: true, message: err.message }, 500); }
       return;
     }
-    if (req.method === 'DELETE' && url.pathname.startsWith('/api/skills/')) {
-      const name = decodeURIComponent(url.pathname.slice('/api/skills/'.length));
-      try {
-        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; }
+    if (req.method === 'DELETE' && url.pathname.startsWith('/api/skills/')) {
+      const name = decodeURIComponent(url.pathname.slice('/api/skills/'.length));
+      try {
+        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; }
         const dir = path.dirname(skill.path);
         await fs.rm(dir, { recursive: true, force: true });
         const registry = await readSkillRegistry();
         registry.skills = (registry.skills || []).filter(s => s.name !== name);
         await writeSkillRegistry(undefined, registry);
-        const catalog = await readProjectSkillCatalog(targetProjectDir);
-        if (catalog.skills?.[name]) {
-          delete catalog.skills[name];
-          await writeProjectSkillCatalog(targetProjectDir, catalog);
-        }
+        const catalog = await readProjectSkillCatalog(targetProjectDir);
+        if (catalog.skills?.[name]) {
+          delete catalog.skills[name];
+          await writeProjectSkillCatalog(targetProjectDir, catalog);
+        }
         await deleteSkillCatalogMetadata(getSkillsDir(), name);
         const config = await loadConfig();
         if (config.skills?.enabled) delete config.skills.enabled[name];
@@ -1370,13 +1446,13 @@ async function main() {
       } catch (err) { jsonResponse(res, { error: true, message: err.message }, 500); }
       return;
     }
-    if (req.method === 'PUT' && url.pathname.startsWith('/api/skills/') && url.pathname.endsWith('/metadata')) {
-      const name = decodeURIComponent(url.pathname.slice('/api/skills/'.length, -'/metadata'.length));
-      const body = await readBody(req);
-      try {
-        const targetProjectDir = await resolveRequestProjectDir(body?.projectDir, currentProjectDir);
-        const entries = await listSkillEntries({ scope: 'all', cwd: targetProjectDir });
-        const skill = entries.find(s => s.name === name);
+    if (req.method === 'PUT' && url.pathname.startsWith('/api/skills/') && url.pathname.endsWith('/metadata')) {
+      const name = decodeURIComponent(url.pathname.slice('/api/skills/'.length, -'/metadata'.length));
+      const body = await readBody(req);
+      try {
+        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') {
           jsonResponse(res, { error: true, message: 'Cannot move builtin skill' }, 403);
@@ -1388,15 +1464,15 @@ async function main() {
         let nextScope = skill.scope;
 
         if (skill.scope !== 'builtin' && requestedScope !== skill.scope) {
-          const sourceDir = path.dirname(skill.path);
-          const targetBaseDir = skillBaseDirForScope(requestedScope, targetProjectDir);
-          const targetDir = path.join(targetBaseDir, name);
+          const sourceDir = path.dirname(skill.path);
+          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(targetProjectDir), name);
+          if (requestedScope === 'global') {
+            await deleteSkillCatalogMetadata(getProjectSkillsDir(targetProjectDir), name);
             await upsertSkillRegistryEntry(undefined, {
               name,
               version: skill.version || '0.0.0',
@@ -1423,13 +1499,13 @@ async function main() {
             ...(metadataPatch.enabled !== undefined ? { enabled: metadataPatch.enabled } : {})
           });
           metadata = await upsertSkillCatalogMetadata(getSkillsDir(), name, body || {});
-        } else if (nextScope === 'project') {
-          metadata = await upsertProjectSkillMetadata(targetProjectDir, name, body || {});
-        } else if (skill.scope !== 'builtin') {
-          metadata = await upsertProjectSkillMetadata(targetProjectDir, name, body || {});
-        } else {
-          metadata = await upsertProjectSkillMetadata(targetProjectDir, name, body || {});
-        }
+        } else if (nextScope === 'project') {
+          metadata = await upsertProjectSkillMetadata(targetProjectDir, name, body || {});
+        } else if (skill.scope !== 'builtin') {
+          metadata = await upsertProjectSkillMetadata(targetProjectDir, name, body || {});
+        } else {
+          metadata = await upsertProjectSkillMetadata(targetProjectDir, name, body || {});
+        }
         if (skill.scope !== 'builtin' && body?.enabled !== undefined) {
           const config = await loadConfig();
           config.skills = config.skills || {};
@@ -1445,16 +1521,16 @@ async function main() {
       } catch (err) { jsonResponse(res, { error: true, message: err.message }, 500); }
       return;
     }
-    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, projectDir } = await readBody(req);
-      try {
-        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(targetProjectDir, name, { enabled });
+    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, projectDir } = await readBody(req);
+      try {
+        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(targetProjectDir, name, { enabled });
           await bridge.reloadCommandsAndSkills();
           jsonResponse(res, { ok: true, name, metadata });
           return;