The FN-2370 auto-resolved squash (7c1a1c36c) reverted three commits' worth
of refinements to the claude-cli provider because the branch contained
rebased duplicates of commits already on main. The auto-resolver picked
the older side line-by-line and dropped the newer.
Restored:
- /api/models filter logic (was inverted; emptied every model picker)
- Claude Opus 4.7 catalog entry in pi-claude-cli
- Provider card status text and toast messages (no longer claim a restart
is needed — the extension is always-loaded now)
- POST /api/auth/claude-cli returns restartRequired: false
Prevention:
- Regression tests on the /api/models useClaudeCli filter
- scripts/audit-squash-merge.mjs flags duplicate-cherry-pick risk and
touched-file overlap on any squash commit
- AGENTS.md documents the rebase-before-squash rule and requires the
merging agent to run the audit and triage every flagged item itself
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
132 lines
4.1 KiB
TypeScript
132 lines
4.1 KiB
TypeScript
/**
|
|
* Pi extension entry point for pi-claude-cli.
|
|
*
|
|
* Registers a custom provider that routes LLM calls through the Claude Code CLI
|
|
* subprocess using stream-json NDJSON protocol.
|
|
*/
|
|
|
|
import { getModels } from "@mariozechner/pi-ai";
|
|
import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
|
|
import { streamViaCli } from "./src/provider.js";
|
|
import {
|
|
validateCliPresence,
|
|
validateCliAuth,
|
|
killAllProcesses,
|
|
} from "./src/process-manager.js";
|
|
import { getCustomToolDefs, writeMcpConfig } from "./src/mcp-config.js";
|
|
|
|
// Kill all active Claude subprocesses on process exit to prevent orphans
|
|
process.on("exit", killAllProcesses);
|
|
|
|
const PROVIDER_ID = "pi-claude-cli";
|
|
|
|
let mcpConfigPath: string | undefined;
|
|
let mcpConfigResolved = false;
|
|
|
|
/**
|
|
* Lazily generate MCP config on first request (not at load time).
|
|
* pi.getAllTools() fails during extension loading; this defers it
|
|
* until the pi runtime is fully initialized.
|
|
*
|
|
* Only locks (sets mcpConfigResolved) when getAllTools() returns a
|
|
* real array — if it returns undefined/null (registry not ready),
|
|
* we retry on the next request. Once the registry is ready we
|
|
* commit to the result even if there are zero custom tools.
|
|
*
|
|
* Uses warn-don't-block: failure logs a warning but does not
|
|
* prevent the provider from functioning (built-ins still work).
|
|
*/
|
|
function ensureMcpConfig(pi: ExtensionAPI): string | undefined {
|
|
if (mcpConfigResolved) return mcpConfigPath;
|
|
try {
|
|
const allTools = pi.getAllTools();
|
|
|
|
// Registry not ready yet — don't lock, retry on next call
|
|
if (!Array.isArray(allTools)) {
|
|
return mcpConfigPath;
|
|
}
|
|
|
|
// Registry is ready — lock regardless of whether custom tools exist
|
|
mcpConfigResolved = true;
|
|
|
|
const toolDefs = getCustomToolDefs(pi);
|
|
if (toolDefs.length > 0) {
|
|
mcpConfigPath = writeMcpConfig(toolDefs);
|
|
console.error(
|
|
`[pi-claude-cli] MCP config generated with ${toolDefs.length} custom tool(s)`,
|
|
);
|
|
}
|
|
} catch (err) {
|
|
console.warn(
|
|
"[pi-claude-cli] MCP config generation failed, custom tools unavailable:",
|
|
err,
|
|
);
|
|
}
|
|
return mcpConfigPath;
|
|
}
|
|
|
|
export default function (pi: ExtensionAPI) {
|
|
try {
|
|
// Startup validation
|
|
validateCliPresence(); // throws if CLI not on PATH
|
|
validateCliAuth(); // warns if not authenticated
|
|
|
|
const catalogModels = getModels("anthropic").map((model) => ({
|
|
id: model.id,
|
|
name: model.name,
|
|
reasoning: model.reasoning,
|
|
input: model.input,
|
|
cost: model.cost,
|
|
contextWindow: model.contextWindow,
|
|
maxTokens: model.maxTokens,
|
|
}));
|
|
|
|
// Newer models released after the pinned @mariozechner/pi-ai catalog
|
|
// was generated. Dedupe by id so this list is harmless once the upstream
|
|
// catalog catches up.
|
|
// https://platform.claude.com/docs/en/about-claude/models/overview
|
|
const extraModels: typeof catalogModels = [
|
|
{
|
|
id: "claude-opus-4-7",
|
|
name: "Claude Opus 4.7",
|
|
reasoning: true,
|
|
input: ["text", "image"],
|
|
cost: { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 },
|
|
contextWindow: 1_000_000,
|
|
maxTokens: 128_000,
|
|
},
|
|
];
|
|
|
|
const seen = new Set(catalogModels.map((m) => m.id));
|
|
const models = [
|
|
...catalogModels,
|
|
...extraModels.filter((m) => !seen.has(m.id)),
|
|
];
|
|
|
|
// Ensure all registered tools are active so pi can execute them.
|
|
// Some tools (find, grep, ls) are registered but not activated by default.
|
|
pi.on("session_start", async () => {
|
|
const allTools = pi.getAllTools();
|
|
if (Array.isArray(allTools)) {
|
|
pi.setActiveTools(allTools.map((t: { name: string }) => t.name));
|
|
}
|
|
});
|
|
|
|
pi.registerProvider(PROVIDER_ID, {
|
|
baseUrl: "pi-claude-cli",
|
|
apiKey: "unused",
|
|
api: "pi-claude-cli",
|
|
models,
|
|
streamSimple: (model, context, options) => {
|
|
const configPath = ensureMcpConfig(pi);
|
|
return streamViaCli(model, context, {
|
|
...options,
|
|
mcpConfigPath: configPath,
|
|
});
|
|
},
|
|
});
|
|
} catch (err) {
|
|
console.error(`[pi-claude-cli] Failed to register provider:`, err);
|
|
}
|
|
}
|