@astrosheep/keiyaku 4.6.1 → 4.6.2

package/build/src/akuma/providers/pi/index.d.ts

@@ -1,12 +1,11 @@
-import type { createAgentSession, createBashToolDefinition, DefaultResourceLoader, getAgentDir, ModelRuntime, SessionManager, CreateAgentSessionOptions } from "@earendil-works/pi-coding-agent";
+import type { createAgentSessionFromServices, createAgentSessionServices, createBashToolDefinition, getAgentDir, SessionManager } from "@earendil-works/pi-coding-agent";
 import type { ProviderExecution } from "../../provider-recipe.js";
 import { type ProviderAdapter } from "../../provider.js";
 export type PiSdk = Readonly<{
-    createAgentSession(options?: CreateAgentSessionOptions): ReturnType<typeof createAgentSession>;
+    createAgentSessionFromServices: typeof createAgentSessionFromServices;
+    createAgentSessionServices: typeof createAgentSessionServices;
     createBashToolDefinition: typeof createBashToolDefinition;
-    DefaultResourceLoader: typeof DefaultResourceLoader;
     getAgentDir: typeof getAgentDir;
-    ModelRuntime: typeof ModelRuntime;
     SessionManager: typeof SessionManager;
 }>;
 export declare function createPiProvider(execution?: ProviderExecution, load?: () => Promise<PiSdk>): ProviderAdapter;

package/build/src/akuma/providers/pi/index.js

@@ -21,26 +21,14 @@ function admitPiOptions(options) {
         options: Object.freeze({ ...options }),
     };
 }
-async function piCreateOptions(sdk, input) {
+function piCreateOptions(sdk, input, services) {
     let model;
-    let modelRuntime;
     if (input.options.model !== undefined) {
         const slash = input.options.model.indexOf("/");
-        modelRuntime = await sdk.ModelRuntime.create();
-        model = modelRuntime.getModel(input.options.model.slice(0, slash), input.options.model.slice(slash + 1));
+        model = services.modelRuntime.getModel(input.options.model.slice(0, slash), input.options.model.slice(slash + 1));
         if (model === undefined)
             throw new Error(`Pi model '${input.options.model}' is unavailable`);
     }
-    const resourceLoader = input.options.systemPrompt === undefined
-        ? undefined
-        : new sdk.DefaultResourceLoader({
-            cwd: input.cwd,
-            agentDir: sdk.getAgentDir(),
-            ...(input.options.systemPromptMode === "append"
-                ? { appendSystemPromptOverride: (base) => [...base, input.options.systemPrompt] }
-                : { systemPromptOverride: () => input.options.systemPrompt }),
-        });
-    await resourceLoader?.reload();
     const sessionManager = input.session.kind === "fresh"
         ? sdk.SessionManager.create(input.cwd)
         : "sessionFile" in input.session.coordinate
@@ -59,22 +47,39 @@ async function piCreateOptions(sdk, input) {
             }),
         ];
     return {
-        cwd: input.cwd,
+        services,
         sessionManager,
-        ...(model === undefined || modelRuntime === undefined ? {} : { model, modelRuntime }),
-        ...(resourceLoader === undefined ? {} : { resourceLoader }),
+        ...(model === undefined ? {} : { model }),
         ...(input.options.effort === undefined ? {} : { thinkingLevel: input.options.effort }),
         ...(customTools === undefined ? {} : { customTools }),
     };
 }
 async function createPiSession(sdk, execution, input) {
-    const setup = piCreateOptions(sdk, input).then(async (options) => {
-        if (execution.config !== undefined) {
-            throw new TypeError("Pi provider config cannot be consumed by native CreateAgentSessionOptions");
-        }
-        return await sdk.createAgentSession(options);
+    if (execution.config !== undefined) {
+        throw new TypeError("Pi provider config cannot be consumed by native CreateAgentSessionOptions");
+    }
+    const services = await sdk.createAgentSessionServices({
+        cwd: input.cwd,
+        agentDir: sdk.getAgentDir(),
+        modelRuntimeSignal: input.signal,
+        ...(input.options.systemPrompt === undefined
+            ? {}
+            : {
+                resourceLoaderOptions: input.options.systemPromptMode === "append"
+                    ? { appendSystemPromptOverride: (base) => [...base, input.options.systemPrompt] }
+                    : { systemPromptOverride: () => input.options.systemPrompt },
+            }),
     });
-    return await setup;
+    try {
+        input.signal?.throwIfAborted();
+        return await sdk.createAgentSessionFromServices(piCreateOptions(sdk, input, services));
+    }
+    catch (error) {
+        // Before a session owns the extension runtime, failed selection/setup must
+        // retire registrations and event-bus subscriptions loaded by the services.
+        services.resourceLoader.getExtensions().runtime.invalidate();
+        throw error;
+    }
 }
 async function runPiPrompt(native, input, events, state, settle) {
     try {
@@ -273,11 +278,10 @@ async function forkPi(sdk, input) {
 async function loadPiSdk() {
     const sdk = await import("@earendil-works/pi-coding-agent");
     return {
-        createAgentSession: sdk.createAgentSession,
+        createAgentSessionFromServices: sdk.createAgentSessionFromServices,
+        createAgentSessionServices: sdk.createAgentSessionServices,
         createBashToolDefinition: sdk.createBashToolDefinition,
-        DefaultResourceLoader: sdk.DefaultResourceLoader,
         getAgentDir: sdk.getAgentDir,
-        ModelRuntime: sdk.ModelRuntime,
         SessionManager: sdk.SessionManager,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/keiyaku",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "workspaces": [
     "plugins/*"
   ],