impel-cli 0.20.38 → 0.20.39

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/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."
   );
 }