diff --git a/bun.lock b/bun.lock index d8609b31e03c..41721bfa9b1b 100644 --- a/bun.lock +++ b/bun.lock @@ -1027,7 +1027,7 @@ "@effect/platform-node-shared": "4.1.0", "@effect/sql-sqlite-bun": "4.1.0", "@effect/sql-sqlite-node": "4.1.0", - "@hona/strobe": "0.36.0", + "@hona/strobe": "0.37.0", "@kobalte/core": "0.13.13", "@lydell/node-pty": "1.2.0-beta.12", "@npmcli/arborist": "9.4.0", @@ -1569,19 +1569,19 @@ "@happy-dom/global-registrator": ["@happy-dom/global-registrator@20.0.11", "", { "dependencies": { "@types/node": "^20.0.0", "happy-dom": "^20.0.11" } }, "sha512-GqNqiShBT/lzkHTMC/slKBrvN0DsD4Di8ssBk4aDaVgEn+2WMzE6DXxq701ndSXj7/0cJ8mNT71pM7Bnrr6JRw=="], - "@hona/strobe": ["@hona/strobe@0.36.0", "", { "optionalDependencies": { "@hona/strobe-darwin-arm64": "0.36.0", "@hona/strobe-darwin-x64": "0.36.0", "@hona/strobe-linux-arm64": "0.36.0", "@hona/strobe-linux-x64": "0.36.0", "@hona/strobe-win32-arm64": "0.36.0", "@hona/strobe-win32-x64": "0.36.0" }, "bin": { "strobe": "bin/strobe.js" } }, "sha512-TcisD2luf5y6R6RQuzTtL1NanqUzqYV2IV8IFr7Q1SIEtgGb4ueeMWPyvNfS9aQ8FSy6u9YpAZiWDoIUA6PrhQ=="], + "@hona/strobe": ["@hona/strobe@0.37.0", "", { "optionalDependencies": { "@hona/strobe-darwin-arm64": "0.37.0", "@hona/strobe-darwin-x64": "0.37.0", "@hona/strobe-linux-arm64": "0.37.0", "@hona/strobe-linux-x64": "0.37.0", "@hona/strobe-win32-arm64": "0.37.0", "@hona/strobe-win32-x64": "0.37.0" }, "bin": { "strobe": "bin/strobe.js" } }, "sha512-6M7W4YxcnioURhVJQtcdIEoFFO4L+Bkcbln1iEMI0MhVJbWELYJgHFWsbAAWw/nXAF6pN5b/AJ/N/fY35WkOCQ=="], - "@hona/strobe-darwin-arm64": ["@hona/strobe-darwin-arm64@0.36.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-2fglraB9DfmrF0x92IEsv/0u6zgZ0oPmLmkmh6deGWKa+B5BD+m2BsCYaCxUrHrmHwrkA8OWG1UfS3Y0fi/HEQ=="], + "@hona/strobe-darwin-arm64": ["@hona/strobe-darwin-arm64@0.37.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-800o9jgsoIBvu/uYyr3qPV8BdtNAr2bQUb8StFSrcwA/h/B+dtLdOubWmwSaL18YoFd3dAwUlWqmxeipAlWH3w=="], - "@hona/strobe-darwin-x64": ["@hona/strobe-darwin-x64@0.36.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-QBD1ejheS/cgy8kFuE9osdCpcOSUxEYh7dTeixDulvzmX+2qCua2AwajFPBS668I1PCbsbwYpUnqpcp9SC5sNg=="], + "@hona/strobe-darwin-x64": ["@hona/strobe-darwin-x64@0.37.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-zZiUoM290+vo+ePcZUsO0nx8F3OSrbAzFX1xhu3OiX+HT5AWagRfIR6/HyFd+k10zDS0rXlYxeudNOMqiM0xbA=="], - "@hona/strobe-linux-arm64": ["@hona/strobe-linux-arm64@0.36.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-SJxTyskt5iCfklNVbRnCxL5jyjtspiV54T8eI+B6Y+qJJ9dk2FGlP/y/YfSkZF1w1N+v1rdKComfZatO5nkpSw=="], + "@hona/strobe-linux-arm64": ["@hona/strobe-linux-arm64@0.37.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-NA5K+7y4qha3PbjdLoIIzB4wz139gFi4X4g8iTS+vWGIaAob0d+6XygU5TndPyMLAZrSDfvgWqcqCQhsVwxPWg=="], - "@hona/strobe-linux-x64": ["@hona/strobe-linux-x64@0.36.0", "", { "os": "linux", "cpu": "x64" }, "sha512-q/brYo1wrqij/rtCMKjK3gVpknncCsulZ+DjrFdW+5dh/cBbWRnuJKV1c3BEYQmXI+/puesqTktV5d3xGlXTpg=="], + "@hona/strobe-linux-x64": ["@hona/strobe-linux-x64@0.37.0", "", { "os": "linux", "cpu": "x64" }, "sha512-jRluj2WV+nkmO9fDpQ4Iw53NkczBsAB9aDWimBkWVLz5BW7RjZSuDT613iMDLXAAiWQJAYE6pZfMjfQnWz5HlQ=="], - "@hona/strobe-win32-arm64": ["@hona/strobe-win32-arm64@0.36.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-10FFkPuZZg9mg4cEY13SSMeliQuJBTVsAaQrv9jYOgmaw0JBYwKo9J/g7iZ81ohLBcNf9tYEeFVPZpgWWbCMYQ=="], + "@hona/strobe-win32-arm64": ["@hona/strobe-win32-arm64@0.37.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-RdFuMZUT38P954klZVNludyDnGNpK+bfbmDkEFKvTmNlFuqvaZ4ARDV2gTmNjlOBAW+xurXAr/16GhTgtXG93Q=="], - "@hona/strobe-win32-x64": ["@hona/strobe-win32-x64@0.36.0", "", { "os": "win32", "cpu": "x64" }, "sha512-fRaQX2P0xL+DKj6pzDwJj7StZgUMgRWl2x0mvC13+5uF3yuPbse/3+eF0I/spBNg/q+PuMVrotlXsHO0eFPD6g=="], + "@hona/strobe-win32-x64": ["@hona/strobe-win32-x64@0.37.0", "", { "os": "win32", "cpu": "x64" }, "sha512-BGKwdbo9/bexolOksstSMqc0GtR0hv6fTfCVl0qf+wg5iS90+1QIYOS4gGtKTyDE4bfy66BKgJJoM5rYQmGcJw=="], "@hono/node-server": ["@hono/node-server@2.1.5", "", { "peerDependencies": { "hono": "^4 || ^5.0.0-0" } }, "sha512-MgP/I06GdvsilDspMk/qmRzpk8LOUStP6jFAbSRi40W09DhoyUn+Mj7eyKICPqeYKybOjVFLVIAQzvu1bfIa7Q=="], diff --git a/package.json b/package.json index 11cd352bd8d7..d5bf56656232 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@effect/sql-sqlite-node": "4.1.0", "@npmcli/arborist": "9.4.0", "@types/bun": "1.4.3", - "@hona/strobe": "0.36.0", + "@hona/strobe": "0.37.0", "@types/cross-spawn": "6.0.6", "@octokit/rest": "22.0.0", "@opentui/core": "0.8.4", diff --git a/packages/ai/README.md b/packages/ai/README.md index db73e71af7c0..8231abb1a633 100644 --- a/packages/ai/README.md +++ b/packages/ai/README.md @@ -1087,7 +1087,9 @@ const program = Effect.gen(function* () { The shared fields are `prompt`, `start`, `end`, `references`, `duration`, `aspect`, `resolution` and `sound`; everything else is provider-specific and goes under `providerOptions`, typed from the selected model. A request only -fails before sending when its protocol has no way to express it, such as a reference video on xAI. Values the provider +fails before sending when its protocol has no way to express it, such as a reference video on xAI. `sound` is the +exception: on models whose sound can't be switched (MiniMax H3 and Gemini Omni always have it, Hailuo never does) it +isn't sent, and the model's own behavior applies. Values the provider may reject, like an unsupported duration or too many references, go to the provider, and its error comes back typed. `start` and `end` are images. They take a URL, data URL, base64 string or bytes, or an asset built with @@ -1131,11 +1133,11 @@ Provider notes: `/v1`, and a bare host (`https://api.minimax.io`) works as is. On H3, `start`, `end` and `references` become `content[]` items with `first_frame`, `last_frame` and `reference_image` / `reference_video` / `reference_audio` roles, MiniMax file refs become `mm_file://` URLs, `aspect: "auto"` becomes `ratio: "adaptive"`, and `resolution` is uppercased (`480P`, `2K`). H3 requires `resolution` and `duration`, plus a - `ratio` for text-only prompts; nothing is filled in, so MiniMax rejects a request without them. H3 always has sound, - so `sound: false` fails before sending. On Hailuo, `start` and `end` map to `first_frame_image` and + `ratio` for text-only prompts; nothing is filled in, so MiniMax rejects a request without them. H3 always has sound + and has no field for it, so `sound` isn't sent. On Hailuo, `start` and `end` map to `first_frame_image` and `last_frame_image`, image references to `subject_reference`, and the result looks up the file's download URL, which - expires after one hour. Hailuo is silent and has no aspect field, so `sound: true`, an explicit `aspect`, and video - or audio references fail before sending. Cancel works on H3 (only while queued); Hailuo has no cancel. Native fields + expires after one hour. Hailuo is always silent, so `sound` isn't sent; it has no aspect field, so an explicit + `aspect` and video or audio references fail before sending. Cancel works on H3 (only while queued); Hailuo has no cancel. Native fields such as `extra.prompt_expansion_mode` (H3), `prompt_optimizer` (Hailuo) and `callback_url` go under `providerOptions`. - **Google** (`Google.video("gemini-omni-1.2-flash")`) starts a background Gemini Omni interaction. Omni has no role field for media, so `start`, `end` and `references` go into `input` in that order (images, plus video @@ -1143,7 +1145,7 @@ Provider notes: `reference_to_video` for references only; with both, the prompt decides. `duration` becomes `response_format.duration` (`"3s"`), and `aspect` and `resolution` go to `response_format` as is (resolution lowercased); `aspect: "auto"` leaves the ratio out. It rejects `end` without `start` (a lone image reads as the - first frame) and `sound: false` (Omni always generates audio). Videos come back as inline bytes. `cancel` posts to + first frame). Omni always generates audio and has no field for it, so `sound` isn't sent. Videos come back as inline bytes. `cancel` posts to `/interactions/{id}/cancel`. `providerOptions` takes native Interactions fields, such as `previous_interaction_id` to edit or extend a generated video, `generation_config.video_config.task`, `service_tier` and `webhook_config`. diff --git a/packages/ai/src/protocols/google-interactions-video.ts b/packages/ai/src/protocols/google-interactions-video.ts index 79c81433c5e2..0f61c6a597c5 100644 --- a/packages/ai/src/protocols/google-interactions-video.ts +++ b/packages/ai/src/protocols/google-interactions-video.ts @@ -129,11 +129,6 @@ const task = (request: Request) => { const fromRequest = Effect.fn("GoogleInteractionsVideo.fromRequest")(function* (request: Request) { if (request.end !== undefined && request.start === undefined) return yield* route.unsupported("video.end", `${route.name} reads a lone image as the start frame; send start too`) - if (request.sound === false) - return yield* route.unsupported( - "video.sound", - `${route.name} always generates audio and has no option to turn it off`, - ) const media = yield* Effect.forEach( [request.start, request.end, ...(request.references ?? [])].filter( (asset): asset is Media.Asset => asset !== undefined, diff --git a/packages/ai/src/protocols/minimax-video.ts b/packages/ai/src/protocols/minimax-video.ts index fe45f999608d..aab982336fec 100644 --- a/packages/ai/src/protocols/minimax-video.ts +++ b/packages/ai/src/protocols/minimax-video.ts @@ -177,9 +177,7 @@ const reference = (asset: Media.Asset) => const resolution = (request: Request) => request.resolution?.toUpperCase() const fromRequest = Effect.fn("MiniMaxVideo.fromRequest")(function* (request: Request) { - // H3 always generates a soundtrack and has no field to turn it off. - if (request.sound === false) - return yield* route.unsupported("video.sound", `${route.name} always generates sound and can't be silenced`) + // H3 always generates a soundtrack and has no field for `sound`, so it isn't sent. const content = [ { type: "text", text: request.prompt }, ...(request.start === undefined ? [] : [yield* item(request.start, "first_frame")]), @@ -213,8 +211,7 @@ const hailuoFromRequest = Effect.fn("MiniMaxHailuoVideo.fromRequest")(function* `${hailuoRoute.name} takes only image (subject) references`, ) // Hailuo output is always silent and its shape follows the model or the first frame, with no field for either. - if (request.sound === true) - return yield* hailuoRoute.unsupported("video.sound", `${hailuoRoute.name} generates silent video only`) + // `sound` has nothing to send, so it isn't; an aspect ratio would change the shape the caller asked for. if (request.aspect !== undefined && request.aspect !== "auto") return yield* hailuoRoute.unsupported("video.aspect", `${hailuoRoute.name} has no aspect ratio input`) const subjects = yield* Effect.forEach(references, (asset) => diff --git a/packages/ai/test/generation.test.ts b/packages/ai/test/generation.test.ts index 90eda9f3a632..e89222573b38 100644 --- a/packages/ai/test/generation.test.ts +++ b/packages/ai/test/generation.test.ts @@ -97,7 +97,9 @@ describe("Generation", () => { const generation = new Generation(route, "t", { id: "gen_1", status: "queued" }) const fiber = yield* Effect.forkChild( - generation.events({ poll: { interval: "1 second", timeout: "5 seconds" } }).pipe(Stream.runCollect, Effect.flip), + generation + .events({ poll: { interval: "1 second", timeout: "5 seconds" } }) + .pipe(Stream.runCollect, Effect.flip), ) yield* TestClock.adjust("6 seconds") const error = yield* Fiber.join(fiber) diff --git a/packages/ai/test/google-interactions-video.test.ts b/packages/ai/test/google-interactions-video.test.ts index 4aabcbaf4f0a..a57253f7f7f9 100644 --- a/packages/ai/test/google-interactions-video.test.ts +++ b/packages/ai/test/google-interactions-video.test.ts @@ -101,7 +101,9 @@ describe("ai.video.start / Google Interactions", () => { model, prompt: "Morph", start: Media.image(Media.fromDataUrl("data:image/png;base64,AQID")), - end: Media.image(Media.ref("google", "https://generativelanguage.googleapis.com/v1beta/files/last", "image/jpeg")), + end: Media.image( + Media.ref("google", "https://generativelanguage.googleapis.com/v1beta/files/last", "image/jpeg"), + ), }) expect(body.input).toEqual([ { type: "image", data: "AQID", mime_type: "image/png" }, @@ -147,9 +149,15 @@ describe("ai.video.start / Google Interactions", () => { }), ) + it.effect("sends nothing for sound, since Omni always generates audio and has no field for it", () => + Effect.gen(function* () { + const silent = yield* sent({ model, prompt: "x", sound: false }) + expect(JSON.stringify(silent.body)).not.toContain("audio") + }), + ) + for (const rejected of [ { name: "an end frame without a start frame", input: { end: "data:image/png;base64,AQID" }, operation: "end" }, - { name: "silent video", input: { sound: false }, operation: "sound" }, ]) it.effect(`rejects ${rejected.name}, which Omni has no way to send, before sending`, () => Effect.gen(function* () { diff --git a/packages/ai/test/minimax-video.test.ts b/packages/ai/test/minimax-video.test.ts index 7434dcd76481..514458e913c7 100644 --- a/packages/ai/test/minimax-video.test.ts +++ b/packages/ai/test/minimax-video.test.ts @@ -136,12 +136,19 @@ describe("MiniMax Video / H3 start", () => { }), ) - it.effect("rejects silent output, which H3 can't produce, before sending", () => + it.effect("sends nothing for sound, which neither API has a field for", () => Effect.gen(function* () { - const error = yield* ai.video.start({ model: h3, prompt: "x", sound: false }).pipe(Effect.flip) - expect(error.reason._tag).toBe("UnsupportedOperation") - expect(error.message).toContain("always generates sound") - }).pipe(Effect.provide(layer(() => Effect.die("an unsupported request reached the network")))), + const requests = yield* sent([ + { model: h3, sound: false }, + { model: h3, sound: true }, + { model: hailuo, sound: true }, + ]) + expect(requests.map((request) => "generate_audio" in request.body || "sound" in request.body)).toEqual([ + false, + false, + false, + ]) + }), ) it.effect("returns MiniMax's HTTP errors typed", () => @@ -242,7 +249,6 @@ describe("MiniMax Video / Hailuo start", () => { request: { references: [Media.url("https://example.test/v.mp3", { mediaType: "audio/mpeg" })] }, tag: "UnsupportedOperation", }, - { name: "sound", request: { sound: true }, tag: "UnsupportedOperation" }, { name: "an aspect ratio", request: { aspect: "16:9" as const }, tag: "UnsupportedOperation" }, { name: "a MiniMax file reference", request: { start: Media.ref("minimax", "file_1") }, tag: "InvalidRequest" }, ]) { diff --git a/packages/app/component-tests/tooltip.spec.ts b/packages/app/component-tests/tooltip.spec.ts index b55839f0feaf..049460740765 100644 --- a/packages/app/component-tests/tooltip.spec.ts +++ b/packages/app/component-tests/tooltip.spec.ts @@ -1,49 +1,169 @@ import { expect, story } from "../../stories/playwright/story" -story("opens a neighbouring tooltip without the open delay", async ({ mount, page }) => { +story.beforeEach(async ({ page }) => { + await page.clock.install({ time: new Date("2026-01-01T00:00:00Z") }) + await page.clock.pauseAt(new Date("2026-01-01T00:00:01Z")) +}) + +story("cancels a pending hover on click and opens again on re-entry", async ({ mount, page }) => { + const root = await mount("ui-tooltip--with-button") + + const trigger = root.getByRole("button", { name: "Add" }) + + const tooltip = page.getByRole("tooltip", { name: "Add one to the count" }) + + await trigger.hover() + await page.clock.runFor(300) + await trigger.click() + await expect(root.getByRole("status")).toHaveText("Count: 1") + await expect(tooltip).toBeHidden() + await page.clock.runFor(600) + await expect(tooltip).toBeHidden() + + await page.mouse.move(0, 0) + await trigger.hover() + await page.clock.runFor(600) + await expect(tooltip).toBeVisible() +}) + +story("dismisses an open tooltip on pointerdown before the button activates", async ({ mount, page }) => { + const root = await mount("ui-tooltip--with-button") + + const tooltip = page.getByRole("tooltip", { name: "Add one to the count" }) + + await root.getByRole("button", { name: "Add" }).hover() + await page.clock.runFor(600) + await expect(tooltip).toBeVisible() + await page.mouse.down() + await expect(tooltip).toBeHidden() + await expect(root.getByRole("status")).toHaveText("Count: 0") + await page.mouse.up() + await expect(root.getByRole("status")).toHaveText("Count: 1") + await page.clock.runFor(600) + await expect(tooltip).toBeHidden() +}) + +story("shows the wrapped button's tooltip on Tab and Shift+Tab, even after a click", async ({ mount, page }) => { + const root = await mount("ui-tooltip--with-button") + + const trigger = root.getByRole("button", { name: "Add" }) + + const tooltip = page.getByRole("tooltip", { name: "Add one to the count" }) + + await page.keyboard.press("Tab") + await expect(trigger).toBeFocused() + await expect(tooltip).toBeVisible() + + await trigger.click() + await expect(tooltip).toBeHidden() + await page.keyboard.press("Tab") + await expect(root.getByRole("button", { name: "Reset" })).toBeFocused() + await page.keyboard.press("Shift+Tab") + await expect(trigger).toBeFocused() + await expect(tooltip).toBeVisible() + await page.keyboard.press("Escape") + await expect(tooltip).toBeHidden() + await expect(trigger).toBeFocused() +}) + +story("restored focus does not open a tooltip after Tab leaves the window", async ({ mount, page }) => { + const root = await mount("ui-tooltip--with-button") + + await page.keyboard.down("Tab") + await expect(root.getByRole("button", { name: "Add" })).toBeFocused() + // The page loses focus before receiving Tab's keyup. + await page.evaluate(() => window.dispatchEvent(new FocusEvent("blur"))) + await root.getByRole("button", { name: "Reset" }).focus() + await expect(page.getByRole("tooltip", { name: "Reset the count" })).toBeHidden() + await page.keyboard.up("Tab") +}) + +story.describe("touch", () => { + story.use({ hasTouch: true, isMobile: true, viewport: { width: 390, height: 844 } }) + + story("tapping the button preserves the tooltip's hover state", async ({ mount, page }) => { + const root = await mount("ui-tooltip--with-button") + + const trigger = root.getByRole("button", { name: "Add" }) + + const tooltip = page.getByRole("tooltip", { name: "Add one to the count" }) + + expect(await page.evaluate(() => matchMedia("(hover: none)").matches)).toBe(true) + await trigger.tap() + await expect(root.getByRole("status")).toHaveText("Count: 1") + await expect(tooltip).toBeHidden() + await page.clock.runFor(600) + await expect(tooltip).toBeHidden() + + await trigger.hover() + await page.clock.runFor(600) + await expect(tooltip).toBeVisible() + await trigger.tap() + await expect(root.getByRole("status")).toHaveText("Count: 2") + await expect(tooltip).toBeVisible() + }) +}) + +story("waits 600 ms on first hover and opens a neighbouring tooltip immediately", async ({ mount, page }) => { const root = await mount("ui-tooltip--appearances") + + const tooltip = page.getByRole("tooltip", { name: "Standard tooltip" }) + await root.getByText("Standard", { exact: true }).hover() - await expect(page.getByRole("tooltip", { name: "Standard tooltip" })).toBeVisible() + await page.clock.runFor(599) + await expect(tooltip).toBeHidden() + await page.clock.runFor(1) + await expect(tooltip).toBeVisible() // With timers frozen, the next tooltip can only open through the skip-delay window that closing this one starts. - await page.clock.install({ time: new Date("2026-01-01T00:00:00Z") }) - await page.clock.pauseAt(new Date("2026-01-01T00:00:01Z")) await root.getByText("Compact", { exact: true }).hover() await expect(page.getByRole("tooltip", { name: "Compact tooltip" })).toBeVisible() }) story("keeps a menu trigger's tooltip hidden when the menu closes under a still pointer", async ({ mount, page }) => { const root = await mount("ui-tooltip--with-menu") - await page.clock.install() + const trigger = root.getByRole("button", { name: "Actions" }) + const tooltip = page.getByRole("tooltip", { name: "More actions" }) + await trigger.hover() + await page.clock.runFor(600) await expect(tooltip).toBeVisible() await trigger.click() await expect(page.getByRole("menu")).toBeVisible() await expect(tooltip).toBeHidden() await page.keyboard.press("Escape") await expect(page.getByRole("menu")).toBeHidden() + // The menu restores focus in a zero-delay task after unmounting. + await page.clock.runFor(0) await expect(trigger).toBeFocused() - // The menu's closing layer hands the still pointer a fresh pointerenter, which would open the tooltip 400 ms later. - await page.clock.runFor(1000) + // The menu's closing layer can hand the still pointer a fresh pointerenter. + await page.clock.runFor(600) await expect(tooltip).toBeHidden() await page.mouse.move(0, 0) await trigger.hover() + await page.clock.runFor(600) await expect(tooltip).toBeVisible() }) story("opens a menu trigger's tooltip on the next hover after the menu closes", async ({ mount, page }) => { const root = await mount("ui-tooltip--with-menu") + const trigger = root.getByRole("button", { name: "Actions" }) + const tooltip = page.getByRole("tooltip", { name: "More actions" }) + await trigger.hover() + await page.clock.runFor(600) await expect(tooltip).toBeVisible() await trigger.click() await expect(page.getByRole("menu")).toBeVisible() await page.mouse.move(0, 0) await page.keyboard.press("Escape") await expect(page.getByRole("menu")).toBeHidden() + await page.clock.runFor(0) await expect(trigger).toBeFocused() await trigger.hover() + await page.clock.runFor(600) await expect(tooltip).toBeVisible() }) diff --git a/packages/app/e2e/regression/btw-sidebar.spec.ts b/packages/app/e2e/regression/btw-sidebar.spec.ts index 6ae47c9a64e7..0028cb75d005 100644 --- a/packages/app/e2e/regression/btw-sidebar.spec.ts +++ b/packages/app/e2e/regression/btw-sidebar.spec.ts @@ -163,6 +163,7 @@ test("keeps many long-titled side tabs usable at a narrow desktop width", async }) test("answers /btw in the side panel without admitting a prompt", async ({ page }) => { + await page.clock.install() await page.context().grantPermissions(["clipboard-read", "clipboard-write"]) const generations: { sessionID: string; prompt: string }[] = [] const prompts: unknown[] = [] @@ -228,12 +229,27 @@ test("answers /btw in the side panel without admitting a prompt", async ({ page await expect(panel.getByRole("button", { name: "Revert to here", exact: true })).toHaveCount(0) await expect(panel.getByRole("button", { name: "Copy answer", exact: true })).toHaveCount(1) await expect(panel.locator('[data-slot="text-part-meta"]')).toContainText(/\d+s/) - await panel.locator('[data-component="user-message"]').hover() - await panel.getByRole("button", { name: "Copy message", exact: true }).click() - await expect(panel.getByRole("button", { name: "Copied", exact: true })).toHaveCount(1) - await panel.locator('[data-component="text-part"]').hover() - await panel.getByRole("button", { name: "Copy answer", exact: true }).click() - await expect(panel.getByRole("button", { name: "Copied", exact: true })).toHaveCount(2) + const feedback = page.getByRole("tooltip", { name: "Copied", exact: true }) + + for (const [component, label] of [ + ["user-message", "Copy message"], + ["text-part", "Copy answer"], + ]) { + const row = panel.locator(`[data-component="${component}"]`) + + const button = row.getByRole("button", { name: label, exact: true }) + + await row.hover() + await button.click() + await expect(feedback).toBeVisible() + await page.clock.fastForward(1_000) + await expect(feedback).toHaveCSS("opacity", "1") + await expect(row.getByRole("button", { name: "Copied", exact: true })).toBeVisible() + await page.clock.fastForward(1_000) + await expect(button).toBeVisible() + await expect(page.getByRole("tooltip")).toBeHidden() + } + expect(generations).toHaveLength(1) expect(generations[0]?.sessionID).toBe(main.id) expect(generations[0]?.prompt).toContain("how does the retry loop work?") diff --git a/packages/app/e2e/regression/settings.spec.ts b/packages/app/e2e/regression/settings.spec.ts index 3abea682c73d..adc3e0edcd04 100644 --- a/packages/app/e2e/regression/settings.spec.ts +++ b/packages/app/e2e/regression/settings.spec.ts @@ -1765,6 +1765,9 @@ for (const row of [ }) } +const connectDialog = (page: Page) => + page.getByRole("dialog").filter({ has: page.getByRole("navigation", { name: "Connect steps", exact: true }) }) + const consoleIntegrations = [ { id: "opencode", @@ -1799,7 +1802,7 @@ test("providers: OpenCode Console signs in from its method list", async ({ page, await methods.getByRole("button", { name: "OpenCode Console account", exact: true }).click() await expect(await popup).toHaveURL(url) - const signIn = page.getByRole("dialog", { name: "Connecting to OpenCode Console", exact: true }) + const signIn = page.getByRole("dialog", { name: "Connect OpenCode Console", exact: true }) await expect(signIn.getByRole("group", { name: "Device code: ABCD-EFGH", exact: true })).toBeVisible() await expect(signIn.getByRole("button", { name: "Copy sign-in link", exact: true })).toBeVisible() }) @@ -1880,14 +1883,14 @@ test("providers: Back during a pending API key request does not report the provi .locator(".settings-provider-row", { hasText: "OpenRouter" }) .getByRole("button", { name: "Connect", exact: true }) .click() - const dialog = page.getByRole("dialog", { name: "Connect OpenRouter", exact: true }) + const dialog = connectDialog(page) await dialog.getByRole("button", { name: "API key", exact: true }).click() await dialog.getByPlaceholder("API key").fill("sk-late") await dialog.getByRole("button", { name: "Continue", exact: true }).click() await held.arrived await expect(dialog.getByRole("button", { name: "Continue", exact: true })).toBeDisabled() - await dialog.getByRole("button", { name: "Navigate back", exact: true }).click() + await dialog.getByRole("navigation").getByRole("button", { name: "OpenRouter", exact: true }).click() await expect(dialog.getByRole("button", { name: "Sign in", exact: true })).toBeVisible() // The server still saves the key, so its late success reloads the catalogs without leaving the method list. @@ -1925,7 +1928,7 @@ test("providers: the free tier upsell opens Go on its own, sized to its content" const container = page.locator('[data-slot="dialog-container"]') await expect(dialog.getByPlaceholder("API key")).toBeVisible() // Nothing to go back to: the upsell opened the dialog straight on Go. - await expect(dialog.getByRole("button", { name: "Navigate back", exact: true })).toHaveCount(0) + await expect(dialog.getByRole("navigation").getByRole("button")).toHaveCount(0) await expect.poll(async () => (await container.boundingBox())?.height).toBeLessThan(512) }) @@ -1982,7 +1985,7 @@ test("providers: the connect dialog lists connected providers and manages their const picker = await container.boundingBox() await openai.click() - await expect(page.getByRole("dialog", { name: "OpenAI", exact: true })).toBeVisible() + await expect(page.getByRole("dialog", { name: "Connect OpenAI", exact: true })).toBeVisible() // The provider step fits its content below the list's top edge. await expect.poll(async () => (await container.boundingBox())?.height).toBeLessThan(picker!.height) expect((await container.boundingBox())?.y).toBe(picker!.y) @@ -2010,7 +2013,7 @@ test("providers: the connect dialog lists connected providers and manages their await name.fill("Ignored") await name.press("Escape") await expect(list.getByRole("radio")).toHaveText(["Home", "Work"]) - await expect(page.getByRole("dialog", { name: "OpenAI", exact: true })).toBeVisible() + await expect(page.getByRole("dialog", { name: "Connect OpenAI", exact: true })).toBeVisible() await list.getByRole("button", { name: "Work options", exact: true }).click() await page.getByRole("menuitem", { name: "Remove", exact: true }).click() @@ -2025,7 +2028,7 @@ test("providers: the connect dialog lists connected providers and manages their await dialog.getByRole("button", { name: "Add account", exact: true }).click() await expect(dialog.getByPlaceholder("API key")).toBeVisible() - await dialog.getByRole("button", { name: "Navigate back", exact: true }).click() + await dialog.getByRole("navigation").getByRole("button", { name: "OpenAI", exact: true }).click() await expect(list).toBeVisible() }) @@ -2064,9 +2067,9 @@ test("providers: adding an account starts a lone method once", async ({ page, co await expect(dialog.getByPlaceholder("API key")).toBeVisible() expect(attempts).toEqual([]) - await dialog.getByRole("button", { name: "Navigate back", exact: true }).click() + await dialog.getByRole("navigation").getByRole("button", { name: "OpenCode Go", exact: true }).click() await expect(dialog.getByRole("radio", { name: "Go key", exact: true })).toBeVisible() - await dialog.getByRole("button", { name: "Integrations", exact: true }).click() + await dialog.getByRole("navigation").getByRole("button", { name: "Connect", exact: true }).click() await dialog.locator('[data-provider-id="github-copilot"]').click() const popup = page.waitForEvent("popup") await dialog.getByRole("button", { name: "Add account", exact: true }).click() @@ -2101,9 +2104,9 @@ test("providers: Back from a pending sign-in cancels it and lets a backdrop clic const popup = page.waitForEvent("popup") await dialog.locator('[data-provider-id="github-copilot"]').click() await popup - await expect(dialog.getByText("Waiting for authorization…", { exact: true })).toBeVisible() + await expect(dialog.getByText("Waiting for authorization", { exact: true })).toBeVisible() - await dialog.getByRole("button", { name: "Navigate back", exact: true }).click() + await dialog.getByRole("navigation").getByRole("button", { name: "Connect", exact: true }).click() await expect(dialog.locator('[data-provider-id="github-copilot"]')).toBeVisible() await expect.poll(() => cancelled).toEqual(["con_mock_1"]) @@ -2132,9 +2135,9 @@ test("providers: Back from a Claude Agent check started by Add account returns t await dialog.getByRole("button", { name: "Add account", exact: true }).click() await dialog.getByRole("button", { name: "Check again", exact: true }).click() await held.arrived - await expect(dialog.getByText("Checking Claude Code…", { exact: true })).toBeVisible() + await expect(dialog.getByText("Checking Claude Code", { exact: true })).toBeVisible() - await dialog.getByRole("button", { name: "Navigate back", exact: true }).click() + await dialog.getByRole("navigation").getByRole("button", { name: "Claude Agent", exact: true }).click() await expect(dialog.getByRole("radio", { name: "Claude Code", exact: true })).toBeVisible() held.release() }) @@ -2173,13 +2176,13 @@ test("providers: Back from a Console connection without models returns to its si .locator(".settings-provider-row", { hasText: "OpenCode Console" }) .getByRole("button", { name: "Connect", exact: true }) .click() - const dialog = page.getByRole("dialog", { name: "Connect OpenCode Console", exact: true }) + const dialog = connectDialog(page) const popup = page.waitForEvent("popup") await dialog.getByRole("button", { name: "OpenCode Console account", exact: true }).click() await popup await expect(page.getByRole("dialog").getByText("OpenCode connected", { exact: true })).toBeVisible() - await page.getByRole("dialog").getByRole("button", { name: "Navigate back", exact: true }).click() + await dialog.getByRole("navigation").getByRole("button", { name: "OpenCode Console", exact: true }).click() await expect(dialog.locator('[data-action="provider-connect-method"]')).toHaveText([ "OpenCode Console account", "API key (service account)", diff --git a/packages/app/e2e/regression/side-panels.spec.ts b/packages/app/e2e/regression/side-panels.spec.ts index 25de38130772..b58082aa29c8 100644 --- a/packages/app/e2e/regression/side-panels.spec.ts +++ b/packages/app/e2e/regression/side-panels.spec.ts @@ -387,3 +387,84 @@ test("the new tab view lists recently closed tabs, expands to the rest, and keep await expect(rows.first()).toContainText("closed-00.ts") await expect(recent).not.toContainText("README.md") }) + +test("Mod+F finds in Markdown and HTML previews with the code view's find bar", async ({ page }) => { + await page.setViewportSize({ width: 1440, height: 900 }) + const directory = "C:/OpenCode/PreviewFind" + const key = `local\u0000${base64Encode(directory)}/ses_previewfind` + + const files = new Map([ + ["notes.md", "# Needle notes\n\nOne needle here.\n\nAnother **needle** there."], + ["diagram.mmd", "flowchart TD\n A[First needle] --> B[Last needle]"], + [ + "page.html", + "\nPage

First needle

Last needle

", + ], + ]) + + await openSession(page, { + name: "PreviewFind", + fileList: () => [], + fileContent: (path) => ({ type: "text", content: files.get(path.split("/").at(-1) ?? "") ?? "" }), + seed: { + panes: { ses_previewfind: { review: true } }, + storage: { + "opencode.global.dat:layout": { + sessionTabs: { + [key]: { all: ["file://notes.md", "file://diagram.mmd", "file://page.html"], active: "file://notes.md" }, + }, + }, + }, + }, + }) + + const side = page.locator('[data-pane-content="side"]') + const find = page.getByRole("textbox", { name: "Find" }) + const mod = await page.evaluate(() => (/(Mac|iPod|iPhone|iPad)/.test(navigator.platform) ? "Meta" : "Control")) + await side.getByText("One needle here.").click() + await page.keyboard.press(`${mod}+f`) + await expect(find).toBeFocused() + await find.fill("needle") + await expect(page.getByText("1/3", { exact: true })).toBeVisible() + await find.press("Enter") + await expect(page.getByText("2/3", { exact: true })).toBeVisible() + await find.press("Shift+Enter") + await find.press("Shift+Enter") + await expect(page.getByText("3/3", { exact: true })).toBeVisible() + await find.press("Escape") + await expect(find).toHaveCount(0) + + // A closed side panel keeps its preview mounted out of sight, so Mod+F opens no bar there. + const toggle = page.getByRole("button", { name: "Toggle review" }) + await toggle.click() + await expect(side).toBeHidden() + await page.keyboard.press(`${mod}+f`) + await expect(find).toHaveCount(0) + await toggle.click() + + // Mermaid keeps its source in a hidden code block; only the drawn labels count. + await side.getByRole("tab", { name: "diagram.mmd", exact: true }).click() + await side.locator("svg").getByText("First needle").click() + await page.keyboard.press(`${mod}+f`) + await expect(find).toBeFocused() + await find.fill("needle") + await expect(page.getByText("1/2", { exact: true })).toBeVisible() + await find.press("Escape") + await expect(find).toHaveCount(0) + + // The HTML runs in a sandboxed frame; Mod+F pressed inside it still opens the bar. + await side.getByRole("tab", { name: "page.html", exact: true }).click() + const frame = side.frameLocator('iframe[data-file-find="frame"]') + await frame.getByText("First needle").click() + // The find script goes after the doctype, even behind a comment, so the page keeps standards mode. + expect(await frame.locator("html").evaluate(() => document.compatMode)).toBe("CSS1Compat") + await page.keyboard.press(`${mod}+f`) + await expect(find).toBeFocused() + await find.fill("needle") + await expect(page.getByText("1/2", { exact: true })).toBeVisible() + await find.press("Enter") + await expect(page.getByText("2/2", { exact: true })).toBeVisible() + await expect(frame.getByText("Last needle")).toBeInViewport() + await find.press("Escape") + await expect(find).toHaveCount(0) +}) diff --git a/packages/app/e2e/regression/tabs.spec.ts b/packages/app/e2e/regression/tabs.spec.ts index 5ef9ed996d9d..dddb9d25374a 100644 --- a/packages/app/e2e/regression/tabs.spec.ts +++ b/packages/app/e2e/regression/tabs.spec.ts @@ -1874,6 +1874,9 @@ test("the Windows titlebar menu swaps one submenu for the next as the pointer mo const parents = ["File", "Edit", "View"].map((name) => page.getByRole("menuitem", { name, exact: true })) const submenus = page.locator('[role="menu"].desktop-app-menu-sub') + // Keep the hover delay from elapsing while Playwright moves the pointer and checks the old submenu. + await holdClock(page) + for (const [index, parent] of parents.entries()) { const box = (await parent.boundingBox())! // Down and to the left, away from the open submenu, so the pointer isn't heading for it. diff --git a/packages/app/src/components-lab/dialog-story-runtime.tsx b/packages/app/src/components-lab/dialog-story-runtime.tsx index 95f3ef4bd23f..23b0a41d06e1 100644 --- a/packages/app/src/components-lab/dialog-story-runtime.tsx +++ b/packages/app/src/components-lab/dialog-story-runtime.tsx @@ -204,7 +204,7 @@ const defaultModels = [ }), ] -const integrations = [ +const fixtureIntegrations = [ { id: "anthropic", name: "Anthropic", @@ -248,6 +248,149 @@ const integrations = [ methods: [{ type: "oauth", id: "copilot", label: "Sign in with GitHub" }], connections: [], }, + { + id: "xai", + name: "xAI", + methods: [ + { type: "oauth", id: "device", label: "SuperGrok Subscription" }, + { type: "key", label: "Manually enter API Key" }, + ], + connections: [], + }, + { + id: "gitlab", + name: "GitLab", + methods: [ + { + type: "oauth", + id: "pkce", + label: "Login with GitLab (OAuth)", + form: [ + { + key: "instanceUrl", + type: "string", + title: "GitLab instance URL", + description: "Use gitlab.com, or the URL of your self-managed instance.", + placeholder: "https://gitlab.com", + }, + ], + }, + ], + connections: [], + }, + { + id: "snowflake-cortex", + name: "Snowflake Cortex", + methods: [ + { + type: "oauth", + id: "browser", + label: "Login with Snowflake (External Browser)", + form: [ + { key: "account", type: "string", title: "Snowflake account", placeholder: "org-account", required: true }, + ], + }, + ], + connections: [], + }, + { + id: "amazon-bedrock", + name: "Amazon Bedrock", + methods: [ + { type: "key", label: "Bedrock API key" }, + { + type: "external", + id: "aws-profile", + label: "AWS profile (SSO or named profile)", + form: [ + { + key: "profile", + type: "string", + title: "AWS profile", + description: "Profiles from ~/.aws/config.", + required: true, + custom: true, + options: [ + { value: "default", label: "default" }, + { value: "work-sso", label: "work-sso", description: "SSO · us-east-1" }, + ], + }, + ], + }, + ], + connections: [], + }, + { + id: "acme-search", + name: "Acme Search", + methods: [ + { + type: "key", + label: "API key", + form: [ + { + key: "sources", + type: "multiselect", + title: "Sources to search", + minItems: 1, + custom: true, + options: [ + { value: "web", label: "Web" }, + { value: "news", label: "News", description: "Articles from the last 30 days" }, + { value: "code", label: "Code" }, + ], + }, + { key: "safe", type: "boolean", title: "Use safe search?", default: true }, + ], + }, + ], + connections: [], + }, + { + id: "acme-cloud", + name: "Acme Cloud", + methods: [ + { + type: "oauth", + id: "browser", + label: "Sign in", + form: [ + { + key: "terms", + type: "external", + url: "https://acme.example/terms", + title: "Accept the Acme terms", + description: "Open the link, accept the terms, then come back.", + }, + ], + }, + ], + connections: [], + }, + { + id: "acme-cli", + name: "Acme CLI", + methods: [{ type: "command", id: "login", label: "Log in", command: ["acme", "login"] }], + connections: [], + }, + { + id: "acme-code", + name: "Acme Code", + methods: [{ type: "oauth", id: "code", label: "Acme account" }], + connections: [], + }, + { + id: "acme-broken", + name: "Acme Broken", + methods: [{ type: "oauth", id: "browser", label: "Sign in" }], + connections: [], + }, + { + id: "claude-agent", + name: "Claude Agent", + methods: [{ type: "external", id: "claude-login", label: "Claude Code login (claude auth login)" }], + connections: [], + }, { id: "google", name: "Google", @@ -354,9 +497,18 @@ function findMatchingPaths(root: string, query: string, type: string | null) { type DialogStoryRuntimeOptions = { servers?: ServerConnection.Any[] platform?: Platform + /** Replaces fixture integrations with the same id. */ + integrations?: IntegrationInfo[] } -export function createStoryFetch(): typeof fetch { +const REDIRECT_PASTE = ["openai", "gitlab", "snowflake-cortex"] + +export function createStoryFetch(overrides: IntegrationInfo[] = []): typeof fetch { + const integrations = [ + ...overrides, + ...fixtureIntegrations.filter((item) => !overrides.some((override) => override.id === item.id)), + ] + const encoder = new TextEncoder() const handler = async (input: RequestInfo | URL, init?: RequestInit) => { @@ -472,13 +624,46 @@ export function createStoryFetch(): typeof fetch { if (rest[1] === "connect" && rest[2] === "oauth" && rest.length === 3 && method === "POST") { const now = Date.now() + if (integrationID === "acme-broken") + return errorResponse("InvalidRequestError", "The Acme sign-in service is unavailable. Try again later.", 400) + return jsonResponse({ location, data: { attemptID: "con_story_1", - url: "https://opencode.ai/auth/authorize", + // Device sign-ins show a code; some browser sign-ins also take the redirect URL pasted from another device. + url: + integrationID === "github-copilot" || integrationID === "xai" + ? "https://example.test/device?user_code=KBSC-TK37" + : integrationID === "opencode" + ? "https://opencode.ai/auth/device?user_code=WXYZ-2345" + : "https://opencode.ai/auth/authorize", instructions: "", - mode: "auto", + mode: integrationID === "acme-code" ? "code" : "auto", + paste: REDIRECT_PASTE.includes(integrationID) ? true : undefined, + time: { created: now, expires: now + 600_000 }, + }, + }) + } + + if (rest[1] === "connect" && rest[2] === "command" && rest.length === 3 && method === "POST") { + const now = Date.now() + + return jsonResponse({ + location, + data: { attemptID: "con_story_cmd", time: { created: now, expires: now + 600_000 } }, + }) + } + + if (rest[1] === "connect" && rest[2] === "command" && rest[3] && method === "GET") { + const now = Date.now() + + return jsonResponse({ + location, + data: { + status: "pending", + message: + "$ acme login\nOpening https://acme.example/device in your browser…\nWaiting for you to approve this device.", time: { created: now, expires: now + 600_000 }, }, }) @@ -581,7 +766,7 @@ export function DialogStoryRuntime(props: ParentProps restart: async () => {}, notify: async () => {}, storage: createMemoryStorage(), - fetch: createStoryFetch(), + fetch: createStoryFetch(props.integrations), } const client = new QueryClient({ diff --git a/packages/app/src/providers/connect/console.tsx b/packages/app/src/providers/connect/console.tsx index ad90795de2b1..0bf975db7a90 100644 --- a/packages/app/src/providers/connect/console.tsx +++ b/packages/app/src/providers/connect/console.tsx @@ -1,7 +1,7 @@ import { For, Show } from "solid-js" import { Button } from "@opencode/ui/button" -import { TextShimmer } from "@opencode/ui/text-shimmer" import { useLanguage } from "@/runtime/i18n/language" +import { StepActions, WaitingButton } from "./step-actions" export function ConsoleAuthorization(props: { /** Undefined until the server returns the sign-in attempt. */ @@ -9,7 +9,6 @@ export function ConsoleAuthorization(props: { browserFailed: boolean copied: boolean copyFailed: boolean - onOpen: () => void onCopy: () => void }) { const language = useLanguage() @@ -17,67 +16,52 @@ export function ConsoleAuthorization(props: { return (

{language.t( props.browserFailed ? "provider.connect.console.browserFailed" : "provider.connect.console.instructions", )}

-
-
{language.t("provider.connect.console.deviceCode")}
- - -

- } - > - {(code) => ( - <> -
- - {(character) => ( - - )} - -
-

- -

- - )} -
-
-
- {language.t("provider.connect.console.browserHint")} - - - - -
+ + {(code) => ( +
+
{language.t("provider.connect.console.deviceCode")}
+
+ + {(character) => ( + + )} + +
+
+ )} +

{language.t("provider.connect.console.copyFailed")}

+ + + + {language.t(props.code ? "provider.connect.console.waiting" : "provider.connect.console.openingBrowser")} + +
) } diff --git a/packages/app/src/providers/connect/controller.ts b/packages/app/src/providers/connect/controller.ts index d910d71d51b2..a473d5721b7b 100644 --- a/packages/app/src/providers/connect/controller.ts +++ b/packages/app/src/providers/connect/controller.ts @@ -23,6 +23,7 @@ import { selectProviderDialogView, transitionProviderDialog, type ProviderAccounts, + type ProviderBackTarget, type ProviderDialogEffect, type ProviderDialogEvent, } from "./dialog-machine" @@ -635,7 +636,7 @@ export function createProviderDialogController(options: { dispatch({ type: "provider.selected", provider: id, fromPicker: true, accounts: accountsOf(id) }), input: (event: ProviderConnectEvent) => dispatch({ type: "connect.input", event }), rename: accountActions.rename, - back: () => dispatch({ type: "back" }), + navigate: (target: ProviderBackTarget) => dispatch({ type: "navigate", target }), checkClaude: () => { const id = provider() diff --git a/packages/app/src/providers/connect/dialog-machine.test.ts b/packages/app/src/providers/connect/dialog-machine.test.ts index 997a5a3c5f70..4e152d80afb4 100644 --- a/packages/app/src/providers/connect/dialog-machine.test.ts +++ b/packages/app/src/providers/connect/dialog-machine.test.ts @@ -1,6 +1,7 @@ import { expect, test } from "bun:test" import { createProviderDialogState, + providerBackTarget, selectProviderDialogView, transitionProviderDialog, type ProviderAccounts, @@ -56,6 +57,12 @@ const selected = (provider: string, fromPicker: boolean, list = none): ProviderD accounts: list, }) +// Clicks the nearest linked breadcrumb, the way the header goes back one step. +const goBack = (state: ProviderDialogState): ProviderDialogEvent => ({ + type: "navigate", + target: providerBackTarget(state) ?? "picker", +}) + function provider(state: ProviderDialogState) { if (state.status !== "provider") throw new Error(`expected a provider step, got ${state.status}`) @@ -180,7 +187,7 @@ test("Back from a pending OAuth sign-in to the provider list allows backdrop dis const waiting = waitingOAuth("github-copilot") expect(selectProviderDialogView(waiting.state).preventBackdropDismiss).toBe(true) - const back = replay([{ type: "back" }], waiting.state) + const back = replay([goBack(waiting.state)], waiting.state) expect(back.state.status).toBe("picker") expect(selectProviderDialogView(back.state).preventBackdropDismiss).toBe(false) @@ -197,11 +204,14 @@ test("Back from a Console connection without models returns to the sign-in metho }) expect(types(empty.effects)).toEqual(["connected.notify", "models.reveal", "toast.connected"]) - const methods = replay([{ type: "back" }], empty.state) + const methods = replay([goBack(empty.state)], empty.state) expect(selectProviderDialogView(methods.state).body).toEqual({ kind: "methods" }) - expect(selectProviderDialogView(methods.state).canBack).toBe(true) + expect(selectProviderDialogView(methods.state).crumbs).toEqual([ + { kind: "root", target: "picker" }, + { kind: "provider", target: undefined }, + ]) - expect(replay([{ type: "back" }], methods.state).state.status).toBe("picker") + expect(replay([goBack(methods.state)], methods.state).state.status).toBe("picker") }) test("Back from a failed Console refresh returns to the sign-in methods", () => { @@ -220,14 +230,17 @@ test("Back from a failed Console refresh returns to the sign-in methods", () => ) expect(selectProviderDialogView(failed.state).body).toEqual({ kind: "failed" }) - expect(selectProviderDialogView(failed.state).title).toBe("console-error") + expect(selectProviderDialogView(failed.state).crumbs).toEqual([ + { kind: "root", target: "picker" }, + { kind: "provider", target: "methods" }, + ]) - expect(selectProviderDialogView(replay([{ type: "back" }], failed.state).state).body).toEqual({ kind: "methods" }) + expect(selectProviderDialogView(replay([goBack(failed.state)], failed.state).state).body).toEqual({ kind: "methods" }) }) test("Back during the Console workspace wait stops the wait", () => { const refreshing = refreshingConsole() - const back = replay([{ type: "back" }], refreshing.state) + const back = replay([goBack(refreshing.state)], refreshing.state) expect(back.effects).toContainEqual({ type: "settle.cancel" }) expect(selectProviderDialogView(back.state).body).toEqual({ kind: "methods" }) @@ -239,9 +252,12 @@ test("Back from a Claude Agent check started from Add account returns to the acc const started = replay([{ type: "claude.check", replacing: ["cred_1"] }], setup.state) const start = connectEffect(started.effects, "start") - expect(selectProviderDialogView(started.state).canBack).toBe(true) + expect(selectProviderDialogView(started.state).crumbs).toEqual([ + { kind: "root", target: "picker" }, + { kind: "provider", target: "accounts" }, + ]) - const back = replay([{ type: "back" }], started.state) + const back = replay([goBack(started.state)], started.state) expect(selectProviderDialogView(back.state).frame).toBe("accounts") // The server still saves the connection, so its late result only reloads the catalogs. @@ -267,7 +283,7 @@ test("leaving a Claude Agent check ignores its late confirmation", () => { const session = provider(confirming.state).session expect(confirming.effects).toContainEqual({ type: "claude.confirm", session, check }) - const back = replay([{ type: "back" }], confirming.state) + const back = replay([goBack(confirming.state)], confirming.state) expect(back.state.status).toBe("picker") expect(back.effects).toContainEqual({ type: "claude.timer.stop" }) @@ -348,7 +364,7 @@ test("a second Remove click sends one request, and a late final removal after Ba expect(second.state).toBe(removing.state) expect(second.effects).toEqual([]) - const back = replay([{ type: "back" }], removing.state) + const back = replay([goBack(removing.state)], removing.state) const late = replay( [ @@ -389,7 +405,7 @@ test("removing the last account closes the dialog once the removal settles", () ) expect(settled.effects).toEqual([{ type: "dialog.close" }]) - expect(replay([{ type: "back" }], settled.state).state).toBe(settled.state) + expect(replay([goBack(settled.state)], settled.state).state).toBe(settled.state) }) test("a switch that settles after another switch started is ignored", () => { @@ -431,7 +447,7 @@ test("a credential saved after the dialog moved to another provider only reloads const submit = connectEffect(submitting.effects, "submit") const session = provider(submitting.state).session - const other = replay([{ type: "back" }, selected("anthropic", true)], submitting.state) + const other = replay([goBack(submitting.state), selected("anthropic", true)], submitting.state) const late = replay( [ @@ -526,7 +542,7 @@ test("a connection without models closes the dialog", () => { expect(types(done.effects)).toEqual(["connected.notify", "models.reveal", "toast.connected", "dialog.close"]) // The key form stays while the dialog animates out, and takes no more input. expect(selectProviderDialogView(done.state).body).toEqual({ kind: "key" }) - expect(replay([{ type: "back" }], done.state).state).toBe(done.state) + expect(replay([goBack(done.state)], done.state).state).toBe(done.state) }) test("confirming a model closes once and keeps the outcome through disposal", () => { @@ -598,15 +614,18 @@ test("a lone method waits on the accounts list and starts once Add account is ch expect(types(added.effects)).toEqual(["connect.start"]) // Back from the lone method goes straight to the accounts list. - expect(selectProviderDialogView(replay([{ type: "back" }], added.state).state).frame).toBe("accounts") + expect(selectProviderDialogView(replay([goBack(added.state)], added.state).state).frame).toBe("accounts") }) test("a standalone dialog has no way back to the provider list", () => { const opened = replay([selected("opencode-go", false)], createProviderDialogState({ standalone: true })) const entering = replay([loaded(opened.state, [key])], opened.state) - expect(selectProviderDialogView(entering.state).canBack).toBe(false) - expect(replay([{ type: "back" }], entering.state).state).toBe(entering.state) + expect(selectProviderDialogView(entering.state).crumbs).toEqual([ + { kind: "root", target: undefined }, + { kind: "provider", target: undefined }, + ]) + expect(replay([goBack(entering.state)], entering.state).state).toBe(entering.state) }) test("the Console sign-in link copy result belongs to its attempt", () => { diff --git a/packages/app/src/providers/connect/dialog-machine.ts b/packages/app/src/providers/connect/dialog-machine.ts index 8ee1773f11af..9c929cc3c6dd 100644 --- a/packages/app/src/providers/connect/dialog-machine.ts +++ b/packages/app/src/providers/connect/dialog-machine.ts @@ -146,7 +146,8 @@ export type ProviderDialogEvent = | { readonly type: "model.selected"; readonly modelKey: string } | { readonly type: "group.collapsed"; readonly providerID: string; readonly collapsed: boolean } | { readonly type: "model.confirmed"; readonly selection: ModelChoice } - | { readonly type: "back" } + /** A breadcrumb in the header: the provider list, or the provider's accounts or sign-in methods. */ + | { readonly type: "navigate"; readonly target: ProviderBackTarget } | { readonly type: "disposed" } export type ProviderDialogEffect = @@ -255,7 +256,11 @@ export function transitionProviderDialog( if (event.type === "provider.cleared") return toPicker(state) - if (event.type === "back") return back(state) + if (event.type === "navigate") { + if (event.target === "picker") return toPicker(state) + + return event.target === providerBackTarget(state) ? back(state) : unchanged(state) + } if (event.type === "accounts.synced") return synced(state, event.accounts) @@ -338,7 +343,10 @@ export function providerBackTarget(state: ProviderDialogState): ProviderBackTarg /** Which dialog shell the step uses: the searchable list, the model choice, or a provider step. */ export type ProviderDialogFrame = "picker" | "models" | "accounts" | "provider" -export type ProviderDialogTitle = "connect" | "console-error" | "console-sign-in" | "anthropic-max" +/** The header path of a provider step: the provider list, then the provider. A crumb with a `target` links back. */ +export type ProviderDialogCrumb = + | { readonly kind: "root"; readonly target?: "picker" } + | { readonly kind: "provider"; readonly target?: "accounts" | "methods" } export type ProviderDialogBody = | { readonly kind: "picker" } @@ -361,7 +369,6 @@ export function selectProviderDialogView(state: ProviderDialogState) { const connect = step && "connect" in step ? selectProviderConnectView(step.connect) : undefined const target = providerBackTarget(state) const body = selectBody(state, connect) - const isConsole = provider?.provider === CONSOLE_INTEGRATION const frame: ProviderDialogFrame = !step ? "picker" @@ -374,17 +381,7 @@ export function selectProviderDialogView(state: ProviderDialogState) { frame, connect, body, - canBack: target !== undefined, - title: ((): ProviderDialogTitle => { - if (isConsole && connect?.status === "failed") return "console-error" - - if (body.kind === "console-sign-in") return "console-sign-in" - - if (provider?.provider === "anthropic" && connect?.method?.label?.toLowerCase().includes("max")) - return "anthropic-max" - - return "connect" - })(), + crumbs: crumbs(state, target), // Closing on a stray backdrop click would abandon a sign-in the user is finishing in the browser. preventBackdropDismiss: !!provider && !provider.closed && !!connect?.authorizing, completed: state.completed, @@ -394,6 +391,15 @@ export function selectProviderDialogView(state: ProviderDialogState) { export type ProviderDialogView = ReturnType +function crumbs(state: ProviderDialogState, target: ProviderBackTarget | undefined): readonly ProviderDialogCrumb[] { + if (state.status !== "provider" || state.step.kind === "models") return [] + + return [ + { kind: "root", target: state.standalone ? undefined : "picker" }, + { kind: "provider", target: target === "picker" ? undefined : target }, + ] +} + function selectBody( state: ProviderDialogState, connect: ReturnType | undefined, diff --git a/packages/app/src/providers/connect/dialog.standalone.stories.tsx b/packages/app/src/providers/connect/dialog.standalone.stories.tsx index 9efa9745919b..211ae47ed8d6 100644 --- a/packages/app/src/providers/connect/dialog.standalone.stories.tsx +++ b/packages/app/src/providers/connect/dialog.standalone.stories.tsx @@ -1,6 +1,8 @@ import { Button } from "@opencode/ui/button" import { useDialog } from "@opencode/ui/context/dialog" import { onMount } from "solid-js" +import type { IntegrationInfo } from "@opencode/client/promise" +import type { ServerConnection } from "@/runtime/server/registry" import { DialogStoryRuntime, STORY_DIRECTORY, STORY_LOCKED_SERVER } from "@/components-lab/dialog-story-runtime" import { DialogConnectProvider, useProviderConnectController } from "./dialog" @@ -37,14 +39,42 @@ function ProviderConnectionDialogStory(props: { provider: string }) { ) } -function renderConnection(provider: string) { - return () => ( - - - - ) +function renderConnection( + provider: string, + options: { integrations?: IntegrationInfo[]; servers?: ServerConnection.Any[] } = {}, +) { + return () => { + return ( + + + + ) + } +} + +const REMOTE_SERVER: ServerConnection.Http = { + type: "http", + displayName: "Dev box", + http: { url: "http://devbox.local:4096" }, } +const claudeWithProblem = (message: string): IntegrationInfo[] => [ + { + id: "claude-agent", + name: "Claude Agent", + methods: [{ type: "external", id: "claude-login", label: "Claude Code login (claude auth login)" }], + connections: [ + { + type: "credential", + id: "cred_claude", + label: "Claude Code", + method: "external", + status: { status: "needs_auth", message, url: "https://code.claude.com/docs/en/setup" }, + }, + ], + }, +] + export default { title: "App/Dialogs/Connect Provider", id: "app-dialog-connect-provider", @@ -62,6 +92,21 @@ export const ChooseMethod = { render: renderConnection("opencode"), } +/** OpenCode Console through a remote server: pick "API key (service account)" to see the note on a form. */ +export const ConsoleRemote = { render: renderConnection("opencode", { servers: [REMOTE_SERVER] }) } + +// Console with only its browser sign-in, so the story starts on the device code. +const consoleAccountOnly: IntegrationInfo[] = [ + { + id: "opencode", + name: "OpenCode Console", + methods: [{ type: "oauth", id: "console", label: "OpenCode Console account" }], + connections: [], + }, +] + +export const ConsoleSignIn = { render: renderConnection("opencode", { integrations: consoleAccountOnly }) } + export const ApiKey = { render: renderConnection("openrouter"), } @@ -72,8 +117,66 @@ export const LoginMethods = { export const ClaudeAgentSetup = { render: renderConnection("claude-agent") } +export const ClaudeAgentNotInstalled = { + render: renderConnection("claude-agent", { + integrations: claudeWithProblem("Claude Code is not installed. Install it, then run `claude auth login`."), + }), +} + +export const ClaudeAgentNotSignedIn = { + render: renderConnection("claude-agent", { + integrations: claudeWithProblem("Claude Code is not logged in. Run `claude auth login` in a terminal."), + }), +} + +/** A device sign-in with a confirmation code. */ export const AwaitingBrowser = { render: renderConnection("github-copilot") } +/** A choice between a device sign-in and an API key. */ +export const DeviceOrApiKey = { render: renderConnection("xai") } + +// OpenAI with only its ChatGPT method, so the story opens straight on the sign-in. +const chatgptOnly: IntegrationInfo[] = [ + { + id: "openai", + name: "OpenAI", + methods: [{ type: "oauth", id: "chatgpt", label: "ChatGPT Plus / Pro" }], + connections: [], + }, +] + +/** A browser sign-in that also takes a pasted redirect URL. */ +export const RedirectPaste = { render: renderConnection("openai", { integrations: chatgptOnly }) } + +/** The same sign-in through a remote server, where the paste field starts open. */ +export const RedirectPasteRemote = { + render: renderConnection("openai", { integrations: chatgptOnly, servers: [REMOTE_SERVER] }), +} + +/** A text question before the sign-in, then a browser sign-in with redirect paste. */ +export const TextQuestion = { render: renderConnection("gitlab") } + +/** A required text question. Continue with an empty field to see the error. */ +export const RequiredTextQuestion = { render: renderConnection("snowflake-cortex") } + +/** Pick "AWS profile": a choice question with a custom answer, for an external credential. */ +export const ChoiceQuestion = { render: renderConnection("amazon-bedrock") } + +/** A multiselect question with a custom item, then a yes/no question, then the API key. */ +export const MultiselectQuestion = { render: renderConnection("acme-search") } + +/** A link the user opens and confirms before the sign-in. */ +export const ExternalLinkQuestion = { render: renderConnection("acme-cloud") } + +/** A sign-in that runs a command and shows its output. */ +export const Command = { render: renderConnection("acme-cli") } + +/** A sign-in that asks for the authorization code the browser shows. */ +export const PasteCode = { render: renderConnection("acme-code") } + +/** A sign-in the server fails to start. */ +export const Failed = { render: renderConnection("acme-broken") } + // The fixture refuses requests to this server. Submitting a sample service key shows the real error and retry. export const LockedRemoteServer = { render: () => ( diff --git a/packages/app/src/providers/connect/dialog.tsx b/packages/app/src/providers/connect/dialog.tsx index 469e414481e3..c6476eac31b7 100644 --- a/packages/app/src/providers/connect/dialog.tsx +++ b/packages/app/src/providers/connect/dialog.tsx @@ -5,10 +5,11 @@ import { Icon } from "@opencode/ui/icon" import { RadioGroup, RadioItem } from "@opencode/ui/radio" import { Checkbox } from "@opencode/ui/checkbox" import { Loader } from "@opencode/ui/loader" -import { TextField } from "@opencode/ui/text-field" +import { Field } from "@opencode/ui/field" import { DialogBody, DialogHeader, DialogTitle, DialogTitleGroup, Dialog } from "@opencode/ui/dialog" import { RedirectPasteForm } from "@opencode/ui/redirect-paste" import { TextInput } from "@opencode/ui/text-input" +import { Tooltip } from "@opencode/ui/tooltip" import { type Component, createMemo, createUniqueId, For, type JSX, Match, onMount, Show, Switch } from "solid-js" import { createStore } from "solid-js/store" import { useParams } from "@solidjs/router" @@ -30,12 +31,15 @@ import { CONSOLE_INTEGRATION, type ProviderDialogBody, type ProviderDialogFrame import { connectMethods, selectProviderConnectView, type ProviderConnectMethod } from "./machine" import type { ProviderFormInput, ProviderFormView } from "./form-machine" import { ConsoleAuthorization } from "./console" +import { StepActions, WaitingButton } from "./step-actions" import { DialogChatGPTPlanWelcome } from "./chatgpt-welcome" -import { authServerName, RemoteAuthNotice } from "./remote" +import { authServerName } from "./remote" import { providerAccounts } from "@/settings/providers/accounts" import { AccountNameInput } from "@/settings/providers/account-name" import { IconButton } from "@opencode/ui/icon-button" import { Menu } from "@opencode/ui/menu" +import { writeClipboard } from "@opencode/session-ui/copy" +import { showToast } from "@/shell/notifications/toast" import "@/shell/search-list.css" import "./models.css" @@ -102,23 +106,12 @@ export const DialogConnectProvider: Component<{ let focusHost: HTMLDivElement | undefined const holdFocus = () => focusHost?.focus({ preventScroll: true }) - const title = () => { - const name = controller.providerName() - const kind = view().title + const providerName = () => + consoleSelected() ? language.t("provider.connect.opencode.name") : controller.providerName() - if (kind === "console-error") return language.t("provider.connect.opencode.errorTitle") - - if (kind === "console-sign-in") - return language.t( - view().provider === "opencode-go" ? "provider.connect.console.titleGo" : "provider.connect.console.title", - ) - - if (kind === "anthropic-max") return language.t("provider.connect.title.anthropicProMax") - - return language.t("provider.connect.title", { - provider: consoleSelected() ? language.t("provider.connect.opencode.name") : name, - }) - } + // A Console sign-in through another server is stored on that server, so the header names it. + const sdk = useServerSDK() + const remoteServer = () => (consoleSelected() && frame() !== "picker" ? authServerName(sdk.server) : undefined) return ( @@ -160,40 +156,87 @@ export const DialogConnectProvider: Component<{ )} - -
- - - - - {controller.providerName()} -
-
{(provider) => ( -
- - - - - {title()} -
+ <> + + {/* The breadcrumb shows where the dialog is; the dialog itself is named for what it does. */} +
+ {language.t("provider.connect.title", { provider: providerName() })} +
+ )}
@@ -203,17 +246,31 @@ export const DialogConnectProvider: Component<{ /> + + {(server) => ( + + + {language.t("provider.connect.remote.label", { server: server() })} + + )} +
{/* Outside the scrolling content, so it can reach across the body's padding without scrolling sideways. */} -
+
, value: ProviderConnectMethod) => + value.type === "key" ? (value.label ?? language.t("provider.connect.method.apiKey")) : value.label + +const METHOD_ICON = { + oauth: "window-cursor", + key: "keyboard", + command: "terminal", + external: "server", +} as const satisfies Record + // The TUI's integration groups and order, with connected integrations pulled up into their own group first. const POPULAR = ["opencode", "opencode-go", "openai", "github-copilot", "anthropic", "google"] @@ -321,11 +391,11 @@ function ProviderPicker(props: { directory?: string; onSelect: (provider: string return (
- )} @@ -574,7 +675,7 @@ function ProviderSteps(props: { provider: string; controller: ProviderDialogCont const options = () => optionRows(step().field) return ( -
+
send({ type: "custom.text.changed", value: event.currentTarget.value })} /> - @@ -620,21 +722,22 @@ function ProviderSteps(props: { provider: string; controller: ProviderDialogCont {(message) =>
{message()}
}
- + + +
) }} {(step) => ( -
+
- queueMicrotask(() => input.focus())} - type="text" - label={language.t("ui.messagePart.option.typeOwnAnswer")} - hideLabel + class="!w-full" + appearance="large" + aria-label={language.t("ui.messagePart.option.typeOwnAnswer")} placeholder={step().placeholder ?? language.t("ui.question.custom.placeholder")} value={step().customText} - onChange={(value) => send({ type: "custom.text.changed", value })} + onInput={(event) => send({ type: "custom.text.changed", value: event.currentTarget.value })} />
-
+ + + + + - - - -
+
)} @@ -688,35 +791,41 @@ function ProviderSteps(props: { provider: string; controller: ProviderDialogCont event.preventDefault() send({ type: "step.submitted" }) }} - class="flex w-full flex-col items-start gap-4" + class="flex w-full flex-col items-start gap-5" > - queueMicrotask(() => input.focus({ preventScroll: true }))} - class="!w-full" - type="text" - inputMode={step().numeric ? "decimal" : undefined} - aria-label={step().title} - placeholder={step().placeholder} - value={step().text} - invalid={step().error !== undefined} - autocomplete="off" - spellcheck={false} - onInput={(event) => send({ type: "text.changed", value: event.currentTarget.value })} - /> - + + {step().title} + + {(description) => ( + + {description()} + + )} + + queueMicrotask(() => input.focus({ preventScroll: true }))} + class="!w-full" + appearance="large" + type="text" + inputMode={step().numeric ? "decimal" : undefined} + placeholder={step().placeholder} + value={step().text} + invalid={step().error !== undefined} + autocomplete="off" + spellcheck={false} + onInput={(event) => send({ type: "text.changed", value: event.currentTarget.value })} + /> + + + + + )} - - {(message) => ( - - )} -
) @@ -725,15 +834,26 @@ function ProviderSteps(props: { provider: string; controller: ProviderDialogCont function MethodSelection() { return (
+

+ {language.t("provider.connect.methods.description", { provider: name() })} +

{(item, index) => ( )} @@ -743,7 +863,7 @@ function ProviderSteps(props: { provider: string; controller: ProviderDialogCont function CommandView() { return ( -
+
{(output) => (
           )}
         
-        {language.t("provider.connect.command.waiting")}
+        
+          {language.t("provider.connect.command.waiting")}
+        
       
) } @@ -768,20 +890,26 @@ function ProviderSteps(props: { provider: string; controller: ProviderDialogCont ) } + function ErrorLine(input: { children: JSX.Element }) { + return ( +
+ + {input.children} +
+ ) + } + function ErrorRow() { return ( -
-
- - - {isConsole - ? connect().error - : language.t("provider.connect.status.failed", { error: connect().error ?? "" })} - -
- +
+ + {isConsole ? connect().error : language.t("provider.connect.status.failed", { error: connect().error ?? "" })} + + + +
) } @@ -806,155 +934,187 @@ function ProviderSteps(props: { provider: string; controller: ProviderDialogCont props.controller.input({ type: "entry.submitted", value: value instanceof File || value === null ? "" : value }) } + function EntryField(input: { + name: string + label: string + placeholder: string + ref: (el: HTMLInputElement) => void + }) { + const errorID = createUniqueId() + + return ( +
+ + + {(error) => ( + + )} + +
+ ) + } + function ApiAuthView() { let apiKey: HTMLInputElement | undefined - const errorID = createUniqueId() onMount(() => { apiKey?.focus({ preventScroll: true }) }) return ( -
+
submitEntry(event, "apiKey")} class={STEP_CLASS}>

{isConsole ? language.t("provider.connect.console.serviceKeyDescription") : language.t("provider.connect.apiKey.description", { provider: name() })}

- submitEntry(event, "apiKey")} class="flex flex-col items-start gap-5 self-stretch"> - - - {(error) => ( - - )} - + (apiKey = el)} + /> + - -
+ + ) } function OAuthCodeView() { let codeInput: HTMLInputElement | undefined - const errorID = createUniqueId() onMount(() => { codeInput?.focus({ preventScroll: true }) }) return ( -
-
{language.t("provider.connect.oauth.code.description", { provider: name() })}
- -
submitEntry(event, "code")} class="flex flex-col items-start gap-5 self-stretch"> - - - {(error) => ( - - )} - - + -
-
+ + ) } function OAuthAutoView() { + const pasteOpen = () => connect().paste?.open ?? onRemote + // Stays up while the URL is being sent; once the server takes it, the sign-in is back to waiting. + const pasteSendable = () => !connect().paste?.locked || connect().paste?.submitting + return ( -
-
- {language.t( - connect().paste - ? "provider.connect.oauth.auto.paste.description" - : "provider.connect.oauth.auto.description", - { provider: name() }, - )} -
- {language.t("provider.connect.status.waiting")} -
- -
+
+

{language.t("provider.connect.oauth.auto.description", { provider: name() })}

{(value) => ( - + )} + + {language.t("provider.connect.oauth.browserFailed")} + {(paste) => ( - props.controller.input({ type: "paste.changed", value })} - onSubmit={() => props.controller.input({ type: "paste.submitted" })} - /> +
+ + +
+

{language.t("provider.connect.oauth.paste.description")}

+ props.controller.input({ type: "paste.changed", value })} + onSubmit={() => props.controller.input({ type: "paste.submitted" })} + /> +
+
+
)}
+ + + {language.t("provider.connect.status.waiting")}} + > + + +
) } @@ -980,7 +1140,7 @@ function ProviderSteps(props: { provider: string; controller: ProviderDialogCont +
{language.t("dialog.provider.accounts.removeConfirm", { account: account.label })} @@ -1001,11 +1161,11 @@ function ProviderSteps(props: { provider: string; controller: ProviderDialogCont
} > -
+
+
props.controller.chooseAccount(account)} > @@ -1088,7 +1248,7 @@ function ProviderSteps(props: { provider: string; controller: ProviderDialogCont + {language.t("provider.connect.claudeAgent.checking")}} + > -
-
+ +
) } function ConsoleNoModels(input: { body: Extract }) { return ( -
+

@@ -1174,20 +1326,21 @@ function ProviderSteps(props: { provider: string; controller: ProviderDialogCont )}

-
+ - -
+
) } @@ -1251,7 +1404,7 @@ function ProviderSteps(props: { provider: string; controller: ProviderDialogCont } return ( -
+

{language.t("provider.connect.models.description")}

@@ -1323,7 +1476,7 @@ function ProviderSteps(props: { provider: string; controller: ProviderDialogCont
+ ) +} diff --git a/packages/app/src/runtime/i18n/am.ts b/packages/app/src/runtime/i18n/am.ts index db10d1619614..3ca0b96c8b90 100644 --- a/packages/app/src/runtime/i18n/am.ts +++ b/packages/app/src/runtime/i18n/am.ts @@ -148,7 +148,7 @@ export const dict = { "provider.connect.title": "{{provider}} አገናኝ", "provider.connect.method.apiKey": "API ቁልፍ", "provider.connect.status.inProgress": "ፍቃድ በሂደት ላይ…", - "provider.connect.status.waiting": "ፈቀዳን በመጠበቅ ላይ…", + "provider.connect.status.waiting": "ፈቀዳን በመጠበቅ ላይ", "provider.connect.status.failed": "ፍቃድ መስጠት አልተሳካም፡ {{error}}", "provider.connect.apiKey.description": "መለያዎን ለማገናኘት የ{{provider}} API ቁልፍዎን ያስገቡ እና {{provider}} ሞዴሎችን በOpenCode ይጠቀሙ።", @@ -796,7 +796,6 @@ export const dict = { "workspace.delete.location": "አካባቢ", "command.session.location.cycle": "የክፍለ ጊዜውን መገኛ ቀይር", "dialog.provider.anthropic.note": "የAPI ቁልፍ በመጠቀም ወደ Claude ሞዴሎች ቀጥተኛ መዳረሻ", - "provider.connect.title.anthropicProMax": "በAnthropic ግባ", "prompt.toast.uploading.cancelFile": "የ{{filename}} ስቀላን ሰርዝ", "prompt.toast.uploadFailed.title": "ስቀላው አልተሳካም", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/ar.ts b/packages/app/src/runtime/i18n/ar.ts index eb5286d1f620..0900994302c8 100644 --- a/packages/app/src/runtime/i18n/ar.ts +++ b/packages/app/src/runtime/i18n/ar.ts @@ -153,7 +153,7 @@ export const dict = { "provider.connect.title": "الاتصال بـ {{provider}}", "provider.connect.method.apiKey": "مفتاح API", "provider.connect.status.inProgress": "جارٍ التفويض…", - "provider.connect.status.waiting": "في انتظار التفويض…", + "provider.connect.status.waiting": "في انتظار التفويض", "provider.connect.status.failed": "فشل التفويض: {{error}}", "provider.connect.apiKey.description": "أدخل مفتاح API الخاص بـ {{provider}} لتوصيل حسابك واستخدام نماذج {{provider}} في OpenCode.", @@ -874,7 +874,6 @@ export const dict = { "command.session.location.cycle": "التنقل بين مواقع الجلسة", "dialog.provider.anthropic.note": "وصول مباشر إلى نماذج Claude عبر مفتاح API", - "provider.connect.title.anthropicProMax": "تسجيل الدخول باستخدام Anthropic", "prompt.toast.uploading.percent": "\u2068{{percent}}\u2069%", "prompt.toast.uploading.cancelFile": "إلغاء رفع \u2068{{filename}}\u2069", "prompt.toast.uploadFailed.title": "فشل الرفع", diff --git a/packages/app/src/runtime/i18n/az.ts b/packages/app/src/runtime/i18n/az.ts index 729cff6bbcd0..9e2fb113ad2e 100644 --- a/packages/app/src/runtime/i18n/az.ts +++ b/packages/app/src/runtime/i18n/az.ts @@ -150,7 +150,7 @@ export const dict = { "provider.connect.title": "{{provider}} provayderini qoş", "provider.connect.method.apiKey": "API açarı", "provider.connect.status.inProgress": "Avtorizasiya davam edir…", - "provider.connect.status.waiting": "Avtorizasiya gözlənilir…", + "provider.connect.status.waiting": "Avtorizasiya gözlənilir", "provider.connect.status.failed": "Avtorizasiya uğursuz oldu: {{error}}", "provider.connect.apiKey.description": "Hesabınızı qoşmaq və OpenCode-da {{provider}} modellərindən istifadə etmək üçün {{provider}} API açarınızı daxil edin.", @@ -826,7 +826,6 @@ export const dict = { "workspace.delete.location": "Yer", "command.session.location.cycle": "Sessiyanın yerini dəyiş", "dialog.provider.anthropic.note": "API açarı ilə Claude modellərinə birbaşa giriş", - "provider.connect.title.anthropicProMax": "Anthropic ilə daxil olun", "prompt.toast.uploading.cancelFile": "{{filename}} faylının yüklənməsini ləğv et", "prompt.toast.uploadFailed.title": "Yükləmə alınmadı", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/bg.ts b/packages/app/src/runtime/i18n/bg.ts index 3d2955741bc1..90b8e9f9f594 100644 --- a/packages/app/src/runtime/i18n/bg.ts +++ b/packages/app/src/runtime/i18n/bg.ts @@ -149,7 +149,7 @@ export const dict = { "provider.connect.title": "Свържете {{provider}}", "provider.connect.method.apiKey": "API ключ", "provider.connect.status.inProgress": "В ход е оторизация…", - "provider.connect.status.waiting": "Чака се оторизация…", + "provider.connect.status.waiting": "Чака се оторизация", "provider.connect.status.failed": "Упълномощаването е неуспешно: {{error}}", "provider.connect.apiKey.description": "Въведете своя {{provider}} API ключ, за да свържете акаунта си и да използвате {{provider}} модели в OpenCode.", @@ -826,7 +826,6 @@ export const dict = { "workspace.delete.location": "Местоположение", "command.session.location.cycle": "Смяна на местоположението на сесията", "dialog.provider.anthropic.note": "Директен достъп до моделите Claude чрез API ключ", - "provider.connect.title.anthropicProMax": "Вход с Anthropic", "prompt.toast.uploading.cancelFile": "Отказ от качването на {{filename}}", "prompt.toast.uploadFailed.title": "Качването е неуспешно", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/bn.ts b/packages/app/src/runtime/i18n/bn.ts index 447feb12030e..5d64e0d4b668 100644 --- a/packages/app/src/runtime/i18n/bn.ts +++ b/packages/app/src/runtime/i18n/bn.ts @@ -153,7 +153,7 @@ export const dict = { "provider.connect.title": "{{provider}} সংযোগ করুন", "provider.connect.method.apiKey": "API কী", "provider.connect.status.inProgress": "অনুমোদন চলছে…", - "provider.connect.status.waiting": "অনুমোদনের জন্য অপেক্ষা করা হচ্ছে…", + "provider.connect.status.waiting": "অনুমোদনের জন্য অপেক্ষা করা হচ্ছে", "provider.connect.status.failed": "অনুমোদন ব্যর্থ হয়েছে: {{error}}", "provider.connect.apiKey.description": "আপনার অ্যাকাউন্ট সংযোগ করতে আপনার {{provider}} API কী লিখুন এবং OpenCode-এ {{provider}} মডেলগুলি ব্যবহার করুন৷", @@ -824,7 +824,6 @@ export const dict = { "command.session.location.cycle": "সেশনের অবস্থান পর্যায়ক্রমে বদলান", "dialog.provider.anthropic.note": "API কী-এর মাধ্যমে Claude মডেলে সরাসরি অ্যাক্সেস", - "provider.connect.title.anthropicProMax": "Anthropic দিয়ে লগ ইন করুন", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "{{filename}}-এর আপলোড বাতিল করুন", "prompt.toast.uploadFailed.title": "আপলোড ব্যর্থ হয়েছে", diff --git a/packages/app/src/runtime/i18n/br.ts b/packages/app/src/runtime/i18n/br.ts index c08a3a7580ad..4d463e8e46ec 100644 --- a/packages/app/src/runtime/i18n/br.ts +++ b/packages/app/src/runtime/i18n/br.ts @@ -367,7 +367,7 @@ export const dict = { "provider.connect.title": "Conectar {{provider}}", "provider.connect.method.apiKey": "Chave de API", "provider.connect.status.inProgress": "Autorização em andamento…", - "provider.connect.status.waiting": "Aguardando autorização…", + "provider.connect.status.waiting": "Aguardando autorização", "provider.connect.status.failed": "Autorização falhou: {{error}}", "provider.connect.apiKey.description": "Digite sua chave de API do {{provider}} para conectar sua conta e usar modelos do {{provider}} no OpenCode.", @@ -851,7 +851,6 @@ export const dict = { "session.background.runningCount.many": "{{count}} de itens em execução em segundo plano", "command.session.location.cycle": "Alternar local da sessão", "dialog.provider.anthropic.note": "Acesso direto aos modelos Claude por chave de API", - "provider.connect.title.anthropicProMax": "Entrar com a Anthropic", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "Cancelar envio de {{filename}}", "prompt.toast.uploadFailed.title": "Falha no envio", diff --git a/packages/app/src/runtime/i18n/bs.ts b/packages/app/src/runtime/i18n/bs.ts index 7e9062419607..b701b0101dbb 100644 --- a/packages/app/src/runtime/i18n/bs.ts +++ b/packages/app/src/runtime/i18n/bs.ts @@ -159,11 +159,11 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "Pogledaj još više od 70 provajdera", "dialog.provider.viewAll": "Prikaži više provajdera", - "provider.connect.title": "Poveži {{provider}}", + "provider.connect.method.apiKey": "API ključ", "provider.connect.status.inProgress": "Autorizacija je u toku…", - "provider.connect.status.waiting": "Čekanje na autorizaciju…", + "provider.connect.status.waiting": "Čekanje na autorizaciju", "provider.connect.status.failed": "Autorizacija nije uspjela: {{error}}", "provider.connect.apiKey.description": "Unesi svoj {{provider}} API ključ da povežeš račun i koristiš {{provider}} modele u OpenCode-u.", @@ -894,7 +894,6 @@ export const dict = { "workspace.delete.location": "Lokacija", "command.session.location.cycle": "Promijeni lokaciju sesije", "dialog.provider.anthropic.note": "Direktan pristup Claude modelima putem API ključa", - "provider.connect.title.anthropicProMax": "Prijava putem Anthropic-a", "prompt.toast.uploading.cancelFile": "Otkaži otpremanje datoteke {{filename}}", "prompt.toast.uploadFailed.title": "Otpremanje nije uspjelo", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/ca.ts b/packages/app/src/runtime/i18n/ca.ts index 399d51c80132..f6478ff92d25 100644 --- a/packages/app/src/runtime/i18n/ca.ts +++ b/packages/app/src/runtime/i18n/ca.ts @@ -148,7 +148,7 @@ export const dict = { "provider.connect.title": "Connecta {{provider}}", "provider.connect.method.apiKey": "tecla API.", "provider.connect.status.inProgress": "Autorització en curs…", - "provider.connect.status.waiting": "Esperant l'autorització…", + "provider.connect.status.waiting": "Esperant l'autorització", "provider.connect.status.failed": "L'autorització ha fallat: {{error}}", "provider.connect.apiKey.description": "Introduïu la clau API de {{provider}} per connectar el compte i utilitzar els models de {{provider}} a OpenCode.", @@ -844,7 +844,6 @@ export const dict = { "toast.migration.progress.working.progress": "S'estan migrant dades {{current}}/{{total}}", "command.session.location.cycle": "Canvia la ubicació de la sessió", "dialog.provider.anthropic.note": "Accés directe als models Claude mitjançant una clau d’API", - "provider.connect.title.anthropicProMax": "Inicia la sessió amb Anthropic", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "Cancel·la la pujada de {{filename}}", "prompt.toast.uploadFailed.title": "Ha fallat la pujada", diff --git a/packages/app/src/runtime/i18n/cs.ts b/packages/app/src/runtime/i18n/cs.ts index 232a1a543e24..82651421c2ce 100644 --- a/packages/app/src/runtime/i18n/cs.ts +++ b/packages/app/src/runtime/i18n/cs.ts @@ -148,7 +148,7 @@ export const dict = { "provider.connect.title": "Připojit {{provider}}", "provider.connect.method.apiKey": "API klíč", "provider.connect.status.inProgress": "Probíhá autorizace…", - "provider.connect.status.waiting": "Čekání na autorizaci…", + "provider.connect.status.waiting": "Čekání na autorizaci", "provider.connect.status.failed": "Autorizace se nezdařila: {{error}}", "provider.connect.apiKey.description": "Zadejte klíč API služby {{provider}}, připojte účet a používejte modely {{provider}} v OpenCode.", @@ -844,7 +844,6 @@ export const dict = { "workspace.delete.location": "Umístění", "command.session.location.cycle": "Přepnout umístění relace", "dialog.provider.anthropic.note": "Přímý přístup k modelům Claude pomocí klíče API", - "provider.connect.title.anthropicProMax": "Přihlásit se přes Anthropic", "prompt.toast.uploading.cancelFile": "Zrušit nahrávání souboru {{filename}}", "prompt.toast.uploadFailed.title": "Nahrávání se nezdařilo", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/da.ts b/packages/app/src/runtime/i18n/da.ts index b89b381b15e0..7e009209bc4f 100644 --- a/packages/app/src/runtime/i18n/da.ts +++ b/packages/app/src/runtime/i18n/da.ts @@ -290,11 +290,11 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "Se mere end 70 yderligere udbydere", "dialog.provider.viewAll": "Vis flere udbydere", - "provider.connect.title": "Forbind {{provider}}", + "provider.connect.method.apiKey": "API-nøgle", "provider.connect.status.inProgress": "Godkendelse i gang…", - "provider.connect.status.waiting": "Venter på godkendelse…", + "provider.connect.status.waiting": "Venter på godkendelse", "provider.connect.status.failed": "Godkendelse mislykkedes: {{error}}", "provider.connect.apiKey.description": "Indtast din API-nøgle til {{provider}} for at forbinde din konto og bruge modeller fra {{provider}} i OpenCode.", @@ -881,7 +881,6 @@ export const dict = { "session.background.moveInline": "Tryk på {{keybind}} for at flytte igangværende arbejde til baggrunden", "command.session.location.cycle": "Skift mellem sessionsplaceringer", "dialog.provider.anthropic.note": "Direkte adgang til Claude-modeller via API-nøgle", - "provider.connect.title.anthropicProMax": "Log ind med Anthropic", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "Annuller upload af {{filename}}", "prompt.toast.uploadFailed.title": "Upload mislykkedes", diff --git a/packages/app/src/runtime/i18n/de.ts b/packages/app/src/runtime/i18n/de.ts index 3e30fa70f1f0..e685c415cfc7 100644 --- a/packages/app/src/runtime/i18n/de.ts +++ b/packages/app/src/runtime/i18n/de.ts @@ -299,7 +299,7 @@ export const dict = { "provider.connect.title": "{{provider}} verbinden", "provider.connect.method.apiKey": "API-Schlüssel", "provider.connect.status.inProgress": "Autorisierung läuft…", - "provider.connect.status.waiting": "Warten auf Autorisierung…", + "provider.connect.status.waiting": "Warten auf Autorisierung", "provider.connect.status.failed": "Autorisierung fehlgeschlagen: {{error}}", "provider.connect.apiKey.description": "Geben Sie Ihren API-Schlüssel für {{provider}} ein, um Ihr Konto zu verbinden und {{provider}}-Modelle in OpenCode zu nutzen.", @@ -846,7 +846,6 @@ export const dict = { "session.background.moveInline": "Drücken Sie {{keybind}}, um laufende Arbeit in den Hintergrund zu verschieben", "command.session.location.cycle": "Sitzungsort wechseln", "dialog.provider.anthropic.note": "Direkter Zugriff auf Claude-Modelle per API-Schlüssel", - "provider.connect.title.anthropicProMax": "Bei Anthropic anmelden", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "Upload von {{filename}} abbrechen", "prompt.toast.uploadFailed.title": "Upload fehlgeschlagen", diff --git a/packages/app/src/runtime/i18n/dv.ts b/packages/app/src/runtime/i18n/dv.ts index 8b7ffe976f0b..45a43e05d3e5 100644 --- a/packages/app/src/runtime/i18n/dv.ts +++ b/packages/app/src/runtime/i18n/dv.ts @@ -150,10 +150,9 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "އިތުރު 70+ ޕްރޮވައިޑަރުން ބައްލަވާށެވެ", "dialog.provider.viewAll": "އިތުރު ޕްރޮވައިޑަރުން ދައްކާށެވެ", "provider.connect.title": "\u2068{{provider}}\u2069 ގުޅުވާށެވެ", - "provider.connect.title.anthropicProMax": "Anthropic އާއެކު ލޮގިން ވާށެވެ", "provider.connect.method.apiKey": "API ކީ އެވެ", "provider.connect.status.inProgress": "ހުއްދަ ދިނުމުގެ މަސައްކަތް ކުރިއަށްދާ…", - "provider.connect.status.waiting": "ހުއްދައަށް އިންތިޒާރު ކުރަމުން…", + "provider.connect.status.waiting": "ހުއްދައަށް އިންތިޒާރު ކުރަމުން", "provider.connect.status.failed": "ހުއްދަ ދިނުން ނާކާމިޔާބު: \u2068{{error}}\u2069", "provider.connect.apiKey.description": "ތިބާގެ އެކައުންޓް ގުޅުވައި، OpenCode ގައި \u2068{{provider}}\u2069 މޮޑެލްތައް ބޭނުންކުރުމަށް \u2068{{provider}}\u2069 API ކީ ލިޔުއްވާ.", diff --git a/packages/app/src/runtime/i18n/dz.ts b/packages/app/src/runtime/i18n/dz.ts index 5d1c63253fb7..5416945552a7 100644 --- a/packages/app/src/runtime/i18n/dz.ts +++ b/packages/app/src/runtime/i18n/dz.ts @@ -836,7 +836,6 @@ export const dict = { "toast.migration.progress.working.progress": "གནད་སྡུད་གནས་སྤོ་འབད་དོ་ {{current}}/{{total}}", "command.session.location.cycle": "ལཱ་ཡུན་གྱི་ས་གནས་སོར།", "dialog.provider.anthropic.note": "API ལྡེ་མིག་བརྒྱུད་དེ་ Claude དཔེ་ཚད་ཚུ་ལུ་ཐད་ཀར་འཛུལ་སྤྱོད།", - "provider.connect.title.anthropicProMax": "Anthropic ཐོག་ལས་ནང་བསྐྱོད།", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "{{filename}} སྐྱེལ་བཙུགས་འབད་ནི་ཆ་མེད་བཏང་།", "prompt.toast.uploadFailed.title": "སྐྱེལ་བཙུགས་འཐུས་ཤོར།", diff --git a/packages/app/src/runtime/i18n/el.ts b/packages/app/src/runtime/i18n/el.ts index a09a64f342d0..1a92241df7de 100644 --- a/packages/app/src/runtime/i18n/el.ts +++ b/packages/app/src/runtime/i18n/el.ts @@ -149,7 +149,7 @@ export const dict = { "provider.connect.title": "Σύνδεση {{provider}}", "provider.connect.method.apiKey": "API κλειδί", "provider.connect.status.inProgress": "Εξουσιοδότηση σε εξέλιξη…", - "provider.connect.status.waiting": "Αναμονή για εξουσιοδότηση…", + "provider.connect.status.waiting": "Αναμονή για εξουσιοδότηση", "provider.connect.status.failed": "Η εξουσιοδότηση απέτυχε: {{error}}", "provider.connect.apiKey.description": "Εισαγάγετε το κλειδί {{provider}} API για να συνδέσετε τον λογαριασμό σας και χρησιμοποιήστε μοντέλα {{provider}} στο OpenCode.", @@ -840,7 +840,6 @@ export const dict = { "toast.migration.progress.working.progress": "Μεταφορά δεδομένων {{current}}/{{total}}", "command.session.location.cycle": "Εναλλαγή τοποθεσίας συνεδρίας", "dialog.provider.anthropic.note": "Άμεση πρόσβαση στα μοντέλα Claude μέσω κλειδιού API", - "provider.connect.title.anthropicProMax": "Σύνδεση με το Anthropic", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "Ακύρωση μεταφόρτωσης του {{filename}}", "prompt.toast.uploadFailed.title": "Η μεταφόρτωση απέτυχε", diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts index 43304addcb3b..d1e291965e6d 100644 --- a/packages/app/src/runtime/i18n/en.ts +++ b/packages/app/src/runtime/i18n/en.ts @@ -181,21 +181,21 @@ export const dict = { "dialog.provider.accounts.removeConfirm": "Remove {{account}}?", "dialog.provider.accounts.remove": "Remove", "dialog.provider.accounts.options": "{{account}} options", - + "provider.connect.copyFailed": "Couldn't copy to the clipboard", "provider.connect.title": "Connect {{provider}}", + + "provider.connect.breadcrumb.root": "Connect", + "provider.connect.breadcrumb.label": "Connect steps", + "provider.connect.methods.description": "Choose how to connect {{provider}}.", "provider.connect.opencode.name": "OpenCode Console", "provider.connect.opencode.freeName": "OpenCode Free", - "provider.connect.opencode.errorTitle": "Connect to OpenCode", - "provider.connect.console.title": "Connecting to OpenCode Console", - "provider.connect.console.titleGo": "Connecting to OpenCode Go", "provider.connect.console.retry": "Try again", "provider.connect.console.serviceKeyDescription": "Connect using a service-account API key from OpenCode Console.", "provider.connect.console.instructions": "Continue in your browser. Confirm the code shown there matches the one below.", "provider.connect.console.deviceCode": "Device code", "provider.connect.console.deviceCode.label": "Device code: {{code}}", - "provider.connect.console.waiting": "Waiting for confirmation…", - "provider.connect.console.browserHint": "Browser didn't open?", + "provider.connect.console.waiting": "Waiting for confirmation", "provider.connect.console.copyLink": "Copy sign-in link", "provider.connect.console.linkCopied": "Sign-in link copied", "provider.connect.console.copyFailed": "Couldn't copy the sign-in link. Open Console again to continue.", @@ -225,21 +225,20 @@ export const dict = { "Your account is connected, but this Console workspace has no available models. Check its setup in Console, then refresh.", "provider.connect.console.modelsLoading": "Your models are still loading. Refresh to check again.", "provider.connect.console.refresh": "Refresh models", - "provider.connect.console.openingBrowser": "Opening browser…", - "provider.connect.remote.title": "Connecting on “{{server}}”", + "provider.connect.console.openingBrowser": "Opening browser", + "provider.connect.remote.label": "on {{server}}", "provider.connect.remote.description": "Your OpenCode credentials will be stored on this server. Models will be available through this server.", - "provider.connect.title.anthropicProMax": "Login with Anthropic", "provider.connect.claudeAgent.description": "Use your Claude plan or another Claude Code login. Install Claude Code and sign in first.", "provider.connect.claudeAgent.install": "Install Claude Code", "provider.connect.claudeAgent.signIn.command": "Sign-in command", "provider.connect.claudeAgent.connect": "Connect", "provider.connect.claudeAgent.checkAgain": "Check again", - "provider.connect.claudeAgent.checking": "Checking Claude Code…", + "provider.connect.claudeAgent.checking": "Checking Claude Code", "provider.connect.claudeAgent.timeout": "Couldn't confirm that Claude Code is ready. Make sure it's installed and signed in, then check again.", - "provider.connect.command.waiting": "Waiting for command to finish…", + "provider.connect.command.waiting": "Waiting for command to finish", "provider.connect.command.expired": "Authentication expired", "provider.connect.form.required": "Answer required", "provider.connect.form.number": "Expected a number", @@ -248,7 +247,6 @@ export const dict = { "provider.connect.form.skip": "Skip", "provider.connect.form.add": "Add", "provider.connect.form.open": "Open link", - "provider.connect.form.openAgain": "Open link again", "provider.connect.form.finished": "I finished", "provider.connect.form.browserFailed": "We couldn't open your browser. Open the link below, then select I finished.", "provider.connect.form.selectOne": "Select at least one option", @@ -256,7 +254,7 @@ export const dict = { "provider.connect.form.maxItems": "Select at most {{count}}", "provider.connect.method.apiKey": "API key", "provider.connect.status.inProgress": "Authorization in progress…", - "provider.connect.status.waiting": "Waiting for authorization…", + "provider.connect.status.waiting": "Waiting for authorization", "provider.connect.status.failed": "Authorization failed: {{error}}", "provider.connect.apiKey.description": "Enter your {{provider}} API key to connect your account and use {{provider}} models in OpenCode.", @@ -268,15 +266,15 @@ export const dict = { "provider.connect.oauth.code.required": "Authorization code is required", "provider.connect.oauth.code.invalid": "Invalid authorization code", "provider.connect.oauth.auto.confirmationCode": "Confirmation code", - "provider.connect.oauth.auto.confirmationCode.description": - "Check that your browser shows the same code before you authorize.", "provider.connect.oauth.auto.description": "Your browser opens so you can sign in to {{provider}}. Come back here when you are done.", - "provider.connect.oauth.auto.paste.description": - "Your browser opens so you can sign in to {{provider}}. If it can't reach the machine running OpenCode, paste the URL it was redirected to below.", "provider.connect.oauth.code.description": "Your browser opens so you can sign in to {{provider}}. Paste the authorization code it gives you below.", "provider.connect.oauth.openBrowser": "Open browser", + "provider.connect.oauth.browserFailed": "We couldn't open your browser. Select Open browser to try again.", + "provider.connect.oauth.paste.toggle": "Signing in from another device?", + "provider.connect.oauth.paste.description": + "If your browser can't reach the machine running OpenCode, paste the URL it was redirected to.", "provider.connect.oauth.expired": "Authorization expired", "provider.connect.toast.connected.title": "{{provider}} connected", "provider.connect.toast.connected.description": "{{provider}} models are now available to use.", diff --git a/packages/app/src/runtime/i18n/es.ts b/packages/app/src/runtime/i18n/es.ts index 3ae91a09d404..4dc5a0b6df59 100644 --- a/packages/app/src/runtime/i18n/es.ts +++ b/packages/app/src/runtime/i18n/es.ts @@ -375,11 +375,11 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "Ver más de 70 proveedores", "dialog.provider.viewAll": "Ver más proveedores", - "provider.connect.title": "Conectar {{provider}}", + "provider.connect.method.apiKey": "Clave API", "provider.connect.status.inProgress": "Autorización en progreso…", - "provider.connect.status.waiting": "Esperando autorización…", + "provider.connect.status.waiting": "Esperando autorización", "provider.connect.status.failed": "Autorización fallida: {{error}}", "provider.connect.apiKey.description": "Introduce tu clave API de {{provider}} para conectar tu cuenta y usar modelos de {{provider}} en OpenCode.", @@ -907,7 +907,6 @@ export const dict = { "session.background.runningCount.many": "{{count}} de elementos en curso en segundo plano", "command.session.location.cycle": "Cambiar la ubicación de la sesión", "dialog.provider.anthropic.note": "Acceso directo a los modelos Claude mediante una clave de API", - "provider.connect.title.anthropicProMax": "Iniciar sesión con Anthropic", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "Cancelar carga de {{filename}}", "prompt.toast.uploadFailed.title": "Error al cargar", diff --git a/packages/app/src/runtime/i18n/et.ts b/packages/app/src/runtime/i18n/et.ts index de0a2f1e7299..2f9a707261c8 100644 --- a/packages/app/src/runtime/i18n/et.ts +++ b/packages/app/src/runtime/i18n/et.ts @@ -148,7 +148,7 @@ export const dict = { "provider.connect.title": "Ühenda {{provider}}", "provider.connect.method.apiKey": "API klahv", "provider.connect.status.inProgress": "Autoriseerimine on pooleli…", - "provider.connect.status.waiting": "Autoriseerimise ootel…", + "provider.connect.status.waiting": "Autoriseerimise ootel", "provider.connect.status.failed": "Autoriseerimine ebaõnnestus: {{error}}", "provider.connect.apiKey.description": "Sisestage {{provider}} API võti, et ühendada konto ja kasutada {{provider}} mudeleid OpenCode'is.", @@ -812,7 +812,6 @@ export const dict = { "toast.migration.progress.working.progress": "Andmete üleviimine {{current}}/{{total}}", "command.session.location.cycle": "Vaheta seansi asukohta", "dialog.provider.anthropic.note": "Otsejuurdepääs Claude’i mudelitele API-võtmega", - "provider.connect.title.anthropicProMax": "Logi Anthropicuga sisse", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "Tühista faili {{filename}} üleslaadimine", "prompt.toast.uploadFailed.title": "Üleslaadimine nurjus", diff --git a/packages/app/src/runtime/i18n/fa.ts b/packages/app/src/runtime/i18n/fa.ts index 0b79749e8af0..268f3a2f4f68 100644 --- a/packages/app/src/runtime/i18n/fa.ts +++ b/packages/app/src/runtime/i18n/fa.ts @@ -149,7 +149,7 @@ export const dict = { "provider.connect.title": "{{provider}} را وصل کنید", "provider.connect.method.apiKey": "کلید API", "provider.connect.status.inProgress": "مجوز در حال انجام است…", - "provider.connect.status.waiting": "در انتظار مجوز…", + "provider.connect.status.waiting": "در انتظار مجوز", "provider.connect.status.failed": "مجوز انجام نشد: {{error}}", "provider.connect.apiKey.description": "کلید API سرویس {{provider}} را وارد کنید تا حساب شما متصل شود و بتوانید از مدل‌های {{provider}} در OpenCode استفاده کنید.", @@ -819,7 +819,6 @@ export const dict = { "command.session.location.cycle": "جابجایی چرخشی مکان نشست", "dialog.provider.anthropic.note": "دسترسی مستقیم به مدل‌های Claude از طریق کلید API", - "provider.connect.title.anthropicProMax": "ورود با Anthropic", "prompt.toast.uploading.percent": "\u2068{{percent}}\u2069٪", "prompt.toast.uploading.cancelFile": "لغو بارگذاری \u2068{{filename}}\u2069", "prompt.toast.uploadFailed.title": "بارگذاری ناموفق بود", diff --git a/packages/app/src/runtime/i18n/fi.ts b/packages/app/src/runtime/i18n/fi.ts index 5af568fcfbce..00117737132e 100644 --- a/packages/app/src/runtime/i18n/fi.ts +++ b/packages/app/src/runtime/i18n/fi.ts @@ -282,7 +282,7 @@ export const dict = { "provider.connect.title": "Yhdistä {{provider}}", "provider.connect.method.apiKey": "API-avain", "provider.connect.status.inProgress": "Valtuutus käynnissä…", - "provider.connect.status.waiting": "Odotetaan valtuutusta…", + "provider.connect.status.waiting": "Odotetaan valtuutusta", "provider.connect.status.failed": "Valtuutus epäonnistui: {{error}}", "provider.connect.apiKey.description": "Anna {{provider}}-API-avaimesi yhdistääksesi tilisi ja käyttääksesi {{provider}}-malleja OpenCodessa.", @@ -821,7 +821,6 @@ export const dict = { "session.background.moveInline": "Siirrä käynnissä oleva työ taustalle painamalla {{keybind}}", "command.session.location.cycle": "Vaihda istunnon sijaintia", "dialog.provider.anthropic.note": "Suora pääsy Claude-malleihin API-avaimella", - "provider.connect.title.anthropicProMax": "Kirjaudu sisään Anthropiciin", "prompt.toast.uploading.percent": "{{percent}} %", "prompt.toast.uploading.cancelFile": "Peru tiedoston {{filename}} lähetys", "prompt.toast.uploadFailed.title": "Lähetys epäonnistui", diff --git a/packages/app/src/runtime/i18n/fo.ts b/packages/app/src/runtime/i18n/fo.ts index 0db2b8b87ca9..f6f37201a791 100644 --- a/packages/app/src/runtime/i18n/fo.ts +++ b/packages/app/src/runtime/i18n/fo.ts @@ -148,7 +148,7 @@ export const dict = { "provider.connect.title": "Samband {{provider}}", "provider.connect.method.apiKey": "API lykil", "provider.connect.status.inProgress": "Heimild í gongd…", - "provider.connect.status.waiting": "Bíða eftir heimild…", + "provider.connect.status.waiting": "Bíða eftir heimild", "provider.connect.status.failed": "Heimild miseydnaðist: {{error}}", "provider.connect.apiKey.description": "Skriva {{provider}} API-lykilin fyri at knýta kontuna saman og brúka {{provider}}-modell í OpenCode.", @@ -816,7 +816,6 @@ export const dict = { "toast.migration.progress.working.progress": "Flyta dátur {{current}}/{{total}}", "command.session.location.cycle": "Skift staðseting fyri setuna", "dialog.provider.anthropic.note": "Beinleiðis atgongd til Claude-modellar við API-lykli", - "provider.connect.title.anthropicProMax": "Rita inn við Anthropic", "prompt.toast.uploading.percent": "{{percent}} %", "prompt.toast.uploading.cancelFile": "Ógilda uppsendingina av {{filename}}", "prompt.toast.uploadFailed.title": "Uppsending miseydnaðist", diff --git a/packages/app/src/runtime/i18n/fr.ts b/packages/app/src/runtime/i18n/fr.ts index 58b1ccacee08..f28f348eff0d 100644 --- a/packages/app/src/runtime/i18n/fr.ts +++ b/packages/app/src/runtime/i18n/fr.ts @@ -371,7 +371,7 @@ export const dict = { "provider.connect.title": "Connecter {{provider}}", "provider.connect.method.apiKey": "Clé API", "provider.connect.status.inProgress": "Autorisation en cours…", - "provider.connect.status.waiting": "En attente d'autorisation…", + "provider.connect.status.waiting": "En attente d'autorisation", "provider.connect.status.failed": "Échec de l'autorisation : {{error}}", "provider.connect.apiKey.description": "Entrez votre clé API {{provider}} pour connecter votre compte et utiliser les modèles {{provider}} dans OpenCode.", @@ -859,7 +859,6 @@ export const dict = { "session.background.runningCount.many": "{{count}} de tâches en cours d'exécution en arrière-plan", "command.session.location.cycle": "Changer l’emplacement de la session", "dialog.provider.anthropic.note": "Accès direct aux modèles Claude avec une clé API", - "provider.connect.title.anthropicProMax": "Se connecter avec Anthropic", "prompt.toast.uploading.percent": "{{percent}} %", "prompt.toast.uploading.cancelFile": "Annuler le téléversement de {{filename}}", "prompt.toast.uploadFailed.title": "Échec du téléversement", diff --git a/packages/app/src/runtime/i18n/he.ts b/packages/app/src/runtime/i18n/he.ts index 49e766cffa18..758b69e3eb6f 100644 --- a/packages/app/src/runtime/i18n/he.ts +++ b/packages/app/src/runtime/i18n/he.ts @@ -148,7 +148,7 @@ export const dict = { "provider.connect.title": "חבר את {{provider}}", "provider.connect.method.apiKey": "מפתח API", "provider.connect.status.inProgress": "האישור מתבצע…", - "provider.connect.status.waiting": "ממתין לאישור…", + "provider.connect.status.waiting": "ממתין לאישור", "provider.connect.status.failed": "ההרשאה נכשלה: {{error}}", "provider.connect.apiKey.description": "הזן את מפתח ה-API של {{provider}} כדי לחבר את החשבון ולהשתמש במודלים של {{provider}} ב-OpenCode.", @@ -818,7 +818,6 @@ export const dict = { "command.session.location.cycle": "מעבר מחזורי בין מיקומי ההפעלה", "dialog.provider.anthropic.note": "גישה ישירה לדגמי Claude באמצעות מפתח API", - "provider.connect.title.anthropicProMax": "התחברות באמצעות Anthropic", "prompt.toast.uploading.percent": "\u2068{{percent}}\u2069%", "prompt.toast.uploading.cancelFile": "ביטול ההעלאה של \u2068{{filename}}\u2069", "prompt.toast.uploadFailed.title": "ההעלאה נכשלה", diff --git a/packages/app/src/runtime/i18n/hi.ts b/packages/app/src/runtime/i18n/hi.ts index 9b1c552a3ed8..eca6d50281bf 100644 --- a/packages/app/src/runtime/i18n/hi.ts +++ b/packages/app/src/runtime/i18n/hi.ts @@ -154,7 +154,7 @@ export const dict = { "provider.connect.title": "{{provider}} कनेक्ट करें", "provider.connect.method.apiKey": "API कुंजी", "provider.connect.status.inProgress": "प्राधिकरण प्रगति पर है…", - "provider.connect.status.waiting": "प्राधिकरण की प्रतीक्षा हो रही है…", + "provider.connect.status.waiting": "प्राधिकरण की प्रतीक्षा हो रही है", "provider.connect.status.failed": "प्राधिकरण विफल: {{error}}", "provider.connect.apiKey.description": "अपने खाते को कनेक्ट करने के लिए अपनी {{provider}} API कुंजी दर्ज करें और OpenCode में {{provider}} मॉडल का उपयोग करें।", @@ -826,7 +826,6 @@ export const dict = { "command.session.location.cycle": "सेशन की लोकेशन क्रम से बदलें", "dialog.provider.anthropic.note": "API कुंजी के माध्यम से Claude मॉडल का सीधा ऐक्सेस", - "provider.connect.title.anthropicProMax": "Anthropic से लॉग इन करें", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "{{filename}} का अपलोड रद्द करें", "prompt.toast.uploadFailed.title": "अपलोड विफल रहा", diff --git a/packages/app/src/runtime/i18n/hr.ts b/packages/app/src/runtime/i18n/hr.ts index 86fe21e1d28b..bcfdd5a314ff 100644 --- a/packages/app/src/runtime/i18n/hr.ts +++ b/packages/app/src/runtime/i18n/hr.ts @@ -161,7 +161,7 @@ export const dict = { "provider.connect.title": "Povežite {{provider}}", "provider.connect.method.apiKey": "Ključ API", "provider.connect.status.inProgress": "Autorizacija u tijeku…", - "provider.connect.status.waiting": "Čeka se autorizacija…", + "provider.connect.status.waiting": "Čeka se autorizacija", "provider.connect.status.failed": "Autorizacija nije uspjela: {{error}}", "provider.connect.apiKey.description": "Enter vaš {{provider}} API ključ za povezivanje vašeg računa i korištenje {{provider}} modela u OpenCode.", @@ -838,7 +838,6 @@ export const dict = { "workspace.delete.location": "Lokacija", "command.session.location.cycle": "Promijeni lokaciju sesije", "dialog.provider.anthropic.note": "Izravan pristup modelima Claude putem API ključa", - "provider.connect.title.anthropicProMax": "Prijava putem Anthropic-a", "prompt.toast.uploading.cancelFile": "Otkaži prijenos datoteke {{filename}}", "prompt.toast.uploadFailed.title": "Prijenos nije uspio", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/hu.ts b/packages/app/src/runtime/i18n/hu.ts index f36006e93172..8a432e81f2f6 100644 --- a/packages/app/src/runtime/i18n/hu.ts +++ b/packages/app/src/runtime/i18n/hu.ts @@ -161,7 +161,7 @@ export const dict = { "provider.connect.title": "Csatlakoztassa a {{provider}}-t", "provider.connect.method.apiKey": "API kulcs", "provider.connect.status.inProgress": "Az engedélyezés folyamatban…", - "provider.connect.status.waiting": "Várakozás az engedélyezésre…", + "provider.connect.status.waiting": "Várakozás az engedélyezésre", "provider.connect.status.failed": "Az engedélyezés sikertelen: {{error}}", "provider.connect.apiKey.description": "Enter az Ön {{provider}} API kulcsa fiókja összekapcsolásához és a {{provider}} modellek használatához a OpenCode-ben.", @@ -832,7 +832,6 @@ export const dict = { "toast.migration.progress.working.progress": "Adatok migrálása {{current}}/{{total}}", "command.session.location.cycle": "Munkamenet helyének váltása", "dialog.provider.anthropic.note": "Közvetlen hozzáférés a Claude-modellekhez API-kulccsal", - "provider.connect.title.anthropicProMax": "Bejelentkezés az Anthropic használatával", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "A(z) {{filename}} feltöltésének megszakítása", "prompt.toast.uploadFailed.title": "A feltöltés sikertelen", diff --git a/packages/app/src/runtime/i18n/hy.ts b/packages/app/src/runtime/i18n/hy.ts index e6fcd771a2fe..4c4670f4b96d 100644 --- a/packages/app/src/runtime/i18n/hy.ts +++ b/packages/app/src/runtime/i18n/hy.ts @@ -149,7 +149,7 @@ export const dict = { "provider.connect.title": "Միացեք {{provider}}", "provider.connect.method.apiKey": "API բանալի", "provider.connect.status.inProgress": "Լիազորումն ընթացքի մեջ է…", - "provider.connect.status.waiting": "Սպասում է թույլտվության…", + "provider.connect.status.waiting": "Սպասում է թույլտվության", "provider.connect.status.failed": "Լիազորումը ձախողվեց՝ {{error}}", "provider.connect.apiKey.description": "Մուտքագրեք ձեր {{provider}} API բանալին՝ ձեր հաշիվը միացնելու և OpenCode-ում {{provider}} մոդելներ օգտագործելու համար։", @@ -819,7 +819,6 @@ export const dict = { "workspace.delete.location": "Տեղանք", "command.session.location.cycle": "Փոխել աշխատաշրջանի տեղադրությունը", "dialog.provider.anthropic.note": "Ուղղակի հասանելիություն Claude մոդելներին API բանալիով", - "provider.connect.title.anthropicProMax": "Մուտք գործել Anthropic-ով", "prompt.toast.uploading.cancelFile": "Չեղարկել {{filename}} ֆայլի վերբեռնումը", "prompt.toast.uploadFailed.title": "Վերբեռնումը ձախողվեց", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/id.ts b/packages/app/src/runtime/i18n/id.ts index 42095b18c5d4..ef6bc4a9f403 100644 --- a/packages/app/src/runtime/i18n/id.ts +++ b/packages/app/src/runtime/i18n/id.ts @@ -162,12 +162,11 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "Lihat 70+ penyedia lainnya", "dialog.provider.viewAll": "Tampilkan lebih banyak penyedia", - "provider.connect.title": "Hubungkan {{provider}}", - "provider.connect.title.anthropicProMax": "Masuk dengan Anthropic", + "provider.connect.method.apiKey": "Kunci API", "provider.connect.status.inProgress": "Otorisasi sedang berlangsung…", - "provider.connect.status.waiting": "Menunggu otorisasi…", + "provider.connect.status.waiting": "Menunggu otorisasi", "provider.connect.status.failed": "Otorisasi gagal: {{error}}", "provider.connect.apiKey.description": "Masukkan kunci API {{provider}} untuk menghubungkan akun Anda dan gunakan model {{provider}} di OpenCode.", diff --git a/packages/app/src/runtime/i18n/is.ts b/packages/app/src/runtime/i18n/is.ts index ab679da20752..2577b6a5d62c 100644 --- a/packages/app/src/runtime/i18n/is.ts +++ b/packages/app/src/runtime/i18n/is.ts @@ -161,7 +161,7 @@ export const dict = { "provider.connect.title": "Tengdu {{provider}}", "provider.connect.method.apiKey": "API lykill", "provider.connect.status.inProgress": "Heimild í gangi…", - "provider.connect.status.waiting": "Bíður eftir heimild…", + "provider.connect.status.waiting": "Bíður eftir heimild", "provider.connect.status.failed": "Heimild mistókst: {{error}}", "provider.connect.apiKey.description": "Sláðu inn API-lykilinn þinn fyrir {{provider}} til að tengja reikninginn og nota líkön frá {{provider}} í OpenCode.", @@ -821,7 +821,6 @@ export const dict = { "toast.migration.progress.working.progress": "Flytja gögn {{current}}/{{total}}", "command.session.location.cycle": "Skipta um staðsetningu setu", "dialog.provider.anthropic.note": "Beinn aðgangur að Claude-líkönum með API-lykli", - "provider.connect.title.anthropicProMax": "Skrá inn með Anthropic", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "Hætta við upphleðslu á {{filename}}", "prompt.toast.uploadFailed.title": "Upphleðsla mistókst", diff --git a/packages/app/src/runtime/i18n/it.ts b/packages/app/src/runtime/i18n/it.ts index 822ab36796ba..11f6deb27e08 100644 --- a/packages/app/src/runtime/i18n/it.ts +++ b/packages/app/src/runtime/i18n/it.ts @@ -303,7 +303,7 @@ export const dict = { "provider.connect.title": "Connetti {{provider}}", "provider.connect.method.apiKey": "Chiave API", "provider.connect.status.inProgress": "Autorizzazione in corso…", - "provider.connect.status.waiting": "In attesa di autorizzazione…", + "provider.connect.status.waiting": "In attesa di autorizzazione", "provider.connect.status.failed": "Autorizzazione fallita: {{error}}", "provider.connect.apiKey.description": "Inserisci la chiave API di {{provider}} per connettere il tuo account e utilizzare i modelli {{provider}} in OpenCode.", @@ -845,7 +845,6 @@ export const dict = { "session.background.runningCount.many": "{{count}} di elementi in esecuzione in background", "command.session.location.cycle": "Cambia la posizione della sessione", "dialog.provider.anthropic.note": "Accesso diretto ai modelli Claude tramite chiave API", - "provider.connect.title.anthropicProMax": "Accedi con Anthropic", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "Annulla il caricamento di {{filename}}", "prompt.toast.uploadFailed.title": "Caricamento non riuscito", diff --git a/packages/app/src/runtime/i18n/ja.ts b/packages/app/src/runtime/i18n/ja.ts index 12fa3212db7a..dd7d91435585 100644 --- a/packages/app/src/runtime/i18n/ja.ts +++ b/packages/app/src/runtime/i18n/ja.ts @@ -153,10 +153,9 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "その他70以上のプロバイダーを見る", "dialog.provider.viewAll": "さらにプロバイダーを表示", "provider.connect.title": "{{provider}}を接続", - "provider.connect.title.anthropicProMax": "Anthropicにログイン", "provider.connect.method.apiKey": "APIキー", "provider.connect.status.inProgress": "認証中…", - "provider.connect.status.waiting": "認証を待機中…", + "provider.connect.status.waiting": "認証を待機中", "provider.connect.status.failed": "認証に失敗しました: {{error}}", "provider.connect.apiKey.description": "{{provider}}のAPIキーを入力してアカウントを接続し、OpenCodeで{{provider}}モデルを使用します。", diff --git a/packages/app/src/runtime/i18n/ka.ts b/packages/app/src/runtime/i18n/ka.ts index bbcbcbbed031..8a9291139067 100644 --- a/packages/app/src/runtime/i18n/ka.ts +++ b/packages/app/src/runtime/i18n/ka.ts @@ -148,7 +148,7 @@ export const dict = { "provider.connect.title": "დაკავშირება {{provider}}", "provider.connect.method.apiKey": "API გასაღები", "provider.connect.status.inProgress": "ავტორიზაცია მიმდინარეობს…", - "provider.connect.status.waiting": "ველოდები ავტორიზაციას…", + "provider.connect.status.waiting": "ველოდები ავტორიზაციას", "provider.connect.status.failed": "ავტორიზაცია ვერ მოხერხდა: {{error}}", "provider.connect.apiKey.description": "შეიყვანეთ თქვენი {{provider}} API გასაღები თქვენი ანგარიშის დასაკავშირებლად და გამოიყენეთ {{provider}} მოდელები OpenCode-ში.", @@ -820,7 +820,6 @@ export const dict = { "workspace.delete.location": "მდებარეობა", "command.session.location.cycle": "სესიის მდებარეობის შეცვლა", "dialog.provider.anthropic.note": "Claude-ის მოდელებზე პირდაპირი წვდომა API გასაღებით", - "provider.connect.title.anthropicProMax": "Anthropic-ით შესვლა", "prompt.toast.uploading.cancelFile": "{{filename}} ფაილის ატვირთვის გაუქმება", "prompt.toast.uploadFailed.title": "ატვირთვა ვერ მოხერხდა", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/km.ts b/packages/app/src/runtime/i18n/km.ts index 787d9324ed9c..1ddbfe42c38e 100644 --- a/packages/app/src/runtime/i18n/km.ts +++ b/packages/app/src/runtime/i18n/km.ts @@ -148,10 +148,9 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "មើលអ្នកផ្តល់សេវា 70+ ទៀត។", "dialog.provider.viewAll": "បង្ហាញអ្នកផ្តល់សេវាបន្ថែម", "provider.connect.title": "ភ្ជាប់ {{provider}}", - "provider.connect.title.anthropicProMax": "ចូលដោយប្រើ Anthropic", "provider.connect.method.apiKey": "សោ API", "provider.connect.status.inProgress": "ការអនុញ្ញាតកំពុងដំណើរការ…", - "provider.connect.status.waiting": "រង់ចាំការអនុញ្ញាត…", + "provider.connect.status.waiting": "រង់ចាំការអនុញ្ញាត", "provider.connect.status.failed": "ការអនុញ្ញាតបានបរាជ័យ៖ {{error}}", "provider.connect.apiKey.description": "បញ្ចូល {{provider}} API key របស់អ្នក ដើម្បីភ្ជាប់គណនីរបស់អ្នក ហើយប្រើម៉ូដែល {{provider}} នៅក្នុង OpenCode។", diff --git a/packages/app/src/runtime/i18n/ko.ts b/packages/app/src/runtime/i18n/ko.ts index e7f7d705620c..d1f4d45c49c6 100644 --- a/packages/app/src/runtime/i18n/ko.ts +++ b/packages/app/src/runtime/i18n/ko.ts @@ -86,10 +86,9 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "70개 이상의 공급자 더 보기", "dialog.provider.viewAll": "더 많은 공급자 보기", "provider.connect.title": "{{provider}} 연결", - "provider.connect.title.anthropicProMax": "Anthropic에 로그인", "provider.connect.method.apiKey": "API 키", "provider.connect.status.inProgress": "인증 진행 중…", - "provider.connect.status.waiting": "인증 대기 중…", + "provider.connect.status.waiting": "인증 대기 중", "provider.connect.status.failed": "인증 실패: {{error}}", "provider.connect.apiKey.description": "{{provider}} API 키를 입력하여 계정을 연결하고 OpenCode에서 {{provider}} 모델을 사용하세요.", diff --git a/packages/app/src/runtime/i18n/lo.ts b/packages/app/src/runtime/i18n/lo.ts index c6fac5b5526d..e78da8195b48 100644 --- a/packages/app/src/runtime/i18n/lo.ts +++ b/packages/app/src/runtime/i18n/lo.ts @@ -148,10 +148,9 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "ເບິ່ງ 70+ ຜູ້ໃຫ້ບໍລິການເພີ່ມເຕີມ", "dialog.provider.viewAll": "ສະແດງຜູ້ໃຫ້ບໍລິການເພີ່ມເຕີມ", "provider.connect.title": "ເຊື່ອມຕໍ່ {{provider}}", - "provider.connect.title.anthropicProMax": "ເຂົ້າສູ່ລະບົບດ້ວຍ Anthropic", "provider.connect.method.apiKey": "ລະຫັດ API", "provider.connect.status.inProgress": "ກໍາລັງດໍາເນີນຢູ່…", - "provider.connect.status.waiting": "ລໍຖ້າການອະນຸຍາດ…", + "provider.connect.status.waiting": "ລໍຖ້າການອະນຸຍາດ", "provider.connect.status.failed": "ການອະນຸຍາດລົ້ມເຫລວ: {{error}}", "provider.connect.apiKey.description": "ໃສ່ລະຫັດ API {{provider}} ຂອງທ່ານເພື່ອເຊື່ອມຕໍ່ບັນຊີຂອງທ່ານ ແລະໃຊ້ຕົວແບບ {{provider}} ໃນ OpenCode.", diff --git a/packages/app/src/runtime/i18n/lt.ts b/packages/app/src/runtime/i18n/lt.ts index 8f7b22fedf25..fd4f55e7e513 100644 --- a/packages/app/src/runtime/i18n/lt.ts +++ b/packages/app/src/runtime/i18n/lt.ts @@ -161,7 +161,7 @@ export const dict = { "provider.connect.title": "Prijunkite {{provider}}", "provider.connect.method.apiKey": "API raktas", "provider.connect.status.inProgress": "Vykdoma prieigos teisė…", - "provider.connect.status.waiting": "Laukiama įgaliojimo…", + "provider.connect.status.waiting": "Laukiama įgaliojimo", "provider.connect.status.failed": "Autorizacija nepavyko: {{error}}", "provider.connect.apiKey.description": "Įveskite {{provider}} API raktą, kad susietumėte paskyrą ir naudotumėte {{provider}} modelius programoje OpenCode.", @@ -851,7 +851,6 @@ export const dict = { "toast.migration.progress.working.progress": "Perkeliami duomenys {{current}}/{{total}}", "command.session.location.cycle": "Keisti seanso vietą", "dialog.provider.anthropic.note": "Tiesioginė prieiga prie „Claude“ modelių naudojant API raktą", - "provider.connect.title.anthropicProMax": "Prisijungti naudojant „Anthropic“", "prompt.toast.uploading.percent": "{{percent}} %", "prompt.toast.uploading.cancelFile": "Atšaukti failo {{filename}} įkėlimą", "prompt.toast.uploadFailed.title": "Įkelti nepavyko", diff --git a/packages/app/src/runtime/i18n/lv.ts b/packages/app/src/runtime/i18n/lv.ts index da895eef6710..5c1a7211a357 100644 --- a/packages/app/src/runtime/i18n/lv.ts +++ b/packages/app/src/runtime/i18n/lv.ts @@ -148,7 +148,7 @@ export const dict = { "provider.connect.title": "Savienot {{provider}}", "provider.connect.method.apiKey": "API atslēga", "provider.connect.status.inProgress": "Notiek autorizācija…", - "provider.connect.status.waiting": "Gaida autorizāciju…", + "provider.connect.status.waiting": "Gaida autorizāciju", "provider.connect.status.failed": "Autorizācija neizdevās: {{error}}", "provider.connect.apiKey.description": "Ievadiet savu {{provider}} API atslēgu, lai savienotu kontu un izmantotu {{provider}} modeļus OpenCode.", @@ -835,7 +835,6 @@ export const dict = { "toast.migration.progress.working.progress": "Notiek datu migrēšana {{current}}/{{total}}", "command.session.location.cycle": "Mainīt sesijas atrašanās vietu", "dialog.provider.anthropic.note": "Tieša piekļuve Claude modeļiem, izmantojot API atslēgu", - "provider.connect.title.anthropicProMax": "Pieteikties, izmantojot Anthropic", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "Atcelt faila {{filename}} augšupielādi", "prompt.toast.uploadFailed.title": "Augšupielāde neizdevās", diff --git a/packages/app/src/runtime/i18n/mk.ts b/packages/app/src/runtime/i18n/mk.ts index 8e74e0e89f4f..a776bfd1760e 100644 --- a/packages/app/src/runtime/i18n/mk.ts +++ b/packages/app/src/runtime/i18n/mk.ts @@ -149,7 +149,7 @@ export const dict = { "provider.connect.title": "Поврзете се {{provider}}", "provider.connect.method.apiKey": "клуч API", "provider.connect.status.inProgress": "Овластувањето е во тек…", - "provider.connect.status.waiting": "Се чека овластување…", + "provider.connect.status.waiting": "Се чека овластување", "provider.connect.status.failed": "Овластувањето не успеа: {{error}}", "provider.connect.apiKey.description": "Внесете го вашиот клуч {{provider}} API за да ја поврзете вашата сметка и да користите {{provider}} модели во OpenCode.", @@ -824,7 +824,6 @@ export const dict = { "workspace.delete.location": "Локација", "command.session.location.cycle": "Смени ја локацијата на сесијата", "dialog.provider.anthropic.note": "Директен пристап до моделите Claude преку API-клуч", - "provider.connect.title.anthropicProMax": "Најави се со Anthropic", "prompt.toast.uploading.cancelFile": "Откажи го поставувањето на {{filename}}", "prompt.toast.uploadFailed.title": "Поставувањето не успеа", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/mn.ts b/packages/app/src/runtime/i18n/mn.ts index fa3748176795..022d511886b8 100644 --- a/packages/app/src/runtime/i18n/mn.ts +++ b/packages/app/src/runtime/i18n/mn.ts @@ -149,7 +149,7 @@ export const dict = { "provider.connect.title": "Холбох {{provider}}", "provider.connect.method.apiKey": "API түлхүүр", "provider.connect.status.inProgress": "Зөвшөөрөл хийгдэж байна…", - "provider.connect.status.waiting": "Зөвшөөрөл хүлээж байна…", + "provider.connect.status.waiting": "Зөвшөөрөл хүлээж байна", "provider.connect.status.failed": "Зөвшөөрөл амжилтгүй болсон: {{error}}", "provider.connect.apiKey.description": "Бүртгэлээ холбохын тулд {{provider}} API түлхүүрээ оруулаад OpenCode-д {{provider}} загварыг ашиглана уу.", @@ -823,7 +823,6 @@ export const dict = { "workspace.delete.location": "Байршил", "command.session.location.cycle": "Сешний байршлыг солих", "dialog.provider.anthropic.note": "API түлхүүрээр Claude загваруудад шууд хандах", - "provider.connect.title.anthropicProMax": "Anthropic-оор нэвтрэх", "prompt.toast.uploading.cancelFile": "{{filename}} файлын байршуулалтыг цуцлах", "prompt.toast.uploadFailed.title": "Байршуулж чадсангүй", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/ms.ts b/packages/app/src/runtime/i18n/ms.ts index 34126b9cf00b..502172332821 100644 --- a/packages/app/src/runtime/i18n/ms.ts +++ b/packages/app/src/runtime/i18n/ms.ts @@ -148,10 +148,9 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "Lihat 70+ lagi penyedia", "dialog.provider.viewAll": "Tunjukkan lebih banyak penyedia", "provider.connect.title": "Sambungkan {{provider}}", - "provider.connect.title.anthropicProMax": "Log masuk dengan Anthropic", "provider.connect.method.apiKey": "Kunci API", "provider.connect.status.inProgress": "Kebenaran sedang diproses…", - "provider.connect.status.waiting": "Menunggu kebenaran…", + "provider.connect.status.waiting": "Menunggu kebenaran", "provider.connect.status.failed": "Kebenaran gagal: {{error}}", "provider.connect.apiKey.description": "Masukkan kunci API {{provider}} anda untuk menghubungkan akaun anda dan menggunakan model {{provider}} dalam OpenCode.", diff --git a/packages/app/src/runtime/i18n/my.ts b/packages/app/src/runtime/i18n/my.ts index 4aaff4edc25f..91133e008b6a 100644 --- a/packages/app/src/runtime/i18n/my.ts +++ b/packages/app/src/runtime/i18n/my.ts @@ -149,10 +149,9 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "နောက်ထပ်ပံ့ပိုးပေးသူ 70+ ကိုကြည့်ပါ။", "dialog.provider.viewAll": "နောက်ထပ်ဝန်ဆောင်မှုပေးသူများကို ပြပါ။", "provider.connect.title": "{{provider}} ကို ချိတ်ဆက်ပါ။", - "provider.connect.title.anthropicProMax": "Anthropic ဖြင့် အကောင့်ဝင်ပါ", "provider.connect.method.apiKey": "API သော့", "provider.connect.status.inProgress": "ခွင့်ပြုချက် လုပ်ဆောင်နေသည်…", - "provider.connect.status.waiting": "ခွင့်ပြုချက်ကို စောင့်ဆိုင်းနေသည်…", + "provider.connect.status.waiting": "ခွင့်ပြုချက်ကို စောင့်ဆိုင်းနေသည်", "provider.connect.status.failed": "ခွင့်ပြုချက် မအောင်မြင်ပါ- {{error}}", "provider.connect.apiKey.description": "သင့်အကောင့်ကို ချိတ်ဆက်ရန်နှင့် OpenCode တွင် {{provider}} မော်ဒယ်များကို အသုံးပြုရန် သင်၏ {{provider}} API သော့ကို ထည့်သွင်းပါ။", diff --git a/packages/app/src/runtime/i18n/ne.ts b/packages/app/src/runtime/i18n/ne.ts index 9f7c98909520..99d47739e1e1 100644 --- a/packages/app/src/runtime/i18n/ne.ts +++ b/packages/app/src/runtime/i18n/ne.ts @@ -153,7 +153,7 @@ export const dict = { "provider.connect.title": "जडान गर्नुहोस् {{provider}}", "provider.connect.method.apiKey": "API कुञ्जी", "provider.connect.status.inProgress": "प्राधिकरण जारी छ…", - "provider.connect.status.waiting": "प्राधिकरणको लागि पर्खँदै…", + "provider.connect.status.waiting": "प्राधिकरणको लागि पर्खँदै", "provider.connect.status.failed": "प्राधिकरण असफल भयो: {{error}}", "provider.connect.apiKey.description": "आफ्नो खाता जडान गर्न आफ्नो {{provider}} API कुञ्जी प्रविष्ट गर्नुहोस् र OpenCode मा {{provider}} मोडेलहरू प्रयोग गर्नुहोस्।", @@ -825,7 +825,6 @@ export const dict = { "command.session.location.cycle": "सेसनको स्थान क्रमशः बदल्नुहोस्", "dialog.provider.anthropic.note": "API कुञ्जीमार्फत Claude मोडेलहरूमा प्रत्यक्ष पहुँच", - "provider.connect.title.anthropicProMax": "Anthropic मार्फत लगइन गर्नुहोस्", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "{{filename}} को अपलोड रद्द गर्नुहोस्", "prompt.toast.uploadFailed.title": "अपलोड असफल भयो", diff --git a/packages/app/src/runtime/i18n/nl.ts b/packages/app/src/runtime/i18n/nl.ts index 2fe2f9f2b4cf..e23cb997de88 100644 --- a/packages/app/src/runtime/i18n/nl.ts +++ b/packages/app/src/runtime/i18n/nl.ts @@ -354,7 +354,7 @@ export const dict = { "provider.connect.title": "Verbinding maken met {{provider}}", "provider.connect.method.apiKey": "API-sleutel", "provider.connect.status.inProgress": "Autorisatie in behandeling…", - "provider.connect.status.waiting": "Wachten op autorisatie…", + "provider.connect.status.waiting": "Wachten op autorisatie", "provider.connect.status.failed": "Autorisatie mislukt: {{error}}", "provider.connect.apiKey.description": "Voer je {{provider}}-API-sleutel in om je account te koppelen en {{provider}}-modellen in OpenCode te gebruiken.", @@ -831,7 +831,6 @@ export const dict = { "session.background.moveInline": "Druk op {{keybind}} om actief werk naar de achtergrond te verplaatsen", "command.session.location.cycle": "Sessielocatie wisselen", "dialog.provider.anthropic.note": "Directe toegang tot Claude-modellen via een API-sleutel", - "provider.connect.title.anthropicProMax": "Inloggen met Anthropic", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "Upload van {{filename}} annuleren", "prompt.toast.uploadFailed.title": "Upload mislukt", diff --git a/packages/app/src/runtime/i18n/no.ts b/packages/app/src/runtime/i18n/no.ts index 9541be7ac336..d02fce57b7d0 100644 --- a/packages/app/src/runtime/i18n/no.ts +++ b/packages/app/src/runtime/i18n/no.ts @@ -356,11 +356,11 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "Se over 70 flere leverandører", "dialog.provider.viewAll": "Vis flere leverandører", - "provider.connect.title": "Koble til {{provider}}", + "provider.connect.method.apiKey": "API-nøkkel", "provider.connect.status.inProgress": "Autorisering pågår…", - "provider.connect.status.waiting": "Venter på autorisering…", + "provider.connect.status.waiting": "Venter på autorisering", "provider.connect.status.failed": "Autorisering mislyktes: {{error}}", "provider.connect.apiKey.description": "Skriv inn API-nøkkelen din for {{provider}} for å koble til kontoen din og bruke {{provider}}-modeller i OpenCode.", @@ -888,7 +888,6 @@ export const dict = { "session.background.moveInline": "Trykk på {{keybind}} for å flytte pågående arbeid til bakgrunnen", "command.session.location.cycle": "Bytt øktplassering", "dialog.provider.anthropic.note": "Direkte tilgang til Claude-modeller via API-nøkkel", - "provider.connect.title.anthropicProMax": "Logg på med Anthropic", "prompt.toast.uploading.percent": "{{percent}} %", "prompt.toast.uploading.cancelFile": "Avbryt opplasting av {{filename}}", "prompt.toast.uploadFailed.title": "Opplasting mislyktes", diff --git a/packages/app/src/runtime/i18n/pa.ts b/packages/app/src/runtime/i18n/pa.ts index 42b7deda7b41..046f2f3804a8 100644 --- a/packages/app/src/runtime/i18n/pa.ts +++ b/packages/app/src/runtime/i18n/pa.ts @@ -153,10 +153,9 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "70+ ہور پرووائیڈر ویکھو", "dialog.provider.viewAll": "ہور پرووائیڈر وکھاؤ", "provider.connect.title": "\u2068{{provider}}\u2069 نال جڑو", - "provider.connect.title.anthropicProMax": "Anthropic دے نال لاگ ان کرو", "provider.connect.method.apiKey": "API کلید", "provider.connect.status.inProgress": "اختیار دیندے پئے آں…", - "provider.connect.status.waiting": "اختیار ملن دی اڈیک اے…", + "provider.connect.status.waiting": "اختیار ملن دی اڈیک اے", "provider.connect.status.failed": "اختیار نئیں مل سکیا: \u2068{{error}}\u2069", "provider.connect.apiKey.description": "اپنے اکاؤنٹ نوں جوڑن لئی اپنی \u2068{{provider}}\u2069 API کلید درج کرو تے OpenCode وچ \u2068{{provider}}\u2069 ماڈل ورتو۔", diff --git a/packages/app/src/runtime/i18n/pl.ts b/packages/app/src/runtime/i18n/pl.ts index 56f0548a6b03..c8693d872eff 100644 --- a/packages/app/src/runtime/i18n/pl.ts +++ b/packages/app/src/runtime/i18n/pl.ts @@ -153,7 +153,7 @@ export const dict = { "provider.connect.title": "Połącz {{provider}}", "provider.connect.method.apiKey": "Klucz API", "provider.connect.status.inProgress": "Autoryzacja w toku…", - "provider.connect.status.waiting": "Oczekiwanie na autoryzację…", + "provider.connect.status.waiting": "Oczekiwanie na autoryzację", "provider.connect.status.failed": "Autoryzacja nie powiodła się: {{error}}", "provider.connect.apiKey.description": "Wprowadź swój klucz API {{provider}}, aby połączyć konto i używać modeli {{provider}} w OpenCode.", @@ -858,7 +858,6 @@ export const dict = { "Spowoduje to trwałe usunięcie {{count}} drzew roboczych bez powiązanych sesji.", "command.session.location.cycle": "Zmień lokalizację sesji", "dialog.provider.anthropic.note": "Bezpośredni dostęp do modeli Claude za pomocą klucza API", - "provider.connect.title.anthropicProMax": "Zaloguj się przez Anthropic", "prompt.toast.uploading.cancelFile": "Anuluj przesyłanie pliku {{filename}}", "prompt.toast.uploadFailed.title": "Przesyłanie nie powiodło się", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/ro.ts b/packages/app/src/runtime/i18n/ro.ts index 6e97233510f9..9f46d77add6b 100644 --- a/packages/app/src/runtime/i18n/ro.ts +++ b/packages/app/src/runtime/i18n/ro.ts @@ -148,7 +148,7 @@ export const dict = { "provider.connect.title": "Conectează {{provider}}", "provider.connect.method.apiKey": "Cheie API", "provider.connect.status.inProgress": "Autorizare în curs…", - "provider.connect.status.waiting": "Se așteaptă autorizarea…", + "provider.connect.status.waiting": "Se așteaptă autorizarea", "provider.connect.status.failed": "Autorizare eșuată: {{error}}", "provider.connect.apiKey.description": "Introdu cheia API {{provider}} pentru a-ți conecta contul și a folosi modelele {{provider}} în OpenCode.", @@ -835,7 +835,6 @@ export const dict = { "toast.migration.progress.working.progress": "Migrarea datelor {{current}}/{{total}}", "command.session.location.cycle": "Schimbă locația sesiunii", "dialog.provider.anthropic.note": "Acces direct la modelele Claude prin cheia API", - "provider.connect.title.anthropicProMax": "Autentificare cu Anthropic", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "Anulează încărcarea fișierului {{filename}}", "prompt.toast.uploadFailed.title": "Încărcarea a eșuat", diff --git a/packages/app/src/runtime/i18n/ru.ts b/packages/app/src/runtime/i18n/ru.ts index cd494bee79e9..b85c86cc98e3 100644 --- a/packages/app/src/runtime/i18n/ru.ts +++ b/packages/app/src/runtime/i18n/ru.ts @@ -159,11 +159,11 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "Посмотреть ещё более 70 провайдеров", "dialog.provider.viewAll": "Показать больше провайдеров", - "provider.connect.title": "Подключить {{provider}}", + "provider.connect.method.apiKey": "Ключ API", "provider.connect.status.inProgress": "Авторизация…", - "provider.connect.status.waiting": "Ожидание авторизации…", + "provider.connect.status.waiting": "Ожидание авторизации", "provider.connect.status.failed": "Ошибка авторизации: {{error}}", "provider.connect.apiKey.description": "Введите ключ API {{provider}}, чтобы подключить аккаунт и использовать модели {{provider}} в OpenCode.", @@ -913,7 +913,6 @@ export const dict = { "Это навсегда удалит {{count}} рабочих деревьев без связанных сессий.", "command.session.location.cycle": "Сменить расположение сеанса", "dialog.provider.anthropic.note": "Прямой доступ к моделям Claude по API-ключу", - "provider.connect.title.anthropicProMax": "Войти через Anthropic", "prompt.toast.uploading.cancelFile": "Отменить загрузку файла {{filename}}", "prompt.toast.uploadFailed.title": "Не удалось загрузить файл", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/si.ts b/packages/app/src/runtime/i18n/si.ts index 401ab4fae0da..0a111f296b7c 100644 --- a/packages/app/src/runtime/i18n/si.ts +++ b/packages/app/src/runtime/i18n/si.ts @@ -152,7 +152,7 @@ export const dict = { "provider.connect.title": "{{provider}} සම්බන්ධ කරන්න", "provider.connect.method.apiKey": "API යතුර", "provider.connect.status.inProgress": "අවසරය ක්‍රියාත්මක වෙමින් පවතී…", - "provider.connect.status.waiting": "අවසරය සඳහා රැඳී සිටිමින්…", + "provider.connect.status.waiting": "අවසරය සඳහා රැඳී සිටිමින්", "provider.connect.status.failed": "අවසරය අසාර්ථක විය: {{error}}", "provider.connect.apiKey.description": "ඔබගේ ගිණුම සම්බන්ධ කිරීමට ඔබගේ {{provider}} API යතුර ඇතුලත් කරන්න සහ OpenCode හි {{provider}} මාදිලි භාවිතා කරන්න.", @@ -820,7 +820,6 @@ export const dict = { "command.session.location.cycle": "සැසි ස්ථානය මාරුවෙන් මාරුවට වෙනස් කරන්න", "dialog.provider.anthropic.note": "API යතුරක් හරහා Claude මාදිලි වෙත සෘජු ප්‍රවේශය", - "provider.connect.title.anthropicProMax": "Anthropic සමඟ පිවිසෙන්න", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "{{filename}} ගොනුව උඩුගත කිරීම අවලංගු කරන්න", "prompt.toast.uploadFailed.title": "උඩුගත කිරීම අසාර්ථකයි", diff --git a/packages/app/src/runtime/i18n/sk.ts b/packages/app/src/runtime/i18n/sk.ts index 993b296fb6a5..3c562c3966d2 100644 --- a/packages/app/src/runtime/i18n/sk.ts +++ b/packages/app/src/runtime/i18n/sk.ts @@ -174,7 +174,7 @@ export const dict = { "provider.connect.title": "Pripojiť {{provider}}", "provider.connect.method.apiKey": "API kľúč", "provider.connect.status.inProgress": "Prebieha autorizácia…", - "provider.connect.status.waiting": "Čaká sa na autorizáciu…", + "provider.connect.status.waiting": "Čaká sa na autorizáciu", "provider.connect.status.failed": "Autorizácia zlyhala: {{error}}", "provider.connect.apiKey.description": "Zadajte svoj API kľúč {{provider}}, aby ste prepojili svoj účet a mohli používať modely {{provider}} v OpenCode.", @@ -844,7 +844,6 @@ export const dict = { "workspace.delete.location": "Umiestnenie", "command.session.location.cycle": "Prepnúť umiestnenie relácie", "dialog.provider.anthropic.note": "Priamy prístup k modelom Claude pomocou kľúča API", - "provider.connect.title.anthropicProMax": "Prihlásiť sa cez Anthropic", "prompt.toast.uploading.cancelFile": "Zrušiť nahrávanie súboru {{filename}}", "prompt.toast.uploadFailed.title": "Nahrávanie zlyhalo", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/sl.ts b/packages/app/src/runtime/i18n/sl.ts index a571a3619f46..ab4f393f03e6 100644 --- a/packages/app/src/runtime/i18n/sl.ts +++ b/packages/app/src/runtime/i18n/sl.ts @@ -174,7 +174,7 @@ export const dict = { "provider.connect.title": "Povežite {{provider}}", "provider.connect.method.apiKey": "Ključ API", "provider.connect.status.inProgress": "Avtorizacija v teku…", - "provider.connect.status.waiting": "Čakanje na avtorizacijo …", + "provider.connect.status.waiting": "Čakanje na avtorizacijo", "provider.connect.status.failed": "Avtorizacija ni uspela: {{error}}", "provider.connect.apiKey.description": "Vnesite ključ API ponudnika {{provider}}, da povežete račun in uporabljate modele {{provider}} v OpenCode.", @@ -844,7 +844,6 @@ export const dict = { "workspace.delete.location": "Lokacija", "command.session.location.cycle": "Zamenjaj lokacijo seje", "dialog.provider.anthropic.note": "Neposreden dostop do modelov Claude s ključem API", - "provider.connect.title.anthropicProMax": "Prijava prek Anthropic", "prompt.toast.uploading.cancelFile": "Prekliči nalaganje datoteke {{filename}}", "prompt.toast.uploadFailed.title": "Nalaganje ni uspelo", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/sq.ts b/packages/app/src/runtime/i18n/sq.ts index a0fd4975fdf9..12c3ef5fac5d 100644 --- a/packages/app/src/runtime/i18n/sq.ts +++ b/packages/app/src/runtime/i18n/sq.ts @@ -149,7 +149,7 @@ export const dict = { "provider.connect.title": "Lidhni {{provider}}", "provider.connect.method.apiKey": "Tasti API", "provider.connect.status.inProgress": "Autorizimi në proces…", - "provider.connect.status.waiting": "Në pritje të autorizimit…", + "provider.connect.status.waiting": "Në pritje të autorizimit", "provider.connect.status.failed": "Autorizimi dështoi: {{error}}", "provider.connect.apiKey.description": "Futni çelësin API të {{provider}} për të lidhur llogarinë dhe për të përdorur modelet {{provider}} në OpenCode.", @@ -822,7 +822,6 @@ export const dict = { "toast.migration.progress.working.progress": "Migrimi i të dhënave {{current}}/{{total}}", "command.session.location.cycle": "Ndrysho vendndodhjen e sesionit", "dialog.provider.anthropic.note": "Qasje e drejtpërdrejtë te modelet Claude përmes çelësit API", - "provider.connect.title.anthropicProMax": "Hyr me Anthropic", "prompt.toast.uploading.percent": "{{percent}}%", "prompt.toast.uploading.cancelFile": "Anulo ngarkimin e {{filename}}", "prompt.toast.uploadFailed.title": "Ngarkimi dështoi", diff --git a/packages/app/src/runtime/i18n/sr.ts b/packages/app/src/runtime/i18n/sr.ts index 048c42ab097d..f6a89845b0c5 100644 --- a/packages/app/src/runtime/i18n/sr.ts +++ b/packages/app/src/runtime/i18n/sr.ts @@ -162,7 +162,7 @@ export const dict = { "provider.connect.title": "Повежи {{provider}}", "provider.connect.method.apiKey": "API кључ", "provider.connect.status.inProgress": "Ауторизација је у току…", - "provider.connect.status.waiting": "Чека се ауторизација…", + "provider.connect.status.waiting": "Чека се ауторизација", "provider.connect.status.failed": "Ауторизација није успела: {{error}}", "provider.connect.apiKey.description": "Унесите свој {{provider}} API кључ да бисте повезали свој налог и користили {{provider}} моделе у OpenCode.", @@ -831,7 +831,6 @@ export const dict = { "workspace.delete.location": "Локација", "command.session.location.cycle": "Промени локацију сесије", "dialog.provider.anthropic.note": "Директан приступ Claude моделима путем API кључа", - "provider.connect.title.anthropicProMax": "Пријави се преко Anthropic-а", "prompt.toast.uploading.cancelFile": "Откажи отпремање датотеке {{filename}}", "prompt.toast.uploadFailed.title": "Отпремање није успело", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/sv.ts b/packages/app/src/runtime/i18n/sv.ts index 49ede78a208a..5543e4b19e7e 100644 --- a/packages/app/src/runtime/i18n/sv.ts +++ b/packages/app/src/runtime/i18n/sv.ts @@ -348,7 +348,7 @@ export const dict = { "provider.connect.title": "Anslut {{provider}}", "provider.connect.method.apiKey": "API-nyckel", "provider.connect.status.inProgress": "Auktorisering pågår…", - "provider.connect.status.waiting": "Väntar på auktorisering…", + "provider.connect.status.waiting": "Väntar på auktorisering", "provider.connect.status.failed": "Auktorisering misslyckades: {{error}}", "provider.connect.apiKey.description": "Ange din {{provider}}-API-nyckel för att ansluta ditt konto och använda {{provider}}-modeller i OpenCode.", @@ -821,7 +821,6 @@ export const dict = { "session.background.moveInline": "Tryck på {{keybind}} för att flytta pågående arbete till bakgrunden", "command.session.location.cycle": "Växla sessionsplats", "dialog.provider.anthropic.note": "Direktåtkomst till Claude-modeller via API-nyckel", - "provider.connect.title.anthropicProMax": "Logga in med Anthropic", "prompt.toast.uploading.percent": "{{percent}} %", "prompt.toast.uploading.cancelFile": "Avbryt uppladdningen av {{filename}}", "prompt.toast.uploadFailed.title": "Uppladdningen misslyckades", diff --git a/packages/app/src/runtime/i18n/tg.ts b/packages/app/src/runtime/i18n/tg.ts index 09c76d178257..ea6bef95fd30 100644 --- a/packages/app/src/runtime/i18n/tg.ts +++ b/packages/app/src/runtime/i18n/tg.ts @@ -149,7 +149,7 @@ export const dict = { "provider.connect.title": "Пайвастшавӣ {{provider}}", "provider.connect.method.apiKey": "API калид", "provider.connect.status.inProgress": "Иҷозатдиҳӣ идома дорад…", - "provider.connect.status.waiting": "Мунтазири иҷозат…", + "provider.connect.status.waiting": "Мунтазири иҷозат", "provider.connect.status.failed": "Иҷозат дода нашуд: {{error}}", "provider.connect.apiKey.description": "Барои пайваст кардани ҳисоби худ калиди {{provider}} API-ро ворид кунед ва моделҳои {{provider}}-ро дар OpenCode истифода баред.", @@ -829,7 +829,6 @@ export const dict = { "workspace.delete.location": "Ҷойгиршавӣ", "command.session.location.cycle": "Ҷойгиршавии сессияро иваз кунед", "dialog.provider.anthropic.note": "Дастрасии мустақим ба моделҳои Claude тавассути калиди API", - "provider.connect.title.anthropicProMax": "Бо Anthropic ворид шавед", "prompt.toast.uploading.cancelFile": "Боркунии файли {{filename}}-ро бекор кунед", "prompt.toast.uploadFailed.title": "Боркунӣ ноком шуд", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/th.ts b/packages/app/src/runtime/i18n/th.ts index a1f7278d6b0f..f65d16e58428 100644 --- a/packages/app/src/runtime/i18n/th.ts +++ b/packages/app/src/runtime/i18n/th.ts @@ -161,12 +161,11 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "ดูผู้ให้บริการเพิ่มเติมกว่า 70 ราย", "dialog.provider.viewAll": "แสดงผู้ให้บริการเพิ่มเติม", - "provider.connect.title": "เชื่อมต่อ {{provider}}", - "provider.connect.title.anthropicProMax": "เข้าสู่ระบบ Anthropic", + "provider.connect.method.apiKey": "คีย์ API", "provider.connect.status.inProgress": "กำลังอนุญาต…", - "provider.connect.status.waiting": "รอการอนุญาต…", + "provider.connect.status.waiting": "รอการอนุญาต", "provider.connect.status.failed": "การอนุญาตล้มเหลว: {{error}}", "provider.connect.apiKey.description": "ป้อนคีย์ API ของ {{provider}} เพื่อเชื่อมต่อบัญชีและใช้โมเดล {{provider}} ใน OpenCode", diff --git a/packages/app/src/runtime/i18n/tk.ts b/packages/app/src/runtime/i18n/tk.ts index d8a9c0bbb2a2..9be6a10a59ac 100644 --- a/packages/app/src/runtime/i18n/tk.ts +++ b/packages/app/src/runtime/i18n/tk.ts @@ -149,7 +149,7 @@ export const dict = { "provider.connect.title": "{{provider}} birikdiriň", "provider.connect.method.apiKey": "API açary", "provider.connect.status.inProgress": "Ygtyýarnama dowam edýär …", - "provider.connect.status.waiting": "Ygtyýarnama garaşýarys …", + "provider.connect.status.waiting": "Ygtyýarnama garaşýarys", "provider.connect.status.failed": "Ygtyýarnama şowsuz: {{error}}", "provider.connect.apiKey.description": "Hasabyňyzy birikdirmek we OpenCode-da {{provider}} modellerini ulanmak üçin {{provider}} API açaryňyzy giriziň.", @@ -815,7 +815,6 @@ export const dict = { "workspace.delete.location": "Ýerleşiş", "command.session.location.cycle": "Sessiýanyň ýerleşýän ýerini üýtget", "dialog.provider.anthropic.note": "API açary bilen Claude modellerine göni giriş", - "provider.connect.title.anthropicProMax": "Anthropic arkaly giriň", "prompt.toast.uploading.cancelFile": "{{filename}} faýlynyň ýüklenmegini ýatyr", "prompt.toast.uploadFailed.title": "Ýükleme şowsuz boldy", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/tr.ts b/packages/app/src/runtime/i18n/tr.ts index 1b1168bce136..a52ff352078d 100644 --- a/packages/app/src/runtime/i18n/tr.ts +++ b/packages/app/src/runtime/i18n/tr.ts @@ -171,11 +171,11 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "70'ten fazla sağlayıcı daha görüntüle", "dialog.provider.viewAll": "Daha fazla sağlayıcı göster", - "provider.connect.title": "{{provider}} bağla", + "provider.connect.method.apiKey": "API anahtarı", "provider.connect.status.inProgress": "Yetkilendirme devam ediyor…", - "provider.connect.status.waiting": "Yetkilendirme bekleniyor…", + "provider.connect.status.waiting": "Yetkilendirme bekleniyor", "provider.connect.status.failed": "Yetkilendirme başarısız: {{error}}", "provider.connect.apiKey.description": "{{provider}} hesabınızı bağlamak ve OpenCode'da {{provider}} modellerini kullanmak için API anahtarınızı girin.", @@ -895,7 +895,6 @@ export const dict = { "toast.migration.progress.working.progress": "Veriler taşınıyor {{current}}/{{total}}", "command.session.location.cycle": "Oturum konumunu değiştir", "dialog.provider.anthropic.note": "API anahtarıyla Claude modellerine doğrudan erişim", - "provider.connect.title.anthropicProMax": "Anthropic ile giriş yap", "prompt.toast.uploading.percent": "%{{percent}}", "prompt.toast.uploading.cancelFile": "{{filename}} yüklemesini iptal et", "prompt.toast.uploadFailed.title": "Yükleme başarısız", diff --git a/packages/app/src/runtime/i18n/uk.ts b/packages/app/src/runtime/i18n/uk.ts index dfb1ee4c67b5..419a478fc936 100644 --- a/packages/app/src/runtime/i18n/uk.ts +++ b/packages/app/src/runtime/i18n/uk.ts @@ -186,11 +186,11 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "Переглянути ще понад 70 провайдерів", "dialog.provider.viewAll": "Показати більше провайдерів", - "provider.connect.title": "Підключити {{provider}}", + "provider.connect.method.apiKey": "Ключ API", "provider.connect.status.inProgress": "Авторизація виконується…", - "provider.connect.status.waiting": "Очікування авторизації…", + "provider.connect.status.waiting": "Очікування авторизації", "provider.connect.status.failed": "Авторизація не вдалася: {{error}}", "provider.connect.apiKey.description": "Введіть ключ API {{provider}}, щоб підключити обліковий запис і використовувати моделі {{provider}} у OpenCode.", @@ -912,7 +912,6 @@ export const dict = { "workspace.delete.location": "Розташування", "command.session.location.cycle": "Змінити розташування сеансу", "dialog.provider.anthropic.note": "Прямий доступ до моделей Claude за допомогою ключа API", - "provider.connect.title.anthropicProMax": "Увійти через Anthropic", "prompt.toast.uploading.cancelFile": "Скасувати завантаження файлу {{filename}}", "prompt.toast.uploadFailed.title": "Не вдалося завантажити файл", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/ur.ts b/packages/app/src/runtime/i18n/ur.ts index 897ed4cfd683..f1cac074fcd2 100644 --- a/packages/app/src/runtime/i18n/ur.ts +++ b/packages/app/src/runtime/i18n/ur.ts @@ -154,10 +154,9 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "مزید 70 فراہم کنندگان دیکھیں", "dialog.provider.viewAll": "مزید فراہم کنندگان دکھائیں۔", "provider.connect.title": "\u2068{{provider}}\u2069 سے منسلک ہوں", - "provider.connect.title.anthropicProMax": "Anthropic کے ساتھ لاگ ان کریں", "provider.connect.method.apiKey": "API کلید", "provider.connect.status.inProgress": "اجازت حاصل کی جا رہی ہے…", - "provider.connect.status.waiting": "اجازت کا انتظار ہے…", + "provider.connect.status.waiting": "اجازت کا انتظار ہے", "provider.connect.status.failed": "اجازت حاصل نہیں ہو سکی: \u2068{{error}}\u2069", "provider.connect.apiKey.description": "اپنا اکاؤنٹ منسلک کرنے اور OpenCode میں \u2068{{provider}}\u2069 ماڈلز استعمال کرنے کے لیے اپنی \u2068{{provider}}\u2069 API کلید درج کریں۔", diff --git a/packages/app/src/runtime/i18n/uz.ts b/packages/app/src/runtime/i18n/uz.ts index aa296b782bd1..d548c3175745 100644 --- a/packages/app/src/runtime/i18n/uz.ts +++ b/packages/app/src/runtime/i18n/uz.ts @@ -149,7 +149,7 @@ export const dict = { "provider.connect.title": "{{provider}} ni ulang", "provider.connect.method.apiKey": "API kaliti", "provider.connect.status.inProgress": "Avtorizatsiya davom etmoqda…", - "provider.connect.status.waiting": "Avtorizatsiya kutilmoqda…", + "provider.connect.status.waiting": "Avtorizatsiya kutilmoqda", "provider.connect.status.failed": "Avtorizatsiya amalga oshmadi: {{error}}", "provider.connect.apiKey.description": "Hisobingizni ulash va OpenCode’da {{provider}} modellaridan foydalanish uchun {{provider}} API kalitini kiriting.", @@ -826,7 +826,6 @@ export const dict = { "workspace.delete.location": "Joylashuv", "command.session.location.cycle": "Sessiya joylashuvini almashtirish", "dialog.provider.anthropic.note": "API kaliti orqali Claude modellariga bevosita kirish", - "provider.connect.title.anthropicProMax": "Anthropic orqali kirish", "prompt.toast.uploading.cancelFile": "{{filename}} faylini yuklashni bekor qilish", "prompt.toast.uploadFailed.title": "Yuklash amalga oshmadi", "prompt.toast.uploading.percent": "{{percent}}%", diff --git a/packages/app/src/runtime/i18n/vi.ts b/packages/app/src/runtime/i18n/vi.ts index 9734339b967b..2e68e1a7d389 100644 --- a/packages/app/src/runtime/i18n/vi.ts +++ b/packages/app/src/runtime/i18n/vi.ts @@ -153,10 +153,9 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "Xem hơn 70 nhà cung cấp khác", "dialog.provider.viewAll": "Hiển thị thêm nhà cung cấp", "provider.connect.title": "Kết nối {{provider}}", - "provider.connect.title.anthropicProMax": "Đăng nhập bằng Anthropic", "provider.connect.method.apiKey": "Khóa API", "provider.connect.status.inProgress": "Đang ủy quyền…", - "provider.connect.status.waiting": "Đang chờ ủy quyền…", + "provider.connect.status.waiting": "Đang chờ ủy quyền", "provider.connect.status.failed": "Ủy quyền thất bại: {{error}}", "provider.connect.apiKey.description": "Nhập khóa API {{provider}} để kết nối tài khoản và sử dụng các mô hình {{provider}} trong OpenCode.", diff --git a/packages/app/src/runtime/i18n/zh.ts b/packages/app/src/runtime/i18n/zh.ts index d4cefa254161..7c4edd33bf08 100644 --- a/packages/app/src/runtime/i18n/zh.ts +++ b/packages/app/src/runtime/i18n/zh.ts @@ -181,12 +181,11 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "查看另外 70 多个提供商", "dialog.provider.viewAll": "查看更多提供商", - "provider.connect.title": "连接 {{provider}}", - "provider.connect.title.anthropicProMax": "登录 Anthropic", + "provider.connect.method.apiKey": "API 密钥", "provider.connect.status.inProgress": "正在授权…", - "provider.connect.status.waiting": "等待授权…", + "provider.connect.status.waiting": "等待授权", "provider.connect.status.failed": "授权失败:{{error}}", "provider.connect.apiKey.description": "输入你的 {{provider}} API 密钥以连接账户,并在 OpenCode 中使用 {{provider}} 模型。", diff --git a/packages/app/src/runtime/i18n/zht.ts b/packages/app/src/runtime/i18n/zht.ts index 525214d6b7ff..1821d5754a75 100644 --- a/packages/app/src/runtime/i18n/zht.ts +++ b/packages/app/src/runtime/i18n/zht.ts @@ -165,12 +165,11 @@ export const dict = { "dialog.model.unpaid.viewMoreProviders": "查看另外 70 多個提供者", "dialog.provider.viewAll": "查看更多提供者", - "provider.connect.title": "連線 {{provider}}", - "provider.connect.title.anthropicProMax": "登入 Anthropic", + "provider.connect.method.apiKey": "API 金鑰", "provider.connect.status.inProgress": "正在授權…", - "provider.connect.status.waiting": "等待授權…", + "provider.connect.status.waiting": "等待授權", "provider.connect.status.failed": "授權失敗: {{error}}", "provider.connect.apiKey.description": "輸入你的 {{provider}} API 金鑰以連線帳戶,並在 OpenCode 中使用 {{provider}} 模型。", diff --git a/packages/core/src/mime.ts b/packages/core/src/mime.ts index 15f24023fa9d..a84e94ba2844 100644 --- a/packages/core/src/mime.ts +++ b/packages/core/src/mime.ts @@ -1,10 +1,21 @@ export * as Mime from "./mime.js" export function detect(bytes: Uint8Array) { + return detectMedia(bytes) ?? (isText(bytes) ? "text/plain" : "application/octet-stream") +} + +export function detectMedia(bytes: Uint8Array) { if (startsWith(bytes, [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a])) return "image/png" if (startsWith(bytes, [0xff, 0xd8, 0xff])) return "image/jpeg" - if (startsWith(bytes, [0x47, 0x49, 0x46, 0x38])) return "image/gif" - if (startsWith(bytes, [0x42, 0x4d])) return "image/bmp" + const signature = ascii(bytes, 0, 6) + if (signature === "GIF87a" || signature === "GIF89a") return "image/gif" + if (bytes.length >= 18 && startsWith(bytes, [0x42, 0x4d])) { + const header = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength) + const pixels = header.getUint32(10, true) + const dib = header.getUint32(14, true) + // Pixels follow the 14-byte file header and a Windows or OS/2 DIB header, possibly beyond this sample. + if ([12, 16, 40, 52, 56, 64, 108, 124].includes(dib) && pixels >= 14 + dib) return "image/bmp" + } if (startsWith(bytes, [0x25, 0x50, 0x44, 0x46, 0x2d])) return "application/pdf" if (startsWith(bytes, [0x52, 0x49, 0x46, 0x46]) && startsWith(bytes.subarray(8), [0x57, 0x45, 0x42, 0x50])) return "image/webp" @@ -28,7 +39,7 @@ export function detect(bytes: Uint8Array) { if (brand === "M4A ") return "audio/mp4" return "video/mp4" } - return isText(bytes) ? "text/plain" : "application/octet-stream" + return undefined } export const isTextual = (mime: string) => diff --git a/packages/core/src/tool/plugin/image-generate.ts b/packages/core/src/tool/plugin/image-generate.ts index 726e35c9b395..adff3d106303 100644 --- a/packages/core/src/tool/plugin/image-generate.ts +++ b/packages/core/src/tool/plugin/image-generate.ts @@ -198,8 +198,8 @@ export const Plugin = { return yield* new ToolFailure({ message: `${source} is larger than 20 MiB.` }) return (yield* environment.files.read(target.absolute)).bytes }) - const mime = Mime.detect(bytes) - if (!INPUT_TYPES.includes(mime)) + const mime = Mime.detectMedia(bytes) + if (!mime || !INPUT_TYPES.includes(mime)) return yield* new ToolFailure({ message: `${source} is not a PNG, JPEG, WebP or GIF image.` }) return { data: Buffer.from(bytes).toString("base64"), mime, name: path.basename(source) } }) @@ -314,7 +314,8 @@ export const Plugin = { const image = result.images[0] if (!image) return yield* Effect.fail(new Error(`${ref} returned no image.`)) const bytes = Buffer.from(image.data, "base64") - const file = stem + (EXTENSIONS[Mime.detect(bytes)] ?? ".png") + const mime = Mime.detectMedia(bytes) + const file = stem + (EXTENSIONS[mime ?? "image/png"] ?? ".png") // The edit prompt covered the requested path. Replacing a different existing file needs its own // approval; a new file only has to pass the deny rules. if (target && file !== target.absolute) { diff --git a/packages/core/src/tool/plugin/read.ts b/packages/core/src/tool/plugin/read.ts index f0b04931e627..3d2e729556a3 100644 --- a/packages/core/src/tool/plugin/read.ts +++ b/packages/core/src/tool/plugin/read.ts @@ -53,6 +53,8 @@ export const Plugin = { output: Output, execute: (input, context) => { return Effect.gen(function* () { + if (input.limit === 0) + return yield* new ToolFailure({ message: "Limit must be a positive integer" }) if (Skill.isUri(input.path)) { const parsed = parseSkillUri(input.path) if (!parsed) return yield* new ToolFailure({ message: `File not found: ${input.path}` }) @@ -348,7 +350,8 @@ export const toModelContent = (path: string, offset: number | undefined, output: const start = output.type === "text-page" ? output.offset : 1 // Pages already join selected lines; a trailing newline represents a selected blank line. const text = output.type === "file" ? output.content.replace(/\n$/, "") : output.content - const lines = output.content === "" ? [] : text.split("\n") + const empty = output.type === "text-page" ? output.lineCount === 0 : output.content === "" + const lines = empty ? [] : text.split("\n") // A page that starts before the requested offset is the file's tail, returned for an offset past the end. const total = start + lines.length - 1 const pastEnd = output.type === "text-page" && offset !== undefined && start < offset diff --git a/packages/core/src/tool/read-filesystem.ts b/packages/core/src/tool/read-filesystem.ts index 11930dcba8a5..5f1a91dd3d21 100644 --- a/packages/core/src/tool/read-filesystem.ts +++ b/packages/core/src/tool/read-filesystem.ts @@ -82,6 +82,7 @@ export type FileContent = typeof FileContent.Type export class TextPage extends Schema.Class("ReadTool.TextPage")({ type: Schema.Literal("text-page"), content: Schema.String, + lineCount: NonNegativeInt, mime: Schema.String, offset: PositiveInt, truncated: Schema.Boolean, @@ -137,8 +138,8 @@ export const read = Effect.fn("ReadTool.read")(function* ( ) if (first instanceof ListPage) return first - const media = Mime.detect(first.bytes) - if (MEDIA_MIMES.has(media)) { + const media = Mime.detectMedia(first.bytes) + if (media && MEDIA_MIMES.has(media)) { if (first.info.size > MAX_MEDIA_INGEST_BYTES) return yield* new MediaIngestLimitError({ resource, maximumBytes: MAX_MEDIA_INGEST_BYTES }) const whole = yield* readFile(files, input, resource) @@ -155,13 +156,20 @@ export const read = Effect.fn("ReadTool.read")(function* ( const paged = first.info.size > MAX_READ_BYTES || page.offset !== undefined || page.limit !== undefined if (!paged) { if (first.bytes.includes(0)) return yield* new BinaryFileError({ resource }) - return { - type: "file" as const, - uri: virtual ? resource : pathToFileURL(input).href, - name: virtual ? path.posix.basename(input) : path.basename(input), - content: new TextDecoder().decode(first.bytes).split("\n").map(clampLine).join("\n"), - encoding: "utf8" as const, - mime: mimeType(input), + const lines = new TextDecoder().decode(first.bytes).split("\n") + // A final separator ends the last physical line; keep it in whole-file content. + const count = lines.at(-1) === "" ? lines.length - 1 : lines.length + if (count <= MAX_READ_LINES) { + const content = lines.map(clampLine).join("\n") + if (Buffer.byteLength(content) <= MAX_READ_BYTES) + return { + type: "file" as const, + uri: virtual ? resource : pathToFileURL(input).href, + name: virtual ? path.posix.basename(input) : path.basename(input), + content, + encoding: "utf8" as const, + mime: mimeType(input), + } } } @@ -325,6 +333,7 @@ const textPage = Effect.fnUntraced(function* ( return new TextPage({ type: "text-page", content: entries.join("\n"), + lineCount: entries.length, mime: mimeType(input), offset: from, truncated: next !== undefined, diff --git a/packages/core/test/mime.test.ts b/packages/core/test/mime.test.ts index a63f19005120..93af27cf06ee 100644 --- a/packages/core/test/mime.test.ts +++ b/packages/core/test/mime.test.ts @@ -4,6 +4,30 @@ import { Mime } from "@opencode/core/mime" const ftyp = (hex: string) => Uint8Array.from(Buffer.from(hex, "hex")) describe("Mime.detect", () => { + test.each([ + [Uint8Array.of(65), "text/plain"], + [Uint8Array.of(0xff), "application/octet-stream"], + [Uint8Array.of(0xe2, 0x82), "text/plain"], // A sample may end inside a UTF-8 character. + ] as const)("leaves samples without media headers to the text fallback: %j", (bytes, mime) => { + expect(Mime.detectMedia(bytes)).toBeUndefined() + expect(Mime.detect(bytes)).toBe(mime) + }) + + test("keeps ordinary text starting with BM as text", () => { + for (const text of ["BM", "BMW service schedule\n"]) expect(Mime.detect(Buffer.from(text))).toBe("text/plain") + }) + + test("detects Windows and OS/2 bitmaps from a prefix", () => { + // 1x1, 24-bit bitmaps with a four-byte padded pixel row. + const windows = "424d3a000000000000003600000028000000010000000100000001001800" + "00".repeat(28) + const os2 = "424d1e000000000000001a0000000c000000010001000100180000000000" + for (const hex of [windows, os2]) { + const bytes = Buffer.from(hex, "hex") + expect(Mime.detect(bytes)).toBe("image/bmp") + expect(Mime.detect(bytes.subarray(0, 18))).toBe("image/bmp") + } + }) + test("tells ISO-BMFF brands apart", () => { expect(Mime.detect(ftyp("000000206674797061766966000000004d695072617669666d6961666d696631"))).toBe("image/avif") expect(Mime.detect(ftyp("000000186674797061766973000000006d73663161766973"))).toBe("image/avif") diff --git a/packages/core/test/session-prompt.test.ts b/packages/core/test/session-prompt.test.ts index 6c50de01f379..d00ef5ebd7d5 100644 --- a/packages/core/test/session-prompt.test.ts +++ b/packages/core/test/session-prompt.test.ts @@ -843,11 +843,15 @@ describe("Session.prompt", () => { yield* setup const session = yield* Session.Service const uri = `data:video/mp2t;base64,${Buffer.from("export const value = 1\n").toString("base64")}` + const notes = Buffer.from("BMW service schedule\n").toString("base64") const message = yield* session.prompt({ sessionID, text: "Inspect this", - files: [{ uri, name: "main.ts" }], + files: [ + { uri, name: "main.ts" }, + { uri: `data:;base64,${notes}`, name: "notes" }, + ], resume: false, }) @@ -858,6 +862,7 @@ describe("Session.prompt", () => { source: { type: "inline" }, name: "main.ts", }, + { data: notes, mime: "text/plain", source: { type: "inline" }, name: "notes" }, ]) }), ) diff --git a/packages/core/test/tool-read-filesystem.test.ts b/packages/core/test/tool-read-filesystem.test.ts index f4997f9b4b27..fa38fa154b2b 100644 --- a/packages/core/test/tool-read-filesystem.test.ts +++ b/packages/core/test/tool-read-filesystem.test.ts @@ -23,6 +23,13 @@ const absolute = (value: string) => AbsolutePath.make(value) describe("ReadTool text serialization", () => { const cases = [ + { + name: "reads a partial GIF signature as text", + content: "GIF8 is text", + page: {}, + output: { type: "file", content: "GIF8 is text", encoding: "utf8" }, + model: "Read file lines.txt, lines 1-1\n1: GIF8 is text", + }, { name: "preserves a selected trailing blank line before continuation", content: "alpha\n\nomega\n", @@ -90,9 +97,30 @@ describe("ReadTool text serialization", () => { name: "preserves empty-file page output", content: "", page: { limit: 2 }, - output: { type: "text-page", content: "", offset: 1, truncated: false }, + output: { type: "text-page", content: "", lineCount: 0, offset: 1, truncated: false }, model: "Read file lines.txt, 0 lines", }, + { + name: "numbers the only blank line in a newline-only file", + content: "\n", + page: { limit: 1 }, + output: { type: "text-page", content: "", lineCount: 1, offset: 1, truncated: false }, + model: "Read file lines.txt, lines 1-1\n1: ", + }, + { + name: "numbers a single blank line before continuation", + content: "alpha\n\nomega\n", + page: { offset: 2, limit: 1 }, + output: { type: "text-page", content: "", lineCount: 1, offset: 2, truncated: true, next: 3 }, + model: "Read file lines.txt, lines 2-2\n2: \n[Output truncated. Continue reading with offset: 3]", + }, + { + name: "counts the last blank line when an offset is past EOF", + content: "alpha\n\n", + page: { offset: 9, limit: 1 }, + output: { type: "text-page", content: "", lineCount: 1, offset: 2, truncated: false }, + model: "Read file lines.txt, lines 2-2 (offset 9 is past the end; the file has 2 lines)\n2: ", + }, ] cases.forEach((input) => { @@ -105,13 +133,81 @@ describe("ReadTool text serialization", () => { const result = yield* ReadToolFileSystem.read(current.environment, file, "lines.txt", input.page) expect(result).toMatchObject(input.output) - expect(ReadTool.toModelContent("lines.txt", undefined, result)).toBe(input.model) + expect(ReadTool.toModelContent("lines.txt", input.page.offset, result)).toBe(input.model) }), ) }) }) describe("ReadToolFileSystem", () => { + it.live("applies the default line limit to small files at physical line boundaries", () => + Effect.gen(function* () { + const { environment, files, directory } = yield* fixture + const file = absolute(path.join(directory, "dense.txt")) + const read = (page?: ReadToolFileSystem.PageInput) => ReadToolFileSystem.read(environment, file, "dense.txt", page) + const prefix = "x\r\n".repeat(1_999) + for (const ending of ["last", "last\n", "last\r\n", "\n"]) { + const content = prefix + ending + yield* files.writeFileString(file, content) + expect(yield* read()).toMatchObject({ type: "file", content }) + } + + yield* files.writeFileString(file, prefix + "\r\nlast") + const page = yield* read() + expect(page.type).toBe("text-page") + if (page.type !== "text-page") return + expect(page).toMatchObject({ content: "x\n".repeat(1_999), offset: 1, next: 2_001, truncated: true }) + expect(ReadTool.toModelContent("dense.txt", undefined, page)).toEndWith( + "2000: \n[Output truncated. Continue reading with offset: 2001]", + ) + expect(yield* read({ offset: page.next })).toMatchObject({ content: "last", offset: 2_001, truncated: false }) + }), + ) + + it.live("applies the byte limit to the returned content of small files", () => + Effect.gen(function* () { + const { environment, files, directory } = yield* fixture + const file = absolute(path.join(directory, "bytes.txt")) + const read = () => ReadToolFileSystem.read(environment, file, "bytes.txt") + const exact = ("é".repeat(799) + "x\n").repeat(32) + yield* files.writeFileString(file, exact) + expect(yield* read()).toMatchObject({ type: "file", content: exact }) + + // Each truncation marker takes more bytes than the one character it replaces. + yield* files.writeFileString(file, ("x".repeat(2_001) + "\n").repeat(25) + "é".repeat(500)) + const page = yield* read() + expect(page.type).toBe("text-page") + if (page.type !== "text-page") return + expect(page).toMatchObject({ offset: 1, next: 26, truncated: true }) + expect(page.content.split("\n")).toHaveLength(25) + expect(Buffer.byteLength(page.content)).toBeLessThanOrEqual(50 * 1024) + }), + ) + + it.live("reads extensionless and renamed GIFs as images", () => + Effect.gen(function* () { + const { environment, files, directory } = yield* fixture + for (const [version, name] of [ + ["GIF87a", "pixel"], + ["GIF89a", "pixel.txt"], + ]) { + // 1x1 screen, black/white palette, one pixel and trailer. + const bytes = Buffer.concat([ + Buffer.from(version), + Buffer.from("01000100800000000000ffffff2c00000000010001000002024401003b", "hex"), + ]) + const file = absolute(path.join(directory, name)) + yield* files.writeFile(file, bytes) + expect(yield* ReadToolFileSystem.read(environment, file, name)).toMatchObject({ + type: "file", + mime: "image/gif", + encoding: "base64", + content: bytes.toString("base64"), + }) + } + }), + ) + it.effect("preserves the environment not-found error", () => Effect.gen(function* () { const { environment, directory } = yield* fixture diff --git a/packages/core/test/tool-read.test.ts b/packages/core/test/tool-read.test.ts index 48ad4f76140c..280f539997b8 100644 --- a/packages/core/test/tool-read.test.ts +++ b/packages/core/test/tool-read.test.ts @@ -223,6 +223,23 @@ describe("ReadTool", () => { }), ) + it.effect("rejects a zero limit before reading", () => + Effect.gen(function* () { + const registry = yield* Tool.Service + const result = yield* executeTool(registry, { + sessionID, + ...toolIdentity, + call: { type: "tool-call", id: "call-zero-limit", name: "read", input: { path: "README.md", limit: 0 } }, + }) + expect(result).toMatchObject({ + status: "error", + error: { message: "Limit must be a positive integer" }, + }) + expect(assertions).toEqual([]) + expect(readCalls).toEqual([]) + }), + ) + it.effect("asks for external_directory approval before reading an external absolute path", () => Effect.gen(function* () { const registry = yield* Tool.Service @@ -1130,6 +1147,7 @@ describe("ReadTool", () => { readResult = new ReadToolFileSystem.TextPage({ type: "text-page", content: "hello", + lineCount: 1, mime: "text/plain", offset: 2, truncated: true, @@ -1170,6 +1188,7 @@ describe("ReadTool", () => { readResult = new ReadToolFileSystem.TextPage({ type: "text-page", content: "nine\nten", + lineCount: 2, mime: "text/plain", offset: 9, truncated: true, diff --git a/packages/gui-plugins/src/btw/panel.tsx b/packages/gui-plugins/src/btw/panel.tsx index 3b9529daba79..249b51ab8d42 100644 --- a/packages/gui-plugins/src/btw/panel.tsx +++ b/packages/gui-plugins/src/btw/panel.tsx @@ -1,5 +1,4 @@ -import { createMemo, Match, on, Show, Switch } from "solid-js" -import { createStore } from "solid-js/store" +import { createMemo, Match, Show, Switch } from "solid-js" import { Button } from "@opencode/ui/button" import { useI18n } from "@opencode/ui/context/i18n" import { Icon } from "@opencode/ui/icon" @@ -7,6 +6,7 @@ import { IconButton } from "@opencode/ui/icon-button" import { TextShimmer } from "@opencode/ui/text-shimmer" import { Tooltip } from "@opencode/ui/tooltip" import { showToast } from "@opencode/ui/toast" +import { createCopyFeedback } from "@opencode/session-ui/copy" import { Markdown } from "@opencode/session-ui/markdown" import { usePlugin, type MountedSession } from "@opencode/plugin/gui" import type { BtwFailure } from "./machine" @@ -15,7 +15,6 @@ import type { BtwModel } from "./model" export default function SessionBtwPanel(props: { btw: BtwModel; session: MountedSession; id: string }) { const ctx = usePlugin() const i18n = useI18n() - const system = ctx.system const view = createMemo(() => props.btw.view(props.session, props.id)) const chat = createMemo(() => { @@ -39,7 +38,6 @@ export default function SessionBtwPanel(props: { btw: BtwModel; session: Mounted }) const question = () => chat()?.question - const answer = () => answered()?.answer const failureDetail = (value: BtwFailure) => { if (value.reason === "empty") return ctx.t("error.empty") @@ -51,12 +49,6 @@ export default function SessionBtwPanel(props: { btw: BtwModel; session: Mounted return undefined } - // New primitive tokens clear the copied mark when text changes without being proxied by the store. - const shownQuestion = createMemo(on(question, () => Symbol())) - const shownAnswer = createMemo(on(answer, () => Symbol())) - const [copied, setCopied] = createStore<{ question?: symbol; answer?: symbol }>({}) - const isQuestionCopied = () => copied.question === shownQuestion() - const isAnswerCopied = () => copied.answer === shownAnswer() const timefmt = createMemo(() => new Intl.DateTimeFormat(i18n.locale(), { timeStyle: "short" })) const numfmt = createMemo(() => new Intl.NumberFormat(i18n.locale())) @@ -111,26 +103,6 @@ export default function SessionBtwPanel(props: { btw: BtwModel; session: Mounted const answerMeta = createMemo(() => [agentLabel(), modelLabel(), durationLabel()].filter(Boolean).join(" \u00B7 ")) - const copyQuestion = () => { - const value = question() - - if (!value) return - void system.copy(value).then( - () => setCopied("question", shownQuestion()), - () => showToast({ title: ctx.t("common.requestFailed") }), - ) - } - - const copy = () => { - const value = answer() - - if (!value) return - void system.copy(value).then( - () => setCopied("answer", shownAnswer()), - () => showToast({ title: ctx.t("common.requestFailed") }), - ) - } - return (
@@ -160,21 +132,11 @@ export default function SessionBtwPanel(props: { btw: BtwModel; session: Mounted - - } - aria-label={isQuestionCopied() ? i18n.t("ui.message.copied") : i18n.t("ui.message.copyMessage")} - onMouseDown={(event) => event.preventDefault()} - onClick={copyQuestion} - /> - +
@@ -211,21 +173,7 @@ export default function SessionBtwPanel(props: { btw: BtwModel; session: Mounted
- - } - aria-label={isAnswerCopied() ? ctx.t("common.copied") : ctx.t("copy")} - onMouseDown={(event) => event.preventDefault()} - onClick={copy} - /> - + {answerMeta()} @@ -241,3 +189,41 @@ export default function SessionBtwPanel(props: { btw: BtwModel; session: Mounted
) } + +function CopyButton(props: { text?: string; label: string; copiedLabel: string }) { + const ctx = usePlugin() + + const system = ctx.system + + return ( + + {(text) => { + const copy = createCopyFeedback({ + write: system.copy, + onError: () => showToast({ title: ctx.t("common.requestFailed") }), + }) + + const label = () => (copy.copied() ? props.copiedLabel : props.label) + + return ( + + } + aria-label={label()} + onMouseDown={(event) => event.preventDefault()} + onClick={() => copy.copy(text)} + /> + + ) + }} + + ) +} diff --git a/packages/gui-plugins/src/file/artifact-view.css b/packages/gui-plugins/src/file/artifact-view.css index f2625006c070..d60610bbb5b3 100644 --- a/packages/gui-plugins/src/file/artifact-view.css +++ b/packages/gui-plugins/src/file/artifact-view.css @@ -315,3 +315,12 @@ img[data-slot="artifact-media"] { padding: 20px 12px; } } + +/* The same marks as the code view's find. */ +::highlight(file-preview-find) { + background-color: rgb(from var(--surface-warning-base) r g b / 0.35); +} + +::highlight(file-preview-find-current) { + background-color: rgb(from var(--surface-warning-strong) r g b / 0.55); +} diff --git a/packages/gui-plugins/src/file/artifact-view.tsx b/packages/gui-plugins/src/file/artifact-view.tsx index 2f3746c44cee..cf1c725fd74a 100644 --- a/packages/gui-plugins/src/file/artifact-view.tsx +++ b/packages/gui-plugins/src/file/artifact-view.tsx @@ -38,6 +38,7 @@ import { import { FileViewer } from "@opencode/plugin/gui/file" import { uuid } from "@opencode/util/uuid" import { ArtifactToolbar } from "./artifact-toolbar" +import { findableHtml } from "./find" import { createArtifactViewerState, createVideoOverlayState, @@ -148,6 +149,7 @@ export default function ArtifactView(props: {
props.content) + const source = createMediaSource(() => (props.kind === "html" ? findableHtml(props.content) : props.content)) // PDF Open Parameters: start with the thumbnail pane closed and the page fitted to the pane width. const src = () => (props.kind === "pdf" ? `${source().src}#navpanes=0&view=FitH` : source().src) @@ -724,6 +726,7 @@ function ArtifactFrame(props: { path: string; content: FileContent; kind: "pdf"