@yhong91/cpac 0.1.46 → 0.1.47

package/dist/agents.js

@@ -1,7 +1,7 @@
 import { spawn, spawnSync } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, join } from "node:path";
+import { basename, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { MAX_SPAWN_MODELS, loadCatalogSlugs, pickSpawnModels, saveCodexSetup, saveSpawnModels, } from "./config.js";
 import { MANAGED_MARKER, inject, restore } from "./targets/codex.js";
@@ -450,6 +450,19 @@ export async function runUninstall(config, options) {
     }
     return 0;
 }
+function runningNpmPrefix() {
+    const dist = dirname(fileURLToPath(import.meta.url));
+    const pkg = dirname(dist);
+    const scoped = dirname(pkg);
+    const modules = dirname(scoped);
+    if (basename(pkg) !== "cpac" ||
+        basename(scoped) !== "@yhong91" ||
+        basename(modules) !== "node_modules") {
+        return undefined;
+    }
+    const parent = dirname(modules);
+    return basename(parent) === "lib" ? dirname(parent) : parent;
+}
 export async function runUpgrade(config, checkOnly) {
     console.log(`Current version: ${CPAC_VERSION}`);
     let latest;
@@ -485,7 +498,11 @@ export async function runUpgrade(config, checkOnly) {
     }
     else {
         console.log(`Installing @yhong91/cpac@${latest}`);
-        const result = spawnSync("npm", ["install", "-g", `@yhong91/cpac@${latest}`], { stdio: "inherit" });
+        const prefix = runningNpmPrefix();
+        const args = ["install", "-g", `@yhong91/cpac@${latest}`];
+        if (prefix)
+            args.splice(2, 0, `--prefix=${prefix}`);
+        const result = spawnSync("npm", args, { stdio: "inherit" });
         if (result.status !== 0) {
             console.error("npm install failed");
             return result.status ?? 1;
@@ -498,7 +515,7 @@ export async function runUpgrade(config, checkOnly) {
     }
     console.log(`Syncing ${installed.join(", ")}`);
     if (!upToDate) {
-        const cli = fileURLToPath(new URL("./cpac.js", import.meta.url));
+        const cli = join(dirname(fileURLToPath(import.meta.url)), "cpac.js");
         const result = spawnSync(process.execPath, [cli, "sync"], {
             stdio: "inherit",
         });

package/dist/targets/hermes.js

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, join } from "node:path";
+import { basename, dirname, join } from "node:path";
 import { catalogModelId, catalogModelRows, dropAgent, fetchCatalog, readState, recordWrittenConfig, restoreOwnedConfig, } from "../config.js";
 import { ensureLoopbackProxy, stopProxyProcess } from "../proxy.js";
 import { CPACError, atomicWrite, ensureCpacBackup, expandUserPath, resolveApiKey, } from "../util.js";
@@ -15,23 +15,38 @@ export function hermesHome() {
     }
     return join(homedir(), ".hermes");
 }
+export function hermesRoot() {
+    const home = hermesHome();
+    const parent = dirname(home);
+    if (basename(parent) === "profiles")
+        return dirname(parent);
+    return home;
+}
 export function hermesConfigPath() {
-    return join(hermesHome(), "config.yaml");
+    return join(hermesRoot(), "config.yaml");
 }
 export function hermesConfigPaths() {
-    const home = hermesHome();
-    const paths = [hermesConfigPath()];
-    let entries;
+    const root = hermesRoot();
+    const paths = [join(root, "config.yaml")];
+    let names;
     try {
-        entries = readdirSync(join(home, "profiles"), { withFileTypes: true });
+        names = readdirSync(join(root, "profiles"));
     }
     catch {
         return paths;
     }
-    for (const entry of entries.sort((a, b) => a.name.localeCompare(b.name))) {
-        if (!entry.isDirectory() || entry.name.startsWith("."))
+    for (const name of names.sort()) {
+        if (name.startsWith(".") || name === "default")
             continue;
-        paths.push(join(home, "profiles", entry.name, "config.yaml"));
+        const dir = join(root, "profiles", name);
+        try {
+            if (!statSync(dir).isDirectory())
+                continue;
+        }
+        catch {
+            continue;
+        }
+        paths.push(join(dir, "config.yaml"));
     }
     return paths;
 }
@@ -261,7 +276,9 @@ export async function installHermesConfig(config) {
             await stopProxyProcess(proxy);
         throw error;
     }
-    console.log(`Installed Hermes provider "${HERMES_PROVIDER_ID}": ${targets.join(", ")}`);
+    console.log(`Installed Hermes provider "${HERMES_PROVIDER_ID}":`);
+    for (const target of targets)
+        console.log(`  ${target}`);
 }
 export async function uninstallHermesConfig(config) {
     const targets = hermesConfigPaths();
@@ -276,5 +293,7 @@ export async function uninstallHermesConfig(config) {
     const { stopProxy } = dropAgent(config.state_dir, "hermes");
     if (stopProxy)
         await stopProxyProcess(stopProxy);
-    console.log(`Removed Hermes provider "${HERMES_PROVIDER_ID}": ${targets.join(", ")}`);
+    console.log(`Removed Hermes provider "${HERMES_PROVIDER_ID}":`);
+    for (const target of targets)
+        console.log(`  ${target}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yhong91/cpac",
-  "version": "0.1.46",
+  "version": "0.1.47",
   "description": "Connect Codex and Claude Code to a remote CLIProxyAPI gateway",
   "type": "module",
   "bin": {