mirror of
https://github.com/getcompanion-ai/co-mono.git
synced 2026-04-16 08:02:17 +00:00
fix: extension loading in Bun binary (#681)
- Remove loader exports from index.ts to break circular dependency - Static import of index.js in loader.ts for virtualModules - Add @mariozechner/pi-agent-core to virtualModules - Update @mariozechner/jiti to 2.6.5 (bundles babel for Bun binary) - Update SDK docs to use correct extension terminology
This commit is contained in:
parent
53d9e61bac
commit
843f235251
7 changed files with 37 additions and 67 deletions
|
|
@ -10,6 +10,7 @@ import * as os from "node:os";
|
|||
import * as path from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { createJiti } from "@mariozechner/jiti";
|
||||
import * as _bundledPiAgentCore from "@mariozechner/pi-agent-core";
|
||||
import * as _bundledPiAi from "@mariozechner/pi-ai";
|
||||
import type { KeyId } from "@mariozechner/pi-tui";
|
||||
import * as _bundledPiTui from "@mariozechner/pi-tui";
|
||||
|
|
@ -18,6 +19,9 @@ import * as _bundledPiTui from "@mariozechner/pi-tui";
|
|||
// The virtualModules option then makes them available to extensions.
|
||||
import * as _bundledTypebox from "@sinclair/typebox";
|
||||
import { getAgentDir, isBunBinary } from "../../config.js";
|
||||
// NOTE: This import works because loader.ts exports are NOT re-exported from index.ts,
|
||||
// avoiding a circular dependency. Extensions can import from @mariozechner/pi-coding-agent.
|
||||
import * as _bundledPiCodingAgent from "../../index.js";
|
||||
import { createEventBus, type EventBus } from "../event-bus.js";
|
||||
import type { ExecOptions } from "../exec.js";
|
||||
import { execCommand } from "../exec.js";
|
||||
|
|
@ -33,19 +37,12 @@ import type {
|
|||
} from "./types.js";
|
||||
|
||||
/** Modules available to extensions via virtualModules (for compiled Bun binary) */
|
||||
let _lazyPiCodingAgent: unknown;
|
||||
const VIRTUAL_MODULES: Record<string, unknown> = {
|
||||
"@sinclair/typebox": _bundledTypebox,
|
||||
"@mariozechner/pi-agent-core": _bundledPiAgentCore,
|
||||
"@mariozechner/pi-tui": _bundledPiTui,
|
||||
"@mariozechner/pi-ai": _bundledPiAi,
|
||||
// Lazy-loaded to avoid circular dependency (loader.ts is part of pi-coding-agent)
|
||||
get "@mariozechner/pi-coding-agent"() {
|
||||
if (!_lazyPiCodingAgent) {
|
||||
// Dynamic require after module initialization completes
|
||||
_lazyPiCodingAgent = require("../../index.js");
|
||||
}
|
||||
return _lazyPiCodingAgent;
|
||||
},
|
||||
"@mariozechner/pi-coding-agent": _bundledPiCodingAgent,
|
||||
};
|
||||
|
||||
const require = createRequire(import.meta.url);
|
||||
|
|
@ -66,6 +63,7 @@ function getAliases(): Record<string, string> {
|
|||
|
||||
_aliases = {
|
||||
"@mariozechner/pi-coding-agent": packageIndex,
|
||||
"@mariozechner/pi-agent-core": require.resolve("@mariozechner/pi-agent-core"),
|
||||
"@mariozechner/pi-tui": require.resolve("@mariozechner/pi-tui"),
|
||||
"@mariozechner/pi-ai": require.resolve("@mariozechner/pi-ai"),
|
||||
"@sinclair/typebox": typeboxRoot,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue