mirror of
https://github.com/stablyai/orca.git
synced 2026-10-18 08:03:22 +00:00
Jinjing
2e800e56e7
Native chat's model/effort picker now dispatches option commands through a body-then-verified-Enter write path and, for Claude, arms a PTY observer that classifies the cached-history confirmation prompt as applied/rejected/needs interaction before the picker returns — falling back to the terminal only when Claude genuinely requires manual input, and clearing stale truth otherwise. Also reorders the composer's model/effort pills, disambiguates their tooltip labels, and switches disabled-reason strings to a closed enum so producer and localized copy can't drift.
81 lines
2.6 KiB
TypeScript
81 lines
2.6 KiB
TypeScript
import type { AgentType } from './agent-status-types'
|
|
import {
|
|
CLAUDE_SESSION_OPTION_CATALOG,
|
|
CODEX_SESSION_OPTION_CATALOG
|
|
} from './agent-session-option-catalog-claude-codex'
|
|
import {
|
|
CURSOR_SESSION_OPTION_CATALOG,
|
|
GEMINI_SESSION_OPTION_CATALOG
|
|
} from './agent-session-option-catalog-gemini-cursor'
|
|
import type {
|
|
AgentSessionOptionCatalog,
|
|
AgentSessionOptionCatalogMap,
|
|
CatalogModel,
|
|
CatalogOption
|
|
} from './agent-session-option-catalog-types'
|
|
import type { SessionOptionValue } from './native-chat-session-options'
|
|
|
|
export type {
|
|
AgentSessionOptionCatalog,
|
|
CatalogAgentInteractionDetection,
|
|
CatalogMidSessionApply,
|
|
CatalogModel,
|
|
CatalogOption,
|
|
CatalogOptionApply
|
|
} from './agent-session-option-catalog-types'
|
|
|
|
const CATALOGS: AgentSessionOptionCatalogMap = {
|
|
claude: CLAUDE_SESSION_OPTION_CATALOG,
|
|
codex: CODEX_SESSION_OPTION_CATALOG,
|
|
gemini: GEMINI_SESSION_OPTION_CATALOG,
|
|
cursor: CURSOR_SESSION_OPTION_CATALOG
|
|
}
|
|
|
|
export function getAgentSessionOptionCatalog(agent: AgentType): AgentSessionOptionCatalog | null {
|
|
return CATALOGS[agent] ?? null
|
|
}
|
|
|
|
export function findCatalogModel(
|
|
catalog: AgentSessionOptionCatalog,
|
|
modelId: string
|
|
): CatalogModel | undefined {
|
|
return catalog.models.find((model) => model.id === modelId)
|
|
}
|
|
|
|
export function findCatalogOption(
|
|
model: CatalogModel | undefined,
|
|
optionId: string
|
|
): CatalogOption | undefined {
|
|
return model?.options.find((option) => option.id === optionId)
|
|
}
|
|
|
|
export function catalogDefaultModel(catalog: AgentSessionOptionCatalog): CatalogModel | undefined {
|
|
return catalog.models.find((model) => model.isDefault) ?? catalog.models[0]
|
|
}
|
|
|
|
export function catalogDefaultValues(model: CatalogModel): Record<string, SessionOptionValue> {
|
|
return Object.fromEntries(model.options.map((option) => [option.id, option.kind.defaultValue]))
|
|
}
|
|
|
|
/** Merge live rows over the static seed while retaining only option shapes Orca
|
|
* can actually map. Newly discovered ids remain model-only until cataloged. */
|
|
export function mergeCatalogModels(
|
|
seed: readonly CatalogModel[],
|
|
discovered: readonly CatalogModel[]
|
|
): CatalogModel[] {
|
|
const discoveredById = new Map(discovered.map((model) => [model.id, model]))
|
|
const merged = seed.map((model) => {
|
|
const live = discoveredById.get(model.id)
|
|
if (!live) {
|
|
return model
|
|
}
|
|
discoveredById.delete(model.id)
|
|
return { ...model, ...live, options: model.options }
|
|
})
|
|
return [...merged, ...discoveredById.values()]
|
|
}
|
|
|
|
export function sessionOptionValueIsValid(value: unknown): value is SessionOptionValue {
|
|
return typeof value === 'string' || typeof value === 'boolean'
|
|
}
|