@harrylabsj/kiwi 0.6.1 → 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 +20 -2
- package/dist/a2a/node.js +127 -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/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 +44 -3
- package/dist/cli.js.map +1 -1
- package/dist/commerce/data-source.d.ts +3 -0
- 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 +63 -46
- package/dist/commerce/shopping-cli-source.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-source.js +39 -35
- package/dist/discovery/catalog-source/kiwi-source.js.map +1 -1
- package/dist/discovery/catalog-source/register.js +12 -1
- 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/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 +37 -5
- 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/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 +1 -1
- package/dist/product-catalog.js +3 -3
- package/dist/product-catalog.js.map +1 -1
- package/dist/product-cli.d.ts +1 -1
- package/dist/product-cli.js +1 -1
- package/dist/product-publish.d.ts +5 -0
- package/dist/product-publish.js +103 -6
- 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 +2 -0
- package/dist/weixin/channel.js +17 -3
- package/dist/weixin/channel.js.map +1 -1
- package/dist/weixin/cli-weixin.js +2 -0
- package/dist/weixin/cli-weixin.js.map +1 -1
- package/dist/weixin/ilink-client.d.ts +1 -1
- package/dist/weixin/ilink-client.js +26 -1
- package/dist/weixin/ilink-client.js.map +1 -1
- package/dist/weixin/login.d.ts +3 -0
- package/dist/weixin/login.js +1 -1
- package/dist/weixin/login.js.map +1 -1
- package/package.json +9 -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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recover.js","sourceRoot":"","sources":["../../../src/negotiation/recovery/recover.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"recover.js","sourceRoot":"","sources":["../../../src/negotiation/recovery/recover.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,12 +63,17 @@ export interface NegotiationRunner {
|
|
|
63
63
|
* Claim the next pending message and generate a candidate. No write.
|
|
64
64
|
* `skipMessageIds` excludes messages the operator rejected this session;
|
|
65
65
|
* they stay reclaimable for later runs (abandoned, never completed).
|
|
66
|
+
* `skipKeys` excludes messages by their composite `${conversation_id}:
|
|
67
|
+
* ${message_id}` key — used by the autopilot for settled negotiations so a
|
|
68
|
+
* settled message in one conversation never suppresses a live message in
|
|
69
|
+
* another conversation that happens to share the same numeric message_id.
|
|
66
70
|
* `directives` are the applied session/turn strategy directives that guide
|
|
67
71
|
* candidate generation (design §7) — the compiled hints never widen the
|
|
68
72
|
* profile's HardPolicy, which the gates re-check at submit time.
|
|
69
73
|
*/
|
|
70
74
|
prepare(options?: {
|
|
71
75
|
skipMessageIds?: ReadonlySet<number>;
|
|
76
|
+
skipKeys?: ReadonlySet<string>;
|
|
72
77
|
directives?: readonly StrategyDirective[];
|
|
73
78
|
}): Promise<PreparedCandidate | undefined>;
|
|
74
79
|
/** Submit an approved candidate through the Commerce boundary and settle. */
|
|
@@ -119,10 +124,16 @@ export declare class DeterministicNegotiationRunner implements NegotiationRunner
|
|
|
119
124
|
stopHeartbeat(): Promise<void>;
|
|
120
125
|
prepare(options?: {
|
|
121
126
|
skipMessageIds?: ReadonlySet<number>;
|
|
127
|
+
skipKeys?: ReadonlySet<string>;
|
|
122
128
|
directives?: readonly StrategyDirective[];
|
|
123
129
|
/** Direct hints (e.g. task-derived quantity/target/budget), merged over directives. */
|
|
124
130
|
hints?: DecisionHints;
|
|
125
131
|
}): Promise<PreparedCandidate | undefined>;
|
|
126
132
|
submit(prepared: Pick<PreparedCandidate, "binding" | "decision">): Promise<SubmitOutcome>;
|
|
127
133
|
abandon(prepared: Pick<PreparedCandidate, "binding">, reason: string): Promise<void>;
|
|
134
|
+
/** 审查 BUG-08:对方已接受 = 本消息已处理的终态——以 completeClaim 权威
|
|
135
|
+
* 结算。abandon 的语义是释放 claim 允许重领,此前 accept 后 abandon 靠
|
|
136
|
+
* 进程内存 settled 集合遮挡,重启后消息再次进入处理(重复 claim/快照/
|
|
137
|
+
* 通知)。Best-effort:失败由网关 stale TTL 兜底。 */
|
|
138
|
+
complete(prepared: Pick<PreparedCandidate, "binding">): Promise<void>;
|
|
128
139
|
}
|
package/dist/operator/runner.js
CHANGED
|
@@ -133,7 +133,11 @@ export class DeterministicNegotiationRunner {
|
|
|
133
133
|
}
|
|
134
134
|
async prepare(options) {
|
|
135
135
|
const pending = await this.client.listPendingMessages();
|
|
136
|
-
|
|
136
|
+
// Skip by full (conversation_id, message_id) key, not bare message_id:
|
|
137
|
+
// message ids are per-conversation, so a settled/rejected message must
|
|
138
|
+
// never suppress a live message in another conversation with the same id.
|
|
139
|
+
const target = pending.find((m) => options?.skipMessageIds?.has(m.message_id) !== true &&
|
|
140
|
+
options?.skipKeys?.has(`${m.conversation_id}:${m.message_id}`) !== true);
|
|
137
141
|
if (!target)
|
|
138
142
|
return undefined;
|
|
139
143
|
const idem = idempotencyKey(this.profile.agent_id, target.message_id, PROTOCOL_VERSION);
|
|
@@ -244,5 +248,20 @@ export class DeterministicNegotiationRunner {
|
|
|
244
248
|
// Abandon must never mask the operator-facing outcome.
|
|
245
249
|
}
|
|
246
250
|
}
|
|
251
|
+
/** 审查 BUG-08:对方已接受 = 本消息已处理的终态——以 completeClaim 权威
|
|
252
|
+
* 结算。abandon 的语义是释放 claim 允许重领,此前 accept 后 abandon 靠
|
|
253
|
+
* 进程内存 settled 集合遮挡,重启后消息再次进入处理(重复 claim/快照/
|
|
254
|
+
* 通知)。Best-effort:失败由网关 stale TTL 兜底。 */
|
|
255
|
+
async complete(prepared) {
|
|
256
|
+
try {
|
|
257
|
+
await this.client.completeClaim({
|
|
258
|
+
message_id: prepared.binding.message_id,
|
|
259
|
+
idempotency_key: prepared.binding.idempotency_key,
|
|
260
|
+
});
|
|
261
|
+
}
|
|
262
|
+
catch {
|
|
263
|
+
// Complete must never mask the operator-facing outcome.
|
|
264
|
+
}
|
|
265
|
+
}
|
|
247
266
|
}
|
|
248
267
|
//# sourceMappingURL=runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/operator/runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA2BH,OAAO,EAAE,cAAc,EAAuB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EACL,gBAAgB,GAIjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAuB,MAAM,yBAAyB,CAAC;AACnF,OAAO,EACL,0BAA0B,EAC1B,6BAA6B,GAC9B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/operator/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
/**
|
|
17
17
|
* `kiwi catalog serve` —— 启动独立 kiwi-catalog 服务(CURRENT-DOCS v0.7.0)。
|
|
18
18
|
*
|
|
19
|
-
* kiwi-catalog
|
|
19
|
+
* kiwi-catalog 是独立部署仓(<WORKSPACE>/kiwi-catalog),console script 入口
|
|
20
20
|
* `kiwi-catalog-api`(pyproject [project.scripts])。本命令以前台方式
|
|
21
21
|
* 转发启动该服务(stdio inherit),便于本地一体化开发;依赖检测:
|
|
22
22
|
* 未安装(ENOENT)→ fail-closed 提示 pip install。
|
package/dist/product-catalog.js
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
/**
|
|
17
17
|
* `kiwi catalog serve` —— 启动独立 kiwi-catalog 服务(CURRENT-DOCS v0.7.0)。
|
|
18
18
|
*
|
|
19
|
-
* kiwi-catalog
|
|
19
|
+
* kiwi-catalog 是独立部署仓(<WORKSPACE>/kiwi-catalog),console script 入口
|
|
20
20
|
* `kiwi-catalog-api`(pyproject [project.scripts])。本命令以前台方式
|
|
21
21
|
* 转发启动该服务(stdio inherit),便于本地一体化开发;依赖检测:
|
|
22
22
|
* 未安装(ENOENT)→ fail-closed 提示 pip install。
|
|
@@ -43,8 +43,8 @@ export function catalogServe(options = {}) {
|
|
|
43
43
|
if (code === "ENOENT") {
|
|
44
44
|
return {
|
|
45
45
|
ok: false,
|
|
46
|
-
error: "kiwi-catalog-api 未安装——kiwi-catalog
|
|
47
|
-
"请先 `pip install -e
|
|
46
|
+
error: "kiwi-catalog-api 未安装——kiwi-catalog 是独立部署仓(<WORKSPACE>/kiwi-catalog)," +
|
|
47
|
+
"请先 `pip install -e <WORKSPACE>/kiwi-catalog` 再运行本命令",
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
50
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-catalog.js","sourceRoot":"","sources":["../src/product-catalog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAmB/C,MAAM,UAAU,YAAY,CAAC,UAA+B,EAAE;IAC5D,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,IAAI,SAAS,CAAC;IAC7C,MAAM,IAAI,GAAG;QACX,MAAM;QACN,OAAO,CAAC,EAAE,IAAI,uBAAuB;QACrC,QAAQ;QACR,OAAO,CAAC,IAAI,IAAI,WAAW;QAC3B,QAAQ;QACR,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC;KAC7B,CAAC;IACF,+DAA+D;IAC/D,2CAA2C;IAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,kBAAkB,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACrE,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAI,MAAM,CAAC,KAA2B,CAAC,IAAI,CAAC;QACtD,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtB,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EACH,
|
|
1
|
+
{"version":3,"file":"product-catalog.js","sourceRoot":"","sources":["../src/product-catalog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAmB/C,MAAM,UAAU,YAAY,CAAC,UAA+B,EAAE;IAC5D,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,IAAI,SAAS,CAAC;IAC7C,MAAM,IAAI,GAAG;QACX,MAAM;QACN,OAAO,CAAC,EAAE,IAAI,uBAAuB;QACrC,QAAQ;QACR,OAAO,CAAC,IAAI,IAAI,WAAW;QAC3B,QAAQ;QACR,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC;KAC7B,CAAC;IACF,+DAA+D;IAC/D,2CAA2C;IAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,kBAAkB,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IACrE,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAI,MAAM,CAAC,KAA2B,CAAC,IAAI,CAAC;QACtD,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtB,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EACH,sEAAsE;oBACtE,qDAAqD;aACxD,CAAC;QACJ,CAAC;QACD,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,yBAAyB,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;SACvD,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,wBAAwB,MAAM,CAAC,MAAM,aAAa,EAAE,CAAC;IAClF,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AACrC,CAAC"}
|
package/dist/product-cli.d.ts
CHANGED
package/dist/product-cli.js
CHANGED
|
@@ -30,7 +30,7 @@ import { spawnSync } from "node:child_process";
|
|
|
30
30
|
import { EXIT } from "./exit-codes.js";
|
|
31
31
|
import { SHOPPING_CLI_COMPAT, compatRangeText, versionInRange } from "./product-compat.js";
|
|
32
32
|
/** 与 package.json / USAGE 同步的产品版本。 */
|
|
33
|
-
export const PRODUCT_VERSION = "0.6.
|
|
33
|
+
export const PRODUCT_VERSION = "0.6.2";
|
|
34
34
|
/**
|
|
35
35
|
* 缺省 kiwi-catalog 地址(单一来源,cli.ts 各处解析一致)。
|
|
36
36
|
*
|
|
@@ -35,6 +35,11 @@ export interface MerchantPublishOptions {
|
|
|
35
35
|
shoppingCliMerchant?: string;
|
|
36
36
|
/** catalog 注册域名(缺省 KIWI_CATALOG_DOMAIN / merchant-{agent_id}.local)。 */
|
|
37
37
|
catalogDomain?: string;
|
|
38
|
+
/** 审查 P1-B:投影为空但 catalog 存在 ACTIVE product listing 时,默认
|
|
39
|
+
* 拒绝 reconcile 下架(典型成因是 --shopping-cli-merchant 不匹配或
|
|
40
|
+
* --shopping-cli-db 指向空库,静默全量下架=数据丢失且报告仍 ok)。
|
|
41
|
+
* 设为 true 显式放行"全部下架"语义(CLI --allow-empty-projection)。 */
|
|
42
|
+
allowEmptyProjectionReconcile?: boolean;
|
|
38
43
|
/** 测试注入。 */
|
|
39
44
|
fetchImpl?: typeof fetch;
|
|
40
45
|
spawnImpl?: typeof spawnSync;
|
package/dist/product-publish.js
CHANGED
|
@@ -33,10 +33,69 @@
|
|
|
33
33
|
import { createHmac } from "node:crypto";
|
|
34
34
|
import { spawnSync } from "node:child_process";
|
|
35
35
|
import { registerCatalogAgent } from "./discovery/catalog-source/register.js";
|
|
36
|
+
import { isRedirectResponse } from "./net/safe-http.js";
|
|
36
37
|
import { SHOPPING_CLI_COMPAT, compatRangeText, versionInRange } from "./product-compat.js";
|
|
37
38
|
function safeAgentId(agentId) {
|
|
38
39
|
return agentId.replace(/[^a-z0-9-]/gi, "-").toLowerCase();
|
|
39
40
|
}
|
|
41
|
+
/**
|
|
42
|
+
* 审查 P1-10:构造注册用的 agent_card_url —— **绝对且经过校验**。
|
|
43
|
+
*
|
|
44
|
+
* `domain` 可能是裸 hostname(`merchant-x.local`,本地占位)或已含 scheme 的
|
|
45
|
+
* URL;统一规范化为 `<scheme>://<host>/.well-known/agent-card.json`。此前直接
|
|
46
|
+
* 拼接 `${domain}/.well-known/agent-card.json`——裸 hostname 时产物是相对 URL
|
|
47
|
+
* (catalog 无法按 well-known 验证),且若 domain 携带 userinfo/路径会污染注册
|
|
48
|
+
* 身份。
|
|
49
|
+
*
|
|
50
|
+
* 校验(fail-closed,任何一项不过 → 抛错短路,不发布):
|
|
51
|
+
* - 绝对 URL 且 http(s);
|
|
52
|
+
* - 远程 host 必须 https(loopback 本地形态允许 http);
|
|
53
|
+
* - 无 userinfo / query / fragment;
|
|
54
|
+
* - path 只允许空或 "/"(agent_card_url 的 well-known 路径由本函数追加)。
|
|
55
|
+
*/
|
|
56
|
+
function buildAgentCardUrl(domain) {
|
|
57
|
+
const base = /^[a-z][a-z0-9+.-]*:\/\//i.test(domain) ? domain : `https://${domain}`;
|
|
58
|
+
let parsed;
|
|
59
|
+
try {
|
|
60
|
+
parsed = new URL(base);
|
|
61
|
+
}
|
|
62
|
+
catch {
|
|
63
|
+
throw new Error(`catalog domain 不是合法 URL/域名: "${domain}"(应为 https://<host> 形式)`);
|
|
64
|
+
}
|
|
65
|
+
if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
|
|
66
|
+
throw new Error(`catalog domain 必须使用 http(s)(got ${parsed.protocol}): ${domain}`);
|
|
67
|
+
}
|
|
68
|
+
if (parsed.username !== "" || parsed.password !== "") {
|
|
69
|
+
throw new Error(`catalog domain 不得内嵌凭据(userinfo): ${domain}`);
|
|
70
|
+
}
|
|
71
|
+
if (parsed.search !== "" || parsed.hash !== "") {
|
|
72
|
+
throw new Error(`catalog domain 不得包含 query/fragment: ${domain}`);
|
|
73
|
+
}
|
|
74
|
+
if (parsed.pathname !== "" && parsed.pathname !== "/") {
|
|
75
|
+
throw new Error(`catalog domain 不得包含路径(agent_card_url 由本函数构造): ${domain}`);
|
|
76
|
+
}
|
|
77
|
+
const host = parsed.hostname;
|
|
78
|
+
const isLoopback = host === "127.0.0.1" || host === "localhost" || host === "::1";
|
|
79
|
+
if (parsed.protocol !== "https:" && !isLoopback) {
|
|
80
|
+
throw new Error(`catalog domain 远程 host 必须使用 https(本地 loopback 才允许 http): ${domain}`);
|
|
81
|
+
}
|
|
82
|
+
const port = parsed.port !== "" ? `:${parsed.port}` : "";
|
|
83
|
+
return `${parsed.protocol}//${host}${port}/.well-known/agent-card.json`;
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* 审查 P1-11:catalog 出站调用(可能携带 owner_token 凭据)——**绝不跟随
|
|
87
|
+
* 重定向**。manual redirect 下任何 3xx / opaqueredirect 立即抛错,不解析
|
|
88
|
+
* body:重定向会把 Authorization 头 / body / query 中的凭据转发给第三方
|
|
89
|
+
* host。跨源重定向是 token 泄漏路径(SC-SEC-01 同型);fail-closed 拒绝所有
|
|
90
|
+
* 3xx(含同源——最简且最安全的保证)。
|
|
91
|
+
*/
|
|
92
|
+
async function catalogFetch(fetchImpl, url, init) {
|
|
93
|
+
const res = await fetchImpl(url, { ...init, redirect: "manual" });
|
|
94
|
+
if (isRedirectResponse(res)) {
|
|
95
|
+
throw new Error(`catalog request must not follow redirects (HTTP ${res.status} from ${url})`);
|
|
96
|
+
}
|
|
97
|
+
return res;
|
|
98
|
+
}
|
|
40
99
|
/**
|
|
41
100
|
* 执行一次 publish 编排。fail-closed:
|
|
42
101
|
* - agent 注册失败 → 短路(listings 依赖 owner agent 存在),ok:false;
|
|
@@ -112,7 +171,7 @@ export async function merchantPublish(options) {
|
|
|
112
171
|
let agentError;
|
|
113
172
|
try {
|
|
114
173
|
const lookupUrl = `${baseUrl}/v1/agent-catalog/merchants/${encodeURIComponent(catalogMerchantId)}/agents`;
|
|
115
|
-
const lookup = await fetchImpl
|
|
174
|
+
const lookup = await catalogFetch(fetchImpl, lookupUrl, { signal: AbortSignal.timeout(15_000) });
|
|
116
175
|
if (lookup.ok) {
|
|
117
176
|
const body = (await lookup.json());
|
|
118
177
|
const existing = body.results?.[0]?.catalog_agent_id;
|
|
@@ -128,7 +187,7 @@ export async function merchantPublish(options) {
|
|
|
128
187
|
merchantId: catalogMerchantId,
|
|
129
188
|
ownerToken: options.ownerToken,
|
|
130
189
|
ownerTokenSecret: options.ownerTokenSecret,
|
|
131
|
-
agentCardUrl:
|
|
190
|
+
agentCardUrl: buildAgentCardUrl(domain),
|
|
132
191
|
fetchImpl: options.fetchImpl,
|
|
133
192
|
timeoutMs: 15_000,
|
|
134
193
|
});
|
|
@@ -241,19 +300,28 @@ export async function merchantPublish(options) {
|
|
|
241
300
|
// 投影含内部元数据(_provenance 等)——catalog 契约 additionalProperties:
|
|
242
301
|
// false,发布前剔除 _ 前缀字段(仅 wire 字段进 body)。
|
|
243
302
|
const wireFields = Object.fromEntries(Object.entries(projection).filter(([key]) => !key.startsWith("_")));
|
|
303
|
+
// 每商品成交入口(KTH destination_ref):投影携带商家维护的
|
|
304
|
+
// handoff_destination(shopping-cli products.handoff_destination)。
|
|
305
|
+
// 映射为 listing 的 handoff_destination_ref,并剔除原始字段(catalog 契约
|
|
306
|
+
// 只认 handoff_destination_ref,additionalProperties:false 会拒未知键)。
|
|
307
|
+
const { handoff_destination: rawHandoff, ...projectionWire } = wireFields;
|
|
308
|
+
const handoffRef = typeof rawHandoff === "string" ? rawHandoff.trim() : "";
|
|
244
309
|
const body = {
|
|
245
|
-
...
|
|
310
|
+
...projectionWire,
|
|
246
311
|
merchant_id: catalogMerchantId,
|
|
247
312
|
owner_agent_id: catalogAgentId,
|
|
248
313
|
owner_token: effectiveOwnerToken,
|
|
249
314
|
handoff_destination_types: ["external_checkout_url"],
|
|
250
315
|
};
|
|
316
|
+
if (handoffRef !== "") {
|
|
317
|
+
body.handoff_destination_ref = handoffRef;
|
|
318
|
+
}
|
|
251
319
|
if (typeof body.owner_token !== "string" || body.owner_token === "") {
|
|
252
320
|
reportErrors.push(`${ref}: no owner token (KIWI_MERCHANT_TOKEN 或 secret 派生)`);
|
|
253
321
|
continue;
|
|
254
322
|
}
|
|
255
323
|
try {
|
|
256
|
-
const res = await fetchImpl
|
|
324
|
+
const res = await catalogFetch(fetchImpl, `${baseUrl}/v1/listings/publish`, {
|
|
257
325
|
method: "POST",
|
|
258
326
|
headers: { "Content-Type": "application/json" },
|
|
259
327
|
body: JSON.stringify(body),
|
|
@@ -277,14 +345,43 @@ export async function merchantPublish(options) {
|
|
|
277
345
|
// diff,多出的下架(capability listing 不在投影集合,不处理)。服务端
|
|
278
346
|
// 对已 WITHDRAWN 幂等返回;SUSPENDED 的 listing 也允许商家 withdraw。
|
|
279
347
|
const projectedRefs = new Set(projections.map((p) => String(p.source_product_ref ?? "")).filter((ref) => ref !== ""));
|
|
348
|
+
// 审查 P1-B(2026-08-10 复验):空投影 + 既有 ACTIVE product listing =
|
|
349
|
+
// 配置错误典型信号(--shopping-cli-merchant 不匹配 / --shopping-cli-db
|
|
350
|
+
// 指向空库)——此前 reconcile 会把自查端点返回的全部 listing 下架且
|
|
351
|
+
// 报告仍 ok:true,自动化发布不告警。fail-closed:拒绝下架,除非显式
|
|
352
|
+
// allowEmptyProjectionReconcile。自查失败不在此重复判定(下方循环会报)。
|
|
353
|
+
let reconcileBlocked = false;
|
|
354
|
+
if (projections.length === 0 && options.allowEmptyProjectionReconcile !== true) {
|
|
355
|
+
const probeUrl = `${baseUrl}/v1/agents/${encodeURIComponent(catalogAgentId)}/listings` +
|
|
356
|
+
`?owner_token=${encodeURIComponent(effectiveOwnerToken)}&limit=100`;
|
|
357
|
+
try {
|
|
358
|
+
const probeRes = await catalogFetch(fetchImpl, probeUrl, { signal: AbortSignal.timeout(15_000) });
|
|
359
|
+
const probePayload = (await probeRes.json());
|
|
360
|
+
if (probeRes.ok && probePayload.ok === true) {
|
|
361
|
+
const hasActiveProductListing = (probePayload.results ?? []).some((rec) => String(rec.listing_type ?? "") === "product" &&
|
|
362
|
+
String(rec.publication_state ?? "") !== "WITHDRAWN");
|
|
363
|
+
if (hasActiveProductListing) {
|
|
364
|
+
reconcileBlocked = true;
|
|
365
|
+
reportErrors.push("投影为空但 catalog 存在 ACTIVE product listing:拒绝 reconcile 下架" +
|
|
366
|
+
"(疑似 --shopping-cli-merchant 不匹配或 --shopping-cli-db 指向空库);" +
|
|
367
|
+
"如确需全部下架请显式传 --allow-empty-projection");
|
|
368
|
+
}
|
|
369
|
+
}
|
|
370
|
+
}
|
|
371
|
+
catch {
|
|
372
|
+
// 探测失败交给下方 reconcile 循环报错(fail-closed 语义一致)
|
|
373
|
+
}
|
|
374
|
+
}
|
|
280
375
|
const withdrawnRefs = [];
|
|
281
376
|
try {
|
|
282
377
|
let cursor;
|
|
283
378
|
for (;;) {
|
|
379
|
+
if (reconcileBlocked)
|
|
380
|
+
break;
|
|
284
381
|
const listUrl = `${baseUrl}/v1/agents/${encodeURIComponent(catalogAgentId)}/listings` +
|
|
285
382
|
`?owner_token=${encodeURIComponent(effectiveOwnerToken)}&limit=100` +
|
|
286
383
|
(cursor !== undefined ? `&cursor=${encodeURIComponent(cursor)}` : "");
|
|
287
|
-
const listRes = await fetchImpl
|
|
384
|
+
const listRes = await catalogFetch(fetchImpl, listUrl, { signal: AbortSignal.timeout(15_000) });
|
|
288
385
|
const listPayload = (await listRes.json());
|
|
289
386
|
if (!listRes.ok || listPayload.ok !== true) {
|
|
290
387
|
reportErrors.push(`withdraw reconcile failed: ${listPayload.error ?? `HTTP ${listRes.status}`}`);
|
|
@@ -303,7 +400,7 @@ export async function merchantPublish(options) {
|
|
|
303
400
|
if (listingId === "")
|
|
304
401
|
continue;
|
|
305
402
|
try {
|
|
306
|
-
const wRes = await fetchImpl
|
|
403
|
+
const wRes = await catalogFetch(fetchImpl, `${baseUrl}/v1/listings/${encodeURIComponent(listingId)}/withdraw`, {
|
|
307
404
|
method: "POST",
|
|
308
405
|
headers: { "Content-Type": "application/json" },
|
|
309
406
|
body: JSON.stringify({ owner_token: effectiveOwnerToken }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-publish.js","sourceRoot":"","sources":["../src/product-publish.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA4D3F,SAAS,WAAW,CAAC,OAAe;IAClC,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;AAC5D,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,OAA+B;IAE/B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAChC,4DAA4D;IAC5D,YAAY;IACZ,iEAAiE;IACjE,2DAA2D;IAC3D,4CAA4C;IAC5C,sEAAsE;IACtE,qDAAqD;IACrD,sDAAsD;IACtD,uCAAuC;IACvC,yCAAyC;IACzC,MAAM,iBAAiB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC3C,MAAM,gBAAgB,GAAG,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,QAAQ,CAAC;IACzE,MAAM,MAAM,GACV,OAAO,CAAC,aAAa;QACrB,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAC/B,YAAY,WAAW,CAAC,iBAAiB,CAAC,QAAQ,CAAC;IAErD,0DAA0D;IAC1D,mDAAmD;IACnD,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,IAAI,SAAS,CAAC;IACpD,IAAI,aAA2C,CAAC;IAChD,IAAI,CAAC;QACH,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,eAAe,IAAI,UAAU,EAAE,CAAC,WAAW,CAAC,EAAE;YACjF,QAAQ,EAAE,OAAO;YACjB,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK,EAAE;gBACL,mBAAmB,EAAE;oBACnB,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE,uBAAuB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;iBACjF;gBACD,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,0BAA0B,EAAE;gBACvD,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE;aAC9D;SACF,CAAC;IACJ,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5E,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,mBAAmB,CAAC,EAAE,CAAC;QACtD,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK,EAAE;gBACL,mBAAmB,EAAE;oBACnB,EAAE,EAAE,KAAK;oBACT,OAAO,EAAE,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;oBACrD,KAAK,EACH,gBAAgB,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,eAAe;wBAC1E,IAAI,eAAe,CAAC,mBAAmB,CAAC,GAAG;iBAC9C;gBACD,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,0BAA0B,EAAE;gBACvD,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE;aAC9D;SACF,CAAC;IACJ,CAAC;IACD,MAAM,UAAU,GAAe;QAC7B,EAAE,EAAE,IAAI;QACR,GAAG,CAAC,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxD,CAAC;IAEF,wDAAwD;IACxD,0DAA0D;IAC1D,qDAAqD;IACrD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,UAAU,CAAC,KAAK,CAAC;IACxD,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC3D,IAAI,cAAkC,CAAC;IACvC,IAAI,UAA8B,CAAC;IACnC,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,GAAG,OAAO,+BAA+B,kBAAkB,CAAC,iBAAiB,CAAC,SAAS,CAAC;QAC1G,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACnF,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;YACd,MAAM,IAAI,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAuD,CAAC;YACzF,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC;YACrD,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;gBACpD,cAAc,GAAG,QAAQ,CAAC;YAC5B,CAAC;QACH,CAAC;QACD,qCAAqC;QACrC,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC;gBACrC,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,MAAM;gBACN,UAAU,EAAE,iBAAiB;gBAC7B,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,YAAY,EAAE,GAAG,MAAM,8BAA8B;gBACrD,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,SAAS,EAAE,MAAM;aAClB,CAAC,CAAC;YACH,cAAc,GAAG,GAAG,CAAC,cAAc,CAAC;QACtC,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,UAAU,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,UAAU,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAC7D,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK,EAAE;gBACL,mBAAmB,EAAE,UAAU;gBAC/B,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,IAAI,uCAAuC,EAAE;gBAClF,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,qCAAqC,EAAE;aAC/E;SACF,CAAC;IACJ,CAAC;IAED,mEAAmE;IACnE,6DAA6D;IAC7D,0DAA0D;IAC1D,wDAAwD;IACxD,8BAA8B;IAC9B,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,IAAI,SAAS,CAAC;IAC7C,MAAM,IAAI,GAAG;QACX,MAAM,EAAE,OAAO,CAAC,aAAa;QAC7B,UAAU;QACV,aAAa;QACb,YAAY,EAAE,gBAAgB;QAC9B,UAAU,EAAE,MAAM;KACnB,CAAC;IACF,IAAI,MAAoC,CAAC;IACzC,IAAI,CAAC;QACH,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,IAAI,UAAU,EAAE,IAAI,EAAE;YAC1D,QAAQ,EAAE,OAAO;YACjB,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK,EAAE;gBACL,mBAAmB,EAAE,UAAU;gBAC/B,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,cAAc,EAAE;gBACrD,QAAQ,EAAE;oBACR,EAAE,EAAE,KAAK;oBACT,MAAM,EAAE,CAAC,8BAA8B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;iBAC3F;aACF;SACF,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAC3C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,0CAA0C;QAC1C,MAAM,MAAM,GAAG,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC7E,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK,EAAE;gBACL,mBAAmB,EAAE,UAAU;gBAC/B,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,cAAc,EAAE;gBACrD,QAAQ,EAAE;oBACR,EAAE,EAAE,KAAK;oBACT,MAAM,EAAE,CAAC,oCAAoC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,MAAM,CAAC,MAAM,IAAI,GAAG,EAAE,EAAE,CAAC;iBACxG;aACF;SACF,CAAC;IACJ,CAAC;IACD,IAAI,WAAW,GAAmC,EAAE,CAAC;IACrD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAwC,CAAC;QACzE,IAAI,MAAM,CAAC,EAAE,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YACxD,WAAW,GAAG,MAAM,CAAC,OAAyC,CAAC;QACjE,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,iCAAiC;QACjC,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK,EAAE;gBACL,mBAAmB,EAAE,UAAU;gBAC/B,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,cAAc,EAAE;gBACrD,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,qCAAqC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE;aAC/F;SACF,CAAC;IACJ,CAAC;IAED,0DAA0D;IAC1D,kEAAkE;IAClE,8CAA8C;IAC9C,MAAM,mBAAmB,GACvB,OAAO,CAAC,UAAU,KAAK,SAAS,IAAI,OAAO,CAAC,UAAU,KAAK,EAAE;QAC3D,CAAC,CAAC,OAAO,CAAC,UAAU;QACpB,CAAC,CAAC,OAAO,CAAC,gBAAgB,KAAK,SAAS;YACtC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CAAC;iBAC3C,MAAM,CAAC,sBAAsB,iBAAiB,EAAE,CAAC;iBACjD,MAAM,CAAC,KAAK,CAAC;YAClB,CAAC,CAAC,EAAE,CAAC;IACX,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,kBAAkB,IAAI,GAAG,CAAC,CAAC;QACzD,oDAAoD;QACpD,sBAAsB;QACtB,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;QACrC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAC3D,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtB,SAAS;QACX,CAAC;QACD,4DAA4D;QAC5D,uCAAuC;QACvC,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CACnC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CACnE,CAAC;QACF,MAAM,IAAI,GAA4B;YACpC,GAAG,UAAU;YACb,WAAW,EAAE,iBAAiB;YAC9B,cAAc,EAAE,cAAc;YAC9B,WAAW,EAAE,mBAAmB;YAChC,yBAAyB,EAAE,CAAC,uBAAuB,CAAC;SACrD,CAAC;QACF,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ,IAAI,IAAI,CAAC,WAAW,KAAK,EAAE,EAAE,CAAC;YACpE,YAAY,CAAC,IAAI,CAAC,GAAG,GAAG,oDAAoD,CAAC,CAAC;YAC9E,SAAS;QACX,CAAC;QACD,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,GAAG,OAAO,sBAAsB,EAAE;gBAC5D,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC1B,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;aACpC,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAwE,CAAC;YAC1G,IAAI,GAAG,CAAC,EAAE,IAAI,OAAO,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;gBAClC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,YAAY,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,OAAO,CAAC,KAAK,IAAI,QAAQ,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,YAAY,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAED,iEAAiE;IACjE,iDAAiD;IACjD,wDAAwD;IACxD,gDAAgD;IAChD,wDAAwD;IACxD,MAAM,aAAa,GAAG,IAAI,GAAG,CAC3B,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,CACvF,CAAC;IACF,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,IAAI,CAAC;QACH,IAAI,MAA0B,CAAC;QAC/B,SAAS,CAAC;YACR,MAAM,OAAO,GACX,GAAG,OAAO,cAAc,kBAAkB,CAAC,cAAc,CAAC,WAAW;gBACrE,gBAAgB,kBAAkB,CAAC,mBAAmB,CAAC,YAAY;gBACnE,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACxE,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAClF,MAAM,WAAW,GAAG,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAKxC,CAAC;YACF,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,WAAW,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;gBAC3C,YAAY,CAAC,IAAI,CAAC,8BAA8B,WAAW,CAAC,KAAK,IAAI,QAAQ,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBACjG,MAAM;YACR,CAAC;YACD,KAAK,MAAM,GAAG,IAAI,WAAW,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;gBAC5C,uDAAuD;gBACvD,IAAI,MAAM,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,KAAK,SAAS;oBAAE,SAAS;gBAC3D,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC;gBACjD,IAAI,GAAG,KAAK,EAAE,IAAI,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC;oBAAE,SAAS;gBACnD,IAAI,MAAM,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC,KAAK,WAAW;oBAAE,SAAS;gBAClE,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;gBAC/C,IAAI,SAAS,KAAK,EAAE;oBAAE,SAAS;gBAC/B,IAAI,CAAC;oBACH,MAAM,IAAI,GAAG,MAAM,SAAS,CAC1B,GAAG,OAAO,gBAAgB,kBAAkB,CAAC,SAAS,CAAC,WAAW,EAClE;wBACE,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;wBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,mBAAmB,EAAE,CAAC;wBAC1D,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC;qBACpC,CACF,CAAC;oBACF,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAqC,CAAC;oBACzE,IAAI,IAAI,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;wBACpC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBAC1B,CAAC;yBAAM,CAAC;wBACN,YAAY,CAAC,IAAI,CAAC,GAAG,GAAG,cAAc,QAAQ,CAAC,KAAK,IAAI,QAAQ,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;oBACnF,CAAC;gBACH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,YAAY,CAAC,IAAI,CAAC,GAAG,GAAG,cAAc,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC5F,CAAC;YACH,CAAC;YACD,MAAM,IAAI,GAAG,WAAW,CAAC,WAAW,CAAC;YACrC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,EAAE;gBAAE,MAAM;YACnD,MAAM,GAAG,IAAI,CAAC;QAChB,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,YAAY,CAAC,IAAI,CAAC,8BAA8B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACtG,CAAC;IAED,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC;IACrC,OAAO;QACL,EAAE;QACF,KAAK,EAAE;YACL,mBAAmB,EAAE,UAAU;YAC/B,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,cAAc,EAAE;YACrD,QAAQ,EAAE;gBACR,EAAE;gBACF,SAAS,EAAE,aAAa,CAAC,MAAM;gBAC/B,OAAO,EAAE,WAAW,CAAC,MAAM;gBAC3B,SAAS,EAAE,aAAa,CAAC,MAAM;gBAC/B,cAAc,EAAE,aAAa;gBAC7B,YAAY,EAAE,WAAW;gBACzB,cAAc,EAAE,aAAa;gBAC7B,GAAG,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC7D;SACF;KACF,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"product-publish.js","sourceRoot":"","sources":["../src/product-publish.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,5 +75,10 @@ export declare function parseStackConfig(raw: string, source: string): StackConf
|
|
|
75
75
|
/** A free loopback port (best effort; the usual bind-after-close race applies). */
|
|
76
76
|
export declare function pickFreePort(): Promise<number>;
|
|
77
77
|
export declare function newInstanceId(): string;
|
|
78
|
-
/** Detect
|
|
78
|
+
/** Detect a nearby shopping-cli source checkout.
|
|
79
|
+
*
|
|
80
|
+
* Local development keeps the repositories as siblings, while composition CI
|
|
81
|
+
* checks the pinned consumer out below the Kiwi workspace. Support both
|
|
82
|
+
* layouts so `kiwi init` remains deterministic in either environment.
|
|
83
|
+
*/
|
|
79
84
|
export declare function detectShoppingCliSrc(packageRoot: string): string | undefined;
|
|
@@ -254,9 +254,17 @@ export async function pickFreePort() {
|
|
|
254
254
|
export function newInstanceId() {
|
|
255
255
|
return randomBytes(16).toString("hex");
|
|
256
256
|
}
|
|
257
|
-
/** Detect
|
|
257
|
+
/** Detect a nearby shopping-cli source checkout.
|
|
258
|
+
*
|
|
259
|
+
* Local development keeps the repositories as siblings, while composition CI
|
|
260
|
+
* checks the pinned consumer out below the Kiwi workspace. Support both
|
|
261
|
+
* layouts so `kiwi init` remains deterministic in either environment.
|
|
262
|
+
*/
|
|
258
263
|
export function detectShoppingCliSrc(packageRoot) {
|
|
259
|
-
const
|
|
260
|
-
|
|
264
|
+
const candidates = [
|
|
265
|
+
path.resolve(packageRoot, "..", "shopping-cli"),
|
|
266
|
+
path.resolve(packageRoot, "shopping-cli"),
|
|
267
|
+
];
|
|
268
|
+
return candidates.find((candidate) => existsSync(path.join(candidate, "shopping_cli")));
|
|
261
269
|
}
|
|
262
270
|
//# sourceMappingURL=stack-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stack-config.js","sourceRoot":"","sources":["../../src/supervisor/stack-config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"stack-config.js","sourceRoot":"","sources":["../../src/supervisor/stack-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -237,6 +237,23 @@ function verifyEntry(entry, signatureBytes, input, now, skew, maxAge) {
|
|
|
237
237
|
if (entry.params.expires !== undefined && entry.params.expires < now - skew) {
|
|
238
238
|
return { ok: false, code: "authorization_failed", reason: "signature has expired" };
|
|
239
239
|
}
|
|
240
|
+
// 审查 BUG-06:最小组件集合强制——此前 content-digest 校验由签名者自选
|
|
241
|
+
// 组件决定(signature 可只覆盖 @method/@target-uri/@authority,body 不被
|
|
242
|
+
// 签名绑定),服务端确认"签名有效"却未确认签过当前 body。带非空 body 的
|
|
243
|
+
// 已签名请求必须覆盖 @method/@target-uri/@authority 与 content-digest。
|
|
244
|
+
const REQUIRED_COMPONENTS = ["@method", "@target-uri", "@authority"];
|
|
245
|
+
const missingComponents = REQUIRED_COMPONENTS.filter((component) => !entry.components.includes(component));
|
|
246
|
+
const hasBody = input.body !== undefined && input.body.length > 0;
|
|
247
|
+
if (hasBody && !entry.components.includes("content-digest")) {
|
|
248
|
+
missingComponents.push("content-digest");
|
|
249
|
+
}
|
|
250
|
+
if (missingComponents.length > 0) {
|
|
251
|
+
return {
|
|
252
|
+
ok: false,
|
|
253
|
+
code: "authorization_failed",
|
|
254
|
+
reason: `signature must cover: ${missingComponents.join(", ")}`,
|
|
255
|
+
};
|
|
256
|
+
}
|
|
240
257
|
let base;
|
|
241
258
|
try {
|
|
242
259
|
base = buildSignatureBase({
|