@alint-js/agent-pi 0.0.25 → 0.0.28

package/dist/index.d.mts

@@ -1,20 +1,21 @@
-import { AgentTool } from "@earendil-works/pi-agent-core";
+import { AgentAdapter, AgentRequest, AgentTool } from "@alint-js/core/agent";
+import { AgentTool as AgentTool$1 } from "@earendil-works/pi-agent-core";
 import { Model } from "@earendil-works/pi-ai";
 import { ResolvedModel } from "@alint-js/core";
-import { AgentAdapter, AgentRequest, AgentTool as AgentTool$1 } from "@alint-js/core/agent";
-
 //#region src/index.d.ts
 interface PiAdapterOptions {
   run: (request: AgentRequest) => Promise<PiMessage[]>;
 }
 interface PiMessage {
   content?: unknown;
+  errorMessage?: unknown;
   role?: unknown;
+  stopReason?: unknown;
 }
 declare function apiKeyFromModel(model: ResolvedModel): string;
 declare function createPiAdapter(options?: Partial<PiAdapterOptions>): AgentAdapter;
 declare function createPiModel(model: ResolvedModel): Model<'openai-completions'>;
 declare function extractPiText(message?: PiMessage): string;
-declare function toPiTools(tools: AgentTool$1[]): AgentTool[];
+declare function toPiTools(tools: AgentTool[]): AgentTool$1[];
 //#endregion
 export { PiAdapterOptions, apiKeyFromModel, createPiAdapter, createPiModel, extractPiText, toPiTools };

package/dist/index.mjs

@@ -1,3 +1,4 @@
+import { RetryableAgentError } from "@alint-js/core/agent";
 import { Agent } from "@earendil-works/pi-agent-core";
 import { Type } from "@earendil-works/pi-ai";
 //#region src/index.ts
@@ -7,10 +8,32 @@ function apiKeyFromModel(model) {
 function createPiAdapter(options = {}) {
 	const run = options.run ?? runPiAgent;
 	return async (request) => {
-		return {
-			answer: extractPiText([...await run(request)].reverse().find((message) => message.role === "assistant")),
-			usage: void 0
+		let toolStarted = false;
+		const trackedRequest = {
+			...request,
+			tools: request.tools.map((tool) => ({
+				...tool,
+				execute: (input) => {
+					toolStarted = true;
+					return tool.execute(input);
+				}
+			}))
 		};
+		try {
+			request.signal?.throwIfAborted();
+			const messages = await run(trackedRequest);
+			request.signal?.throwIfAborted();
+			const assistant = [...messages].reverse().find((message) => message.role === "assistant");
+			if (assistant?.stopReason === "error" || assistant?.stopReason === "aborted") throw new Error(typeof assistant.errorMessage === "string" ? assistant.errorMessage : "Pi agent failed");
+			return {
+				answer: extractPiText(assistant),
+				usage: void 0
+			};
+		} catch (error) {
+			if (request.signal?.aborted) throw request.signal.reason;
+			if (!toolStarted) throw new RetryableAgentError("Pi agent invocation can be safely replayed", { cause: error });
+			throw error;
+		}
 	};
 }
 function createPiModel(model) {
@@ -66,9 +89,17 @@ async function runPiAgent(request) {
 			tools: toPiTools(request.tools)
 		}
 	});
-	await agent.prompt(request.prompt);
-	await agent.waitForIdle();
-	return agent.state.messages;
+	const abort = () => agent.abort();
+	request.signal?.addEventListener("abort", abort, { once: true });
+	try {
+		request.signal?.throwIfAborted();
+		await agent.prompt(request.prompt);
+		await agent.waitForIdle();
+		request.signal?.throwIfAborted();
+		return agent.state.messages;
+	} finally {
+		request.signal?.removeEventListener("abort", abort);
+	}
 }
 //#endregion
 export { apiKeyFromModel, createPiAdapter, createPiModel, extractPiText, toPiTools };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alint-js/agent-pi",
   "type": "module",
-  "version": "0.0.25",
+  "version": "0.0.28",
   "exports": {
     ".": {
       "types": "./dist/index.d.mts",
@@ -13,15 +13,15 @@
     "dist"
   ],
   "peerDependencies": {
-    "@alint-js/core": "0.0.25"
+    "@alint-js/core": "0.0.28"
   },
   "dependencies": {
-    "@earendil-works/pi-agent-core": "^0.80.2",
-    "@earendil-works/pi-ai": "^0.80.2",
-    "@smithy/node-http-handler": "^4.9.1"
+    "@earendil-works/pi-agent-core": "^0.80.7",
+    "@earendil-works/pi-ai": "^0.80.7",
+    "@smithy/node-http-handler": "^4.9.6"
   },
   "devDependencies": {
-    "@alint-js/core": "0.0.25"
+    "@alint-js/core": "0.0.28"
   },
   "scripts": {
     "build": "tsdown",