specsmd 0.1.53 → 0.1.55

package/lib/dashboard/git/changes.js

@@ -273,7 +273,7 @@ function readUntrackedFileDiff(repoRoot, absolutePath) {
   }
 
   const result = runGit(
-    ['-c', 'color.ui=always', '--no-pager', 'diff', '--no-index', '--', '/dev/null', absolutePath],
+    ['-c', 'color.ui=false', '--no-pager', 'diff', '--no-index', '--', '/dev/null', absolutePath],
     repoRoot,
     { acceptedStatuses: [0, 1] }
   );
@@ -305,7 +305,7 @@ function loadGitDiffPreview(changeEntry) {
     }
   }
 
-  const args = ['-c', 'color.ui=always', '--no-pager', 'diff'];
+  const args = ['-c', 'color.ui=false', '--no-pager', 'diff'];
   if (bucket === 'staged') {
     args.push('--cached');
   }

package/lib/dashboard/tui/app.js

@@ -1172,6 +1172,215 @@ function getGitChangesSnapshot(snapshot) {
   };
 }
 
+function readGitCommandLines(repoRoot, args, options = {}) {
+  if (typeof repoRoot !== 'string' || repoRoot.trim() === '' || !Array.isArray(args) || args.length === 0) {
+    return [];
+  }
+
+  const acceptedStatuses = Array.isArray(options.acceptedStatuses) && options.acceptedStatuses.length > 0
+    ? options.acceptedStatuses
+    : [0];
+
+  const result = spawnSync('git', args, {
+    cwd: repoRoot,
+    encoding: 'utf8',
+    maxBuffer: 8 * 1024 * 1024
+  });
+
+  if (result.error) {
+    return [];
+  }
+
+  if (typeof result.status === 'number' && !acceptedStatuses.includes(result.status)) {
+    return [];
+  }
+
+  const lines = String(result.stdout || '')
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter(Boolean);
+
+  const limit = Number.isFinite(options.limit) ? Math.max(1, Math.floor(options.limit)) : null;
+  if (limit == null || lines.length <= limit) {
+    return lines;
+  }
+  return lines.slice(0, limit);
+}
+
+function buildGitStatusPanelLines(snapshot) {
+  const git = getGitChangesSnapshot(snapshot);
+  if (!git.available) {
+    return [{
+      text: 'Repository unavailable in selected worktree',
+      color: 'red',
+      bold: true
+    }];
+  }
+
+  const tracking = git.upstream
+    ? `${git.upstream} (${git.ahead > 0 ? `ahead ${git.ahead}` : 'ahead 0'}, ${git.behind > 0 ? `behind ${git.behind}` : 'behind 0'})`
+    : 'no upstream';
+
+  return [
+    {
+      text: `branch: ${git.branch}${git.detached ? ' [detached]' : ''}`,
+      color: 'green',
+      bold: true
+    },
+    {
+      text: `tracking: ${tracking}`,
+      color: 'gray',
+      bold: false
+    },
+    {
+      text: `changes: ${git.counts.total || 0} total`,
+      color: 'gray',
+      bold: false
+    },
+    {
+      text: `staged ${git.counts.staged || 0} | unstaged ${git.counts.unstaged || 0}`,
+      color: 'yellow',
+      bold: false
+    },
+    {
+      text: `untracked ${git.counts.untracked || 0} | conflicts ${git.counts.conflicted || 0}`,
+      color: 'yellow',
+      bold: false
+    }
+  ];
+}
+
+function buildGitBranchesPanelLines(snapshot) {
+  const git = getGitChangesSnapshot(snapshot);
+  if (!git.available) {
+    return [{
+      text: 'No branch list (git unavailable)',
+      color: 'gray',
+      bold: false
+    }];
+  }
+
+  const branchLines = readGitCommandLines(git.rootPath, [
+    '-c',
+    'color.ui=false',
+    'for-each-ref',
+    '--sort=-committerdate',
+    '--format=%(if)%(HEAD)%(then)*%(else) %(end) %(refname:short)',
+    'refs/heads'
+  ], { limit: 8 });
+
+  const lines = [{
+    text: 'Local branches · Remotes · Tags',
+    color: 'cyan',
+    bold: true
+  }];
+
+  if (branchLines.length === 0) {
+    lines.push({
+      text: 'No local branches found',
+      color: 'gray',
+      bold: false
+    });
+    return lines;
+  }
+
+  for (const line of branchLines) {
+    const isCurrent = line.startsWith('*');
+    lines.push({
+      text: line,
+      color: isCurrent ? 'green' : 'gray',
+      bold: isCurrent
+    });
+  }
+
+  return lines;
+}
+
+function buildGitCommitsPanelLines(snapshot) {
+  const git = getGitChangesSnapshot(snapshot);
+  if (!git.available) {
+    return [{
+      text: 'No commit log (git unavailable)',
+      color: 'gray',
+      bold: false
+    }];
+  }
+
+  const reflogLines = readGitCommandLines(git.rootPath, [
+    '-c',
+    'color.ui=false',
+    'reflog',
+    '--date=relative',
+    '--pretty=format:%h %gs'
+  ], { limit: 8 });
+
+  const lines = [{
+    text: 'Commits · Reflog',
+    color: 'cyan',
+    bold: true
+  }];
+
+  if (reflogLines.length === 0) {
+    lines.push({
+      text: 'No reflog entries',
+      color: 'gray',
+      bold: false
+    });
+    return lines;
+  }
+
+  lines.push(...reflogLines.map((line) => ({
+    text: line,
+    color: 'gray',
+    bold: false
+  })));
+  return lines;
+}
+
+function buildGitStashPanelLines(snapshot) {
+  const git = getGitChangesSnapshot(snapshot);
+  if (!git.available) {
+    return [{
+      text: 'No stash info (git unavailable)',
+      color: 'gray',
+      bold: false
+    }];
+  }
+
+  const stashLines = readGitCommandLines(git.rootPath, [
+    '-c',
+    'color.ui=false',
+    'stash',
+    'list',
+    '--pretty=format:%gd %s'
+  ], {
+    acceptedStatuses: [0],
+    limit: 4
+  });
+
+  const lines = [{
+    text: 'Stash',
+    color: 'cyan',
+    bold: true
+  }];
+
+  if (stashLines.length === 0) {
+    lines.push({
+      text: 'No stashes',
+      color: 'gray',
+      bold: false
+    });
+    return lines;
+  }
+
+  lines.push(...stashLines.map((line) => ({
+    text: line,
+    color: 'gray',
+    bold: false
+  })));
+  return lines;
+}
+
 function getDashboardWorktreeMeta(snapshot) {
   if (!snapshot || typeof snapshot !== 'object') {
     return null;
@@ -1349,7 +1558,7 @@ function getSectionOrderForView(view, options = {}) {
     return ['standards', 'stats', 'warnings', 'error-details'];
   }
   if (view === 'git') {
-    return ['git-changes'];
+    return ['git-status', 'git-changes', 'git-branches', 'git-commits', 'git-stash', 'git-diff'];
   }
   const sections = [];
   if (includeWorktrees) {
@@ -2420,6 +2629,21 @@ function rowToFileEntry(row) {
   };
 }
 
+function firstFileEntryFromRows(rows) {
+  if (!Array.isArray(rows) || rows.length === 0) {
+    return null;
+  }
+
+  for (const row of rows) {
+    const entry = rowToFileEntry(row);
+    if (entry) {
+      return entry;
+    }
+  }
+
+  return null;
+}
+
 function rowToWorktreeId(row) {
   if (!row || typeof row.key !== 'string') {
     return null;
@@ -2528,7 +2752,7 @@ function buildQuickHelpText(view, options = {}) {
     }
     parts.push('a current', 'f files');
   } else if (view === 'git') {
-    parts.push('d changes', 'c/A/p/P git(soon)');
+    parts.push('6 status', '7 files', '8 branches', '9 commits', '0 stash', '- diff');
   }
   parts.push(`tab1 ${activeLabel}`);
 
@@ -2540,7 +2764,7 @@ function buildQuickHelpText(view, options = {}) {
   return parts.join(' | ');
 }
 
-function buildLazyGitCommandStrip(view, options = {}) {
+function buildGitCommandStrip(view, options = {}) {
   const {
     hasWorktrees = false,
     previewOpen = false
@@ -2560,7 +2784,7 @@ function buildLazyGitCommandStrip(view, options = {}) {
   } else if (view === 'health') {
     parts.push('s standards', 't stats', 'w warnings');
   } else if (view === 'git') {
-    parts.push('d changes', 'space preview', 'c commit (soon)', 'A amend (soon)', 'p push (soon)', 'P pull (soon)');
+    parts.push('6 status', '7 files', '8 branches', '9 commits', '0 stash', '- diff', 'space preview');
   }
 
   if (previewOpen) {
@@ -2573,7 +2797,7 @@ function buildLazyGitCommandStrip(view, options = {}) {
   return parts.join(' | ');
 }
 
-function buildLazyGitCommandLogLine(options = {}) {
+function buildGitCommandLogLine(options = {}) {
   const {
     statusLine = '',
     activeFlow = 'fire',
@@ -2650,7 +2874,7 @@ function buildHelpOverlayLines(options = {}) {
     { text: '', color: undefined, bold: false },
     { text: 'Tab 5 Git Changes', color: 'yellow', bold: true },
     'select changed files and preview diffs',
-    'commit/push/pull shortcuts are shown in footer for LazyGit-style hierarchy',
+    '6 status | 7 files | 8 branches | 9 commits | 0 stash | - diff',
     { text: '', color: undefined, bold: false },
     { text: `Current view: ${String(view || 'runs').toUpperCase()}`, color: 'gray', bold: false }
   );
@@ -3277,32 +3501,11 @@ function createDashboardApp(deps) {
     const gitRows = shouldHydrateSecondaryTabs
       ? (() => {
         const git = getGitChangesSnapshot(snapshot);
-        const tracking = git.upstream
-          ? `${git.upstream} (${git.ahead > 0 ? `ahead ${git.ahead}` : 'ahead 0'}, ${git.behind > 0 ? `behind ${git.behind}` : 'behind 0'})`
-          : 'no upstream';
-        const headerRows = [{
-          kind: 'info',
-          key: 'git:branch',
-          label: git.available
-            ? `branch ${git.branch}${git.detached ? ' [detached]' : ''} | ${tracking}`
-            : 'git: repository unavailable in selected worktree',
-          color: git.available ? 'cyan' : 'red',
-          bold: true,
-          selectable: false
-        }, {
-          kind: 'info',
-          key: 'git:counts',
-          label: `changes ${git.counts.total || 0} | staged ${git.counts.staged || 0} | unstaged ${git.counts.unstaged || 0} | untracked ${git.counts.untracked || 0} | conflicts ${git.counts.conflicted || 0}`,
-          color: 'gray',
-          bold: false,
-          selectable: false
-        }];
-        const groups = toExpandableRows(
+        return toExpandableRows(
           buildGitChangeGroups(snapshot),
           git.available ? 'Working tree clean' : 'No git changes',
           expandedGroups
         );
-        return [...headerRows, ...groups];
       })()
       : toLoadingRows('Loading git changes...', 'git-loading');
 
@@ -3338,6 +3541,9 @@ function createDashboardApp(deps) {
     const focusedIndex = selectionBySection[focusedSection] || 0;
     const selectedFocusedRow = getSelectedRow(focusedRows, focusedIndex);
     const selectedFocusedFile = rowToFileEntry(selectedFocusedRow);
+    const selectedGitRow = getSelectedRow(gitRows, selectionBySection['git-changes'] || 0);
+    const selectedGitFile = rowToFileEntry(selectedGitRow);
+    const firstGitFile = firstFileEntryFromRows(gitRows);
 
     const refresh = useCallback(async (overrideSelectedWorktreeId = null) => {
       const now = new Date().toISOString();
@@ -3691,24 +3897,34 @@ function createDashboardApp(deps) {
           return;
         }
       } else if (ui.view === 'git') {
-        if (input === 'd') {
+        if (input === '6') {
+          setSectionFocus((previous) => ({ ...previous, git: 'git-status' }));
+          setPaneFocus('main');
+          return;
+        }
+        if (input === '7') {
           setSectionFocus((previous) => ({ ...previous, git: 'git-changes' }));
+          setPaneFocus('main');
           return;
         }
-        if (input === 'c') {
-          setStatusLine('Git commit action is not wired yet (footer mirrors LazyGit command hierarchy).');
+        if (input === '8') {
+          setSectionFocus((previous) => ({ ...previous, git: 'git-branches' }));
+          setPaneFocus('main');
           return;
         }
-        if (input === 'A') {
-          setStatusLine('Git amend action is not wired yet (footer mirrors LazyGit command hierarchy).');
+        if (input === '9') {
+          setSectionFocus((previous) => ({ ...previous, git: 'git-commits' }));
+          setPaneFocus('main');
           return;
         }
-        if (input === 'p') {
-          setStatusLine('Git push action is not wired yet (footer mirrors LazyGit command hierarchy).');
+        if (input === '0') {
+          setSectionFocus((previous) => ({ ...previous, git: 'git-stash' }));
+          setPaneFocus('main');
           return;
         }
-        if (input === 'P') {
-          setStatusLine('Git pull action is not wired yet (footer mirrors LazyGit command hierarchy).');
+        if (input === '-') {
+          setSectionFocus((previous) => ({ ...previous, git: 'git-diff' }));
+          setPaneFocus('main');
           return;
         }
       }
@@ -4066,6 +4282,16 @@ function createDashboardApp(deps) {
         fullDocument: overlayPreviewOpen
       })
       : [];
+    const gitInlineDiffTarget = selectedGitFile || firstGitFile || previewTarget || null;
+    const gitInlineDiffLines = ui.view === 'git'
+      ? buildPreviewLines(gitInlineDiffTarget, compactWidth, previewOpen && paneFocus === 'preview' ? previewScroll : 0, {
+        fullDocument: false
+      })
+      : [];
+    const gitStatusPanelLines = ui.view === 'git' ? buildGitStatusPanelLines(snapshot) : [];
+    const gitBranchesPanelLines = ui.view === 'git' ? buildGitBranchesPanelLines(snapshot) : [];
+    const gitCommitsPanelLines = ui.view === 'git' ? buildGitCommitsPanelLines(snapshot) : [];
+    const gitStashPanelLines = ui.view === 'git' ? buildGitStashPanelLines(snapshot) : [];
 
     const shortcutsOverlayLines = buildHelpOverlayLines({
       view: ui.view,
@@ -4083,11 +4309,11 @@ function createDashboardApp(deps) {
       availableFlowCount: availableFlowIds.length,
       hasWorktrees: worktreeSectionEnabled
     });
-    const commandStripText = buildLazyGitCommandStrip(ui.view, {
+    const commandStripText = buildGitCommandStrip(ui.view, {
       hasWorktrees: worktreeSectionEnabled,
       previewOpen
     });
-    const commandLogLine = buildLazyGitCommandLogLine({
+    const commandLogLine = buildGitCommandLogLine({
       statusLine,
       activeFlow,
       watchEnabled,
@@ -4173,11 +4399,41 @@ function createDashboardApp(deps) {
       }
     } else if (ui.view === 'git') {
       panelCandidates = [
+        {
+          key: 'git-status',
+          title: '[6]-Status',
+          lines: gitStatusPanelLines,
+          borderColor: 'green'
+        },
         {
           key: 'git-changes',
-          title: panelTitles.git || 'Git Changes',
+          title: '[7]-Files',
           lines: sectionLines['git-changes'],
           borderColor: 'yellow'
+        },
+        {
+          key: 'git-branches',
+          title: '[8]-Local branches',
+          lines: gitBranchesPanelLines,
+          borderColor: 'magenta'
+        },
+        {
+          key: 'git-commits',
+          title: '[9]-Commits',
+          lines: gitCommitsPanelLines,
+          borderColor: 'cyan'
+        },
+        {
+          key: 'git-stash',
+          title: '[0]-Stash',
+          lines: gitStashPanelLines,
+          borderColor: 'blue'
+        },
+        {
+          key: 'git-diff',
+          title: '[-]-Unstaged changes',
+          lines: gitInlineDiffLines,
+          borderColor: 'yellow'
         }
       ];
     } else {
@@ -4214,7 +4470,7 @@ function createDashboardApp(deps) {
       }
     }
 
-    if (!ui.showHelp && previewOpen && !overlayPreviewOpen) {
+    if (!ui.showHelp && previewOpen && !overlayPreviewOpen && ui.view !== 'git') {
       panelCandidates.push({
         key: 'preview',
         title: `Preview: ${effectivePreviewTarget?.label || 'unknown'}`,
@@ -4225,7 +4481,13 @@ function createDashboardApp(deps) {
 
     if (ultraCompact) {
       if (previewOpen) {
-        panelCandidates = panelCandidates.filter((panel) => panel && (panel.key === focusedSection || panel.key === 'preview'));
+        panelCandidates = panelCandidates.filter((panel) =>
+          panel && (
+            panel.key === focusedSection
+            || panel.key === 'preview'
+            || (ui.view === 'git' && panel.key === 'git-diff')
+          )
+        );
       } else {
         const focusedPanel = panelCandidates.find((panel) => panel?.key === focusedSection);
         panelCandidates = [focusedPanel || panelCandidates[0]];
@@ -4233,7 +4495,8 @@ function createDashboardApp(deps) {
     }
 
     const panels = allocateSingleColumnPanels(panelCandidates, contentRowsBudget);
-    const lazyGitHierarchyLayout = !ui.showHelp
+    const gitHierarchyLayout = ui.view === 'git'
+      && !ui.showHelp
       && !worktreeOverlayOpen
       && !overlayPreviewOpen
       && !ultraCompact
@@ -4253,10 +4516,11 @@ function createDashboardApp(deps) {
     });
 
     let contentNode;
-    if (lazyGitHierarchyLayout) {
-      const preferredRightPanel = previewOpen && !overlayPreviewOpen
-        ? panelCandidates.find((panel) => panel?.key === 'preview')
-        : null;
+    if (gitHierarchyLayout) {
+      const preferredRightPanel = panelCandidates.find((panel) => panel?.key === 'git-diff')
+        || (previewOpen && !overlayPreviewOpen
+          ? panelCandidates.find((panel) => panel?.key === 'preview')
+          : null);
       const focusedPanel = panelCandidates.find((panel) => panel?.key === focusedSection);
       const rightPanelBase = preferredRightPanel
         || focusedPanel
@@ -4307,7 +4571,9 @@ function createDashboardApp(deps) {
             dense: densePanels,
             focused: rightPanel.key === 'preview'
               ? paneFocus === 'preview'
-              : (paneFocus === 'main' && rightPanel.key === focusedSection)
+              : (rightPanel.key === 'git-diff'
+                ? true
+                : (paneFocus === 'main' && rightPanel.key === focusedSection))
           })
         )
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "specsmd",
-  "version": "0.1.53",
+  "version": "0.1.55",
   "description": "Multi-agent orchestration system for AI-native software development. Delivers AI-DLC, Agile, and custom SDLC flows as markdown-based agent systems.",
   "main": "lib/installer.js",
   "bin": {