@daski/pay 0.1.0 → 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/commands/buy.d.ts.map +1 -1
- package/dist/commands/buy.js +36 -7
- package/dist/commands/buy.js.map +1 -1
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +39 -1
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/order.js +1 -0
- package/dist/commands/order.js.map +1 -1
- package/dist/commands/signPayment.js +4 -1
- package/dist/commands/signPayment.js.map +1 -1
- package/dist/commands/wallet.d.ts.map +1 -1
- package/dist/commands/wallet.js +5 -3
- package/dist/commands/wallet.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +5 -0
- package/dist/config.js.map +1 -1
- package/dist/gateway/catalog.d.ts.map +1 -1
- package/dist/gateway/catalog.js +19 -1
- package/dist/gateway/catalog.js.map +1 -1
- package/dist/gateway/client.d.ts +58 -2
- package/dist/gateway/client.d.ts.map +1 -1
- package/dist/gateway/client.js +115 -7
- package/dist/gateway/client.js.map +1 -1
- package/dist/gateway/lifecycle.d.ts.map +1 -1
- package/dist/gateway/lifecycle.js +6 -2
- package/dist/gateway/lifecycle.js.map +1 -1
- package/dist/gateway/purchase.d.ts +11 -2
- package/dist/gateway/purchase.d.ts.map +1 -1
- package/dist/gateway/purchase.js +24 -8
- package/dist/gateway/purchase.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -4,7 +4,7 @@ The Daski buyer bridge. A CLI that buys outcomes, tracks orders across
|
|
|
4
4
|
processes, and refuses to sign anything it has not independently checked.
|
|
5
5
|
|
|
6
6
|
```bash
|
|
7
|
-
npx @daski/pay@0.1.
|
|
7
|
+
npx @daski/pay@0.1.1 doctor --json
|
|
8
8
|
```
|
|
9
9
|
|
|
10
10
|
> Server proposes; buyer bridge validates against its own expectations and
|
|
@@ -14,7 +14,7 @@ npx @daski/pay@0.1.0 doctor --json
|
|
|
14
14
|
|
|
15
15
|
| Command | What it does |
|
|
16
16
|
|---|---|
|
|
17
|
-
| `daski doctor` | Readiness report; exits 0 only when nothing blocks. Every issue carries a remediation |
|
|
17
|
+
| `daski doctor` | Readiness report; exits 0 only when nothing blocks, including one read-only MCP round trip that proves this CLI can read the gateway's results. Every issue carries a remediation |
|
|
18
18
|
| `daski wallet create` | Generate a local EOA — interactive human confirmation required |
|
|
19
19
|
| `daski wallet address` / `balance` | The active payer address; native + USDC balances |
|
|
20
20
|
| `daski buy --provider <id> --outcome <id> --request <file.json>` | Challenge → approve → validate → sign → submit → record |
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buy.d.ts","sourceRoot":"","sources":["../../src/commands/buy.ts"],"names":[],"mappings":"AAQA,OAAO,EAAc,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAK/D,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAYnE,MAAM,WAAW,UAAW,SAAQ,cAAc;IAChD,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qEAAqE;IACrE,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAQD,wBAAsB,MAAM,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"buy.d.ts","sourceRoot":"","sources":["../../src/commands/buy.ts"],"names":[],"mappings":"AAQA,OAAO,EAAc,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAK/D,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAYnE,MAAM,WAAW,UAAW,SAAQ,cAAc;IAChD,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qEAAqE;IACrE,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAQD,wBAAsB,MAAM,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA6KlF;AAyID,OAAO,EAAE,aAAa,EAAE,CAAC"}
|
package/dist/commands/buy.js
CHANGED
|
@@ -42,9 +42,27 @@ export async function runBuy(options) {
|
|
|
42
42
|
payerAddress: context.payerAddress,
|
|
43
43
|
});
|
|
44
44
|
const amountAtomic = BigInt(challenge.requirement.amount);
|
|
45
|
+
const preflight = challenge.preflight;
|
|
46
|
+
if (preflight?.sufficient === false) {
|
|
47
|
+
// The gateway already read the payer's balance: a signature now would be
|
|
48
|
+
// a doomed one. Say what is needed and stop; where the USDC comes from
|
|
49
|
+
// is the operator's business.
|
|
50
|
+
const network = String(preflight.network ?? context.profile.network);
|
|
51
|
+
const balance = typeof preflight.usdcBalance === "string"
|
|
52
|
+
? `${formatUsdc(BigInt(preflight.usdcBalance))} USDC`
|
|
53
|
+
: "an unknown USDC balance";
|
|
54
|
+
throw new CliError({
|
|
55
|
+
code: "DASKI_INSUFFICIENT_USDC",
|
|
56
|
+
message: `${context.payerAddress} holds ${balance} on ${network}; this purchase ` +
|
|
57
|
+
`needs ${formatUsdc(amountAtomic)}.`,
|
|
58
|
+
remediation: `Fund ${context.payerAddress} with USDC on ${network}, then re-run. Nothing was signed.`,
|
|
59
|
+
details: { preflight, priceUsdc: formatUsdc(amountAtomic) },
|
|
60
|
+
exitCode: 2,
|
|
61
|
+
});
|
|
62
|
+
}
|
|
45
63
|
// -- 2. approval -------------------------------------------------------
|
|
46
64
|
const outcome = await context.catalog.getOutcome(options.providerAgentId, options.outcomeId);
|
|
47
|
-
const summary = approvalSummary(challenge.challenge.extensions, outcome, amountAtomic);
|
|
65
|
+
const summary = approvalSummary(challenge.challenge.extensions, outcome, amountAtomic, preflight);
|
|
48
66
|
const threshold = atomicUsdc(context.profile.requireApprovalAboveUsdc);
|
|
49
67
|
if (amountAtomic > threshold && !options.yes) {
|
|
50
68
|
if (options.json || !isInteractive()) {
|
|
@@ -124,10 +142,19 @@ export async function runBuy(options) {
|
|
|
124
142
|
cause: `gateway reported ${code}`,
|
|
125
143
|
});
|
|
126
144
|
}
|
|
145
|
+
if (GatewayClient.unreadable(result)) {
|
|
146
|
+
// The paid call answered without an error and this client found no
|
|
147
|
+
// payload. The signature is out and the outcome is unknown: that is the
|
|
148
|
+
// ambiguous case, so reconcile — never report failure, never re-sign.
|
|
149
|
+
return await reconcile(context, {
|
|
150
|
+
intentId, options, request, authorized,
|
|
151
|
+
cause: "the paid result carried no payload this CLI could read",
|
|
152
|
+
});
|
|
153
|
+
}
|
|
127
154
|
if (result.isError || !body || typeof body.orderHandle !== "string") {
|
|
128
155
|
updateOrder(intentId, { state: "PENDING_RECONCILIATION" });
|
|
129
156
|
const { purchaseFailure } = await import("../gateway/purchase.js");
|
|
130
|
-
throw purchaseFailure(result);
|
|
157
|
+
throw purchaseFailure(result, { afterSubmit: true });
|
|
131
158
|
}
|
|
132
159
|
// -- 6 & 7. persist and report ----------------------------------------
|
|
133
160
|
const record = updateOrder(intentId, {
|
|
@@ -210,16 +237,18 @@ function normalizeState(status) {
|
|
|
210
237
|
return "SUBMITTED";
|
|
211
238
|
}
|
|
212
239
|
/**
|
|
213
|
-
* The human-facing summary.
|
|
214
|
-
*
|
|
215
|
-
*
|
|
240
|
+
* The human-facing summary. The gateway's prepare tool ships a one-sentence
|
|
241
|
+
* `approvalSummary` in its preflight; it leads when present, and the rest is
|
|
242
|
+
* assembled from the order terms and the catalog, so the operator sees who is
|
|
243
|
+
* being paid and under whose terms either way.
|
|
216
244
|
*/
|
|
217
|
-
function approvalSummary(extensions, outcome, amountAtomic) {
|
|
218
|
-
const supplied = extensions?.approvalSummary;
|
|
245
|
+
function approvalSummary(extensions, outcome, amountAtomic, preflight) {
|
|
246
|
+
const supplied = preflight?.approvalSummary ?? extensions?.approvalSummary;
|
|
219
247
|
if (supplied && typeof supplied === "object")
|
|
220
248
|
return supplied;
|
|
221
249
|
const terms = extensions?.["daski-order-terms"];
|
|
222
250
|
return {
|
|
251
|
+
...(typeof supplied === "string" ? { gateway: supplied } : {}),
|
|
223
252
|
what: [outcome.serviceName, outcome.skillName].filter(Boolean).join(" / ") || "Daski outcome",
|
|
224
253
|
price: formatUsdc(amountAtomic),
|
|
225
254
|
paysTo: outcome.payTo,
|
package/dist/commands/buy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buy.js","sourceRoot":"","sources":["../../src/commands/buy.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"buy.js","sourceRoot":"","sources":["../../src/commands/buy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,UAAU,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACzC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,EAAE,EAAE,OAAO,CAAC;CACb;AAED,wBAAsB,SAAS,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AAwBA,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,UAAU,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACzC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,EAAE,EAAE,OAAO,CAAC;CACb;AAED,wBAAsB,SAAS,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CA+M7E"}
|
package/dist/commands/doctor.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { CliError } from "../cli/errors.js";
|
|
2
2
|
import { permissionWarnings, applyCapOverrides, loadConfig, CONFIG_DOC } from "../config.js";
|
|
3
3
|
import { readBalances } from "../gateway/balance.js";
|
|
4
|
-
import { readiness } from "../gateway/client.js";
|
|
4
|
+
import { GatewayClient, probeGatewayProtocol, readiness } from "../gateway/client.js";
|
|
5
5
|
import { configPath, daskiHome } from "../paths.js";
|
|
6
6
|
import { createSigner } from "../signers/index.js";
|
|
7
7
|
import { runSignerSelfTest } from "../signers/selfTest.js";
|
|
@@ -130,6 +130,41 @@ export async function runDoctor(options) {
|
|
|
130
130
|
remediation: "Wait for the gateway to become ready, then re-run: daski doctor --json",
|
|
131
131
|
});
|
|
132
132
|
}
|
|
133
|
+
// -- gateway protocol ----------------------------------------------------
|
|
134
|
+
// /health/ready says the process is up; it cannot say whether this CLI can
|
|
135
|
+
// read what the MCP tools return. One read-only round trip settles that,
|
|
136
|
+
// so "exit 0" means a purchase can actually complete.
|
|
137
|
+
let protocol = null;
|
|
138
|
+
if (health.reachable && health.status === "ready") {
|
|
139
|
+
protocol = await probeGatewayProtocol(new GatewayClient({ gatewayUrl: profile.gatewayUrl }));
|
|
140
|
+
if (!protocol.reachable) {
|
|
141
|
+
issues.push({
|
|
142
|
+
severity: "blocking",
|
|
143
|
+
code: "DASKI_GATEWAY_MCP_UNREACHABLE",
|
|
144
|
+
message: `${profile.gatewayUrl}/mcp did not answer: ${protocol.error ?? "unknown error"}`,
|
|
145
|
+
remediation: "Check connectivity to the gateway's /mcp endpoint, then re-run: daski doctor --json",
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
else if (!protocol.tools.includes("daski_buy_outcome")) {
|
|
149
|
+
issues.push({
|
|
150
|
+
severity: "blocking",
|
|
151
|
+
code: "DASKI_GATEWAY_TOOLS_MISSING",
|
|
152
|
+
message: `The gateway at ${profile.gatewayUrl} does not advertise daski_buy_outcome.`,
|
|
153
|
+
remediation: `Point the "${loaded.profileName}" profile's gatewayUrl at a Daski gateway in ` +
|
|
154
|
+
`${configPath()}, then re-run: daski doctor --json`,
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
else if (!protocol.readableVia) {
|
|
158
|
+
issues.push({
|
|
159
|
+
severity: "blocking",
|
|
160
|
+
code: "DASKI_GATEWAY_PROTOCOL_MISMATCH",
|
|
161
|
+
message: "The gateway answered a read-only tool call, but this CLI found no JSON payload " +
|
|
162
|
+
"in the result, so no purchase, order read, or reconciliation can complete.",
|
|
163
|
+
remediation: "Upgrade to the @daski/pay version the gateway's /skills/setup.md pins, then " +
|
|
164
|
+
"re-run: daski doctor --json",
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
}
|
|
133
168
|
const spent = authorizedTotalAtomic(loaded.profileName);
|
|
134
169
|
return {
|
|
135
170
|
cliVersion: CLI_VERSION,
|
|
@@ -165,6 +200,9 @@ export async function runDoctor(options) {
|
|
|
165
200
|
reachable: health.reachable,
|
|
166
201
|
status: health.status ?? null,
|
|
167
202
|
version: health.version ?? null,
|
|
203
|
+
mcp: protocol
|
|
204
|
+
? { reachable: protocol.reachable, tools: protocol.tools.length, readableVia: protocol.readableVia }
|
|
205
|
+
: null,
|
|
168
206
|
},
|
|
169
207
|
issues,
|
|
170
208
|
ok: !issues.some((issue) => issue.severity === "blocking"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC7F,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/order.js
CHANGED
|
@@ -189,6 +189,7 @@ async function grantRead(context, record, handle) {
|
|
|
189
189
|
action: "status",
|
|
190
190
|
gatewayUrl: context.profile.gatewayUrl,
|
|
191
191
|
request: {},
|
|
192
|
+
chainId: context.profile.chainId,
|
|
192
193
|
});
|
|
193
194
|
const signature = await context.signer.signTypedData(orderActionTypedData(challenge, context.profile.chainId, context.profile.gatewayUrl));
|
|
194
195
|
const granted = await context.client.callTool(READ_CAPABILITY_TOOL, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order.js","sourceRoot":"","sources":["../../src/commands/order.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"order.js","sourceRoot":"","sources":["../../src/commands/order.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAuB,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,WAAW,EAAoB,MAAM,oBAAoB,CAAC;AAiBpG,MAAM,oBAAoB,GAAG,wBAAwB,CAAC;AAEtD,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAAqB;IACrD,OAAO,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAClD,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE;YACrD,QAAQ,EAAE,wBAAwB;YAClC,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QACtE,IAAI,KAAK;YAAE,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACrE,OAAO;YACL,WAAW,EAAE,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM;YAC5C,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,QAAQ,EAAE,MAAM,CAAC,eAAe;YAChC,OAAO,EAAE,MAAM,CAAC,SAAS;YACzB,KAAK,EAAE,KAAK,IAAI,MAAM,CAAC,KAAK;YAC5B,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAA6B;IAE7B,OAAO,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAClD,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE;YACrD,QAAQ,EAAE,0BAA0B;YACpC,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,CAAC,eAEV,CAAC;QACd,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC;YACxB,MAAM,IAAI,QAAQ,CAAC;gBACjB,IAAI,EAAE,8BAA8B;gBACpC,OAAO,EAAE,kDAAkD;gBAC3D,WAAW,EACT,6CAA6C,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE;gBAChF,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC3B,CAAC,CAAC;QACL,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACzG,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM;eACtB,KAAK,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,YAAY,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;QACpH,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAE5C,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC;QACtD,OAAO;YACL,WAAW,EAAE,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM;YAC5C,iEAAiE;YACjE,iBAAiB,EAAE,IAAI;YACvB,SAAS,EAAE,SAAS,CAAC,SAAS,IAAI,0BAA0B;YAC5D,UAAU,EAAE,SAAS,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU;YACpD,QAAQ;YACR,IAAI,EACF,mEAAmE;gBACnE,mEAAmE;gBACnE,wBAAwB;SAC3B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAqB;IACtD,OAAO,MAAM,CAAC,OAAO,EAAE,wBAAwB,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,OAAqB;IACrD,OAAO,MAAM,CAAC,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAA0B;IAE1B,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,OAAgC,CAAC;IACrC,IAAI,CAAC;QACH,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAA4B,CAAC;IAC7F,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,QAAQ,CAAC;YACjB,IAAI,EAAE,+BAA+B;YACrC,OAAO,EAAE,kBAAkB,OAAO,CAAC,WAAW,KAAM,KAAe,CAAC,OAAO,EAAE;YAC7E,WAAW,EAAE,8CAA8C;SAC5D,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,EAAE,0BAA0B,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC;AAED,KAAK,UAAU,MAAM,CACnB,OAAqB,EACrB,QAAgB,EAChB,MAAmB,EACnB,OAAgC;IAEhC,OAAO,SAAS,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAClD,MAAM,IAAI,GAAG,MAAM,2BAA2B,CAAC;YAC7C,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,QAAQ;YACR,MAAM;YACN,WAAW,EAAE,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM;YAC5C,OAAO;YACP,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO;YAChC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU;SACvC,CAAC,CAAC;QACH,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACnC,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,OAAO;YACL,WAAW,EAAE,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM;YAC5C,MAAM;YACN,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,kBAAkB,CAC/B,OAAkD,EAClD,MAAmB,EACnB,IAAiF;IAEjF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,QAAQ,CAAC;YACjB,IAAI,EAAE,2BAA2B;YACjC,OAAO,EAAE,UAAU,MAAM,CAAC,QAAQ,kCAAkC;YACpE,WAAW,EACT,2EAA2E;gBAC3E,2CAA2C;SAC9C,CAAC,CAAC;IACL,CAAC;IAED,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAChD,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC1D,WAAW,EAAE,MAAM;YACnB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,UAAU,CAAC,KAAK;SAC7B,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/E,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QACzC,yEAAyE;QACzE,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACvD,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACzD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAC1D,WAAW,EAAE,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,UAAU,EAAE,OAAO,CAAC,KAAK;aAC1B,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,CAAC,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC/E,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,OAAO,2BAA2B,CAAC;QACjC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,WAAW,EAAE,MAAM;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO;QAChC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU;KACvC,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,SAAS,CACtB,OAAkD,EAClD,MAAmB,EACnB,MAAc;IAEd,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAC;IAC/D,MAAM,EACJ,oBAAoB,EAAE,4BAA4B,GACnD,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAEvC,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,EAAE;QAC1E,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;KACjC,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC1D,IAAI,CAAC,aAAa,IAAI,eAAe,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAChE,IAAI,aAAa,CAAC,qBAAqB,KAAK,IAAI,EAAE,CAAC;QACjD,OAAO,cAAc,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IACD,MAAM,SAAS,GAAG,4BAA4B,CAAC,aAAa,CAAC,SAAS,EAAE;QACtE,WAAW,EAAE,MAAM;QACnB,MAAM,EAAE,QAAQ;QAChB,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU;QACtC,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO;KACjC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAClD,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CACrF,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,EAAE;QAClE,WAAW,EAAE,MAAM;QACnB,OAAO,EAAE,EAAE;QACX,aAAa,EAAE,EAAE,GAAG,SAAS,EAAE,SAAS,EAAE;KAC3C,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAC/C,OAAO,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACtC,CAAC;AAED,SAAS,cAAc,CACrB,IAA6B,EAC7B,MAAmB;IAEnB,MAAM,UAAU,GAAG,IAAI,CAAC,UAAkE,CAAC;IAC3F,IAAI,OAAO,UAAU,EAAE,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACzF,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;IACpF,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC;IACzD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,SAAS,CACtB,OAAqB,EACrB,GAA4F;IAE5F,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC;eACxD,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,QAAQ,CAAC;gBACjB,IAAI,EAAE,uBAAuB;gBAC7B,OAAO,EAAE,wCAAwC,OAAO,CAAC,MAAM,IAAI;gBACnE,WAAW,EACT,wEAAwE;oBACxE,wEAAwE;oBACxE,8DAA8D;aACjE,CAAC,CAAC;QACL,CAAC;QACD,OAAO,MAAM,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAClC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,WAAW,CAAC;IACnE,IAAI,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,gBAAgB,CAAC;IAClF,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,iBAAiB,CAAC;IAC5E,IAAI,KAAK,KAAK,UAAU,IAAI,KAAK,KAAK,WAAW;QAAE,OAAO,UAAU,CAAC;IACrE,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,YAAY,CAAC,SAA6B;IACjD,IAAI,CAAC,SAAS;QAAE,OAAO,MAAM,CAAC;IAC9B,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,OAAO,CAAC;IAC/C,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC;IAC9C,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC;IAC7C,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -136,7 +136,10 @@ function readChallenge(path) {
|
|
|
136
136
|
remediation: "Save the gateway's PaymentRequired response to the file verbatim.",
|
|
137
137
|
});
|
|
138
138
|
}
|
|
139
|
-
|
|
139
|
+
// The prepare tool's saved output nests the challenge under `paymentRequired`
|
|
140
|
+
// beside its preflight; accept that file as well as a bare PaymentRequired.
|
|
141
|
+
const nested = parsed.paymentRequired;
|
|
142
|
+
const challenge = (nested && typeof nested === "object" && !Array.isArray(nested) ? nested : parsed);
|
|
140
143
|
const requirement = challenge.accepts?.[0];
|
|
141
144
|
if (challenge.x402Version !== 2 || !requirement || !challenge.resource) {
|
|
142
145
|
throw new CliError({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signPayment.js","sourceRoot":"","sources":["../../src/commands/signPayment.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"signPayment.js","sourceRoot":"","sources":["../../src/commands/signPayment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/commands/wallet.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/commands/wallet.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AAID,wBAAsB,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAwD3F;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAgB5F;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAoB5F"}
|
package/dist/commands/wallet.js
CHANGED
|
@@ -5,7 +5,9 @@
|
|
|
5
5
|
* command, so it is gated on a human: an interactive terminal and a typed
|
|
6
6
|
* confirmation phrase. `--yes-human-approved` exists for provisioning
|
|
7
7
|
* scripts, and its name is the documentation: whoever passes it is asserting a
|
|
8
|
-
* human approved this.
|
|
8
|
+
* human approved this. No error message names the flag: on 2026-09-03 an
|
|
9
|
+
* agent read the remediation that did, passed the flag from its own shell,
|
|
10
|
+
* and created the key the guide had reserved for the human.
|
|
9
11
|
*/
|
|
10
12
|
import { generatePrivateKey, privateKeyToAccount } from "viem/accounts";
|
|
11
13
|
import { getAddress } from "viem";
|
|
@@ -33,8 +35,8 @@ export async function createWallet(options) {
|
|
|
33
35
|
throw new CliError({
|
|
34
36
|
code: "DASKI_KEY_CREATION_NEEDS_HUMAN",
|
|
35
37
|
message: "Creating a signing key requires a human, and this session has no terminal.",
|
|
36
|
-
remediation: "
|
|
37
|
-
|
|
38
|
+
remediation: "A human must run `daski wallet create` in their own interactive terminal " +
|
|
39
|
+
"and type the confirmation phrase. Do not run it from an agent's shell.",
|
|
38
40
|
});
|
|
39
41
|
}
|
|
40
42
|
const approved = await confirmPhrase(`This creates a new signing key for the "${profileName}" profile ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../src/commands/wallet.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../src/commands/wallet.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAUnD,MAAM,aAAa,GAAG,kBAAkB,CAAC;AAEzC,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAsB;IACvD,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;IAEvC,IAAI,MAAM,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,QAAQ,CAAC;YACjB,IAAI,EAAE,0BAA0B;YAChC,OAAO,EAAE,yCAAyC,WAAW,YAAY;YACzE,WAAW,EACT,gDAAgD,WAAW,eAAe;gBAC1E,sEAAsE;gBACtE,6DAA6D;SAChE,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC9B,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACrB,MAAM,IAAI,QAAQ,CAAC;gBACjB,IAAI,EAAE,gCAAgC;gBACtC,OAAO,EACL,4EAA4E;gBAC9E,WAAW,EACT,2EAA2E;oBAC3E,wEAAwE;aAC3E,CAAC,CAAC;QACL,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAClC,2CAA2C,WAAW,YAAY;YAClE,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,MAAM;YAChC,oEAAoE;YACpE,0EAA0E,EAC1E,aAAa,CACd,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,QAAQ,CAAC;gBACjB,IAAI,EAAE,6BAA6B;gBACnC,OAAO,EAAE,iCAAiC;gBAC1C,WAAW,EAAE,oBAAoB,aAAa,eAAe;gBAC7D,QAAQ,EAAE,CAAC;aACZ,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC;IACxC,MAAM,OAAO,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAEzD,+EAA+E;IAC/E,OAAO;QACL,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,WAAW;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO;QAC/B,QAAQ,EAAE,QAAQ,CAAC,WAAW;QAC9B,WAAW,EAAE,wDAAwD;KACtE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAsB;IACxD,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;QAChC,IAAI,EAAG,OAAO,CAAC,cAAwB,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM;QAChE,OAAO,EAAE,MAAM,CAAC,WAAW;QAC3B,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,YAAY,EAAE,OAAO,CAAC,YAAY;KACnC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrD,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,WAAW;QAC3B,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO;QAC/B,OAAO,EAAE,MAAM,MAAM,CAAC,UAAU,EAAE;QAClC,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,QAAQ;QAClC,SAAS,EAAE,QAAQ,EAAE,MAAM,IAAI,SAAS;KACzC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAsB;IACxD,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;QAChC,IAAI,EAAG,OAAO,CAAC,cAAwB,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM;QAChE,OAAO,EAAE,MAAM,CAAC,WAAW;QAC3B,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,YAAY,EAAE,OAAO,CAAC,YAAY;KACnC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC;QAClC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM;QAC7B,OAAO;QACP,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW;KACxC,CAAC,CAAC;IACH,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,WAAW;QAC3B,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO;QAC/B,OAAO;QACP,GAAG,QAAQ;KACZ,CAAC;AACJ,CAAC"}
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAaA,OAAO,EAAc,KAAK,OAAO,EAAE,MAAM,MAAM,CAAC;AAIhD,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAChE,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,KAAK,GAAG,QAAQ,CAAC;AAEpD,MAAM,WAAW,aAAa;IAC5B,oEAAoE;IACpE,UAAU,EAAE,MAAM,CAAC;IACnB,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,gEAAgE;IAChE,WAAW,EAAE,OAAO,CAAC;IACrB,yDAAyD;IACzD,MAAM,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,eAAe,EAAE,MAAM,CAAC;IACxB,4CAA4C;IAC5C,cAAc,EAAE,MAAM,CAAC;IACvB,sEAAsE;IACtE,wBAAwB,EAAE,MAAM,CAAC;IACjC,MAAM,EAAE,UAAU,CAAC;IACnB,mDAAmD;IACnD,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,CAAC,CAAC;IACX,cAAc,EAAE,WAAW,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;CAC9C;AAED,+DAA+D;AAC/D,eAAO,MAAM,YAAY,eAA2D,CAAC;AACrF,kEAAkE;AAClE,eAAO,MAAM,YAAY,eAA2D,CAAC;AAErF,eAAO,MAAM,cAAc,EAAE,WA8B5B,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,aAAa,CAAC;IACvB,iEAAiE;IACjE,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,QAAA,MAAM,GAAG,+DAA+D,CAAC;AAEzE,6EAA6E;AAC7E,wBAAgB,YAAY,IAAI,MAAM,CAUrC;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,YAAY,CAqCjE;AAED,yEAAyE;AACzE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAaA,OAAO,EAAc,KAAK,OAAO,EAAE,MAAM,MAAM,CAAC;AAIhD,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAChE,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,KAAK,GAAG,QAAQ,CAAC;AAEpD,MAAM,WAAW,aAAa;IAC5B,oEAAoE;IACpE,UAAU,EAAE,MAAM,CAAC;IACnB,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,gEAAgE;IAChE,WAAW,EAAE,OAAO,CAAC;IACrB,yDAAyD;IACzD,MAAM,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,eAAe,EAAE,MAAM,CAAC;IACxB,4CAA4C;IAC5C,cAAc,EAAE,MAAM,CAAC;IACvB,sEAAsE;IACtE,wBAAwB,EAAE,MAAM,CAAC;IACjC,MAAM,EAAE,UAAU,CAAC;IACnB,mDAAmD;IACnD,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,CAAC,CAAC;IACX,cAAc,EAAE,WAAW,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;CAC9C;AAED,+DAA+D;AAC/D,eAAO,MAAM,YAAY,eAA2D,CAAC;AACrF,kEAAkE;AAClE,eAAO,MAAM,YAAY,eAA2D,CAAC;AAErF,eAAO,MAAM,cAAc,EAAE,WA8B5B,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,aAAa,CAAC;IACvB,iEAAiE;IACjE,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,QAAA,MAAM,GAAG,+DAA+D,CAAC;AAEzE,6EAA6E;AAC7E,wBAAgB,YAAY,IAAI,MAAM,CAUrC;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,YAAY,CAqCjE;AAED,yEAAyE;AACzE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,EAAE,CAuBhE;AAyCD,2EAA2E;AAC3E,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,aAAa,EACtB,SAAS,EAAE;IAAE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GACvF,aAAa,CA0Bf;AAMD,6EAA6E;AAC7E,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGhD;AAED,OAAO,EAAE,GAAG,IAAI,UAAU,EAAE,CAAC"}
|
package/dist/config.js
CHANGED
|
@@ -106,6 +106,11 @@ export function loadConfig(profileOverride) {
|
|
|
106
106
|
/** Directory and file permission checks, surfaced by `doctor` (§4.2). */
|
|
107
107
|
export function permissionWarnings(path) {
|
|
108
108
|
const warnings = [];
|
|
109
|
+
// NTFS permissions are ACLs; Node synthesizes the POSIX mode on Windows and
|
|
110
|
+
// reports the world-writable bit regardless of the real ACL, and chmod is a
|
|
111
|
+
// no-op there. The check would only ever be a false positive: skip it.
|
|
112
|
+
if (process.platform === "win32")
|
|
113
|
+
return warnings;
|
|
109
114
|
for (const [target, label] of [[path, "config file"], [daskiHome(), "state directory"]]) {
|
|
110
115
|
try {
|
|
111
116
|
const mode = statSync(target).mode;
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/gateway/catalog.ts"],"names":[],"mappings":"AAWA,OAAO,EAAc,KAAK,OAAO,EAAE,MAAM,MAAM,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAG3D,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/gateway/catalog.ts"],"names":[],"mappings":"AAWA,OAAO,EAAc,KAAK,OAAO,EAAE,MAAM,MAAM,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAG3D,OAAO,EAAE,aAAa,EAAyB,MAAM,aAAa,CAAC;AAEnE,gFAAgF;AAChF,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAavC,MAAM,WAAW,cAAc;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,eAAe,EAAE,OAAO,CAAC;IACzB,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;IAC1C,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,mBAAmB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,8DAA8D;IAC9D,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAC5C,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CACrD;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE;QACR,eAAe,EAAE,MAAM,CAAC;QACxB,SAAS,EAAE,MAAM,CAAC;QAClB,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE;YAAE,eAAe,CAAC,EAAE,MAAM,CAAA;SAAE,GAAG,SAAS,CAAC;KACrD,EAAE,CAAC;CACL;AA0BD;;;GAGG;AACH,qBAAa,OAAO;;gBAIN,MAAM,EAAE,aAAa,EAAE,GAAG,GAAE,MAAM,MAA6C;IAK3F,4EAA4E;IACtE,UAAU,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAwErF,8EAA8E;IACxE,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAmC7C,6DAA6D;IACvD,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAyB9F"}
|
package/dist/gateway/catalog.js
CHANGED
|
@@ -12,7 +12,7 @@ import { dirname, join } from "node:path";
|
|
|
12
12
|
import { getAddress } from "viem";
|
|
13
13
|
import { CliError } from "../cli/errors.js";
|
|
14
14
|
import { daskiHome } from "../paths.js";
|
|
15
|
-
import { GatewayClient } from "./client.js";
|
|
15
|
+
import { GatewayClient, unreadableResultError } from "./client.js";
|
|
16
16
|
/** How long catalog evidence stays fresh. Short: splitters can be re-listed. */
|
|
17
17
|
export const CATALOG_TTL_SECONDS = 300;
|
|
18
18
|
const cachePath = () => join(daskiHome(), "cache.json");
|
|
@@ -59,8 +59,26 @@ export class Catalog {
|
|
|
59
59
|
providerAgentId,
|
|
60
60
|
outcomeId,
|
|
61
61
|
});
|
|
62
|
+
// A success answer this client cannot read is a protocol mismatch, and
|
|
63
|
+
// saying "no such outcome" about it sent operators to a catalog that
|
|
64
|
+
// showed the outcome present and healthy (2026-09-03).
|
|
65
|
+
if (GatewayClient.unreadable(result))
|
|
66
|
+
throw unreadableResultError("daski_get_outcome", result);
|
|
62
67
|
const body = GatewayClient.json(result);
|
|
63
68
|
if (result.isError || !body) {
|
|
69
|
+
const gatewayCode = typeof body?.code === "string" ? body.code : "OUTCOME_NOT_FOUND";
|
|
70
|
+
if (gatewayCode !== "OUTCOME_NOT_FOUND") {
|
|
71
|
+
throw new CliError({
|
|
72
|
+
code: gatewayCode,
|
|
73
|
+
message: typeof body?.message === "string"
|
|
74
|
+
? body.message
|
|
75
|
+
: `The gateway refused daski_get_outcome for ${providerAgentId}/${outcomeId}.`,
|
|
76
|
+
remediation: typeof body?.next_action === "string"
|
|
77
|
+
? body.next_action
|
|
78
|
+
: "Run `daski doctor --json`, then retry.",
|
|
79
|
+
details: { gateway: body },
|
|
80
|
+
});
|
|
81
|
+
}
|
|
64
82
|
throw new CliError({
|
|
65
83
|
code: "DASKI_OUTCOME_NOT_FOUND",
|
|
66
84
|
message: `The gateway has no outcome ${providerAgentId}/${outcomeId}.`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/gateway/catalog.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAgB,MAAM,MAAM,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/gateway/catalog.ts"],"names":[],"mappings":"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"}
|
package/dist/gateway/client.d.ts
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import type { TransferAuthorization } from "@daski/x402-scheme";
|
|
2
|
+
import { CliError } from "../cli/errors.js";
|
|
2
3
|
export interface McpToolResult {
|
|
3
4
|
content: {
|
|
4
5
|
type: string;
|
|
5
6
|
text?: string;
|
|
6
7
|
}[];
|
|
7
8
|
isError?: boolean | undefined;
|
|
9
|
+
/** MCP structured tool output (spec 2025-06-18). The gateway carries every payload here. */
|
|
10
|
+
structuredContent?: unknown;
|
|
8
11
|
_meta?: Record<string, unknown> | undefined;
|
|
9
12
|
}
|
|
10
13
|
export interface GatewayCallLog {
|
|
@@ -65,11 +68,64 @@ export declare class GatewayClient {
|
|
|
65
68
|
availableTools(): Promise<Set<string>>;
|
|
66
69
|
hasTool(name: string): Promise<boolean>;
|
|
67
70
|
callTool(name: string, args: Record<string, unknown>, meta?: Record<string, unknown>): Promise<McpToolResult>;
|
|
68
|
-
/**
|
|
71
|
+
/**
|
|
72
|
+
* The tool result's JSON payload. `structuredContent` is authoritative when
|
|
73
|
+
* present (MCP structured tool output); the first JSON object in a text
|
|
74
|
+
* block is the compatibility fallback. From gateway v0.28.0 (2026-09-01)
|
|
75
|
+
* until the text copy was restored, ordinary results carried their payload
|
|
76
|
+
* in `structuredContent` alone with a one-line summary in text, so a reader
|
|
77
|
+
* that stopped at text saw nothing — and `@daski/pay` 0.1.0 did exactly that.
|
|
78
|
+
*/
|
|
69
79
|
static json(result: McpToolResult): Record<string, unknown> | undefined;
|
|
70
|
-
/**
|
|
80
|
+
/**
|
|
81
|
+
* The x402 challenge in a tool result. Three places, in order: the x402 MCP
|
|
82
|
+
* transport's `_meta["x402/payment-required"]`; the prepare tool's body,
|
|
83
|
+
* which nests the challenge under `paymentRequired` beside its `preflight`;
|
|
84
|
+
* and a bare PaymentRequired body, which the unpaid buy call returns.
|
|
85
|
+
*/
|
|
71
86
|
static challenge(result: McpToolResult): PaymentChallenge | undefined;
|
|
87
|
+
/** The prepare tool's `preflight` block, when the result carries one. */
|
|
88
|
+
static preflight(result: McpToolResult): Record<string, unknown> | undefined;
|
|
89
|
+
/**
|
|
90
|
+
* A success result whose payload this client cannot find. That is a
|
|
91
|
+
* protocol mismatch between the CLI and the gateway, never a refusal, and
|
|
92
|
+
* it must never be reported as "not found" or "rejected".
|
|
93
|
+
*/
|
|
94
|
+
static unreadable(result: McpToolResult): boolean;
|
|
72
95
|
}
|
|
96
|
+
/**
|
|
97
|
+
* What a result looked like, for an error report. Results carry no key
|
|
98
|
+
* material, so a bounded text preview is safe to print.
|
|
99
|
+
*/
|
|
100
|
+
export declare function describeResult(result: McpToolResult): Record<string, unknown>;
|
|
101
|
+
/**
|
|
102
|
+
* The gateway answered without an error and this CLI found no payload. The
|
|
103
|
+
* remediation depends on whether a signature has already left the process.
|
|
104
|
+
*/
|
|
105
|
+
export declare function unreadableResultError(toolName: string, result: McpToolResult, options?: {
|
|
106
|
+
afterSubmit?: boolean | undefined;
|
|
107
|
+
}): CliError;
|
|
108
|
+
export interface GatewayProtocolProbe {
|
|
109
|
+
reachable: boolean;
|
|
110
|
+
tools: string[];
|
|
111
|
+
/** The read-only tool whose payload this client could read, or null when none. */
|
|
112
|
+
readableVia: string | null;
|
|
113
|
+
error?: string | undefined;
|
|
114
|
+
}
|
|
115
|
+
/** The surface the probe needs, so `doctor` can be tested without a network. */
|
|
116
|
+
export interface ProbeTarget {
|
|
117
|
+
availableTools(): Promise<Set<string>>;
|
|
118
|
+
callTool(name: string, args: Record<string, unknown>): Promise<McpToolResult>;
|
|
119
|
+
close(): Promise<void>;
|
|
120
|
+
}
|
|
121
|
+
/**
|
|
122
|
+
* One read-only MCP round trip for `doctor`: list the tools, then read a
|
|
123
|
+
* payload through a read-only tool with this client's own parser. A gateway
|
|
124
|
+
* whose results this CLI cannot read blocks every purchase, and
|
|
125
|
+
* `/health/ready` cannot see that: on 2026-09-03 a CLI that passed doctor
|
|
126
|
+
* could not complete a single call.
|
|
127
|
+
*/
|
|
128
|
+
export declare function probeGatewayProtocol(target: ProbeTarget): Promise<GatewayProtocolProbe>;
|
|
73
129
|
/** Health and version, for `doctor`. Plain HTTP; no MCP session needed. */
|
|
74
130
|
export declare function readiness(gatewayUrl: string, timeoutMs?: number): Promise<{
|
|
75
131
|
reachable: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/gateway/client.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/gateway/client.ts"],"names":[],"mappings":"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"}
|
package/dist/gateway/client.js
CHANGED
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
import { Client } from "@modelcontextprotocol/sdk/client/index.js";
|
|
11
11
|
import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
|
|
12
12
|
import { CliError } from "../cli/errors.js";
|
|
13
|
+
import { CLI_VERSION } from "../version.js";
|
|
13
14
|
export class GatewayClient {
|
|
14
15
|
gatewayUrl;
|
|
15
16
|
#client;
|
|
@@ -29,7 +30,7 @@ export class GatewayClient {
|
|
|
29
30
|
return;
|
|
30
31
|
const client = new Client({
|
|
31
32
|
name: this.#options.clientName ?? "daski-pay",
|
|
32
|
-
version: this.#options.clientVersion ??
|
|
33
|
+
version: this.#options.clientVersion ?? CLI_VERSION,
|
|
33
34
|
});
|
|
34
35
|
try {
|
|
35
36
|
await client.connect(new StreamableHTTPClientTransport(new URL(`${this.gatewayUrl}/mcp`)));
|
|
@@ -83,16 +84,24 @@ export class GatewayClient {
|
|
|
83
84
|
});
|
|
84
85
|
return result;
|
|
85
86
|
}
|
|
86
|
-
/**
|
|
87
|
+
/**
|
|
88
|
+
* The tool result's JSON payload. `structuredContent` is authoritative when
|
|
89
|
+
* present (MCP structured tool output); the first JSON object in a text
|
|
90
|
+
* block is the compatibility fallback. From gateway v0.28.0 (2026-09-01)
|
|
91
|
+
* until the text copy was restored, ordinary results carried their payload
|
|
92
|
+
* in `structuredContent` alone with a one-line summary in text, so a reader
|
|
93
|
+
* that stopped at text saw nothing — and `@daski/pay` 0.1.0 did exactly that.
|
|
94
|
+
*/
|
|
87
95
|
static json(result) {
|
|
96
|
+
if (isRecord(result.structuredContent))
|
|
97
|
+
return result.structuredContent;
|
|
88
98
|
for (const item of result.content ?? []) {
|
|
89
99
|
if (item.type !== "text" || typeof item.text !== "string")
|
|
90
100
|
continue;
|
|
91
101
|
try {
|
|
92
102
|
const parsed = JSON.parse(item.text);
|
|
93
|
-
if (
|
|
103
|
+
if (isRecord(parsed))
|
|
94
104
|
return parsed;
|
|
95
|
-
}
|
|
96
105
|
}
|
|
97
106
|
catch {
|
|
98
107
|
// Non-JSON text content is informational; keep looking.
|
|
@@ -100,11 +109,110 @@ export class GatewayClient {
|
|
|
100
109
|
}
|
|
101
110
|
return undefined;
|
|
102
111
|
}
|
|
103
|
-
/**
|
|
112
|
+
/**
|
|
113
|
+
* The x402 challenge in a tool result. Three places, in order: the x402 MCP
|
|
114
|
+
* transport's `_meta["x402/payment-required"]`; the prepare tool's body,
|
|
115
|
+
* which nests the challenge under `paymentRequired` beside its `preflight`;
|
|
116
|
+
* and a bare PaymentRequired body, which the unpaid buy call returns.
|
|
117
|
+
*/
|
|
104
118
|
static challenge(result) {
|
|
105
119
|
const fromMeta = result._meta?.["x402/payment-required"];
|
|
106
|
-
|
|
107
|
-
|
|
120
|
+
if (isChallenge(fromMeta))
|
|
121
|
+
return fromMeta;
|
|
122
|
+
const body = GatewayClient.json(result);
|
|
123
|
+
const nested = body?.paymentRequired;
|
|
124
|
+
if (isChallenge(nested))
|
|
125
|
+
return nested;
|
|
126
|
+
return isChallenge(body) ? body : undefined;
|
|
127
|
+
}
|
|
128
|
+
/** The prepare tool's `preflight` block, when the result carries one. */
|
|
129
|
+
static preflight(result) {
|
|
130
|
+
const body = GatewayClient.json(result);
|
|
131
|
+
const preflight = body?.preflight;
|
|
132
|
+
return isRecord(preflight) ? preflight : undefined;
|
|
133
|
+
}
|
|
134
|
+
/**
|
|
135
|
+
* A success result whose payload this client cannot find. That is a
|
|
136
|
+
* protocol mismatch between the CLI and the gateway, never a refusal, and
|
|
137
|
+
* it must never be reported as "not found" or "rejected".
|
|
138
|
+
*/
|
|
139
|
+
static unreadable(result) {
|
|
140
|
+
return !result.isError && GatewayClient.json(result) === undefined;
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
function isRecord(value) {
|
|
144
|
+
return Boolean(value) && typeof value === "object" && !Array.isArray(value);
|
|
145
|
+
}
|
|
146
|
+
function isChallenge(value) {
|
|
147
|
+
return isRecord(value) && Array.isArray(value.accepts);
|
|
148
|
+
}
|
|
149
|
+
/**
|
|
150
|
+
* What a result looked like, for an error report. Results carry no key
|
|
151
|
+
* material, so a bounded text preview is safe to print.
|
|
152
|
+
*/
|
|
153
|
+
export function describeResult(result) {
|
|
154
|
+
const content = result.content ?? [];
|
|
155
|
+
return {
|
|
156
|
+
isError: Boolean(result.isError),
|
|
157
|
+
hasStructuredContent: isRecord(result.structuredContent),
|
|
158
|
+
contentTypes: content.map((item) => item.type),
|
|
159
|
+
textPreview: content
|
|
160
|
+
.filter((item) => item.type === "text" && typeof item.text === "string")
|
|
161
|
+
.map((item) => item.text.slice(0, 200)),
|
|
162
|
+
};
|
|
163
|
+
}
|
|
164
|
+
/**
|
|
165
|
+
* The gateway answered without an error and this CLI found no payload. The
|
|
166
|
+
* remediation depends on whether a signature has already left the process.
|
|
167
|
+
*/
|
|
168
|
+
export function unreadableResultError(toolName, result, options = {}) {
|
|
169
|
+
return new CliError({
|
|
170
|
+
code: "DASKI_GATEWAY_RESULT_UNREADABLE",
|
|
171
|
+
message: `The gateway answered ${toolName} without an error, but this CLI found no JSON ` +
|
|
172
|
+
"payload in the result: neither structuredContent nor a JSON text block.",
|
|
173
|
+
remediation: options.afterSubmit
|
|
174
|
+
? "Do not re-run `daski buy`: the signature was submitted and the payment may have " +
|
|
175
|
+
"settled. The intent is recorded in the order store. Upgrade to the @daski/pay " +
|
|
176
|
+
"version the gateway's /skills/setup.md pins, run `daski doctor --json`, and " +
|
|
177
|
+
"check the payer's order history before any new purchase."
|
|
178
|
+
: "Nothing was signed. This CLI and the gateway disagree about the result shape: " +
|
|
179
|
+
"upgrade to the @daski/pay version the gateway's /skills/setup.md pins, then " +
|
|
180
|
+
"re-run `daski doctor --json`, which checks that gateway results are readable.",
|
|
181
|
+
details: { tool: toolName, gateway: describeResult(result) },
|
|
182
|
+
});
|
|
183
|
+
}
|
|
184
|
+
/**
|
|
185
|
+
* One read-only MCP round trip for `doctor`: list the tools, then read a
|
|
186
|
+
* payload through a read-only tool with this client's own parser. A gateway
|
|
187
|
+
* whose results this CLI cannot read blocks every purchase, and
|
|
188
|
+
* `/health/ready` cannot see that: on 2026-09-03 a CLI that passed doctor
|
|
189
|
+
* could not complete a single call.
|
|
190
|
+
*/
|
|
191
|
+
export async function probeGatewayProtocol(target) {
|
|
192
|
+
try {
|
|
193
|
+
const tools = [...await target.availableTools()].sort();
|
|
194
|
+
const attempts = [
|
|
195
|
+
["daski_get_setup_guide", { topic: "setup" }, (body) => typeof body.markdown === "string"],
|
|
196
|
+
["daski_list_outcomes", { limit: 1 }, (body) => Array.isArray(body.outcomes)],
|
|
197
|
+
];
|
|
198
|
+
let readableVia = null;
|
|
199
|
+
for (const [name, args, accept] of attempts) {
|
|
200
|
+
if (!tools.includes(name))
|
|
201
|
+
continue;
|
|
202
|
+
const result = await target.callTool(name, args);
|
|
203
|
+
const body = GatewayClient.json(result);
|
|
204
|
+
if (!result.isError && body && accept(body)) {
|
|
205
|
+
readableVia = name;
|
|
206
|
+
break;
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
return { reachable: true, tools, readableVia };
|
|
210
|
+
}
|
|
211
|
+
catch (error) {
|
|
212
|
+
return { reachable: false, tools: [], readableVia: null, error: error.message };
|
|
213
|
+
}
|
|
214
|
+
finally {
|
|
215
|
+
await target.close().catch(() => undefined);
|
|
108
216
|
}
|
|
109
217
|
}
|
|
110
218
|
/** Health and version, for `doctor`. Plain HTTP; no MCP session needed. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/gateway/client.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAEnG,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/gateway/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../src/gateway/lifecycle.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAKL,KAAK,WAAW,EAChB,KAAK,aAAa,EACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,
|
|
1
|
+
{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../src/gateway/lifecycle.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAKL,KAAK,WAAW,EAChB,KAAK,aAAa,EACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAEL,aAAa,EAGd,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,aAAa,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,mDAAmD;IACnD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAiClC;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,aAAa,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA2BlC"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { orderActionTypedData, validateOrderActionChallenge, validateWalletActionChallenge, walletActionTypedData, } from "@daski/x402-scheme";
|
|
9
9
|
import { CliError } from "../cli/errors.js";
|
|
10
|
-
import { GatewayClient } from "./client.js";
|
|
10
|
+
import { describeResult, GatewayClient, unreadableResultError, } from "./client.js";
|
|
11
11
|
/**
|
|
12
12
|
* Runs one authorized lifecycle call. Two gateway calls: the challenge, then
|
|
13
13
|
* the authorized retry.
|
|
@@ -31,6 +31,7 @@ export async function callAuthorizedLifecycleTool(options) {
|
|
|
31
31
|
action: options.action,
|
|
32
32
|
gatewayUrl: options.gatewayUrl,
|
|
33
33
|
request,
|
|
34
|
+
chainId: options.chainId,
|
|
34
35
|
...(options.nowSeconds === undefined ? {} : { nowSeconds: options.nowSeconds }),
|
|
35
36
|
});
|
|
36
37
|
const signature = await options.signer.signTypedData(orderActionTypedData(challenge, options.chainId, options.gatewayUrl));
|
|
@@ -79,6 +80,9 @@ export async function callWalletQuery(options) {
|
|
|
79
80
|
return body;
|
|
80
81
|
}
|
|
81
82
|
function lifecycleFailure(toolName, result) {
|
|
83
|
+
// No payload in a success answer is a shape disagreement, not a refusal.
|
|
84
|
+
if (GatewayClient.unreadable(result))
|
|
85
|
+
return unreadableResultError(toolName, result);
|
|
82
86
|
const body = GatewayClient.json(result);
|
|
83
87
|
const code = typeof body?.code === "string" ? body.code : "DASKI_LIFECYCLE_CALL_FAILED";
|
|
84
88
|
const message = typeof body?.message === "string"
|
|
@@ -90,7 +94,7 @@ function lifecycleFailure(toolName, result) {
|
|
|
90
94
|
remediation: typeof body?.next_action === "string"
|
|
91
95
|
? body.next_action
|
|
92
96
|
: `Run \`daski order status <handle>\` to see the order's current state.`,
|
|
93
|
-
details: { tool: toolName, gateway: body ??
|
|
97
|
+
details: { tool: toolName, gateway: body ?? describeResult(result) },
|
|
94
98
|
});
|
|
95
99
|
}
|
|
96
100
|
//# sourceMappingURL=lifecycle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/gateway/lifecycle.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,6BAA6B,EAC7B,qBAAqB,GAGtB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/gateway/lifecycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { type Address } from "viem";
|
|
|
3
3
|
import { CliError } from "../cli/errors.js";
|
|
4
4
|
import { updateOrder, type OrderRecord } from "../store/orders.js";
|
|
5
5
|
import { GatewayClient, type McpToolResult, type PaymentChallenge, type PaymentRequirement, type PaymentSubmission } from "./client.js";
|
|
6
|
-
/** The
|
|
6
|
+
/** The read-only prepare tool. A gateway without it serves the same challenge through an unpaid buy call. */
|
|
7
7
|
export declare const CHALLENGE_TOOL = "daski_get_payment_challenge";
|
|
8
8
|
export declare const BUY_TOOL = "daski_buy_outcome";
|
|
9
9
|
export interface ChallengeResult {
|
|
@@ -12,6 +12,8 @@ export interface ChallengeResult {
|
|
|
12
12
|
binding: OrderBinding | undefined;
|
|
13
13
|
/** True when the spec-01 challenge tool served this. */
|
|
14
14
|
viaChallengeTool: boolean;
|
|
15
|
+
/** The prepare tool's balance and eligibility preflight, when it served one. */
|
|
16
|
+
preflight?: Record<string, unknown> | undefined;
|
|
15
17
|
}
|
|
16
18
|
/** A fresh reconciliation key. Also the idempotency key the gateway echoes. */
|
|
17
19
|
export declare function newIntentId(): string;
|
|
@@ -113,7 +115,14 @@ export declare function listPayerOrders(options: {
|
|
|
113
115
|
/** Records the intent before signing, so an interruption is recoverable. */
|
|
114
116
|
export declare function recordIntent(record: Omit<OrderRecord, "createdAt" | "updatedAt">): OrderRecord;
|
|
115
117
|
export { updateOrder };
|
|
116
|
-
|
|
118
|
+
/**
|
|
119
|
+
* The gateway's answer to a purchase step, as an operator-facing error. An
|
|
120
|
+
* unreadable success is reported as the protocol mismatch it is, and the
|
|
121
|
+
* response is always attached — `gateway: null` sent operators in circles.
|
|
122
|
+
*/
|
|
123
|
+
export declare function purchaseFailure(result: McpToolResult, options?: {
|
|
124
|
+
afterSubmit?: boolean | undefined;
|
|
125
|
+
}): CliError;
|
|
117
126
|
/** Human-readable price, for approval prompts and receipts. */
|
|
118
127
|
export declare function priceLine(amountAtomic: bigint): string;
|
|
119
128
|
//# sourceMappingURL=purchase.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"purchase.d.ts","sourceRoot":"","sources":["../../src/gateway/purchase.ts"],"names":[],"mappings":"AAqBA,OAAO,EAOL,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,aAAa,EACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAc,KAAK,OAAO,EAAE,MAAM,MAAM,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAEL,WAAW,EAEX,KAAK,WAAW,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,
|
|
1
|
+
{"version":3,"file":"purchase.d.ts","sourceRoot":"","sources":["../../src/gateway/purchase.ts"],"names":[],"mappings":"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"}
|
package/dist/gateway/purchase.js
CHANGED
|
@@ -23,9 +23,9 @@ import { bindingFromExtensions, formatUsdc, paymentEchoExtensions, transferWithA
|
|
|
23
23
|
import { getAddress } from "viem";
|
|
24
24
|
import { CliError } from "../cli/errors.js";
|
|
25
25
|
import { findByIntent, updateOrder, upsertOrder, } from "../store/orders.js";
|
|
26
|
-
import { GatewayClient, } from "./client.js";
|
|
26
|
+
import { describeResult, GatewayClient, unreadableResultError, } from "./client.js";
|
|
27
27
|
import { callWalletQuery } from "./lifecycle.js";
|
|
28
|
-
/** The
|
|
28
|
+
/** The read-only prepare tool. A gateway without it serves the same challenge through an unpaid buy call. */
|
|
29
29
|
export const CHALLENGE_TOOL = "daski_get_payment_challenge";
|
|
30
30
|
export const BUY_TOOL = "daski_buy_outcome";
|
|
31
31
|
/** A fresh reconciliation key. Also the idempotency key the gateway echoes. */
|
|
@@ -46,8 +46,14 @@ export async function requestChallenge(options) {
|
|
|
46
46
|
})
|
|
47
47
|
: await client.callTool(BUY_TOOL, { providerAgentId, outcomeId, request });
|
|
48
48
|
const challenge = GatewayClient.challenge(result);
|
|
49
|
-
if (!challenge)
|
|
49
|
+
if (!challenge) {
|
|
50
|
+
// A success answer with no payload this client can read is a protocol
|
|
51
|
+
// mismatch, not a refusal; say so instead of "the gateway rejected it".
|
|
52
|
+
if (GatewayClient.unreadable(result)) {
|
|
53
|
+
throw unreadableResultError(viaChallengeTool ? CHALLENGE_TOOL : BUY_TOOL, result);
|
|
54
|
+
}
|
|
50
55
|
throw purchaseFailure(result);
|
|
56
|
+
}
|
|
51
57
|
const requirement = challenge.accepts[0];
|
|
52
58
|
if (!requirement) {
|
|
53
59
|
throw new CliError({
|
|
@@ -61,6 +67,7 @@ export async function requestChallenge(options) {
|
|
|
61
67
|
requirement,
|
|
62
68
|
binding: bindingFromExtensions(challenge.extensions),
|
|
63
69
|
viaChallengeTool,
|
|
70
|
+
preflight: GatewayClient.preflight(result),
|
|
64
71
|
};
|
|
65
72
|
}
|
|
66
73
|
/**
|
|
@@ -229,18 +236,27 @@ export function recordIntent(record) {
|
|
|
229
236
|
return upsertOrder({ ...record, createdAt: now, updatedAt: now });
|
|
230
237
|
}
|
|
231
238
|
export { updateOrder };
|
|
232
|
-
|
|
239
|
+
/**
|
|
240
|
+
* The gateway's answer to a purchase step, as an operator-facing error. An
|
|
241
|
+
* unreadable success is reported as the protocol mismatch it is, and the
|
|
242
|
+
* response is always attached — `gateway: null` sent operators in circles.
|
|
243
|
+
*/
|
|
244
|
+
export function purchaseFailure(result, options = {}) {
|
|
245
|
+
if (GatewayClient.unreadable(result))
|
|
246
|
+
return unreadableResultError(BUY_TOOL, result, options);
|
|
233
247
|
const body = GatewayClient.json(result);
|
|
234
248
|
const code = typeof body?.code === "string" ? body.code : "DASKI_PURCHASE_FAILED";
|
|
249
|
+
const fallbackRemediation = options.afterSubmit
|
|
250
|
+
? "The signature was submitted: do not re-run `daski buy` until the recorded intent " +
|
|
251
|
+
"is reconciled. The gateway's response is under `gateway` in this error."
|
|
252
|
+
: "Nothing was signed. The gateway's response is under `gateway` in this error.";
|
|
235
253
|
return new CliError({
|
|
236
254
|
code,
|
|
237
255
|
message: typeof body?.message === "string"
|
|
238
256
|
? body.message
|
|
239
257
|
: "The gateway rejected the purchase.",
|
|
240
|
-
remediation: typeof body?.next_action === "string"
|
|
241
|
-
|
|
242
|
-
: "Re-run with --json to see the gateway's full response.",
|
|
243
|
-
details: { gateway: body ?? null },
|
|
258
|
+
remediation: typeof body?.next_action === "string" ? body.next_action : fallbackRemediation,
|
|
259
|
+
details: { gateway: body ?? describeResult(result) },
|
|
244
260
|
});
|
|
245
261
|
}
|
|
246
262
|
/** Human-readable price, for approval prompts and receipts. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"purchase.js","sourceRoot":"","sources":["../../src/gateway/purchase.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EACL,qBAAqB,EACrB,UAAU,EACV,qBAAqB,EACrB,kCAAkC,EAClC,6BAA6B,EAC7B,qBAAqB,GAItB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAgB,MAAM,MAAM,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,YAAY,EACZ,WAAW,EACX,WAAW,GAEZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,aAAa,
|
|
1
|
+
{"version":3,"file":"purchase.js","sourceRoot":"","sources":["../../src/gateway/purchase.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@daski/pay",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.1",
|
|
4
4
|
"description": "The Daski buyer bridge CLI. Server proposes, the bridge validates and recomputes, the wallet signs, the gateway never sees the key.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"prepublishOnly": "npm run build"
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@daski/x402-scheme": "0.1.
|
|
47
|
+
"@daski/x402-scheme": "0.1.1",
|
|
48
48
|
"@modelcontextprotocol/sdk": "1.30.0",
|
|
49
49
|
"@x402/core": "2.24.0",
|
|
50
50
|
"viem": "2.21.55"
|