privateer-agent 0.3.4 → 0.3.5

package/extensions/privateer-brand.ts

@@ -58,7 +58,7 @@ const ANCHOR = [
   "  .-----.  ", // lock body top (the shackle's base)
   "  |  o  |  ", // lock body + keyhole
   "  '--+--'  ", // lock body base, shank exits
-  "  /\\ | /\\  ", // stock — arms flare from the shank (each \\ is one backslash)
+  " /\\  |  /\\  ", // stock — arms flare from the shank (each \\ is one backslash)
   "  \\  |  /  ", // arms
   "   \\_|_/   ", // flukes
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "privateer-agent",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Privateer — a provider-agnostic, safe-by-default terminal coding agent with TEE/Tinfoil attestation, rebuilt on the Pi toolkit. Bring your own model across 20 providers.",
   "type": "module",
   "license": "MIT",

package/src/providers/account.ts

@@ -66,18 +66,34 @@ export async function fetchAccountModels(): Promise<string[]> {
 export const privateerOAuthProvider = {
   name: "Privateer account",
   usesCallbackServer: false,
-  async login(cb: { onDeviceCode?: (info: unknown) => void }) {
+  // Pi's login dialog passes `signal` (its cancel AbortController) alongside the
+  // callbacks. We MUST thread it into runDeviceLogin — otherwise escape/ctrl+c
+  // aborts the dialog's signal but our poll loop never sees it, the login()
+  // promise never settles, and Pi never restores the editor: the "Waiting for
+  // authentication…" screen hangs with no way out. See auth/privateer.ts
+  // pollForToken, which checks the signal and rejects with "Login cancelled.".
+  async login(cb: { onDeviceCode?: (info: unknown) => void; signal?: AbortSignal }) {
     if (!hasCredentials()) {
-      await runDeviceLogin({
-        onCode: (code) =>
-          cb.onDeviceCode?.({
-            userCode: code.user_code,
-            verificationUri: code.verification_uri_complete ?? code.verification_uri ?? "",
-            intervalSeconds: code.interval,
-            expiresInSeconds: code.expires_in,
-          }),
-      });
+      try {
+        await runDeviceLogin({
+          signal: cb.signal,
+          onCode: (code) =>
+            cb.onDeviceCode?.({
+              userCode: code.user_code,
+              verificationUri: code.verification_uri_complete ?? code.verification_uri ?? "",
+              intervalSeconds: code.interval,
+              expiresInSeconds: code.expires_in,
+            }),
+        });
+      } catch (e) {
+        // Normalize the cancel message to exactly "Login cancelled" (no period):
+        // Pi's login dialog only suppresses its "Failed to login…" error toast for
+        // that exact string, so a cancel should exit quietly, not flash an error.
+        if (cb.signal?.aborted) throw new Error("Login cancelled");
+        throw e;
+      }
     }
+    if (cb.signal?.aborted) throw new Error("Login cancelled");
     return spawnAccountCredentials();
   },
   async refreshToken(creds: { refresh: string }) {