@lark-apaas/openclaw-scripts-diagnose-cli 0.1.4-beta.0 → 0.1.4

package/dist/index.cjs

@@ -53,7 +53,7 @@ let json_diff = require("json-diff");
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.4-beta.0";
+	return "0.1.4";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -1420,19 +1420,24 @@ OldMiaodaPluginsCleanupRule = __decorate([Rule({
 //#endregion
 //#region src/rules/lark-plugin-allow.ts
 const LARK_PLUGIN = "openclaw-lark";
-const LARK_PLUGIN_NAMES = [LARK_PLUGIN, "feishu-openclaw-plugin"];
+const LEGACY_LARK_PLUGIN = "feishu-openclaw-plugin";
+const LARK_PLUGIN_NAMES = [LARK_PLUGIN, LEGACY_LARK_PLUGIN];
 let LarkPluginAllowRule = class LarkPluginAllowRule extends DiagnoseRule {
 	validate(ctx) {
 		const allow = getAllow(ctx.config);
 		if (LARK_PLUGIN_NAMES.some((name) => allow.includes(name))) return { pass: true };
+		const installed = detectInstalledLarkPlugin(getExtensionsDir(ctx.configPath));
+		if (installed == null) return { pass: true };
 		return {
 			pass: false,
-			message: `plugins.allow 缺少飞书插件 (expected one of: ${LARK_PLUGIN_NAMES.join(", ")})`
+			message: `plugins.allow 缺少飞书插件 ${installed}（已在 extensions/ 下装但未启用）`
 		};
 	}
 	repair(ctx) {
+		const installed = detectInstalledLarkPlugin(getExtensionsDir(ctx.configPath));
+		if (installed == null) return;
 		if (ctx.config.plugins == null || typeof ctx.config.plugins !== "object" || Array.isArray(ctx.config.plugins)) {
-			ctx.config.plugins = { allow: [LARK_PLUGIN] };
+			ctx.config.plugins = { allow: [installed] };
 			return;
 		}
 		const pluginsMap = ctx.config.plugins;
@@ -1440,7 +1445,7 @@ let LarkPluginAllowRule = class LarkPluginAllowRule extends DiagnoseRule {
 		const original = Array.isArray(rawAllow) ? rawAllow : [];
 		const stringAllow = original.filter((e) => typeof e === "string");
 		if (LARK_PLUGIN_NAMES.some((name) => stringAllow.includes(name))) return;
-		original.push(LARK_PLUGIN);
+		original.push(installed);
 		pluginsMap.allow = original;
 	}
 };
@@ -1456,6 +1461,22 @@ function getAllow(config) {
 	if (!Array.isArray(allow)) return [];
 	return allow.filter((e) => typeof e === "string");
 }
+/**
+* fs-only 检测：`<extDir>/<name>/package.json` 存在即视为已装。
+* 优先级 openclaw-lark（新版）> feishu-openclaw-plugin（legacy）。
+* 不读 package.json 内容，只判存在性，避开 JSON 损坏。
+*/
+function detectInstalledLarkPlugin(extDir) {
+	for (const name of [LARK_PLUGIN, LEGACY_LARK_PLUGIN]) if (pluginPackageJsonExists(extDir, name)) return name;
+	return null;
+}
+function pluginPackageJsonExists(extDir, pluginDir) {
+	try {
+		return node_fs.default.existsSync(node_path.default.join(extDir, pluginDir, "package.json"));
+	} catch {
+		return false;
+	}
+}
 //#endregion
 //#region src/fs-utils.ts
 /**
@@ -2687,22 +2708,88 @@ function startAsyncReset(ctxBase64) {
 }
 //#endregion
 //#region src/oss/fetchWithDiag.ts
+/** Methods retried automatically on transient transport errors. POST and
+*  PATCH are deliberately excluded: a transient ECONNRESET / ETIMEDOUT
+*  after the request body has been written might mean the server
+*  received and processed it (just couldn't reply) — auto-retrying
+*  would cause duplicate side effects. AWS / GCP / Aliyun SDKs all use
+*  the same allowlist. */
+const IDEMPOTENT_METHODS = new Set([
+	"GET",
+	"HEAD",
+	"OPTIONS",
+	"DELETE",
+	"PUT"
+]);
+/** Errno codes treated as transient — almost always a stale connection
+*  or momentary network blip that succeeds on retry. The list mirrors
+*  what AWS / GCP / Aliyun SDKs retry by default. Only used for fetch
+*  rejection cause; HTTP 4xx/5xx responses pass through unchanged
+*  (caller decides whether the application-level status is retryable). */
+const TRANSIENT_CODES = new Set([
+	"ECONNRESET",
+	"ETIMEDOUT",
+	"EPIPE",
+	"ECONNREFUSED",
+	"EHOSTUNREACH",
+	"ENETUNREACH",
+	"EAI_AGAIN"
+]);
 async function fetchWithDiag(url, opts = {}) {
+	const maxRetries = opts.maxRetries ?? 2;
+	const method = (opts.init?.method ?? "GET").toUpperCase();
+	const retrySafe = opts.retryNonIdempotent || IDEMPOTENT_METHODS.has(method);
+	let lastErr;
+	for (let attempt = 0; attempt <= maxRetries; attempt++) try {
+		return await fetchOnce(url, opts);
+	} catch (e) {
+		lastErr = e;
+		const code = extractCauseCode(e);
+		if (!(code !== void 0 && TRANSIENT_CODES.has(code)) || attempt === maxRetries) throw e;
+		if (!retrySafe) {
+			console.error(`fetch ${opts.label ?? originOf(url)}: transient ${code} but method=${method} is non-idempotent, NOT retrying`);
+			throw e;
+		}
+		const delay = 200 * Math.pow(2, attempt) + Math.floor(Math.random() * 100);
+		console.error(`fetch ${opts.label ?? originOf(url)}: transient ${code}, retrying in ${delay}ms (attempt ${attempt + 1}/${maxRetries})`);
+		await new Promise((r) => setTimeout(r, delay));
+	}
+	throw lastErr;
+}
+/** One fetch attempt with timeout. Throws on transport / abort failures
+*  (caught by the retry loop above) and on its own enriched message form. */
+async function fetchOnce(url, opts) {
 	const label = opts.label ?? originOf(url);
 	const timeoutMs = opts.timeoutMs ?? 3e4;
 	const start = Date.now();
 	const ac = new AbortController();
 	const timer = timeoutMs > 0 && Number.isFinite(timeoutMs) ? setTimeout(() => ac.abort(), timeoutMs) : void 0;
 	try {
-		return await fetch(url, { signal: ac.signal });
+		return await fetch(url, {
+			...opts.init,
+			signal: ac.signal
+		});
 	} catch (e) {
 		const durationMs = Date.now() - start;
 		const causeStr = e.name === "AbortError" || ac.signal.aborted && timeoutMs > 0 ? `request aborted after ${timeoutMs}ms (timeout)` : describeCause(e.cause) || e.message;
-		throw new Error(`fetch ${label} failed: ${causeStr} (url=${redactUrl(url)} durationMs=${durationMs})`);
+		const enriched = /* @__PURE__ */ new Error(`fetch ${label} failed: ${causeStr} (url=${redactUrl(url)} durationMs=${durationMs})`);
+		enriched.cause = e.cause ?? e;
+		throw enriched;
 	} finally {
 		if (timer) clearTimeout(timer);
 	}
 }
+/** Pull the errno-style code from the deepest cause we can reach. Used by
+*  retry-classification only — error messages still get the human-readable
+*  describeCause() rendering. */
+function extractCauseCode(e) {
+	let cur = e.cause ?? e;
+	for (let depth = 0; depth < 5 && cur; depth++) {
+		const code = cur.code;
+		if (typeof code === "string") return code;
+		cur = cur.cause;
+	}
+}
 /** Walk the Error.cause chain and produce a single-line summary like
 *  `ENOTFOUND getaddrinfo ENOTFOUND oss.example.com`. */
 function describeCause(c, depth = 0) {
@@ -4210,7 +4297,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.4-beta.0`;
+	return `v0.1.4`;
 }
 const COMMANDS = [
 	{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/openclaw-scripts-diagnose-cli",
-  "version": "0.1.4-beta.0",
+  "version": "0.1.4",
   "description": "CLI for OpenClaw config diagnose and repair with JSON5 support",
   "main": "dist/index.cjs",
   "bin": {