@lark-apaas/openclaw-scripts-diagnose-cli 0.1.8-alpha.1 → 0.1.8-alpha.2

package/dist/index.cjs

@@ -52,7 +52,7 @@ node_assert = __toESM(node_assert);
 * it terse and parseable.
 */
 function getVersion() {
-	return "0.1.8-alpha.1";
+	return "0.1.8-alpha.2";
 }
 //#endregion
 //#region src/rule-engine/base.ts
@@ -2465,7 +2465,7 @@ MiaodaPluginAllowRule = __decorate([Rule({
 	description: "当 openclaw-extension-miaoda 已在磁盘安装但未在 allow 列表中时，将其添加到 plugins.allow（实验性）",
 	dependsOn: ["config_syntax_check"],
 	repairMode: "standard",
-	profile: "experimental"
+	profile: "standard"
 })], MiaodaPluginAllowRule);
 function getAllow(config) {
 	const plugins = config.plugins;
@@ -6369,7 +6369,6 @@ async function installClis(tag, ossFileMap, opts) {
 	const homeBase = resolveHomeBase(opts.homeBase);
 	if (opts.names.length === 0) throw new Error("install-cli: must provide at least one --cli=<name>");
 	const manifest = await fetchManifest(ossFileMap, tag);
-	console.error(`[install-cli] manifest=${JSON.stringify(manifest)}`);
 	const allClis = manifest.packages.filter((p) => p.role === "cli" && p.name !== "openclaw");
 	const wanted = new Set(opts.names);
 	const targets = allClis.filter((p) => wanted.has(p.name) || p.packageName != null && wanted.has(p.packageName));
@@ -6396,7 +6395,8 @@ async function installClis(tag, ossFileMap, opts) {
 		console.error(`[install-cli]   ${pkg.name}: installed`);
 	}
 	if (targets.some((p) => p.name === LARK_CLI_NAME)) {
-		await installAgentSkills(manifest, ossFileMap, opts, homeBase, opts.tmpRoot);
+		const skillsInstallPath = await installAgentSkills(manifest, ossFileMap, opts, homeBase, opts.tmpRoot);
+		if (skillsInstallPath) linkAgentSkills(homeBase, skillsInstallPath);
 		const appIds = collectFeishuAppIds();
 		console.error(`[install-cli] lark-cli installed — running lark-cli-init for ${appIds.length} appId(s): [${appIds.join(", ")}]`);
 		for (const appId of appIds) {
@@ -6406,7 +6406,12 @@ async function installClis(tag, ossFileMap, opts) {
 				feishuAppSecret: opts.feishuAppSecret
 			});
 			console.error(`[install-cli] lark-cli-init: appId=${appId} ok=${result.ok}` + (result.skipped ? ` skipped=true reason=${result.skipReason}` : "") + (result.error ? ` error=${result.error}` : ""));
-			if (!result.ok && !result.skipped) reportError({
+			const outputText = [
+				result.error,
+				result.configInitStdout,
+				result.configInitStderr
+			].join(" ");
+			if (/error/i.test(outputText)) reportError({
 				error: `lark-cli-init failed for appId=${appId}: ${result.error ?? "unknown"}`,
 				extraCategories: {
 					event: "install_cli_lark_init_failed",
@@ -6453,7 +6458,7 @@ async function installAgentSkills(manifest, ossFileMap, downloadOpts, homeBase,
 	const pkg = manifest.packages.find((p) => p.role === "template" && p.name === AGENT_SKILLS_NAME);
 	if (!pkg) {
 		console.error(`[install-cli] installAgentSkills: ${AGENT_SKILLS_NAME} not found in manifest (tag may not bundle it) — skipping skill install`);
-		return;
+		return null;
 	}
 	console.error(`[install-cli] installAgentSkills: downloading ${pkg.name}@${pkg.version}`);
 	const tarball = await downloadWithCache(pkg, ossFileMap, downloadOpts);
@@ -6498,6 +6503,7 @@ async function installAgentSkills(manifest, ossFileMap, downloadOpts, homeBase,
 			force: true
 		});
 		console.error(`[install-cli] installAgentSkills: done — skills installed to ${targetDir}`);
+		return pkg.installPath;
 	} finally {
 		if (node_fs.default.existsSync(tmpStage)) try {
 			node_fs.default.rmSync(tmpStage, {
@@ -6507,6 +6513,39 @@ async function installAgentSkills(manifest, ossFileMap, downloadOpts, homeBase,
 		} catch {}
 	}
 }
+/**
+* (Re)create workspace/agent/skills/<name> → ../<installPath>/<name> symlinks so
+* the agent workspace sees agent-skills under the conventional skills/ directory.
+*
+* Both sides share workspace/agent/ as parent, so the relative link form is stable
+* regardless of where homeBase is mounted.
+*
+* @param homeBase  Root directory (default /home/gem). installPath is relative to
+*                  <homeBase>/workspace/agent/.
+* @param installPath  Relative path of the extracted skills dir under workspace/agent
+*                     (e.g. ".agents/skills").
+*/
+function linkAgentSkills(homeBase, installPath) {
+	const targetDir = node_path.default.join(homeBase, WORKSPACE_AGENT_REL, installPath);
+	const skillsLinkDir = node_path.default.join(homeBase, WORKSPACE_AGENT_REL, "skills");
+	if (!node_fs.default.existsSync(targetDir)) {
+		console.error(`[install-cli] linkAgentSkills: targetDir=${targetDir} does not exist — skipping`);
+		return;
+	}
+	const skillDirs = node_fs.default.readdirSync(targetDir, { withFileTypes: true }).filter((e) => e.isDirectory());
+	console.error(`[install-cli] linkAgentSkills: creating ${skillDirs.length} symlinks in ${skillsLinkDir}`);
+	node_fs.default.mkdirSync(skillsLinkDir, { recursive: true });
+	for (const entry of skillDirs) {
+		const relTarget = node_path.default.join("..", installPath, entry.name);
+		const symlinkPath = node_path.default.join(skillsLinkDir, entry.name);
+		try {
+			node_fs.default.unlinkSync(symlinkPath);
+		} catch {}
+		node_fs.default.symlinkSync(relTarget, symlinkPath);
+		console.error(`[install-cli] linkAgentSkills:   ${entry.name} -> ${relTarget}`);
+	}
+	console.error(`[install-cli] linkAgentSkills: done — ${skillDirs.length} skill(s) symlinked from ${skillsLinkDir}`);
+}
 function installOne(pkg, tarball, homeBase, tmpRoot) {
 	const targetDir = node_path.default.join(homeBase, pkg.installPath);
 	const bakDir = targetDir + ".bak";
@@ -9735,7 +9774,7 @@ async function reportCliRun(opts) {
 //#region src/help.ts
 const BIN = "mclaw-diagnose";
 function versionBanner() {
-	return `v0.1.8-alpha.1`;
+	return `v0.1.8-alpha.2`;
 }
 const COMMANDS = [
 	{
@@ -10611,6 +10650,10 @@ async function main() {
 				node_process.default.exit(1);
 			}
 			const names = getMultiFlag(args, "cli");
+			if (names.length === 0) {
+				console.error("Usage: install-cli <tag> --cli=<name>... [--home_base=<dir>] [--ctx=<base64> | --oss_file_map=<base64>]");
+				node_process.default.exit(1);
+			}
 			const homeBase = getFlag(args, "home_base");
 			const ossFileMapFlag = getFlag(args, "oss_file_map");
 			let installOssFileMap;
@@ -10627,7 +10670,6 @@ async function main() {
 				ossFileMapFlag,
 				installOssFileMap
 			});
-			console.error(`[install-cli] ossFileMap=${JSON.stringify(ossFileMap)}`);
 			let feishuAppSecret;
 			if (names.includes("lark-cli")) feishuAppSecret = normalizeCtx(await fetchCtxViaInnerApi({
 				populate: { app: ["feishuAppSecret"] },

package/package.json

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