impel-cli 0.20.2-beta.0 → 0.20.2

package/package.json

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

package/src/nativeAgentTransport.js

@@ -47,6 +47,8 @@ const DEFAULT_ADMISSION_LEASE_MS = 10_000;
 const STATE_COMMIT_LEASE_MARGIN_MS = 5_000;
 const CIBI_START_IN_PROGRESS_CODE = "eve_run_drain_start_in_progress";
 const CIBI_START_IN_PROGRESS_MESSAGE = "The durable Eve drain workflow is still being enqueued; retry this idempotent start.";
+const CTOS_START_TIMEOUT_MESSAGE = `MCP tool call failed for ${NATIVE_AGENT_START_TOOL}: The operation was aborted due to timeout: mcp tool call failed`;
+const MCP_TOOL_RESULT_ERROR = Symbol("native-agent MCP tool result error");
 const TERMINAL_STATUSES = new Set(["succeeded", "failed", "cancelled", "canceled"]);
 
 function stableValue(value) {
@@ -538,7 +540,9 @@ function toolPayload(message) {
   const result = message.result;
   const text = result?.content?.find((item) => item?.type === "text" && typeof item.text === "string")?.text;
   if (result?.isError) {
-    throw new NativeAgentUpstreamError(redactSecretText(text || "native-agent MCP tool failed"));
+    const error = new NativeAgentUpstreamError(redactSecretText(text || "native-agent MCP tool failed"));
+    error[MCP_TOOL_RESULT_ERROR] = true;
+    throw error;
   }
   if (result?.structuredContent && typeof result.structuredContent === "object") {
     return result.structuredContent;
@@ -664,7 +668,9 @@ export class NativeAgentUpstreamSession {
         && (error.incompleteResponse
           || error.code === CIBI_START_IN_PROGRESS_CODE
           || error.data?.code === CIBI_START_IN_PROGRESS_CODE
-          || error.message === CIBI_START_IN_PROGRESS_MESSAGE)) {
+          || error.message === CIBI_START_IN_PROGRESS_MESSAGE
+          || (error[MCP_TOOL_RESULT_ERROR] === true
+            && error.message === CTOS_START_TIMEOUT_MESSAGE))) {
         error.ambiguous = true;
       }
       throw error;
@@ -1822,6 +1828,11 @@ export class NativeAgentCompositeTransport {
       throwIfAborted(signal);
       if (!state.upstreamRunId) {
         let started = null;
+        // startAttempts is durably incremented before each outbound call. A
+        // pre-existing attempt may have reached the upstream even when this
+        // process did not observe an ambiguous response (for example, after a
+        // crash), so later definitive failures cannot prove that no run exists.
+        let startOutcomeUncertain = state.startAttempts > 0;
         for (let attempt = 0; attempt < 2; attempt += 1) {
           state.startAttempts += 1;
           state.updatedAt = new Date(this.now()).toISOString();
@@ -1832,12 +1843,20 @@ export class NativeAgentCompositeTransport {
           } catch (error) {
             if (error?.name === "AbortError") throw error;
             if (!error?.ambiguous) {
-              const diagnostic = diagnosticFor(error, state.idempotencyKey);
-              throw new NativeAgentUpstreamError(String(diagnostic.message), {
-                code: diagnostic.code,
-                data: diagnostic.data,
-              });
+              if (startOutcomeUncertain) {
+                this.persistDiagnostic(state, error, lock);
+                return handleForState(state);
+              }
+              this.compactTerminalFailure(
+                state,
+                state,
+                "LOCAL_START_REJECTED",
+                "The native-agent start request was definitively rejected by the upstream service.",
+                lock,
+              );
+              return resultForState(state);
             }
+            startOutcomeUncertain = true;
             this.persistDiagnostic(state, error, lock);
           }
         }