@yhong91/cpac 0.1.45 → 0.1.47

package/README.md

@@ -327,13 +327,13 @@ cpac install hermes
 cpac hermes
 ```
 
-它在 `~/.hermes/config.yaml` 的 `providers.cpac` 写入 loopback `base_url`/`api`、占位 `api_key`、`api_mode: responses`，以及 CPA catalog 的 slug 列表（`discover_models: false`）。不改当前默认模型；切换用 `hermes model` 或 `/model`。密钥由 loopback 注入，不写进 `.env`。卸载：
+它在 default `~/.hermes/config.yaml` 以及每个 `~/.hermes/profiles/<name>/config.yaml` 的 `providers.cpac` 写入 loopback `base_url`/`api`、占位 `api_key`、`api_mode: responses`，以及 CPA catalog 的 slug 列表（`discover_models: false`）。不改当前默认模型；切换用 `hermes model` 或 `/model`。密钥由 loopback 注入，不写进 `.env`。新建 profile 后再跑一次 `cpac install hermes`（或 `cpac hermes`）即可写入。卸载：
 
 ```bash
 cpac restore hermes
 ```
 
-配置目录尊重 `HERMES_HOME`（Windows 默认 `%LOCALAPPDATA%\hermes`）。首次写入前若 `config.yaml` 已存在，会在 `state_dir/hermes/config.yaml` 保留原始快照。
+配置目录尊重 `HERMES_HOME`（Windows 默认 `%LOCALAPPDATA%\hermes`）。首次写入前若 default `config.yaml` 已存在，会在 `state_dir/hermes/config.yaml` 保留原始快照。profile 文件不单独备份，restore 只剥 `providers.cpac`。
 
 ## 环境变量
 

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";
@@ -9,7 +9,7 @@ import { grokConfigPath, grokHome, installGrokConfig, isGrokConfigInstalled, uni
 import { installKimiConfig, isKimiConfigInstalled, kimiConfigPath, uninstallKimiConfig, } from "./targets/kimi.js";
 import { installPiConfig, isPiConfigInstalled, piAgentDir, piModelsPath, uninstallPiConfig, } from "./targets/pi.js";
 import { installZedConfig, isZedConfigInstalled, uninstallZedConfig, zedConfigPath, zedHome, } from "./targets/zed.js";
-import { hermesConfigPath, hermesHome, installHermesConfig, isHermesConfigInstalled, uninstallHermesConfig, } from "./targets/hermes.js";
+import { hermesConfigPaths, hermesHome, installHermesConfig, isHermesConfigInstalled, uninstallHermesConfig, } from "./targets/hermes.js";
 import { CPACError, atomicWrite, checkboxPicker, compareVersions, expandUserPath, objectValue, tabWizard, } from "./util.js";
 const CODEX_CTX_STD = "Standard (default input budget, e.g. 200K~272K)";
 const CODEX_CTX_MAX = "Max Context Window (lift to full upper bound, e.g. 921K~1M, 90% auto-compact limit)";
@@ -310,14 +310,16 @@ const TARGETS = [
         version: () => detectClientVersion("hermes"),
         install: async (config, dryRun) => {
             if (dryRun) {
-                console.log(`would write CPA provider: ${hermesConfigPath()}`);
+                for (const path of hermesConfigPaths())
+                    console.log(`would write CPA provider: ${path}`);
                 return;
             }
             await installHermesConfig(config);
         },
         uninstall: async (config, dryRun) => {
             if (dryRun) {
-                console.log(`would remove CPA provider: ${hermesConfigPath()}`);
+                for (const path of hermesConfigPaths())
+                    console.log(`would remove CPA provider: ${path}`);
                 return;
             }
             await uninstallHermesConfig(config);
@@ -368,7 +370,10 @@ export async function runInstall(config, requested, options) {
         throw new CPACError("--max_context is only valid with codex");
     }
     for (const target of selected) {
-        if (target.installed(config) && !options.force && target.id !== "pi") {
+        if (target.installed(config) &&
+            !options.force &&
+            target.id !== "pi" &&
+            target.id !== "hermes") {
             console.log(`${target.id}: already installed; use --force to reinstall`);
             continue;
         }
@@ -445,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;
@@ -480,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;
@@ -492,5 +514,12 @@ export async function runUpgrade(config, checkOnly) {
         return 0;
     }
     console.log(`Syncing ${installed.join(", ")}`);
+    if (!upToDate) {
+        const cli = join(dirname(fileURLToPath(import.meta.url)), "cpac.js");
+        const result = spawnSync(process.execPath, [cli, "sync"], {
+            stdio: "inherit",
+        });
+        return result.status ?? 1;
+    }
     return runSync(config, [], { all: false, dryRun: false });
 }

package/dist/targets/hermes.js

@@ -1,7 +1,7 @@
-import { existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
+import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-import { catalogModelId, catalogModelRows, dropAgent, fetchCatalog, recordWrittenConfig, restoreOwnedConfig, } from "../config.js";
+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";
 export const HERMES_PROVIDER_ID = "cpac";
@@ -15,8 +15,40 @@ 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 root = hermesRoot();
+    const paths = [join(root, "config.yaml")];
+    let names;
+    try {
+        names = readdirSync(join(root, "profiles"));
+    }
+    catch {
+        return paths;
+    }
+    for (const name of names.sort()) {
+        if (name.startsWith(".") || name === "default")
+            continue;
+        const dir = join(root, "profiles", name);
+        try {
+            if (!statSync(dir).isDirectory())
+                continue;
+        }
+        catch {
+            continue;
+        }
+        paths.push(join(dir, "config.yaml"));
+    }
+    return paths;
 }
 function lineIndent(line) {
     const match = line.match(/^( *)/);
@@ -121,14 +153,17 @@ function hasProvidersCpac(content) {
     const indent = childIndent(lines, range.idx, range.end, 0);
     return Boolean(findCpacChild(lines, range.idx, range.end, indent));
 }
-export function isHermesConfigInstalled() {
+function pathHasCpac(path) {
     try {
-        return hasProvidersCpac(readFileSync(hermesConfigPath(), "utf8"));
+        return hasProvidersCpac(readFileSync(path, "utf8"));
     }
     catch {
         return false;
     }
 }
+export function isHermesConfigInstalled() {
+    return hermesConfigPaths().some(pathHasCpac);
+}
 function stripProvidersCpac(content) {
     const eol = content.includes("\r\n") ? "\r\n" : "\n";
     const lines = content.split(/\r?\n/);
@@ -194,6 +229,20 @@ function writeHermesProvider(path, port, rows) {
     const mode = existsSync(path) ? statSync(path).mode & 0o7777 : 0o600;
     atomicWrite(path, Buffer.from(content), mode);
 }
+function stripHermesFile(path) {
+    if (!existsSync(path))
+        return;
+    const current = readFileSync(path, "utf8");
+    if (!hasProvidersCpac(current))
+        return;
+    const stripped = stripProvidersCpac(current);
+    if (stripped.trim() === "") {
+        rmSync(path, { force: true });
+        return;
+    }
+    const mode = statSync(path).mode & 0o7777;
+    atomicWrite(path, Buffer.from(stripped.endsWith("\n") ? stripped : `${stripped}\n`), mode);
+}
 export async function installHermesConfig(config) {
     const apiKey = await resolveApiKey(config.api_key_env);
     const catalog = await fetchCatalog(config.cpa_url, apiKey);
@@ -208,12 +257,14 @@ export async function installHermesConfig(config) {
     if (rows.length === 0)
         throw new CPACError("CPA catalog contains no models");
     const { proxy, fingerprint, started } = await ensureLoopbackProxy(config, apiKey);
-    const target = hermesConfigPath();
-    const hadFile = existsSync(target);
+    const targets = hermesConfigPaths();
+    const primary = targets[0];
+    const hadFile = existsSync(primary);
     try {
-        ensureCpacBackup(config.state_dir, "hermes", target, !isHermesConfigInstalled());
-        writeHermesProvider(target, proxy.port, rows);
-        recordWrittenConfig(config.state_dir, "hermes", target, {
+        ensureCpacBackup(config.state_dir, "hermes", primary, !pathHasCpac(primary));
+        for (const target of targets)
+            writeHermesProvider(target, proxy.port, rows);
+        recordWrittenConfig(config.state_dir, "hermes", primary, {
             id: proxy.id,
             pid: proxy.pid,
             port: proxy.port,
@@ -225,15 +276,24 @@ export async function installHermesConfig(config) {
             await stopProxyProcess(proxy);
         throw error;
     }
-    console.log(`Installed Hermes provider "${HERMES_PROVIDER_ID}": ${target}`);
+    console.log(`Installed Hermes provider "${HERMES_PROVIDER_ID}":`);
+    for (const target of targets)
+        console.log(`  ${target}`);
 }
 export async function uninstallHermesConfig(config) {
-    const target = hermesConfigPath();
+    const targets = hermesConfigPaths();
+    const primary = targets[0];
     if (!isHermesConfigInstalled())
         throw new CPACError("Hermes CPAC provider is not installed");
-    restoreOwnedConfig(config.state_dir, "hermes", target, (current) => Buffer.from(stripProvidersCpac(new TextDecoder("utf-8").decode(current))));
+    if (readState(config.state_dir)?.agents?.hermes || pathHasCpac(primary)) {
+        restoreOwnedConfig(config.state_dir, "hermes", primary, (current) => Buffer.from(stripProvidersCpac(new TextDecoder("utf-8").decode(current))));
+    }
+    for (const target of targets.slice(1))
+        stripHermesFile(target);
     const { stopProxy } = dropAgent(config.state_dir, "hermes");
     if (stopProxy)
         await stopProxyProcess(stopProxy);
-    console.log(`Removed Hermes provider "${HERMES_PROVIDER_ID}": ${target}`);
+    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.45",
+  "version": "0.1.47",
   "description": "Connect Codex and Claude Code to a remote CLIProxyAPI gateway",
   "type": "module",
   "bin": {