mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-06 10:48:12 +02:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work. > - Its adapters supply model catalogs and reasoning controls to agent setup. > - Several provider releases are missing from the fallback catalogs. > - Some newer models also have effort levels that the UI does not offer. > - Operators need the exact supported IDs and controls when discovery is unavailable. > - This pull request updates the existing adapters from current provider documentation. > - Operators can select current coding models without entering custom IDs. ## Linked Issues or Issue Description **What existing behavior does this improve?** Model selection and reasoning controls across the existing coding-agent adapters. **Subsystem affected** Claude, Codex, Grok, Gemini, Cursor, Kimi, and OpenCode adapters; model discovery tests; agent creation and editing. **Current behavior** The catalogs omit Opus 5.5, GPT-6 Sol/Luna, Grok 4.7/4.6/4.5, current Gemini Flash models, and several Cursor/Kimi choices. Bedrock has obsolete IDs. The UI omits supported effort levels and saves Grok effort under a key the runtime does not read. **Proposed behavior** Offer verified current model IDs and model-specific efforts. Remove retired Gemini 2.0 choices. Keep configured defaults and saved model IDs. Keep runtime discovery for account-specific choices. **Reason and benefit** Catch up with provider releases through September 22, 2026. Correct the picker and runtime controls together. **Breaking changes** No database or API change. Gemini 2.0 options leave the picker after their June 1 shutdown. Existing saved IDs remain unchanged. Corrected Bedrock catalog IDs do not rewrite saved configuration. **Additional context** Supersedes the separate GPT-6 Sol PR #13830. Fable 5.1 was already merged in #12730, and GPT-6 Astra in #12851. The Grok 4.6/4.5 proposal #11324 was closed and parked by its author. This change retains the default-sentinel fix from #12062. Related discovery proposals #13127 and #13565 do not supply these catalog and effort updates. Searches found no open PR for the additional model IDs. See [the dated audit](https://github.com/paperclipai/paperclip/blob/feat/claude-opus-5-5/doc/adapter-model-audit-2026-09-22.md) for exact scope, primary sources, runtime observations, and account-specific limits. This updates existing adapters and does not duplicate planned core work. ## What Changed - Add Opus 5.5 for direct Claude and Bedrock, with a Claude Code 2.1.280 gate. Correct and extend Bedrock model IDs. - Add GPT-6 Sol/Luna and Fast mode. Offer Ultra for Astra/Sol and GPT-5.6 Sol/Terra, and Max for both Luna generations. - Add Grok 4.7/4.6/4.5, expose supported Extra High effort, and save Grok edits under `reasoningEffort`. - Add Gemini Flash 3.8/3.7/3.6/3.5, Flash Lite 3.5/3.1, and 3 Flash Preview. Remove retired 2.0 choices. - Add the current documented Cursor fallback models, including Fable 5.1, Composer 2.5, and Muse Spark 1.3. - Refresh OpenCode fallback IDs used in remote environments from its installed provider registry. - Add Kimi K3 256K. Update the existing coding alias to K2.8 Preview and enable its CLI effort settings. - Use model-specific Claude/Grok efforts in creation and editing. Clear unsupported effort when switching models. - Add catalog, CLI/ACP forwarding, compatibility, and UI persistence coverage. Record the audit and sources. ## Verification - Latest head `6e63c9ef53b54ba869cd4fb431a8570bebe289f4`: 53 CI checks passed, 2 skipped. This includes full workspace typecheck, build, and all test shards. Greptile is 5/5 with zero unresolved threads. GitHub reports no merge conflicts. - 340 focused tests passed across adapter metadata, CLI/ACP arguments, Claude version checks, Kimi effort, Grok execution, server model discovery, and UI effort selection/persistence. - `pnpm --filter @paperclipai/adapter-claude-local --filter @paperclipai/adapter-codex-local --filter @paperclipai/adapter-grok-local --filter @paperclipai/adapter-gemini-local --filter @paperclipai/adapter-kimi-local --filter @paperclipai/adapter-cursor-local --filter @paperclipai/adapter-opencode-local typecheck` — passed. The same filters with `build` passed. - `pnpm check:token-gates` and `git diff --check` — passed. - Full workspace and UI typechecks were attempted locally. They stop on existing missing `three` dependencies in `packages/shared/src/cliplab`. - Full `pnpm test:run` and `pnpm build` were not run locally. Worktree creation exhausted disk space, so a clean dependency install is not feasible on this host. Focused checks reuse existing dependencies. CI supplies full workspace verification. - No provider inference was run. Account-specific runtime model lists were inspected where available. - Manual check: select the new models in agent setup and editing. Confirm Luna has Max but no Ultra, Grok 4.7 has Extra High, and Fable 5.1 has Extra High/Max. Save Grok effort and confirm `adapterConfig.reasoningEffort` contains the selection. ## Risks - Catalog presence does not grant account access. Older CLIs and restricted accounts can reject a model. Opus 5.5 has an explicit upgrade check. - Higher effort can increase cost and latency. Existing agent defaults are unchanged. - Cursor fallback IDs come from public model documentation; the local account exposed no live catalog. Runtime discovery still adds account-specific variants. - Kimi effort remains supported only on its explicit CLI engine. This does not add effort support to its default ACP engine. - Saved obsolete Bedrock or retired Gemini IDs are not migrated automatically. ## Model Used OpenAI GPT-6 through Codex, with reasoning, tool use, and code execution. The exact deployment ID and context window are not exposed to this session. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
172 lines
6.0 KiB
TypeScript
172 lines
6.0 KiB
TypeScript
import { createHash } from "node:crypto";
|
|
import type { AdapterModel } from "@paperclipai/adapter-utils";
|
|
import { models as DIRECT_MODELS } from "../index.js";
|
|
|
|
const ANTHROPIC_MODELS_ENDPOINT = "/v1/models";
|
|
const ANTHROPIC_MODELS_TIMEOUT_MS = 5000;
|
|
const ANTHROPIC_MODELS_CACHE_TTL_MS = 60_000;
|
|
const ANTHROPIC_API_VERSION = "2023-06-01";
|
|
|
|
/** AWS Bedrock model IDs — region-qualified identifiers required by the Bedrock API. */
|
|
const BEDROCK_MODELS: AdapterModel[] = [
|
|
{ id: "us.anthropic.claude-opus-4-8", label: "Bedrock Opus 4.8" },
|
|
{ id: "us.anthropic.claude-opus-5-5", label: "Bedrock Opus 5.5" },
|
|
{ id: "us.anthropic.claude-opus-5", label: "Bedrock Opus 5" },
|
|
{ id: "us.anthropic.claude-sonnet-5", label: "Bedrock Sonnet 5" },
|
|
// Fable 5.1's documented geo inference ID carries no -v1 suffix, unlike earlier entries.
|
|
{ id: "us.anthropic.claude-fable-5-1", label: "Bedrock Fable 5.1" },
|
|
{ id: "us.anthropic.claude-fable-5", label: "Bedrock Fable 5" },
|
|
{ id: "us.anthropic.claude-opus-4-7", label: "Bedrock Opus 4.7" },
|
|
{ id: "us.anthropic.claude-sonnet-4-6", label: "Bedrock Sonnet 4.6" },
|
|
{ id: "us.anthropic.claude-opus-4-6-v1", label: "Bedrock Opus 4.6" },
|
|
{ id: "us.anthropic.claude-sonnet-4-5-20250929-v2:0", label: "Bedrock Sonnet 4.5" },
|
|
{ id: "us.anthropic.claude-haiku-4-5-20251001-v1:0", label: "Bedrock Haiku 4.5" },
|
|
];
|
|
|
|
let cached: { keyFingerprint: string; baseUrl: string; expiresAt: number; models: AdapterModel[] } | null = null;
|
|
|
|
function isBedrockEnv(): boolean {
|
|
return (
|
|
process.env.CLAUDE_CODE_USE_BEDROCK === "1" ||
|
|
process.env.CLAUDE_CODE_USE_BEDROCK === "true" ||
|
|
(typeof process.env.ANTHROPIC_BEDROCK_BASE_URL === "string" &&
|
|
process.env.ANTHROPIC_BEDROCK_BASE_URL.trim().length > 0)
|
|
);
|
|
}
|
|
|
|
function fingerprint(apiKey: string): string {
|
|
const digest = createHash("sha256").update(apiKey).digest("base64url").slice(0, 16);
|
|
return `${apiKey.length}:${digest}`;
|
|
}
|
|
|
|
function dedupeModels(models: AdapterModel[]): AdapterModel[] {
|
|
const seen = new Set<string>();
|
|
const deduped: AdapterModel[] = [];
|
|
for (const model of models) {
|
|
const id = model.id.trim();
|
|
if (!id || seen.has(id)) continue;
|
|
seen.add(id);
|
|
deduped.push({ id, label: model.label.trim() || id });
|
|
}
|
|
return deduped;
|
|
}
|
|
|
|
function mergedWithFallback(models: AdapterModel[]): AdapterModel[] {
|
|
return dedupeModels([
|
|
...models,
|
|
...DIRECT_MODELS,
|
|
]);
|
|
}
|
|
|
|
function resolveAnthropicApiKey(): string | null {
|
|
const apiKey = process.env.ANTHROPIC_API_KEY?.trim();
|
|
return apiKey && apiKey.length > 0 ? apiKey : null;
|
|
}
|
|
|
|
function resolveAnthropicBaseUrl(): string {
|
|
const baseUrl = process.env.ANTHROPIC_BASE_URL?.trim();
|
|
return baseUrl && baseUrl.length > 0 ? baseUrl.replace(/\/+$/, "") : "https://api.anthropic.com";
|
|
}
|
|
|
|
async function fetchAnthropicModels(apiKey: string, baseUrl: string): Promise<AdapterModel[]> {
|
|
const controller = new AbortController();
|
|
const timeout = setTimeout(() => controller.abort(), ANTHROPIC_MODELS_TIMEOUT_MS);
|
|
try {
|
|
const response = await fetch(`${baseUrl}${ANTHROPIC_MODELS_ENDPOINT}`, {
|
|
headers: {
|
|
"anthropic-version": ANTHROPIC_API_VERSION,
|
|
"x-api-key": apiKey,
|
|
},
|
|
signal: controller.signal,
|
|
});
|
|
if (!response.ok) return [];
|
|
|
|
const payload = (await response.json()) as { data?: unknown };
|
|
const data = Array.isArray(payload.data) ? payload.data : [];
|
|
const models: AdapterModel[] = [];
|
|
for (const item of data) {
|
|
if (typeof item !== "object" || item === null) continue;
|
|
const record = item as { id?: unknown; display_name?: unknown };
|
|
if (typeof record.id !== "string" || record.id.trim().length === 0) continue;
|
|
const displayName =
|
|
typeof record.display_name === "string" && record.display_name.trim().length > 0
|
|
? record.display_name
|
|
: record.id;
|
|
models.push({
|
|
id: record.id,
|
|
label: displayName,
|
|
});
|
|
}
|
|
return dedupeModels(models);
|
|
} catch (error) {
|
|
console.warn("[paperclip] Claude model discovery failed", {
|
|
error: error instanceof Error ? error.message : String(error),
|
|
});
|
|
return [];
|
|
} finally {
|
|
clearTimeout(timeout);
|
|
}
|
|
}
|
|
|
|
async function loadClaudeModels(options?: { forceRefresh?: boolean }): Promise<AdapterModel[]> {
|
|
if (isBedrockEnv()) return dedupeModels(BEDROCK_MODELS);
|
|
|
|
const fallback = dedupeModels(DIRECT_MODELS);
|
|
const apiKey = resolveAnthropicApiKey();
|
|
if (!apiKey) return fallback;
|
|
|
|
const now = Date.now();
|
|
const baseUrl = resolveAnthropicBaseUrl();
|
|
const keyFingerprint = fingerprint(apiKey);
|
|
if (
|
|
options?.forceRefresh !== true &&
|
|
cached &&
|
|
cached.keyFingerprint === keyFingerprint &&
|
|
cached.baseUrl === baseUrl &&
|
|
cached.expiresAt > now
|
|
) {
|
|
return cached.models;
|
|
}
|
|
|
|
const fetched = await fetchAnthropicModels(apiKey, baseUrl);
|
|
if (fetched.length > 0) {
|
|
const merged = mergedWithFallback(fetched);
|
|
cached = {
|
|
keyFingerprint,
|
|
baseUrl,
|
|
expiresAt: now + ANTHROPIC_MODELS_CACHE_TTL_MS,
|
|
models: merged,
|
|
};
|
|
return merged;
|
|
}
|
|
|
|
if (cached && cached.keyFingerprint === keyFingerprint && cached.baseUrl === baseUrl && cached.models.length > 0) {
|
|
return cached.models;
|
|
}
|
|
|
|
return fallback;
|
|
}
|
|
|
|
/**
|
|
* Return the model list appropriate for the current auth mode.
|
|
* When Bedrock env vars are detected, returns Bedrock-native model IDs;
|
|
* otherwise returns standard Anthropic API model IDs.
|
|
*/
|
|
export async function listClaudeModels(): Promise<AdapterModel[]> {
|
|
return loadClaudeModels();
|
|
}
|
|
|
|
export async function refreshClaudeModels(): Promise<AdapterModel[]> {
|
|
return loadClaudeModels({ forceRefresh: true });
|
|
}
|
|
|
|
export function resetClaudeModelsCacheForTests() {
|
|
cached = null;
|
|
}
|
|
|
|
/** Check whether a model ID is a Bedrock-native identifier (not an Anthropic API short name). */
|
|
/** Bedrock model IDs use region-qualified prefixes (e.g. us.anthropic.*, eu.anthropic.*) or ARNs. */
|
|
export function isBedrockModelId(model: string): boolean {
|
|
return /^\w+\.anthropic\./.test(model) || model.startsWith("arn:aws:bedrock:");
|
|
}
|