impel-cli 0.20.40 → 0.20.41

package/RELEASE_NOTES.md

@@ -1,5 +1,20 @@
 # Release notes
 
+## 0.20.41 — Windows onboarding: converge over an already-installed Store ChatGPT
+
+- Accepts winget's UPDATE_NOT_APPLICABLE result during setup as well as
+  update, gated by the pin-exact package probe, ending the unconvergeable
+  first-run failure loop on machines where the ChatGPT Store app already
+  exists (and, downstream, the managed sign-in loop it caused).
+- Registers a machine-wide staged Store package for the current user
+  (download-free, no elevation) when winget sees it but the per-user probe
+  does not, still failing closed through the pin-exact probe.
+- Resolves the app-open path strictly through the pinned finder so an
+  off-pin Store build can never be staged as the managed app.
+- Names installed-vs-pinned versions in vendor-install diagnostics with a
+  measured direction, adds the 0x8A15002B winget hint, and makes Windows
+  status require the staged managed app rather than config presence alone.
+
 ## 0.20.40 — Field-report fixes: launcher drift, sync ownership, Codex capability, one-run update
 
 - Survives Claude auto-update drift: `impel claude` resolves the exact reviewed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "impel-cli",
-  "version": "0.20.40",
+  "version": "0.20.41",
   "description": "Prepare isolated Claude and Codex workspaces for every accessible Impel tenant",
   "type": "module",
   "bin": {

package/src/commands/apps.js

@@ -55,6 +55,7 @@ import {
   findWindowsChatGPTApp,
   findManagedWindowsChatGPTApp,
   launchWindowsClaudeApp,
+  pinnedWindowsChatGPTApp,
   launchWindowsChatGPTApp,
   removeManagedWindowsChatGPTApp,
   stageWindowsChatGPTApp,
@@ -280,6 +281,7 @@ const WINGET_EXIT_HINTS = new Map([
   [0x8A150014, "no package matched the winget query"],
   [0x8A15001B, "the Microsoft Store client is blocked by policy"],
   [0x8A15001C, "the Microsoft Store app is blocked by policy"],
+  [0x8A15002B, "a Store package is already installed but does not match the reviewed pin — its version likely moved past the pinned release"],
 ]);
 
 function windowsProcessFailure(result) {
@@ -380,7 +382,7 @@ export async function reconcileWindowsTenantApps({
     findClaudeApp: findWindowsClaudeApp,
     ensureClaudeApp: ensureWindowsClaudeApp,
     claudeUserData: windowsClaudeUserData,
-    findChatGPTApp: findWindowsChatGPTApp,
+    findChatGPTApp: (environment) => pinnedWindowsChatGPTApp(environment),
     ensureChatGPTApp: ensureWindowsChatGPTApp,
     findManagedChatGPTApp: findManagedWindowsChatGPTApp,
     stageChatGPTApp: stageWindowsChatGPTApp,
@@ -664,7 +666,7 @@ export async function cmdWindowsApps(argv, overrides = {}) {
     ensureClaudeApp: ensureWindowsClaudeApp,
     launchClaudeApp: launchWindowsClaudeApp,
     claudeUserData: windowsClaudeUserData,
-    findChatGPTApp: findWindowsChatGPTApp,
+    findChatGPTApp: (environment) => pinnedWindowsChatGPTApp(environment),
     ensureChatGPTApp: ensureWindowsChatGPTApp,
     findManagedChatGPTApp: findManagedWindowsChatGPTApp,
     launchChatGPTApp: launchWindowsChatGPTApp,

package/src/commands/status.js

@@ -15,7 +15,7 @@ import {
   productAccessLabel,
 } from "../tenants.js";
 import { installedVersion, maybePrintUpdateNotice } from "../updates.js";
-import { windowsClaudeUserData } from "../windowsApps.js";
+import { findManagedWindowsChatGPTApp, windowsClaudeUserData } from "../windowsApps.js";
 import { RUNTIME_BRAND } from "../runtimeBrand.js";
 import { cachedProviderReadiness, providerAvailable } from "../providerReadiness.js";
 
@@ -52,11 +52,16 @@ export function desktopReadiness(tenant, {
       states[client] = { app: "unsupported", shell: "unsupported" };
       continue;
     }
+    // A generated config alone proves nothing launchable on Windows: when the
+    // vendor ensure failed, config.toml can exist while no managed app was
+    // ever staged — reporting "ready" then hides the exact failure the user
+    // is debugging (IMP-474). Require the staged binary too.
     const appReady = platform === "darwin"
       ? existsSync(paths[product].launcher)
-      : existsSync(product === "claude"
-        ? path.join(paths.claude.userData, "configLibrary", `${CLAUDE_CONFIG_ID}.json`)
-        : path.join(paths.chatgpt.codexHome, "config.toml"));
+      : product === "claude"
+        ? existsSync(path.join(paths.claude.userData, "configLibrary", `${CLAUDE_CONFIG_ID}.json`))
+        : existsSync(path.join(paths.chatgpt.codexHome, "config.toml"))
+          && Boolean(findManagedWindowsChatGPTApp(paths.root, { isFile: existsSync }));
     let shellReady = appReady && registered.has(product);
     if (platform === "win32" && appData) {
       const shortcutPath = path.win32.join(

package/src/windowsApps.js

@@ -90,6 +90,71 @@ function installedMsixChatGPT(environment, run = spawnSync, pin = null) {
   }
 }
 
+/**
+ * Register the already-staged ChatGPT Store package for the current user.
+ * winget resolves packages machine-wide, so on a machine where another user
+ * (or provisioning) installed the app, `winget install` reports
+ * UPDATE_NOT_APPLICABLE while the current user's Get-AppxPackage sees
+ * nothing. Add-AppxPackage -RegisterByFamilyName registers the existing
+ * staged bits for this user without downloading or elevating.
+ */
+export function registerProvisionedMsixChatGPT(environment, run = spawnSync) {
+  const familyName = `${WINDOWS_CHATGPT_PACKAGE_NAME}_${WINDOWS_CHATGPT_PUBLISHER_ID}`;
+  try {
+    const result = run("powershell.exe", [
+      "-NoProfile",
+      "-NonInteractive",
+      "-Command",
+      `Add-AppxPackage -RegisterByFamilyName -MainPackage '${familyName}' -ErrorAction Stop`,
+    ], {
+      encoding: "utf8",
+      env: windowsPowerShellEnvironment(environment),
+      stdio: ["ignore", "pipe", "pipe"],
+      timeout: 120_000,
+      windowsHide: true,
+    });
+    return result?.status === 0 && !result?.error;
+  } catch {
+    return false;
+  }
+}
+
+function compareDottedVersions(left, right) {
+  const parse = (value) => String(value).split(".").map((part) => Number.parseInt(part, 10) || 0);
+  const a = parse(left);
+  const b = parse(right);
+  for (let index = 0; index < Math.max(a.length, b.length); index += 1) {
+    const delta = (a[index] || 0) - (b[index] || 0);
+    if (delta !== 0) return delta;
+  }
+  return 0;
+}
+
+/**
+ * The version string of whatever ChatGPT Store package is installed,
+ * regardless of the reviewed pin. Diagnostic-only: it lets a pin mismatch
+ * name the actual installed version instead of a bare winget HRESULT.
+ */
+export function installedMsixChatGPTVersion(environment, run = spawnSync) {
+  const script = [
+    `$package = Get-AppxPackage -Name '${WINDOWS_CHATGPT_PACKAGE_NAME}' -ErrorAction SilentlyContinue`,
+    `$package = $package | Where-Object { $_.PublisherId -ceq '${WINDOWS_CHATGPT_PUBLISHER_ID}' } | Sort-Object Version -Descending | Select-Object -First 1`,
+    "if ($package) { $package.Version.ToString() }",
+  ].join("; ");
+  try {
+    const result = run("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", script], {
+      encoding: "utf8",
+      env: windowsPowerShellEnvironment(environment),
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: 15_000,
+      windowsHide: true,
+    });
+    return result?.status === 0 ? String(result.stdout || "").trim() || null : null;
+  } catch {
+    return null;
+  }
+}
+
 /** Candidate paths for Anthropic's signed per-user Windows desktop install. */
 export function windowsClaudeAppCandidates(environment = process.env, dependencies = {}) {
   const io = { readDirectory: fs.readdirSync, ...dependencies };
@@ -148,7 +213,7 @@ export function findWindowsChatGPTApp(environment = process.env, dependencies =
   return msix && exists(msix) ? path.win32.normalize(msix) : null;
 }
 
-function pinnedWindowsChatGPTApp(environment = process.env, dependencies = {}) {
+export 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);
@@ -434,16 +499,36 @@ export function ensureWindowsChatGPTApp({ update = false } = {}, dependencies =
     result = { status: null, error };
   }
   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
-    && resultBinary
-    && !result?.error
+  const noApplicableUpgrade = !result?.error
     && Number.isInteger(result?.status)
-    && (result.status >>> 0) === WINDOWS_WINGET_UPDATE_NOT_APPLICABLE,
-  );
+    && (result.status >>> 0) === WINDOWS_WINGET_UPDATE_NOT_APPLICABLE;
+  // winget resolves machine-wide: when it reports the package installed but
+  // the current user's probe sees nothing, the staged bits are registered to
+  // another user or provisioning. Registering them for this user is a local,
+  // download-free repair; the pin-exact probe afterwards keeps it fail-closed.
+  let registeredOffPin = false;
+  if (noApplicableUpgrade && !resultBinary) {
+    io.logger.log("ChatGPT/Codex: attempting to register the machine-wide Microsoft Store package for the current user…");
+    if ((io.registerProvisioned || registerProvisionedMsixChatGPT)(io.environment, io.run)) {
+      resultBinary = io.findPinned(io.environment, { pin: io.pin, run: io.run });
+      if (resultBinary) {
+        io.logger.log("ChatGPT/Codex: registered the already-staged Microsoft Store package for the current user.");
+      } else {
+        registeredOffPin = true;
+      }
+    } else {
+      io.logger.log("ChatGPT/Codex: the Store package could not be registered for the current user.");
+    }
+  }
+  // winget uses an error HRESULT when it finds an installed package with no
+  // newer Store release (APPINSTALLER_CLI_ERROR_UPDATE_NOT_APPLICABLE). That
+  // is a healthy idempotent result whenever the pin-exact re-query proves the
+  // reviewed package is present — during setup/install as much as update:
+  // `winget install` reports the same HRESULT for an already-installed
+  // package, and treating it as failure strands first-run machines in an
+  // unconvergeable recovery loop. Acceptance stays fail-closed through the
+  // pin-exact probe below.
+  const alreadyUpToDate = Boolean(resultBinary && noApplicableUpgrade);
   if (alreadyUpToDate) {
     io.logger.log(`ChatGPT/Codex: Microsoft Store package ${io.pin.packageVersion} already up to date.`);
   }
@@ -456,6 +541,33 @@ export function ensureWindowsChatGPTApp({ update = false } = {}, dependencies =
       ),
     };
   }
+  // A no-applicable-upgrade result over a package that fails the pin-exact
+  // probe means the Store carries a different (usually newer) build the
+  // Store cannot downgrade. Name both versions so the operator learns this
+  // needs a CLI release with an updated ChatGPT pin, not another retry.
+  if (!commandSucceeded && !resultBinary && noApplicableUpgrade) {
+    const installedVersion = (io.installedVersion || installedMsixChatGPTVersion)(io.environment, io.run);
+    if (installedVersion) {
+      const newer = compareDottedVersions(installedVersion, io.pin.packageVersion) > 0;
+      result = {
+        ...result,
+        error: new Error(
+          `installed ChatGPT Store package ${installedVersion} does not match the reviewed pin ${io.pin.packageVersion}; `
+          + (newer
+            ? "the Microsoft Store cannot downgrade, so this needs a CLI release with an updated ChatGPT pin"
+            : "the Store has not fulfilled the pinned build on this machine yet — retry once the Store catches up"),
+        ),
+      };
+    } else if (registeredOffPin) {
+      result = {
+        ...result,
+        error: new Error(
+          "a machine-wide ChatGPT Store package was registered for the current user but does not match "
+          + `the reviewed pin ${io.pin.packageVersion}; the managed app stays uninstalled until a matching build is available`,
+        ),
+      };
+    }
+  }
   const succeeded = commandSucceeded && Boolean(resultBinary);
   if (!succeeded) resultBinary = null;
   return {