opencrowd 0.3.1 → 0.3.2

package/bundle/opencrowd.js

@@ -101,15 +101,11 @@ async function appendLedgerEntry(path3, entry) {
 }
 async function readLedger(path3) {
   const text = await readFile2(path3, "utf8");
-  const [headerLine, ...lines] = text.trim().split(/\r?\n/);
-  if (!headerLine) {
+  const [headers, ...records] = parseCsv(text);
+  if (!headers) {
     return [];
   }
-  const headers = parseCsvLine(headerLine);
-  return lines.filter(Boolean).map((line) => {
-    const values = parseCsvLine(line);
-    return Object.fromEntries(headers.map((header, index2) => [header, values[index2] ?? ""]));
-  });
+  return records.filter((record) => record.length > 1 || (record[0] ?? "") !== "").map((record) => Object.fromEntries(headers.map((header, index2) => [header, record[index2] ?? ""])));
 }
 function csvCell(value) {
   if (/[",\n\r]/.test(value)) {
@@ -117,26 +113,44 @@ function csvCell(value) {
   }
   return value;
 }
-function parseCsvLine(line) {
-  const cells = [];
+function parseCsv(text) {
+  const records = [];
+  let cells = [];
   let current = "";
   let quoted = false;
-  for (let index2 = 0; index2 < line.length; index2 += 1) {
-    const char = line[index2];
-    if (quoted && char === '"' && line[index2 + 1] === '"') {
-      current += '"';
-      index2 += 1;
+  for (let index2 = 0; index2 < text.length; index2 += 1) {
+    const char = text[index2];
+    if (quoted) {
+      if (char === '"' && text[index2 + 1] === '"') {
+        current += '"';
+        index2 += 1;
+      } else if (char === '"') {
+        quoted = false;
+      } else {
+        current += char;
+      }
     } else if (char === '"') {
-      quoted = !quoted;
-    } else if (char === "," && !quoted) {
+      quoted = true;
+    } else if (char === ",") {
       cells.push(current);
       current = "";
+    } else if (char === "\n" || char === "\r") {
+      if (char === "\r" && text[index2 + 1] === "\n") {
+        index2 += 1;
+      }
+      cells.push(current);
+      records.push(cells);
+      cells = [];
+      current = "";
     } else {
       current += char;
     }
   }
-  cells.push(current);
-  return cells;
+  if (current !== "" || cells.length > 0) {
+    cells.push(current);
+    records.push(cells);
+  }
+  return records;
 }
 var LEDGER_COLUMNS;
 var init_ledger = __esm({
@@ -1010,7 +1024,7 @@ var init_dist = __esm({
 
 // ../../packages/economy/dist/agentcash.js
 function parsePaidFetchResult(raw, requestedRail) {
-  const record = objectValue2(raw) ?? {};
+  const { body, record } = splitFetchPayload(raw);
   const status = numberValue2(record.status ?? record.statusCode);
   const ok3 = typeof record.ok === "boolean" ? record.ok : status !== void 0 ? status < 400 : true;
   const payment = parsePaymentEvidence(record, requestedRail);
@@ -1020,32 +1034,88 @@ function parsePaidFetchResult(raw, requestedRail) {
     ok: ok3,
     ambiguous: false,
     status,
-    data: record.data ?? record.body ?? record.response ?? raw,
+    data: body,
     error: ok3 ? void 0 : stringValue2(record.error) ?? (status !== void 0 ? `HTTP ${status}` : "request failed"),
     authMode: payment ? "paid" : usedSiwx ? "siwx" : "free",
     payment
   };
 }
+function splitFetchPayload(raw) {
+  if (Array.isArray(raw)) {
+    const record2 = {};
+    const bodies = [];
+    for (const block of raw) {
+      const object = objectValue2(block);
+      if (object && looksLikePaymentMetadata(object)) {
+        Object.assign(record2, object);
+      } else {
+        bodies.push(block);
+      }
+    }
+    return { body: bodies.length === 1 ? bodies[0] : bodies, record: record2 };
+  }
+  if (typeof raw === "string") {
+    return splitEmbeddedMetadata(raw) ?? { body: raw, record: {} };
+  }
+  const record = objectValue2(raw) ?? {};
+  return { body: record.data ?? record.body ?? record.response ?? raw, record };
+}
+function looksLikePaymentMetadata(record) {
+  if (objectValue2(record.payment ?? record.paymentDetails ?? record.payment_details)) {
+    return true;
+  }
+  const headers = objectValue2(record.headers ?? record.responseHeaders);
+  if (headers && Object.keys(headers).some((key) => /^(x-)?payment-(response|receipt|required)$/i.test(key))) {
+    return true;
+  }
+  return typeof record.protocol === "string" && (record.price !== void 0 || typeof record.network === "string");
+}
+function splitEmbeddedMetadata(text) {
+  for (let index2 = text.lastIndexOf("\n{"); index2 >= 0; index2 = text.lastIndexOf("\n{", index2 - 1)) {
+    const candidate = objectValue2(parseMaybeJson(text.slice(index2 + 1)));
+    if (candidate && looksLikePaymentMetadata(candidate)) {
+      const bodyText = text.slice(0, index2).trim();
+      return { body: parseMaybeJson(bodyText), record: candidate };
+    }
+  }
+  return void 0;
+}
 function parsePaymentEvidence(record, requestedRail) {
   const payment = objectValue2(record.payment ?? record.paymentDetails ?? record.payment_details);
   const headers = objectValue2(record.headers ?? record.responseHeaders) ?? {};
   const proof = stringValue2(payment?.proof ?? payment?.receipt ?? headers["payment-response"] ?? headers["x-payment-response"] ?? headers["payment-receipt"] ?? headers["Payment-Receipt"]);
-  const reference = stringValue2(payment?.txHash ?? payment?.tx_hash ?? payment?.transactionHash ?? payment?.reference ?? record.txHash ?? record.tx_hash);
-  const paidUsd = numberValue2(payment?.price ?? payment?.amount ?? payment?.paidUsd ?? payment?.amountUsd ?? record.paid ?? record.price);
+  let reference = stringValue2(payment?.txHash ?? payment?.tx_hash ?? payment?.transactionHash ?? payment?.reference ?? record.txHash ?? record.tx_hash);
+  const paidUsd = moneyValue(payment?.price ?? payment?.amount ?? payment?.paidUsd ?? payment?.amountUsd ?? record.paid ?? record.price);
   if (!payment && !proof && !reference && paidUsd === void 0) {
     return void 0;
   }
-  const network = stringValue2(payment?.network ?? record.network)?.toLowerCase();
-  const protocol = stringValue2(payment?.protocol ?? record.paymentProtocol)?.toLowerCase();
-  const rail = network === "tempo" || protocol === "mpp" || protocol === "mppx" ? "mppx" : network === "base" || protocol === "x402" ? "x402-base" : network === void 0 && protocol === void 0 ? requestedRail : "unsupported";
+  const receipt = proof ? objectValue2(parseMaybeJson(decodeBase64(proof) ?? "")) : void 0;
+  reference ??= stringValue2(receipt?.transaction ?? receipt?.transactionHash ?? receipt?.txHash ?? receipt?.reference);
+  const network = stringValue2(payment?.network ?? record.network ?? receipt?.network)?.toLowerCase();
+  const protocol = stringValue2(payment?.protocol ?? record.protocol ?? record.paymentProtocol)?.toLowerCase();
+  const rail = network === "tempo" || protocol === "mpp" || protocol === "mppx" ? "mppx" : network === "base" || network === "eip155:8453" || protocol === "x402" ? "x402-base" : network === void 0 && protocol === void 0 ? requestedRail : "unsupported";
   return {
     paidUsd,
     rail,
     reference,
     proof,
-    payTo: stringValue2(payment?.payTo ?? payment?.pay_to ?? payment?.recipient)
+    payTo: stringValue2(payment?.payTo ?? payment?.pay_to ?? payment?.recipient ?? receipt?.payTo ?? receipt?.pay_to ?? receipt?.recipient ?? receipt?.payee)
   };
 }
+function parseMaybeJson(text) {
+  try {
+    return JSON.parse(text);
+  } catch {
+    return text;
+  }
+}
+function decodeBase64(value) {
+  try {
+    return Buffer.from(value, "base64").toString("utf8");
+  } catch {
+    return void 0;
+  }
+}
 function objectValue2(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
@@ -1061,6 +1131,17 @@ function numberValue2(value) {
   }
   return void 0;
 }
+function moneyValue(value) {
+  const direct = numberValue2(value);
+  if (direct !== void 0) {
+    return direct;
+  }
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const cleaned = value.replace(/[$,\s]|usd(c?)/gi, "");
+  return cleaned === "" ? void 0 : numberValue2(cleaned);
+}
 var McpAgentCashAdapter;
 var init_agentcash2 = __esm({
   "../../packages/economy/dist/agentcash.js"() {
@@ -1852,7 +1933,13 @@ function parseToolContent(content) {
   if (!Array.isArray(content)) {
     return content;
   }
-  const text = content.filter((block) => block && typeof block === "object" && block.type === "text").map((block) => String(block.text ?? "")).join("\n");
+  const texts = content.filter((block) => block && typeof block === "object" && block.type === "text").map((block) => String(block.text ?? ""));
+  if (texts.length <= 1) {
+    return parseMaybeJson2(texts[0] ?? "");
+  }
+  return texts.map(parseMaybeJson2);
+}
+function parseMaybeJson2(text) {
   try {
     return JSON.parse(text);
   } catch {
@@ -46725,7 +46812,7 @@ async function challengeFromResponse(response) {
   }
   const headerValue = response.headers.get("payment-required") ?? response.headers.get("x-payment-required");
   if (headerValue) {
-    const headerChallenge = parseBase64Json(headerValue) ?? parseMaybeJson(headerValue);
+    const headerChallenge = parseBase64Json(headerValue) ?? parseMaybeJson3(headerValue);
     if (headerChallenge) {
       return headerChallenge;
     }
@@ -46810,7 +46897,7 @@ function parseBase64Json(value) {
     return void 0;
   }
 }
-function parseMaybeJson(value) {
+function parseMaybeJson3(value) {
   try {
     return JSON.parse(value);
   } catch {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "opencrowd",
-  "version": "0.3.1",
-  "description": "A CLI agent with its own wallet \u2014 discovers x402 services, pays in USDC, and completes tasks under a local budget",
+  "version": "0.3.2",
+  "description": "A CLI agent with its own wallet — discovers x402 services, pays in USDC, and completes tasks under a local budget",
   "type": "module",
   "license": "MIT",
   "repository": {