@cannbot-plugin/cannbot-harness 0.2.9 → 0.3.1

package/lib/index.js

@@ -7,8 +7,8 @@ import { isUserInvocable, renderSkillContent } from "@deepseek-ai/dsh-skill";
 import z from "@deepseek-ai/schemastery";
 import { spawn } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
-import { readFileSync, realpathSync, statSync } from "node:fs";
-import { cp, mkdir, mkdtemp, open, readFile, realpath, rename, unlink, writeFile } from "node:fs/promises";
+import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
+import { cp, lstat, mkdir, mkdtemp, open, readFile, realpath, rename, rm, unlink, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 //#region src/workflows.ts
 const WORKFLOWS = [
@@ -273,6 +273,145 @@ async function withContentLock(path, action) {
 		if (await readFile(path, "utf8").catch(() => "") === owner) await unlink(path);
 	}
 }
+//#endregion
+//#region src/initializer-transaction.ts
+const transient = new Set([
+	"EIO",
+	"EBUSY",
+	"EPERM",
+	"EACCES",
+	"ENOENT"
+]);
+async function retry(action) {
+	for (let attempt = 0;; attempt++) try {
+		return await action();
+	} catch (error) {
+		if (!transient.has(error.code ?? "") || attempt === 6) throw error;
+		await new Promise((done) => setTimeout(done, Math.min(100 * 2 ** attempt, 800)));
+	}
+}
+function inside$1(root, path) {
+	const target = resolve(root, path), diff = relative(root, target);
+	if (!diff || diff === ".." || diff.startsWith(".." + sep) || isAbsolute(diff)) throw new Error("Invalid initialization recovery path");
+	return target;
+}
+async function present(path) {
+	try {
+		await lstat(path);
+		return true;
+	} catch (error) {
+		if (error.code === "ENOENT") return false;
+		throw error;
+	}
+}
+async function checkParent(workspace, path) {
+	let parent = resolve(path, "..");
+	while (parent !== workspace && !await present(parent)) parent = resolve(parent, "..");
+	if (parent !== workspace) inside$1(workspace, await realpath(parent));
+}
+/** Snapshot only installer-owned destinations; dependency repositories are never removed. */
+async function initializeTransaction(workspace, recoveryRoot, descriptor, resources, initialize) {
+	await mkdir(recoveryRoot, { recursive: true });
+	const journalPath = join(recoveryRoot, "recovery.json");
+	async function restore(journal) {
+		if (journal.workspace !== workspace || !relative(recoveryRoot, journal.directory).startsWith("snapshot-") || relative(recoveryRoot, journal.directory).includes(sep)) throw new Error("Invalid initialization recovery journal");
+		for (const entry of journal.entries) {
+			const destination = inside$1(workspace, entry.path), saved = inside$1(journal.directory, entry.slot);
+			const parent = resolve(destination, "..");
+			await checkParent(workspace, destination);
+			await retry(() => rm(destination, {
+				recursive: true,
+				force: true,
+				maxRetries: 3,
+				retryDelay: 100
+			}));
+			if (entry.present) {
+				await mkdir(parent, { recursive: true });
+				await retry(() => cp(saved, destination, {
+					recursive: true,
+					dereference: false,
+					verbatimSymlinks: true
+				}));
+			}
+		}
+	}
+	const previous = await readFile(journalPath, "utf8").catch((error) => {
+		if (error.code === "ENOENT") return "";
+		throw error;
+	});
+	if (previous) {
+		const journal = JSON.parse(previous);
+		await restore(journal);
+		await rm(journalPath);
+		await rm(journal.directory, {
+			recursive: true,
+			force: true,
+			maxRetries: 3,
+			retryDelay: 100
+		}).catch(() => {});
+	}
+	const paths = new Set(descriptor.skills.map((skill) => `.dsh/skills/${skill.name}`));
+	paths.add(`.cannbot/plugins/${descriptor.id}`);
+	for (const file of [
+		"AGENTS.md",
+		"CLAUDE.md",
+		".dsh/cannbot-plugin.json",
+		".cannbot/settings.json",
+		".cannbot/permissions"
+	]) paths.add(file);
+	const manifestPath = join(resources, ".claude-plugin/plugin.json");
+	if (await present(manifestPath)) {
+		const manifest = JSON.parse(await readFile(manifestPath, "utf8"));
+		for (const path of manifest.agents ?? []) {
+			const text = await readFile(inside$1(resources, path), "utf8");
+			const name = /^name:\s*([^\r\n]+)$/m.exec(text)?.[1]?.trim();
+			if (!name || !/^[A-Za-z0-9_-]+(?:\.[A-Za-z0-9_-]+)*$/.test(name)) throw new Error("Invalid initializer agent name");
+			paths.add(`.dsh/agents/${name}.md`);
+		}
+	}
+	const directory = await mkdtemp(join(recoveryRoot, "snapshot-"));
+	const journal = {
+		workspace,
+		directory,
+		entries: []
+	};
+	for (const path of paths) {
+		const source = inside$1(workspace, path);
+		await checkParent(workspace, source);
+		const exists = await present(source), slot = String(journal.entries.length);
+		if (exists) await retry(() => cp(source, join(directory, slot), {
+			recursive: true,
+			dereference: false,
+			verbatimSymlinks: true
+		}));
+		journal.entries.push({
+			path,
+			present: exists,
+			slot
+		});
+	}
+	const temporary = journalPath + ".tmp";
+	await writeFile(temporary, JSON.stringify(journal), { mode: 384 });
+	await rename(temporary, journalPath);
+	try {
+		await initialize();
+	} catch (error) {
+		try {
+			await restore(journal);
+			await rm(journalPath);
+		} catch (recovery) {
+			throw new Error(`${error.message}\n自动恢复未完成，备份保留在 ${directory}：${recovery.message}`);
+		}
+		throw new Error(`${error.message}\n已恢复本次初始化前的 Skills 和工作区配置。`);
+	}
+	await rm(journalPath);
+	await rm(directory, {
+		recursive: true,
+		force: true,
+		maxRetries: 3,
+		retryDelay: 100
+	}).catch(() => {});
+}
 const CATALOG_PACKAGE = "@cannbot-plugin/workflow-catalog";
 const REGISTRY = "https://registry.npmjs.org/";
 const MIRROR = "https://registry.npmmirror.com/";
@@ -733,7 +872,13 @@ var ContentManager = class {
 	async runInitializer(entry, args, cwd) {
 		await new Promise((accept, reject) => {
 			let output = "", stopped = false;
-			const child = spawn(process.execPath, [entry, ...args], {
+			const compatibility = join(import.meta.dirname, "../runtime/initializer-compat.cjs");
+			const child = spawn(process.execPath, [
+				"--require",
+				compatibility,
+				entry,
+				...args
+			], {
 				cwd,
 				windowsHide: true,
 				detached: process.platform !== "win32",
@@ -744,6 +889,8 @@ var ContentManager = class {
 				],
 				env: {
 					...process.env,
+					...process.versions.electron ? { ELECTRON_RUN_AS_NODE: "1" } : {},
+					CANNBOT_INITIALIZER_WORKSPACE: cwd,
 					GIT_TERMINAL_PROMPT: "0",
 					GCM_INTERACTIVE: "never"
 				}
@@ -800,7 +947,9 @@ var ContentManager = class {
 		let job = this.jobs.get(jobKey);
 		if (!job) {
 			job = withContentLock(join(this.root, "initialized", key, "workspace.lock"), async () => {
-				if (await readFile(marker, "utf8").catch(() => "") === receipt) return;
+				const recoveryRoot = join(this.root, "initialized", key, "recovery");
+				const skillsPresent = descriptor.skills.every((skill) => existsSync(join(workspace, ".dsh/skills", skill.name, "SKILL.md")));
+				if (await readFile(marker, "utf8").catch(() => "") === receipt && !existsSync(join(recoveryRoot, "recovery.json")) && (descriptor.initialization.kind !== "cannbot-cli" || skillsPresent)) return;
 				this.publish({
 					phase: "initializing",
 					message: `Preparing ${id}@${record.version} for this workspace…`,
@@ -808,7 +957,8 @@ var ContentManager = class {
 				});
 				if (descriptor.initialization.kind === "cannbot-cli") {
 					const root = inside(this.root, record.directory);
-					await this.runInitializer(inside(root, descriptor.initialization.entry), [
+					const entry = inside(root, descriptor.initialization.entry);
+					await initializeTransaction(workspace, recoveryRoot, descriptor, join(root, "resources"), () => this.runInitializer(entry, [
 						"install",
 						id,
 						"--tool",
@@ -817,7 +967,7 @@ var ContentManager = class {
 						workspace,
 						"--plugin-dir",
 						join(root, "resources")
-					], workspace);
+					], workspace));
 				}
 				await writeFile(marker, receipt, { mode: 384 });
 				this.publish({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cannbot-plugin/cannbot-harness",
-  "version": "0.2.9",
-  "description": "CANNBot Harness: DSH interface with independently versioned npm workflow packages",
+  "version": "0.3.1",
+  "description": "CANNBot Harness: Ascend development workbench with independently versioned workflow packages",
   "type": "module",
   "license": "SEE LICENSE IN THIRD_PARTY_NOTICES.md",
   "main": "lib/index.js",
@@ -14,6 +14,7 @@
   },
   "files": [
     "lib",
+    "runtime/initializer-compat.cjs",
     "workflow-defaults.json",
     "locale",
     "cordis.patch.yml",

package/runtime/initializer-compat.cjs

@@ -0,0 +1,25 @@
+// Used only by the official initializer subprocess. Never patches the DSH host.
+const fs = require('node:fs')
+const path = require('node:path')
+const root = process.env.CANNBOT_INITIALIZER_WORKSPACE
+if (process.platform === 'win32' && root) {
+  const cp = fs.cpSync
+  const wait = new Int32Array(new SharedArrayBuffer(4))
+  const managed = value => {
+    if (typeof value !== 'string') return false
+    const relative = path.relative(root, path.resolve(value))
+    return !path.isAbsolute(relative) && ['.dsh', '.cannbot'].some(name => relative.startsWith(name + path.sep))
+  }
+  fs.cpSync = function (source, destination, options) {
+    for (let attempt = 0; ; attempt++) {
+      try { return cp(source, destination, options) }
+      catch (error) {
+        // Windows may report EIO while a just-deleted directory is still closing.
+        // Do not rerun the whole installer, or retry missing source files.
+        if (!managed(destination) || !fs.existsSync(source) || !['EIO', 'EBUSY', 'EPERM', 'EACCES', 'ENOENT'].includes(error.code) || attempt === 6) throw error
+        Atomics.wait(wait, 0, 0, Math.min(100 * 2 ** attempt, 800))
+      }
+    }
+  }
+  require('node:module').syncBuiltinESMExports()
+}