@mstar-harness/cli 3.6.0-alpha.2 → 3.6.0-alpha.3

package/dist/mstar-harness.js

@@ -10916,11 +10916,6 @@ import fs3 from "node:fs";
 import os2 from "node:os";
 import path5 from "node:path";
 
-// src/adapters/shared-install.ts
-import fs2 from "node:fs";
-import os from "node:os";
-import path4 from "node:path";
-
 // src/exec.ts
 import { execFileSync as execFileSync7 } from "node:child_process";
 function runCliCommand(command, opts = {}) {
@@ -10936,6 +10931,9 @@ function runCliCommand(command, opts = {}) {
 }
 
 // src/adapters/shared-install.ts
+import fs2 from "node:fs";
+import os from "node:os";
+import path4 from "node:path";
 var REPO_URL = "https://github.com/btspoony/mstar-harness.git";
 var PLUGIN_NAME = "morning-star-harness";
 var HARNESS_REPO_PATH = path4.join(os.homedir(), ".mstar", "harness");
@@ -11126,17 +11124,14 @@ function appendGitignore(projectRoot, entries, dryRun) {
 function appendHarnessProjectGitignore(projectRoot, dryRun) {
   return appendGitignore(projectRoot, HARNESS_PROCESS_GITIGNORE, dryRun);
 }
-function homeRelativeSourcePath(targetPath) {
-  const rel = path4.relative(os.homedir(), targetPath).split(path4.sep).join("/");
-  return rel.startsWith("..") ? targetPath : `./${rel}`;
-}
 
 // src/adapters/codex.ts
-var MARKETPLACE_NAME = "personal";
-var MARKETPLACE_DISPLAY_NAME = "Personal";
-var GLOBAL_MARKETPLACE_PATH = path5.join(os2.homedir(), ".agents", "plugins", "marketplace.json");
-var PLUGIN_CATEGORY = "Productivity";
-var CODEX_PLUGIN_LINK = ".codex/plugins/mstar-harness";
+var CODEX_BIN = "codex";
+var CODEX_LOCAL_TIMEOUT_MS = 1e4;
+var CODEX_MARKETPLACE_TIMEOUT_MS = 300000;
+var MARKETPLACE_GIT_SOURCE = "btspoony/mstar-harness";
+var MARKETPLACE_NAME = "mstar-repo";
+var CODEX_INSTALL_HINT = "Install the Codex CLI (https://github.com/openai/codex), e.g. `npm install -g @openai/codex`, then re-run init.";
 var CODEX_AGENT_NAMES = [
   "product-manager",
   "architect",
@@ -11159,11 +11154,50 @@ var CODEX_PROJECT_COMMAND_NAMES = [
   "amazing-pr-review"
 ];
 var GLOBAL_ITERATION_SKILLS_WARNING = "Codex project-scoped commands (iteration-start / iteration-drive / iteration-loop / codebase-audit / amazing-pr-review) are installed as project-local skills under .agents/skills/ only. Global install skips them to avoid polluting other code agents. Re-run with --scope project to enable.";
-function globalMarketplacePath() {
-  return GLOBAL_MARKETPLACE_PATH;
+function runCodex(args, dryRun, timeoutMs) {
+  return runCliCommand([CODEX_BIN, ...args], { dryRun, timeoutMs, env: process.env });
 }
-function projectMarketplacePath() {
-  return path5.join(resolveProjectRoot2(), ".agents", "plugins", "marketplace.json");
+function codexAvailable() {
+  try {
+    runCodex(["--version"], false, CODEX_LOCAL_TIMEOUT_MS);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function configuredMarketplaceNames(dryRun) {
+  if (dryRun)
+    return [];
+  const dump = runCodex(["plugin", "marketplace", "list", "--json"], false, CODEX_LOCAL_TIMEOUT_MS);
+  const parsed = JSON.parse(dump);
+  const list = Array.isArray(parsed.marketplaces) ? parsed.marketplaces : [];
+  return list.map((entry) => entry && typeof entry.name === "string" ? entry.name : "").filter((name) => name !== "");
+}
+function installedPluginIds(dryRun) {
+  if (dryRun)
+    return [];
+  const dump = runCodex(["plugin", "list", "--json"], false, CODEX_LOCAL_TIMEOUT_MS);
+  const parsed = JSON.parse(dump);
+  const list = Array.isArray(parsed.installed) ? parsed.installed : [];
+  return list.map((entry) => entry && typeof entry.pluginId === "string" ? entry.pluginId : "").filter((pluginId) => pluginId !== "");
+}
+function legacyPersonalMarketplaceNote() {
+  const legacyPath = path5.join(os2.homedir(), ".agents", "plugins", "marketplace.json");
+  let raw;
+  try {
+    raw = fs3.readFileSync(legacyPath, "utf8");
+  } catch {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    const plugins = Array.isArray(parsed.plugins) ? parsed.plugins : [];
+    const hasMstar = plugins.some((entry) => entry !== null && typeof entry === "object" && !Array.isArray(entry) && ("name" in entry) && entry.name === PLUGIN_NAME);
+    if (hasMstar) {
+      return `Legacy personal marketplace entry found at ${legacyPath} \u2014 the ${PLUGIN_NAME} plugin now installs from the repo marketplace (${MARKETPLACE_GIT_SOURCE}). Remove the entry, then install: codex plugin add ${PLUGIN_NAME}@${MARKETPLACE_NAME}`;
+    }
+  } catch {}
+  return null;
 }
 function agentSourcePath(agentName) {
   return path5.join(HARNESS_REPO_PATH, "codex", "agents", `${agentName}.toml`);
@@ -11174,76 +11208,6 @@ function globalAgentLinkPath(agentName) {
 function projectAgentLinkPath(agentName) {
   return path5.join(resolveProjectRoot2(), ".codex", "agents", `${agentName}.toml`);
 }
-function mstarEntry(scope) {
-  const sourcePath = scope === "global" ? homeRelativeSourcePath(HARNESS_REPO_PATH) : `./${CODEX_PLUGIN_LINK}`;
-  return {
-    name: PLUGIN_NAME,
-    source: {
-      source: "local",
-      path: sourcePath
-    },
-    policy: {
-      installation: "AVAILABLE",
-      authentication: "ON_INSTALL"
-    },
-    category: PLUGIN_CATEGORY
-  };
-}
-function normalizeMarketplace(raw) {
-  const next = ensureObject(raw);
-  next.name = MARKETPLACE_NAME;
-  const iface = ensureObject(next.interface);
-  if (typeof iface.displayName !== "string" || !iface.displayName.trim()) {
-    iface.displayName = MARKETPLACE_DISPLAY_NAME;
-  }
-  next.interface = iface;
-  if (!Array.isArray(next.plugins)) {
-    next.plugins = [];
-  }
-  return next;
-}
-function upsertEntry(raw, scope) {
-  const next = normalizeMarketplace(raw);
-  const plugins = next.plugins.filter((entry) => {
-    return !(entry && typeof entry === "object" && !Array.isArray(entry) && entry.name === PLUGIN_NAME);
-  });
-  plugins.push(mstarEntry(scope));
-  next.plugins = plugins;
-  return next;
-}
-function findEntry(raw) {
-  const plugins = Array.isArray(raw.plugins) ? raw.plugins : [];
-  return plugins.find((entry) => {
-    return entry && typeof entry === "object" && !Array.isArray(entry) && entry.name === PLUGIN_NAME;
-  });
-}
-function validateEntryShape(entry, scope, marketplacePath) {
-  const errors2 = [];
-  if (!entry) {
-    errors2.push(`Missing ${PLUGIN_NAME} entry in ${marketplacePath}.`);
-    return errors2;
-  }
-  const source = ensureObject(entry.source);
-  const expectedSourcePath = mstarEntry(scope).source.path;
-  if (source.source !== "local")
-    errors2.push("Codex marketplace entry source.source must be `local`.");
-  if (source.path !== expectedSourcePath) {
-    errors2.push(`Codex marketplace entry source.path must be ${expectedSourcePath}.`);
-  }
-  const policy = ensureObject(entry.policy);
-  if (policy.installation !== "AVAILABLE")
-    errors2.push("Codex marketplace entry policy.installation must be AVAILABLE.");
-  if (policy.authentication !== "ON_INSTALL")
-    errors2.push("Codex marketplace entry policy.authentication must be ON_INSTALL.");
-  if (entry.category !== PLUGIN_CATEGORY)
-    errors2.push(`Codex marketplace entry category must be ${PLUGIN_CATEGORY}.`);
-  return errors2;
-}
-function marketplacePath(scope) {
-  if (scope === "global")
-    return globalMarketplacePath();
-  return projectMarketplacePath();
-}
 function ensureAgentLinks(scope, dryRun) {
   const notes = [];
   for (const agentName of CODEX_AGENT_NAMES) {
@@ -11301,59 +11265,78 @@ function validateIterationSkillLinks() {
   return errors2;
 }
 function runInit(scope, dryRun) {
-  const pathToMarketplace = marketplacePath(scope);
-  const current = readJson2(pathToMarketplace);
-  const next = upsertEntry(current, scope);
-  const existingEntry = findEntry(current);
-  const notes = ensureLocalHarnessRepo(dryRun);
+  const notes = [];
+  notes.push(...ensureLocalHarnessRepo(dryRun));
+  const marketplaceArgs = ["plugin", "marketplace", "add", REPO_URL, "--ref", "main"];
+  if (dryRun) {
+    notes.push(`Would run: ${CODEX_BIN} ${marketplaceArgs.join(" ")}`);
+  } else {
+    if (!codexAvailable()) {
+      throw new Error(`${CODEX_BIN} CLI not found on PATH. ${CODEX_INSTALL_HINT}`);
+    }
+    try {
+      const already = configuredMarketplaceNames(false).includes(MARKETPLACE_NAME);
+      if (already) {
+        notes.push(`Marketplace ${MARKETPLACE_NAME} already configured.`);
+      } else {
+        runCodex(marketplaceArgs, false, CODEX_MARKETPLACE_TIMEOUT_MS);
+        notes.push(`Added marketplace ${MARKETPLACE_NAME} from ${REPO_URL} (ref main).`);
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(`Failed to add marketplace via ${CODEX_BIN}: ${message}`);
+    }
+    notes.push(`Next: codex plugin add ${PLUGIN_NAME}@${MARKETPLACE_NAME}`);
+  }
   if (scope === "project") {
     const projectRoot = resolveProjectRoot2();
-    notes.push(ensureSymlink(HARNESS_REPO_PATH, path5.join(projectRoot, CODEX_PLUGIN_LINK), dryRun));
-    notes.push(...appendGitignore(projectRoot, [CODEX_PLUGIN_LINK, ".codex/agents/*.toml"], dryRun));
+    notes.push(...appendGitignore(projectRoot, [".codex/agents/*.toml"], dryRun));
     notes.push(...appendHarnessProjectGitignore(projectRoot, dryRun));
     notes.push(...ensureIterationSkillLinks(dryRun));
   } else {
     notes.push(GLOBAL_ITERATION_SKILLS_WARNING);
   }
   notes.push(...ensureAgentLinks(scope, dryRun));
-  if (!dryRun)
-    writeJson2(pathToMarketplace, next);
-  notes.push(existingEntry ? `Updated ${PLUGIN_NAME} local marketplace entry.` : `Added ${PLUGIN_NAME} local marketplace entry.`);
-  notes.push(`Source path: ${mstarEntry(scope).source.path}`);
-  notes.push(`Install after init: codex plugin add ${PLUGIN_NAME} --marketplace ${MARKETPLACE_NAME}`);
   return {
-    location: pathToMarketplace,
+    location: `${CODEX_BIN} marketplaces (config.toml)`,
     notes
   };
 }
 function runDoctor(scope) {
-  const pathToMarketplace = marketplacePath(scope);
   const errors2 = validateLocalHarnessRepo();
-  if (!fs3.existsSync(pathToMarketplace)) {
-    return { location: pathToMarketplace, errors: [...errors2, `Missing Codex marketplace: ${pathToMarketplace}`] };
+  const notes = [];
+  const legacyNote = legacyPersonalMarketplaceNote();
+  if (legacyNote)
+    notes.push(legacyNote);
+  if (!codexAvailable()) {
+    errors2.push(`${CODEX_BIN} CLI not found on PATH. ${CODEX_INSTALL_HINT}`);
+    return { location: `${CODEX_BIN} marketplaces (config.toml)`, errors: errors2, notes };
   }
-  const marketplace = readJson2(pathToMarketplace);
-  if (marketplace.name !== MARKETPLACE_NAME) {
-    errors2.push(`Codex personal marketplace name must be ${MARKETPLACE_NAME}.`);
+  try {
+    const marketplaces = configuredMarketplaceNames(false);
+    if (!marketplaces.includes(MARKETPLACE_NAME)) {
+      errors2.push(`Marketplace ${MARKETPLACE_NAME} not configured (run init, or: ${CODEX_BIN} plugin marketplace add ${REPO_URL} --ref main).`);
+    }
+    const installed = installedPluginIds(false);
+    const pluginId = `${PLUGIN_NAME}@${MARKETPLACE_NAME}`;
+    if (marketplaces.includes(MARKETPLACE_NAME) && !installed.includes(pluginId)) {
+      notes.push(`Plugin not installed yet: ${CODEX_BIN} plugin add ${pluginId}`);
+    }
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    errors2.push(`Could not query ${CODEX_BIN} plugin marketplace list: ${message}`);
   }
-  errors2.push(...validateEntryShape(findEntry(marketplace), scope, pathToMarketplace));
   if (scope === "project") {
     const projectRoot = resolveProjectRoot2();
-    errors2.push(...validateSymlink(HARNESS_REPO_PATH, path5.join(projectRoot, CODEX_PLUGIN_LINK)));
     const gitignorePath = path5.join(projectRoot, ".gitignore");
     const gitignore = fs3.existsSync(gitignorePath) ? fs3.readFileSync(gitignorePath, "utf8") : "";
-    const lines = gitignore.split(/\r?\n/);
-    if (!lines.includes(CODEX_PLUGIN_LINK))
-      errors2.push(`Missing .gitignore entry: ${CODEX_PLUGIN_LINK}`);
-    if (!lines.includes(".codex/agents/*.toml"))
-      errors2.push("Missing .gitignore entry: .codex/agents/*.toml");
     for (const entry of missingHarnessProcessGitignoreEntries(gitignore)) {
       errors2.push(`Missing .gitignore entry: ${entry}`);
     }
     errors2.push(...validateIterationSkillLinks());
   }
   errors2.push(...validateAgentLinks(scope));
-  return { location: pathToMarketplace, errors: errors2 };
+  return { location: `${CODEX_BIN} marketplaces (config.toml)`, errors: errors2, notes };
 }
 var codexAdapter = {
   target: "codex",
@@ -11921,7 +11904,7 @@ var MARKETPLACE_ID = "mstar-local";
 var MARKETPLACE_NAME2 = "mstar-local";
 var MARKETPLACE_DESCRIPTION = "Morning Star harness marketplace (GitHub source).";
 var PLUGIN_DESCRIPTION = "Multi-agent code harness framework with unified skills for OpenCode, Cursor, Codex, Kimi Code, and ZCode.";
-var PLUGIN_CATEGORY2 = "Productivity";
+var PLUGIN_CATEGORY = "Productivity";
 var GITHUB_REPO = "btspoony/mstar-harness";
 var GITHUB_REF = "main";
 var ZCODE_PLUGIN_MARKER = ".zcode-plugin/plugin.json";
@@ -11941,7 +11924,7 @@ function marketplacePluginEntry() {
     source: { ...GITHUB_SOURCE },
     description: PLUGIN_DESCRIPTION,
     version: readHarnessVersion(),
-    category: PLUGIN_CATEGORY2
+    category: PLUGIN_CATEGORY
   };
 }
 function knownMarketplaceEntry(existing) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mstar-harness/cli",
-  "version": "3.6.0-alpha.2",
+  "version": "3.6.0-alpha.3",
   "description": "Morning Star harness CLI — installer bootstrap + mstar workflow verbs (path/status/lease/sdd/iteration/dispatch/worktree/lint/design-md/audit/compound/host/skill).",
   "license": "MIT",
   "repository": {