impel-cli 0.20.37 → 0.20.39

package/src/commands/token.js

@@ -1,14 +1,21 @@
 import { loadConfig } from "../config.js";
 import { parseFlags } from "../args.js";
 import { ensureTenantSelection, normalizeTenantId, tenantCredential } from "../tenants.js";
+import { maybeRepairManagedApps } from "./sessions.js";
 import { RUNTIME_BRAND } from "../runtimeBrand.js";
 
 // This is the `apiKeyHelper` / auth-command contract: stdout (and only
 // stdout) must be exactly the bearer token, nothing else. Both Claude Code's
 // apiKeyHelper and Codex CLI's `model_providers.<id>.auth.command` call this.
-export async function cmdToken(argv = []) {
+export async function cmdToken(argv = [], overrides = {}) {
+  const io = {
+    loadConfig,
+    ensureTenantSelection,
+    repairManagedApps: maybeRepairManagedApps,
+    ...overrides,
+  };
   const { flags } = parseFlags(argv, { tenant: { type: "string" } });
-  const config = loadConfig();
+  const config = io.loadConfig();
   if (!config?.pat) {
     process.stderr.write(`${RUNTIME_BRAND.cli.command}: not authenticated. Run \`${RUNTIME_BRAND.cli.command} setup\` (or \`${RUNTIME_BRAND.cli.command} auth\`) first.\n`);
     process.exitCode = 1;
@@ -17,8 +24,21 @@ export async function cmdToken(argv = []) {
   try {
     const tenantId = flags.tenant
       ? normalizeTenantId(flags.tenant)
-      : (await ensureTenantSelection(config)).tenantId;
+      : (await io.ensureTenantSelection(config)).tenantId;
     process.stdout.write(`${tenantCredential(config.pat, tenantId)}\n`);
+    // Drift-aware self-heal, strictly AFTER the token bytes are on stdout: the
+    // vendor apps call this helper on every auth, which makes it an Impel
+    // entry point that keeps running even after a vendor settings-writer
+    // rewrites a managed profile (a drifted config once stopped invoking the
+    // rest of the heal channel entirely). Kick the same detached,
+    // heartbeat-locked stale-only refresh the session hooks use — for both
+    // Codex and Claude drift. It must never write to stdout, never block the
+    // emission above, and never change this command's exit code.
+    try {
+      io.repairManagedApps(tenantId);
+    } catch {
+      // Opportunistic only; the token contract is already fulfilled.
+    }
   } catch (error) {
     process.stderr.write(`${RUNTIME_BRAND.cli.command}: ${error.message}\n`);
     process.exitCode = 1;

package/src/macSetup.js

@@ -7,7 +7,7 @@ import { spawnSync } from "node:child_process";
 import { ensureImpelClaudeProfile, ensureImpelCodexProfile } from "./cliProfiles.js";
 import { findNativeBinary } from "./nativeProcess.js";
 import { syncSkillsSafe } from "./skills.js";
-import { verifyReviewedMacVendorCli } from "./vendorCliBinaries.js";
+import { findReviewedVendorCliBinary, verifyReviewedMacVendorCli } from "./vendorCliBinaries.js";
 import { PINNED_VENDOR_CLI_VERSIONS } from "./vendorCliVersions.js";
 
 const MAX_INSTALLER_BYTES = 512 * 1024;
@@ -49,13 +49,14 @@ export const MAC_CLI_INSTALLERS = Object.freeze({
 });
 
 function detectMacClis(find, environment, verify) {
-  const detect = (tool) => find(
-    tool,
-    environment,
-    "darwin",
-    "IMPEL",
-    (binary) => verify(tool, binary, environment),
-  );
+  // Detection must share the launcher's reviewed resolution (including the
+  // side-by-side fallback after vendor auto-update drift); a raw PATH probe
+  // here would classify a drifted-but-launchable install as missing and
+  // reinstall it on every setup/update pass.
+  const detect = (tool) => findReviewedVendorCliBinary(tool, environment, "darwin", "IMPEL", {
+    find,
+    verify,
+  });
   return { claude: detect("claude"), codex: detect("codex") };
 }
 

package/src/nativeAgentTransport.js

@@ -445,10 +445,18 @@ function resumedHandleForState(state, incomingHandle) {
 function normalizeHandle(value) {
   if (value?.schema === NATIVE_AGENT_CONTINUATION_SCHEMA) {
     exactObject(value, ["schema", "invocationId"], "native-agent continuation");
-    if (typeof value.invocationId !== "string" || !SAFE_INVOCATION_RE.test(value.invocationId)) {
-      throw new Error("native-agent continuation invocationId is invalid");
+    // Minted ids are lowercase UUIDs; tolerate a case-drifting reserialization
+    // but nothing that changes the id's shape.
+    const invocationId = typeof value.invocationId === "string"
+      ? value.invocationId.toLowerCase()
+      : null;
+    if (!invocationId || !SAFE_INVOCATION_RE.test(invocationId)) {
+      throw new Error(
+        "native-agent continuation invocationId is invalid; pass the exact continuation object "
+        + "returned by the answer call, or call the answer tool again if none was returned",
+      );
     }
-    return { ...value };
+    return { ...value, invocationId };
   }
   exactObject(value, [
     "schema",
@@ -1854,7 +1862,7 @@ export class NativeAgentCompositeTransport {
     }
   }
 
-  async answer(args, { signal } = {}) {
+  async answer(args, { signal, onProgress } = {}) {
     throwIfAborted(signal);
     const attachment = boundedAttachmentSignal(signal, this.attachmentWindowMs);
     let state = null;
@@ -1880,6 +1888,7 @@ export class NativeAgentCompositeTransport {
       if (!lock) return continuationForState(state);
       const result = await this.attach(state, prepared, {
         signal: attachment.signal,
+        onProgress,
         lock,
       });
       if (result?.schema === NATIVE_AGENT_RESULT_SCHEMA && result.status === "succeeded") {

package/src/selfInvocation.js

@@ -5,8 +5,18 @@ import { environmentValue } from "./nativeProcess.js";
 import { brandedEnvironmentName, RUNTIME_BRAND } from "./runtimeBrand.js";
 
 /** The running package's own bin script, used directly for live child spawns. */
-export const IMPEL_CLI_ENTRYPOINT = process.env.IMPEL_CLI_EXTENSION_ENTRYPOINT
-  || fileURLToPath(new URL("../bin/impel.js", import.meta.url));
+const PACKAGE_CLI_ENTRYPOINT = fileURLToPath(new URL("../bin/impel.js", import.meta.url));
+const extensionEntrypoint = process.env.IMPEL_CLI_EXTENSION_ENTRYPOINT;
+// The public Impel package never delegates its trusted MCP command prefix to
+// inherited process state. First-party extension wrappers install a validated
+// non-Impel runtime brand before import, must actually be executing the named
+// entrypoint, and then prove that same path in createImpelCliExtension.
+export const IMPEL_CLI_ENTRYPOINT = RUNTIME_BRAND.cli.packageName === "impel-cli"
+  || typeof extensionEntrypoint !== "string"
+  || !path.isAbsolute(extensionEntrypoint)
+  || path.resolve(process.argv[1] || "") !== path.resolve(extensionEntrypoint)
+  ? PACKAGE_CLI_ENTRYPOINT
+  : extensionEntrypoint;
 
 // Matches a real package install (npm/pnpm/volta all place the package under
 // node_modules/impel-cli; an unsupported project-local install matches too,

package/src/vendorCliBinaries.js

@@ -111,16 +111,45 @@ export function findReviewedVendorCliBinary(
   {
     find = findNativeBinary,
     verify = verifyReviewedMacVendorCli,
+    realpath = fs.realpathSync,
+    stat = fs.statSync,
   } = {},
 ) {
   if (platform !== "darwin") return find(tool, environment, platform, environmentPrefix);
-  return find(
-    tool,
-    environment,
-    platform,
-    environmentPrefix,
-    (binary) => verify(tool, binary, environment, { environmentPrefix }),
-  );
+  const accept = (binary) => verify(tool, binary, environment, { environmentPrefix });
+  const reviewed = find(tool, environment, platform, environmentPrefix, accept);
+  if (reviewed || tool !== "claude") return reviewed;
+  // An explicit override remains authoritative even while unusable: callers
+  // asked for exactly that binary, so never substitute another install.
+  const override = vendorOverrideName(tool, environmentPrefix);
+  if (override && environmentValue(environment, override)) return null;
+
+  // The standalone Claude installer keeps releases side by side under
+  // versions/<release> and its auto-updater only moves the launcher symlink.
+  // When the symlink drifts past the reviewed release, resolve the exact
+  // reviewed release directly instead of failing the launch; every candidate
+  // still passes the full version + signature + team verification.
+  const candidates = [];
+  const drifted = find(tool, environment, platform, environmentPrefix);
+  if (drifted) {
+    try {
+      candidates.push(path.join(path.dirname(realpath(drifted)), PINNED_VENDOR_CLI_VERSIONS.claude));
+    } catch {
+      // An unresolvable shim only forfeits the sibling candidate.
+    }
+  }
+  const home = environmentValue(environment, "HOME");
+  if (home) {
+    candidates.push(path.join(home, ".local", "share", "claude", "versions", PINNED_VENDOR_CLI_VERSIONS.claude));
+  }
+  for (const candidate of candidates) {
+    try {
+      if (stat(candidate).isFile() && accept(candidate)) return candidate;
+    } catch {
+      // A missing side-by-side release keeps resolution fail-closed.
+    }
+  }
+  return null;
 }
 
 /**

package/src/verbatimRelay.js

@@ -1,5 +1,13 @@
+import { CODEX_NATIVE_AGENT_ATTACHMENT_WINDOW_MS } from "./selfInvocation.js";
+
 export const VERBATIM_RELAY_OPT_IN_MARKER = "verbatimRelay enabled";
 
+// The parent's single blocking wait must outlast the Codex child's bounded
+// native-agent attachment window or the parent's visible working span
+// truncates while the child is still running. Deriving it keeps the two
+// contracts linked when the window moves again.
+export const VERBATIM_RELAY_PARENT_WAIT_MS = CODEX_NATIVE_AGENT_ATTACHMENT_WINDOW_MS + 20_000;
+
 export const VERBATIM_SPAWN_REQUIREMENT = 'fork_turns="none"';
 
 export const VERBATIM_FINAL_TEXT_CONSTRAINTS =
@@ -14,7 +22,7 @@ export function parentVerbatimRelayAppendix() {
     `When an explicit custom agent's catalog-derived description declares ${VERBATIM_RELAY_OPT_IN_MARKER}, ` +
     `spawn it with ${VERBATIM_SPAWN_REQUIREMENT} and relay its finalText verbatim with ${VERBATIM_FINAL_TEXT_CONSTRAINTS}; ` +
     "preserve Sources sections and citations exactly. Start one child, then use one blocking wait sized for the child budget; " +
-    "on Codex, call wait_agent exactly once with timeout_ms=60000. Do not send follow-ups, short-poll the child, or synthesize while it is running. " +
+    `on Codex, call wait_agent exactly once with timeout_ms=${VERBATIM_RELAY_PARENT_WAIT_MS}. Do not send follow-ups, short-poll the child, or synthesize while it is running. ` +
     "Custom agents without that declaration keep the default delegation behavior."
   );
 }