@jixoai/gh-runner 0.2.2 → 0.2.4

package/dist/assets/manifest.json

@@ -0,0 +1,84 @@
+{
+  "schemaVersion": 1,
+  "appIcon": [
+    {
+      "platform": "darwin",
+      "format": "icns",
+      "source": {
+        "type": "file",
+        "path": "icon.icns"
+      }
+    },
+    {
+      "platform": "windows",
+      "format": "ico",
+      "source": {
+        "type": "file",
+        "path": "icon.ico"
+      }
+    },
+    {
+      "platform": "linux",
+      "format": "png",
+      "size": 16,
+      "source": {
+        "type": "file",
+        "path": "linux/16x16/app-icon.png"
+      }
+    },
+    {
+      "platform": "linux",
+      "format": "png",
+      "size": 32,
+      "source": {
+        "type": "file",
+        "path": "linux/32x32/app-icon.png"
+      }
+    },
+    {
+      "platform": "linux",
+      "format": "png",
+      "size": 48,
+      "source": {
+        "type": "file",
+        "path": "linux/48x48/app-icon.png"
+      }
+    },
+    {
+      "platform": "linux",
+      "format": "png",
+      "size": 64,
+      "source": {
+        "type": "file",
+        "path": "linux/64x64/app-icon.png"
+      }
+    },
+    {
+      "platform": "linux",
+      "format": "png",
+      "size": 128,
+      "source": {
+        "type": "file",
+        "path": "linux/128x128/app-icon.png"
+      }
+    },
+    {
+      "platform": "linux",
+      "format": "png",
+      "size": 256,
+      "source": {
+        "type": "file",
+        "path": "linux/256x256/app-icon.png"
+      }
+    },
+    {
+      "platform": "linux",
+      "format": "png",
+      "size": 512,
+      "source": {
+        "type": "file",
+        "path": "linux/512x512/app-icon.png"
+      }
+    }
+  ]
+}

package/dist/main.mjs

@@ -1,17 +1,143 @@
 #!/usr/bin/env node
-import { arch, homedir, platform } from "node:os";
 import { mkdir, open, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
 import { createTray } from "opentray";
 import { attachDialog } from "@opentray/ext-dialog";
 import { attachOpener } from "@opentray/ext-opener";
+import { arch, homedir, platform } from "node:os";
 import { dirname, isAbsolute, join } from "node:path";
-import { createWriteStream, existsSync } from "node:fs";
+import { createWriteStream, existsSync, readFileSync } from "node:fs";
 import { execFile, spawn } from "node:child_process";
 import { promisify } from "node:util";
 import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { fileURLToPath } from "node:url";
 import { WebviewExt } from "@opentray/ext-webview";
+// src/platform.ts
+const IS_WIN = platform() === "win32";
+const PLATFORM = platform();
+const ARCH = arch();
+/** actions/runner release 资产的平台段：darwin→osx, win32→win, linux→linux。 */
+function osSegment(p = PLATFORM) {
+	if (p === "darwin") return "osx";
+	if (p === "win32") return "win";
+	return "linux";
+}
+/** arch 段：ia32→x86, arm64→arm64, 其余→x64。 */
+function archSegment(a = ARCH) {
+	if (a === "ia32") return "x86";
+	if (a === "arm64") return "arm64";
+	return "x64";
+}
+/** 官方 release 资产名，如 actions-runner-osx-arm64-2.338.1.tar.gz / actions-runner-win-x64-2.338.1.zip。 */
+function assetNameFor(version, p = PLATFORM, a = ARCH) {
+	const ext = osSegment(p) === "win" ? "zip" : "tar.gz";
+	return `actions-runner-${osSegment(p)}-${archSegment(a)}-${version}.${ext}`;
+}
+/** 包文件是否与当前平台匹配（供 UI 把不兼容包置灰）。 */
+function packageCompatible(fileName) {
+	const seg = `${osSegment()}-${archSegment()}`;
+	return fileName.includes(`-${seg}-`);
+}
+/** runner 启动入口：darwin/linux 用 run.sh；win32 直接跑 Listener.exe（run.cmd 只是它的薄包装）。 */
+function runnerSpawn(dir) {
+	if (IS_WIN) return {
+		file: join(dir, "bin", "Runner.Listener.exe"),
+		args: ["run"]
+	};
+	return {
+		file: join(dir, "run.sh"),
+		args: []
+	};
+}
+/** 注册命令：darwin/linux 走 ./config.sh；win32 用 Listener 的 configure 动词（避免 cmd.exe 转义坑）。 */
+function registerSpawn(dir) {
+	if (IS_WIN) return {
+		file: join(dir, "bin", "Runner.Listener.exe"),
+		prefixArgs: ["configure"]
+	};
+	return {
+		file: "./config.sh",
+		prefixArgs: []
+	};
+}
+/** labels 默认值（UI 预填）。 */
+function defaultLabels() {
+	if (PLATFORM === "darwin") return "self-hosted,macOS,ARM64";
+	if (IS_WIN) return `self-hosted,Windows,${archSegment().toUpperCase()}`;
+	return `self-hosted,Linux,${archSegment().toUpperCase()}`;
+}
+/** 实例目录的默认父目录（UI placeholder 与初始 searchDirs）。 */
+function defaultSearchDirs() {
+	if (PLATFORM === "darwin") return ["/Volumes/bnqkl/Users/kzf"];
+	if (IS_WIN) return ["C:\\actions-runner", homedir()];
+	return [homedir()];
+}
+/** 平台路径分段（win32 反斜杠）。 */
+function basenameOf(dir) {
+	const parts = dir.split(/[\\/]+/).filter(Boolean);
+	return parts[parts.length - 1] ?? dir;
+}
+/** 平台无关的绝对路径判定。 */
+function isAbsolutePath(p) {
+	if (IS_WIN) return /^[A-Za-z]:[\\/]/.test(p) || isAbsolute(p);
+	return isAbsolute(p);
+}
+// src/config.ts
+const DEFAULT_SEARCH_DIRS = defaultSearchDirs();
+function configDir() {
+	if (process.platform === "win32") {
+		const appData = process.env.APPDATA ?? join(homedir(), "AppData", "Roaming");
+		return join(appData, "gh-runner");
+	}
+	return join(homedir(), "Library", "Application Support", "gh-runner");
+}
+function configPath() {
+	return join(configDir(), "config.json");
+}
+/** 形状校验：损坏的实例项直接丢弃（手编配置/撕裂写的容错），不让 boot 崩掉。
+*  路径合法性平台无关（POSIX 绝对 / win32 盘符 / UNC 均可）——config 是本机产物，
+*  但 Windows 盘符路径曾被 startsWith("/") 全量误杀并回写空清单（v0.2.2 实证事故）。 */
+function isAbsoluteish(p) {
+	return p.startsWith("/") || /^[A-Za-z]:[\\/]/.test(p) || p.startsWith("\\\\");
+}
+function validInstance(item) {
+	return typeof item === "object" && item !== null && typeof item.dir === "string" && isAbsoluteish(item.dir) && typeof item.id === "string";
+}
+async function loadConfig() {
+	try {
+		const raw = (await readFile(configPath(), "utf8")).replace(/^\uFEFF/, "");
+		const parsed = JSON.parse(raw);
+		const searchDirs = Array.isArray(parsed.searchDirs) ? parsed.searchDirs.filter((d) => typeof d === "string" && isAbsolutePath(d)) : [];
+		const instances = Array.isArray(parsed.instances) ? parsed.instances.filter((i) => validInstance(i)) : [];
+		const importedPackages = Array.isArray(parsed.importedPackages) ? parsed.importedPackages.filter((p) => typeof p === "string") : [];
+		return {
+			searchDirs: searchDirs.length > 0 ? searchDirs : DEFAULT_SEARCH_DIRS,
+			instances,
+			importedPackages
+		};
+	} catch {
+		return {
+			searchDirs: DEFAULT_SEARCH_DIRS,
+			instances: [],
+			importedPackages: []
+		};
+	}
+}
+/** 原子写：tmp + rename，杜绝撕裂写（损坏的 config 会 brick 启动路径）。 */
+async function saveConfig(config) {
+	await mkdir(configDir(), { recursive: true });
+	const path = configPath();
+	const tmp = `${path}.tmp`;
+	await writeFile(tmp, `${JSON.stringify(config, null, 2)}\n`, "utf8");
+	await rename(tmp, path);
+}
+function upsertInstance(config, instance) {
+	const rest = config.instances.filter((i) => i.id !== instance.id && i.dir !== instance.dir);
+	return {
+		...config,
+		instances: [...rest, instance]
+	};
+}
 // src/tailer.ts
 /**
 * 跟随一个目录中最新的、名字匹配 `prefix*.log` 的文件。
@@ -164,76 +290,6 @@ function parseConsoleLine(line) {
 	};
 	return null;
 }
-// src/platform.ts
-const IS_WIN = platform() === "win32";
-const PLATFORM = platform();
-const ARCH = arch();
-/** actions/runner release 资产的平台段：darwin→osx, win32→win, linux→linux。 */
-function osSegment(p = PLATFORM) {
-	if (p === "darwin") return "osx";
-	if (p === "win32") return "win";
-	return "linux";
-}
-/** arch 段：ia32→x86, arm64→arm64, 其余→x64。 */
-function archSegment(a = ARCH) {
-	if (a === "ia32") return "x86";
-	if (a === "arm64") return "arm64";
-	return "x64";
-}
-/** 官方 release 资产名，如 actions-runner-osx-arm64-2.338.1.tar.gz / actions-runner-win-x64-2.338.1.zip。 */
-function assetNameFor(version, p = PLATFORM, a = ARCH) {
-	const ext = osSegment(p) === "win" ? "zip" : "tar.gz";
-	return `actions-runner-${osSegment(p)}-${archSegment(a)}-${version}.${ext}`;
-}
-/** 包文件是否与当前平台匹配（供 UI 把不兼容包置灰）。 */
-function packageCompatible(fileName) {
-	const seg = `${osSegment()}-${archSegment()}`;
-	return fileName.includes(`-${seg}-`);
-}
-/** runner 启动入口：darwin/linux 用 run.sh；win32 直接跑 Listener.exe（run.cmd 只是它的薄包装）。 */
-function runnerSpawn(dir) {
-	if (IS_WIN) return {
-		file: join(dir, "bin", "Runner.Listener.exe"),
-		args: ["run"]
-	};
-	return {
-		file: join(dir, "run.sh"),
-		args: []
-	};
-}
-/** 注册命令：darwin/linux 走 ./config.sh；win32 用 Listener 的 configure 动词（避免 cmd.exe 转义坑）。 */
-function registerSpawn(dir) {
-	if (IS_WIN) return {
-		file: join(dir, "bin", "Runner.Listener.exe"),
-		prefixArgs: ["configure"]
-	};
-	return {
-		file: "./config.sh",
-		prefixArgs: []
-	};
-}
-/** labels 默认值（UI 预填）。 */
-function defaultLabels() {
-	if (PLATFORM === "darwin") return "self-hosted,macOS,ARM64";
-	if (IS_WIN) return `self-hosted,Windows,${archSegment().toUpperCase()}`;
-	return `self-hosted,Linux,${archSegment().toUpperCase()}`;
-}
-/** 实例目录的默认父目录（UI placeholder 与初始 searchDirs）。 */
-function defaultSearchDirs() {
-	if (PLATFORM === "darwin") return ["/Volumes/bnqkl/Users/kzf"];
-	if (IS_WIN) return ["C:\\actions-runner", homedir()];
-	return [homedir()];
-}
-/** 平台路径分段（win32 反斜杠）。 */
-function basenameOf(dir) {
-	const parts = dir.split(/[\\/]+/).filter(Boolean);
-	return parts[parts.length - 1] ?? dir;
-}
-/** 平台无关的绝对路径判定。 */
-function isAbsolutePath(p) {
-	if (IS_WIN) return /^[A-Za-z]:[\\/]/.test(p) || isAbsolute(p);
-	return isAbsolute(p);
-}
 // src/discover.ts
 const exec = promisify(execFile);
 /** 读取 <dir>/.runner；缺失或损坏时返回未配置态。注意 GitHub 写入的文件带 UTF-8 BOM。 */
@@ -444,62 +500,6 @@ async function stopProcessGroup(pid, graceMs = 8e3) {
 	await new Promise((r) => setTimeout(r, 500));
 	return pidExists(pid) === "dead";
 }
-// src/config.ts
-const DEFAULT_SEARCH_DIRS = defaultSearchDirs();
-function configDir() {
-	if (process.platform === "win32") {
-		const appData = process.env.APPDATA ?? join(homedir(), "AppData", "Roaming");
-		return join(appData, "gh-runner");
-	}
-	return join(homedir(), "Library", "Application Support", "gh-runner");
-}
-function configPath() {
-	return join(configDir(), "config.json");
-}
-/** 形状校验：损坏的实例项直接丢弃（手编配置/撕裂写的容错），不让 boot 崩掉。
-*  路径合法性平台无关（POSIX 绝对 / win32 盘符 / UNC 均可）——config 是本机产物，
-*  但 Windows 盘符路径曾被 startsWith("/") 全量误杀并回写空清单（v0.2.2 实证事故）。 */
-function isAbsoluteish(p) {
-	return p.startsWith("/") || /^[A-Za-z]:[\\/]/.test(p) || p.startsWith("\\\\");
-}
-function validInstance(item) {
-	return typeof item === "object" && item !== null && typeof item.dir === "string" && isAbsoluteish(item.dir) && typeof item.id === "string";
-}
-async function loadConfig() {
-	try {
-		const raw = (await readFile(configPath(), "utf8")).replace(/^\uFEFF/, "");
-		const parsed = JSON.parse(raw);
-		const searchDirs = Array.isArray(parsed.searchDirs) ? parsed.searchDirs.filter((d) => typeof d === "string" && isAbsolutePath(d)) : [];
-		const instances = Array.isArray(parsed.instances) ? parsed.instances.filter((i) => validInstance(i)) : [];
-		const importedPackages = Array.isArray(parsed.importedPackages) ? parsed.importedPackages.filter((p) => typeof p === "string") : [];
-		return {
-			searchDirs: searchDirs.length > 0 ? searchDirs : DEFAULT_SEARCH_DIRS,
-			instances,
-			importedPackages
-		};
-	} catch {
-		return {
-			searchDirs: DEFAULT_SEARCH_DIRS,
-			instances: [],
-			importedPackages: []
-		};
-	}
-}
-/** 原子写：tmp + rename，杜绝撕裂写（损坏的 config 会 brick 启动路径）。 */
-async function saveConfig(config) {
-	await mkdir(configDir(), { recursive: true });
-	const path = configPath();
-	const tmp = `${path}.tmp`;
-	await writeFile(tmp, `${JSON.stringify(config, null, 2)}\n`, "utf8");
-	await rename(tmp, path);
-}
-function upsertInstance(config, instance) {
-	const rest = config.instances.filter((i) => i.id !== instance.id && i.dir !== instance.dir);
-	return {
-		...config,
-		instances: [...rest, instance]
-	};
-}
 // src/register.ts
 async function runStep(title, file, args, cwd, onProgress, timeoutMs = 3e5) {
 	onProgress(`$ ${title}`);
@@ -553,13 +553,24 @@ async function registerRunner(req, searchDirs, onProgress) {
 	const dir = req.dir;
 	try {
 		if (!dir || !isAbsolutePath(dir)) throw new Error("实例目录必须是绝对路径");
+		if (existsSync(join(dir, ".runner"))) {
+			onProgress(`检测到已注册实例（${dir}）→ 接入管理清单`);
+			const meta = await readRunnerMeta(dir);
+			if (!meta.configured) throw new Error(".runner 存在但无法解析（损坏？）");
+			onProgress(`✔ 接入成功：${meta.agentName}（agentId=${meta.agentId}）` + (meta.workFolder ? `，work 目录已恢复：${meta.workFolder}` : ""));
+			return {
+				ok: true,
+				error: null,
+				runnerDir: dir
+			};
+		}
 		if (!req.name.trim()) throw new Error("缺少实例名称");
 		if (!req.token.trim()) throw new Error("缺少注册 Token（org 设置页每次生成、一次性）");
 		if (!req.workFolder.trim()) throw new Error("缺少 Work 目录（多实例必须各自独立）");
 		let entries = [];
 		if (existsSync(dir)) {
 			entries = await readdir(dir);
-			if (entries.some((e) => e !== ".DS_Store")) throw new Error(`目录非空（${entries.length} 项）：注册必须是空目录；管理已有实例请直接 attach`);
+			if (entries.some((e) => e !== ".DS_Store")) throw new Error(`目录非空且无 .runner（${entries.length} 项）：无法安全解包。若是此前注册的实例，请确认目录下有 .runner 文件；否则请换一个空目录。`);
 		} else {
 			onProgress(`创建目录 ${dir}`);
 			await mkdir(dir, { recursive: true });
@@ -1132,6 +1143,26 @@ var Fleet = class {
 		this.#debounceTimer.unref?.();
 	}
 };
+// src/branding.ts
+const assetsDir = join(dirname(fileURLToPath(import.meta.url)), "assets");
+/** 内核 manifest → 运行时 AppIcon（manifest 内相对路径 → 绝对）。 */
+function appIcon() {
+	return JSON.parse(readFileSync(join(assetsDir, "manifest.json"), "utf8")).appIcon.map((asset) => ({
+		...asset,
+		source: {
+			type: "file",
+			path: join(assetsDir, asset.source.path)
+		}
+	}));
+}
+/** 菜单栏模板图（darwin：纯黑剪影 isTemplate 系统着色）。 */
+function trayTemplatePath() {
+	return join(assetsDir, "tray-template.png");
+}
+/** 菜单栏彩色图（win32）。 */
+function trayColorPath() {
+	return join(assetsDir, "tray-color.png");
+}
 // src/tray.ts
 const ITEM_OPEN = 1;
 const ITEM_QUIT = 2;
@@ -1147,11 +1178,15 @@ function stateLabel(snapshot, index) {
 		default: return i.processState;
 	}
 }
-/** 快照 → 托盘投影器。每次 update() 全量重画图标/tooltip/菜单。 */
+/** 快照 → 托盘投影器。原生托盘接口按内容去重——内容未变绝不重复调用。 */
 var TrayProjection = class {
 	tray;
 	actions;
 	#instanceIds = [];
+	#lastIcon = null;
+	#platform = process.platform;
+	#lastTooltip = null;
+	#lastMenu = null;
 	constructor(tray, actions) {
 		this.tray = tray;
 		this.actions = actions;
@@ -1160,12 +1195,39 @@ var TrayProjection = class {
 		this.#instanceIds = snapshot.instances.map((i) => i.id);
 		const running = snapshot.instances.filter((i) => i.processState === "running" || i.processState === "starting");
 		const busy = running.filter((i) => i.currentJob !== null).length;
-		await this.tray.setIcon({ "text-only": busy > 0 ? `▶${running.length}↻${busy}` : `▶${running.length}` });
-		await this.tray.setTooltip({
+		const iconText = busy > 0 ? `▶${running.length}↻${busy}` : `▶${running.length}`;
+		if (iconText !== this.#lastIcon) {
+			this.#lastIcon = iconText;
+			const icon = this.#iconOf(iconText);
+			if (icon) await this.tray.setIcon(icon);
+		}
+		const tooltip = JSON.stringify({
 			title: "GH Runner",
 			description: snapshot.instances.map((_, index) => `${snapshot.instances[index].name}: ${stateLabel(snapshot, index)}`).join("\n") || "尚无实例"
 		});
-		await this.tray.setMenu(this.#menuOf(snapshot));
+		if (tooltip !== this.#lastTooltip) {
+			this.#lastTooltip = tooltip;
+			await this.tray.setTooltip(JSON.parse(tooltip));
+		}
+		const menu = JSON.stringify(this.#menuOf(snapshot));
+		if (menu !== this.#lastMenu) {
+			this.#lastMenu = menu;
+			await this.tray.setMenu(JSON.parse(menu));
+		}
+	}
+	#iconOf(text) {
+		if (this.#platform === "darwin") return { "darwin-icon-text": {
+			type: "file",
+			path: trayTemplatePath(),
+			isTemplate: true,
+			text
+		} };
+		if (this.#platform === "win32") return { "win32-icon-text": {
+			type: "file",
+			path: trayColorPath(),
+			text
+		} };
+		return { "text-only": text };
 	}
 	/** onMenuClick 事件入口；返回是否已消费。 */
 	handleMenuClick(itemId) {
@@ -1221,6 +1283,7 @@ var UiHost = class {
 	webviewTray;
 	onOpenDiag;
 	pickPackageFile;
+	pickRunnerDir;
 	openExternal;
 	#window = null;
 	#lastSnapshot = null;
@@ -1233,17 +1296,22 @@ var UiHost = class {
 	/** 单飞守卫：hello 全量重推与去抖推送并发交错会让同一批日志行重复送达页面。 */
 	#pushInFlight = false;
 	#pushPending = false;
-	constructor(fleet, webviewTray, onOpenDiag, pickPackageFile, openExternal) {
+	#visible = true;
+	constructor(fleet, webviewTray, onOpenDiag, pickPackageFile, pickRunnerDir, openExternal) {
 		this.fleet = fleet;
 		this.webviewTray = webviewTray;
 		this.onOpenDiag = onOpenDiag;
 		this.pickPackageFile = pickPackageFile;
+		this.pickRunnerDir = pickRunnerDir;
 		this.openExternal = openExternal;
 	}
 	async open() {
 		if (this.#window) {
 			await this.#window.show();
 			await this.#window.focus();
+			this.#visible = true;
+			this.#logOffsets.clear();
+			this.#doPush();
 			return;
 		}
 		const htmlPath = join(dirname(fileURLToPath(import.meta.url)), "ui", "index.html");
@@ -1258,12 +1326,25 @@ var UiHost = class {
 			style: {
 				appMode: true,
 				autoHide: false,
-				frameless: false
+				frameless: false,
+				background: {
+					kind: "semantic",
+					token: "blur",
+					state: "active"
+				}
 			}
 		});
 		this.#window = win;
 		await win.show();
 		await win.setMinimumSize(720, 520);
+		win.listen("visibleChange", (event) => {
+			const visible = event.payload.visible ?? true;
+			this.#visible = visible;
+			if (visible) {
+				this.#logOffsets.clear();
+				this.#doPush();
+			}
+		});
 		this.#drainTimer = setInterval(() => void this.#drain(), DRAIN_INTERVAL_MS);
 		this.#drainTimer.unref?.();
 		this.#flush();
@@ -1307,7 +1388,7 @@ var UiHost = class {
 	async #doPush() {
 		const win = this.#window;
 		const snap = this.#lastSnapshot;
-		if (!win || !snap || win.connectionDead) return;
+		if (!win || !snap || win.connectionDead || !this.#visible) return;
 		if (this.#pushInFlight) {
 			this.#pushPending = true;
 			return;
@@ -1612,7 +1693,8 @@ async function main() {
 		}] }
 	}, {
 		appId: APP_ID,
-		appName: "GH Runner"
+		appName: "GH Runner",
+		appIcon: appIcon()
 	});
 	const projection = new TrayProjection(tray, {
 		openWindow: () => void uiHost.open(),
@@ -1627,7 +1709,14 @@ async function main() {
 	const uiHost = new UiHost(fleet, webviewTray, (id) => {
 		const view = fleet.view(id);
 		if (view) opener.revealInFolder(`${view.dir}/_diag`).catch((err) => console.error("[gh-runner] 揭示目录失败:", err));
-	}, () => pickPackageFile(tray), (url) => opener.open(url));
+	}, () => pickPackageFile(tray), async () => {
+		try {
+			return await attachDialog(tray).pickDirectory();
+		} catch (err) {
+			console.error("[gh-runner] 目录选择失败:", err);
+			return null;
+		}
+	}, (url) => opener.open(url));
 	fleet.onSnapshot((snap) => {
 		projection.update(snap);
 		uiHost.push(snap);
@@ -1647,7 +1736,7 @@ async function main() {
 	};
 	process.on("SIGINT", () => void shutdown());
 	process.on("SIGTERM", () => void shutdown());
-	console.log(`[gh-runner] 已启动（配置目录 ${homedir()}/Library/Application Support/gh-runner）`);
+	console.log(`[gh-runner] 已启动（配置目录 ${configDir()}）`);
 }
 main().catch((err) => {
 	console.error("[gh-runner] 启动失败:", err);