@@ -8,7 +8,7 @@ import { errorMessage } from "@opencode-ai/tui/util/error"
88import { withTimeout } from "@/util/timeout"
99import { withNetworkOptions , resolveNetworkOptionsNoConfig , hasArg } from "@/cli/network"
1010import { Filesystem } from "@/util/filesystem"
11- import type { GlobalEvent } from "@opencode-ai/sdk/v2"
11+ import { createOpencodeClient , type GlobalEvent } from "@opencode-ai/sdk/v2"
1212import type { EventSource } from "@opencode-ai/tui/context/sdk"
1313import { writeHeapSnapshot } from "v8"
1414import { ServerAuth } from "@/server/auth"
@@ -69,6 +69,17 @@ export function resolveThreadDirectory(project?: string, envPWD = process.env.PW
6969 return Filesystem . resolve ( cwd )
7070}
7171
72+ export async function resolveStartupSession ( input : {
73+ sessionID ?: string
74+ continue ?: boolean
75+ prompt ?: string
76+ create : ( ) => Promise < string >
77+ } ) {
78+ if ( input . sessionID ) return input . sessionID
79+ if ( input . continue || input . prompt ) return
80+ return input . create ( )
81+ }
82+
7283export const TuiThreadCommand = cmd ( {
7384 command : "$0 [project]" ,
7485 describe : "start opencode tui" ,
@@ -248,10 +259,26 @@ export const TuiThreadCommand = cmd({
248259 events : createEventSource ( client ) ,
249260 }
250261
262+ const sessionID = await resolveStartupSession ( {
263+ sessionID : args . session ,
264+ continue : args . continue ,
265+ prompt,
266+ create : async ( ) => {
267+ const result = await createOpencodeClient ( {
268+ baseUrl : transport . url ,
269+ directory : cwd ,
270+ fetch : transport . fetch ,
271+ headers : transport . headers ,
272+ } ) . session . create ( { directory : cwd } , { throwOnError : true } )
273+ if ( ! result . data ?. id ) throw new Error ( "Failed to create startup session" )
274+ return result . data . id
275+ } ,
276+ } )
277+
251278 try {
252279 await validateSession ( {
253280 url : transport . url ,
254- sessionID : args . session ,
281+ sessionID,
255282 directory : cwd ,
256283 fetch : transport . fetch ,
257284 headers,
@@ -286,7 +313,7 @@ export const TuiThreadCommand = cmd({
286313 events : transport . events ,
287314 args : {
288315 continue : args . continue ,
289- sessionID : args . session ,
316+ sessionID,
290317 agent : args . agent ,
291318 model : args . model ,
292319 prompt,
0 commit comments