@cortexkit/pi-magic-context 0.27.1 → 0.27.2

package/dist/index.js

@@ -15136,7 +15136,18 @@ function legacySourcesForBase(basePath, label) {
     { path: `${basePath}.json`, label: `${label} magic-context.json` }
   ];
 }
+function userScopeConfigPaths() {
+  return new Set([
+    `${cortexKitUserConfigBasePath()}.jsonc`,
+    `${cortexKitUserConfigBasePath()}.json`,
+    join(configHome(), "opencode", `${CONFIG_FILE_BASENAME}.jsonc`),
+    join(configHome(), "opencode", `${CONFIG_FILE_BASENAME}.json`),
+    join(homeDir(), ".pi", "agent", `${CONFIG_FILE_BASENAME}.jsonc`),
+    join(homeDir(), ".pi", "agent", `${CONFIG_FILE_BASENAME}.json`)
+  ]);
+}
 function resolveLegacyConfigSources(directory) {
+  const userPaths = userScopeConfigPaths();
   return {
     user: [
       ...legacySourcesForBase(join(configHome(), "opencode", CONFIG_FILE_BASENAME), "OpenCode user"),
@@ -15146,7 +15157,7 @@ function resolveLegacyConfigSources(directory) {
       ...legacySourcesForBase(join(directory, CONFIG_FILE_BASENAME), "project root"),
       ...legacySourcesForBase(join(directory, ".opencode", CONFIG_FILE_BASENAME), "OpenCode project"),
       ...legacySourcesForBase(join(directory, ".pi", CONFIG_FILE_BASENAME), "Pi project")
-    ]
+    ].filter((source) => !userPaths.has(source.path))
   };
 }
 function resolveLegacyConfigSourcesForHarness(directory, harness) {
@@ -156419,7 +156430,7 @@ init_logger();
 import * as childProcess from "node:child_process";
 import { existsSync as existsSync7 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
-import { dirname as dirname4, join as join8, resolve as resolvePath } from "node:path";
+import { basename as basename2, dirname as dirname4, join as join8, resolve as resolvePath } from "node:path";
 import { createInterface } from "node:readline";
 import { fileURLToPath } from "node:url";
 
@@ -156528,6 +156539,24 @@ function resolveBundledPiCli() {
     return null;
   }
 }
+function resolvePiInvocation() {
+  const execPath = process.execPath;
+  const currentScript = process.argv[1];
+  const isBunVirtualScript = currentScript?.startsWith("/$bunfs/root/") ?? false;
+  if (currentScript && !isBunVirtualScript && existsSync7(currentScript)) {
+    return { command: execPath, prefixArgs: [currentScript] };
+  }
+  const execName = basename2(execPath).toLowerCase();
+  const isGenericRuntime = /^(node|bun)(\.exe)?$/.test(execName);
+  if (!isGenericRuntime) {
+    return { command: execPath, prefixArgs: [] };
+  }
+  const bundled = resolveBundledPiCli();
+  if (bundled) {
+    return { command: execPath, prefixArgs: [bundled] };
+  }
+  return { command: "pi", prefixArgs: [] };
+}
 function resolveSubagentEntryPath() {
   try {
     const here = dirname4(fileURLToPath(import.meta.url));
@@ -156577,19 +156606,10 @@ function inferAccountingSubagent(agent) {
 
 class PiSubagentRunner {
   harness = "pi";
-  piBinary;
+  invocation;
   spawnImpl;
   constructor(options = {}) {
-    if (options.piBinary) {
-      this.piBinary = options.piBinary;
-    } else {
-      const bundled = resolveBundledPiCli();
-      if (bundled) {
-        this.piBinary = bundled;
-      } else {
-        this.piBinary = "pi";
-      }
-    }
+    this.invocation = options.piBinary ? { command: options.piBinary, prefixArgs: [] } : resolvePiInvocation();
     this.spawnImpl = options.spawnImpl ?? childProcess.spawn;
   }
   async run(options) {
@@ -156677,7 +156697,7 @@ class PiSubagentRunner {
       };
       let child;
       try {
-        child = this.spawnImpl(this.piBinary, args, {
+        child = this.spawnImpl(this.invocation.command, [...this.invocation.prefixArgs, ...args], {
           cwd: options.cwd,
           env: process.env,
           stdio: [deliverViaStdin ? "pipe" : "ignore", "pipe", "pipe"]
@@ -177523,21 +177543,21 @@ function isSecretDeniedPath(repoRelativePath) {
   const segments = normalized.split("/");
   if (segments.includes(".git") || segments.includes("secrets"))
     return true;
-  const basename2 = segments.at(-1) ?? "";
-  if (basename2 === ".npmrc" || basename2.startsWith(".env"))
+  const basename3 = segments.at(-1) ?? "";
+  if (basename3 === ".npmrc" || basename3.startsWith(".env"))
     return true;
-  if (basename2 === ".pgpass" || basename2 === ".netrc")
+  if (basename3 === ".pgpass" || basename3 === ".netrc")
     return true;
-  if (SECRET_KEY_EXTENSIONS.some((extension) => basename2.endsWith(extension)))
+  if (SECRET_KEY_EXTENSIONS.some((extension) => basename3.endsWith(extension)))
     return true;
-  if (basename2 === "id_rsa" || basename2 === "id_dsa" || basename2 === "id_ecdsa" || basename2 === "id_ed25519" || basename2.startsWith("id_")) {
+  if (basename3 === "id_rsa" || basename3 === "id_dsa" || basename3 === "id_ecdsa" || basename3 === "id_ed25519" || basename3.startsWith("id_")) {
     return true;
   }
-  if (segments.includes(".aws") && basename2 === "credentials")
+  if (segments.includes(".aws") && basename3 === "credentials")
     return true;
-  if (basename2.endsWith(".json")) {
-    const serviceAccountJson = basename2.includes("service-account") || basename2.includes("service_account");
-    const gcloudCredentialJson = segments.includes("gcloud") && (basename2 === "application_default_credentials.json" || basename2.includes("credential") || segments.includes("legacy_credentials"));
+  if (basename3.endsWith(".json")) {
+    const serviceAccountJson = basename3.includes("service-account") || basename3.includes("service_account");
+    const gcloudCredentialJson = segments.includes("gcloud") && (basename3 === "application_default_credentials.json" || basename3.includes("credential") || segments.includes("legacy_credentials"));
     if (serviceAccountJson || gcloudCredentialJson)
       return true;
   }
@@ -199300,7 +199320,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.27.1",
+  version: "0.27.2",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",

package/dist/subagent-entry.js

@@ -144113,7 +144113,18 @@ function legacySourcesForBase(basePath, label) {
     { path: `${basePath}.json`, label: `${label} magic-context.json` }
   ];
 }
+function userScopeConfigPaths() {
+  return new Set([
+    `${cortexKitUserConfigBasePath()}.jsonc`,
+    `${cortexKitUserConfigBasePath()}.json`,
+    join4(configHome(), "opencode", `${CONFIG_FILE_BASENAME}.jsonc`),
+    join4(configHome(), "opencode", `${CONFIG_FILE_BASENAME}.json`),
+    join4(homeDir(), ".pi", "agent", `${CONFIG_FILE_BASENAME}.jsonc`),
+    join4(homeDir(), ".pi", "agent", `${CONFIG_FILE_BASENAME}.json`)
+  ]);
+}
 function resolveLegacyConfigSources(directory) {
+  const userPaths = userScopeConfigPaths();
   return {
     user: [
       ...legacySourcesForBase(join4(configHome(), "opencode", CONFIG_FILE_BASENAME), "OpenCode user"),
@@ -144123,7 +144134,7 @@ function resolveLegacyConfigSources(directory) {
       ...legacySourcesForBase(join4(directory, CONFIG_FILE_BASENAME), "project root"),
       ...legacySourcesForBase(join4(directory, ".opencode", CONFIG_FILE_BASENAME), "OpenCode project"),
       ...legacySourcesForBase(join4(directory, ".pi", CONFIG_FILE_BASENAME), "Pi project")
-    ]
+    ].filter((source) => !userPaths.has(source.path))
   };
 }
 function resolveLegacyConfigSourcesForHarness(directory, harness) {

package/package.json

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