diff --git a/packages/client/src/promise/generated/types.ts b/packages/client/src/promise/generated/types.ts index 5745e288316..70b6026acb6 100644 --- a/packages/client/src/promise/generated/types.ts +++ b/packages/client/src/promise/generated/types.ts @@ -2612,7 +2612,6 @@ export type SessionEventDurable = export type IntegrationInfo = { id: IntegrationID name: string - configured?: boolean metadata?: { [x: string]: any } methods: Array connections: Array diff --git a/packages/core/src/config/plugin/provider.ts b/packages/core/src/config/plugin/provider.ts index 32161f696d3..75faaec5f27 100644 --- a/packages/core/src/config/plugin/provider.ts +++ b/packages/core/src/config/plugin/provider.ts @@ -34,7 +34,6 @@ export const Plugin = define({ } integrations.update(integrationID, (integration) => { integration.name = provider.name || integration.name - integration.configured = true }) if (provider.env !== undefined) { integrations.method.update({ diff --git a/packages/core/src/integration.ts b/packages/core/src/integration.ts index 1a0df1e0f47..8b98e9ce89e 100644 --- a/packages/core/src/integration.ts +++ b/packages/core/src/integration.ts @@ -426,7 +426,6 @@ const layer = Layer.effect( Info.make({ id: entry.ref.id, name: entry.ref.name, - ...(entry.ref.configured === undefined ? {} : { configured: entry.ref.configured }), ...(entry.ref.metadata === undefined ? {} : { metadata: entry.ref.metadata }), methods: entry.methods, connections: connections.map((connection) => { diff --git a/packages/core/test/config/provider.test.ts b/packages/core/test/config/provider.test.ts index 53b99337776..2acd4a9e3c8 100644 --- a/packages/core/test/config/provider.test.ts +++ b/packages/core/test/config/provider.test.ts @@ -365,9 +365,7 @@ describe("ConfigProviderPlugin.Plugin", () => { expect(yield* integrations.get(Integration.ID.make("litellm"))).toMatchObject({ id: "litellm", name: "litellm", - configured: true, methods: [{ type: "key", label: "Manually enter API Key" }], - connections: [], }) }), ) diff --git a/packages/plugin/src/effect/integration.ts b/packages/plugin/src/effect/integration.ts index 7f9d2cf46b2..dea0f616781 100644 --- a/packages/plugin/src/effect/integration.ts +++ b/packages/plugin/src/effect/integration.ts @@ -1,4 +1,4 @@ -import type { ConnectionInfo, IntegrationInfo } from "@opencode/client" +import type { ConnectionInfo } from "@opencode/client" import type { IntegrationApi } from "@opencode/client/effect/api" import { Connection } from "@opencode/schema/connection" import { Credential } from "@opencode/schema/credential" @@ -6,7 +6,7 @@ import { Form } from "@opencode/schema/form" import type { Effect, Scope } from "effect" import type { Transform } from "./registration.js" -type IntegrationRef = Pick +type IntegrationRef = { id: string; name: string } export interface IntegrationOAuthMethod { readonly id: string diff --git a/packages/plugin/src/promise/integration.ts b/packages/plugin/src/promise/integration.ts index 358eeaeb65e..630b391826a 100644 --- a/packages/plugin/src/promise/integration.ts +++ b/packages/plugin/src/promise/integration.ts @@ -1,11 +1,11 @@ -import type { ConnectionInfo, IntegrationInfo } from "@opencode/client" +import type { ConnectionInfo } from "@opencode/client" import type { IntegrationApi } from "@opencode/client/promise/api" import { Connection } from "@opencode/schema/connection" import { Credential } from "@opencode/schema/credential" import { Form } from "@opencode/schema/form" import type { Transform } from "./registration.js" -type IntegrationRef = Pick +type IntegrationRef = { id: string; name: string } export interface IntegrationOAuthMethod { readonly id: string diff --git a/packages/protocol/openapi.json b/packages/protocol/openapi.json index 4ed62787590..75101ecef1c 100644 --- a/packages/protocol/openapi.json +++ b/packages/protocol/openapi.json @@ -17370,9 +17370,6 @@ "name": { "type": "string" }, - "configured": { - "type": "boolean" - }, "metadata": { "type": "object" }, diff --git a/packages/schema/src/integration.ts b/packages/schema/src/integration.ts index c16562a5bc0..2bed7ba6977 100644 --- a/packages/schema/src/integration.ts +++ b/packages/schema/src/integration.ts @@ -68,15 +68,12 @@ export interface Ref extends Schema.Schema.Type {} export const Ref = Schema.Struct({ id: ID, name: Schema.String, - /** Declared in provider configuration, independently of credential connections. */ - configured: optional(Schema.Boolean), metadata: optional(Schema.Record(Schema.String, Schema.Any)), }).annotate({ identifier: "Integration.Ref" }) export const Info = Schema.Struct({ id: ID, name: Schema.String, - configured: optional(Schema.Boolean), metadata: optional(Schema.Record(Schema.String, Schema.Any)), methods: Schema.Array(Method), connections: Schema.Array(Connection.Info), diff --git a/packages/tui/src/component/dialog-integration.tsx b/packages/tui/src/component/dialog-integration.tsx index 37f9a5850b9..17a5143af19 100644 --- a/packages/tui/src/component/dialog-integration.tsx +++ b/packages/tui/src/component/dialog-integration.tsx @@ -135,14 +135,12 @@ export function DialogIntegration( title: integration.name, value: integration.id, description: methods.length === 0 ? "Environment only" : undefined, - footer: status - ? "Sign in required →" - : connectionSummary(integration) || (integration.configured ? "Configured" : undefined), + footer: status ? "Sign in required →" : connectionSummary(integration) || undefined, footerColor: status ? theme.text.feedback.warning.base : undefined, category, disabled: methods.length === 0 && credentials.length === 0, gutter: - (integration.connections.length > 0 || integration.configured) && !status + integration.connections.length > 0 && !status ? () => ✓ : undefined, onSelect: () => { diff --git a/packages/tui/src/util/connected-provider.ts b/packages/tui/src/util/connected-provider.ts index ab791d7bd45..f75ab97390f 100644 --- a/packages/tui/src/util/connected-provider.ts +++ b/packages/tui/src/util/connected-provider.ts @@ -1,5 +1,5 @@ import type { IntegrationInfo } from "@opencode/client" -export function hasConnectedProvider(integrations: readonly Pick[]) { - return integrations.some((integration) => integration.connections.length > 0 || integration.configured) +export function hasConnectedProvider(integrations: readonly Pick[]) { + return integrations.some((integration) => integration.connections.length > 0) } diff --git a/packages/tui/test/component/configured-providers.test.tsx b/packages/tui/test/component/configured-providers.test.tsx deleted file mode 100644 index d1aab11fcb2..00000000000 --- a/packages/tui/test/component/configured-providers.test.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import { expect, test } from "bun:test" -import { CliRenderEvents, InputRenderable } from "@opentui/core" -import { once } from "node:events" -import { DialogIntegration } from "../../src/component/dialog-integration" -import { DialogModel } from "../../src/component/dialog-model" -import { model, renderLocal } from "../fixture/local" -import { directory, json } from "../fixture/tui-client" - -test("identifies models with the same name from config-only integrations", async () => { - await using setup = await renderLocal({ - models: ["one", "two"].map((providerID) => ({ ...model("chat"), providerID, name: "Same Model" })), - fetch: (url) => { - if (url.pathname === "/api/integration") - return json({ - location: { directory }, - data: [ - { id: "one", name: "Gateway One", configured: true, methods: [], connections: [] }, - { id: "two", name: "Gateway Two", configured: true, methods: [], connections: [] }, - ], - }) - if (url.pathname === "/api/provider") - return json({ - location: { directory }, - data: [ - { id: "one", name: "Gateway One" }, - { id: "two", name: "Gateway Two" }, - ], - }) - }, - }) - setup.dialog.replace(() => ) - await setup.renderOnce() - expect(setup.captureCharFrame()).toContain("Gateway One") - expect(setup.captureCharFrame()).toContain("Gateway Two") - - // DialogSelect defers filter focus until after its first render. - if (!(setup.renderer.currentFocusedRenderable instanceof InputRenderable)) - await once(setup.renderer, CliRenderEvents.FOCUSED_RENDERABLE) - await setup.mockInput.typeText("Same Model") - await setup.renderOnce() - const rows = setup - .captureCharFrame() - .split("\n") - .filter((line) => line.includes("Same Model") && line.includes("Gateway")) - expect(rows).toHaveLength(2) - expect(rows.some((line) => line.includes("Gateway One"))).toBe(true) - expect(rows.some((line) => line.includes("Gateway Two"))).toBe(true) -}) - -test("marks config-only integrations as configured", async () => { - await using setup = await renderLocal({ - fetch: (url) => { - if (url.pathname === "/api/integration") - return json({ - location: { directory }, - data: [ - { id: "config", name: "Config only", configured: true, methods: [{ type: "key" }], connections: [] }, - { id: "unconfigured", name: "Not configured", methods: [{ type: "key" }], connections: [] }, - ], - }) - }, - }) - setup.dialog.replace(() => ) - await setup.renderOnce() - const rows = setup.captureCharFrame().split("\n") - expect(rows.find((line) => line.includes("Config only"))).toContain("Configured") - expect(rows.find((line) => line.includes("Config only"))).toContain("✓") - expect(rows.find((line) => line.includes("Not configured"))).not.toContain("Configured") - expect(rows.find((line) => line.includes("Not configured"))).not.toContain("✓") -})