@astralyn/pi 0.87.6 → 0.99.0

package/dist/core/nested-tool-calls.d.ts

@@ -0,0 +1,102 @@
+/**
+ * Tool calls that a tool makes while it runs (`ctx.executeTool()`), for example from codemode
+ * scripts. The agent loop does not know about them: the session runs each one through the agent's
+ * tool pipeline (`runToolCall`) with its own hooks, emits `tool_execution_*` events with
+ * `parentToolCallId`, and records the calls and their usage on the model-issued call's tool result
+ * message.
+ *
+ * Nothing here runs until a tool calls `ctx.executeTool()`.
+ */
+import type { AgentTool, AgentToolCall, AgentToolCallOutcome, AgentToolResult, AgentToolUpdateCallback } from "@earendil-works/pi-agent-core";
+import type { NestedToolCallRecord, NestedToolCalls, Usage } from "@earendil-works/pi-ai";
+/**
+ * Limits of the nested-call record on a tool result: arguments
+ * over the per-call or total size are omitted, calls beyond the count are dropped, and the record
+ * is marked incomplete when any of that happens.
+ */
+export declare const NESTED_CALL_LIMITS: {
+    readonly maxCalls: 256;
+    readonly maxArgumentBytesPerCall: number;
+    readonly maxArgumentBytesTotal: number;
+    readonly maxErrorChars: 500;
+};
+/** What the nested calls of one model-issued tool call leave on its tool result message. */
+export interface NestedCallSummary {
+    /** Becomes `nestedCalls`. Undefined when no nested call was made. */
+    calls: NestedToolCalls | undefined;
+    /** Summed `usage` of the nested results, added to the message's `usage`. */
+    usage: Usage | undefined;
+}
+/**
+ * Collects the nested calls of one model-issued tool call, including calls made by nested tools.
+ * The snapshot becomes `nestedCalls` on the tool result message.
+ */
+export declare class NestedCallRecorder {
+    private readonly calls;
+    private readonly startedAt;
+    private complete;
+    private argumentBytes;
+    /** Summed usage of every nested result, including calls dropped from the record. */
+    private usage;
+    /** Record a call as it starts. Returns undefined when the call is dropped. */
+    start(toolCall: AgentToolCall): NestedToolCallRecord | undefined;
+    finish(record: NestedToolCallRecord | undefined, isError: boolean, errorText: string): void;
+    addUsage(usage: Usage): void;
+    get totalUsage(): Usage | undefined;
+    /** Copy of the record so far, or undefined when no nested call was made. */
+    snapshot(): NestedToolCalls | undefined;
+}
+export interface NestedToolCallOptions {
+    /** Defaults to the calling tool's signal. */
+    signal?: AbortSignal;
+    /** Receives partial results of the nested tool, in addition to `tool_execution_update` events. */
+    onUpdate?: AgentToolUpdateCallback;
+}
+/** `tool_execution_*` events of nested calls. */
+export type NestedToolExecutionEvent = {
+    type: "tool_execution_start";
+    toolCallId: string;
+    toolName: string;
+    args: unknown;
+    parentToolCallId: string;
+} | {
+    type: "tool_execution_update";
+    toolCallId: string;
+    toolName: string;
+    args: unknown;
+    partialResult: AgentToolResult<unknown>;
+    parentToolCallId: string;
+} | {
+    type: "tool_execution_end";
+    toolCallId: string;
+    toolName: string;
+    result: AgentToolResult<unknown>;
+    isError: boolean;
+    parentToolCallId: string;
+};
+export interface NestedToolCallHost {
+    /** Tools nested calls resolve against. */
+    getTools(): readonly AgentTool[];
+    /** Whether every nested call runs exclusively, as when the agent executes tool calls sequentially. */
+    isSequential(): boolean;
+    /** Run the call through the tool pipeline, with hooks that report `parentToolCallId`. */
+    runToolCall(toolCall: AgentToolCall, parentToolCallId: string, signal: AbortSignal | undefined, onUpdate: (partialResult: AgentToolResult<unknown>) => Promise<void>): Promise<AgentToolCallOutcome>;
+    emit(event: NestedToolExecutionEvent): Promise<void>;
+}
+export declare class NestedToolCallRunner {
+    private readonly host;
+    /** Scopes by the id of the calling tool call. */
+    private readonly scopes;
+    /** Serializes nested calls that must not run concurrently. */
+    private queueTail;
+    constructor(host: NestedToolCallHost);
+    /**
+     * Run `name` on behalf of the call `callerId`. The nested call gets the id `<callerId>/<n>`.
+     * Never rejects for tool failures: they come back as `isError: true`.
+     */
+    execute(callerId: string, name: string, args: unknown, options?: NestedToolCallOptions): Promise<AgentToolCallOutcome>;
+    /** Remove and return the record of the nested calls a model-issued call made. */
+    takeRecord(toolCallId: string): NestedCallSummary | undefined;
+    clear(): void;
+}
+//# sourceMappingURL=nested-tool-calls.d.ts.map

package/dist/core/nested-tool-calls.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nested-tool-calls.d.ts","sourceRoot":"","sources":["../../src/core/nested-tool-calls.ts"],"names":[],"mappings":"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"}

package/dist/core/nested-tool-calls.js

@@ -0,0 +1,177 @@
+/**
+ * Tool calls that a tool makes while it runs (`ctx.executeTool()`), for example from codemode
+ * scripts. The agent loop does not know about them: the session runs each one through the agent's
+ * tool pipeline (`runToolCall`) with its own hooks, emits `tool_execution_*` events with
+ * `parentToolCallId`, and records the calls and their usage on the model-issued call's tool result
+ * message.
+ *
+ * Nothing here runs until a tool calls `ctx.executeTool()`.
+ */
+import { combineUsage } from "./usage-totals.js";
+/**
+ * Limits of the nested-call record on a tool result: arguments
+ * over the per-call or total size are omitted, calls beyond the count are dropped, and the record
+ * is marked incomplete when any of that happens.
+ */
+export const NESTED_CALL_LIMITS = {
+    maxCalls: 256,
+    maxArgumentBytesPerCall: 8 * 1024,
+    maxArgumentBytesTotal: 32 * 1024,
+    maxErrorChars: 500,
+};
+const encoder = new TextEncoder();
+/**
+ * Collects the nested calls of one model-issued tool call, including calls made by nested tools.
+ * The snapshot becomes `nestedCalls` on the tool result message.
+ */
+export class NestedCallRecorder {
+    constructor() {
+        this.calls = [];
+        this.startedAt = new Map();
+        this.complete = true;
+        this.argumentBytes = 0;
+    }
+    /** Record a call as it starts. Returns undefined when the call is dropped. */
+    start(toolCall) {
+        if (this.calls.length >= NESTED_CALL_LIMITS.maxCalls) {
+            this.complete = false;
+            return undefined;
+        }
+        const record = { id: toolCall.id, name: toolCall.name, status: "unfinished" };
+        const json = JSON.stringify(toolCall.arguments ?? {});
+        const bytes = encoder.encode(json).length;
+        if (bytes > NESTED_CALL_LIMITS.maxArgumentBytesPerCall ||
+            this.argumentBytes + bytes > NESTED_CALL_LIMITS.maxArgumentBytesTotal) {
+            record.argumentsBytes = bytes;
+            this.complete = false;
+        }
+        else {
+            record.arguments = JSON.parse(json);
+            this.argumentBytes += bytes;
+        }
+        this.calls.push(record);
+        this.startedAt.set(record, performance.now());
+        return record;
+    }
+    finish(record, isError, errorText) {
+        if (!record)
+            return;
+        record.status = isError ? "error" : "ok";
+        record.durationMs = Math.round(performance.now() - (this.startedAt.get(record) ?? performance.now()));
+        this.startedAt.delete(record);
+        if (isError && errorText)
+            record.error = errorText.slice(0, NESTED_CALL_LIMITS.maxErrorChars);
+    }
+    addUsage(usage) {
+        this.usage = this.usage ? combineUsage(this.usage, usage) : usage;
+    }
+    get totalUsage() {
+        return this.usage;
+    }
+    /** Copy of the record so far, or undefined when no nested call was made. */
+    snapshot() {
+        if (this.calls.length === 0 && this.complete)
+            return undefined;
+        const calls = this.calls.map((call) => ({ ...call }));
+        return { calls, complete: this.complete && calls.every((call) => call.status !== "unfinished") };
+    }
+}
+function textOf(result) {
+    return (result.content ?? [])
+        .filter((block) => block.type === "text")
+        .map((block) => block.text)
+        .join("\n");
+}
+export class NestedToolCallRunner {
+    constructor(host) {
+        /** Scopes by the id of the calling tool call. */
+        this.scopes = new Map();
+        /** Serializes nested calls that must not run concurrently. */
+        this.queueTail = Promise.resolve();
+        this.host = host;
+    }
+    /**
+     * Run `name` on behalf of the call `callerId`. The nested call gets the id `<callerId>/<n>`.
+     * Never rejects for tool failures: they come back as `isError: true`.
+     */
+    async execute(callerId, name, args, options = {}) {
+        let scope = this.scopes.get(callerId);
+        if (!scope) {
+            scope = { recorder: new NestedCallRecorder(), nextId: 1, holdsQueue: false };
+            this.scopes.set(callerId, scope);
+        }
+        const toolCall = {
+            type: "toolCall",
+            id: `${callerId}/${scope.nextId++}`,
+            name,
+            arguments: (args ?? {}),
+        };
+        const record = scope.recorder.start(toolCall);
+        await this.host.emit({
+            type: "tool_execution_start",
+            toolCallId: toolCall.id,
+            toolName: name,
+            args: toolCall.arguments,
+            parentToolCallId: callerId,
+        });
+        const exclusive = !scope.holdsQueue &&
+            (this.host.isSequential() ||
+                this.host.getTools().find((tool) => tool.name === name)?.executionMode === "sequential");
+        let release;
+        if (exclusive) {
+            const previous = this.queueTail;
+            this.queueTail = new Promise((resolve) => {
+                release = resolve;
+            });
+            await previous;
+        }
+        this.scopes.set(toolCall.id, {
+            recorder: scope.recorder,
+            nextId: 1,
+            holdsQueue: scope.holdsQueue || exclusive,
+        });
+        let outcome;
+        try {
+            outcome = await this.host.runToolCall(toolCall, callerId, options.signal, async (partialResult) => {
+                options.onUpdate?.(partialResult);
+                await this.host.emit({
+                    type: "tool_execution_update",
+                    toolCallId: toolCall.id,
+                    toolName: name,
+                    args: toolCall.arguments,
+                    partialResult,
+                    parentToolCallId: callerId,
+                });
+            });
+        }
+        finally {
+            this.scopes.delete(toolCall.id);
+            release?.();
+        }
+        scope.recorder.finish(record, outcome.isError, textOf(outcome.result));
+        // Nested results are not persisted, so their usage is only counted through the recorder.
+        if (outcome.result.usage)
+            scope.recorder.addUsage(outcome.result.usage);
+        await this.host.emit({
+            type: "tool_execution_end",
+            toolCallId: toolCall.id,
+            toolName: name,
+            result: outcome.result,
+            isError: outcome.isError,
+            parentToolCallId: callerId,
+        });
+        return outcome;
+    }
+    /** Remove and return the record of the nested calls a model-issued call made. */
+    takeRecord(toolCallId) {
+        const scope = this.scopes.get(toolCallId);
+        this.scopes.delete(toolCallId);
+        if (!scope)
+            return undefined;
+        return { calls: scope.recorder.snapshot(), usage: scope.recorder.totalUsage };
+    }
+    clear() {
+        this.scopes.clear();
+    }
+}
+//# sourceMappingURL=nested-tool-calls.js.map

package/dist/core/nested-tool-calls.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nested-tool-calls.js","sourceRoot":"","sources":["../../src/core/nested-tool-calls.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Tool calls that a tool makes while it runs (`ctx.executeTool()`), for example from codemode\n * scripts. The agent loop does not know about them: the session runs each one through the agent's\n * tool pipeline (`runToolCall`) with its own hooks, emits `tool_execution_*` events with\n * `parentToolCallId`, and records the calls and their usage on the model-issued call's tool result\n * message.\n *\n * Nothing here runs until a tool calls `ctx.executeTool()`.\n */\n\nimport type {\n\tAgentTool,\n\tAgentToolCall,\n\tAgentToolCallOutcome,\n\tAgentToolResult,\n\tAgentToolUpdateCallback,\n} from \"@earendil-works/pi-agent-core\";\nimport type { JsonObject, NestedToolCallRecord, NestedToolCalls, TextContent, Usage } from \"@earendil-works/pi-ai\";\nimport { combineUsage } from \"./usage-totals.ts\";\n\n/**\n * Limits of the nested-call record on a tool result: arguments\n * over the per-call or total size are omitted, calls beyond the count are dropped, and the record\n * is marked incomplete when any of that happens.\n */\nexport const NESTED_CALL_LIMITS = {\n\tmaxCalls: 256,\n\tmaxArgumentBytesPerCall: 8 * 1024,\n\tmaxArgumentBytesTotal: 32 * 1024,\n\tmaxErrorChars: 500,\n} as const;\n\nconst encoder = new TextEncoder();\n\n/** What the nested calls of one model-issued tool call leave on its tool result message. */\nexport interface NestedCallSummary {\n\t/** Becomes `nestedCalls`. Undefined when no nested call was made. */\n\tcalls: NestedToolCalls | undefined;\n\t/** Summed `usage` of the nested results, added to the message's `usage`. */\n\tusage: Usage | undefined;\n}\n\n/**\n * Collects the nested calls of one model-issued tool call, including calls made by nested tools.\n * The snapshot becomes `nestedCalls` on the tool result message.\n */\nexport class NestedCallRecorder {\n\tprivate readonly calls: NestedToolCallRecord[] = [];\n\tprivate readonly startedAt = new Map<NestedToolCallRecord, number>();\n\tprivate complete = true;\n\tprivate argumentBytes = 0;\n\t/** Summed usage of every nested result, including calls dropped from the record. */\n\tprivate usage: Usage | undefined;\n\n\t/** Record a call as it starts. Returns undefined when the call is dropped. */\n\tstart(toolCall: AgentToolCall): NestedToolCallRecord | undefined {\n\t\tif (this.calls.length >= NESTED_CALL_LIMITS.maxCalls) {\n\t\t\tthis.complete = false;\n\t\t\treturn undefined;\n\t\t}\n\t\tconst record: NestedToolCallRecord = { id: toolCall.id, name: toolCall.name, status: \"unfinished\" };\n\t\tconst json = JSON.stringify(toolCall.arguments ?? {});\n\t\tconst bytes = encoder.encode(json).length;\n\t\tif (\n\t\t\tbytes > NESTED_CALL_LIMITS.maxArgumentBytesPerCall ||\n\t\t\tthis.argumentBytes + bytes > NESTED_CALL_LIMITS.maxArgumentBytesTotal\n\t\t) {\n\t\t\trecord.argumentsBytes = bytes;\n\t\t\tthis.complete = false;\n\t\t} else {\n\t\t\trecord.arguments = JSON.parse(json) as JsonObject;\n\t\t\tthis.argumentBytes += bytes;\n\t\t}\n\t\tthis.calls.push(record);\n\t\tthis.startedAt.set(record, performance.now());\n\t\treturn record;\n\t}\n\n\tfinish(record: NestedToolCallRecord | undefined, isError: boolean, errorText: string): void {\n\t\tif (!record) return;\n\t\trecord.status = isError ? \"error\" : \"ok\";\n\t\trecord.durationMs = Math.round(performance.now() - (this.startedAt.get(record) ?? performance.now()));\n\t\tthis.startedAt.delete(record);\n\t\tif (isError && errorText) record.error = errorText.slice(0, NESTED_CALL_LIMITS.maxErrorChars);\n\t}\n\n\taddUsage(usage: Usage): void {\n\t\tthis.usage = this.usage ? combineUsage(this.usage, usage) : usage;\n\t}\n\n\tget totalUsage(): Usage | undefined {\n\t\treturn this.usage;\n\t}\n\n\t/** Copy of the record so far, or undefined when no nested call was made. */\n\tsnapshot(): NestedToolCalls | undefined {\n\t\tif (this.calls.length === 0 && this.complete) return undefined;\n\t\tconst calls = this.calls.map((call) => ({ ...call }));\n\t\treturn { calls, complete: this.complete && calls.every((call) => call.status !== \"unfinished\") };\n\t}\n}\n\nexport interface NestedToolCallOptions {\n\t/** Defaults to the calling tool's signal. */\n\tsignal?: AbortSignal;\n\t/** Receives partial results of the nested tool, in addition to `tool_execution_update` events. */\n\tonUpdate?: AgentToolUpdateCallback;\n}\n\n/** `tool_execution_*` events of nested calls. */\nexport type NestedToolExecutionEvent =\n\t| { type: \"tool_execution_start\"; toolCallId: string; toolName: string; args: unknown; parentToolCallId: string }\n\t| {\n\t\t\ttype: \"tool_execution_update\";\n\t\t\ttoolCallId: string;\n\t\t\ttoolName: string;\n\t\t\targs: unknown;\n\t\t\tpartialResult: AgentToolResult<unknown>;\n\t\t\tparentToolCallId: string;\n\t  }\n\t| {\n\t\t\ttype: \"tool_execution_end\";\n\t\t\ttoolCallId: string;\n\t\t\ttoolName: string;\n\t\t\tresult: AgentToolResult<unknown>;\n\t\t\tisError: boolean;\n\t\t\tparentToolCallId: string;\n\t  };\n\nexport interface NestedToolCallHost {\n\t/** Tools nested calls resolve against. */\n\tgetTools(): readonly AgentTool[];\n\t/** Whether every nested call runs exclusively, as when the agent executes tool calls sequentially. */\n\tisSequential(): boolean;\n\t/** Run the call through the tool pipeline, with hooks that report `parentToolCallId`. */\n\trunToolCall(\n\t\ttoolCall: AgentToolCall,\n\t\tparentToolCallId: string,\n\t\tsignal: AbortSignal | undefined,\n\t\tonUpdate: (partialResult: AgentToolResult<unknown>) => Promise<void>,\n\t): Promise<AgentToolCallOutcome>;\n\temit(event: NestedToolExecutionEvent): Promise<void>;\n}\n\n/** Calls below one model-issued call share its recorder. */\ninterface CallScope {\n\trecorder: NestedCallRecorder;\n\tnextId: number;\n\t/** Set inside a call that holds the exclusive queue, so its own nested calls do not wait on it. */\n\tholdsQueue: boolean;\n}\n\nfunction textOf(result: AgentToolResult<unknown>): string {\n\treturn (result.content ?? [])\n\t\t.filter((block): block is TextContent => block.type === \"text\")\n\t\t.map((block) => block.text)\n\t\t.join(\"\\n\");\n}\n\nexport class NestedToolCallRunner {\n\tprivate readonly host: NestedToolCallHost;\n\t/** Scopes by the id of the calling tool call. */\n\tprivate readonly scopes = new Map<string, CallScope>();\n\t/** Serializes nested calls that must not run concurrently. */\n\tprivate queueTail: Promise<void> = Promise.resolve();\n\n\tconstructor(host: NestedToolCallHost) {\n\t\tthis.host = host;\n\t}\n\n\t/**\n\t * Run `name` on behalf of the call `callerId`. The nested call gets the id `<callerId>/<n>`.\n\t * Never rejects for tool failures: they come back as `isError: true`.\n\t */\n\tasync execute(\n\t\tcallerId: string,\n\t\tname: string,\n\t\targs: unknown,\n\t\toptions: NestedToolCallOptions = {},\n\t): Promise<AgentToolCallOutcome> {\n\t\tlet scope = this.scopes.get(callerId);\n\t\tif (!scope) {\n\t\t\tscope = { recorder: new NestedCallRecorder(), nextId: 1, holdsQueue: false };\n\t\t\tthis.scopes.set(callerId, scope);\n\t\t}\n\t\tconst toolCall: AgentToolCall = {\n\t\t\ttype: \"toolCall\",\n\t\t\tid: `${callerId}/${scope.nextId++}`,\n\t\t\tname,\n\t\t\targuments: (args ?? {}) as AgentToolCall[\"arguments\"],\n\t\t};\n\t\tconst record = scope.recorder.start(toolCall);\n\t\tawait this.host.emit({\n\t\t\ttype: \"tool_execution_start\",\n\t\t\ttoolCallId: toolCall.id,\n\t\t\ttoolName: name,\n\t\t\targs: toolCall.arguments,\n\t\t\tparentToolCallId: callerId,\n\t\t});\n\n\t\tconst exclusive =\n\t\t\t!scope.holdsQueue &&\n\t\t\t(this.host.isSequential() ||\n\t\t\t\tthis.host.getTools().find((tool) => tool.name === name)?.executionMode === \"sequential\");\n\t\tlet release: (() => void) | undefined;\n\t\tif (exclusive) {\n\t\t\tconst previous = this.queueTail;\n\t\t\tthis.queueTail = new Promise((resolve) => {\n\t\t\t\trelease = resolve;\n\t\t\t});\n\t\t\tawait previous;\n\t\t}\n\t\tthis.scopes.set(toolCall.id, {\n\t\t\trecorder: scope.recorder,\n\t\t\tnextId: 1,\n\t\t\tholdsQueue: scope.holdsQueue || exclusive,\n\t\t});\n\t\tlet outcome: AgentToolCallOutcome;\n\t\ttry {\n\t\t\toutcome = await this.host.runToolCall(toolCall, callerId, options.signal, async (partialResult) => {\n\t\t\t\toptions.onUpdate?.(partialResult);\n\t\t\t\tawait this.host.emit({\n\t\t\t\t\ttype: \"tool_execution_update\",\n\t\t\t\t\ttoolCallId: toolCall.id,\n\t\t\t\t\ttoolName: name,\n\t\t\t\t\targs: toolCall.arguments,\n\t\t\t\t\tpartialResult,\n\t\t\t\t\tparentToolCallId: callerId,\n\t\t\t\t});\n\t\t\t});\n\t\t} finally {\n\t\t\tthis.scopes.delete(toolCall.id);\n\t\t\trelease?.();\n\t\t}\n\n\t\tscope.recorder.finish(record, outcome.isError, textOf(outcome.result));\n\t\t// Nested results are not persisted, so their usage is only counted through the recorder.\n\t\tif (outcome.result.usage) scope.recorder.addUsage(outcome.result.usage);\n\t\tawait this.host.emit({\n\t\t\ttype: \"tool_execution_end\",\n\t\t\ttoolCallId: toolCall.id,\n\t\t\ttoolName: name,\n\t\t\tresult: outcome.result,\n\t\t\tisError: outcome.isError,\n\t\t\tparentToolCallId: callerId,\n\t\t});\n\t\treturn outcome;\n\t}\n\n\t/** Remove and return the record of the nested calls a model-issued call made. */\n\ttakeRecord(toolCallId: string): NestedCallSummary | undefined {\n\t\tconst scope = this.scopes.get(toolCallId);\n\t\tthis.scopes.delete(toolCallId);\n\t\tif (!scope) return undefined;\n\t\treturn { calls: scope.recorder.snapshot(), usage: scope.recorder.totalUsage };\n\t}\n\n\tclear(): void {\n\t\tthis.scopes.clear();\n\t}\n}\n"]}

package/dist/core/package-manager.d.ts

@@ -4,6 +4,7 @@ export interface PathMetadata {
     scope: SourceScope;
     origin: "package" | "top-level";
     baseDir?: string;
+    packageRoot?: string;
 }
 export interface ResolvedResource {
     path: string;
@@ -69,6 +70,8 @@ interface PackageManagerOptions {
     cwd: string;
     agentDir: string;
     settingsManager: SettingsManager;
+    /** Names of built-in extensions, resolved as `builtin:<name>` extension resources. */
+    builtinExtensions?: string[];
 }
 type SourceScope = "user" | "project" | "temporary";
 export declare function getExtensionTempFolder(agentDir: string): string;
@@ -76,6 +79,7 @@ export declare class DefaultPackageManager implements PackageManager {
     private cwd;
     private agentDir;
     private settingsManager;
+    private builtinExtensions;
     private globalNpmRoot;
     private globalNpmRootCommandKey;
     private progressCallback;

package/dist/core/package-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../src/core/package-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"package-manager.d.ts","sourceRoot":"","sources":["../../src/core/package-manager.ts"],"names":[],"mappings":"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"}

package/dist/core/package-manager.js

@@ -31,6 +31,7 @@ import { canonicalizePath, isLocalPath, markPathIgnoredByCloudSync, resolvePath
 import { stripBom } from "../utils/text.js";
 import { isStdoutTakenOver } from "./output-guard.js";
 import { readPiManifest } from "./pi-manifest.js";
+import { BUILTIN_PATH_PREFIX } from "./source-info.js";
 const NETWORK_TIMEOUT_MS = 10000;
 const UPDATE_CHECK_CONCURRENCY = 4;
 const GIT_UPDATE_CONCURRENCY = 4;
@@ -59,6 +60,9 @@ function getNpmVersionRange(version) {
  *   4  package resource (origin: "package")
  */
 function resourcePrecedenceRank(m) {
+    // Built-in extensions load after file and package extensions, whichever scope enables them.
+    if (m.source === "builtin")
+        return 5;
     if (m.origin === "package")
         return 4;
     const scopeBase = m.scope === "project" ? 0 : 2;
@@ -605,6 +609,7 @@ export class DefaultPackageManager {
         this.cwd = resolvePath(options.cwd);
         this.agentDir = resolvePath(options.agentDir);
         this.settingsManager = options.settingsManager;
+        this.builtinExtensions = options.builtinExtensions ?? [];
     }
     setProgressCallback(callback) {
         this.progressCallback = callback;
@@ -722,12 +727,25 @@ export class DefaultPackageManager {
             }, globalBaseDir);
         }
         this.addAutoDiscoveredResources(accumulator, globalSettings, projectSettings, globalBaseDir, projectBaseDir);
+        // Built-in extensions are enabled unless the user `extensions` setting excludes them, for example
+        // with `-builtin:mcp`. A matching `+`, `-`, or `!` entry in the project setting overrides that.
+        for (const name of this.builtinExtensions) {
+            const path = `${BUILTIN_PATH_PREFIX}${name}`;
+            const projectEnabled = applyAutoloadDisabledPatterns([path], getOverridePatterns(projectSettings.extensions ?? []), projectBaseDir).get(path);
+            this.addResource(accumulator.extensions, path, { source: "builtin", scope: projectEnabled === undefined ? "user" : "project", origin: "top-level" }, projectEnabled ?? isEnabledByOverrides(path, globalSettings.extensions ?? [], globalBaseDir));
+        }
         return this.toResolvedPaths(accumulator);
     }
     async resolveExtensionSources(sources, options) {
         const accumulator = this.createAccumulator();
         const scope = options?.temporary ? "temporary" : options?.local ? "project" : "user";
-        const packageSources = sources.map((source) => ({ pkg: source, scope }));
+        // `-e builtin:<name>` loads a built-in extension; the resource loader reports unknown names.
+        for (const source of sources.filter((source) => source.startsWith(BUILTIN_PATH_PREFIX))) {
+            this.addResource(accumulator.extensions, source, { source: "builtin", scope, origin: "top-level" }, true);
+        }
+        const packageSources = sources
+            .filter((source) => !source.startsWith(BUILTIN_PATH_PREFIX))
+            .map((source) => ({ pkg: source, scope }));
         await this.resolvePackageSources(packageSources, accumulator);
         return this.toResolvedPaths(accumulator);
     }
@@ -1011,6 +1029,7 @@ export class DefaultPackageManager {
                     installedPath = this.getNpmInstallPath(parsed, resolvedScope);
                 }
                 metadata.baseDir = installedPath;
+                metadata.packageRoot = installedPath;
                 this.collectPackageResources(installedPath, accumulator, filter, metadata);
                 continue;
             }
@@ -1025,6 +1044,7 @@ export class DefaultPackageManager {
                     await this.refreshTemporaryGitSource(parsed, resolvedSource);
                 }
                 metadata.baseDir = installedPath;
+                metadata.packageRoot = installedPath;
                 this.collectPackageResources(installedPath, accumulator, filter, metadata);
             }
         }
@@ -1051,6 +1071,7 @@ export class DefaultPackageManager {
             }
             if (stats.isDirectory()) {
                 metadata.baseDir = resolved;
+                metadata.packageRoot = resolved;
                 const resources = this.collectPackageResources(resolved, accumulator, filter, metadata);
                 if (!resources) {
                     this.addResource(accumulator.extensions, resolved, metadata, true);
@@ -1430,21 +1451,45 @@ export class DefaultPackageManager {
     }
     getPackageManagerName() {
         const npmCommand = this.getNpmCommand();
-        const commandParts = [npmCommand.command, ...npmCommand.args];
-        const separatorIndex = commandParts.lastIndexOf("--");
-        const packageManagerCommand = separatorIndex >= 0 ? commandParts[separatorIndex + 1] : npmCommand.command;
-        return packageManagerCommand ? basename(packageManagerCommand).replace(/\.(cmd|exe)$/i, "") : "";
+        const normalizeCommandName = (command) => basename(command).replace(/\.(cmd|exe)$/i, "");
+        const supportedPackageManagers = new Set(["npm", "pnpm", "bun"]);
+        const directCommand = normalizeCommandName(npmCommand.command);
+        const separatorIndex = npmCommand.args.lastIndexOf("--");
+        if (separatorIndex >= 0) {
+            const wrappedCommand = npmCommand.args[separatorIndex + 1];
+            return wrappedCommand ? normalizeCommandName(wrappedCommand) : directCommand;
+        }
+        if (supportedPackageManagers.has(directCommand))
+            return directCommand;
+        const wrappedPackageManagers = [
+            ...new Set(npmCommand.args.map(normalizeCommandName).filter((command) => supportedPackageManagers.has(command))),
+        ];
+        if (wrappedPackageManagers.length > 1) {
+            throw new Error(`Ambiguous npmCommand package managers: ${wrappedPackageManagers.join(", ")}`);
+        }
+        return wrappedPackageManagers[0] ?? directCommand;
     }
     async runNpmCommand(args, options) {
         const npmCommand = this.getNpmCommand();
         await this.runCommand(npmCommand.command, [...npmCommand.args, ...args], options);
     }
     getGitDependencyInstallArgs() {
-        const configuredCommand = this.settingsManager.getNpmCommand();
-        if (configuredCommand && configuredCommand.length > 0) {
-            return ["install"];
+        switch (this.getPackageManagerName()) {
+            case "bun":
+                return ["install", "--omit=dev", "--omit=peer"];
+            case "pnpm":
+                return [
+                    "install",
+                    "--prod",
+                    "--config.auto-install-peers=false",
+                    "--config.strict-peer-dependencies=false",
+                    "--config.strict-dep-builds=false",
+                ];
+            case "npm":
+                return ["install", "--omit=dev", "--legacy-peer-deps"];
+            default:
+                return ["install"];
         }
-        return ["install", "--omit=dev"];
     }
     runNpmCommandSync(args) {
         const npmCommand = this.getNpmCommand();
@@ -1742,7 +1787,8 @@ export class DefaultPackageManager {
     }
     getGitInstallPath(source, scope) {
         if (scope === "temporary") {
-            return this.getTemporaryDir(`git-${source.host}`, source.path);
+            // Include the ref in the hash so each pinned ref gets its own checkout.
+            return this.getTemporaryDir(`git-${source.host}`, source.path, source.ref);
         }
         const installRoot = this.getGitInstallRoot(scope);
         if (!installRoot) {
@@ -1760,10 +1806,10 @@ export class DefaultPackageManager {
         }
         return join(this.agentDir, "git");
     }
-    getTemporaryDir(prefix, suffix) {
+    getTemporaryDir(prefix, suffix, ref) {
         const root = this.resolveManagedPath(getExtensionTempFolder(this.agentDir), prefix);
         const hash = createHash("sha256")
-            .update(`${prefix}-${suffix ?? ""}`)
+            .update(`${prefix}-${suffix ?? ""}${ref ? `@${ref}` : ""}`)
             .digest("hex")
             .slice(0, 8);
         return this.resolveManagedPath(root, hash, suffix ?? "");