@xbzbing/dsh-git-panel 1.3.0 → 1.5.0

package/lib/host/types.d.ts

@@ -5,6 +5,10 @@
  */
 /** Diff layout: `unified` = single inline column, `split` = side-by-side. */
 export type DiffViewMode = 'unified' | 'split';
+/** Commit-graph line style: `compact` = converge a shared ancestor into one
+ * lane (git log --graph); `parallel` = keep each merge's first parent in its
+ * own lane, converging only at the ancestor (VSCode / GUI tools). */
+export type GraphStyle = 'compact' | 'parallel';
 /** Wire request: the browser sends only session identity, never a path. */
 export interface GitSnapshotRequest {
     readonly sessionId: string;
@@ -33,6 +37,21 @@ export type GitFailure = {
 } | {
     readonly code: 'cancelled';
 };
+/** Host classification for a remote URL (drives the status-bar icon). */
+export type RemoteHostKind = 'github' | 'gitlab' | 'gitee' | 'bitbucket' | 'other';
+/** The repository's primary remote (origin, else the first remote). */
+export interface GitRemote {
+    /** Remote name (`origin`, or the first configured remote). */
+    readonly name: string;
+    /** The configured fetch URL, verbatim (ssh/scp/https/git form). */
+    readonly url: string;
+    /** A browsable https URL for the repo page; null when unparseable. */
+    readonly webUrl: string | null;
+    /** The remote hostname (e.g. `github.com`); null when unparseable. */
+    readonly host: string | null;
+    /** Known-host classification, for the status-bar icon. */
+    readonly hostKind: RemoteHostKind;
+}
 /** Immutable snapshot of one repository's status at `checkedAt`. */
 export interface GitSnapshot {
     /** Realpath of the repository root (work tree top). */
@@ -50,6 +69,10 @@ export interface GitSnapshot {
     readonly untracked: number;
     readonly ahead: number;
     readonly behind: number;
+    /** True when the current branch tracks an upstream (@{upstream} resolves). */
+    readonly hasUpstream: boolean;
+    /** The repository's primary remote; null when none is configured. */
+    readonly remote: GitRemote | null;
     readonly lastCommit: GitCommit | null;
     readonly changes: readonly GitChange[];
     /** Working-tree statistics for the changes-page header (single source). */
@@ -62,6 +85,8 @@ export interface GitSnapshot {
     readonly showInputPill: boolean;
     /** Default diff layout the views open with (user preference). */
     readonly defaultDiffView: DiffViewMode;
+    /** Commit-graph line style (user preference). */
+    readonly graphStyle: GraphStyle;
     /** Whether the commit box shows the AI-suggest button (user preference). */
     readonly suggestEnabled: boolean;
     /** Epoch millis of the snapshot. */
@@ -122,8 +147,43 @@ export type GitAction = {
     readonly name: string;
 } | {
     readonly kind: 'fetch';
+} | {
+    readonly kind: 'pull-ff';
+} | {
+    readonly kind: 'tag-create';
+    readonly name: string;
+    readonly commit: string;
+    readonly message?: string;
+} | {
+    readonly kind: 'tag-delete';
+    readonly name: string;
+} | {
+    readonly kind: 'stash-push';
+    readonly message?: string;
+} | {
+    readonly kind: 'stash-apply';
+    readonly index: number;
+    readonly sha: string;
+} | {
+    readonly kind: 'stash-pop';
+    readonly index: number;
+    readonly sha: string;
+} | {
+    readonly kind: 'stash-drop';
+    readonly index: number;
+    readonly sha: string;
+} | {
+    readonly kind: 'revert';
+    readonly commit: string;
+} | {
+    readonly kind: 'reset';
+    readonly commit: string;
+    readonly mode: ResetMode;
 };
-export type GitErrorCode = 'cwd-unavailable' | 'not-a-git-repo' | 'git-unavailable' | 'invalid-path' | 'invalid-name' | 'git-error' | 'timeout' | 'cancelled' | 'empty-message' | 'local-changes-block' | 'empty-diff' | 'llm-unavailable' | 'llm-error' | 'llm-output' | 'suggest-disabled';
+/** `git reset` modes, from least to most destructive. Single source so the
+ * client dialog and the command builder cannot drift. */
+export type ResetMode = 'soft' | 'mixed' | 'hard';
+export type GitErrorCode = 'cwd-unavailable' | 'not-a-git-repo' | 'git-unavailable' | 'invalid-path' | 'invalid-name' | 'invalid-index' | 'git-error' | 'timeout' | 'cancelled' | 'empty-message' | 'local-changes-block' | 'not-ff' | 'conflict' | 'revert-conflict' | 'revert-stuck' | 'revert-merge' | 'not-found' | 'index-busy' | 'empty-diff' | 'llm-unavailable' | 'llm-error' | 'llm-output' | 'suggest-disabled';
 export type GitActionResult = {
     readonly ok: true;
     readonly snapshot: GitSnapshot;
@@ -197,12 +257,16 @@ export type GitQuery = {
     readonly kind: 'branches';
 } | {
     readonly kind: 'tags';
+} | {
+    readonly kind: 'stash-list';
 } | {
     readonly kind: 'authors';
 } | {
     readonly kind: 'last-commit-message';
 } | {
     readonly kind: 'worktree-stats';
+} | {
+    readonly kind: 'pull-preview';
 };
 /** One entry in a `dir-list` result. */
 export interface DirEntry {
@@ -224,6 +288,19 @@ export interface GitBranch {
     readonly ahead?: number;
     readonly behind?: number;
 }
+/** One entry in the stash stack (`git stash list`). */
+export interface StashEntry {
+    /** Stack position (0 = most recent). */
+    readonly index: number;
+    /** The stash commit SHA — a stable id the index position is not (see run). */
+    readonly sha: string;
+    /** The stash message (custom `-m` text, or the auto "WIP on …" subject). */
+    readonly message: string;
+    /** Branch the stash was taken on; null when it could not be parsed. */
+    readonly branch: string | null;
+    /** Human relative time (e.g. "2 hours ago"). */
+    readonly relTime: string;
+}
 /** Working-tree statistics for the changes page header. */
 export interface WorktreeStats {
     /** Distinct changed-file paths (staged ∪ modified ∪ untracked). */
@@ -239,6 +316,13 @@ export interface WorktreeStats {
     readonly lastChangeAt: number | null;
     /** HEAD commit time ISO; null when unborn. */
     readonly headCommittedAt: string | null;
+    /**
+     * True when the per-file fan-outs were skipped because the change set was too
+     * large (issue #16): `insertions` then omits untracked lines and
+     * `lastChangeAt` is null. Counts (fileCount/staged/modified/untracked) and
+     * tracked insertions/deletions stay exact.
+     */
+    readonly partial: boolean;
 }
 export type GitQueryResult = {
     readonly kind: 'history';
@@ -286,6 +370,9 @@ export type GitQueryResult = {
 } | {
     readonly kind: 'tags';
     readonly tags: readonly GitBranch[];
+} | {
+    readonly kind: 'stash-list';
+    readonly entries: readonly StashEntry[];
 } | {
     readonly kind: 'authors';
     readonly authors: readonly string[];
@@ -295,6 +382,13 @@ export type GitQueryResult = {
 } | {
     readonly kind: 'worktree-stats';
     readonly stats: WorktreeStats;
+} | {
+    readonly kind: 'pull-preview';
+    readonly hasUpstream: boolean;
+    readonly commits: number;
+    readonly files: number;
+    readonly insertions: number;
+    readonly deletions: number;
 } | {
     readonly kind: 'dir-list';
     readonly path: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xbzbing/dsh-git-panel",
-  "version": "1.3.0",
+  "version": "1.5.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",