opencode-git-plugin 0.2.1 → 0.3.0

package/README.md

@@ -82,6 +82,7 @@ Do not add the plugin to `opencode.json(c)`; that file is for server plugins and
 | Option | Type | Default | Description |
 | --- | --- | --- | --- |
 | `intervalMs` | `number` | `4000` | Refresh interval in milliseconds; values below `1000` are clamped. |
+| `folderTree` | `string` | `"none"` | File list style: `"none"` (full paths), `"comfortable"` (indented tree, 2 cols/level), `"compact"` (tree, 1 col/level), or `"minimal"` (plain indentation). |
 
 ## Usage
 
@@ -92,6 +93,7 @@ Do not add the plugin to `opencode.json(c)`; that file is for server plugins and
 - Click a row to open its diff; click the branch name to enter stage mode (every clicked file toggles staged/unstaged; branch click or `ESC` exits)
 - Clicking the prompt input exits list mode so typing is never hijacked
 - Staging also via palette (`Git Panel: Stage/Unstage File`)
+- With `folderTree` enabled, clicking a folder collapses/expands it; in stage mode, clicking a folder stages/unstages everything inside it (unstages only when all of its files are already staged)
 
 ### Diff panel
 
@@ -110,7 +112,7 @@ Do not add the plugin to `opencode.json(c)`; that file is for server plugins and
 
 - `Loading…` while fetching
 - `Working tree clean` when there is nothing to show (header stats hidden)
-- `Empty repo — no commits yet` before the first commit
+- `Empty repo — no commits yet` before the first commit when nothing is staged or untracked (files still list normally once they exist)
 - `Not a git repository` outside a repo, plus raw fetch errors
 
 ## Development

package/dist/tui.js

@@ -24,6 +24,11 @@ function intervalMs(ctx) {
     return DEFAULT_INTERVAL_MS;
   return Math.max(MIN_INTERVAL_MS, Math.floor(raw));
 }
+var TREE_STYLES = ["none", "comfortable", "compact", "minimal"];
+function folderTree(ctx) {
+  const raw = ctx.options.folderTree;
+  return TREE_STYLES.includes(raw) ? raw : "none";
+}
 // src/git/diff-parse.ts
 var DIFF_PREAMBLE_RE = /^(diff --git |index |new file mode|deleted file mode|similarity index|rename from|rename to|old mode|new mode)/;
 var HUNK_HEADER_RE = /^@@ -\d+(?:,\d+)? \+(\d+)(?:,\d+)? @@ ?(.*)$/;
@@ -59,17 +64,95 @@ function parseDiff(patch) {
   return out;
 }
 // src/git/porcelain.ts
-function parseStagedPorcelain(porcelain) {
-  const staged = new Set;
+var NO_COUNTS = { additions: 0, deletions: 0 };
+function parsePorcelainRecords(porcelain) {
+  const out = [];
   for (const record of porcelain.split("\x00")) {
     if (record.length < 4)
       continue;
-    const indexStatus = record[0];
-    if (indexStatus === " " || indexStatus === "?")
+    out.push({ x: record[0], y: record[1], file: record.slice(3) });
+  }
+  return out;
+}
+var isStaged = (r) => r.x !== " " && r.x !== "?";
+function parseStagedPorcelain(porcelain) {
+  return new Set(parsePorcelainRecords(porcelain).filter(isStaged).map((r) => r.file));
+}
+function porcelainChangeStatus(x, y) {
+  if (x === "?" || y === "?")
+    return "added";
+  if (x === "D" || y === "D")
+    return "deleted";
+  if (x === "A")
+    return "added";
+  return "modified";
+}
+function parseNumstat(output) {
+  const counts = new Map;
+  for (const record of output.split("\x00")) {
+    if (!record)
       continue;
-    staged.add(record.slice(3));
+    const firstTab = record.indexOf("\t");
+    if (firstTab < 0)
+      continue;
+    const secondTab = record.indexOf("\t", firstTab + 1);
+    if (secondTab < 0)
+      continue;
+    const additions = Number(record.slice(0, firstTab));
+    const deletions = Number(record.slice(firstTab + 1, secondTab));
+    const file = record.slice(secondTab + 1);
+    if (!file)
+      continue;
+    counts.set(file, {
+      additions: Number.isFinite(additions) && additions >= 0 ? additions : 0,
+      deletions: Number.isFinite(deletions) && deletions >= 0 ? deletions : 0
+    });
   }
-  return staged;
+  return counts;
+}
+var countsFor = (counts, file) => counts.get(file) ?? NO_COUNTS;
+function buildFallbackFiles(porcelain, cachedNumstat, worktreeNumstat) {
+  const cached = parseNumstat(cachedNumstat);
+  const worktree = parseNumstat(worktreeNumstat);
+  return parsePorcelainRecords(porcelain).map((r) => {
+    const c = isStaged(r) ? countsFor(cached, r.file) : NO_COUNTS;
+    const w = countsFor(worktree, r.file);
+    return {
+      file: r.file,
+      status: porcelainChangeStatus(r.x, r.y),
+      additions: c.additions + w.additions,
+      deletions: c.deletions + w.deletions
+    };
+  }).sort((a, b) => a.file < b.file ? -1 : a.file > b.file ? 1 : 0);
+}
+
+// src/git/fallback.ts
+function cleanBranchName(output) {
+  const name = output.split(`
+`, 1)[0]?.trim() ?? "";
+  return name === "" || name === "HEAD" ? "" : name;
+}
+async function fetchWorkingCopyFallback(git) {
+  const statusRes = await git.run("status --porcelain=v1 -z -uall --no-renames");
+  if (statusRes.exit !== 0)
+    throw new Error("Not a git repository");
+  const [cachedRes, worktreeRes, headRes, symRes] = await Promise.all([
+    git.run("diff --cached --numstat -z --no-renames"),
+    git.run("diff --numstat -z --no-renames"),
+    git.run("rev-parse --verify HEAD --"),
+    git.run("symbolic-ref --short HEAD")
+  ]);
+  let branch = symRes.exit === 0 ? cleanBranchName(symRes.output) : "";
+  if (!branch) {
+    const current = await git.run("branch --show-current");
+    if (current.exit === 0)
+      branch = cleanBranchName(current.output);
+  }
+  return {
+    files: buildFallbackFiles(statusRes.output, cachedRes.output, worktreeRes.output),
+    branch,
+    hasHead: headRes.exit === 0
+  };
 }
 // src/git/runner.ts
 function shellQuote(s) {
@@ -261,8 +344,91 @@ function syntaxFiletype(file) {
   }
   return LANGUAGE_BY_EXTENSION[file.slice(dot).toLowerCase()];
 }
+// src/ui/tree.ts
+var PREFIXES = {
+  comfortable: { branch: "\u251C ", lastBranch: "\u2514 ", guide: "\u2502 ", emptyGuide: "  ", indent: "" },
+  compact: { branch: "\u251C", lastBranch: "\u2514", guide: "\u2502", emptyGuide: " ", indent: "" },
+  minimal: { branch: "", lastBranch: "", guide: "", emptyGuide: "", indent: " " }
+};
+var compareNames = (a, b) => a < b ? -1 : a > b ? 1 : 0;
+var baseName = (path) => path.slice(path.lastIndexOf("/") + 1);
+var newNode = () => ({ dirs: new Map, files: [] });
+function buildTree(files) {
+  const root = newNode();
+  for (const f of files) {
+    let node = root;
+    for (const part of f.file.split("/").slice(0, -1)) {
+      let next = node.dirs.get(part);
+      if (!next) {
+        next = newNode();
+        node.dirs.set(part, next);
+      }
+      node = next;
+    }
+    node.files.push(f);
+  }
+  return root;
+}
+function buildFileTree(files, style = "comfortable", collapsed = new Set) {
+  const rows = [];
+  const p = PREFIXES[style];
+  const prefixOf = (depth, guides, last) => {
+    if (depth === 0)
+      return "";
+    if (style === "minimal")
+      return p.indent.repeat(depth);
+    return guides.map((g) => g ? p.guide : p.emptyGuide).join("") + (last ? p.lastBranch : p.branch);
+  };
+  const render = (node, depth, guides, basePath) => {
+    const dirNames = [...node.dirs.keys()].sort(compareNames);
+    const sortedFiles = [...node.files].sort((a, b) => compareNames(baseName(a.file), baseName(b.file)));
+    const total = dirNames.length + sortedFiles.length;
+    dirNames.forEach((name, i) => {
+      const last = i === total - 1;
+      let label = `${name}/`;
+      let fullPath = `${basePath}${name}/`;
+      let child = node.dirs.get(name);
+      while (child && child.dirs.size === 1 && child.files.length === 0) {
+        const [[nextName, next]] = child.dirs;
+        label += `${nextName}/`;
+        fullPath += `${nextName}/`;
+        child = next;
+      }
+      rows.push({ kind: "dir", prefix: prefixOf(depth, guides, last), name: label, path: fullPath });
+      if (child && !collapsed.has(fullPath))
+        render(child, depth + 1, [...guides, !last], fullPath);
+    });
+    sortedFiles.forEach((f, j) => {
+      const last = dirNames.length + j === total - 1;
+      rows.push({ kind: "file", prefix: prefixOf(depth, guides, last), name: baseName(f.file), file: f });
+    });
+  };
+  render(buildTree(files), 0, [], "");
+  return rows;
+}
 // src/diff/open-diff.ts
-function createDiffOpener(ctx, location) {
+async function gitFallbackPatch(git, file) {
+  const q = shellQuote(file);
+  return git.enqueue(async () => {
+    const cached = await git.run(`diff --cached --no-renames -U3 -- ${q}`);
+    const worktree = await git.run(`diff --no-renames -U3 -- ${q}`);
+    const combined = [cached.output, worktree.output].filter((s) => s.trim() !== "").join(`
+`);
+    if (combined.trim() !== "")
+      return combined;
+    const untracked = await git.run(`diff --no-index --no-renames -U3 -- /dev/null ${q}`);
+    return untracked.output.trim() !== "" ? untracked.output : undefined;
+  });
+}
+async function vcsPatch(ctx, location, file) {
+  try {
+    const res = await ctx.client.vcs.diff({ location, mode: "working", context: 3 });
+    return res.data.find((d) => d.file === file)?.patch;
+  } catch {
+    return;
+  }
+}
+function createDiffOpener(ctx, location, git) {
   const [diffView, setDiffState] = useDiffStore(ctx);
   let activeRequestId = 0;
   return async (f) => {
@@ -283,15 +449,21 @@ function createDiffOpener(ctx, location) {
     });
     ctx.ui.panel.open(DIFF_PANEL_NAME, { presentation: "panel" });
     try {
-      const res = await ctx.client.vcs.diff({ location: location(), mode: "working", context: 3 });
+      let patch = await vcsPatch(ctx, location(), f.file);
       if (isStale())
         return;
-      const entry = res.data.find((d) => d.file === f.file);
-      const parsed = entry ? parseDiff(entry.patch) : [];
+      if (patch == null) {
+        patch = await gitFallbackPatch(git, f.file).catch(() => {
+          return;
+        });
+        if (isStale())
+          return;
+      }
+      const parsed = patch ? parseDiff(patch) : [];
       setDiffState((draft) => {
         draft.loading = false;
-        draft.patch = entry?.patch ?? "";
-        if (!entry) {
+        draft.patch = patch ?? "";
+        if (!patch) {
           draft.message = "No diff available";
         } else if (parsed.length === 0) {
           draft.message = "No visible changes (empty or binary file)";
@@ -929,73 +1101,119 @@ import { insert as _$insert7 } from "@opentui/solid";
 import { use as _$use2 } from "@opentui/solid";
 import { setProp as _$setProp7 } from "@opentui/solid";
 import { createElement as _$createElement7 } from "@opentui/solid";
-import { memo as _$memo5 } from "@opentui/solid";
+import { memo as _$memo6 } from "@opentui/solid";
 import { createComponent as _$createComponent7 } from "@opentui/solid";
-import { createEffect as createEffect3, createSignal as createSignal3, onCleanup as onCleanup4, Show as Show6 } from "solid-js";
+import { createEffect as createEffect3, createSignal as createSignal3, onCleanup as onCleanup4, Show as Show7 } from "solid-js";
 
 // src/sidebar/file-list.tsx
+import { memo as _$memo3 } from "@opentui/solid";
+import { createComponent as _$createComponent4 } from "@opentui/solid";
 import { effect as _$effect3 } from "@opentui/solid";
 import { createTextNode as _$createTextNode3 } from "@opentui/solid";
 import { insertNode as _$insertNode3 } from "@opentui/solid";
 import { insert as _$insert4 } from "@opentui/solid";
-import { createComponent as _$createComponent4 } from "@opentui/solid";
 import { setProp as _$setProp4 } from "@opentui/solid";
 import { createElement as _$createElement4 } from "@opentui/solid";
-import { For as For2 } from "solid-js";
+import { createMemo as createMemo3, For as For2, Show as Show4 } from "solid-js";
 function FileList(props) {
   const ctx = props.ctx;
+  const rows = createMemo3(() => props.treeStyle === "none" ? [] : buildFileTree(props.files, props.treeStyle, props.collapsed));
+  const indexByFile = createMemo3(() => new Map(props.files.map((f, i) => [f.file, i])));
+  const pathLabel = (f, name, prefix) => {
+    const max = Math.max(8, filePathMaxWidth(props.width, {
+      additions: f.additions,
+      deletions: f.deletions
+    }) - displayWidth(prefix));
+    return prefix + truncatePath(name, max);
+  };
+  const fileRow = (f, index, name, prefix) => {
+    const b = statusBadge(f.status, ctx.theme);
+    const label = () => props.staged.has(f.file) ? `[${b.label}]` : ` ${b.label} `;
+    return (() => {
+      var _el$ = _$createElement4("box"), _el$2 = _$createElement4("text"), _el$3 = _$createElement4("b"), _el$4 = _$createElement4("text"), _el$5 = _$createElement4("box"), _el$6 = _$createElement4("text"), _el$7 = _$createTextNode3(`+`), _el$8 = _$createElement4("text"), _el$9 = _$createTextNode3(`-`);
+      _$insertNode3(_el$, _el$2);
+      _$insertNode3(_el$, _el$4);
+      _$insertNode3(_el$, _el$5);
+      _$insertNode3(_el$, _el$6);
+      _$insertNode3(_el$, _el$8);
+      _$setProp4(_el$, "flexDirection", "row");
+      _$setProp4(_el$, "gap", 1);
+      _$setProp4(_el$, "onMouseUp", () => props.onSelect(f, index));
+      _$insertNode3(_el$2, _el$3);
+      _$setProp4(_el$2, "width", FILE_ROW_BADGE_WIDTH);
+      _$insert4(_el$3, label);
+      _$setProp4(_el$4, "wrapMode", "none");
+      _$insert4(_el$4, () => pathLabel(f, name, prefix));
+      _$setProp4(_el$5, "flexGrow", 1);
+      _$insertNode3(_el$6, _el$7);
+      _$insert4(_el$6, () => f.additions, null);
+      _$insertNode3(_el$8, _el$9);
+      _$insert4(_el$8, () => f.deletions, null);
+      _$effect3((_p$) => {
+        var _v$ = b.color, _v$2 = props.navMode && index === props.selected ? ctx.theme.text.base : ctx.theme.text.muted, _v$3 = ctx.theme.diff.text.added, _v$4 = ctx.theme.diff.text.removed;
+        _v$ !== _p$.e && (_p$.e = _$setProp4(_el$2, "fg", _v$, _p$.e));
+        _v$2 !== _p$.t && (_p$.t = _$setProp4(_el$4, "fg", _v$2, _p$.t));
+        _v$3 !== _p$.a && (_p$.a = _$setProp4(_el$6, "fg", _v$3, _p$.a));
+        _v$4 !== _p$.o && (_p$.o = _$setProp4(_el$8, "fg", _v$4, _p$.o));
+        return _p$;
+      }, {
+        e: undefined,
+        t: undefined,
+        a: undefined,
+        o: undefined
+      });
+      return _el$;
+    })();
+  };
   return (() => {
-    var _el$ = _$createElement4("box");
-    _$setProp4(_el$, "flexDirection", "column");
-    _$setProp4(_el$, "gap", 0);
-    _$insert4(_el$, _$createComponent4(For2, {
-      get each() {
-        return props.files;
+    var _el$0 = _$createElement4("box");
+    _$setProp4(_el$0, "flexDirection", "column");
+    _$setProp4(_el$0, "gap", 0);
+    _$insert4(_el$0, _$createComponent4(Show4, {
+      get when() {
+        return props.treeStyle !== "none";
       },
-      children: (f, i) => {
-        const b = statusBadge(f.status, ctx.theme);
-        const label = () => props.staged.has(f.file) ? `[${b.label}]` : ` ${b.label} `;
-        return (() => {
-          var _el$2 = _$createElement4("box"), _el$3 = _$createElement4("text"), _el$4 = _$createElement4("b"), _el$5 = _$createElement4("text"), _el$6 = _$createElement4("box"), _el$7 = _$createElement4("text"), _el$8 = _$createTextNode3(`+`), _el$9 = _$createElement4("text"), _el$0 = _$createTextNode3(`-`);
-          _$insertNode3(_el$2, _el$3);
-          _$insertNode3(_el$2, _el$5);
-          _$insertNode3(_el$2, _el$6);
-          _$insertNode3(_el$2, _el$7);
-          _$insertNode3(_el$2, _el$9);
-          _$setProp4(_el$2, "flexDirection", "row");
-          _$setProp4(_el$2, "gap", 1);
-          _$setProp4(_el$2, "onMouseUp", () => props.onSelect(f, i()));
-          _$insertNode3(_el$3, _el$4);
-          _$setProp4(_el$3, "width", FILE_ROW_BADGE_WIDTH);
-          _$insert4(_el$4, label);
-          _$setProp4(_el$5, "wrapMode", "none");
-          _$insert4(_el$5, () => truncatePath(f.file, filePathMaxWidth(props.width, {
-            additions: f.additions,
-            deletions: f.deletions
-          })));
-          _$setProp4(_el$6, "flexGrow", 1);
-          _$insertNode3(_el$7, _el$8);
-          _$insert4(_el$7, () => f.additions, null);
-          _$insertNode3(_el$9, _el$0);
-          _$insert4(_el$9, () => f.deletions, null);
-          _$effect3((_p$) => {
-            var _v$ = b.color, _v$2 = props.navMode && i() === props.selected ? ctx.theme.text.base : ctx.theme.text.muted, _v$3 = ctx.theme.diff.text.added, _v$4 = ctx.theme.diff.text.removed;
-            _v$ !== _p$.e && (_p$.e = _$setProp4(_el$3, "fg", _v$, _p$.e));
-            _v$2 !== _p$.t && (_p$.t = _$setProp4(_el$5, "fg", _v$2, _p$.t));
-            _v$3 !== _p$.a && (_p$.a = _$setProp4(_el$7, "fg", _v$3, _p$.a));
-            _v$4 !== _p$.o && (_p$.o = _$setProp4(_el$9, "fg", _v$4, _p$.o));
-            return _p$;
-          }, {
-            e: undefined,
-            t: undefined,
-            a: undefined,
-            o: undefined
-          });
-          return _el$2;
-        })();
+      get fallback() {
+        return _$createComponent4(For2, {
+          get each() {
+            return props.files;
+          },
+          children: (f, i) => fileRow(f, i(), f.file, "")
+        });
+      },
+      get children() {
+        return _$createComponent4(For2, {
+          get each() {
+            return rows();
+          },
+          children: (row) => row.kind === "dir" ? (() => {
+            var _el$1 = _$createElement4("box"), _el$10 = _$createElement4("text"), _el$12 = _$createElement4("text");
+            _$insertNode3(_el$1, _el$10);
+            _$insertNode3(_el$1, _el$12);
+            _$setProp4(_el$1, "flexDirection", "row");
+            _$setProp4(_el$1, "gap", 1);
+            _$setProp4(_el$1, "onMouseUp", () => props.onSelectDir(row.path));
+            _$insertNode3(_el$10, _$createTextNode3(` `));
+            _$setProp4(_el$10, "width", FILE_ROW_BADGE_WIDTH);
+            _$setProp4(_el$12, "wrapMode", "none");
+            _$insert4(_el$12, () => row.prefix, null);
+            _$insert4(_el$12, () => props.collapsed.has(row.path) ? "\u25B8 " : "\u25BE ", null);
+            _$insert4(_el$12, () => row.name, null);
+            _$effect3((_p$) => {
+              var _v$5 = ctx.theme.text.muted, _v$6 = ctx.theme.text.muted;
+              _v$5 !== _p$.e && (_p$.e = _$setProp4(_el$10, "fg", _v$5, _p$.e));
+              _v$6 !== _p$.t && (_p$.t = _$setProp4(_el$12, "fg", _v$6, _p$.t));
+              return _p$;
+            }, {
+              e: undefined,
+              t: undefined
+            });
+            return _el$1;
+          })() : fileRow(row.file, indexByFile().get(row.file.file) ?? -1, row.name, row.prefix)
+        });
       }
     }));
-    return _el$;
+    return _el$0;
   })();
 }
 
@@ -1039,12 +1257,12 @@ function bindSidebarFocus(ctx, opts) {
 import { createComponent as _$createComponent5 } from "@opentui/solid";
 import { effect as _$effect4 } from "@opentui/solid";
 import { insert as _$insert5 } from "@opentui/solid";
-import { memo as _$memo3 } from "@opentui/solid";
+import { memo as _$memo4 } from "@opentui/solid";
 import { createTextNode as _$createTextNode4 } from "@opentui/solid";
 import { insertNode as _$insertNode4 } from "@opentui/solid";
 import { setProp as _$setProp5 } from "@opentui/solid";
 import { createElement as _$createElement5 } from "@opentui/solid";
-import { Show as Show4 } from "solid-js";
+import { Show as Show5 } from "solid-js";
 function SidebarHeader(props) {
   const ctx = props.ctx;
   return (() => {
@@ -1059,9 +1277,9 @@ function SidebarHeader(props) {
     _$insertNode4(_el$3, _el$4);
     _$insertNode4(_el$4, _$createTextNode4(`Git Panel`));
     _$setProp5(_el$6, "flexGrow", 1);
-    _$insert5(_el$2, _$createComponent5(Show4, {
+    _$insert5(_el$2, _$createComponent5(Show5, {
       get when() {
-        return _$memo3(() => !!props.branch)() && props.fileCount > 0;
+        return _$memo4(() => !!props.branch)() && props.fileCount > 0;
       },
       get children() {
         return [(() => {
@@ -1082,9 +1300,9 @@ function SidebarHeader(props) {
         })()];
       }
     }), null);
-    _$insert5(_el$2, _$createComponent5(Show4, {
+    _$insert5(_el$2, _$createComponent5(Show5, {
       get when() {
-        return _$memo3(() => !!props.ready)() && props.fileCount > 0;
+        return _$memo4(() => !!props.ready)() && props.fileCount > 0;
       },
       get children() {
         return [(() => {
@@ -1102,9 +1320,9 @@ function SidebarHeader(props) {
         })()];
       }
     }), null);
-    _$insert5(_el$, _$createComponent5(Show4, {
+    _$insert5(_el$, _$createComponent5(Show5, {
       get when() {
-        return _$memo3(() => !!(props.ready && props.fileCount > 0))() && props.navMode;
+        return _$memo4(() => !!(props.ready && props.fileCount > 0))() && props.navMode;
       },
       get children() {
         var _el$15 = _$createElement5("box"), _el$16 = _$createElement5("box");
@@ -1112,7 +1330,7 @@ function SidebarHeader(props) {
         _$setProp5(_el$15, "flexDirection", "row");
         _$setProp5(_el$15, "gap", 1);
         _$setProp5(_el$16, "flexGrow", 1);
-        _$insert5(_el$15, _$createComponent5(Show4, {
+        _$insert5(_el$15, _$createComponent5(Show5, {
           get when() {
             return props.stageMode;
           },
@@ -1131,7 +1349,7 @@ function SidebarHeader(props) {
             return _el$17;
           }
         }), null);
-        _$insert5(_el$15, _$createComponent5(Show4, {
+        _$insert5(_el$15, _$createComponent5(Show5, {
           get when() {
             return props.hasStaged;
           },
@@ -1351,7 +1569,15 @@ function createListNavigation(ctx, files) {
 }
 
 // src/sidebar/staging.tsx
-import { createMemo as createMemo3 } from "solid-js";
+import { createMemo as createMemo4 } from "solid-js";
+function shouldStageAll(files, staged) {
+  return !files.every((f) => staged.has(f));
+}
+var HEAD_ERROR_RE = /could not resolve HEAD|ambiguous argument ['"]?HEAD|invalid object name ['"]?HEAD/i;
+function buildStageArgs(stage, files) {
+  const paths = files.map(shellQuote).join(" ");
+  return stage ? `add -- ${paths}` : `restore --staged -- ${paths}`;
+}
 function createStaging(ctx, git, location, refreshWorkingCopy) {
   const [stagedMem, setStagedMem] = ctx.storage.memory(STAGED_STORE_KEY, {
     initial: {
@@ -1359,7 +1585,7 @@ function createStaging(ctx, git, location, refreshWorkingCopy) {
       files: []
     }
   });
-  const staged = createMemo3(() => new Set(stagedMem.files));
+  const staged = createMemo4(() => new Set(stagedMem.files));
   if (stagedMem.directory !== location().directory) {
     setStagedMem((draft) => {
       draft.directory = location().directory;
@@ -1370,12 +1596,12 @@ function createStaging(ctx, git, location, refreshWorkingCopy) {
   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;
-        });
-      }
+      if (res.exit !== 0)
+        return;
+      const files = [...parseStagedPorcelain(res.output)];
+      setStagedMem((draft) => {
+        draft.files = files;
+      });
     } catch {}
   };
   const scheduleRefresh = async () => {
@@ -1386,43 +1612,54 @@ function createStaging(ctx, git, location, refreshWorkingCopy) {
     });
     return refreshTask;
   };
-  const applyChange = (file, stage) => {
+  const toastError = (message) => ctx.ui.toast.show({
+    message,
+    variant: "error"
+  });
+  const tail = (output) => output.trim().slice(0, 200);
+  const stageFiles = async (stage, files) => {
+    const res = await git.run(buildStageArgs(stage, files));
+    if (res.exit === 0)
+      return;
+    if (!stage && HEAD_ERROR_RE.test(res.output)) {
+      for (const file of files) {
+        const q = shellQuote(file);
+        let r = await git.run(`restore --staged -- ${q}`);
+        if (r.exit !== 0 && HEAD_ERROR_RE.test(r.output))
+          r = await git.run(`rm --cached -- ${q}`);
+        if (r.exit !== 0)
+          toastError(`git restore failed: ${tail(r.output)}`);
+      }
+      return;
+    }
+    toastError(`git ${stage ? "add" : "restore"} failed: ${tail(res.output)}`);
+  };
+  const applyFiles = (files, stage) => {
+    if (files.length === 0)
+      return;
     setStagedMem((draft) => {
       const next = new Set(draft.files);
-      if (stage)
-        next.add(file);
-      else
-        next.delete(file);
+      for (const file of files) {
+        if (stage)
+          next.add(file);
+        else
+          next.delete(file);
+      }
       draft.files = [...next];
     });
     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();
+        await stageFiles(stage, files);
       } catch (e) {
-        ctx.ui.toast.show({
-          message: `git failed: ${friendlyError(e)}`,
-          variant: "error"
-        });
+        toastError(`git failed: ${friendlyError(e)}`);
+      } finally {
         await fetchStatuses();
-        return;
       }
     });
   };
-  const toggle = (file) => {
-    applyChange(file, !staged().has(file));
-  };
+  const applyChange = (file, stage) => applyFiles([file], stage);
+  const toggle = (file) => applyChange(file, !staged().has(file));
+  const toggleAll = (files) => applyFiles(files, shouldStageAll(files, staged()));
   const commit = async () => {
     await scheduleRefresh();
     if (staged().size === 0) {
@@ -1442,10 +1679,7 @@ function createStaging(ctx, git, location, refreshWorkingCopy) {
       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"
-          });
+          toastError(`git commit failed: ${tail(res.output)}`);
         } else {
           ctx.ui.toast.show({
             message: "Committed",
@@ -1453,10 +1687,7 @@ function createStaging(ctx, git, location, refreshWorkingCopy) {
           });
         }
       } catch (e) {
-        ctx.ui.toast.show({
-          message: `git commit failed: ${friendlyError(e)}`,
-          variant: "error"
-        });
+        toastError(`git commit failed: ${friendlyError(e)}`);
       }
       await refreshWorkingCopy();
     });
@@ -1466,23 +1697,24 @@ function createStaging(ctx, git, location, refreshWorkingCopy) {
     scheduleRefresh,
     applyChange,
     toggle,
+    toggleAll,
     commit
   };
 }
 
 // src/sidebar/status.tsx
 import { insert as _$insert6 } from "@opentui/solid";
-import { memo as _$memo4 } from "@opentui/solid";
+import { memo as _$memo5 } from "@opentui/solid";
 import { createComponent as _$createComponent6 } from "@opentui/solid";
 import { setProp as _$setProp6 } from "@opentui/solid";
 import { effect as _$effect5 } from "@opentui/solid";
 import { createTextNode as _$createTextNode5 } from "@opentui/solid";
 import { insertNode as _$insertNode5 } from "@opentui/solid";
 import { createElement as _$createElement6 } from "@opentui/solid";
-import { Show as Show5 } from "solid-js";
+import { Show as Show6 } from "solid-js";
 function SidebarStatus(props) {
   const ctx = props.ctx;
-  return [_$createComponent6(Show5, {
+  return [_$createComponent6(Show6, {
     get when() {
       return props.loading;
     },
@@ -1492,9 +1724,9 @@ function SidebarStatus(props) {
       _$effect5((_$p) => _$setProp6(_el$, "fg", ctx.theme.text.muted, _$p));
       return _el$;
     }
-  }), _$createComponent6(Show5, {
+  }), _$createComponent6(Show6, {
     get when() {
-      return _$memo4(() => !!!props.loading)() && props.error;
+      return _$memo5(() => !!!props.loading)() && props.error;
     },
     get children() {
       var _el$3 = _$createElement6("text");
@@ -1502,9 +1734,9 @@ function SidebarStatus(props) {
       _$effect5((_$p) => _$setProp6(_el$3, "fg", ctx.theme.text.feedback.error.base, _$p));
       return _el$3;
     }
-  }), _$createComponent6(Show5, {
+  }), _$createComponent6(Show6, {
     get when() {
-      return _$memo4(() => !!(!props.loading && !props.error && !props.hasFiles))() && !props.branch;
+      return _$memo5(() => !!(!props.loading && !props.error && !props.hasFiles))() && !props.hasHead;
     },
     get children() {
       var _el$4 = _$createElement6("text");
@@ -1512,9 +1744,9 @@ function SidebarStatus(props) {
       _$effect5((_$p) => _$setProp6(_el$4, "fg", ctx.theme.text.muted, _$p));
       return _el$4;
     }
-  }), _$createComponent6(Show5, {
+  }), _$createComponent6(Show6, {
     get when() {
-      return _$memo4(() => !!(!props.loading && !props.error && !props.hasFiles))() && !!props.branch;
+      return _$memo5(() => !!(!props.loading && !props.error && !props.hasFiles))() && props.hasHead;
     },
     get children() {
       var _el$6 = _$createElement6("text");
@@ -1526,44 +1758,69 @@ function SidebarStatus(props) {
 }
 
 // src/sidebar/working-copy.tsx
-import { createEffect as createEffect2, createMemo as createMemo4, createSignal as createSignal2, onCleanup as onCleanup3 } from "solid-js";
-function createWorkingCopy(ctx, location, onRefreshed) {
+import { createEffect as createEffect2, createMemo as createMemo5, createSignal as createSignal2, onCleanup as onCleanup3 } from "solid-js";
+var EMPTY_VCS = {
+  files: [],
+  branch: "",
+  hasHead: true
+};
+function createWorkingCopy(ctx, location, git, onRefreshed) {
   const [files, setFiles] = createSignal2([]);
   const [branch, setBranch] = createSignal2("");
+  const [hasHead, setHasHead] = createSignal2(true);
   const [loading, setLoading] = createSignal2(true);
   const [error, setError] = createSignal2(undefined);
   let isRefreshing = false;
   let lastEventRefreshAt = 0;
-  const refresh = async () => {
-    if (isRefreshing)
-      return;
-    isRefreshing = true;
+  const applyFiles = (next) => {
+    const prevByFile = new Map(files().map((f) => [f.file, f]));
+    setFiles(next.map((d) => {
+      const p = prevByFile.get(d.file);
+      return p && p.additions === d.additions && p.deletions === d.deletions && p.status === d.status ? p : {
+        ...d
+      };
+    }));
+  };
+  const loadFromVcs = async (loc) => {
     try {
-      const loc = location();
       const [statusRes, infoRes] = await Promise.all([ctx.client.vcs.status({
         location: loc
       }), ctx.client.vcs.get({
         location: loc
       })]);
-      const prevByFile = new Map(files().map((f) => [f.file, f]));
-      setFiles(statusRes.data.map((d) => {
-        const p = prevByFile.get(d.file);
-        return p && p.additions === d.additions && p.deletions === d.deletions && p.status === d.status ? p : {
-          ...d
-        };
-      }));
-      setBranch(infoRes.data.branch.current ?? "");
+      return {
+        files: statusRes.data,
+        branch: infoRes.data.branch.current ?? "",
+        hasHead: true
+      };
+    } catch {
+      return EMPTY_VCS;
+    }
+  };
+  const isEmpty = (s) => s.files.length === 0 && s.branch === "";
+  const refresh = async () => {
+    if (isRefreshing)
+      return;
+    isRefreshing = true;
+    try {
+      const vcs = await loadFromVcs(location());
+      const next = isEmpty(vcs) ? await git.enqueue(() => fetchWorkingCopyFallback(git)) : vcs;
+      applyFiles(next.files);
+      setBranch(next.branch);
+      setHasHead(next.hasHead);
+      onRefreshed(next.files.length);
       setError(undefined);
-      onRefreshed(statusRes.data.length);
     } catch (e) {
+      applyFiles([]);
+      setBranch("");
       setError(friendlyError(e));
     } finally {
       setLoading(false);
       isRefreshing = false;
     }
   };
-  const additions = createMemo4(() => files().reduce((n, f) => n + f.additions, 0));
-  const deletions = createMemo4(() => files().reduce((n, f) => n + f.deletions, 0));
+  const additions = createMemo5(() => files().reduce((n, f) => n + f.additions, 0));
+  const deletions = createMemo5(() => files().reduce((n, f) => n + f.deletions, 0));
   const [refreshSignal, bumpRefresh] = ctx.storage.memory(REFRESH_STORE_KEY, {
     initial: {
       nonce: 0
@@ -1598,6 +1855,7 @@ function createWorkingCopy(ctx, location, onRefreshed) {
   return {
     files,
     branch,
+    hasHead,
     loading,
     error,
     additions,
@@ -1613,6 +1871,7 @@ function GitChangesView(props) {
     ctx
   } = props;
   const [sidebarWidth, setSidebarWidth] = createSignal3(46);
+  const [collapsedDirs, setCollapsedDirs] = createSignal3(new Set);
   const [diffView] = useDiffStore(ctx);
   let sidebarNode;
   const currentLocation = () => {
@@ -1622,8 +1881,8 @@ function GitChangesView(props) {
     };
   };
   const git = createGitRunner(ctx, () => currentLocation().directory);
-  const openDiff = createDiffOpener(ctx, currentLocation);
-  const workingCopy = createWorkingCopy(ctx, currentLocation, (count) => {
+  const openDiff = createDiffOpener(ctx, currentLocation, git);
+  const workingCopy = createWorkingCopy(ctx, currentLocation, git, (count) => {
     nav.clampSelection(count);
     staging.scheduleRefresh();
   });
@@ -1646,6 +1905,30 @@ function GitChangesView(props) {
     else
       openDiff(f).catch(() => {});
   };
+  const toggleCollapsed = (dirPath) => setCollapsedDirs((prev) => {
+    const next = new Set(prev);
+    if (!next.delete(dirPath))
+      next.add(dirPath);
+    return next;
+  });
+  const selectDir = (dirPath) => {
+    if (!nav.stageMode()) {
+      toggleCollapsed(dirPath);
+      return;
+    }
+    const contained = workingCopy.files().map((f, i) => ({
+      f,
+      i
+    })).filter(({
+      f
+    }) => f.file.startsWith(dirPath));
+    if (contained.length === 0)
+      return;
+    staging.toggleAll(contained.map(({
+      f
+    }) => f.file));
+    nav.setSelected(contained[0].i);
+  };
   workingCopy.refresh().catch(() => {});
   staging.scheduleRefresh().catch(() => {});
   registerSidebarKeymaps(ctx, {
@@ -1734,12 +2017,12 @@ function GitChangesView(props) {
     get hasFiles() {
       return hasFiles();
     },
-    get branch() {
-      return workingCopy.branch();
+    get hasHead() {
+      return workingCopy.hasHead();
     }
-  }), _$createComponent7(Show6, {
+  }), _$createComponent7(Show7, {
     get when() {
-      return _$memo5(() => !!ready())() && hasFiles();
+      return _$memo6(() => !!ready())() && hasFiles();
     },
     get children() {
       return _$createComponent7(FileList, {
@@ -1759,11 +2042,18 @@ function GitChangesView(props) {
         get width() {
           return sidebarWidth();
         },
-        onSelect: selectFile
+        get treeStyle() {
+          return folderTree(ctx);
+        },
+        get collapsed() {
+          return collapsedDirs();
+        },
+        onSelect: selectFile,
+        onSelectDir: selectDir
       });
     }
   })];
-  return _$createComponent7(Show6, {
+  return _$createComponent7(Show7, {
     get when() {
       return nav.navMode();
     },
@@ -1822,7 +2112,12 @@ var tui_default = Plugin.define({
   }
 });
 export {
+  porcelainChangeStatus,
   parseStagedPorcelain,
+  parsePorcelainRecords,
+  parseNumstat,
   parseDiff,
-  tui_default as default
+  tui_default as default,
+  buildFileTree,
+  buildFallbackFiles
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "opencode-git-plugin",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "OpenCode v2 TUI sidebar plugin listing git working-copy changes with diff preview",
   "type": "module",
   "exports": {