@mirrowel/opencode-openshare 0.1.1 → 0.2.0-dev.1

package/src/dialogs.tsx

@@ -576,6 +576,32 @@ export function MenuDialog<Value>(props: {
   )
 }
 
+/** Guard against stacked plugin dialogs. `dialog.replace` is documented as
+ * an atomic swap, but on some host builds a second replace while a dialog is
+ * still pending leaves BOTH renderers mounted - the reader sees two menus
+ * with two highlighted rows and keys go to a stale layer ("/share does
+ * nothing"). Cancelling the pending dialog and clearing before the next
+ * replace keeps exactly one dialog alive. The normal single-dialog path is
+ * untouched, so the esc-to-parent flicker fix stays intact. */
+let pendingDialog: (() => void) | undefined
+function claimDialog(api: TuiPluginApi): () => void {
+  if (pendingDialog) {
+    try {
+      pendingDialog()
+    } catch {}
+    try {
+      api.ui.dialog.clear()
+    } catch {}
+  }
+  let released = false
+  const release = () => {
+    if (released) return
+    released = true
+    if (pendingDialog === release) pendingDialog = undefined
+  }
+  pendingDialog = release
+  return release
+}
 /** showMenuOnce, family discipline with the flicker fix (2026-10-19):
  * done() does NOT clear the host stack — the next dialog's replace() is an
  * atomic swap, so clearing first paints one empty frame (the esc-to-parent
@@ -584,9 +610,11 @@ export function MenuDialog<Value>(props: {
 export function showMenuOnce<Value>(api: TuiPluginApi, props: { title: string; options: MenuOption<Value>[]; current?: Value; hint?: string }): Promise<Value | undefined> {
   return new Promise((resolve) => {
     let settled = false
+    const release = claimDialog(api)
     const done = (value: Value | undefined, _clear = false) => {
       if (settled) return
       settled = true
+      release()
       dbgLog(`menu(${props.title}) -> ${value === undefined ? "cancel" : String(value)}`)
       resolve(value)
     }
@@ -610,9 +638,11 @@ export type DialogAction = { title: string; value: string; key?: string; danger?
 export function showInfoDialog(api: TuiPluginApi, props: { title: string; message: string; actions?: DialogAction[] }): Promise<string | undefined> {
   return new Promise((resolve) => {
     let settled = false
+    const release = claimDialog(api)
     const done = (value: string | undefined) => {
       if (settled) return
       settled = true
+      release()
       resolve(value)
     }
     api.ui.dialog.replace(
@@ -799,9 +829,11 @@ export function PromptDialog(props: {
 export function showPromptOnce(api: TuiPluginApi, props: { title: string; placeholder?: string; value?: string }): Promise<string | undefined> {
   return new Promise((resolve) => {
     let settled = false
+    const release = claimDialog(api)
     const done = (value: string | undefined, _clear = false) => {
       if (settled) return
       settled = true
+      release()
       dbgLog(`prompt(${props.title}) -> ${value === undefined ? "cancel" : `len=${value.length}`}`)
       resolve(value)
     }
@@ -829,9 +861,11 @@ export type SizePickerResult = { width: DialogWidth; heightPercent: number }
 export function showSizePickerOnce(api: TuiPluginApi, current: SizePickerResult): Promise<SizePickerResult | undefined> {
   return new Promise((resolve) => {
     let settled = false
+    const release = claimDialog(api)
     const done = (value: SizePickerResult | undefined) => {
       if (settled) return
       settled = true
+      release()
       resolve(value)
     }
     api.ui.dialog.replace(

package/src/sidebar.tsx

@@ -28,12 +28,6 @@ import type { JSX } from "@opentui/solid"
 import { bindingsOf, bindingOf, verifyShare } from "./share-flow.js"
 import type { TuiPluginApi, TuiSlotContext } from "@opencode-ai/plugin/tui"
 import type { Session } from "@opencode-ai/sdk/v2"
-import { appendFileSync } from "node:fs"
-import { tmpdir } from "node:os"
-import { join } from "node:path"
-
-const DBG_FILE = join(tmpdir(), "openshare-tui-debug.log")
-
 /** value -> `kind:preview` so the log shows TYPES (the crash was a type bug) */
 export function dbg(v: unknown, depth = 0): string {
   const t = typeof v
@@ -69,13 +63,9 @@ function dbgEl(el: unknown, depth = 0): string {
   }
 }
 
-export function dbgLog(line: string): void {
-  try {
-    appendFileSync(DBG_FILE, `${new Date().toISOString()} ${line}\n`)
-  } catch {}
-}
-
-let renderSeq = 0
+/** no-op: the TUI debug log file was a crash-hunt aid and must not write
+ * to temp any more (owner request 2026-10-21) */
+export function dbgLog(_line: string): void {}
 
 /** Share liveness cache for the chip: a binding can claim "shared" long
  * after the page died server-side (purge/TTL/delete with no event ever
@@ -102,13 +92,10 @@ type SidebarTitleProps = {
 }
 
 export function createSidebarSlot(api: TuiPluginApi, opts?: { onShareCommand?: () => void }) {
-  dbgLog(`createSidebarSlot called; api.state=${!!api.state} api.theme=${!!api.theme} api.version=${dbg(api.app?.version)}`)
   return {
     slots: {
       sidebar_title: (ctx: TuiSlotContext, props: SidebarTitleProps): JSX.Element => {
-        const seq = ++renderSeq
         try {
-          dbgLog(`render#${seq} ctx=${dbg(ctx)} props=${dbg(props)}`)
           const sid = typeof props?.session_id === "string" ? props.session_id : ""
           const title = String(props?.title ?? "") || "Session"
           const session = sid ? api.state.session.get(sid) : undefined
@@ -122,9 +109,7 @@ export function createSidebarSlot(api: TuiPluginApi, opts?: { onShareCommand?: (
           const anyGone = verdicts.some((v) => v?.status === "gone")
           const multi = liveCount > 1 ? `·${liveCount} ` : ""
           const theme = ctx?.theme?.current ?? api.theme.current
-          dbgLog(
-            `render#${seq} sid=${dbg(sid)} title=${dbg(title)} session=${session ? "found" : "MISSING"} binding=${binding ? `id=${dbg(binding.id)} enabled=${dbg(binding.enabled)}` : "none"} status=${dbg(status)} theme=${dbg(theme)}`,
-          )
+
           // chip on its own line under the title (takes the blank line that
           // separated the title block from the context blocks); clicking it
           // copies the share link — proven pattern: onMouseDown on a box.
@@ -175,10 +160,8 @@ export function createSidebarSlot(api: TuiPluginApi, opts?: { onShareCommand?: (
               ) : null}
             </box>
           )
-          dbgLog(`render#${seq} RETURNS ${dbgEl(el)}`)
           return el
         } catch (error) {
-          dbgLog(`render#${seq} THREW ${(error as Error)?.stack ?? dbg(error)} — rethrowing`)
           throw error
         }
       },

package/src/v2-server.ts

@@ -74,114 +74,10 @@ type V2Context = {
   signal?: AbortSignal
 }
 
-// --- v2 message -> v1 items ---------------------------------------------------
-
-function toolContentText(content: unknown): string {
-  if (typeof content === "string") return content
-  if (Array.isArray(content)) {
-    return content
-      .map((item) => {
-        if (typeof item === "string") return item
-        if (item && typeof item === "object") {
-          const record = item as Record<string, unknown>
-          if (typeof record.text === "string") return record.text
-        }
-        return ""
-      })
-      .join("")
-  }
-  return ""
-}
-
-function convertToolState(state: unknown): Record<string, unknown> {
-  if (!state || typeof state !== "object") return { status: "pending" }
-  const record = state as Record<string, unknown>
-  const status = String(record.status ?? "pending")
-  const mapped: Record<string, unknown> = {}
-  if (status === "streaming" || status === "running") mapped.status = "running"
-  else if (status === "completed") mapped.status = "completed"
-  else if (status === "failed" || status === "error") mapped.status = "error"
-  else mapped.status = "pending"
-  if (record.input !== undefined) mapped.input = record.input
-  if (record.output !== undefined) mapped.output = toolContentText(record.output)
-  if (record.error !== undefined) mapped.error = record.error
-  if (record.time !== undefined) mapped.time = record.time
-  return mapped
-}
-
-/** v2 flat message -> { info, parts } in the v1 shapes the viewer speaks. */
-export function convertV2Message(message: V2Message, sessionID: string): { info: MessageInfo; parts: PartInfo[] } | undefined {
-  if (!message || typeof message.id !== "string") return undefined
-  const base = {
-    id: message.id,
-    sessionID,
-  }
-  if (message.type === "user") {
-    return {
-      info: {
-        ...base,
-        role: "user",
-        time: { created: message.time?.created ?? 0 },
-        text: message.text ?? "",
-      },
-      parts: [],
-    }
-  }
-  if (message.type === "assistant") {
-    const parts: PartInfo[] = []
-    const content = Array.isArray(message.content) ? message.content : []
-    content.forEach((block, index) => {
-      const record = block as Record<string, unknown>
-      const kind = String(record.type ?? "")
-      if (kind === "text") {
-        parts.push({
-          id: `${message.id}_t${index}`,
-          messageID: message.id,
-          sessionID,
-          type: "text",
-          text: String(record.text ?? ""),
-          synthetic: false,
-          time: { start: message.time?.created ?? 0, end: message.time?.completed ?? 0 },
-        })
-      } else if (kind === "reasoning") {
-        parts.push({
-          id: `${message.id}_r${index}`,
-          messageID: message.id,
-          sessionID,
-          type: "reasoning",
-          text: String(record.text ?? ""),
-          synthetic: false,
-          time: { start: message.time?.created ?? 0, end: message.time?.completed ?? 0 },
-        })
-      } else if (kind === "tool") {
-        parts.push({
-          id: String(record.id ?? `${message.id}_tool${index}`),
-          messageID: message.id,
-          sessionID,
-          type: "tool",
-          tool: String(record.name ?? "unknown"),
-          state: convertToolState(record.state),
-          synthetic: false,
-        })
-      }
-    })
-    return {
-      info: {
-        ...base,
-        role: "assistant",
-        agent: message.agent,
-        model: message.model
-          ? { providerID: message.model.providerID, modelID: message.model.modelID ?? message.model.id }
-          : undefined,
-        time: { created: message.time?.created ?? 0, completed: message.time?.completed ?? 0 },
-      },
-      parts,
-    }
-  }
-  return undefined
-}
-
 // --- v2 client -> engine ClientApi ---------------------------------------------
+// Contract v2: messages pass through VERBATIM as v2 session messages (the
+// engine's ingestion detects v2-native shapes and enqueues them directly —
+// no v1 conversion, no dropped compaction, no dropped user text).
 
 function adaptSessionClient(session: V2SessionClient | undefined, message: V2MessageClient | undefined, directory: string | undefined): ClientApi | undefined {
   if (!session) return undefined
@@ -203,7 +99,7 @@ function adaptSessionClient(session: V2SessionClient | undefined, message: V2Mes
 
   const listMessages = async (sessionID: string) => {
     if (!message) return []
-    const out: Array<{ info: MessageInfo; parts: PartInfo[] }> = []
+    const out: Array<{ info: unknown; parts: unknown[] }> = []
     let cursor: string | undefined
     for (let page = 0; page < 50; page++) {
       const res = (await message.list({ sessionID, limit: 100, cursor })) as
@@ -212,8 +108,9 @@ function adaptSessionClient(session: V2SessionClient | undefined, message: V2Mes
       const data = res?.data
       if (!Array.isArray(data)) break
       for (const raw of data) {
-        const converted = convertV2Message(raw, sessionID)
-        if (converted) out.push(converted)
+        if (raw && typeof raw === "object" && typeof (raw as { id?: unknown }).id === "string") {
+          out.push({ info: raw, parts: [] })
+        }
       }
       const next = res?.cursor?.next ?? undefined
       if (!next || data.length === 0) break