openxiangda 1.0.115 → 1.0.117

package/lib/cli.js

@@ -5338,6 +5338,11 @@ const RESOURCE_TYPE_ALIASES = new Map([
   ['formsettings', 'formSettings'],
 ]);
 
+const RESOURCE_TYPE_ALIAS_GROUPS = new Map([
+  ['permission', ['pagePermissionGroups', 'formPermissionGroups']],
+  ['permissions', ['pagePermissionGroups', 'formPermissionGroups']],
+]);
+
 function getResourceTypeFilters(positional = [], flags = {}) {
   const rawValues = [
     ...positional,
@@ -5355,9 +5360,17 @@ function getResourceTypeFilters(positional = [], flags = {}) {
   const filters = new Set();
   for (const rawType of rawValues) {
     const normalized = normalizeResourceTypeAlias(rawType);
+    const group = RESOURCE_TYPE_ALIAS_GROUPS.get(normalized);
+    if (group) {
+      for (const key of group) filters.add(key);
+      continue;
+    }
     const key = RESOURCE_TYPE_ALIASES.get(normalized);
     if (!key) {
-      fail(`未知资源类型: ${rawType}`);
+      fail(
+        `未知资源类型: ${rawType}。常用类型包括 workflow, notification, route, menu, role, ` +
+          `page-permission-group, form-permission-group, public-access。`
+      );
     }
     filters.add(key);
   }
@@ -9804,6 +9817,42 @@ function isUnauthorized(error) {
   );
 }
 
+function isTransientNetworkError(error) {
+  const message = String(error?.message || error || '').toLowerCase();
+  return (
+    message.includes('und_err_connect_timeout') ||
+    message.includes('connect_timeout') ||
+    message.includes('econnreset') ||
+    message.includes('socket hang up') ||
+    message.includes('network socket disconnected') ||
+    message.includes('fetch failed')
+  );
+}
+
+function requestMethodAllowsTransientRetry(options = {}) {
+  const method = String(options.method || 'GET').toUpperCase();
+  return method === 'GET' || method === 'HEAD';
+}
+
+async function retryTransientFetch(fn, options = {}) {
+  const retries = Number.isFinite(Number(options.retries))
+    ? Number(options.retries)
+    : 2;
+  let lastError;
+  for (let attempt = 0; attempt <= retries; attempt += 1) {
+    try {
+      return await fn(attempt);
+    } catch (error) {
+      lastError = error;
+      if (attempt >= retries || !isTransientNetworkError(error)) {
+        throw error;
+      }
+      await sleep(Math.min(500 * Math.pow(2, attempt), 3000));
+    }
+  }
+  throw lastError;
+}
+
 async function requestWithAuth(config, profileName, apiPath, options = {}) {
   const resolved = getProfile(config, profileName);
   const profile = resolved.profile;
@@ -9811,22 +9860,25 @@ async function requestWithAuth(config, profileName, apiPath, options = {}) {
     fail(`profile ${resolved.profileName} 未登录，请先执行 openxiangda login --profile ${resolved.profileName}`);
   }
   const { strictEnvelope, ...requestOptions } = options;
-
-  try {
-    const payload = await requestJson(profile.baseUrl, apiPath, {
+  const send = () =>
+    requestJson(profile.baseUrl, apiPath, {
       ...requestOptions,
       accessToken: profile.token.accessToken,
     });
+  const sendWithRetry = () =>
+    requestMethodAllowsTransientRetry(requestOptions)
+      ? retryTransientFetch(send, requestOptions)
+      : send();
+
+  try {
+    const payload = await sendWithRetry();
     return strictEnvelope ? unwrapStrictApi(payload) : unwrapApi(payload);
   } catch (error) {
     if (!isUnauthorized(error) || !profile.token?.refreshToken) {
       throw error;
     }
     await refreshProfile(config, resolved.profileName);
-    const payload = await requestJson(profile.baseUrl, apiPath, {
-      ...requestOptions,
-      accessToken: profile.token.accessToken,
-    });
+    const payload = await sendWithRetry();
     return strictEnvelope ? unwrapStrictApi(payload) : unwrapApi(payload);
   }
 }
@@ -9837,28 +9889,24 @@ async function requestFormWithAuth(config, profileName, apiPath, formDataFactory
   if (!profile.token?.accessToken) {
     fail(`profile ${resolved.profileName} 未登录，请先执行 openxiangda login --profile ${resolved.profileName}`);
   }
-
-  try {
-    const payload = await requestForm(
+  const send = () =>
+    requestForm(
       profile.baseUrl,
       apiPath,
       formDataFactory(),
       profile.token.accessToken,
       options
     );
+
+  try {
+    const payload = await retryTransientFetch(send, options);
     return unwrapApi(payload);
   } catch (error) {
     if (!isUnauthorized(error) || !profile.token?.refreshToken) {
       throw error;
     }
     await refreshProfile(config, resolved.profileName);
-    const payload = await requestForm(
-      profile.baseUrl,
-      apiPath,
-      formDataFactory(),
-      profile.token.accessToken,
-      options
-    );
+    const payload = await retryTransientFetch(send, options);
     return unwrapApi(payload);
   }
 }

package/lib/http.js

@@ -2,6 +2,8 @@ const { formatFetchError, maskText } = require('./utils');
 
 const DEFAULT_REQUEST_TIMEOUT_MS = 60000;
 
+configureFetchDispatcher(DEFAULT_REQUEST_TIMEOUT_MS);
+
 async function requestJson(baseUrl, apiPath, options = {}) {
   if (typeof fetch !== 'function') {
     throw new Error('当前 Node.js 版本不支持 fetch，请使用 Node.js 18 或更高版本');
@@ -77,3 +79,20 @@ function isAbortError(error) {
 module.exports = {
   requestJson,
 };
+
+function configureFetchDispatcher(timeoutMs) {
+  try {
+    // Node fetch uses undici internally. Setting the global dispatcher prevents
+    // large resource operations from failing on undici's 10s connect default.
+    const { Agent, setGlobalDispatcher } = require('undici');
+    setGlobalDispatcher(
+      new Agent({
+        connect: {
+          timeout: timeoutMs,
+        },
+      })
+    );
+  } catch {
+    // Keep working on runtimes where undici is not directly importable.
+  }
+}

package/openxiangda-skills/references/workflow-v3.md

@@ -24,7 +24,7 @@ export default defineWorkflow({
         flow.action.transfer(),
         flow.action.return(),
       ],
-      returnPolicy: { scopeType: "previous_all", resubmitMode: "resume_current" },
+      returnPolicy: { scopeType: "initiator", resubmitMode: "resume_current" },
       fieldPermissions: [{ fieldId: "amount", fieldBehavior: "READONLY" }],
     });
     const sync = flow.functionCall("sync_budget", {
@@ -108,6 +108,8 @@ Runtime pages should not guess buttons. Use `sdk.process.resolveCapabilities(...
 
 For delayed approval start, do not submit a process form and then delete/recreate records. Save the process-form instance without starting workflow via `StandardFormPage submitBehavior="save-draft"` or `sdk.form.create({ formUuid, data, saveAsDraft: true, startProcess: false })`. Later start approval on that same `formInstId` with `sdk.process.startFromExistingInstance({ formUuid, formInstId })` or `StandardFormPage submitBehavior="start-existing-process"`.
 
+For return-to-initiator workflows, prefer `returnPolicy: { scopeType: "initiator", resubmitMode: "resume_current" }` or `flow.action.returnToInitiator()`. The runtime capabilities protocol exposes `resubmit` only on pending `originator_return` tasks. If a user returns to a previous approval node, continuing the flow is a normal `approve` action on that returned approval task.
+
 Minimum shape:
 
 ```json

package/openxiangda-skills/skills/openxiangda-workflow-automation/SKILL.md

@@ -25,6 +25,7 @@ Create a workflow only when the scenario has **real approval semantics**: approv
 - ✅ New AI-authored workflows: prefer **semantic DSL** `src/workflows/<code>/workflow.ts` using `defineWorkflow`; compile it to v3 designer JSON with `openxiangda workflow compile`.
 - ✅ Runtime workflow pages: use `sdk.process.resolveCapabilities(...)` or `ProcessActionBar` / `ProcessTimeline` from `openxiangda/runtime/react`; do not hard-code buttons.
 - ✅ Delayed approval start: save the process-form record first with `StandardFormPage submitBehavior="save-draft"` or `sdk.form.create({ formUuid, data, saveAsDraft: true, startProcess: false })`, then start approval in place with `sdk.process.startFromExistingInstance({ formUuid, formInstId })` or `StandardFormPage submitBehavior="start-existing-process"`.
+- ✅ Return-to-initiator flows: use `returnPolicy: { scopeType: "initiator", resubmitMode: "resume_current" | "replay" }` or `flow.action.returnToInitiator()`. The runtime capabilities protocol exposes `resubmit` only for pending `originator_return` tasks; return to a previous approval node continues through the normal `approve` action.
 - ✅ Reusable backend business logic: prefer **App Function** (`src/functions/<functionCode>/index.ts` + `src/resources/functions/<functionCode>.json`), then call it from page `sdk.function.invoke` or automation/workflow `function_call`.
 - ✅ JS_CODE V2 trusted_node: source in TypeScript under `src/js-code-nodes/<scriptCode>/index.ts`, `src/automations/<resourceCode>/index.ts`, or `src/functions/<functionCode>/index.ts`. Run `pnpm build-js-code --script <code>` (validates with `tsc` first).
 - ✅ Use `trigger_v2` for new automation triggers; CLI fills root `appType` / `formUuid` from active profile when `--form-code` is provided.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.115",
+  "version": "1.0.117",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {
@@ -117,6 +117,7 @@
     "qrcode-terminal": "^0.12.0",
     "tailwindcss": "^3.4.17",
     "tsx": "^4.20.0",
+    "undici": "^6.27.0",
     "vite": "^6.0.0"
   },
   "peerDependencies": {

package/packages/sdk/dist/runtime/index.cjs

@@ -2560,6 +2560,33 @@ init_cjs_shims();
 
 // packages/sdk/src/runtime/core/fetch.ts
 init_cjs_shims();
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var isTransientFetchError = (error) => {
+  const anyError = error;
+  const message7 = String(anyError?.message || error || "").toLowerCase();
+  const causeCode = String(anyError?.cause?.code || "").toLowerCase();
+  return causeCode === "und_err_connect_timeout" || message7.includes("und_err_connect_timeout") || message7.includes("connect_timeout") || message7.includes("econnreset") || message7.includes("socket hang up") || message7.includes("network socket disconnected") || message7.includes("fetch failed");
+};
+var fetchWithTransientRetry = async (fetchImpl, input, init, options = {}) => {
+  if (!options.enabled) {
+    return fetchImpl(input, init);
+  }
+  const retries = Number.isFinite(Number(options.retries)) ? Number(options.retries) : 2;
+  const baseDelayMs = Number.isFinite(Number(options.baseDelayMs)) ? Number(options.baseDelayMs) : 250;
+  let lastError;
+  for (let attempt = 0; attempt <= retries; attempt += 1) {
+    try {
+      return await fetchImpl(input, init);
+    } catch (error) {
+      lastError = error;
+      if (attempt >= retries || !isTransientFetchError(error)) {
+        throw error;
+      }
+      await sleep(Math.min(baseDelayMs * Math.pow(2, attempt), 2e3));
+    }
+  }
+  throw lastError;
+};
 var createBoundFetch = (fetchImpl) => {
   const baseFetch = fetchImpl || globalThis.fetch;
   return ((input, init) => baseFetch.call(globalThis, input, init));
@@ -28079,7 +28106,7 @@ var import_react162 = __toESM(require("react"));
 
 // node_modules/antd-mobile/es/utils/sleep.js
 init_cjs_shims();
-var sleep = (time) => new Promise((resolve) => setTimeout(resolve, time));
+var sleep2 = (time) => new Promise((resolve) => setTimeout(resolve, time));
 
 // node_modules/antd-mobile/es/components/pull-to-refresh/pull-to-refresh.js
 var classPrefix63 = `adm-pull-to-refresh`;
@@ -28152,7 +28179,7 @@ var PullToRefresh = (p) => {
         throw e2;
       }
       if (props.completeDelay > 0) {
-        yield sleep(props.completeDelay);
+        yield sleep2(props.completeDelay);
       }
       reset();
     });
@@ -34333,6 +34360,12 @@ var normalizeMethod2 = (method4) => {
   const value = String(method4 || "get").toUpperCase();
   return ["GET", "POST", "PUT", "DELETE", "PATCH"].includes(value) ? value : "GET";
 };
+var shouldRetryTransportRequest = (payload) => {
+  const method4 = normalizeMethod2(payload?.method);
+  if (method4 === "GET") return true;
+  const path = String(payload?.path || "").split("?")[0];
+  return method4 === "POST" && path === "/workflow/capabilities/resolve";
+};
 var normalizeCssIsolation2 = (value) => {
   if (value === "namespace" || value === "shadow" || value === "none") {
     return value;
@@ -34393,11 +34426,13 @@ var createBrowserPageBridge = (options = {}) => {
         body = JSON.stringify(payload.body);
       }
     }
-    const response = await fetchImpl(url2, {
+    const response = await fetchWithTransientRetry(fetchImpl, url2, {
       method: normalizeMethod2(payload.method),
       headers,
       body,
       credentials: "include"
+    }, {
+      enabled: shouldRetryTransportRequest(payload)
     });
     return parseJsonResponse(response);
   };