@hieplp/pi-account-switcher 0.2.3 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hieplp/pi-account-switcher",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "type": "module",
   "description": "Pi extension for quickly switching between multiple accounts/API keys per provider.",
   "license": "MIT",

package/src/commands/accounts/verify.ts

@@ -1,4 +1,4 @@
-import { completeSimple, type Api, type Model } from "@earendil-works/pi-ai";
+import type { Api, Model } from "@earendil-works/pi-ai";
 import type { AuthCredential, ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { AccountSwitcher } from "@/runtime";
 import type { AccountConfig, AccountSwitcherContext, ProviderConfig, SecretSource } from "@/types";
@@ -209,6 +209,7 @@ class VerifyAccountsCommand extends AccountCommand {
     try {
       ctx.ui.notify(`${prefix} ping: sending request via ${model.provider}/${model.id}...`, "info");
 
+      const { completeSimple } = await import("@earendil-works/pi-ai");
       const response = await completeSimple(
         model,
         {

package/src/extension.ts

@@ -1,15 +1,47 @@
 import { createJiti } from "@mariozechner/jiti";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { createRequire } from "node:module";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 
 export default async function accountSwitcherBootstrap(pi: ExtensionAPI) {
   const srcDir = dirname(fileURLToPath(import.meta.url));
-  const jiti = createJiti(import.meta.url, {
-    alias: {
-      "@": srcDir,
-    },
-  });
+
+  // Resolve @earendil-works/* from the pi loader's context so the same
+  // module instances are used (avoids duplicate singletons / instanceof mismatches).
+  const loaderRequire = createRequire(import.meta.url);
+  const resolveOrUndefined = (id: string): string | undefined => {
+    try {
+      return loaderRequire.resolve(id);
+    } catch {
+      return undefined;
+    }
+  };
+
+  const piAiEntry = resolveOrUndefined("@earendil-works/pi-ai");
+  const piCodingAgentEntry = resolveOrUndefined("@earendil-works/pi-coding-agent");
+  const piAgentCoreEntry = resolveOrUndefined("@earendil-works/pi-agent-core");
+  const piTuiEntry = resolveOrUndefined("@earendil-works/pi-tui");
+
+  const alias: Record<string, string> = { "@": srcDir };
+  if (piAiEntry) {
+    alias["@earendil-works/pi-ai"] = piAiEntry;
+    alias["@mariozechner/pi-ai"] = piAiEntry;
+  }
+  if (piCodingAgentEntry) {
+    alias["@earendil-works/pi-coding-agent"] = piCodingAgentEntry;
+    alias["@mariozechner/pi-coding-agent"] = piCodingAgentEntry;
+  }
+  if (piAgentCoreEntry) {
+    alias["@earendil-works/pi-agent-core"] = piAgentCoreEntry;
+    alias["@mariozechner/pi-agent-core"] = piAgentCoreEntry;
+  }
+  if (piTuiEntry) {
+    alias["@earendil-works/pi-tui"] = piTuiEntry;
+    alias["@mariozechner/pi-tui"] = piTuiEntry;
+  }
+
+  const jiti = createJiti(import.meta.url, { alias });
 
   const extension = await jiti.import<(pi: ExtensionAPI) => void | Promise<void>>("./index", {
     default: true,

package/src/utils/accounts.ts

@@ -1,4 +1,3 @@
-import * as piAi from "@earendil-works/pi-ai";
 import { readFile } from "node:fs/promises";
 import type { ModelRegistry } from "@earendil-works/pi-coding-agent";
 import type { AccountConfig, SecretSource } from "@/types";
@@ -90,10 +89,18 @@ export const accountUtil = {
 };
 
 function closeCachedSessions(): void {
-  const helpers = piAi as {
-    cleanupSessionResources?: () => void;
-    closeOpenAICodexWebSocketSessions?: () => void;
-  };
-  helpers.cleanupSessionResources?.();
-  helpers.closeOpenAICodexWebSocketSessions?.();
+  // Dynamic import so the module is not required at load time — @earendil-works/pi-ai
+  // is a peerDependency provided by the pi agent host, not bundled with this package.
+  import("@earendil-works/pi-ai")
+    .then((piAi) => {
+      const helpers = piAi as {
+        cleanupSessionResources?: () => void;
+        closeOpenAICodexWebSocketSessions?: () => void;
+      };
+      helpers.cleanupSessionResources?.();
+      helpers.closeOpenAICodexWebSocketSessions?.();
+    })
+    .catch(() => {
+      // pi-ai not available in this environment — skip session cleanup
+    });
 }