codexapp 0.1.45 → 0.1.46

package/dist-cli/index.js

@@ -2,12 +2,12 @@
 
 // src/cli/index.ts
 import { createServer as createServer2 } from "http";
-import { chmodSync, createWriteStream, existsSync as existsSync2, 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 { createInterface } from "readline/promises";
+import { chmodSync, createWriteStream, existsSync as existsSync4, mkdirSync } from "fs";
+import { readFile as readFile4, stat as stat5, writeFile as writeFile4 } from "fs/promises";
+import { homedir as homedir3, networkInterfaces } from "os";
+import { isAbsolute as isAbsolute3, join as join5, resolve as resolve2 } from "path";
+import { spawn as spawn3, spawnSync } from "child_process";
+import { createInterface as createInterface2 } from "readline/promises";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { dirname as dirname3 } from "path";
 import { get as httpsGet } from "https";
@@ -16,19 +16,30 @@ 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 { existsSync } from "fs";
-import { writeFile as writeFile2, stat as stat3 } from "fs/promises";
+import { dirname as dirname2, extname as extname2, isAbsolute as isAbsolute2, join as join4 } from "path";
+import { existsSync as existsSync3 } from "fs";
+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, readFile, readdir, rm, mkdir, stat } from "fs/promises";
+import { mkdtemp as mkdtemp2, readFile as readFile2, mkdir as mkdir2, stat as stat2 } from "fs/promises";
+import { createReadStream } from "fs";
+import { request as httpRequest } from "http";
 import { request as httpsRequest } from "https";
-import { homedir } from "os";
-import { tmpdir } from "os";
-import { basename, isAbsolute, join, resolve } from "path";
+import { homedir as homedir2 } from "os";
+import { tmpdir as tmpdir2 } from "os";
+import { basename, isAbsolute, join as join2, resolve } from "path";
+import { createInterface } from "readline";
+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 { 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;
@@ -52,85 +63,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");
@@ -139,7 +71,7 @@ function getSkillsInstallDir() {
   return join(getCodexHomeDir(), "skills");
 }
 async function runCommand(command, args, options = {}) {
-  await new Promise((resolve2, reject) => {
+  await new Promise((resolve3, reject) => {
     const proc = spawn(command, args, {
       cwd: options.cwd,
       env: process.env,
@@ -156,7 +88,7 @@ async function runCommand(command, args, options = {}) {
     proc.on("error", reject);
     proc.on("close", (code) => {
       if (code === 0) {
-        resolve2();
+        resolve3();
         return;
       }
       const details = [stderr.trim(), stdout.trim()].filter(Boolean).join("\n");
@@ -165,30 +97,8 @@ 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((resolveOutput, reject) => {
+async function runCommandWithOutput(command, args, options = {}) {
+  return await new Promise((resolve3, reject) => {
     const proc = spawn(command, args, {
       cwd: options.cwd,
       env: process.env,
@@ -205,7 +115,7 @@ async function runCommandCapture(command, args, options = {}) {
     proc.on("error", reject);
     proc.on("close", (code) => {
       if (code === 0) {
-        resolveOutput(stdout.trim());
+        resolve3(stdout.trim());
         return;
       }
       const details = [stderr.trim(), stdout.trim()].filter(Boolean).join("\n");
@@ -250,9 +160,9 @@ async function getGhToken() {
     proc.stdout.on("data", (d) => {
       out += d.toString();
     });
-    return new Promise((resolve2) => {
-      proc.on("close", (code) => resolve2(code === 0 ? out.trim() : null));
-      proc.on("error", () => resolve2(null));
+    return new Promise((resolve3) => {
+      proc.on("close", (code) => resolve3(code === 0 ? out.trim() : null));
+      proc.on("error", () => resolve3(null));
     });
   } catch {
     return null;
@@ -271,7 +181,7 @@ async function fetchSkillsTree() {
   if (skillsTreeCache && Date.now() - skillsTreeCache.fetchedAt < TREE_CACHE_TTL_MS) {
     return skillsTreeCache.entries;
   }
-  const resp = await ghFetch("https://api.github.com/repos/openclaw/skills/git/trees/main?recursive=1");
+  const resp = await ghFetch(`https://api.github.com/repos/${HUB_SKILLS_OWNER}/${HUB_SKILLS_REPO}/git/trees/main?recursive=1`);
   if (!resp.ok) throw new Error(`GitHub tree API returned ${resp.status}`);
   const data = await resp.json();
   const metaPattern = /^skills\/([^/]+)\/([^/]+)\/_meta\.json$/;
@@ -287,86 +197,1109 @@ async function fetchSkillsTree() {
     entries.push({
       name: skillName,
       owner,
-      url: `https://github.com/openclaw/skills/tree/main/skills/${owner}/${skillName}`
+      url: `https://github.com/${HUB_SKILLS_OWNER}/${HUB_SKILLS_REPO}/tree/main/skills/${owner}/${skillName}`
+    });
+  }
+  skillsTreeCache = { entries, fetchedAt: Date.now() };
+  return entries;
+}
+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);
+  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);
+      if (!resp.ok) return;
+      const meta = await resp.json();
+      metaCache.set(`${e.owner}/${e.name}`, {
+        displayName: typeof meta.displayName === "string" ? meta.displayName : "",
+        description: typeof meta.displayName === "string" ? meta.displayName : "",
+        publishedAt: meta.latest?.publishedAt ?? 0
+      });
+    })
+  );
+}
+function buildHubEntry(e) {
+  const cached = metaCache.get(`${e.owner}/${e.name}`);
+  return {
+    name: e.name,
+    owner: e.owner,
+    description: cached?.description ?? "",
+    displayName: cached?.displayName ?? "",
+    publishedAt: cached?.publishedAt ?? 0,
+    avatarUrl: `https://github.com/${e.owner}.png?size=40`,
+    url: e.url,
+    installed: false
+  };
+}
+var GITHUB_DEVICE_CLIENT_ID = "Iv1.b507a08c87ecfe98";
+var DEFAULT_SKILLS_SYNC_REPO_NAME = "codexskills";
+var SKILLS_SYNC_MANIFEST_PATH = "installed-skills.json";
+var SYNC_UPSTREAM_SKILLS_OWNER = "OpenClawAndroid";
+var SYNC_UPSTREAM_SKILLS_REPO = "skills";
+var HUB_SKILLS_OWNER = "openclaw";
+var HUB_SKILLS_REPO = "skills";
+var startupSkillsSyncInitialized = false;
+var startupSyncStatus = {
+  inProgress: false,
+  mode: "idle",
+  branch: getPreferredSyncBranch(),
+  lastAction: "not-started",
+  lastRunAtIso: "",
+  lastSuccessAtIso: "",
+  lastError: ""
+};
+async function scanInstalledSkillsFromDisk() {
+  const map = /* @__PURE__ */ new Map();
+  const skillsDir = getSkillsInstallDir();
+  try {
+    const entries = await readdir(skillsDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
+      const skillMd = join(skillsDir, entry.name, "SKILL.md");
+      try {
+        await stat(skillMd);
+        map.set(entry.name, { name: entry.name, path: skillMd, enabled: true });
+      } catch {
+      }
+    }
+  } catch {
+  }
+  return map;
+}
+function getSkillsSyncStatePath() {
+  return join(getCodexHomeDir(), "skills-sync.json");
+}
+async function readSkillsSyncState() {
+  try {
+    const raw = await readFile(getSkillsSyncStatePath(), "utf8");
+    const parsed = JSON.parse(raw);
+    return parsed && typeof parsed === "object" ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+async function writeSkillsSyncState(state) {
+  await writeFile(getSkillsSyncStatePath(), JSON.stringify(state), "utf8");
+}
+async function getGithubJson(url, token, method = "GET", body) {
+  const resp = await fetch(url, {
+    method,
+    headers: {
+      Accept: "application/vnd.github+json",
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`,
+      "X-GitHub-Api-Version": "2022-11-28",
+      "User-Agent": "codex-web-local"
+    },
+    body: body ? JSON.stringify(body) : void 0
+  });
+  if (!resp.ok) {
+    const text = await resp.text();
+    throw new Error(`GitHub API ${method} ${url} failed (${resp.status}): ${text}`);
+  }
+  return await resp.json();
+}
+async function startGithubDeviceLogin() {
+  const resp = await fetch("https://github.com/login/device/code", {
+    method: "POST",
+    headers: {
+      Accept: "application/json",
+      "Content-Type": "application/x-www-form-urlencoded",
+      "User-Agent": "codex-web-local"
+    },
+    body: new URLSearchParams({
+      client_id: GITHUB_DEVICE_CLIENT_ID,
+      scope: "repo read:user"
+    })
+  });
+  if (!resp.ok) {
+    throw new Error(`GitHub device flow init failed (${resp.status})`);
+  }
+  return await resp.json();
+}
+async function completeGithubDeviceLogin(deviceCode) {
+  const resp = await fetch("https://github.com/login/oauth/access_token", {
+    method: "POST",
+    headers: {
+      Accept: "application/json",
+      "Content-Type": "application/x-www-form-urlencoded",
+      "User-Agent": "codex-web-local"
+    },
+    body: new URLSearchParams({
+      client_id: GITHUB_DEVICE_CLIENT_ID,
+      device_code: deviceCode,
+      grant_type: "urn:ietf:params:oauth:grant-type:device_code"
+    })
+  });
+  if (!resp.ok) {
+    throw new Error(`GitHub token exchange failed (${resp.status})`);
+  }
+  const payload = await resp.json();
+  if (!payload.access_token) return { token: null, error: payload.error || "unknown_error" };
+  return { token: payload.access_token, error: null };
+}
+function isAndroidLikeRuntime() {
+  if (process.platform === "android") return true;
+  if (existsSync("/data/data/com.termux")) return true;
+  if (process.env.TERMUX_VERSION) return true;
+  const prefix = process.env.PREFIX?.toLowerCase() ?? "";
+  if (prefix.includes("/com.termux/")) return true;
+  const proot = process.env.PROOT_TMP_DIR?.toLowerCase() ?? "";
+  return proot.length > 0;
+}
+function getPreferredSyncBranch() {
+  return isAndroidLikeRuntime() ? "android" : "main";
+}
+function isUpstreamSkillsRepo(repoOwner, repoName) {
+  return repoOwner.toLowerCase() === SYNC_UPSTREAM_SKILLS_OWNER.toLowerCase() && repoName.toLowerCase() === SYNC_UPSTREAM_SKILLS_REPO.toLowerCase();
+}
+async function resolveGithubUsername(token) {
+  const user = await getGithubJson("https://api.github.com/user", token);
+  return user.login;
+}
+async function ensurePrivateForkFromUpstream(token, username, repoName) {
+  const repoUrl = `https://api.github.com/repos/${username}/${repoName}`;
+  let created = false;
+  const existing = await fetch(repoUrl, {
+    headers: {
+      Accept: "application/vnd.github+json",
+      Authorization: `Bearer ${token}`,
+      "X-GitHub-Api-Version": "2022-11-28",
+      "User-Agent": "codex-web-local"
+    }
+  });
+  if (existing.ok) {
+    const details = await existing.json();
+    if (details.private === true) return;
+    await getGithubJson(repoUrl, token, "PATCH", { private: true });
+    return;
+  }
+  if (existing.status !== 404) {
+    throw new Error(`Failed to check personal repo existence (${existing.status})`);
+  }
+  await getGithubJson(
+    "https://api.github.com/user/repos",
+    token,
+    "POST",
+    { name: repoName, private: true, auto_init: false, description: "Codex skills private mirror sync" }
+  );
+  created = true;
+  let ready = false;
+  for (let i = 0; i < 20; i++) {
+    const check = await fetch(repoUrl, {
+      headers: {
+        Accept: "application/vnd.github+json",
+        Authorization: `Bearer ${token}`,
+        "X-GitHub-Api-Version": "2022-11-28",
+        "User-Agent": "codex-web-local"
+      }
+    });
+    if (check.ok) {
+      ready = true;
+      break;
+    }
+    await new Promise((resolve3) => setTimeout(resolve3, 1e3));
+  }
+  if (!ready) throw new Error("Private mirror repo was created but is not available yet");
+  if (!created) return;
+  const tmp = await mkdtemp(join(tmpdir(), "codex-skills-seed-"));
+  try {
+    const upstreamUrl = `https://github.com/${SYNC_UPSTREAM_SKILLS_OWNER}/${SYNC_UPSTREAM_SKILLS_REPO}.git`;
+    const branch = getPreferredSyncBranch();
+    try {
+      await runCommand("git", ["clone", "--depth", "1", "--single-branch", "--branch", branch, upstreamUrl, tmp]);
+    } catch {
+      await runCommand("git", ["clone", "--depth", "1", upstreamUrl, tmp]);
+    }
+    const privateRemote = toGitHubTokenRemote(username, repoName, token);
+    await runCommand("git", ["remote", "set-url", "origin", privateRemote], { cwd: tmp });
+    try {
+      await runCommand("git", ["checkout", "-B", branch], { cwd: tmp });
+    } catch {
+    }
+    await runCommand("git", ["push", "-u", "origin", `HEAD:${branch}`], { cwd: tmp });
+  } finally {
+    await rm(tmp, { recursive: true, force: true });
+  }
+}
+async function readRemoteSkillsManifest(token, repoOwner, repoName) {
+  const url = `https://api.github.com/repos/${repoOwner}/${repoName}/contents/${SKILLS_SYNC_MANIFEST_PATH}`;
+  const resp = await fetch(url, {
+    headers: {
+      Accept: "application/vnd.github+json",
+      Authorization: `Bearer ${token}`,
+      "X-GitHub-Api-Version": "2022-11-28",
+      "User-Agent": "codex-web-local"
+    }
+  });
+  if (resp.status === 404) return [];
+  if (!resp.ok) throw new Error(`Failed to read remote manifest (${resp.status})`);
+  const payload = await resp.json();
+  const content = payload.content ? Buffer.from(payload.content.replace(/\n/g, ""), "base64").toString("utf8") : "[]";
+  const parsed = JSON.parse(content);
+  if (!Array.isArray(parsed)) return [];
+  const skills = [];
+  for (const row of parsed) {
+    const item = asRecord(row);
+    const owner = typeof item?.owner === "string" ? item.owner : "";
+    const name = typeof item?.name === "string" ? item.name : "";
+    if (!name) continue;
+    skills.push({ ...owner ? { owner } : {}, name, enabled: item?.enabled !== false });
+  }
+  return skills;
+}
+async function writeRemoteSkillsManifest(token, repoOwner, repoName, skills) {
+  const url = `https://api.github.com/repos/${repoOwner}/${repoName}/contents/${SKILLS_SYNC_MANIFEST_PATH}`;
+  let sha = "";
+  const existing = await fetch(url, {
+    headers: {
+      Accept: "application/vnd.github+json",
+      Authorization: `Bearer ${token}`,
+      "X-GitHub-Api-Version": "2022-11-28",
+      "User-Agent": "codex-web-local"
+    }
+  });
+  if (existing.ok) {
+    const payload = await existing.json();
+    sha = payload.sha ?? "";
+  }
+  const content = Buffer.from(JSON.stringify(skills, null, 2), "utf8").toString("base64");
+  await getGithubJson(url, token, "PUT", {
+    message: "Update synced skills manifest",
+    content,
+    ...sha ? { sha } : {}
+  });
+}
+function toGitHubTokenRemote(repoOwner, repoName, token) {
+  return `https://x-access-token:${encodeURIComponent(token)}@github.com/${repoOwner}/${repoName}.git`;
+}
+async function ensureSkillsWorkingTreeRepo(repoUrl, branch) {
+  const localDir = getSkillsInstallDir();
+  await mkdir(localDir, { recursive: true });
+  const gitDir = join(localDir, ".git");
+  let hasGitDir = false;
+  try {
+    hasGitDir = (await stat(gitDir)).isDirectory();
+  } catch {
+    hasGitDir = false;
+  }
+  if (!hasGitDir) {
+    await runCommand("git", ["init"], { cwd: localDir });
+    await runCommand("git", ["config", "user.email", "skills-sync@local"], { cwd: localDir });
+    await runCommand("git", ["config", "user.name", "Skills Sync"], { cwd: localDir });
+    await runCommand("git", ["add", "-A"], { cwd: localDir });
+    try {
+      await runCommand("git", ["commit", "-m", "Local skills snapshot before sync"], { cwd: localDir });
+    } catch {
+    }
+    await runCommand("git", ["branch", "-M", branch], { cwd: localDir });
+    try {
+      await runCommand("git", ["remote", "add", "origin", repoUrl], { cwd: localDir });
+    } catch {
+      await runCommand("git", ["remote", "set-url", "origin", repoUrl], { cwd: localDir });
+    }
+    await runCommand("git", ["fetch", "origin"], { cwd: localDir });
+    try {
+      await runCommand("git", ["merge", "--allow-unrelated-histories", "--no-edit", `origin/${branch}`], { cwd: localDir });
+    } catch {
+    }
+    return localDir;
+  }
+  await runCommand("git", ["remote", "set-url", "origin", repoUrl], { cwd: localDir });
+  await runCommand("git", ["fetch", "origin"], { cwd: localDir });
+  await resolveMergeConflictsByNewerCommit(localDir, branch);
+  try {
+    await runCommand("git", ["checkout", branch], { cwd: localDir });
+  } catch {
+    await resolveMergeConflictsByNewerCommit(localDir, branch);
+    await runCommand("git", ["checkout", "-B", branch], { cwd: localDir });
+  }
+  await resolveMergeConflictsByNewerCommit(localDir, branch);
+  const localMtimesBeforePull = await snapshotFileMtimes(localDir);
+  try {
+    await runCommand("git", ["stash", "push", "--include-untracked", "-m", "codex-skills-autostash"], { cwd: localDir });
+  } catch {
+  }
+  let pulledMtimes = /* @__PURE__ */ new Map();
+  try {
+    await runCommand("git", ["pull", "--no-rebase", "origin", branch], { cwd: localDir });
+    pulledMtimes = await snapshotFileMtimes(localDir);
+  } catch {
+    await resolveMergeConflictsByNewerCommit(localDir, branch);
+    pulledMtimes = await snapshotFileMtimes(localDir);
+  }
+  try {
+    await runCommand("git", ["stash", "pop"], { cwd: localDir });
+  } catch {
+    await resolveStashPopConflictsByFileTime(localDir, localMtimesBeforePull, pulledMtimes);
+  }
+  return localDir;
+}
+async function resolveMergeConflictsByNewerCommit(repoDir, branch) {
+  const unmerged = (await runCommandWithOutput("git", ["diff", "--name-only", "--diff-filter=U"], { cwd: repoDir })).split(/\r?\n/).map((row) => row.trim()).filter(Boolean);
+  if (unmerged.length === 0) return;
+  for (const path of unmerged) {
+    const oursTime = await getCommitTime(repoDir, "HEAD", path);
+    const theirsTime = await getCommitTime(repoDir, `origin/${branch}`, path);
+    if (theirsTime > oursTime) {
+      await runCommand("git", ["checkout", "--theirs", "--", path], { cwd: repoDir });
+    } else {
+      await runCommand("git", ["checkout", "--ours", "--", path], { cwd: repoDir });
+    }
+    await runCommand("git", ["add", "--", path], { cwd: repoDir });
+  }
+  const mergeHead = (await runCommandWithOutput("git", ["rev-parse", "-q", "--verify", "MERGE_HEAD"], { cwd: repoDir })).trim();
+  if (mergeHead) {
+    await runCommand("git", ["commit", "-m", "Auto-resolve skills merge by newer file"], { cwd: repoDir });
+  }
+}
+async function getCommitTime(repoDir, ref, path) {
+  try {
+    const output = (await runCommandWithOutput("git", ["log", "-1", "--format=%ct", ref, "--", path], { cwd: repoDir })).trim();
+    return output ? Number.parseInt(output, 10) : 0;
+  } catch {
+    return 0;
+  }
+}
+async function resolveStashPopConflictsByFileTime(repoDir, localMtimesBeforePull, pulledMtimes) {
+  const unmerged = (await runCommandWithOutput("git", ["diff", "--name-only", "--diff-filter=U"], { cwd: repoDir })).split(/\r?\n/).map((row) => row.trim()).filter(Boolean);
+  if (unmerged.length === 0) return;
+  for (const path of unmerged) {
+    const localMtime = localMtimesBeforePull.get(path) ?? 0;
+    const pulledMtime = pulledMtimes.get(path) ?? 0;
+    const side = localMtime >= pulledMtime ? "--theirs" : "--ours";
+    await runCommand("git", ["checkout", side, "--", path], { cwd: repoDir });
+    await runCommand("git", ["add", "--", path], { cwd: repoDir });
+  }
+  const mergeHead = (await runCommandWithOutput("git", ["rev-parse", "-q", "--verify", "MERGE_HEAD"], { cwd: repoDir })).trim();
+  if (mergeHead) {
+    await runCommand("git", ["commit", "-m", "Auto-resolve stash-pop conflicts by file time"], { cwd: repoDir });
+  }
+}
+async function snapshotFileMtimes(dir) {
+  const mtimes = /* @__PURE__ */ new Map();
+  await walkFileMtimes(dir, dir, mtimes);
+  return mtimes;
+}
+async function walkFileMtimes(rootDir, currentDir, out) {
+  let entries;
+  try {
+    entries = await readdir(currentDir, { withFileTypes: true });
+  } catch {
+    return;
+  }
+  for (const entry of entries) {
+    const entryName = String(entry.name);
+    if (entryName === ".git") continue;
+    const absolutePath = join(currentDir, entryName);
+    const relativePath = absolutePath.slice(rootDir.length + 1);
+    if (entry.isDirectory()) {
+      await walkFileMtimes(rootDir, absolutePath, out);
+      continue;
+    }
+    if (!entry.isFile()) continue;
+    try {
+      const info = await stat(absolutePath);
+      out.set(relativePath, info.mtimeMs);
+    } catch {
+    }
+  }
+}
+async function syncInstalledSkillsFolderToRepo(token, repoOwner, repoName, _installedMap) {
+  const remoteUrl = toGitHubTokenRemote(repoOwner, repoName, token);
+  const branch = getPreferredSyncBranch();
+  const repoDir = await ensureSkillsWorkingTreeRepo(remoteUrl, branch);
+  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", "."], { 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) {
+  const remoteUrl = toGitHubTokenRemote(repoOwner, repoName, token);
+  const branch = getPreferredSyncBranch();
+  await ensureSkillsWorkingTreeRepo(remoteUrl, branch);
+}
+async function bootstrapSkillsFromUpstreamIntoLocal() {
+  const repoUrl = `https://github.com/${SYNC_UPSTREAM_SKILLS_OWNER}/${SYNC_UPSTREAM_SKILLS_REPO}.git`;
+  const branch = getPreferredSyncBranch();
+  await ensureSkillsWorkingTreeRepo(repoUrl, branch);
+}
+async function collectLocalSyncedSkills(appServer) {
+  const state = await readSkillsSyncState();
+  const owners = { ...state.installedOwners ?? {} };
+  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 skills = await appServer.rpc("skills/list", {});
+  const seen = /* @__PURE__ */ new Set();
+  const synced = [];
+  let ownersChanged = false;
+  for (const entry of skills.data ?? []) {
+    for (const skill of entry.skills ?? []) {
+      const name = typeof skill.name === "string" ? skill.name : "";
+      if (!name || seen.has(name)) continue;
+      seen.add(name);
+      let owner = owners[name];
+      if (!owner) {
+        owner = uniqueOwnerByName.get(name) ?? "";
+        if (owner) {
+          owners[name] = owner;
+          ownersChanged = true;
+        }
+      }
+      synced.push({ ...owner ? { owner } : {}, name, enabled: skill.enabled !== false });
+    }
+  }
+  if (ownersChanged) {
+    await writeSkillsSyncState({ ...state, installedOwners: owners });
+  }
+  synced.sort((a, b) => `${a.owner ?? ""}/${a.name}`.localeCompare(`${b.owner ?? ""}/${b.name}`));
+  return synced;
+}
+async function autoPushSyncedSkills(appServer) {
+  const state = await readSkillsSyncState();
+  if (!state.githubToken || !state.repoOwner || !state.repoName) return;
+  if (isUpstreamSkillsRepo(state.repoOwner, state.repoName)) {
+    throw new Error("Refusing to push to upstream skills repository");
+  }
+  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);
+}
+async function ensureCodexAgentsSymlinkToSkillsAgents() {
+  const codexHomeDir = getCodexHomeDir();
+  const skillsAgentsPath = join(codexHomeDir, "skills", "AGENTS.md");
+  const codexAgentsPath = join(codexHomeDir, "AGENTS.md");
+  await mkdir(join(codexHomeDir, "skills"), { recursive: true });
+  let copiedFromCodex = false;
+  try {
+    const codexAgentsStat = await lstat(codexAgentsPath);
+    if (codexAgentsStat.isFile() || codexAgentsStat.isSymbolicLink()) {
+      const content = await readFile(codexAgentsPath, "utf8");
+      await writeFile(skillsAgentsPath, content, "utf8");
+      copiedFromCodex = true;
+    } else {
+      await rm(codexAgentsPath, { force: true, recursive: true });
+    }
+  } catch {
+  }
+  if (!copiedFromCodex) {
+    try {
+      const skillsAgentsStat = await stat(skillsAgentsPath);
+      if (!skillsAgentsStat.isFile()) {
+        await rm(skillsAgentsPath, { force: true, recursive: true });
+        await writeFile(skillsAgentsPath, "", "utf8");
+      }
+    } catch {
+      await writeFile(skillsAgentsPath, "", "utf8");
+    }
+  }
+  const relativeTarget = join("skills", "AGENTS.md");
+  try {
+    const current = await lstat(codexAgentsPath);
+    if (current.isSymbolicLink()) {
+      const existingTarget = await readlink(codexAgentsPath);
+      if (existingTarget === relativeTarget) return;
+    }
+    await rm(codexAgentsPath, { force: true, recursive: true });
+  } catch {
+  }
+  await symlink(relativeTarget, codexAgentsPath);
+}
+async function initializeSkillsSyncOnStartup(appServer) {
+  if (startupSkillsSyncInitialized) return;
+  startupSkillsSyncInitialized = true;
+  startupSyncStatus.inProgress = true;
+  startupSyncStatus.lastRunAtIso = (/* @__PURE__ */ new Date()).toISOString();
+  startupSyncStatus.lastError = "";
+  startupSyncStatus.branch = getPreferredSyncBranch();
+  try {
+    const state = await readSkillsSyncState();
+    if (!state.githubToken) {
+      await ensureCodexAgentsSymlinkToSkillsAgents();
+      if (!isAndroidLikeRuntime()) {
+        startupSyncStatus.mode = "idle";
+        startupSyncStatus.lastAction = "skip-upstream-non-android";
+        startupSyncStatus.lastSuccessAtIso = (/* @__PURE__ */ new Date()).toISOString();
+        return;
+      }
+      startupSyncStatus.mode = "unauthenticated-bootstrap";
+      startupSyncStatus.lastAction = "pull-upstream";
+      await bootstrapSkillsFromUpstreamIntoLocal();
+      try {
+        await appServer.rpc("skills/list", { forceReload: true });
+      } catch {
+      }
+      startupSyncStatus.lastSuccessAtIso = (/* @__PURE__ */ new Date()).toISOString();
+      startupSyncStatus.lastAction = "pull-upstream-complete";
+      return;
+    }
+    startupSyncStatus.mode = "authenticated-fork-sync";
+    startupSyncStatus.lastAction = "ensure-private-fork";
+    const username = state.githubUsername || await resolveGithubUsername(state.githubToken);
+    const repoName = DEFAULT_SKILLS_SYNC_REPO_NAME;
+    await ensurePrivateForkFromUpstream(state.githubToken, username, repoName);
+    await writeSkillsSyncState({ ...state, githubUsername: username, repoOwner: username, repoName });
+    startupSyncStatus.lastAction = "pull-private-fork";
+    await pullInstalledSkillsFolderFromRepo(state.githubToken, username, repoName);
+    try {
+      await appServer.rpc("skills/list", { forceReload: true });
+    } catch {
+    }
+    startupSyncStatus.lastAction = "push-private-fork";
+    await autoPushSyncedSkills(appServer);
+    startupSyncStatus.lastSuccessAtIso = (/* @__PURE__ */ new Date()).toISOString();
+    startupSyncStatus.lastAction = "startup-sync-complete";
+  } catch (error) {
+    startupSyncStatus.lastError = getErrorMessage(error, "startup-sync-failed");
+    startupSyncStatus.lastAction = "startup-sync-failed";
+  } finally {
+    startupSyncStatus.inProgress = false;
+  }
+}
+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 });
+  await pullInstalledSkillsFolderFromRepo(token, username, repoName);
+  try {
+    await appServer.rpc("skills/list", { forceReload: true });
+  } catch {
+  }
+  await autoPushSyncedSkills(appServer);
+}
+async function searchSkillsHub(allEntries, query, limit, sort, installedMap) {
+  const q = query.toLowerCase().trim();
+  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}`);
+    return Boolean(cached?.displayName?.toLowerCase().includes(q));
+  }) : allEntries;
+  const page = filtered.slice(0, Math.min(limit * 2, 200));
+  await fetchMetaBatch(page);
+  let results = page.map(buildHubEntry);
+  if (sort === "date") {
+    results.sort((a, b) => b.publishedAt - a.publishedAt);
+  } else if (q) {
+    results.sort((a, b) => {
+      const aExact = a.name.toLowerCase() === q ? 1 : 0;
+      const bExact = b.name.toLowerCase() === q ? 1 : 0;
+      if (aExact !== bExact) return bExact - aExact;
+      return b.publishedAt - a.publishedAt;
+    });
+  }
+  return results.slice(0, limit).map((s) => {
+    const local = installedMap.get(s.name);
+    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((resolve3, 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);
+        resolve3(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((resolve3, 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();
     });
-  }
-  skillsTreeCache = { entries, fetchedAt: Date.now() };
-  return entries;
+    proc.on("error", reject);
+    proc.on("close", (code) => {
+      if (code === 0) {
+        resolve3();
+        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 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(
-    batch.map(async (e) => {
-      const rawUrl = `https://raw.githubusercontent.com/openclaw/skills/main/skills/${e.owner}/${e.name}/_meta.json`;
-      const resp = await fetch(rawUrl);
-      if (!resp.ok) return;
-      const meta = await resp.json();
-      metaCache.set(`${e.owner}/${e.name}`, {
-        displayName: typeof meta.displayName === "string" ? meta.displayName : "",
-        description: typeof meta.displayName === "string" ? meta.displayName : "",
-        publishedAt: meta.latest?.publishedAt ?? 0
-      });
-    })
-  );
-  void results;
+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 buildHubEntry(e) {
-  const cached = metaCache.get(`${e.owner}/${e.name}`);
-  return {
-    name: e.name,
-    owner: e.owner,
-    description: cached?.description ?? "",
-    displayName: cached?.displayName ?? "",
-    publishedAt: cached?.publishedAt ?? 0,
-    avatarUrl: `https://github.com/${e.owner}.png?size=40`,
-    url: e.url,
-    installed: false
-  };
+function isNotGitRepositoryError(error) {
+  const message = getErrorMessage2(error, "").toLowerCase();
+  return message.includes("not a git repository") || message.includes("fatal: not a git repository");
 }
-async function scanInstalledSkillsFromDisk() {
-  const map = /* @__PURE__ */ new Map();
-  const skillsDir = getSkillsInstallDir();
+async function ensureRepoHasInitialCommit(repoRoot) {
+  const agentsPath = join2(repoRoot, "AGENTS.md");
   try {
-    const entries = await readdir(skillsDir, { withFileTypes: true });
-    for (const entry of entries) {
-      if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
-      const skillMd = join(skillsDir, entry.name, "SKILL.md");
-      try {
-        await stat(skillMd);
-        map.set(entry.name, { name: entry.name, path: skillMd, enabled: true });
-      } catch {
-      }
-    }
+    await stat2(agentsPath);
   } catch {
+    await writeFile2(agentsPath, "", "utf8");
   }
-  return map;
+  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 searchSkillsHub(allEntries, query, limit, sort, installedMap) {
-  const q = query.toLowerCase().trim();
-  let 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;
-  }) : allEntries;
-  const page = filtered.slice(0, Math.min(limit * 2, 200));
-  await fetchMetaBatch(page);
-  let results = page.map(buildHubEntry);
-  if (sort === "date") {
-    results.sort((a, b) => b.publishedAt - a.publishedAt);
-  } else if (q) {
-    results.sort((a, b) => {
-      const aExact = a.name.toLowerCase() === q ? 1 : 0;
-      const bExact = b.name.toLowerCase() === q ? 1 : 0;
-      if (aExact !== bExact) return bExact - aExact;
-      return b.publishedAt - a.publishedAt;
+async function runCommandCapture(command, args, options = {}) {
+  return await new Promise((resolve3, 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) {
+        resolve3(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}`));
     });
-  }
-  return results.slice(0, limit).map((s) => {
-    const local = installedMap.get(s.name);
-    return local ? { ...s, installed: true, path: local.path, enabled: local.enabled } : s;
   });
 }
 function normalizeStringArray(value) {
@@ -390,27 +1323,36 @@ 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 apiKey = auth.OPENAI_API_KEY || process.env.OPENAI_API_KEY || void 0;
     const token = auth.tokens?.access_token;
-    if (!token) return null;
-    return { accessToken: token, accountId: auth.tokens?.account_id ?? void 0 };
+    if (!token && !apiKey) return null;
+    return { accessToken: token ?? "", accountId: auth.tokens?.account_id ?? void 0, apiKey };
   } catch {
     return null;
   }
 }
 function getCodexGlobalStatePath() {
-  return join(getCodexHomeDir(), ".codex-global-state.json");
+  return join2(getCodexHomeDir2(), ".codex-global-state.json");
+}
+function getCodexSessionIndexPath() {
+  return join2(getCodexHomeDir2(), "session_index.jsonl");
 }
 var MAX_THREAD_TITLES = 500;
+var EMPTY_THREAD_TITLE_CACHE = { titles: {}, order: [] };
+var sessionIndexThreadTitleCacheState = {
+  fileSignature: null,
+  cache: EMPTY_THREAD_TITLE_CACHE
+};
 function normalizeThreadTitleCache(value) {
-  const record = asRecord(value);
-  if (!record) return { titles: {}, order: [] };
-  const rawTitles = asRecord(record.titles);
+  const record = asRecord2(value);
+  if (!record) return EMPTY_THREAD_TITLE_CACHE;
+  const rawTitles = asRecord2(record.titles);
   const titles = {};
   if (rawTitles) {
     for (const [k, v] of Object.entries(rawTitles)) {
@@ -433,35 +1375,139 @@ function removeFromThreadTitleCache(cache, id) {
   const { [id]: _, ...titles } = cache.titles;
   return { titles, order: cache.order.filter((o) => o !== id) };
 }
+function normalizeSessionIndexThreadTitle(value) {
+  const record = asRecord2(value);
+  if (!record) return null;
+  const id = typeof record.id === "string" ? record.id.trim() : "";
+  const title = typeof record.thread_name === "string" ? record.thread_name.trim() : "";
+  const updatedAtIso = typeof record.updated_at === "string" ? record.updated_at.trim() : "";
+  const updatedAtMs = updatedAtIso ? Date.parse(updatedAtIso) : Number.NaN;
+  if (!id || !title) return null;
+  return {
+    id,
+    title,
+    updatedAtMs: Number.isFinite(updatedAtMs) ? updatedAtMs : 0
+  };
+}
+function trimThreadTitleCache(cache) {
+  const titles = { ...cache.titles };
+  const order = cache.order.filter((id) => {
+    if (!titles[id]) return false;
+    return true;
+  }).slice(0, MAX_THREAD_TITLES);
+  for (const id of Object.keys(titles)) {
+    if (!order.includes(id)) {
+      delete titles[id];
+    }
+  }
+  return { titles, order };
+}
+function mergeThreadTitleCaches(base, overlay) {
+  const titles = { ...base.titles, ...overlay.titles };
+  const order = [];
+  for (const id of [...overlay.order, ...base.order]) {
+    if (!titles[id] || order.includes(id)) continue;
+    order.push(id);
+  }
+  for (const id of Object.keys(titles)) {
+    if (!order.includes(id)) {
+      order.push(id);
+    }
+  }
+  return trimThreadTitleCache({ titles, order });
+}
 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: [] };
+    return EMPTY_THREAD_TITLE_CACHE;
   }
 }
 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");
+}
+function getSessionIndexFileSignature(stats) {
+  return `${String(stats.mtimeMs)}:${String(stats.size)}`;
+}
+async function parseThreadTitlesFromSessionIndex(sessionIndexPath) {
+  const latestById = /* @__PURE__ */ new Map();
+  const input = createReadStream(sessionIndexPath, { encoding: "utf8" });
+  const lines = createInterface({
+    input,
+    crlfDelay: Infinity
+  });
+  try {
+    for await (const line of lines) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      try {
+        const entry = normalizeSessionIndexThreadTitle(JSON.parse(trimmed));
+        if (!entry) continue;
+        const previous = latestById.get(entry.id);
+        if (!previous || entry.updatedAtMs >= previous.updatedAtMs) {
+          latestById.set(entry.id, entry);
+        }
+      } catch {
+      }
+    }
+  } finally {
+    lines.close();
+    input.close();
+  }
+  const entries = Array.from(latestById.values()).sort((first, second) => second.updatedAtMs - first.updatedAtMs);
+  const titles = {};
+  const order = [];
+  for (const entry of entries) {
+    titles[entry.id] = entry.title;
+    order.push(entry.id);
+  }
+  return trimThreadTitleCache({ titles, order });
+}
+async function readThreadTitlesFromSessionIndex() {
+  const sessionIndexPath = getCodexSessionIndexPath();
+  try {
+    const stats = await stat2(sessionIndexPath);
+    const fileSignature = getSessionIndexFileSignature(stats);
+    if (sessionIndexThreadTitleCacheState.fileSignature === fileSignature) {
+      return sessionIndexThreadTitleCacheState.cache;
+    }
+    const cache = await parseThreadTitlesFromSessionIndex(sessionIndexPath);
+    sessionIndexThreadTitleCacheState = { fileSignature, cache };
+    return cache;
+  } catch {
+    sessionIndexThreadTitleCacheState = {
+      fileSignature: "missing",
+      cache: EMPTY_THREAD_TITLE_CACHE
+    };
+    return sessionIndexThreadTitleCacheState.cache;
+  }
+}
+async function readMergedThreadTitleCache() {
+  const [sessionIndexCache, persistedCache] = await Promise.all([
+    readThreadTitlesFromSessionIndex(),
+    readThreadTitleCache()
+  ]);
+  return mergeThreadTitleCaches(persistedCache, sessionIndexCache);
 }
 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 = {};
   }
@@ -475,15 +1521,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);
@@ -521,7 +1567,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];
@@ -551,49 +1597,110 @@ 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) {
-  const headers = {
+function httpPost(url, headers, body) {
+  const doRequest = url.startsWith("http://") ? httpRequest : httpsRequest;
+  return new Promise((resolve3, reject) => {
+    const req = doRequest(url, { method: "POST", headers }, (res) => {
+      const chunks = [];
+      res.on("data", (c) => chunks.push(c));
+      res.on("end", () => resolve3({ status: res.statusCode ?? 500, body: Buffer.concat(chunks).toString("utf8") }));
+      res.on("error", reject);
+    });
+    req.on("error", reject);
+    req.write(body);
+    req.end();
+  });
+}
+var curlImpersonateAvailable = null;
+function curlImpersonatePost(url, headers, body) {
+  return new Promise((resolve3, reject) => {
+    const args = ["-s", "-w", "\n%{http_code}", "-X", "POST", url];
+    for (const [k, v] of Object.entries(headers)) {
+      if (k.toLowerCase() === "content-length") continue;
+      args.push("-H", `${k}: ${String(v)}`);
+    }
+    args.push("--data-binary", "@-");
+    const proc = spawn2("curl-impersonate-chrome", args, {
+      env: { ...process.env, CURL_IMPERSONATE: "chrome116" },
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    const chunks = [];
+    proc.stdout.on("data", (c) => chunks.push(c));
+    proc.on("error", (e) => {
+      curlImpersonateAvailable = false;
+      reject(e);
+    });
+    proc.on("close", (code) => {
+      const raw = Buffer.concat(chunks).toString("utf8");
+      const lastNewline = raw.lastIndexOf("\n");
+      const statusStr = lastNewline >= 0 ? raw.slice(lastNewline + 1).trim() : "";
+      const responseBody = lastNewline >= 0 ? raw.slice(0, lastNewline) : raw;
+      const status = parseInt(statusStr, 10) || (code === 0 ? 200 : 500);
+      curlImpersonateAvailable = true;
+      resolve3({ status, body: responseBody });
+    });
+    proc.stdin.write(body);
+    proc.stdin.end();
+  });
+}
+var TRANSCRIBE_RELAY_URL = process.env.TRANSCRIBE_RELAY_URL || "http://127.0.0.1:1090/relay-transcribe";
+async function tryRelay(headers, body) {
+  try {
+    const resp = await httpPost(TRANSCRIBE_RELAY_URL, headers, body);
+    if (resp.status !== 0) return resp;
+  } catch {
+  }
+  return null;
+}
+async function proxyTranscribe(body, contentType, authToken, accountId, apiKey) {
+  const chatgptHeaders = {
     "Content-Type": contentType,
     "Content-Length": body.length,
-    Authorization: `Bearer ${authToken}`,
+    Authorization: `Bearer ${authToken || apiKey || ""}`,
     originator: "Codex Desktop",
     "User-Agent": `Codex Desktop/0.1.0 (${process.platform}; ${process.arch})`
   };
-  if (accountId) {
-    headers["ChatGPT-Account-Id"] = accountId;
-  }
-  return new Promise((resolve2, reject) => {
-    const req = httpsRequest(
-      "https://chatgpt.com/backend-api/transcribe",
-      { method: "POST", headers },
-      (res) => {
-        const chunks = [];
-        res.on("data", (c) => chunks.push(c));
-        res.on("end", () => resolve2({ status: res.statusCode ?? 500, body: Buffer.concat(chunks).toString("utf8") }));
-        res.on("error", reject);
-      }
-    );
-    req.on("error", reject);
-    req.write(body);
-    req.end();
-  });
+  if (accountId) chatgptHeaders["ChatGPT-Account-Id"] = accountId;
+  const postFn = curlImpersonateAvailable !== false ? curlImpersonatePost : httpPost;
+  let result;
+  try {
+    result = await postFn("https://chatgpt.com/backend-api/transcribe", chatgptHeaders, body);
+  } catch {
+    result = await httpPost("https://chatgpt.com/backend-api/transcribe", chatgptHeaders, body);
+  }
+  if (result.status === 403 && result.body.includes("cf_chl")) {
+    if (curlImpersonateAvailable !== false && postFn !== curlImpersonatePost) {
+      try {
+        const ciResult = await curlImpersonatePost("https://chatgpt.com/backend-api/transcribe", chatgptHeaders, body);
+        if (ciResult.status !== 403) return ciResult;
+      } catch {
+      }
+    }
+    const relayed = await tryRelay(chatgptHeaders, body);
+    if (relayed && relayed.status !== 403) return relayed;
+    if (apiKey) {
+      return httpPost("https://api.openai.com/v1/audio/transcriptions", { ...chatgptHeaders, Authorization: `Bearer ${apiKey}` }, body);
+    }
+    return { status: 503, body: JSON.stringify({ error: "Transcription blocked by Cloudflare. Install curl-impersonate-chrome, start relay, or set OPENAI_API_KEY." }) };
+  }
+  return result;
 }
 var AppServerProcess = class {
   constructor() {
@@ -617,7 +1724,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) => {
@@ -711,7 +1818,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",
@@ -740,8 +1847,8 @@ var AppServerProcess = class {
   async call(method, params) {
     this.start();
     const id = this.nextId++;
-    return new Promise((resolve2, reject) => {
-      this.pending.set(id, { resolve: resolve2, reject });
+    return new Promise((resolve3, reject) => {
+      this.pending.set(id, { resolve: resolve3, reject });
       this.sendLine({
         jsonrpc: "2.0",
         id,
@@ -780,7 +1887,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");
     }
@@ -788,7 +1895,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;
@@ -842,8 +1949,8 @@ var MethodCatalog = class {
     this.notificationCache = null;
   }
   async runGenerateSchemaCommand(outDir) {
-    await new Promise((resolve2, reject) => {
-      const process2 = spawn("codex", ["app-server", "generate-json-schema", "--out", outDir], {
+    await new Promise((resolve3, reject) => {
+      const process2 = spawn2("codex", ["app-server", "generate-json-schema", "--out", outDir], {
         stdio: ["ignore", "ignore", "pipe"]
       });
       let stderr = "";
@@ -854,7 +1961,7 @@ var MethodCatalog = class {
       process2.on("error", reject);
       process2.on("exit", (code) => {
         if (code === 0) {
-          resolve2();
+          resolve3();
           return;
         }
         reject(new Error(stderr.trim() || `generate-json-schema exited with code ${String(code)}`));
@@ -862,13 +1969,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) {
@@ -879,13 +1986,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) {
@@ -899,10 +2006,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;
@@ -912,10 +2019,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;
@@ -938,7 +2045,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",
@@ -946,7 +2053,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";
@@ -1010,6 +2117,7 @@ function createCodexBridgeMiddleware() {
     }
     return threadSearchIndexPromise;
   }
+  void initializeSkillsSyncOnStartup(appServer);
   const middleware = async (req, res, next) => {
     try {
       if (!req.url) {
@@ -1017,30 +2125,33 @@ 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);
         const incomingCt = req.headers["content-type"] ?? "application/octet-stream";
-        const upstream = await proxyTranscribe(rawBody, incomingCt, auth.accessToken, auth.accountId);
+        const upstream = await proxyTranscribe(rawBody, incomingCt, auth.accessToken, auth.accountId, auth.apiKey);
         res.statusCode = upstream.status;
         res.setHeader("Content-Type", "application/json; charset=utf-8");
         res.end(upstream.body);
@@ -1049,48 +2160,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 {
@@ -1099,25 +2210,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;
             }
           }
@@ -1125,15 +2236,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,
@@ -1141,15 +2252,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 = {
@@ -1158,33 +2269,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();
@@ -1199,215 +2310,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 });
+        const cache = await readMergedThreadTitleCache();
+        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-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/openclaw/skills/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",
-            "openclaw/skills",
-            "--path",
-            skillPathInRepo,
-            "--dest",
-            installDest,
-            "--method",
-            "git"
-          ]);
-          const skillDir = join(installDest, name);
-          await ensureInstalledSkillIsValid(appServer, skillDir);
-          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 });
-          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") {
@@ -1442,8 +2441,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 = () => {
@@ -1580,8 +2579,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",
@@ -1696,7 +2695,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 {
@@ -1716,10 +2715,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,
@@ -1777,7 +2776,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);
@@ -1848,8 +2847,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",
@@ -1860,6 +2859,20 @@ var IMAGE_CONTENT_TYPES = {
   ".svg": "image/svg+xml",
   ".webp": "image/webp"
 };
+function renderFrontendMissingHtml(message, details) {
+  const lines = details && details.length > 0 ? `<pre>${details.join("\n")}</pre>` : "";
+  return [
+    "<!doctype html>",
+    '<html lang="en">',
+    '<head><meta charset="utf-8"><title>Codex Web UI Error</title></head>',
+    "<body>",
+    `<h1>${message}</h1>`,
+    lines,
+    '<p><a href="/">Back to chat</a></p>',
+    "</body>",
+    "</html>"
+  ].join("");
+}
 function normalizeLocalImagePath(rawPath) {
   const trimmed = rawPath.trim();
   if (!trimmed) return "";
@@ -1926,7 +2939,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);
@@ -1949,7 +2962,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;
@@ -1973,32 +2986,31 @@ 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." });
     }
   });
-  const hasFrontendAssets = existsSync(spaEntryFile);
+  const hasFrontendAssets = existsSync3(spaEntryFile);
   if (hasFrontendAssets) {
     app.use(express.static(distDir));
   }
   app.use((_req, res) => {
     if (!hasFrontendAssets) {
-      res.status(503).type("text/plain").send(
-        [
-          "Codex web UI assets are missing.",
+      res.status(503).type("text/html; charset=utf-8").send(
+        renderFrontendMissingHtml("Codex web UI assets are missing.", [
           `Expected: ${spaEntryFile}`,
           "If running from source, build frontend assets with: npm run build:frontend",
           "If running with npx, clear the npx cache and reinstall codexapp."
-        ].join("\n")
+        ])
       );
       return;
     }
     res.sendFile(spaEntryFile, (error) => {
       if (!error) return;
       if (!res.headersSent) {
-        res.status(404).type("text/plain").send("Frontend entry file not found.");
+        res.status(404).type("text/html; charset=utf-8").send(renderFrontendMissingHtml("Frontend entry file not found."));
       }
     });
   });
@@ -2053,8 +3065,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 {
@@ -2079,22 +3091,22 @@ 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");
-  if (existsSync2(userCandidate) && canRun(userCandidate, ["--version"])) {
+  const userCandidate = join5(getUserNpmPrefix(), "bin", "codex");
+  if (existsSync4(userCandidate) && canRun(userCandidate, ["--version"])) {
     return userCandidate;
   }
   const prefix = process.env.PREFIX?.trim();
   if (!prefix) {
     return null;
   }
-  const candidate = join4(prefix, "bin", "codex");
-  if (existsSync2(candidate) && canRun(candidate, ["--version"])) {
+  const candidate = join5(prefix, "bin", "codex");
+  if (existsSync4(candidate) && canRun(candidate, ["--version"])) {
     return candidate;
   }
   return null;
@@ -2103,8 +3115,8 @@ function resolveCloudflaredCommand() {
   if (canRun("cloudflared", ["--version"])) {
     return "cloudflared";
   }
-  const localCandidate = join4(homedir2(), ".local", "bin", "cloudflared");
-  if (existsSync2(localCandidate) && canRun(localCandidate, ["--version"])) {
+  const localCandidate = join5(homedir3(), ".local", "bin", "cloudflared");
+  if (existsSync4(localCandidate) && canRun(localCandidate, ["--version"])) {
     return localCandidate;
   }
   return null;
@@ -2119,7 +3131,7 @@ function mapCloudflaredLinuxArch(arch) {
   return null;
 }
 function downloadFile(url, destination) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const request = (currentUrl) => {
       httpsGet(currentUrl, (response) => {
         const code = response.statusCode ?? 0;
@@ -2137,7 +3149,7 @@ function downloadFile(url, destination) {
         response.pipe(file);
         file.on("finish", () => {
           file.close();
-          resolve2();
+          resolve3();
         });
         file.on("error", reject);
       }).on("error", reject);
@@ -2157,9 +3169,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);
@@ -2177,7 +3189,7 @@ async function shouldInstallCloudflaredInteractively() {
     console.warn("\n[cloudflared] cloudflared is missing and terminal is non-interactive, skipping install.");
     return false;
   }
-  const prompt = createInterface({ input: process.stdin, output: process.stdout });
+  const prompt = createInterface2({ input: process.stdin, output: process.stdout });
   try {
     const answer = await prompt.question("cloudflared is not installed. Install it now to ~/.local/bin? [y/N] ");
     const normalized = answer.trim().toLowerCase();
@@ -2198,8 +3210,8 @@ async function resolveCloudflaredForTunnel() {
   return ensureCloudflaredInstalledLinux();
 }
 function hasCodexAuth() {
-  const codexHome = process.env.CODEX_HOME?.trim() || join4(homedir2(), ".codex");
-  return existsSync2(join4(codexHome, "auth.json"));
+  const codexHome = process.env.CODEX_HOME?.trim() || join5(homedir3(), ".codex");
+  return existsSync4(join5(codexHome, "auth.json"));
 }
 function ensureCodexInstalled() {
   let codexCommand = resolveCodexCommand();
@@ -2217,7 +3229,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");
@@ -2266,7 +3278,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();
@@ -2280,25 +3292,28 @@ function parseCloudflaredUrl(chunk) {
 }
 function getAccessibleUrls(port) {
   const urls = /* @__PURE__ */ new Set([`http://localhost:${String(port)}`]);
-  const interfaces = networkInterfaces();
-  for (const entries of Object.values(interfaces)) {
-    if (!entries) {
-      continue;
-    }
-    for (const entry of entries) {
-      if (entry.internal) {
+  try {
+    const interfaces = networkInterfaces();
+    for (const entries of Object.values(interfaces)) {
+      if (!entries) {
         continue;
       }
-      if (entry.family === "IPv4") {
-        urls.add(`http://${entry.address}:${String(port)}`);
+      for (const entry of entries) {
+        if (entry.internal) {
+          continue;
+        }
+        if (entry.family === "IPv4") {
+          urls.add(`http://${entry.address}:${String(port)}`);
+        }
       }
     }
+  } catch {
   }
   return Array.from(urls);
 }
 async function startCloudflaredTunnel(command, localPort) {
-  return new Promise((resolve2, reject) => {
-    const child = spawn2(command, ["tunnel", "--url", `http://localhost:${String(localPort)}`], {
+  return new Promise((resolve3, reject) => {
+    const child = spawn3(command, ["tunnel", "--url", `http://localhost:${String(localPort)}`], {
       stdio: ["ignore", "pipe", "pipe"]
     });
     const timeout = setTimeout(() => {
@@ -2314,7 +3329,7 @@ async function startCloudflaredTunnel(command, localPort) {
       clearTimeout(timeout);
       child.stdout?.off("data", handleData);
       child.stderr?.off("data", handleData);
-      resolve2({ process: child, url: parsedUrl });
+      resolve3({ process: child, url: parsedUrl });
     };
     const onError = (error) => {
       clearTimeout(timeout);
@@ -2333,7 +3348,7 @@ async function startCloudflaredTunnel(command, localPort) {
   });
 }
 function listenWithFallback(server, startPort) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const attempt = (port) => {
       const onError = (error) => {
         server.off("listening", onListening);
@@ -2345,7 +3360,7 @@ function listenWithFallback(server, startPort) {
       };
       const onListening = () => {
         server.off("error", onError);
-        resolve2(port);
+        resolve3(port);
       };
       server.once("error", onError);
       server.once("listening", onListening);
@@ -2354,8 +3369,72 @@ function listenWithFallback(server, startPort) {
     attempt(startPort);
   });
 }
+function getCodexGlobalStatePath2() {
+  const codexHome = process.env.CODEX_HOME?.trim() || join5(homedir3(), ".codex");
+  return join5(codexHome, ".codex-global-state.json");
+}
+function normalizeUniqueStrings(value) {
+  if (!Array.isArray(value)) return [];
+  const next = [];
+  for (const item of value) {
+    if (typeof item !== "string") continue;
+    const trimmed = item.trim();
+    if (!trimmed || next.includes(trimmed)) continue;
+    next.push(trimmed);
+  }
+  return next;
+}
+async function persistLaunchProject(projectPath) {
+  const trimmed = projectPath.trim();
+  if (!trimmed) return;
+  const normalizedPath = isAbsolute3(trimmed) ? trimmed : resolve2(trimmed);
+  const directoryInfo = await stat5(normalizedPath);
+  if (!directoryInfo.isDirectory()) {
+    throw new Error(`Not a directory: ${normalizedPath}`);
+  }
+  const statePath = getCodexGlobalStatePath2();
+  let payload = {};
+  try {
+    const raw = await readFile4(statePath, "utf8");
+    const parsed = JSON.parse(raw);
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      payload = parsed;
+    }
+  } catch {
+    payload = {};
+  }
+  const roots = normalizeUniqueStrings(payload["electron-saved-workspace-roots"]);
+  const activeRoots = normalizeUniqueStrings(payload["active-workspace-roots"]);
+  payload["electron-saved-workspace-roots"] = [
+    normalizedPath,
+    ...roots.filter((value) => value !== normalizedPath)
+  ];
+  payload["active-workspace-roots"] = [
+    normalizedPath,
+    ...activeRoots.filter((value) => value !== normalizedPath)
+  ];
+  await writeFile4(statePath, JSON.stringify(payload), "utf8");
+}
+async function addProjectOnly(projectPath) {
+  const trimmed = projectPath.trim();
+  if (!trimmed) {
+    throw new Error("Missing project path");
+  }
+  await persistLaunchProject(trimmed);
+}
 async function startServer(options) {
   const version = await readCliVersion();
+  const projectPath = options.projectPath?.trim() ?? "";
+  if (projectPath.length > 0) {
+    try {
+      await persistLaunchProject(projectPath);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.warn(`
+[project] Could not open launch project: ${message}
+`);
+    }
+  }
   const codexCommand = ensureCodexInstalled() ?? resolveCodexCommand();
   if (!hasCodexAuth() && codexCommand) {
     console.log("\nCodex is not logged in. Starting `codex login`...\n");
@@ -2416,7 +3495,7 @@ async function startServer(options) {
     qrcode.generate(tunnelUrl, { small: true });
     console.log("");
   }
-  openBrowser(`http://localhost:${String(port)}`);
+  if (options.open) openBrowser(`http://localhost:${String(port)}`);
   function shutdown() {
     console.log("\nShutting down...");
     if (tunnelChild && !tunnelChild.killed) {
@@ -2439,8 +3518,20 @@ async function runLogin() {
   console.log("\nStarting `codex login`...\n");
   runOrFail(codexCommand, ["login"], "Codex login");
 }
-program.option("-p, --port <port>", "port to listen on", "5999").option("--password <pass>", "set a specific password").option("--no-password", "disable password protection").option("--tunnel", "start cloudflared tunnel", true).option("--no-tunnel", "disable cloudflared tunnel startup").action(async (opts) => {
-  await startServer(opts);
+program.argument("[projectPath]", "project directory to open on launch").option("--open-project <path>", "open project directory on launch (Codex desktop parity)").option("-p, --port <port>", "port to listen on", "5999").option("--password <pass>", "set a specific password").option("--no-password", "disable password protection").option("--tunnel", "start cloudflared tunnel", true).option("--no-tunnel", "disable cloudflared tunnel startup").option("--open", "open browser on startup", true).option("--no-open", "do not open browser on startup").action(async (projectPath, opts) => {
+  const rawArgv = process.argv.slice(2);
+  const openProjectFlagIndex = rawArgv.findIndex((arg) => arg === "--open-project" || arg.startsWith("--open-project="));
+  let openProjectOnly = (opts.openProject ?? "").trim();
+  if (!openProjectOnly && openProjectFlagIndex >= 0 && projectPath?.trim()) {
+    openProjectOnly = projectPath.trim();
+  }
+  if (openProjectOnly.length > 0) {
+    await addProjectOnly(openProjectOnly);
+    console.log(`Added project: ${openProjectOnly}`);
+    return;
+  }
+  const launchProject = (projectPath ?? "").trim();
+  await startServer({ ...opts, projectPath: launchProject });
 });
 program.command("login").description("Install/check Codex CLI and run `codex login`").action(runLogin);
 program.command("help").description("Show codexui command help").action(() => {