@yhong91/cpac 0.1.32 → 0.1.34

package/dist/cpac.js

@@ -1,22 +1,22 @@
 #!/usr/bin/env node
 import { existsSync, readFileSync, realpathSync } from "node:fs";
 import { createHash } from "node:crypto";
-import { resolve } from "node:path";
+import { join, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { CPAC_VERSION, runCodexConfig, runDetect, runInstall, runRestore, runSync, runTargetLauncher, runUninstall, runUpgrade, } from "./agents.js";
-import { runClaude, runClaudeConfig, runClaudeModels, } from "./targets/claude.js";
-import { inject, multiAgentV2Enabled } from "./targets/codex.js";
+import { runClaude, runClaudeConfig } from "./targets/claude.js";
+import { multiAgentV2Enabled } from "./targets/codex.js";
 import { isGrokConfigInstalled } from "./targets/grok.js";
 import { isKimiConfigInstalled } from "./targets/kimi.js";
 import { runOpencode } from "./targets/opencode.js";
 import { isPiExtensionInstalled } from "./targets/pi.js";
-import { defaultConfigPath, loadConfig, originalBytes, pickSpawnModels, readState, saveSpawnModels, stateProxy, } from "./config.js";
-import { proxyIsHealthy, runProxy, runProxyChild } from "./proxy.js";
+import { defaultConfigPath, loadConfig, originalBytes, pickSpawnModels, readState, saveSpawnModels, stateProxy, catalogMaxContextLive, } from "./config.js";
+import { proxyIsHealthy, runProxyChild } from "./proxy.js";
 import { CPACError, expandUserPath, promptSecret, saveApiKeyExport, shellProfile, } from "./util.js";
-export { PROVIDER, loadConfig, saveSpawnModels, liftContextWindows, reorderCatalog, readState, stateProxy, } from "./config.js";
+export { PROVIDER, loadConfig, saveSpawnModels, saveCodexSetup, liftContextWindows, reorderCatalog, sanitizeCatalogModalities, stampMultiAgentVersion, catalogMaxContextLive, readState, stateProxy, } from "./config.js";
 export { saveApiKeyExport } from "./util.js";
 export { stopProxyProcess } from "./proxy.js";
-export { buildCodexConfig, hasProviderTable, inject, multiAgentV2Enabled, restore, withMultiAgentV2, } from "./targets/codex.js";
+export { buildCodexConfig, hasProviderTable, inject, multiAgentV2Enabled, restore, stripAgentsMaxThreads, withMultiAgentV2, } from "./targets/codex.js";
 export { claudeTierSlots, createClaudeProxy, runClaude, } from "./targets/claude.js";
 export { detectClientVersion, detectTargets, runInstall, runRestore, runSync, runTargetLauncher, } from "./agents.js";
 export { installGrokConfig, isGrokConfigInstalled, uninstallGrokConfig, } from "./targets/grok.js";
@@ -42,11 +42,23 @@ export async function status(config) {
                 console.log(`codex: injected proxy=http://127.0.0.1:${proxy.port}/v1 sha256=${digest}`);
             }
             try {
-                console.log(`codex multi-agent v2: ${multiAgentV2Enabled(readFileSync(config.codex_config, "utf8")) ? "on" : "off"}`);
+                const liveV2 = multiAgentV2Enabled(readFileSync(config.codex_config, "utf8"));
+                console.log(`codex v2: expected=${config.v2_off ? "off" : "on"} live=${liveV2 ? "on" : "off"}`);
             }
             catch {
                 // Unreadable config: the injected line above already reports it.
             }
+            const catalogPath = join(config.state_dir, "codex-models.json");
+            let liveMax = false;
+            if (existsSync(catalogPath)) {
+                try {
+                    liveMax = catalogMaxContextLive(readFileSync(catalogPath));
+                }
+                catch {
+                    // Unreadable catalog: report live=off.
+                }
+            }
+            console.log(`codex max_context: expected=${config.max_context ? "on" : "off"} live=${liveMax ? "on" : "off"}`);
         }
         else {
             console.log(`codex: injected (config missing: ${config.codex_config})`);
@@ -57,11 +69,11 @@ export async function status(config) {
     }
     console.log(`claude: ${keyConfigured ? "ready" : "not configured"}`);
     const piInstalled = isPiExtensionInstalled();
-    console.log(`pi: ${keyConfigured ? (piInstalled ? "ready" : "extension not installed; run: cpac install --target pi") : "not configured"}`);
+    console.log(`pi: ${keyConfigured ? (piInstalled ? "ready" : "extension not installed; run: cpac install pi") : "not configured"}`);
     const kimiInstalled = isKimiConfigInstalled();
-    console.log(`kimi: ${keyConfigured ? (kimiInstalled ? "ready" : "config not installed; run: cpac install --target kimi") : "not configured"}`);
+    console.log(`kimi: ${keyConfigured ? (kimiInstalled ? "ready" : "config not installed; run: cpac install kimi") : "not configured"}`);
     const grokInstalled = isGrokConfigInstalled();
-    console.log(`grok: ${keyConfigured ? (grokInstalled ? "ready" : "config not installed; run: cpac install --target grok") : "not configured"}`);
+    console.log(`grok: ${keyConfigured ? (grokInstalled ? "ready" : "config not installed; run: cpac install grok") : "not configured"}`);
     if (!state)
         return 1;
     const proxy = stateProxy(state);
@@ -70,9 +82,9 @@ export async function status(config) {
     return 0;
 }
 async function guide(config) {
-    console.log(`CPA Companion\n\nCPA: ${config.cpa_url}\nCPA_API_KEY: ${process.env[config.api_key_env]?.trim() ? "configured" : "not configured"}\n\nCommands:\n  cpac <agent> [args...] Launch an agent (codex, kimi, grok, pi, claude, opencode) through CPA\n  cpac inject            Inject CPA into Codex and start its loopback proxy\n  cpac proxy             Run the injected loopback proxy in the foreground\n  cpac status            Show agent support status (Codex, Claude, Pi, Kimi, Grok)\n  cpac restore --target <id> | --all  Detach injected agents
+    console.log(`CPA Companion\n\nCPA: ${config.cpa_url}\nCPA_API_KEY: ${process.env[config.api_key_env]?.trim() ? "configured" : "not configured"}\n\nCommands:\n  cpac <agent> [args...] Launch an agent (codex, kimi, grok, pi, claude, opencode) through CPA\n  cpac setup <codex|claude>  Configure Codex or Claude, then launch\n  cpac status            Show agent support status (Codex, Claude, Pi, Kimi, Grok)\n  cpac restore <id> | --all  Detach injected agents
   cpac detect            Show supported targets and install status
-  cpac install           Install CPA integration into detected targets
+  cpac install [ids...]  Install CPA into detected targets, or named agents
   cpac sync              Refresh installed Codex/Pi/Kimi/Grok injections from CPA
   cpac uninstall         Detach all agents, then remove the cpac package (confirms first)\n  cpac upgrade           Update cpac from npm and sync installed agents\n  cpac --help            Show command usage`);
     if (process.env[config.api_key_env]?.trim())
@@ -90,21 +102,33 @@ function usage() {
     return [
         "Usage: cpac",
         "       cpac <codex|kimi|grok|pi|claude|opencode> [args...]",
-        "       cpac <codex|claude> --setup [args...]",
+        "       cpac setup <codex|claude> [options]",
         "       cpac <codex|claude|kimi|grok|pi> clear",
-        "       cpac inject [--v2_off] [--v2_models] [--max_context] [--config PATH]",
-        "       cpac restore --target <id> | --all [--dry-run] [--config PATH]",
+        "       cpac restore <id...> | --all [--dry-run] [--config PATH]",
         "       cpac status [--config PATH]",
-        "       cpac proxy [--config PATH]",
         "       cpac detect [--json] [--home PATH]",
-        "       cpac install [--target codex,pi,kimi,grok] [--all] [--dry-run] [--force] [--v2_off] [--v2_models] [--max_context] [--home PATH]",
-        "       cpac sync [--target codex,pi,kimi,grok] [--all] [--dry-run] [--v2_off] [--v2_models] [--max_context] [--home PATH]",
+        "       cpac install [codex|pi|kimi|grok...] [--all] [--dry-run] [--force] [--v2_off] [--v2_models] [--max_context] [--home PATH]",
+        "       cpac sync [codex|pi|kimi|grok...] [--all] [--dry-run] [--v2_off] [--v2_models] [--max_context] [--home PATH]",
         "       cpac uninstall [--dry-run]",
         "       cpac upgrade [--check]",
         "       cpac -v | --version",
         "",
         "launch an agent directly with `cpac <agent> [args...]` (all args forwarded).",
-        "configure then launch with `cpac <codex|claude> --setup`; restore with `cpac <agent> clear`.",
+        "configure then launch with `cpac setup <codex|claude>`; restore with `cpac <agent> clear`.",
+    ].join("\n");
+}
+function setupUsage() {
+    return [
+        "Usage: cpac setup claude [--opus [M]] [--sonnet [M]] [--haiku [M]] [--reset] [--config PATH]",
+        "       cpac setup codex [--v2_off] [--v2_models] [--max_context] [--config PATH]",
+        "",
+        "Claude slots (saved to config, applied on every `cpac claude`):",
+        "  --opus        heavy reasoning / planning fallback (ANTHROPIC_DEFAULT_OPUS_MODEL)",
+        "  --sonnet      main conversation default (ANTHROPIC_DEFAULT_SONNET_MODEL)",
+        "  --haiku       high-frequency small tasks (ANTHROPIC_DEFAULT_HAIKU_MODEL)",
+        "",
+        "A slot without a value opens an arrow-key picker; --reset clears overrides.",
+        "No flags on a TTY opens the wizard, then launches.",
     ].join("\n");
 }
 function parseArgs(args) {
@@ -172,6 +196,12 @@ function parseArgs(args) {
             else if (arg === "--max_context" || arg === "--max-context") {
                 parsed.maxContext = true;
             }
+            else if (!arg.startsWith("-")) {
+                parsed.targets.push(...arg
+                    .split(",")
+                    .map((entry) => entry.trim())
+                    .filter(Boolean));
+            }
             else {
                 throw new CPACError(`unknown option: ${arg}`);
             }
@@ -223,6 +253,17 @@ function parseArgs(args) {
                     interactive: false,
                 };
             }
+            if (targetId === "codex") {
+                return {
+                    command: "codex-config",
+                    configPath,
+                    v2Off: false,
+                    v2Models: false,
+                    maxContext: false,
+                    reset: true,
+                    interactive: false,
+                };
+            }
             return {
                 command: "restore",
                 configPath,
@@ -274,7 +315,7 @@ function parseArgs(args) {
                     args: launchArgs,
                 };
             }
-            throw new CPACError(`${targetId} does not require setup (all CPA models are auto-synced). Run 'cpac ${targetId}' or 'cpac install --target ${targetId}'.`);
+            throw new CPACError(`${targetId} does not require setup (all CPA models are auto-synced). Run 'cpac ${targetId}' or 'cpac install ${targetId}'.`);
         }
         const passArgs = rest;
         if (targetId === "codex") {
@@ -300,31 +341,53 @@ function parseArgs(args) {
             args: passArgs,
         };
     }
-    if (args[0] === "claude-models") {
+    if (args[0] === "setup") {
         if (args.includes("-h") || args.includes("--help")) {
-            console.log([
-                "Usage: cpac claude --config [--opus [M]] [--sonnet [M]] [--haiku [M]] [--reset] [--config PATH]",
-                "",
-                "Sets the model Claude Code uses per task tier. Saved to the config file",
-                "and applied on every `cpac claude` launch:",
-                "  --opus        heavy reasoning / planning fallback tier (ANTHROPIC_DEFAULT_OPUS_MODEL)",
-                "  --sonnet      main conversation default tier (ANTHROPIC_DEFAULT_SONNET_MODEL)",
-                "  --haiku       high-frequency small tasks: titles, summaries, background",
-                "                (ANTHROPIC_DEFAULT_HAIKU_MODEL + ANTHROPIC_SMALL_FAST_MODEL)",
-                "",
-                "Unset slots auto-select from the catalog: same-family claude model first,",
-                "then gemini → grok → luna → first model (opus stays unset without a match).",
-                "",
-                "A slot without a value opens an arrow-key picker over the CPA catalog;",
-                "--reset clears all overrides back to catalog auto-selection.",
-            ].join("\n"));
+            console.log(setupUsage());
             return null;
         }
+        const agent = args[1];
+        if (agent !== "claude" && agent !== "codex") {
+            throw new CPACError("setup requires claude or codex");
+        }
         let configPath = defaultConfigPath();
+        if (agent === "codex") {
+            let v2Off = false;
+            let v2Models = false;
+            let maxContext = false;
+            for (let index = 2; index < args.length; index++) {
+                const arg = args[index];
+                if (arg === "--config") {
+                    const value = args[++index];
+                    if (!value)
+                        throw new CPACError("--config requires a path");
+                    configPath = resolve(expandUserPath(value));
+                }
+                else if (arg === "--v2_off" || arg === "--v2-off")
+                    v2Off = true;
+                else if (arg === "--v2_models" || arg === "--v2-models")
+                    v2Models = true;
+                else if (arg === "--max_context" || arg === "--max-context")
+                    maxContext = true;
+                else
+                    throw new CPACError(`unknown option: ${arg}`);
+            }
+            return {
+                command: "codex-config",
+                configPath,
+                v2Off,
+                v2Models,
+                maxContext,
+                reset: false,
+                interactive: true,
+                launch: true,
+                args: [],
+            };
+        }
         const models = {};
         const pick = [];
         let reset = false;
-        for (let index = 1; index < args.length; index += 1) {
+        for (let index = 2; index < args.length; index += 1) {
             const arg = args[index];
             if (arg === "--config") {
                 const value = args[++index];
@@ -352,15 +415,20 @@ function parseArgs(args) {
                 throw new CPACError(`unknown option: ${arg}`);
             }
         }
+        const interactive = !reset && Object.keys(models).length === 0 && pick.length === 0;
         return {
             command: "claude-config",
             configPath,
             models,
             pick,
             reset,
-            interactive: !reset && Object.keys(models).length === 0 && pick.length === 0,
+            interactive,
+            launch: interactive && !reset,
         };
     }
+    if (args[0] === "claude-models") {
+        throw new CPACError("claude-models was removed; use: cpac setup claude");
+    }
     if (args.includes("-h") || args.includes("--help")) {
         console.log(usage());
         return null;
@@ -393,20 +461,19 @@ function parseArgs(args) {
         else
             positional.push(args[index]);
     }
-    if (positional.length !== 1 ||
-        !["inject", "status", "proxy"].includes(positional[0])) {
-        throw new CPACError(usage());
+    if (positional.length === 1 && positional[0] === "inject") {
+        throw new CPACError("inject was removed; use: cpac install codex");
+    }
+    if (positional.length === 1 && positional[0] === "proxy") {
+        throw new CPACError("proxy was removed; restart with: cpac install codex (or kimi / grok)");
     }
-    if (positional[0] !== "inject" && (v2Off || v2Models || maxContext)) {
-        throw new CPACError("--v2_off / --v2_models / --max_context is only valid with inject or install");
+    if (positional.length !== 1 || positional[0] !== "status") {
+        throw new CPACError(usage());
     }
-    if (positional[0] === "inject") {
-        return { command: "inject", configPath, v2Off, v2Models, maxContext };
+    if (v2Off || v2Models || maxContext) {
+        throw new CPACError("--v2_off / --v2_models / --max_context is only valid with install or setup");
     }
-    return {
-        command: positional[0],
-        configPath,
-    };
+    return { command: "status", configPath };
 }
 export async function main(args = process.argv.slice(2)) {
     try {
@@ -468,7 +535,7 @@ export async function main(args = process.argv.slice(2)) {
             });
         if (parsed.command === "uninstall") {
             if (parsed.targets.length || parsed.all) {
-                throw new CPACError("uninstall removes the cpac package; detach agents with: cpac restore --target <id> | --all");
+                throw new CPACError("uninstall removes the cpac package; detach agents with: cpac restore <id> | --all");
             }
             return await runUninstall(config, { dryRun: parsed.dryRun });
         }
@@ -520,23 +587,7 @@ export async function main(args = process.argv.slice(2)) {
             parsed.command === "pi") {
             return await runTargetLauncher(config, parsed.command, parsed.args);
         }
-        if (parsed.command === "claude-models")
-            return await runClaudeModels(parsed);
-        if (parsed.command === "proxy")
-            return await runProxy(config);
-        if (parsed.command === "inject") {
-            let injectConfig = config;
-            if (parsed.v2Models) {
-                const picked = await pickSpawnModels(config);
-                saveSpawnModels(parsed.configPath, picked);
-                console.log(`spawn_models saved to ${parsed.configPath}: ${picked.join(", ")}`);
-                injectConfig = { ...config, spawn_models: picked };
-            }
-            await inject(injectConfig, parsed.v2Off, parsed.maxContext);
-        }
-        else
-            return await status(config);
-        return 0;
+        return await status(config);
     }
     catch (error) {
         console.error(`cpac: ${error instanceof Error ? error.message : String(error)}`);

package/dist/targets/claude.js

@@ -2,9 +2,9 @@ import { spawn } from "node:child_process";
 import { readFileSync } from "node:fs";
 import { createServer, request as httpRequest, } from "node:http";
 import { request as httpsRequest } from "node:https";
-import { apiBase, catalogModelId, catalogModelRows, fetchCatalog, loadConfig, } from "../config.js";
+import { apiBase, catalogModelId, catalogModelRows, catalogSlugs, fetchCatalog, loadConfig, } from "../config.js";
 import { proxyHeaders, responseHeaders, upstreamUrl } from "../proxy.js";
-import { CPACError, atomicWrite, checkboxPicker, objectValue, resolveApiKey, } from "../util.js";
+import { CPACError, atomicWrite, objectValue, resolveApiKey, 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
@@ -235,25 +235,34 @@ export async function runClaudeConfig(config, configPath, options = {}) {
     if (shouldPick) {
         const apiKey = await resolveApiKey(config.api_key_env);
         const catalog = await fetchCatalog(config.cpa_url, apiKey);
-        let document;
-        try {
-            document = JSON.parse(new TextDecoder().decode(catalog.bytes));
-        }
-        catch {
-            throw new CPACError("CPA catalog response is not valid JSON");
-        }
-        const slugs = (document.models ?? [])
-            .map((model) => (typeof model?.slug === "string" ? model.slug : ""))
-            .filter(Boolean);
+        const slugs = catalogSlugs(catalog.bytes);
+        const auto = "(auto-select from catalog)";
         const slotsToPick = options.pick && options.pick.length > 0
             ? options.pick
             : ["sonnet", "haiku", "opus"];
+        const current = { ...config.claude_models, ...models };
+        const picked = await tabWizard(slotsToPick.map((slot) => {
+            const items = slot === "sonnet" ? slugs : [auto, ...slugs];
+            const preset = current[slot];
+            const selected = preset && slugs.includes(preset)
+                ? [preset]
+                : slot === "sonnet"
+                    ? undefined
+                    : [auto];
+            return {
+                id: slot,
+                label: slot.toUpperCase(),
+                items,
+                max: 1,
+                selected,
+            };
+        }));
         for (const slot of slotsToPick) {
-            const choices = slot === "sonnet" ? slugs : ["(auto-select from catalog)", ...slugs];
-            const [picked] = await checkboxPicker(`Select Claude Code ${slot.toUpperCase()} tier model:`, choices, 1);
-            if (picked && picked !== "(auto-select from catalog)") {
-                models[slot] = picked;
-            }
+            const choice = picked[slot]?.[0];
+            if (choice && choice !== auto)
+                models[slot] = choice;
+            else
+                delete models[slot];
         }
     }
     if (!Object.keys(models).length && !shouldPick) {
@@ -280,7 +289,19 @@ export async function runClaudeConfig(config, configPath, options = {}) {
         ? { ...raw.claude_models }
         : {};
     Object.assign(existing, models);
-    raw.claude_models = existing;
+    if (shouldPick) {
+        const slots = options.pick && options.pick.length > 0
+            ? options.pick
+            : ["sonnet", "haiku", "opus"];
+        for (const slot of slots) {
+            if (!models[slot])
+                delete existing[slot];
+        }
+    }
+    if (Object.keys(existing).length === 0)
+        delete raw.claude_models;
+    else
+        raw.claude_models = existing;
     atomicWrite(configPath, Buffer.from(`${JSON.stringify(raw, null, 2)}\n`));
     loadConfig(configPath);
     console.log(`Claude Code tier models updated in ${configPath}:\n${JSON.stringify(raw.claude_models, null, 2)}`);

package/dist/targets/codex.js

@@ -1,6 +1,6 @@
 import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync, statSync, } from "node:fs";
 import { dirname, join } from "node:path";
-import { PROVIDER, STATE_FILES, cleanupStateFiles, dropAgent, fetchCatalog, injectedOwnership, liftContextWindows, originalBytes, readState, reorderCatalog, saveState, sha256Hex, stateBytes, } from "../config.js";
+import { PROVIDER, STATE_FILES, cleanupStateFiles, dropAgent, fetchCatalog, injectedOwnership, liftContextWindows, originalBytes, readState, reorderCatalog, stampMultiAgentVersion, saveState, sha256Hex, stateBytes, } from "../config.js";
 import { ensureLoopbackProxy, stopProxyProcess } from "../proxy.js";
 import { CPACError, atomicWrite, dominantEol, tomlString } from "../util.js";
 const MODEL_PROVIDER_KEY = /^\s*(?:model_provider|"model_provider"|'model_provider')\s*=/;
@@ -239,6 +239,27 @@ function hasAgentsMaxThreads(content) {
     }
     return false;
 }
+export function stripAgentsMaxThreads(content) {
+    const lines = content.replace(/\r\n/g, "\n").split("\n");
+    const kept = [];
+    let table = "root";
+    for (const line of lines) {
+        if (/^\s*\[/.test(line)) {
+            table = /^\s*\[\s*(?:agents|"agents"|'agents')\s*\]\s*(?:#.*)?$/.test(line)
+                ? "agents"
+                : "other";
+            kept.push(line);
+            continue;
+        }
+        if (table === "agents" && /^\s*max_threads\s*=/.test(line))
+            continue;
+        if (table === "root" &&
+            /^\s*(?:agents|"agents"|'agents')\s*\.\s*max_threads\s*=/.test(line))
+            continue;
+        kept.push(line);
+    }
+    return kept.join("\n");
+}
 export function withMultiAgentV2(content, enabled, eol) {
     let body = stripMultiAgentV2(content);
     if (body && !body.endsWith("\n"))
@@ -247,6 +268,8 @@ export function withMultiAgentV2(content, enabled, eol) {
     return eol === "\n" ? output : output.replace(/\n/g, "\r\n");
 }
 export async function inject(config, v2Off = false, maxContext = false) {
+    v2Off = v2Off || !!config.v2_off;
+    maxContext = maxContext || !!config.max_context;
     const apiKey = process.env[config.api_key_env]?.trim();
     if (!apiKey)
         throw new CPACError(`environment variable ${config.api_key_env} is not set`);
@@ -288,6 +311,7 @@ export async function inject(config, v2Off = false, maxContext = false) {
         catalog.bytes = reorderCatalog(catalog.bytes, config.spawn_models);
     if (maxContext)
         catalog.bytes = liftContextWindows(catalog.bytes);
+    catalog.bytes = stampMultiAgentVersion(catalog.bytes, !v2Off);
     const stateDirExisted = existsSync(config.state_dir);
     if (!state &&
         STATE_FILES.some((name) => existsSync(join(config.state_dir, name)))) {
@@ -309,11 +333,14 @@ export async function inject(config, v2Off = false, maxContext = false) {
     let injected;
     try {
         injected = buildCodexConfig(original, proxy.port, catalogPath);
-        const injectedText = new TextDecoder("utf-8").decode(injected);
-        injected = Buffer.from(withMultiAgentV2(injectedText, !v2Off, dominantEol(injectedText)));
+        let injectedText = new TextDecoder("utf-8").decode(injected);
+        const eol = dominantEol(injectedText);
         if (!v2Off && hasAgentsMaxThreads(injectedText)) {
-            console.warn("warning: [agents] max_threads is set; codex refuses to start with multi_agent_v2 enabled, remove it");
+            const stripped = stripAgentsMaxThreads(injectedText);
+            injectedText = eol === "\n" ? stripped : stripped.replace(/\n/g, "\r\n");
+            console.warn("stripped [agents] max_threads (codex refuses it with multi_agent_v2)");
         }
+        injected = Buffer.from(withMultiAgentV2(injectedText, !v2Off, eol));
     }
     catch (error) {
         if (startedProxy)

package/dist/targets/pi.js

@@ -1,51 +1,135 @@
 import { existsSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
+import { join } from "node:path";
 import { dropAgent, recordAgent } from "../config.js";
 import { stopProxyProcess } from "../proxy.js";
-import { CPACError, atomicWrite, ensureCpacBackup, expandUserPath, } from "../util.js";
-export function piExtensionsDir() {
-    return join(expandUserPath(process.env.PI_CODING_AGENT_DIR?.trim() || join(homedir(), ".pi", "agent")), "extensions");
+import { CPACError, atomicWrite, expandUserPath, objectValue, } from "../util.js";
+export const PI_PACKAGE = "npm:@yhong91/cpac";
+const PI_PACKAGE_NAME = "@yhong91/cpac";
+const LEGACY_EXTENSIONS = ["pi-cpac.ts", "cpac.ts", "pi-cpa.ts"];
+export function piAgentDir() {
+    return expandUserPath(process.env.PI_CODING_AGENT_DIR?.trim() || join(homedir(), ".pi", "agent"));
 }
-export function isPiExtensionInstalled() {
-    const dir = piExtensionsDir();
-    return existsSync(join(dir, "pi-cpac.ts")) || existsSync(join(dir, "cpac.ts"));
+export function piSettingsPath() {
+    return join(piAgentDir(), "settings.json");
+}
+function leftoverExtensions() {
+    const dir = join(piAgentDir(), "extensions");
+    return LEGACY_EXTENSIONS.map((name) => join(dir, name)).filter(existsSync);
+}
+function specName(source) {
+    const rest = source.startsWith("npm:") ? source.slice(4) : source;
+    if (rest.startsWith("@")) {
+        const cut = rest.lastIndexOf("@");
+        return cut > 0 ? rest.slice(0, cut) : rest;
+    }
+    const cut = rest.lastIndexOf("@");
+    return cut === -1 ? rest : rest.slice(0, cut);
+}
+function packageSource(entry) {
+    if (typeof entry === "string")
+        return entry.replace(/^-/, "");
+    if (objectValue(entry) && typeof entry.source === "string")
+        return entry.source;
+}
+function isCpacPackage(entry) {
+    const source = packageSource(entry);
+    return source !== undefined && specName(source) === PI_PACKAGE_NAME;
+}
+function isEnabledCpacPackage(entry) {
+    if (!isCpacPackage(entry))
+        return false;
+    if (typeof entry === "string")
+        return !entry.startsWith("-");
+    return !objectValue(entry) || entry.enabled !== false;
+}
+function readSettings(path) {
+    let raw;
+    try {
+        raw = JSON.parse(readFileSync(path, "utf8"));
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return {};
+        throw new CPACError(`cannot parse Pi settings: ${path}`);
+    }
+    if (!objectValue(raw)) {
+        throw new CPACError(`Pi settings must be a JSON object: ${path}`);
+    }
+    return raw;
+}
+function settingsPackages(settings, path) {
+    if (!Object.hasOwn(settings, "packages"))
+        return undefined;
+    if (!Array.isArray(settings.packages)) {
+        throw new CPACError(`Pi settings packages must be an array: ${path}`);
+    }
+    return settings.packages;
+}
+function writeSettings(path, value) {
+    atomicWrite(path, Buffer.from(`${JSON.stringify(value, null, 2)}\n`));
 }
-function piTemplatePath() {
-    return join(dirname(fileURLToPath(import.meta.url)), "..", "pi-extension.template");
+function removeLeftovers() {
+    const removed = [];
+    for (const file of leftoverExtensions()) {
+        unlinkSync(file);
+        removed.push(file);
+    }
+    return removed;
 }
-function piExtensionContent(cpaUrl) {
-    return readFileSync(piTemplatePath(), "utf8").replace("__CPA_URL__", cpaUrl);
+export function isPiExtensionInstalled() {
+    if (leftoverExtensions().length > 0)
+        return true;
+    const path = piSettingsPath();
+    if (!existsSync(path))
+        return false;
+    try {
+        const packages = settingsPackages(readSettings(path), path);
+        return packages?.some(isEnabledCpacPackage) ?? false;
+    }
+    catch {
+        return false;
+    }
 }
 export async function installPiExtension(config) {
-    const dir = piExtensionsDir();
-    mkdirSync(dir, { recursive: true, mode: 0o700 });
-    const target = join(dir, "pi-cpac.ts");
-    ensureCpacBackup(config.state_dir, "pi", target, !isPiExtensionInstalled());
-    atomicWrite(target, Buffer.from(piExtensionContent(config.cpa_url)), 0o644);
-    recordAgent(config.state_dir, "pi", target);
-    for (const legacy of ["cpac.ts", "pi-cpa.ts"]) {
-        const legacyPath = join(dir, legacy);
-        if (existsSync(legacyPath) && legacyPath !== target) {
-            try {
-                unlinkSync(legacyPath);
-            }
-            catch { }
-        }
+    const path = piSettingsPath();
+    mkdirSync(piAgentDir(), { recursive: true, mode: 0o700 });
+    const settings = existsSync(path) ? readSettings(path) : {};
+    const packages = settingsPackages(settings, path) ?? [];
+    if (!packages.some(isEnabledCpacPackage)) {
+        settings.packages = [
+            ...packages.filter((entry) => !isCpacPackage(entry)),
+            PI_PACKAGE,
+        ];
+        writeSettings(path, settings);
+    }
+    recordAgent(config.state_dir, "pi", path);
+    for (const file of removeLeftovers()) {
+        console.log(`Removed leftover Pi extension: ${file}`);
     }
-    console.log(`Installed Pi extension: ${target}`);
+    console.log(`Installed Pi package ${PI_PACKAGE} in ${path}`);
 }
 export async function uninstallPiExtension(config) {
-    const dir = piExtensionsDir();
-    const target = join(dir, "pi-cpac.ts");
-    const legacyTargets = [join(dir, "cpac.ts"), join(dir, "pi-cpa.ts")];
+    const path = piSettingsPath();
     let removed = false;
-    for (const file of [target, ...legacyTargets]) {
-        if (existsSync(file)) {
-            unlinkSync(file);
-            console.log(`Removed Pi extension: ${file}`);
-            removed = true;
+    for (const file of removeLeftovers()) {
+        console.log(`Removed leftover Pi extension: ${file}`);
+        removed = true;
+    }
+    if (existsSync(path)) {
+        try {
+            const settings = readSettings(path);
+            const packages = settingsPackages(settings, path);
+            if (packages?.some(isCpacPackage)) {
+                settings.packages = packages.filter((entry) => !isCpacPackage(entry));
+                writeSettings(path, settings);
+                console.log(`Removed Pi package ${PI_PACKAGE} from ${path}`);
+                removed = true;
+            }
+        }
+        catch (error) {
+            if (!removed)
+                throw error;
         }
     }
     if (!removed)