Skip to content

feat(tui): integrate ServerAuth headers into transport configuration for external served TUI thread #29876

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
OpeOginni wants to merge 1 commit into
base: dev
Choose a base branch
from
+7 −4
Open

feat(tui): integrate ServerAuth headers into transport configuration for external served TUI thread #29876

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions packages/opencode/src/cli/cmd/tui/thread.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
sanitizedProcessEnv,
} from "@opencode-ai/core/util/opencode-process"
import { validateSession } from "./validate-session"
import { ServerAuth } from "@/server/auth"

declare global {
const OPENCODE_WORKER_PATH: string
Expand Down Expand Up @@ -193,16 +194,16 @@ export const TuiThreadCommand = cmd({
const external =
process.argv.includes("--port") ||
process.argv.includes("--hostname") ||
process.argv.includes("--mdns") ||
network.mdns ||
network.port !== 0 ||
network.hostname !== "127.0.0.1"
process.argv.includes("--mdns")

const headers = external ? ServerAuth.headers() : undefined

const transport = external
? {
url: (await client.call("server", network)).url,
fetch: undefined,
events: undefined,
headers,
}
: {
url: "http://opencode.internal",
Expand All @@ -216,6 +217,7 @@ export const TuiThreadCommand = cmd({
sessionID: args.session,
directory: cwd,
fetch: transport.fetch,
headers,
})
} catch (error) {
UI.error(errorMessage(error))
Expand All @@ -241,6 +243,7 @@ export const TuiThreadCommand = cmd({
config,
directory: cwd,
fetch: transport.fetch,
headers: transport.headers,
events: transport.events,
args: {
continue: args.continue,
Expand Down
Loading