agentgui 1.0.1096 → 1.0.1097

package/lib/ws-handlers-util.js

@@ -324,6 +324,26 @@ export function register(router, deps) {
     } catch (e) { err(500, e.message); }
   });
 
+  // --- git.status: changed-file list (staged/unstaged/untracked) for
+  // GitStatusPanel. Porcelain=v1 line format "XY PATH" (rename: "XY OLD -> NEW"),
+  // X = index state, Y = worktree state, '?'/' ' = untouched/untracked.
+  router.handle('git.status', async (p) => {
+    const cwd = resolveGitCwd(p, STARTUP_CWD);
+    try {
+      const { stdout } = await execFileP('git', ['status', '--porcelain=v1'], { cwd });
+      const files = [];
+      for (const line of stdout.split('\n')) {
+        if (!line) continue;
+        const x = line[0], y = line[1];
+        const path = line.slice(3);
+        if (x === '?' && y === '?') { files.push({ path, status: '?' }); continue; }
+        if (x !== ' ' && x !== '?') files.push({ path, status: x, staged: true });
+        else if (y !== ' ' && y !== '?') files.push({ path, status: y, staged: false });
+      }
+      return { files };
+    } catch (e) { err(500, (e.stderr || e.message || 'git status failed').trim()); }
+  });
+
   // --- git.diff: unified diff for a single file or the whole working tree.
   // p.cwd (optional) is confined via confineToRoots/fsAllowRoots, same as
   // chat.sendMessage; p.file (optional) is validated to reject flags/shell

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.1096",
+  "version": "1.0.1097",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "electron/main.js",

package/site/app/js/app.js

@@ -3,7 +3,7 @@ import * as B from './backend.js';
 
 installStyles().catch(() => {});
 
-const { AppShell, WorkspaceShell, WorkspaceRail, Topbar, Crumb, Side, Status, Chat, ChatComposer, AgentChat, ConversationList, SessionDashboard, Row, Panel, PageHeader, TextField, Select, Btn, Icon, IconButton, EventList, Spinner, Alert, FileGrid, FileSkeleton, sortFiles, FileToolbar, RootsPicker, BreadcrumbPath, EmptyState, FileViewer, FilePreviewPane, FilePreviewCode, FilePreviewText, FilePreviewMedia, ThemeToggle, ContextPane, PromptDialog, ConfirmDialog, DropZone, UploadProgress, FilterPills, SessionMeta, BulkBar, Checkbox, ShortcutList, FocusTrap, AgentListSkeleton, flashComposerNote, toast, withBusy } = C;
+const { AppShell, WorkspaceShell, WorkspaceRail, Topbar, Crumb, Side, Status, Chat, ChatComposer, AgentChat, ConversationList, SessionDashboard, Row, Panel, PageHeader, TextField, Select, Btn, Icon, IconButton, EventList, Spinner, Alert, FileGrid, FileSkeleton, sortFiles, FileToolbar, RootsPicker, BreadcrumbPath, EmptyState, FileViewer, FilePreviewPane, FilePreviewCode, FilePreviewText, FilePreviewMedia, ThemeToggle, ContextPane, PromptDialog, ConfirmDialog, DropZone, UploadProgress, FilterPills, SessionMeta, BulkBar, Checkbox, ShortcutList, FocusTrap, AgentListSkeleton, flashComposerNote, toast, withBusy, GitStatusPanel, GitDiffView, WorktreeSwitcher } = C;
 
 // One duration/bytes vocabulary across every surface: prefer the kit's shared
 // formatters (exported alongside the components), fall back to the local
@@ -43,10 +43,7 @@ const state = {
   activeTimer: null,
   eventsLimit: 300,   // how many of the most-recent events to render; grows via "load older"
   files: { path: '', segments: [], entries: [], roots: [], loading: false, error: null, preview: null, sort: 'name', sortDir: 'asc', filter: '' },
-  // Minimal git/worktree panel state. The richer visual component
-  // (GitDiffView/WorktreeSwitcher) lives in anentrypoint-design; this is a
-  // plain list/text render until the vendored SDK bundle picks those up.
-  git: { loading: false, error: null, diff: '', commits: [], worktrees: [], file: '' },
+  git: { loading: false, error: null, diff: '', commits: [], worktrees: [], files: [], file: '', worktreeBusy: false },
 };
 
 // Two-step arm controls auto-reset after this delay so an accidental first click
@@ -939,20 +936,19 @@ function mainContent() {
   return settingsMain();
 }
 
-// --- git (diff/log + worktree list) ---
-// Minimal panel: loads git.log + worktree.list on entry, git.diff on demand.
-// A richer visual component (GitDiffView/WorktreeSwitcher) is being built in
-// anentrypoint-design in parallel; swap this for those exports once the
-// vendored SDK bundle (site/app/vendor/anentrypoint-design) is rebuilt to
-// include them - it does not yet (checked: no GitDiffView/WorktreeSwitcher
-// in the vendored 247420.js as of this change).
+// --- git (status/diff/log + worktree list) ---
+// Uses anentrypoint-design's GitStatusPanel/GitDiffView/WorktreeSwitcher
+// (ported from pi-web's BranchNavigator concept) once the vendored SDK
+// bundle carries them - see components.js barrel export.
 async function loadGitPanel() {
   state.git.loading = true; state.git.error = null; render();
   try {
-    const [commits, worktrees] = await Promise.all([
+    const [files, commits, worktrees] = await Promise.all([
+      B.gitStatus(state.backend, {}),
       B.gitLog(state.backend, { limit: 20 }),
       B.worktreeList(state.backend, {}),
     ]);
+    state.git.files = files;
     state.git.commits = commits;
     state.git.worktrees = worktrees;
   } catch (e) {
@@ -973,19 +969,59 @@ async function loadGitDiff(file) {
   state.git.diffLoading = false; render();
 }
 
+async function createWorktree(path, branch, newBranch) {
+  state.git.worktreeBusy = true; render();
+  try {
+    await B.worktreeCreate(state.backend, { path, branch, newBranch });
+    state.git.wtDialog = null;
+    await loadGitPanel();
+  } catch (e) {
+    if (state.git.wtDialog) { state.git.wtDialog.error = e.message || 'Could not create worktree.'; }
+    else state.git.error = e.message || 'Could not create worktree.';
+  }
+  state.git.worktreeBusy = false; render();
+}
+
+function gitWorktreeDialog() {
+  const d = state.git.wtDialog;
+  if (!d) return null;
+  return PromptDialog({
+    title: 'New worktree', value: d.value ?? '', placeholder: 'relative path, e.g. ../myrepo-feature',
+    error: d.error || null, busy: !!state.git.worktreeBusy,
+    confirmLabel: state.git.worktreeBusy ? 'creating…' : 'create', cancelLabel: 'cancel',
+    onCancel: () => { state.git.wtDialog = null; render(); },
+    onInput: (v) => { d.value = v; },
+    onConfirm: (v) => {
+      if (!v) { d.error = 'enter a worktree path'; render(); return; }
+      // New worktree checks out a branch named after the path's basename -
+      // matches WorktreeSwitcher's "new worktree" action, which collects no
+      // separate branch field (host owns the create flow per its own docs).
+      createWorktree(v, undefined, v.split('/').filter(Boolean).pop());
+    },
+  });
+}
+
 function gitMain() {
-  if (!state.git.loading && !state.git.commits.length && !state.git.worktrees.length && !state.git.error) loadGitPanel();
+  if (!state.git.loading && !state.git.files.length && !state.git.commits.length && !state.git.worktrees.length && !state.git.error) loadGitPanel();
   const g = state.git;
   return [
     PageHeader({ compact: true, dense: true, title: 'Git', lede: 'Working-tree diff, recent commits, and worktrees.' }),
     g.error ? Alert({ key: 'git-err', kind: 'error', title: 'Git error', children: g.error }) : null,
     Row({ key: 'git-actions', children: [
       Btn({ key: 'refresh', onClick: () => loadGitPanel(), children: g.loading ? 'loading…' : 'refresh' }),
-      Btn({ key: 'diff-all', onClick: () => loadGitDiff(''), children: g.diffLoading ? 'loading diff…' : 'load full diff' }),
+      WorktreeSwitcher({
+        key: 'wts',
+        worktrees: g.worktrees,
+        current: (g.worktrees.find(w => w.branch) || {}).branch,
+        onSwitch: (w) => loadGitDiff(''),
+        onCreate: () => { state.git.wtDialog = { value: '', error: null }; render(); },
+      }),
     ] }),
+    Panel({ id: 'git-status', title: 'changed files', children:
+      GitStatusPanel({ files: g.files, active: g.file, onFileClick: (f) => loadGitDiff(f.path) }) }),
     Panel({ id: 'git-diff', title: g.file ? ('diff: ' + g.file) : 'diff', children:
       g.diffError ? h('p', { key: 'de', class: 't-meta field-error' }, g.diffError)
-      : h('pre', { key: 'dp', class: 'git-diff-pre' }, g.diff || '(no diff loaded)') }),
+      : GitDiffView({ diff: g.diff || '', filename: g.file }) }),
     Panel({ id: 'git-log', title: 'recent commits', children:
       !g.commits.length ? h('p', { key: 'nc', class: 't-meta' }, g.loading ? 'loading…' : 'no commits')
       : h('ul', { key: 'cl', class: 'git-commit-list' }, g.commits.map(c =>
@@ -995,13 +1031,7 @@ function gitMain() {
             h('span', { key: 'm', class: 't-meta' }, ' — ' + (c.author || '') + ' · ' + (c.date || '')),
             Btn({ key: 'view', small: true, onClick: () => loadGitDiff(''), children: 'view' }),
           ]))) }),
-    Panel({ id: 'git-worktrees', title: 'worktrees', children:
-      !g.worktrees.length ? h('p', { key: 'nw', class: 't-meta' }, g.loading ? 'loading…' : 'no worktrees')
-      : h('ul', { key: 'wl', class: 'git-worktree-list' }, g.worktrees.map((w, i) =>
-          h('li', { key: w.path || i }, [
-            h('code', { key: 'p' }, w.path || ''),
-            ' ' + (w.branch || (w.detached ? '(detached)' : '')),
-          ]))) }),
+    gitWorktreeDialog(),
   ];
 }
 

package/site/app/js/backend.js

@@ -430,6 +430,11 @@ export async function listAgentModels(base, agentId) {
 
 // ---------- Git / worktrees (WS) ----------
 
+export async function gitStatus(base, { cwd } = {}) {
+  const { files } = await wsCall(base, 'git.status', { cwd });
+  return files || [];
+}
+
 export async function gitDiff(base, { cwd, file, staged } = {}) {
   return wsCall(base, 'git.diff', { cwd, file, staged });
 }