opencode-git-plugin 0.2.0 → 0.2.1

package/package.json

@@ -1,23 +1,24 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "opencode-git-plugin",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "OpenCode v2 TUI sidebar plugin listing git working-copy changes with diff preview",
   "type": "module",
   "exports": {
-    "./tui": "./tui.ts"
+    "./tui": "./dist/tui.js"
   },
   "files": [
-    "tui.ts",
-    "src",
+    "dist",
     "docs",
     "README.md",
     "LICENSE"
   ],
   "scripts": {
+    "build": "bun run scripts/build.ts",
     "typecheck": "tsc --noEmit",
     "test": "bun test",
     "check": "bun run typecheck && bun test",
+    "prepack": "bun run build",
     "prepublishOnly": "bun run check"
   },
   "dependencies": {

package/src/config/constants.ts

@@ -1,16 +0,0 @@
-export const DEFAULT_INTERVAL_MS = 4000
-export const MIN_INTERVAL_MS = 1000
-export const MAX_DIFF_LINES = 4000
-export const GIT_TIMEOUT_MS = 120_000
-export const GIT_POLL_MS = 50
-
-export const DIFF_STORE_KEY = "git-panel.diff-view"
-export const DIFF_PANEL_NAME = "git-panel.diff"
-export const REFRESH_STORE_KEY = "git-panel.refresh"
-export const SETTINGS_STORE_KEY = "git-panel.settings"
-export const STAGED_STORE_KEY = "git-panel.staged"
-
-export const LIST_NAV_MODE = "git-panel-list"
-
-export const FILE_ROW_BADGE_WIDTH = 3
-export const EVENT_REFRESH_DEBOUNCE_MS = 2000

package/src/config/index.ts

@@ -1,2 +0,0 @@
-export * from "./constants"
-export * from "./options"

package/src/config/options.ts

@@ -1,8 +0,0 @@
-import type { Context } from "@opencode/plugin/tui/context"
-import { DEFAULT_INTERVAL_MS, MIN_INTERVAL_MS } from "./constants"
-
-export function intervalMs(ctx: Context): number {
-  const raw = ctx.options.intervalMs
-  if (typeof raw !== "number" || !Number.isFinite(raw)) return DEFAULT_INTERVAL_MS
-  return Math.max(MIN_INTERVAL_MS, Math.floor(raw))
-}

package/src/diff/body.tsx

@@ -1,90 +0,0 @@
-/** @jsxImportSource @opentui/solid */
-import { For, Show } from "solid-js"
-import type { generateSyntax } from "@opencode/theme/tui"
-import { diffLinePrefix, diffLineStyle, syntaxFiletype } from "../ui"
-import type { DiffRow, DiffViewState, ScrollHandle, Theme } from "../types"
-
-function DiffLineRow(props: { theme: Theme; row: DiffRow; index: number }) {
-  const theme = props.theme
-  const row = props.row
-  const style = diffLineStyle(theme, row.kind)
-  const isCurrent = row.state === "current"
-  const gutter = row.line !== undefined ? String(row.line).padStart(4, " ") : "    "
-  const fg = isCurrent
-    ? theme.diff.background.context
-    : row.state === "hit"
-      ? theme.text.feedback.warning.base
-      : style.fg
-  const bg = isCurrent ? theme.text.feedback.warning.base : style.bg
-  return (
-    <box flexDirection="row" width="100%" id={`git-panel-diff-line-${props.index}`}>
-      <text fg={isCurrent ? theme.text.feedback.warning.base : theme.text.muted} width={5}>
-        {isCurrent ? `❯${gutter.slice(1)}` : `${gutter} `}
-      </text>
-      <text fg={fg} bg={bg} wrapMode="word" flexGrow={1}>
-        {diffLinePrefix(row.kind)}
-        {row.text}
-      </text>
-    </box>
-  )
-}
-
-export function DiffBody(props: {
-  theme: Theme
-  state: DiffViewState
-  rows: DiffRow[]
-  focused: boolean
-  syntaxActive: boolean
-  syntaxStyle: ReturnType<typeof generateSyntax> | undefined
-  onScrollRef: (el: ScrollHandle) => void
-}) {
-  const theme = props.theme
-  return (
-    <>
-      <Show when={props.state.loading}>
-        <text fg={theme.text.muted}>Loading diff…</text>
-      </Show>
-      <Show when={!props.state.loading && props.state.message}>
-        <text fg={theme.text.muted}>{props.state.message}</text>
-      </Show>
-      <Show when={!props.state.loading && !props.state.message}>
-        <scrollbox
-          width="100%"
-          flexGrow={1}
-          flexShrink={1}
-          minHeight={0}
-          scrollY
-          scrollX={false}
-          focused={props.focused}
-          ref={(el) => props.onScrollRef(el)}
-          contentOptions={{ flexDirection: "column", gap: 0 }}
-          wrapperOptions={{ paddingRight: 1 }}
-        >
-          <Show when={props.syntaxActive}>
-            <diff
-              diff={props.state.patch}
-              view="unified"
-              filetype={syntaxFiletype(props.state.file)}
-              syntaxStyle={props.syntaxStyle}
-              showLineNumbers
-              wrapMode="word"
-              fg={theme.text.base}
-              addedBg={theme.diff.background.added}
-              removedBg={theme.diff.background.removed}
-              contextBg={theme.diff.background.context}
-              addedSignColor={theme.diff.text.added}
-              removedSignColor={theme.diff.text.removed}
-              lineNumberFg={theme.text.muted}
-            />
-          </Show>
-          <Show when={!props.syntaxActive}>
-            <For each={props.rows}>{(row, i) => <DiffLineRow theme={theme} row={row} index={i()} />}</For>
-          </Show>
-          <Show when={props.state.truncated}>
-            <text fg={theme.text.muted}>… truncated</text>
-          </Show>
-        </scrollbox>
-      </Show>
-    </>
-  )
-}

package/src/diff/header.tsx

@@ -1,77 +0,0 @@
-/** @jsxImportSource @opentui/solid */
-import { Show } from "solid-js"
-import { displayWidth, maxTextWidth, truncatePath } from "../ui"
-import type { Theme } from "../types"
-
-export function DiffHeader(props: {
-  theme: Theme
-  width: number
-  file: string
-  additions: number
-  deletions: number
-  query: string
-  matchCursor: number
-  matchCount: number
-  syntax: boolean
-  onSearch: () => void
-  onToggleSyntax: () => void
-  onClose: () => void
-}) {
-  const theme = props.theme
-  return (
-    <box flexDirection="column" gap={0} flexShrink={0}>
-      <box flexDirection="row" width={Math.max(1, props.width)} flexShrink={0}>
-        <text fg={theme.text.base} wrapMode="none" flexShrink={0}>
-          <b>
-            {truncatePath(
-              props.file,
-              maxTextWidth(
-                props.width,
-                displayWidth(`+${props.additions}`) + 1 + displayWidth(`-${props.deletions}`) + 1,
-              ),
-            )}
-          </b>
-        </text>
-        <box flexGrow={1} />
-        <box flexDirection="row" gap={1} flexShrink={0}>
-          <text fg={theme.diff.text.added} wrapMode="none" flexShrink={0}>
-            +{props.additions}
-          </text>
-          <text fg={theme.diff.text.removed} wrapMode="none" flexShrink={0}>
-            -{props.deletions}
-          </text>
-        </box>
-      </box>
-      <Show when={props.query}>
-        <text fg={theme.text.feedback.warning.base} wrapMode="none">
-          {props.matchCount > 0 ? `${props.matchCursor + 1}/${props.matchCount}` : "0/0"} · {props.query}
-        </text>
-      </Show>
-      <box height={1} flexShrink={0} />
-      <box flexDirection="row" flexWrap="wrap" width={Math.max(1, props.width)} gap={1} flexShrink={0}>
-        <text fg={theme.text.muted} wrapMode="none" flexShrink={0} onMouseUp={() => props.onSearch()}>
-          [? : Search]
-        </text>
-        <Show when={props.query}>
-          <text fg={theme.text.muted} wrapMode="none" flexShrink={0}>
-            [↑↓ : Jump]
-          </text>
-        </Show>
-        <text
-          fg={props.syntax ? theme.text.feedback.warning.base : theme.text.muted}
-          wrapMode="none"
-          flexShrink={0}
-          onMouseUp={() => props.onToggleSyntax()}
-        >
-          {props.syntax ? "[syntax:on]" : "[syntax:off]"}
-        </text>
-        <text fg={theme.text.base} wrapMode="none" flexShrink={0} onMouseUp={() => props.onClose()}>
-          [ Close · ESC/⌫ ]
-        </text>
-      </box>
-      <text fg={theme.text.muted} wrapMode="none">
-        {"─".repeat(Math.max(1, props.width))}
-      </text>
-    </box>
-  )
-}

package/src/diff/index.ts

@@ -1,2 +0,0 @@
-export { createDiffOpener } from "./open-diff"
-export { DiffPanel } from "./panel"

package/src/diff/keymap.ts

@@ -1,113 +0,0 @@
-import type { Context, PanelInput } from "@opencode/plugin/tui/context"
-import { DIFF_PANEL_NAME } from "../config"
-
-export function registerDiffKeymap(
-  ctx: Context,
-  deps: {
-    input: () => PanelInput
-    searching: () => boolean
-    hasMatches: () => boolean
-    syntaxActive: () => boolean
-    search(): void
-    stepMatch(dir: 1 | -1): void
-    clearSearch(): void
-    close(): void
-    toggleSyntax(): void
-    scrollBy(delta: number): void
-  },
-): void {
-  ctx.keymap.layer(() => {
-    const searching = deps.searching()
-    const hasMatches = deps.hasMatches()
-    const inSyntax = deps.syntaxActive()
-    return {
-      mode: "global",
-      priority: 20,
-      enabled: () => deps.input().name === DIFF_PANEL_NAME,
-      bindings: [
-        "git-panel.diff-search",
-        "git-panel.diff-next-match",
-        "git-panel.diff-prev-match",
-        "git-panel.diff-clear-search",
-        "git-panel.close-diff",
-        "git-panel.close-diff-backspace",
-        "git-panel.toggle-syntax",
-        "git-panel.syntax-down",
-        "git-panel.syntax-up",
-      ],
-      commands: [
-        {
-          id: "git-panel.diff-search",
-          title: "Git Panel: Search in Diff",
-          group: "Git Panel",
-          bind: "?",
-          run: () => deps.search(),
-        },
-        {
-          id: "git-panel.diff-next-match",
-          title: "Git Panel: Next Diff Match",
-          group: "Git Panel",
-          bind: "down",
-          enabled: searching && hasMatches,
-          run: () => deps.stepMatch(1),
-        },
-        {
-          id: "git-panel.diff-prev-match",
-          title: "Git Panel: Previous Diff Match",
-          group: "Git Panel",
-          bind: "up",
-          enabled: searching && hasMatches,
-          run: () => deps.stepMatch(-1),
-        },
-        {
-          id: "git-panel.diff-clear-search",
-          title: "Git Panel: Clear Diff Search",
-          group: "Git Panel",
-          bind: "escape",
-          enabled: searching,
-          run: () => deps.clearSearch(),
-        },
-        {
-          id: "git-panel.close-diff",
-          title: "Git Panel: Close Diff",
-          group: "Git Panel",
-          bind: "escape",
-          enabled: !searching,
-          run: () => deps.close(),
-        },
-        {
-          id: "git-panel.close-diff-backspace",
-          title: "Git Panel: Close Diff (Backspace)",
-          group: "Git Panel",
-          bind: "backspace",
-          enabled: !searching,
-          run: () => deps.close(),
-        },
-        {
-          id: "git-panel.toggle-syntax",
-          title: "Git Panel: Toggle Diff Syntax Highlighting",
-          group: "Git Panel",
-          bind: "s",
-          palette: true,
-          run: () => deps.toggleSyntax(),
-        },
-        {
-          id: "git-panel.syntax-down",
-          title: "Git Panel: Scroll Syntax Diff Down",
-          group: "Git Panel",
-          bind: "j",
-          enabled: inSyntax,
-          run: () => deps.scrollBy(3),
-        },
-        {
-          id: "git-panel.syntax-up",
-          title: "Git Panel: Scroll Syntax Diff Up",
-          group: "Git Panel",
-          bind: "k",
-          enabled: inSyntax,
-          run: () => deps.scrollBy(-3),
-        },
-      ],
-    }
-  })
-}

package/src/diff/open-diff.ts

@@ -1,57 +0,0 @@
-import type { Context } from "@opencode/plugin/tui/context"
-import { DIFF_PANEL_NAME, MAX_DIFF_LINES } from "../config"
-import { parseDiff } from "../git"
-import { useDiffStore } from "../state"
-import { friendlyError } from "../ui"
-import type { ChangeFile } from "../types"
-
-export function createDiffOpener(ctx: Context, location: () => { directory: string }) {
-  const [diffView, setDiffState] = useDiffStore(ctx)
-  let activeRequestId = 0
-
-  return async (f: ChangeFile) => {
-    const requestId = ++activeRequestId
-    const isStale = () => requestId !== activeRequestId || diffView.file !== f.file || !diffView.panelOpen
-
-    setDiffState((draft) => {
-      draft.file = f.file
-      draft.additions = f.additions
-      draft.deletions = f.deletions
-      draft.lines = []
-      draft.patch = ""
-      draft.message = ""
-      draft.truncated = false
-      draft.loading = true
-      draft.query = ""
-      draft.matchCursor = 0
-      draft.panelOpen = true
-    })
-    ctx.ui.panel.open(DIFF_PANEL_NAME, { presentation: "panel" })
-    try {
-      const res = await ctx.client.vcs.diff({ location: location(), mode: "working", context: 3 })
-      if (isStale()) return
-      const entry = res.data.find((d: { file: string }) => d.file === f.file)
-      const parsed = entry ? parseDiff(entry.patch) : []
-      setDiffState((draft) => {
-        draft.loading = false
-        draft.patch = entry?.patch ?? ""
-        if (!entry) {
-          draft.message = "No diff available"
-        } else if (parsed.length === 0) {
-          draft.message = "No visible changes (empty or binary file)"
-        } else if (parsed.length > MAX_DIFF_LINES) {
-          draft.lines = parsed.slice(0, MAX_DIFF_LINES)
-          draft.truncated = true
-        } else {
-          draft.lines = parsed
-        }
-      })
-    } catch (e) {
-      if (isStale()) return
-      setDiffState((draft) => {
-        draft.loading = false
-        draft.message = friendlyError(e)
-      })
-    }
-  }
-}

package/src/diff/panel.tsx

@@ -1,156 +0,0 @@
-/** @jsxImportSource @opentui/solid */
-import { createEffect, createMemo, Show } from "solid-js"
-import { generateSyntax } from "@opencode/theme/tui"
-import type { Context, PanelInput } from "@opencode/plugin/tui/context"
-import { DIFF_PANEL_NAME, SETTINGS_STORE_KEY } from "../config"
-import { notifyDiffClosed, useDiffStore } from "../state"
-import { friendlyError } from "../ui"
-import type { ScrollHandle } from "../types"
-import { DiffBody } from "./body"
-import { DiffHeader } from "./header"
-import { registerDiffKeymap } from "./keymap"
-import { createDiffSearch } from "./search"
-
-export function DiffPanel(props: { ctx: Context; input: PanelInput }) {
-  const ctx = props.ctx
-  const input = () => props.input
-  const theme = ctx.theme
-  const [diffState, setDiffState] = useDiffStore(ctx)
-  const [settings, setSettings] = ctx.storage.store(SETTINGS_STORE_KEY, {
-    initial: { syntax: false },
-  })
-  const toggleSyntax = () => {
-    void setSettings((draft) => {
-      draft.syntax = !draft.syntax
-    }).catch(() => {})
-  }
-  const isSyntaxViewActive = () =>
-    settings.syntax && !diffState.truncated && diffState.query === "" && diffState.patch !== ""
-  const syntaxHighlightStyle = createMemo(() => (settings.syntax ? generateSyntax(theme) : undefined))
-  const search = createDiffSearch(diffState)
-
-  createEffect(() => {
-    if (input().name !== DIFF_PANEL_NAME && diffState.panelOpen) {
-      setDiffState((draft) => {
-        draft.panelOpen = false
-      })
-    }
-  })
-
-  createEffect(() => {
-    if (input().name === DIFF_PANEL_NAME && !input().focused) {
-      try {
-        input().focus()
-      } catch {
-      }
-    }
-  })
-
-  let scrollEl: ScrollHandle | undefined
-
-  const safeScrollTo = (y: number) => {
-    const el = scrollEl
-    if (!el) return
-    try {
-      el.scrollTo({ x: 0, y: Math.max(0, y) })
-    } catch {
-    }
-  }
-
-  createEffect(() => {
-    const line = search.currentMatchIndex()
-    if (line < 0 || input().name !== DIFF_PANEL_NAME || !scrollEl) return
-    const target = Math.max(0, line - 10)
-    setTimeout(() => safeScrollTo(target), 50)
-  })
-
-  const scrollSyntaxBy = (delta: number) => {
-    if (!scrollEl) return
-    safeScrollTo(scrollEl.scrollTop + delta)
-  }
-
-  const stepSearchMatch = (dir: 1 | -1) => {
-    const m = search.matchIndices()
-    if (m.length === 0) return
-    setDiffState((draft) => {
-      draft.matchCursor = (draft.matchCursor + dir + m.length) % m.length
-    })
-  }
-
-  const clearSearch = () => {
-    setDiffState((draft) => {
-      draft.query = ""
-      draft.matchCursor = 0
-    })
-  }
-
-  const closeDiff = () => {
-    setDiffState((draft) => {
-      draft.panelOpen = false
-    })
-    ctx.ui.panel.close()
-    notifyDiffClosed()
-  }
-
-  const promptSearchQuery = async () => {
-    try {
-      const q = await ctx.ui.dialog.prompt({
-        title: "Search in diff",
-        placeholder: "Type to highlight matches",
-        value: diffState.query,
-      })
-      if (q === undefined) return
-      setDiffState((draft) => {
-        draft.query = q
-        draft.matchCursor = 0
-      })
-    } catch (e) {
-      ctx.ui.toast.show({ message: `Search failed: ${friendlyError(e)}`, variant: "error" })
-    }
-  }
-
-  registerDiffKeymap(ctx, {
-    input,
-    searching: () => diffState.query.length > 0,
-    hasMatches: () => search.matchIndices().length > 0,
-    syntaxActive: isSyntaxViewActive,
-    search: () => void promptSearchQuery(),
-    stepMatch: stepSearchMatch,
-    clearSearch,
-    close: closeDiff,
-    toggleSyntax,
-    scrollBy: scrollSyntaxBy,
-  })
-
-  return (
-    <Show when={input().name === DIFF_PANEL_NAME}>
-      <box flexDirection="column" gap={1} width="100%" height="100%">
-        <DiffHeader
-          theme={theme}
-          width={input().width}
-          file={diffState.file}
-          additions={diffState.additions}
-          deletions={diffState.deletions}
-          query={diffState.query}
-          matchCursor={diffState.matchCursor}
-          matchCount={search.matchIndices().length}
-          syntax={settings.syntax}
-          onSearch={() => void promptSearchQuery()}
-          onToggleSyntax={toggleSyntax}
-          onClose={closeDiff}
-        />
-        <DiffBody
-          theme={theme}
-          state={diffState}
-          rows={search.visibleRows()}
-          focused={input().focused}
-          syntaxActive={isSyntaxViewActive()}
-          syntaxStyle={syntaxHighlightStyle()}
-          onScrollRef={(el) => {
-            scrollEl = el
-          }}
-        />
-      </box>
-    </Show>
-  )
-}

package/src/diff/search.tsx

@@ -1,38 +0,0 @@
-import { createMemo } from "solid-js"
-import type { DiffRow, DiffViewState } from "../types"
-
-export function createDiffSearch(state: DiffViewState) {
-  const matchIndices = createMemo(() => {
-    const q = state.query.toLowerCase()
-    if (!q) return []
-    const out: number[] = []
-    state.lines.forEach((line, i) => {
-      if (line.text.toLowerCase().includes(q)) out.push(i)
-    })
-    return out
-  })
-
-  const currentMatchIndex = createMemo(() => {
-    const m = matchIndices()
-    if (m.length === 0) return -1
-    return m[((state.matchCursor % m.length) + m.length) % m.length]
-  })
-
-  let previousRows: DiffRow[] = []
-  const visibleRows = createMemo(() => {
-    const q = state.query.toLowerCase()
-    const cur = currentMatchIndex()
-    const prev = previousRows
-    const next = state.lines.map((line, idx) => {
-      const hit = q !== "" && line.text.toLowerCase().includes(q)
-      const rowState = (idx === cur ? "current" : hit ? "hit" : "plain") as DiffRow["state"]
-      const p = prev[idx]
-      if (p && p.kind === line.kind && p.text === line.text && p.line === line.line && p.state === rowState) return p
-      return { kind: line.kind, text: line.text, line: line.line, state: rowState }
-    })
-    previousRows = next
-    return next
-  })
-
-  return { matchIndices, currentMatchIndex, visibleRows }
-}

package/src/git/diff-parse.ts

@@ -1,35 +0,0 @@
-import type { DiffLine } from "../types"
-
-const DIFF_PREAMBLE_RE = /^(diff --git |index |new file mode|deleted file mode|similarity index|rename from|rename to|old mode|new mode)/
-const HUNK_HEADER_RE = /^@@ -\d+(?:,\d+)? \+(\d+)(?:,\d+)? @@ ?(.*)$/
-
-export function formatHunkHeader(raw: string): string {
-  const m = raw.match(HUNK_HEADER_RE)
-  if (!m) return raw
-  const [, newStart, trailingContext] = m
-  return trailingContext ? `⋯ ${trailingContext}` : `⋯ line ${newStart}`
-}
-
-export function parseDiff(patch: string): DiffLine[] {
-  const out: DiffLine[] = []
-  let newLine = 0
-  for (const line of patch.split("\n")) {
-    if (line === "") continue
-    if (line.startsWith("@@")) {
-      const m = line.match(HUNK_HEADER_RE)
-      if (m) newLine = parseInt(m[1], 10)
-      out.push({ kind: "hunk", text: formatHunkHeader(line) })
-    } else if (line.startsWith("+++") || line.startsWith("---")) {
-    } else if (DIFF_PREAMBLE_RE.test(line)) {
-    } else if (line.startsWith("Binary files")) {
-      out.push({ kind: "meta", text: line })
-    } else if (line.startsWith("+")) {
-      out.push({ kind: "add", text: line.slice(1), line: newLine++ })
-    } else if (line.startsWith("-")) {
-      out.push({ kind: "del", text: line.slice(1) })
-    } else {
-      out.push({ kind: "context", text: line.startsWith(" ") ? line.slice(1) : line, line: newLine++ })
-    }
-  }
-  return out
-}

package/src/git/index.ts

@@ -1,3 +0,0 @@
-export * from "./diff-parse"
-export * from "./porcelain"
-export * from "./runner"

package/src/git/porcelain.ts

@@ -1,10 +0,0 @@
-export function parseStagedPorcelain(porcelain: string): Set<string> {
-  const staged = new Set<string>()
-  for (const record of porcelain.split("\0")) {
-    if (record.length < 4) continue
-    const indexStatus = record[0]
-    if (indexStatus === " " || indexStatus === "?") continue
-    staged.add(record.slice(3))
-  }
-  return staged
-}