impel-cli 0.18.15 → 0.18.16

package/src/windowsApps.js

@@ -11,9 +11,10 @@ import { environmentValue, nativeCommandInvocation } from "./nativeProcess.js";
 import { normalizeTenantId } from "./tenants.js";
 import { brandedEnvironmentName, RUNTIME_BRAND } from "./runtimeBrand.js";
 
-export const WINDOWS_CHATGPT_PACKAGE = "9PLM9XGG6VKS";
-export const WINDOWS_CHATGPT_PACKAGE_NAME = "OpenAI.Codex";
-export const WINDOWS_CHATGPT_PUBLISHER_ID = "2p2nqsd0c76g0";
+const WINDOWS_CHATGPT_PIN = PINNED_VENDOR_APPS.chatgpt.windows;
+export const WINDOWS_CHATGPT_PACKAGE = WINDOWS_CHATGPT_PIN.storeProductId;
+export const WINDOWS_CHATGPT_PACKAGE_NAME = WINDOWS_CHATGPT_PIN.packageName;
+export const WINDOWS_CHATGPT_PUBLISHER_ID = WINDOWS_CHATGPT_PIN.publisherId;
 const WINDOWS_CLAUDE_DOWNLOAD_TIMEOUT_MS = 5 * 60 * 1000;
 const WINDOWS_WINGET_UPDATE_NOT_APPLICABLE = 0x8A15002B;
 
@@ -60,20 +61,26 @@ function versionedSquirrelCandidates(root, readDirectory = fs.readdirSync) {
   }
 }
 
-function installedMsixChatGPT(environment, run = spawnSync) {
+function installedMsixChatGPT(environment, run = spawnSync, pin = null) {
   const script = [
     `$package = Get-AppxPackage -Name '${WINDOWS_CHATGPT_PACKAGE_NAME}' -ErrorAction SilentlyContinue`,
-    `$package = $package | Where-Object PublisherId -eq '${WINDOWS_CHATGPT_PUBLISHER_ID}' | Sort-Object Version -Descending | Select-Object -First 1`,
+    `$package = $package | Where-Object { $_.PublisherId -ceq '${WINDOWS_CHATGPT_PUBLISHER_ID}' -and (-not $env:IMPEL_CHATGPT_PACKAGE_VERSION -or $_.Version.ToString() -ceq $env:IMPEL_CHATGPT_PACKAGE_VERSION) } | Sort-Object Version -Descending | Select-Object -First 1`,
     "if ($package) {",
     "  $manifest = Get-AppxPackageManifest -Package $package",
     "  $relative = $manifest.Package.Applications.Application | Where-Object Id -eq 'App' | Select-Object -First 1 -ExpandProperty Executable",
-    "  if ($relative) { Join-Path $package.InstallLocation $relative }",
+    "  $normalized = ([string]$relative).Replace('/', '\\')",
+    "  $expected = ([string]$env:IMPEL_CHATGPT_PACKAGE_EXECUTABLE).Replace('/', '\\')",
+    "  if ($relative -and (-not $expected -or $normalized -ieq $expected)) { Join-Path $package.InstallLocation $relative }",
     "}",
   ].join("; ");
   try {
     const result = run("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", script], {
       encoding: "utf8",
-      env: windowsPowerShellEnvironment(environment),
+      env: {
+        ...windowsPowerShellEnvironment(environment),
+        IMPEL_CHATGPT_PACKAGE_VERSION: pin?.packageVersion || "",
+        IMPEL_CHATGPT_PACKAGE_EXECUTABLE: pin?.executable || "",
+      },
       stdio: ["ignore", "pipe", "ignore"],
       windowsHide: true,
     });
@@ -141,9 +148,23 @@ export function findWindowsChatGPTApp(environment = process.env, dependencies =
   return msix && exists(msix) ? path.win32.normalize(msix) : null;
 }
 
-function wingetInvocation(action, environment, { packageId, source = "winget", scope = "user" }) {
+function pinnedWindowsChatGPTApp(environment = process.env, dependencies = {}) {
+  const exists = dependencies.isFile || isFile;
+  const pin = dependencies.pin || WINDOWS_CHATGPT_PIN;
+  const msix = (dependencies.queryMsix || installedMsixChatGPT)(environment, dependencies.run, pin);
+  return msix && exists(msix) ? path.win32.normalize(msix) : null;
+}
+
+function wingetInvocation(action, environment, {
+  packageId,
+  source = "winget",
+  scope = "user",
+}) {
   const verb = action === "update" ? "upgrade" : "install";
   const scopeArgs = scope ? ["--scope", scope] : [];
+  // Microsoft Store packages commonly report Version "Unknown" to winget.
+  // Without this switch winget refuses to consider their available update.
+  const updateArgs = action === "update" ? ["--include-unknown"] : [];
   return nativeCommandInvocation(
     "winget",
     [
@@ -154,6 +175,7 @@ function wingetInvocation(action, environment, { packageId, source = "winget", s
       "--source",
       source,
       ...scopeArgs,
+      ...updateArgs,
       "--silent",
       "--disable-interactivity",
       "--accept-package-agreements",
@@ -372,21 +394,32 @@ export async function ensureWindowsClaudeApp(_options = {}, dependencies = {}) {
 
 /** Install/update OpenAI's official ChatGPT/Codex Store package. */
 export function ensureWindowsChatGPTApp({ update = false } = {}, dependencies = {}) {
+  const find = dependencies.find || findWindowsChatGPTApp;
+  const findPinned = dependencies.findPinned || dependencies.find || pinnedWindowsChatGPTApp;
   const io = {
     environment: process.env,
-    find: findWindowsChatGPTApp,
+    find,
+    findPinned,
     logger: console,
+    pin: WINDOWS_CHATGPT_PIN,
     run: spawnSync,
     ...dependencies,
   };
   const before = io.find(io.environment);
-  if (before && !update) return { binary: before, action: "existing", result: null };
+  const pinnedBefore = io.findPinned(io.environment, { pin: io.pin, run: io.run });
+  if (pinnedBefore && !update) {
+    return { binary: pinnedBefore, action: "existing", result: null };
+  }
 
-  // `impel update` also repairs missing surfaces. A missing Store package must
-  // be installed, not sent to `winget upgrade` (which returns 0x8A150014).
+  // `impel update` converges an older official Store package to the current
+  // reviewed pin. A missing Store package must be installed, not sent to
+  // `winget upgrade` (which returns 0x8A150014).
   const shouldUpdate = Boolean(update && before);
+  // The msstore source rejects its AppX package version as a winget --version
+  // selector. Install the current Store package, then fail closed below unless
+  // Windows registered the exact reviewed package version and executable.
   const invocation = wingetInvocation(shouldUpdate ? "update" : "install", io.environment, {
-    packageId: WINDOWS_CHATGPT_PACKAGE,
+    packageId: io.pin.storeProductId,
     source: "msstore",
     scope: null,
   });
@@ -400,26 +433,36 @@ export function ensureWindowsChatGPTApp({ update = false } = {}, dependencies =
   } catch (error) {
     result = { status: null, error };
   }
-  const binary = io.find(io.environment) || before;
+  let resultBinary = io.findPinned(io.environment, { pin: io.pin, run: io.run });
   // winget uses an error HRESULT when `upgrade` finds an installed package
   // with no newer Store release. That is a healthy idempotent update result,
   // not an installation failure (APPINSTALLER_CLI_ERROR_UPDATE_NOT_APPLICABLE).
   const alreadyUpToDate = Boolean(
     shouldUpdate
-    && binary
+    && resultBinary
     && !result?.error
     && Number.isInteger(result?.status)
     && (result.status >>> 0) === WINDOWS_WINGET_UPDATE_NOT_APPLICABLE,
   );
   if (alreadyUpToDate) {
-    io.logger.log("ChatGPT/Codex: Microsoft Store package already up to date.");
+    io.logger.log(`ChatGPT/Codex: Microsoft Store package ${io.pin.packageVersion} already up to date.`);
+  }
+  const commandSucceeded = (result?.status === 0 && !result?.error) || alreadyUpToDate;
+  if (commandSucceeded && !resultBinary) {
+    result = {
+      ...result,
+      error: new Error(
+        `ChatGPT/Codex Store package ${io.pin.packageVersion} did not appear after winget completed`,
+      ),
+    };
   }
-  const succeeded = (result?.status === 0 && !result?.error) || alreadyUpToDate;
+  const succeeded = commandSucceeded && Boolean(resultBinary);
+  if (!succeeded) resultBinary = null;
   return {
-    binary,
+    binary: resultBinary,
     action: alreadyUpToDate
       ? "existing"
-      : succeeded ? (shouldUpdate ? "updated" : "installed") : (before ? "existing" : "install-failed"),
+      : succeeded ? (shouldUpdate ? "updated" : "installed") : "install-failed",
     result,
   };
 }
@@ -617,6 +660,7 @@ export function launchWindowsChatGPTApp(binary, {
     "CODEX_AUTHAPI_BASE_URL",
     "CODEX_ELECTRON_USER_DATA_PATH",
     "CODEX_HOME",
+    "CODEX_SPARKLE_ENABLED",
     "OPENAI_API_KEY",
     "OPENAI_BASE_URL",
   ]);
@@ -625,6 +669,7 @@ export function launchWindowsChatGPTApp(binary, {
   }
   environment.CODEX_HOME = codexHome;
   environment.CODEX_AUTHAPI_BASE_URL = `${gatewayUrl}/chatgpt_passthrough/backend-api`;
+  environment.CODEX_SPARKLE_ENABLED = "false";
   // Codex Desktop resolves this before acquiring Electron's single-instance
   // lock. Keep --user-data-dir below as a compatibility fallback for builds
   // that predate the dedicated desktop override.

package/src/windowsSetup.js

@@ -8,6 +8,7 @@ import {
   nativeSpawnInvocation,
 } from "./nativeProcess.js";
 import { syncSkillsSafe } from "./skills.js";
+import { PINNED_VENDOR_CLI_VERSIONS } from "./vendorCliVersions.js";
 import { provisionWindowsGit } from "./windowsGit.js";
 
 const POWERSHELL_ARGS = [
@@ -27,12 +28,14 @@ const POWERSHELL_ARGS = [
  */
 export const WINDOWS_CLI_INSTALLERS = Object.freeze({
   claude: Object.freeze({
-    command: "powershell -ExecutionPolicy Bypass -NoProfile -Command \"irm https://claude.ai/install.ps1 | iex\"",
-    script: "Invoke-RestMethod -Uri 'https://claude.ai/install.ps1' | Invoke-Expression",
+    version: PINNED_VENDOR_CLI_VERSIONS.claude,
+    command: `powershell -ExecutionPolicy Bypass -NoProfile -Command "& ([scriptblock]::Create((irm https://claude.ai/install.ps1))) '${PINNED_VENDOR_CLI_VERSIONS.claude}'"`,
+    script: `& ([scriptblock]::Create((Invoke-RestMethod -Uri 'https://claude.ai/install.ps1'))) '${PINNED_VENDOR_CLI_VERSIONS.claude}'`,
   }),
   codex: Object.freeze({
-    command: "powershell -ExecutionPolicy Bypass -NoProfile -Command \"$env:CODEX_NON_INTERACTIVE='1'; irm https://chatgpt.com/codex/install.ps1 | iex\"",
-    script: "$env:CODEX_NON_INTERACTIVE = '1'; Invoke-RestMethod -Uri 'https://chatgpt.com/codex/install.ps1' | Invoke-Expression",
+    version: PINNED_VENDOR_CLI_VERSIONS.codex,
+    command: `powershell -ExecutionPolicy Bypass -NoProfile -Command "[Environment]::SetEnvironmentVariable('CODEX_NON_INTERACTIVE','1','Process'); & ([scriptblock]::Create((irm https://chatgpt.com/codex/install.ps1))) -Release '${PINNED_VENDOR_CLI_VERSIONS.codex}'"`,
+    script: `[Environment]::SetEnvironmentVariable('CODEX_NON_INTERACTIVE', '1', 'Process'); & ([scriptblock]::Create((Invoke-RestMethod -Uri 'https://chatgpt.com/codex/install.ps1'))) -Release '${PINNED_VENDOR_CLI_VERSIONS.codex}'`,
   }),
 });