impel-cli 0.17.3 → 0.17.4

package/package.json

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

package/src/apps.js

@@ -42,33 +42,33 @@ const APP_DEFINITIONS = {
 // with its compatibility patches. Updating a pin requires a new CLI release.
 export const PINNED_VENDOR_APPS = Object.freeze({
   claude: Object.freeze({
-    version: "1.20186.9",
-    claudeCodeVersion: "2.1.209",
-    claudeCodeCommit: "0fe048596fd45e79e99353cbe2c3d1b1ac069568",
+    version: "1.22209.3",
+    claudeCodeVersion: "2.1.215",
+    claudeCodeCommit: "316ce99628e89900bf0b1328fed3b8fec0c0c92d",
     bundleName: "Claude.app",
     downloads: Object.freeze({
       arm64: Object.freeze({
-        url: "https://downloads.claude.ai/releases/darwin/universal/1.20186.9/Claude-69f150a4c9316d5c8cd7b9f130ed583d15c0383e.zip",
-        sha256: "9364648c74bd525aa293a28103eb37262a5553de21c7ca907766d7fc40623015",
+        url: "https://downloads.claude.ai/releases/darwin/universal/1.22209.3/Claude-babe11577dfefe3e209c06bd674628d862f0dbae.zip",
+        sha256: "b110e0fdb7b2601d80dfdd7893f7811de382de84c4586113e7873e28f17680fc",
       }),
       x64: Object.freeze({
-        url: "https://downloads.claude.ai/releases/darwin/universal/1.20186.9/Claude-69f150a4c9316d5c8cd7b9f130ed583d15c0383e.zip",
-        sha256: "9364648c74bd525aa293a28103eb37262a5553de21c7ca907766d7fc40623015",
+        url: "https://downloads.claude.ai/releases/darwin/universal/1.22209.3/Claude-babe11577dfefe3e209c06bd674628d862f0dbae.zip",
+        sha256: "b110e0fdb7b2601d80dfdd7893f7811de382de84c4586113e7873e28f17680fc",
       }),
     }),
   }),
   chatgpt: Object.freeze({
-    version: "26.707.72221",
-    codexVersion: "0.144.2",
+    version: "26.715.31925",
+    codexVersion: "0.145.0-alpha.18",
     bundleName: "ChatGPT.app",
     downloads: Object.freeze({
       arm64: Object.freeze({
-        url: "https://persistent.oaistatic.com/codex-app-prod/ChatGPT-darwin-arm64-26.707.72221.zip",
-        sha256: "d47a2c0dfb07afec21c415fcec672035a2e90410ecb7c6dc60141518fba524e0",
+        url: "https://persistent.oaistatic.com/codex-app-prod/ChatGPT-darwin-arm64-26.715.31925.zip",
+        sha256: "a0cded116975c71c723dc8601c07402533b5ff23881d15e52cfb6dc71413e45b",
       }),
       x64: Object.freeze({
-        url: "https://persistent.oaistatic.com/codex-app-prod/ChatGPT-darwin-x64-26.707.72221.zip",
-        sha256: "cadfdc8e1efa809b021bcf4466ae8c115ffdd280f1a467b518eca8ce8f6717fe",
+        url: "https://persistent.oaistatic.com/codex-app-prod/ChatGPT-darwin-x64-26.715.31925.zip",
+        sha256: "f18972b893207ff5cbf047599369ce96768c2ace25128a09315058ef0a5cfdcb",
       }),
     }),
   }),
@@ -85,12 +85,10 @@ const ULTRA_REASONING_LEVEL = { effort: "ultra", description: "Maximum reasoning
 const FAST_SERVICE_TIER = { id: "priority", name: "Fast", description: "1.5x speed, increased usage" };
 const FAST_MODE_AUTH_GATE = /([A-Za-z_$][\w$]*)=([A-Za-z_$][\w$]*)&&!([A-Za-z_$][\w$]*)&&([A-Za-z_$][\w$]*)!=null&&\4\?\.requirements\?\.featureRequirements\?\.fast_mode!==!1/gu;
 const CHATGPT_RESOURCE_ROOT = "linked_vendor_resources_with_patched_asar";
-const CLAUDE_PLAN_USAGE_GUARD = "if(!Ze().hasOrgPolicyBackend())return;if((r=fr())";
-const IMPEL_CLAUDE_PLAN_USAGE_GUARD = `${"if(!wze())return;".padEnd("if(!Ze().hasOrgPolicyBackend())return;".length, " ")}if((r=fr())`;
-const CLAUDE_PLAN_USAGE_REQUEST = 'P.net.fetch(`${ht()}/api/organizations/${o}/usage`,{signal:AbortSignal.timeout(mcr)})';
-const IMPEL_CLAUDE_PLAN_USAGE_REQUEST = 'P.net.fetch("https://gateway.useimpel.com/ui/a/u",{headers:{key:dR(Oe()).apiKey}})'.padEnd(CLAUDE_PLAN_USAGE_REQUEST.length, " ");
-const CLAUDE_DRAFT_AGENT_MENTIONS = 'agentMentionsEnabled:"draft"===Be&&s';
-const IMPEL_CLAUDE_BOUND_AGENT_MENTIONS = 'agentMentionsEnabled:"draft"===Be?s:Le?.agent??!1';
+const CLAUDE_PLAN_USAGE_GUARD = "if(!Vve()){f8();return}if(!et().hasOrgPolicyBackend())return;if((r=yr())";
+const IMPEL_CLAUDE_PLAN_USAGE_GUARD = `if(!Vve()){f8();return}${"".padEnd("if(!et().hasOrgPolicyBackend())return;".length, " ")}if((r=yr())`;
+const CLAUDE_DRAFT_AGENT_MENTIONS = 'agentMentionsEnabled:"draft"===He&&s';
+const IMPEL_CLAUDE_BOUND_AGENT_MENTIONS = 'agentMentionsEnabled:"draft"===He?s:Le?.agent??!1';
 const CLAUDE_AGENT_MENTION_FILTER = 'return e.filter(e=>"user"===e.source&&(!s||e.name.toLowerCase().includes(s))).slice(0,10)';
 const IMPEL_CLAUDE_BOUND_AGENT_MENTION_FILTER = 'return e.filter(e=>"user"===e.source&&(!s||e.name.toLowerCase().includes(s))&&("string"!=typeof y||e.name===y)).slice(0,10)';
 const CLAUDE_AGENT_MENTION_SELECT = 'onSelect:t=>(e(String(t)),Promise.resolve(null))';
@@ -176,7 +174,7 @@ export const CURRENT_CONFIG_VERSION = 16;
 // — which is what made every `impel update` re-trigger macOS permission
 // prompts. Bump this ONLY when a code change alters the bytes of a built
 // bundle; leave it alone for changes that don't touch bundle contents.
-export const BUNDLE_BUILD_FINGERPRINT = "bundle-2026-07-19.1";
+export const BUNDLE_BUILD_FINGERPRINT = "bundle-2026-07-20.1";
 
 /** Parse the tenant's install manifest, or null when absent/corrupt. */
 export function readTenantManifest(homeDir = os.homedir(), tenantId = null) {
@@ -282,12 +280,15 @@ function wrapperLaunchesOnTahoe(status) {
 
 function managedClaudeRendererMatchesCompatibility(status, compatibility) {
   try {
-    const renderer = compatibility.rendererAssets?.agentMentions;
-    if (!renderer?.path || !renderer.sha256 || path.isAbsolute(renderer.path)) return false;
+    const renderers = compatibility.rendererAssets?.agentMentions;
+    if (!Array.isArray(renderers) || renderers.length === 0) return false;
     const root = path.resolve(status.launcher, "Contents", "Resources", "ion-dist");
-    const target = path.resolve(root, renderer.path);
-    if (!target.startsWith(`${root}${path.sep}`)) return false;
-    return sha256(fs.readFileSync(target)) === renderer.sha256;
+    return renderers.every((renderer) => {
+      if (!renderer?.path || !renderer.sha256 || path.isAbsolute(renderer.path)) return false;
+      const target = path.resolve(root, renderer.path);
+      if (!target.startsWith(`${root}${path.sep}`)) return false;
+      return sha256(fs.readFileSync(target)) === renderer.sha256;
+    });
   } catch {
     return false;
   }
@@ -1406,7 +1407,7 @@ function writeVendoredClaudeBundle(paths, vendorPath, gatewayUrl, safeStorageNam
     const vendorExecutable = path.join(macos, executableName);
     const signingIdentity = resolveVendoredAppSigningIdentity(vendorExecutable);
     writeAtomic(path.join(staging, "Contents", "Resources", "impel-compatibility.json"), JSON.stringify({
-      schemaVersion: 4,
+      schemaVersion: 5,
       cliVersion: CLI_VERSION,
       bundleFingerprint: BUNDLE_BUILD_FINGERPRINT,
       signingMode: signingModeForIdentity(signingIdentity),
@@ -1427,10 +1428,7 @@ function writeVendoredClaudeBundle(paths, vendorPath, gatewayUrl, safeStorageNam
         followupBoundAgentChip: agentMentionPatches.chip,
       },
       rendererAssets: {
-        agentMentions: {
-          path: agentMentionPatches.path,
-          sha256: agentMentionPatches.sha256,
-        },
+        agentMentions: agentMentionPatches.assets,
       },
       asarHeaderSha256: newAsarHash,
     }, null, 2) + "\n", 0o644);
@@ -1576,42 +1574,63 @@ function patchClaudeFollowupAgentMentions(bundle) {
 
   const ionDist = path.join(bundle, "Contents", "Resources", "ion-dist");
   const contracts = [
-    CLAUDE_DRAFT_AGENT_MENTIONS,
-    CLAUDE_AGENT_MENTION_FILTER,
-    CLAUDE_AGENT_MENTION_SELECT,
+    {
+      key: "enable",
+      original: CLAUDE_DRAFT_AGENT_MENTIONS,
+      replacement: IMPEL_CLAUDE_BOUND_AGENT_MENTIONS,
+    },
+    {
+      key: "filter",
+      original: CLAUDE_AGENT_MENTION_FILTER,
+      replacement: IMPEL_CLAUDE_BOUND_AGENT_MENTION_FILTER,
+    },
+    {
+      key: "chip",
+      original: CLAUDE_AGENT_MENTION_SELECT,
+      replacement: IMPEL_CLAUDE_BOUND_AGENT_MENTION_SELECT,
+    },
   ];
-  const candidates = listJavaScriptFiles(ionDist).filter((candidate) => {
-    const source = fs.readFileSync(candidate, "utf8");
-    return contracts.every((contract) => source.includes(contract));
-  });
-  if (candidates.length !== 1) {
-    throw new Error(
-      `Claude follow-up agent-mention renderer expected 1 matching asset, found ${candidates.length}; update impel-cli before installing this desktop app version`,
-    );
+  const sources = new Map(listJavaScriptFiles(ionDist).map((candidate) => [
+    candidate,
+    fs.readFileSync(candidate, "utf8"),
+  ]));
+  const matches = new Map(contracts.map(({ key }) => [key, []]));
+  for (const [candidate, source] of sources) {
+    for (const contract of contracts) {
+      const count = exactTextMatchCount(source, contract.original);
+      if (count > 0) matches.get(contract.key).push({ candidate, count });
+    }
   }
-
-  const renderer = candidates[0];
-  let source = fs.readFileSync(renderer, "utf8");
-  const enable = exactTextMatchCount(source, CLAUDE_DRAFT_AGENT_MENTIONS);
-  const filter = exactTextMatchCount(source, CLAUDE_AGENT_MENTION_FILTER);
-  const chip = exactTextMatchCount(source, CLAUDE_AGENT_MENTION_SELECT);
-  for (const [label, count] of [["enable", enable], ["filter", filter], ["chip", chip]]) {
+  for (const contract of contracts) {
+    const count = matches.get(contract.key).reduce((total, match) => total + match.count, 0);
     if (count !== 1) {
-      throw new Error(`Claude follow-up agent-mention ${label} patch expected 1 match, found ${count}`);
+      throw new Error(`Claude follow-up agent-mention ${contract.key} patch expected 1 match, found ${count}`);
     }
   }
 
-  source = source
-    .replace(CLAUDE_DRAFT_AGENT_MENTIONS, IMPEL_CLAUDE_BOUND_AGENT_MENTIONS)
-    .replace(CLAUDE_AGENT_MENTION_FILTER, IMPEL_CLAUDE_BOUND_AGENT_MENTION_FILTER)
-    .replace(CLAUDE_AGENT_MENTION_SELECT, IMPEL_CLAUDE_BOUND_AGENT_MENTION_SELECT);
-  writeAtomic(renderer, source, fs.statSync(renderer).mode & 0o777);
+  const assets = [];
+  for (const candidate of [...new Set(
+    [...matches.values()].flatMap((entries) => entries.map(({ candidate: file }) => file)),
+  )].sort()) {
+    const source = fs.readFileSync(candidate, "utf8");
+    const applicable = contracts.filter((contract) => source.includes(contract.original));
+    let patched = source;
+    for (const contract of applicable) {
+      patched = patched.replace(contract.original, contract.replacement);
+    }
+    writeAtomic(candidate, patched, fs.statSync(candidate).mode & 0o777);
+    assets.push({
+      path: path.relative(ionDist, candidate).split(path.sep).join("/"),
+      sha256: sha256(Buffer.from(patched, "utf8")),
+      patches: applicable.map(({ key }) => key),
+    });
+  }
+
   return {
-    enable,
-    filter,
-    chip,
-    path: path.relative(ionDist, renderer).split(path.sep).join("/"),
-    sha256: sha256(Buffer.from(source, "utf8")),
+    enable: 1,
+    filter: 1,
+    chip: 1,
+    assets,
   };
 }
 
@@ -1661,23 +1680,6 @@ function patchFixedWidthAsarString(asarPath, original, replacement, label) {
 function patchClaudePlanUsageRequest(asarPath) {
   const archive = fs.readFileSync(asarPath);
   const source = archive.toString("latin1");
-  const legacyPatches = [];
-  for (
-    let offset = source.indexOf(CLAUDE_PLAN_USAGE_REQUEST);
-    offset !== -1;
-    offset = source.indexOf(CLAUDE_PLAN_USAGE_REQUEST, offset + CLAUDE_PLAN_USAGE_REQUEST.length)
-  ) {
-    legacyPatches.push({
-      offset,
-      original: CLAUDE_PLAN_USAGE_REQUEST,
-      replacement: IMPEL_CLAUDE_PLAN_USAGE_REQUEST,
-    });
-  }
-  if (legacyPatches.length > 0) {
-    return applyFixedWidthAsarPatches(
-      asarPath, archive, legacyPatches, "Claude plan-usage gateway request",
-    );
-  }
   const credentialAccessor = source.match(
     /function ([A-Za-z_$][\w$]*)\(e\)\{var t;return [\s\S]{0,500}?\[custom-3p\] Credentials loaded from managed config/u,
   )?.[1];
@@ -1693,10 +1695,10 @@ function patchClaudePlanUsageRequest(asarPath) {
     return applyFixedWidthAsarPatches(asarPath, archive, [], "Claude plan-usage gateway request");
   }
 
-  const requestPattern = /([A-Za-z_$][\w$]*)\.net\.fetch\(`\$\{[A-Za-z_$][\w$]*\(\)\}\/api\/organizations\/\$\{[A-Za-z_$][\w$]*\}\/usage`,\{signal:AbortSignal\.timeout\([A-Za-z_$][\w$]*\)\}\)/gu;
+  const requestPattern = /const ([A-Za-z_$][\w$]*)=`\$\{[A-Za-z_$][\w$]*\(\)\}\/api\/organizations\/\$\{[A-Za-z_$][\w$]*\}\/usage\$\{[A-Za-z_$][\w$]*\?"\?skip_spend=1":""\}`,([A-Za-z_$][\w$]*)=await ([A-Za-z_$][\w$]*)\.net\.fetch\(\1,\{signal:AbortSignal\.timeout\([A-Za-z_$][\w$]*\)\}\)/gu;
   const patches = [...source.matchAll(requestPattern)].map((match) => {
     const original = match[0];
-    const replacement = `${match[1]}.net.fetch("https://gateway.useimpel.com/ui/a/u",{headers:{key:${credentialAccessor}(${configAccessor}()).apiKey}})`;
+    const replacement = `const ${match[1]}="https://gateway.useimpel.com/ui/a/u",${match[2]}=await ${match[3]}.net.fetch(${match[1]},{headers:{key:${credentialAccessor}(${configAccessor}()).apiKey}})`;
     if (replacement.length > original.length) {
       throw new Error("Claude plan-usage gateway request replacement no longer fits the vendor ASAR contract");
     }
@@ -1997,7 +1999,11 @@ function vendoredChatGPTWrapperPlist(vendorPath, asarHash, identity, executableN
 <key>CFBundleShortVersionString</key><string>${xmlEscape(bundleVersion(vendorPath) || "1")}</string>
 <key>ElectronAsarIntegrity</key><dict><key>Resources/app.asar</key><dict><key>algorithm</key><string>SHA256</string><key>hash</key><string>${xmlEscape(asarHash)}</string></dict></dict>
 <key>LSMinimumSystemVersion</key><string>12.0</string>
+<key>NSCalendarsFullAccessUsageDescription</key><string>Allow access so that ChatGPT can read and update your calendar events when you ask.</string>
+<key>NSCalendarsUsageDescription</key><string>Allow access so that ChatGPT can read and update your calendar events when you ask.</string>
 <key>NSHighResolutionCapable</key><true/>
+<key>NSRemindersFullAccessUsageDescription</key><string>Allow access so that ChatGPT can read and update your reminders when you ask.</string>
+<key>NSRemindersUsageDescription</key><string>Allow access so that ChatGPT can read and update your reminders when you ask.</string>
 </dict></plist>
 `;
 }

package/src/windowsApps.js

@@ -1,4 +1,5 @@
 import { spawn, spawnSync } from "node:child_process";
+import crypto from "node:crypto";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
@@ -251,14 +252,47 @@ export function findManagedWindowsChatGPTApp(appsRoot, dependencies = {}) {
   return null;
 }
 
+function sha256File(file) {
+  const hash = crypto.createHash("sha256");
+  const buffer = Buffer.allocUnsafe(1024 * 1024);
+  const descriptor = fs.openSync(file, "r");
+  try {
+    for (let offset = 0; ; offset += buffer.length) {
+      const bytesRead = fs.readSync(descriptor, buffer, 0, buffer.length, offset);
+      if (bytesRead === 0) break;
+      hash.update(buffer.subarray(0, bytesRead));
+    }
+    return hash.digest("hex");
+  } finally {
+    fs.closeSync(descriptor);
+  }
+}
+
+function windowsChatGPTSourceIdentity(binary) {
+  const sourceRoot = path.dirname(binary);
+  const files = {
+    executable: binary,
+    appAsar: path.join(sourceRoot, "resources", "app.asar"),
+    codex: path.join(sourceRoot, "resources", "codex.exe"),
+  };
+  return {
+    executableName: path.basename(binary),
+    sha256: Object.fromEntries(
+      Object.entries(files).map(([name, file]) => [name, sha256File(file)]),
+    ),
+  };
+}
+
 export function windowsChatGPTStageIsCurrent(binary, appsRoot) {
   if (!binary || !findManagedWindowsChatGPTApp(appsRoot)) return false;
   try {
     const record = JSON.parse(
       fs.readFileSync(path.join(windowsChatGPTCacheRoot(appsRoot), "source.json"), "utf8"),
     );
-    return path.win32.normalize(record.sourceBinary || "").toLowerCase()
-      === path.win32.normalize(binary).toLowerCase();
+    return record.schemaVersion === 2
+      && path.win32.normalize(record.sourceBinary || "").toLowerCase()
+        === path.win32.normalize(binary).toLowerCase()
+      && JSON.stringify(record.sourceIdentity) === JSON.stringify(windowsChatGPTSourceIdentity(binary));
   } catch {
     return false;
   }
@@ -288,6 +322,7 @@ export function stageWindowsChatGPTApp(binary, appsRoot, dependencies = {}) {
   if (!io.isFile(binary) || !io.isFile(sourceAsar) || !io.isFile(sourceCodex)) {
     throw new Error(`unsupported ChatGPT/Codex Windows app layout at ${sourceRoot}`);
   }
+  const sourceIdentity = windowsChatGPTSourceIdentity(binary);
 
   const cacheRoot = windowsChatGPTCacheRoot(appsRoot);
   const destination = windowsManagedChatGPTRoot(appsRoot);
@@ -309,8 +344,9 @@ export function stageWindowsChatGPTApp(binary, appsRoot, dependencies = {}) {
   try {
     io.rename(staging, destination);
     fs.writeFileSync(path.join(cacheRoot, "source.json"), `${JSON.stringify({
-      schemaVersion: 1,
+      schemaVersion: 2,
       sourceBinary: path.win32.normalize(binary),
+      sourceIdentity,
       stagedAt: new Date().toISOString(),
     }, null, 2)}\n`, { mode: 0o600 });
     io.remove(backup);