@tmustier/pi-files-widget 0.1.20 → 0.2.0

package/file-viewer.ts

@@ -1,4 +1,4 @@
-import { visibleWidth, wrapTextWithAnsi } from "@mariozechner/pi-tui";
+import { visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { execSync } from "node:child_process";
 import { readFileSync, statSync } from "node:fs";
 

package/git.ts

@@ -11,6 +11,27 @@ export function isGitRepo(cwd: string): boolean {
   }
 }
 
+/**
+ * Path of `cwd` relative to the repository top-level (e.g. "app/"), or "" when
+ * `cwd` is the top-level itself. `git status --porcelain` reports paths relative
+ * to the repository root, while `git ls-files` (and this widget's node keys) are
+ * relative to `cwd` — this prefix lets us translate between the two.
+ */
+function getGitPathPrefix(cwd: string): string {
+  try {
+    return execSync("git rev-parse --show-prefix", { cwd, encoding: "utf-8", timeout: 2000, stdio: "pipe" }).trim();
+  } catch {
+    return "";
+  }
+}
+
+/** Convert a repo-root-relative path to a cwd-relative one; null if outside cwd. */
+function stripPathPrefix(filePath: string, prefix: string): string | null {
+  if (!prefix) return filePath;
+  if (filePath.startsWith(prefix)) return filePath.slice(prefix.length);
+  return null;
+}
+
 export function getGitStatus(cwd: string, options: { includeIgnored?: boolean } = {}): Map<string, string> {
   const status = new Map<string, string>();
   try {
@@ -18,11 +39,13 @@ export function getGitStatus(cwd: string, options: { includeIgnored?: boolean }
     if (options.includeIgnored !== false) {
       flags.push("--ignored");
     }
+    const prefix = getGitPathPrefix(cwd);
     const output = execSync(`git status ${flags.join(" ")}`, { cwd, encoding: "utf-8", timeout: 5000, stdio: "pipe" });
     for (const line of output.split("\n")) {
       if (line.length < 3) continue;
       const statusCode = line.slice(0, 2).trim() || "?";
-      const filePath = line.slice(3);
+      const filePath = stripPathPrefix(line.slice(3), prefix);
+      if (filePath === null || !filePath) continue;
       status.set(filePath, statusCode);
     }
   } catch {}
@@ -39,6 +62,7 @@ export function getGitFileList(cwd: string): string[] {
   } catch {}
 
   try {
+    const prefix = getGitPathPrefix(cwd);
     const statusOutput = execSync("git status --porcelain -uall -z", { cwd, encoding: "utf-8", timeout: 5000, stdio: "pipe" });
     const entries = statusOutput.split("\0");
     for (let i = 0; i < entries.length; i++) {
@@ -52,8 +76,9 @@ export function getGitFileList(cwd: string): string[] {
       } else if (filePath.includes(" -> ")) {
         filePath = filePath.split(" -> ").pop() || filePath;
       }
-      if (filePath) {
-        files.add(filePath);
+      const relPath = filePath ? stripPathPrefix(filePath, prefix) : null;
+      if (relPath) {
+        files.add(relPath);
       }
     }
   } catch {}
@@ -72,8 +97,10 @@ export function getGitBranch(cwd: string): string {
 export function getGitDiffStats(cwd: string): Map<string, DiffStats> {
   const stats = new Map<string, DiffStats>();
   try {
-    // Get diff stats for modified files
-    const output = execSync("git diff --numstat HEAD", { cwd, encoding: "utf-8", timeout: 5000, stdio: "pipe" });
+    // Get diff stats for modified files. --relative keeps paths relative to cwd
+    // (and scoped to it) so they match the widget's cwd-relative node keys even
+    // when cwd is a subdirectory of the repository.
+    const output = execSync("git diff --relative --numstat HEAD", { cwd, encoding: "utf-8", timeout: 5000, stdio: "pipe" });
     for (const line of output.split("\n")) {
       const parts = line.split("\t");
       if (parts.length >= 3) {
@@ -84,7 +111,7 @@ export function getGitDiffStats(cwd: string): Map<string, DiffStats> {
       }
     }
     // Also get stats for staged files
-    const stagedOutput = execSync("git diff --numstat --cached", { cwd, encoding: "utf-8", timeout: 5000, stdio: "pipe" });
+    const stagedOutput = execSync("git diff --relative --numstat --cached", { cwd, encoding: "utf-8", timeout: 5000, stdio: "pipe" });
     for (const line of stagedOutput.split("\n")) {
       const parts = line.split("\t");
       if (parts.length >= 3) {

package/index.ts

@@ -5,14 +5,37 @@
  * Use /readfiles to open the file browser, navigate with j/k, Enter to view.
  */
 
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { join } from "node:path";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { statSync } from "node:fs";
+import { homedir } from "node:os";
+import { isAbsolute, join, resolve } from "node:path";
 
 import { createFileBrowser } from "./browser";
 import { POLL_INTERVAL_MS } from "./constants";
 import { formatCommentMessage } from "./comment";
 import { hasCommand } from "./utils";
 
+function resolveInitialPath(arg: string | undefined, cwd: string): { path: string; error?: string } {
+  if (!arg) return { path: cwd };
+  let candidate = arg.trim();
+  if (!candidate) return { path: cwd };
+  const home = homedir();
+  if (candidate === "~") {
+    candidate = home;
+  } else if (candidate.startsWith("~/")) {
+    candidate = join(home, candidate.slice(2));
+  }
+  const absolute = isAbsolute(candidate) ? candidate : resolve(cwd, candidate);
+  try {
+    if (!statSync(absolute).isDirectory()) {
+      return { path: cwd, error: `${absolute} is not a directory` };
+    }
+  } catch {
+    return { path: cwd, error: `${absolute} is not accessible` };
+  }
+  return { path: absolute };
+}
+
 export default function editorExtension(pi: ExtensionAPI): void {
   const cwd = process.cwd();
   const agentModifiedFiles = new Set<string>();
@@ -20,14 +43,21 @@ export default function editorExtension(pi: ExtensionAPI): void {
   const getMissingDeps = () => requiredDeps.filter((dep) => !hasCommand(dep));
 
   pi.registerCommand("readfiles", {
-    description: "Open file browser",
-    handler: async (_args, ctx) => {
+    description: "Open file browser (optional: /readfiles <path> to start outside the current directory)",
+    handler: async (args, ctx) => {
       const missing = getMissingDeps();
       if (missing.length > 0) {
         ctx.ui.notify(`files-widget requires ${missing.join(", ")}. Install: brew install bat git-delta glow`, "error");
         return;
       }
 
+      const resolved = resolveInitialPath(args, cwd);
+      if (resolved.error) {
+        ctx.ui.notify(resolved.error, "error");
+        return;
+      }
+      const initialPath = resolved.path;
+
       await ctx.ui.custom<void>((tui, theme, _kb, done) => {
         let pollInterval: ReturnType<typeof setInterval> | null = null;
 
@@ -51,7 +81,15 @@ export default function editorExtension(pi: ExtensionAPI): void {
         };
 
         const requestRender = () => tui.requestRender();
-        const browser = createFileBrowser(cwd, agentModifiedFiles, theme, cleanup, requestComment, requestRender);
+        const browser = createFileBrowser(
+          initialPath,
+          agentModifiedFiles,
+          theme,
+          cleanup,
+          requestComment,
+          requestRender,
+          cwd
+        );
 
         pollInterval = setInterval(() => {
           requestRender();

package/input-utils.ts

@@ -1,4 +1,4 @@
-import { decodeKittyPrintable } from "@mariozechner/pi-tui";
+import { decodeKittyPrintable } from "@earendil-works/pi-tui";
 
 const CONTROL_CHARS = /[\u0000-\u0008\u000B-\u001F\u007F]/g;
 const BRACKETED_PASTE_START = "\u001b[200~";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmustier/pi-files-widget",
-  "version": "0.1.20",
+  "version": "0.2.0",
   "description": "In-terminal file browser and viewer for Pi.",
   "license": "MIT",
   "author": "Thomas Mustier",
@@ -15,8 +15,8 @@
   "bugs": "https://github.com/tmustier/pi-extensions/issues",
   "homepage": "https://github.com/tmustier/pi-extensions/tree/main/files-widget",
   "peerDependencies": {
-    "@mariozechner/pi-coding-agent": "*",
-    "@mariozechner/pi-tui": "*"
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*"
   },
   "scripts": {
     "postinstall": "node -e \"console.log('pi-files-widget: required deps: bat, delta, glow. Install with: brew install bat git-delta glow')\""
@@ -26,5 +26,9 @@
       "index.ts"
     ],
     "video": "https://raw.githubusercontent.com/tmustier/pi-extensions/main/files-widget/demo.mp4"
+  },
+  "devDependencies": {
+    "@earendil-works/pi-coding-agent": "^0.80.3",
+    "@earendil-works/pi-tui": "^0.80.3"
   }
 }

package/utils.ts

@@ -2,7 +2,8 @@ import { execSync } from "node:child_process";
 
 export function hasCommand(cmd: string): boolean {
   try {
-    execSync(`which ${cmd}`, { stdio: "ignore" });
+    const checkCmd = process.platform === "win32" ? "where" : "which";
+    execSync(`${checkCmd} ${cmd}`, { stdio: "ignore" });
     return true;
   } catch {
     return false;

package/viewer.ts

@@ -1,5 +1,5 @@
-import type { Theme } from "@mariozechner/pi-coding-agent";
-import { Key, matchesKey, truncateToWidth, wrapTextWithAnsi } from "@mariozechner/pi-tui";
+import type { Theme } from "@earendil-works/pi-coding-agent";
+import { Key, matchesKey, truncateToWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { readFileSync, statSync } from "node:fs";
 import { relative } from "node:path";
 
@@ -59,11 +59,17 @@ export interface ViewerController {
   handleInput(data: string): ViewerAction;
 }
 
+export interface ViewerConfig {
+  getRoot: () => string;
+  projectCwd: string;
+}
+
 export function createViewer(
-  cwd: string,
+  config: ViewerConfig,
   theme: Theme,
   requestComment: (payload: CommentPayload, comment: string) => void
 ): ViewerController {
+  const { getRoot, projectCwd } = config;
   const searchInput = createTextInputBuffer();
   const commentInput = createTextInputBuffer({ preserveNewlines: true });
 
@@ -177,7 +183,7 @@ export function createViewer(
     if (!state.file) return;
     refreshRawContent();
     const hasChanges = !!state.file.gitStatus;
-    const result = loadFileContent(state.file.path, cwd, state.diffMode, hasChanges, width, state.renderMarkdown);
+    const result = loadFileContent(state.file.path, getRoot(), state.diffMode, hasChanges, width, state.renderMarkdown);
     state.content = result.lines;
     state.renderMarkdown = result.renderedMarkdown;
     state.lastRenderWidth = width;
@@ -242,7 +248,8 @@ export function createViewer(
 
     const rawLines = state.rawContent.split("\n");
     const selectedText = rawLines.slice(state.selectStart, state.selectEnd + 1).join("\n");
-    const relPath = relative(cwd, state.file.path);
+    const rel = relative(projectCwd, state.file.path);
+    const relPath = !rel || rel.startsWith("..") ? state.file.path : rel;
     const lineRange = state.selectStart === state.selectEnd
       ? `line ${state.selectStart + 1}`
       : `lines ${state.selectStart + 1}-${state.selectEnd + 1}`;