@yhong91/cpac 0.1.28 → 0.1.29

package/README.md

@@ -285,7 +285,7 @@ cpac opencode [--] [opencode args...]
 cpac pi install
 ```
 
-它将生成 `cpac.ts` 写入 `~/.pi/agent/extensions/`，Pi 启动时自动加载并从 CPA 动态注册模型目录。卸载：
+它将生成 `pi-cpac.ts` 写入 `~/.pi/agent/extensions/`，Pi 启动时自动加载并从 CPA 动态注册模型目录。卸载：
 
 ```bash
 cpac restore --target pi
@@ -326,7 +326,7 @@ CPAC CLI 可临时覆盖 CPA 地址：
 CPA_BASE_URL='https://cpa.example.com' cpac claude
 ```
 
-`pi-cpa.ts` 插件不读取此变量，固定连接远程 `http://124.223.178.52:8317`，并且只从 Pi 进程环境读取 `CPA_API_KEY`；不读取用户 home 中的私有文件。
+`pi-cpac.ts` 插件固定连接配置指定的 CPA 地址，并且只从 Pi 进程环境读取 `CPA_API_KEY`；不读取用户 home 中的私有文件。
 
 ## 可选 JSON 配置
 

package/dist/agents.js

@@ -209,14 +209,14 @@ const TARGETS = [
         version: () => detectClientVersion("pi"),
         install: async (config, dryRun) => {
             if (dryRun) {
-                console.log(`would write Pi extension: ${join(piExtensionsDir(), "cpac.ts")}`);
+                console.log(`would write Pi extension: ${join(piExtensionsDir(), "pi-cpac.ts")}`);
                 return;
             }
             await installPiExtension(config);
         },
         uninstall: async (_config, dryRun) => {
             if (dryRun) {
-                console.log(`would remove Pi extension: ${join(piExtensionsDir(), "cpac.ts")}`);
+                console.log(`would remove Pi extension: ${join(piExtensionsDir(), "pi-cpac.ts")}`);
                 return;
             }
             await uninstallPiExtension();

package/dist/pi-extension.template

@@ -1,4 +1,4 @@
-// CPAC Pi extension: register CPA models as Pi providers
+// Pi CPAC extension: register CPA models as Pi providers
 // Installed by: cpac pi install
 
 const CPA = "__CPA_URL__";
@@ -71,7 +71,7 @@ function intField(value) {
 export default async function (pi) {
   const apiKey = (process.env.CPA_API_KEY || "").trim();
   if (!apiKey) {
-    console.error("[cpac] CPA_API_KEY not set; skipping CPA providers");
+    console.error("[pi-cpac] CPA_API_KEY not set; skipping CPA providers");
     return;
   }
   let payload;
@@ -81,19 +81,19 @@ export default async function (pi) {
       signal: AbortSignal.timeout(10000),
     });
     if (!res.ok) {
-      console.error("[cpac] CPA models request failed: HTTP " + res.status);
+      console.error("[pi-cpac] CPA models request failed: HTTP " + res.status);
       return;
     }
     payload = await res.json();
   } catch (error) {
-    console.error("[cpac] CPA models request failed: " + (error && error.message || error));
+    console.error("[pi-cpac] CPA models request failed: " + (error && error.message || error));
     return;
   }
   const source = payload && Array.isArray(payload.models)
     ? payload.models
     : payload && Array.isArray(payload.data) ? payload.data : null;
   if (!source) {
-    console.error("[cpac] CPA models response has no models list");
+    console.error("[pi-cpac] CPA models response has no models list");
     return;
   }
   const rows = [];
@@ -110,7 +110,7 @@ export default async function (pi) {
     });
   }
   if (rows.length === 0) {
-    console.error("[cpac] CPA models response has no usable models");
+    console.error("[pi-cpac] CPA models response has no usable models");
     return;
   }
   const groups = new Map();

package/dist/targets/pi.js

@@ -7,7 +7,8 @@ export function piExtensionsDir() {
     return join(expandUserPath(process.env.PI_CODING_AGENT_DIR?.trim() || join(homedir(), ".pi", "agent")), "extensions");
 }
 export function isPiExtensionInstalled() {
-    return existsSync(join(piExtensionsDir(), "cpac.ts"));
+    const dir = piExtensionsDir();
+    return existsSync(join(dir, "pi-cpac.ts")) || existsSync(join(dir, "cpac.ts"));
 }
 function piTemplatePath() {
     return join(dirname(fileURLToPath(import.meta.url)), "..", "pi-extension.template");
@@ -18,15 +19,32 @@ function piExtensionContent(cpaUrl) {
 export async function installPiExtension(config) {
     const dir = piExtensionsDir();
     mkdirSync(dir, { recursive: true, mode: 0o700 });
-    const target = join(dir, "cpac.ts");
+    const target = join(dir, "pi-cpac.ts");
     ensureCpacBackup(target);
     atomicWrite(target, Buffer.from(piExtensionContent(config.cpa_url)), 0o644);
+    for (const legacy of ["cpac.ts", "pi-cpa.ts"]) {
+        const legacyPath = join(dir, legacy);
+        if (existsSync(legacyPath) && legacyPath !== target) {
+            try {
+                unlinkSync(legacyPath);
+            }
+            catch { }
+        }
+    }
     console.log(`Installed Pi extension: ${target}`);
 }
 export async function uninstallPiExtension() {
-    const target = join(piExtensionsDir(), "cpac.ts");
-    if (!existsSync(target))
+    const dir = piExtensionsDir();
+    const target = join(dir, "pi-cpac.ts");
+    const legacyTargets = [join(dir, "cpac.ts"), join(dir, "pi-cpa.ts")];
+    let removed = false;
+    for (const file of [target, ...legacyTargets]) {
+        if (existsSync(file)) {
+            unlinkSync(file);
+            console.log(`Removed Pi extension: ${file}`);
+            removed = true;
+        }
+    }
+    if (!removed)
         throw new CPACError("Pi extension is not installed");
-    unlinkSync(target);
-    console.log(`Removed Pi extension: ${target}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yhong91/cpac",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "description": "Connect Codex and Claude Code to a remote CLIProxyAPI gateway",
   "type": "module",
   "bin": {
@@ -30,7 +30,6 @@
     "clean": "node -e \"for (const d of ['dist','dist-test']) require('fs').rmSync(d,{recursive:true,force:true})\"",
     "build": "npm run clean --if-present && tsc -p tsconfig.build.json && cp src/pi-extension.template dist/ && node -e \"const fs=require('fs');const p='dist/cpac.js';const s=fs.readFileSync(p,'utf8');if(!s.startsWith('#!'))fs.writeFileSync(p,'#!/usr/bin/env node\\n'+s);try{fs.chmodSync(p,0o755)}catch{}\"",
     "check": "tsc -p tsconfig.json --noEmit",
-    "check:pi": "tsc -p tsconfig.pi.json --noEmit",
     "test": "npm run clean && tsc -p tsconfig.test.json && cp src/pi-extension.template dist-test/src/ && node --test --test-reporter=spec dist-test/cpac.test.js",
     "pack:check": "npm pack --dry-run"
   },