@itpay/cli 2.1.57 → 2.1.59

package/dist/src/main.js

@@ -16671,6 +16671,17 @@ function assertCheckoutCreation(checkout, cartID, sourceExecutionID) {
   }
 }
 __name(assertCheckoutCreation, "assertCheckoutCreation");
+function assertAccountCheckout(checkout, cartID, sourceExecutionID) {
+  const current = checkout.checkout;
+  const expiry = Date.parse(current.expires_at ?? "");
+  const entryExpiry = checkout.official_entry?.expires_at;
+  const bound = entryExpiry === void 0 ? expiry : Date.parse(entryExpiry);
+  const closed = !Number.isFinite(expiry) || !Number.isFinite(bound) || Math.min(expiry, bound) <= Date.now();
+  if (!current.checkout_id || current.cart_id !== cartID || !payableStates.includes(current.status) || closed || bound > expiry) {
+    throw checkoutNotPayable(current, cartID, sourceExecutionID, closed);
+  }
+}
+__name(assertAccountCheckout, "assertAccountCheckout");
 function assertCheckoutPayable(checkout, authoritative, cartID, sourceExecutionID) {
   const current = authoritative?.checkout ?? checkout.checkout;
   const deadlineClosed = authoritative?.payment_remaining_seconds === 0 || current.expires_at !== void 0 && (!authoritative?.server_now || Date.parse(current.expires_at) <= Date.parse(authoritative.server_now));
@@ -17599,6 +17610,12 @@ function railActionError(error, serviceExecutionID, actionType) {
 __name(railActionError, "railActionError");
 var railInputRecoveryInstruction = "Agent\u6309\u5F53\u524D\u6A21\u677F\u81EA\u884C\u4FEE\u6B63\u9519\u8BEF\u5B57\u6BB5\u548CJSON\u5C42\u7EA7\uFF0C\u4FDD\u7559\u5DF2\u6709\u6458\u8981\u7684\u7AEF\u70B9\u542B\u4E49\u53CA\u539F\u5730\u70B9/\u65E5\u671F/\u4EBA\u6570\uFF0C\u4E0D\u91CD\u590D\u7814\u7A76\u6216\u4E8B\u540E\u8865\u5199\u5192\u5145\u67E5\u8BE2\u524D\u6458\u8981\uFF1B\u4E0D\u8981\u5411\u7528\u6237\u8BE2\u95EE\u6280\u672F\u5B57\u6BB5\u3002\u53EA\u6709\u771F\u5B9E\u4E1A\u52A1\u6B67\u4E49\u624D\u95EE\u4EBA\uFF1B\u4F7F\u7528\u8FD4\u56DE\u7684\u6267\u884C\u8EAB\u4EFD\u6062\u590D\uFF0C\u672A\u521B\u5EFA\u65F6\u7528\u539F\u670D\u52A1\u3002";
 
+// src/services/shared/workflow-actor.ts
+function workflowSubmissionActor(action) {
+  return action.submission_actor === "agent" ? "agent" : "human";
+}
+__name(workflowSubmissionActor, "workflowSubmissionActor");
+
 // src/services/rail/review.ts
 function railWorkflowEnvelope(model) {
   const execution = model.execution;
@@ -17744,7 +17761,7 @@ function railWorkflowEnvelope(model) {
           ...sides.some((side) => side.status !== "resolved" && !side.candidates?.length) ? {} : { interaction: {
             schema_version: "itpay.interaction.v1",
             stage: "location_confirmation_required",
-            input_template: fileInputTemplate(`itpay services action ${id} --action ${action.action_type} --actor-type human --status approved --input-json <\u5730\u70B9\u786E\u8BA4.json> --json`, { ...railInputTemplate(action.input_schema), ...requiredFields.includes("choices") ? { choices: Object.fromEntries(sides.filter((side) => side.candidates?.length).map((side) => [side.side, "<\u6240\u9009\u5019\u9009id>"])) } : {} }, requiredFields, { executionID: id, userAnswerRequired: true })
+            input_template: fileInputTemplate(`itpay services action ${id} --action ${action.action_type} --actor-type ${workflowSubmissionActor(action)} --status approved --input-json <\u5730\u70B9\u786E\u8BA4.json> --json`, { ...railInputTemplate(action.input_schema), ...requiredFields.includes("choices") ? { choices: Object.fromEntries(sides.filter((side) => side.candidates?.length).map((side) => [side.side, "<\u6240\u9009\u5019\u9009id>"])) } : {} }, requiredFields, { executionID: id, userAnswerRequired: true })
           } },
           recovery: []
         };
@@ -17794,7 +17811,7 @@ function railWorkflowEnvelope(model) {
         interaction: {
           schema_version: "itpay.interaction.v1",
           stage: "confirmation_required",
-          input_template: fileInputTemplate(`itpay services action ${id} --action ${action.action_type} --actor-type human --status approved --input-json <file> --json`, railInputTemplate(action.input_schema), requiredFields, { executionID: id, userAnswerRequired: true })
+          input_template: fileInputTemplate(`itpay services action ${id} --action ${action.action_type} --actor-type ${workflowSubmissionActor(action)} --status approved --input-json <file> --json`, railInputTemplate(action.input_schema), requiredFields, { executionID: id, userAnswerRequired: true })
         },
         recovery: []
       };
@@ -17837,7 +17854,7 @@ function railWorkflowEnvelope(model) {
           stage: inputTemplate ? "input_required" : "payment",
           ...inputTemplate ? { input_template: inputTemplate } : {},
           ...state === "payment" && model.workflow?.human_action?.context?.review ? {
-            revise_template: fileInputTemplate(`itpay services action ${id} --action ${model.workflow.human_action.action_type} --actor-type human --status approved --input-json <file> --json`, railInputTemplate(model.workflow.human_action.input_schema), requiredInputFields(model.workflow.human_action.input_schema), { executionID: id, userAnswerRequired: true })
+            revise_template: fileInputTemplate(`itpay services action ${id} --action ${model.workflow.human_action.action_type} --actor-type ${workflowSubmissionActor(model.workflow.human_action)} --status approved --input-json <file> --json`, railInputTemplate(model.workflow.human_action.input_schema), requiredInputFields(model.workflow.human_action.input_schema), { executionID: id, userAnswerRequired: true })
           } : {}
         }
       } : {},
@@ -19090,7 +19107,7 @@ function workflowEnvelope(model) {
     instruction: "\u5C55\u793A\u672C\u6B21\u64CD\u4F5C\u7684\u5F85\u786E\u8BA4\u5185\u5BB9\uFF1B\u5DF2\u6709\u660E\u786E\u540C\u610F\u4E14\u76EE\u6807\u4E0E\u7248\u672C\u672A\u53D8\u65F6\u6CBF\u7528\uFF0C\u53EA\u8865\u7F3A\u5931\u7684\u771F\u5B9E\u540C\u610F\u3002\u6309\u5B8C\u6574\u6A21\u677F\u63D0\u4EA4\u540C\u4E00\u6267\u884C\uFF1B\u9009\u62E9\u5BF9\u8C61\u4E0D\u7B49\u4E8E\u8D2D\u4E70\u6279\u51C6\u3002",
     next: null,
     recovery: [],
-    interaction: { schema_version: "itpay.interaction.v1", stage: "confirmation_required", input_template: fileInputTemplate(`itpay services action ${id} --action ${action.action_type} --actor-type human --status approved --input-json <file> --json`, serviceInputTemplate(action.input_schema), requiredInputFields(action.input_schema), { executionID: id, userAnswerRequired: true }) }
+    interaction: { schema_version: "itpay.interaction.v1", stage: "confirmation_required", input_template: fileInputTemplate(`itpay services action ${id} --action ${action.action_type} --actor-type ${workflowSubmissionActor(action)} --status approved --input-json <file> --json`, serviceInputTemplate(action.input_schema), requiredInputFields(action.input_schema), { executionID: id, userAnswerRequired: true }) }
   };
   const inputRequired = state === "input_required";
   const failed = ["failed", "recovery_required", "cancelled"].includes(state);
@@ -19363,17 +19380,6 @@ async function presentServiceCheckout(backend, config, serviceExecutionID, respo
   const host = options.host ?? "terminal";
   const currentModel = options.readModel;
   const checkout = response.checkout;
-  assertCheckoutCreation(checkout, response.cart.cart_id, serviceExecutionID);
-  options.persistHandoff?.({
-    serviceExecutionID,
-    cartID: response.cart.cart_id,
-    checkoutID: checkout.checkout.checkout_id,
-    displayToken: checkout.display_token,
-    checkoutURL: tokenizedCheckoutURL(checkout.checkout_url, checkout.display_token, checkout.qr_payload)
-  });
-  const authoritative = checkout.display_token ? await backend.getCheckoutPresentation(checkout.checkout.checkout_id, checkout.display_token, void 0, { deadline }) : void 0;
-  assertCheckoutPayable(checkout, authoritative, response.cart.cart_id, serviceExecutionID);
-  if (authoritative) response.cart.items = authoritative.items;
   const checkoutID = checkout.checkout.checkout_id;
   const agentType = options.agentType ?? config.agentType;
   if (agentType === "dot" || agentType === "muse") {
@@ -19384,14 +19390,25 @@ async function presentServiceCheckout(backend, config, serviceExecutionID, respo
     } catch {
     }
     const readOriginal = { command: `itpay --agent-type ${agentType} services get ${serviceExecutionID} --json`, reason: "\u7528\u6237\u5B8C\u6210\u9875\u9762\u64CD\u4F5C\u540E\u8BFB\u53D6\u539F\u4EFB\u52A1\u4E8B\u5B9E" };
-    if (!entry || entry.access !== "account_session" || entry.url !== checkout.checkout_url || !url || !isPresentableURL(entry.url, config.baseURL) || url.protocol !== "https:" || url.username || url.password || url.search || url.hash || url.pathname !== `/checkout/${encodeURIComponent(checkoutID)}`) {
+    if (!entry || entry.access !== "account_session" || entry.purpose !== "checkout" || entry.url !== checkout.checkout_url || !url || !isPresentableURL(entry.url, config.baseURL) || url.protocol !== "https:" || url.username || url.password || url.search || url.hash || url.pathname !== `/checkout/${encodeURIComponent(checkoutID)}`) {
       throw new CommandContractError("secure_handoff_unavailable", "original purchase has no verified account-session entry", "\u4FDD\u7559\u539F\u8D2D\u4E70\uFF1B\u5F53\u524D\u8D26\u53F7\u5B89\u5168\u5165\u53E3\u4E0D\u53EF\u7528\uFF0C\u4E0D\u5C55\u793A\u6216\u62FC\u63A5 bearer \u94FE\u63A5\uFF0C\u4E0D\u6362\u8EAB\u4EFD\u6216\u91CD\u5EFA\u8D2D\u4E70\u3002", [readOriginal], void 0, { service_execution_id: serviceExecutionID, checkout_id: checkoutID });
     }
-    const { itinerary: itinerary2 } = authoritative ? projectCheckoutPresentation(authoritative, currentModel) : {};
+    assertAccountCheckout(checkout, response.cart.cart_id, serviceExecutionID);
     const effects = { page_created: !response.handoff_reissued, page_reused: response.handoff_reissued === true, payment_requested: false, charged: false, human_page_action_required: true };
-    writeCommandEnvelope2({ status: "human_checkout_required", result: { service_execution_id: serviceExecutionID, checkout_id: checkoutID, amount: formatMoney(checkout.checkout.amount_minor, checkout.checkout.currency), effects, ...itinerary2 ? { itinerary: itinerary2 } : {}, agent_facts: presentAgent({ service_execution_id: serviceExecutionID, checkout_id: checkoutID, status: "human_checkout_required", checkout: { official_entry: entry }, effects }, { allowedOrigins: OFFICIAL_BACKEND_URLS }) }, handoff: { url: entry.url, purpose: entry.purpose, access: entry.access, ...entry.expires_at ? { expires_at: entry.expires_at } : {} }, instruction: "\u7ACB\u5373\u5C55\u793A\u5B98\u65B9\u94FE\u63A5\u53CA\u91D1\u989D\uFF1B\u7528\u6237\u767B\u5F55\u53D1\u8D77\u8FDE\u63A5\u7684\u8D26\u53F7\u5B8C\u6210\u5F53\u524D\u6B65\u9AA4\u3002\u4E8C\u7EF4\u7801\u4E0D\u662F\u524D\u7F6E\u6761\u4EF6\uFF0C\u6253\u5F00\u94FE\u63A5\u4E0D\u4EE3\u8868\u4ED8\u6B3E\u6216\u51FA\u7968\u3002\u7528\u6237\u8868\u793A\u5B8C\u6210\u540E\u8BFB\u53D6\u539F\u4EFB\u52A1\u4E8B\u5B9E\uFF0C\u4E0D\u91CD\u590D\u786E\u8BA4\u3001\u6362\u5355\u6216\u81EA\u52A8\u4ED8\u6B3E\u3002", next: readOriginal, recovery: [] }, { ...options.jsonOutput !== void 0 ? { jsonOutput: options.jsonOutput } : {}, ...options.output ? { output: options.output } : {} });
+    writeCommandEnvelope2({ status: "human_checkout_required", result: { service_execution_id: serviceExecutionID, checkout_id: checkoutID, amount: formatMoney(checkout.checkout.amount_minor, checkout.checkout.currency), effects, agent_facts: presentAgent({ service_execution_id: serviceExecutionID, checkout_id: checkoutID, status: "human_checkout_required", checkout: { official_entry: entry }, effects }, { allowedOrigins: OFFICIAL_BACKEND_URLS }) }, handoff: { url: entry.url, purpose: entry.purpose, access: entry.access, ...entry.expires_at ? { expires_at: entry.expires_at } : {} }, instruction: "\u7ACB\u5373\u5C55\u793A\u5B98\u65B9\u94FE\u63A5\u53CA\u91D1\u989D\uFF1B\u7528\u6237\u767B\u5F55\u53D1\u8D77\u8FDE\u63A5\u7684\u8D26\u53F7\u5B8C\u6210\u5F53\u524D\u6B65\u9AA4\u3002\u4E8C\u7EF4\u7801\u4E0D\u662F\u524D\u7F6E\u6761\u4EF6\uFF0C\u6253\u5F00\u94FE\u63A5\u4E0D\u4EE3\u8868\u4ED8\u6B3E\u6216\u51FA\u7968\u3002\u7528\u6237\u8868\u793A\u5B8C\u6210\u540E\u8BFB\u53D6\u539F\u4EFB\u52A1\u4E8B\u5B9E\uFF0C\u4E0D\u91CD\u590D\u786E\u8BA4\u3001\u6362\u5355\u6216\u81EA\u52A8\u4ED8\u6B3E\u3002", next: readOriginal, recovery: [] }, { ...options.jsonOutput !== void 0 ? { jsonOutput: options.jsonOutput } : {}, ...options.output ? { output: options.output } : {} });
     return;
   }
+  assertCheckoutCreation(checkout, response.cart.cart_id, serviceExecutionID);
+  options.persistHandoff?.({
+    serviceExecutionID,
+    cartID: response.cart.cart_id,
+    checkoutID: checkout.checkout.checkout_id,
+    displayToken: checkout.display_token,
+    checkoutURL: tokenizedCheckoutURL(checkout.checkout_url, checkout.display_token, checkout.qr_payload)
+  });
+  const authoritative = checkout.display_token ? await backend.getCheckoutPresentation(checkout.checkout.checkout_id, checkout.display_token, void 0, { deadline }) : void 0;
+  assertCheckoutPayable(checkout, authoritative, response.cart.cart_id, serviceExecutionID);
+  if (authoritative) response.cart.items = authoritative.items;
   const displayToken = checkout.display_token;
   const locale = normalizeCardLocale(options.locale);
   const checkoutURL = tokenizedCheckoutURL(checkout.checkout_url, displayToken, checkout.qr_payload);

package/dist/src/state/config.js

@@ -1,4 +1,4 @@
-const CLI_VERSION = "2.1.57";
+const CLI_VERSION = "2.1.59";
 const API_CONTRACT_REVISION = "sha256:f20af3780a0e12a79a6ca9507ba65167a4018338495af66d87931e55619b618a";
 export {
   API_CONTRACT_REVISION,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itpay/cli",
-  "version": "2.1.57",
+  "version": "2.1.59",
   "description": "The ItPay CLI for services, orders, and human-authorized purchased content.",
   "type": "module",
   "bin": {
@@ -148,5 +148,5 @@
     "services",
     "api"
   ],
-  "gitHead": "72287b60296b8acfc55da3699b7421de48d53c6a"
+  "gitHead": "59b0086e1133b9d10a26ee3703ce7591d3bee825"
 }