@xbzbing/dsh-git-panel 0.2.0 → 0.3.0

package/lib/host/core.d.ts

@@ -1,5 +1,5 @@
 import type { GitRunner } from './git.ts';
-import type { GitChange, GitErrorCode, GitSnapshotResult } from './types.ts';
+import type { DiffViewMode, GitChange, GitErrorCode, GitSnapshotResult } from './types.ts';
 export interface GitPanelConfig {
     readonly timeoutMs: number;
     /** Per-command stdout cap; also the per-side image-diff payload cap. */
@@ -8,9 +8,13 @@ export interface GitPanelConfig {
     readonly refreshIntervalMs: number;
     /** Whether the input-bar git marker pill is shown. */
     readonly showInputPill: boolean;
+    /** Default diff layout the views open with (user can switch per-diff). */
+    readonly defaultDiffView: DiffViewMode;
 }
 export declare const DEFAULT_CONFIG: GitPanelConfig;
 export declare function normalizeConfig(raw: unknown): GitPanelConfig;
+/** Read the default-diff-view field, unwrapping a schemastery volatile ref. */
+export declare function readDiffView(value: unknown, fallback: DiffViewMode): DiffViewMode;
 /**
  * Read a boolean config field, unwrapping a schemastery volatile reference
  * (`{ get() }`) so a live-editable toggle reflects the latest value. Absent or
@@ -28,6 +32,11 @@ export interface SnapshotDeps {
         }>;
         /** Raw bytes (no encoding) — image sides for the image-diff query. */
         readFile(path: string): Promise<Buffer>;
+        /** One directory's entries (name + is-directory) — the file browser. */
+        readdir(path: string): Promise<ReadonlyArray<{
+            name: string;
+            isDirectory: boolean;
+        }>>;
         /** Best-effort unlink (force) — temp-blob cleanup. */
         remove(path: string): Promise<void>;
     };
@@ -62,10 +71,27 @@ export type WorkspaceResolution = {
         ok: false;
     };
 };
+/**
+ * Resolve a directory root for the file browser, which must work outside a git
+ * repository too. Inside a repo it is the work-tree top; otherwise it falls
+ * back to the session's cwd (realpath'd) so directory listing / file preview
+ * still function. Only a missing cwd is a hard failure.
+ */
+export declare function resolveBrowseRoot(deps: SnapshotDeps, sessionId: string): Promise<{
+    ok: true;
+    root: string;
+    isGitRepo: boolean;
+} | {
+    ok: false;
+    error: {
+        code: GitErrorCode;
+        message?: string;
+    };
+}>;
 /** Resolve the git work-tree root for a session's cwd. */
 export declare function resolveWorkspace(deps: SnapshotDeps, sessionId: string): Promise<WorkspaceResolution>;
 /** Run one git command; a spawn-level failure returns { failure }. */
-export declare function runCommand(runner: GitRunner, argv: readonly string[], cwd: string, _label: string, signal?: AbortSignal): Promise<{
+export declare function runCommand(runner: GitRunner, argv: readonly string[], cwd: string, _label: string, signal?: AbortSignal, stdinData?: string): Promise<{
     run: Awaited<ReturnType<GitRunner['run']>>;
 } | {
     failure: unknown;

package/lib/host/git.d.ts

@@ -10,7 +10,9 @@ interface SpawnSpec {
     readonly argv: readonly string[];
     readonly cwd: string;
     readonly stdio: {
-        readonly stdin: 'ignore';
+        readonly stdin: 'ignore' | {
+            readonly data: string;
+        };
         readonly stdout: CollectDisposition;
         readonly stderr: CollectDisposition;
     };
@@ -53,6 +55,7 @@ export interface GitRunner {
     run(argv: readonly string[], opts: {
         readonly cwd: string;
         readonly signal?: AbortSignal;
+        readonly stdinData?: string;
     }): Promise<GitRunResult>;
 }
 /**

package/lib/host/index.d.ts

@@ -10,7 +10,7 @@ import { TypertRemoteService } from '@deepseek-ai/dsh-typert-protocol';
 import type { Context } from '@deepseek-ai/cordis';
 import Schema from '@deepseek-ai/schemastery';
 import type { GitActionRequest, GitActionResult, GitQueryRequest, GitQueryResponse, GitSnapshotRequest, GitSnapshotResult, GitVersionInfo, GitVersionRequest } from './types.ts';
-export type { GitSnapshot, GitSnapshotResult, GitSnapshotRequest, GitFailure, GitCommit, GraphCommit, GitRef, GitChange, GitChangeStatus, GitAction, GitActionRequest, GitActionResult, GitErrorCode, GitQuery, GitQueryRequest, GitQueryResponse, GitQueryResult, GitBranch, GitFileStat, WorktreeStats, GitVersionRequest, GitVersionInfo, } from './types.ts';
+export type { GitSnapshot, GitSnapshotResult, GitSnapshotRequest, GitFailure, GitCommit, GraphCommit, GitRef, GitChange, GitChangeStatus, GitAction, GitActionRequest, GitActionResult, GitErrorCode, GitQuery, GitQueryRequest, GitQueryResponse, GitQueryResult, GitBranch, GitFileStat, WorktreeStats, GitVersionRequest, GitVersionInfo, DiffViewMode, DirEntry, } from './types.ts';
 export { normalizeConfig, DEFAULT_CONFIG, snapshotForSession, resolveWorkspace } from './core.ts';
 export { createGitRunner } from './git.ts';
 export { parseStatus, parseGraphLog, parseBranches, parseNameStatus, sumNumstat } from './parser.ts';
@@ -20,14 +20,17 @@ export { readVersionInfo, checkLatestVersion, compareVersions, parseRepository }
 export declare class GitPanelService extends TypertRemoteService {
     static inject: string[];
     /**
-     * Config schema surfaced on the plugin detail page. Only `showInputPill` is
-     * `.volatile()`, so the settings host renders it as a live-editable toggle;
-     * the operational limits stay profile-only and out of the UI form.
+     * Config schema surfaced on the plugin detail page. `showInputPill` and
+     * `defaultDiffView` are `.volatile()`, so the settings host renders them as
+     * live-editable controls; the operational limits stay profile-only and out
+     * of the UI form.
      */
     static Config: Schema<Schemastery.ObjectS<NoInfer<{
         showInputPill: Schema<boolean, boolean, "volatile-defined">;
+        defaultDiffView: Schema<"split" | "unified", "split" | "unified", "volatile-defined">;
     }>>, Schemastery.ObjectT<NoInfer<{
         showInputPill: Schema<boolean, boolean, "volatile-defined">;
+        defaultDiffView: Schema<"split" | "unified", "split" | "unified", "volatile-defined">;
     }>>, "plain">;
     private readonly deps;
     private config;

package/lib/host/index.js

@@ -50,7 +50,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
 // src/host/index.ts
 import { Remote, TypertRemoteService } from "@deepseek-ai/dsh-typert-protocol";
 import Schema from "@deepseek-ai/schemastery";
-import { readFile as readFile3, realpath, rm, stat } from "node:fs/promises";
+import { readFile as readFile3, readdir, realpath, rm, stat } from "node:fs/promises";
 
 // src/host/git.ts
 import { readFile } from "node:fs/promises";
@@ -66,7 +66,7 @@ function createGitRunner(subprocess, timeoutMs, maxBytes) {
           argv,
           cwd: opts.cwd,
           stdio: {
-            stdin: "ignore",
+            stdin: opts.stdinData === void 0 ? "ignore" : { data: opts.stdinData },
             stdout: { collect: { maxBytes, spill: { maxBytes: spillMaxBytes } } },
             stderr: { collect: { maxBytes, spill: { maxBytes: spillMaxBytes } } }
           },
@@ -305,7 +305,8 @@ var DEFAULT_CONFIG = {
   maxBytes: 4 * 1024 * 1024,
   maxChanges: 1e3,
   refreshIntervalMs: 3e4,
-  showInputPill: true
+  showInputPill: true,
+  defaultDiffView: "unified"
 };
 function normalizeConfig(raw) {
   const c = raw ?? {};
@@ -315,14 +316,35 @@ function normalizeConfig(raw) {
     maxBytes: num(c.maxBytes, DEFAULT_CONFIG.maxBytes),
     maxChanges: num(c.maxChanges, DEFAULT_CONFIG.maxChanges),
     refreshIntervalMs: num(c.refreshIntervalMs, DEFAULT_CONFIG.refreshIntervalMs),
-    showInputPill: readBool(c.showInputPill, DEFAULT_CONFIG.showInputPill)
+    showInputPill: readBool(c.showInputPill, DEFAULT_CONFIG.showInputPill),
+    defaultDiffView: readDiffView(c.defaultDiffView, DEFAULT_CONFIG.defaultDiffView)
   };
 }
+function unwrapVolatile(value) {
+  return value !== null && typeof value === "object" && "get" in value && typeof value.get === "function" ? value.get() : value;
+}
+function readDiffView(value, fallback) {
+  const raw = unwrapVolatile(value);
+  return raw === "unified" || raw === "split" ? raw : fallback;
+}
 function readBool(value, fallback) {
-  const raw = value !== null && typeof value === "object" && "get" in value && typeof value.get === "function" ? value.get() : value;
+  const raw = unwrapVolatile(value);
   return typeof raw === "boolean" ? raw : fallback;
 }
 var NEG_CACHE_MS = 15e3;
+async function resolveBrowseRoot(deps, sessionId) {
+  const ws = await resolveWorkspace(deps, sessionId);
+  if (ws.ok) return { ok: true, root: ws.root, isGitRepo: true };
+  const err = ws.failure.error;
+  if (err.code === "not-a-git-repo" && err.cwd !== void 0 && err.cwd !== "") {
+    try {
+      return { ok: true, root: await deps.fs.realpath(err.cwd), isGitRepo: false };
+    } catch {
+      return { ok: false, error: { code: "git-error" } };
+    }
+  }
+  return { ok: false, error: mapWorkspaceFailure(ws.failure) };
+}
 async function resolveWorkspace(deps, sessionId) {
   let cwd = deps.sessions.liveCwd(sessionId);
   if (cwd === void 0 || cwd === "") {
@@ -363,9 +385,9 @@ async function resolveWorkspace(deps, sessionId) {
   deps.rootCache?.set(cwd, root);
   return { ok: true, root };
 }
-async function runCommand(runner, argv, cwd, _label, signal) {
+async function runCommand(runner, argv, cwd, _label, signal, stdinData) {
   try {
-    const run = await runner.run(argv, { cwd, ...signal ? { signal } : {} });
+    const run = await runner.run(argv, { cwd, ...signal ? { signal } : {}, ...stdinData !== void 0 ? { stdinData } : {} });
     return { run };
   } catch (error) {
     return { failure: error };
@@ -478,6 +500,7 @@ async function snapshotForSession(deps, config, sessionId) {
     truncated,
     refreshIntervalMs: config.refreshIntervalMs,
     showInputPill: config.showInputPill,
+    defaultDiffView: config.defaultDiffView,
     checkedAt: Date.now()
   };
   return { ok: true, value: snapshot };
@@ -649,10 +672,19 @@ function isHexLike(text) {
   return /^[0-9a-fA-F]{7,40}$/.test(text.trim());
 }
 async function runQuery(deps, config, request) {
+  const q = request.query;
+  if (q.kind === "dir-list" || q.kind === "file-content") {
+    const browse = await resolveBrowseRoot(deps, request.sessionId);
+    if (!browse.ok) return { ok: false, error: browse.error };
+    try {
+      return q.kind === "dir-list" ? await queryDirList(deps, browse.root, q, browse.isGitRepo) : await queryFileContent(deps, config, browse.root, q);
+    } catch (error) {
+      return { ok: false, error: { code: "git-error", message: error instanceof Error ? error.message : String(error) } };
+    }
+  }
   const workspace = await resolveWorkspace(deps, request.sessionId);
   if (!workspace.ok) return { ok: false, error: mapWorkspaceFailure(workspace.failure) };
   const root = workspace.root;
-  const q = request.query;
   try {
     switch (q.kind) {
       case "history":
@@ -892,6 +924,106 @@ async function worktreeSide(deps, root, path, cap) {
     return void 0;
   }
 }
+var DIR_ENTRY_CAP = 2e3;
+async function queryDirList(deps, root, q, isGitRepo) {
+  const rel = q.path;
+  if (rel !== "" && !isSafePath(rel) || hasGitSegment(rel)) return { ok: false, error: { code: "invalid-path", message: rel } };
+  const dir = rel === "" ? root : join3(root, rel);
+  const inside = await isInsideRoot(deps, root, dir, true);
+  if (!inside) return { ok: false, error: { code: "invalid-path", message: rel } };
+  let raw;
+  try {
+    raw = await deps.fs.readdir(dir);
+  } catch (error) {
+    return { ok: false, error: { code: "git-error", message: error instanceof Error ? error.message : "readdir failed" } };
+  }
+  const filtered = raw.filter((e) => e.name !== ".git");
+  filtered.sort((a, b) => a.isDirectory !== b.isDirectory ? a.isDirectory ? -1 : 1 : a.name.localeCompare(b.name));
+  const truncated = filtered.length > DIR_ENTRY_CAP;
+  const slice = truncated ? filtered.slice(0, DIR_ENTRY_CAP) : filtered;
+  const ignored = isGitRepo ? await ignoredEntries(deps, root, rel, slice.map((e) => e.name)) : /* @__PURE__ */ new Set();
+  const entries = await Promise.all(slice.map(async (e) => {
+    const ignoreFlag = ignored.has(e.name) ? { ignored: true } : {};
+    if (e.isDirectory) return { name: e.name, dir: true, ...ignoreFlag };
+    let size;
+    try {
+      size = (await deps.fs.stat(join3(dir, e.name))).size;
+    } catch {
+      size = void 0;
+    }
+    return { name: e.name, dir: false, ...size !== void 0 ? { size } : {}, ...ignoreFlag };
+  }));
+  const path = rel === "" ? "" : rel.replace(/\/+$/, "");
+  return { ok: true, value: { kind: "dir-list", path, entries, truncated } };
+}
+async function ignoredEntries(deps, root, parent, names) {
+  const ignored = /* @__PURE__ */ new Set();
+  const paths = names.map((name) => parent === "" ? name : `${parent}/${name}`);
+  for (let index = 0; index < paths.length; ) {
+    const batch = [];
+    let bytes = 0;
+    while (index < paths.length && batch.length < 128) {
+      const candidate = paths[index];
+      const size = Buffer.byteLength(candidate) + 1;
+      if (batch.length > 0 && bytes + size > 32 * 1024) break;
+      batch.push(candidate);
+      bytes += size;
+      index++;
+    }
+    const result = await runCommand(deps.run, ["git", "check-ignore", "-z", "--stdin"], root, "dir-ignore", deps.signal, `${batch.join("\0")}\0`);
+    if ("failure" in result || result.run.timedOut || result.run.cancelled || result.run.stdoutLossy || ![0, 1].includes(result.run.exitCode ?? -1)) continue;
+    const matches = new Set(result.run.stdout.split("\0"));
+    for (const path of batch) if (matches.has(path)) ignored.add(parent === "" ? path : path.slice(parent.length + 1));
+  }
+  return ignored;
+}
+async function queryFileContent(deps, config, root, q) {
+  if (!isSafePath(q.path) || hasGitSegment(q.path)) return { ok: false, error: { code: "invalid-path", message: q.path } };
+  const file = join3(root, q.path);
+  const inside = await isInsideRoot(deps, root, file, true);
+  if (!inside) return { ok: false, error: { code: "invalid-path", message: q.path } };
+  const cap = config.maxBytes;
+  let info;
+  try {
+    info = await deps.fs.stat(file);
+  } catch (error) {
+    return { ok: false, error: { code: "git-error", message: error instanceof Error ? error.message : "stat failed" } };
+  }
+  const mime = imageMimeFor(q.path);
+  if (info.size > cap) return { ok: true, value: { kind: "file-content", path: q.path, variant: mime !== null ? "image" : "text", tooLarge: true } };
+  let buf;
+  try {
+    buf = await deps.fs.readFile(file);
+  } catch (error) {
+    return { ok: false, error: { code: "git-error", message: error instanceof Error ? error.message : "read failed" } };
+  }
+  if (buf.length > cap) return { ok: true, value: { kind: "file-content", path: q.path, variant: mime !== null ? "image" : "text", tooLarge: true } };
+  if (mime !== null) {
+    return { ok: true, value: { kind: "file-content", path: q.path, variant: "image", dataUrl: `data:${mime};base64,${buf.toString("base64")}` } };
+  }
+  if (isBinaryBuffer(buf)) return { ok: true, value: { kind: "file-content", path: q.path, variant: "binary" } };
+  const content = buf.toString("utf8");
+  const lines = content === "" ? 0 : content.split("\n").length - (content.endsWith("\n") ? 1 : 0);
+  return { ok: true, value: { kind: "file-content", path: q.path, variant: "text", content, lines } };
+}
+function hasGitSegment(path) {
+  return path.split(/[\\/]/).includes(".git");
+}
+async function isInsideRoot(deps, root, path, hideGit = false) {
+  try {
+    const real = await deps.fs.realpath(path);
+    const rootReal = await deps.fs.realpath(root);
+    if (real !== rootReal && !real.startsWith(rootReal + sep2)) return false;
+    return !hideGit || !hasGitSegment(real.slice(rootReal.length + 1));
+  } catch {
+    return false;
+  }
+}
+function isBinaryBuffer(buf) {
+  const n = Math.min(buf.length, 8192);
+  for (let i = 0; i < n; i++) if (buf[i] === 0) return true;
+  return false;
+}
 async function queryShow(deps, root, ref) {
   if (!isSafeRev(ref)) return { ok: false, error: { code: "invalid-name", message: `unsafe ref: ${ref}` } };
   const metaFormat = "--format=%H%x1f%h%x1f%s%x1f%an%x1f%aI%x1f%b";
@@ -1107,6 +1239,7 @@ var GitPanelService = class extends (_a = TypertRemoteService, _snapshot_dec = [
       realpath,
       stat: async (p) => stat(p),
       readFile: readFile3,
+      readdir: async (p) => (await readdir(p, { withFileTypes: true })).map((e) => ({ name: e.name, isDirectory: e.isDirectory() })),
       remove: async (p) => {
         await rm(p, { force: true });
       }
@@ -1170,12 +1303,17 @@ __decorateElement(_init, 1, "version", _version_dec, GitPanelService);
 __decoratorMetadata(_init, GitPanelService);
 __publicField(GitPanelService, "inject", ["subprocess", "sessions", "sessionPersistence"]);
 /**
- * Config schema surfaced on the plugin detail page. Only `showInputPill` is
- * `.volatile()`, so the settings host renders it as a live-editable toggle;
- * the operational limits stay profile-only and out of the UI form.
+ * Config schema surfaced on the plugin detail page. `showInputPill` and
+ * `defaultDiffView` are `.volatile()`, so the settings host renders them as
+ * live-editable controls; the operational limits stay profile-only and out
+ * of the UI form.
  */
 __publicField(GitPanelService, "Config", Schema.object({
-  showInputPill: Schema.boolean().default(true).volatile().description("\u663E\u793A\u8F93\u5165\u6846\u7684 Git \u5206\u652F\u6807\u8BB0")
+  showInputPill: Schema.boolean().default(true).volatile().description("\u663E\u793A\u8F93\u5165\u6846\u7684 Git \u5206\u652F\u6807\u8BB0"),
+  defaultDiffView: Schema.union([
+    Schema.const("unified").description("\u7EDF\u4E00\u89C6\u56FE\uFF08\u5355\u680F\u884C\u5185\u5BF9\u6BD4\uFF09"),
+    Schema.const("split").description("\u5E76\u6392\u89C6\u56FE\uFF08\u5DE6\u53F3\u5206\u680F\u5BF9\u6BD4\uFF09")
+  ]).default("unified").volatile().description("\u5DEE\u5F02\u5BF9\u6BD4\u9ED8\u8BA4\u89C6\u56FE")
 }));
 var index_default = GitPanelService;
 export {

package/lib/host/types.d.ts

@@ -3,6 +3,8 @@
  * The client half (src/client/rpc.ts) reuses these types directly, so the
  * wire contract has a single definition and cannot drift.
  */
+/** Diff layout: `unified` = single inline column, `split` = side-by-side. */
+export type DiffViewMode = 'unified' | 'split';
 /** Wire request: the browser sends only session identity, never a path. */
 export interface GitSnapshotRequest {
     readonly sessionId: string;
@@ -56,6 +58,8 @@ export interface GitSnapshot {
     readonly refreshIntervalMs: number;
     /** Whether the input-bar git marker pill should render (user preference). */
     readonly showInputPill: boolean;
+    /** Default diff layout the views open with (user preference). */
+    readonly defaultDiffView: DiffViewMode;
     /** Epoch millis of the snapshot. */
     readonly checkedAt: number;
 }
@@ -176,6 +180,12 @@ export type GitQuery = {
     readonly path: string;
     readonly base: 'commit';
     readonly commit: string;
+} | {
+    readonly kind: 'dir-list';
+    readonly path: string;
+} | {
+    readonly kind: 'file-content';
+    readonly path: string;
 } | {
     readonly kind: 'show';
     readonly ref: string;
@@ -190,6 +200,15 @@ export type GitQuery = {
 } | {
     readonly kind: 'worktree-stats';
 };
+/** One entry in a `dir-list` result. */
+export interface DirEntry {
+    readonly name: string;
+    readonly dir: boolean;
+    /** File byte size; absent for directories. */
+    readonly size?: number;
+    /** True when Git excludes an untracked item; absent outside a repository. */
+    readonly ignored?: boolean;
+}
 /** One commit's changed-file line (from --name-status). */
 export interface GitFileStat {
     readonly path: string;
@@ -272,6 +291,23 @@ export type GitQueryResult = {
 } | {
     readonly kind: 'worktree-stats';
     readonly stats: WorktreeStats;
+} | {
+    readonly kind: 'dir-list';
+    readonly path: string;
+    readonly entries: readonly DirEntry[];
+    readonly truncated: boolean;
+} | {
+    readonly kind: 'file-content';
+    readonly path: string;
+    readonly variant: 'text' | 'image' | 'binary';
+    /** text variant: the file's full UTF-8 content. */
+    readonly content?: string;
+    /** text variant: total line count. */
+    readonly lines?: number;
+    /** image variant: a `data:<mime>;base64,…` URL. */
+    readonly dataUrl?: string;
+    /** The file exceeded the byte cap, so no content is returned. */
+    readonly tooLarge?: true;
 };
 export type GitQueryResponse = {
     readonly ok: true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xbzbing/dsh-git-panel",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "DeepSeek Harness (dsh) plugin: an IDE-style Git panel in the Web GUI — branch/history overview, uncommitted changes with commit & amend, diff stats, and a zsh-style branch marker in the input bar.",
   "type": "module",
   "license": "MIT",
@@ -44,8 +44,7 @@
     "test:unit": "node build.mjs && node --test --test-force-exit test/unit/*.test.mjs",
     "test:e2e": "node build.mjs && node test/e2e/setup.mjs && node test/e2e/run.mjs && node test/e2e/run2.mjs",
     "test": "npm run test:unit && npm run test:e2e",
-    "check": "npm run typecheck && npm run test && git diff --exit-code -- lib/",
-    "prepare": "node build.mjs"
+    "check": "npm run typecheck && npm run test && git diff --exit-code -- lib/"
   },
   "dsh": {
     "bundle": {
@@ -56,7 +55,8 @@
       "inject": [
         "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-ui-conversation"
+        "@deepseek-ai/dsh-client-ui-conversation",
+        "@deepseek-ai/dsh-client-ui-primitives"
       ]
     }
   },
@@ -76,9 +76,6 @@
     "@deepseek-ai/dsh-typert-protocol": ">=0.1.2-rc.1",
     "@deepseek-ai/schemastery": ">=3.18.4"
   },
-  "dependencies": {
-    "highlight.js": "11.11.1"
-  },
   "devDependencies": {
     "@types/node": "22.10.5",
     "@types/react": "18.3.18",