codexapp 0.1.32 → 0.1.34

package/dist-cli/index.js

@@ -2,7 +2,7 @@
 
 // src/cli/index.ts
 import { createServer as createServer2 } from "http";
-import { chmodSync, createWriteStream, existsSync as existsSync2, mkdirSync } from "fs";
+import { chmodSync, createWriteStream, existsSync as existsSync3, mkdirSync } from "fs";
 import { readFile as readFile3 } from "fs/promises";
 import { homedir as homedir2, networkInterfaces } from "os";
 import { join as join4 } from "path";
@@ -17,14 +17,15 @@ 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 { existsSync as existsSync2 } from "fs";
 import { writeFile as writeFile2, stat as stat3 } from "fs/promises";
 import express from "express";
 
 // src/server/codexAppServerBridge.ts
 import { spawn } from "child_process";
 import { randomBytes } from "crypto";
-import { mkdtemp, readFile, readdir, rm, mkdir, stat } from "fs/promises";
+import { mkdtemp, readFile, readdir, rm, mkdir, stat, lstat, readlink, symlink } from "fs/promises";
+import { existsSync } from "fs";
 import { request as httpsRequest } from "https";
 import { homedir } from "os";
 import { tmpdir } from "os";
@@ -188,7 +189,7 @@ async function ensureRepoHasInitialCommit(repoRoot) {
   );
 }
 async function runCommandCapture(command, args, options = {}) {
-  return await new Promise((resolveOutput, reject) => {
+  return await new Promise((resolve2, reject) => {
     const proc = spawn(command, args, {
       cwd: options.cwd,
       env: process.env,
@@ -205,7 +206,34 @@ async function runCommandCapture(command, args, options = {}) {
     proc.on("error", reject);
     proc.on("close", (code) => {
       if (code === 0) {
-        resolveOutput(stdout.trim());
+        resolve2(stdout.trim());
+        return;
+      }
+      const details = [stderr.trim(), stdout.trim()].filter(Boolean).join("\n");
+      const suffix = details.length > 0 ? `: ${details}` : "";
+      reject(new Error(`Command failed (${command} ${args.join(" ")})${suffix}`));
+    });
+  });
+}
+async function runCommandWithOutput(command, args, options = {}) {
+  return await new Promise((resolve2, reject) => {
+    const proc = spawn(command, args, {
+      cwd: options.cwd,
+      env: process.env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    proc.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    proc.stderr.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    proc.on("error", reject);
+    proc.on("close", (code) => {
+      if (code === 0) {
+        resolve2(stdout.trim());
         return;
       }
       const details = [stderr.trim(), stdout.trim()].filter(Boolean).join("\n");
@@ -271,7 +299,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,7 +315,7 @@ 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() };
@@ -299,7 +327,7 @@ async function fetchMetaBatch(entries) {
   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 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();
@@ -325,6 +353,23 @@ function buildHubEntry(e) {
     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();
@@ -343,6 +388,538 @@ async function scanInstalledSkillsFromDisk() {
   }
   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() ?? "";
+  if (proot.length > 0) return true;
+  return false;
+}
+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((resolve2) => setTimeout(resolve2, 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);
+  const addPaths = ["."];
+  void _installedMap;
+  await runCommand("git", ["config", "user.email", "skills-sync@local"], { cwd: repoDir });
+  await runCommand("git", ["config", "user.name", "Skills Sync"], { cwd: repoDir });
+  await runCommand("git", ["add", ...addPaths], { cwd: repoDir });
+  const status = (await runCommandWithOutput("git", ["status", "--porcelain"], { cwd: repoDir })).trim();
+  if (!status) return;
+  await runCommand("git", ["commit", "-m", "Sync installed skills folder and manifest"], { cwd: repoDir });
+  await runCommand("git", ["push", "origin", `HEAD:${branch}`], { cwd: repoDir });
+}
+async function pullInstalledSkillsFolderFromRepo(token, repoOwner, repoName, _localSkillsDir) {
+  const remoteUrl = toGitHubTokenRemote(repoOwner, repoName, token);
+  const branch = getPreferredSyncBranch();
+  await ensureSkillsWorkingTreeRepo(remoteUrl, branch);
+}
+async function bootstrapSkillsFromUpstreamIntoLocal(_localSkillsDir) {
+  void _localSkillsDir;
+  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();
+    const localSkillsDir = getSkillsInstallDir();
+    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(localSkillsDir);
+      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);
+    const nextState = { ...state, githubUsername: username, repoOwner: username, repoName };
+    await writeSkillsSyncState(nextState);
+    startupSyncStatus.lastAction = "pull-private-fork";
+    await pullInstalledSkillsFolderFromRepo(state.githubToken, username, repoName, localSkillsDir);
+    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
+  });
+  const localDir = getSkillsInstallDir();
+  await pullInstalledSkillsFolderFromRepo(token, username, repoName, localDir);
+  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();
   let filtered = q ? allEntries.filter((s) => {
@@ -1010,6 +1587,7 @@ function createCodexBridgeMiddleware() {
     }
     return threadSearchIndexPromise;
   }
+  void initializeSkillsSyncOnStartup(appServer);
   const middleware = async (req, res, next) => {
     try {
       if (!req.url) {
@@ -1340,6 +1918,188 @@ function createCodexBridgeMiddleware() {
         }
         return;
       }
+      if (req.method === "GET" && url.pathname === "/codex-api/skills-sync/status") {
+        const state = await readSkillsSyncState();
+        setJson(res, 200, {
+          data: {
+            loggedIn: Boolean(state.githubToken),
+            githubUsername: state.githubUsername ?? "",
+            repoOwner: state.repoOwner ?? "",
+            repoName: state.repoName ?? "",
+            configured: Boolean(state.githubToken && state.repoOwner && state.repoName),
+            startup: {
+              inProgress: startupSyncStatus.inProgress,
+              mode: startupSyncStatus.mode,
+              branch: startupSyncStatus.branch,
+              lastAction: startupSyncStatus.lastAction,
+              lastRunAtIso: startupSyncStatus.lastRunAtIso,
+              lastSuccessAtIso: startupSyncStatus.lastSuccessAtIso,
+              lastError: startupSyncStatus.lastError
+            }
+          }
+        });
+        return;
+      }
+      if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/github/start-login") {
+        try {
+          const started = await startGithubDeviceLogin();
+          setJson(res, 200, { data: started });
+        } catch (error) {
+          setJson(res, 502, { error: getErrorMessage(error, "Failed to start GitHub login") });
+        }
+        return;
+      }
+      if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/github/token-login") {
+        try {
+          const payload = asRecord(await readJsonBody(req));
+          const token = typeof payload?.token === "string" ? payload.token.trim() : "";
+          if (!token) {
+            setJson(res, 400, { error: "Missing GitHub token" });
+            return;
+          }
+          const username = await resolveGithubUsername(token);
+          await finalizeGithubLoginAndSync(token, username, appServer);
+          setJson(res, 200, { ok: true, data: { githubUsername: username } });
+        } catch (error) {
+          setJson(res, 502, { error: getErrorMessage(error, "Failed to login with GitHub token") });
+        }
+        return;
+      }
+      if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/github/logout") {
+        try {
+          const state = await readSkillsSyncState();
+          await writeSkillsSyncState({
+            ...state,
+            githubToken: void 0,
+            githubUsername: void 0,
+            repoOwner: void 0,
+            repoName: void 0
+          });
+          setJson(res, 200, { ok: true });
+        } catch (error) {
+          setJson(res, 500, { error: getErrorMessage(error, "Failed to logout GitHub") });
+        }
+        return;
+      }
+      if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/github/complete-login") {
+        try {
+          const payload = asRecord(await readJsonBody(req));
+          const deviceCode = typeof payload?.deviceCode === "string" ? payload.deviceCode : "";
+          if (!deviceCode) {
+            setJson(res, 400, { error: "Missing deviceCode" });
+            return;
+          }
+          const result = await completeGithubDeviceLogin(deviceCode);
+          if (!result.token) {
+            setJson(res, 200, { ok: false, pending: result.error === "authorization_pending", error: result.error || "login_failed" });
+            return;
+          }
+          const token = result.token;
+          const username = await resolveGithubUsername(token);
+          await finalizeGithubLoginAndSync(token, username, appServer);
+          setJson(res, 200, { ok: true, data: { githubUsername: username } });
+        } catch (error) {
+          setJson(res, 502, { error: getErrorMessage(error, "Failed to complete GitHub login") });
+        }
+        return;
+      }
+      if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/push") {
+        try {
+          const state = await readSkillsSyncState();
+          if (!state.githubToken || !state.repoOwner || !state.repoName) {
+            setJson(res, 400, { error: "Skills sync is not configured yet" });
+            return;
+          }
+          if (isUpstreamSkillsRepo(state.repoOwner, state.repoName)) {
+            setJson(res, 400, { error: "Refusing to push to upstream repository" });
+            return;
+          }
+          const local = await collectLocalSyncedSkills(appServer);
+          const installedMap = await scanInstalledSkillsFromDisk();
+          await writeRemoteSkillsManifest(state.githubToken, state.repoOwner, state.repoName, local);
+          await syncInstalledSkillsFolderToRepo(state.githubToken, state.repoOwner, state.repoName, installedMap);
+          setJson(res, 200, { ok: true, data: { synced: local.length } });
+        } catch (error) {
+          setJson(res, 502, { error: getErrorMessage(error, "Failed to push synced skills") });
+        }
+        return;
+      }
+      if (req.method === "POST" && url.pathname === "/codex-api/skills-sync/pull") {
+        try {
+          const state = await readSkillsSyncState();
+          if (!state.githubToken || !state.repoOwner || !state.repoName) {
+            const localDir2 = await detectUserSkillsDir(appServer);
+            await bootstrapSkillsFromUpstreamIntoLocal(localDir2);
+            try {
+              await appServer.rpc("skills/list", { forceReload: true });
+            } catch {
+            }
+            setJson(res, 200, { ok: true, data: { synced: 0, source: "upstream" } });
+            return;
+          }
+          const remote = await readRemoteSkillsManifest(state.githubToken, state.repoOwner, state.repoName);
+          const tree = await fetchSkillsTree();
+          const uniqueOwnerByName = /* @__PURE__ */ new Map();
+          const ambiguousNames = /* @__PURE__ */ new Set();
+          for (const entry of tree) {
+            if (ambiguousNames.has(entry.name)) continue;
+            const existingOwner = uniqueOwnerByName.get(entry.name);
+            if (!existingOwner) {
+              uniqueOwnerByName.set(entry.name, entry.owner);
+              continue;
+            }
+            if (existingOwner !== entry.owner) {
+              uniqueOwnerByName.delete(entry.name);
+              ambiguousNames.add(entry.name);
+            }
+          }
+          const localDir = await detectUserSkillsDir(appServer);
+          await pullInstalledSkillsFolderFromRepo(state.githubToken, state.repoOwner, state.repoName, localDir);
+          const installerScript = "/Users/igor/.cursor/skills/.system/skill-installer/scripts/install-skill-from-github.py";
+          const localSkills = await scanInstalledSkillsFromDisk();
+          for (const skill of remote) {
+            const owner = skill.owner || uniqueOwnerByName.get(skill.name) || "";
+            if (!owner) {
+              continue;
+            }
+            if (!localSkills.has(skill.name)) {
+              await runCommand("python3", [
+                installerScript,
+                "--repo",
+                `${HUB_SKILLS_OWNER}/${HUB_SKILLS_REPO}`,
+                "--path",
+                `skills/${owner}/${skill.name}`,
+                "--dest",
+                localDir,
+                "--method",
+                "git"
+              ]);
+            }
+            const skillPath = join(localDir, skill.name);
+            await appServer.rpc("skills/config/write", { path: skillPath, enabled: skill.enabled });
+          }
+          const remoteNames = new Set(remote.map((row) => row.name));
+          for (const [name, localInfo] of localSkills.entries()) {
+            if (!remoteNames.has(name)) {
+              await rm(localInfo.path.replace(/\/SKILL\.md$/, ""), { recursive: true, force: true });
+            }
+          }
+          const nextOwners = {};
+          for (const item of remote) {
+            const owner = item.owner || uniqueOwnerByName.get(item.name) || "";
+            if (owner) nextOwners[item.name] = owner;
+          }
+          await writeSkillsSyncState({ ...state, installedOwners: nextOwners });
+          try {
+            await appServer.rpc("skills/list", { forceReload: true });
+          } catch {
+          }
+          setJson(res, 200, { ok: true, data: { synced: remote.length } });
+        } catch (error) {
+          setJson(res, 502, { error: getErrorMessage(error, "Failed to pull synced skills") });
+        }
+        return;
+      }
       if (req.method === "GET" && url.pathname === "/codex-api/skills-hub/readme") {
         try {
           const owner = url.searchParams.get("owner") || "";
@@ -1348,7 +2108,7 @@ function createCodexBridgeMiddleware() {
             setJson(res, 400, { error: "Missing owner or name" });
             return;
           }
-          const rawUrl = `https://raw.githubusercontent.com/openclaw/skills/main/skills/${owner}/${name}/SKILL.md`;
+          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();
@@ -1373,7 +2133,7 @@ function createCodexBridgeMiddleware() {
           await runCommand("python3", [
             installerScript,
             "--repo",
-            "openclaw/skills",
+            `${HUB_SKILLS_OWNER}/${HUB_SKILLS_REPO}`,
             "--path",
             skillPathInRepo,
             "--dest",
@@ -1383,6 +2143,10 @@ function createCodexBridgeMiddleware() {
           ]);
           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") });
@@ -1400,6 +2164,13 @@ function createCodexBridgeMiddleware() {
             return;
           }
           await rm(target, { recursive: true, force: true });
+          if (name) {
+            const syncState = await readSkillsSyncState();
+            const nextOwners = { ...syncState.installedOwners ?? {} };
+            delete nextOwners[name];
+            await writeSkillsSyncState({ ...syncState, installedOwners: nextOwners });
+          }
+          await autoPushSyncedSkills(appServer);
           try {
             await appServer.rpc("skills/list", { forceReload: true });
           } catch {
@@ -1979,7 +2750,7 @@ function createServer(options = {}) {
       res.status(404).json({ error: "File not found." });
     }
   });
-  const hasFrontendAssets = existsSync(spaEntryFile);
+  const hasFrontendAssets = existsSync2(spaEntryFile);
   if (hasFrontendAssets) {
     app.use(express.static(distDir));
   }
@@ -2086,7 +2857,7 @@ function resolveCodexCommand() {
     return "codex";
   }
   const userCandidate = join4(getUserNpmPrefix(), "bin", "codex");
-  if (existsSync2(userCandidate) && canRun(userCandidate, ["--version"])) {
+  if (existsSync3(userCandidate) && canRun(userCandidate, ["--version"])) {
     return userCandidate;
   }
   const prefix = process.env.PREFIX?.trim();
@@ -2094,7 +2865,7 @@ function resolveCodexCommand() {
     return null;
   }
   const candidate = join4(prefix, "bin", "codex");
-  if (existsSync2(candidate) && canRun(candidate, ["--version"])) {
+  if (existsSync3(candidate) && canRun(candidate, ["--version"])) {
     return candidate;
   }
   return null;
@@ -2104,7 +2875,7 @@ function resolveCloudflaredCommand() {
     return "cloudflared";
   }
   const localCandidate = join4(homedir2(), ".local", "bin", "cloudflared");
-  if (existsSync2(localCandidate) && canRun(localCandidate, ["--version"])) {
+  if (existsSync3(localCandidate) && canRun(localCandidate, ["--version"])) {
     return localCandidate;
   }
   return null;
@@ -2199,7 +2970,7 @@ async function resolveCloudflaredForTunnel() {
 }
 function hasCodexAuth() {
   const codexHome = process.env.CODEX_HOME?.trim() || join4(homedir2(), ".codex");
-  return existsSync2(join4(codexHome, "auth.json"));
+  return existsSync3(join4(codexHome, "auth.json"));
 }
 function ensureCodexInstalled() {
   let codexCommand = resolveCodexCommand();