@yhong91/cpac 0.2.7 → 0.2.9

package/README.md

@@ -151,6 +151,23 @@ source ~/.zshrc # 使用引导实际显示的文件
 export CPA_API_KEY='...'
 ```
 
+### Windows
+
+CPAC 会按平台自动选择处理方式：
+
+- 密钥引导不写 shell profile（Windows 没有 `source` 语义）。引导会提示改用 `setx CPA_API_KEY "<your-key>"` 或「编辑账户的环境变量」持久化；也可以在 PowerShell 里直接执行：
+
+  ```powershell
+  [Environment]::SetEnvironmentVariable("CPA_API_KEY", "<your-key>", "User")
+  ```
+
+  设置后需要重开终端。若通过 npm 全局安装，PowerShell 首次运行需要允许本地脚本：`Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser`。
+
+- 检测 PATH 上的 agent 时使用 `where` 而非 `command -v`。
+- 启动 agent 时自动解析 `.cmd` / `.bat` shim（npm 全局安装的 CLI），`.exe` 直接启动。
+- `cpac upgrade` / `cpac uninstall` 内部调用 npm 时自动经 shell 启动 `npm.cmd`。
+- 清理残留代理进程时通过 PowerShell CIM 读取进程命令行来确认身份，不会误杀无关进程。
+
 ## 命令
 
 ### 引导和帮助

package/dist/agents.js

@@ -3,8 +3,9 @@ import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
-import { MAX_SPAWN_MODELS, fetchCatalog, loadCatalogSlugs, pickSpawnModels, saveCodexSetup, saveSpawnModels, } from "./config.js";
-import { markModelsApplied, refreshModelIndex } from "./models.js";
+import { MAX_SPAWN_MODELS, fetchCatalog, loadCatalogSlugs, pickSpawnModels, readState, saveCodexSetup, saveSpawnModels, saveState, stateProxy, } from "./config.js";
+import { ensureLoopbackProxy } from "./proxy.js";
+import { diffModelSlugs, markModelsApplied, readModelIndex, refreshModelIndex, } from "./models.js";
 import { MANAGED_MARKER, inject, restore } from "./targets/codex.js";
 import { grokConfigPath, grokHome, installGrokConfig, isGrokConfigInstalled, uninstallGrokConfig, } from "./targets/grok.js";
 import { installKimiConfig, isKimiConfigInstalled, kimiConfigPath, uninstallKimiConfig, } from "./targets/kimi.js";
@@ -12,7 +13,7 @@ import { installPiConfig, isPiConfigInstalled, piAgentDir, piModelsPath, uninsta
 import { installZedConfig, isZedConfigInstalled, uninstallZedConfig, zedConfigPath, zedHome, } from "./targets/zed.js";
 import { hermesConfigPaths, hermesHome, installHermesConfig, isHermesConfigInstalled, uninstallHermesConfig, } from "./targets/hermes.js";
 import { codebuddyHome, codebuddyModelsPath, installCodebuddyConfig, isCodebuddyConfigInstalled, uninstallCodebuddyConfig, } from "./targets/codebuddy.js";
-import { CPACError, atomicWrite, checkboxPicker, compareVersions, expandUserPath, objectValue, resolveApiKey, tabWizard, } from "./util.js";
+import { CPACError, atomicWrite, checkboxPicker, compareVersions, expandUserPath, isWindows, objectValue, resolveApiKey, spawnAgent, spawnAgentSync, 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)";
 const CODEX_V2_ON = "Enabled (Default)";
@@ -135,11 +136,12 @@ export async function runTargetLauncher(config, targetId, args, executable = tar
             await target.install(config, false, options.v2Off, options.maxContext);
         }
     }
+    await ensureLauncherProxy(config, target, options);
     return await new Promise((resolvePromise, rejectPromise) => {
         const env = targetId === "zed"
             ? { ...process.env, CPAC_API_KEY: process.env.CPAC_API_KEY || "cpac" }
             : undefined;
-        const child = spawn(executable, args, { stdio: "inherit", env });
+        const child = spawnAgent(executable, args, { stdio: "inherit", env });
         child.once("error", (error) => {
             rejectPromise(new CPACError(error instanceof Error && "code" in error && error.code === "ENOENT"
                 ? `${executable} not found`
@@ -163,7 +165,7 @@ export function detectClientVersion(binary) {
     if (!/^[\w.-]+$/.test(binary))
         return undefined;
     try {
-        const res = spawnSync(binary, ["--version"], {
+        const res = spawnAgentSync(binary, ["--version"], {
             encoding: "utf8",
             timeout: 2000,
             stdio: ["ignore", "pipe", "ignore"],
@@ -178,10 +180,40 @@ export function detectClientVersion(binary) {
     }
     return undefined;
 }
+async function ensureLauncherProxy(config, target, options) {
+    const apiKey = await resolveApiKey(config.api_key_env);
+    const before = readState(config.state_dir);
+    const previous = before ? stateProxy(before) : null;
+    if (!previous) {
+        await target.install(config, false, options.v2Off, options.maxContext);
+        return;
+    }
+    const { proxy, fingerprint, started } = await ensureLoopbackProxy(config, apiKey);
+    if (!started)
+        return;
+    saveState(config.state_dir, {
+        ...before,
+        proxy_id: proxy.id,
+        proxy_pid: proxy.pid,
+        proxy_port: proxy.port,
+        proxy_fingerprint: fingerprint,
+    });
+    if (previous.port === proxy.port)
+        return;
+    await target.install(config, false, options.v2Off, options.maxContext);
+}
 function binaryOnPath(name) {
     if (!/^[\w.-]+$/.test(name))
         return false;
     try {
+        if (isWindows) {
+            // `command -v` is a POSIX shell builtin; cmd.exe only has `where`.
+            return (spawnSync("where", [name], {
+                stdio: "ignore",
+                timeout: 3_000,
+                windowsHide: true,
+            }).status === 0);
+        }
         return (spawnSync(`command -v ${name}`, { stdio: "ignore", shell: true }).status ===
             0);
     }
@@ -419,17 +451,21 @@ function syncTargetIds(config, requested, all) {
     }
     return selected.map((target) => target.id);
 }
-function formatModelVersion(iso) {
-    const date = new Date(iso);
-    if (Number.isNaN(date.getTime()))
-        return iso;
-    const pad = (value) => String(value).padStart(2, "0");
-    const clock = `${pad(date.getHours())}:${pad(date.getMinutes())}`;
-    // ponytail: minute display; the stored ISO still separates same-minute updates
-    const monthDay = `${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
-    return date.getFullYear() === new Date().getFullYear()
-        ? `${monthDay} ${clock}`
-        : `${date.getFullYear()}-${monthDay} ${clock}`;
+function logModelChanges(previous, next) {
+    const { added, removed } = diffModelSlugs(previous.map((model) => model.slug), next.map((model) => model.slug));
+    const addedSet = new Set(added);
+    const previousJson = new Map(previous.map((model) => [model.slug, JSON.stringify(model)]));
+    for (const slug of added)
+        console.log(`+ ${slug}`);
+    for (const slug of removed)
+        console.log(`- ${slug}`);
+    for (const model of next) {
+        if (addedSet.has(model.slug))
+            continue;
+        const before = previousJson.get(model.slug);
+        if (before !== undefined && before !== JSON.stringify(model))
+            console.log(`~ ${model.slug}`);
+    }
 }
 export async function runSync(config, requested, options) {
     const ids = syncTargetIds(config, requested, options.all);
@@ -438,16 +474,11 @@ export async function runSync(config, requested, options) {
     }
     const apiKey = await resolveApiKey(config.api_key_env);
     const catalog = await fetchCatalog(config.cpa_url, apiKey);
+    const previous = readModelIndex(config.state_dir);
     const { index, changed } = refreshModelIndex(config.state_dir, catalog.bytes, new Date().toISOString(), !options.dryRun);
-    console.log(`models ${formatModelVersion(index.updated_at)}${changed ? (options.dryRun ? " would update" : " updated") : " unchanged"}`);
+    if (changed)
+        logModelChanges(previous?.models ?? [], index.models);
     const pending = ids.filter((id) => index.applied[id] !== index.updated_at);
-    for (const id of ids) {
-        const applied = index.applied[id];
-        if (applied === index.updated_at)
-            console.log(`  ${id}: unchanged`);
-        else if (applied)
-            console.log(`  ${id}: ${formatModelVersion(applied)}`);
-    }
     if (pending.length === 0)
         return 0;
     // ponytail: version is the model-list timestamp only. spawn_models, v2_off,
@@ -512,7 +543,7 @@ export async function runUninstall(config, options) {
         return 0;
     }
     console.log("Uninstalling @yhong91/cpac");
-    const result = spawnSync("npm", ["uninstall", "-g", "@yhong91/cpac"], {
+    const result = spawnAgentSync("npm", ["uninstall", "-g", "@yhong91/cpac"], {
         stdio: "inherit",
     });
     if (result.status !== 0) {
@@ -573,7 +604,7 @@ export async function runUpgrade(config, checkOnly) {
         const args = ["install", "-g", `@yhong91/cpac@${latest}`];
         if (prefix)
             args.splice(2, 0, `--prefix=${prefix}`);
-        const result = spawnSync("npm", args, { stdio: "inherit" });
+        const result = spawnAgentSync("npm", args, { stdio: "inherit" });
         if (result.status !== 0) {
             console.error("npm install failed");
             return result.status ?? 1;

package/dist/cpac.js

@@ -158,9 +158,15 @@ async function guide(config) {
     if (process.env[config.api_key_env]?.trim())
         return 0;
     const apiKey = await promptSecret(config.api_key_env);
+    process.env[config.api_key_env] = apiKey;
+    if (process.platform === "win32") {
+        // Windows has no shell profile to source; persist via setx instead of
+        // writing an export line no native shell would read.
+        console.log(`\nTo persist ${config.api_key_env} across terminals, run in a new terminal:\n  setx ${config.api_key_env} "<your-key>"\n(or use Start > "Edit environment variables for your account").\nThe key is active for this session only until then.`);
+        return 0;
+    }
     const profile = shellProfile();
     saveApiKeyExport(profile, config.api_key_env, apiKey);
-    process.env[config.api_key_env] = apiKey;
     console.log(`\nSaved ${config.api_key_env} to ${profile}. Open a new terminal or run:\n  source ${profile}`);
     return 0;
 }
@@ -674,8 +680,11 @@ export async function main(args = process.argv.slice(2)) {
         const parsed = parseArgs(args);
         if (!parsed)
             return 0;
-        if ("home" in parsed && parsed.home)
+        if ("home" in parsed && parsed.home) {
             process.env.HOME = parsed.home;
+            if (process.platform === "win32")
+                process.env.USERPROFILE = parsed.home;
+        }
         const config = loadConfig(parsed.configPath, true);
         if (parsed.command === "guide")
             return await guide(config);

package/dist/proxy.js

@@ -3,6 +3,7 @@ import { randomBytes } from "node:crypto";
 import { existsSync, readFileSync } from "node:fs";
 import { createServer, request as httpRequest, } from "node:http";
 import { request as httpsRequest } from "node:https";
+import { join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { apiBase, proxyFingerprint, readState, saveState, stateProxy, } from "./config.js";
 import { CPACError, objectValue, resolveApiKey } from "./util.js";
@@ -246,6 +247,30 @@ export async function startProxyProcess(config, apiKey) {
 function processCommandArgs(pid) {
     if (!Number.isInteger(pid) || pid <= 0)
         return undefined;
+    if (process.platform === "win32") {
+        // No /proc and no ps on Windows; PowerShell CIM is the dependable way
+        // to read another process's command line (wmic is removed on newer
+        // Windows 11 builds). Only used to identify stale proxy processes.
+        const systemRoot = process.env.SystemRoot?.trim() || "C:\\Windows";
+        try {
+            const result = spawnSync(join(systemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe"), [
+                "-NoProfile",
+                "-NonInteractive",
+                "-Command",
+                `(Get-CimInstance Win32_Process -Filter 'ProcessId=${pid}').CommandLine`,
+            ], {
+                encoding: "utf8",
+                timeout: 5_000,
+                stdio: ["ignore", "pipe", "ignore"],
+                windowsHide: true,
+            });
+            const line = result.stdout?.trim();
+            return line ? line.split(/\s+/) : undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
     try {
         const proc = `/proc/${pid}/cmdline`;
         if (existsSync(proc)) {
@@ -321,6 +346,9 @@ export async function ensureLoopbackProxy(config, apiKey) {
     if (existing)
         await stopProxyProcess(existing);
     const proxy = await startProxyProcess(config, apiKey);
+    if (!existing) {
+        console.log(`loopback proxy listening on http://127.0.0.1:${proxy.port}/v1`);
+    }
     return { proxy, fingerprint, started: true };
 }
 export async function runProxy(config) {

package/dist/targets/claude.js

@@ -4,7 +4,7 @@ import { createServer, request as httpRequest, } from "node:http";
 import { request as httpsRequest } from "node:https";
 import { apiBase, catalogModelId, catalogModelRows, catalogSlugs, fetchCatalog, loadConfig, } from "../config.js";
 import { proxyHeaders, responseHeaders, upstreamUrl } from "../proxy.js";
-import { CPACError, atomicWrite, objectValue, resolveApiKey, tabWizard, } from "../util.js";
+import { CPACError, atomicWrite, objectValue, resolveApiKey, spawnAgent, tabWizard, } from "../util.js";
 const CLAUDE_ALIAS_PREFIX = "claude-cpac--";
 // Claude Code accepts CLAUDE_CODE_AUTO_COMPACT_WINDOW in 100K–1M (binary-verified).
 // A single global window cannot be per-model; 350K is opencodex's user-approved
@@ -379,7 +379,7 @@ export async function runClaude(config, args, executable = "claude") {
     delete env.CLAUDE_CODE_USE_FOUNDRY;
     delete env.CLAUDE_CODE_USE_VERTEX;
     return await new Promise((resolve, reject) => {
-        const child = spawn(executable, args, { env, stdio: "inherit" });
+        const child = spawnAgent(executable, args, { env, stdio: "inherit" });
         child.once("error", (error) => {
             stopProxy();
             reject(new CPACError(error instanceof Error && "code" in error && error.code === "ENOENT"

package/dist/util.js

@@ -1,3 +1,4 @@
+import { spawn, spawnSync, } from "node:child_process";
 import { chmodSync, closeSync, copyFileSync, existsSync, fsyncSync, mkdirSync, openSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync, } from "node:fs";
 import { homedir } from "node:os";
 import { basename, dirname, join, parse } from "node:path";
@@ -9,6 +10,79 @@ export class CPACError extends Error {
 export function objectValue(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+export const isWindows = process.platform === "win32";
+// Windows process launching: npm-installed CLIs are .cmd/.bat shims, and
+// spawn without a shell only resolves .exe (CreateProcess), so those need a
+// shell plus a correctly quoted command line. Everything else spawns directly.
+function resolveWindowsExecutable(executable) {
+    if (!/^[\w.-]+$/.test(executable))
+        return undefined;
+    try {
+        const result = spawnSync("where", [executable], {
+            encoding: "utf8",
+            timeout: 3_000,
+            stdio: ["ignore", "pipe", "ignore"],
+            windowsHide: true,
+        });
+        if (result.status !== 0)
+            return undefined;
+        const lines = result.stdout
+            .split(/\r?\n/)
+            .map((entry) => entry.trim())
+            .filter(Boolean);
+        return (lines.find((entry) => /\.(exe|com|cmd|bat)$/i.test(entry)) || lines[0]);
+    }
+    catch {
+        return undefined;
+    }
+}
+// Quotes a single argument for cmd.exe (MSDN rules): double backslashes that
+// precede a quote, double trailing backslashes so they cannot escape the
+// closing quote, and wrap tokens containing whitespace or quotes.
+function cmdQuote(arg) {
+    if (arg !== "" && !/[\s"]/.test(arg))
+        return arg;
+    let out = "";
+    let backslashes = 0;
+    for (const ch of arg) {
+        if (ch === "\\") {
+            backslashes++;
+            continue;
+        }
+        if (ch === '"')
+            out += `${"\\".repeat(backslashes * 2 + 1)}"`;
+        else
+            out += `${"\\".repeat(backslashes)}${ch}`;
+        backslashes = 0;
+    }
+    return `"${out}${"\\".repeat(backslashes * 2)}"`;
+}
+function spawnAgentPlan(executable, args) {
+    if (!isWindows)
+        return { command: executable, args };
+    const resolved = resolveWindowsExecutable(executable);
+    if (!resolved)
+        return null; // let the plain spawn produce the ENOENT error
+    if (!/\.(cmd|bat)$/i.test(resolved))
+        return { command: resolved, args };
+    return { line: [resolved, ...args].map(cmdQuote).join(" ") };
+}
+export function spawnAgent(executable, args, options) {
+    const plan = spawnAgentPlan(executable, args);
+    if (plan === null)
+        return spawn(executable, args, options);
+    if ("line" in plan)
+        return spawn(plan.line, { ...options, shell: true });
+    return spawn(plan.command, plan.args, options);
+}
+export function spawnAgentSync(executable, args, options) {
+    const plan = spawnAgentPlan(executable, args);
+    if (plan === null)
+        return spawnSync(executable, args, options);
+    if ("line" in plan)
+        return spawnSync(plan.line, { ...options, shell: true });
+    return spawnSync(plan.command, plan.args, options);
+}
 export function ensureCpacBackup(stateDir, agent, target, native = false) {
     const dest = join(stateDir, agent, basename(target));
     const sidecar = `${target}.cpac-backup`;

package/package.json

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