@danypops/papyrus 0.33.0 → 0.33.1

package/extension/src/service-client.ts

@@ -1,45 +1,29 @@
+import { createRetryingClient, type RetryingClient } from "@danypops/daemon-kit/pi-client";
 import { connectPapyrusClient, type PapyrusClient } from "../../src/client.ts";
 import type { OperationName } from "../../src/service.ts";
 
 type ClientConnector = () => Promise<PapyrusClient>;
 
 let connector: ClientConnector = () => connectPapyrusClient();
-let cached: PapyrusClient | undefined;
+const client: RetryingClient<PapyrusClient> = createRetryingClient<PapyrusClient>(() => connector(), { label: "Papyrus" });
 
 export async function papyrusClient(): Promise<PapyrusClient> {
-	if (cached) return cached;
-	cached = await connector();
-	return cached;
-}
-
-function staleConnection(error: unknown): boolean {
-	if (error instanceof TypeError) return true;
-	if (!(error instanceof Error)) return false;
-	if (error.name === "AbortError" || error.name === "TimeoutError") return true;
-	return /fetch failed|network|socket|ECONNRESET|ECONNREFUSED|connection refused/i.test(error.message);
+	return client.call(async (resolved) => resolved);
 }
 
 export async function callService<Input extends Record<string, unknown>, Output>(
 	operation: OperationName,
 	input: Input,
 ): Promise<Output> {
-	for (let attempt = 0; attempt < 2; attempt += 1) {
-		try {
-			return await (await papyrusClient()).call<Input, Output>(operation, input);
-		} catch (error) {
-			cached = undefined;
-			if (attempt === 1 || !staleConnection(error)) throw error;
-		}
-	}
-	throw new Error("Papyrus daemon client retry exhausted");
+	return client.call((resolved) => resolved.call<Input, Output>(operation, input));
 }
 
 export function setPapyrusClientConnectorForTests(value: ClientConnector): void {
-	cached = undefined;
 	connector = value;
+	client.reset();
 }
 
 export function resetPapyrusClientForTests(): void {
-	cached = undefined;
 	connector = () => connectPapyrusClient();
+	client.reset();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danypops/papyrus",
-  "version": "0.33.0",
+  "version": "0.33.1",
   "description": "Daemon-backed graph artifacts, evidence-bearing tasks, rules, skills, and native TUI workflows for Pi",
   "type": "module",
   "keywords": ["pi-package"],
@@ -42,6 +42,6 @@
   "files": ["src", "extension", "README.md"],
   "dependencies": {
     "beautiful-mermaid": "1.1.3",
-    "@danypops/daemon-kit": "^0.2.1"
+    "@danypops/daemon-kit": "^0.4.0"
   }
 }