@lark-apaas/openclaw-scripts-diagnose-cli 0.1.6-alpha.3 → 0.1.6-alpha.5

package/dist/index.cjs

@@ -53,7 +53,7 @@ let json_diff = require("json-diff");
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.6-alpha.3";
+	return "0.1.6-alpha.5";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -4212,40 +4212,8 @@ function finalize(results, aborted) {
 //#endregion
 //#region src/lark-cli-init.ts
 const LARK_PLUGIN_NAMES = ["openclaw-lark", "feishu-openclaw-plugin"];
-const PE_XML_TAG = "lark-pe";
-const PE_PLACEHOLDER = `
-<${PE_XML_TAG}>
-# 飞书操作铁律（最高优先级）
-【Critical】所有飞书相关操作（消息、文档、日历、搜索、群、文件等）**必须通过 lark-cli**，禁止使用 \`feishu_im_*\` / \`feishu_chat\` / \`feishu_search_doc_wiki\` / \`feishu_fetch_doc\` / \`feishu_create_doc\` / \`feishu_update_doc\` 等同名工具。
-lark-cli 是飞书所有能力的唯一入口。
-## 调用规范
-【必读】开始任何飞书操作前，先读对应 SKILL.md：
-- 系统自动根据任务匹配 skills，读取对应 SKILL.md
-- 匹配到相关 skill 后，严格按照 SKILL.md 的规范执行
-- 需要时用 \`lark-cli --help\` 或 \`lark-cli <sub> --help\` 查看可用命令，不要猜测参数格式
-## 命令格式
-\`\`\`
-lark-cli --profile <appId> [--as bot] <子命令> <子命令参数>
-\`\`\`
-### --profile 参数（必填）
-\`--profile\` 传入的是飞书 App ID（格式：\`cli_xxx\`），**不是** \`account_id\`（\`bot-cli_xxx\`）。
-**如何找到当前 Agent 的 appId**：
-1. **获取 account_id**：从入站上下文元数据的 \`account_id\` 字段读取（格式：\`bot-cli_xxx\`）
-2. **查 appId**：调用 \`gateway config.get\` 查询 \`channels.feishu.accounts[account_id].appId\`
-3. **兜底**：如果 accounts 里查不到，直接查 \`channels.feishu.appId\`
-\`\`\`bash
-# 示例：account_id = bot-cli_a977eb4fc239dbd7
-# 查询配置获取 appId
-gateway config.get channels.feishu.accounts
-# → appId: cli_a977eb4fc239dbd7
-# 正确用法
-lark-cli --profile cli_a977eb4fc239dbd7 --as bot im +chat-messages-list ...
-\`\`\`
-### --as bot 参数（必填）
-当前账号 \`uat.enabled: false\`，**必须显式加 \`--as bot\`**。
-\`--as user\` 仅在 \`uat.enabled: true\` 且需要以用户身份操作时使用。
-</${PE_XML_TAG}>
-`;
+const PE_XML_TAG = "lark-cli-pe";
+`${PE_XML_TAG}${PE_XML_TAG}`;
 function isLarkPluginInstalled(configPath) {
 	const extDir = getExtensionsDir(configPath);
 	return LARK_PLUGIN_NAMES.some((name) => {
@@ -4303,7 +4271,7 @@ function resolveAppSecret(appId, config, feishuAppSecret) {
 		if (accounts) for (const [, val] of Object.entries(accounts)) {
 			const account = asRecord(val);
 			if (account?.appId === appId) {
-				rawSecret = account.appSecret;
+				rawSecret = account.appSecret ?? feishu.appSecret;
 				break;
 			}
 		}
@@ -4312,67 +4280,6 @@ function resolveAppSecret(appId, config, feishuAppSecret) {
 	if (rawSecret != null && typeof rawSecret === "object") return feishuAppSecret ?? null;
 	return null;
 }
-/**
-* Resolve the agents.md path for the given appId from the openclaw config.
-*
-* Case 1: appId matches channels.feishu.appId (single-agent path)
-*   → WORKSPACE_DIR/AGENTS.md
-*
-* Case 2: appId found in channels.feishu.accounts (multi-agent path)
-*   → find account key where account.appId === appId
-*   → find binding where match.channel=feishu && match.accountId=that key
-*   → if agentId === 'main'  → WORKSPACE_DIR/agents.md
-*   → else find agent in agents.list by id → agent.workspace/agents.md
-*
-* Returns null when the path cannot be determined.
-*/
-function resolveAgentsMdPath(appId, config) {
-	const feishu = getNestedMap(config, "channels", "feishu");
-	if (!feishu) return null;
-	if (typeof feishu.appId === "string" && feishu.appId === appId) return node_path.default.join(WORKSPACE_DIR, "AGENTS.md");
-	const accounts = asRecord(feishu.accounts);
-	if (!accounts) return null;
-	let accountId;
-	for (const [key, val] of Object.entries(accounts)) if (asRecord(val)?.appId === appId) {
-		accountId = key;
-		break;
-	}
-	if (!accountId) return null;
-	const bindings = Array.isArray(config.bindings) ? config.bindings : [];
-	let agentId;
-	for (const b of bindings) {
-		const binding = asRecord(b);
-		if (!binding) continue;
-		const match = asRecord(binding.match);
-		if (match?.channel === "feishu" && match?.accountId === accountId) {
-			if (typeof binding.agentId === "string") {
-				agentId = binding.agentId;
-				break;
-			}
-		}
-	}
-	if (!agentId) return null;
-	if (agentId === "main") return node_path.default.join(WORKSPACE_DIR, "agents.md");
-	const agentsObj = asRecord(config.agents);
-	const list = Array.isArray(agentsObj?.list) ? agentsObj.list : [];
-	for (const a of list) {
-		const agent = asRecord(a);
-		if (agent?.id === agentId && typeof agent.workspace === "string") return node_path.default.join(agent.workspace, "agents.md");
-	}
-	return null;
-}
-function appendPeToAgentsMd(agentsMdPath) {
-	const dir = node_path.default.dirname(agentsMdPath);
-	if (!node_fs.default.existsSync(dir)) node_fs.default.mkdirSync(dir, { recursive: true });
-	const existing = node_fs.default.existsSync(agentsMdPath) ? node_fs.default.readFileSync(agentsMdPath, "utf-8") : "";
-	if (existing.includes(`<${PE_XML_TAG}>`)) {
-		console.error(`lark-cli-init: <${PE_XML_TAG}> already present in ${agentsMdPath}, skipping`);
-		return;
-	}
-	const sep = existing.length > 0 && !existing.endsWith("\n") ? "\n" : "";
-	node_fs.default.appendFileSync(agentsMdPath, `${sep}${PE_PLACEHOLDER}`, "utf-8");
-	console.error(`lark-cli-init: appended PE placeholder to ${agentsMdPath}`);
-}
 function runLarkCliInit(opts) {
 	const configPath = opts.configPath ?? CONFIG_PATH;
 	if (!isLarkPluginInstalled(configPath)) {
@@ -4396,18 +4303,12 @@ function runLarkCliInit(opts) {
 		ok: false,
 		error: `could not read config at ${configPath}`
 	};
-	const agentsMdPath = opts.agentsMdPath ?? resolveAgentsMdPath(opts.appId, config);
-	if (!agentsMdPath) return {
-		ok: false,
-		error: `could not resolve agents.md path for appId=${opts.appId}`
-	};
-	console.error(`lark-cli-init: agents.md path=${agentsMdPath}`);
 	const appSecret = resolveAppSecret(opts.appId, config, opts.feishuAppSecret);
 	if (!appSecret) return {
 		ok: false,
 		error: `could not resolve appSecret for appId=${opts.appId}`
 	};
-	console.error(`lark-cli-init: running lark-cli config init --app-id=${opts.appId}`);
+	console.error(`lark-cli-init: running lark-cli config init --name ${opts.appId} --app-id ${opts.appId} --brand feishu --app-secret-stdin --force-init`);
 	const initRes = (0, node_child_process.spawnSync)("lark-cli", [
 		"config",
 		"init",
@@ -4417,7 +4318,8 @@ function runLarkCliInit(opts) {
 		opts.appId,
 		"--brand",
 		"feishu",
-		"--app-secret-stdin"
+		"--app-secret-stdin",
+		"--force-init"
 	], {
 		stdio: [
 			"pipe",
@@ -4427,22 +4329,26 @@ function runLarkCliInit(opts) {
 		encoding: "utf-8",
 		input: appSecret
 	});
-	if (initRes.stdout?.trim()) console.error(`lark-cli config init stdout: ${initRes.stdout.trim()}`);
-	if (initRes.stderr?.trim()) console.error(`lark-cli config init stderr: ${initRes.stderr.trim()}`);
+	const configInitStdout = initRes.stdout?.trim() || void 0;
+	const configInitStderr = initRes.stderr?.trim() || void 0;
+	if (configInitStdout) console.error(`lark-cli config init stdout: ${configInitStdout}`);
+	if (configInitStderr) console.error(`lark-cli config init stderr: ${configInitStderr}`);
 	if (initRes.error) return {
 		ok: false,
+		configInitStdout,
+		configInitStderr,
 		error: `lark-cli config init spawn error: ${initRes.error.message}`
 	};
 	if (initRes.status !== 0) return {
 		ok: false,
 		configInitExitCode: initRes.status ?? void 0,
+		configInitStdout,
+		configInitStderr,
 		error: `lark-cli config init exited with code ${initRes.status}`
 	};
-	appendPeToAgentsMd(agentsMdPath);
 	return {
 		ok: true,
-		configInitExitCode: 0,
-		agentsMdPath
+		configInitExitCode: 0
 	};
 }
 //#endregion
@@ -4525,7 +4431,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.6-alpha.3`;
+	return `v0.1.6-alpha.5`;
 }
 const COMMANDS = [
 	{
@@ -4741,7 +4647,7 @@ OPTIONS
 		hidden: false,
 		summary: "Initialize lark-cli bot config and append PE to agents.md",
 		help: `USAGE
-  ${BIN} lark-cli-init --app-id=<app-id> [--feishu-app-secret=<secret>] [--agents-md=<path>]
+  ${BIN} lark-cli-init --app-id=<app-id> [--feishu-app-secret=<secret>]
 
 DESCRIPTION
   Two-step initialization for a Lark (Feishu) bot when prerequisites are met:
@@ -4772,16 +4678,13 @@ DESCRIPTION
   agents.md path resolution:
     - channels.feishu.appId === appId  → WORKSPACE/AGENTS.md  (single-agent)
     - accounts[key].appId === appId    → look up binding by accountId:
-        agentId === 'main'             → WORKSPACE/agents.md
-        otherwise                     → agents.list[agentId].workspace/agents.md
+        agentId === 'main'             → WORKSPACE/AGENTS.md
+        otherwise                     → agents.list[agentId].workspace/AGENTS.md
 
 ARGUMENTS
   --app-id=<app-id>              Required. Bot app ID, e.g. cli_a9659e1f0ab89ccd.
 
 OPTIONS
-  --feishu-app-secret=<secret>   Required when config stores appSecret as a
-                                 provider-ref object (ctx.vars.feishuAppSecret).
-  --agents-md=<path>             Override the resolved agents.md path.
 
 EXIT CODES
   0    Success or skipped (prerequisites not met).
@@ -5268,13 +5171,16 @@ async function main() {
 		case "lark-cli-init": {
 			const appId = getFlag(args, "app-id");
 			if (!appId) {
-				console.error("Usage: lark-cli-init --app-id=<app-id> [--agents-md=<path>]");
+				console.error("Usage: lark-cli-init --app-id=<app-id>");
 				node_process.default.exit(1);
 			}
 			const result = runLarkCliInit({
 				appId,
-				agentsMdPath: getFlag(args, "agents-md"),
-				feishuAppSecret: getFlag(args, "feishu-app-secret")
+				feishuAppSecret: normalizeCtx(await fetchCtxViaInnerApi({
+					populate: { app: ["feishuAppSecret"] },
+					caller: rc.caller,
+					traceId: rc.traceId
+				})).app.feishuAppSecret || void 0
 			});
 			console.log(JSON.stringify(result));
 			await reportRun("lark-cli-init", rc, void 0, args.join(" "), Date.now() - t0, {

package/package.json

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