@heart-of-gold/toolkit 0.1.41 → 0.1.43

package/README.md

@@ -36,6 +36,8 @@ bunx @heart-of-gold/toolkit install --to pi
 **Important:** choose one Pi install path or the other.
 Do **not** use both the Pi package install and `install --to pi` at the same time, or Pi will report duplicate skill collisions on reload.
 
+The CLI now refuses `install --to pi` when your Pi settings already reference `@heart-of-gold/toolkit` as a package. If you intentionally want both paths for debugging, rerun with `--force`.
+
 Pi also discovers skills from the shared `~/.agents/skills/` location, so installs done with the OpenCode target are usable from Pi too.
 
 When installed as a Pi package, Heart of Gold exposes Pi-native extension commands for the flagship workflows:
@@ -168,7 +170,7 @@ The toolkit ships as an npm package with a CLI for installing skills into any su
 
 - `--to pi` installs to Pi's native `~/.pi/agent/skills/`
 - `--to opencode` installs to shared `~/.agents/skills/`, which Pi also discovers
-- `pi install npm:@heart-of-gold/toolkit` installs the package directly in Pi, including the shared skills plus pi-native extensions
+- `pi install npm:@heart-of-gold/toolkit` adds the package to Pi settings, then Pi installs and loads it as a package with shared skills plus pi-native extensions
 
 ```bash
 # Install all plugins into Codex

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heart-of-gold/toolkit",
-  "version": "0.1.41",
+  "version": "0.1.43",
   "type": "module",
   "description": "Cross-platform installer for Heart of Gold skills — works with Codex, OpenCode, Pi, Claude Code, and more",
   "bin": {

package/src/commands/install.ts

@@ -1,9 +1,8 @@
 import { defineCommand } from "citty";
 import { loadAllPlugins, loadPlugin } from "../parsers/claude";
 import { targets } from "../targets/index";
-import { resolve, join } from "path";
-import { existsSync } from "fs";
-import { execSync } from "child_process";
+import { resolve } from "path";
+import { findHeartOfGoldPiPackageInstalls } from "../utils/pi-package-detection.js";
 
 export const installCommand = defineCommand({
   meta: {
@@ -26,21 +25,41 @@ export const installCommand = defineCommand({
       description: "Override output root directory",
       required: false,
     },
+    force: {
+      type: "boolean",
+      description: "Proceed even if Pi already loads @heart-of-gold/toolkit as a package",
+      required: false,
+      default: false,
+    },
   },
   async run({ args }) {
     const targetName = args.to;
 
     if (targetName === "pi") {
-      try {
-        const npmRoot = execSync("npm root -g", { encoding: "utf8" }).trim();
-        const packagePath = join(npmRoot, "@heart-of-gold", "toolkit", "package.json");
-        if (existsSync(packagePath)) {
-          console.warn("Warning: @heart-of-gold/toolkit is already installed as a Pi package.");
-          console.warn("Using 'install --to pi' as well will create duplicate Pi skill collisions on reload.");
-          console.warn("Prefer one Pi install path: either 'pi install npm:@heart-of-gold/toolkit' or 'bunx @heart-of-gold/toolkit install --to pi'.\n");
+      const matches = findHeartOfGoldPiPackageInstalls(process.cwd());
+      if (matches.length > 0) {
+        const locations = matches
+          .map(({ settingsPath, source }) => `  - ${settingsPath} → ${source}`)
+          .join("\n");
+
+        const message = [
+          "Refusing to install duplicate Pi skills.",
+          "Pi is already configured to load @heart-of-gold/toolkit as a package from:",
+          locations,
+          "",
+          "Choose one Pi install path:",
+          "  1. keep the Pi package:    pi install npm:@heart-of-gold/toolkit",
+          "  2. keep native skill copy: bunx @heart-of-gold/toolkit install --to pi",
+          "",
+          "Remove one side before continuing, or rerun with --force if you really want both.",
+        ].join("\n");
+
+        if (!args.force) {
+          console.error(message);
+          process.exit(1);
         }
-      } catch {
-        // ignore detection failures and proceed normally
+
+        console.warn(`${message}\n`);
       }
     }
     const target = targets[targetName];

package/src/index.ts

@@ -8,7 +8,7 @@ import { shareServerCommand } from "./commands/share-server";
 const main = defineCommand({
   meta: {
     name: "heart-of-gold",
-    version: "0.1.32",
+    version: "0.1.43",
     description:
       "Cross-platform installer for Heart of Gold skills — Codex, OpenCode, Pi, Claude Code, and more",
   },

package/src/utils/pi-package-detection.js

@@ -0,0 +1,81 @@
+import { existsSync, readFileSync } from "node:fs";
+import { dirname, join, parse, resolve } from "node:path";
+import { homedir } from "node:os";
+
+const HEART_OF_GOLD_PACKAGE_NAME = "@heart-of-gold/toolkit";
+const HEART_OF_GOLD_REPO_HINT = /(^|[/:])heart-of-gold-toolkit(?:$|[@/.#?])/i;
+
+function readJson(path) {
+  try {
+    return JSON.parse(readFileSync(path, "utf8"));
+  } catch {
+    return null;
+  }
+}
+
+function isLocalSource(source) {
+  return source.startsWith(".") || source.startsWith("/");
+}
+
+function localSourceIsHeartOfGold(source, settingsDir) {
+  const resolved = resolve(settingsDir, source);
+  const packageJsonPath = existsSync(resolved) && resolved.endsWith("package.json")
+    ? resolved
+    : join(resolved, "package.json");
+
+  if (!existsSync(packageJsonPath)) return false;
+
+  const manifest = readJson(packageJsonPath);
+  return manifest?.name === HEART_OF_GOLD_PACKAGE_NAME;
+}
+
+function sourceMatchesHeartOfGold(source, settingsDir) {
+  if (typeof source !== "string" || source.length === 0) return false;
+
+  if (source === HEART_OF_GOLD_PACKAGE_NAME) return true;
+  if (source.startsWith(`npm:${HEART_OF_GOLD_PACKAGE_NAME}`)) return true;
+  if (isLocalSource(source) && localSourceIsHeartOfGold(source, settingsDir)) return true;
+  if ((source.startsWith("git:") || source.startsWith("http://") || source.startsWith("https://") || source.startsWith("ssh://")) && HEART_OF_GOLD_REPO_HINT.test(source)) {
+    return true;
+  }
+
+  return false;
+}
+
+function collectMatchingPackageSources(settingsPath) {
+  if (!existsSync(settingsPath)) return [];
+
+  const settings = readJson(settingsPath);
+  const packages = Array.isArray(settings?.packages) ? settings.packages : [];
+  const settingsDir = dirname(settingsPath);
+  const matches = [];
+
+  for (const entry of packages) {
+    const source = typeof entry === "string" ? entry : entry?.source;
+    if (sourceMatchesHeartOfGold(source, settingsDir)) {
+      matches.push({ settingsPath, source });
+    }
+  }
+
+  return matches;
+}
+
+function findNearestProjectSettings(startDir = process.cwd()) {
+  let current = resolve(startDir);
+  const root = parse(current).root;
+
+  while (true) {
+    const candidate = join(current, ".pi", "settings.json");
+    if (existsSync(candidate)) return candidate;
+    if (current === root) return null;
+    current = dirname(current);
+  }
+}
+
+export function findHeartOfGoldPiPackageInstalls(startDir = process.cwd()) {
+  const globalSettings = join(homedir(), ".pi", "agent", "settings.json");
+  const projectSettings = findNearestProjectSettings(startDir);
+  const settingsPaths = [globalSettings, projectSettings].filter(Boolean);
+
+  return settingsPaths.flatMap((settingsPath) => collectMatchingPackageSources(settingsPath));
+}