Discover Claude models from the live harness#21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
logancsack merged 2 commits into from
Jul 26, 2026
Merged

Discover Claude models from the live harness #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f63e8b3
Discover Claude models from the live harness
logancsack Jul 26, 2026
fdd344d
Preserve efforts for discovered Claude models
logancsack Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions apps/server/src/provider/Layers/ClaudeAdapter.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -530,6 +530,29 @@ describe("ClaudeAdapterLive", () => {
);
});

it.effect("preserves xhigh effort for a newly discovered Claude model", () => {
const harness = makeHarness();
return Effect.gen(function* () {
const adapter = yield* ClaudeAdapter;
yield* adapter.startSession({
threadId: THREAD_ID,
provider: ProviderDriverKind.make("claudeAgent"),
modelSelection: createModelSelection(
ProviderInstanceId.make("claudeAgent"),
"claude-sonnet-6",
[{ id: "effort", value: "xhigh" }],
),
runtimeMode: "full-access",
});

const createInput = harness.getLastCreateQueryInput();
assert.equal(createInput?.options.effort, "xhigh");
}).pipe(
Effect.provideService(Random.Random, makeDeterministicRandomService()),
Effect.provide(harness.layer),
);
});

it.effect("falls back to default effort when unsupported max is requested for Sonnet 4.6", () => {
const harness = makeHarness();
return Effect.gen(function* () {
Expand Down
34 changes: 33 additions & 1 deletion apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,14 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
" agents: [],",
' output_style: "default",',
' available_output_styles: ["default"],',
" models: [],",
" models: [{",
' value: "claude-sonnet-6",',
' displayName: "Claude Sonnet 6",',
' description: "Newest Sonnet",',
" supportsEffort: true,",
' supportedEffortLevels: ["medium", "xhigh"],',
" supportsFastMode: true,",
" }],",
' account: { email: "dev@example.com", subscriptionType: "pro", tokenSource: "oauth" },',
" },",
" },",
Expand DownExpand Up@@ -117,6 +124,31 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
input: { hint: "[path]" },
},
],
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: {
optionDescriptors: [
{
id: "effort",
label: "Reasoning",
type: "select",
options: [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
],
},
{
id: "fastMode",
label: "Fast Mode",
type: "boolean",
},
],
},
},
],
});

// @effect-diagnostics-next-line preferSchemaOverJson:off
Expand Down
99 changes: 91 additions & 8 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { resolveSpawnCommand } from "@t3tools/shared/shell";
import { compareSemverVersions } from "@t3tools/shared/semver";
import {
query as claudeQuery,
type ModelInfo as ClaudeModelInfo,
type Options as ClaudeQueryOptions,
type SlashCommand as ClaudeSlashCommand,
type SDKUserMessage,
Expand All@@ -46,6 +47,25 @@ import { discoverClaudeSkills } from "../Drivers/ClaudeSkills.ts";
const DEFAULT_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [],
});
const FUTURE_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
],
}),
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
],
});

const CLAUDE_PRESENTATION = {
displayName: "Claude",
Expand All@@ -54,6 +74,7 @@ const CLAUDE_PRESENTATION = {
const MINIMUM_CLAUDE_FABLE_5_VERSION = "2.1.169";
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";
const CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX = new Set(["claude-opus-4-7"]);

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
Expand DownExpand Up@@ -320,10 +341,70 @@ export function getClaudeModelCapabilities(model: string | null | undefined): Mo
const slug = model?.trim();
return (
BUILT_IN_MODELS.find((candidate) => candidate.slug === slug)?.capabilities ??
DEFAULT_CLAUDE_MODEL_CAPABILITIES
FUTURE_CLAUDE_MODEL_CAPABILITIES
Comment thread
logancsack marked this conversation as resolved.
);
}

function labelClaudeEffort(value: string): string {
return value === "xhigh"
? "Extra High"
: value.charAt(0).toUpperCase() + value.slice(1).toLowerCase();
}

function discoveredClaudeModelCapabilities(model: ClaudeModelInfo): ModelCapabilities {
const known = BUILT_IN_MODELS.find((candidate) => candidate.slug === model.value);
if (known?.capabilities) {
return known.capabilities;
}

const effortLevels = model.supportedEffortLevels ?? [];
return createModelCapabilities({
optionDescriptors: [
...(model.supportsEffort && effortLevels.length > 0
? [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: effortLevels.map((value) => ({
value,
label: labelClaudeEffort(value),
})),
}),
]
: []),
...(model.supportsFastMode
? [
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
]
: []),
],
});
}

export function parseClaudeInitializationModels(
models: ReadonlyArray<ClaudeModelInfo> | undefined,
): ReadonlyArray<ServerProviderModel> {
const discovered: ServerProviderModel[] = [];
const seen = new Set<string>();
for (const model of models ?? []) {
const slug = model.value.trim();
if (!slug || seen.has(slug)) {
continue;
}
seen.add(slug);
discovered.push({
slug,
name: model.displayName.trim() || slug,
isCustom: false,
capabilities: discoveredClaudeModelCapabilities(model),
});
}
return discovered;
}

export function resolveClaudeEffort(
caps: ModelCapabilities,
raw: string | null | undefined,
Expand DownExpand Up@@ -357,12 +438,7 @@ export function normalizeClaudeCliEffort(
if (effort === "ultracode") {
return "xhigh";
}
if (
effort === "xhigh" &&
model !== "claude-fable-5" &&
model !== "claude-opus-4-8" &&
model !== "claude-sonnet-5"
) {
if (effort === "xhigh" && model && CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX.has(model)) {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
Expand DownExpand Up@@ -566,6 +642,7 @@ type ClaudeCapabilitiesProbe = {
*/
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function parseClaudeInitializationCommands(
Expand DownExpand Up@@ -695,6 +772,7 @@ const probeClaudeCapabilities = (
tokenSource: account?.tokenSource,
apiProvider: account?.apiProvider,
slashCommands: parseClaudeInitializationCommands(init.commands),
models: parseClaudeInitializationModels(init.models),
} satisfies ClaudeCapabilitiesProbe;
});
}).pipe(
Expand DownExpand Up@@ -832,7 +910,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
});
}

const models = providerModelsFromSettings(
const fallbackModels = providerModelsFromSettings(
getBuiltInClaudeModelsForVersion(parsedVersion),
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
Expand All@@ -848,6 +926,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
: undefined;
const models = providerModelsFromSettings(
capabilities?.models.length ? capabilities.models : fallbackModels,

@chatgpt-codex-connectorchatgpt-codex-connectorBotJul 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Replace stale models when applying a live Claude catalog

During normal startup this selects the account-specific catalog, but the refresh is merged into makePendingClaudeProvider's snapshot, which already contains every built-in model. mergeProviderSnapshot in ProviderRegistry.ts retains missing models for every non-OpenCode provider and appends them at lines 81-83 and 120-123, so unavailable built-ins—and cached models discovered under a previous Claude account—remain visible and selectable after a successful live probe. Successful Claude inventories need to replace, rather than merge with, the pending/cached model list.

Useful? React with 👍 / 👎.

claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const skills = yield* discoverClaudeSkills(claudeSettings, cwd, resolvedEnvironment);
const slashCommands = capabilities?.slashCommands ?? [];
const dedupedSlashCommands = dedupeSlashCommands(slashCommands);
Expand Down
50 changes: 50 additions & 0 deletions apps/server/src/provider/Layers/ProviderRegistry.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
ProviderInstanceId,
ServerSettings,
type ServerProvider,
type ServerProviderModel,
type ServerProviderSlashCommand,
type ServerSettings as ContractServerSettings,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -103,6 +104,7 @@ type TestClaudeCapabilities = {
readonly tokenSource: string | undefined;
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
Expand All@@ -113,6 +115,7 @@ function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
tokenSource: undefined,
apiProvider: undefined,
slashCommands: [],
models: [],
...overrides,
});
}
Expand DownExpand Up@@ -1867,6 +1870,53 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
),
);

it.effect("uses the live Claude initialization model catalog", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
defaultClaudeSettings,
claudeCapabilities({
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
],
}),
},
],
}),
);

assert.deepStrictEqual(
status.models.map((model) => model.slug),
["claude-sonnet-6"],
);
assert.deepStrictEqual(status.models[0]?.capabilities?.optionDescriptors, [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
]);
}).pipe(
Effect.provide(
mockSpawnerLayer((args) => {
if (args.join(" ") === "--version") {
return { stdout: "2.1.219\n", stderr: "", code: 0 };
}
throw new Error(`Unexpected args: ${args.join(" ")}`);
}),
),
),
);

it.effect("hides Claude Fable 5 on older Claude Code versions", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Discover Claude models from the live harness#21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
logancsack merged 2 commits into from
Jul 26, 2026
Merged

Discover Claude models from the live harness #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f63e8b3
Discover Claude models from the live harness
logancsack Jul 26, 2026
fdd344d
Preserve efforts for discovered Claude models
logancsack Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions apps/server/src/provider/Layers/ClaudeAdapter.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -530,6 +530,29 @@ describe("ClaudeAdapterLive", () => {
);
});

it.effect("preserves xhigh effort for a newly discovered Claude model", () => {
const harness = makeHarness();
return Effect.gen(function* () {
const adapter = yield* ClaudeAdapter;
yield* adapter.startSession({
threadId: THREAD_ID,
provider: ProviderDriverKind.make("claudeAgent"),
modelSelection: createModelSelection(
ProviderInstanceId.make("claudeAgent"),
"claude-sonnet-6",
[{ id: "effort", value: "xhigh" }],
),
runtimeMode: "full-access",
});

const createInput = harness.getLastCreateQueryInput();
assert.equal(createInput?.options.effort, "xhigh");
}).pipe(
Effect.provideService(Random.Random, makeDeterministicRandomService()),
Effect.provide(harness.layer),
);
});

it.effect("falls back to default effort when unsupported max is requested for Sonnet 4.6", () => {
const harness = makeHarness();
return Effect.gen(function* () {
Expand Down
34 changes: 33 additions & 1 deletion apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,14 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
" agents: [],",
' output_style: "default",',
' available_output_styles: ["default"],',
" models: [],",
" models: [{",
' value: "claude-sonnet-6",',
' displayName: "Claude Sonnet 6",',
' description: "Newest Sonnet",',
" supportsEffort: true,",
' supportedEffortLevels: ["medium", "xhigh"],',
" supportsFastMode: true,",
" }],",
' account: { email: "dev@example.com", subscriptionType: "pro", tokenSource: "oauth" },',
" },",
" },",
Expand DownExpand Up@@ -117,6 +124,31 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
input: { hint: "[path]" },
},
],
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: {
optionDescriptors: [
{
id: "effort",
label: "Reasoning",
type: "select",
options: [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
],
},
{
id: "fastMode",
label: "Fast Mode",
type: "boolean",
},
],
},
},
],
});

// @effect-diagnostics-next-line preferSchemaOverJson:off
Expand Down
99 changes: 91 additions & 8 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { resolveSpawnCommand } from "@t3tools/shared/shell";
import { compareSemverVersions } from "@t3tools/shared/semver";
import {
query as claudeQuery,
type ModelInfo as ClaudeModelInfo,
type Options as ClaudeQueryOptions,
type SlashCommand as ClaudeSlashCommand,
type SDKUserMessage,
Expand All@@ -46,6 +47,25 @@ import { discoverClaudeSkills } from "../Drivers/ClaudeSkills.ts";
const DEFAULT_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [],
});
const FUTURE_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
],
}),
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
],
});

const CLAUDE_PRESENTATION = {
displayName: "Claude",
Expand All@@ -54,6 +74,7 @@ const CLAUDE_PRESENTATION = {
const MINIMUM_CLAUDE_FABLE_5_VERSION = "2.1.169";
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";
const CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX = new Set(["claude-opus-4-7"]);

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
Expand DownExpand Up@@ -320,10 +341,70 @@ export function getClaudeModelCapabilities(model: string | null | undefined): Mo
const slug = model?.trim();
return (
BUILT_IN_MODELS.find((candidate) => candidate.slug === slug)?.capabilities ??
DEFAULT_CLAUDE_MODEL_CAPABILITIES
FUTURE_CLAUDE_MODEL_CAPABILITIES
Comment thread
logancsack marked this conversation as resolved.
);
}

function labelClaudeEffort(value: string): string {
return value === "xhigh"
? "Extra High"
: value.charAt(0).toUpperCase() + value.slice(1).toLowerCase();
}

function discoveredClaudeModelCapabilities(model: ClaudeModelInfo): ModelCapabilities {
const known = BUILT_IN_MODELS.find((candidate) => candidate.slug === model.value);
if (known?.capabilities) {
return known.capabilities;
}

const effortLevels = model.supportedEffortLevels ?? [];
return createModelCapabilities({
optionDescriptors: [
...(model.supportsEffort && effortLevels.length > 0
? [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: effortLevels.map((value) => ({
value,
label: labelClaudeEffort(value),
})),
}),
]
: []),
...(model.supportsFastMode
? [
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
]
: []),
],
});
}

export function parseClaudeInitializationModels(
models: ReadonlyArray<ClaudeModelInfo> | undefined,
): ReadonlyArray<ServerProviderModel> {
const discovered: ServerProviderModel[] = [];
const seen = new Set<string>();
for (const model of models ?? []) {
const slug = model.value.trim();
if (!slug || seen.has(slug)) {
continue;
}
seen.add(slug);
discovered.push({
slug,
name: model.displayName.trim() || slug,
isCustom: false,
capabilities: discoveredClaudeModelCapabilities(model),
});
}
return discovered;
}

export function resolveClaudeEffort(
caps: ModelCapabilities,
raw: string | null | undefined,
Expand DownExpand Up@@ -357,12 +438,7 @@ export function normalizeClaudeCliEffort(
if (effort === "ultracode") {
return "xhigh";
}
if (
effort === "xhigh" &&
model !== "claude-fable-5" &&
model !== "claude-opus-4-8" &&
model !== "claude-sonnet-5"
) {
if (effort === "xhigh" && model && CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX.has(model)) {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
Expand DownExpand Up@@ -566,6 +642,7 @@ type ClaudeCapabilitiesProbe = {
*/
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function parseClaudeInitializationCommands(
Expand DownExpand Up@@ -695,6 +772,7 @@ const probeClaudeCapabilities = (
tokenSource: account?.tokenSource,
apiProvider: account?.apiProvider,
slashCommands: parseClaudeInitializationCommands(init.commands),
models: parseClaudeInitializationModels(init.models),
} satisfies ClaudeCapabilitiesProbe;
});
}).pipe(
Expand DownExpand Up@@ -832,7 +910,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
});
}

const models = providerModelsFromSettings(
const fallbackModels = providerModelsFromSettings(
getBuiltInClaudeModelsForVersion(parsedVersion),
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
Expand All@@ -848,6 +926,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
: undefined;
const models = providerModelsFromSettings(
capabilities?.models.length ? capabilities.models : fallbackModels,

@chatgpt-codex-connectorchatgpt-codex-connectorBotJul 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Replace stale models when applying a live Claude catalog

During normal startup this selects the account-specific catalog, but the refresh is merged into makePendingClaudeProvider's snapshot, which already contains every built-in model. mergeProviderSnapshot in ProviderRegistry.ts retains missing models for every non-OpenCode provider and appends them at lines 81-83 and 120-123, so unavailable built-ins—and cached models discovered under a previous Claude account—remain visible and selectable after a successful live probe. Successful Claude inventories need to replace, rather than merge with, the pending/cached model list.

Useful? React with 👍 / 👎.

claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const skills = yield* discoverClaudeSkills(claudeSettings, cwd, resolvedEnvironment);
const slashCommands = capabilities?.slashCommands ?? [];
const dedupedSlashCommands = dedupeSlashCommands(slashCommands);
Expand Down
50 changes: 50 additions & 0 deletions apps/server/src/provider/Layers/ProviderRegistry.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
ProviderInstanceId,
ServerSettings,
type ServerProvider,
type ServerProviderModel,
type ServerProviderSlashCommand,
type ServerSettings as ContractServerSettings,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -103,6 +104,7 @@ type TestClaudeCapabilities = {
readonly tokenSource: string | undefined;
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
Expand All@@ -113,6 +115,7 @@ function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
tokenSource: undefined,
apiProvider: undefined,
slashCommands: [],
models: [],
...overrides,
});
}
Expand DownExpand Up@@ -1867,6 +1870,53 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
),
);

it.effect("uses the live Claude initialization model catalog", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
defaultClaudeSettings,
claudeCapabilities({
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
],
}),
},
],
}),
);

assert.deepStrictEqual(
status.models.map((model) => model.slug),
["claude-sonnet-6"],
);
assert.deepStrictEqual(status.models[0]?.capabilities?.optionDescriptors, [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
]);
}).pipe(
Effect.provide(
mockSpawnerLayer((args) => {
if (args.join(" ") === "--version") {
return { stdout: "2.1.219\n", stderr: "", code: 0 };
}
throw new Error(`Unexpected args: ${args.join(" ")}`);
}),
),
),
);

it.effect("hides Claude Fable 5 on older Claude Code versions", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Discover Claude models from the live harness#21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
logancsack merged 2 commits into from
Jul 26, 2026
Merged

Discover Claude models from the live harness #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f63e8b3
Discover Claude models from the live harness
logancsack Jul 26, 2026
fdd344d
Preserve efforts for discovered Claude models
logancsack Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions apps/server/src/provider/Layers/ClaudeAdapter.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -530,6 +530,29 @@ describe("ClaudeAdapterLive", () => {
);
});

it.effect("preserves xhigh effort for a newly discovered Claude model", () => {
const harness = makeHarness();
return Effect.gen(function* () {
const adapter = yield* ClaudeAdapter;
yield* adapter.startSession({
threadId: THREAD_ID,
provider: ProviderDriverKind.make("claudeAgent"),
modelSelection: createModelSelection(
ProviderInstanceId.make("claudeAgent"),
"claude-sonnet-6",
[{ id: "effort", value: "xhigh" }],
),
runtimeMode: "full-access",
});

const createInput = harness.getLastCreateQueryInput();
assert.equal(createInput?.options.effort, "xhigh");
}).pipe(
Effect.provideService(Random.Random, makeDeterministicRandomService()),
Effect.provide(harness.layer),
);
});

it.effect("falls back to default effort when unsupported max is requested for Sonnet 4.6", () => {
const harness = makeHarness();
return Effect.gen(function* () {
Expand Down
34 changes: 33 additions & 1 deletion apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,14 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
" agents: [],",
' output_style: "default",',
' available_output_styles: ["default"],',
" models: [],",
" models: [{",
' value: "claude-sonnet-6",',
' displayName: "Claude Sonnet 6",',
' description: "Newest Sonnet",',
" supportsEffort: true,",
' supportedEffortLevels: ["medium", "xhigh"],',
" supportsFastMode: true,",
" }],",
' account: { email: "dev@example.com", subscriptionType: "pro", tokenSource: "oauth" },',
" },",
" },",
Expand DownExpand Up@@ -117,6 +124,31 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
input: { hint: "[path]" },
},
],
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: {
optionDescriptors: [
{
id: "effort",
label: "Reasoning",
type: "select",
options: [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
],
},
{
id: "fastMode",
label: "Fast Mode",
type: "boolean",
},
],
},
},
],
});

// @effect-diagnostics-next-line preferSchemaOverJson:off
Expand Down
99 changes: 91 additions & 8 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { resolveSpawnCommand } from "@t3tools/shared/shell";
import { compareSemverVersions } from "@t3tools/shared/semver";
import {
query as claudeQuery,
type ModelInfo as ClaudeModelInfo,
type Options as ClaudeQueryOptions,
type SlashCommand as ClaudeSlashCommand,
type SDKUserMessage,
Expand All@@ -46,6 +47,25 @@ import { discoverClaudeSkills } from "../Drivers/ClaudeSkills.ts";
const DEFAULT_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [],
});
const FUTURE_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
],
}),
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
],
});

const CLAUDE_PRESENTATION = {
displayName: "Claude",
Expand All@@ -54,6 +74,7 @@ const CLAUDE_PRESENTATION = {
const MINIMUM_CLAUDE_FABLE_5_VERSION = "2.1.169";
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";
const CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX = new Set(["claude-opus-4-7"]);

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
Expand DownExpand Up@@ -320,10 +341,70 @@ export function getClaudeModelCapabilities(model: string | null | undefined): Mo
const slug = model?.trim();
return (
BUILT_IN_MODELS.find((candidate) => candidate.slug === slug)?.capabilities ??
DEFAULT_CLAUDE_MODEL_CAPABILITIES
FUTURE_CLAUDE_MODEL_CAPABILITIES
Comment thread
logancsack marked this conversation as resolved.
);
}

function labelClaudeEffort(value: string): string {
return value === "xhigh"
? "Extra High"
: value.charAt(0).toUpperCase() + value.slice(1).toLowerCase();
}

function discoveredClaudeModelCapabilities(model: ClaudeModelInfo): ModelCapabilities {
const known = BUILT_IN_MODELS.find((candidate) => candidate.slug === model.value);
if (known?.capabilities) {
return known.capabilities;
}

const effortLevels = model.supportedEffortLevels ?? [];
return createModelCapabilities({
optionDescriptors: [
...(model.supportsEffort && effortLevels.length > 0
? [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: effortLevels.map((value) => ({
value,
label: labelClaudeEffort(value),
})),
}),
]
: []),
...(model.supportsFastMode
? [
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
]
: []),
],
});
}

export function parseClaudeInitializationModels(
models: ReadonlyArray<ClaudeModelInfo> | undefined,
): ReadonlyArray<ServerProviderModel> {
const discovered: ServerProviderModel[] = [];
const seen = new Set<string>();
for (const model of models ?? []) {
const slug = model.value.trim();
if (!slug || seen.has(slug)) {
continue;
}
seen.add(slug);
discovered.push({
slug,
name: model.displayName.trim() || slug,
isCustom: false,
capabilities: discoveredClaudeModelCapabilities(model),
});
}
return discovered;
}

export function resolveClaudeEffort(
caps: ModelCapabilities,
raw: string | null | undefined,
Expand DownExpand Up@@ -357,12 +438,7 @@ export function normalizeClaudeCliEffort(
if (effort === "ultracode") {
return "xhigh";
}
if (
effort === "xhigh" &&
model !== "claude-fable-5" &&
model !== "claude-opus-4-8" &&
model !== "claude-sonnet-5"
) {
if (effort === "xhigh" && model && CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX.has(model)) {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
Expand DownExpand Up@@ -566,6 +642,7 @@ type ClaudeCapabilitiesProbe = {
*/
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function parseClaudeInitializationCommands(
Expand DownExpand Up@@ -695,6 +772,7 @@ const probeClaudeCapabilities = (
tokenSource: account?.tokenSource,
apiProvider: account?.apiProvider,
slashCommands: parseClaudeInitializationCommands(init.commands),
models: parseClaudeInitializationModels(init.models),
} satisfies ClaudeCapabilitiesProbe;
});
}).pipe(
Expand DownExpand Up@@ -832,7 +910,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
});
}

const models = providerModelsFromSettings(
const fallbackModels = providerModelsFromSettings(
getBuiltInClaudeModelsForVersion(parsedVersion),
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
Expand All@@ -848,6 +926,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
: undefined;
const models = providerModelsFromSettings(
capabilities?.models.length ? capabilities.models : fallbackModels,

@chatgpt-codex-connectorchatgpt-codex-connectorBotJul 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Replace stale models when applying a live Claude catalog

During normal startup this selects the account-specific catalog, but the refresh is merged into makePendingClaudeProvider's snapshot, which already contains every built-in model. mergeProviderSnapshot in ProviderRegistry.ts retains missing models for every non-OpenCode provider and appends them at lines 81-83 and 120-123, so unavailable built-ins—and cached models discovered under a previous Claude account—remain visible and selectable after a successful live probe. Successful Claude inventories need to replace, rather than merge with, the pending/cached model list.

Useful? React with 👍 / 👎.

claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const skills = yield* discoverClaudeSkills(claudeSettings, cwd, resolvedEnvironment);
const slashCommands = capabilities?.slashCommands ?? [];
const dedupedSlashCommands = dedupeSlashCommands(slashCommands);
Expand Down
50 changes: 50 additions & 0 deletions apps/server/src/provider/Layers/ProviderRegistry.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
ProviderInstanceId,
ServerSettings,
type ServerProvider,
type ServerProviderModel,
type ServerProviderSlashCommand,
type ServerSettings as ContractServerSettings,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -103,6 +104,7 @@ type TestClaudeCapabilities = {
readonly tokenSource: string | undefined;
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
Expand All@@ -113,6 +115,7 @@ function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
tokenSource: undefined,
apiProvider: undefined,
slashCommands: [],
models: [],
...overrides,
});
}
Expand DownExpand Up@@ -1867,6 +1870,53 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
),
);

it.effect("uses the live Claude initialization model catalog", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
defaultClaudeSettings,
claudeCapabilities({
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
],
}),
},
],
}),
);

assert.deepStrictEqual(
status.models.map((model) => model.slug),
["claude-sonnet-6"],
);
assert.deepStrictEqual(status.models[0]?.capabilities?.optionDescriptors, [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
]);
}).pipe(
Effect.provide(
mockSpawnerLayer((args) => {
if (args.join(" ") === "--version") {
return { stdout: "2.1.219\n", stderr: "", code: 0 };
}
throw new Error(`Unexpected args: ${args.join(" ")}`);
}),
),
),
);

it.effect("hides Claude Fable 5 on older Claude Code versions", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Discover Claude models from the live harness#21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
logancsack merged 2 commits into from
Jul 26, 2026
Merged

Discover Claude models from the live harness #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f63e8b3
Discover Claude models from the live harness
logancsack Jul 26, 2026
fdd344d
Preserve efforts for discovered Claude models
logancsack Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions apps/server/src/provider/Layers/ClaudeAdapter.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -530,6 +530,29 @@ describe("ClaudeAdapterLive", () => {
);
});

it.effect("preserves xhigh effort for a newly discovered Claude model", () => {
const harness = makeHarness();
return Effect.gen(function* () {
const adapter = yield* ClaudeAdapter;
yield* adapter.startSession({
threadId: THREAD_ID,
provider: ProviderDriverKind.make("claudeAgent"),
modelSelection: createModelSelection(
ProviderInstanceId.make("claudeAgent"),
"claude-sonnet-6",
[{ id: "effort", value: "xhigh" }],
),
runtimeMode: "full-access",
});

const createInput = harness.getLastCreateQueryInput();
assert.equal(createInput?.options.effort, "xhigh");
}).pipe(
Effect.provideService(Random.Random, makeDeterministicRandomService()),
Effect.provide(harness.layer),
);
});

it.effect("falls back to default effort when unsupported max is requested for Sonnet 4.6", () => {
const harness = makeHarness();
return Effect.gen(function* () {
Expand Down
34 changes: 33 additions & 1 deletion apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,14 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
" agents: [],",
' output_style: "default",',
' available_output_styles: ["default"],',
" models: [],",
" models: [{",
' value: "claude-sonnet-6",',
' displayName: "Claude Sonnet 6",',
' description: "Newest Sonnet",',
" supportsEffort: true,",
' supportedEffortLevels: ["medium", "xhigh"],',
" supportsFastMode: true,",
" }],",
' account: { email: "dev@example.com", subscriptionType: "pro", tokenSource: "oauth" },',
" },",
" },",
Expand DownExpand Up@@ -117,6 +124,31 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
input: { hint: "[path]" },
},
],
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: {
optionDescriptors: [
{
id: "effort",
label: "Reasoning",
type: "select",
options: [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
],
},
{
id: "fastMode",
label: "Fast Mode",
type: "boolean",
},
],
},
},
],
});

// @effect-diagnostics-next-line preferSchemaOverJson:off
Expand Down
99 changes: 91 additions & 8 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { resolveSpawnCommand } from "@t3tools/shared/shell";
import { compareSemverVersions } from "@t3tools/shared/semver";
import {
query as claudeQuery,
type ModelInfo as ClaudeModelInfo,
type Options as ClaudeQueryOptions,
type SlashCommand as ClaudeSlashCommand,
type SDKUserMessage,
Expand All@@ -46,6 +47,25 @@ import { discoverClaudeSkills } from "../Drivers/ClaudeSkills.ts";
const DEFAULT_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [],
});
const FUTURE_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
],
}),
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
],
});

const CLAUDE_PRESENTATION = {
displayName: "Claude",
Expand All@@ -54,6 +74,7 @@ const CLAUDE_PRESENTATION = {
const MINIMUM_CLAUDE_FABLE_5_VERSION = "2.1.169";
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";
const CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX = new Set(["claude-opus-4-7"]);

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
Expand DownExpand Up@@ -320,10 +341,70 @@ export function getClaudeModelCapabilities(model: string | null | undefined): Mo
const slug = model?.trim();
return (
BUILT_IN_MODELS.find((candidate) => candidate.slug === slug)?.capabilities ??
DEFAULT_CLAUDE_MODEL_CAPABILITIES
FUTURE_CLAUDE_MODEL_CAPABILITIES
Comment thread
logancsack marked this conversation as resolved.
);
}

function labelClaudeEffort(value: string): string {
return value === "xhigh"
? "Extra High"
: value.charAt(0).toUpperCase() + value.slice(1).toLowerCase();
}

function discoveredClaudeModelCapabilities(model: ClaudeModelInfo): ModelCapabilities {
const known = BUILT_IN_MODELS.find((candidate) => candidate.slug === model.value);
if (known?.capabilities) {
return known.capabilities;
}

const effortLevels = model.supportedEffortLevels ?? [];
return createModelCapabilities({
optionDescriptors: [
...(model.supportsEffort && effortLevels.length > 0
? [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: effortLevels.map((value) => ({
value,
label: labelClaudeEffort(value),
})),
}),
]
: []),
...(model.supportsFastMode
? [
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
]
: []),
],
});
}

export function parseClaudeInitializationModels(
models: ReadonlyArray<ClaudeModelInfo> | undefined,
): ReadonlyArray<ServerProviderModel> {
const discovered: ServerProviderModel[] = [];
const seen = new Set<string>();
for (const model of models ?? []) {
const slug = model.value.trim();
if (!slug || seen.has(slug)) {
continue;
}
seen.add(slug);
discovered.push({
slug,
name: model.displayName.trim() || slug,
isCustom: false,
capabilities: discoveredClaudeModelCapabilities(model),
});
}
return discovered;
}

export function resolveClaudeEffort(
caps: ModelCapabilities,
raw: string | null | undefined,
Expand DownExpand Up@@ -357,12 +438,7 @@ export function normalizeClaudeCliEffort(
if (effort === "ultracode") {
return "xhigh";
}
if (
effort === "xhigh" &&
model !== "claude-fable-5" &&
model !== "claude-opus-4-8" &&
model !== "claude-sonnet-5"
) {
if (effort === "xhigh" && model && CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX.has(model)) {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
Expand DownExpand Up@@ -566,6 +642,7 @@ type ClaudeCapabilitiesProbe = {
*/
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function parseClaudeInitializationCommands(
Expand DownExpand Up@@ -695,6 +772,7 @@ const probeClaudeCapabilities = (
tokenSource: account?.tokenSource,
apiProvider: account?.apiProvider,
slashCommands: parseClaudeInitializationCommands(init.commands),
models: parseClaudeInitializationModels(init.models),
} satisfies ClaudeCapabilitiesProbe;
});
}).pipe(
Expand DownExpand Up@@ -832,7 +910,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
});
}

const models = providerModelsFromSettings(
const fallbackModels = providerModelsFromSettings(
getBuiltInClaudeModelsForVersion(parsedVersion),
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
Expand All@@ -848,6 +926,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
: undefined;
const models = providerModelsFromSettings(
capabilities?.models.length ? capabilities.models : fallbackModels,

@chatgpt-codex-connectorchatgpt-codex-connectorBotJul 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Replace stale models when applying a live Claude catalog

During normal startup this selects the account-specific catalog, but the refresh is merged into makePendingClaudeProvider's snapshot, which already contains every built-in model. mergeProviderSnapshot in ProviderRegistry.ts retains missing models for every non-OpenCode provider and appends them at lines 81-83 and 120-123, so unavailable built-ins—and cached models discovered under a previous Claude account—remain visible and selectable after a successful live probe. Successful Claude inventories need to replace, rather than merge with, the pending/cached model list.

Useful? React with 👍 / 👎.

claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const skills = yield* discoverClaudeSkills(claudeSettings, cwd, resolvedEnvironment);
const slashCommands = capabilities?.slashCommands ?? [];
const dedupedSlashCommands = dedupeSlashCommands(slashCommands);
Expand Down
50 changes: 50 additions & 0 deletions apps/server/src/provider/Layers/ProviderRegistry.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
ProviderInstanceId,
ServerSettings,
type ServerProvider,
type ServerProviderModel,
type ServerProviderSlashCommand,
type ServerSettings as ContractServerSettings,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -103,6 +104,7 @@ type TestClaudeCapabilities = {
readonly tokenSource: string | undefined;
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
Expand All@@ -113,6 +115,7 @@ function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
tokenSource: undefined,
apiProvider: undefined,
slashCommands: [],
models: [],
...overrides,
});
}
Expand DownExpand Up@@ -1867,6 +1870,53 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
),
);

it.effect("uses the live Claude initialization model catalog", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
defaultClaudeSettings,
claudeCapabilities({
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
],
}),
},
],
}),
);

assert.deepStrictEqual(
status.models.map((model) => model.slug),
["claude-sonnet-6"],
);
assert.deepStrictEqual(status.models[0]?.capabilities?.optionDescriptors, [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
]);
}).pipe(
Effect.provide(
mockSpawnerLayer((args) => {
if (args.join(" ") === "--version") {
return { stdout: "2.1.219\n", stderr: "", code: 0 };
}
throw new Error(`Unexpected args: ${args.join(" ")}`);
}),
),
),
);

it.effect("hides Claude Fable 5 on older Claude Code versions", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Discover Claude models from the live harness#21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
logancsack merged 2 commits into from
Jul 26, 2026
Merged

Discover Claude models from the live harness #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f63e8b3
Discover Claude models from the live harness
logancsack Jul 26, 2026
fdd344d
Preserve efforts for discovered Claude models
logancsack Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions apps/server/src/provider/Layers/ClaudeAdapter.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -530,6 +530,29 @@ describe("ClaudeAdapterLive", () => {
);
});

it.effect("preserves xhigh effort for a newly discovered Claude model", () => {
const harness = makeHarness();
return Effect.gen(function* () {
const adapter = yield* ClaudeAdapter;
yield* adapter.startSession({
threadId: THREAD_ID,
provider: ProviderDriverKind.make("claudeAgent"),
modelSelection: createModelSelection(
ProviderInstanceId.make("claudeAgent"),
"claude-sonnet-6",
[{ id: "effort", value: "xhigh" }],
),
runtimeMode: "full-access",
});

const createInput = harness.getLastCreateQueryInput();
assert.equal(createInput?.options.effort, "xhigh");
}).pipe(
Effect.provideService(Random.Random, makeDeterministicRandomService()),
Effect.provide(harness.layer),
);
});

it.effect("falls back to default effort when unsupported max is requested for Sonnet 4.6", () => {
const harness = makeHarness();
return Effect.gen(function* () {
Expand Down
34 changes: 33 additions & 1 deletion apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,14 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
" agents: [],",
' output_style: "default",',
' available_output_styles: ["default"],',
" models: [],",
" models: [{",
' value: "claude-sonnet-6",',
' displayName: "Claude Sonnet 6",',
' description: "Newest Sonnet",',
" supportsEffort: true,",
' supportedEffortLevels: ["medium", "xhigh"],',
" supportsFastMode: true,",
" }],",
' account: { email: "dev@example.com", subscriptionType: "pro", tokenSource: "oauth" },',
" },",
" },",
Expand DownExpand Up@@ -117,6 +124,31 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
input: { hint: "[path]" },
},
],
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: {
optionDescriptors: [
{
id: "effort",
label: "Reasoning",
type: "select",
options: [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
],
},
{
id: "fastMode",
label: "Fast Mode",
type: "boolean",
},
],
},
},
],
});

// @effect-diagnostics-next-line preferSchemaOverJson:off
Expand Down
99 changes: 91 additions & 8 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { resolveSpawnCommand } from "@t3tools/shared/shell";
import { compareSemverVersions } from "@t3tools/shared/semver";
import {
query as claudeQuery,
type ModelInfo as ClaudeModelInfo,
type Options as ClaudeQueryOptions,
type SlashCommand as ClaudeSlashCommand,
type SDKUserMessage,
Expand All@@ -46,6 +47,25 @@ import { discoverClaudeSkills } from "../Drivers/ClaudeSkills.ts";
const DEFAULT_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [],
});
const FUTURE_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
],
}),
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
],
});

const CLAUDE_PRESENTATION = {
displayName: "Claude",
Expand All@@ -54,6 +74,7 @@ const CLAUDE_PRESENTATION = {
const MINIMUM_CLAUDE_FABLE_5_VERSION = "2.1.169";
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";
const CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX = new Set(["claude-opus-4-7"]);

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
Expand DownExpand Up@@ -320,10 +341,70 @@ export function getClaudeModelCapabilities(model: string | null | undefined): Mo
const slug = model?.trim();
return (
BUILT_IN_MODELS.find((candidate) => candidate.slug === slug)?.capabilities ??
DEFAULT_CLAUDE_MODEL_CAPABILITIES
FUTURE_CLAUDE_MODEL_CAPABILITIES
Comment thread
logancsack marked this conversation as resolved.
);
}

function labelClaudeEffort(value: string): string {
return value === "xhigh"
? "Extra High"
: value.charAt(0).toUpperCase() + value.slice(1).toLowerCase();
}

function discoveredClaudeModelCapabilities(model: ClaudeModelInfo): ModelCapabilities {
const known = BUILT_IN_MODELS.find((candidate) => candidate.slug === model.value);
if (known?.capabilities) {
return known.capabilities;
}

const effortLevels = model.supportedEffortLevels ?? [];
return createModelCapabilities({
optionDescriptors: [
...(model.supportsEffort && effortLevels.length > 0
? [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: effortLevels.map((value) => ({
value,
label: labelClaudeEffort(value),
})),
}),
]
: []),
...(model.supportsFastMode
? [
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
]
: []),
],
});
}

export function parseClaudeInitializationModels(
models: ReadonlyArray<ClaudeModelInfo> | undefined,
): ReadonlyArray<ServerProviderModel> {
const discovered: ServerProviderModel[] = [];
const seen = new Set<string>();
for (const model of models ?? []) {
const slug = model.value.trim();
if (!slug || seen.has(slug)) {
continue;
}
seen.add(slug);
discovered.push({
slug,
name: model.displayName.trim() || slug,
isCustom: false,
capabilities: discoveredClaudeModelCapabilities(model),
});
}
return discovered;
}

export function resolveClaudeEffort(
caps: ModelCapabilities,
raw: string | null | undefined,
Expand DownExpand Up@@ -357,12 +438,7 @@ export function normalizeClaudeCliEffort(
if (effort === "ultracode") {
return "xhigh";
}
if (
effort === "xhigh" &&
model !== "claude-fable-5" &&
model !== "claude-opus-4-8" &&
model !== "claude-sonnet-5"
) {
if (effort === "xhigh" && model && CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX.has(model)) {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
Expand DownExpand Up@@ -566,6 +642,7 @@ type ClaudeCapabilitiesProbe = {
*/
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function parseClaudeInitializationCommands(
Expand DownExpand Up@@ -695,6 +772,7 @@ const probeClaudeCapabilities = (
tokenSource: account?.tokenSource,
apiProvider: account?.apiProvider,
slashCommands: parseClaudeInitializationCommands(init.commands),
models: parseClaudeInitializationModels(init.models),
} satisfies ClaudeCapabilitiesProbe;
});
}).pipe(
Expand DownExpand Up@@ -832,7 +910,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
});
}

const models = providerModelsFromSettings(
const fallbackModels = providerModelsFromSettings(
getBuiltInClaudeModelsForVersion(parsedVersion),
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
Expand All@@ -848,6 +926,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
: undefined;
const models = providerModelsFromSettings(
capabilities?.models.length ? capabilities.models : fallbackModels,

@chatgpt-codex-connectorchatgpt-codex-connectorBotJul 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Replace stale models when applying a live Claude catalog

During normal startup this selects the account-specific catalog, but the refresh is merged into makePendingClaudeProvider's snapshot, which already contains every built-in model. mergeProviderSnapshot in ProviderRegistry.ts retains missing models for every non-OpenCode provider and appends them at lines 81-83 and 120-123, so unavailable built-ins—and cached models discovered under a previous Claude account—remain visible and selectable after a successful live probe. Successful Claude inventories need to replace, rather than merge with, the pending/cached model list.

Useful? React with 👍 / 👎.

claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const skills = yield* discoverClaudeSkills(claudeSettings, cwd, resolvedEnvironment);
const slashCommands = capabilities?.slashCommands ?? [];
const dedupedSlashCommands = dedupeSlashCommands(slashCommands);
Expand Down
50 changes: 50 additions & 0 deletions apps/server/src/provider/Layers/ProviderRegistry.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
ProviderInstanceId,
ServerSettings,
type ServerProvider,
type ServerProviderModel,
type ServerProviderSlashCommand,
type ServerSettings as ContractServerSettings,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -103,6 +104,7 @@ type TestClaudeCapabilities = {
readonly tokenSource: string | undefined;
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
Expand All@@ -113,6 +115,7 @@ function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
tokenSource: undefined,
apiProvider: undefined,
slashCommands: [],
models: [],
...overrides,
});
}
Expand DownExpand Up@@ -1867,6 +1870,53 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
),
);

it.effect("uses the live Claude initialization model catalog", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
defaultClaudeSettings,
claudeCapabilities({
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
],
}),
},
],
}),
);

assert.deepStrictEqual(
status.models.map((model) => model.slug),
["claude-sonnet-6"],
);
assert.deepStrictEqual(status.models[0]?.capabilities?.optionDescriptors, [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
]);
}).pipe(
Effect.provide(
mockSpawnerLayer((args) => {
if (args.join(" ") === "--version") {
return { stdout: "2.1.219\n", stderr: "", code: 0 };
}
throw new Error(`Unexpected args: ${args.join(" ")}`);
}),
),
),
);

it.effect("hides Claude Fable 5 on older Claude Code versions", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Discover Claude models from the live harness#21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
logancsack merged 2 commits into from
Jul 26, 2026
Merged

Discover Claude models from the live harness #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f63e8b3
Discover Claude models from the live harness
logancsack Jul 26, 2026
fdd344d
Preserve efforts for discovered Claude models
logancsack Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions apps/server/src/provider/Layers/ClaudeAdapter.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -530,6 +530,29 @@ describe("ClaudeAdapterLive", () => {
);
});

it.effect("preserves xhigh effort for a newly discovered Claude model", () => {
const harness = makeHarness();
return Effect.gen(function* () {
const adapter = yield* ClaudeAdapter;
yield* adapter.startSession({
threadId: THREAD_ID,
provider: ProviderDriverKind.make("claudeAgent"),
modelSelection: createModelSelection(
ProviderInstanceId.make("claudeAgent"),
"claude-sonnet-6",
[{ id: "effort", value: "xhigh" }],
),
runtimeMode: "full-access",
});

const createInput = harness.getLastCreateQueryInput();
assert.equal(createInput?.options.effort, "xhigh");
}).pipe(
Effect.provideService(Random.Random, makeDeterministicRandomService()),
Effect.provide(harness.layer),
);
});

it.effect("falls back to default effort when unsupported max is requested for Sonnet 4.6", () => {
const harness = makeHarness();
return Effect.gen(function* () {
Expand Down
34 changes: 33 additions & 1 deletion apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,14 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
" agents: [],",
' output_style: "default",',
' available_output_styles: ["default"],',
" models: [],",
" models: [{",
' value: "claude-sonnet-6",',
' displayName: "Claude Sonnet 6",',
' description: "Newest Sonnet",',
" supportsEffort: true,",
' supportedEffortLevels: ["medium", "xhigh"],',
" supportsFastMode: true,",
" }],",
' account: { email: "dev@example.com", subscriptionType: "pro", tokenSource: "oauth" },',
" },",
" },",
Expand DownExpand Up@@ -117,6 +124,31 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
input: { hint: "[path]" },
},
],
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: {
optionDescriptors: [
{
id: "effort",
label: "Reasoning",
type: "select",
options: [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
],
},
{
id: "fastMode",
label: "Fast Mode",
type: "boolean",
},
],
},
},
],
});

// @effect-diagnostics-next-line preferSchemaOverJson:off
Expand Down
99 changes: 91 additions & 8 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { resolveSpawnCommand } from "@t3tools/shared/shell";
import { compareSemverVersions } from "@t3tools/shared/semver";
import {
query as claudeQuery,
type ModelInfo as ClaudeModelInfo,
type Options as ClaudeQueryOptions,
type SlashCommand as ClaudeSlashCommand,
type SDKUserMessage,
Expand All@@ -46,6 +47,25 @@ import { discoverClaudeSkills } from "../Drivers/ClaudeSkills.ts";
const DEFAULT_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [],
});
const FUTURE_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
],
}),
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
],
});

const CLAUDE_PRESENTATION = {
displayName: "Claude",
Expand All@@ -54,6 +74,7 @@ const CLAUDE_PRESENTATION = {
const MINIMUM_CLAUDE_FABLE_5_VERSION = "2.1.169";
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";
const CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX = new Set(["claude-opus-4-7"]);

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
Expand DownExpand Up@@ -320,10 +341,70 @@ export function getClaudeModelCapabilities(model: string | null | undefined): Mo
const slug = model?.trim();
return (
BUILT_IN_MODELS.find((candidate) => candidate.slug === slug)?.capabilities ??
DEFAULT_CLAUDE_MODEL_CAPABILITIES
FUTURE_CLAUDE_MODEL_CAPABILITIES
Comment thread
logancsack marked this conversation as resolved.
);
}

function labelClaudeEffort(value: string): string {
return value === "xhigh"
? "Extra High"
: value.charAt(0).toUpperCase() + value.slice(1).toLowerCase();
}

function discoveredClaudeModelCapabilities(model: ClaudeModelInfo): ModelCapabilities {
const known = BUILT_IN_MODELS.find((candidate) => candidate.slug === model.value);
if (known?.capabilities) {
return known.capabilities;
}

const effortLevels = model.supportedEffortLevels ?? [];
return createModelCapabilities({
optionDescriptors: [
...(model.supportsEffort && effortLevels.length > 0
? [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: effortLevels.map((value) => ({
value,
label: labelClaudeEffort(value),
})),
}),
]
: []),
...(model.supportsFastMode
? [
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
]
: []),
],
});
}

export function parseClaudeInitializationModels(
models: ReadonlyArray<ClaudeModelInfo> | undefined,
): ReadonlyArray<ServerProviderModel> {
const discovered: ServerProviderModel[] = [];
const seen = new Set<string>();
for (const model of models ?? []) {
const slug = model.value.trim();
if (!slug || seen.has(slug)) {
continue;
}
seen.add(slug);
discovered.push({
slug,
name: model.displayName.trim() || slug,
isCustom: false,
capabilities: discoveredClaudeModelCapabilities(model),
});
}
return discovered;
}

export function resolveClaudeEffort(
caps: ModelCapabilities,
raw: string | null | undefined,
Expand DownExpand Up@@ -357,12 +438,7 @@ export function normalizeClaudeCliEffort(
if (effort === "ultracode") {
return "xhigh";
}
if (
effort === "xhigh" &&
model !== "claude-fable-5" &&
model !== "claude-opus-4-8" &&
model !== "claude-sonnet-5"
) {
if (effort === "xhigh" && model && CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX.has(model)) {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
Expand DownExpand Up@@ -566,6 +642,7 @@ type ClaudeCapabilitiesProbe = {
*/
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function parseClaudeInitializationCommands(
Expand DownExpand Up@@ -695,6 +772,7 @@ const probeClaudeCapabilities = (
tokenSource: account?.tokenSource,
apiProvider: account?.apiProvider,
slashCommands: parseClaudeInitializationCommands(init.commands),
models: parseClaudeInitializationModels(init.models),
} satisfies ClaudeCapabilitiesProbe;
});
}).pipe(
Expand DownExpand Up@@ -832,7 +910,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
});
}

const models = providerModelsFromSettings(
const fallbackModels = providerModelsFromSettings(
getBuiltInClaudeModelsForVersion(parsedVersion),
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
Expand All@@ -848,6 +926,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
: undefined;
const models = providerModelsFromSettings(
capabilities?.models.length ? capabilities.models : fallbackModels,

@chatgpt-codex-connectorchatgpt-codex-connectorBotJul 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Replace stale models when applying a live Claude catalog

During normal startup this selects the account-specific catalog, but the refresh is merged into makePendingClaudeProvider's snapshot, which already contains every built-in model. mergeProviderSnapshot in ProviderRegistry.ts retains missing models for every non-OpenCode provider and appends them at lines 81-83 and 120-123, so unavailable built-ins—and cached models discovered under a previous Claude account—remain visible and selectable after a successful live probe. Successful Claude inventories need to replace, rather than merge with, the pending/cached model list.

Useful? React with 👍 / 👎.

claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const skills = yield* discoverClaudeSkills(claudeSettings, cwd, resolvedEnvironment);
const slashCommands = capabilities?.slashCommands ?? [];
const dedupedSlashCommands = dedupeSlashCommands(slashCommands);
Expand Down
50 changes: 50 additions & 0 deletions apps/server/src/provider/Layers/ProviderRegistry.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
ProviderInstanceId,
ServerSettings,
type ServerProvider,
type ServerProviderModel,
type ServerProviderSlashCommand,
type ServerSettings as ContractServerSettings,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -103,6 +104,7 @@ type TestClaudeCapabilities = {
readonly tokenSource: string | undefined;
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
Expand All@@ -113,6 +115,7 @@ function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
tokenSource: undefined,
apiProvider: undefined,
slashCommands: [],
models: [],
...overrides,
});
}
Expand DownExpand Up@@ -1867,6 +1870,53 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
),
);

it.effect("uses the live Claude initialization model catalog", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
defaultClaudeSettings,
claudeCapabilities({
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
],
}),
},
],
}),
);

assert.deepStrictEqual(
status.models.map((model) => model.slug),
["claude-sonnet-6"],
);
assert.deepStrictEqual(status.models[0]?.capabilities?.optionDescriptors, [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
]);
}).pipe(
Effect.provide(
mockSpawnerLayer((args) => {
if (args.join(" ") === "--version") {
return { stdout: "2.1.219\n", stderr: "", code: 0 };
}
throw new Error(`Unexpected args: ${args.join(" ")}`);
}),
),
),
);

it.effect("hides Claude Fable 5 on older Claude Code versions", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Discover Claude models from the live harness#21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
logancsack merged 2 commits into from
Jul 26, 2026
Merged

Discover Claude models from the live harness #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f63e8b3
Discover Claude models from the live harness
logancsack Jul 26, 2026
fdd344d
Preserve efforts for discovered Claude models
logancsack Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions apps/server/src/provider/Layers/ClaudeAdapter.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -530,6 +530,29 @@ describe("ClaudeAdapterLive", () => {
);
});

it.effect("preserves xhigh effort for a newly discovered Claude model", () => {
const harness = makeHarness();
return Effect.gen(function* () {
const adapter = yield* ClaudeAdapter;
yield* adapter.startSession({
threadId: THREAD_ID,
provider: ProviderDriverKind.make("claudeAgent"),
modelSelection: createModelSelection(
ProviderInstanceId.make("claudeAgent"),
"claude-sonnet-6",
[{ id: "effort", value: "xhigh" }],
),
runtimeMode: "full-access",
});

const createInput = harness.getLastCreateQueryInput();
assert.equal(createInput?.options.effort, "xhigh");
}).pipe(
Effect.provideService(Random.Random, makeDeterministicRandomService()),
Effect.provide(harness.layer),
);
});

it.effect("falls back to default effort when unsupported max is requested for Sonnet 4.6", () => {
const harness = makeHarness();
return Effect.gen(function* () {
Expand Down
34 changes: 33 additions & 1 deletion apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,14 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
" agents: [],",
' output_style: "default",',
' available_output_styles: ["default"],',
" models: [],",
" models: [{",
' value: "claude-sonnet-6",',
' displayName: "Claude Sonnet 6",',
' description: "Newest Sonnet",',
" supportsEffort: true,",
' supportedEffortLevels: ["medium", "xhigh"],',
" supportsFastMode: true,",
" }],",
' account: { email: "dev@example.com", subscriptionType: "pro", tokenSource: "oauth" },',
" },",
" },",
Expand DownExpand Up@@ -117,6 +124,31 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
input: { hint: "[path]" },
},
],
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: {
optionDescriptors: [
{
id: "effort",
label: "Reasoning",
type: "select",
options: [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
],
},
{
id: "fastMode",
label: "Fast Mode",
type: "boolean",
},
],
},
},
],
});

// @effect-diagnostics-next-line preferSchemaOverJson:off
Expand Down
99 changes: 91 additions & 8 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { resolveSpawnCommand } from "@t3tools/shared/shell";
import { compareSemverVersions } from "@t3tools/shared/semver";
import {
query as claudeQuery,
type ModelInfo as ClaudeModelInfo,
type Options as ClaudeQueryOptions,
type SlashCommand as ClaudeSlashCommand,
type SDKUserMessage,
Expand All@@ -46,6 +47,25 @@ import { discoverClaudeSkills } from "../Drivers/ClaudeSkills.ts";
const DEFAULT_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [],
});
const FUTURE_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
],
}),
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
],
});

const CLAUDE_PRESENTATION = {
displayName: "Claude",
Expand All@@ -54,6 +74,7 @@ const CLAUDE_PRESENTATION = {
const MINIMUM_CLAUDE_FABLE_5_VERSION = "2.1.169";
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";
const CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX = new Set(["claude-opus-4-7"]);

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
Expand DownExpand Up@@ -320,10 +341,70 @@ export function getClaudeModelCapabilities(model: string | null | undefined): Mo
const slug = model?.trim();
return (
BUILT_IN_MODELS.find((candidate) => candidate.slug === slug)?.capabilities ??
DEFAULT_CLAUDE_MODEL_CAPABILITIES
FUTURE_CLAUDE_MODEL_CAPABILITIES
Comment thread
logancsack marked this conversation as resolved.
);
}

function labelClaudeEffort(value: string): string {
return value === "xhigh"
? "Extra High"
: value.charAt(0).toUpperCase() + value.slice(1).toLowerCase();
}

function discoveredClaudeModelCapabilities(model: ClaudeModelInfo): ModelCapabilities {
const known = BUILT_IN_MODELS.find((candidate) => candidate.slug === model.value);
if (known?.capabilities) {
return known.capabilities;
}

const effortLevels = model.supportedEffortLevels ?? [];
return createModelCapabilities({
optionDescriptors: [
...(model.supportsEffort && effortLevels.length > 0
? [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: effortLevels.map((value) => ({
value,
label: labelClaudeEffort(value),
})),
}),
]
: []),
...(model.supportsFastMode
? [
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
]
: []),
],
});
}

export function parseClaudeInitializationModels(
models: ReadonlyArray<ClaudeModelInfo> | undefined,
): ReadonlyArray<ServerProviderModel> {
const discovered: ServerProviderModel[] = [];
const seen = new Set<string>();
for (const model of models ?? []) {
const slug = model.value.trim();
if (!slug || seen.has(slug)) {
continue;
}
seen.add(slug);
discovered.push({
slug,
name: model.displayName.trim() || slug,
isCustom: false,
capabilities: discoveredClaudeModelCapabilities(model),
});
}
return discovered;
}

export function resolveClaudeEffort(
caps: ModelCapabilities,
raw: string | null | undefined,
Expand DownExpand Up@@ -357,12 +438,7 @@ export function normalizeClaudeCliEffort(
if (effort === "ultracode") {
return "xhigh";
}
if (
effort === "xhigh" &&
model !== "claude-fable-5" &&
model !== "claude-opus-4-8" &&
model !== "claude-sonnet-5"
) {
if (effort === "xhigh" && model && CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX.has(model)) {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
Expand DownExpand Up@@ -566,6 +642,7 @@ type ClaudeCapabilitiesProbe = {
*/
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function parseClaudeInitializationCommands(
Expand DownExpand Up@@ -695,6 +772,7 @@ const probeClaudeCapabilities = (
tokenSource: account?.tokenSource,
apiProvider: account?.apiProvider,
slashCommands: parseClaudeInitializationCommands(init.commands),
models: parseClaudeInitializationModels(init.models),
} satisfies ClaudeCapabilitiesProbe;
});
}).pipe(
Expand DownExpand Up@@ -832,7 +910,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
});
}

const models = providerModelsFromSettings(
const fallbackModels = providerModelsFromSettings(
getBuiltInClaudeModelsForVersion(parsedVersion),
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
Expand All@@ -848,6 +926,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
: undefined;
const models = providerModelsFromSettings(
capabilities?.models.length ? capabilities.models : fallbackModels,

@chatgpt-codex-connectorchatgpt-codex-connectorBotJul 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Replace stale models when applying a live Claude catalog

During normal startup this selects the account-specific catalog, but the refresh is merged into makePendingClaudeProvider's snapshot, which already contains every built-in model. mergeProviderSnapshot in ProviderRegistry.ts retains missing models for every non-OpenCode provider and appends them at lines 81-83 and 120-123, so unavailable built-ins—and cached models discovered under a previous Claude account—remain visible and selectable after a successful live probe. Successful Claude inventories need to replace, rather than merge with, the pending/cached model list.

Useful? React with 👍 / 👎.

claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const skills = yield* discoverClaudeSkills(claudeSettings, cwd, resolvedEnvironment);
const slashCommands = capabilities?.slashCommands ?? [];
const dedupedSlashCommands = dedupeSlashCommands(slashCommands);
Expand Down
50 changes: 50 additions & 0 deletions apps/server/src/provider/Layers/ProviderRegistry.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
ProviderInstanceId,
ServerSettings,
type ServerProvider,
type ServerProviderModel,
type ServerProviderSlashCommand,
type ServerSettings as ContractServerSettings,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -103,6 +104,7 @@ type TestClaudeCapabilities = {
readonly tokenSource: string | undefined;
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
Expand All@@ -113,6 +115,7 @@ function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
tokenSource: undefined,
apiProvider: undefined,
slashCommands: [],
models: [],
...overrides,
});
}
Expand DownExpand Up@@ -1867,6 +1870,53 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
),
);

it.effect("uses the live Claude initialization model catalog", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
defaultClaudeSettings,
claudeCapabilities({
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
],
}),
},
],
}),
);

assert.deepStrictEqual(
status.models.map((model) => model.slug),
["claude-sonnet-6"],
);
assert.deepStrictEqual(status.models[0]?.capabilities?.optionDescriptors, [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
]);
}).pipe(
Effect.provide(
mockSpawnerLayer((args) => {
if (args.join(" ") === "--version") {
return { stdout: "2.1.219\n", stderr: "", code: 0 };
}
throw new Error(`Unexpected args: ${args.join(" ")}`);
}),
),
),
);

it.effect("hides Claude Fable 5 on older Claude Code versions", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Discover Claude models from the live harness#21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
logancsack merged 2 commits into from
Jul 26, 2026
Merged

Discover Claude models from the live harness #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f63e8b3
Discover Claude models from the live harness
logancsack Jul 26, 2026
fdd344d
Preserve efforts for discovered Claude models
logancsack Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions apps/server/src/provider/Layers/ClaudeAdapter.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -530,6 +530,29 @@ describe("ClaudeAdapterLive", () => {
);
});

it.effect("preserves xhigh effort for a newly discovered Claude model", () => {
const harness = makeHarness();
return Effect.gen(function* () {
const adapter = yield* ClaudeAdapter;
yield* adapter.startSession({
threadId: THREAD_ID,
provider: ProviderDriverKind.make("claudeAgent"),
modelSelection: createModelSelection(
ProviderInstanceId.make("claudeAgent"),
"claude-sonnet-6",
[{ id: "effort", value: "xhigh" }],
),
runtimeMode: "full-access",
});

const createInput = harness.getLastCreateQueryInput();
assert.equal(createInput?.options.effort, "xhigh");
}).pipe(
Effect.provideService(Random.Random, makeDeterministicRandomService()),
Effect.provide(harness.layer),
);
});

it.effect("falls back to default effort when unsupported max is requested for Sonnet 4.6", () => {
const harness = makeHarness();
return Effect.gen(function* () {
Expand Down
34 changes: 33 additions & 1 deletion apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,14 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
" agents: [],",
' output_style: "default",',
' available_output_styles: ["default"],',
" models: [],",
" models: [{",
' value: "claude-sonnet-6",',
' displayName: "Claude Sonnet 6",',
' description: "Newest Sonnet",',
" supportsEffort: true,",
' supportedEffortLevels: ["medium", "xhigh"],',
" supportsFastMode: true,",
" }],",
' account: { email: "dev@example.com", subscriptionType: "pro", tokenSource: "oauth" },',
" },",
" },",
Expand DownExpand Up@@ -117,6 +124,31 @@ it.layer(NodeServices.layer)("Claude capability probe SDK boundary", (it) => {
input: { hint: "[path]" },
},
],
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: {
optionDescriptors: [
{
id: "effort",
label: "Reasoning",
type: "select",
options: [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
],
},
{
id: "fastMode",
label: "Fast Mode",
type: "boolean",
},
],
},
},
],
});

// @effect-diagnostics-next-line preferSchemaOverJson:off
Expand Down
99 changes: 91 additions & 8 deletions apps/server/src/provider/Layers/ClaudeProvider.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { resolveSpawnCommand } from "@t3tools/shared/shell";
import { compareSemverVersions } from "@t3tools/shared/semver";
import {
query as claudeQuery,
type ModelInfo as ClaudeModelInfo,
type Options as ClaudeQueryOptions,
type SlashCommand as ClaudeSlashCommand,
type SDKUserMessage,
Expand All@@ -46,6 +47,25 @@ import { discoverClaudeSkills } from "../Drivers/ClaudeSkills.ts";
const DEFAULT_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [],
});
const FUTURE_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
optionDescriptors: [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: [
{ value: "low", label: "Low" },
{ value: "medium", label: "Medium" },
{ value: "high", label: "High" },
{ value: "xhigh", label: "Extra High" },
{ value: "max", label: "Max" },
],
}),
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
],
});

const CLAUDE_PRESENTATION = {
displayName: "Claude",
Expand All@@ -54,6 +74,7 @@ const CLAUDE_PRESENTATION = {
const MINIMUM_CLAUDE_FABLE_5_VERSION = "2.1.169";
const MINIMUM_CLAUDE_OPUS_4_8_VERSION = "2.1.154";
const MINIMUM_CLAUDE_OPUS_4_7_VERSION = "2.1.111";
const CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX = new Set(["claude-opus-4-7"]);

const BUILT_IN_MODELS: ReadonlyArray<ServerProviderModel> = [
{
Expand DownExpand Up@@ -320,10 +341,70 @@ export function getClaudeModelCapabilities(model: string | null | undefined): Mo
const slug = model?.trim();
return (
BUILT_IN_MODELS.find((candidate) => candidate.slug === slug)?.capabilities ??
DEFAULT_CLAUDE_MODEL_CAPABILITIES
FUTURE_CLAUDE_MODEL_CAPABILITIES
Comment thread
logancsack marked this conversation as resolved.
);
}

function labelClaudeEffort(value: string): string {
return value === "xhigh"
? "Extra High"
: value.charAt(0).toUpperCase() + value.slice(1).toLowerCase();
}

function discoveredClaudeModelCapabilities(model: ClaudeModelInfo): ModelCapabilities {
const known = BUILT_IN_MODELS.find((candidate) => candidate.slug === model.value);
if (known?.capabilities) {
return known.capabilities;
}

const effortLevels = model.supportedEffortLevels ?? [];
return createModelCapabilities({
optionDescriptors: [
...(model.supportsEffort && effortLevels.length > 0
? [
buildSelectOptionDescriptor({
id: "effort",
label: "Reasoning",
options: effortLevels.map((value) => ({
value,
label: labelClaudeEffort(value),
})),
}),
]
: []),
...(model.supportsFastMode
? [
buildBooleanOptionDescriptor({
id: "fastMode",
label: "Fast Mode",
}),
]
: []),
],
});
}

export function parseClaudeInitializationModels(
models: ReadonlyArray<ClaudeModelInfo> | undefined,
): ReadonlyArray<ServerProviderModel> {
const discovered: ServerProviderModel[] = [];
const seen = new Set<string>();
for (const model of models ?? []) {
const slug = model.value.trim();
if (!slug || seen.has(slug)) {
continue;
}
seen.add(slug);
discovered.push({
slug,
name: model.displayName.trim() || slug,
isCustom: false,
capabilities: discoveredClaudeModelCapabilities(model),
});
}
return discovered;
}

export function resolveClaudeEffort(
caps: ModelCapabilities,
raw: string | null | undefined,
Expand DownExpand Up@@ -357,12 +438,7 @@ export function normalizeClaudeCliEffort(
if (effort === "ultracode") {
return "xhigh";
}
if (
effort === "xhigh" &&
model !== "claude-fable-5" &&
model !== "claude-opus-4-8" &&
model !== "claude-sonnet-5"
) {
if (effort === "xhigh" && model && CLAUDE_MODELS_REQUIRING_XHIGH_AS_MAX.has(model)) {
return "max";
}
if (effort === "max" && model === "claude-sonnet-4-6") {
Expand DownExpand Up@@ -566,6 +642,7 @@ type ClaudeCapabilitiesProbe = {
*/
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function parseClaudeInitializationCommands(
Expand DownExpand Up@@ -695,6 +772,7 @@ const probeClaudeCapabilities = (
tokenSource: account?.tokenSource,
apiProvider: account?.apiProvider,
slashCommands: parseClaudeInitializationCommands(init.commands),
models: parseClaudeInitializationModels(init.models),
} satisfies ClaudeCapabilitiesProbe;
});
}).pipe(
Expand DownExpand Up@@ -832,7 +910,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
});
}

const models = providerModelsFromSettings(
const fallbackModels = providerModelsFromSettings(
getBuiltInClaudeModelsForVersion(parsedVersion),
claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
Expand All@@ -848,6 +926,11 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
const capabilities = resolveCapabilities
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
: undefined;
const models = providerModelsFromSettings(
capabilities?.models.length ? capabilities.models : fallbackModels,

@chatgpt-codex-connectorchatgpt-codex-connectorBotJul 26, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Replace stale models when applying a live Claude catalog

During normal startup this selects the account-specific catalog, but the refresh is merged into makePendingClaudeProvider's snapshot, which already contains every built-in model. mergeProviderSnapshot in ProviderRegistry.ts retains missing models for every non-OpenCode provider and appends them at lines 81-83 and 120-123, so unavailable built-ins—and cached models discovered under a previous Claude account—remain visible and selectable after a successful live probe. Successful Claude inventories need to replace, rather than merge with, the pending/cached model list.

Useful? React with 👍 / 👎.

claudeSettings.customModels,
DEFAULT_CLAUDE_MODEL_CAPABILITIES,
);
const skills = yield* discoverClaudeSkills(claudeSettings, cwd, resolvedEnvironment);
const slashCommands = capabilities?.slashCommands ?? [];
const dedupedSlashCommands = dedupeSlashCommands(slashCommands);
Expand Down
50 changes: 50 additions & 0 deletions apps/server/src/provider/Layers/ProviderRegistry.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ import {
ProviderInstanceId,
ServerSettings,
type ServerProvider,
type ServerProviderModel,
type ServerProviderSlashCommand,
type ServerSettings as ContractServerSettings,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -103,6 +104,7 @@ type TestClaudeCapabilities = {
readonly tokenSource: string | undefined;
readonly apiProvider: string | undefined;
readonly slashCommands: ReadonlyArray<ServerProviderSlashCommand>;
readonly models: ReadonlyArray<ServerProviderModel>;
};

function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
Expand All@@ -113,6 +115,7 @@ function claudeCapabilities(overrides: Partial<TestClaudeCapabilities> = {}) {
tokenSource: undefined,
apiProvider: undefined,
slashCommands: [],
models: [],
...overrides,
});
}
Expand DownExpand Up@@ -1867,6 +1870,53 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
),
);

it.effect("uses the live Claude initialization model catalog", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
defaultClaudeSettings,
claudeCapabilities({
models: [
{
slug: "claude-sonnet-6",
name: "Claude Sonnet 6",
isCustom: false,
capabilities: createModelCapabilities({
optionDescriptors: [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
],
}),
},
],
}),
);

assert.deepStrictEqual(
status.models.map((model) => model.slug),
["claude-sonnet-6"],
);
assert.deepStrictEqual(status.models[0]?.capabilities?.optionDescriptors, [
selectDescriptor("effort", "Reasoning", [
{ id: "medium", label: "Medium" },
{ id: "xhigh", label: "Extra High" },
]),
booleanDescriptor("fastMode", "Fast Mode"),
]);
}).pipe(
Effect.provide(
mockSpawnerLayer((args) => {
if (args.join(" ") === "--version") {
return { stdout: "2.1.219\n", stderr: "", code: 0 };
}
throw new Error(`Unexpected args: ${args.join(" ")}`);
}),
),
),
);

it.effect("hides Claude Fable 5 on older Claude Code versions", () =>
Effect.gen(function* () {
const status = yield* checkClaudeProviderStatus(
Expand Down
Loading