Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions packages/client/src/effect/api/api.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 42 additions & 9 deletions packages/client/src/promise/generated/types.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion packages/core/src/config/plugin/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,14 @@ function overlay(
if (config.name) model.name = config.name
if (config.modelID !== undefined) model.modelID = config.modelID
if (config.releaseDate !== undefined) model.time = { released: Date.parse(config.releaseDate) }
if (config.compatibility !== undefined) model.compatibility = { ...model.compatibility, ...config.compatibility }
if (config.compatibility !== undefined) {
const { supportsToolUpdates, ...compatibility } = config.compatibility
model.compatibility = {
...model.compatibility,
...compatibility,
...(supportsToolUpdates === undefined ? {} : { supportsToolUpdates: [...supportsToolUpdates] }),
}
}
if (config.package !== undefined) model.package = config.package
if (config.settings !== undefined) model.settings = Provider.mergeOverlay(model.settings, config.settings)
if (config.headers !== undefined) model.headers = Provider.mergeHeaders(model.headers, config.headers)
Expand Down
10 changes: 9 additions & 1 deletion packages/core/src/model-resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,12 @@ const resolveCatalogModel = Effect.fn("ModelResolver.resolveCatalogModel")(funct
})

// Config `compatibility` keys the AI package reads as model capabilities.
const CAPABILITY_KEYS = ["supportsPromptCacheKey", "streamUsage", "supportsEffortUpdates"] as const
const CAPABILITY_KEYS = [
"supportsPromptCacheKey",
"streamUsage",
"supportsEffortUpdates",
"supportsToolUpdates",
] as const

const capabilities = (base: LanguageModel["capabilities"], compatibility: Compatibility) => ({
...base,
Expand All @@ -283,6 +288,9 @@ const capabilities = (base: LanguageModel["capabilities"], compatibility: Compat
...("supportsEffortUpdates" in compatibility
? { reasoning: { ...base?.reasoning, updates: compatibility.supportsEffortUpdates } }
: {}),
...("supportsToolUpdates" in compatibility
? { tools: { ...base?.tools, updates: compatibility.supportsToolUpdates } }
: {}),
})

/** Settings and package loading shared by every model type: credentials, variables, canonical provider, overlays. */
Expand Down
16 changes: 13 additions & 3 deletions packages/core/src/models-dev.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Cause, Context, Duration, Effect, Layer, Option, Result, Schedule, Schema, Semaphore } from "effect"
import { HttpClient, HttpClientError, HttpClientRequest, HttpClientResponse } from "effect/http"
import { ConfigProvider } from "@opencode/schema/config/provider"
import { MaxTokensField, MediaInput } from "@opencode/schema/model-compatibility"
import { MaxTokensField, MediaInput, ToolUpdate } from "@opencode/schema/model-compatibility"
import { ModelsDev } from "@opencode/schema/models-dev"
import { Money } from "@opencode/schema/money"
import { FreeformFormat } from "@opencode/schema/tool"
Expand Down Expand Up @@ -72,8 +72,14 @@ const SourceApi = Schema.Struct({
base_url: Schema.optional(Schema.String),
capabilities: Schema.optional(
Schema.Struct({
// Format names this version doesn't know are skipped when the route is built.
tools: Schema.optional(Schema.Struct({ freeform: Schema.optional(Schema.Array(Schema.String)) })),
// Format and update names this version doesn't know are skipped when the route is built.
tools: Schema.optional(
Schema.Struct({
freeform: Schema.optional(Schema.Array(Schema.String)),
// Older catalogs published a boolean here, which counts as no updates.
updates: Schema.optional(Schema.Unknown),
}),
),
}),
),
sdk: Schema.optional(
Expand Down Expand Up @@ -144,6 +150,7 @@ const decodeContext = Schema.decodeUnknownOption(ContextCondition)
const decodeMaxTokensField = Schema.decodeUnknownOption(MaxTokensField)
const decodeMediaInput = Schema.decodeUnknownOption(MediaInput)
const knownFreeformFormat = Schema.is(FreeformFormat)
const knownToolUpdate = Schema.is(ToolUpdate)
const decodeStatus = Schema.decodeUnknownOption(Schema.Literals(["alpha", "beta", "deprecated"]))

export type Snapshot = {
Expand Down Expand Up @@ -274,7 +281,10 @@ function route(providerID: Provider.ID, model: SourceModel, unknown: Set<string>
if (!packageName) return undefined
const maxTokensField = Option.getOrUndefined(decodeMaxTokensField(api.compatibility?.max_tokens_field))
const mediaInput = Option.getOrUndefined(decodeMediaInput(api.compatibility?.media_input))
const updates = api.capabilities?.tools?.updates
const toolUpdates = Array.isArray(updates) ? updates.filter(knownToolUpdate) : []
const compatibility = {
...(toolUpdates.length > 0 ? { supportsToolUpdates: toolUpdates } : {}),
...(api.compatibility?.reasoning_field ? { reasoningField: api.compatibility.reasoning_field } : {}),
...(maxTokensField ? { maxTokensField } : {}),
...(mediaInput ? { mediaInput } : {}),
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/session/compaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,7 @@ export const layer = Layer.effect(
agent: context.agent.id,
model: context.model,
tools: context.tools,
toolEpoch: base.toolEpoch,
system: base.system,
messages: base.messages,
webSocket,
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/session/generate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export const generate = Effect.fn("SessionGenerate.generate")(function* (input:
agent: selection.agent.id,
model,
tools: selection.tools,
toolEpoch: transcript.toolEpoch,
system: transcript.system,
messages: [
...transcript.messages,
Expand Down
11 changes: 11 additions & 0 deletions packages/core/src/session/message-updater.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,17 @@ export function update(adapter: Adapter, event: SessionEvent.DurableEvent) {
}),
)
},
"session.tools.updated": (event) =>
adapter.appendMessage(
SessionMessage.System.make({
id: SessionMessage.ID.fromEvent(event.id),
type: "system",
text: "",
tools: { add: event.data.add, remove: event.data.remove, model: event.data.model },
metadata: event.metadata,
time: { created },
}),
),
"session.synthetic": (event) => {
return adapter.appendMessage(
SessionMessage.Synthetic.make({
Expand Down
Loading
Loading