@duanluan/codex-plus-plus-launcher 1.2.0 → 1.2.1

package/codex_plus_plus_launcher/__init__.py

@@ -1 +1 @@
-__version__ = "1.2.0"
+__version__ = "1.2.1"

package/npm/build-local-binary.cjs

@@ -9,6 +9,14 @@ function packageRoot() {
   return path.resolve(__dirname, '..');
 }
 
+function packageVersion(root = packageRoot()) {
+  return JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8')).version;
+}
+
+function defaultUpstreamRef(root = packageRoot()) {
+  return `v${packageVersion(root)}`;
+}
+
 function run(command, args, options = {}) {
   const result = spawnSync(command, args, { stdio: 'inherit', shell: false, ...options });
   if (result.status !== 0) {
@@ -16,6 +24,11 @@ function run(command, args, options = {}) {
   }
 }
 
+function runSucceeds(command, args, options = {}) {
+  const result = spawnSync(command, args, { stdio: 'ignore', shell: false, ...options });
+  return result.status === 0;
+}
+
 function platformKey(platform = process.platform, arch = process.arch) {
   return `${platform}-${arch}`;
 }
@@ -42,10 +55,20 @@ function packageBuildArgs(key) {
   return key === 'linux-x64' ? ['-p', 'codex-plus-launcher'] : [];
 }
 
+function applyPluginUnlockPatch(upstreamDir, root = packageRoot()) {
+  const patchPath = path.join(root, 'patches', 'codex-plus-plus-plugin-unlock.patch');
+  if (runSucceeds('git', ['apply', '--reverse', '--check', patchPath], { cwd: upstreamDir })) {
+    return;
+  }
+  run('git', ['apply', '--check', patchPath], { cwd: upstreamDir });
+  run('git', ['apply', patchPath], { cwd: upstreamDir });
+}
+
 function main() {
   const root = packageRoot();
-  const upstreamDir = process.env.CODEXPP_UPSTREAM_DIR || path.join(os.tmpdir(), 'CodexPlusPlus-upstream-build');
-  const ref = process.env.CODEXPP_UPSTREAM_REF || 'v1.2.0';
+  const ref = process.env.CODEXPP_UPSTREAM_REF || defaultUpstreamRef(root);
+  const refKey = ref.replace(/[^A-Za-z0-9._-]/g, '_');
+  const upstreamDir = process.env.CODEXPP_UPSTREAM_DIR || path.join(os.tmpdir(), `CodexPlusPlus-upstream-build-${refKey}`);
   const key = process.env.CODEXPP_SIDECAR_PLATFORM || platformKey();
   const outDir = path.join(root, 'upstream-bin', key);
 
@@ -56,6 +79,8 @@ function main() {
     run('git', ['checkout', 'FETCH_HEAD'], { cwd: upstreamDir });
   }
 
+  applyPluginUnlockPatch(upstreamDir, root);
+
   if (key !== 'linux-x64') {
     run('npm', ['install', '--package-lock=false'], { cwd: path.join(upstreamDir, 'apps', 'codex-plus-manager'), shell: process.platform === 'win32' });
     run('npm', ['run', 'vite:build'], { cwd: path.join(upstreamDir, 'apps', 'codex-plus-manager'), shell: process.platform === 'win32' });
@@ -100,4 +125,4 @@ if (require.main === module) {
   }
 }
 
-module.exports = { buildTargetArgs, cargoTargetForKey, main, packageBuildArgs, platformKey };
+module.exports = { applyPluginUnlockPatch, buildTargetArgs, cargoTargetForKey, defaultUpstreamRef, main, packageBuildArgs, platformKey };

package/npm/launcher.js

@@ -13,6 +13,8 @@ const MANAGER_NAME = 'Codex++ 管理工具';
 const LINUX_SHIM_DIR_NAME = 'codex-desktop-linux-shim';
 const LINUX_SHIM_BINARY = 'codex.exe';
 const LINUX_DESKTOP_ENTRY = 'codex-plus-plus.desktop';
+const PLUGIN_AUTH_UNLOCK_FILE = 'plugin-auth-unlocked.js';
+const PLUGIN_AUTH_UNLOCK_CONTENT = 'function e(e){return false}export{e as t};\n';
 
 function optionValue(options, key, fallback) {
   const value = options[key];
@@ -63,6 +65,11 @@ function upstreamMetadataPath(options = {}) {
   return path.join(root, 'upstream-bin', 'upstream-release.json');
 }
 
+function pluginAuthUnlockPath(options = {}) {
+  const root = optionValue(options, 'packageRoot', packageRoot);
+  return optionValue(options, 'pluginAuthUnlockPath', () => path.join(root, 'npm', PLUGIN_AUTH_UNLOCK_FILE));
+}
+
 function readJsonFile(candidate, fsImpl = fs) {
   try {
     return JSON.parse(fsImpl.readFileSync(candidate, 'utf8'));
@@ -585,11 +592,113 @@ function shellSingleQuote(value) {
   return `'${String(value).replace(/'/g, "'\\''")}'`;
 }
 
-function linuxCodexShimScript(startScript) {
+function linuxCodexShimScript(startScript, pluginAuthUnlockFile) {
   return [
     '#!/usr/bin/env bash',
     'set -euo pipefail',
-    `exec ${shellSingleQuote(startScript)} -- "$@"`,
+    '',
+    `START_SCRIPT=${shellSingleQuote(startScript)}`,
+    `PLUGIN_AUTH_UNLOCK_FILE=${shellSingleQuote(pluginAuthUnlockFile)}`,
+    'TMP_APP_ROOT=""',
+    'CHILD_PID=""',
+    '',
+    'resolve_file_dir() {',
+    '  local source="$1"',
+    '  local dir',
+    '  while [ -L "$source" ]; do',
+    '    dir="$(cd -P "$(dirname "$source")" && pwd)"',
+    '    source="$(readlink "$source")"',
+    '    case "$source" in',
+    '      /*) ;;',
+    '      *) source="$dir/$source" ;;',
+    '    esac',
+    '  done',
+    '  cd -P "$(dirname "$source")" && pwd',
+    '}',
+    '',
+    'cleanup() {',
+    '  if [ -n "$TMP_APP_ROOT" ]; then',
+    '    rm -rf "$TMP_APP_ROOT"',
+    '  fi',
+    '}',
+    '',
+    'forward_signal() {',
+    '  local sig="$1"',
+    '  if [ -n "$CHILD_PID" ] && kill -0 "$CHILD_PID" 2>/dev/null; then',
+    '    kill -"$sig" "$CHILD_PID" 2>/dev/null || true',
+    '  fi',
+    '}',
+    '',
+    'trap cleanup EXIT',
+    "trap 'forward_signal HUP' HUP",
+    "trap 'forward_signal INT' INT",
+    "trap 'forward_signal TERM' TERM",
+    '',
+    'APP_ROOT="$(resolve_file_dir "$START_SCRIPT")"',
+    'WEBVIEW_DIR="$APP_ROOT/content/webview"',
+    '',
+    'if [ ! -f "$PLUGIN_AUTH_UNLOCK_FILE" ]; then',
+    '  echo "Codex++ plugin auth unlock file not found: $PLUGIN_AUTH_UNLOCK_FILE" >&2',
+    '  exit 1',
+    'fi',
+    '',
+    'if [ ! -d "$WEBVIEW_DIR" ]; then',
+    '  exec "$START_SCRIPT" -- "$@"',
+    'fi',
+    '',
+    'TMP_APP_ROOT="$(mktemp -d "${TMPDIR:-/tmp}/codex-plus-plus-linux-app.XXXXXX")"',
+    'cp "$START_SCRIPT" "$TMP_APP_ROOT/start.sh"',
+    'chmod 755 "$TMP_APP_ROOT/start.sh"',
+    '',
+    'shopt -s dotglob nullglob',
+    'for entry in "$APP_ROOT"/*; do',
+    '  name="$(basename "$entry")"',
+    '  if [ "$name" = "start.sh" ] || [ "$name" = "content" ]; then',
+    '    continue',
+    '  fi',
+    '  ln -s "$entry" "$TMP_APP_ROOT/$name"',
+    'done',
+    'shopt -u dotglob nullglob',
+    '',
+    'mkdir -p "$TMP_APP_ROOT/content/webview/assets"',
+    'if [ -d "$APP_ROOT/content" ]; then',
+    '  shopt -s dotglob nullglob',
+    '  for entry in "$APP_ROOT/content"/*; do',
+    '    name="$(basename "$entry")"',
+    '    if [ "$name" = "webview" ]; then',
+    '      continue',
+    '    fi',
+    '    ln -s "$entry" "$TMP_APP_ROOT/content/$name"',
+    '  done',
+    '  shopt -u dotglob nullglob',
+    'fi',
+    '',
+    'shopt -s dotglob nullglob',
+    'for entry in "$WEBVIEW_DIR"/*; do',
+    '  name="$(basename "$entry")"',
+    '  if [ "$name" = "assets" ]; then',
+    '    continue',
+    '  fi',
+    '  ln -s "$entry" "$TMP_APP_ROOT/content/webview/$name"',
+    'done',
+    'for entry in "$WEBVIEW_DIR/assets"/*; do',
+    '  name="$(basename "$entry")"',
+    '  if [[ "$name" == plugin-auth-*.js ]]; then',
+    '    ln -s "$PLUGIN_AUTH_UNLOCK_FILE" "$TMP_APP_ROOT/content/webview/assets/$name"',
+    '  else',
+    '    ln -s "$entry" "$TMP_APP_ROOT/content/webview/assets/$name"',
+    '  fi',
+    'done',
+    'shopt -u dotglob nullglob',
+    '',
+    '"$TMP_APP_ROOT/start.sh" -- "$@" &',
+    'CHILD_PID=$!',
+    'set +e',
+    'wait "$CHILD_PID"',
+    'STATUS=$?',
+    'set -e',
+    'CHILD_PID=""',
+    'exit "$STATUS"',
     '',
   ].join('\n');
 }
@@ -599,9 +708,16 @@ function writeLinuxCodexShim(installation, options = {}) {
   const shimRoot = linuxShimRoot(options);
   fsImpl.mkdirSync(shimRoot, { recursive: true });
   const shimPath = path.join(shimRoot, LINUX_SHIM_BINARY);
-  fsImpl.writeFileSync(shimPath, linuxCodexShimScript(installation.startScript), 'utf8');
+  const pluginAuthTarget = path.join(shimRoot, PLUGIN_AUTH_UNLOCK_FILE);
+  const pluginAuthSource = pluginAuthUnlockPath(options);
+  if (fsImpl.existsSync(pluginAuthSource)) {
+    fsImpl.copyFileSync(pluginAuthSource, pluginAuthTarget);
+  } else {
+    fsImpl.writeFileSync(pluginAuthTarget, PLUGIN_AUTH_UNLOCK_CONTENT, 'utf8');
+  }
+  fsImpl.writeFileSync(shimPath, linuxCodexShimScript(installation.startScript, pluginAuthTarget), 'utf8');
   fsImpl.chmodSync(shimPath, 0o755);
-  return { shimRoot, shimPath };
+  return { shimRoot, shimPath, pluginAuthUnlock: pluginAuthTarget };
 }
 
 function linuxDesktopEntry({ name, execPath, iconPath, comment }) {
@@ -756,6 +872,7 @@ async function installLinuxApp(options = {}) {
   const shim = writeLinuxCodexShim(installation, options);
   installed.linuxShim = shim.shimPath;
   installed.linuxShimRoot = shim.shimRoot;
+  installed.linuxPluginAuthUnlock = shim.pluginAuthUnlock;
   installed.linuxCodexStart = installation.startScript;
   const entrypoints = await installEntrypoints(installed, { ...options, installRoot: installed.installRoot });
   const statePath = writeLinuxInstallState(installed, installation, options);

package/npm/plugin-auth-unlocked.js

@@ -0,0 +1 @@
+function e(e){return false}export{e as t};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duanluan/codex-plus-plus-launcher",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Install and launch Codex++ from npm",
   "bin": {
     "cxpp": "npm/cxpp.js",
@@ -15,12 +15,14 @@
   "files": [
     "codex_plus_plus_launcher/*.py",
     "codex_plus_plus_launcher/assets/*",
+    "patches/**",
     "upstream-bin/**",
     "install-npm.cjs",
     "npm/cxpp.js",
     "npm/i18n.js",
     "npm/launcher.js",
     "npm/install.js",
+    "npm/plugin-auth-unlocked.js",
     "npm/build-local-binary.cjs",
     "npm/verify-package.cjs",
     "npm/smoke-install.cjs",

package/patches/codex-plus-plus-plugin-unlock.patch

@@ -0,0 +1,164 @@
+--- a/assets/inject/renderer-inject.js
++++ b/assets/inject/renderer-inject.js
+@@ -67,0 +68 @@
++  const codexPluginNavUnlockVersion = "2";
+@@ -2701,0 +2703,154 @@
++  function pluginNavButtonCandidates() {
++    return Array.from(document.querySelectorAll(selectors.pluginNavButton))
++      .filter((button) => button instanceof HTMLElement && isPluginNavButton(button));
++  }
++
++  function isPluginNavButton(button) {
++    const text = (button.textContent || "").trim();
++    if (/^(Plugins|插件)$/.test(text)) return true;
++    return !!button.querySelector?.(selectors.pluginSvgPath);
++  }
++
++  function reactPropKeys(element) {
++    return Object.keys(element || {}).filter((key) => key.startsWith("__reactProps"));
++  }
++
++  function reactPropsFor(element) {
++    return reactPropKeys(element)
++      .map((key) => element[key])
++      .filter((props) => props && typeof props === "object");
++  }
++
++  function reactFiberFor(element) {
++    const key = Object.keys(element || {}).find((key) => key.startsWith("__reactFiber"));
++    return key ? element[key] : null;
++  }
++
++  function reactPropHandlersFor(element) {
++    const handlers = reactPropsFor(element)
++      .map((props) => props.onClick)
++      .filter((handler) => typeof handler === "function");
++    const fiber = reactFiberFor(element);
++    [
++      fiber?.memoizedProps?.onClick,
++      fiber?.pendingProps?.onClick,
++      fiber?.alternate?.memoizedProps?.onClick,
++      fiber?.alternate?.pendingProps?.onClick,
++    ].forEach((handler) => {
++      if (typeof handler === "function") handlers.push(handler);
++    });
++    return Array.from(new Set(handlers));
++  }
++
++  function reactClickHandlerFor(element) {
++    for (const handler of reactPropHandlersFor(element)) {
++      if (typeof handler === "function") return handler;
++    }
++    return null;
++  }
++
++  function isUsefulPluginNavClickHandler(handler) {
++    if (typeof handler !== "function") return false;
++    const source = Function.prototype.toString.call(handler);
++    if (/^\s*(?:\(\)\s*=>\s*\{\s*\}|function\s*[^(]*\([^)]*\)\s*\{\s*\})\s*$/.test(source)) return false;
++    if (source.includes("navigateToCodexPlugins")) return false;
++    return true;
++  }
++
++  function isSkillsRouteClickHandler(handler) {
++    if (!isUsefulPluginNavClickHandler(handler)) return false;
++    const source = Function.prototype.toString.call(handler);
++    return source.includes("Uy(") || source.includes("/skills");
++  }
++
++  function isSkillsNavButton(button) {
++    const text = (button.textContent || "").trim();
++    return /^(Skills|技能)$/.test(text);
++  }
++
++  function pluginNavFallbackClickHandler(button) {
++    const ownSkillsHandler = reactPropHandlersFor(button).find(isSkillsRouteClickHandler);
++    if (ownSkillsHandler) return ownSkillsHandler;
++    const currentHandler = reactClickHandlerFor(button);
++    if (isUsefulPluginNavClickHandler(currentHandler)) return currentHandler;
++    const nav = button.closest?.('nav[role="navigation"]');
++    const candidates = Array.from(nav?.querySelectorAll?.(selectors.pluginNavButton) || []);
++    for (const candidate of candidates) {
++      if (candidate === button) continue;
++      const handlers = reactPropHandlersFor(candidate);
++      const skillsHandler = handlers.find(isSkillsRouteClickHandler);
++      if (skillsHandler) return skillsHandler;
++    }
++    const skillsButton = candidates.find((candidate) => candidate !== button && isSkillsNavButton(candidate));
++    const skillsHandler = reactClickHandlerFor(skillsButton);
++    if (isUsefulPluginNavClickHandler(skillsHandler)) return skillsHandler;
++    return null;
++  }
++
++  function patchReactPluginNavProps(element) {
++    const pluginHandler = pluginNavFallbackClickHandler(element);
++    reactPropsFor(element)
++      .forEach((props) => {
++        props.disabled = false;
++        props["aria-disabled"] = false;
++        props["data-disabled"] = undefined;
++        if (pluginHandler && !isUsefulPluginNavClickHandler(props.onClick)) {
++          props.onClick = pluginHandler;
++        }
++      });
++  }
++
++  function clearPluginNavDisabledState(element) {
++    if (!(element instanceof HTMLElement)) return;
++    if ("disabled" in element) element.disabled = false;
++    element.removeAttribute("disabled");
++    element.removeAttribute("aria-disabled");
++    element.removeAttribute("data-disabled");
++    element.removeAttribute("inert");
++    element.classList.remove("disabled", "opacity-50", "cursor-not-allowed", "pointer-events-none");
++    element.style.pointerEvents = "auto";
++    element.style.opacity = "";
++    element.style.cursor = "pointer";
++    element.tabIndex = 0;
++    patchReactPluginNavProps(element);
++  }
++
++  function pluginNavUnlockNodes(button) {
++    const nodes = [button];
++    button.querySelectorAll?.("[disabled], [aria-disabled], [data-disabled], .cursor-not-allowed, .pointer-events-none")
++      .forEach((node) => nodes.push(node));
++    let parent = button.parentElement;
++    for (let depth = 0; parent && depth < 3; depth += 1, parent = parent.parentElement) {
++      if (parent.matches?.("button, [role='button'], [disabled], [aria-disabled], [data-disabled], .cursor-not-allowed, .pointer-events-none")) {
++        nodes.push(parent);
++      }
++    }
++    return Array.from(new Set(nodes));
++  }
++
++  function unlockPluginNavButtons() {
++    if (!codexPlusSettings().pluginMarketplaceUnlock) return;
++    pluginNavButtonCandidates().forEach((button) => {
++      button.dataset.codexPluginNavUnlocked = codexPluginNavUnlockVersion;
++      pluginNavUnlockNodes(button).forEach(clearPluginNavDisabledState);
++    });
++  }
++
++  function refreshPluginNavUnlockLoop() {
++    const shouldRun = codexPlusSettings().pluginMarketplaceUnlock;
++    if (!shouldRun) {
++      clearInterval(window.__codexPluginNavUnlockRefreshTimer);
++      window.__codexPluginNavUnlockRefreshTimer = null;
++      return;
++    }
++    if (window.__codexPluginNavUnlockRefreshTimer) return;
++    window.__codexPluginNavUnlockRefreshTimer = setInterval(() => {
++      if (!codexPlusSettings().pluginMarketplaceUnlock) {
++        clearInterval(window.__codexPluginNavUnlockRefreshTimer);
++        window.__codexPluginNavUnlockRefreshTimer = null;
++        return;
++      }
++      unlockPluginNavButtons();
++    }, codexForcePluginInstallRefreshIntervalMs);
++  }
++
+@@ -7592,0 +7748,2 @@
++    unlockPluginNavButtons();
++    refreshPluginNavUnlockLoop();
+@@ -7647,0 +7805 @@
++      selectors.pluginNavButton,

package/upstream-bin/upstream-release.json

@@ -1,16 +1,16 @@
 {
-  "version": "v1.2.0",
-  "html_url": "https://github.com/BigPizzaV3/CodexPlusPlus/releases/tag/v1.2.0",
-  "asset_name": "CodexPlusPlus-1.2.0-macos-arm64.dmg",
-  "asset_url": "https://github.com/BigPizzaV3/CodexPlusPlus/releases/download/v1.2.0/CodexPlusPlus-1.2.0-macos-arm64.dmg",
-  "windows_asset_name": "CodexPlusPlus-1.2.0-windows-x64-setup.exe",
-  "windows_asset_url": "https://github.com/BigPizzaV3/CodexPlusPlus/releases/download/v1.2.0/CodexPlusPlus-1.2.0-windows-x64-setup.exe",
-  "macos_x64_asset_name": "CodexPlusPlus-1.2.0-macos-x64.dmg",
-  "macos_x64_asset_url": "https://github.com/BigPizzaV3/CodexPlusPlus/releases/download/v1.2.0/CodexPlusPlus-1.2.0-macos-x64.dmg",
-  "macos_arm64_asset_name": "CodexPlusPlus-1.2.0-macos-arm64.dmg",
-  "macos_arm64_asset_url": "https://github.com/BigPizzaV3/CodexPlusPlus/releases/download/v1.2.0/CodexPlusPlus-1.2.0-macos-arm64.dmg",
-  "source_zip_url": "https://github.com/BigPizzaV3/CodexPlusPlus/archive/refs/tags/v1.2.0.zip",
-  "install_spec": "https://github.com/BigPizzaV3/CodexPlusPlus/releases/download/v1.2.0/CodexPlusPlus-1.2.0-macos-arm64.dmg",
-  "commit": "68f72e36db03c3052145e8fd1601847ac0f54d17",
+  "version": "v1.2.1",
+  "html_url": "https://github.com/BigPizzaV3/CodexPlusPlus/releases/tag/v1.2.1",
+  "asset_name": "CodexPlusPlus-1.2.1-macos-arm64.dmg",
+  "asset_url": "https://github.com/BigPizzaV3/CodexPlusPlus/releases/download/v1.2.1/CodexPlusPlus-1.2.1-macos-arm64.dmg",
+  "windows_asset_name": "CodexPlusPlus-1.2.1-windows-x64-setup.exe",
+  "windows_asset_url": "https://github.com/BigPizzaV3/CodexPlusPlus/releases/download/v1.2.1/CodexPlusPlus-1.2.1-windows-x64-setup.exe",
+  "macos_x64_asset_name": "CodexPlusPlus-1.2.1-macos-x64.dmg",
+  "macos_x64_asset_url": "https://github.com/BigPizzaV3/CodexPlusPlus/releases/download/v1.2.1/CodexPlusPlus-1.2.1-macos-x64.dmg",
+  "macos_arm64_asset_name": "CodexPlusPlus-1.2.1-macos-arm64.dmg",
+  "macos_arm64_asset_url": "https://github.com/BigPizzaV3/CodexPlusPlus/releases/download/v1.2.1/CodexPlusPlus-1.2.1-macos-arm64.dmg",
+  "source_zip_url": "https://github.com/BigPizzaV3/CodexPlusPlus/archive/refs/tags/v1.2.1.zip",
+  "install_spec": "https://github.com/BigPizzaV3/CodexPlusPlus/releases/download/v1.2.1/CodexPlusPlus-1.2.1-macos-arm64.dmg",
+  "commit": "b20ca373d2e5a29bb75b532bd93f74bac18626f5",
   "repository": "BigPizzaV3/CodexPlusPlus"
 }