moritzWa · Oct 2, 2026
diff --git a/packages/opencode/src/cli/cmd/attach.ts b/packages/opencode/src/cli/cmd/attach.ts
@@ -32,6 +32,10 @@ export const AttachCommand = cmd({
         type: "boolean",
         describe: "fork the session when continuing (use with --continue or --session)",
       })
+      .option("client", {
+        type: "string",
+        describe: "id that /tui/select-session can target so only this TUI switches sessions",
+      })
       .option("password", {
         alias: ["p"],
         type: "string",
@@ -139,6 +143,7 @@ export const AttachCommand = cmd({
           continue: args.continue,
           sessionID: args.session,
           fork: args.fork,
+          client: args.client,
         },
         directory,
         headers,

diff --git a/packages/opencode/src/cli/cmd/tui.ts b/packages/opencode/src/cli/cmd/tui.ts
@@ -97,6 +97,10 @@ export const TuiThreadCommand = cmd({
         type: "boolean",
         describe: "fork the session when continuing (use with --continue or --session)",
       })
+      .option("client", {
+        type: "string",
+        describe: "id that /tui/select-session can target so only this TUI switches sessions",
+      })
       .option("prompt", {
         type: "string",
         describe: "prompt to use",
@@ -292,6 +296,7 @@ export const TuiThreadCommand = cmd({
               prompt,
               fork: args.fork,
               auto: args.auto || args.yolo || args["dangerously-skip-permissions"],
+              client: args.client,
             },
           }),
         )

diff --git a/packages/opencode/test/server/session-select.test.ts b/packages/opencode/test/server/session-select.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect } from "bun:test"
 import { LayerNode } from "@opencode-ai/core/effect/layer-node"
 import { Effect, Layer } from "effect"
+import { GlobalBus, type GlobalEvent } from "@/bus/global"
 import { Session } from "@/session/session"
 import { TestInstance } from "../fixture/fixture"
 import { testEffect } from "../lib/effect"
@@ -29,6 +30,31 @@ describe("tui.selectSession endpoint", () => {
     { git: true },
   )
 
+  it.instance(
+    "should publish the target client with the select event",
+    () =>
+      Effect.gen(function* () {
+        const tmp = yield* TestInstance
+        const session = yield* Session.use.create({})
+        const seen: unknown[] = []
+        const on = (event: GlobalEvent) => {
+          if (event.payload.type === "tui.session.select") seen.push(event.payload.properties)
+        }
+        GlobalBus.on("event", on)
+        yield* Effect.addFinalizer(() => Effect.sync(() => GlobalBus.off("event", on)))
+
+        const response = yield* requestInDirectory("/tui/select-session", tmp.directory, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ sessionID: session.id, client: "pane-2" }),
+        })
+
+        expect(response.status).toBe(200)
+        expect(seen).toEqual([{ sessionID: session.id, client: "pane-2" }])
+      }),
+    { git: true },
+  )
+
   it.instance(
     "should return 404 when session does not exist",
     () =>

diff --git a/packages/schema/src/tui-event.ts b/packages/schema/src/tui-event.ts
@@ -53,6 +53,11 @@ export const SessionSelect = Event.define({
   type: "tui.session.select",
   schema: {
     sessionID: SessionID.annotate({ description: "Session ID to navigate to" }),
+    client: optional(
+      Schema.String.annotate({
+        description: "Only the TUI started with this --client id navigates. Omit to navigate every attached TUI.",
+      }),
+    ),
   },
 })
 

diff --git a/packages/sdk/js/src/v2/gen/sdk.gen.ts b/packages/sdk/js/src/v2/gen/sdk.gen.ts
@@ -4988,6 +4988,7 @@ export class Tui extends HeyApiClient {
       directory?: string
       workspace?: string
       sessionID?: string
+      client?: string
     },
     options?: Options<never, ThrowOnError>,
   ) {
@@ -4999,6 +5000,7 @@ export class Tui extends HeyApiClient {
             { in: "query", key: "directory" },
             { in: "query", key: "workspace" },
             { in: "body", key: "sessionID" },
+            { in: "body", key: "client" },
           ],
         },
       ],

diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -1449,6 +1449,10 @@ export type GlobalEvent = {
            * Session ID to navigate to
            */
           sessionID: string
+          /**
+           * Only the TUI started with this --client id navigates. Omit to navigate every attached TUI.
+           */
+          client?: string
         }
       }
     | {
@@ -2652,6 +2656,10 @@ export type EventTuiSessionSelect = {
      * Session ID to navigate to
      */
     sessionID: string
+    /**
+     * Only the TUI started with this --client id navigates. Omit to navigate every attached TUI.
+     */
+    client?: string
   }
 }
 
@@ -3016,6 +3024,10 @@ export type EventTuiSessionSelect2 = {
      * Session ID to navigate to
      */
     sessionID: string
+    /**
+     * Only the TUI started with this --client id navigates. Omit to navigate every attached TUI.
+     */
+    client?: string
   }
 }
 
@@ -5831,6 +5843,10 @@ export type TuiSessionSelect = {
      * Session ID to navigate to
      */
     sessionID: string
+    /**
+     * Only the TUI started with this --client id navigates. Omit to navigate every attached TUI.
+     */
+    client?: string
   }
 }
 
@@ -10913,6 +10929,10 @@ export type TuiSelectSessionData = {
      * Session ID to navigate to
      */
     sessionID: string
+    /**
+     * Only the TUI started with this --client id navigates. Omit to navigate every attached TUI.
+     */
+    client?: string
   }
   path?: never
   query?: {

diff --git a/packages/tui/src/app.tsx b/packages/tui/src/app.tsx
@@ -1001,6 +1001,7 @@ function App(props: { onSnapshot?: () => Promise<string[]>; pluginHost: TuiPlugi
 
   event.on("tui.session.select", (evt, { workspace }) => {
     if (workspace !== project.workspace.current()) return
+    if (evt.properties.client !== undefined && evt.properties.client !== args.client) return
     route.navigate({
       type: "session",
       sessionID: evt.properties.sessionID,

diff --git a/packages/tui/src/context/args.tsx b/packages/tui/src/context/args.tsx
@@ -8,6 +8,7 @@ export interface Args {
   sessionID?: string
   fork?: boolean
   auto?: boolean
+  client?: string
 }
 
 export const { use: useArgs, provider: ArgsProvider } = createSimpleContext({