codeblog-app 2.2.6 → 2.3.1

package/src/tui/routes/setup.tsx

@@ -10,12 +10,22 @@ const HC = {
   dim: "#999999",
 }
 
+function resolveThemeDef(name: string) {
+  const fallback = THEMES.codeblog ?? Object.values(THEMES).find(Boolean)
+  if (!fallback) {
+    throw new Error("No themes available")
+  }
+  return THEMES[name] ?? fallback
+}
+
 export function ThemeSetup() {
   const theme = useTheme()
   const modes = ["dark", "light"] as const
   const [step, setStep] = createSignal<"mode" | "theme">("mode")
   const [modeIdx, setModeIdx] = createSignal(0)
   const [themeIdx, setThemeIdx] = createSignal(0)
+  const getThemeName = (index: number) => THEME_NAMES[index] ?? "codeblog"
+  const getThemeColors = (name: string) => resolveThemeDef(name)[theme.mode]
 
   useKeyboard((evt) => {
     if (step() === "mode") {
@@ -30,7 +40,7 @@ export function ThemeSetup() {
         return
       }
       if (evt.name === "return") {
-        theme.setMode(modes[modeIdx()])
+        theme.setMode(modes[modeIdx()] ?? "dark")
         setStep("theme")
         evt.preventDefault()
         return
@@ -41,14 +51,14 @@ export function ThemeSetup() {
       if (evt.name === "up" || evt.name === "k") {
         const next = (themeIdx() - 1 + THEME_NAMES.length) % THEME_NAMES.length
         setThemeIdx(next)
-        theme.set(THEME_NAMES[next])
+        theme.set(getThemeName(next))
         evt.preventDefault()
         return
       }
       if (evt.name === "down" || evt.name === "j") {
         const next = (themeIdx() + 1) % THEME_NAMES.length
         setThemeIdx(next)
-        theme.set(THEME_NAMES[next])
+        theme.set(getThemeName(next))
         evt.preventDefault()
         return
       }
@@ -104,7 +114,7 @@ export function ThemeSetup() {
           </text>
           <box height={1} />
           {THEME_NAMES.map((name, i) => {
-            const c = THEMES[name][theme.mode]
+            const c = getThemeColors(name)
             return (
               <box flexDirection="row" paddingLeft={2}>
                 <text fg={themeIdx() === i ? c.primary : theme.colors.textMuted}>
@@ -136,22 +146,24 @@ export function ThemeSetup() {
 
 export function ThemePicker(props: { onDone: () => void }) {
   const theme = useTheme()
-  const [idx, setIdx] = createSignal(THEME_NAMES.indexOf(theme.name))
+  const [idx, setIdx] = createSignal(Math.max(0, THEME_NAMES.indexOf(theme.name)))
   const [tab, setTab] = createSignal<"theme" | "mode">("theme")
+  const getThemeName = (index: number) => THEME_NAMES[index] ?? "codeblog"
+  const getThemeColors = (name: string) => resolveThemeDef(name)[theme.mode]
 
   useKeyboard((evt) => {
     if (tab() === "theme") {
       if (evt.name === "up" || evt.name === "k") {
         const next = (idx() - 1 + THEME_NAMES.length) % THEME_NAMES.length
         setIdx(next)
-        theme.set(THEME_NAMES[next])
+        theme.set(getThemeName(next))
         evt.preventDefault()
         return
       }
       if (evt.name === "down" || evt.name === "j") {
         const next = (idx() + 1) % THEME_NAMES.length
         setIdx(next)
-        theme.set(THEME_NAMES[next])
+        theme.set(getThemeName(next))
         evt.preventDefault()
         return
       }
@@ -204,7 +216,7 @@ export function ThemePicker(props: { onDone: () => void }) {
           </text>
           <box height={1} />
           {THEME_NAMES.map((name, i) => {
-            const c = THEMES[name][theme.mode]
+            const c = getThemeColors(name)
             return (
               <box flexDirection="row">
                 <text fg={idx() === i ? c.primary : theme.colors.textMuted}>

package/src/tui/stream-assembler.ts

@@ -0,0 +1,49 @@
+export class TuiStreamAssembler {
+  private text = ""
+  private finished = false
+  private lastSeq = 0
+
+  reset() {
+    this.text = ""
+    this.finished = false
+    this.lastSeq = 0
+  }
+
+  getText() {
+    return this.text
+  }
+
+  pushDelta(delta: string, seq?: number) {
+    if (!delta || this.finished) return this.text
+    if (seq !== undefined && seq <= this.lastSeq) return this.text
+    if (seq !== undefined) this.lastSeq = seq
+
+    this.text += delta
+    return this.text
+  }
+
+  pushFinal(finalText: string) {
+    if (!finalText) {
+      this.finished = true
+      return this.text
+    }
+
+    if (!this.text) {
+      this.text = finalText
+      this.finished = true
+      return this.text
+    }
+
+    if (finalText.length >= this.text.length && finalText.includes(this.text)) {
+      this.text = finalText
+      this.finished = true
+      return this.text
+    }
+
+    if (finalText.length > this.text.length) {
+      this.text = finalText
+    }
+    this.finished = true
+    return this.text
+  }
+}

package/src/util/log.ts

@@ -52,9 +52,11 @@ export namespace Log {
     if (options.level) level = options.level
     cleanup(Global.Path.log)
     if (options.print) return
+    const isoNow = new Date().toISOString()
+    const timestampBase = isoNow.split(".")[0] ?? isoNow
     logpath = path.join(
       Global.Path.log,
-      options.dev ? "dev.log" : new Date().toISOString().split(".")[0].replace(/:/g, "") + ".log",
+      options.dev ? "dev.log" : `${timestampBase.replace(/:/g, "")}.log`,
     )
     const logfile = Bun.file(logpath)
     await fs.truncate(logpath).catch(() => {})

package/tsconfig.json

@@ -3,7 +3,7 @@
   "extends": "@tsconfig/bun/tsconfig.json",
   "compilerOptions": {
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
+    "jsxImportSource": "@opentui/solid",
     "paths": {
       "@/*": ["./src/*"]
     }