@fluxa-pay/planner 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluxa-pay/planner",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "FluxA Planner CLI — recommend the right models/APIs/skills for a task, and run paid calls via x402.",
   "type": "module",
   "bin": {

package/planner.mjs

@@ -301,6 +301,36 @@ async function rawCall(url, method, data, extraHeaders = {}, auth = false) {
   return { status: res.status, text };
 }
 
+// The proxy's API/MCP lanes bill the caller identified by the X-Agent-ID header
+// and reject every non-discovery request without it. Default to the agent_id
+// (UUID) from `fluxa-wallet status`; configs with require_agent_auth need a JWT
+// instead, so agentCall() retries with a freshly minted wallet JWT on the
+// "valid JWT" 401. Both values are cached for the process.
+let _agentId = null;
+async function agentId() {
+  if (_agentId) return _agentId;
+  const s = unwrap(await walletJson(["status"]).catch(() => ({})));
+  const id = s.agent_id || s.agentId || s.id;
+  if (!id) die("could not read agent_id from `fluxa-wallet status` — register once with `fluxa-wallet init`.");
+  return (_agentId = id);
+}
+let _walletJwt = null;
+async function walletJwt() {
+  if (_walletJwt) return _walletJwt;
+  const j = unwrap(await walletJson(["refreshJWT"]).catch(() => ({})));
+  const jwt = j.jwt || j.token;
+  if (!jwt) die("could not mint a wallet JWT (`fluxa-wallet refreshJWT`).");
+  return (_walletJwt = jwt);
+}
+// rawCall + X-Agent-ID, with the UUID→JWT fallback for require_agent_auth configs.
+async function agentCall(url, method, data, extra = {}) {
+  const r = await rawCall(url, method, data, { ...extra, "X-Agent-ID": await agentId() });
+  if (r.status === 401 && /valid JWT/i.test(r.text)) {
+    return rawCall(url, method, data, { ...extra, "X-Agent-ID": await walletJwt() });
+  }
+  return r;
+}
+
 async function ensureMandate(currency, budget, seconds, url) {
   const cfg = loadConfig();
   // only reuse a signed mandate of the SAME currency with budget left
@@ -339,9 +369,12 @@ function descriptorEndpoints(text) {
 }
 
 async function cmdCall(url, opts = {}) {
-  if (!url || !/^https?:\/\//.test(url)) {
-    return die("usage: planner call <url> [--endpoint <path>] [--data '<json>'] [--pay credits|usdc] [--method GET|POST] [--budget <units>] [--raw]");
+  if (!url) {
+    return die("usage: planner call <url|slug> [--endpoint <path>] [--data '<json>'] [--pay credits|usdc] [--method GET|POST] [--budget <units>] [--raw]");
   }
+  // accept a bare AgentMarket slug (e.g. `web-search-api`) → the proxy API base.
+  // full http(s) URLs are used as-is.
+  if (!/^https?:\/\//.test(url)) url = `${PROXY}/api/${encodeURIComponent(url)}`;
   const pay = (opts.pay || loadConfig().pay || "credits").toLowerCase();
   const currency = pay === "usdc" ? "USDC" : "FLUXA_MONETIZE_CREDITS";
   const budget = opts.budget ? Number(opts.budget) : (pay === "usdc" ? 5000000 : 500); // ~$5 default
@@ -357,7 +390,7 @@ async function cmdCall(url, opts = {}) {
   // real paid sub-endpoints. Resolve it (unless --raw) so the agent doesn't have
   // to read the catalog itself. We never spend without a supplied body.
   if (!opts.raw) {
-    const probe = await rawCall(url, "GET");
+    const probe = await agentCall(url, "GET");
     const desc = probe.status === 200 ? descriptorEndpoints(probe.text) : null;
     if (desc) {
       const eps = desc.endpoints.filter((e) => e.enabled !== false);
@@ -388,7 +421,7 @@ async function cmdCall(url, opts = {}) {
   }
 
   // call the resolved endpoint — pay if it answers 402
-  let r = await rawCall(targetUrl, method, data);
+  let r = await agentCall(targetUrl, method, data);
   if (r.status !== 402) {
     if (r.status >= 400) die(`${r.status} — ${r.text.slice(0, 300)}`);
     return console.log(r.text); // raw body, no post-processing
@@ -402,8 +435,8 @@ async function cmdCall(url, opts = {}) {
   const xPayment = paid.xPaymentB64 || paid.xPayment;
   if (!xPayment) die("x402-v3 did not return a payment token (xPaymentB64).");
 
-  // 3. retry with the payment token
-  r = await rawCall(url, method, opts.data, { "X-Payment": xPayment });
+  // 3. retry with the payment token (against the resolved endpoint, with X-Agent-ID)
+  r = await agentCall(targetUrl, method, opts.data, { "X-Payment": xPayment });
   if (r.status >= 400) die(`paid retry failed: ${r.status} — ${r.text.slice(0, 300)}`);
   console.log(r.text); // raw body, no post-processing
 }