@cortexkit/pi-magic-context 0.31.4 → 0.31.5

package/dist/index.js

@@ -157588,18 +157588,48 @@ function inferAccountingSubagent(agent) {
     return "recomp";
   return "historian";
 }
+var ALREADY_PROCESSING_PREFIX = "Agent is already processing";
+var ISOLATED_RETRY_MODEL_UNAVAILABLE_MESSAGE = "model unavailable in isolated retry: it is provided by a disabled extension; configure it through models.json or add a built-in/provider-configured fallback";
+var MODEL_RESOLUTION_ERROR_PATTERNS = [
+  /unknown model/i,
+  /unknown provider/i,
+  /model.+not found/i,
+  /provider.+not found/i,
+  /could not resolve model/i,
+  /no models? (matched|available|configured)/i,
+  /model.+not configured/i
+];
 
 class PiSubagentRunner {
   harness = "pi";
   invocation;
   spawnImpl;
   platform;
+  extraArgs;
   constructor(options = {}) {
     this.invocation = options.piBinary ? { command: options.piBinary, prefixArgs: [] } : resolvePiInvocation();
     this.spawnImpl = options.spawnImpl ?? childProcess.spawn;
     this.platform = options.platform ?? process.platform;
+    this.extraArgs = options.extraArgs ?? [];
   }
   async run(options) {
+    const primaryRunMode = { disableDiscoveredExtensions: false };
+    const primaryResult = await this.runModelChain(options, primaryRunMode);
+    if (this.spawnUsesNoExtensions(primaryRunMode) || !isPiExtensionCollisionFailure(primaryResult)) {
+      return primaryResult;
+    }
+    const sessionId = options.accountingSessionId ?? "pi-subagent";
+    sessionLog(sessionId, "pi subagent: a loaded Pi extension started an agent turn before the child's prompt could run; retrying with an isolated extension set (user extensions disabled for this run)");
+    const isolatedResult = await this.runModelChain(options, {
+      disableDiscoveredExtensions: true
+    });
+    if (!isolatedResult.ok && isIsolatedRetryModelUnavailable(isolatedResult)) {
+      sessionLog(sessionId, ISOLATED_RETRY_MODEL_UNAVAILABLE_MESSAGE);
+      return annotateIsolatedRetryModelUnavailable(isolatedResult);
+    }
+    return isolatedResult;
+  }
+  async runModelChain(options, runMode) {
     const models = [options.model, ...options.fallbackModels ?? []].filter((model) => typeof model === "string" && model.length > 0);
     const attempts = models.length > 0 ? models : [undefined];
     let lastResult = null;
@@ -157610,17 +157640,23 @@ class PiSubagentRunner {
         model,
         fallbackModels: undefined
       };
-      const result = await this.runOnce(attemptOptions);
+      const result = await this.runOnce(attemptOptions, runMode);
       if (result.ok)
         return result;
       lastResult = result;
+      if (!this.spawnUsesNoExtensions(runMode) && isPiExtensionCollisionFailure(result)) {
+        return result;
+      }
       if (index >= attempts.length - 1 || !isFallbackEligible(result.reason)) {
         return result;
       }
     }
-    return lastResult ?? this.runOnce({ ...options, fallbackModels: undefined });
+    return lastResult ?? this.runOnce({ ...options, fallbackModels: undefined }, runMode);
+  }
+  spawnUsesNoExtensions(runMode) {
+    return runMode.disableDiscoveredExtensions || hasNoExtensionsArg([...this.invocation.prefixArgs, ...this.extraArgs]);
   }
-  async runOnce(options) {
+  async runOnce(options, runMode) {
     const startTime = Date.now();
     let recordedAccounting = false;
     const recordAccounting = (result, messages = []) => {
@@ -157695,6 +157731,7 @@ class PiSubagentRunner {
       }
     }
     const args = buildArgs(options, {
+      disableDiscoveredExtensions: runMode.disableDiscoveredExtensions,
       omitPositionalMessage: deliverViaStdin,
       systemPromptPath
     });
@@ -157722,7 +157759,7 @@ class PiSubagentRunner {
       };
       let child;
       try {
-        child = this.spawnImpl(this.invocation.command, [...this.invocation.prefixArgs, ...args], {
+        child = this.spawnImpl(this.invocation.command, [...this.invocation.prefixArgs, ...this.extraArgs, ...args], {
           cwd: options.cwd,
           env: {
             ...process.env,
@@ -158016,6 +158053,32 @@ class PiSubagentRunner {
     });
   }
 }
+function getResultStderr(result) {
+  const stderr = result.meta?.stderr;
+  return typeof stderr === "string" ? stderr : "";
+}
+function hasNoExtensionsArg(args) {
+  return args.includes("--no-extensions");
+}
+function isPiExtensionCollisionFailure(result) {
+  return !result.ok && result.reason === "non_zero_exit" && getResultStderr(result).includes(ALREADY_PROCESSING_PREFIX);
+}
+function isIsolatedRetryModelUnavailable(result) {
+  if (result.ok)
+    return false;
+  const diagnosticText = `${result.error}
+${getResultStderr(result)}`;
+  return MODEL_RESOLUTION_ERROR_PATTERNS.some((pattern) => pattern.test(diagnosticText));
+}
+function annotateIsolatedRetryModelUnavailable(result) {
+  if (result.error.startsWith(ISOLATED_RETRY_MODEL_UNAVAILABLE_MESSAGE)) {
+    return result;
+  }
+  return {
+    ...result,
+    error: `${ISOLATED_RETRY_MODEL_UNAVAILABLE_MESSAGE}. Original failure: ${result.error}`
+  };
+}
 function isFallbackEligible(reason) {
   return reason === "model_failed" || reason === "truncated" || reason === "non_zero_exit" || reason === "no_assistant";
 }
@@ -158030,9 +158093,13 @@ function buildArgs(options, opts) {
     "--no-prompt-templates",
     "--no-context-files"
   ];
-  const shouldLoadSubagentExtension = SUBAGENT_ENTRY_PATH && (SEARCH_ONLY_SUBAGENT_TOOL_AGENTS.has(options.agent) || DREAMER_ACTION_AGENTS.has(options.agent));
+  if (opts?.disableDiscoveredExtensions) {
+    args.push("--no-extensions");
+  }
+  const subagentEntryPath = opts?.subagentEntryPath ?? SUBAGENT_ENTRY_PATH;
+  const shouldLoadSubagentExtension = subagentEntryPath && (SEARCH_ONLY_SUBAGENT_TOOL_AGENTS.has(options.agent) || DREAMER_ACTION_AGENTS.has(options.agent));
   if (shouldLoadSubagentExtension) {
-    args.push("--extension", SUBAGENT_ENTRY_PATH);
+    args.push("--extension", subagentEntryPath);
     if (DREAMER_ACTION_AGENTS.has(options.agent)) {
       args.push("--magic-context-dreamer-actions");
     }
@@ -201923,7 +201990,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.31.4",
+  version: "0.31.5",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cortexkit/pi-magic-context",
-	"version": "0.31.4",
+	"version": "0.31.5",
 	"type": "module",
 	"description": "Pi coding agent extension for Magic Context — cross-session memory and context management",
 	"main": "dist/index.js",