sync

Author: thdxr

bun.lock

@@ -26,6 +26,7 @@
     "@types/yargs": "17.0.33",
     "typescript": "catalog:",
     "vscode-languageserver-types": "3.17.5",
+    "why-is-node-running": "3.2.2",
     "zod-to-json-schema": "3.24.5"
   },
   "randomField": "added_by_user_request",

packages/opencode/package.json

@@ -2,14 +2,19 @@ import { useDialog } from "@tui/ui/dialog"
 import { DialogSelect } from "@tui/ui/dialog-select"
 import { useRoute } from "@tui/context/route"
 import { useSync } from "@tui/context/sync"
-import { createMemo, onMount } from "solid-js"
+import { createMemo, createSignal, onMount } from "solid-js"
 import { Locale } from "@/util/locale"
 import { Keybind } from "@/util/keybind"
+import { Theme } from "../context/theme"
+import { useSDK } from "../context/sdk"
 
 export function DialogSessionList() {
   const dialog = useDialog()
   const sync = useSync()
   const route = useRoute()
+  const sdk = useSDK()
+
+  const [toDelete, setToDelete] = createSignal<string>()
 
   const options = createMemo(() => {
     const today = new Date().toDateString()
@@ -21,8 +26,10 @@ export function DialogSessionList() {
         if (category === today) {
           category = "Today"
         }
+        const isDeleting = toDelete() === x.id
         return {
-          title: x.title,
+          title: isDeleting ? "Press delete again to confirm" : x.title,
+          bg: isDeleting ? Theme.error : undefined,
           value: x.id,
           category,
           footer: Locale.time(x.time.updated),
@@ -39,6 +46,9 @@ export function DialogSessionList() {
       title="Sessions"
       options={options()}
       limit={50}
+      onMove={() => {
+        setToDelete(undefined)
+      }}
       onSelect={(option) => {
         route.navigate({
           type: "session",
@@ -48,9 +58,20 @@ export function DialogSessionList() {
       }}
       keybind={[
         {
-          keybind: Keybind.parse("del")[0],
+          keybind: Keybind.parse("delete")[0],
           title: "delete",
-          onTrigger: () => {},
+          onTrigger: async (option) => {
+            if (toDelete() === option.value) {
+              sdk.session.delete({
+                path: {
+                  id: option.value,
+                },
+              })
+              setToDelete(undefined)
+              return
+            }
+            setToDelete(option.value)
+          },
         },
       ]}
     />

packages/opencode/src/cli/cmd/tui/component/dialog-session-list.tsx

@@ -44,6 +44,18 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
           case "todo.updated":
             setStore("todo", event.properties.sessionID, event.properties.todos)
             break
+          case "session.deleted": {
+            const result = Binary.search(store.session, event.properties.info.id, (s) => s.id)
+            if (result.found) {
+              setStore(
+                "session",
+                produce((draft) => {
+                  draft.splice(result.index, 1)
+                }),
+              )
+            }
+            break
+          }
           case "session.updated":
             const result = Binary.search(store.session, event.properties.info.id, (s) => s.id)
             if (result.found) {

packages/opencode/src/cli/cmd/tui/context/sync.tsx

@@ -4,6 +4,7 @@ import { useDialog, type DialogContext } from "./dialog"
 import { createStore } from "solid-js/store"
 import { For } from "solid-js"
 import { useKeyboard } from "@opentui/solid"
+import { Locale } from "@/util/locale"
 
 export type DialogConfirmProps = {
   title: string
@@ -51,7 +52,7 @@ export function DialogConfirm(props: DialogConfirmProps) {
                 dialog.clear()
               }}
             >
-              <text fg={key === store.active ? Theme.background : Theme.textMuted}>{key}</text>
+              <text fg={key === store.active ? Theme.background : Theme.textMuted}>{Locale.titlecase(key)}</text>
             </box>
           )}
         </For>

packages/opencode/src/cli/cmd/tui/ui/dialog-confirm.tsx

@@ -13,6 +13,7 @@ import { Keybind } from "@/util/keybind"
 export interface DialogSelectProps<T> {
   title: string
   options: DialogSelectOption<T>[]
+  onMove?: (option: DialogSelectOption<T>) => void
   onFilter?: (query: string) => void
   onSelect?: (option: DialogSelectOption<T>) => void
   keybind?: {
@@ -31,6 +32,7 @@ export interface DialogSelectOption<T = any> {
   footer?: string
   category?: string
   disabled?: boolean
+  bg?: string
   onSelect?: (ctx: DialogContext) => void
 }
 
@@ -87,6 +89,7 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
 
   function moveTo(next: number) {
     setStore("selected", next)
+    props.onMove?.(selected()!)
     const target = scroll.getChildren().find((child) => {
       return child.id === JSON.stringify(selected()?.value)
     })
@@ -117,7 +120,8 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
 
     for (const item of props.keybind ?? []) {
       if (Keybind.match(item.keybind, keybind.parse(evt))) {
-        item.onTrigger(selected())
+        const s = selected()
+        if (s) item.onTrigger(s)
       }
     }
   })
@@ -183,7 +187,7 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
                         if (index === -1) return
                         moveTo(index)
                       }}
-                      backgroundColor={active() ? Theme.primary : RGBA.fromInts(0, 0, 0, 0)}
+                      backgroundColor={active() ? (option.bg ?? Theme.primary) : RGBA.fromInts(0, 0, 0, 0)}
                       paddingLeft={1}
                       paddingRight={1}
                     >

packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx

@@ -124,7 +124,7 @@ export function DialogProvider(props: ParentProps) {
       <box position="absolute">
         <For each={value.stack}>
           {(item, index) => (
-            <Show when={index() === 0}>
+            <Show when={index() === value.stack.length - 1}>
               <Dialog size={value.size}>{item.element}</Dialog>
             </Show>
           )}

packages/opencode/src/cli/cmd/tui/ui/dialog.tsx

@@ -242,12 +242,12 @@ export namespace Session {
     return result
   }
 
-  export async function remove(sessionID: string, emitEvent = true) {
+  export async function remove(sessionID: string) {
     const project = Instance.project
     try {
       const session = await get(sessionID)
       for (const child of await children(sessionID)) {
-        await remove(child.id, false)
+        await remove(child.id)
       }
       await unshare(sessionID).catch(() => {})
       for (const msg of await Storage.list(["message", sessionID])) {
@@ -257,11 +257,9 @@ export namespace Session {
         await Storage.remove(msg)
       }
       await Storage.remove(["session", project.id, sessionID])
-      if (emitEvent) {
-        Bus.publish(Event.Deleted, {
-          info: session,
-        })
-      }
+      Bus.publish(Event.Deleted, {
+        info: session,
+      })
     } catch (e) {
       log.error(e)
     }

packages/opencode/src/session/index.ts

@@ -1,6 +1,8 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { createSseClient } from "../core/serverSentEvents.gen.js"
+import type { HttpMethod } from "../core/types.gen.js"
+import { getValidRequestBody } from "../core/utils.gen.js"
 import type { Client, Config, RequestOptions, ResolvedRequestOptions } from "./types.gen.js"
 import {
   buildUrl,
@@ -49,12 +51,12 @@ export const createClient = (config: Config = {}): Client => {
       await opts.requestValidator(opts)
     }
 
-    if (opts.body && opts.bodySerializer) {
+    if (opts.body !== undefined && opts.bodySerializer) {
       opts.serializedBody = opts.bodySerializer(opts.body)
     }
 
     // remove Content-Type header if body is empty to avoid sending invalid requests
-    if (opts.serializedBody === undefined || opts.serializedBody === "") {
+    if (opts.body === undefined || opts.serializedBody === "") {
       opts.headers.delete("Content-Type")
     }
 
@@ -69,7 +71,7 @@ export const createClient = (config: Config = {}): Client => {
     const requestInit: ReqInit = {
       redirect: "follow",
       ...opts,
-      body: opts.serializedBody,
+      body: getValidRequestBody(opts),
     }
 
     let request = new Request(url, requestInit)
@@ -97,18 +99,36 @@ export const createClient = (config: Config = {}): Client => {
     }
 
     if (response.ok) {
+      const parseAs =
+        (opts.parseAs === "auto" ? getParseAs(response.headers.get("Content-Type")) : opts.parseAs) ?? "json"
+
       if (response.status === 204 || response.headers.get("Content-Length") === "0") {
+        let emptyData: any
+        switch (parseAs) {
+          case "arrayBuffer":
+          case "blob":
+          case "text":
+            emptyData = await response[parseAs]()
+            break
+          case "formData":
+            emptyData = new FormData()
+            break
+          case "stream":
+            emptyData = response.body
+            break
+          case "json":
+          default:
+            emptyData = {}
+            break
+        }
         return opts.responseStyle === "data"
-          ? {}
+          ? emptyData
           : {
-              data: {},
+              data: emptyData,
               ...result,
             }
       }
 
-      const parseAs =
-        (opts.parseAs === "auto" ? getParseAs(response.headers.get("Content-Type")) : opts.parseAs) ?? "json"
-
       let data: any
       switch (parseAs) {
         case "arrayBuffer":
@@ -178,35 +198,53 @@ export const createClient = (config: Config = {}): Client => {
         }
   }
 
-  const makeMethod = (method: Required<Config>["method"]) => {
-    const fn = (options: RequestOptions) => request({ ...options, method })
-    fn.sse = async (options: RequestOptions) => {
-      const { opts, url } = await beforeRequest(options)
-      return createSseClient({
-        ...opts,
-        body: opts.body as BodyInit | null | undefined,
-        headers: opts.headers as unknown as Record<string, string>,
-        method,
-        url,
-      })
-    }
-    return fn
+  const makeMethodFn = (method: Uppercase<HttpMethod>) => (options: RequestOptions) => request({ ...options, method })
+
+  const makeSseFn = (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+    const { opts, url } = await beforeRequest(options)
+    return createSseClient({
+      ...opts,
+      body: opts.body as BodyInit | null | undefined,
+      headers: opts.headers as unknown as Record<string, string>,
+      method,
+      onRequest: async (url, init) => {
+        let request = new Request(url, init)
+        for (const fn of interceptors.request._fns) {
+          if (fn) {
+            request = await fn(request, opts)
+          }
+        }
+        return request
+      },
+      url,
+    })
   }
 
   return {
     buildUrl,
-    connect: makeMethod("CONNECT"),
-    delete: makeMethod("DELETE"),
-    get: makeMethod("GET"),
+    connect: makeMethodFn("CONNECT"),
+    delete: makeMethodFn("DELETE"),
+    get: makeMethodFn("GET"),
     getConfig,
-    head: makeMethod("HEAD"),
+    head: makeMethodFn("HEAD"),
     interceptors,
-    options: makeMethod("OPTIONS"),
-    patch: makeMethod("PATCH"),
-    post: makeMethod("POST"),
-    put: makeMethod("PUT"),
+    options: makeMethodFn("OPTIONS"),
+    patch: makeMethodFn("PATCH"),
+    post: makeMethodFn("POST"),
+    put: makeMethodFn("PUT"),
     request,
     setConfig,
-    trace: makeMethod("TRACE"),
+    sse: {
+      connect: makeSseFn("CONNECT"),
+      delete: makeSseFn("DELETE"),
+      get: makeSseFn("GET"),
+      head: makeSseFn("HEAD"),
+      options: makeSseFn("OPTIONS"),
+      patch: makeSseFn("PATCH"),
+      post: makeSseFn("POST"),
+      put: makeSseFn("PUT"),
+      trace: makeSseFn("TRACE"),
+    },
+    trace: makeMethodFn("TRACE"),
   } as Client
 }