17994693af
- Add directory parameter to session API calls (session.get, session.todo,
session.status, session.children)
- Improve agent resolver with display name support via agent-display-names
- Add tool execution visibility in event handlers with running/completed
status output
- Enhance poll-for-completion with main session status checking and
stabilization period handling
- Add normalizeSDKResponse import for consistent response handling
- Update types with Todo, ChildSession, and toast-related interfaces
🤖 Generated with OhMyOpenCode assistance
71 lines
2.0 KiB
TypeScript
71 lines
2.0 KiB
TypeScript
import pc from "picocolors"
|
|
import type { OpencodeClient } from "./types"
|
|
import { serializeError } from "./events"
|
|
|
|
const SESSION_CREATE_MAX_RETRIES = 3
|
|
const SESSION_CREATE_RETRY_DELAY_MS = 1000
|
|
|
|
export async function resolveSession(options: {
|
|
client: OpencodeClient
|
|
sessionId?: string
|
|
directory: string
|
|
}): Promise<string> {
|
|
const { client, sessionId, directory } = options
|
|
|
|
if (sessionId) {
|
|
const res = await client.session.get({
|
|
path: { id: sessionId },
|
|
query: { directory },
|
|
})
|
|
if (res.error || !res.data) {
|
|
throw new Error(`Session not found: ${sessionId}`)
|
|
}
|
|
return sessionId
|
|
}
|
|
|
|
for (let attempt = 1; attempt <= SESSION_CREATE_MAX_RETRIES; attempt++) {
|
|
const res = await client.session.create({
|
|
body: {
|
|
title: "oh-my-opencode run",
|
|
// In CLI run mode there's no TUI to answer questions.
|
|
permission: [
|
|
{ permission: "question", action: "deny" as const, pattern: "*" },
|
|
],
|
|
} as any,
|
|
query: { directory },
|
|
})
|
|
|
|
if (res.error) {
|
|
console.error(
|
|
pc.yellow(`Session create attempt ${attempt}/${SESSION_CREATE_MAX_RETRIES} failed:`)
|
|
)
|
|
console.error(pc.dim(` Error: ${serializeError(res.error)}`))
|
|
|
|
if (attempt < SESSION_CREATE_MAX_RETRIES) {
|
|
const delay = SESSION_CREATE_RETRY_DELAY_MS * attempt
|
|
console.log(pc.dim(` Retrying in ${delay}ms...`))
|
|
await new Promise((resolve) => setTimeout(resolve, delay))
|
|
}
|
|
continue
|
|
}
|
|
|
|
if (res.data?.id) {
|
|
return res.data.id
|
|
}
|
|
|
|
console.error(
|
|
pc.yellow(
|
|
`Session create attempt ${attempt}/${SESSION_CREATE_MAX_RETRIES}: No session ID returned`
|
|
)
|
|
)
|
|
|
|
if (attempt < SESSION_CREATE_MAX_RETRIES) {
|
|
const delay = SESSION_CREATE_RETRY_DELAY_MS * attempt
|
|
console.log(pc.dim(` Retrying in ${delay}ms...`))
|
|
await new Promise((resolve) => setTimeout(resolve, delay))
|
|
}
|
|
}
|
|
|
|
throw new Error("Failed to create session after all retries")
|
|
}
|