@itpay/cli 2.1.60 → 2.1.61

package/dist/src/main.js

@@ -3841,7 +3841,8 @@ __name(withAsyncFileLock, "withAsyncFileLock");
 import { createHash, randomBytes } from "node:crypto";
 import { createServer } from "node:http";
 function hubOAuthConfig(env = process.env) {
-  const issuer = (env.ITPAY_HUB_OAUTH_ISSUER ?? "http://localhost:24444").replace(/\/+$/, "");
+  const devHub = (env.ITPAY_HUB_URL ?? "").replace(/\/+$/, "") === "https://market-v4-dev.itpay.ai";
+  const issuer = (env.ITPAY_HUB_OAUTH_ISSUER ?? (devHub ? "https://auth-v4-dev.itpay.ai" : "http://localhost:24444")).replace(/\/+$/, "");
   return {
     authorizeURL: `${issuer}/oauth2/auth`,
     tokenURL: `${issuer}/oauth2/token`,
@@ -5568,6 +5569,26 @@ __name(renderPaymentHandoff, "renderPaymentHandoff");
 
 // src/commands/hub_guidance.ts
 function writeCommandEnvelope(value, options = {}) {
+  const qualify = /* @__PURE__ */ __name((action) => {
+    if (!action.command.startsWith("itpay ")) return action;
+    const assignments = [];
+    for (const name of ["ITPAY_HUB_URL", "ITPAY_HUB_OAUTH_ISSUER", "ITPAY_HUB_OAUTH_CLIENT", "ITPAY_HUB_OAUTH_SCOPE", "ITPAY_STATE_DIR"]) {
+      const raw = process.env[name];
+      if (!raw) continue;
+      if (name === "ITPAY_HUB_URL" || name === "ITPAY_HUB_OAUTH_ISSUER") {
+        try {
+          const u = new URL(raw);
+          if (!["http:", "https:"].includes(u.protocol) || u.username || u.password || u.search || u.hash) return null;
+        } catch {
+          return null;
+        }
+      }
+      const quoted = "'" + raw.replaceAll("'", `'"'"'`) + "'";
+      assignments.push(name + "=" + quoted);
+    }
+    return { ...action, command: [...assignments, qualifyItPayCommand(action.command, declaredAgentType())].join(" ") };
+  }, "qualify");
+  value = { ...value, next: value.next ? qualify(value.next) : null, recovery: value.recovery.map(qualify).filter((action) => action !== null) };
   const out = options.output ?? ((text2) => {
     process.stdout.write(text2);
   });
@@ -5650,7 +5671,9 @@ async function runHubInspect(operationID2, options) {
       input_schema: desc.input_schema ?? null
     },
     instruction: desc.status !== "published" ? "\u8BE5\u64CD\u4F5C\u5F53\u524D\u4E0D\u53EF\u8FD0\u884C\uFF1B\u4E0D\u8981\u53D1\u8D77 run\u3002" : "\u4F7F\u7528 current_publication_id \u7ED1\u5B9A\u8FD0\u884C\uFF1B\u5E26 effect_class=external_write/purchase \u7684\u64CD\u4F5C\u9700\u8981\u7528\u6237\u786E\u8BA4\u3002",
-    next: desc.status === "published" ? { command: `itpay api run ${desc.operation_id} --publication ${desc.current_publication_id} --input '<JSON>'${options.jsonOutput ? " --json" : ""}`, reason: "\u53D1\u5E03\u7ED1\u5B9A\u8FD0\u884C" } : null,
+    // Actual user input is still required; help is executable without calling
+    // the supplier, while a placeholder is not a runnable action.
+    next: desc.status === "published" ? { command: "itpay api run --help", reason: "\u6309 input_schema \u548C\u7528\u6237\u9700\u6C42\u51C6\u5907\u771F\u5B9E\u8F93\u5165\uFF1B\u6B64\u5E2E\u52A9\u547D\u4EE4\u4E0D\u6267\u884C API" } : null,
     recovery: []
   }, {
     jsonOutput: Boolean(options.jsonOutput),
@@ -5746,42 +5769,68 @@ async function runHubRun(operationID2, options) {
     throw new Error(`idempotency_conflict: request ${task.request_id} already exists with different input/publication/credential selection \u2014 use a new --request-id or "itpay api resume ${task.request_id}"`);
   }
   if (!created && task.run_id) {
-    const rec2 = await waitForRun(client, task.run_id, options.waitSeconds ?? 0);
-    store.update(task.request_id, { status: rec2.execution_state === "succeeded" ? "succeeded" : rec2.execution_state === "failed" ? "failed" : "dispatched" });
-    renderRun(rec2, options.jsonOutput, "replayed");
+    const rec = await waitForRun(client, task.run_id, options.waitSeconds ?? 0);
+    store.update(task.request_id, { status: rec.execution_state === "succeeded" ? "succeeded" : rec.execution_state === "failed" ? "failed" : "dispatched" });
+    renderRun(rec, options.jsonOutput, "replayed");
     return;
   }
   if (!created && task.intent_id) {
     await renderBlockedTask(task, null, options.jsonOutput);
     return;
   }
-  const body = {
-    expected_publication_id: task.publication_id,
-    input: task.input,
-    ...task.credential_id ? { credential_id: task.credential_id } : {},
-    ...task.source_credentials ? { source_credentials: task.source_credentials } : {}
-  };
-  if (options.maxCharge) {
-    body.max_charge = { currency: "CNY", scale: 6, amount_atoms: options.maxCharge };
-  }
-  store.update(task.request_id, { status: "dispatched" });
-  const admission = await client.run(operationID2, body, store.idempotencyKey(task.request_id));
-  if (!isRunReceipt(admission)) {
-    store.update(task.request_id, { status: "blocked", intent_id: admission.intent_id, blocking_reason: admission.blocking_reason });
-    await renderBlockedTask(task, admission, options.jsonOutput);
-    return;
+  await dispatchOriginalTask(client, store, task, options);
+}
+__name(runHubRun, "runHubRun");
+var HubTaskRequestError = class extends Error {
+  static {
+    __name(this, "HubTaskRequestError");
   }
-  let rec = admission;
-  store.update(task.request_id, { run_id: rec.run_id });
-  if (options.waitSeconds) {
-    rec = await waitForRun(client, rec.run_id, options.waitSeconds);
+  requestID;
+  references;
+  code;
+  constructor(error, task) {
+    super(error instanceof Error ? error.message : "original Hub request did not return a receipt");
+    this.requestID = task.request_id;
+    this.references = { request_id: task.request_id, ...task.run_id ? { run_id: task.run_id } : {}, ...task.intent_id ? { intent_id: task.intent_id } : {} };
+    this.code = error instanceof HttpError ? error.code : ["authorization_required", "idempotency_conflict", "invalid_state"].find((code) => this.message.startsWith(code + ":")) ?? "hub_request_unknown";
+  }
+};
+async function dispatchOriginalTask(client, store, task, options) {
+  try {
+    const selections = { ...task.credential_id ? { credential_id: task.credential_id } : {}, ...task.source_credentials ? { source_credentials: task.source_credentials } : {} };
+    if (task.input_digest !== digestTask(task.operation_id, task.publication_id, task.input, task.max_charge_atoms, selections)) {
+      throw new Error("idempotency_conflict: stored request facts do not match the original digest; preserve this task for review");
+    }
+    const body = {
+      expected_publication_id: task.publication_id,
+      input: task.input,
+      ...task.credential_id ? { credential_id: task.credential_id } : {},
+      ...task.source_credentials ? { source_credentials: task.source_credentials } : {}
+    };
+    if (task.max_charge_atoms) {
+      body.max_charge = { currency: "CNY", scale: 6, amount_atoms: task.max_charge_atoms };
+    }
+    store.update(task.request_id, { status: "dispatched" });
+    const admission = await client.run(task.operation_id, body, store.idempotencyKey(task.request_id));
+    if (!isRunReceipt(admission)) {
+      store.update(task.request_id, { status: "blocked", intent_id: admission.intent_id, blocking_reason: admission.blocking_reason });
+      await renderBlockedTask(task, admission, options.jsonOutput);
+      return;
+    }
+    let rec = admission;
+    store.update(task.request_id, { run_id: rec.run_id });
+    if (options.waitSeconds) {
+      rec = await waitForRun(client, rec.run_id, options.waitSeconds);
+    }
+    store.update(task.request_id, {
+      status: rec.execution_state === "succeeded" ? "succeeded" : rec.execution_state === "failed" ? "failed" : "dispatched"
+    });
+    renderRun(rec, options.jsonOutput);
+  } catch (error) {
+    throw new HubTaskRequestError(error, store.get(task.request_id) ?? task);
   }
-  store.update(task.request_id, {
-    status: rec.execution_state === "succeeded" ? "succeeded" : rec.execution_state === "failed" ? "failed" : "dispatched"
-  });
-  renderRun(rec, options.jsonOutput);
 }
-__name(runHubRun, "runHubRun");
+__name(dispatchOriginalTask, "dispatchOriginalTask");
 function renderRun(rec, jsonOutput, note) {
   const charged = rec.actual_charge ? atomsToYuan(rec.actual_charge.amount_atoms) : "\xA50.000000";
   writeCommandEnvelope({
@@ -6013,25 +6062,33 @@ async function runHubResume(requestID, options) {
   if (!task) {
     throw new Error(`not_found: unknown task ${requestID} \u2014 check "itpay api tasks"`);
   }
-  if (task.run_id) {
-    const rec = await waitForRun(client, task.run_id, options.waitSeconds ?? 0);
-    store.update(requestID, { status: rec.execution_state === "succeeded" ? "succeeded" : rec.execution_state === "failed" ? "failed" : "dispatched" });
-    renderRun(rec, options.jsonOutput);
-    return;
-  }
-  if (task.intent_id) {
-    const res = await client.continueIntent(task.intent_id, `cli-continue-${requestID}`);
-    if (res.run) {
-      store.update(requestID, { run_id: res.run.run_id, status: res.run.execution_state === "succeeded" ? "succeeded" : "dispatched" });
-      renderRun(res.run, options.jsonOutput);
-    } else {
-      const state = res.blocking_reason ?? res.state ?? res.status ?? "blocked";
-      store.update(requestID, { blocking_reason: state });
-      await renderBlockedTask(task, { ...res, intent_id: task.intent_id, blocking_reason: state }, options.jsonOutput);
+  try {
+    if (task.run_id) {
+      const rec = await waitForRun(client, task.run_id, options.waitSeconds ?? 0);
+      store.update(requestID, { status: rec.execution_state === "succeeded" ? "succeeded" : rec.execution_state === "failed" ? "failed" : "dispatched" });
+      renderRun(rec, options.jsonOutput);
+      return;
     }
-    return;
+    if (task.intent_id) {
+      const res = await client.continueIntent(task.intent_id, `cli-continue-${requestID}`);
+      if (res.run) {
+        store.update(requestID, { run_id: res.run.run_id, status: res.run.execution_state === "succeeded" ? "succeeded" : "dispatched" });
+        renderRun(res.run, options.jsonOutput);
+      } else {
+        const state = res.blocking_reason ?? res.state ?? res.status ?? "blocked";
+        store.update(requestID, { blocking_reason: state });
+        await renderBlockedTask(task, { ...res, intent_id: task.intent_id, blocking_reason: state }, options.jsonOutput);
+      }
+      return;
+    }
+    if (!["pending", "dispatched", "unknown"].includes(task.status)) {
+      throw new HubTaskRequestError(new Error("invalid_state: original task has no authoritative run or intent; preserve it for review"), task);
+    }
+    await dispatchOriginalTask(client, store, task, options);
+  } catch (error) {
+    if (error instanceof HubTaskRequestError) throw error;
+    throw new HubTaskRequestError(error, store.get(requestID) ?? task);
   }
-  throw new Error(`invalid_state: task ${requestID} has no run or intent \u2014 it never reached the server`);
 }
 __name(runHubResume, "runHubResume");
 async function runHubTasks(options) {
@@ -6134,7 +6191,12 @@ __name(runHubConnect, "runHubConnect");
 
 // src/commands/api_commands.ts
 function reportCLIError(error, contract) {
-  writeCommandEnvelope({ status: "error", error: { code: error instanceof HttpError ? error.code : contract?.code ?? "command_failed", message: error instanceof Error ? error.message : String(error) }, instruction: contract?.instruction ?? "Check the command and the current Hub connection; resume known tasks before retrying writes.", next: null, recovery: contract?.recovery ?? [] }, { jsonOutput: contract?.jsonOutput ?? process.argv.includes("--json") });
+  const code = error instanceof HubTaskRequestError ? error.code : error instanceof HttpError ? error.code : error instanceof Error && error.message.startsWith("authorization_required:") ? "authorization_required" : contract?.code ?? "command_failed";
+  const auth = code === "authorization_required" || code === "unauthenticated";
+  const taskID = error instanceof HubTaskRequestError ? error.requestID : void 0;
+  const references = error instanceof HubTaskRequestError ? error.references : void 0;
+  const recover = taskID ? { command: qualifyItPayCommand(references?.run_id ? `itpay api run-status ${references.run_id}${contract?.jsonOutput ? " --json" : ""}` : `itpay api resume ${taskID}${contract?.jsonOutput ? " --json" : ""}`, declaredAgentType()), reason: "\u8BFB\u53D6\u6216\u6062\u590D\u540C\u4E00\u539F\u4EFB\u52A1\uFF0C\u4E0D\u521B\u5EFA\u66FF\u4EE3\u8BF7\u6C42" } : null;
+  writeCommandEnvelope({ status: "error", error: { code, message: error instanceof Error ? error.message : String(error) }, ...references ? { result: references } : {}, instruction: auth ? "\u5148\u5B8C\u6210 ItPay API \u6B63\u5E38\u8FDE\u63A5\uFF1B\u4FDD\u7559\u539F\u8EAB\u4EFD\u548C\u4EFB\u52A1\uFF0C\u4E0D\u8981\u521B\u5EFA\u66FF\u4EE3\u8BF7\u6C42\u3002" : ["idempotency_conflict", "invalid_state"].includes(code) ? "\u539F\u4EFB\u52A1\u8BB0\u5F55\u4E0D\u4E00\u81F4\uFF1B\u4FDD\u7559\u8BB0\u5F55\u6838\u5BF9\uFF0C\u4E0D\u80FD\u4FEE\u6539\u51BB\u7ED3\u53C2\u6570\u7EE7\u7EED\u53D1\u9001\u3002" : taskID ? "\u539F\u8BF7\u6C42\u5C1A\u672A\u53D6\u5F97\u53EF\u7528\u56DE\u6267\uFF1B\u8FD9\u4E0D\u4EE3\u8868\u672A\u5230\u8FBE\u670D\u52A1\u5668\u3002\u4FDD\u7559\u539F\u8BF7\u6C42\u6062\u590D\uFF0C\u4E0D\u91CD\u65B0\u8C03\u7528\u6216\u5145\u503C\u3002" : contract?.instruction ?? "Check the command and current Hub connection; preserve original tasks.", next: auth ? { command: qualifyItPayCommand(`itpay api connect${contract?.jsonOutput ? " --json" : ""}`, declaredAgentType()), reason: "\u6B63\u5E38\u6388\u6743\u540E\u7EE7\u7EED\u539F\u4EFB\u52A1" } : ["idempotency_conflict", "invalid_state", "forbidden", "publication_changed", "credential_revalidation_required"].includes(code) ? null : recover, recovery: auth && recover ? [recover] : contract?.recovery ?? [] }, { jsonOutput: contract?.jsonOutput ?? process.argv.includes("--json") });
   process.exitCode = 1;
 }
 __name(reportCLIError, "reportCLIError");
@@ -12880,7 +12942,7 @@ function railInvocationProjection(response, requestedCapability, input, itemCoun
 __name(railInvocationProjection, "railInvocationProjection");
 
 // src/services/rail/recovery.ts
-var RAIL_LOCATION_EVIDENCE_REASONS = /* @__PURE__ */ new Set(["endpoint_kind_conflict", "place_identity_uncertain", "endpoint_adcode_name_conflict", "endpoint_poi_name_conflict", "endpoint_station_name_code_conflict", "location_evidence_required", "coordinate_name_mismatch", "area_scope_too_broad", "address_required", "administrative_area_unresolved", "station_location_evidence_required", "coordinate_identity_unverified"]);
+var RAIL_LOCATION_EVIDENCE_REASONS = /* @__PURE__ */ new Set(["station_jurisdiction_evidence_required", "endpoint_kind_conflict", "place_identity_uncertain", "endpoint_adcode_name_conflict", "endpoint_poi_name_conflict", "endpoint_station_name_code_conflict", "location_evidence_required", "coordinate_name_mismatch", "area_scope_too_broad", "address_required", "administrative_area_unresolved", "station_location_evidence_required", "coordinate_identity_unverified"]);
 var RAIL_QUOTE_FAILURE_GUIDANCE = {
   quote_source_unavailable: "\u5B9E\u65F6\u8F66\u7968\u6570\u636E\u6682\u4E0D\u53EF\u7528\uFF1B\u4FDD\u7559\u539F\u9009\u62E9\uFF0C\u7A0D\u540E\u6309\u7528\u6237\u610F\u613F\u91CD\u65B0\u6838\u9A8C\uFF0C\u4E0D\u521B\u5EFA\u66FF\u4EE3\u8BA2\u5355\u3002",
   quote_train_changed: "\u6240\u9009\u8F66\u6B21\u7684\u65F6\u523B\u6216\u8FD0\u884C\u4FE1\u606F\u5DF2\u53D8\u5316\uFF1B\u5411\u7528\u6237\u8BF4\u660E\u5E76\u5F81\u8BE2\u662F\u5426\u91CD\u65B0\u67E5\u7968\u3002",
@@ -13000,6 +13062,9 @@ function railWorkflowEnvelope(model) {
       const affected = model.workflow?.failure?.endpoint ?? model.workflow?.dependency?.endpoint;
       const query = model.workflow?.query_input ?? {};
       const endpoints = query.endpoints && typeof query.endpoints === "object" ? query.endpoints : {};
+      if (code === "station_jurisdiction_evidence_required") {
+        return { status: "system_evidence_required", result: { service_execution_id: id, reason: code, failed_step: model.workflow?.failure?.step_id, failure: model.workflow?.failure, query, ...affected === "origin" || affected === "destination" ? { affected_endpoint: affected, original_place: endpoints[affected]?.text ?? query[affected] } : {} }, instruction: "\u5730\u56FE\u5730\u70B9\u672A\u80FD\u56DE\u5339\u539F\u94C1\u8DEF\u7AD9\u8EAB\u4EFD\uFF0C\u9700\u670D\u52A1\u7EF4\u62A4\u65B9\u6838\u5BF9\u5730\u56FE\u4E0E\u94C1\u8DEF\u76EE\u5F55\u4E8B\u5B9E\u3002\u4FDD\u7559\u5B8C\u6574\u539F\u9700\u6C42\u53CA\u5DF2\u89E3\u6790\u53E6\u4E00\u7AEF\uFF1B\u4E0D\u8981\u6C42\u7528\u6237\u6539\u5730\u5740\uFF0C\u4E0D\u6362kind\u3001\u7AD9\u3001\u65E5\u671F\u6216\u731C\u5750\u6807\u3002\u5F53\u524D\u65E0\u53EF\u6267\u884C\u6062\u590D\uFF0C\u505C\u6B62\uFF1B\u4E0D\u91CD\u65B0\u67E5\u7968\u6216\u521B\u5EFA\u8D2D\u4E70\u3002", next: null, recovery: [] };
+      }
       const stationPair = [endpoints.origin, endpoints.destination].every((endpoint) => endpoint?.kind === "station" && typeof endpoint.text === "string" && endpoint.text.trim() && typeof endpoint.station_code === "string" && /^[A-Z]{3}$/.test(endpoint.station_code));
       if (code === "station_location_evidence_required") {
         const exactInput = stationPair && typeof query.travel_date === "string" ? { origin: endpoints.origin.text, destination: endpoints.destination.text, travel_date: query.travel_date } : void 0;
@@ -16639,7 +16704,7 @@ import { createHash as createHash12 } from "node:crypto";
 
 // src/state/skill_identity.generated.ts
 var CANONICAL_SKILL_SHA256 = "dcbce8347f9ed4a95b89bbd680bbfb2c5308f1081e1af1554f413b950eb902dc";
-var CANONICAL_API_SKILL_SHA256 = "a00535a771acc0d3bd325316380d0a58d2291a013c792c5edccae65694647b45";
+var CANONICAL_API_SKILL_SHA256 = "70af9cc2363b1c60174e4159e296b64c183c833a20930e8612c265bb69c238e6";
 
 // src/commands/skill.ts
 import { existsSync as existsSync9, readFileSync as readFileSync16 } from "node:fs";

package/dist/src/state/config.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itpay/cli",
-  "version": "2.1.60",
+  "version": "2.1.61",
   "description": "The ItPay CLI for services, orders, and human-authorized purchased content.",
   "type": "module",
   "bin": {
@@ -148,5 +148,5 @@
     "services",
     "api"
   ],
-  "gitHead": "9eb053fdeeb9edecba3310f915096e96fee3b96e"
+  "gitHead": "928231fd3c11229cd9116a36fcbf3ff1eef6402f"
 }

package/skills/itpay-api/SKILL.md

@@ -11,6 +11,8 @@ For a new task, prefer the official pinned ItPay CLI when execution is permitted
 
 Use this Skill for API tasks; Services/railway instructions are not prerequisites. Use the installed pinned launcher and `itpay api --help`; `hub` is its compatibility alias. Keep the actual host/Agent Type, ITPAY_HUB_URL and permitted ITPAY_STATE_DIR across every command/session. Never switch accounts, spoof a host or clear identity to recover quota.
 
+For an explicitly authorized **v4 dev API** task, select `ITPAY_HUB_URL=https://market-v4-dev.itpay.ai` before the first API command and preserve it with the permitted state directory. Its OAuth issuer is `https://auth-v4-dev.itpay.ai`; the CLI selects that issuer for this exact dev Hub unless explicitly configured otherwise. CLI resource is the Hub root, not the hosted MCP `/mcp` URL. For example, after the user selects v4 dev: `ITPAY_HUB_URL=https://market-v4-dev.itpay.ai itpay api connect --json`. Never select or switch dev merely because a request failed, and never infer the API identity from Services configuration. Local defaults and other explicit Hub/issuer configurations remain separate.
+
 Connect with the existing `itpay api connect` browser OAuth flow when authentication is required. The human enters verification privately. Existing credentials and task files belong to their endpoint/resource; sharing an ItPay account does not merge OAuth grants, API budgets, Services devices or data ACLs. Never request tokens or codes in chat. Use `api doctor` only for an actual connection problem, not before every task.
 
 Discover the published operation, inspect its current publication, input schema, effects, price and limits, then choose it only if it expresses all user constraints. Read normal text/JSON directly; do not write a parser or infer operation IDs from names. Read the exact command's help as needed. Templates containing placeholders are not executable next actions.