@harrylabsj/kiwi 0.6.0 → 0.6.2

package/dist/cli.js

@@ -30,21 +30,18 @@
 import { existsSync, realpathSync } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { agentDataDir, ensurePathsForDir } from "./agent/agent-db.js";
 import { startA2aNode } from "./a2a/node.js";
 import { runChatTui } from "./agent/chat-tui.js";
-import { createFakeChatModels } from "./agent/fake-chat-model.js";
-import { isAgentMode } from "./agent/mode.js";
+import { buildChatKernel, buildClient, defaultChatProfile } from "./agent/kernel-builder.js";
 import { AgentKernel } from "./agent/kernel.js";
-import { loadProfile, ProfileError, resolveSecret, RUNTIME_VERSION } from "./config/profile.js";
-import { HttpCommerceClient } from "./commerce/http-client.js";
+import { loadProfile, ProfileError } from "./config/profile.js";
 import { CommerceError } from "./commerce/types.js";
 import { runDoctor } from "./doctor.js";
 import { EXIT } from "./exit-codes.js";
 import { createDeterministicStreamFn } from "./runtime/fake-model.js";
 import { runForeground } from "./runtime/foreground.js";
 import { runNegotiationTurn } from "./runtime/negotiation-turn.js";
-import { isFakeProvider, realStreamFn, resolveThinkingLevel } from "./runtime/model.js";
+import { isFakeProvider, realStreamFn } from "./runtime/model.js";
 import { OperatorController } from "./operator/controller.js";
 import { DeterministicNegotiationRunner } from "./operator/runner.js";
 import { FileOperatorEventStore, OperatorStoreError } from "./operator/store.js";
@@ -55,9 +52,11 @@ import { runDown, runStatus, runUp, SupervisorError } from "./supervisor/manage.
 import { parseLogLines, runLogs } from "./supervisor/logs.js";
 import { StackConfigError } from "./supervisor/stack-config.js";
 import { cmdProductDoctor, productHelp, PRODUCT_VERSION, DEFAULT_CATALOG_URL } from "./product-cli.js";
+import { cmdWeixin, weixinUsage } from "./weixin/cli-weixin.js";
 import { merchantInit } from "./product-init.js";
 import { buyerInit, buyerSearch, buyerTasks } from "./product-buyer.js";
 import { merchantPublish } from "./product-publish.js";
+import { catalogServe } from "./product-catalog.js";
 const USAGE = `kiwi ${PRODUCT_VERSION} — commerce negotiation agent runtime
 
 Usage:
@@ -81,7 +80,12 @@ Usage:
                                           /discover /negotiate /register in-session
   kiwi chat --profile <file> [--data-dir <dir>]
                                           Main conversation with Principal Memory (v0.3.0-A)
+  kiwi weixin [--profile <file>] [--allow id,...] [--relogin] [--a2a]
+                                          WeChat remote control (scan QR to log in)
   kiwi metrics --dir <dir>                Handoff/negotiation ledger metrics (JSONL)
+  kiwi catalog serve [--db <file>] [--host <host>] [--port <port>]
+                                          Start the standalone kiwi-catalog service
+                                          (foreground; requires pip install kiwi-catalog)
 
 Product layer (product-strategy rev1.1 §10/§19):
   kiwi buyer --help                       Kiwi Buyer command tree
@@ -100,7 +104,8 @@ contain secrets or private policy values. Secrets come from environment
 variables named in the profile (commerce.token_env, model.api_key_env);
 they are never read from or written to the profile file.
 `;
-function parseArgs(argv) {
+/** 导出供测试（审查 P2-L：--a2a flag 解析回归锁定）。 */
+export function parseArgs(argv) {
     const command = [];
     let profile;
     let dir;
@@ -114,6 +119,7 @@ function parseArgs(argv) {
     let output;
     let force = false;
     let noInstall = false;
+    let allowEmptyProjectionReconcile = false;
     let agentId;
     let ownerId;
     let autoNegotiate = false;
@@ -124,10 +130,17 @@ function parseArgs(argv) {
     let dataDir;
     let catalog;
     let port;
+    let catalogDb;
+    let catalogHost;
     let once = false;
     let fake = false;
     let noChat = false;
     let noA2a = false;
+    let a2aExplicit = false;
+    let weixinAllow;
+    let relogin = false;
+    let qrScale = 1;
+    let noQr = false;
     for (let i = 0; i < argv.length; i++) {
         const arg = argv[i];
         if (arg === "--profile") {
@@ -163,6 +176,10 @@ function parseArgs(argv) {
         else if (arg === "--force") {
             force = true;
         }
+        else if (arg === "--allow-empty-projection") {
+            // 审查 P1-B：显式放行"投影为空时 reconcile 全量下架"（默认拒绝）
+            allowEmptyProjectionReconcile = true;
+        }
         else if (arg === "--no-install") {
             noInstall = true;
         }
@@ -199,6 +216,12 @@ function parseArgs(argv) {
             const parsed = /^\d+$/.test(raw ?? "") ? Number(raw) : Number.NaN;
             port = Number.isInteger(parsed) ? parsed : undefined;
         }
+        else if (arg === "--host") {
+            catalogHost = argv[++i];
+        }
+        else if (arg === "--db") {
+            catalogDb = argv[++i];
+        }
         else if (arg === "--once") {
             once = true;
         }
@@ -211,6 +234,26 @@ function parseArgs(argv) {
         else if (arg === "--no-a2a") {
             noA2a = true;
         }
+        else if (arg === "--a2a") {
+            // 审查 P2-L：weixin 命令文档承诺"A2A 节点默认关，--a2a 开启"——
+            // 此前 parseArgs 无此分支（Unknown argument: --a2a，实测 exit 2），
+            // 且默认 noA2a=false 让 A2A 恒开（与文档相反，需 --no-a2a 才能关）。
+            // 裸 kiwi 命令的 A2A 默认开不受影响（见 cmdWeixin 的解析）。
+            a2aExplicit = true;
+        }
+        else if (arg === "--allow") {
+            weixinAllow = argv[++i];
+        }
+        else if (arg === "--relogin") {
+            relogin = true;
+        }
+        else if (arg === "--qr-scale") {
+            const raw = argv[++i];
+            qrScale = raw === "2" ? 2 : 1;
+        }
+        else if (arg === "--no-qr") {
+            noQr = true;
+        }
         else if (arg !== undefined && arg.startsWith("--profile=")) {
             profile = arg.slice("--profile=".length);
         }
@@ -239,7 +282,22 @@ function parseArgs(argv) {
             throw new ProfileError(`Unknown argument: ${arg ?? ""}`);
         }
     }
-    const out = { command, once, fake, noChat, noA2a, force, noInstall, autoNegotiate };
+    const out = {
+        command,
+        once,
+        fake,
+        noChat,
+        noA2a,
+        a2aExplicit,
+        force,
+        noInstall,
+        autoNegotiate,
+        allowEmptyProjectionReconcile,
+        weixinAllow,
+        relogin,
+        qrScale,
+        noQr,
+    };
     if (profile !== undefined)
         out.profile = profile;
     if (dir !== undefined)
@@ -254,6 +312,8 @@ function parseArgs(argv) {
         out.shoppingCliPath = shoppingCliPath;
     if (shoppingCliMerchant !== undefined)
         out.shoppingCliMerchant = shoppingCliMerchant;
+    if (allowEmptyProjectionReconcile)
+        out.allowEmptyProjectionReconcile = true;
     if (merchantId !== undefined)
         out.merchantId = merchantId;
     if (merchantName !== undefined)
@@ -278,6 +338,10 @@ function parseArgs(argv) {
         out.catalog = catalog;
     if (port !== undefined)
         out.port = port;
+    if (catalogDb !== undefined)
+        out.catalogDb = catalogDb;
+    if (catalogHost !== undefined)
+        out.catalogHost = catalogHost;
     return out;
 }
 function requireDir(args) {
@@ -292,13 +356,6 @@ function requireProfile(args) {
     }
     return loadProfile(args.profile);
 }
-function buildClient(profile) {
-    const token = resolveSecret(profile.commerce.token_env, "commerce token");
-    return new HttpCommerceClient({
-        baseUrl: profile.commerce.base_url,
-        token,
-    });
-}
 function printReportJsonl(report) {
     process.stdout.write(`${JSON.stringify(report)}\n`);
 }
@@ -473,7 +530,16 @@ async function cmdTui(args) {
  *
  *   kiwi agent serve --profile <merchant.yaml> [--catalog <url>]  # 缺省官方 catalog，本地自托管用 --catalog http://127.0.0.1:8600
  *                    [--port 9000] [--data-dir <dir>]
+ *
+ * 公网暴露：节点仍监听 127.0.0.1，但可用 KIWI_A2A_PUBLIC_URL=<https://domain>
+ * 覆盖 Agent Card / UCP / catalog 注册广告的公网地址（配合 Caddy/Nginx 反代）。
  */
+/** 审查 P1-09：agent serve 的 A2A 状态目录。缺省用稳定路径
+ *  `<cwd>/.kiwi/agents/<agent_id>`（与 operator 路径共用同一缺省）——重启后
+ *  Ledger/幂等/终态可恢复；显式 --data-dir 覆盖。绝不回退到临时目录。 */
+export function resolveServeDataDir(dataDir, agentId) {
+    return dataDir ?? path.resolve(".kiwi", "agents", agentId);
+}
 async function cmdAgentServe(args) {
     const profile = requireProfile(args);
     if (profile.role !== "merchant") {
@@ -481,13 +547,22 @@ async function cmdAgentServe(args) {
         return EXIT.CONFIG;
     }
     const catalog = args.catalog ?? process.env.KIWI_CATALOG_URL ?? DEFAULT_CATALOG_URL;
+    const merchantToken = process.env.KIWI_MERCHANT_TOKEN || "";
+    // 审查 P1-09：serve 的初始 A2A 节点必须用稳定 dataDir——此前初始节点缺省走
+    // mkdtemp 临时目录且 stop 时删除，重启后 Ledger/幂等/终态全丢：已终态
+    // negotiation 可重开、已发 conditional offer 返回 offer_unknown。稳定目录
+    // 让重启可恢复状态（resolveServeDataDir 见上）。
+    const serveDataDir = resolveServeDataDir(args.dataDir, profile.agent_id);
     let node = await startA2aNode({
         profile,
         catalog,
         preferredPort: args.port,
+        dataDir: serveDataDir,
+        ...(merchantToken ? { ownerToken: merchantToken } : {}),
         ownerTokenSecret: process.env.KIWI_CATALOG_OWNER_TOKEN_SECRET,
     });
-    console.log(`[agent serve] merchant ${profile.agent_id} A2A server: ${node.agentCardUrl}`);
+    console.log(`[agent serve] merchant ${profile.agent_id} A2A server: ${node.agentCardUrl}` +
+        (node.advertisedUrl !== node.url ? ` (local ${node.url})` : ""));
     console.log(`[agent serve] registered in catalog ${catalog}: ${node.catalogAgentId ?? "?"}`);
     const a2aNode = {
         status: () => node === null
@@ -504,6 +579,8 @@ async function cmdAgentServe(args) {
                 profile: p,
                 catalog,
                 preferredPort: args.port,
+                dataDir: serveDataDir,
+                ...(merchantToken ? { ownerToken: merchantToken } : {}),
                 ownerTokenSecret: process.env.KIWI_CATALOG_OWNER_TOKEN_SECRET,
             });
         },
@@ -559,149 +636,12 @@ async function cmdAgentServe(args) {
  * - KIWI_MODEL_API_KEY_ENV（默认 DEEPSEEK_API_KEY）
  * - KIWI_MODEL_BASE_URL（可选覆盖）
  */
-function defaultChatProfile() {
-    const provider = process.env.KIWI_MODEL_PROVIDER ?? "deepseek";
-    const model = process.env.KIWI_MODEL ?? "deepseek-v4-flash";
-    const apiKeyEnv = process.env.KIWI_MODEL_API_KEY_ENV ?? "DEEPSEEK_API_KEY";
-    const baseUrl = process.env.KIWI_MODEL_BASE_URL;
-    return {
-        runtime_version: RUNTIME_VERSION,
-        protocol_version: "shopping.negotiation/0.1",
-        agent_id: "kiwi-assistant",
-        role: "buyer",
-        owner_id: "kiwi-user",
-        commerce: {
-            base_url: "http://127.0.0.1:8765",
-            token_env: "SHOPPING_BUYER_TOKEN",
-            backend: "local_marketplace",
-        },
-        model: {
-            provider,
-            model,
-            api_key_env: apiKeyEnv,
-            ...(baseUrl !== undefined ? { base_url: baseUrl } : {}),
-        },
-        runtime: {
-            mode: "once",
-            poll_interval_seconds: 5,
-            turn_timeout_seconds: 90,
-            max_model_steps: 4,
-            max_retries: 2,
-        },
-        buyer_policy: {
-            target_skus: [],
-            quantity: 1,
-            max_total_price_private: 1_000_000,
-            acceptable_eta_latest: "2099-12-31T23:59:59+08:00",
-            required_after_sales_terms: [],
-            auto_negotiate: true,
-            human_review_on: [],
-        },
-    };
-}
 /**
  * Main conversation (v0.3.0-A): build the AgentKernel for a profile.
  * provider=fake runs the deterministic offline chat fake; real providers
  * resolve models and auth through pi-ai's built-in provider catalog.
  * `catalog` 是 agent catalog base URL（buyer 的 negotiate_buyer_task 发现商家用）。
  */
-async function buildChatKernel(profile, dataDir, catalog) {
-    const paths = ensurePathsForDir(dataDir ?? agentDataDir(profile.agent_id));
-    let models;
-    let model;
-    let connector;
-    let thinkingLevel;
-    let merchantClient;
-    let broker;
-    let commerceClient;
-    if (isFakeProvider(profile)) {
-        ({ models, model } = createFakeChatModels());
-        if (profile.role === "buyer") {
-            const { FakeCommerceConnector, fakeConnectorProduct } = await import("./agent/connector/fake-connector.js");
-            connector = new FakeCommerceConnector([
-                fakeConnectorProduct(),
-                fakeConnectorProduct({
-                    sku: "sku-002",
-                    title: "机制陶瓷杯",
-                    price: 59,
-                    stock: 0,
-                    merchant_id: "merchant-002",
-                }),
-            ]);
-        }
-        else {
-            // Offline merchant chat: deterministic catalog client + dummy-scope
-            // credentials so the capability pack is exercisable without a gateway.
-            const { FakeMerchantClient, fakeMerchantProduct } = await import("./agent/merchant/fake-merchant-client.js");
-            const { StaticCredentialBroker } = await import("./agent/merchant/credential-broker.js");
-            merchantClient = new FakeMerchantClient({
-                products: [fakeMerchantProduct()],
-            });
-            broker = new StaticCredentialBroker({
-                negotiation: "fake-negotiation-token",
-                catalog: "fake-catalog-token",
-                inventory: "fake-inventory-token",
-            });
-        }
-    }
-    else {
-        const { builtinModels } = await import("@earendil-works/pi-ai/providers/all");
-        const collection = builtinModels();
-        const found = collection.getModel(profile.model.provider, profile.model.model);
-        if (found === undefined) {
-            process.stderr.write(`no built-in model ${profile.model.provider}/${profile.model.model}; check the profile\n`);
-            throw new ProfileError(`no built-in model ${profile.model.provider}/${profile.model.model}`);
-        }
-        models = collection;
-        model = found;
-        thinkingLevel = resolveThinkingLevel(profile);
-        if (profile.role === "buyer") {
-            const { ShoppingCliConnector } = await import("./agent/connector/http-connector.js");
-            connector = new ShoppingCliConnector(profile.commerce.base_url, {
-                buyerBootstrapToken: process.env.SHOPPING_BUYER_BOOTSTRAP_TOKEN,
-            });
-        }
-        // Real gateway: negotiation client + scoped merchant client + broker.
-        const { ProfileCredentialBroker } = await import("./agent/merchant/credential-broker.js");
-        broker = new ProfileCredentialBroker(profile);
-        try {
-            commerceClient = buildClient(profile);
-        }
-        catch {
-            // No negotiation token: negotiation tools fail closed at call time.
-            // Catalog/inventory 只读工具走公开搜索端点，不依赖该 token，仍会挂载。
-            commerceClient = undefined;
-            if (profile.role === "merchant") {
-                process.stderr.write(`[kiwi] 未设置 ${profile.commerce.token_env}：磋商工具停用（fail closed），` +
-                    "目录/库存只读工具仍可用。\n");
-            }
-        }
-        if (profile.role === "merchant") {
-            const { HttpMerchantClient } = await import("./agent/merchant/merchant-client.js");
-            merchantClient = new HttpMerchantClient(profile.commerce.base_url, broker);
-        }
-    }
-    // KIWI_MODE env: start the chat already in the given write mode (e.g.
-    // autopilot for autonomous negotiation) — no manual /mode needed.
-    const kiwiMode = process.env.KIWI_MODE;
-    const mode = isAgentMode(kiwiMode) ? kiwiMode : undefined;
-    if (kiwiMode !== undefined && mode === undefined) {
-        process.stderr.write(`unknown KIWI_MODE ${kiwiMode}（可选 ${["manual", "supervised", "autopilot"].join("/")}）\n`);
-    }
-    return AgentKernel.open({
-        profile,
-        paths,
-        models,
-        model,
-        ...(mode !== undefined ? { mode } : {}),
-        ...(connector !== undefined ? { connector } : {}),
-        ...(commerceClient !== undefined ? { commerceClient } : {}),
-        ...(merchantClient !== undefined ? { merchantClient } : {}),
-        ...(broker !== undefined ? { broker } : {}),
-        ...(catalog !== undefined ? { catalog } : {}),
-        ...(thinkingLevel !== undefined ? { thinkingLevel } : {}),
-    });
-}
 /** kiwi 包根目录（dist/cli.js 的上级）——全局 `kiwi` 在任意 cwd 也能解析示例 profile。 */
 function packageRoot() {
     const here = path.dirname(fileURLToPath(import.meta.url));
@@ -735,6 +675,7 @@ async function cmdChat(args) {
     const profile = args.profile !== undefined ? loadProfile(args.profile) : defaultChatProfile();
     // A2A 节点 + buyer 磋商工具共用一个 catalog：kernel 构建前先解析。
     const catalog = args.catalog ?? process.env.KIWI_CATALOG_URL ?? DEFAULT_CATALOG_URL;
+    const merchantToken = process.env.KIWI_MERCHANT_TOKEN || "";
     const kernel = await buildChatKernel(profile, args.dataDir, catalog);
     const kernels = [kernel];
     const reload = async (file) => {
@@ -758,6 +699,7 @@ async function cmdChat(args) {
                 profile: p,
                 catalog,
                 preferredPort: args.port,
+                ...(merchantToken ? { ownerToken: merchantToken } : {}),
                 ownerTokenSecret: process.env.KIWI_CATALOG_OWNER_TOKEN_SECRET,
             });
             process.stderr.write(`[a2a] ${node.role}@${node.url}${node.catalogAgentId !== undefined ? ` registered ${node.catalogAgentId}` : ""}\n`);
@@ -969,20 +911,25 @@ async function cmdMerchantPublish(args) {
         return EXIT.CONFIG;
     }
     const ownerTokenSecret = process.env.KIWI_CATALOG_OWNER_TOKEN_SECRET;
-    if (!ownerTokenSecret) {
-        process.stderr.write("KIWI_CATALOG_OWNER_TOKEN_SECRET 是必需的（owner token 派生，与 kiwi-catalog 一致）\n");
+    const merchantToken = process.env.KIWI_MERCHANT_TOKEN || "";
+    if (!merchantToken && !ownerTokenSecret) {
+        process.stderr.write("需要 KIWI_MERCHANT_TOKEN（随机 token，推荐）或 KIWI_CATALOG_OWNER_TOKEN_SECRET（legacy HMAC）\n");
         return EXIT.CONFIG;
     }
     const catalog = args.catalog ?? process.env.KIWI_CATALOG_URL ?? DEFAULT_CATALOG_URL;
     const report = await merchantPublish({
         profile,
         catalogBaseUrl: catalog,
-        ownerTokenSecret,
+        ...(merchantToken ? { ownerToken: merchantToken } : {}),
+        ...(ownerTokenSecret ? { ownerTokenSecret } : {}),
         shoppingCliDb,
         ...(args.shoppingCliPath !== undefined ? { shoppingCliPath: args.shoppingCliPath } : {}),
         ...(args.shoppingCliMerchant !== undefined
             ? { shoppingCliMerchant: args.shoppingCliMerchant }
             : {}),
+        ...(args.allowEmptyProjectionReconcile
+            ? { allowEmptyProjectionReconcile: true }
+            : {}),
     });
     printJson(report);
     return report.ok ? EXIT.OK : EXIT.CONFIG;
@@ -1003,6 +950,10 @@ export async function main(argv = process.argv.slice(2)) {
     const hasHelp = argv.includes("--help") || argv.includes("-h");
     const firstArg = argv.find((a) => !a.startsWith("-"));
     // 产品层命令组帮助优先于全局帮助（`kiwi buyer --help` → buyer 帮助）
+    if (hasHelp && firstArg === "weixin") {
+        process.stdout.write(weixinUsage());
+        return EXIT.OK;
+    }
     if (hasHelp && (firstArg === "buyer" || firstArg === "merchant" || firstArg === "network")) {
         const help = productHelp(firstArg);
         if (help !== "") {
@@ -1050,6 +1001,22 @@ export async function main(argv = process.argv.slice(2)) {
             return await cmdTui(args);
         if (cmd === "chat")
             return await cmdChat(args);
+        if (cmd === "weixin") {
+            return await cmdWeixin({
+                profile: args.profile,
+                dataDir: args.dataDir,
+                allow: args.weixinAllow,
+                relogin: args.relogin,
+                // 审查 P2-L：weixin 命令 A2A 节点默认关（headless 控制面收窄攻击面），
+                // 仅 --a2a 显式开启（--no-a2a 仍可覆盖）。裸 kiwi/chat 命令的
+                // A2A 默认开不受影响（各自按 noA2a 判断）。
+                a2a: args.a2aExplicit && !args.noA2a,
+                port: args.port,
+                qrScale: args.qrScale,
+                noQr: args.noQr,
+                catalog: args.catalog,
+            });
+        }
         if (cmd === "init") {
             const result = await runInit({
                 dir: requireDir(args),
@@ -1088,6 +1055,24 @@ export async function main(argv = process.argv.slice(2)) {
             printJson(computeHandoffMetrics(byNegotiation));
             return EXIT.OK;
         }
+        if (cmd === "catalog") {
+            // `kiwi catalog serve` —— 前台启动独立 kiwi-catalog 服务（CURRENT-DOCS）。
+            const sub = args.command[1] ?? "";
+            if (sub === "serve") {
+                const result = catalogServe({
+                    db: args.catalogDb,
+                    host: args.catalogHost,
+                    port: args.port,
+                });
+                if (!result.ok) {
+                    process.stderr.write(`${result.error ?? "kiwi-catalog 启动失败"}\n`);
+                    return EXIT.CONFIG;
+                }
+                return EXIT.OK;
+            }
+            process.stderr.write("usage: kiwi catalog serve [--db <file>] [--host <host>] [--port <port>]\n");
+            return EXIT.CONFIG;
+        }
         if (cmd === "down") {
             const result = await runDown(requireDir(args));
             printJson(result);