blun-king-cli 9.1.483 → 9.1.484

package/blun.mjs

@@ -298449,17 +298449,16 @@ var init_types = __esmMin((() => {
 //#endregion
 //#region ../../packages/agent-core/src/plugin/manifest.ts
 async function parseManifest(pluginRoot) {
-	const rootJsonPath = path.join(pluginRoot, BLUN_PLUGIN_ROOT_PATH);
-	const dirJsonPath = path.join(pluginRoot, BLUN_PLUGIN_DIR_PATH);
-	const rootJsonExists = await isFile$1(rootJsonPath);
-	const dirJsonExists = await isFile$1(dirJsonPath);
-	if (!rootJsonExists && !dirJsonExists) return { diagnostics: [{
+	const candidates = pluginManifestCandidates(pluginRoot);
+	const existing = [];
+	for (const candidate of candidates) if (await isFile$1(candidate.path)) existing.push(candidate);
+	if (existing.length === 0) return { diagnostics: [{
 		severity: "error",
-		message: `No manifest at ${BLUN_PLUGIN_ROOT_PATH} or ${BLUN_PLUGIN_DIR_PATH}`
+		message: `No manifest at ${BLUN_PLUGIN_ROOT_PATH}, ${BLUN_PLUGIN_DIR_PATH}, or ${CODEX_PLUGIN_DIR_PATH}`
 	}] };
-	const manifestPath = rootJsonExists ? rootJsonPath : dirJsonPath;
-	const manifestKind = rootJsonExists ? "blun-plugin-root" : "blun-plugin-dir";
-	const shadowedManifestPath = rootJsonExists && dirJsonExists ? dirJsonPath : void 0;
+	const manifestPath = existing[0].path;
+	const manifestKind = existing[0].kind;
+	const shadowedManifestPath = existing[1]?.path;
 	let raw;
 	try {
 		raw = JSON.parse(await readFile(manifestPath, "utf8"));
@@ -298539,6 +298538,18 @@ async function parseManifest(pluginRoot) {
 		diagnostics
 	};
 }
+function pluginManifestCandidates(pluginRoot) {
+	return [{
+		kind: "blun-plugin-root",
+		path: path.join(pluginRoot, BLUN_PLUGIN_ROOT_PATH)
+	}, {
+		kind: "blun-plugin-dir",
+		path: path.join(pluginRoot, BLUN_PLUGIN_DIR_PATH)
+	}, {
+		kind: "codex-plugin-dir",
+		path: path.join(pluginRoot, CODEX_PLUGIN_DIR_PATH)
+	}];
+}
 function recordUnsupportedRuntimeFields(raw, diagnostics) {
 	for (const field of UNSUPPORTED_RUNTIME_FIELDS) {
 		if (raw[field] === void 0) continue;
@@ -298596,7 +298607,7 @@ async function resolveSkillsField(pluginRoot, raw, diagnostics) {
 	return resolved;
 }
 async function resolvePluginPathField(input) {
-	if (!input.value.startsWith("./")) {
+	if (!input.value.startsWith("./") && !path.isAbsolute(input.value)) {
 		input.diagnostics.push({
 			severity: "warn",
 			message: `"${input.field}" path must start with "./" (got "${input.value}")`
@@ -298864,8 +298875,9 @@ function commandNameFromFile(file, root) {
 async function normalizePluginMcpServer(input) {
 	const { config } = input;
 	if (config.transport === "http" || config.transport === "sse") return config;
-	let command = config.command;
-	if (command.startsWith("./")) {
+	const configuredCommand = config.command;
+	let command = expandPluginRootToken(configuredCommand, input.pluginRoot);
+	if (command.startsWith("./") || command !== configuredCommand) {
 		const resolvedCommand = await resolvePluginPathField({
 			pluginRoot: input.pluginRoot,
 			field: `mcpServers.${input.name}.command`,
@@ -298881,7 +298893,8 @@ async function normalizePluginMcpServer(input) {
 		});
 		return;
 	}
-	let cwd = config.cwd;
+	const args = config.args?.map((arg) => expandPluginRootToken(arg, input.pluginRoot));
+	let cwd = config.cwd === void 0 ? void 0 : expandPluginRootToken(config.cwd, input.pluginRoot);
 	if (cwd !== void 0) {
 		const resolvedCwd = await resolvePluginPathField({
 			pluginRoot: input.pluginRoot,
@@ -298895,9 +298908,13 @@ async function normalizePluginMcpServer(input) {
 	return {
 		...config,
 		command,
+		args,
 		cwd
 	};
 }
+function expandPluginRootToken(value, pluginRoot) {
+	return value.replaceAll("${PLUGIN_ROOT}", pluginRoot).replaceAll("${BLUN_PLUGIN_ROOT}", pluginRoot);
+}
 function readAuthor(raw) {
 	if (typeof raw === "string") return { name: raw };
 	if (!isObject$4(raw)) return void 0;
@@ -298965,12 +298982,13 @@ async function isDir(p) {
 		return false;
 	}
 }
-var BLUN_PLUGIN_ROOT_PATH, BLUN_PLUGIN_DIR_PATH, UNSUPPORTED_RUNTIME_FIELDS;
+var BLUN_PLUGIN_ROOT_PATH, BLUN_PLUGIN_DIR_PATH, CODEX_PLUGIN_DIR_PATH, UNSUPPORTED_RUNTIME_FIELDS;
 var init_manifest$1 = __esmMin((() => {
 	init_schema();
 	init_types();
 	BLUN_PLUGIN_ROOT_PATH = "blun.plugin.json";
 	BLUN_PLUGIN_DIR_PATH = ".blun-plugin/plugin.json";
+	CODEX_PLUGIN_DIR_PATH = ".codex-plugin/plugin.json";
 	UNSUPPORTED_RUNTIME_FIELDS = [
 		"tools",
 		"apps",
@@ -299119,9 +299137,8 @@ async function detectPluginRoot(dir) {
 	return dir;
 }
 async function hasManifest(dir) {
-	const rootManifest = path.join(dir, "blun.plugin.json");
-	const dirManifest = path.join(dir, ".blun-plugin", "plugin.json");
-	return await isFile(rootManifest) || await isFile(dirManifest);
+	for (const candidate of pluginManifestCandidates(dir)) if (await isFile(candidate.path)) return true;
+	return false;
 }
 async function isFile(p) {
 	try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blun-king-cli",
-  "version": "9.1.483",
+  "version": "9.1.484",
   "description": "BLUN CLI - your own AI agent with a Telegram channel. Get it done. With BLUN.",
   "license": "MIT",
   "bin": {