saeeol 1.2.1 → 1.2.3

package/src/cli/cmd/tui/context/theme.tsx

@@ -1,307 +1 @@
-import { CliRenderEvents, type TerminalColors } from "@opentui/core"
-import path from "path"
-import { createEffect, createMemo, onCleanup, onMount } from "solid-js"
-import { createSimpleContext } from "./helper"
-import { Glob } from "@saeeol/core/util/glob"
-import { useKV } from "./kv"
-import { useRenderer } from "@opentui/solid"
-import { createStore, produce } from "solid-js/store"
-import { Global } from "@saeeol/core/global"
-import { Filesystem } from "@/util/filesystem"
-import { useTuiConfig } from "./tui-config"
-import { isRecord } from "@/util/record"
-import { selectedForeground, tint } from "./theme/theme-types"
-import type { ThemeJson, Theme } from "./theme/theme-types"
-import { DEFAULT_THEMES, isValidTheme } from "./theme/theme-themes"
-import { resolveTheme } from "./theme/theme-resolve"
-import { generateSystem } from "./theme/theme-system"
-import { generateSyntax, generateSubtleSyntax } from "./theme/theme-syntax"
-
-export { selectedForeground, tint }
-export type { ThemeJson }
-export { DEFAULT_THEMES }
-export { resolveTheme }
-
-type State = {
-  themes: Record<string, ThemeJson>
-  mode: "dark" | "light"
-  lock: "dark" | "light" | undefined
-  active: string
-  ready: boolean
-}
-
-const pluginThemes: Record<string, ThemeJson> = {}
-let customThemes: Record<string, ThemeJson> = {}
-let systemTheme: ThemeJson | undefined
-
-function listThemes() {
-  const themes = {
-    ...DEFAULT_THEMES,
-    ...pluginThemes,
-    ...customThemes,
-  }
-  if (!systemTheme) return themes
-  return {
-    ...themes,
-    system: systemTheme,
-  }
-}
-
-function syncThemes() {
-  setStore("themes", listThemes())
-}
-
-const [store, setStore] = createStore<State>({
-  themes: listThemes(),
-  mode: "dark",
-  lock: undefined,
-  active: "saeeol",
-  ready: false,
-})
-
-export function allThemes() {
-  return store.themes
-}
-
-function isTheme(theme: unknown): theme is ThemeJson {
-  if (!isRecord(theme)) return false
-  if (!isRecord(theme.theme)) return false
-  return true
-}
-
-export function hasTheme(name: string) {
-  if (!name) return false
-  return allThemes()[name] !== undefined
-}
-
-export function addTheme(name: string, theme: unknown) {
-  if (!name) return false
-  if (!isTheme(theme)) return false
-  if (hasTheme(name)) return false
-  pluginThemes[name] = theme
-  syncThemes()
-  return true
-}
-
-export function upsertTheme(name: string, theme: unknown) {
-  if (!name) return false
-  if (!isTheme(theme)) return false
-  if (customThemes[name] !== undefined) {
-    customThemes[name] = theme
-  } else {
-    pluginThemes[name] = theme
-  }
-  syncThemes()
-  return true
-}
-
-export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
-  name: "Theme",
-  init: (props: { mode: "dark" | "light" }) => {
-    const renderer = useRenderer()
-    const config = useTuiConfig()
-    const kv = useKV()
-    const pick = (value: unknown) => {
-      if (value === "dark" || value === "light") return value
-      return
-    }
-
-    setStore(
-      produce((draft) => {
-        const lock = pick(kv.get("theme_mode_lock"))
-        const mode = lock ?? pick(renderer.themeMode) ?? props.mode
-        if (!lock && pick(kv.get("theme_mode")) !== undefined) {
-          kv.set("theme_mode", undefined)
-        }
-        draft.mode = mode
-        draft.lock = lock
-        const active = config.theme ?? kv.get("theme", "saeeol")
-        draft.active = typeof active === "string" ? active : "saeeol"
-        draft.ready = false
-      }),
-    )
-
-    createEffect(() => {
-      const theme = config.theme
-      if (theme) setStore("active", theme)
-    })
-
-    function init() {
-      void Promise.allSettled([
-        resolveSystemTheme(store.mode),
-        getCustomThemes()
-          .then((custom) => {
-            customThemes = custom
-            syncThemes()
-          })
-          .catch(() => {
-            setStore("active", "saeeol")
-          }),
-      ]).finally(() => {
-        setStore("ready", true)
-      })
-    }
-
-    onMount(init)
-
-    function resolveSystemTheme(mode: "dark" | "light" = store.mode) {
-      return renderer
-        .getPalette({
-          size: 16,
-        })
-        .then((colors: TerminalColors) => {
-          if (!colors.palette[0]) {
-            systemTheme = undefined
-            syncThemes()
-            if (store.active === "system") {
-              setStore("active", "saeeol")
-            }
-            return
-          }
-          systemTheme = generateSystem(colors, mode)
-          syncThemes()
-        })
-        .catch(() => {
-          systemTheme = undefined
-          syncThemes()
-          if (store.active === "system") {
-            setStore("active", "saeeol")
-          }
-        })
-    }
-
-    function apply(mode: "dark" | "light") {
-      if (store.lock !== undefined) kv.set("theme_mode", mode)
-      if (store.mode === mode) return
-      setStore("mode", mode)
-      renderer.clearPaletteCache()
-      void resolveSystemTheme(mode)
-    }
-
-    function pin(mode: "dark" | "light" = store.mode) {
-      setStore("lock", mode)
-      kv.set("theme_mode_lock", mode)
-      apply(mode)
-    }
-
-    function free() {
-      setStore("lock", undefined)
-      kv.set("theme_mode_lock", undefined)
-      kv.set("theme_mode", undefined)
-      const mode = renderer.themeMode
-      if (mode) apply(mode)
-    }
-
-    const handle = (mode: "dark" | "light") => {
-      if (store.lock) return
-      apply(mode)
-    }
-    renderer.on(CliRenderEvents.THEME_MODE, handle)
-
-    const refresh = () => {
-      renderer.clearPaletteCache()
-      init()
-    }
-    process.on("SIGUSR2", refresh)
-
-    onCleanup(() => {
-      renderer.off(CliRenderEvents.THEME_MODE, handle)
-      process.off("SIGUSR2", refresh)
-    })
-    const values = createMemo(() => {
-      const active = store.themes[store.active]
-      if (active) {
-        return resolveTheme(active, store.mode)
-      }
-
-      const saved = kv.get("theme")
-      if (typeof saved === "string") {
-        const theme = store.themes[saved]
-        if (theme) {
-          return resolveTheme(theme, store.mode)
-        }
-      }
-
-      return resolveTheme(store.themes.saeeol, store.mode)
-    })
-
-    createEffect(() => {
-      renderer.setBackgroundColor(values().background)
-    })
-
-    const syntax = createMemo(() => generateSyntax(values()))
-    const subtleSyntax = createMemo(() => generateSubtleSyntax(values()))
-    return {
-      theme: new Proxy({} as Theme, {
-        get(_target, prop) {
-          // @ts-expect-error
-          return values()[prop]
-        },
-      }),
-      get selected() {
-        return store.active
-      },
-      all() {
-        return allThemes()
-      },
-      has(name: string) {
-        return hasTheme(name)
-      },
-      syntax,
-      subtleSyntax,
-      mode() {
-        return store.mode
-      },
-      locked() {
-        return store.lock !== undefined
-      },
-      lock() {
-        pin(store.mode)
-      },
-      unlock() {
-        free()
-      },
-      setMode(mode: "dark" | "light") {
-        pin(mode)
-      },
-      set(theme: string) {
-        if (!hasTheme(theme)) return false
-        setStore("active", theme)
-        kv.set("theme", theme)
-        return true
-      },
-      get ready() {
-        return store.ready
-      },
-    }
-  },
-})
-
-async function getCustomThemes() {
-  const directories = [
-    Global.Path.config,
-    ...(await Array.fromAsync(
-      Filesystem.up({
-        targets: [".saeeol", ".saeeol"],
-        start: process.cwd(),
-      }),
-    )),
-  ]
-
-  const result: Record<string, ThemeJson> = {}
-  for (const dir of directories) {
-    for (const item of await Glob.scan("themes/*.json", {
-      cwd: dir,
-      absolute: true,
-      dot: true,
-      symlink: true,
-    })) {
-      const name = path.basename(item, ".json")
-      if (name in DEFAULT_THEMES) continue
-      const json = await Filesystem.readJson(item).catch(() => null)
-      if (!isValidTheme(json)) continue
-      result[name] = json
-    }
-  }
-  return result
-}
+export * from "./app/theme"

package/src/cli/cmd/tui/context/tui-config.tsx

@@ -1,9 +1 @@
-import { TuiConfig } from "@/cli/cmd/tui/config/tui"
-import { createSimpleContext } from "./helper"
-
-export const { use: useTuiConfig, provider: TuiConfigProvider } = createSimpleContext({
-  name: "TuiConfig",
-  init: (props: { config: TuiConfig.Info }) => {
-    return props.config
-  },
-})
+export * from "./app/tui-config"

package/src/tool/apply_patch.ts

@@ -1,334 +1 @@
-import * as path from "path"
-import { Effect, Schema } from "effect"
-import * as Tool from "./tool"
-import { Bus } from "../bus"
-import { FileWatcher } from "../file/watcher"
-import { InstanceState } from "@/effect/instance-state"
-import { Patch } from "../patch"
-import { createTwoFilesPatch, diffLines } from "diff"
-import { assertExternalDirectoryEffect } from "./external-directory"
-import { trimDiff } from "./edit"
-import { LSP } from "@/lsp/lsp"
-import { AppFileSystem } from "@saeeol/core/filesystem"
-import DESCRIPTION from "./apply_patch.txt"
-import { File } from "../file"
-import { filterDiagnostics } from "./diagnostics" 
-import { ConfigValidation } from "../overlay/config-validation" 
-import * as EncodedIO from "../overlay/tool/encoded-io" 
-import { Format } from "../format"
-import * as Bom from "@/util/bom"
-
-export const Parameters = Schema.Struct({
-  patchText: Schema.String.annotate({ description: "The full patch text that describes all changes to be made" }),
-})
-
-export const ApplyPatchTool = Tool.define(
-  "apply_patch",
-  Effect.gen(function* () {
-    const lsp = yield* LSP.Service
-    const afs = yield* AppFileSystem.Service
-    const format = yield* Format.Service
-    const bus = yield* Bus.Service
-
-    const run = Effect.fn("ApplyPatchTool.execute")(function* (
-      params: Schema.Schema.Type<typeof Parameters>,
-      ctx: Tool.Context,
-    ) {
-      if (!params.patchText) {
-        return yield* Effect.fail(new Error("patchText is required"))
-      }
-
-      // Parse the patch to get hunks
-      let hunks: Patch.Hunk[]
-      try {
-        const parseResult = Patch.parsePatch(params.patchText)
-        hunks = parseResult.hunks
-      } catch (error) {
-        return yield* Effect.fail(new Error(`apply_patch verification failed: ${error}`))
-      }
-
-      if (hunks.length === 0) {
-        const normalized = params.patchText.replace(/\r\n/g, "\n").replace(/\r/g, "\n").trim()
-        if (normalized === "*** Begin Patch\n*** End Patch") {
-          return yield* Effect.fail(new Error("patch rejected: empty patch"))
-        }
-        return yield* Effect.fail(new Error("apply_patch verification failed: no hunks found"))
-      }
-
-      const instance = yield* InstanceState.context
-
-      // Validate file paths and check permissions
-      const fileChanges: Array<{
-        filePath: string
-        oldContent: string
-        newContent: string
-        type: "add" | "update" | "delete" | "move"
-        movePath?: string
-        diff: string
-        additions: number
-        deletions: number
-        bom: boolean
-        encoding: string 
-      }> = []
-
-      let totalDiff = ""
-
-      for (const hunk of hunks) {
-        const filePath = path.resolve(instance.directory, hunk.path)
-        yield* assertExternalDirectoryEffect(ctx, filePath)
-
-        switch (hunk.type) {
-          case "add": {
-            const oldContent = ""
-            const newContent =
-              hunk.contents.length === 0 || hunk.contents.endsWith("\n") ? hunk.contents : `${hunk.contents}\n`
-            const next = Bom.split(newContent)
-            const diff = trimDiff(createTwoFilesPatch(filePath, filePath, oldContent, next.text))
-
-            let additions = 0
-            let deletions = 0
-            for (const change of diffLines(oldContent, next.text)) {
-              if (change.added) additions += change.count || 0
-              if (change.removed) deletions += change.count || 0
-            }
-
-            fileChanges.push({
-              filePath,
-              oldContent,
-              newContent: next.text,
-              type: "add",
-              diff,
-              additions,
-              deletions,
-              bom: next.bom,
-              encoding: "utf-8", 
-            })
-
-            totalDiff += diff + "\n"
-            break
-          }
-
-          case "update": {
-            // Check if file exists for update
-            const stats = yield* afs.stat(filePath).pipe(Effect.catch(() => Effect.succeed(undefined)))
-            if (!stats || stats.type === "Directory") {
-              return yield* Effect.fail(
-                new Error(`apply_patch verification failed: Failed to read file to update: ${filePath}`),
-              )
-            }
-            // mojibake; the resulting diff, additions/deletions counts, and permission-prompt
-            // metadata shown to the user must reflect the real file contents.
-            const read = yield* EncodedIO.read(filePath).pipe(
-              Effect.catch((error) =>
-                Effect.fail(
-                  new Error(
-                    `apply_patch verification failed: ${error instanceof Error ? error.message : String(error)}`,
-                  ),
-                ),
-              ),
-            )
-            const source = Bom.split(read.text)
-            const oldContent = source.text
-            let newContent = oldContent
-            let bom = source.bom
-            let encoding = read.encoding 
-
-            // Apply the update chunks to get new content
-            try {
-              const fileUpdate = Patch.deriveNewContentsFromChunks(filePath, hunk.chunks)
-              newContent = fileUpdate.content
-              bom = fileUpdate.bom
-              encoding = fileUpdate.encoding 
-            } catch (error) {
-              return yield* Effect.fail(new Error(`apply_patch verification failed: ${error}`))
-            }
-
-            const diff = trimDiff(createTwoFilesPatch(filePath, filePath, oldContent, newContent))
-
-            let additions = 0
-            let deletions = 0
-            for (const change of diffLines(oldContent, newContent)) {
-              if (change.added) additions += change.count || 0
-              if (change.removed) deletions += change.count || 0
-            }
-
-            const movePath = hunk.move_path ? path.resolve(instance.directory, hunk.move_path) : undefined
-            yield* assertExternalDirectoryEffect(ctx, movePath)
-
-            fileChanges.push({
-              filePath,
-              oldContent,
-              newContent,
-              type: hunk.move_path ? "move" : "update",
-              movePath,
-              diff,
-              additions,
-              deletions,
-              bom,
-              encoding, 
-            })
-
-            totalDiff += diff + "\n"
-            break
-          }
-
-          case "delete": {
-            const deleteRead = yield* EncodedIO.read(filePath).pipe(
-              Effect.catch((error) =>
-                Effect.fail(
-                  new Error(
-                    `apply_patch verification failed: ${error instanceof Error ? error.message : String(error)}`,
-                  ),
-                ),
-              ),
-            )
-            const contentToDelete = deleteRead.text
-            const source = Bom.split(contentToDelete)
-            const deleteDiff = trimDiff(createTwoFilesPatch(filePath, filePath, contentToDelete, ""))
-
-            const deletions = contentToDelete.split("\n").length
-
-            fileChanges.push({
-              filePath,
-              oldContent: contentToDelete,
-              newContent: "",
-              type: "delete",
-              diff: deleteDiff,
-              additions: 0,
-              deletions,
-              bom: source.bom,
-              encoding: deleteRead.encoding, 
-            })
-
-            totalDiff += deleteDiff + "\n"
-            break
-          }
-        }
-      }
-
-      // Build per-file metadata for UI rendering (used for both permission and result)
-      const files = fileChanges.map((change) => ({
-        filePath: change.filePath,
-        relativePath: path.relative(instance.worktree, change.movePath ?? change.filePath).replaceAll("\\", "/"),
-        type: change.type,
-        patch: change.diff,
-        additions: change.additions,
-        deletions: change.deletions,
-        movePath: change.movePath,
-      }))
-
-      // Check permissions if needed
-      const relativePaths = fileChanges.map((c) => path.relative(instance.worktree, c.filePath).replaceAll("\\", "/"))
-      yield* ctx.ask({
-        permission: "edit",
-        patterns: relativePaths,
-        always: ["*"],
-        metadata: {
-          filepath: relativePaths.join(", "),
-          diff: totalDiff,
-          files,
-        },
-      })
-
-      // Apply the changes
-      const updates: Array<{ file: string; event: "add" | "change" | "unlink" }> = []
-
-      for (const change of fileChanges) {
-        const edited = change.type === "delete" ? undefined : (change.movePath ?? change.filePath)
-        switch (change.type) {
-          case "add":
-            // Create parent directories (recursive: true is safe on existing/root dirs)
-            yield* EncodedIO.write(change.filePath, Bom.join(change.newContent, change.bom), change.encoding) 
-            updates.push({ file: change.filePath, event: "add" })
-            break
-
-          case "update":
-            yield* EncodedIO.write(change.filePath, Bom.join(change.newContent, change.bom), change.encoding) 
-            updates.push({ file: change.filePath, event: "change" })
-            break
-
-          case "move":
-            if (change.movePath) {
-              // Create parent directories (recursive: true is safe on existing/root dirs)
-              yield* EncodedIO.write(change.movePath!, Bom.join(change.newContent, change.bom), change.encoding) 
-              yield* afs.remove(change.filePath)
-              updates.push({ file: change.filePath, event: "unlink" })
-              updates.push({ file: change.movePath, event: "add" })
-            }
-            break
-
-          case "delete":
-            yield* afs.remove(change.filePath)
-            updates.push({ file: change.filePath, event: "unlink" })
-            break
-        }
-
-        if (edited) {
-          if (yield* format.file(edited)) {
-            yield* Bom.syncFile(afs, edited, change.bom)
-          }
-          yield* bus.publish(File.Event.Edited, { file: edited })
-        }
-      }
-
-      // Publish file change events
-      for (const update of updates) {
-        yield* bus.publish(FileWatcher.Event.Updated, update)
-      }
-
-      // Notify LSP of file changes and collect diagnostics
-      for (const change of fileChanges) {
-        if (change.type === "delete") continue
-        const target = change.movePath ?? change.filePath
-        yield* lsp.touchFile(target, "document")
-      }
-      const diagnostics = yield* lsp.diagnostics()
-
-      // Generate output summary
-      const summaryLines = fileChanges.map((change) => {
-        if (change.type === "add") {
-          return `A ${path.relative(instance.worktree, change.filePath).replaceAll("\\", "/")}`
-        }
-        if (change.type === "delete") {
-          return `D ${path.relative(instance.worktree, change.filePath).replaceAll("\\", "/")}`
-        }
-        const target = change.movePath ?? change.filePath
-        return `M ${path.relative(instance.worktree, target).replaceAll("\\", "/")}`
-      })
-      let output = `Success. Updated the following files:\n${summaryLines.join("\n")}`
-      const changedPaths = fileChanges
-        .filter((c) => c.type !== "delete")
-        .map((c) => AppFileSystem.normalizePath(c.movePath ?? c.filePath))
-
-      for (const change of fileChanges) {
-        if (change.type === "delete") continue
-        const target = change.movePath ?? change.filePath
-        const block = LSP.Diagnostic.report(target, diagnostics[AppFileSystem.normalizePath(target)] ?? [])
-        if (!block) continue
-        const rel = path.relative(instance.worktree, target).replaceAll("\\", "/")
-        output += `\n\nLSP errors detected in ${rel}, please fix:\n${block}`
-      }
-      for (const changed of fileChanges) {
-        if (changed.type === "delete") continue
-        output += yield* Effect.promise(() => ConfigValidation.check(changed.movePath ?? changed.filePath))
-      }
-
-      return {
-        title: output,
-        metadata: {
-          diff: totalDiff,
-          files,
-          diagnostics: filterDiagnostics(diagnostics, changedPaths), 
-        },
-        output,
-      }
-    })
-
-    return {
-      description: DESCRIPTION,
-      parameters: Parameters,
-      execute: (params: Schema.Schema.Type<typeof Parameters>, ctx: Tool.Context) =>
-        run(params, ctx).pipe(Effect.orDie),
-    }
-  }),
-)
+export * from "./file/apply_patch"