npm - groove-dev - Versions diffs - 0.16.1 → 0.16.3 - Mend

groove-dev 0.16.1 → 0.16.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (203) hide show

package/packages/gui/dist/index.html CHANGED Viewed

@@ -4,8 +4,8 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>GROOVE</title>
-    <script type="module" crossorigin src="/assets/index-BQSznoq0.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-Gfb8Zxy9.css">
+    <script type="module" crossorigin src="/assets/index-CFeltwTB.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BhjOFLBc.css">
   </head>
   <body>
     <div id="root"></div>

package/packages/gui/package.json CHANGED Viewed

@@ -23,6 +23,9 @@
     "@codemirror/state": "^6.6.0",
     "@codemirror/theme-one-dark": "^6.1.3",
     "@codemirror/view": "^6.41.0",
+    "@xterm/addon-fit": "^0.11.0",
+    "@xterm/addon-web-links": "^0.12.0",
+    "@xterm/xterm": "^6.0.0",
     "@xyflow/react": "^12.0.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",

package/packages/gui/src/components/EditorTabs.jsx CHANGED Viewed

@@ -29,8 +29,8 @@ export default function EditorTabs() {
             style={{
               ...styles.tab,
               color: isActive ? 'var(--text-bright)' : 'var(--text-primary)',
-              borderBottom: isActive ? '2px solid var(--accent)' : '2px solid transparent',
-              background: isActive ? 'var(--bg-active)' : 'transparent',
+              borderBottom: isActive ? '1px solid var(--accent)' : '1px solid transparent',
+              background: isActive ? 'var(--bg-base)' : 'transparent',
             }}
           >
             {isDirty && <span style={styles.dirtyDot} />}
@@ -62,7 +62,7 @@ const styles = {
     cursor: 'pointer', whiteSpace: 'nowrap',
     fontSize: 11, fontFamily: 'var(--font)',
     transition: 'background 0.08s',
-    borderRight: '1px solid var(--border)',
+    borderRight: '1px solid rgba(75, 82, 99, 0.4)',
     flexShrink: 0,
   },
   tabName: {

package/packages/gui/src/components/FileTree.jsx CHANGED Viewed

@@ -111,11 +111,9 @@ function ContextMenu({ x, y, entry, onClose, onAction }) {
   const isDir = entry?.type === 'dir';
   const items = [
-    ...(isDir ? [
-      { label: 'New File Here', action: 'newFileIn' },
-      { label: 'New Folder Here', action: 'newDirIn' },
-      { sep: true },
-    ] : []),
+    { label: 'New File', action: isDir ? 'newFileIn' : 'newFileSibling' },
+    { label: 'New Folder', action: isDir ? 'newDirIn' : 'newDirSibling' },
+    { sep: true },
     { label: 'Rename', action: 'rename' },
     { label: 'Delete', action: 'delete', danger: true },
   ];
@@ -219,7 +217,6 @@ export default function FileTree() {
     switch (action) {
       case 'newFileIn':
         setCreating({ type: 'file', parentPath: entry.path });
-        // Ensure dir is expanded
         setExpandedDirs((prev) => {
           const next = new Set(prev);
           next.add(entry.path);
@@ -236,6 +233,12 @@ export default function FileTree() {
           return next;
         });
         break;
+      case 'newFileSibling':
+        setCreating({ type: 'file', parentPath: parentDir });
+        break;
+      case 'newDirSibling':
+        setCreating({ type: 'dir', parentPath: parentDir });
+        break;
       case 'rename':
         setRenamingPath(entry.path);
         setRenameValue(entry.name);
@@ -300,28 +303,21 @@ export default function FileTree() {
             title="New File"
             style={styles.toolbarBtn}
           >
-            +f
+            <svg width="14" height="14" viewBox="0 0 16 16" fill="none" stroke="currentColor" strokeWidth="1.3">
+              <path d="M3 1.5h6l4 4V14a.5.5 0 01-.5.5h-9A.5.5 0 013 14V2a.5.5 0 01.5-.5z"/>
+              <path d="M9 1.5V5.5h4"/>
+              <path d="M8 8.5v4M6 10.5h4" strokeLinecap="round"/>
+            </svg>
           </button>
           <button
             onClick={() => setCreating({ type: 'dir', parentPath: '' })}
             title="New Folder"
             style={styles.toolbarBtn}
           >
-            +d
-          </button>
-          <button
-            onClick={() => setExpandedDirs(new Set(['']))}
-            title="Collapse All"
-            style={styles.toolbarBtn}
-          >
-            {'\u2191'}
-          </button>
-          <button
-            onClick={() => fetchTreeDir('')}
-            title="Refresh"
-            style={styles.toolbarBtn}
-          >
-            {'\u21BB'}
+            <svg width="14" height="14" viewBox="0 0 16 16" fill="none" stroke="currentColor" strokeWidth="1.3">
+              <path d="M1.5 3.5h4l1.5 1.5H14a.5.5 0 01.5.5v8a.5.5 0 01-.5.5H2a.5.5 0 01-.5-.5V4z"/>
+              <path d="M8 8v3M6.5 9.5h3" strokeLinecap="round"/>
+            </svg>
           </button>
         </div>
       </div>

package/packages/gui/src/components/Terminal.jsx ADDED Viewed

@@ -0,0 +1,154 @@
+// GROOVE GUI — Embedded Terminal (xterm.js)
+// FSL-1.1-Apache-2.0 — see LICENSE
+import React, { useRef, useEffect, useCallback } from 'react';
+import { Terminal as XTerm } from '@xterm/xterm';
+import { FitAddon } from '@xterm/addon-fit';
+import { WebLinksAddon } from '@xterm/addon-web-links';
+import '@xterm/xterm/css/xterm.css';
+import { useGrooveStore } from '../stores/groove';
+export default function Terminal({ visible }) {
+  const containerRef = useRef(null);
+  const termRef = useRef(null);
+  const fitAddonRef = useRef(null);
+  const sessionIdRef = useRef(null);
+  const ws = useGrooveStore((s) => s.ws);
+  // Create terminal on mount
+  useEffect(() => {
+    if (!containerRef.current) return;
+    const term = new XTerm({
+      fontFamily: "'JetBrains Mono', 'SF Mono', 'Fira Code', monospace",
+      fontSize: 12,
+      lineHeight: 1.3,
+      cursorBlink: true,
+      cursorStyle: 'bar',
+      theme: {
+        background: '#1e2127',
+        foreground: '#abb2bf',
+        cursor: '#33afbc',
+        selectionBackground: 'rgba(51, 175, 188, 0.25)',
+        black: '#1e2127',
+        red: '#e06c75',
+        green: '#4ae168',
+        yellow: '#e5c07b',
+        blue: '#61afef',
+        magenta: '#c678dd',
+        cyan: '#33afbc',
+        white: '#abb2bf',
+        brightBlack: '#5c6370',
+        brightRed: '#e06c75',
+        brightGreen: '#4ae168',
+        brightYellow: '#e5c07b',
+        brightBlue: '#61afef',
+        brightMagenta: '#c678dd',
+        brightCyan: '#33afbc',
+        brightWhite: '#e6e6e6',
+      },
+    });
+    const fitAddon = new FitAddon();
+    const webLinksAddon = new WebLinksAddon();
+    term.loadAddon(fitAddon);
+    term.loadAddon(webLinksAddon);
+    term.open(containerRef.current);
+    fitAddon.fit();
+    termRef.current = term;
+    fitAddonRef.current = fitAddon;
+    return () => {
+      term.dispose();
+      termRef.current = null;
+      fitAddonRef.current = null;
+    };
+  }, []);
+  // Spawn shell session when ws is ready
+  useEffect(() => {
+    if (!ws || ws.readyState !== 1 || !termRef.current) return;
+    const term = termRef.current;
+    // Request a shell session
+    ws.send(JSON.stringify({ type: 'terminal:spawn' }));
+    // Listen for terminal messages
+    const handler = (event) => {
+      try {
+        const msg = JSON.parse(event.data);
+        if (msg.type === 'terminal:spawned') {
+          sessionIdRef.current = msg.id;
+        } else if (msg.type === 'terminal:output' && msg.id === sessionIdRef.current) {
+          term.write(msg.data);
+        } else if (msg.type === 'terminal:exit' && msg.id === sessionIdRef.current) {
+          term.write('\r\n\x1b[90m[session ended]\x1b[0m\r\n');
+          sessionIdRef.current = null;
+        }
+      } catch { /* ignore */ }
+    };
+    ws.addEventListener('message', handler);
+    // Forward keystrokes to daemon
+    const inputDisposable = term.onData((data) => {
+      if (sessionIdRef.current && ws.readyState === 1) {
+        ws.send(JSON.stringify({ type: 'terminal:input', id: sessionIdRef.current, data }));
+      }
+    });
+    return () => {
+      ws.removeEventListener('message', handler);
+      inputDisposable.dispose();
+      // Kill session on unmount
+      if (sessionIdRef.current && ws.readyState === 1) {
+        ws.send(JSON.stringify({ type: 'terminal:kill', id: sessionIdRef.current }));
+      }
+      sessionIdRef.current = null;
+    };
+  }, [ws]);
+  // Refit on visibility change
+  useEffect(() => {
+    if (visible && fitAddonRef.current) {
+      // Small delay so container has its final size
+      const timer = setTimeout(() => {
+        try { fitAddonRef.current.fit(); } catch { /* ignore */ }
+      }, 50);
+      return () => clearTimeout(timer);
+    }
+  }, [visible]);
+  // Refit on window resize
+  useEffect(() => {
+    const onResize = () => {
+      if (fitAddonRef.current && visible) {
+        try { fitAddonRef.current.fit(); } catch { /* ignore */ }
+      }
+    };
+    window.addEventListener('resize', onResize);
+    return () => window.removeEventListener('resize', onResize);
+  }, [visible]);
+  return (
+    <div
+      ref={containerRef}
+      style={{
+        ...styles.container,
+        display: visible ? 'block' : 'none',
+      }}
+    />
+  );
+}
+const styles = {
+  container: {
+    width: '100%', height: '100%',
+    padding: '4px 0 0 4px',
+    background: '#1e2127',
+    overflow: 'hidden',
+  },
+};

package/packages/gui/src/views/FileEditor.jsx CHANGED Viewed

@@ -1,12 +1,13 @@
 // GROOVE GUI — File Editor View
 // FSL-1.1-Apache-2.0 — see LICENSE
-import React, { useCallback } from 'react';
+import React, { useState, useCallback } from 'react';
 import { useGrooveStore } from '../stores/groove';
 import FileTree from '../components/FileTree';
 import EditorTabs from '../components/EditorTabs';
 import CodeEditor from '../components/CodeEditor';
 import MediaViewer, { isMediaFile } from '../components/MediaViewer';
+import Terminal from '../components/Terminal';
 export default function FileEditor() {
   const activeFile = useGrooveStore((s) => s.editorActiveFile);
@@ -18,10 +19,12 @@ export default function FileEditor() {
   const reloadFile = useGrooveStore((s) => s.reloadFile);
   const dismissFileChange = useGrooveStore((s) => s.dismissFileChange);
+  const [terminalOpen, setTerminalOpen] = useState(false);
+  const [terminalHeight, setTerminalHeight] = useState(220);
   const file = activeFile ? files[activeFile] : null;
   const isChanged = activeFile && changedFiles[activeFile];
   const isMedia = activeFile && isMediaFile(activeFile);
-  // Media files go straight to viewer — they won't be in editorFiles
   const isMediaTab = activeFile && openTabs.includes(activeFile) && isMedia;
   const onContentChange = useCallback((content) => {
@@ -32,6 +35,23 @@ export default function FileEditor() {
     if (activeFile) saveFile(activeFile);
   }, [activeFile, saveFile]);
+  // Drag-to-resize terminal
+  const onResizeStart = useCallback((e) => {
+    e.preventDefault();
+    const startY = e.clientY;
+    const startH = terminalHeight;
+    const onMove = (ev) => {
+      const delta = startY - ev.clientY;
+      setTerminalHeight(Math.max(100, Math.min(600, startH + delta)));
+    };
+    const onUp = () => {
+      document.removeEventListener('mousemove', onMove);
+      document.removeEventListener('mouseup', onUp);
+    };
+    document.addEventListener('mousemove', onMove);
+    document.addEventListener('mouseup', onUp);
+  }, [terminalHeight]);
   return (
     <div style={styles.container}>
       {/* Tab bar */}
@@ -44,45 +64,61 @@ export default function FileEditor() {
           <FileTree />
         </div>
-        {/* Editor area */}
-        <div style={styles.editorArea}>
-          {/* External change banner */}
-          {isChanged && !isMedia && (
-            <div style={styles.changeBanner}>
-              <span style={styles.bannerText}>File modified externally</span>
-              <button
-                onClick={() => reloadFile(activeFile)}
-                style={styles.bannerBtn}
-              >
-                Reload
-              </button>
-              <button
-                onClick={() => dismissFileChange(activeFile)}
-                style={styles.bannerDismiss}
-              >
-                Dismiss
-              </button>
-            </div>
-          )}
+        {/* Editor + terminal column */}
+        <div style={styles.editorColumn}>
+          {/* Editor area */}
+          <div style={styles.editorArea}>
+            {/* External change banner */}
+            {isChanged && !isMedia && (
+              <div style={styles.changeBanner}>
+                <span style={styles.bannerText}>File modified externally</span>
+                <button onClick={() => reloadFile(activeFile)} style={styles.bannerBtn}>Reload</button>
+                <button onClick={() => dismissFileChange(activeFile)} style={styles.bannerDismiss}>Dismiss</button>
+              </div>
+            )}
-          {/* Media viewer */}
-          {isMediaTab ? (
-            <MediaViewer path={activeFile} />
-          ) : file ? (
-            <CodeEditor
-              key={activeFile}
-              content={file.content}
-              language={file.language}
-              onContentChange={onContentChange}
-              onSave={onSave}
-            />
-          ) : (
-            <div style={styles.emptyState}>
-              <div style={styles.emptyIcon}>{'\u2190'}</div>
-              <div style={styles.emptyText}>Select a file from the tree</div>
-              <div style={styles.emptyHint}>Cmd+S to save  |  right-click for options</div>
-            </div>
+            {/* Media viewer / Code editor / Empty state */}
+            {isMediaTab ? (
+              <MediaViewer path={activeFile} />
+            ) : file ? (
+              <CodeEditor
+                key={activeFile}
+                content={file.content}
+                language={file.language}
+                onContentChange={onContentChange}
+                onSave={onSave}
+              />
+            ) : (
+              <div style={styles.emptyState}>
+                <div style={styles.emptyIcon}>{'\u2190'}</div>
+                <div style={styles.emptyText}>Select a file from the tree</div>
+                <div style={styles.emptyHint}>Cmd+S to save  |  right-click for options</div>
+              </div>
+            )}
+          </div>
+          {/* Terminal pane */}
+          {terminalOpen && (
+            <>
+              <div style={styles.resizeHandle} onMouseDown={onResizeStart} />
+              <div style={{ ...styles.terminalPane, height: terminalHeight }}>
+                <Terminal visible={terminalOpen} />
+              </div>
+            </>
           )}
+          {/* Terminal toggle bar */}
+          <div style={styles.terminalBar}>
+            <button
+              onClick={() => setTerminalOpen(!terminalOpen)}
+              style={{
+                ...styles.terminalToggle,
+                color: terminalOpen ? 'var(--accent)' : 'var(--text-dim)',
+              }}
+            >
+              {terminalOpen ? '\u25BE' : '\u25B4'} Terminal
+            </button>
+          </div>
         </div>
       </div>
     </div>
@@ -102,6 +138,10 @@ const styles = {
     borderRight: '1px solid var(--border)',
     overflow: 'hidden',
   },
+  editorColumn: {
+    flex: 1, display: 'flex', flexDirection: 'column',
+    overflow: 'hidden',
+  },
   editorArea: {
     flex: 1, display: 'flex', flexDirection: 'column',
     position: 'relative', overflow: 'hidden',
@@ -146,4 +186,25 @@ const styles = {
   emptyHint: {
     fontSize: 10, color: 'var(--text-muted)',
   },
+  resizeHandle: {
+    height: 4, cursor: 'row-resize',
+    background: 'var(--border)',
+    flexShrink: 0,
+  },
+  terminalPane: {
+    flexShrink: 0, overflow: 'hidden',
+  },
+  terminalBar: {
+    height: 24, flexShrink: 0,
+    display: 'flex', alignItems: 'center',
+    borderTop: '1px solid var(--border)',
+    background: 'var(--bg-chrome)',
+    padding: '0 8px',
+  },
+  terminalToggle: {
+    background: 'none', border: 'none',
+    fontSize: 11, fontWeight: 600,
+    fontFamily: 'var(--font)',
+    cursor: 'pointer', padding: '2px 6px',
+  },
 };