@duanluan/codex-plus-plus-launcher 1.2.18 → 1.2.22

package/codex_plus_plus_launcher/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "1.2.18"
+__version__ = "1.2.19"
 
 

package/npm/launcher.js

@@ -402,6 +402,39 @@ function findRunningSidecarProcesses(options = {}) {
   }
 }
 
+function findRunningCodexPlusManagerProcesses(options = {}) {
+  const platform = optionValue(options, 'platform', process.platform);
+  if (platform !== 'win32') {
+    return [];
+  }
+  if (typeof options.findRunningCodexPlusManagerProcesses === 'function') {
+    return options.findRunningCodexPlusManagerProcesses(options) || [];
+  }
+
+  const run = options.processSpawnSync || (options.spawnSync ? null : spawnSync);
+  if (!run) {
+    return [];
+  }
+  const script = [
+    '$ErrorActionPreference = "SilentlyContinue"',
+    'Get-CimInstance Win32_Process | Where-Object {',
+    '  $_.Name -ieq "codex-plus-plus-manager.exe"',
+    '} | Select-Object ProcessId,Name,ExecutablePath,CommandLine | ConvertTo-Json -Compress',
+  ].join('\n');
+  const result = run('powershell.exe', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command', script], {
+    encoding: 'utf8',
+    windowsHide: true,
+  });
+  if (!result || result.status !== 0) {
+    return [];
+  }
+  try {
+    return parsePowerShellJson(result.stdout);
+  } catch (_error) {
+    return [];
+  }
+}
+
 function cdpTargetsAvailable(debugPort, options = {}) {
   if (typeof options.cdpTargetsAvailable === 'function') {
     return options.cdpTargetsAvailable(debugPort, options);
@@ -447,10 +480,12 @@ function exitSoon(code) {
   }
 }
 
-function readJson(pathname) {
+const HTTP_HOSTS = ['localhost', '127.0.0.1', '::1'];
+
+function readJsonFromHost(host, pathname) {
   return new Promise((resolve, reject) => {
     const request = http.get({
-      host: '127.0.0.1',
+      host,
       port: debugPort,
       path: pathname,
       timeout: 1500,
@@ -471,13 +506,30 @@ function readJson(pathname) {
   });
 }
 
+async function readJson(pathname) {
+  let lastError = null;
+  for (const host of HTTP_HOSTS) {
+    try {
+      return await readJsonFromHost(host, pathname);
+    } catch (error) {
+      lastError = error;
+    }
+  }
+  throw lastError || new Error('CDP HTTP unavailable');
+}
+
 function parseWebSocketTarget(webSocketDebuggerUrl) {
   const parsed = new URL(webSocketDebuggerUrl);
   if (parsed.protocol !== 'ws:') {
     throw new Error('unsupported websocket protocol');
   }
+  const host = parsed.hostname.startsWith('[') && parsed.hostname.endsWith(']')
+    ? parsed.hostname.slice(1, -1)
+    : parsed.hostname;
+  const hostHeader = host.includes(':') ? '[' + host + ']' : host;
   return {
-    host: parsed.hostname,
+    host,
+    hostHeader,
     port: Number(parsed.port || 80),
     path: (parsed.pathname || '/') + (parsed.search || ''),
   };
@@ -617,7 +669,7 @@ function evaluateMenuState(webSocketDebuggerUrl) {
       const key = crypto.randomBytes(16).toString('base64');
       socket.write([
         'GET ' + target.path + ' HTTP/1.1',
-        'Host: ' + target.host + ':' + target.port,
+        'Host: ' + target.hostHeader + ':' + target.port,
         'Upgrade: websocket',
         'Connection: Upgrade',
         'Sec-WebSocket-Key: ' + key,
@@ -758,6 +810,22 @@ function preflightWindowsCodexLaunch(args = [], options = {}) {
   const requestedDebugPort = launchDebugPort(args);
   const runningDebugPorts = codexProcessDebugPorts(processes);
   const portsToCheck = runningDebugPorts.length > 0 ? runningDebugPorts : [requestedDebugPort];
+  if (runningDebugPorts.length === 0) {
+    const terminate = options.terminateProcesses || terminateProcesses;
+    terminate(processes, options);
+    const sidecars = findRunningSidecarProcesses(options);
+    if (sidecars.length > 0) {
+      terminate(sidecars, options);
+    } else {
+      terminateSidecarsByImageName(options);
+    }
+    return {
+      action: 'terminated_codex_for_missing_cdp',
+      debugPort: requestedDebugPort,
+      processCount: processes.length,
+      sidecarCount: sidecars.length,
+    };
+  }
   if (runningDebugPorts.length > 0) {
     const availableDebugPort = portsToCheck.find((debugPort) => cdpTargetsAvailable(debugPort, options));
     if (availableDebugPort) {
@@ -1019,9 +1087,8 @@ async function installSidecars(options = {}) {
   return installed;
 }
 
-function readInstalledSidecarVersion(options = {}) {
+function readInstalledSidecarStampVersion(options = {}) {
   const fsImpl = options.fs || fs;
-  const platform = optionValue(options, 'platform', process.platform);
   const installRoot = optionValue(options, 'installRoot', () => detectedInstallRoot(options));
   const stampPath = path.join(installRoot, SIDECAR_VERSION_STAMP);
   try {
@@ -1031,21 +1098,25 @@ function readInstalledSidecarVersion(options = {}) {
       return first;
     }
   } catch (_error) {
-    // stamp absent or unreadable; fall through to platform probe
-  }
-  if (platform !== 'win32') {
-    return null;
+    // stamp absent or unreadable
   }
+  return null;
+}
+
+function readWindowsSidecarBinaryVersion(options = {}) {
+  const fsImpl = options.fs || fs;
+  const installRoot = optionValue(options, 'installRoot', () => detectedInstallRoot(options));
   const silent = installedSidecarPath('silent', { ...options, installRoot });
   if (!fsImpl.existsSync(silent)) {
     return null;
   }
   const run = options.spawnSync || spawnSync;
   try {
+    const env = { ...(options.env || process.env), CODEXPP_VERSION_PROBE_PATH: silent };
     const result = run(
-      'powershell',
-      ['-NoProfile', '-NonInteractive', '-Command', '(Get-Item -LiteralPath $args[0]).VersionInfo.FileVersion', '--', silent],
-      { encoding: 'utf8', windowsHide: true },
+      'powershell.exe',
+      ['-NoProfile', '-NonInteractive', '-Command', '(Get-Item -LiteralPath $env:CODEXPP_VERSION_PROBE_PATH).VersionInfo.FileVersion'],
+      { encoding: 'utf8', env, windowsHide: true },
     );
     if (result && result.status === 0) {
       const out = String(result.stdout || '').trim();
@@ -1059,6 +1130,14 @@ function readInstalledSidecarVersion(options = {}) {
   return null;
 }
 
+function readInstalledSidecarVersion(options = {}) {
+  const platform = optionValue(options, 'platform', process.platform);
+  if (platform !== 'win32') {
+    return readInstalledSidecarStampVersion(options);
+  }
+  return readWindowsSidecarBinaryVersion(options) || readInstalledSidecarStampVersion(options);
+}
+
 function computeSidecarDrift(options = {}) {
   const platform = optionValue(options, 'platform', process.platform);
   const arch = optionValue(options, 'arch', process.arch);
@@ -1079,6 +1158,38 @@ function computeSidecarDrift(options = {}) {
   return installed === bundled ? 'none' : 'mismatch';
 }
 
+function stopCodexPlusProcesses(options = {}) {
+  const platform = optionValue(options, 'platform', process.platform);
+  if (platform !== 'win32') {
+    return { status: 1, error: new Error('cxpp stop is only supported on Windows in this package') };
+  }
+  const sidecars = findRunningSidecarProcesses(options);
+  const managers = findRunningCodexPlusManagerProcesses(options);
+  const codex = findRunningCodexProcesses(options);
+  const targets = [...sidecars, ...managers, ...codex];
+  const uniqueTargets = [];
+  const seen = new Set();
+  for (const target of targets) {
+    const id = Number(target && target.ProcessId);
+    if (!Number.isInteger(id) || id <= 0 || seen.has(id)) {
+      continue;
+    }
+    seen.add(id);
+    uniqueTargets.push(target);
+  }
+  if (uniqueTargets.length > 0) {
+    const terminate = options.terminateProcesses || terminateProcesses;
+    terminate(uniqueTargets, options);
+  }
+  return {
+    status: 0,
+    stoppedCount: uniqueTargets.length,
+    sidecarCount: sidecars.length,
+    managerCount: managers.length,
+    codexCount: codex.length,
+  };
+}
+
 async function ensureSidecarsFresh(options = {}) {
   const drift = computeSidecarDrift(options);
   if (drift === 'none' || drift === 'unsupported') {
@@ -1814,17 +1925,23 @@ function doctorReport(options = {}) {
   const sidecars = installedSidecars(options);
   const entrypoints = inspectEntrypoints(options);
   const supported = SUPPORTED_PLATFORMS.has(platformKey(platform, arch));
+  const installedVersion = readInstalledSidecarVersion({ ...options, installRoot });
+  const expectedVersion = packageVersion(options);
+  const drift = computeSidecarDrift(options);
   const report = {
     platform,
     arch,
     supported: supported ? 'yes' : 'no',
-    package_version: packageVersion(options),
+    package_version: expectedVersion,
     upstream_version: bundledUpstreamVersion(options) || 'missing',
     upstream_commit: upstreamMetadata(options).commit || 'missing',
     sidecar_dir: upstreamBinDir(options),
     install_root: installRoot,
     silent_binary: sidecars.silent,
     silent_binary_state: sidecars.silent_state,
+    expected_sidecar_version: expectedVersion,
+    installed_sidecar_version: installedVersion || 'missing',
+    sidecar_drift: drift,
     manager_binary: sidecars.manager,
     manager_binary_state: sidecars.manager_state,
     silent_entrypoint_state: entrypoints.silent,
@@ -1927,6 +2044,7 @@ Usage:
   cxpp manager               Open Codex++ manager
   cxpp install-app           Install or repair local entrypoints
   cxpp repair-app            Alias of install-app
+  cxpp stop                  Stop running Codex++ and Codex processes
   cxpp doctor [--json]       Inspect local state
   cxpp version               Print wrapper version
 `);
@@ -1945,6 +2063,17 @@ async function runLauncher(args = [], options = {}) {
   if (command === 'doctor') {
     return { status: printDoctor(args.includes('--json'), options) };
   }
+  if (command === 'stop') {
+    const result = stopCodexPlusProcesses(options);
+    if (result.error) {
+      return result;
+    }
+    console.log(`stopped_processes=${result.stoppedCount}`);
+    console.log(`sidecar_processes=${result.sidecarCount}`);
+    console.log(`manager_processes=${result.managerCount}`);
+    console.log(`codex_processes=${result.codexCount}`);
+    return result;
+  }
   if (command === 'install-app' || command === 'repair-app' || command === 'setup' || command === 'repair' || command === 'npm-postinstall') {
     const supported = SUPPORTED_PLATFORMS.has(platformKey(optionValue(options, 'platform', process.platform), optionValue(options, 'arch', process.arch)));
     if (!supported) {
@@ -2028,9 +2157,12 @@ module.exports = {
   sidecarArgsWithDebugPort,
   promptYesNoWindowsPopup,
   readInstalledSidecarVersion,
+  readInstalledSidecarStampVersion,
+  readWindowsSidecarBinaryVersion,
   removePath,
   runLauncher,
   spawnSidecar,
+  stopCodexPlusProcesses,
   terminateProcesses,
   terminateSidecarsByImageName,
   upstreamBinDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duanluan/codex-plus-plus-launcher",
-  "version": "1.2.18",
+  "version": "1.2.22",
   "description": "Install and launch Codex++ from npm",
   "bin": {
     "cxpp": "npm/cxpp.js",

package/upstream-bin/upstream-release.json

@@ -1,6 +1,6 @@
 {
   "upstream_version": "v1.2.15",
-  "package_version": "1.2.18",
+  "package_version": "1.2.22",
   "ref": "v1.2.15",
   "version": "v1.2.15",
   "commit": "324a350d00376d4f9565aeeae3c8820b0cbbbe2a",