@ibgib/space-gib 0.0.34 → 0.0.36

package/src/client/ui/component/file-explorer/file-explorer.css

@@ -2,16 +2,51 @@
   display: flex;
   flex-direction: column;
   width: 100%;
+  height: 100%;
+  min-height: 0;
   box-sizing: border-box;
 }
 
+:host([collapsed]) {
+  height: auto !important;
+  flex: 0 0 auto !important;
+}
+
+:host([collapsed]) .file-explorer-root {
+  height: auto !important;
+  flex: 0 0 auto !important;
+}
+
+:host([collapsed]) .single-branch-view,
+:host([collapsed]) .composite-tree-container {
+  height: auto !important;
+  flex: 0 0 auto !important;
+  min-height: 0 !important;
+  padding-bottom: 0 !important;
+  overflow: visible !important;
+}
+
 .file-explorer-root {
   display: flex;
   flex-direction: column;
   width: 100%;
+  height: 100%;
+  min-height: 0;
+  overflow: hidden;
   user-select: none;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
   box-sizing: border-box;
+  position: relative;
+}
+
+/* Single Branch View Container */
+.single-branch-view {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  flex: 1 1 0px;
+  min-height: 32px;
+  overflow: hidden;
 }
 
 /* Branch Worktree Accordion Header */
@@ -19,9 +54,10 @@
   display: flex;
   align-items: center;
   gap: 0.35rem;
-  padding: 0.4rem 0.6rem;
+  padding: 0.28rem 0.5rem;
   background: rgba(255, 255, 255, 0.04);
   border: 1px solid rgba(255, 255, 255, 0.08);
+  border-left: 3px solid var(--branch-accent-color, rgba(255, 255, 255, 0.08));
   border-radius: 6px;
   font-size: 0.82rem;
   font-weight: 600;
@@ -30,16 +66,18 @@
   transition: all 0.15s ease;
   outline: none;
   box-sizing: border-box;
+  flex: 0 0 auto !important;
+  flex-shrink: 0 !important;
 }
 
 .branch-header:hover {
-  background: rgba(255, 255, 255, 0.07);
-  border-color: rgba(124, 92, 252, 0.3);
+  background: var(--branch-accent-translucent, rgba(255, 255, 255, 0.07));
+  border-color: var(--branch-accent-color, rgba(124, 92, 252, 0.3));
   color: #f1f5f9;
 }
 
 .branch-header:focus-visible {
-  border-color: #a78bfa;
+  border-color: var(--branch-accent-color, #a78bfa);
 }
 
 .branch-toggle-btn {
@@ -67,22 +105,113 @@
   transform: rotate(-90deg);
 }
 
+.branch-selector-container {
+  position: relative;
+  display: flex;
+  align-items: center;
+  flex: 1;
+  min-width: 0;
+}
+
+.branch-select-btn {
+  display: flex;
+  align-items: center;
+  gap: 0.35rem;
+  background: transparent;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  padding: 2px 6px;
+  cursor: pointer;
+  color: inherit;
+  font-family: inherit;
+  min-width: 0;
+  max-width: 100%;
+  transition: all 0.15s ease;
+}
+
+.branch-select-btn:hover {
+  background: rgba(255, 255, 255, 0.08);
+  border-color: rgba(255, 255, 255, 0.15);
+}
+
 .branch-icon {
   font-size: 0.9rem;
   line-height: 1;
+  color: var(--branch-accent-color, #a78bfa);
 }
 
 .branch-title {
-  flex: 1;
   font-family: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, monospace;
   font-size: 0.82rem;
-  color: #a78bfa;
+  color: var(--branch-accent-color, #a78bfa);
   font-weight: 600;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 
+.branch-caret {
+  font-size: 0.65rem;
+  opacity: 0.7;
+  transition: transform 0.15s ease;
+}
+
+.branch-dropdown-menu {
+  position: absolute;
+  top: calc(100% + 4px);
+  left: 0;
+  min-width: 180px;
+  max-width: 260px;
+  max-height: 220px;
+  overflow-y: auto;
+  background: #11111b;
+  border: 1px solid rgba(255, 255, 255, 0.14);
+  border-radius: 6px;
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.55);
+  padding: 4px;
+  z-index: 1000;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.branch-dropdown-item {
+  display: flex;
+  align-items: center;
+  gap: 0.45rem;
+  padding: 0.35rem 0.5rem;
+  border-radius: 4px;
+  font-size: 0.78rem;
+  font-family: ui-monospace, SFMono-Regular, monospace;
+  color: #cbd5e1;
+  cursor: pointer;
+  transition: all 0.12s ease;
+}
+
+.branch-dropdown-item:hover {
+  background: rgba(255, 255, 255, 0.08);
+  color: #ffffff;
+}
+
+.branch-dropdown-item.active {
+  background: var(--branch-accent-translucent, rgba(167, 139, 250, 0.15));
+  color: var(--branch-accent-color, #a78bfa);
+  font-weight: 600;
+}
+
+.branch-color-dot {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  flex-shrink: 0;
+}
+
+.branch-dropdown-check {
+  margin-left: auto;
+  font-size: 0.75rem;
+  opacity: 0.9;
+}
+
 .worktree-badge {
   font-size: 0.58rem;
   text-transform: uppercase;
@@ -99,13 +228,33 @@
   display: flex;
   align-items: center;
   gap: 2px;
-  opacity: 0;
-  transition: opacity 0.15s ease;
-  margin-left: 0.25rem;
+  margin-left: auto;
+}
+
+.branch-menu-btn {
+  font-size: 1.15rem;
+  font-weight: 700;
+  padding: 2px 7px;
+  min-width: 24px;
+  min-height: 22px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  line-height: 1;
+  color: #94a3b8;
+  border-radius: 4px;
+  cursor: pointer;
+  opacity: 0.8;
+  transition: all 0.12s ease;
 }
 
-.branch-header:hover .branch-actions {
+.branch-header:hover .branch-menu-btn,
+.composite-branch-header:hover .branch-menu-btn,
+.branch-menu-btn:hover,
+.branch-menu-btn.active {
   opacity: 1;
+  color: #ffffff;
+  background: rgba(255, 255, 255, 0.12);
 }
 
 .action-btn {
@@ -131,7 +280,11 @@
   flex-direction: column;
   gap: 2px;
   padding: 0.35rem 0.2rem;
-  transition: max-height 0.2s ease, opacity 0.2s ease;
+  flex: 1 1 0px;
+  min-height: 0;
+  overflow-y: auto;
+  overflow-x: hidden;
+  transition: opacity 0.2s ease;
 }
 
 .file-tree-container.collapsed {
@@ -208,6 +361,58 @@
   white-space: nowrap;
 }
 
+/* ── VCS Status Styling (driven by web-gib shared CSS variables) ── */
+.tree-label.vcs-untracked, .tree-item.vcs-untracked .tree-label {
+  color: var(--vcs-clr-untracked, #73c991) !important;
+}
+
+.tree-label.vcs-modified, .tree-item.vcs-modified .tree-label {
+  color: var(--vcs-clr-modified, #e2c08d) !important;
+}
+
+.tree-label.vcs-added, .tree-item.vcs-added .tree-label {
+  color: var(--vcs-clr-added, #78f87e) !important;
+}
+
+.tree-label.vcs-deleted, .tree-item.vcs-deleted .tree-label {
+  color: var(--vcs-clr-deleted, #ff5b5b) !important;
+  text-decoration: line-through;
+}
+
+.vcs-status-badge {
+  font-family: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, monospace;
+  font-size: var(--vcs-badge-font-size, 0.65rem);
+  font-weight: var(--vcs-badge-font-weight, 700);
+  padding: 1px 4px;
+  border-radius: var(--vcs-badge-radius, 3px);
+  line-height: 1;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  margin-left: auto;
+  margin-right: 2px;
+  flex-shrink: 0;
+  text-transform: uppercase;
+}
+
+.vcs-status-badge.untracked, .vcs-status-badge.u {
+  color: var(--vcs-clr-untracked, #73c991);
+  background: var(--vcs-clr-untracked-bg, rgba(115, 201, 145, 0.12));
+  border: 1px solid var(--vcs-clr-untracked-border, rgba(115, 201, 145, 0.3));
+}
+
+.vcs-status-badge.modified, .vcs-status-badge.m {
+  color: var(--vcs-clr-modified, #e2c08d);
+  background: var(--vcs-clr-modified-bg, rgba(226, 192, 141, 0.12));
+  border: 1px solid var(--vcs-clr-modified-border, rgba(226, 192, 141, 0.3));
+}
+
+.vcs-status-badge.added, .vcs-status-badge.a {
+  color: var(--vcs-clr-added, #78f87e);
+  background: var(--vcs-clr-added-bg, rgba(120, 248, 126, 0.12));
+  border: 1px solid var(--vcs-clr-added-border, rgba(120, 248, 126, 0.3));
+}
+
 .file-comment-badge {
   margin-left: auto;
   font-size: 0.75rem;
@@ -253,4 +458,263 @@
   color: #a7f3d0;
 }
 
+.empty-tree-msg {
+  padding: 1.5rem 1rem;
+  text-align: center;
+  color: #94a3b8;
+  font-size: 0.8rem;
+  line-height: 1.5;
+  border: 1px dashed rgba(255, 255, 255, 0.1);
+  border-radius: 6px;
+  margin: 0.5rem 0.25rem;
+}
+
+.empty-tree-msg .highlight {
+  color: #38bdf8;
+  font-weight: 600;
+}
+
+/* ── View Mode Toolbar ── */
+.explorer-mode-toolbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0.35rem 0.5rem;
+  margin-bottom: 0.4rem;
+  background: rgba(255, 255, 255, 0.02);
+  border-bottom: 1px solid rgba(255, 255, 255, 0.06);
+  flex: 0 0 auto !important;
+  flex-shrink: 0 !important;
+}
+
+.mode-toggle-group {
+  display: flex;
+  align-items: center;
+  background: rgba(0, 0, 0, 0.3);
+  border: 1px solid rgba(255, 255, 255, 0.08);
+  border-radius: 5px;
+  padding: 2px;
+  gap: 2px;
+}
+
+.mode-toggle-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.3rem;
+  background: transparent;
+  border: none;
+  border-radius: 3px;
+  color: #94a3b8;
+  font-size: 0.72rem;
+  font-weight: 500;
+  padding: 2px 7px;
+  cursor: pointer;
+  transition: all 0.15s ease;
+  user-select: none;
+}
+
+.mode-toggle-btn:hover {
+  color: #f1f5f9;
+  background: rgba(255, 255, 255, 0.06);
+}
+
+.mode-toggle-btn.active {
+  background: var(--branch-accent-translucent, rgba(124, 92, 252, 0.25));
+  color: #ffffff;
+  font-weight: 600;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+}
+
+.explorer-global-actions {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+/* ── Branch Dirty Badges ── */
+.branch-dirty-badge {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 0.65rem;
+  font-family: ui-monospace, SFMono-Regular, monospace;
+  font-weight: 700;
+  padding: 1px 5px;
+  border-radius: 10px;
+  background: var(--branch-accent-translucent, rgba(234, 179, 8, 0.18));
+  color: var(--branch-accent-color, #fbbf24);
+  border: 1px solid var(--branch-accent-color, rgba(234, 179, 8, 0.4));
+  margin-left: auto;
+  margin-right: 0.25rem;
+  line-height: 1.2;
+}
+
+/* ── Composite Branch Tree Styles ── */
+.composite-tree-container {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  gap: 4px;
+  padding-bottom: 0.25rem;
+  flex: 1 1 0px;
+  min-height: 0;
+  overflow-y: auto;
+}
+
+.composite-branch-node {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  position: relative;
+  box-sizing: border-box;
+}
+
+.composite-branch-header {
+  display: flex;
+  align-items: center;
+  gap: 0.35rem;
+  padding: 0.28rem 0.5rem;
+  border-radius: 6px;
+  background: rgba(255, 255, 255, 0.04);
+  border: 1px solid rgba(255, 255, 255, 0.08);
+  border-left: 3px solid var(--node-accent-color, #818cf8);
+  font-size: 0.82rem;
+  font-weight: 600;
+  color: #cbd5e1;
+  cursor: pointer;
+  transition: all 0.15s ease;
+  user-select: none;
+  box-sizing: border-box;
+  flex: 0 0 auto !important;
+  flex-shrink: 0 !important;
+}
+
+.composite-branch-header:hover {
+  background: var(--node-accent-translucent, rgba(255, 255, 255, 0.07));
+  border-color: var(--node-accent-color, rgba(124, 92, 252, 0.3));
+  color: #f1f5f9;
+}
+
+.composite-branch-header.active {
+  background: var(--node-accent-translucent, rgba(129, 140, 248, 0.15));
+  border-color: var(--node-accent-color, rgba(129, 140, 248, 0.4));
+}
+
+.composite-branch-header.collapsed .chevron-icon {
+  transform: rotate(-90deg);
+}
+
+.composite-branch-icon,
+.composite-branch-header .branch-icon {
+  font-size: 0.85rem;
+  color: var(--node-accent-color, var(--branch-accent-color, #818cf8));
+}
+
+.composite-branch-title,
+.composite-branch-header .branch-title {
+  color: var(--node-accent-color, var(--branch-accent-color, #e2e8f0));
+  font-family: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, monospace;
+  font-size: 0.82rem;
+  font-weight: 600;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.composite-scoped-badge {
+  font-size: 0.6rem;
+  font-weight: 500;
+  background: rgba(99, 102, 241, 0.2);
+  color: #a5b4fc;
+  border: 1px solid rgba(99, 102, 241, 0.4);
+  border-radius: 3px;
+  padding: 1px 4px;
+}
+
+.composite-branch-body {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
+
+.composite-branch-files {
+  display: flex;
+  flex-direction: column;
+  margin-left: 1rem;
+  padding-left: 0.35rem;
+  border-left: 1px dashed rgba(255, 255, 255, 0.12);
+}
+
+.composite-branch-children {
+  display: flex;
+  flex-direction: column;
+  margin-left: 0.85rem;
+  gap: 3px;
+  margin-top: 3px;
+}
+
+/* ── DRY Command Menu Popup ── */
+.command-menu-popup {
+  position: absolute;
+  min-width: 175px;
+  max-width: 250px;
+  background: #11111b;
+  border: 1px solid rgba(255, 255, 255, 0.14);
+  border-radius: 6px;
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.65);
+  padding: 4px;
+  z-index: 1200;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  animation: menuFadeIn 0.1s ease-out;
+}
+
+@keyframes menuFadeIn {
+  from { opacity: 0; transform: translateY(-3px); }
+  to { opacity: 1; transform: translateY(0); }
+}
+
+.command-menu-item {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  padding: 0.38rem 0.55rem;
+  border-radius: 4px;
+  font-size: 0.78rem;
+  font-family: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, monospace;
+  color: #cbd5e1;
+  cursor: pointer;
+  transition: all 0.12s ease;
+  user-select: none;
+}
+
+.command-menu-item:hover {
+  background: rgba(255, 255, 255, 0.09);
+  color: #ffffff;
+}
+
+.command-menu-item.danger:hover {
+  background: rgba(239, 68, 68, 0.15);
+  color: #ef4444;
+}
+
+.command-menu-item .cmd-icon {
+  font-size: 0.85rem;
+  line-height: 1;
+  width: 18px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+
+.command-menu-item .cmd-label {
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+
 

package/src/client/ui/component/file-explorer/file-explorer.html

@@ -1,75 +1,55 @@
 <div id="file-explorer-root" class="file-explorer-root">
-  <!-- Worktree Branch Header Accordion -->
-  <div id="branch-header" class="branch-header expanded" tabindex="0">
-    <button id="btn-branch-toggle" class="branch-toggle-btn" type="button" aria-label="Toggle Branch Files">
-      <span class="chevron-icon">▼</span>
-    </button>
-    <span class="branch-icon">🌿</span>
-    <span id="branch-title" class="branch-title">main</span>
-    <!-- <span class="worktree-badge">worktree</span> -->
-    <div class="branch-actions">
-      <button id="btn-branch-branch" class="action-btn" type="button" title="Branch from worktree (🌿+)">🌿+</button>
-      <button id="btn-clone-branch" class="action-btn" type="button" title="Clone / Export Worktree (⤓)">⤓</button>
-      <button id="btn-new-file" class="action-btn" type="button" title="New File">📄+</button>
-      <button id="btn-new-folder" class="action-btn" type="button" title="New Folder">📁+</button>
-      <button id="btn-collapse-all" class="action-btn" type="button" title="Collapse All">⇱</button>
+  <!-- View Mode Toolbar: Single Branch vs Composite Tree -->
+  <div class="explorer-mode-toolbar" id="explorer-mode-toolbar">
+    <div class="mode-toggle-group">
+      <button id="btn-mode-single" class="mode-toggle-btn active" type="button" title="Single Branch View">
+        <span class="mode-icon">🌿</span>
+        <span class="mode-label">Single</span>
+      </button>
+      <button id="btn-mode-composite" class="mode-toggle-btn" type="button" title="Composite Tree View">
+        <span class="mode-icon">🌳</span>
+        <span class="mode-label">Composite</span>
+      </button>
+    </div>
+    <div class="explorer-global-actions">
+      <button id="btn-refresh-explorer" class="action-btn" type="button" title="Refresh Explorer">↻</button>
     </div>
   </div>
 
-  <!-- Worktree Files Container -->
-  <div id="file-tree-container" class="file-tree-container">
-    <!-- Folder: src -->
-    <div class="tree-item folder expanded" data-folder="src" tabindex="0">
-      <span class="tree-chevron">▼</span>
-      <span class="tree-icon">📂</span>
-      <span class="tree-label">src</span>
-      <button class="file-action-btn file-branch-btn" title="Branch from directory item (🌿+)"
-        type="button">🌿+</button>
-      <button class="file-action-btn file-clone-btn" title="Clone directory item" type="button">⤓</button>
-    </div>
-    <!-- File: src/index.ts (Selected by default) -->
-    <div class="tree-item file selected" data-path="src/index.ts" data-name="index.ts" tabindex="0">
-      <span class="tree-indent tree-indent-2"></span>
-      <span class="tree-icon">📄</span>
-      <span class="tree-label">index.ts</span>
-      <span class="file-comment-badge" title="Living companion comment attached">💬</span>
-      <button class="file-action-btn file-branch-btn" title="Branch from file item (🌿+)" type="button">🌿+</button>
-      <button class="file-action-btn file-clone-btn" title="Clone file item" type="button">⤓</button>
-    </div>
-    <!-- File: src/helper.ts -->
-    <div class="tree-item file" data-path="src/helper.ts" data-name="helper.ts" tabindex="0">
-      <span class="tree-indent tree-indent-2"></span>
-      <span class="tree-icon">📄</span>
-      <span class="tree-label">helper.ts</span>
-      <button class="file-action-btn file-branch-btn" title="Branch from file item (🌿+)" type="button">🌿+</button>
-      <button class="file-action-btn file-clone-btn" title="Clone file item" type="button">⤓</button>
+  <!-- Single Branch View Container -->
+  <div id="single-branch-view" class="single-branch-view">
+    <!-- Worktree Branch Header Accordion -->
+    <div id="branch-header" class="branch-header expanded" tabindex="0">
+      <button id="btn-branch-toggle" class="branch-toggle-btn" type="button" aria-label="Toggle Branch Files">
+        <span class="chevron-icon">▼</span>
+      </button>
+      <div id="branch-selector-container" class="branch-selector-container">
+        <button id="btn-branch-select" class="branch-select-btn" type="button" title="Switch Branch">
+          <span class="branch-icon">🌿</span>
+          <span id="branch-title" class="branch-title">main</span>
+          <span class="branch-caret">▾</span>
+        </button>
+        <div id="branch-dropdown-menu" class="branch-dropdown-menu" style="display: none;">
+          <!-- Populated dynamically with branches in galaxy -->
+        </div>
+      </div>
+      <span id="branch-dirty-badge" class="branch-dirty-badge" style="display: none;">● 0</span>
+      <div class="branch-actions">
+        <button id="btn-branch-menu" class="action-btn branch-menu-btn" type="button" title="Branch actions (⋮)">⋮</button>
+      </div>
     </div>
 
-    <!-- Folder: docs -->
-    <div class="tree-item folder" data-folder="docs" tabindex="0">
-      <span class="tree-chevron">▼</span>
-      <span class="tree-icon">📁</span>
-      <span class="tree-label">docs</span>
-      <button class="file-action-btn file-branch-btn" title="Branch from directory item (🌿+)"
-        type="button">🌿+</button>
-      <button class="file-action-btn file-clone-btn" title="Clone directory item" type="button">⤓</button>
-    </div>
-    <!-- File: docs/README.md (Initially hidden under collapsed docs) -->
-    <div class="tree-item file child-of-docs hidden" data-path="docs/README.md" data-name="README.md" tabindex="0">
-      <span class="tree-indent tree-indent-2"></span>
-      <span class="tree-icon">📝</span>
-      <span class="tree-label">README.md</span>
-      <button class="file-action-btn file-branch-btn" title="Branch from file item (🌿+)" type="button">🌿+</button>
-      <button class="file-action-btn file-clone-btn" title="Clone file item" type="button">⤓</button>
+    <!-- Worktree Files Container -->
+    <div id="file-tree-container" class="file-tree-container">
+      <!-- Dynamically rendered tree items -->
     </div>
+  </div>
 
-    <!-- Root File: package.json -->
-    <div class="tree-item file" data-path="package.json" data-name="package.json" tabindex="0">
-      <span class="tree-indent"></span>
-      <span class="tree-icon">⚙️</span>
-      <span class="tree-label">package.json</span>
-      <button class="file-action-btn file-branch-btn" title="Branch from file item (🌿+)" type="button">🌿+</button>
-      <button class="file-action-btn file-clone-btn" title="Clone file item" type="button">⤓</button>
-    </div>
+  <!-- Composite Branch Tree Container -->
+  <div id="composite-tree-container" class="composite-tree-container" style="display: none;">
+    <!-- Dynamically rendered hierarchical branch tree -->
   </div>
+
+  <!-- Command Menu Popup (DRY popup menu for branch / item actions) -->
+  <div id="command-menu-popup" class="command-menu-popup" style="display: none;"></div>
 </div>