mbeditor 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31199cd73e4e3321d8851a62ab20decd6e9c8d9ab328b50d9f987f85da1333b2
-  data.tar.gz: 27de9f3e0641c41e693023b3fcbedbe0d89d35d8d1fd7f3606aaa8095ceeb5b2
+  metadata.gz: 041ce3cd1e0cc69e9c9d4fbf4a3578d8681ce4ed54cbaf6351f36e4642d161b9
+  data.tar.gz: e65f221f2bad0d72957225ba5836104878e27865c4e86b82b45857509922d571
 SHA512:
-  metadata.gz: 5f86f17e33bfd43248d7dc1a122f6ed3d85a0fcf3e745ca805561d7d490c3497e1bfaa53339ed28ed068a401ed91447888eb5f92a89654d89fe3b8ae0fd7c5b1
-  data.tar.gz: fea980a035f785508e1bc5444fce65c7a8c0824307c48e4db7ea73fcf7218f23889c1c687d999fc252f3ffb97fc732b1aae8292ec65938f40d97c48b95a470c7
+  metadata.gz: 9f51620ece5851894a862bc5ed080bb0a4d73a4263a987b069b212ed15d705f3a2ce1383dcb6850578bd2bb6f1aa5a00734132d11ab62cf91cfb945cf8042a5d
+  data.tar.gz: da12cdf3ddceaf8d91f173ca11df458e88f4c294294eef005401a6b2ecc3457d5d76f4ce9bb148d6fbd18e572a0b669f154ef4675855ebb170fe63859aef82dd

data/app/assets/javascripts/mbeditor/application.js

@@ -4,6 +4,7 @@
 //= require mbeditor/file_service
 //= require mbeditor/websocket_service
 //= require mbeditor/git_service
+//= require mbeditor/conflict_parser
 //= require mbeditor/search_service
 //= require mbeditor/tab_manager
 //= require mbeditor/editor_plugins

data/app/assets/javascripts/mbeditor/components/EditorPanel.js

@@ -36,9 +36,17 @@ var EditorPanel = function EditorPanel(_ref) {
   var monacoRef = useRef(null);
   var latestContentRef = useRef('');
   var lastAppliedExternalVersionRef = useRef(0);
+  var conflictDecorationsRef = React.useRef([]);
+  var conflictBlocksRef = React.useRef([]);
   var aviBaseRef = useRef(0);
   var aviMaxRef = useRef(0);
 
+  var _conflictState = React.useState(0);
+  var conflictCount = _conflictState[0];
+  var setConflictCount = _conflictState[1];
+
+  var currentConflictIndexRef = React.useRef(0);
+
   var _useState = useState('');
   var _useState2 = _slicedToArray(_useState, 2);
   var markup = _useState2[0];
@@ -848,6 +856,54 @@ var EditorPanel = function EditorPanel(_ref) {
     }
   }, [tab.content, tab.externalContentVersion]);
 
+  useEffect(function () {
+    var editor = monacoRef.current;
+    if (!editor || !window.monaco || typeof tab.content !== 'string') return;
+    var model = editor.getModel();
+    if (!model) return;
+
+    if (!ConflictParser.hasConflicts(tab.content)) {
+      conflictDecorationsRef.current = model.deltaDecorations(conflictDecorationsRef.current, []);
+      conflictBlocksRef.current = [];
+      setConflictCount(0);
+      return;
+    }
+
+    var blocks = ConflictParser.parse(tab.content);
+    conflictBlocksRef.current = blocks;
+    setConflictCount(blocks.length);
+
+    var decorations = [];
+    blocks.forEach(function (block) {
+      decorations.push({
+        range: new window.monaco.Range(block.startLine + 1, 1, block.startLine + 1, 1),
+        options: { isWholeLine: true, className: 'mb-conflict-marker-line' }
+      });
+      if (block.headEnd > block.startLine + 1) {
+        decorations.push({
+          range: new window.monaco.Range(block.startLine + 2, 1, block.headEnd, 1),
+          options: { isWholeLine: true, className: 'mb-conflict-head' }
+        });
+      }
+      decorations.push({
+        range: new window.monaco.Range(block.dividerLine + 1, 1, block.dividerLine + 1, 1),
+        options: { isWholeLine: true, className: 'mb-conflict-marker-line' }
+      });
+      if (block.endLine > block.dividerLine + 1) {
+        decorations.push({
+          range: new window.monaco.Range(block.dividerLine + 2, 1, block.endLine, 1),
+          options: { isWholeLine: true, className: 'mb-conflict-incoming' }
+        });
+      }
+      decorations.push({
+        range: new window.monaco.Range(block.endLine + 1, 1, block.endLine + 1, 1),
+        options: { isWholeLine: true, className: 'mb-conflict-marker-line' }
+      });
+    });
+
+    conflictDecorationsRef.current = model.deltaDecorations(conflictDecorationsRef.current, decorations);
+  }, [tab.content, tab.externalContentVersion]);
+
   // Apply editorPrefs changes to a running editor without remounting
   useEffect(function () {
     if (!window.monaco) return;
@@ -1458,6 +1514,57 @@ var EditorPanel = function EditorPanel(_ref) {
     );
   }
 
+  function resolveConflict(blockIndex, resolution) {
+    var editor = monacoRef.current;
+    if (!editor || !window.monaco) return;
+    var blocks = conflictBlocksRef.current;
+    if (blockIndex < 0 || blockIndex >= blocks.length) return;
+    var block = blocks[blockIndex];
+    var model = editor.getModel();
+    if (!model) return;
+
+    var resolvedContent;
+    if (resolution === 'head') {
+      resolvedContent = block.headContent;
+    } else if (resolution === 'incoming') {
+      resolvedContent = block.incomingContent;
+    } else {
+      resolvedContent = block.headContent +
+        (block.headContent && block.incomingContent ? '\n' : '') +
+        block.incomingContent;
+    }
+
+    editor.pushUndoStop();
+    editor.executeEdits('conflict-resolve', [{
+      range: new window.monaco.Range(
+        block.startLine + 1, 1,
+        block.endLine + 1,
+        model.getLineMaxColumn(block.endLine + 1)
+      ),
+      text: resolvedContent
+    }]);
+    editor.pushUndoStop();
+
+    var newContent = editor.getValue();
+    EditorStore.setState({
+      panes: EditorStore.getState().panes.map(function (p) {
+        return Object.assign({}, p, {
+          tabs: p.tabs.map(function (t) {
+            if (t.path !== tab.path) return t;
+            return Object.assign({}, t, {
+              content: newContent,
+              dirty: true,
+              externalContentVersion: (t.externalContentVersion || 0) + 1
+            });
+          })
+        });
+      })
+    });
+
+    var remaining = conflictBlocksRef.current.length - 1;
+    currentConflictIndexRef.current = Math.min(currentConflictIndexRef.current, Math.max(0, remaining - 1));
+  }
+
   // Always render the same wrapper structure so the editorRef div is never
   // unmounted when gitAvailable changes (e.g. loaded async after workspace
   // call returns). The toolbar is conditionally included inside the wrapper.
@@ -1532,6 +1639,65 @@ var EditorPanel = function EditorPanel(_ref) {
         !editorPrefs.toolbarIconOnly && !testLoading && React.createElement('span', { className: 'ide-toolbar-label' }, 'Test')
       )
     ),
+    conflictCount > 0 && React.createElement(
+      'div', { className: 'mb-conflict-banner' },
+      React.createElement(
+        'span', { className: 'mb-conflict-count' },
+        React.createElement('i', { className: 'fas fa-code-merge' }),
+        ' ',
+        conflictCount,
+        ' merge conflict',
+        conflictCount !== 1 ? 's' : ''
+      ),
+      React.createElement(
+        'div', { className: 'mb-conflict-nav' },
+        React.createElement('button', {
+          className: 'mb-btn mb-btn-sm',
+          title: 'Previous conflict',
+          onClick: function () {
+            var idx = Math.max(0, currentConflictIndexRef.current - 1);
+            currentConflictIndexRef.current = idx;
+            var b = conflictBlocksRef.current[idx];
+            if (b && monacoRef.current) {
+              monacoRef.current.revealLineInCenter(b.startLine + 1);
+              monacoRef.current.setPosition({ lineNumber: b.startLine + 1, column: 1 });
+            }
+          }
+        }, '↑ Prev'),
+        React.createElement('button', {
+          className: 'mb-btn mb-btn-sm',
+          title: 'Next conflict',
+          onClick: function () {
+            var blocks = conflictBlocksRef.current;
+            var idx = Math.min(blocks.length - 1, currentConflictIndexRef.current + 1);
+            currentConflictIndexRef.current = idx;
+            var b = blocks[idx];
+            if (b && monacoRef.current) {
+              monacoRef.current.revealLineInCenter(b.startLine + 1);
+              monacoRef.current.setPosition({ lineNumber: b.startLine + 1, column: 1 });
+            }
+          }
+        }, '↓ Next')
+      ),
+      React.createElement(
+        'div', { className: 'mb-conflict-actions' },
+        React.createElement('button', {
+          className: 'mb-btn mb-btn-sm mb-btn-success',
+          title: 'Accept current (HEAD) — keep your local changes',
+          onClick: function () { resolveConflict(currentConflictIndexRef.current, 'head'); }
+        }, 'Accept Current'),
+        React.createElement('button', {
+          className: 'mb-btn mb-btn-sm mb-btn-incoming',
+          title: 'Accept incoming — take the changes being merged in',
+          onClick: function () { resolveConflict(currentConflictIndexRef.current, 'incoming'); }
+        }, 'Accept Incoming'),
+        React.createElement('button', {
+          className: 'mb-btn mb-btn-sm',
+          title: 'Accept both — keep current above incoming',
+          onClick: function () { resolveConflict(currentConflictIndexRef.current, 'both'); }
+        }, 'Accept Both')
+      )
+    ),
     tab.truncated && React.createElement(
       'div',
       {

data/app/assets/javascripts/mbeditor/components/MbeditorApp.js

@@ -111,6 +111,44 @@ var SectionActionGroup = function SectionActionGroup(_ref2) {
   );
 };
 
+function FileReloadBanner(_ref) {
+  var pendingReloads = _ref.pendingReloads;
+  var onSaveAndReload = _ref.onSaveAndReload;
+  var onDiscardAndReload = _ref.onDiscardAndReload;
+  var onKeepMine = _ref.onKeepMine;
+  if (!pendingReloads || pendingReloads.length === 0) return null;
+  return React.createElement(
+    'div', { className: 'mb-file-reload-banner' },
+    pendingReloads.map(function (r) {
+      return React.createElement(
+        'div', { key: r.paneId + ':' + r.tabId, className: 'mb-file-reload-item' },
+        React.createElement(
+          'span', { className: 'mb-file-reload-msg' },
+          React.createElement('i', { className: 'fas fa-sync-alt' }),
+          '  ',
+          React.createElement('strong', null, r.name),
+          '  was updated externally'
+        ),
+        React.createElement(
+          'div', { className: 'mb-file-reload-actions' },
+          React.createElement('button', {
+            className: 'mb-btn mb-btn-sm mb-btn-primary',
+            onClick: function () { onSaveAndReload(r); }
+          }, 'Save & Reload'),
+          React.createElement('button', {
+            className: 'mb-btn mb-btn-sm mb-btn-warning',
+            onClick: function () { onDiscardAndReload(r); }
+          }, 'Discard & Reload'),
+          React.createElement('button', {
+            className: 'mb-btn mb-btn-sm',
+            onClick: function () { onKeepMine(r); }
+          }, 'Keep Mine')
+        )
+      );
+    })
+  );
+}
+
 var MbeditorApp = function MbeditorApp() {
   var _useState = useState(EditorStore.getState());
 
@@ -1099,12 +1137,77 @@ var MbeditorApp = function MbeditorApp() {
           SearchService.buildIndex(newData);
           return newData;
         });
+        checkOpenTabsForExternalChanges();
       })["catch"](function () {});
     }
     WebSocketService.onFilesChanged(handleFilesChanged);
     return function () { WebSocketService.offFilesChanged(handleFilesChanged); };
   }, []);
 
+  function checkOpenTabsForExternalChanges() {
+    var st = EditorStore.getState();
+    var allTabs = st.panes.reduce(function (acc, p) {
+      return acc.concat(p.tabs.map(function (t) { return { paneId: p.id, tab: t }; }));
+    }, []);
+    var fileTabs = allTabs.filter(function (pt) {
+      var path = pt.tab.path || '';
+      return path &&
+        !path.startsWith('mbeditor://') &&
+        !path.startsWith('diff://') &&
+        !path.startsWith('combined-diff://') &&
+        !pt.tab.isCombinedDiff &&
+        !pt.tab.isSettings &&
+        !pt.tab.isImage &&
+        !pt.tab.isDiff &&
+        typeof pt.tab.content === 'string';
+    });
+    fileTabs.forEach(function (pt) {
+      FileService.getFile(pt.tab.path, { allowMissing: true }).then(function (data) {
+        if (!data || typeof data.content !== 'string') return;
+        var serverNorm = data.content.replace(/\r\n/g, '\n');
+        var tabNorm = (pt.tab.content || '').replace(/\r\n/g, '\n');
+        if (serverNorm === tabNorm) return;
+        if (!pt.tab.dirty) {
+          EditorStore.setState({
+            panes: EditorStore.getState().panes.map(function (p) {
+              if (p.id !== pt.paneId) return p;
+              return Object.assign({}, p, {
+                tabs: p.tabs.map(function (t) {
+                  if (t.id !== pt.tab.id) return t;
+                  return Object.assign({}, t, {
+                    content: data.content,
+                    externalContentVersion: (t.externalContentVersion || 0) + 1
+                  });
+                })
+              });
+            })
+          });
+        } else {
+          // Re-verify the tab still exists before queuing
+          var currentState = EditorStore.getState();
+          var stillExists = currentState.panes.some(function (p) {
+            return p.id === pt.paneId && p.tabs.some(function (t) { return t.id === pt.tab.id; });
+          });
+          if (!stillExists) return;
+          var existing = EditorStore.getState().pendingReloads.find(function (r) {
+            return r.paneId === pt.paneId && r.tabId === pt.tab.id;
+          });
+          if (!existing) {
+            EditorStore.setState({
+              pendingReloads: EditorStore.getState().pendingReloads.concat([{
+                paneId: pt.paneId,
+                tabId: pt.tab.id,
+                path: pt.tab.path,
+                name: pt.tab.name,
+                serverContent: data.content
+              }])
+            });
+          }
+        }
+      })["catch"](function () {});
+    });
+  }
+
   // Auto-refresh the file tree every 10s to pick up external changes (new files, deletions, etc.)
   // When an ActionCable WebSocket is connected this acts only as a safety-net fallback —
   // the WebSocket push above handles immediate invalidation after mbeditor mutations.
@@ -1168,6 +1271,13 @@ var MbeditorApp = function MbeditorApp() {
       setClosingTabId(id);
     } else {
       TabManager.closeTab(paneId, id);
+      EditorStore.setState({
+        pendingReloads: EditorStore.getState().pendingReloads.filter(function (r) {
+          return EditorStore.getState().panes.some(function (p) {
+            return p.tabs.some(function (t) { return t.id === r.tabId; });
+          });
+        })
+      });
     }
   };
 
@@ -1199,6 +1309,13 @@ var MbeditorApp = function MbeditorApp() {
           _closeEntry.cleanVersionId = _closeEntry.model.getAlternativeVersionId();
         }
         TabManager.closeTab(closingPaneId, tab.id);
+        EditorStore.setState({
+          pendingReloads: EditorStore.getState().pendingReloads.filter(function (r) {
+            return EditorStore.getState().panes.some(function (p) {
+              return p.tabs.some(function (t) { return t.id === r.tabId; });
+            });
+          })
+        });
       })["catch"](function (err) {
         EditorStore.setStatus("Save failed: " + err.message, "error");
       })["finally"](function () {
@@ -1210,6 +1327,13 @@ var MbeditorApp = function MbeditorApp() {
       });
     } else {
       TabManager.closeTab(closingPaneId, tab.id);
+      EditorStore.setState({
+        pendingReloads: EditorStore.getState().pendingReloads.filter(function (r) {
+          return EditorStore.getState().panes.some(function (p) {
+            return p.tabs.some(function (t) { return t.id === r.tabId; });
+          });
+        })
+      });
       setClosingTabId(null);
       setClosingPaneId(null);
     }
@@ -1472,6 +1596,64 @@ var MbeditorApp = function MbeditorApp() {
     });
   };
 
+  function dismissPendingReload(reload) {
+    EditorStore.setState({
+      pendingReloads: EditorStore.getState().pendingReloads.filter(function (r) {
+        return !(r.paneId === reload.paneId && r.tabId === reload.tabId);
+      })
+    });
+  }
+
+  function handleSaveAndReload(reload) {
+    var st = EditorStore.getState();
+    var pane = st.panes.find(function (p) { return p.id === reload.paneId; });
+    var tab = pane && pane.tabs.find(function (t) { return t.id === reload.tabId; });
+    if (!tab) { dismissPendingReload(reload); return; }
+    FileService.saveFile(tab.path, tab.content).then(function () {
+      EditorStore.setState({
+        panes: EditorStore.getState().panes.map(function (p) {
+          if (p.id !== reload.paneId) return p;
+          return Object.assign({}, p, {
+            tabs: p.tabs.map(function (t) {
+              if (t.id !== reload.tabId) return t;
+              return Object.assign({}, t, {
+                content: tab.content,
+                dirty: false,
+                externalContentVersion: (t.externalContentVersion || 0) + 1
+              });
+            })
+          });
+        })
+      });
+      dismissPendingReload(reload);
+    })["catch"](function () {
+      EditorStore.setStatus('Save failed — cannot reload', 'error');
+    });
+  }
+
+  function handleDiscardAndReload(reload) {
+    EditorStore.setState({
+      panes: EditorStore.getState().panes.map(function (p) {
+        if (p.id !== reload.paneId) return p;
+        return Object.assign({}, p, {
+          tabs: p.tabs.map(function (t) {
+            if (t.id !== reload.tabId) return t;
+            return Object.assign({}, t, {
+              content: reload.serverContent,
+              dirty: false,
+              externalContentVersion: (t.externalContentVersion || 0) + 1
+            });
+          })
+        });
+      })
+    });
+    dismissPendingReload(reload);
+  }
+
+  function handleKeepMine(reload) {
+    dismissPendingReload(reload);
+  }
+
   var handleSaveAll = function handleSaveAll() {
     var dirtyTabs = state.panes.flatMap(function (p) {
       return p.tabs;
@@ -1558,6 +1740,29 @@ var MbeditorApp = function MbeditorApp() {
     EditorStore.setStatus('Line endings changed to ' + newEOL, 'info');
   };
 
+  var handleRefreshWorkspace = function handleRefreshWorkspace() {
+    setLoading(function (prev) {
+      return _extends({}, prev, { refreshWorkspace: true });
+    });
+    GitService.fetchStatus()["catch"](function () {});
+    FileService.getTree().then(function (data) {
+      var newData = data || [];
+      setTreeData(function (prevData) {
+        if (JSON.stringify(newData) === JSON.stringify(prevData)) return prevData;
+        SearchService.buildIndex(newData);
+        return newData;
+      });
+      checkOpenTabsForExternalChanges();
+      EditorStore.setStatus("Workspace refreshed", "success");
+    })["catch"](function (err) {
+      EditorStore.setStatus("Failed to refresh workspace", "error");
+    })["finally"](function () {
+      setLoading(function (prev) {
+        return _extends({}, prev, { refreshWorkspace: false });
+      });
+    });
+  };
+
   var handleFormat = function handleFormat() {
     if (!activeTab) return;
 
@@ -2789,6 +2994,13 @@ var MbeditorApp = function MbeditorApp() {
               actions: React.createElement(
                 SectionActionGroup,
                 { ariaLabel: "Project actions" },
+                React.createElement(SidebarActionButton, {
+                  title: "Refresh workspace",
+                  iconClass: "fas fa-sync-alt",
+                  ariaBusy: !!loading.refreshWorkspace,
+                  onClick: handleRefreshWorkspace,
+                  disabled: !!loading.refreshWorkspace
+                }),
                 React.createElement(SidebarActionButton, {
                   title: "Collapse all folders",
                   iconClass: "fas fa-compress-alt",
@@ -3775,6 +3987,12 @@ var MbeditorApp = function MbeditorApp() {
                 React.Fragment,
                 null,
                 renderTabBar(pane.id, pane.tabs, pane.activeTabId),
+                React.createElement(FileReloadBanner, {
+                  pendingReloads: (state.pendingReloads || []).filter(function (r) { return r.paneId === pane.id; }),
+                  onSaveAndReload: handleSaveAndReload,
+                  onDiscardAndReload: handleDiscardAndReload,
+                  onKeepMine: handleKeepMine
+                }),
                 React.createElement(
                   "div",
                   { style: { flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column', visibility: activeResizeMode === 'pane' ? 'hidden' : 'visible' } },

data/app/assets/javascripts/mbeditor/conflict_parser.js

@@ -0,0 +1,48 @@
+var ConflictParser = (function () {
+  function hasConflicts(content) {
+    return /^<<<<<<< /m.test(content);
+  }
+
+  function parse(content) {
+    var blocks = [];
+    var lines = content.split('\n');
+    var state = null;
+    var headStart = -1, headEnd = -1, dividerLine = -1;
+    var headLines = [], incomingLines = [];
+    var marker = null;
+
+    for (var i = 0; i < lines.length; i++) {
+      var line = lines[i];
+      if (/^<<<<<<< /.test(line) && state === null) {
+        state = 'head';
+        headStart = i;
+        headLines = [];
+        marker = line;
+      } else if (/^=======\s*$/.test(line) && state === 'head') {
+        state = 'incoming';
+        headEnd = i;
+        dividerLine = i;
+        incomingLines = [];
+      } else if (/^>>>>>>> /.test(line) && state === 'incoming') {
+        blocks.push({
+          startLine: headStart,
+          headEnd: headEnd,
+          dividerLine: dividerLine,
+          endLine: i,
+          headContent: headLines.join('\n'),
+          incomingContent: incomingLines.join('\n'),
+          marker: marker,
+          endMarker: line
+        });
+        state = null;
+      } else if (state === 'head') {
+        headLines.push(line);
+      } else if (state === 'incoming') {
+        incomingLines.push(line);
+      }
+    }
+    return blocks;
+  }
+
+  return { hasConflicts: hasConflicts, parse: parse };
+})();

data/app/assets/javascripts/mbeditor/editor_store.js

@@ -15,6 +15,7 @@ var EditorStore = (function () {
     searchResults: [],
     searchCapped: false,
     statusMessage: { text: "", kind: "info" },
+    pendingReloads: [],
     canUndo: false,
     canRedo: false,
   };

data/app/assets/javascripts/mbeditor/search_service.js

@@ -61,6 +61,7 @@ var SearchService = (function () {
 
       function traverse(nodes) {
         nodes.forEach(function(n) {
+          if (n.excluded) return; // skip excluded paths and their descendants
           if (n.type === 'file') {
             docs.push({ id: idCounter++, path: n.path, name: n.name, type: 'file' });
           } else if (n.type === 'folder') {

data/app/assets/stylesheets/mbeditor/application.css

@@ -861,3 +861,115 @@
 }
 
 .cdiff-ctx  { color: var(--ide-text-muted); }
+
+/* ── File Reload Banner ─────────────────────────────────────────── */
+.mb-file-reload-banner {
+  display: flex;
+  flex-direction: column;
+  gap: 0;
+  flex-shrink: 0;
+}
+
+.mb-file-reload-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 5px 12px;
+  background: #2a2600;
+  border-bottom: 1px solid #5a5000;
+  font-size: 12px;
+  color: #e3d286;
+  gap: 12px;
+}
+
+.mb-file-reload-msg {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.mb-file-reload-actions {
+  display: flex;
+  gap: 5px;
+  flex-shrink: 0;
+}
+
+.mb-btn-warning {
+  background: #6b4500;
+  color: #ffd88a;
+  border: 1px solid #8a5900;
+}
+
+.mb-btn-warning:hover {
+  background: #8a5900;
+}
+
+/* ── Merge Conflict Decorations ─────────────────────────────────── */
+.mb-conflict-marker-line {
+  background: rgba(120, 80, 0, 0.35) !important;
+}
+
+.mb-conflict-head {
+  background: rgba(180, 60, 60, 0.18) !important;
+  border-left: 2px solid rgba(200, 80, 80, 0.6);
+}
+
+.mb-conflict-incoming {
+  background: rgba(60, 130, 60, 0.18) !important;
+  border-left: 2px solid rgba(80, 160, 80, 0.6);
+}
+
+/* ── Conflict Banner ─────────────────────────────────────────────── */
+.mb-conflict-banner {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 5px 12px;
+  background: #1e1a00;
+  border-bottom: 1px solid #5a5000;
+  font-size: 12px;
+  color: #e3d286;
+  flex-shrink: 0;
+}
+
+.mb-conflict-count {
+  font-weight: bold;
+  color: #f5a623;
+  white-space: nowrap;
+}
+
+.mb-conflict-nav {
+  display: flex;
+  gap: 4px;
+}
+
+.mb-conflict-actions {
+  display: flex;
+  gap: 5px;
+  margin-left: auto;
+}
+
+.mb-btn-success {
+  background: #1a5c2a;
+  color: #aef;
+  border: 1px solid #2a7a3a;
+}
+
+.mb-btn-success:hover {
+  background: #1e7a38;
+}
+
+.mb-btn-incoming {
+  background: #1a3060;
+  color: #aef;
+  border: 1px solid #1a4080;
+}
+
+.mb-btn-incoming:hover {
+  background: #1a4080;
+}

data/app/controllers/mbeditor/editors_controller.rb

@@ -702,7 +702,8 @@ module Mbeditor
 
     # GET /mbeditor/manifest.webmanifest — PWA manifest
     def pwa_manifest
-      base = request.script_name.to_s.sub(%r{/$}, "")
+      _mount = request.script_name.to_s.gsub(%r{(^/+|/+$)}, "")
+      base = _mount.empty? ? "" : "/#{_mount}"
       manifest = {
         name: "Mbeditor — #{Rails.root.basename}",
         short_name: "Mbeditor",
@@ -1070,10 +1071,14 @@ module Mbeditor
         rel = relative_path(full)
 
         if File.directory?(full)
-          { name: name, type: "folder", path: rel, children: build_tree(full, depth: depth + 1) }
+          node = { name: name, type: "folder", path: rel, children: build_tree(full, depth: depth + 1) }
+          node[:excluded] = true if excluded_path?(rel, name)
+          node
         else
           size = File.size(full) rescue nil
-          { name: name, type: "file", path: rel, size: size }
+          node = { name: name, type: "file", path: rel, size: size }
+          node[:excluded] = true if excluded_path?(rel, name)
+          node
         end
       end
     rescue Errno::EACCES

data/app/views/layouts/mbeditor/application.html.erb

@@ -7,7 +7,7 @@
   <meta name="theme-color" content="#1e1e2e" />
   <meta name="mobile-web-app-capable" content="yes" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
-  <% pwa_base = request.script_name.to_s.sub(%r{/$}, '') %>
+  <% _mount = request.script_name.to_s.gsub(%r{(^/+|/+$)}, ''); pwa_base = _mount.empty? ? '' : "/#{_mount}" %>
   <link rel="manifest" href="<%= "#{pwa_base}/manifest.webmanifest" %>" />
   <script>
     if ('serviceWorker' in navigator) {
@@ -32,7 +32,7 @@
   <script defer src="<%= asset_path('minisearch.min.js') %>"></script>
   <script defer src="<%= asset_path('marked.min.js') %>"></script>
   <!-- ── Monaco loader (sync — inline body script calls require()) ── -->
-  <% base_path = request.script_name.to_s.sub(%r{/$}, '') %>
+  <% base_path = pwa_base %>
   <script>var require = { paths: { vs: '<%= json_escape("#{base_path}/monaco-editor/vs") %>', 'monaco-editor/esm/vs': '<%= json_escape("#{base_path}/monaco-editor/vs") %>', 'monaco-vim': '<%= json_escape(asset_path("monaco-vim.js").sub(/\.js$/, "")) %>' } };</script>
   <script src="<%= "#{base_path}/monaco-editor/vs/loader.js" %>"></script>
   <!-- ── Emmet + Extra themes (non-AMD, deferred — used inside Monaco callback) ── -->

data/lib/mbeditor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mbeditor
-  VERSION = "0.5.3"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mbeditor
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Oliver Noonan
@@ -71,6 +71,7 @@ files:
 - app/assets/javascripts/mbeditor/components/ShortcutHelp.js
 - app/assets/javascripts/mbeditor/components/TabBar.js
 - app/assets/javascripts/mbeditor/components/TestResultsPanel.js
+- app/assets/javascripts/mbeditor/conflict_parser.js
 - app/assets/javascripts/mbeditor/editor_plugins.js
 - app/assets/javascripts/mbeditor/editor_store.js
 - app/assets/javascripts/mbeditor/file_icon.js