@harrylabsj/kiwi 0.6.0 → 0.6.2
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 +21 -0
- package/contracts/candidate-agent-dto-1.0.README.md +12 -8
- package/contracts/conformance/python-service/README.md +19 -0
- package/contracts/conformance/python-service/run.py +134 -0
- package/contracts/kiwi-catalog/1.0/listing-record.schema.json +11 -1
- package/contracts/kiwi-contracts.lock.json +7 -0
- package/contracts/manifest.json +61 -0
- package/contracts/vectors/candidate-agent.invalid-private-field.json +7 -0
- package/contracts/vectors/candidate-agent.valid.json +26 -0
- package/dist/a2a/client/client.js +39 -34
- package/dist/a2a/client/client.js.map +1 -1
- package/dist/a2a/client/url-policy.d.ts +8 -1
- package/dist/a2a/client/url-policy.js +18 -2
- package/dist/a2a/client/url-policy.js.map +1 -1
- package/dist/a2a/clock.d.ts +30 -0
- package/dist/a2a/clock.js +39 -0
- package/dist/a2a/clock.js.map +1 -0
- package/dist/a2a/negotiate.d.ts +6 -0
- package/dist/a2a/negotiate.js +10 -12
- package/dist/a2a/negotiate.js.map +1 -1
- package/dist/a2a/node.d.ts +23 -3
- package/dist/a2a/node.js +128 -18
- package/dist/a2a/node.js.map +1 -1
- package/dist/a2a/server/merchant-handler.d.ts +4 -0
- package/dist/a2a/server/merchant-handler.js +238 -25
- package/dist/a2a/server/merchant-handler.js.map +1 -1
- package/dist/a2a/server/pipeline.d.ts +17 -0
- package/dist/a2a/server/pipeline.js +89 -1
- package/dist/a2a/server/pipeline.js.map +1 -1
- package/dist/a2a/server/ucp.d.ts +30 -2
- package/dist/a2a/server/ucp.js +23 -14
- package/dist/a2a/server/ucp.js.map +1 -1
- package/dist/agent/agent-db.js +5 -0
- package/dist/agent/agent-db.js.map +1 -1
- package/dist/agent/buyer/buyer-tools.d.ts +5 -0
- package/dist/agent/buyer/buyer-tools.js +8 -1
- package/dist/agent/buyer/buyer-tools.js.map +1 -1
- package/dist/agent/buyer/types.d.ts +0 -25
- package/dist/agent/buyer/types.js.map +1 -1
- package/dist/agent/kernel-builder.d.ts +27 -0
- package/dist/agent/kernel-builder.js +180 -0
- package/dist/agent/kernel-builder.js.map +1 -0
- package/dist/agent/kernel.d.ts +6 -0
- package/dist/agent/kernel.js +95 -8
- package/dist/agent/kernel.js.map +1 -1
- package/dist/agent/memory/store.d.ts +5 -0
- package/dist/agent/memory/store.js +29 -1
- package/dist/agent/memory/store.js.map +1 -1
- package/dist/agent/merchant/action-candidate.js +15 -1
- package/dist/agent/merchant/action-candidate.js.map +1 -1
- package/dist/agent/merchant/merchant-client.js +22 -4
- package/dist/agent/merchant/merchant-client.js.map +1 -1
- package/dist/agent/merchant/types.d.ts +5 -2
- package/dist/agent/merchant/types.js +6 -2
- package/dist/agent/merchant/types.js.map +1 -1
- package/dist/agent/negotiation-chat.js +34 -14
- package/dist/agent/negotiation-chat.js.map +1 -1
- package/dist/cli.d.ts +56 -0
- package/dist/cli.js +141 -156
- package/dist/cli.js.map +1 -1
- package/dist/commerce/data-source.d.ts +7 -3
- package/dist/commerce/data-source.js.map +1 -1
- package/dist/commerce/http-client.js +35 -31
- package/dist/commerce/http-client.js.map +1 -1
- package/dist/commerce/shopping-cli-source.js +66 -48
- package/dist/commerce/shopping-cli-source.js.map +1 -1
- package/dist/config/profile.d.ts +7 -0
- package/dist/config/profile.js +23 -0
- package/dist/config/profile.js.map +1 -1
- package/dist/counterparty/a2a-direct/index.d.ts +5 -0
- package/dist/counterparty/a2a-direct/index.js +24 -0
- package/dist/counterparty/a2a-direct/index.js.map +1 -1
- package/dist/counterparty/shopping-cli-hosted/index.js +52 -19
- package/dist/counterparty/shopping-cli-hosted/index.js.map +1 -1
- package/dist/discovery/catalog-source/kiwi-record.d.ts +3 -0
- package/dist/discovery/catalog-source/kiwi-record.js.map +1 -1
- package/dist/discovery/catalog-source/kiwi-source.js +46 -36
- package/dist/discovery/catalog-source/kiwi-source.js.map +1 -1
- package/dist/discovery/catalog-source/register.d.ts +6 -0
- package/dist/discovery/catalog-source/register.js +27 -8
- package/dist/discovery/catalog-source/register.js.map +1 -1
- package/dist/discovery/catalog-source/source.js +39 -35
- package/dist/discovery/catalog-source/source.js.map +1 -1
- package/dist/discovery/resolve.d.ts +15 -0
- package/dist/discovery/resolve.js +59 -35
- package/dist/discovery/resolve.js.map +1 -1
- package/dist/discovery/ucp/index.d.ts +1 -1
- package/dist/discovery/ucp/index.js +1 -1
- package/dist/discovery/ucp/index.js.map +1 -1
- package/dist/discovery/ucp/resolver.d.ts +5 -0
- package/dist/discovery/ucp/resolver.js +65 -38
- package/dist/discovery/ucp/resolver.js.map +1 -1
- package/dist/discovery/ucp/vendor.d.ts +1 -1
- package/dist/discovery/ucp/vendor.js +1 -1
- package/dist/handoff/delivery.d.ts +4 -2
- package/dist/handoff/delivery.js +6 -1
- package/dist/handoff/delivery.js.map +1 -1
- package/dist/handoff/errors.d.ts +1 -1
- package/dist/handoff/errors.js +1 -0
- package/dist/handoff/errors.js.map +1 -1
- package/dist/handoff/idempotency.d.ts +10 -1
- package/dist/handoff/idempotency.js +13 -3
- package/dist/handoff/idempotency.js.map +1 -1
- package/dist/handoff/index.d.ts +1 -1
- package/dist/handoff/index.js +1 -1
- package/dist/handoff/index.js.map +1 -1
- package/dist/handoff/ledger.d.ts +9 -0
- package/dist/handoff/ledger.js +66 -0
- package/dist/handoff/ledger.js.map +1 -1
- package/dist/handoff/transaction.d.ts +21 -3
- package/dist/handoff/transaction.js +50 -11
- package/dist/handoff/transaction.js.map +1 -1
- package/dist/handoff/ucp-checkout/channel.js +15 -10
- package/dist/handoff/ucp-checkout/channel.js.map +1 -1
- package/dist/negotiation/jcs.js +11 -8
- package/dist/negotiation/jcs.js.map +1 -1
- package/dist/negotiation/lease/store.d.ts +25 -0
- package/dist/negotiation/lease/store.js +101 -0
- package/dist/negotiation/lease/store.js.map +1 -0
- package/dist/negotiation/recovery/recover.js +25 -1
- package/dist/negotiation/recovery/recover.js.map +1 -1
- package/dist/negotiation/state/phase.js +12 -4
- package/dist/negotiation/state/phase.js.map +1 -1
- package/dist/operator/runner.d.ts +11 -0
- package/dist/operator/runner.js +20 -1
- package/dist/operator/runner.js.map +1 -1
- package/dist/product-catalog.d.ts +43 -0
- package/dist/product-catalog.js +60 -0
- package/dist/product-catalog.js.map +1 -0
- package/dist/product-cli.d.ts +1 -1
- package/dist/product-cli.js +1 -1
- package/dist/product-publish.d.ts +15 -17
- package/dist/product-publish.js +279 -46
- package/dist/product-publish.js.map +1 -1
- package/dist/supervisor/stack-config.d.ts +6 -1
- package/dist/supervisor/stack-config.js +11 -3
- package/dist/supervisor/stack-config.js.map +1 -1
- package/dist/trust/identity/message-signature.js +17 -0
- package/dist/trust/identity/message-signature.js.map +1 -1
- package/dist/weixin/channel.d.ts +89 -0
- package/dist/weixin/channel.js +370 -0
- package/dist/weixin/channel.js.map +1 -0
- package/dist/weixin/cli-weixin.d.ts +29 -0
- package/dist/weixin/cli-weixin.js +130 -0
- package/dist/weixin/cli-weixin.js.map +1 -0
- package/dist/weixin/credentials.d.ts +33 -0
- package/dist/weixin/credentials.js +107 -0
- package/dist/weixin/credentials.js.map +1 -0
- package/dist/weixin/ilink-client.d.ts +44 -0
- package/dist/weixin/ilink-client.js +287 -0
- package/dist/weixin/ilink-client.js.map +1 -0
- package/dist/weixin/login.d.ts +37 -0
- package/dist/weixin/login.js +93 -0
- package/dist/weixin/login.js.map +1 -0
- package/dist/weixin/qr.d.ts +26 -0
- package/dist/weixin/qr.js +525 -0
- package/dist/weixin/qr.js.map +1 -0
- package/dist/weixin/types.d.ts +114 -0
- package/dist/weixin/types.js +48 -0
- package/dist/weixin/types.js.map +1 -0
- package/package.json +12 -2
- package/dist/commerce/erp-source.d.ts +0 -51
- package/dist/commerce/erp-source.js +0 -184
- package/dist/commerce/erp-source.js.map +0 -1
- package/dist/commerce/local-db-source.d.ts +0 -50
- package/dist/commerce/local-db-source.js +0 -162
- package/dist/commerce/local-db-source.js.map +0 -1
package/dist/handoff/delivery.js
CHANGED
|
@@ -84,8 +84,13 @@ const DELIVERY_TRANSITIONS = {
|
|
|
84
84
|
EXPIRED: new Set(),
|
|
85
85
|
REVOKED: new Set(),
|
|
86
86
|
};
|
|
87
|
-
/** 迁移校验:非法转换抛 schemaError(fail-closed)。
|
|
87
|
+
/** 迁移校验:非法转换抛 schemaError(fail-closed)。
|
|
88
|
+
* `handoff_delivery_failed` 是审计事件(KTH rev0.3 §9:交付失败在 handoff
|
|
89
|
+
* 创建前落账),不产生观察状态、保留前态——不参与迁移校验。 */
|
|
88
90
|
export function transitionDeliveryState(current, eventKind) {
|
|
91
|
+
if (eventKind === "handoff_delivery_failed") {
|
|
92
|
+
return current;
|
|
93
|
+
}
|
|
89
94
|
const target = DELIVERY_EVENT_TO_STATE[eventKind];
|
|
90
95
|
if (target === undefined) {
|
|
91
96
|
throw schemaError("handoff_delivery_state", `event kind ${eventKind} has no delivery state mapping`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery.js","sourceRoot":"","sources":["../../src/handoff/delivery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAS1G,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,WAAW;IACX,UAAU;IACV,kBAAkB;IAClB,SAAS;IACT,SAAS;CACD,CAAC;AAIX,gDAAgD;AAChD,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,gBAAgB;IAChB,mBAAmB;IACnB,mBAAmB;IACnB,qBAAqB;CACb,CAAC;AAYX,oDAAoD;AACpD,iDAAiD;AACjD,MAAM,uBAAuB,GAA8E;IACzG,iBAAiB,EAAE,WAAW;IAC9B,gBAAgB,EAAE,UAAU;IAC5B,wBAAwB,EAAE,kBAAkB;IAC5C,eAAe,EAAE,SAAS;IAC1B,eAAe,EAAE,SAAS;CAC3B,CAAC;AAEF,uCAAuC;AACvC,MAAM,UAAU,aAAa,CAC3B,MAA+D;IAE/D,IAAI,KAAuC,CAAC;IAC5C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,UAAU,CAAC;YAAE,SAAS;QAC5D,MAAM,IAAI,GAAG,uBAAuB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,IAAI,KAAK,SAAS;YAAE,KAAK,GAAG,IAAI,CAAC;IACvC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,oBAAoB,GAEtB;IACF,EAAE,EAAE,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1B,SAAS,EAAE,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,kBAAkB,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAC1E,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC,kBAAkB,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAC7D,gBAAgB,EAAE,IAAI,GAAG,EAAE;IAC3B,OAAO,EAAE,IAAI,GAAG,EAAE;IAClB,OAAO,EAAE,IAAI,GAAG,EAAE;CACnB,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"delivery.js","sourceRoot":"","sources":["../../src/handoff/delivery.ts"],"names":[],"mappings":"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"}
|
package/dist/handoff/errors.d.ts
CHANGED
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
*
|
|
25
25
|
* 代码与协议错误词表(§18)保持对齐,`terms_digest_mismatch` 直接复用 KNP 词表。
|
|
26
26
|
*/
|
|
27
|
-
export declare const HANDOFF_ERROR_CODES: readonly ["terms_digest_mismatch", "invalid_agreement", "invalid_authorization", "invalid_session", "invalid_input", "concurrency_lock_timeout"];
|
|
27
|
+
export declare const HANDOFF_ERROR_CODES: readonly ["terms_digest_mismatch", "invalid_agreement", "invalid_authorization", "invalid_session", "invalid_input", "concurrency_lock_timeout", "handoff_idempotency_conflict"];
|
|
28
28
|
export type HandoffErrorCode = (typeof HANDOFF_ERROR_CODES)[number];
|
|
29
29
|
/** Handoff 工件/授权对象构造失败。`path` 为字段路径(JSON Pointer 风格)。 */
|
|
30
30
|
export declare class HandoffError extends Error {
|
package/dist/handoff/errors.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/handoff/errors.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;GAUG;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,uBAAuB;IACvB,mBAAmB;IACnB,uBAAuB;IACvB,iBAAiB;IACjB,eAAe;IACf,0BAA0B;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/handoff/errors.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;GAUG;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,uBAAuB;IACvB,mBAAmB;IACnB,uBAAuB;IACvB,iBAAiB;IACjB,eAAe;IACf,0BAA0B;IAC1B,8BAA8B;CACtB,CAAC;AAGX,yDAAyD;AACzD,MAAM,OAAO,YAAa,SAAQ,KAAK;IAC5B,IAAI,CAAmB;IACvB,IAAI,CAAU;IACvB,YAAY,IAAsB,EAAE,OAAe,EAAE,IAAa;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,IAAI,KAAK,SAAS;YAAE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAC3C,CAAC;CACF"}
|
|
@@ -39,9 +39,18 @@ export declare class HandoffIdempotencyStore {
|
|
|
39
39
|
* 等待方超时(fail-closed:抛 HandoffError,绝不并发执行)。
|
|
40
40
|
*/
|
|
41
41
|
withCandidateLock<T>(candidateId: string, fn: () => Promise<T>): Promise<T>;
|
|
42
|
-
/**
|
|
42
|
+
/**
|
|
43
|
+
* 幂等查询(KTH §10.1):
|
|
44
|
+
* - 同候选同 digest 已交付 → `{ status: "hit", handoff_id }`;
|
|
45
|
+
* - 同候选**异 digest**(内容被篡改/重建不匹配)→ `{ status: "conflict" }`
|
|
46
|
+
* (调用方必须 fail-closed,见 `handoff_idempotency_conflict`);
|
|
47
|
+
* - 无记录 → undefined。
|
|
48
|
+
*/
|
|
43
49
|
lookup(candidateId: string, candidateDigest: string): {
|
|
50
|
+
status: "hit";
|
|
44
51
|
handoff_id: string;
|
|
52
|
+
} | {
|
|
53
|
+
status: "conflict";
|
|
45
54
|
} | undefined;
|
|
46
55
|
/** 记录一次成功交付(幂等键 → handoff_id)。 */
|
|
47
56
|
record(candidateId: string, candidateDigest: string, handoffId: string): void;
|
|
@@ -101,14 +101,24 @@ export class HandoffIdempotencyStore {
|
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
|
-
/**
|
|
104
|
+
/**
|
|
105
|
+
* 幂等查询(KTH §10.1):
|
|
106
|
+
* - 同候选同 digest 已交付 → `{ status: "hit", handoff_id }`;
|
|
107
|
+
* - 同候选**异 digest**(内容被篡改/重建不匹配)→ `{ status: "conflict" }`
|
|
108
|
+
* (调用方必须 fail-closed,见 `handoff_idempotency_conflict`);
|
|
109
|
+
* - 无记录 → undefined。
|
|
110
|
+
*/
|
|
105
111
|
lookup(candidateId, candidateDigest) {
|
|
112
|
+
let found;
|
|
106
113
|
for (const row of this.rows()) {
|
|
107
114
|
if (row.candidate_id === candidateId && row.candidate_digest === candidateDigest) {
|
|
108
|
-
|
|
115
|
+
found = row.handoff_id;
|
|
116
|
+
}
|
|
117
|
+
if (row.candidate_id === candidateId && row.candidate_digest !== candidateDigest) {
|
|
118
|
+
return { status: "conflict" };
|
|
109
119
|
}
|
|
110
120
|
}
|
|
111
|
-
return undefined;
|
|
121
|
+
return found !== undefined ? { status: "hit", handoff_id: found } : undefined;
|
|
112
122
|
}
|
|
113
123
|
/** 记录一次成功交付(幂等键 → handoff_id)。 */
|
|
114
124
|
record(candidateId, candidateDigest, handoffId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"idempotency.js","sourceRoot":"","sources":["../../src/handoff/idempotency.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"idempotency.js","sourceRoot":"","sources":["../../src/handoff/idempotency.ts"],"names":[],"mappings":"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"}
|
package/dist/handoff/index.d.ts
CHANGED
|
@@ -40,7 +40,7 @@ export { computeCandidateDigest, createHandoffCandidate, isHandoffCandidate, val
|
|
|
40
40
|
export { HANDOFF_CANDIDATE_EVENT_KINDS, HANDOFF_CANDIDATE_LIFECYCLE_STATES, foldCandidateLifecycle, isHandoffCandidateEventKind, isTerminalLifecycleState, transitionCandidateLifecycle, type HandoffCandidateEventKind, type HandoffCandidateLifecycleState, } from "./lifecycle.js";
|
|
41
41
|
export { HANDOFF_DELIVERY_EVENT_KINDS, HandoffEventStore, type HandoffDeliveryEventKind, type HandoffEventInput, type HandoffEventStoreOptions, } from "./ledger.js";
|
|
42
42
|
export { HANDOFF_DELIVERY_STATES, OPEN_EVIDENCE_KINDS, deliveryState, isHandoffDeliveryEventKind, recordLaunch, recordOpenEvidence, recordRevoked, validateOpenEvidence, type HandoffDeliveryState, type OpenEvidence, type OpenEvidenceKind, } from "./delivery.js";
|
|
43
|
-
export { executeHandoff, defaultUrlSafety, type AgreementReadResult, type ExecuteHandoffInput, type ExecuteHandoffResult, type TransactionHandoff, } from "./transaction.js";
|
|
43
|
+
export { destinationLockKey, executeHandoff, defaultUrlSafety, type AgreementReadResult, type ExecuteHandoffInput, type ExecuteHandoffResult, type TransactionHandoff, } from "./transaction.js";
|
|
44
44
|
export { HandoffIdempotencyStore, type HandoffIdempotencyStoreOptions } from "./idempotency.js";
|
|
45
45
|
export { validateExternalDestinationUrl, type SafeDestinationUrl, type UrlSafetyOptions, } from "./url-safety.js";
|
|
46
46
|
export { computeHandoffMetrics, type HandoffMetrics } from "./metrics.js";
|
package/dist/handoff/index.js
CHANGED
|
@@ -41,7 +41,7 @@ export { computeCandidateDigest, createHandoffCandidate, isHandoffCandidate, val
|
|
|
41
41
|
export { HANDOFF_CANDIDATE_EVENT_KINDS, HANDOFF_CANDIDATE_LIFECYCLE_STATES, foldCandidateLifecycle, isHandoffCandidateEventKind, isTerminalLifecycleState, transitionCandidateLifecycle, } from "./lifecycle.js";
|
|
42
42
|
export { HANDOFF_DELIVERY_EVENT_KINDS, HandoffEventStore, } from "./ledger.js";
|
|
43
43
|
export { HANDOFF_DELIVERY_STATES, OPEN_EVIDENCE_KINDS, deliveryState, isHandoffDeliveryEventKind, recordLaunch, recordOpenEvidence, recordRevoked, validateOpenEvidence, } from "./delivery.js";
|
|
44
|
-
export { executeHandoff, defaultUrlSafety, } from "./transaction.js";
|
|
44
|
+
export { destinationLockKey, executeHandoff, defaultUrlSafety, } from "./transaction.js";
|
|
45
45
|
export { HandoffIdempotencyStore } from "./idempotency.js";
|
|
46
46
|
export { validateExternalDestinationUrl, } from "./url-safety.js";
|
|
47
47
|
export { computeHandoffMetrics } from "./metrics.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/handoff/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,YAAY,EACZ,mBAAmB,GAEpB,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,EAC1B,gBAAgB,GAIjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,wBAAwB,EACxB,oBAAoB,GAMrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,2BAA2B,EAC3B,+BAA+B,EAC/B,0BAA0B,EAC1B,8BAA8B,EAC9B,WAAW,EACX,kBAAkB,GAanB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACtB,gCAAgC,GAIjC,MAAM,iBAAiB,CAAC;AAEzB,4EAA4E;AAE5E,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,oBAAoB,EACpB,mBAAmB,GAGpB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,kBAAkB,EAClB,wBAAwB,EACxB,4BAA4B,GAI7B,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,6BAA6B,EAC7B,kCAAkC,EAClC,sBAAsB,EACtB,2BAA2B,EAC3B,wBAAwB,EACxB,4BAA4B,GAG7B,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,4BAA4B,EAC5B,iBAAiB,GAIlB,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,uBAAuB,EACvB,mBAAmB,EACnB,aAAa,EACb,0BAA0B,EAC1B,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACb,oBAAoB,GAIrB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,cAAc,EACd,gBAAgB,GAKjB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,uBAAuB,EAAuC,MAAM,kBAAkB,CAAC;AAEhG,OAAO,EACL,8BAA8B,GAG/B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,qBAAqB,EAAuB,MAAM,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/handoff/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,YAAY,EACZ,mBAAmB,GAEpB,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,EAC1B,gBAAgB,GAIjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,wBAAwB,EACxB,oBAAoB,GAMrB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,2BAA2B,EAC3B,+BAA+B,EAC/B,0BAA0B,EAC1B,8BAA8B,EAC9B,WAAW,EACX,kBAAkB,GAanB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACtB,gCAAgC,GAIjC,MAAM,iBAAiB,CAAC;AAEzB,4EAA4E;AAE5E,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,oBAAoB,EACpB,mBAAmB,GAGpB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,kBAAkB,EAClB,wBAAwB,EACxB,4BAA4B,GAI7B,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,6BAA6B,EAC7B,kCAAkC,EAClC,sBAAsB,EACtB,2BAA2B,EAC3B,wBAAwB,EACxB,4BAA4B,GAG7B,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,4BAA4B,EAC5B,iBAAiB,GAIlB,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,uBAAuB,EACvB,mBAAmB,EACnB,aAAa,EACb,0BAA0B,EAC1B,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACb,oBAAoB,GAIrB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,gBAAgB,GAKjB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,uBAAuB,EAAuC,MAAM,kBAAkB,CAAC;AAEhG,OAAO,EACL,8BAA8B,GAG/B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,qBAAqB,EAAuB,MAAM,cAAc,CAAC"}
|
package/dist/handoff/ledger.d.ts
CHANGED
|
@@ -91,4 +91,13 @@ export declare class HandoffEventStore {
|
|
|
91
91
|
* 的周期性入口(schedulerTick)与 /handoff 渲染前。
|
|
92
92
|
*/
|
|
93
93
|
sweepExpiredCandidates(now: string): number;
|
|
94
|
+
/**
|
|
95
|
+
* 交付域过期清扫(审查 P3):handoff_expired 此前在类型表/状态机里但全仓
|
|
96
|
+
* 无生产者——DELIVERED/LAUNCHED 的 handoff 打开时限过期后永远停在原态
|
|
97
|
+
* ("过期未打开"不可观测,指标缺失)。与 sweepExpiredCandidates 同款:
|
|
98
|
+
* 按 handoff_id 分组,交付状态为 DELIVERED/LAUNCHED 且源头 candidate 的
|
|
99
|
+
* expires_at 已过 → 落 handoff_expired。幂等:已终态不重复处理;调用方
|
|
100
|
+
* 与 candidate 清扫同挂 kernel schedulerTick。
|
|
101
|
+
*/
|
|
102
|
+
sweepExpiredHandoffs(now: string): number;
|
|
94
103
|
}
|
package/dist/handoff/ledger.js
CHANGED
|
@@ -191,5 +191,71 @@ export class HandoffEventStore {
|
|
|
191
191
|
}
|
|
192
192
|
return swept;
|
|
193
193
|
}
|
|
194
|
+
/**
|
|
195
|
+
* 交付域过期清扫(审查 P3):handoff_expired 此前在类型表/状态机里但全仓
|
|
196
|
+
* 无生产者——DELIVERED/LAUNCHED 的 handoff 打开时限过期后永远停在原态
|
|
197
|
+
* ("过期未打开"不可观测,指标缺失)。与 sweepExpiredCandidates 同款:
|
|
198
|
+
* 按 handoff_id 分组,交付状态为 DELIVERED/LAUNCHED 且源头 candidate 的
|
|
199
|
+
* expires_at 已过 → 落 handoff_expired。幂等:已终态不重复处理;调用方
|
|
200
|
+
* 与 candidate 清扫同挂 kernel schedulerTick。
|
|
201
|
+
*/
|
|
202
|
+
sweepExpiredHandoffs(now) {
|
|
203
|
+
let swept = 0;
|
|
204
|
+
for (const negotiationId of this.store.listNegotiations()) {
|
|
205
|
+
const events = this.store.events(negotiationId);
|
|
206
|
+
const seen = new Set();
|
|
207
|
+
for (const event of events) {
|
|
208
|
+
const handoffId = event.handoff_id;
|
|
209
|
+
if (handoffId === undefined || seen.has(handoffId))
|
|
210
|
+
continue;
|
|
211
|
+
seen.add(handoffId);
|
|
212
|
+
const handoffEvents = events.filter((e) => e.handoff_id === handoffId);
|
|
213
|
+
const state = deliveryState(handoffEvents);
|
|
214
|
+
// 只有 DELIVERED/LAUNCHED 可过期;OPENED_CONFIRMED 是打开证据
|
|
215
|
+
// (已确认打开,不再适用打开时限),EXPIRED/REVOKED 已是终态。
|
|
216
|
+
if (state !== "DELIVERED" && state !== "LAUNCHED")
|
|
217
|
+
continue;
|
|
218
|
+
// 源头 candidate 的 expires_at:delivered 事件携带 handoff_candidate_id
|
|
219
|
+
const delivered = handoffEvents.find((e) => e.event_kind === "handoff_delivered");
|
|
220
|
+
const candidateId = delivered?.handoff_candidate_id;
|
|
221
|
+
if (candidateId === undefined)
|
|
222
|
+
continue;
|
|
223
|
+
const created = events.find((e) => e.handoff_candidate_id === candidateId && e.event_kind === "handoff_candidate_created");
|
|
224
|
+
const embedded = created?.outcome.kind === "ok"
|
|
225
|
+
? created.outcome.result?.candidate
|
|
226
|
+
: undefined;
|
|
227
|
+
const expiresAt = typeof embedded?.expires_at === "string" ? embedded.expires_at : "";
|
|
228
|
+
// NaN 防护与 executeHandoff 的过期门一致:不可解析视为未过期(不误杀)。
|
|
229
|
+
if (expiresAt === "" || !Number.isFinite(Date.parse(expiresAt)))
|
|
230
|
+
continue;
|
|
231
|
+
if (Date.parse(expiresAt) >= Date.parse(now))
|
|
232
|
+
continue;
|
|
233
|
+
const candidate = created?.outcome.kind === "ok"
|
|
234
|
+
? created.outcome.result?.candidate
|
|
235
|
+
: undefined;
|
|
236
|
+
if (candidate === undefined)
|
|
237
|
+
continue;
|
|
238
|
+
try {
|
|
239
|
+
this.appendDeliveryEvent({
|
|
240
|
+
kind: "handoff_expired",
|
|
241
|
+
candidate,
|
|
242
|
+
handoff_id: handoffId,
|
|
243
|
+
identity: {
|
|
244
|
+
sender_identity: candidate.buyer_identity_ref,
|
|
245
|
+
counterparty_identity: candidate.merchant_identity_ref,
|
|
246
|
+
actor: "buyer",
|
|
247
|
+
},
|
|
248
|
+
capability: { capability: "com.harrylabsj.kiwi.shopping.negotiation", protocol_version: "1.0" },
|
|
249
|
+
occurred_at: now,
|
|
250
|
+
});
|
|
251
|
+
swept += 1;
|
|
252
|
+
}
|
|
253
|
+
catch {
|
|
254
|
+
// 单 handoff 失败不影响整体清扫(fail-closed 但继续其他链)。
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
return swept;
|
|
259
|
+
}
|
|
194
260
|
}
|
|
195
261
|
//# sourceMappingURL=ledger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ledger.js","sourceRoot":"","sources":["../../src/handoff/ledger.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ledger.js","sourceRoot":"","sources":["../../src/handoff/ledger.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,11 +85,29 @@ export interface ExecuteHandoffInput {
|
|
|
85
85
|
urlSafety?: (url: string) => Promise<SafeDestinationUrl>;
|
|
86
86
|
now?: () => string;
|
|
87
87
|
}
|
|
88
|
+
/**
|
|
89
|
+
* 审查 P1-06:执行锁作用域按 **destination**——同一 (agreement_id,
|
|
90
|
+
* destination_type, destination_ref) 的任何候选共享同一把锁。此前按
|
|
91
|
+
* candidate_id 加锁,两个**不同候选**指向同一 destination 时并发执行会双双
|
|
92
|
+
* 通过 §10.1 协议级去重(check-then-act,双方都还没交付)→ 双投递到同一
|
|
93
|
+
* 目的地。destination 级锁把这些执行串行化:第二个看到首个的 delivered 事件
|
|
94
|
+
* → already_delivered。同一候选必然落在同一 destination 锁上,候选级幂等
|
|
95
|
+
* (§10.1 lookup→record)同样被保护。
|
|
96
|
+
*
|
|
97
|
+
* 锁键:`dest:<agreement_id>:<destination_type>:<sha256(ref) 前 16>`——ref 可能
|
|
98
|
+
* 是长 URL,直接进文件名会超出文件系统 255 字节限制,取定长哈希。
|
|
99
|
+
*/
|
|
100
|
+
export declare function destinationLockKey(candidate: {
|
|
101
|
+
agreement_id: string;
|
|
102
|
+
destination_type: string;
|
|
103
|
+
destination_ref: string;
|
|
104
|
+
}): string;
|
|
88
105
|
/**
|
|
89
106
|
* 从 Ledger 事件流驱动执行(含生命周期/重验/幂等/落链)。
|
|
90
|
-
*
|
|
91
|
-
* check-then-act
|
|
92
|
-
*
|
|
107
|
+
* 整个流程按 destination 互斥(§10.1 并发保护 + 审查 P1-06):lookup→(await)
|
|
108
|
+
* →record 的 check-then-act 在无锁时两个并发执行会双双通过幂等检查、同一候选
|
|
109
|
+
* 交付两次;不同候选指向同一 destination 也会双双通过协议级去重。锁在幂等
|
|
110
|
+
* 存储上(JSONL 与锁文件同目录,跨进程共享 dir 时同样互斥)。
|
|
93
111
|
*/
|
|
94
112
|
export declare function executeHandoff(input: ExecuteHandoffInput): Promise<ExecuteHandoffResult>;
|
|
95
113
|
/** 供调用方构造缺省 URL 安全策略(HTTPS-only + merchant 域绑定)。 */
|
|
@@ -30,7 +30,8 @@
|
|
|
30
30
|
*
|
|
31
31
|
* 三副作用不变量(§16/§36-25):本模块绝不创建订单/授权支付/预留库存。
|
|
32
32
|
*/
|
|
33
|
-
import {
|
|
33
|
+
import { HandoffError } from "./errors.js";
|
|
34
|
+
import { contentDigest, sha256Hex } from "../negotiation/jcs.js";
|
|
34
35
|
import { assertNoForbiddenContent } from "../negotiation/ledger/event.js";
|
|
35
36
|
import { generateId } from "../negotiation/domain/identifiers.js";
|
|
36
37
|
import { CommerceError } from "../commerce/data-source.js";
|
|
@@ -40,14 +41,31 @@ import { isUrlDestinationType } from "./destination.js";
|
|
|
40
41
|
function computeHandoffDigest(handoff) {
|
|
41
42
|
return contentDigest(handoff);
|
|
42
43
|
}
|
|
44
|
+
/**
|
|
45
|
+
* 审查 P1-06:执行锁作用域按 **destination**——同一 (agreement_id,
|
|
46
|
+
* destination_type, destination_ref) 的任何候选共享同一把锁。此前按
|
|
47
|
+
* candidate_id 加锁,两个**不同候选**指向同一 destination 时并发执行会双双
|
|
48
|
+
* 通过 §10.1 协议级去重(check-then-act,双方都还没交付)→ 双投递到同一
|
|
49
|
+
* 目的地。destination 级锁把这些执行串行化:第二个看到首个的 delivered 事件
|
|
50
|
+
* → already_delivered。同一候选必然落在同一 destination 锁上,候选级幂等
|
|
51
|
+
* (§10.1 lookup→record)同样被保护。
|
|
52
|
+
*
|
|
53
|
+
* 锁键:`dest:<agreement_id>:<destination_type>:<sha256(ref) 前 16>`——ref 可能
|
|
54
|
+
* 是长 URL,直接进文件名会超出文件系统 255 字节限制,取定长哈希。
|
|
55
|
+
*/
|
|
56
|
+
export function destinationLockKey(candidate) {
|
|
57
|
+
const refHash = sha256Hex(candidate.destination_ref).slice(0, 16);
|
|
58
|
+
return `dest:${candidate.agreement_id}:${candidate.destination_type}:${refHash}`;
|
|
59
|
+
}
|
|
43
60
|
/**
|
|
44
61
|
* 从 Ledger 事件流驱动执行(含生命周期/重验/幂等/落链)。
|
|
45
|
-
*
|
|
46
|
-
* check-then-act
|
|
47
|
-
*
|
|
62
|
+
* 整个流程按 destination 互斥(§10.1 并发保护 + 审查 P1-06):lookup→(await)
|
|
63
|
+
* →record 的 check-then-act 在无锁时两个并发执行会双双通过幂等检查、同一候选
|
|
64
|
+
* 交付两次;不同候选指向同一 destination 也会双双通过协议级去重。锁在幂等
|
|
65
|
+
* 存储上(JSONL 与锁文件同目录,跨进程共享 dir 时同样互斥)。
|
|
48
66
|
*/
|
|
49
67
|
export async function executeHandoff(input) {
|
|
50
|
-
return input.idempotency.withCandidateLock(input.candidate
|
|
68
|
+
return input.idempotency.withCandidateLock(destinationLockKey(input.candidate), () => executeHandoffUnlocked(input));
|
|
51
69
|
}
|
|
52
70
|
async function executeHandoffUnlocked(input) {
|
|
53
71
|
const { candidate, ledger, idempotency } = input;
|
|
@@ -64,7 +82,18 @@ async function executeHandoffUnlocked(input) {
|
|
|
64
82
|
const candidateEvents = events.filter((e) => e.handoff_candidate_id === candidate.handoff_candidate_id);
|
|
65
83
|
const state = foldCandidateLifecycle(candidateEvents);
|
|
66
84
|
const now = input.now ?? (() => new Date().toISOString());
|
|
67
|
-
// ── 0.5
|
|
85
|
+
// ── 0.5 幂等(§10.1)─────────────────────────────────────────────────
|
|
86
|
+
// 候选级幂等优先于 H3 目标级去重:同候选同 digest → already_delivered;
|
|
87
|
+
// 同候选**异 digest**(内容篡改/重建不匹配)→ handoff_idempotency_conflict
|
|
88
|
+
// fail-closed,绝不放行二次交付(KTH §10.1 具名错误)。
|
|
89
|
+
const prior = idempotency.lookup(candidate.handoff_candidate_id, candidate.candidate_digest);
|
|
90
|
+
if (prior !== undefined) {
|
|
91
|
+
if (prior.status === "conflict") {
|
|
92
|
+
throw new HandoffError("handoff_idempotency_conflict", `handoff candidate ${candidate.handoff_candidate_id} was already delivered with a different digest; refusing execution (content tampering or rebuild mismatch)`);
|
|
93
|
+
}
|
|
94
|
+
return { kind: "already_delivered", handoff_id: prior.handoff_id };
|
|
95
|
+
}
|
|
96
|
+
// ── 0.6 协议级去重(评审项 H3)──────────────────────────────────────
|
|
68
97
|
// 同一 (agreement_id, destination_type, destination_ref) 已交付过 →
|
|
69
98
|
// already_delivered。创建期检查(buyer-tools priorDelivery)拦不住双候选
|
|
70
99
|
// 双批准:候选 A 创建时 B 尚未交付,两者都通过创建期检查;执行期幂等键
|
|
@@ -177,16 +206,26 @@ async function executeHandoffUnlocked(input) {
|
|
|
177
206
|
// 每次重试都新建候选再置 stale,候选/事件堆积)。安全拒绝(scheme/
|
|
178
207
|
// host/DNS 保留网段 → invalid_input)仍是终态——内容确实不可用。
|
|
179
208
|
if (err instanceof CommerceError && err.code === "request_failed") {
|
|
209
|
+
// 审查 P2-F:交付失败在 handoff 创建前落 handoff_delivery_failed
|
|
210
|
+
// 审计事件(KTH rev0.3 §9)。此前该 kind 无状态映射,append 必抛
|
|
211
|
+
// schemaError,失败交付审计缺失(3 处声明、0 处产生)。
|
|
212
|
+
ledger.append({
|
|
213
|
+
kind: "handoff_delivery_failed",
|
|
214
|
+
candidate,
|
|
215
|
+
identity: input.identity,
|
|
216
|
+
capability: input.capability,
|
|
217
|
+
outcome: {
|
|
218
|
+
kind: "error",
|
|
219
|
+
code: "request_failed",
|
|
220
|
+
message: err.message,
|
|
221
|
+
},
|
|
222
|
+
occurred_at: now(),
|
|
223
|
+
});
|
|
180
224
|
return { kind: "probe_failed", reason: err.message };
|
|
181
225
|
}
|
|
182
226
|
return stale(input, candidate, now, `destination invalid: ${err instanceof Error ? err.message : String(err)}`);
|
|
183
227
|
}
|
|
184
228
|
}
|
|
185
|
-
// ── 3. 幂等(§10.1)─────────────────────────────────────────────────
|
|
186
|
-
const prior = idempotency.lookup(candidate.handoff_candidate_id, candidate.candidate_digest);
|
|
187
|
-
if (prior !== undefined) {
|
|
188
|
-
return { kind: "already_delivered", handoff_id: prior.handoff_id };
|
|
189
|
-
}
|
|
190
229
|
// ── 4. 交付:consumed + delivered 落链 ──────────────────────────────
|
|
191
230
|
const handoffId = generateId("handoff");
|
|
192
231
|
const base = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/handoff/transaction.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/handoff/transaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -214,16 +214,16 @@ export class UcpCheckoutChannel {
|
|
|
214
214
|
async createSessionFromCart(pkg, terms, cartId) {
|
|
215
215
|
const existing = this.cartCheckoutLinks.get(cartId);
|
|
216
216
|
if (existing !== undefined && existing.terms_digest === pkg.terms_digest) {
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
217
|
+
// 审查 P3:幂等短接此前直接返回本地 mirror(含 continue_url/
|
|
218
|
+
// checkout_status)不刷新远端——远端会话已被取消/过期时调用方拿到
|
|
219
|
+
// "看起来成功"的 stale 结果,后续操作才报错。命中时刷新远端:
|
|
220
|
+
// session_not_found(远端已消失)→ 落入下方重建路径;其他错误按原
|
|
221
|
+
// 样返回(retryable 时调用方可安全重试)。
|
|
222
|
+
const refreshed = await this.getSession(existing.session_ref);
|
|
223
|
+
if (refreshed.status === "ok")
|
|
224
|
+
return refreshed;
|
|
225
|
+
if (refreshed.status !== "fail_closed" || refreshed.code !== "session_not_found") {
|
|
226
|
+
return refreshed;
|
|
227
227
|
}
|
|
228
228
|
}
|
|
229
229
|
if (!this.cartCapabilityVerified) {
|
|
@@ -505,11 +505,16 @@ export class UcpCheckoutChannel {
|
|
|
505
505
|
});
|
|
506
506
|
}
|
|
507
507
|
mapHttpError(err) {
|
|
508
|
+
// 审查 P3:timeout/network 是瞬时故障——此前与硬失败同为 fail_closed
|
|
509
|
+
// 且无 retryable 标记,调用方无法区分、无法安全重试。带 retryable 让
|
|
510
|
+
// 恢复路径可触发("改输入重试",不自动死循环)。
|
|
511
|
+
const retryable = err.code === "timeout" || err.code === "network";
|
|
508
512
|
return {
|
|
509
513
|
status: "fail_closed",
|
|
510
514
|
reason: `ucp_checkout_${err.code}: ${err.reason}`,
|
|
511
515
|
code: err.code,
|
|
512
516
|
messages: [],
|
|
517
|
+
...(retryable ? { retryable: true } : {}),
|
|
513
518
|
};
|
|
514
519
|
}
|
|
515
520
|
/** 把 parse.ts 的决策动作转成三形态结果(ok 需要 session + checkout)。 */
|