my-durable 0.0.23 → 0.0.25

package/apps/dpi-backend/src/git.ts

@@ -167,6 +167,7 @@ export async function gitStatus(path: string): Promise<GitStatus> {
 export type GitOp =
   | "diff"
   | "log"
+  | "log-list"
   | "fetch"
   | "pull"
   | "switch"
@@ -174,7 +175,13 @@ export type GitOp =
   | "commit"
   | "worktree-list"
   | "worktree-add"
-  | "worktree-remove";
+  | "worktree-remove"
+  | "push"
+  | "stage"
+  | "discard"
+  | "diff-file"
+  | "stash-push"
+  | "stash-pop";
 
 /** Plain string an arg may never contain — we build argv ourselves anyway. */
 const safeRef = (s: string) => /^[\w./@+-]+$/.test(s) && !s.includes("..");
@@ -183,14 +190,39 @@ const safeRef = (s: string) => /^[\w./@+-]+$/.test(s) && !s.includes("..");
 export async function gitOp(
   path: string,
   op: GitOp,
-  opts: { ref?: string; message?: string; target?: string; branch?: string; files?: string[] } = {},
-): Promise<{ text: string }> {
-  const { ref, message, target, branch, files } = opts;
+  opts: {
+    ref?: string;
+    message?: string;
+    target?: string;
+    branch?: string;
+    files?: string[];
+    create?: boolean;
+    staged?: boolean;
+  } = {},
+): Promise<{ text: string; commits?: { hash: string; refs: string; author: string; date: string; subject: string }[] }> {
+  const { ref, message, target, branch, files, create, staged } = opts;
   switch (op) {
     case "diff":
       return { text: await git(path, ["--no-pager", "diff", ...(ref && safeRef(ref) ? [ref] : [])]) };
     case "log":
       return { text: (await git(path, ["--no-pager", "log", "--oneline", "-n", "30", ...(ref && safeRef(ref) ? [ref] : [])])).trimEnd() };
+    case "log-list": {
+      // IntelliJ's log window: hash, refs, author, date, subject — structured.
+      const raw = await git(
+        path,
+        ["--no-pager", "log", "-n", "50", "--date=short", "--pretty=format:%h%x1f%D%x1f%an%x1f%ad%x1f%s"],
+      );
+      return {
+        text: "",
+        commits: raw
+          .split("\n")
+          .filter(Boolean)
+          .map((l) => {
+            const [hash, refs, author, date, subject] = l.split("\x1f");
+            return { hash: hash ?? "", refs: refs ?? "", author: author ?? "", date: date ?? "", subject: subject ?? "" };
+          }),
+      };
+    }
     case "fetch":
       return { text: (await git(path, ["fetch", "--all", "--prune"])).trim() || "fetched" };
     case "pull":
@@ -199,8 +231,28 @@ export async function gitOp(
       return { text: (await git(path, ["--no-pager", "branch", "-vv"])).trimEnd() };
     case "switch": {
       if (!ref || !safeRef(ref)) throw Error("switch needs a branch name (letters, digits, ./-_)");
-      return { text: (await git(path, ["switch", ref])).trim() };
+      // create:true = git switch -c — IntelliJ's "new branch" action.
+      return { text: (await git(path, ["switch", ...(create ? ["-c"] : []), ref])).trim() };
+    }
+    case "push":
+      return { text: (await git(path, ["push"], GIT_SLOW_TIMEOUT)).trim() || "pushed (or nothing to push)" };
+    case "stage": {
+      if (!files?.length) throw Error("stage needs files");
+      return { text: (await git(path, ["add", "--", ...files])).trim() || `staged ${files.length} file(s)` };
+    }
+    case "discard": {
+      // IntelliJ's Rollback: index AND worktree back to HEAD for these paths.
+      if (!files?.length) throw Error("discard needs files");
+      return { text: (await git(path, ["checkout", "HEAD", "--", ...files])).trim() || `discarded ${files.length} file(s)` };
+    }
+    case "diff-file": {
+      if (!target) throw Error("diff-file needs a file path");
+      return { text: (await git(path, ["--no-pager", "diff", ...(staged ? ["--cached"] : []), "HEAD", "--", target])).trim() || "no diff" };
     }
+    case "stash-push":
+      return { text: (await git(path, ["stash", "push", ...(message ? ["-m", message] : [])])).trim() || "stashed" };
+    case "stash-pop":
+      return { text: (await git(path, ["stash", "pop"])).trim() || "stash popped" };
     case "commit": {
       const msg = (message ?? "").trim();
       if (!msg) throw Error("commit needs a message");

package/apps/dpi-backend/src/routes.ts

@@ -11,7 +11,7 @@ import type { DevicePairing } from "./pairing.js";
 type Async = (req: Request, res: Response) => Promise<unknown>;
 const route = (fn: Async) => (req: Request, res: Response, next: NextFunction) => fn(req, res).catch(next);
 import { gitOp, gitStatus, gitStatusBatch, type GitOp } from "./git.ts";
-const GIT_OPS: GitOp[] = ["diff", "log", "fetch", "pull", "switch", "branch", "commit", "worktree-list", "worktree-add", "worktree-remove"];
+const GIT_OPS: GitOp[] = ["diff", "log", "log-list", "fetch", "pull", "push", "switch", "branch", "commit", "stage", "discard", "diff-file", "stash-push", "stash-pop", "worktree-list", "worktree-add", "worktree-remove"];
 
 interface Locals {
   row: SessionRow;