@whittlelabs/trivet 0.1.7 → 0.1.8

package/bin.js

@@ -72521,6 +72521,8 @@ var require_device_code = __commonJS({
     exports2.noPoolRefusal = noPoolRefusal;
     exports2.issuedButNotKept = issuedButNotKept;
     var os_1 = require("os");
+    var jobs_1 = require_jobs();
+    var keep_1 = require_keep();
     var apply_1 = require_apply();
     var version_check_1 = require_version_check();
     var typed_exit_1 = require_typed_exit();
@@ -72618,35 +72620,13 @@ var require_device_code = __commonJS({
       };
     }
     async function discoverMemberPools(opts) {
-      const tokenUrl = `${opts.keepApiUrl.replace(/\/$/, "")}/api/agent-tokens`;
-      const tokenRes = await opts.fetcher(tokenUrl, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          clientId: opts.clientId,
-          clientSecret: opts.clientSecret
-        })
-      });
-      (0, version_check_1.checkResponseMinVersion)({
-        response: tokenRes,
-        productId: opts.brand.product.id,
-        currentVersion: opts.brand.product.version,
-        packageName: opts.brand.product.packageName
-      });
-      const tokenJson = await readJson(tokenRes);
-      const poolsUrl = `${opts.jobsApiUrl.replace(/\/$/, "")}/api/my/pools`;
-      const poolsRes = await opts.fetcher(poolsUrl, {
-        method: "GET",
-        headers: { Authorization: `Bearer ${tokenJson.data.token}` }
-      });
-      (0, version_check_1.checkResponseMinVersion)({
-        response: poolsRes,
-        productId: opts.brand.product.id,
-        currentVersion: opts.brand.product.version,
-        packageName: opts.brand.product.packageName
-      });
-      const poolsJson = await readJson(poolsRes);
-      return poolsJson.data.pools;
+      const minted = readAnswer(await sendPairing(opts.fetcher, (transport) => (0, keep_1.createClient)({ baseUrl: opts.keepApiUrl, transport }).post("/api/agent-tokens", {
+        body: { clientId: opts.clientId, clientSecret: opts.clientSecret }
+      })), opts.brand);
+      const roster = readAnswer(await sendPairing(opts.fetcher, (transport) => (0, jobs_1.createClient)({ baseUrl: opts.jobsApiUrl, transport }).get("/api/my/pools", {
+        headers: { Authorization: `Bearer ${minted.token}` }
+      })), opts.brand);
+      return roster.pools;
     }
     function webFirstRemedy(brand, cause) {
       const reason = cause instanceof Error ? cause.message : String(cause);
@@ -72683,90 +72663,105 @@ var require_device_code = __commonJS({
       return opts.columns ?? process.stdout.columns;
     }
     async function startDeviceCode(opts) {
-      const url = `${opts.keepApiUrl.replace(/\/$/, "")}/api/oauth/device`;
-      const response = await opts.fetcher(url, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          client_id: opts.oauthClientId
-        })
-      });
-      (0, version_check_1.checkResponseMinVersion)({
-        response,
-        productId: opts.brand.product.id,
-        currentVersion: opts.brand.product.version,
-        packageName: opts.brand.product.packageName
-      });
-      const json = await readJson(response);
-      return json.data;
+      const answer = await sendPairing(opts.fetcher, (transport) => (0, keep_1.createClient)({ baseUrl: opts.keepApiUrl, transport }).post("/api/oauth/device", {
+        body: { client_id: opts.oauthClientId }
+      }));
+      return readAnswer(answer, opts.brand);
     }
     async function pollForToken(opts) {
-      const url = `${opts.keepApiUrl.replace(/\/$/, "")}/api/oauth/device/token`;
       const deadline = Date.now() + opts.timeoutMs;
       while (Date.now() < deadline) {
-        const response = await opts.fetcher(url, {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({
+        const answer = await sendPairing(opts.fetcher, (transport) => (0, keep_1.createClient)({ baseUrl: opts.keepApiUrl, transport }).post("/api/oauth/device/token", {
+          body: {
             client_id: opts.oauthClientId,
             device_code: opts.deviceCode,
             display_name: opts.displayName,
             hostname: (0, os_1.hostname)(),
             os_user: (0, os_1.userInfo)().username
-          })
-        });
-        if (response.status === 202) {
+          }
+        }));
+        if (answer.status === 202) {
           await sleep(opts.intervalMs);
           continue;
         }
-        if (response.status === 410) {
+        if (answer.status === 410) {
           throw new Error("Pairing code expired before verification.");
         }
-        (0, version_check_1.checkResponseMinVersion)({
-          response,
-          productId: opts.brand.product.id,
-          currentVersion: opts.brand.product.version,
-          packageName: opts.brand.product.packageName
-        });
-        const json = await readJson(response);
-        return json.data;
+        const issued = readAnswer(answer, opts.brand);
+        if ("status" in issued) {
+          throw new Error(`Pairing endpoint returned status ${answer.status}.`);
+        }
+        return issued;
       }
       throw new Error("Pairing timed out before verification.");
     }
     async function redeemPairingCode(opts) {
-      const url = `${opts.keepApiUrl.replace(/\/$/, "")}/api/oauth/device/redeem`;
-      const response = await opts.fetcher(url, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
+      const answer = await sendPairing(opts.fetcher, (transport) => (0, keep_1.createClient)({ baseUrl: opts.keepApiUrl, transport }).post("/api/oauth/device/redeem", {
+        body: {
           client_id: opts.oauthClientId,
           user_code: opts.userCode,
           display_name: opts.displayName,
           hostname: (0, os_1.hostname)(),
           os_user: (0, os_1.userInfo)().username
-        })
+        }
+      }));
+      return readAnswer(answer, opts.brand);
+    }
+    async function sendPairing(fetcher, send) {
+      let raised;
+      let seen;
+      const result = await send(async (url, init2) => {
+        let response;
+        try {
+          response = await fetcher(url, init2);
+        } catch (err2) {
+          raised = { error: err2 };
+          throw err2;
+        }
+        const text = await response.text().catch(() => void 0);
+        seen = { status: response.status, headers: response.headers, ...readBody(text) };
+        return new Response(text ? text : null, {
+          status: response.status,
+          statusText: response.statusText,
+          headers: response.headers
+        });
       });
+      if (raised)
+        throw raised.error;
+      if (!seen)
+        throw new Error("Pairing endpoint gave no answer.");
+      return { result, ...seen };
+    }
+    function readAnswer(answer, brand) {
       (0, version_check_1.checkResponseMinVersion)({
-        response,
-        productId: opts.brand.product.id,
-        currentVersion: opts.brand.product.version,
-        packageName: opts.brand.product.packageName
+        response: answer,
+        productId: brand.product.id,
+        currentVersion: brand.product.version,
+        packageName: brand.product.packageName
       });
-      const json = await readJson(response);
-      return json.data;
+      if (!answer.json) {
+        throw new Error(`Pairing endpoint returned non-JSON (status ${answer.status}).`);
+      }
+      if (!answer.result.success) {
+        throw new Error(answer.refusalMessage ?? `Pairing endpoint returned status ${answer.status}.`);
+      }
+      return answer.result.data;
     }
-    async function readJson(response) {
+    function readBody(text) {
+      if (text === void 0)
+        return { json: false, refusalMessage: void 0 };
       let body2;
       try {
-        body2 = await response.json();
+        body2 = JSON.parse(text);
       } catch {
-        throw new Error(`Pairing endpoint returned non-JSON (status ${response.status}).`);
+        return { json: false, refusalMessage: void 0 };
       }
-      if (!response.ok) {
-        const err2 = body2;
-        throw new Error(err2.error?.message ?? `Pairing endpoint returned status ${response.status}.`);
-      }
-      return body2;
+      const error = isRecord(body2) ? body2.error : void 0;
+      const message = isRecord(error) ? error.message : void 0;
+      return { json: true, refusalMessage: typeof message === "string" ? message : void 0 };
+    }
+    function isRecord(value) {
+      return typeof value === "object" && value !== null;
     }
     function sleep(ms) {
       return new Promise((resolve) => setTimeout(resolve, ms));
@@ -76407,7 +76402,7 @@ var import_shuttle2 = __toESM(require_dist8());
 
 // src/brand.ts
 var import_shuttle = __toESM(require_dist8());
-var buildVersion = true ? "0.1.7" : pkg.version;
+var buildVersion = true ? "0.1.8" : pkg.version;
 var EXECUTORS = ["claude-code"];
 var trivetBrand = {
   product: {