impel-cli 0.18.3 → 0.18.4

package/README.md

@@ -329,6 +329,14 @@ run a real package manager, or modify native personal profiles.
 CI runs on Ubuntu, macOS, and Windows with supported Node versions. See
 [RELEASING.md](RELEASING.md) for the npm release process.
 
+The separate Windows vendor contract runs only on a disposable GitHub-hosted
+Windows VM. It installs the exact newer Claude fixture that preceded the
+current compatibility pin, invokes the production downloader and installer to
+downgrade to the exact pinned MSIX, verifies the registered AppX identity,
+version, architecture, executable, and idempotent second run, then removes the
+package. Docker/Wine remains useful for Windows path and process semantics, but
+cannot validate AppX deployment, packaged services, trust, or Store behavior.
+
 The macOS config-contract job downloads the exact ChatGPT archive declared in
 `PINNED_VENDOR_APPS`, verifies its checksum, signature, app version, and
 embedded Codex version, then validates a deterministic generated profile with

package/package.json

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

package/src/commands/converge.js

@@ -91,13 +91,18 @@ export async function cmdConverge(argv = [], overrides = {}) {
     // answer (not unref'd) so the auto-decline reliably fires even when the
     // prompt is the only thing keeping the event loop alive.
     const allowed = confirmed(await new Promise((resolve) => {
-      const timer = setTimeout(() => resolve(""), io.vendorPromptTimeoutMs ?? 60_000);
+      const controller = new AbortController();
+      const timer = setTimeout(() => {
+        controller.abort();
+        resolve("");
+      }, io.vendorPromptTimeoutMs ?? 60_000);
       const settle = (answer) => {
         clearTimeout(timer);
         resolve(answer);
       };
       Promise.resolve(io.promptText(
         `Allow the verified ${label} vendor ${context.mode === "update" ? "update" : "installation"}? [y/N] (auto-N in 60s) `,
+        { signal: controller.signal },
       )).then(settle, () => settle(""));
     }));
     vendorAppDecisions.set(target, allowed);
@@ -272,7 +277,14 @@ export async function cmdConverge(argv = [], overrides = {}) {
               || product === target
               || (target === "codex" && product === "chatgpt")
             ));
-            return vendorAppTargetReady(retryReport, target);
+            const installed = vendorAppTargetReady(retryReport, target);
+            return {
+              installed,
+              error: installed
+                ? null
+                : retryReport?.tenants?.[0]?.errors?.join("; ")
+                  || `The ${target} vendor app did not reach a verified state.`,
+            };
           },
         },
       }, overrides.recoveryOverrides || {});

package/src/commands/setup.js

@@ -453,7 +453,14 @@ export async function cmdSetup(argv, overrides = {}) {
               || product === target
               || (target === "codex" && product === "chatgpt")
             ));
-            return vendorAppTargetReady(retryReport, target);
+            const installed = vendorAppTargetReady(retryReport, target);
+            return {
+              installed,
+              error: installed
+                ? null
+                : retryReport?.tenants?.[0]?.errors?.join("; ")
+                  || `The ${target} vendor app did not reach a verified state.`,
+            };
           },
         },
       }, overrides.recoveryOverrides || {});

package/src/installRecovery/tools.js

@@ -500,10 +500,22 @@ async function installVendorApp(input, context) {
   if (typeof context.installVendorApp !== "function") {
     return result("failed", "Vendor app installation is unavailable in this recovery context.");
   }
-  const installed = await context.installVendorApp(input.target);
-  return installed === false
-    ? result("failed", `The ${input.target} vendor app did not install cleanly.`)
-    : result("succeeded", `The ${input.target} vendor app installation completed.`);
+  const outcome = await context.installVendorApp(input.target);
+  const installed = typeof outcome === "object" && outcome !== null
+    ? outcome.installed !== false
+    : outcome !== false;
+  if (installed) {
+    return result("succeeded", `The ${input.target} vendor app installation completed.`);
+  }
+  const detail = typeof outcome === "object" && outcome?.error
+    ? redactInstallRecoveryText(outcome.error).slice(0, 1_000)
+    : null;
+  return result(
+    "failed",
+    detail
+      ? `The ${input.target} vendor app did not install cleanly: ${detail}`
+      : `The ${input.target} vendor app did not install cleanly.`,
+  );
 }
 
 function repairUserPath(input, context, io) {

package/src/prompt.js

@@ -40,12 +40,32 @@ export function promptSecret(question) {
   });
 }
 
-export function promptText(question) {
+export function promptText(question, {
+  signal = null,
+  input = process.stdin,
+  output = process.stdout,
+} = {}) {
   return new Promise((resolve) => {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    rl.question(question, (answer) => {
+    const rl = readline.createInterface({ input, output });
+    let settled = false;
+    const finish = (answer, aborted = false) => {
+      if (settled) return;
+      settled = true;
+      signal?.removeEventListener("abort", abort);
       rl.close();
-      resolve(answer.trim());
+      // A cancelled readline prompt otherwise leaves the next status line on
+      // the same terminal row as its unanswered question.
+      if (aborted && output?.isTTY) output.write("\n");
+      resolve(String(answer || "").trim());
+    };
+    const abort = () => finish("", true);
+    if (signal?.aborted) {
+      abort();
+      return;
+    }
+    signal?.addEventListener("abort", abort, { once: true });
+    rl.question(question, (answer) => {
+      finish(answer);
     });
   });
 }

package/src/windowsApps.js

@@ -14,6 +14,7 @@ export const WINDOWS_CHATGPT_PACKAGE = "9PLM9XGG6VKS";
 export const WINDOWS_CHATGPT_PACKAGE_NAME = "OpenAI.Codex";
 export const WINDOWS_CHATGPT_PUBLISHER_ID = "2p2nqsd0c76g0";
 const WINDOWS_CLAUDE_DOWNLOAD_TIMEOUT_MS = 5 * 60 * 1000;
+const WINDOWS_WINGET_UPDATE_NOT_APPLICABLE = 0x8A15002B;
 
 export function windowsClaudeUserData(environment = process.env, tenantId = null) {
   const localAppData = environmentValue(environment, "LOCALAPPDATA")
@@ -34,6 +35,16 @@ function isFile(filePath) {
   }
 }
 
+// A CLI launched from PowerShell 7 inherits its PSModulePath. Passing that
+// value into Windows PowerShell 5.1 makes legacy modules such as
+// Microsoft.PowerShell.Security visible but unloadable. Omit the variable so
+// powershell.exe reconstructs its own version-correct default module path.
+function windowsPowerShellEnvironment(environment = process.env) {
+  return Object.fromEntries(
+    Object.entries(environment).filter(([key]) => key.toLowerCase() !== "psmodulepath"),
+  );
+}
+
 function versionedSquirrelCandidates(root, readDirectory = fs.readdirSync) {
   try {
     return readDirectory(root, { withFileTypes: true })
@@ -61,7 +72,7 @@ function installedMsixChatGPT(environment, run = spawnSync) {
   try {
     const result = run("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", script], {
       encoding: "utf8",
-      env: environment,
+      env: windowsPowerShellEnvironment(environment),
       stdio: ["ignore", "pipe", "ignore"],
       windowsHide: true,
     });
@@ -179,7 +190,7 @@ function pinnedWindowsClaudeApp(environment = process.env, dependencies = {}) {
     const result = io.run("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", script], {
       encoding: "utf8",
       env: {
-        ...environment,
+        ...windowsPowerShellEnvironment(environment),
         IMPEL_CLAUDE_PACKAGE_VERSION: io.pin.packageVersion,
         IMPEL_CLAUDE_PACKAGE_PUBLISHER: io.pin.publisher,
         IMPEL_CLAUDE_PACKAGE_ARCHITECTURE: expectedArchitecture,
@@ -269,7 +280,7 @@ function installPinnedWindowsClaudeMsix(packagePath, environment, pin, architect
     {
       encoding: "utf8",
       env: {
-        ...environment,
+        ...windowsPowerShellEnvironment(environment),
         IMPEL_CLAUDE_MSIX_PATH: packagePath,
         IMPEL_CLAUDE_PACKAGE_NAME: pin.packageName,
         IMPEL_CLAUDE_PACKAGE_VERSION: pin.packageVersion,
@@ -363,6 +374,7 @@ export function ensureWindowsChatGPTApp({ update = false } = {}, dependencies =
   const io = {
     environment: process.env,
     find: findWindowsChatGPTApp,
+    logger: console,
     run: spawnSync,
     ...dependencies,
   };
@@ -388,10 +400,25 @@ export function ensureWindowsChatGPTApp({ update = false } = {}, dependencies =
     result = { status: null, error };
   }
   const binary = io.find(io.environment) || before;
-  const succeeded = result?.status === 0 && !result?.error;
+  // 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
+    && !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.");
+  }
+  const succeeded = (result?.status === 0 && !result?.error) || alreadyUpToDate;
   return {
     binary,
-    action: succeeded ? (shouldUpdate ? "updated" : "installed") : (before ? "existing" : "install-failed"),
+    action: alreadyUpToDate
+      ? "existing"
+      : succeeded ? (shouldUpdate ? "updated" : "installed") : (before ? "existing" : "install-failed"),
     result,
   };
 }