@amsterdamdatalabs/enact-extensions 0.1.54 → 0.1.55

package/scripts/lib/run-repo-doctor.mjs

@@ -14,16 +14,17 @@
  *                                          match; every merged JSON entry /
  *                                          TOML block present; list drifted
  *                                          or missing)
- *   - per-host status: claude (marketplace + settings present; trust +
- *     "start a new session" note), codex (files present; read-only
+ *   - per-host status: direct native files recorded in the lock (never a
+ *     plugin root or marketplace), codex (files present; read-only
  *     ~/.codex/config.toml projects."<repo>".trust_level; hooks-review-
  *     pending note), cursor (files present; MCP approval note), kimi
- *     (.kimi-code/mcp.json present; global hooks are enact-vps-owned, so we
- *     only report whether ~/.kimi-code/config.toml has the
+ *     (native files present; global hooks are enact-vps-owned, so we only
+ *     report whether ~/.kimi-code/config.toml has the
  *     `# BEGIN ENACT KIMI HOOKS` block; PLUS a read-only Kimi Code
  *     workspace-trust check — Kimi only loads project MCP servers, including
  *     `.kimi-code/mcp.json`, once the workspace is trusted), opencode
- *     (plugin file present and generated from the current bundle)
+ *     (native agents/skills and root `opencode.json` MCP entries when the
+ *     selected bundle declares them; hooks are global enact-vps-owned)
  *   - required global binaries on PATH (enact-hook, lean-ctx,
  *     code-review-graph/crg, azure-devops-mcp) with versions
  *   - root `enact-config.toml` marker: present, parses as TOML, has our
@@ -332,14 +333,9 @@ function checkLockIntegrity(repo, name, lock) {
     const found = existsSync(path) ? findBlock(readFileSync(path, "utf8"), name) : null;
     if (!found || sha256(found.block) !== record.sha256) tomlIssues.push(rel);
   }
-  // Managed symlinks (today: the Claude plugin's skills -> ../../.agents/skills
-  // link). These carry no content hash, so `lock.files`-style verification does
-  // not reach them: a broken or retargeted link is invisible to every other
-  // check here. It is not a cosmetic gap -- a dangling link makes Claude Code
-  // report `Skills (0)` while the repo still looks installed, which is exactly
-  // the "presence is not armedness" failure AGENTS.md exists to catch. Verify
-  // by the link's own mechanism: it must BE a symlink, point where the lock
-  // says, and actually resolve.
+  // Managed symlinks carry no content hash, so `lock.files`-style verification
+  // does not reach them. Verify by the link's own mechanism: it must BE a
+  // symlink, point where the lock says, and actually resolve.
   //
   // lstatSync, never existsSync: existsSync follows the link and returns false
   // for a dangling one, so it cannot tell "absent" from "present but broken".
@@ -374,48 +370,76 @@ function checkLockIntegrity(repo, name, lock) {
 // ---------------------------------------------------------------------------
 // per-host status
 // ---------------------------------------------------------------------------
-function checkHosts(repo, lock, home, contentOutdated) {
+const NATIVE_HOST_PATHS = {
+  claude: { prefixes: [".claude/"], exact: [".mcp.json"] },
+  codex: { prefixes: [".codex/", ".agents/skills/"], exact: [] },
+  cursor: { prefixes: [".cursor/"], exact: [] },
+  kimi: { prefixes: [".kimi-code/"], exact: [] },
+  opencode: { prefixes: [".opencode/"], exact: ["opencode.json"] },
+};
+
+function isNativeHostPath(host, rel) {
+  const { prefixes, exact } = NATIVE_HOST_PATHS[host];
+  return exact.includes(rel) || prefixes.some((prefix) => rel.startsWith(prefix));
+}
+
+// The lock is the authoritative ownership record. A host is present only
+// when it owns at least one direct native path and every such path still
+// exists. This deliberately does not infer installation from a plugin root,
+// marketplace, or a host config file that another extension/user may own.
+function checkNativeHostPresence(repo, lock, host) {
+  const rels = [
+    ...Object.keys(lock.files ?? {}),
+    ...Object.keys(lock.merged ?? {}),
+    ...Object.keys(lock.toml ?? {}),
+    ...Object.keys(lock.symlinks ?? {}),
+  ].filter((rel) => isNativeHostPath(host, rel));
+  const nativePaths = [...new Set(rels)].sort();
+  return {
+    nativePaths,
+    present: nativePaths.length > 0 && nativePaths.every((rel) => existsSync(abs(repo, rel))),
+  };
+}
+
+function checkHosts(repo, lock, home) {
   const hosts = {};
   for (const host of REPO_HOSTS) {
     const targeted = lock.hosts.includes(host);
+    const native = targeted ? checkNativeHostPresence(repo, lock, host) : { nativePaths: [], present: true };
     if (host === "claude") {
-      const present =
-        !targeted ||
-        (existsSync(abs(repo, ".claude-plugin/marketplace.json")) && existsSync(abs(repo, ".claude/settings.json")));
       hosts.claude = {
         targeted,
-        present,
+        present: native.present,
+        nativePaths: native.nativePaths,
         note: targeted
-          ? "loads only after you TRUST this folder in Claude Code -- the marketplace registers on first launch; if hooks/skills are missing in that FIRST session, start a NEW session in this folder"
+          ? "direct native Claude files are installed; Claude Code loads them after you TRUST this folder"
           : "not targeted by this install",
       };
     } else if (host === "codex") {
-      const present =
-        !targeted || existsSync(abs(repo, ".codex/hooks.json")) || existsSync(abs(repo, ".codex/config.toml"));
       hosts.codex = {
         targeted,
-        present,
+        present: native.present,
+        nativePaths: native.nativePaths,
         trust: checkCodexTrust(repo, home),
         note: targeted
           ? "config/hooks load only after you trust this project; hooks review (/hooks) is pending until you review them in Codex"
           : "not targeted by this install",
       };
     } else if (host === "cursor") {
-      const present =
-        !targeted || existsSync(abs(repo, ".cursor/hooks.json")) || existsSync(abs(repo, ".cursor/mcp.json"));
       hosts.cursor = {
         targeted,
-        present,
+        present: native.present,
+        nativePaths: native.nativePaths,
         note: targeted
           ? "Cursor prompts for MCP server approval on first use -- approve code-review-graph/lean-ctx in Cursor's MCP settings"
           : "not targeted by this install",
       };
     } else if (host === "kimi") {
-      const present = !targeted || existsSync(abs(repo, ".kimi-code/mcp.json"));
       const globalHooks = checkKimiGlobalHooks(home);
       hosts.kimi = {
         targeted,
-        present,
+        present: native.present,
+        nativePaths: native.nativePaths,
         globalHooksInstalled: globalHooks.hooksBlockPresent,
         globalHooksNote: !globalHooks.configFound
           ? `${globalHooks.configPath} not found`
@@ -425,15 +449,12 @@ function checkHosts(repo, lock, home, contentOutdated) {
         workspaceTrust: checkKimiWorkspaceTrust(repo),
       };
     } else if (host === "opencode") {
-      const rel = `.opencode/plugins/${lock.plugin}.ts`;
-      const present = !targeted || existsSync(abs(repo, rel));
-      const generatedFromCurrentBundle = targeted && present ? !contentOutdated.includes(rel) : null;
       hosts.opencode = {
         targeted,
-        present,
-        generatedFromCurrentBundle,
+        present: native.present,
+        nativePaths: native.nativePaths,
         note: targeted
-          ? "one generated plugin file; re-run install after a bundle update to regenerate it"
+          ? "direct native OpenCode files are installed; repo-local hooks are global enact-vps-owned"
           : "not targeted by this install",
       };
     }
@@ -567,7 +588,7 @@ export function runRepoDoctor(pluginRoot, options = {}) {
     );
   }
 
-  const hosts = checkHosts(repo, lock, home, contentOutdated);
+  const hosts = checkHosts(repo, lock, home);
 
   const binaries = {};
   for (const bin of REQUIRED_BINARIES) binaries[bin] = checkBinary(bin);