opencode-git-plugin 0.2.0 → 0.3.0

package/src/git/runner.ts

@@ -1,45 +0,0 @@
-import type { Context } from "@opencode/plugin/tui/context"
-import { GIT_POLL_MS, GIT_TIMEOUT_MS } from "../config"
-
-export function shellQuote(s: string): string {
-  return `'${s.replace(/'/g, `'\\''`)}'`
-}
-
-export type GitRunner = {
-  enqueue<T>(op: () => Promise<T>): Promise<T>
-  run(args: string): Promise<{ exit: number | undefined; output: string }>
-}
-
-export function createGitRunner(ctx: Context, directory: () => string): GitRunner {
-  let queue: Promise<void> = Promise.resolve()
-  const enqueue = <T,>(op: () => Promise<T>): Promise<T> => {
-    const run = queue.then(op)
-    queue = run.then(
-      () => undefined,
-      () => undefined,
-    )
-    return run
-  }
-  const run = async (args: string): Promise<{ exit: number | undefined; output: string }> => {
-    const location = { directory: directory() }
-    const created = await ctx.client.shell.create({
-      location,
-      command: `git ${args}`,
-      cwd: location.directory,
-    })
-    const id = created.data.id
-    try {
-      let final = await ctx.client.shell.get({ id, location })
-      for (let elapsed = 0; final.data.status === "running" && elapsed < GIT_TIMEOUT_MS; elapsed += GIT_POLL_MS) {
-        await new Promise((resolve) => setTimeout(resolve, GIT_POLL_MS))
-        final = await ctx.client.shell.get({ id, location })
-      }
-      if (final.data.status === "running") throw new Error(`Git command timed out after ${GIT_TIMEOUT_MS / 1000}s`)
-      const out = await ctx.client.shell.output({ id, location })
-      return { exit: final.data.exit, output: out.data.output }
-    } finally {
-      await ctx.client.shell.remove({ id, location }).catch(() => {})
-    }
-  }
-  return { enqueue, run }
-}

package/src/sidebar/file-list.tsx

@@ -1,47 +0,0 @@
-/** @jsxImportSource @opentui/solid */
-import { For } from "solid-js"
-import type { Context } from "@opencode/plugin/tui/context"
-import { FILE_ROW_BADGE_WIDTH } from "../config"
-import { filePathMaxWidth, statusBadge, truncatePath } from "../ui"
-import type { ChangeFile } from "../types"
-
-export function FileList(props: {
-  ctx: Context
-  files: ChangeFile[]
-  staged: Set<string>
-  selected: number
-  navMode: boolean
-  width: number
-  onSelect: (file: ChangeFile, index: number) => void
-}) {
-  const ctx = props.ctx
-  return (
-    <box flexDirection="column" gap={0}>
-      <For each={props.files}>
-        {(f, i) => {
-          const b = statusBadge(f.status, ctx.theme)
-          const label = () => (props.staged.has(f.file) ? `[${b.label}]` : ` ${b.label} `)
-          return (
-            <box flexDirection="row" gap={1} onMouseUp={() => props.onSelect(f, i())}>
-              <text fg={b.color} width={FILE_ROW_BADGE_WIDTH}>
-                <b>{label()}</b>
-              </text>
-              <text
-                fg={props.navMode && i() === props.selected ? ctx.theme.text.base : ctx.theme.text.muted}
-                wrapMode="none"
-              >
-                {truncatePath(
-                  f.file,
-                  filePathMaxWidth(props.width, { additions: f.additions, deletions: f.deletions }),
-                )}
-              </text>
-              <box flexGrow={1} />
-              <text fg={ctx.theme.diff.text.added}>+{f.additions}</text>
-              <text fg={ctx.theme.diff.text.removed}>-{f.deletions}</text>
-            </box>
-          )
-        }}
-      </For>
-    </box>
-  )
-}

package/src/sidebar/focus.tsx

@@ -1,37 +0,0 @@
-import { onCleanup } from "solid-js"
-import type { Context } from "@opencode/plugin/tui/context"
-import { DIFF_PANEL_NAME } from "../config"
-import type { RendererFocusEvents, RenderNode } from "../types"
-
-export function bindSidebarFocus(
-  ctx: Context,
-  opts: { container: () => RenderNode | undefined; active: () => boolean; exit: () => void },
-): void {
-  const isInsideSidebar = (node: RenderNode | null | undefined) => {
-    const container = opts.container()
-    let current = node
-    while (current) {
-      if (current === container) return true
-      current = current.parent
-    }
-    return false
-  }
-
-  const rendererEvents = ctx.renderer as unknown as RendererFocusEvents
-  const handleFocusedRenderable = (current: RenderNode | null) => {
-    if (!opts.active()) return
-    if (ctx.ui.panel.current()?.name === DIFF_PANEL_NAME) return
-    if (!isInsideSidebar(current)) opts.exit()
-  }
-  const handleFocusedEditor = (editor: unknown) => {
-    if (editor == null) return
-    if (opts.active()) opts.exit()
-  }
-
-  rendererEvents.on("focused_renderable", handleFocusedRenderable)
-  rendererEvents.on("focused_editor", handleFocusedEditor)
-  onCleanup(() => {
-    rendererEvents.off("focused_renderable", handleFocusedRenderable)
-    rendererEvents.off("focused_editor", handleFocusedEditor)
-  })
-}

package/src/sidebar/header.tsx

@@ -1,55 +0,0 @@
-/** @jsxImportSource @opentui/solid */
-import { Show } from "solid-js"
-import type { Context } from "@opencode/plugin/tui/context"
-
-export function SidebarHeader(props: {
-  ctx: Context
-  branch: string
-  fileCount: number
-  ready: boolean
-  additions: number
-  deletions: number
-  navMode: boolean
-  stageMode: boolean
-  hasStaged: boolean
-  onBranchClick: () => void
-  onCommit: () => void
-}) {
-  const ctx = props.ctx
-  return (
-    <box flexDirection="column" gap={0}>
-      <box flexDirection="row" gap={1}>
-        <text fg={ctx.theme.text.base}>
-          <b>Git Panel</b>
-        </text>
-        <box flexGrow={1} />
-        <Show when={props.branch && props.fileCount > 0}>
-          <text fg={ctx.theme.text.muted} onMouseUp={() => props.onBranchClick()}>
-            ▶ {props.branch}{" "}
-          </text>
-          <text fg={ctx.theme.text.base}>({props.fileCount})</text>
-        </Show>
-        <Show when={props.ready && props.fileCount > 0}>
-          <text fg={ctx.theme.diff.text.added}>+{props.additions}</text>
-          <text fg={ctx.theme.diff.text.removed}>-{props.deletions}</text>
-        </Show>
-      </box>
-      <Show when={props.ready && props.fileCount > 0 && props.navMode}>
-        <box flexDirection="row" gap={1}>
-          <box flexGrow={1} />
-          <Show
-            when={props.stageMode}
-            fallback={<text fg={ctx.theme.text.muted}>[← → : stage/unstage]</text>}
-          >
-            <text fg={ctx.theme.text.feedback.warning.base}>[click : stage/unstage]</text>
-          </Show>
-          <Show when={props.hasStaged}>
-            <text fg={ctx.theme.text.feedback.success.base} onMouseUp={() => props.onCommit()}>
-              [c : Commit]
-            </text>
-          </Show>
-        </box>
-      </Show>
-    </box>
-  )
-}

package/src/sidebar/index.ts

@@ -1 +0,0 @@
-export { GitChangesView } from "./view"

package/src/sidebar/keymap.ts

@@ -1,143 +0,0 @@
-import type { Accessor } from "solid-js"
-import type { Context, KeymapCommand } from "@opencode/plugin/tui/context"
-import { LIST_NAV_MODE } from "../config"
-import type { ChangeFile, FileBinds } from "../types"
-import type { ListNavigation } from "./list-navigation"
-
-export type FileActions = {
-  next(): void
-  prev(): void
-  open(): void
-  setStaged(stage: boolean): void
-  commit(): void
-}
-
-function buildFileCommands(actions: FileActions, binds: FileBinds, palette: boolean, hasFiles: boolean): KeymapCommand[] {
-  return [
-    {
-      id: "git-panel.next",
-      title: "Git Panel: Next File",
-      group: "Git Panel",
-      bind: binds.next,
-      enabled: hasFiles,
-      run: () => actions.next(),
-    },
-    {
-      id: "git-panel.prev",
-      title: "Git Panel: Previous File",
-      group: "Git Panel",
-      bind: binds.prev,
-      enabled: hasFiles,
-      run: () => actions.prev(),
-    },
-    {
-      id: "git-panel.open",
-      title: "Git Panel: Open Diff",
-      group: "Git Panel",
-      bind: binds.open,
-      palette: palette ? true : undefined,
-      enabled: hasFiles,
-      run: () => actions.open(),
-    },
-    {
-      id: "git-panel.stage",
-      title: "Git Panel: Stage File",
-      group: "Git Panel",
-      bind: binds.stage,
-      palette: palette ? true : undefined,
-      enabled: hasFiles,
-      run: () => actions.setStaged(true),
-    },
-    {
-      id: "git-panel.unstage",
-      title: "Git Panel: Unstage File",
-      group: "Git Panel",
-      bind: binds.unstage,
-      palette: palette ? true : undefined,
-      enabled: hasFiles,
-      run: () => actions.setStaged(false),
-    },
-    {
-      id: "git-panel.commit",
-      title: "Git Panel: Commit Staged",
-      group: "Git Panel",
-      bind: binds.commit,
-      palette: palette ? true : undefined,
-      run: () => actions.commit(),
-    },
-  ]
-}
-
-export function registerSidebarKeymaps(
-  ctx: Context,
-  deps: {
-    files: Accessor<ChangeFile[]>
-    nav: ListNavigation
-    diffOpen: () => boolean
-    actions: FileActions
-    requestRefresh: () => void
-  },
-): void {
-  const { files, nav, actions } = deps
-
-  ctx.keymap.layer(() => {
-    const hasFiles = files().length > 0
-    return {
-      mode: "global",
-      bindings: ["git-panel.focus-list", "git-panel.next", "git-panel.prev", "git-panel.open", "git-panel.stage", "git-panel.unstage", "git-panel.commit"],
-      commands: [
-        {
-          id: "git-panel.refresh",
-          title: "Git Panel: Refresh",
-          group: "Git Panel",
-          palette: true,
-          run: () => deps.requestRefresh(),
-        },
-        {
-          id: "git-panel.focus-list",
-          title: "Git Panel: Focus List",
-          group: "Git Panel",
-          bind: "<leader>G",
-          palette: true,
-          enabled: hasFiles,
-          run: () => nav.enter(),
-        },
-        ...buildFileCommands(actions, {}, true, hasFiles),
-      ],
-    }
-  })
-
-  ctx.keymap.layer(() => {
-    const hasFiles = files().length > 0
-    const canExitNav = nav.navMode() && !deps.diffOpen() && !nav.stageMode()
-    return {
-      mode: LIST_NAV_MODE,
-      priority: 10,
-      bindings: ["git-panel.next", "git-panel.prev", "git-panel.open", "git-panel.stage", "git-panel.unstage", "git-panel.commit", "git-panel.exit-stage-mode", "git-panel.unfocus-list"],
-      commands: [
-        ...buildFileCommands(
-          actions,
-          { next: "down", prev: "up", open: "return", stage: "right", unstage: "left", commit: "c" },
-          false,
-          hasFiles,
-        ),
-        {
-          id: "git-panel.exit-stage-mode",
-          title: "Git Panel: Exit Stage Mode",
-          group: "Git Panel",
-          bind: "escape",
-          enabled: nav.stageMode(),
-          run: () => nav.setStageMode(false),
-        },
-        {
-          id: "git-panel.unfocus-list",
-          title: "Git Panel: Exit List Navigation",
-          group: "Git Panel",
-          bind: "escape",
-          enabled: canExitNav,
-          run: () => nav.exit(),
-        },
-      ],
-    }
-  })
-}

package/src/sidebar/list-navigation.tsx

@@ -1,96 +0,0 @@
-import { createSignal, onCleanup, type Accessor } from "solid-js"
-import type { Context } from "@opencode/plugin/tui/context"
-import { LIST_NAV_MODE } from "../config"
-import type { ChangeFile } from "../types"
-
-export type ListNavigation = ReturnType<typeof createListNavigation>
-
-export function createListNavigation(ctx: Context, files: Accessor<ChangeFile[]>) {
-  const [navMode, setNavMode] = createSignal(false)
-  const [stageMode, setStageMode] = createSignal(false)
-  const [selected, setSelected] = createSignal(0)
-
-  let popListNavMode: (() => void) | null = null
-
-  const pushListNavMode = () => {
-    popListNavMode = ctx.keymap.mode.push(LIST_NAV_MODE)
-  }
-
-  const enter = () => {
-    if (popListNavMode) {
-      try {
-        if (ctx.keymap.mode.current() === LIST_NAV_MODE) return
-      } catch {
-        return
-      }
-      popListNavMode = null
-    }
-    pushListNavMode()
-    setNavMode(true)
-  }
-
-  const exit = () => {
-    try {
-      if (ctx.keymap.mode.current() === LIST_NAV_MODE) popListNavMode?.()
-    } catch {
-    }
-    popListNavMode = null
-    setNavMode(false)
-    setStageMode(false)
-  }
-
-  const ensure = () => {
-    if (!navMode()) return
-    try {
-      if (ctx.keymap.mode.current() !== LIST_NAV_MODE) {
-        popListNavMode = null
-        pushListNavMode()
-      }
-    } catch {
-    }
-  }
-
-  const selectNext = () => {
-    const count = files().length
-    if (count > 0) setSelected((prev) => (prev + 1) % count)
-  }
-
-  const selectPrevious = () => {
-    const count = files().length
-    if (count > 0) setSelected((prev) => (prev - 1 + count) % count)
-  }
-
-  const clampSelection = (count: number) => {
-    setSelected((prev) => Math.min(prev, Math.max(0, count - 1)))
-  }
-
-  const selectedFile = (): ChangeFile | undefined => {
-    const list = files()
-    return list[Math.min(selected(), list.length - 1)]
-  }
-
-  const toggleStageMode = () => {
-    if (files().length === 0) return
-    const next = !stageMode()
-    setStageMode(next)
-    if (next) enter()
-  }
-
-  onCleanup(exit)
-
-  return {
-    navMode,
-    stageMode,
-    setStageMode,
-    selected,
-    setSelected,
-    enter,
-    exit,
-    ensure,
-    selectNext,
-    selectPrevious,
-    clampSelection,
-    selectedFile,
-    toggleStageMode,
-  }
-}

package/src/sidebar/staging.tsx

@@ -1,108 +0,0 @@
-import { createMemo } from "solid-js"
-import type { Context } from "@opencode/plugin/tui/context"
-import { STAGED_STORE_KEY } from "../config"
-import { parseStagedPorcelain, shellQuote, type GitRunner } from "../git"
-import { friendlyError } from "../ui"
-
-export type Staging = ReturnType<typeof createStaging>
-
-export function createStaging(
-  ctx: Context,
-  git: GitRunner,
-  location: () => { directory: string },
-  refreshWorkingCopy: () => Promise<void>,
-) {
-  const [stagedMem, setStagedMem] = ctx.storage.memory(STAGED_STORE_KEY, {
-    initial: { directory: "", files: [] as string[] },
-  })
-  const staged = createMemo(() => new Set(stagedMem.files))
-
-  if (stagedMem.directory !== location().directory) {
-    setStagedMem((draft) => {
-      draft.directory = location().directory
-      draft.files = []
-    })
-  }
-
-  let refreshTask: Promise<void> | undefined
-
-  const fetchStatuses = async () => {
-    try {
-      const res = await git.run("status --porcelain=v1 -z -uall --no-renames")
-      if (res.exit === 0) {
-        const files = [...parseStagedPorcelain(res.output)]
-        setStagedMem((draft) => {
-          draft.files = files
-        })
-      }
-    } catch {
-    }
-  }
-
-  const scheduleRefresh = async () => {
-    if (refreshTask) return refreshTask
-    refreshTask = git.enqueue(fetchStatuses).finally(() => {
-      refreshTask = undefined
-    })
-    return refreshTask
-  }
-
-  const applyChange = (file: string, stage: boolean) => {
-    setStagedMem((draft) => {
-      const next = new Set(draft.files)
-      if (stage) next.add(file)
-      else next.delete(file)
-      draft.files = [...next]
-    })
-    void git.enqueue(async () => {
-      try {
-        let res = await git.run(stage ? `add -- ${shellQuote(file)}` : `restore --staged -- ${shellQuote(file)}`)
-        if (!stage && res.exit !== 0 && /could not resolve HEAD|ambiguous argument ['"]?HEAD|invalid object name ['"]?HEAD/i.test(res.output)) {
-          res = await git.run(`rm --cached -- ${shellQuote(file)}`)
-        }
-        if (res.exit !== 0) {
-          ctx.ui.toast.show({
-            message: `git ${stage ? "add" : "restore"} failed: ${res.output.trim().slice(0, 200)}`,
-            variant: "error",
-          })
-          await fetchStatuses()
-          return
-        }
-        await fetchStatuses()
-      } catch (e) {
-        ctx.ui.toast.show({ message: `git failed: ${friendlyError(e)}`, variant: "error" })
-        await fetchStatuses()
-        return
-      }
-    })
-  }
-
-  const toggle = (file: string) => {
-    applyChange(file, !staged().has(file))
-  }
-
-  const commit = async () => {
-    await scheduleRefresh()
-    if (staged().size === 0) {
-      ctx.ui.toast.show({ message: "Nothing staged — stage files with → first", variant: "warning" })
-      return
-    }
-    const message = await ctx.ui.dialog.prompt({ title: "Commit message", placeholder: "Describe the change" })
-    if (!message) return
-    await git.enqueue(async () => {
-      try {
-        const res = await git.run(`commit -m ${shellQuote(message)}`)
-        if (res.exit !== 0) {
-          ctx.ui.toast.show({ message: `git commit failed: ${res.output.trim().slice(0, 200)}`, variant: "error" })
-        } else {
-          ctx.ui.toast.show({ message: "Committed", variant: "success" })
-        }
-      } catch (e) {
-        ctx.ui.toast.show({ message: `git commit failed: ${friendlyError(e)}`, variant: "error" })
-      }
-      await refreshWorkingCopy()
-    })
-  }
-
-  return { staged, scheduleRefresh, applyChange, toggle, commit }
-}

package/src/sidebar/status.tsx

@@ -1,29 +0,0 @@
-/** @jsxImportSource @opentui/solid */
-import { Show } from "solid-js"
-import type { Context } from "@opencode/plugin/tui/context"
-
-export function SidebarStatus(props: {
-  ctx: Context
-  loading: boolean
-  error: string | undefined
-  hasFiles: boolean
-  branch: string
-}) {
-  const ctx = props.ctx
-  return (
-    <>
-      <Show when={props.loading}>
-        <text fg={ctx.theme.text.muted}>Loading…</text>
-      </Show>
-      <Show when={!props.loading && props.error}>
-        <text fg={ctx.theme.text.feedback.error.base}>{props.error}</text>
-      </Show>
-      <Show when={!props.loading && !props.error && !props.hasFiles && !props.branch}>
-        <text fg={ctx.theme.text.muted}>Empty repo — no commits yet</text>
-      </Show>
-      <Show when={!props.loading && !props.error && !props.hasFiles && !!props.branch}>
-        <text fg={ctx.theme.text.muted}>Working tree clean</text>
-      </Show>
-    </>
-  )
-}