harnesstrim 0.0.3 → 0.0.4

package/dist/cli.mjs

@@ -22681,40 +22681,45 @@ function checkSkills(dir, findings) {
   }
 }
 function checkOpenCode(dir, findings) {
-  const raw = readIfExists(path.join(dir, "opencode.json"));
-  if (raw === null) {
+  const hasOpencodeProject = readIfExists(path.join(dir, "opencode.json")) !== null || fs.existsSync(path.join(dir, ".opencode"));
+  if (!hasOpencodeProject) {
     findings.push({
       severity: "info",
-      title: "No opencode.json found",
-      detail: "No OpenCode project config in this directory."
+      title: "No OpenCode project config found",
+      detail: "No opencode.json or .opencode/ in this directory."
     });
     return;
   }
-  let config2;
-  try {
-    config2 = JSON.parse(raw);
-  } catch {
-    findings.push({
-      severity: "warn",
-      title: "opencode.json is not valid JSON",
-      detail: "Could not parse opencode.json to check plugin wiring."
-    });
-    return;
+  const wrapper = path.join(dir, ".opencode", "plugin", "harnesstrim.ts");
+  const wrapperPresent = fs.existsSync(wrapper);
+  const raw = readIfExists(path.join(dir, "opencode.json"));
+  let staleEntry = false;
+  if (raw !== null) {
+    try {
+      staleEntry = extractPluginNames(JSON.parse(raw)).some((p) => p.includes("@harnesstrim/adapter-opencode"));
+    } catch {
+    }
   }
-  const plugins = extractPluginNames(config2);
-  const installed = plugins.some((p) => p.includes("@harnesstrim/adapter-opencode"));
-  if (installed) {
+  if (wrapperPresent) {
     findings.push({
       severity: "ok",
-      title: "HarnessTrim OpenCode adapter is wired in",
-      detail: "@harnesstrim/adapter-opencode is present in opencode.json plugins."
+      title: "HarnessTrim OpenCode adapter is installed",
+      detail: ".opencode/plugin/harnesstrim.ts loads the adapter (OpenCode auto-loads it)."
     });
   } else {
     findings.push({
       severity: "warn",
-      title: "HarnessTrim adapter not installed in opencode.json",
+      title: "HarnessTrim adapter not installed for OpenCode",
       detail: "The OpenCode adapter would slim tool output automatically.",
-      suggestion: "Run `harnesstrim install opencode` to wire it in."
+      suggestion: "Run `harnesstrim install opencode --apply` to install the local plugin."
+    });
+  }
+  if (staleEntry && !wrapperPresent) {
+    findings.push({
+      severity: "warn",
+      title: "Stale adapter entry in opencode.json",
+      detail: "opencode.json lists @harnesstrim/adapter-opencode, but OpenCode's plugin field is a string array and ignores option tuples \u2014 this entry never loaded.",
+      suggestion: "Run `harnesstrim install opencode --apply` to migrate to the local plugin wrapper."
     });
   }
 }
@@ -22741,70 +22746,151 @@ function inspect(dir) {
 init_src();
 import fs2 from "node:fs";
 import path2 from "node:path";
+import { spawnSync } from "node:child_process";
 var OPENCODE_PLUGIN_NAME = "@harnesstrim/adapter-opencode";
-function pluginIndex(plugin) {
-  return plugin.findIndex(
-    (e) => typeof e === "string" && e.includes(OPENCODE_PLUGIN_NAME) || Array.isArray(e) && typeof e[0] === "string" && e[0].includes(OPENCODE_PLUGIN_NAME)
-  );
+var OPENCODE_ADAPTER_VERSION = "^0.0.2";
+var DEFAULT_OPENCODE_ADAPTER_CONFIG = {
+  mode: "active",
+  telemetry: true,
+  telemetryPath: ".harnesstrim/metrics.jsonl"
+};
+var WRAPPER_REL = path2.join(".opencode", "plugin", "harnesstrim.ts");
+var PKG_REL = path2.join(".opencode", "package.json");
+var OPENCODE_JSON = "opencode.json";
+function buildOpencodeWrapper(adapterConfig) {
+  const opts = JSON.stringify(adapterConfig, null, 2).replace(/\n/g, "\n  ");
+  return `// Generated by \`harnesstrim install opencode\`. Do not reference this plugin from
+// opencode.json \u2014 OpenCode's \`plugin\` field is a string array and cannot pass options,
+// so HarnessTrim options live here and OpenCode auto-loads this file from .opencode/plugin/.
+// The dependency is declared in ../package.json. Edit the options below freely.
+import { HarnessTrim } from "${OPENCODE_PLUGIN_NAME}";
+
+export const HarnessTrimPlugin = async (input) =>
+  HarnessTrim(input, ${opts});
+`;
 }
-function legacyPluginIndex(plugin) {
-  return plugin.findIndex(
-    (entry) => typeof entry === "object" && entry !== null && typeof entry.name === "string" && entry.name.includes(OPENCODE_PLUGIN_NAME)
-  );
+function buildOpencodePackageJson(existing) {
+  let base = {};
+  if (existing) {
+    try {
+      const parsed = JSON.parse(existing);
+      if (parsed && typeof parsed === "object") base = parsed;
+    } catch {
+    }
+  }
+  const deps = { ...base.dependencies };
+  deps[OPENCODE_PLUGIN_NAME] = OPENCODE_ADAPTER_VERSION;
+  return JSON.stringify({ ...base, dependencies: deps }, null, 2) + "\n";
+}
+function opencodeJsonReferencesAdapter(config2) {
+  const plugin = config2.plugin;
+  if (!Array.isArray(plugin)) return false;
+  return plugin.some((e) => {
+    if (typeof e === "string") return e.includes(OPENCODE_PLUGIN_NAME);
+    if (Array.isArray(e)) return typeof e[0] === "string" && e[0].includes(OPENCODE_PLUGIN_NAME);
+    if (e && typeof e === "object") {
+      const name = e.name;
+      return typeof name === "string" && name.includes(OPENCODE_PLUGIN_NAME);
+    }
+    return false;
+  });
 }
-function planOpencodeInstall(config2, adapterConfig) {
-  const base = typeof config2 === "object" && config2 !== null ? { ...config2 } : {};
-  const plugin = Array.isArray(base.plugin) ? [...base.plugin] : [];
-  const desired = adapterConfig ? [OPENCODE_PLUGIN_NAME, adapterConfig] : OPENCODE_PLUGIN_NAME;
-  const idx = pluginIndex(plugin);
-  const legacyIdx = idx === -1 ? legacyPluginIndex(plugin) : -1;
-  if (legacyIdx !== -1) {
-    const legacy = plugin[legacyIdx];
-    const options = legacy.options;
-    plugin[legacyIdx] = adapterConfig ? desired : typeof options === "object" && options !== null && !Array.isArray(options) ? [OPENCODE_PLUGIN_NAME, options] : OPENCODE_PLUGIN_NAME;
-    return { nextConfig: { ...base, plugin }, alreadyInstalled: true, changed: true };
-  }
-  if (idx === -1) {
-    plugin.push(desired);
-    return { nextConfig: { ...base, plugin }, alreadyInstalled: false, changed: true };
-  }
-  if (adapterConfig && JSON.stringify(plugin[idx]) !== JSON.stringify(desired)) {
-    plugin[idx] = desired;
-    return { nextConfig: { ...base, plugin }, alreadyInstalled: true, changed: true };
-  }
-  return { nextConfig: { ...base, plugin }, alreadyInstalled: true, changed: false };
-}
-function runInstallOpencode(dir, apply, presetName) {
+function cleanOpencodeJson(existing) {
+  let config2;
+  try {
+    config2 = JSON.parse(existing);
+  } catch {
+    throw new Error(`${OPENCODE_JSON} exists but is not valid JSON`);
+  }
+  if (!opencodeJsonReferencesAdapter(config2)) return null;
+  const plugin = config2.plugin.filter((e) => {
+    if (typeof e === "string") return !e.includes(OPENCODE_PLUGIN_NAME);
+    if (Array.isArray(e)) return !(typeof e[0] === "string" && e[0].includes(OPENCODE_PLUGIN_NAME));
+    if (e && typeof e === "object") {
+      const name = e.name;
+      return !(typeof name === "string" && name.includes(OPENCODE_PLUGIN_NAME));
+    }
+    return true;
+  });
+  const next = { ...config2 };
+  if (plugin.length === 0) delete next.plugin;
+  else next.plugin = plugin;
+  return { content: JSON.stringify(next, null, 2) + "\n" };
+}
+function planOpencodeInstall(input) {
+  const adapterConfig = input.adapterConfig ?? DEFAULT_OPENCODE_ADAPTER_CONFIG;
+  const wrapperContent = buildOpencodeWrapper(adapterConfig);
+  const packageJsonContent = buildOpencodePackageJson(input.existingPackageJson);
+  const opencodeClean = input.existingOpencodeJson ? cleanOpencodeJson(input.existingOpencodeJson) : null;
+  const opencodeJsonContent = opencodeClean?.content ?? null;
+  const wrapperChanged = input.existingWrapper !== wrapperContent;
+  const pkgChanged = input.existingPackageJson !== packageJsonContent;
+  const opencodeChanged = opencodeJsonContent !== null;
+  const alreadyInstalled = input.existingWrapper !== null;
+  const changed = wrapperChanged || pkgChanged || opencodeChanged;
+  return { wrapperContent, packageJsonContent, opencodeJsonContent, alreadyInstalled, changed };
+}
+function runInstallOpencode(dir, apply, presetName, installDeps = true) {
   let preset;
-  let adapterConfig;
+  let adapterConfig = { ...DEFAULT_OPENCODE_ADAPTER_CONFIG };
   if (presetName) {
     preset = getPreset(presetName);
     if (!preset) throw new Error(`Unknown preset: ${presetName}`);
-    adapterConfig = { ...preset.adapter };
+    adapterConfig = { ...adapterConfig, ...preset.adapter };
   }
-  const configPath = path2.join(dir, "opencode.json");
-  let raw = null;
-  try {
-    raw = fs2.readFileSync(configPath, "utf8");
-  } catch {
-    raw = null;
-  }
-  const existed = raw !== null;
-  let config2 = {};
-  if (raw !== null) {
+  const wrapperPath = path2.join(dir, WRAPPER_REL);
+  const packageJsonPath = path2.join(dir, PKG_REL);
+  const opencodeJsonPath = path2.join(dir, OPENCODE_JSON);
+  const readOrNull = (p) => {
     try {
-      config2 = JSON.parse(raw);
+      return fs2.readFileSync(p, "utf8");
     } catch {
-      throw new Error(`${configPath} exists but is not valid JSON`);
+      return null;
     }
-  }
-  const plan = planOpencodeInstall(config2, adapterConfig);
+  };
+  const existingWrapper = readOrNull(wrapperPath);
+  const existingPackageJson = readOrNull(packageJsonPath);
+  const existingOpencodeJson = readOrNull(opencodeJsonPath);
+  const plan = planOpencodeInstall({
+    existingWrapper,
+    existingPackageJson,
+    existingOpencodeJson,
+    adapterConfig
+  });
   let applied = false;
+  let depsInstalled = null;
+  let depsMessage;
   if (apply && plan.changed) {
-    fs2.writeFileSync(configPath, JSON.stringify(plan.nextConfig, null, 2) + "\n");
+    fs2.mkdirSync(path2.dirname(wrapperPath), { recursive: true });
+    fs2.writeFileSync(wrapperPath, plan.wrapperContent);
+    fs2.writeFileSync(packageJsonPath, plan.packageJsonContent);
+    if (plan.opencodeJsonContent !== null) fs2.writeFileSync(opencodeJsonPath, plan.opencodeJsonContent);
     applied = true;
+    if (installDeps) {
+      const npm = process.platform === "win32" ? "npm.cmd" : "npm";
+      const res = spawnSync(npm, ["install", "--silent"], {
+        cwd: path2.dirname(packageJsonPath),
+        encoding: "utf8"
+      });
+      if (res.error || res.status !== 0) {
+        depsInstalled = false;
+        depsMessage = `Could not auto-install the adapter; run \`npm install\` in ${path2.dirname(packageJsonPath)}.`;
+      } else {
+        depsInstalled = true;
+      }
+    }
   }
-  return { configPath, existed, applied, preset, ...plan };
+  return {
+    ...plan,
+    wrapperPath,
+    packageJsonPath,
+    opencodeJsonPath,
+    existed: existingWrapper !== null,
+    applied,
+    depsInstalled,
+    depsMessage,
+    preset
+  };
 }
 
 // src/install-codex.ts
@@ -23256,7 +23342,7 @@ function runInstallPi(installDir, apply) {
 // src/install-hermes.ts
 import fs8 from "node:fs";
 import path12 from "node:path";
-import { spawnSync } from "node:child_process";
+import { spawnSync as spawnSync2 } from "node:child_process";
 
 // ../adapter-hermes/src/index.ts
 import path11 from "node:path";
@@ -23323,7 +23409,7 @@ function runInstallHermes(installDir, apply) {
     fs8.writeFileSync(path12.join(pluginDest, ".installed"), markerFileContent2());
     copiedFiles.push(".installed");
     applied = true;
-    const enable = spawnSync("hermes", ["plugins", "enable", HERMES_PLUGIN_NAME], {
+    const enable = spawnSync2("hermes", ["plugins", "enable", HERMES_PLUGIN_NAME], {
       encoding: "utf8"
     });
     if (enable.error) {
@@ -23389,19 +23475,38 @@ function renderDoctor(report) {
 }
 function renderInstall(result, apply) {
   const lines = [];
-  if (result.alreadyInstalled) {
-    lines.push(`Already installed: ${result.configPath} already wires in the HarnessTrim adapter.`);
+  const wrapper = result.wrapperPath;
+  const pkg = result.packageJsonPath;
+  if (!result.changed) {
+    lines.push(`Already installed and up to date: ${wrapper} loads the HarnessTrim adapter.`);
+    if (result.preset) {
+      lines.push("");
+      lines.push(renderPresetAdvisory(result.preset));
+    }
     return lines.join("\n");
   }
   if (apply) {
-    lines.push(`Wrote ${result.configPath}:`);
-    lines.push(JSON.stringify(result.nextConfig, null, 2));
-  } else {
-    lines.push(`Dry run \u2014 no files changed. This is what \`--apply\` would write to ${result.configPath}:`);
+    lines.push(`Installed the OpenCode adapter as a local plugin:`);
+    lines.push(`  \u2022 wrote ${wrapper} (auto-loaded by OpenCode from .opencode/plugin/)`);
+    lines.push(`  \u2022 wrote ${pkg} (declares @harnesstrim/adapter-opencode)`);
+    if (result.opencodeJsonContent !== null) {
+      lines.push(`  \u2022 cleaned the adapter entry out of ${result.opencodeJsonPath} (options live in the wrapper now)`);
+    }
+    if (result.depsInstalled === true) lines.push(`  \u2022 installed the .opencode dependency`);
+    else if (result.depsInstalled === false) lines.push(`  ! ${result.depsMessage}`);
     lines.push("");
-    lines.push(JSON.stringify(result.nextConfig, null, 2));
+    lines.push("Reduction is active; telemetry writes to .harnesstrim/metrics.jsonl.");
+    lines.push("Reload OpenCode so it loads the plugin, then check `harnesstrim metrics`.");
+  } else {
+    lines.push(`Dry run \u2014 no files changed. \`--apply\` would:`);
+    lines.push(`  \u2022 write ${wrapper} (local plugin wrapper with the adapter options)`);
+    lines.push(`  \u2022 write ${pkg} (declare @harnesstrim/adapter-opencode) and install it`);
+    if (result.opencodeJsonContent !== null) {
+      lines.push(`  \u2022 remove the stale adapter entry from ${result.opencodeJsonPath}`);
+    }
     lines.push("");
-    lines.push("Re-run with `--apply` to write it.");
+    lines.push("OpenCode's `plugin` config can't pass options, so the adapter is installed as a");
+    lines.push("local plugin file instead. Re-run with `--apply` to write it.");
   }
   if (result.preset) {
     lines.push("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "harnesstrim",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "HarnessTrim CLI: doctor (diagnose token waste), install adapters, run benchmarks.",
   "license": "MIT",
   "type": "module",