codexapp 0.1.34 → 0.1.36

package/dist-cli/index.js

@@ -3,10 +3,10 @@
 // src/cli/index.ts
 import { createServer as createServer2 } from "http";
 import { chmodSync, createWriteStream, existsSync as existsSync3, mkdirSync } from "fs";
-import { readFile as readFile3 } from "fs/promises";
-import { homedir as homedir2, networkInterfaces } from "os";
-import { join as join4 } from "path";
-import { spawn as spawn2, spawnSync } from "child_process";
+import { readFile as readFile4 } from "fs/promises";
+import { homedir as homedir3, networkInterfaces } from "os";
+import { join as join5 } from "path";
+import { spawn as spawn3, spawnSync } from "child_process";
 import { createInterface } from "readline/promises";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { dirname as dirname3 } from "path";
@@ -16,20 +16,27 @@ import qrcode from "qrcode-terminal";
 
 // src/server/httpServer.ts
 import { fileURLToPath } from "url";
-import { dirname as dirname2, extname as extname2, isAbsolute as isAbsolute2, join as join3 } from "path";
+import { dirname as dirname2, extname as extname2, isAbsolute as isAbsolute2, join as join4 } from "path";
 import { existsSync as existsSync2 } from "fs";
-import { writeFile as writeFile2, stat as stat3 } from "fs/promises";
+import { writeFile as writeFile3, stat as stat4 } from "fs/promises";
 import express from "express";
 
 // src/server/codexAppServerBridge.ts
-import { spawn } from "child_process";
+import { spawn as spawn2 } from "child_process";
 import { randomBytes } from "crypto";
+import { mkdtemp as mkdtemp2, readFile as readFile2, mkdir as mkdir2, stat as stat2 } from "fs/promises";
+import { request as httpsRequest } from "https";
+import { homedir as homedir2 } from "os";
+import { tmpdir as tmpdir2 } from "os";
+import { basename, isAbsolute, join as join2, resolve } from "path";
+import { writeFile as writeFile2 } from "fs/promises";
+
+// src/server/skillsRoutes.ts
+import { spawn } from "child_process";
 import { mkdtemp, readFile, readdir, rm, mkdir, stat, lstat, readlink, symlink } from "fs/promises";
 import { existsSync } from "fs";
-import { request as httpsRequest } from "https";
-import { homedir } from "os";
-import { tmpdir } from "os";
-import { basename, isAbsolute, join, resolve } from "path";
+import { homedir, tmpdir } from "os";
+import { join } from "path";
 import { writeFile } from "fs/promises";
 function asRecord(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
@@ -53,85 +60,6 @@ function setJson(res, statusCode, payload) {
   res.setHeader("Content-Type", "application/json; charset=utf-8");
   res.end(JSON.stringify(payload));
 }
-function extractThreadMessageText(threadReadPayload) {
-  const payload = asRecord(threadReadPayload);
-  const thread = asRecord(payload?.thread);
-  const turns = Array.isArray(thread?.turns) ? thread.turns : [];
-  const parts = [];
-  for (const turn of turns) {
-    const turnRecord = asRecord(turn);
-    const items = Array.isArray(turnRecord?.items) ? turnRecord.items : [];
-    for (const item of items) {
-      const itemRecord = asRecord(item);
-      const type = typeof itemRecord?.type === "string" ? itemRecord.type : "";
-      if (type === "agentMessage" && typeof itemRecord?.text === "string" && itemRecord.text.trim().length > 0) {
-        parts.push(itemRecord.text.trim());
-        continue;
-      }
-      if (type === "userMessage") {
-        const content = Array.isArray(itemRecord?.content) ? itemRecord.content : [];
-        for (const block of content) {
-          const blockRecord = asRecord(block);
-          if (blockRecord?.type === "text" && typeof blockRecord.text === "string" && blockRecord.text.trim().length > 0) {
-            parts.push(blockRecord.text.trim());
-          }
-        }
-        continue;
-      }
-      if (type === "commandExecution") {
-        const command = typeof itemRecord?.command === "string" ? itemRecord.command.trim() : "";
-        const output = typeof itemRecord?.aggregatedOutput === "string" ? itemRecord.aggregatedOutput.trim() : "";
-        if (command) parts.push(command);
-        if (output) parts.push(output);
-      }
-    }
-  }
-  return parts.join("\n").trim();
-}
-function isExactPhraseMatch(query, doc) {
-  const q = query.trim().toLowerCase();
-  if (!q) return false;
-  return doc.title.toLowerCase().includes(q) || doc.preview.toLowerCase().includes(q) || doc.messageText.toLowerCase().includes(q);
-}
-function scoreFileCandidate(path, query) {
-  if (!query) return 0;
-  const lowerPath = path.toLowerCase();
-  const lowerQuery = query.toLowerCase();
-  const baseName = lowerPath.slice(lowerPath.lastIndexOf("/") + 1);
-  if (baseName === lowerQuery) return 0;
-  if (baseName.startsWith(lowerQuery)) return 1;
-  if (baseName.includes(lowerQuery)) return 2;
-  if (lowerPath.includes(`/${lowerQuery}`)) return 3;
-  if (lowerPath.includes(lowerQuery)) return 4;
-  return 10;
-}
-async function listFilesWithRipgrep(cwd) {
-  return await new Promise((resolve2, reject) => {
-    const proc = spawn("rg", ["--files", "--hidden", "-g", "!.git", "-g", "!node_modules"], {
-      cwd,
-      env: process.env,
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    let stdout = "";
-    let stderr = "";
-    proc.stdout.on("data", (chunk) => {
-      stdout += chunk.toString();
-    });
-    proc.stderr.on("data", (chunk) => {
-      stderr += chunk.toString();
-    });
-    proc.on("error", reject);
-    proc.on("close", (code) => {
-      if (code === 0) {
-        const rows = stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-        resolve2(rows);
-        return;
-      }
-      const details = [stderr.trim(), stdout.trim()].filter(Boolean).join("\n");
-      reject(new Error(details || "rg --files failed"));
-    });
-  });
-}
 function getCodexHomeDir() {
   const codexHome = process.env.CODEX_HOME?.trim();
   return codexHome && codexHome.length > 0 ? codexHome : join(homedir(), ".codex");
@@ -166,55 +94,6 @@ async function runCommand(command, args, options = {}) {
     });
   });
 }
-function isMissingHeadError(error) {
-  const message = getErrorMessage(error, "").toLowerCase();
-  return message.includes("not a valid object name: 'head'") || message.includes("not a valid object name: head") || message.includes("invalid reference: head");
-}
-function isNotGitRepositoryError(error) {
-  const message = getErrorMessage(error, "").toLowerCase();
-  return message.includes("not a git repository") || message.includes("fatal: not a git repository");
-}
-async function ensureRepoHasInitialCommit(repoRoot) {
-  const agentsPath = join(repoRoot, "AGENTS.md");
-  try {
-    await stat(agentsPath);
-  } catch {
-    await writeFile(agentsPath, "", "utf8");
-  }
-  await runCommand("git", ["add", "AGENTS.md"], { cwd: repoRoot });
-  await runCommand(
-    "git",
-    ["-c", "user.name=Codex", "-c", "user.email=codex@local", "commit", "-m", "Initialize repository for worktree support"],
-    { cwd: repoRoot }
-  );
-}
-async function runCommandCapture(command, args, options = {}) {
-  return await new Promise((resolve2, reject) => {
-    const proc = spawn(command, args, {
-      cwd: options.cwd,
-      env: process.env,
-      stdio: ["ignore", "pipe", "pipe"]
-    });
-    let stdout = "";
-    let stderr = "";
-    proc.stdout.on("data", (chunk) => {
-      stdout += chunk.toString();
-    });
-    proc.stderr.on("data", (chunk) => {
-      stderr += chunk.toString();
-    });
-    proc.on("error", reject);
-    proc.on("close", (code) => {
-      if (code === 0) {
-        resolve2(stdout.trim());
-        return;
-      }
-      const details = [stderr.trim(), stdout.trim()].filter(Boolean).join("\n");
-      const suffix = details.length > 0 ? `: ${details}` : "";
-      reject(new Error(`Command failed (${command} ${args.join(" ")})${suffix}`));
-    });
-  });
-}
 async function runCommandWithOutput(command, args, options = {}) {
   return await new Promise((resolve2, reject) => {
     const proc = spawn(command, args, {
@@ -325,7 +204,7 @@ async function fetchMetaBatch(entries) {
   const toFetch = entries.filter((e) => !metaCache.has(`${e.owner}/${e.name}`));
   if (toFetch.length === 0) return;
   const batch = toFetch.slice(0, 50);
-  const results = await Promise.allSettled(
+  await Promise.allSettled(
     batch.map(async (e) => {
       const rawUrl = `https://raw.githubusercontent.com/${HUB_SKILLS_OWNER}/${HUB_SKILLS_REPO}/main/skills/${e.owner}/${e.name}/_meta.json`;
       const resp = await fetch(rawUrl);
@@ -338,7 +217,6 @@ async function fetchMetaBatch(entries) {
       });
     })
   );
-  void results;
 }
 function buildHubEntry(e) {
   const cached = metaCache.get(`${e.owner}/${e.name}`);
@@ -467,8 +345,7 @@ function isAndroidLikeRuntime() {
   const prefix = process.env.PREFIX?.toLowerCase() ?? "";
   if (prefix.includes("/com.termux/")) return true;
   const proot = process.env.PROOT_TMP_DIR?.toLowerCase() ?? "";
-  if (proot.length > 0) return true;
-  return false;
+  return proot.length > 0;
 }
 function getPreferredSyncBranch() {
   return isAndroidLikeRuntime() ? "android" : "main";
@@ -732,23 +609,21 @@ async function syncInstalledSkillsFolderToRepo(token, repoOwner, repoName, _inst
   const remoteUrl = toGitHubTokenRemote(repoOwner, repoName, token);
   const branch = getPreferredSyncBranch();
   const repoDir = await ensureSkillsWorkingTreeRepo(remoteUrl, branch);
-  const addPaths = ["."];
   void _installedMap;
   await runCommand("git", ["config", "user.email", "skills-sync@local"], { cwd: repoDir });
   await runCommand("git", ["config", "user.name", "Skills Sync"], { cwd: repoDir });
-  await runCommand("git", ["add", ...addPaths], { cwd: repoDir });
+  await runCommand("git", ["add", "."], { cwd: repoDir });
   const status = (await runCommandWithOutput("git", ["status", "--porcelain"], { cwd: repoDir })).trim();
   if (!status) return;
   await runCommand("git", ["commit", "-m", "Sync installed skills folder and manifest"], { cwd: repoDir });
   await runCommand("git", ["push", "origin", `HEAD:${branch}`], { cwd: repoDir });
 }
-async function pullInstalledSkillsFolderFromRepo(token, repoOwner, repoName, _localSkillsDir) {
+async function pullInstalledSkillsFolderFromRepo(token, repoOwner, repoName) {
   const remoteUrl = toGitHubTokenRemote(repoOwner, repoName, token);
   const branch = getPreferredSyncBranch();
   await ensureSkillsWorkingTreeRepo(remoteUrl, branch);
 }
-async function bootstrapSkillsFromUpstreamIntoLocal(_localSkillsDir) {
-  void _localSkillsDir;
+async function bootstrapSkillsFromUpstreamIntoLocal() {
   const repoUrl = `https://github.com/${SYNC_UPSTREAM_SKILLS_OWNER}/${SYNC_UPSTREAM_SKILLS_REPO}.git`;
   const branch = getPreferredSyncBranch();
   await ensureSkillsWorkingTreeRepo(repoUrl, branch);
@@ -857,7 +732,6 @@ async function initializeSkillsSyncOnStartup(appServer) {
   startupSyncStatus.branch = getPreferredSyncBranch();
   try {
     const state = await readSkillsSyncState();
-    const localSkillsDir = getSkillsInstallDir();
     if (!state.githubToken) {
       await ensureCodexAgentsSymlinkToSkillsAgents();
       if (!isAndroidLikeRuntime()) {
@@ -868,7 +742,7 @@ async function initializeSkillsSyncOnStartup(appServer) {
       }
       startupSyncStatus.mode = "unauthenticated-bootstrap";
       startupSyncStatus.lastAction = "pull-upstream";
-      await bootstrapSkillsFromUpstreamIntoLocal(localSkillsDir);
+      await bootstrapSkillsFromUpstreamIntoLocal();
       try {
         await appServer.rpc("skills/list", { forceReload: true });
       } catch {
@@ -882,10 +756,9 @@ async function initializeSkillsSyncOnStartup(appServer) {
     const username = state.githubUsername || await resolveGithubUsername(state.githubToken);
     const repoName = DEFAULT_SKILLS_SYNC_REPO_NAME;
     await ensurePrivateForkFromUpstream(state.githubToken, username, repoName);
-    const nextState = { ...state, githubUsername: username, repoOwner: username, repoName };
-    await writeSkillsSyncState(nextState);
+    await writeSkillsSyncState({ ...state, githubUsername: username, repoOwner: username, repoName });
     startupSyncStatus.lastAction = "pull-private-fork";
-    await pullInstalledSkillsFolderFromRepo(state.githubToken, username, repoName, localSkillsDir);
+    await pullInstalledSkillsFolderFromRepo(state.githubToken, username, repoName);
     try {
       await appServer.rpc("skills/list", { forceReload: true });
     } catch {
@@ -905,15 +778,8 @@ async function finalizeGithubLoginAndSync(token, username, appServer) {
   const repoName = DEFAULT_SKILLS_SYNC_REPO_NAME;
   await ensurePrivateForkFromUpstream(token, username, repoName);
   const current = await readSkillsSyncState();
-  await writeSkillsSyncState({
-    ...current,
-    githubToken: token,
-    githubUsername: username,
-    repoOwner: username,
-    repoName
-  });
-  const localDir = getSkillsInstallDir();
-  await pullInstalledSkillsFolderFromRepo(token, username, repoName, localDir);
+  await writeSkillsSyncState({ ...current, githubToken: token, githubUsername: username, repoOwner: username, repoName });
+  await pullInstalledSkillsFolderFromRepo(token, username, repoName);
   try {
     await appServer.rpc("skills/list", { forceReload: true });
   } catch {
@@ -922,11 +788,10 @@ async function finalizeGithubLoginAndSync(token, username, appServer) {
 }
 async function searchSkillsHub(allEntries, query, limit, sort, installedMap) {
   const q = query.toLowerCase().trim();
-  let filtered = q ? allEntries.filter((s) => {
+  const filtered = q ? allEntries.filter((s) => {
     if (s.name.toLowerCase().includes(q) || s.owner.toLowerCase().includes(q)) return true;
     const cached = metaCache.get(`${s.owner}/${s.name}`);
-    if (cached?.displayName?.toLowerCase().includes(q)) return true;
-    return false;
+    return Boolean(cached?.displayName?.toLowerCase().includes(q));
   }) : allEntries;
   const page = filtered.slice(0, Math.min(limit * 2, 200));
   await fetchMetaBatch(page);
@@ -946,6 +811,494 @@ async function searchSkillsHub(allEntries, query, limit, sort, installedMap) {
     return local ? { ...s, installed: true, path: local.path, enabled: local.enabled } : s;
   });
 }
+async function handleSkillsRoutes(req, res, url, context) {
+  const { appServer, readJsonBody: readJsonBody2 } = context;
+  if (req.method === "GET" && url.pathname === "/codex-api/skills-hub") {
+    try {
+      const q = url.searchParams.get("q") || "";
+      const limit = Math.min(Math.max(parseInt(url.searchParams.get("limit") || "50", 10) || 50, 1), 200);
+      const sort = url.searchParams.get("sort") || "date";
+      const allEntries = await fetchSkillsTree();
+      const installedMap = await scanInstalledSkillsFromDisk();
+      try {
+        const result = await appServer.rpc("skills/list", {});
+        for (const entry of result.data ?? []) {
+          for (const skill of entry.skills ?? []) {
+            if (skill.name) {
+              installedMap.set(skill.name, { name: skill.name, path: skill.path ?? "", enabled: skill.enabled !== false });
+            }
+          }
+        }
+      } catch {
+      }
+      const installedHubEntries = allEntries.filter((e) => installedMap.has(e.name));
+      await fetchMetaBatch(installedHubEntries);
+      const installed = [];
+      for (const [, info] of installedMap) {
+        const hubEntry = allEntries.find((e) => e.name === info.name);
+        const base = hubEntry ? buildHubEntry(hubEntry) : {
+          name: info.name,
+          owner: "local",
+          description: "",
+          displayName: "",
+          publishedAt: 0,
+          avatarUrl: "",
+          url: "",
+          installed: false
+        };
+        installed.push({ ...base, installed: true, path: info.path, enabled: info.enabled });
+      }
+      const results = await searchSkillsHub(allEntries, q, limit, sort, installedMap);
+      setJson(res, 200, { data: results, installed, total: allEntries.length });
+    } catch (error) {
+      setJson(res, 502, { error: getErrorMessage(error, "Failed to fetch skills hub") });
+    }
+    return true;
+  }
+  if (req.method === "GET" && url.pathname === "/codex-api/skills-sync/status") {
+    const state = await readSkillsSyncState();
+    setJson(res, 200, {
+      data: {
+        loggedIn: Boolean(state.githubToken),
+        githubUsername: state.githubUsername ?? "",
+        repoOwner: state.repoOwner ?? "",
+        repoName: state.repoName ?? "",
+        configured: Boolean(state.githubToken && state.repoOwner && state.repoName),
+        startup: {
+          inProgress: startupSyncStatus.inProgress,
+          mode: startupSyncStatus.mode,
+          branch: startupSyncStatus.branch,
+          lastAction: startupSyncStatus.lastAction,
+          lastRunAtIso: startupSyncStatus.lastRunAtIso,
+          lastSuccessAtIso: startupSyncStatus.lastSuccessAtIso,
+          lastError: startupSyncStatus.lastError
+        }
+      }
+    });
+    return true;
+  }
+  if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/github/start-login") {
+    try {
+      const started = await startGithubDeviceLogin();
+      setJson(res, 200, { data: started });
+    } catch (error) {
+      setJson(res, 502, { error: getErrorMessage(error, "Failed to start GitHub login") });
+    }
+    return true;
+  }
+  if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/github/token-login") {
+    try {
+      const payload = asRecord(await readJsonBody2(req));
+      const token = typeof payload?.token === "string" ? payload.token.trim() : "";
+      if (!token) {
+        setJson(res, 400, { error: "Missing GitHub token" });
+        return true;
+      }
+      const username = await resolveGithubUsername(token);
+      await finalizeGithubLoginAndSync(token, username, appServer);
+      setJson(res, 200, { ok: true, data: { githubUsername: username } });
+    } catch (error) {
+      setJson(res, 502, { error: getErrorMessage(error, "Failed to login with GitHub token") });
+    }
+    return true;
+  }
+  if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/github/logout") {
+    try {
+      const state = await readSkillsSyncState();
+      await writeSkillsSyncState({
+        ...state,
+        githubToken: void 0,
+        githubUsername: void 0,
+        repoOwner: void 0,
+        repoName: void 0
+      });
+      setJson(res, 200, { ok: true });
+    } catch (error) {
+      setJson(res, 500, { error: getErrorMessage(error, "Failed to logout GitHub") });
+    }
+    return true;
+  }
+  if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/github/complete-login") {
+    try {
+      const payload = asRecord(await readJsonBody2(req));
+      const deviceCode = typeof payload?.deviceCode === "string" ? payload.deviceCode : "";
+      if (!deviceCode) {
+        setJson(res, 400, { error: "Missing deviceCode" });
+        return true;
+      }
+      const result = await completeGithubDeviceLogin(deviceCode);
+      if (!result.token) {
+        setJson(res, 200, { ok: false, pending: result.error === "authorization_pending", error: result.error || "login_failed" });
+        return true;
+      }
+      const token = result.token;
+      const username = await resolveGithubUsername(token);
+      await finalizeGithubLoginAndSync(token, username, appServer);
+      setJson(res, 200, { ok: true, data: { githubUsername: username } });
+    } catch (error) {
+      setJson(res, 502, { error: getErrorMessage(error, "Failed to complete GitHub login") });
+    }
+    return true;
+  }
+  if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/push") {
+    try {
+      const state = await readSkillsSyncState();
+      if (!state.githubToken || !state.repoOwner || !state.repoName) {
+        setJson(res, 400, { error: "Skills sync is not configured yet" });
+        return true;
+      }
+      if (isUpstreamSkillsRepo(state.repoOwner, state.repoName)) {
+        setJson(res, 400, { error: "Refusing to push to upstream repository" });
+        return true;
+      }
+      const local = await collectLocalSyncedSkills(appServer);
+      const installedMap = await scanInstalledSkillsFromDisk();
+      await writeRemoteSkillsManifest(state.githubToken, state.repoOwner, state.repoName, local);
+      await syncInstalledSkillsFolderToRepo(state.githubToken, state.repoOwner, state.repoName, installedMap);
+      setJson(res, 200, { ok: true, data: { synced: local.length } });
+    } catch (error) {
+      setJson(res, 502, { error: getErrorMessage(error, "Failed to push synced skills") });
+    }
+    return true;
+  }
+  if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/pull") {
+    try {
+      const state = await readSkillsSyncState();
+      if (!state.githubToken || !state.repoOwner || !state.repoName) {
+        await bootstrapSkillsFromUpstreamIntoLocal();
+        try {
+          await appServer.rpc("skills/list", { forceReload: true });
+        } catch {
+        }
+        setJson(res, 200, { ok: true, data: { synced: 0, source: "upstream" } });
+        return true;
+      }
+      const remote = await readRemoteSkillsManifest(state.githubToken, state.repoOwner, state.repoName);
+      const tree = await fetchSkillsTree();
+      const uniqueOwnerByName = /* @__PURE__ */ new Map();
+      const ambiguousNames = /* @__PURE__ */ new Set();
+      for (const entry of tree) {
+        if (ambiguousNames.has(entry.name)) continue;
+        const existingOwner = uniqueOwnerByName.get(entry.name);
+        if (!existingOwner) {
+          uniqueOwnerByName.set(entry.name, entry.owner);
+          continue;
+        }
+        if (existingOwner !== entry.owner) {
+          uniqueOwnerByName.delete(entry.name);
+          ambiguousNames.add(entry.name);
+        }
+      }
+      const localDir = await detectUserSkillsDir(appServer);
+      await pullInstalledSkillsFolderFromRepo(state.githubToken, state.repoOwner, state.repoName);
+      const installerScript = "/Users/igor/.cursor/skills/.system/skill-installer/scripts/install-skill-from-github.py";
+      const localSkills = await scanInstalledSkillsFromDisk();
+      for (const skill of remote) {
+        const owner = skill.owner || uniqueOwnerByName.get(skill.name) || "";
+        if (!owner) continue;
+        if (!localSkills.has(skill.name)) {
+          await runCommand("python3", [
+            installerScript,
+            "--repo",
+            `${HUB_SKILLS_OWNER}/${HUB_SKILLS_REPO}`,
+            "--path",
+            `skills/${owner}/${skill.name}`,
+            "--dest",
+            localDir,
+            "--method",
+            "git"
+          ]);
+        }
+        const skillPath = join(localDir, skill.name);
+        await appServer.rpc("skills/config/write", { path: skillPath, enabled: skill.enabled });
+      }
+      const remoteNames = new Set(remote.map((row) => row.name));
+      for (const [name, localInfo] of localSkills.entries()) {
+        if (!remoteNames.has(name)) {
+          await rm(localInfo.path.replace(/\/SKILL\.md$/, ""), { recursive: true, force: true });
+        }
+      }
+      const nextOwners = {};
+      for (const item of remote) {
+        const owner = item.owner || uniqueOwnerByName.get(item.name) || "";
+        if (owner) nextOwners[item.name] = owner;
+      }
+      await writeSkillsSyncState({ ...state, installedOwners: nextOwners });
+      try {
+        await appServer.rpc("skills/list", { forceReload: true });
+      } catch {
+      }
+      setJson(res, 200, { ok: true, data: { synced: remote.length } });
+    } catch (error) {
+      setJson(res, 502, { error: getErrorMessage(error, "Failed to pull synced skills") });
+    }
+    return true;
+  }
+  if (req.method === "GET" && url.pathname === "/codex-api/skills-hub/readme") {
+    try {
+      const owner = url.searchParams.get("owner") || "";
+      const name = url.searchParams.get("name") || "";
+      if (!owner || !name) {
+        setJson(res, 400, { error: "Missing owner or name" });
+        return true;
+      }
+      const rawUrl = `https://raw.githubusercontent.com/${HUB_SKILLS_OWNER}/${HUB_SKILLS_REPO}/main/skills/${owner}/${name}/SKILL.md`;
+      const resp = await fetch(rawUrl);
+      if (!resp.ok) throw new Error(`Failed to fetch SKILL.md: ${resp.status}`);
+      const content = await resp.text();
+      setJson(res, 200, { content });
+    } catch (error) {
+      setJson(res, 502, { error: getErrorMessage(error, "Failed to fetch SKILL.md") });
+    }
+    return true;
+  }
+  if (req.method === "POST" && url.pathname === "/codex-api/skills-hub/install") {
+    try {
+      const payload = asRecord(await readJsonBody2(req));
+      const owner = typeof payload?.owner === "string" ? payload.owner : "";
+      const name = typeof payload?.name === "string" ? payload.name : "";
+      if (!owner || !name) {
+        setJson(res, 400, { error: "Missing owner or name" });
+        return true;
+      }
+      const installerScript = "/Users/igor/.cursor/skills/.system/skill-installer/scripts/install-skill-from-github.py";
+      const installDest = await detectUserSkillsDir(appServer);
+      await runCommand("python3", [
+        installerScript,
+        "--repo",
+        `${HUB_SKILLS_OWNER}/${HUB_SKILLS_REPO}`,
+        "--path",
+        `skills/${owner}/${name}`,
+        "--dest",
+        installDest,
+        "--method",
+        "git"
+      ]);
+      const skillDir = join(installDest, name);
+      await ensureInstalledSkillIsValid(appServer, skillDir);
+      const syncState = await readSkillsSyncState();
+      const nextOwners = { ...syncState.installedOwners ?? {}, [name]: owner };
+      await writeSkillsSyncState({ ...syncState, installedOwners: nextOwners });
+      await autoPushSyncedSkills(appServer);
+      setJson(res, 200, { ok: true, path: skillDir });
+    } catch (error) {
+      setJson(res, 502, { error: getErrorMessage(error, "Failed to install skill") });
+    }
+    return true;
+  }
+  if (req.method === "POST" && url.pathname === "/codex-api/skills-hub/uninstall") {
+    try {
+      const payload = asRecord(await readJsonBody2(req));
+      const name = typeof payload?.name === "string" ? payload.name : "";
+      const path = typeof payload?.path === "string" ? payload.path : "";
+      const target = path || (name ? join(getSkillsInstallDir(), name) : "");
+      if (!target) {
+        setJson(res, 400, { error: "Missing name or path" });
+        return true;
+      }
+      await rm(target, { recursive: true, force: true });
+      if (name) {
+        const syncState = await readSkillsSyncState();
+        const nextOwners = { ...syncState.installedOwners ?? {} };
+        delete nextOwners[name];
+        await writeSkillsSyncState({ ...syncState, installedOwners: nextOwners });
+      }
+      await autoPushSyncedSkills(appServer);
+      try {
+        await appServer.rpc("skills/list", { forceReload: true });
+      } catch {
+      }
+      setJson(res, 200, { ok: true, deletedPath: target });
+    } catch (error) {
+      setJson(res, 502, { error: getErrorMessage(error, "Failed to uninstall skill") });
+    }
+    return true;
+  }
+  return false;
+}
+
+// src/server/codexAppServerBridge.ts
+function asRecord2(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function getErrorMessage2(payload, fallback) {
+  if (payload instanceof Error && payload.message.trim().length > 0) {
+    return payload.message;
+  }
+  const record = asRecord2(payload);
+  if (!record) return fallback;
+  const error = record.error;
+  if (typeof error === "string" && error.length > 0) return error;
+  const nestedError = asRecord2(error);
+  if (nestedError && typeof nestedError.message === "string" && nestedError.message.length > 0) {
+    return nestedError.message;
+  }
+  return fallback;
+}
+function setJson2(res, statusCode, payload) {
+  res.statusCode = statusCode;
+  res.setHeader("Content-Type", "application/json; charset=utf-8");
+  res.end(JSON.stringify(payload));
+}
+function extractThreadMessageText(threadReadPayload) {
+  const payload = asRecord2(threadReadPayload);
+  const thread = asRecord2(payload?.thread);
+  const turns = Array.isArray(thread?.turns) ? thread.turns : [];
+  const parts = [];
+  for (const turn of turns) {
+    const turnRecord = asRecord2(turn);
+    const items = Array.isArray(turnRecord?.items) ? turnRecord.items : [];
+    for (const item of items) {
+      const itemRecord = asRecord2(item);
+      const type = typeof itemRecord?.type === "string" ? itemRecord.type : "";
+      if (type === "agentMessage" && typeof itemRecord?.text === "string" && itemRecord.text.trim().length > 0) {
+        parts.push(itemRecord.text.trim());
+        continue;
+      }
+      if (type === "userMessage") {
+        const content = Array.isArray(itemRecord?.content) ? itemRecord.content : [];
+        for (const block of content) {
+          const blockRecord = asRecord2(block);
+          if (blockRecord?.type === "text" && typeof blockRecord.text === "string" && blockRecord.text.trim().length > 0) {
+            parts.push(blockRecord.text.trim());
+          }
+        }
+        continue;
+      }
+      if (type === "commandExecution") {
+        const command = typeof itemRecord?.command === "string" ? itemRecord.command.trim() : "";
+        const output = typeof itemRecord?.aggregatedOutput === "string" ? itemRecord.aggregatedOutput.trim() : "";
+        if (command) parts.push(command);
+        if (output) parts.push(output);
+      }
+    }
+  }
+  return parts.join("\n").trim();
+}
+function isExactPhraseMatch(query, doc) {
+  const q = query.trim().toLowerCase();
+  if (!q) return false;
+  return doc.title.toLowerCase().includes(q) || doc.preview.toLowerCase().includes(q) || doc.messageText.toLowerCase().includes(q);
+}
+function scoreFileCandidate(path, query) {
+  if (!query) return 0;
+  const lowerPath = path.toLowerCase();
+  const lowerQuery = query.toLowerCase();
+  const baseName = lowerPath.slice(lowerPath.lastIndexOf("/") + 1);
+  if (baseName === lowerQuery) return 0;
+  if (baseName.startsWith(lowerQuery)) return 1;
+  if (baseName.includes(lowerQuery)) return 2;
+  if (lowerPath.includes(`/${lowerQuery}`)) return 3;
+  if (lowerPath.includes(lowerQuery)) return 4;
+  return 10;
+}
+async function listFilesWithRipgrep(cwd) {
+  return await new Promise((resolve2, reject) => {
+    const proc = spawn2("rg", ["--files", "--hidden", "-g", "!.git", "-g", "!node_modules"], {
+      cwd,
+      env: process.env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    proc.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    proc.stderr.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    proc.on("error", reject);
+    proc.on("close", (code) => {
+      if (code === 0) {
+        const rows = stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+        resolve2(rows);
+        return;
+      }
+      const details = [stderr.trim(), stdout.trim()].filter(Boolean).join("\n");
+      reject(new Error(details || "rg --files failed"));
+    });
+  });
+}
+function getCodexHomeDir2() {
+  const codexHome = process.env.CODEX_HOME?.trim();
+  return codexHome && codexHome.length > 0 ? codexHome : join2(homedir2(), ".codex");
+}
+async function runCommand2(command, args, options = {}) {
+  await new Promise((resolve2, reject) => {
+    const proc = spawn2(command, args, {
+      cwd: options.cwd,
+      env: process.env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    proc.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    proc.stderr.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    proc.on("error", reject);
+    proc.on("close", (code) => {
+      if (code === 0) {
+        resolve2();
+        return;
+      }
+      const details = [stderr.trim(), stdout.trim()].filter(Boolean).join("\n");
+      const suffix = details.length > 0 ? `: ${details}` : "";
+      reject(new Error(`Command failed (${command} ${args.join(" ")})${suffix}`));
+    });
+  });
+}
+function isMissingHeadError(error) {
+  const message = getErrorMessage2(error, "").toLowerCase();
+  return message.includes("not a valid object name: 'head'") || message.includes("not a valid object name: head") || message.includes("invalid reference: head");
+}
+function isNotGitRepositoryError(error) {
+  const message = getErrorMessage2(error, "").toLowerCase();
+  return message.includes("not a git repository") || message.includes("fatal: not a git repository");
+}
+async function ensureRepoHasInitialCommit(repoRoot) {
+  const agentsPath = join2(repoRoot, "AGENTS.md");
+  try {
+    await stat2(agentsPath);
+  } catch {
+    await writeFile2(agentsPath, "", "utf8");
+  }
+  await runCommand2("git", ["add", "AGENTS.md"], { cwd: repoRoot });
+  await runCommand2(
+    "git",
+    ["-c", "user.name=Codex", "-c", "user.email=codex@local", "commit", "-m", "Initialize repository for worktree support"],
+    { cwd: repoRoot }
+  );
+}
+async function runCommandCapture(command, args, options = {}) {
+  return await new Promise((resolve2, reject) => {
+    const proc = spawn2(command, args, {
+      cwd: options.cwd,
+      env: process.env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    proc.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    proc.stderr.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    proc.on("error", reject);
+    proc.on("close", (code) => {
+      if (code === 0) {
+        resolve2(stdout.trim());
+        return;
+      }
+      const details = [stderr.trim(), stdout.trim()].filter(Boolean).join("\n");
+      const suffix = details.length > 0 ? `: ${details}` : "";
+      reject(new Error(`Command failed (${command} ${args.join(" ")})${suffix}`));
+    });
+  });
+}
 function normalizeStringArray(value) {
   if (!Array.isArray(value)) return [];
   const normalized = [];
@@ -967,11 +1320,11 @@ function normalizeStringRecord(value) {
   return next;
 }
 function getCodexAuthPath() {
-  return join(getCodexHomeDir(), "auth.json");
+  return join2(getCodexHomeDir2(), "auth.json");
 }
 async function readCodexAuth() {
   try {
-    const raw = await readFile(getCodexAuthPath(), "utf8");
+    const raw = await readFile2(getCodexAuthPath(), "utf8");
     const auth = JSON.parse(raw);
     const token = auth.tokens?.access_token;
     if (!token) return null;
@@ -981,13 +1334,13 @@ async function readCodexAuth() {
   }
 }
 function getCodexGlobalStatePath() {
-  return join(getCodexHomeDir(), ".codex-global-state.json");
+  return join2(getCodexHomeDir2(), ".codex-global-state.json");
 }
 var MAX_THREAD_TITLES = 500;
 function normalizeThreadTitleCache(value) {
-  const record = asRecord(value);
+  const record = asRecord2(value);
   if (!record) return { titles: {}, order: [] };
-  const rawTitles = asRecord(record.titles);
+  const rawTitles = asRecord2(record.titles);
   const titles = {};
   if (rawTitles) {
     for (const [k, v] of Object.entries(rawTitles)) {
@@ -1013,8 +1366,8 @@ function removeFromThreadTitleCache(cache, id) {
 async function readThreadTitleCache() {
   const statePath = getCodexGlobalStatePath();
   try {
-    const raw = await readFile(statePath, "utf8");
-    const payload = asRecord(JSON.parse(raw)) ?? {};
+    const raw = await readFile2(statePath, "utf8");
+    const payload = asRecord2(JSON.parse(raw)) ?? {};
     return normalizeThreadTitleCache(payload["thread-titles"]);
   } catch {
     return { titles: {}, order: [] };
@@ -1024,21 +1377,21 @@ async function writeThreadTitleCache(cache) {
   const statePath = getCodexGlobalStatePath();
   let payload = {};
   try {
-    const raw = await readFile(statePath, "utf8");
-    payload = asRecord(JSON.parse(raw)) ?? {};
+    const raw = await readFile2(statePath, "utf8");
+    payload = asRecord2(JSON.parse(raw)) ?? {};
   } catch {
     payload = {};
   }
   payload["thread-titles"] = cache;
-  await writeFile(statePath, JSON.stringify(payload), "utf8");
+  await writeFile2(statePath, JSON.stringify(payload), "utf8");
 }
 async function readWorkspaceRootsState() {
   const statePath = getCodexGlobalStatePath();
   let payload = {};
   try {
-    const raw = await readFile(statePath, "utf8");
+    const raw = await readFile2(statePath, "utf8");
     const parsed = JSON.parse(raw);
-    payload = asRecord(parsed) ?? {};
+    payload = asRecord2(parsed) ?? {};
   } catch {
     payload = {};
   }
@@ -1052,15 +1405,15 @@ async function writeWorkspaceRootsState(nextState) {
   const statePath = getCodexGlobalStatePath();
   let payload = {};
   try {
-    const raw = await readFile(statePath, "utf8");
-    payload = asRecord(JSON.parse(raw)) ?? {};
+    const raw = await readFile2(statePath, "utf8");
+    payload = asRecord2(JSON.parse(raw)) ?? {};
   } catch {
     payload = {};
   }
   payload["electron-saved-workspace-roots"] = normalizeStringArray(nextState.order);
   payload["electron-workspace-root-labels"] = normalizeStringRecord(nextState.labels);
   payload["active-workspace-roots"] = normalizeStringArray(nextState.active);
-  await writeFile(statePath, JSON.stringify(payload), "utf8");
+  await writeFile2(statePath, JSON.stringify(payload), "utf8");
 }
 async function readJsonBody(req) {
   const raw = await readRawBody(req);
@@ -1098,7 +1451,7 @@ function handleFileUpload(req, res) {
       const contentType = req.headers["content-type"] ?? "";
       const boundaryMatch = contentType.match(/boundary=(.+)/i);
       if (!boundaryMatch) {
-        setJson(res, 400, { error: "Missing multipart boundary" });
+        setJson2(res, 400, { error: "Missing multipart boundary" });
         return;
       }
       const boundary = boundaryMatch[1];
@@ -1128,21 +1481,21 @@ function handleFileUpload(req, res) {
         break;
       }
       if (!fileData) {
-        setJson(res, 400, { error: "No file in request" });
+        setJson2(res, 400, { error: "No file in request" });
         return;
       }
-      const uploadDir = join(tmpdir(), "codex-web-uploads");
-      await mkdir(uploadDir, { recursive: true });
-      const destDir = await mkdtemp(join(uploadDir, "f-"));
-      const destPath = join(destDir, fileName);
-      await writeFile(destPath, fileData);
-      setJson(res, 200, { path: destPath });
+      const uploadDir = join2(tmpdir2(), "codex-web-uploads");
+      await mkdir2(uploadDir, { recursive: true });
+      const destDir = await mkdtemp2(join2(uploadDir, "f-"));
+      const destPath = join2(destDir, fileName);
+      await writeFile2(destPath, fileData);
+      setJson2(res, 200, { path: destPath });
     } catch (err) {
-      setJson(res, 500, { error: getErrorMessage(err, "Upload failed") });
+      setJson2(res, 500, { error: getErrorMessage2(err, "Upload failed") });
     }
   });
   req.on("error", (err) => {
-    setJson(res, 500, { error: getErrorMessage(err, "Upload stream error") });
+    setJson2(res, 500, { error: getErrorMessage2(err, "Upload stream error") });
   });
 }
 async function proxyTranscribe(body, contentType, authToken, accountId) {
@@ -1194,7 +1547,7 @@ var AppServerProcess = class {
   start() {
     if (this.process) return;
     this.stopping = false;
-    const proc = spawn("codex", this.appServerArgs, { stdio: ["pipe", "pipe", "pipe"] });
+    const proc = spawn2("codex", this.appServerArgs, { stdio: ["pipe", "pipe", "pipe"] });
     this.process = proc;
     proc.stdout.setEncoding("utf8");
     proc.stdout.on("data", (chunk) => {
@@ -1288,7 +1641,7 @@ var AppServerProcess = class {
     }
     this.pendingServerRequests.delete(requestId);
     this.sendServerRequestReply(requestId, reply);
-    const requestParams = asRecord(pendingRequest.params);
+    const requestParams = asRecord2(pendingRequest.params);
     const threadId = typeof requestParams?.threadId === "string" && requestParams.threadId.length > 0 ? requestParams.threadId : "";
     this.emitNotification({
       method: "server/request/resolved",
@@ -1357,7 +1710,7 @@ var AppServerProcess = class {
   }
   async respondToServerRequest(payload) {
     await this.ensureInitialized();
-    const body = asRecord(payload);
+    const body = asRecord2(payload);
     if (!body) {
       throw new Error("Invalid response payload: expected object");
     }
@@ -1365,7 +1718,7 @@ var AppServerProcess = class {
     if (typeof id !== "number" || !Number.isInteger(id)) {
       throw new Error('Invalid response payload: "id" must be an integer');
     }
-    const rawError = asRecord(body.error);
+    const rawError = asRecord2(body.error);
     if (rawError) {
       const message = typeof rawError.message === "string" && rawError.message.trim().length > 0 ? rawError.message.trim() : "Server request rejected by client";
       const code = typeof rawError.code === "number" && Number.isFinite(rawError.code) ? Math.trunc(rawError.code) : -32e3;
@@ -1420,7 +1773,7 @@ var MethodCatalog = class {
   }
   async runGenerateSchemaCommand(outDir) {
     await new Promise((resolve2, reject) => {
-      const process2 = spawn("codex", ["app-server", "generate-json-schema", "--out", outDir], {
+      const process2 = spawn2("codex", ["app-server", "generate-json-schema", "--out", outDir], {
         stdio: ["ignore", "ignore", "pipe"]
       });
       let stderr = "";
@@ -1439,13 +1792,13 @@ var MethodCatalog = class {
     });
   }
   extractMethodsFromClientRequest(payload) {
-    const root = asRecord(payload);
+    const root = asRecord2(payload);
     const oneOf = Array.isArray(root?.oneOf) ? root.oneOf : [];
     const methods = /* @__PURE__ */ new Set();
     for (const entry of oneOf) {
-      const row = asRecord(entry);
-      const properties = asRecord(row?.properties);
-      const methodDef = asRecord(properties?.method);
+      const row = asRecord2(entry);
+      const properties = asRecord2(row?.properties);
+      const methodDef = asRecord2(properties?.method);
       const methodEnum = Array.isArray(methodDef?.enum) ? methodDef.enum : [];
       for (const item of methodEnum) {
         if (typeof item === "string" && item.length > 0) {
@@ -1456,13 +1809,13 @@ var MethodCatalog = class {
     return Array.from(methods).sort((a, b) => a.localeCompare(b));
   }
   extractMethodsFromServerNotification(payload) {
-    const root = asRecord(payload);
+    const root = asRecord2(payload);
     const oneOf = Array.isArray(root?.oneOf) ? root.oneOf : [];
     const methods = /* @__PURE__ */ new Set();
     for (const entry of oneOf) {
-      const row = asRecord(entry);
-      const properties = asRecord(row?.properties);
-      const methodDef = asRecord(properties?.method);
+      const row = asRecord2(entry);
+      const properties = asRecord2(row?.properties);
+      const methodDef = asRecord2(properties?.method);
       const methodEnum = Array.isArray(methodDef?.enum) ? methodDef.enum : [];
       for (const item of methodEnum) {
         if (typeof item === "string" && item.length > 0) {
@@ -1476,10 +1829,10 @@ var MethodCatalog = class {
     if (this.methodCache) {
       return this.methodCache;
     }
-    const outDir = await mkdtemp(join(tmpdir(), "codex-web-local-schema-"));
+    const outDir = await mkdtemp2(join2(tmpdir2(), "codex-web-local-schema-"));
     await this.runGenerateSchemaCommand(outDir);
-    const clientRequestPath = join(outDir, "ClientRequest.json");
-    const raw = await readFile(clientRequestPath, "utf8");
+    const clientRequestPath = join2(outDir, "ClientRequest.json");
+    const raw = await readFile2(clientRequestPath, "utf8");
     const parsed = JSON.parse(raw);
     const methods = this.extractMethodsFromClientRequest(parsed);
     this.methodCache = methods;
@@ -1489,10 +1842,10 @@ var MethodCatalog = class {
     if (this.notificationCache) {
       return this.notificationCache;
     }
-    const outDir = await mkdtemp(join(tmpdir(), "codex-web-local-schema-"));
+    const outDir = await mkdtemp2(join2(tmpdir2(), "codex-web-local-schema-"));
     await this.runGenerateSchemaCommand(outDir);
-    const serverNotificationPath = join(outDir, "ServerNotification.json");
-    const raw = await readFile(serverNotificationPath, "utf8");
+    const serverNotificationPath = join2(outDir, "ServerNotification.json");
+    const raw = await readFile2(serverNotificationPath, "utf8");
     const parsed = JSON.parse(raw);
     const methods = this.extractMethodsFromServerNotification(parsed);
     this.notificationCache = methods;
@@ -1515,7 +1868,7 @@ async function loadAllThreadsForSearch(appServer) {
   const threads = [];
   let cursor = null;
   do {
-    const response = asRecord(await appServer.rpc("thread/list", {
+    const response = asRecord2(await appServer.rpc("thread/list", {
       archived: false,
       limit: 100,
       sortKey: "updated_at",
@@ -1523,7 +1876,7 @@ async function loadAllThreadsForSearch(appServer) {
     }));
     const data = Array.isArray(response?.data) ? response.data : [];
     for (const row of data) {
-      const record = asRecord(row);
+      const record = asRecord2(row);
       const id = typeof record?.id === "string" ? record.id : "";
       if (!id) continue;
       const title = typeof record?.name === "string" && record.name.trim().length > 0 ? record.name.trim() : typeof record?.preview === "string" && record.preview.trim().length > 0 ? record.preview.trim() : "Untitled thread";
@@ -1595,25 +1948,28 @@ function createCodexBridgeMiddleware() {
         return;
       }
       const url = new URL(req.url, "http://localhost");
+      if (await handleSkillsRoutes(req, res, url, { appServer, readJsonBody })) {
+        return;
+      }
       if (req.method === "POST" && url.pathname === "/codex-api/upload-file") {
         handleFileUpload(req, res);
         return;
       }
       if (req.method === "POST" && url.pathname === "/codex-api/rpc") {
         const payload = await readJsonBody(req);
-        const body = asRecord(payload);
+        const body = asRecord2(payload);
         if (!body || typeof body.method !== "string" || body.method.length === 0) {
-          setJson(res, 400, { error: "Invalid body: expected { method, params? }" });
+          setJson2(res, 400, { error: "Invalid body: expected { method, params? }" });
           return;
         }
         const result = await appServer.rpc(body.method, body.params ?? null);
-        setJson(res, 200, { result });
+        setJson2(res, 200, { result });
         return;
       }
       if (req.method === "POST" && url.pathname === "/codex-api/transcribe") {
         const auth = await readCodexAuth();
         if (!auth) {
-          setJson(res, 401, { error: "No auth token available for transcription" });
+          setJson2(res, 401, { error: "No auth token available for transcription" });
           return;
         }
         const rawBody = await readRawBody(req);
@@ -1627,48 +1983,48 @@ function createCodexBridgeMiddleware() {
       if (req.method === "POST" && url.pathname === "/codex-api/server-requests/respond") {
         const payload = await readJsonBody(req);
         await appServer.respondToServerRequest(payload);
-        setJson(res, 200, { ok: true });
+        setJson2(res, 200, { ok: true });
         return;
       }
       if (req.method === "GET" && url.pathname === "/codex-api/server-requests/pending") {
-        setJson(res, 200, { data: appServer.listPendingServerRequests() });
+        setJson2(res, 200, { data: appServer.listPendingServerRequests() });
         return;
       }
       if (req.method === "GET" && url.pathname === "/codex-api/meta/methods") {
         const methods = await methodCatalog.listMethods();
-        setJson(res, 200, { data: methods });
+        setJson2(res, 200, { data: methods });
         return;
       }
       if (req.method === "GET" && url.pathname === "/codex-api/meta/notifications") {
         const methods = await methodCatalog.listNotificationMethods();
-        setJson(res, 200, { data: methods });
+        setJson2(res, 200, { data: methods });
         return;
       }
       if (req.method === "GET" && url.pathname === "/codex-api/workspace-roots-state") {
         const state = await readWorkspaceRootsState();
-        setJson(res, 200, { data: state });
+        setJson2(res, 200, { data: state });
         return;
       }
       if (req.method === "GET" && url.pathname === "/codex-api/home-directory") {
-        setJson(res, 200, { data: { path: homedir() } });
+        setJson2(res, 200, { data: { path: homedir2() } });
         return;
       }
       if (req.method === "POST" && url.pathname === "/codex-api/worktree/create") {
-        const payload = asRecord(await readJsonBody(req));
+        const payload = asRecord2(await readJsonBody(req));
         const rawSourceCwd = typeof payload?.sourceCwd === "string" ? payload.sourceCwd.trim() : "";
         if (!rawSourceCwd) {
-          setJson(res, 400, { error: "Missing sourceCwd" });
+          setJson2(res, 400, { error: "Missing sourceCwd" });
           return;
         }
         const sourceCwd = isAbsolute(rawSourceCwd) ? rawSourceCwd : resolve(rawSourceCwd);
         try {
-          const sourceInfo = await stat(sourceCwd);
+          const sourceInfo = await stat2(sourceCwd);
           if (!sourceInfo.isDirectory()) {
-            setJson(res, 400, { error: "sourceCwd is not a directory" });
+            setJson2(res, 400, { error: "sourceCwd is not a directory" });
             return;
           }
         } catch {
-          setJson(res, 404, { error: "sourceCwd does not exist" });
+          setJson2(res, 404, { error: "sourceCwd does not exist" });
           return;
         }
         try {
@@ -1677,25 +2033,25 @@ function createCodexBridgeMiddleware() {
             gitRoot = await runCommandCapture("git", ["rev-parse", "--show-toplevel"], { cwd: sourceCwd });
           } catch (error) {
             if (!isNotGitRepositoryError(error)) throw error;
-            await runCommand("git", ["init"], { cwd: sourceCwd });
+            await runCommand2("git", ["init"], { cwd: sourceCwd });
             gitRoot = await runCommandCapture("git", ["rev-parse", "--show-toplevel"], { cwd: sourceCwd });
           }
           const repoName = basename(gitRoot) || "repo";
-          const worktreesRoot = join(getCodexHomeDir(), "worktrees");
-          await mkdir(worktreesRoot, { recursive: true });
+          const worktreesRoot = join2(getCodexHomeDir2(), "worktrees");
+          await mkdir2(worktreesRoot, { recursive: true });
           let worktreeId = "";
           let worktreeParent = "";
           let worktreeCwd = "";
           for (let attempt = 0; attempt < 12; attempt += 1) {
             const candidate = randomBytes(2).toString("hex");
-            const parent = join(worktreesRoot, candidate);
+            const parent = join2(worktreesRoot, candidate);
             try {
-              await stat(parent);
+              await stat2(parent);
               continue;
             } catch {
               worktreeId = candidate;
               worktreeParent = parent;
-              worktreeCwd = join(parent, repoName);
+              worktreeCwd = join2(parent, repoName);
               break;
             }
           }
@@ -1703,15 +2059,15 @@ function createCodexBridgeMiddleware() {
             throw new Error("Failed to allocate a unique worktree id");
           }
           const branch = `codex/${worktreeId}`;
-          await mkdir(worktreeParent, { recursive: true });
+          await mkdir2(worktreeParent, { recursive: true });
           try {
-            await runCommand("git", ["worktree", "add", "-b", branch, worktreeCwd, "HEAD"], { cwd: gitRoot });
+            await runCommand2("git", ["worktree", "add", "-b", branch, worktreeCwd, "HEAD"], { cwd: gitRoot });
           } catch (error) {
             if (!isMissingHeadError(error)) throw error;
             await ensureRepoHasInitialCommit(gitRoot);
-            await runCommand("git", ["worktree", "add", "-b", branch, worktreeCwd, "HEAD"], { cwd: gitRoot });
+            await runCommand2("git", ["worktree", "add", "-b", branch, worktreeCwd, "HEAD"], { cwd: gitRoot });
           }
-          setJson(res, 200, {
+          setJson2(res, 200, {
             data: {
               cwd: worktreeCwd,
               branch,
@@ -1719,15 +2075,15 @@ function createCodexBridgeMiddleware() {
             }
           });
         } catch (error) {
-          setJson(res, 500, { error: getErrorMessage(error, "Failed to create worktree") });
+          setJson2(res, 500, { error: getErrorMessage2(error, "Failed to create worktree") });
         }
         return;
       }
       if (req.method === "PUT" && url.pathname === "/codex-api/workspace-roots-state") {
         const payload = await readJsonBody(req);
-        const record = asRecord(payload);
+        const record = asRecord2(payload);
         if (!record) {
-          setJson(res, 400, { error: "Invalid body: expected object" });
+          setJson2(res, 400, { error: "Invalid body: expected object" });
           return;
         }
         const nextState = {
@@ -1736,33 +2092,33 @@ function createCodexBridgeMiddleware() {
           active: normalizeStringArray(record.active)
         };
         await writeWorkspaceRootsState(nextState);
-        setJson(res, 200, { ok: true });
+        setJson2(res, 200, { ok: true });
         return;
       }
       if (req.method === "POST" && url.pathname === "/codex-api/project-root") {
-        const payload = asRecord(await readJsonBody(req));
+        const payload = asRecord2(await readJsonBody(req));
         const rawPath = typeof payload?.path === "string" ? payload.path.trim() : "";
         const createIfMissing = payload?.createIfMissing === true;
         const label = typeof payload?.label === "string" ? payload.label : "";
         if (!rawPath) {
-          setJson(res, 400, { error: "Missing path" });
+          setJson2(res, 400, { error: "Missing path" });
           return;
         }
         const normalizedPath = isAbsolute(rawPath) ? rawPath : resolve(rawPath);
         let pathExists = true;
         try {
-          const info = await stat(normalizedPath);
+          const info = await stat2(normalizedPath);
           if (!info.isDirectory()) {
-            setJson(res, 400, { error: "Path exists but is not a directory" });
+            setJson2(res, 400, { error: "Path exists but is not a directory" });
             return;
           }
         } catch {
           pathExists = false;
         }
         if (!pathExists && createIfMissing) {
-          await mkdir(normalizedPath, { recursive: true });
+          await mkdir2(normalizedPath, { recursive: true });
         } else if (!pathExists) {
-          setJson(res, 404, { error: "Directory does not exist" });
+          setJson2(res, 404, { error: "Directory does not exist" });
           return;
         }
         const existingState = await readWorkspaceRootsState();
@@ -1777,408 +2133,103 @@ function createCodexBridgeMiddleware() {
           labels: nextLabels,
           active: nextActive
         });
-        setJson(res, 200, { data: { path: normalizedPath } });
+        setJson2(res, 200, { data: { path: normalizedPath } });
         return;
       }
       if (req.method === "GET" && url.pathname === "/codex-api/project-root-suggestion") {
         const basePath = url.searchParams.get("basePath")?.trim() ?? "";
         if (!basePath) {
-          setJson(res, 400, { error: "Missing basePath" });
+          setJson2(res, 400, { error: "Missing basePath" });
           return;
         }
         const normalizedBasePath = isAbsolute(basePath) ? basePath : resolve(basePath);
         try {
-          const baseInfo = await stat(normalizedBasePath);
+          const baseInfo = await stat2(normalizedBasePath);
           if (!baseInfo.isDirectory()) {
-            setJson(res, 400, { error: "basePath is not a directory" });
+            setJson2(res, 400, { error: "basePath is not a directory" });
             return;
           }
         } catch {
-          setJson(res, 404, { error: "basePath does not exist" });
+          setJson2(res, 404, { error: "basePath does not exist" });
           return;
         }
         let index = 1;
         while (index < 1e5) {
           const candidateName = `New Project (${String(index)})`;
-          const candidatePath = join(normalizedBasePath, candidateName);
+          const candidatePath = join2(normalizedBasePath, candidateName);
           try {
-            await stat(candidatePath);
+            await stat2(candidatePath);
             index += 1;
             continue;
           } catch {
-            setJson(res, 200, { data: { name: candidateName, path: candidatePath } });
+            setJson2(res, 200, { data: { name: candidateName, path: candidatePath } });
             return;
           }
         }
-        setJson(res, 500, { error: "Failed to compute project name suggestion" });
+        setJson2(res, 500, { error: "Failed to compute project name suggestion" });
         return;
       }
       if (req.method === "POST" && url.pathname === "/codex-api/composer-file-search") {
-        const payload = asRecord(await readJsonBody(req));
+        const payload = asRecord2(await readJsonBody(req));
         const rawCwd = typeof payload?.cwd === "string" ? payload.cwd.trim() : "";
         const query = typeof payload?.query === "string" ? payload.query.trim() : "";
         const limitRaw = typeof payload?.limit === "number" ? payload.limit : 20;
         const limit = Math.max(1, Math.min(100, Math.floor(limitRaw)));
         if (!rawCwd) {
-          setJson(res, 400, { error: "Missing cwd" });
+          setJson2(res, 400, { error: "Missing cwd" });
           return;
         }
         const cwd = isAbsolute(rawCwd) ? rawCwd : resolve(rawCwd);
         try {
-          const info = await stat(cwd);
+          const info = await stat2(cwd);
           if (!info.isDirectory()) {
-            setJson(res, 400, { error: "cwd is not a directory" });
+            setJson2(res, 400, { error: "cwd is not a directory" });
             return;
           }
         } catch {
-          setJson(res, 404, { error: "cwd does not exist" });
+          setJson2(res, 404, { error: "cwd does not exist" });
           return;
         }
         try {
           const files = await listFilesWithRipgrep(cwd);
           const scored = files.map((path) => ({ path, score: scoreFileCandidate(path, query) })).filter((row) => query.length === 0 || row.score < 10).sort((a, b) => a.score - b.score || a.path.localeCompare(b.path)).slice(0, limit).map((row) => ({ path: row.path }));
-          setJson(res, 200, { data: scored });
+          setJson2(res, 200, { data: scored });
         } catch (error) {
-          setJson(res, 500, { error: getErrorMessage(error, "Failed to search files") });
+          setJson2(res, 500, { error: getErrorMessage2(error, "Failed to search files") });
         }
         return;
       }
       if (req.method === "GET" && url.pathname === "/codex-api/thread-titles") {
         const cache = await readThreadTitleCache();
-        setJson(res, 200, { data: cache });
+        setJson2(res, 200, { data: cache });
         return;
       }
       if (req.method === "POST" && url.pathname === "/codex-api/thread-search") {
-        const payload = asRecord(await readJsonBody(req));
+        const payload = asRecord2(await readJsonBody(req));
         const query = typeof payload?.query === "string" ? payload.query.trim() : "";
         const limitRaw = typeof payload?.limit === "number" ? payload.limit : 200;
         const limit = Math.max(1, Math.min(1e3, Math.floor(limitRaw)));
         if (!query) {
-          setJson(res, 200, { data: { threadIds: [], indexedThreadCount: 0 } });
+          setJson2(res, 200, { data: { threadIds: [], indexedThreadCount: 0 } });
           return;
         }
         const index = await getThreadSearchIndex();
         const matchedIds = Array.from(index.docsById.entries()).filter(([, doc]) => isExactPhraseMatch(query, doc)).slice(0, limit).map(([id]) => id);
-        setJson(res, 200, { data: { threadIds: matchedIds, indexedThreadCount: index.docsById.size } });
+        setJson2(res, 200, { data: { threadIds: matchedIds, indexedThreadCount: index.docsById.size } });
         return;
       }
       if (req.method === "PUT" && url.pathname === "/codex-api/thread-titles") {
-        const payload = asRecord(await readJsonBody(req));
+        const payload = asRecord2(await readJsonBody(req));
         const id = typeof payload?.id === "string" ? payload.id : "";
         const title = typeof payload?.title === "string" ? payload.title : "";
         if (!id) {
-          setJson(res, 400, { error: "Missing id" });
+          setJson2(res, 400, { error: "Missing id" });
           return;
         }
         const cache = await readThreadTitleCache();
         const next2 = title ? updateThreadTitleCache(cache, id, title) : removeFromThreadTitleCache(cache, id);
         await writeThreadTitleCache(next2);
-        setJson(res, 200, { ok: true });
-        return;
-      }
-      if (req.method === "GET" && url.pathname === "/codex-api/skills-hub") {
-        try {
-          const q = url.searchParams.get("q") || "";
-          const limit = Math.min(Math.max(parseInt(url.searchParams.get("limit") || "50", 10) || 50, 1), 200);
-          const sort = url.searchParams.get("sort") || "date";
-          const allEntries = await fetchSkillsTree();
-          const installedMap = await scanInstalledSkillsFromDisk();
-          try {
-            const result = await appServer.rpc("skills/list", {});
-            for (const entry of result.data ?? []) {
-              for (const skill of entry.skills ?? []) {
-                if (skill.name) {
-                  installedMap.set(skill.name, { name: skill.name, path: skill.path ?? "", enabled: skill.enabled !== false });
-                }
-              }
-            }
-          } catch {
-          }
-          const installedHubEntries = allEntries.filter((e) => installedMap.has(e.name));
-          await fetchMetaBatch(installedHubEntries);
-          const installed = [];
-          for (const [, info] of installedMap) {
-            const hubEntry = allEntries.find((e) => e.name === info.name);
-            const base = hubEntry ? buildHubEntry(hubEntry) : {
-              name: info.name,
-              owner: "local",
-              description: "",
-              displayName: "",
-              publishedAt: 0,
-              avatarUrl: "",
-              url: "",
-              installed: false
-            };
-            installed.push({ ...base, installed: true, path: info.path, enabled: info.enabled });
-          }
-          const results = await searchSkillsHub(allEntries, q, limit, sort, installedMap);
-          setJson(res, 200, { data: results, installed, total: allEntries.length });
-        } catch (error) {
-          setJson(res, 502, { error: getErrorMessage(error, "Failed to fetch skills hub") });
-        }
-        return;
-      }
-      if (req.method === "GET" && url.pathname === "/codex-api/skills-sync/status") {
-        const state = await readSkillsSyncState();
-        setJson(res, 200, {
-          data: {
-            loggedIn: Boolean(state.githubToken),
-            githubUsername: state.githubUsername ?? "",
-            repoOwner: state.repoOwner ?? "",
-            repoName: state.repoName ?? "",
-            configured: Boolean(state.githubToken && state.repoOwner && state.repoName),
-            startup: {
-              inProgress: startupSyncStatus.inProgress,
-              mode: startupSyncStatus.mode,
-              branch: startupSyncStatus.branch,
-              lastAction: startupSyncStatus.lastAction,
-              lastRunAtIso: startupSyncStatus.lastRunAtIso,
-              lastSuccessAtIso: startupSyncStatus.lastSuccessAtIso,
-              lastError: startupSyncStatus.lastError
-            }
-          }
-        });
-        return;
-      }
-      if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/github/start-login") {
-        try {
-          const started = await startGithubDeviceLogin();
-          setJson(res, 200, { data: started });
-        } catch (error) {
-          setJson(res, 502, { error: getErrorMessage(error, "Failed to start GitHub login") });
-        }
-        return;
-      }
-      if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/github/token-login") {
-        try {
-          const payload = asRecord(await readJsonBody(req));
-          const token = typeof payload?.token === "string" ? payload.token.trim() : "";
-          if (!token) {
-            setJson(res, 400, { error: "Missing GitHub token" });
-            return;
-          }
-          const username = await resolveGithubUsername(token);
-          await finalizeGithubLoginAndSync(token, username, appServer);
-          setJson(res, 200, { ok: true, data: { githubUsername: username } });
-        } catch (error) {
-          setJson(res, 502, { error: getErrorMessage(error, "Failed to login with GitHub token") });
-        }
-        return;
-      }
-      if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/github/logout") {
-        try {
-          const state = await readSkillsSyncState();
-          await writeSkillsSyncState({
-            ...state,
-            githubToken: void 0,
-            githubUsername: void 0,
-            repoOwner: void 0,
-            repoName: void 0
-          });
-          setJson(res, 200, { ok: true });
-        } catch (error) {
-          setJson(res, 500, { error: getErrorMessage(error, "Failed to logout GitHub") });
-        }
-        return;
-      }
-      if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/github/complete-login") {
-        try {
-          const payload = asRecord(await readJsonBody(req));
-          const deviceCode = typeof payload?.deviceCode === "string" ? payload.deviceCode : "";
-          if (!deviceCode) {
-            setJson(res, 400, { error: "Missing deviceCode" });
-            return;
-          }
-          const result = await completeGithubDeviceLogin(deviceCode);
-          if (!result.token) {
-            setJson(res, 200, { ok: false, pending: result.error === "authorization_pending", error: result.error || "login_failed" });
-            return;
-          }
-          const token = result.token;
-          const username = await resolveGithubUsername(token);
-          await finalizeGithubLoginAndSync(token, username, appServer);
-          setJson(res, 200, { ok: true, data: { githubUsername: username } });
-        } catch (error) {
-          setJson(res, 502, { error: getErrorMessage(error, "Failed to complete GitHub login") });
-        }
-        return;
-      }
-      if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/push") {
-        try {
-          const state = await readSkillsSyncState();
-          if (!state.githubToken || !state.repoOwner || !state.repoName) {
-            setJson(res, 400, { error: "Skills sync is not configured yet" });
-            return;
-          }
-          if (isUpstreamSkillsRepo(state.repoOwner, state.repoName)) {
-            setJson(res, 400, { error: "Refusing to push to upstream repository" });
-            return;
-          }
-          const local = await collectLocalSyncedSkills(appServer);
-          const installedMap = await scanInstalledSkillsFromDisk();
-          await writeRemoteSkillsManifest(state.githubToken, state.repoOwner, state.repoName, local);
-          await syncInstalledSkillsFolderToRepo(state.githubToken, state.repoOwner, state.repoName, installedMap);
-          setJson(res, 200, { ok: true, data: { synced: local.length } });
-        } catch (error) {
-          setJson(res, 502, { error: getErrorMessage(error, "Failed to push synced skills") });
-        }
-        return;
-      }
-      if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/pull") {
-        try {
-          const state = await readSkillsSyncState();
-          if (!state.githubToken || !state.repoOwner || !state.repoName) {
-            const localDir2 = await detectUserSkillsDir(appServer);
-            await bootstrapSkillsFromUpstreamIntoLocal(localDir2);
-            try {
-              await appServer.rpc("skills/list", { forceReload: true });
-            } catch {
-            }
-            setJson(res, 200, { ok: true, data: { synced: 0, source: "upstream" } });
-            return;
-          }
-          const remote = await readRemoteSkillsManifest(state.githubToken, state.repoOwner, state.repoName);
-          const tree = await fetchSkillsTree();
-          const uniqueOwnerByName = /* @__PURE__ */ new Map();
-          const ambiguousNames = /* @__PURE__ */ new Set();
-          for (const entry of tree) {
-            if (ambiguousNames.has(entry.name)) continue;
-            const existingOwner = uniqueOwnerByName.get(entry.name);
-            if (!existingOwner) {
-              uniqueOwnerByName.set(entry.name, entry.owner);
-              continue;
-            }
-            if (existingOwner !== entry.owner) {
-              uniqueOwnerByName.delete(entry.name);
-              ambiguousNames.add(entry.name);
-            }
-          }
-          const localDir = await detectUserSkillsDir(appServer);
-          await pullInstalledSkillsFolderFromRepo(state.githubToken, state.repoOwner, state.repoName, localDir);
-          const installerScript = "/Users/igor/.cursor/skills/.system/skill-installer/scripts/install-skill-from-github.py";
-          const localSkills = await scanInstalledSkillsFromDisk();
-          for (const skill of remote) {
-            const owner = skill.owner || uniqueOwnerByName.get(skill.name) || "";
-            if (!owner) {
-              continue;
-            }
-            if (!localSkills.has(skill.name)) {
-              await runCommand("python3", [
-                installerScript,
-                "--repo",
-                `${HUB_SKILLS_OWNER}/${HUB_SKILLS_REPO}`,
-                "--path",
-                `skills/${owner}/${skill.name}`,
-                "--dest",
-                localDir,
-                "--method",
-                "git"
-              ]);
-            }
-            const skillPath = join(localDir, skill.name);
-            await appServer.rpc("skills/config/write", { path: skillPath, enabled: skill.enabled });
-          }
-          const remoteNames = new Set(remote.map((row) => row.name));
-          for (const [name, localInfo] of localSkills.entries()) {
-            if (!remoteNames.has(name)) {
-              await rm(localInfo.path.replace(/\/SKILL\.md$/, ""), { recursive: true, force: true });
-            }
-          }
-          const nextOwners = {};
-          for (const item of remote) {
-            const owner = item.owner || uniqueOwnerByName.get(item.name) || "";
-            if (owner) nextOwners[item.name] = owner;
-          }
-          await writeSkillsSyncState({ ...state, installedOwners: nextOwners });
-          try {
-            await appServer.rpc("skills/list", { forceReload: true });
-          } catch {
-          }
-          setJson(res, 200, { ok: true, data: { synced: remote.length } });
-        } catch (error) {
-          setJson(res, 502, { error: getErrorMessage(error, "Failed to pull synced skills") });
-        }
-        return;
-      }
-      if (req.method === "GET" && url.pathname === "/codex-api/skills-hub/readme") {
-        try {
-          const owner = url.searchParams.get("owner") || "";
-          const name = url.searchParams.get("name") || "";
-          if (!owner || !name) {
-            setJson(res, 400, { error: "Missing owner or name" });
-            return;
-          }
-          const rawUrl = `https://raw.githubusercontent.com/${HUB_SKILLS_OWNER}/${HUB_SKILLS_REPO}/main/skills/${owner}/${name}/SKILL.md`;
-          const resp = await fetch(rawUrl);
-          if (!resp.ok) throw new Error(`Failed to fetch SKILL.md: ${resp.status}`);
-          const content = await resp.text();
-          setJson(res, 200, { content });
-        } catch (error) {
-          setJson(res, 502, { error: getErrorMessage(error, "Failed to fetch SKILL.md") });
-        }
-        return;
-      }
-      if (req.method === "POST" && url.pathname === "/codex-api/skills-hub/install") {
-        try {
-          const payload = asRecord(await readJsonBody(req));
-          const owner = typeof payload?.owner === "string" ? payload.owner : "";
-          const name = typeof payload?.name === "string" ? payload.name : "";
-          if (!owner || !name) {
-            setJson(res, 400, { error: "Missing owner or name" });
-            return;
-          }
-          const installerScript = "/Users/igor/.cursor/skills/.system/skill-installer/scripts/install-skill-from-github.py";
-          const installDest = await detectUserSkillsDir(appServer);
-          const skillPathInRepo = `skills/${owner}/${name}`;
-          await runCommand("python3", [
-            installerScript,
-            "--repo",
-            `${HUB_SKILLS_OWNER}/${HUB_SKILLS_REPO}`,
-            "--path",
-            skillPathInRepo,
-            "--dest",
-            installDest,
-            "--method",
-            "git"
-          ]);
-          const skillDir = join(installDest, name);
-          await ensureInstalledSkillIsValid(appServer, skillDir);
-          const syncState = await readSkillsSyncState();
-          const nextOwners = { ...syncState.installedOwners ?? {}, [name]: owner };
-          await writeSkillsSyncState({ ...syncState, installedOwners: nextOwners });
-          await autoPushSyncedSkills(appServer);
-          setJson(res, 200, { ok: true, path: skillDir });
-        } catch (error) {
-          setJson(res, 502, { error: getErrorMessage(error, "Failed to install skill") });
-        }
-        return;
-      }
-      if (req.method === "POST" && url.pathname === "/codex-api/skills-hub/uninstall") {
-        try {
-          const payload = asRecord(await readJsonBody(req));
-          const name = typeof payload?.name === "string" ? payload.name : "";
-          const path = typeof payload?.path === "string" ? payload.path : "";
-          const target = path || (name ? join(getSkillsInstallDir(), name) : "");
-          if (!target) {
-            setJson(res, 400, { error: "Missing name or path" });
-            return;
-          }
-          await rm(target, { recursive: true, force: true });
-          if (name) {
-            const syncState = await readSkillsSyncState();
-            const nextOwners = { ...syncState.installedOwners ?? {} };
-            delete nextOwners[name];
-            await writeSkillsSyncState({ ...syncState, installedOwners: nextOwners });
-          }
-          await autoPushSyncedSkills(appServer);
-          try {
-            await appServer.rpc("skills/list", { forceReload: true });
-          } catch {
-          }
-          setJson(res, 200, { ok: true, deletedPath: target });
-        } catch (error) {
-          setJson(res, 502, { error: getErrorMessage(error, "Failed to uninstall skill") });
-        }
+        setJson2(res, 200, { ok: true });
         return;
       }
       if (req.method === "GET" && url.pathname === "/codex-api/events") {
@@ -2213,8 +2264,8 @@ data: ${JSON.stringify({ ok: true })}
       }
       next();
     } catch (error) {
-      const message = getErrorMessage(error, "Unknown bridge error");
-      setJson(res, 502, { error: message });
+      const message = getErrorMessage2(error, "Unknown bridge error");
+      setJson2(res, 502, { error: message });
     }
   };
   middleware.dispose = () => {
@@ -2351,8 +2402,8 @@ function createAuthSession(password) {
 }
 
 // src/server/localBrowseUi.ts
-import { dirname, extname, join as join2 } from "path";
-import { open, readFile as readFile2, readdir as readdir2, stat as stat2 } from "fs/promises";
+import { dirname, extname, join as join3 } from "path";
+import { open, readFile as readFile3, readdir as readdir3, stat as stat3 } from "fs/promises";
 var TEXT_EDITABLE_EXTENSIONS = /* @__PURE__ */ new Set([
   ".txt",
   ".md",
@@ -2467,7 +2518,7 @@ async function probeFileIsText(localPath) {
 async function isTextEditableFile(localPath) {
   if (isTextEditablePath(localPath)) return true;
   try {
-    const fileStat = await stat2(localPath);
+    const fileStat = await stat3(localPath);
     if (!fileStat.isFile()) return false;
     return await probeFileIsText(localPath);
   } catch {
@@ -2487,10 +2538,10 @@ function escapeForInlineScriptString(value) {
   return JSON.stringify(value).replace(/<\//gu, "<\\/").replace(/<!--/gu, "<\\!--").replace(/\u2028/gu, "\\u2028").replace(/\u2029/gu, "\\u2029");
 }
 async function getDirectoryItems(localPath) {
-  const entries = await readdir2(localPath, { withFileTypes: true });
+  const entries = await readdir3(localPath, { withFileTypes: true });
   const withMeta = await Promise.all(entries.map(async (entry) => {
-    const entryPath = join2(localPath, entry.name);
-    const entryStat = await stat2(entryPath);
+    const entryPath = join3(localPath, entry.name);
+    const entryStat = await stat3(entryPath);
     const editable = !entry.isDirectory() && await isTextEditableFile(entryPath);
     return {
       name: entry.name,
@@ -2548,7 +2599,7 @@ async function createDirectoryListingHtml(localPath) {
 </html>`;
 }
 async function createTextEditorHtml(localPath) {
-  const content = await readFile2(localPath, "utf8");
+  const content = await readFile3(localPath, "utf8");
   const parentPath = dirname(localPath);
   const language = languageForPath(localPath);
   const safeContentLiteral = escapeForInlineScriptString(content);
@@ -2619,8 +2670,8 @@ async function createTextEditorHtml(localPath) {
 // src/server/httpServer.ts
 import { WebSocketServer } from "ws";
 var __dirname = dirname2(fileURLToPath(import.meta.url));
-var distDir = join3(__dirname, "..", "dist");
-var spaEntryFile = join3(distDir, "index.html");
+var distDir = join4(__dirname, "..", "dist");
+var spaEntryFile = join4(distDir, "index.html");
 var IMAGE_CONTENT_TYPES = {
   ".avif": "image/avif",
   ".bmp": "image/bmp",
@@ -2697,7 +2748,7 @@ function createServer(options = {}) {
       return;
     }
     try {
-      const fileStat = await stat3(localPath);
+      const fileStat = await stat4(localPath);
       res.setHeader("Cache-Control", "private, no-store");
       if (fileStat.isDirectory()) {
         const html = await createDirectoryListingHtml(localPath);
@@ -2720,7 +2771,7 @@ function createServer(options = {}) {
       return;
     }
     try {
-      const fileStat = await stat3(localPath);
+      const fileStat = await stat4(localPath);
       if (!fileStat.isFile()) {
         res.status(400).json({ error: "Expected file path." });
         return;
@@ -2744,7 +2795,7 @@ function createServer(options = {}) {
     }
     const body = typeof req.body === "string" ? req.body : "";
     try {
-      await writeFile2(localPath, body, "utf8");
+      await writeFile3(localPath, body, "utf8");
       res.status(200).json({ ok: true });
     } catch {
       res.status(404).json({ error: "File not found." });
@@ -2824,8 +2875,8 @@ var program = new Command().name("codexui").description("Web interface for Codex
 var __dirname2 = dirname3(fileURLToPath2(import.meta.url));
 async function readCliVersion() {
   try {
-    const packageJsonPath = join4(__dirname2, "..", "package.json");
-    const raw = await readFile3(packageJsonPath, "utf8");
+    const packageJsonPath = join5(__dirname2, "..", "package.json");
+    const raw = await readFile4(packageJsonPath, "utf8");
     const parsed = JSON.parse(raw);
     return typeof parsed.version === "string" ? parsed.version : "unknown";
   } catch {
@@ -2850,13 +2901,13 @@ function runWithStatus(command, args) {
   return result.status ?? -1;
 }
 function getUserNpmPrefix() {
-  return join4(homedir2(), ".npm-global");
+  return join5(homedir3(), ".npm-global");
 }
 function resolveCodexCommand() {
   if (canRun("codex", ["--version"])) {
     return "codex";
   }
-  const userCandidate = join4(getUserNpmPrefix(), "bin", "codex");
+  const userCandidate = join5(getUserNpmPrefix(), "bin", "codex");
   if (existsSync3(userCandidate) && canRun(userCandidate, ["--version"])) {
     return userCandidate;
   }
@@ -2864,7 +2915,7 @@ function resolveCodexCommand() {
   if (!prefix) {
     return null;
   }
-  const candidate = join4(prefix, "bin", "codex");
+  const candidate = join5(prefix, "bin", "codex");
   if (existsSync3(candidate) && canRun(candidate, ["--version"])) {
     return candidate;
   }
@@ -2874,7 +2925,7 @@ function resolveCloudflaredCommand() {
   if (canRun("cloudflared", ["--version"])) {
     return "cloudflared";
   }
-  const localCandidate = join4(homedir2(), ".local", "bin", "cloudflared");
+  const localCandidate = join5(homedir3(), ".local", "bin", "cloudflared");
   if (existsSync3(localCandidate) && canRun(localCandidate, ["--version"])) {
     return localCandidate;
   }
@@ -2928,9 +2979,9 @@ async function ensureCloudflaredInstalledLinux() {
   if (!mappedArch) {
     throw new Error(`cloudflared auto-install is not supported for Linux architecture: ${process.arch}`);
   }
-  const userBinDir = join4(homedir2(), ".local", "bin");
+  const userBinDir = join5(homedir3(), ".local", "bin");
   mkdirSync(userBinDir, { recursive: true });
-  const destination = join4(userBinDir, "cloudflared");
+  const destination = join5(userBinDir, "cloudflared");
   const downloadUrl = `https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${mappedArch}`;
   console.log("\ncloudflared not found. Installing to ~/.local/bin...\n");
   await downloadFile(downloadUrl, destination);
@@ -2969,8 +3020,8 @@ async function resolveCloudflaredForTunnel() {
   return ensureCloudflaredInstalledLinux();
 }
 function hasCodexAuth() {
-  const codexHome = process.env.CODEX_HOME?.trim() || join4(homedir2(), ".codex");
-  return existsSync3(join4(codexHome, "auth.json"));
+  const codexHome = process.env.CODEX_HOME?.trim() || join5(homedir3(), ".codex");
+  return existsSync3(join5(codexHome, "auth.json"));
 }
 function ensureCodexInstalled() {
   let codexCommand = resolveCodexCommand();
@@ -2988,7 +3039,7 @@ function ensureCodexInstalled() {
 Global npm install requires elevated permissions. Retrying with --prefix ${userPrefix}...
 `);
       runOrFail("npm", ["install", "-g", "--prefix", userPrefix, pkg], `${label} (user prefix)`);
-      process.env.PATH = `${join4(userPrefix, "bin")}:${process.env.PATH ?? ""}`;
+      process.env.PATH = `${join5(userPrefix, "bin")}:${process.env.PATH ?? ""}`;
     };
     if (isTermuxRuntime()) {
       console.log("\nCodex CLI not found. Installing Termux-compatible Codex CLI from npm...\n");
@@ -3037,7 +3088,7 @@ function printTermuxKeepAlive(lines) {
 }
 function openBrowser(url) {
   const command = process.platform === "darwin" ? { cmd: "open", args: [url] } : process.platform === "win32" ? { cmd: "cmd", args: ["/c", "start", "", url] } : { cmd: "xdg-open", args: [url] };
-  const child = spawn2(command.cmd, command.args, { detached: true, stdio: "ignore" });
+  const child = spawn3(command.cmd, command.args, { detached: true, stdio: "ignore" });
   child.on("error", () => {
   });
   child.unref();
@@ -3069,7 +3120,7 @@ function getAccessibleUrls(port) {
 }
 async function startCloudflaredTunnel(command, localPort) {
   return new Promise((resolve2, reject) => {
-    const child = spawn2(command, ["tunnel", "--url", `http://localhost:${String(localPort)}`], {
+    const child = spawn3(command, ["tunnel", "--url", `http://localhost:${String(localPort)}`], {
       stdio: ["ignore", "pipe", "pipe"]
     });
     const timeout = setTimeout(() => {