v3.26.1

changelog.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## 2026-01-01 - 3.26.1 - fix(dees-actionbar)
+animate actionbar hide using grid-template-rows and wait for animation before clearing state
+
+- Switch host layout from block/max-height to grid using grid-template-rows for open/close transitions
+- Add min-height: 0 to .actionbar-item to prevent flex children overflow and collapsing
+- Introduce async hideCurrentBar() that removes 'visible', sets isVisible=false, waits 220ms then clears currentBar and currentResolve
+- processQueue() now calls hideCurrentBar() asynchronously instead of clearing state immediately
+
+## 2026-01-01 - 3.26.0 - feat(workspace)
+add external file change detection, conflict resolution UI, and diff editor
+
+- Watch open files for external changes with debounced file watchers (startWatchingFile/stopWatchingFile/stopAllFileWatchers).
+- Prompt the user when disk changes conflict with unsaved local edits via dees-actionbar (actions: Load from Disk, Save Local, Compare).
+- Introduce dees-workspace-diff-editor component and export it; support comparing and resolving diffs (diff-resolved / diff-closed events).
+- Add setContentExternal in dees-workspace-monaco to update editor content from external sources while optionally preserving cursor, selections and scroll position.
+- Start/stop file watchers when files are opened/closed and integrate diff view and actionbar into the workspace UI for seamless conflict handling.
+
+## 2026-01-01 - 3.25.0 - feat(dees-actionbar)
+add action bar component and improve workspace package update handling
+
+- Introduce dees-actionbar component (dees-actionbar.ts) with interfaces, queueing, timed auto-trigger and demo usage
+- Add actionbar.interfaces.ts and index export; export dees-actionbar from elements index
+- Enhance workspace bottombar: add pendingPackageUpdate flag, process-complete handler, and connected/disconnected listeners to auto-refresh package status after updates
+- Make pnpm outdated checking robust by streaming output via a reader and adding a 10s timeout to avoid hanging; handle timeout and stream cancellation
+- Update package update commands to include '--latest' for updatePackage and updateAllPackages, and show 'Checking...' label during checks
+- Add '@types/node' (^22.0.0) to devDependencies in the workspace package config
+
+## 2026-01-01 - 3.24.0 - feat(workspace)
+add workspace bottom bar, terminal tab manager, and run-process integration
+
+- Add dees-workspace-bottombar component and export; bottom bar emits run-process events to launch processes.
+- Introduce terminal interfaces (IRunProcessEventDetail, ITerminalTab, ICreateTerminalTabOptions, etc.) and a TerminalTabManager to manage multiple terminal tabs and lifecycle.
+- Integrate bottombar into dees-workspace: layout refactor (workspace-outer), move/adjust resize handles and panels, and handle @run-process to create terminal tabs and focus terminal panel.
+- Enhance dees-workspace-terminal: tabbed terminal UI, new public APIs (createProcessTab, writeToTab, sendInputToTab), theme updates, and improved disposal/cleanup behavior.
+- Update module exports to include bottombar and additional terminal sub-exports (interfaces, terminal-tab-manager).
+
 ## 2025-12-31 - 3.23.0 - feat(workspace)
 add resizable file tree and terminal panes with draggable handles and public layout APIs
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@design.estate/dees-catalog",
-  "version": "3.23.0",
+  "version": "3.26.1",
   "private": false,
   "description": "A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.",
   "main": "dist_ts_web/index.js",

ts_web/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@design.estate/dees-catalog',
-  version: '3.23.0',
+  version: '3.26.1',
   description: 'A comprehensive library that provides dynamic web components for building sophisticated and modern web applications using JavaScript and TypeScript.'
 }

ts_web/elements/00group-workspace/dees-workspace-bottombar/dees-workspace-bottombar.ts

@@ -0,0 +1,548 @@
+import {
+  DeesElement,
+  property,
+  html,
+  customElement,
+  type TemplateResult,
+  css,
+  cssManager,
+  state,
+} from '@design.estate/dees-element';
+import { themeDefaultStyles } from '../../00theme.js';
+import type { IExecutionEnvironment } from '../../00group-runtime/index.js';
+import '../../dees-icon/dees-icon.js';
+import { DeesContextmenu } from '../../dees-contextmenu/dees-contextmenu.js';
+import type { IRunProcessEventDetail, ITerminalProcessCompleteEventDetail } from '../dees-workspace-terminal/interfaces.js';
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'dees-workspace-bottombar': DeesWorkspaceBottombar;
+  }
+}
+
+interface IOutdatedPackage {
+  name: string;
+  current: string;
+  wanted: string;
+  latest: string;
+  type: 'dependencies' | 'devDependencies';
+}
+
+@customElement('dees-workspace-bottombar')
+export class DeesWorkspaceBottombar extends DeesElement {
+  // INSTANCE
+  @property({ type: Object })
+  accessor executionEnvironment: IExecutionEnvironment | null = null;
+
+  // Script runner state
+  @state()
+  accessor scripts: Record<string, string> = {};
+
+  // Package checker state
+  @state()
+  accessor packageStatus: 'checking' | 'up-to-date' | 'updates-available' | 'error' | 'idle' = 'idle';
+
+  @state()
+  accessor outdatedPackages: IOutdatedPackage[] = [];
+
+  @state()
+  accessor isCheckingPackages: boolean = false;
+
+  // Track if we have a pending package update that should trigger refresh
+  private pendingPackageUpdate: boolean = false;
+
+  // Bound handler for process-complete events
+  private handleProcessComplete = (e: CustomEvent<ITerminalProcessCompleteEventDetail>) => {
+    // If we have a pending package update and a process completed, refresh
+    if (this.pendingPackageUpdate) {
+      this.pendingPackageUpdate = false;
+      // Small delay to let pnpm-lock.yaml update
+      setTimeout(() => this.checkPackages(), 500);
+    }
+  };
+
+  public static styles = [
+    themeDefaultStyles,
+    cssManager.defaultStyles,
+    css`
+      :host {
+        display: block;
+        height: 24px;
+        flex-shrink: 0;
+      }
+
+      .bottom-bar {
+        height: 24px;
+        display: flex;
+        align-items: center;
+        padding: 0 8px;
+        gap: 4px;
+        background: ${cssManager.bdTheme('hsl(0 0% 94%)', 'hsl(0 0% 6%)')};
+        border-top: 1px solid ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 15%)')};
+        font-size: 11px;
+        color: ${cssManager.bdTheme('hsl(0 0% 40%)', 'hsl(0 0% 60%)')};
+      }
+
+      .widget {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+        padding: 2px 6px;
+        border-radius: 3px;
+        cursor: pointer;
+        transition: background 0.15s ease, color 0.15s ease;
+        white-space: nowrap;
+      }
+
+      .widget:hover {
+        background: ${cssManager.bdTheme('hsl(0 0% 88%)', 'hsl(0 0% 12%)')};
+        color: ${cssManager.bdTheme('hsl(0 0% 20%)', 'hsl(0 0% 80%)')};
+      }
+
+      .widget dees-icon {
+        flex-shrink: 0;
+      }
+
+      .widget-separator {
+        width: 1px;
+        height: 14px;
+        background: ${cssManager.bdTheme('hsl(0 0% 80%)', 'hsl(0 0% 20%)')};
+        margin: 0 4px;
+      }
+
+      .widget.running {
+        color: ${cssManager.bdTheme('hsl(210 100% 45%)', 'hsl(210 100% 60%)')};
+      }
+
+      .widget.up-to-date {
+        color: ${cssManager.bdTheme('hsl(142 70% 35%)', 'hsl(142 70% 50%)')};
+      }
+
+      .widget.updates-available {
+        color: ${cssManager.bdTheme('hsl(38 92% 45%)', 'hsl(38 92% 55%)')};
+      }
+
+      .widget.error {
+        color: ${cssManager.bdTheme('hsl(0 70% 50%)', 'hsl(0 70% 60%)')};
+      }
+
+      @keyframes spin {
+        from { transform: rotate(0deg); }
+        to { transform: rotate(360deg); }
+      }
+
+      .spinning {
+        animation: spin 1s linear infinite;
+      }
+
+      .spacer {
+        flex: 1;
+      }
+    `,
+  ];
+
+  public render(): TemplateResult {
+    return html`
+      <div class="bottom-bar">
+        <!-- Script Runner Widget -->
+        <div
+          class="widget"
+          @click=${this.handleScriptClick}
+          title="Run script"
+        >
+          <dees-icon
+            .icon=${'lucide:play'}
+            iconSize="12"
+          ></dees-icon>
+          <span>Scripts</span>
+        </div>
+
+        <div class="widget-separator"></div>
+
+        <!-- Package Checker Widget -->
+        <div
+          class="widget ${this.getPackageStatusClass()}"
+          @click=${this.handlePackageClick}
+          title="${this.getPackageTooltip()}"
+        >
+          <dees-icon
+            .icon=${this.getPackageIcon()}
+            iconSize="12"
+            class="${this.isCheckingPackages ? 'spinning' : ''}"
+          ></dees-icon>
+          <span>${this.getPackageStatusText()}</span>
+        </div>
+
+        <div class="spacer"></div>
+
+        <!-- Future widgets can be added here -->
+      </div>
+    `;
+  }
+
+  public async connectedCallback() {
+    await super.connectedCallback();
+    // Listen for process-complete events to refresh after package updates
+    window.addEventListener('process-complete', this.handleProcessComplete as EventListener);
+  }
+
+  public async disconnectedCallback() {
+    await super.disconnectedCallback();
+    window.removeEventListener('process-complete', this.handleProcessComplete as EventListener);
+  }
+
+  async firstUpdated() {
+    await this.loadScripts();
+    await this.checkPackages();
+  }
+
+  async updated(changedProperties: Map<string, any>) {
+    if (changedProperties.has('executionEnvironment') && this.executionEnvironment) {
+      await this.loadScripts();
+      await this.checkPackages();
+    }
+  }
+
+  // ========== Script Runner ==========
+
+  private async loadScripts(): Promise<void> {
+    if (!this.executionEnvironment) return;
+
+    try {
+      const packageJsonExists = await this.executionEnvironment.exists('/package.json');
+      if (!packageJsonExists) {
+        this.scripts = {};
+        return;
+      }
+
+      const content = await this.executionEnvironment.readFile('/package.json');
+      const packageJson = JSON.parse(content);
+      this.scripts = packageJson.scripts || {};
+    } catch (error) {
+      console.warn('Failed to load scripts from package.json:', error);
+      this.scripts = {};
+    }
+  }
+
+  private async handleScriptClick(e: MouseEvent): Promise<void> {
+    e.stopPropagation();
+
+    const scriptNames = Object.keys(this.scripts);
+    if (scriptNames.length === 0) {
+      return;
+    }
+
+    const menuItems = scriptNames.map(name => ({
+      name: name,
+      iconName: 'lucide:terminal' as const,
+      action: async () => {
+        await this.runScript(name);
+      },
+    }));
+
+    await DeesContextmenu.openContextMenuWithOptions(e, menuItems);
+  }
+
+  private async runScript(scriptName: string): Promise<void> {
+    if (!this.executionEnvironment) return;
+
+    // Emit run-process event for the workspace to create a terminal tab
+    const detail: IRunProcessEventDetail = {
+      type: 'script',
+      label: scriptName,
+      command: 'pnpm',
+      args: ['run', scriptName],
+      metadata: { scriptName },
+    };
+
+    this.dispatchEvent(new CustomEvent('run-process', {
+      bubbles: true,
+      composed: true,
+      detail,
+    }));
+  }
+
+  // ========== Package Checker ==========
+
+  private async checkPackages(): Promise<void> {
+    if (!this.executionEnvironment) {
+      this.packageStatus = 'idle';
+      return;
+    }
+
+    try {
+      const packageJsonExists = await this.executionEnvironment.exists('/package.json');
+      if (!packageJsonExists) {
+        this.packageStatus = 'idle';
+        return;
+      }
+
+      this.packageStatus = 'checking';
+      this.isCheckingPackages = true;
+
+      // Run pnpm outdated --json with timeout
+      const process = await this.executionEnvironment.spawn('pnpm', ['outdated', '--json']);
+
+      let output = '';
+
+      // Collect output asynchronously - don't await, stream may not close if no output
+      const outputReader = process.output.getReader();
+      const readOutput = async () => {
+        try {
+          while (true) {
+            const { done, value } = await outputReader.read();
+            if (done) break;
+            output += value;
+          }
+        } catch {
+          // Ignore stream errors
+        }
+      };
+      // Start reading but don't await - we'll use whatever we have when process exits
+      readOutput();
+
+      // Wait for process exit with timeout (10 seconds)
+      const exitCode = await Promise.race([
+        process.exit,
+        new Promise<number>((resolve) => setTimeout(() => resolve(-1), 10000)),
+      ]);
+
+      // Cancel reader when done
+      try {
+        await outputReader.cancel();
+      } catch {
+        // Ignore cancel errors
+      }
+
+      // Handle timeout
+      if (exitCode === -1) {
+        console.warn('Package check timed out');
+        this.packageStatus = 'error';
+        return;
+      }
+
+      // pnpm outdated returns exit code 1 if there are outdated packages
+      if (exitCode === 0) {
+        // No outdated packages
+        this.packageStatus = 'up-to-date';
+        this.outdatedPackages = [];
+      } else {
+        // Parse outdated packages
+        try {
+          const outdatedData = JSON.parse(output);
+          this.outdatedPackages = this.parseOutdatedPackages(outdatedData);
+          this.packageStatus = this.outdatedPackages.length > 0 ? 'updates-available' : 'up-to-date';
+        } catch {
+          // If parsing fails but exit code is 1, assume there are updates
+          this.packageStatus = 'updates-available';
+          this.outdatedPackages = [];
+        }
+      }
+    } catch (error) {
+      console.warn('Failed to check for package updates:', error);
+      this.packageStatus = 'error';
+    } finally {
+      this.isCheckingPackages = false;
+    }
+  }
+
+  private parseOutdatedPackages(data: any): IOutdatedPackage[] {
+    const packages: IOutdatedPackage[] = [];
+
+    // pnpm outdated --json returns an object with package names as keys
+    if (typeof data === 'object' && data !== null) {
+      for (const [name, info] of Object.entries(data)) {
+        const pkgInfo = info as any;
+        packages.push({
+          name,
+          current: pkgInfo.current || 'unknown',
+          wanted: pkgInfo.wanted || pkgInfo.current || 'unknown',
+          latest: pkgInfo.latest || pkgInfo.wanted || 'unknown',
+          type: pkgInfo.dependencyType === 'devDependencies' ? 'devDependencies' : 'dependencies',
+        });
+      }
+    }
+
+    return packages;
+  }
+
+  private async handlePackageClick(e: MouseEvent): Promise<void> {
+    e.stopPropagation();
+
+    const menuItems: Parameters<typeof DeesContextmenu.openContextMenuWithOptions>[1] = [];
+
+    // Refresh option - show output in terminal
+    menuItems.push({
+      name: this.isCheckingPackages ? 'Checking...' : 'Check for updates',
+      iconName: 'lucide:refreshCw',
+      action: async () => {
+        if (this.isCheckingPackages) return;
+
+        // Create terminal tab to show pnpm outdated output
+        const detail: IRunProcessEventDetail = {
+          type: 'package-update',
+          label: 'check packages',
+          command: 'pnpm',
+          args: ['outdated'],
+        };
+
+        this.dispatchEvent(new CustomEvent('run-process', {
+          bubbles: true,
+          composed: true,
+          detail,
+        }));
+
+        // Also refresh the widget status silently after a delay
+        setTimeout(() => this.checkPackages(), 3000);
+      },
+    });
+
+    if (this.outdatedPackages.length > 0) {
+      menuItems.push({ divider: true });
+
+      // Show outdated packages (max 10)
+      const displayPackages = this.outdatedPackages.slice(0, 10);
+      for (const pkg of displayPackages) {
+        menuItems.push({
+          name: `${pkg.name}: ${pkg.current} → ${pkg.latest}`,
+          iconName: 'lucide:package',
+          action: async () => {
+            // Update single package
+            await this.updatePackage(pkg.name);
+          },
+        });
+      }
+
+      if (this.outdatedPackages.length > 10) {
+        menuItems.push({
+          name: `... and ${this.outdatedPackages.length - 10} more`,
+          iconName: 'lucide:moreHorizontal',
+          action: async () => {},
+        });
+      }
+
+      menuItems.push({ divider: true });
+
+      menuItems.push({
+        name: 'Update all packages',
+        iconName: 'lucide:arrowUpCircle',
+        action: async () => {
+          await this.updateAllPackages();
+        },
+      });
+    }
+
+    await DeesContextmenu.openContextMenuWithOptions(e, menuItems);
+  }
+
+  private async updatePackage(packageName: string): Promise<void> {
+    if (!this.executionEnvironment) return;
+
+    // Mark that we have a pending update - will trigger refresh when complete
+    this.pendingPackageUpdate = true;
+
+    // Emit run-process event for the workspace to create a terminal tab
+    const detail: IRunProcessEventDetail = {
+      type: 'package-update',
+      label: `update ${packageName}`,
+      command: 'pnpm',
+      args: ['update', '--latest', packageName],
+      metadata: { packageName },
+    };
+
+    this.dispatchEvent(new CustomEvent('run-process', {
+      bubbles: true,
+      composed: true,
+      detail,
+    }));
+  }
+
+  private async updateAllPackages(): Promise<void> {
+    if (!this.executionEnvironment) return;
+
+    // Mark that we have a pending update - will trigger refresh when complete
+    this.pendingPackageUpdate = true;
+
+    // Emit run-process event for the workspace to create a terminal tab
+    const detail: IRunProcessEventDetail = {
+      type: 'package-update',
+      label: 'update all',
+      command: 'pnpm',
+      args: ['update', '--latest'],
+    };
+
+    this.dispatchEvent(new CustomEvent('run-process', {
+      bubbles: true,
+      composed: true,
+      detail,
+    }));
+  }
+
+  // ========== Helper Methods ==========
+
+  private getPackageStatusClass(): string {
+    if (this.isCheckingPackages) return '';
+    return this.packageStatus;
+  }
+
+  private getPackageIcon(): string {
+    if (this.isCheckingPackages) return 'lucide:loader2';
+
+    switch (this.packageStatus) {
+      case 'up-to-date':
+        return 'lucide:checkCircle';
+      case 'updates-available':
+        return 'lucide:alertCircle';
+      case 'error':
+        return 'lucide:xCircle';
+      default:
+        return 'lucide:package';
+    }
+  }
+
+  private getPackageStatusText(): string {
+    if (this.isCheckingPackages) return 'Checking...';
+
+    switch (this.packageStatus) {
+      case 'up-to-date':
+        return 'Up to date';
+      case 'updates-available':
+        return `${this.outdatedPackages.length} update${this.outdatedPackages.length !== 1 ? 's' : ''}`;
+      case 'error':
+        return 'Check failed';
+      default:
+        return 'Packages';
+    }
+  }
+
+  private getPackageTooltip(): string {
+    if (this.isCheckingPackages) return 'Checking for package updates...';
+
+    switch (this.packageStatus) {
+      case 'up-to-date':
+        return 'All packages are up to date';
+      case 'updates-available':
+        return `${this.outdatedPackages.length} package update${this.outdatedPackages.length !== 1 ? 's' : ''} available`;
+      case 'error':
+        return 'Failed to check for updates. Click to retry.';
+      default:
+        return 'Click to check for package updates';
+    }
+  }
+
+  // ========== Public Methods ==========
+
+  /**
+   * Manually trigger a package check
+   */
+  public async refreshPackageStatus(): Promise<void> {
+    await this.checkPackages();
+  }
+
+  /**
+   * Manually reload scripts from package.json
+   */
+  public async refreshScripts(): Promise<void> {
+    await this.loadScripts();
+  }
+}

ts_web/elements/00group-workspace/dees-workspace-bottombar/index.ts

@@ -0,0 +1 @@
+export * from './dees-workspace-bottombar.js';

ts_web/elements/00group-workspace/dees-workspace-diff-editor/dees-workspace-diff-editor.ts

@@ -0,0 +1,359 @@
+import {
+  DeesElement,
+  property,
+  html,
+  customElement,
+  type TemplateResult,
+  css,
+  cssManager,
+} from '@design.estate/dees-element';
+import * as domtools from '@design.estate/dees-domtools';
+import { MONACO_VERSION } from '../dees-workspace-monaco/version.js';
+import { themeDefaultStyles } from '../../00theme.js';
+import '../../00group-button/dees-button/dees-button.js';
+
+import type * as monaco from 'monaco-editor';
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'dees-workspace-diff-editor': DeesWorkspaceDiffEditor;
+  }
+}
+
+@customElement('dees-workspace-diff-editor')
+export class DeesWorkspaceDiffEditor extends DeesElement {
+  // DEMO
+  public static demo = () => html`
+    <dees-workspace-diff-editor
+      .originalContent=${'function hello() {\n  console.log("Hello");\n}'}
+      .modifiedContent=${'function hello() {\n  console.log("Hello World!");\n  return true;\n}'}
+      .language=${'typescript'}
+      .filePath=${'/demo/example.ts'}
+    ></dees-workspace-diff-editor>
+  `;
+
+  // INSTANCE
+  public diffEditorDeferred = domtools.plugins.smartpromise.defer<monaco.editor.IStandaloneDiffEditor>();
+
+  @property({ type: String })
+  accessor originalContent: string = '';
+
+  @property({ type: String })
+  accessor modifiedContent: string = '';
+
+  @property({ type: String })
+  accessor originalLabel: string = 'Disk Version';
+
+  @property({ type: String })
+  accessor modifiedLabel: string = 'Local Version';
+
+  @property({ type: String })
+  accessor language: string = 'typescript';
+
+  @property({ type: String })
+  accessor filePath: string = '';
+
+  private diffEditor: monaco.editor.IStandaloneDiffEditor | null = null;
+  private monacoThemeSubscription: domtools.plugins.smartrx.rxjs.Subscription | null = null;
+  private originalModel: monaco.editor.ITextModel | null = null;
+  private modifiedModel: monaco.editor.ITextModel | null = null;
+
+  constructor() {
+    super();
+    domtools.DomTools.setupDomTools();
+  }
+
+  public static styles = [
+    themeDefaultStyles,
+    cssManager.defaultStyles,
+    css`
+      :host {
+        display: block;
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+      }
+
+      * {
+        box-sizing: border-box;
+      }
+
+      .diff-wrapper {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+        width: 100%;
+      }
+
+      .diff-toolbar {
+        height: 48px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 0 16px;
+        background: ${cssManager.bdTheme('hsl(0 0% 96%)', 'hsl(0 0% 12%)')};
+        border-bottom: 1px solid ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 20%)')};
+        flex-shrink: 0;
+      }
+
+      .diff-info {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+        font-size: 14px;
+        color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 80%)')};
+      }
+
+      .diff-filename {
+        font-weight: 600;
+        color: ${cssManager.bdTheme('hsl(0 0% 20%)', 'hsl(0 0% 90%)')};
+      }
+
+      .diff-labels {
+        font-size: 12px;
+        color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')};
+      }
+
+      .diff-actions {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+      }
+
+      .diff-container {
+        flex: 1;
+        min-height: 0;
+        width: 100%;
+      }
+
+      .nav-buttons {
+        display: flex;
+        gap: 4px;
+      }
+
+      .action-buttons {
+        display: flex;
+        gap: 8px;
+        margin-left: 16px;
+      }
+    `,
+  ];
+
+  public render(): TemplateResult {
+    const fileName = this.filePath.split('/').pop() || 'file';
+
+    return html`
+      <div class="diff-wrapper">
+        <div class="diff-toolbar">
+          <div class="diff-info">
+            <span class="diff-filename">${fileName}</span>
+            <span class="diff-labels">${this.originalLabel} ↔ ${this.modifiedLabel}</span>
+          </div>
+          <div class="diff-actions">
+            <div class="nav-buttons">
+              <dees-button
+                type="outline"
+                @click=${this.goToPreviousDiff}
+              >Previous</dees-button>
+              <dees-button
+                type="outline"
+                @click=${this.goToNextDiff}
+              >Next</dees-button>
+            </div>
+            <div class="action-buttons">
+              <dees-button
+                type="highlighted"
+                @click=${this.acceptLocal}
+              >Use Local</dees-button>
+              <dees-button
+                type="outline"
+                @click=${this.acceptDisk}
+              >Use Disk</dees-button>
+              <dees-button
+                type="outline"
+                @click=${this.close}
+              >Close</dees-button>
+            </div>
+          </div>
+        </div>
+        <div class="diff-container"></div>
+      </div>
+    `;
+  }
+
+  public async firstUpdated(): Promise<void> {
+    await super.firstUpdated(new Map());
+    await this.initDiffEditor();
+  }
+
+  private async initDiffEditor(): Promise<void> {
+    const container = this.shadowRoot?.querySelector('.diff-container') as HTMLElement;
+    if (!container) return;
+
+    const monacoCdnBase = `https://cdn.jsdelivr.net/npm/monaco-editor@${MONACO_VERSION}`;
+
+    // Wait for Monaco to be loaded (should already be loaded by dees-workspace-monaco)
+    let monacoInstance = (window as any).monaco as typeof monaco;
+
+    if (!monacoInstance) {
+      // Monaco not loaded yet, wait for it
+      await new Promise<void>((resolve) => {
+        const checkMonaco = setInterval(() => {
+          if ((window as any).monaco) {
+            clearInterval(checkMonaco);
+            resolve();
+          }
+        }, 100);
+      });
+      monacoInstance = (window as any).monaco as typeof monaco;
+    }
+
+    // Get current theme from domtools
+    const domtoolsInstance = await this.domtoolsPromise;
+    const isBright = domtoolsInstance.themeManager.goBrightBoolean;
+    const initialTheme = isBright ? 'vs' : 'vs-dark';
+
+    // Create unique URIs for models
+    const timestamp = Date.now();
+    const originalUri = monacoInstance.Uri.parse(`diff://original/${timestamp}${this.filePath}`);
+    const modifiedUri = monacoInstance.Uri.parse(`diff://modified/${timestamp}${this.filePath}`);
+
+    // Create models
+    this.originalModel = monacoInstance.editor.createModel(
+      this.originalContent,
+      this.language,
+      originalUri
+    );
+    this.modifiedModel = monacoInstance.editor.createModel(
+      this.modifiedContent,
+      this.language,
+      modifiedUri
+    );
+
+    // Create diff editor
+    this.diffEditor = monacoInstance.editor.createDiffEditor(container, {
+      automaticLayout: true,
+      readOnly: false, // Allow editing the modified (local) side
+      originalEditable: false, // Disk version is read-only
+      renderSideBySide: true,
+      ignoreTrimWhitespace: false,
+      fontSize: 14,
+      minimap: {
+        enabled: false,
+      },
+    });
+
+    // Set the theme
+    monacoInstance.editor.setTheme(initialTheme);
+
+    this.diffEditor.setModel({
+      original: this.originalModel,
+      modified: this.modifiedModel,
+    });
+
+    // Subscribe to theme changes
+    this.monacoThemeSubscription = domtoolsInstance.themeManager.themeObservable.subscribe(
+      (goBright: boolean) => {
+        const newTheme = goBright ? 'vs' : 'vs-dark';
+        monacoInstance.editor.setTheme(newTheme);
+      }
+    );
+
+    // Inject Monaco CSS if not already present
+    const cssId = 'monaco-diff-editor-css';
+    if (!this.shadowRoot?.getElementById(cssId)) {
+      const cssResponse = await fetch(`${monacoCdnBase}/min/vs/editor/editor.main.css`);
+      const cssText = await cssResponse.text();
+      const styleElement = document.createElement('style');
+      styleElement.id = cssId;
+      styleElement.textContent = cssText;
+      this.shadowRoot?.append(styleElement);
+    }
+
+    // Navigate to first diff after a short delay
+    setTimeout(() => {
+      try {
+        this.diffEditor?.revealFirstDiff();
+      } catch {
+        // Ignore if no diffs
+      }
+    }, 100);
+
+    this.diffEditorDeferred.resolve(this.diffEditor);
+  }
+
+  public goToNextDiff(): void {
+    try {
+      this.diffEditor?.goToDiff('next');
+    } catch {
+      // Ignore if no more diffs
+    }
+  }
+
+  public goToPreviousDiff(): void {
+    try {
+      this.diffEditor?.goToDiff('previous');
+    } catch {
+      // Ignore if no more diffs
+    }
+  }
+
+  public acceptLocal(): void {
+    // User wants to keep local version (potentially with edits made in diff view)
+    const modifiedContent = this.diffEditor?.getModifiedEditor().getValue() || this.modifiedContent;
+    this.dispatchEvent(
+      new CustomEvent('diff-resolved', {
+        detail: { action: 'use-local', content: modifiedContent },
+        bubbles: true,
+        composed: true,
+      })
+    );
+  }
+
+  public acceptDisk(): void {
+    // User wants disk version
+    this.dispatchEvent(
+      new CustomEvent('diff-resolved', {
+        detail: { action: 'use-disk', content: this.originalContent },
+        bubbles: true,
+        composed: true,
+      })
+    );
+  }
+
+  public close(): void {
+    this.dispatchEvent(
+      new CustomEvent('diff-closed', {
+        bubbles: true,
+        composed: true,
+      })
+    );
+  }
+
+  public async disconnectedCallback(): Promise<void> {
+    await super.disconnectedCallback();
+
+    if (this.monacoThemeSubscription) {
+      this.monacoThemeSubscription.unsubscribe();
+      this.monacoThemeSubscription = null;
+    }
+
+    // Dispose models
+    if (this.originalModel) {
+      this.originalModel.dispose();
+      this.originalModel = null;
+    }
+    if (this.modifiedModel) {
+      this.modifiedModel.dispose();
+      this.modifiedModel = null;
+    }
+
+    // Dispose editor
+    if (this.diffEditor) {
+      this.diffEditor.dispose();
+      this.diffEditor = null;
+    }
+  }
+}

ts_web/elements/00group-workspace/dees-workspace-diff-editor/index.ts

@@ -0,0 +1 @@
+export * from './dees-workspace-diff-editor.js';

ts_web/elements/00group-workspace/dees-workspace-monaco/dees-workspace-monaco.ts

@@ -242,4 +242,53 @@ export class DeesWorkspaceMonaco extends DeesElement {
       this.monacoThemeSubscription = null;
     }
   }
+
+  /**
+   * Update content from external source with optional cursor preservation.
+   * Use this when the file content changes externally (e.g., file changed on disk).
+   * @param newContent The new content to set
+   * @param preserveCursor Whether to preserve cursor/scroll position (default: true)
+   */
+  public async setContentExternal(
+    newContent: string,
+    preserveCursor: boolean = true
+  ): Promise<void> {
+    const editor = await this.editorDeferred.promise;
+    const currentValue = editor.getValue();
+
+    if (currentValue === newContent) return;
+
+    // Save cursor state if preserving
+    const position = preserveCursor ? editor.getPosition() : null;
+    const selections = preserveCursor ? editor.getSelections() : null;
+    const scrollTop = preserveCursor ? editor.getScrollTop() : 0;
+    const scrollLeft = preserveCursor ? editor.getScrollLeft() : 0;
+
+    // Update content
+    this.isUpdatingFromExternal = true;
+    editor.setValue(newContent);
+    this.isUpdatingFromExternal = false;
+
+    // Restore cursor state if preserving
+    if (preserveCursor) {
+      if (position) {
+        // Clamp position to valid range
+        const model = editor.getModel();
+        const lineCount = model?.getLineCount() || 1;
+        const clampedLine = Math.min(position.lineNumber, lineCount);
+        const lineLength = model?.getLineMaxColumn(clampedLine) || 1;
+        const clampedColumn = Math.min(position.column, lineLength);
+        editor.setPosition({ lineNumber: clampedLine, column: clampedColumn });
+      }
+      if (selections && selections.length > 0) {
+        // Selections may be invalid after content change, wrap in try-catch
+        try {
+          editor.setSelections(selections);
+        } catch {
+          // Ignore invalid selections
+        }
+      }
+      editor.setScrollPosition({ scrollTop, scrollLeft });
+    }
+  }
 }

ts_web/elements/00group-workspace/dees-workspace-terminal/dees-workspace-terminal.ts

@@ -6,6 +6,7 @@ import {
   type TemplateResult,
   css,
   cssManager,
+  state,
 } from '@design.estate/dees-element';
 import * as domtools from '@design.estate/dees-domtools';
 
@@ -14,6 +15,15 @@ import { FitAddon } from 'xterm-addon-fit';
 import { themeDefaultStyles } from '../../00theme.js';
 import type { IExecutionEnvironment } from '../../00group-runtime/index.js';
 import { WebContainerEnvironment } from '../../00group-runtime/index.js';
+import '../../dees-icon/dees-icon.js';
+import '../../dees-actionbar/dees-actionbar.js';
+import type { DeesActionbar } from '../../dees-actionbar/dees-actionbar.js';
+import { TerminalTabManager } from './terminal-tab-manager.js';
+import type {
+  ITerminalTab,
+  ICreateTerminalTabOptions,
+  TTerminalTabType,
+} from './interfaces.js';
 
 declare global {
   interface HTMLElementTagNameMap {
@@ -30,6 +40,7 @@ export class DeesWorkspaceTerminal extends DeesElement {
 
   // INSTANCE
   private resizeObserver: ResizeObserver;
+  private tabManager: TerminalTabManager;
 
   /**
    * The execution environment (required).
@@ -39,7 +50,7 @@ export class DeesWorkspaceTerminal extends DeesElement {
   accessor executionEnvironment: IExecutionEnvironment | null = null;
 
   @property()
-  accessor setupCommand = `pnpm install @serve.zone/cli && servezone cli\n`;
+  accessor setupCommand = '';
 
   /**
    * Environment variables to set in the shell
@@ -47,6 +58,32 @@ export class DeesWorkspaceTerminal extends DeesElement {
   @property()
   accessor environmentVariables: { [key: string]: string } = {};
 
+  /**
+   * Width of the tab bar in pixels
+   */
+  @property({ type: Number })
+  accessor tabBarWidth: number = 160;
+
+  /**
+   * Whether to show the tab bar
+   */
+  @property({ type: Boolean })
+  accessor showTabBar: boolean = true;
+
+  // Tab state
+  @state()
+  accessor tabs: ITerminalTab[] = [];
+
+  @state()
+  accessor activeTabId: string | null = null;
+
+  // Theme subscription for dynamic theme updates
+  private terminalThemeSubscription: any = null;
+  private isBright: boolean = false;
+
+  // Actionbar reference for terminal-context notifications
+  private terminalActionbar: DeesActionbar | null = null;
+
   /**
    * Promise that resolves when the environment is ready.
    * @deprecated Use executionEnvironment directly
@@ -54,17 +91,11 @@ export class DeesWorkspaceTerminal extends DeesElement {
   private environmentDeferred = new domtools.plugins.smartpromise.Deferred<IExecutionEnvironment>();
   public environmentPromise = this.environmentDeferred.promise;
 
-  // Theme subscription for dynamic theme updates
-  private terminalThemeSubscription: any = null;
-
   constructor() {
     super();
-    this.resizeObserver = new ResizeObserver((entries) => {
-      for (const entry of entries) {
-        // Handle the resize event
-        console.log(`Terminal Resized`);
-        this.handleResize();
-      }
+    this.tabManager = new TerminalTabManager();
+    this.resizeObserver = new ResizeObserver(() => {
+      this.handleResize();
     });
   }
 
@@ -73,59 +104,195 @@ export class DeesWorkspaceTerminal extends DeesElement {
     cssManager.defaultStyles,
     css`
       :host {
-        padding: 20px;
         background: ${cssManager.bdTheme('#ffffff', '#000000')};
         position: absolute;
         height: 100%;
         width: 100%;
+        display: flex;
+        flex-direction: row;
       }
 
       * {
         box-sizing: border-box;
       }
 
-      #container {
-        position: absolute;
-        height: calc(100% - 40px);
-        width: calc(100% - 40px);
+      .terminal-container {
+        display: flex;
+        flex-direction: row;
+        width: 100%;
+        height: 100%;
       }
-      /**
-      * Copyright (c) 2014 The xterm.js authors. All rights reserved.
-      * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
-      * https://github.com/chjj/term.js
-      * @license MIT
-      *
-      * Permission is hereby granted, free of charge, to any person obtaining a copy
-      * of this software and associated documentation files (the "Software"), to deal
-      * in the Software without restriction, including without limitation the rights
-      * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-      * copies of the Software, and to permit persons to whom the Software is
-      * furnished to do so, subject to the following conditions:
-      *
-      * The above copyright notice and this permission notice shall be included in
-      * all copies or substantial portions of the Software.
-      *
-      * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-      * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-      * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-      * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-      * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-      * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-      * THE SOFTWARE.
-      *
-      * Originally forked from (with the author's permission):
-      *   Fabrice Bellard's javascript vt100 for jslinux:
-      *   http://bellard.org/jslinux/
-      *   Copyright (c) 2011 Fabrice Bellard
-      *   The original design remains. The terminal itself
-      *   has been extended to include xterm CSI codes, among
-      *   other features.
-      */
 
-      /**
-      *  Default styles for xterm.js
-      */
+      .terminal-content {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        overflow: hidden;
+        background: ${cssManager.bdTheme('#ffffff', '#000000')};
+      }
 
+      #active-terminal-container {
+        flex: 1;
+        position: relative;
+        min-height: 0;
+        margin: 20px;
+      }
+
+      .terminal-content dees-actionbar {
+        flex-shrink: 0;
+      }
+
+      /* Tab bar on the right side */
+      .tab-bar {
+        display: flex;
+        flex-direction: column;
+        background: ${cssManager.bdTheme('hsl(0 0% 96%)', 'hsl(0 0% 7%)')};
+        border-left: 1px solid ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 15%)')};
+        flex-shrink: 0;
+        overflow: hidden;
+      }
+
+      .tab-bar-header {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 8px 10px;
+        border-bottom: 1px solid ${cssManager.bdTheme('hsl(0 0% 88%)', 'hsl(0 0% 12%)')};
+        font-size: 11px;
+        font-weight: 600;
+        text-transform: uppercase;
+        letter-spacing: 0.5px;
+        color: ${cssManager.bdTheme('hsl(0 0% 45%)', 'hsl(0 0% 55%)')};
+      }
+
+      .tab-bar-title {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      .tab-bar-actions {
+        display: flex;
+        gap: 2px;
+      }
+
+      .tab-action {
+        width: 22px;
+        height: 22px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 4px;
+        cursor: pointer;
+        color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 60%)')};
+        transition: all 0.15s ease;
+      }
+
+      .tab-action:hover {
+        background: ${cssManager.bdTheme('hsl(0 0% 88%)', 'hsl(0 0% 15%)')};
+        color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 80%)')};
+      }
+
+      .tab-list {
+        flex: 1;
+        overflow-y: auto;
+        padding: 4px;
+      }
+
+      .terminal-tab {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        padding: 8px 10px;
+        margin-bottom: 2px;
+        border-radius: 6px;
+        cursor: pointer;
+        font-size: 12px;
+        color: ${cssManager.bdTheme('hsl(0 0% 45%)', 'hsl(0 0% 60%)')};
+        transition: all 0.15s ease;
+      }
+
+      .terminal-tab:hover {
+        background: ${cssManager.bdTheme('hsl(0 0% 90%)', 'hsl(0 0% 12%)')};
+        color: ${cssManager.bdTheme('hsl(0 0% 25%)', 'hsl(0 0% 80%)')};
+      }
+
+      .terminal-tab.active {
+        background: ${cssManager.bdTheme('hsl(210 100% 95%)', 'hsl(210 30% 15%)')};
+        color: ${cssManager.bdTheme('hsl(210 100% 40%)', 'hsl(210 100% 70%)')};
+      }
+
+      .terminal-tab.exited {
+        opacity: 0.7;
+      }
+
+      .tab-icon {
+        flex-shrink: 0;
+      }
+
+      .tab-icon.running {
+        color: ${cssManager.bdTheme('hsl(142 70% 40%)', 'hsl(142 70% 55%)')};
+      }
+
+      .tab-label {
+        flex: 1;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+
+      .exit-badge {
+        font-size: 10px;
+        padding: 1px 5px;
+        border-radius: 8px;
+        font-weight: 600;
+        flex-shrink: 0;
+      }
+
+      .exit-badge.success {
+        background: ${cssManager.bdTheme('hsl(142 70% 90%)', 'hsl(142 30% 20%)')};
+        color: ${cssManager.bdTheme('hsl(142 70% 35%)', 'hsl(142 70% 60%)')};
+      }
+
+      .exit-badge.error {
+        background: ${cssManager.bdTheme('hsl(0 70% 93%)', 'hsl(0 30% 20%)')};
+        color: ${cssManager.bdTheme('hsl(0 70% 45%)', 'hsl(0 70% 60%)')};
+      }
+
+      .tab-close {
+        width: 18px;
+        height: 18px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 4px;
+        opacity: 0;
+        transition: all 0.15s ease;
+        flex-shrink: 0;
+      }
+
+      .terminal-tab:hover .tab-close {
+        opacity: 0.6;
+      }
+
+      .tab-close:hover {
+        opacity: 1 !important;
+        background: ${cssManager.bdTheme('hsl(0 0% 85%)', 'hsl(0 0% 25%)')};
+        color: ${cssManager.bdTheme('hsl(0 70% 50%)', 'hsl(0 70% 60%)')};
+      }
+
+      .empty-state {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        height: 100%;
+        color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 50%)')};
+        font-size: 13px;
+        gap: 8px;
+      }
+
+      /* xterm.js styles */
       .xterm {
         font-feature-settings: 'liga' 0;
         position: relative;
@@ -142,10 +309,6 @@ export class DeesWorkspaceTerminal extends DeesElement {
       .xterm .xterm-helpers {
         position: absolute;
         top: 0;
-        /**
-          * The z-index of the helpers must be higher than the canvases in order for
-          * IMEs to appear on top.
-          */
         z-index: 5;
       }
 
@@ -153,7 +316,6 @@ export class DeesWorkspaceTerminal extends DeesElement {
         padding: 0;
         border: 0;
         margin: 0;
-        /* Move textarea out of the screen to the far left, so that the cursor is not visible */
         position: absolute;
         opacity: 0;
         left: -9999em;
@@ -161,14 +323,12 @@ export class DeesWorkspaceTerminal extends DeesElement {
         width: 0;
         height: 0;
         z-index: -5;
-        /** Prevent wrapping so the IME appears against the textarea at the correct position */
         white-space: nowrap;
         overflow: hidden;
         resize: none;
       }
 
       .xterm .composition-view {
-        /* TODO: Composition position got messed up somewhere */
         background: ${cssManager.bdTheme('#ffffff', '#000000')};
         color: ${cssManager.bdTheme('#333333', '#ffffff')};
         display: none;
@@ -182,7 +342,6 @@ export class DeesWorkspaceTerminal extends DeesElement {
       }
 
       .xterm .xterm-viewport {
-        /* On OS X this is required in order for the scroll bar to appear fully opaque */
         background-color: ${cssManager.bdTheme('#ffffff', '#000000')};
         overflow-y: scroll;
         cursor: default;
@@ -221,7 +380,6 @@ export class DeesWorkspaceTerminal extends DeesElement {
       }
 
       .xterm.enable-mouse-events {
-        /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
         cursor: default;
       }
 
@@ -230,7 +388,6 @@ export class DeesWorkspaceTerminal extends DeesElement {
       }
 
       .xterm.column-select.focus {
-        /* Column selection mode */
         cursor: crosshair;
       }
 
@@ -264,165 +421,464 @@ export class DeesWorkspaceTerminal extends DeesElement {
   ];
 
   public render(): TemplateResult {
+    const activeTab = this.activeTabId ? this.tabManager.getTab(this.activeTabId) : null;
+
     return html`
-      <div class="mainbox">
-        <div id="container"></div>
+      <div class="terminal-container">
+        <!-- Main terminal area -->
+        <div class="terminal-content">
+          ${activeTab ? html`
+            <div id="active-terminal-container"></div>
+          ` : html`
+            <div class="empty-state">
+              <dees-icon .icon=${'lucide:terminal'} iconSize="32"></dees-icon>
+              <span>No terminal open</span>
+            </div>
+          `}
+          <dees-actionbar></dees-actionbar>
+        </div>
+
+        <!-- Vertical tab bar on the right -->
+        ${this.showTabBar ? html`
+          <div class="tab-bar" style="width: ${this.tabBarWidth}px">
+            <div class="tab-bar-header">
+              <span class="tab-bar-title">Terminals</span>
+              <div class="tab-bar-actions">
+                <div class="tab-action" @click=${this.handleAddTab} title="New Terminal">
+                  <dees-icon .icon=${'lucide:plus'} iconSize="14"></dees-icon>
+                </div>
+              </div>
+            </div>
+
+            <div class="tab-list">
+              ${this.tabs.map(tab => html`
+                <div
+                  class="terminal-tab ${tab.id === this.activeTabId ? 'active' : ''} ${tab.exited ? 'exited' : ''}"
+                  @click=${() => this.switchToTab(tab.id)}
+                >
+                  <dees-icon
+                    .icon=${tab.iconName}
+                    iconSize="14"
+                    class="tab-icon ${tab.process && !tab.exited ? 'running' : ''}"
+                  ></dees-icon>
+                  <span class="tab-label">${tab.label}</span>
+                  ${tab.exited ? html`
+                    <span class="exit-badge ${tab.exitCode === 0 ? 'success' : 'error'}">
+                      ${tab.exitCode}
+                    </span>
+                  ` : ''}
+                  ${tab.closeable ? html`
+                    <span class="tab-close" @click=${(e: Event) => this.handleTabClose(e, tab.id)}>
+                      <dees-icon .icon=${'lucide:x'} iconSize="12"></dees-icon>
+                    </span>
+                  ` : ''}
+                </div>
+              `)}
+            </div>
+          </div>
+        ` : ''}
       </div>
     `;
   }
 
-  private fitAddon: FitAddon;
-  private terminal: Terminal | null = null;
-
-  /**
-   * Get terminal theme colors based on bright/dark mode
-   */
-  private getTerminalTheme(isBright: boolean) {
-    return isBright
-      ? {
-          background: '#ffffff',
-          foreground: '#333333',
-          cursor: '#333333',
-          cursorAccent: '#ffffff',
-          selectionBackground: 'rgba(0, 0, 0, 0.2)',
-        }
-      : {
-          background: '#000000',
-          foreground: '#cccccc',
-          cursor: '#cccccc',
-          cursorAccent: '#000000',
-          selectionBackground: 'rgba(255, 255, 255, 0.2)',
-        };
-  }
-
-  public async firstUpdated(
-    _changedProperties: Map<string | number | symbol, unknown>
-  ): Promise<void> {
+  public async firstUpdated(): Promise<void> {
     const domtoolsInstance = await this.domtoolsPromise;
-    super.firstUpdated(_changedProperties);
 
     // Get current theme
-    const isBright = domtoolsInstance.themeManager.goBrightBoolean;
-
-    const container = this.shadowRoot.getElementById('container');
-
-    const term = new Terminal({
-      convertEol: true,
-      cursorBlink: true,
-      theme: this.getTerminalTheme(isBright),
-    });
-    this.terminal = term;
+    this.isBright = domtoolsInstance.themeManager.goBrightBoolean;
 
     // Subscribe to theme changes
-    this.terminalThemeSubscription = domtoolsInstance.themeManager.themeObservable.subscribe((goBright: boolean) => {
-      if (this.terminal) {
-        this.terminal.options.theme = this.getTerminalTheme(goBright);
+    this.terminalThemeSubscription = domtoolsInstance.themeManager.themeObservable.subscribe(
+      (goBright: boolean) => {
+        this.isBright = goBright;
+        this.tabManager.updateAllThemes(goBright);
       }
-    });
-    this.fitAddon = new FitAddon();
-    term.loadAddon(this.fitAddon);
-
-    // Open the terminal in #terminal-container
-    term.open(container);
-
-    // Make the terminal's size and geometry fit the size of #terminal-container
-    this.fitAddon.fit();
-
-    // Check if execution environment is provided
-    if (!this.executionEnvironment) {
-      term.write('\x1b[31m');  // Red color
-      term.write('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\r\n');
-      term.write('  ❌ No execution environment provided.\r\n');
-      term.write('\r\n');
-      term.write('  Pass an IExecutionEnvironment via the\r\n');
-      term.write('  \'executionEnvironment\' property.\r\n');
-      term.write('\r\n');
-      term.write('  Example:\r\n');
-      term.write('    const env = new WebContainerEnvironment();\r\n');
-      term.write('    <dees-terminal .executionEnvironment=${env}>\r\n');
-      term.write('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\r\n');
-      term.write('\x1b[0m');  // Reset color
-      return;
-    }
-
-    term.write('Initializing execution environment...\r\n');
-
-    // Initialize the execution environment
-    try {
-      await this.executionEnvironment.init();
-      term.write('Environment ready. Starting shell...\r\n');
-    } catch (error) {
-      term.write('\x1b[31m');  // Red color
-      term.write(`\r\n❌ Failed to initialize environment: ${error}\r\n`);
-      term.write('\x1b[0m');  // Reset color
-      console.error('Failed to initialize execution environment:', error);
-      return;
-    }
-
-    // Spawn shell process
-    let shellProcess;
-    try {
-      shellProcess = await this.executionEnvironment.spawn('jsh');
-    } catch (error) {
-      term.write('\x1b[31m');  // Red color
-      term.write(`\r\n❌ Failed to spawn shell: ${error}\r\n`);
-      term.write('\x1b[0m');  // Reset color
-      console.error('Failed to spawn shell:', error);
-      return;
-    }
-    shellProcess.output.pipeTo(
-      new WritableStream({
-        write(data) {
-          term.write(data);
-        },
-      })
     );
-    const input = shellProcess.input.getWriter();
-    term.onData((data) => {
-      input.write(data);
-    });
 
-    await this.waitForPrompt(term, '~/');
-
-    // Set environment variables if provided
-    if (Object.keys(this.environmentVariables).length > 0) {
-      await this.setEnvironmentVariables(this.environmentVariables);
-      input.write(`source source.env\n`);
-      await this.waitForPrompt(term, '~/');
-    }
-
-    // Run setup command if provided
-    if (this.setupCommand) {
-      input.write(this.setupCommand);
-      await this.waitForPrompt(term, '~/');
-    }
-
-    input.write(`clear && echo 'Terminal ready.'\n`);
-    this.environmentDeferred.resolve(this.executionEnvironment);
+    // Create default shell tab
+    await this.createShellTab();
   }
 
   async connectedCallback(): Promise<void> {
     await super.connectedCallback();
-    this.resizeObserver.observe(this);
+    // ResizeObserver is set up in attachTerminalToContainer when the container exists
   }
 
   async disconnectedCallback(): Promise<void> {
-    this.resizeObserver.unobserve(this);
+    // Unobserve the terminal container
+    const container = this.shadowRoot?.getElementById('active-terminal-container');
+    if (container) {
+      this.resizeObserver.unobserve(container);
+    }
     if (this.terminalThemeSubscription) {
       this.terminalThemeSubscription.unsubscribe();
       this.terminalThemeSubscription = null;
     }
-    if (this.terminal) {
-      this.terminal.dispose();
-      this.terminal = null;
-    }
+    this.tabManager.disposeAll();
     await super.disconnectedCallback();
   }
 
-  handleResize() {
-    this.fitAddon.fit();
+  // ========== Tab Management ==========
+
+  private async handleAddTab(): Promise<void> {
+    await this.createShellTab();
   }
 
+  private handleTabClose(e: Event, tabId: string): void {
+    e.stopPropagation();
+    this.closeTab(tabId);
+  }
+
+  private switchToTab(tabId: string): void {
+    if (tabId === this.activeTabId) return;
+
+    const tab = this.tabManager.getTab(tabId);
+    if (!tab) return;
+
+    const previousTabId = this.activeTabId;
+
+    // Detach current terminal from DOM
+    if (this.activeTabId) {
+      this.detachActiveTerminal();
+    }
+
+    // Update active tab
+    this.activeTabId = tabId;
+    this.tabs = this.tabManager.getAllTabs();
+
+    // Wait for render then attach new terminal
+    this.updateComplete.then(() => {
+      this.attachTerminalToContainer(tab);
+
+      // Dispatch event
+      this.dispatchEvent(
+        new CustomEvent('tab-switched', {
+          bubbles: true,
+          composed: true,
+          detail: { tabId, previousTabId },
+        })
+      );
+    });
+  }
+
+  private detachActiveTerminal(): void {
+    const container = this.shadowRoot?.getElementById('active-terminal-container');
+    if (container) {
+      container.innerHTML = '';
+    }
+  }
+
+  private attachTerminalToContainer(tab: ITerminalTab): void {
+    const container = this.shadowRoot?.getElementById('active-terminal-container');
+    if (!container) return;
+
+    // Observe container for resize (handles actionbar appearing/disappearing)
+    // ResizeObserver.observe() is idempotent - safe to call multiple times
+    this.resizeObserver.observe(container);
+
+    // Clear container
+    container.innerHTML = '';
+
+    // Open terminal in container
+    tab.terminal.open(container);
+    tab.fitAddon.fit();
+    tab.terminal.focus();
+  }
+
+  private handleResize(): void {
+    if (this.activeTabId) {
+      const tab = this.tabManager.getTab(this.activeTabId);
+      if (tab) {
+        tab.fitAddon.fit();
+      }
+    }
+  }
+
+  // ========== Process Management ==========
+
+  private async spawnProcessForTab(
+    tab: ITerminalTab,
+    command: string,
+    args: string[] = []
+  ): Promise<void> {
+    if (!this.executionEnvironment) {
+      tab.terminal.write('\x1b[31m');
+      tab.terminal.write('❌ No execution environment available.\r\n');
+      tab.terminal.write('\x1b[0m');
+      return;
+    }
+
+    try {
+      // Initialize environment if needed
+      if (!this.executionEnvironment.ready) {
+        tab.terminal.write('Initializing environment...\r\n');
+        await this.executionEnvironment.init();
+      }
+
+      // Spawn process
+      const process = await this.executionEnvironment.spawn(command, args);
+
+      // Set up output piping
+      process.output.pipeTo(
+        new WritableStream({
+          write: (data) => {
+            tab.terminal.write(data);
+          },
+        })
+      );
+
+      // Set up input for interactive processes
+      const inputWriter = process.input.getWriter();
+      tab.terminal.onData((data) => {
+        inputWriter.write(data);
+      });
+
+      // Store process reference
+      this.tabManager.setTabProcess(tab.id, process, inputWriter);
+      this.tabs = this.tabManager.getAllTabs();
+
+      // Handle process exit
+      process.exit.then((exitCode) => {
+        this.handleProcessExit(tab.id, exitCode);
+      });
+    } catch (error) {
+      tab.terminal.write('\x1b[31m');
+      tab.terminal.write(`❌ Failed to spawn process: ${error}\r\n`);
+      tab.terminal.write('\x1b[0m');
+      console.error('Failed to spawn process:', error);
+    }
+  }
+
+  private handleProcessExit(tabId: string, exitCode: number): void {
+    const tab = this.tabManager.getTab(tabId);
+    if (!tab) return;
+
+    // Update tab state
+    this.tabManager.markTabExited(tabId, exitCode);
+
+    // Write exit message to terminal
+    const message =
+      exitCode === 0
+        ? '\r\n\x1b[32m[Process completed successfully]\x1b[0m\r\n'
+        : `\r\n\x1b[31m[Process exited with code ${exitCode}]\x1b[0m\r\n`;
+    tab.terminal.write(message);
+
+    // Update state to trigger re-render
+    this.tabs = this.tabManager.getAllTabs();
+
+    // Dispatch event
+    this.dispatchEvent(
+      new CustomEvent('process-complete', {
+        bubbles: true,
+        composed: true,
+        detail: { tabId, exitCode },
+      })
+    );
+
+    // Show actionbar to offer closing the tab (only if tab is closeable)
+    if (tab.closeable) {
+      this.showExitedTabActionbar(tabId, tab.label, exitCode);
+    }
+  }
+
+  /**
+   * Show actionbar offering to close an exited tab
+   */
+  private async showExitedTabActionbar(tabId: string, tabLabel: string, exitCode: number): Promise<void> {
+    const isSuccess = exitCode === 0;
+    const result = await this.showActionbar({
+      message: isSuccess
+        ? `"${tabLabel}" completed. Close tab?`
+        : `"${tabLabel}" exited (code ${exitCode}). Close tab?`,
+      type: isSuccess ? 'info' : 'warning',
+      icon: isSuccess ? 'lucide:checkCircle' : 'lucide:alertTriangle',
+      actions: [
+        { id: 'close', label: 'Close Tab', primary: true },
+        { id: 'keep', label: 'Keep Open' },
+      ],
+      timeout: { duration: 10000, defaultActionId: 'close' },
+      dismissible: true,
+    });
+
+    // Close tab if user clicked "Close Tab" or timeout triggered auto-close
+    if (result.actionId === 'close') {
+      this.closeTab(tabId);
+    }
+  }
+
+  // ========== Public API ==========
+
+  /**
+   * Create a new shell tab
+   */
+  public async createShellTab(label?: string): Promise<string> {
+    const tab = this.tabManager.createTab(
+      {
+        type: 'shell',
+        label: label || `bash ${this.tabManager.getTabCount() + 1}`,
+        closeable: this.tabManager.getTabCount() > 0, // First tab not closeable
+      },
+      this.isBright
+    );
+
+    this.tabs = this.tabManager.getAllTabs();
+
+    // Switch to new tab
+    this.switchToTab(tab.id);
+
+    // Wait for DOM update then spawn shell
+    await this.updateComplete;
+    await this.spawnProcessForTab(tab, 'jsh');
+
+    // Run setup command if this is the first tab
+    if (this.tabManager.getTabCount() === 1 && this.setupCommand) {
+      await this.waitForPrompt(tab.terminal, '~/');
+      if (tab.inputWriter) {
+        tab.inputWriter.write(this.setupCommand);
+      }
+    }
+
+    // Dispatch event
+    this.dispatchEvent(
+      new CustomEvent('tab-created', {
+        bubbles: true,
+        composed: true,
+        detail: { tabId: tab.id },
+      })
+    );
+
+    return tab.id;
+  }
+
+  /**
+   * Create a terminal tab for running a process
+   */
+  public async createProcessTab(options: ICreateTerminalTabOptions): Promise<string> {
+    const tab = this.tabManager.createTab(options, this.isBright);
+
+    this.tabs = this.tabManager.getAllTabs();
+
+    // Switch to new tab if requested (default: true)
+    if (options.switchToTab !== false) {
+      this.switchToTab(tab.id);
+    }
+
+    // Wait for DOM update
+    await this.updateComplete;
+
+    // Spawn process if command provided
+    if (options.command) {
+      await this.spawnProcessForTab(tab, options.command, options.args);
+    }
+
+    // Dispatch event
+    this.dispatchEvent(
+      new CustomEvent('tab-created', {
+        bubbles: true,
+        composed: true,
+        detail: { tabId: tab.id },
+      })
+    );
+
+    return tab.id;
+  }
+
+  /**
+   * Get the currently active tab
+   */
+  public getActiveTab(): ITerminalTab | null {
+    if (!this.activeTabId) return null;
+    return this.tabManager.getTab(this.activeTabId) || null;
+  }
+
+  /**
+   * Get all tabs
+   */
+  public getTabs(): ITerminalTab[] {
+    return this.tabManager.getAllTabs();
+  }
+
+  /**
+   * Switch to a specific tab by ID
+   */
+  public selectTab(tabId: string): boolean {
+    if (!this.tabManager.hasTab(tabId)) return false;
+    this.switchToTab(tabId);
+    return true;
+  }
+
+  /**
+   * Close a tab by ID
+   */
+  public closeTab(tabId: string): boolean {
+    const tab = this.tabManager.getTab(tabId);
+    if (!tab || !tab.closeable) return false;
+
+    // If closing active tab, switch to another
+    if (tabId === this.activeTabId) {
+      const allTabs = this.tabManager.getAllTabs();
+      const currentIndex = allTabs.findIndex((t) => t.id === tabId);
+      const nextTab = allTabs[currentIndex + 1] || allTabs[currentIndex - 1];
+
+      if (nextTab) {
+        this.switchToTab(nextTab.id);
+      } else {
+        this.activeTabId = null;
+        this.detachActiveTerminal();
+      }
+    }
+
+    // Close the tab
+    this.tabManager.closeTab(tabId);
+    this.tabs = this.tabManager.getAllTabs();
+
+    // Dispatch event
+    this.dispatchEvent(
+      new CustomEvent('tab-closed', {
+        bubbles: true,
+        composed: true,
+        detail: { tabId },
+      })
+    );
+
+    return true;
+  }
+
+  /**
+   * Write data to a tab's terminal
+   */
+  public writeToTab(tabId: string, data: string): boolean {
+    const tab = this.tabManager.getTab(tabId);
+    if (!tab) return false;
+    tab.terminal.write(data);
+    return true;
+  }
+
+  /**
+   * Send input to a tab's process (if interactive)
+   */
+  public sendInputToTab(tabId: string, data: string): boolean {
+    const tab = this.tabManager.getTab(tabId);
+    if (!tab || !tab.inputWriter) return false;
+    tab.inputWriter.write(data);
+    return true;
+  }
+
+  /**
+   * Show an actionbar notification in the terminal panel context.
+   * Use this for terminal-related decisions (e.g., retry failed process, kill process, etc.)
+   */
+  public async showActionbar(
+    options: Parameters<DeesActionbar['show']>[0]
+  ): Promise<ReturnType<DeesActionbar['show']>> {
+    if (!this.terminalActionbar) {
+      this.terminalActionbar = this.shadowRoot?.querySelector('dees-actionbar') as DeesActionbar;
+    }
+    return this.terminalActionbar?.show(options);
+  }
+
+  // ========== Utility Methods ==========
+
   public async waitForPrompt(term: Terminal, prompt: string): Promise<void> {
     return new Promise<void>((resolve) => {
       const checkPrompt = () => {
@@ -436,9 +892,9 @@ export class DeesWorkspaceTerminal extends DeesElement {
             return;
           }
         }
-        setTimeout(checkPrompt, 100); // check every 100 ms
+        setTimeout(checkPrompt, 100);
       };
-  
+
       checkPrompt();
     });
   }
@@ -453,13 +909,11 @@ export class DeesWorkspaceTerminal extends DeesElement {
       envFile += `export ${key}="${envArg[key]}"\n`;
     }
 
-    // Write the environment file using the filesystem API
     await this.executionEnvironment.writeFile('/source.env', envFile);
   }
 
   /**
    * Get the underlying execution environment.
-   * Useful for advanced operations like filesystem access.
    */
   public getExecutionEnvironment(): IExecutionEnvironment | null {
     return this.executionEnvironment;

ts_web/elements/00group-workspace/dees-workspace-terminal/index.ts

@@ -1 +1,3 @@
 export * from './dees-workspace-terminal.js';
+export * from './interfaces.js';
+export * from './terminal-tab-manager.js';

ts_web/elements/00group-workspace/dees-workspace-terminal/interfaces.ts

@@ -0,0 +1,126 @@
+import type { Terminal } from 'xterm';
+import type { FitAddon } from 'xterm-addon-fit';
+import type { IProcessHandle } from '../../00group-runtime/index.js';
+
+/**
+ * Type of terminal tab based on its source/purpose
+ */
+export type TTerminalTabType =
+  | 'shell'           // Default interactive shell (jsh)
+  | 'script'          // Script from package.json
+  | 'package-update'  // Package update process
+  | 'custom';         // External process from API
+
+/**
+ * Represents a single terminal tab instance
+ */
+export interface ITerminalTab {
+  /** Unique identifier for the tab */
+  id: string;
+
+  /** Display label for the tab */
+  label: string;
+
+  /** Icon name (lucide icon) */
+  iconName: string;
+
+  /** Type of terminal process */
+  type: TTerminalTabType;
+
+  /** Whether the tab can be closed */
+  closeable: boolean;
+
+  /** xterm.js Terminal instance */
+  terminal: Terminal;
+
+  /** FitAddon for this terminal */
+  fitAddon: FitAddon;
+
+  /** Process handle (if process is running) */
+  process: IProcessHandle | null;
+
+  /** Process input writer (for interactive terminals) */
+  inputWriter: WritableStreamDefaultWriter<string> | null;
+
+  /** Whether the process has exited */
+  exited: boolean;
+
+  /** Exit code (if process has exited) */
+  exitCode: number | null;
+
+  /** Timestamp when tab was created */
+  createdAt: number;
+
+  /** Optional metadata for script tabs */
+  metadata?: {
+    scriptName?: string;
+    packageName?: string;
+    command?: string;
+  };
+}
+
+/**
+ * Options for creating a new terminal tab
+ */
+export interface ICreateTerminalTabOptions {
+  /** Display label (auto-generated if not provided) */
+  label?: string;
+
+  /** Tab type */
+  type: TTerminalTabType;
+
+  /** Icon name override */
+  iconName?: string;
+
+  /** Whether the tab can be closed (default: true for non-shell) */
+  closeable?: boolean;
+
+  /** Command to spawn (default: 'jsh' for shell type) */
+  command?: string;
+
+  /** Command arguments */
+  args?: string[];
+
+  /** Additional metadata */
+  metadata?: ITerminalTab['metadata'];
+
+  /** Whether to switch to this tab after creation (default: true) */
+  switchToTab?: boolean;
+}
+
+/**
+ * Event detail for terminal tab events
+ */
+export interface ITerminalTabEventDetail {
+  tabId: string;
+}
+
+/**
+ * Event detail for tab switch events
+ */
+export interface ITerminalTabSwitchEventDetail {
+  tabId: string;
+  previousTabId: string | null;
+}
+
+/**
+ * Event detail for process completion
+ */
+export interface ITerminalProcessCompleteEventDetail {
+  tabId: string;
+  exitCode: number;
+}
+
+/**
+ * Event detail for run-process events from bottom bar
+ */
+export interface IRunProcessEventDetail {
+  type: TTerminalTabType;
+  label: string;
+  command: string;
+  args?: string[];
+  metadata?: {
+    scriptName?: string;
+    packageName?: string;
+  };
+}

ts_web/elements/00group-workspace/dees-workspace-terminal/terminal-tab-manager.ts

@@ -0,0 +1,243 @@
+import { Terminal } from 'xterm';
+import { FitAddon } from 'xterm-addon-fit';
+import type { ITerminalTab, ICreateTerminalTabOptions, TTerminalTabType } from './interfaces.js';
+
+/**
+ * Manages terminal tabs lifecycle and state
+ */
+export class TerminalTabManager {
+  private tabs: Map<string, ITerminalTab> = new Map();
+  private tabCounter: number = 0;
+
+  /**
+   * Generate unique tab ID
+   */
+  private generateTabId(): string {
+    this.tabCounter++;
+    return `terminal-${this.tabCounter}-${Date.now()}`;
+  }
+
+  /**
+   * Get default label for tab type
+   */
+  private getDefaultLabel(type: TTerminalTabType, metadata?: ITerminalTab['metadata']): string {
+    switch (type) {
+      case 'shell':
+        return 'bash';
+      case 'script':
+        return metadata?.scriptName || 'script';
+      case 'package-update':
+        return metadata?.packageName ? `update ${metadata.packageName}` : 'update';
+      case 'custom':
+        return metadata?.command || 'process';
+      default:
+        return 'terminal';
+    }
+  }
+
+  /**
+   * Get default icon for tab type
+   */
+  private getDefaultIcon(type: TTerminalTabType): string {
+    switch (type) {
+      case 'shell':
+        return 'lucide:terminal';
+      case 'script':
+        return 'lucide:play';
+      case 'package-update':
+        return 'lucide:packageCheck';
+      case 'custom':
+        return 'lucide:code';
+      default:
+        return 'lucide:terminal';
+    }
+  }
+
+  /**
+   * Get terminal theme configuration
+   */
+  private getTerminalTheme(isBright: boolean): any {
+    if (isBright) {
+      return {
+        background: '#ffffff',
+        foreground: '#333333',
+        cursor: '#333333',
+        cursorAccent: '#ffffff',
+        selection: 'rgba(0, 0, 0, 0.2)',
+        black: '#000000',
+        red: '#cd3131',
+        green: '#00bc00',
+        yellow: '#949800',
+        blue: '#0451a5',
+        magenta: '#bc05bc',
+        cyan: '#0598bc',
+        white: '#555555',
+        brightBlack: '#666666',
+        brightRed: '#cd3131',
+        brightGreen: '#14ce14',
+        brightYellow: '#b5ba00',
+        brightBlue: '#0451a5',
+        brightMagenta: '#bc05bc',
+        brightCyan: '#0598bc',
+        brightWhite: '#a5a5a5',
+      };
+    } else {
+      return {
+        background: '#000000',
+        foreground: '#ffffff',
+        cursor: '#ffffff',
+        cursorAccent: '#000000',
+        selection: 'rgba(255, 255, 255, 0.2)',
+      };
+    }
+  }
+
+  /**
+   * Create a new tab instance
+   */
+  createTab(options: ICreateTerminalTabOptions, isBright: boolean): ITerminalTab {
+    const id = this.generateTabId();
+    const type = options.type;
+
+    // Create xterm.js Terminal instance
+    const terminal = new Terminal({
+      convertEol: true,
+      cursorBlink: true,
+      theme: this.getTerminalTheme(isBright),
+      fontFamily: 'Menlo, Monaco, "Courier New", monospace',
+      fontSize: 13,
+      lineHeight: 1.2,
+    });
+
+    // Create FitAddon
+    const fitAddon = new FitAddon();
+    terminal.loadAddon(fitAddon);
+
+    const tab: ITerminalTab = {
+      id,
+      label: options.label || this.getDefaultLabel(type, options.metadata),
+      iconName: options.iconName || this.getDefaultIcon(type),
+      type,
+      closeable: options.closeable ?? (type !== 'shell'),
+      terminal,
+      fitAddon,
+      process: null,
+      inputWriter: null,
+      exited: false,
+      exitCode: null,
+      createdAt: Date.now(),
+      metadata: options.metadata,
+    };
+
+    this.tabs.set(id, tab);
+    return tab;
+  }
+
+  /**
+   * Get tab by ID
+   */
+  getTab(id: string): ITerminalTab | undefined {
+    return this.tabs.get(id);
+  }
+
+  /**
+   * Get all tabs as array (ordered by creation time)
+   */
+  getAllTabs(): ITerminalTab[] {
+    return Array.from(this.tabs.values()).sort((a, b) => a.createdAt - b.createdAt);
+  }
+
+  /**
+   * Get the number of tabs
+   */
+  getTabCount(): number {
+    return this.tabs.size;
+  }
+
+  /**
+   * Check if tab exists
+   */
+  hasTab(id: string): boolean {
+    return this.tabs.has(id);
+  }
+
+  /**
+   * Close and cleanup a tab
+   */
+  closeTab(id: string): boolean {
+    const tab = this.tabs.get(id);
+    if (!tab) return false;
+
+    // Kill process if still running
+    if (tab.process && !tab.exited) {
+      try {
+        tab.process.kill();
+      } catch (e) {
+        console.warn('Failed to kill process:', e);
+      }
+    }
+
+    // Dispose terminal
+    try {
+      tab.terminal.dispose();
+    } catch (e) {
+      console.warn('Failed to dispose terminal:', e);
+    }
+
+    this.tabs.delete(id);
+    return true;
+  }
+
+  /**
+   * Rename a tab
+   */
+  renameTab(id: string, newLabel: string): boolean {
+    const tab = this.tabs.get(id);
+    if (!tab) return false;
+
+    tab.label = newLabel;
+    return true;
+  }
+
+  /**
+   * Update tab process state to exited
+   */
+  markTabExited(id: string, exitCode: number): void {
+    const tab = this.tabs.get(id);
+    if (!tab) return;
+
+    tab.exited = true;
+    tab.exitCode = exitCode;
+  }
+
+  /**
+   * Set process for a tab
+   */
+  setTabProcess(id: string, process: ITerminalTab['process'], inputWriter: ITerminalTab['inputWriter']): void {
+    const tab = this.tabs.get(id);
+    if (!tab) return;
+
+    tab.process = process;
+    tab.inputWriter = inputWriter;
+  }
+
+  /**
+   * Update theme for all terminals
+   */
+  updateAllThemes(isBright: boolean): void {
+    const theme = this.getTerminalTheme(isBright);
+    for (const tab of this.tabs.values()) {
+      tab.terminal.options.theme = theme;
+    }
+  }
+
+  /**
+   * Dispose all tabs and cleanup
+   */
+  disposeAll(): void {
+    for (const [id] of this.tabs) {
+      this.closeTab(id);
+    }
+    this.tabs.clear();
+  }
+}

ts_web/elements/00group-workspace/dees-workspace/dees-workspace.ts

@@ -17,12 +17,18 @@ import '../dees-workspace-monaco/dees-workspace-monaco.js';
 import '../dees-workspace-filetree/dees-workspace-filetree.js';
 import { DeesWorkspaceFiletree } from '../dees-workspace-filetree/dees-workspace-filetree.js';
 import '../dees-workspace-terminal/dees-workspace-terminal.js';
+import { DeesWorkspaceTerminal } from '../dees-workspace-terminal/dees-workspace-terminal.js';
+import type { IRunProcessEventDetail } from '../dees-workspace-terminal/interfaces.js';
 import '../dees-workspace-terminal-preview/dees-workspace-terminal-preview.js';
+import '../dees-workspace-bottombar/dees-workspace-bottombar.js';
 import '../../dees-icon/dees-icon.js';
 import { DeesWorkspaceMonaco } from '../dees-workspace-monaco/dees-workspace-monaco.js';
 import { TypeScriptIntelliSenseManager } from './typescript-intellisense.js';
 import { DeesContextmenu } from '../../dees-contextmenu/dees-contextmenu.js';
 import '@design.estate/dees-wcctools/demotools';
+import '../../dees-actionbar/dees-actionbar.js';
+import type { DeesActionbar } from '../../dees-actionbar/dees-actionbar.js';
+import '../dees-workspace-diff-editor/dees-workspace-diff-editor.js';
 
 declare global {
   interface HTMLElementTagNameMap {
@@ -62,6 +68,7 @@ export class DeesWorkspace extends DeesElement {
                   '@push.rocks/smartpromise': '^4.2.3',
                 },
                 devDependencies: {
+                  '@types/node': '^22.0.0',
                   typescript: '^5.0.0',
                 },
               },
@@ -250,6 +257,11 @@ testSmartPromise();
   private nodeModulesDebounceTimeout: ReturnType<typeof setTimeout> | null = null;
   private intelliSenseDebounceTimeout: ReturnType<typeof setTimeout> | null = null;
 
+  // Open file watchers for external change detection
+  private openFileWatchers: Map<string, IFileWatcher> = new Map();
+  private fileChangeDebounce: Map<string, ReturnType<typeof setTimeout>> = new Map();
+  private actionbarElement: DeesActionbar | null = null;
+
   // Auto-save functionality
   @state()
   accessor autoSave: boolean = false;
@@ -275,6 +287,18 @@ testSmartPromise();
   @state()
   accessor isDraggingTerminal: boolean = false;
 
+  // Diff view state
+  @state()
+  accessor showDiffView: boolean = false;
+
+  @state()
+  accessor diffViewConfig: {
+    filePath: string;
+    originalContent: string;
+    modifiedContent: string;
+    language: string;
+  } | null = null;
+
   // Keyboard shortcut handler (bound for proper cleanup)
   private keydownHandler = (e: KeyboardEvent) => {
     // Cmd+S (Mac) or Ctrl+S (Windows/Linux) - Save
@@ -370,10 +394,18 @@ testSmartPromise();
         font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
       }
 
+      .workspace-outer {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+        width: 100%;
+      }
+
       .workspace-container {
         display: flex;
         flex-direction: row;
-        height: 100%;
+        flex: 1;
+        min-height: 0;
         width: 100%;
       }
 
@@ -857,121 +889,139 @@ testSmartPromise();
     }
 
     return html`
-      <div class="${containerClasses}">
-        <!-- Filetree panel (full height) -->
-        ${this.showFileTree ? html`
-          <div
-            class="filetree-panel ${this.isFileTreeCollapsed ? 'collapsed' : ''}"
-            style="width: ${this.isFileTreeCollapsed ? 0 : this.currentFileTreeWidth}px"
-          >
-            <dees-workspace-filetree
-              .executionEnvironment=${this.executionEnvironment}
-              .selectedPath=${this.activeFilePath}
-              @file-select=${this.handleFileSelect}
-            ></dees-workspace-filetree>
-          </div>
-          ${!this.isFileTreeCollapsed ? html`
+      <div class="workspace-outer">
+        <div class="${containerClasses}">
+          <!-- Filetree panel (full height) -->
+          ${this.showFileTree ? html`
             <div
-              class="resize-handle-vertical ${this.isDraggingFileTree ? 'dragging' : ''}"
-              @mousedown=${this.handleFileTreeMouseDown}
-            ></div>
-          ` : ''}
-        ` : ''}
-
-        <!-- Editor + Terminal area -->
-        <div class="editor-area">
-          <div class="editor-panel">
-            <div class="tabs-bar">
-              <div class="tabs-container">
-                ${this.openFiles.map(file => html`
-                  <div
-                    class="tab ${file.path === this.activeFilePath ? 'active' : ''}"
-                    @click=${() => this.activateFile(file.path)}
-                  >
-                    ${file.modified ? html`<span class="tab-modified"></span>` : ''}
-                    <span class="tab-name">${file.name}</span>
-                    <span class="tab-close" @click=${(e: Event) => this.closeFile(e, file.path)}>
-                      <dees-icon .icon=${'lucide:x'} iconSize="12"></dees-icon>
-                    </span>
-                  </div>
-                `)}
-              </div>
-              <div class="editor-menu-button" @click=${this.showEditorMenu} title="Editor options">
-                <dees-icon .icon=${'lucide:moreVertical'} iconSize="16"></dees-icon>
-              </div>
-            </div>
-            <div class="editor-content">
-              ${this.openFiles.length === 0 ? html`
-                <div class="empty-state">
-                  <dees-icon .icon=${'lucide:fileCode'} iconSize="48"></dees-icon>
-                  <span>Select a file to edit</span>
-                </div>
-              ` : html`
-                <dees-workspace-monaco
-                  .filePath=${this.activeFilePath}
-                  .content=${this.getActiveFileContent()}
-                  .language=${this.getLanguageFromPath(this.activeFilePath)}
-                  @content-change=${this.handleContentChange}
-                ></dees-workspace-monaco>
-              `}
-            </div>
-          </div>
-
-          <!-- Horizontal resize handle for terminal -->
-          ${this.showTerminal && !this.isTerminalCollapsed ? html`
-            <div
-              class="resize-handle-horizontal ${this.isDraggingTerminal ? 'dragging' : ''}"
-              @mousedown=${this.handleTerminalMouseDown}
-            ></div>
-          ` : ''}
-
-          <!-- Terminal panel -->
-          ${this.showTerminal ? html`
-            <div
-              class="terminal-panel ${this.isTerminalCollapsed ? 'collapsed' : ''}"
-              style="height: ${this.isTerminalCollapsed ? 32 : this.currentTerminalHeight}px"
+              class="filetree-panel ${this.isFileTreeCollapsed ? 'collapsed' : ''}"
+              style="width: ${this.isFileTreeCollapsed ? 0 : this.currentFileTreeWidth}px"
             >
-              <div class="panel-header">
-                <div class="panel-tabs">
-                  <div
-                    class="panel-tab ${this.activeBottomPanel === 'terminal' ? 'active' : ''}"
-                    @click=${() => this.activeBottomPanel = 'terminal'}
-                  >
-                    <dees-icon .icon=${'lucide:terminal'} iconSize="14"></dees-icon>
-                    Terminal
-                  </div>
-                  <div
-                    class="panel-tab ${this.activeBottomPanel === 'problems' ? 'active' : ''}"
-                    @click=${() => this.activeBottomPanel = 'problems'}
-                  >
-                    <dees-icon .icon=${'lucide:circleAlert'} iconSize="14"></dees-icon>
-                    Problems
-                    ${this.diagnosticMarkers.length > 0 ? html`
-                      <span class="panel-tab-badge ${this.getErrorCount() === 0 ? 'warning' : ''}">${this.diagnosticMarkers.length}</span>
-                    ` : ''}
-                  </div>
-                </div>
-                <div class="panel-header-actions">
-                  <div class="panel-action" @click=${this.toggleTerminal}>
-                    <dees-icon
-                      .icon=${this.isTerminalCollapsed ? 'lucide:chevronUp' : 'lucide:chevronDown'}
-                      iconSize="14"
-                    ></dees-icon>
-                  </div>
-                </div>
-              </div>
-              <div class="terminal-content" style="display: ${this.activeBottomPanel === 'terminal' ? 'block' : 'none'}">
-                <dees-workspace-terminal
-                  .executionEnvironment=${this.executionEnvironment}
-                  .setupCommand=${''}
-                ></dees-workspace-terminal>
-              </div>
-              <div class="problems-content" style="display: ${this.activeBottomPanel === 'problems' ? 'block' : 'none'}">
-                ${this.renderProblemsPanel()}
-              </div>
+              <dees-workspace-filetree
+                .executionEnvironment=${this.executionEnvironment}
+                .selectedPath=${this.activeFilePath}
+                @file-select=${this.handleFileSelect}
+              ></dees-workspace-filetree>
             </div>
+            ${!this.isFileTreeCollapsed ? html`
+              <div
+                class="resize-handle-vertical ${this.isDraggingFileTree ? 'dragging' : ''}"
+                @mousedown=${this.handleFileTreeMouseDown}
+              ></div>
+            ` : ''}
           ` : ''}
+
+          <!-- Editor + Terminal area -->
+          <div class="editor-area">
+            <div class="editor-panel">
+              <div class="tabs-bar">
+                <div class="tabs-container">
+                  ${this.openFiles.map(file => html`
+                    <div
+                      class="tab ${file.path === this.activeFilePath ? 'active' : ''}"
+                      @click=${() => this.activateFile(file.path)}
+                    >
+                      ${file.modified ? html`<span class="tab-modified"></span>` : ''}
+                      <span class="tab-name">${file.name}</span>
+                      <span class="tab-close" @click=${(e: Event) => this.closeFile(e, file.path)}>
+                        <dees-icon .icon=${'lucide:x'} iconSize="12"></dees-icon>
+                      </span>
+                    </div>
+                  `)}
+                </div>
+                <div class="editor-menu-button" @click=${this.showEditorMenu} title="Editor options">
+                  <dees-icon .icon=${'lucide:moreVertical'} iconSize="16"></dees-icon>
+                </div>
+              </div>
+              <div class="editor-content">
+                ${this.showDiffView && this.diffViewConfig ? html`
+                  <dees-workspace-diff-editor
+                    .filePath=${this.diffViewConfig.filePath}
+                    .originalContent=${this.diffViewConfig.originalContent}
+                    .modifiedContent=${this.diffViewConfig.modifiedContent}
+                    .language=${this.diffViewConfig.language}
+                    @diff-resolved=${this.handleDiffResolved}
+                    @diff-closed=${() => { this.showDiffView = false; this.diffViewConfig = null; }}
+                  ></dees-workspace-diff-editor>
+                ` : this.openFiles.length === 0 ? html`
+                  <div class="empty-state">
+                    <dees-icon .icon=${'lucide:fileCode'} iconSize="48"></dees-icon>
+                    <span>Select a file to edit</span>
+                  </div>
+                ` : html`
+                  <dees-workspace-monaco
+                    .filePath=${this.activeFilePath}
+                    .content=${this.getActiveFileContent()}
+                    .language=${this.getLanguageFromPath(this.activeFilePath)}
+                    @content-change=${this.handleContentChange}
+                  ></dees-workspace-monaco>
+                `}
+              </div>
+              <dees-actionbar></dees-actionbar>
+            </div>
+
+            <!-- Horizontal resize handle for terminal -->
+            ${this.showTerminal && !this.isTerminalCollapsed ? html`
+              <div
+                class="resize-handle-horizontal ${this.isDraggingTerminal ? 'dragging' : ''}"
+                @mousedown=${this.handleTerminalMouseDown}
+              ></div>
+            ` : ''}
+
+            <!-- Terminal panel -->
+            ${this.showTerminal ? html`
+              <div
+                class="terminal-panel ${this.isTerminalCollapsed ? 'collapsed' : ''}"
+                style="height: ${this.isTerminalCollapsed ? 32 : this.currentTerminalHeight}px"
+              >
+                <div class="panel-header">
+                  <div class="panel-tabs">
+                    <div
+                      class="panel-tab ${this.activeBottomPanel === 'terminal' ? 'active' : ''}"
+                      @click=${() => this.activeBottomPanel = 'terminal'}
+                    >
+                      <dees-icon .icon=${'lucide:terminal'} iconSize="14"></dees-icon>
+                      Terminal
+                    </div>
+                    <div
+                      class="panel-tab ${this.activeBottomPanel === 'problems' ? 'active' : ''}"
+                      @click=${() => this.activeBottomPanel = 'problems'}
+                    >
+                      <dees-icon .icon=${'lucide:circleAlert'} iconSize="14"></dees-icon>
+                      Problems
+                      ${this.diagnosticMarkers.length > 0 ? html`
+                        <span class="panel-tab-badge ${this.getErrorCount() === 0 ? 'warning' : ''}">${this.diagnosticMarkers.length}</span>
+                      ` : ''}
+                    </div>
+                  </div>
+                  <div class="panel-header-actions">
+                    <div class="panel-action" @click=${this.toggleTerminal}>
+                      <dees-icon
+                        .icon=${this.isTerminalCollapsed ? 'lucide:chevronUp' : 'lucide:chevronDown'}
+                        iconSize="14"
+                      ></dees-icon>
+                    </div>
+                  </div>
+                </div>
+                <div class="terminal-content" style="display: ${this.activeBottomPanel === 'terminal' ? 'block' : 'none'}">
+                  <dees-workspace-terminal
+                    .executionEnvironment=${this.executionEnvironment}
+                    .setupCommand=${''}
+                  ></dees-workspace-terminal>
+                </div>
+                <div class="problems-content" style="display: ${this.activeBottomPanel === 'problems' ? 'block' : 'none'}">
+                  ${this.renderProblemsPanel()}
+                </div>
+              </div>
+            ` : ''}
+          </div>
         </div>
+
+        <!-- Bottom Bar (full width) -->
+        <dees-workspace-bottombar
+          .executionEnvironment=${this.executionEnvironment}
+          @run-process=${this.handleRunProcess}
+        ></dees-workspace-bottombar>
       </div>
     `;
   }
@@ -996,6 +1046,7 @@ testSmartPromise();
       this.autoSaveInterval = null;
     }
     this.stopNodeModulesWatcher();
+    this.stopAllFileWatchers();
   }
 
   public async firstUpdated() {
@@ -1012,6 +1063,11 @@ testSmartPromise();
     if (changedProperties.has('executionEnvironment') && this.executionEnvironment) {
       await this.initializeWorkspace();
     }
+
+    // Capture actionbar reference when it becomes available (after initialization completes)
+    if (!this.actionbarElement) {
+      this.actionbarElement = this.shadowRoot?.querySelector('.editor-panel dees-actionbar') as DeesActionbar;
+    }
   }
 
   private async initializeWorkspace() {
@@ -1166,6 +1222,191 @@ testSmartPromise();
     }
   }
 
+  // ========== Open File Watching for External Changes ==========
+
+  /**
+   * Start watching an open file for external changes
+   */
+  private startWatchingFile(path: string): void {
+    if (!this.executionEnvironment || this.openFileWatchers.has(path)) return;
+
+    try {
+      const watcher = this.executionEnvironment.watch(
+        path,
+        (_event, _filename) => {
+          // Debounce to avoid multiple rapid triggers
+          const existingTimeout = this.fileChangeDebounce.get(path);
+          if (existingTimeout) {
+            clearTimeout(existingTimeout);
+          }
+          const timeout = setTimeout(() => {
+            this.handleExternalFileChange(path);
+            this.fileChangeDebounce.delete(path);
+          }, 300);
+          this.fileChangeDebounce.set(path, timeout);
+        }
+      );
+      this.openFileWatchers.set(path, watcher);
+    } catch (error) {
+      console.warn(`Could not watch file ${path}:`, error);
+    }
+  }
+
+  /**
+   * Stop watching a file when it's closed
+   */
+  private stopWatchingFile(path: string): void {
+    const watcher = this.openFileWatchers.get(path);
+    if (watcher) {
+      watcher.stop();
+      this.openFileWatchers.delete(path);
+    }
+    const timeout = this.fileChangeDebounce.get(path);
+    if (timeout) {
+      clearTimeout(timeout);
+      this.fileChangeDebounce.delete(path);
+    }
+  }
+
+  /**
+   * Stop all file watchers
+   */
+  private stopAllFileWatchers(): void {
+    for (const watcher of this.openFileWatchers.values()) {
+      watcher.stop();
+    }
+    this.openFileWatchers.clear();
+
+    for (const timeout of this.fileChangeDebounce.values()) {
+      clearTimeout(timeout);
+    }
+    this.fileChangeDebounce.clear();
+  }
+
+  /**
+   * Handle external file change - show actionbar if file has local changes,
+   * otherwise silently update with cursor preservation
+   */
+  private async handleExternalFileChange(path: string): Promise<void> {
+    const file = this.openFiles.find(f => f.path === path);
+    if (!file || !this.executionEnvironment) return;
+
+    try {
+      // Read the new content from disk
+      const newContent = await this.executionEnvironment.readFile(path);
+
+      // If content is same as what we have, no action needed
+      if (newContent === file.content) return;
+
+      if (file.modified) {
+        // File has unsaved local changes AND disk changed - conflict!
+        const result = await this.actionbarElement?.show({
+          message: `"${file.name}" changed on disk. What do you want to do?`,
+          type: 'question',
+          icon: 'lucide:gitMerge',
+          actions: [
+            { id: 'load-disk', label: 'Load from Disk', primary: true },
+            { id: 'save-local', label: 'Save Local to Disk' },
+            { id: 'compare', label: 'Compare' },
+          ],
+          timeout: { duration: 15000, defaultActionId: 'load-disk' },
+          dismissible: true,
+        });
+
+        if (result?.actionId === 'load-disk') {
+          // Discard local changes, load disk version
+          await this.updateFileContent(path, newContent, false);
+        } else if (result?.actionId === 'save-local') {
+          // Keep local changes and save to disk (overwrite external)
+          await this.executionEnvironment.writeFile(path, file.content);
+          // Mark as saved
+          this.openFiles = this.openFiles.map(f =>
+            f.path === path ? { ...f, modified: false } : f
+          );
+        } else if (result?.actionId === 'compare') {
+          // Open diff view
+          this.openDiffView(path, file.content, newContent);
+        }
+        // If dismissed, do nothing - user can manually resolve later
+      } else {
+        // No local changes - silently update with cursor preservation
+        await this.updateFileContent(path, newContent, true);
+      }
+    } catch (error) {
+      console.warn(`Failed to handle external change for ${path}:`, error);
+    }
+  }
+
+  /**
+   * Update file content in state and optionally in the editor
+   */
+  private async updateFileContent(
+    path: string,
+    newContent: string,
+    preserveCursor: boolean
+  ): Promise<void> {
+    // Update internal state
+    this.openFiles = this.openFiles.map(f =>
+      f.path === path ? { ...f, content: newContent, modified: false } : f
+    );
+
+    // If this is the active file, update Monaco editor
+    if (path === this.activeFilePath) {
+      const editor = this.shadowRoot?.querySelector('dees-workspace-monaco') as DeesWorkspaceMonaco;
+      if (editor) {
+        await editor.setContentExternal(newContent, preserveCursor);
+      }
+    }
+  }
+
+  /**
+   * Open the diff view to compare local and disk versions
+   */
+  private openDiffView(path: string, localContent: string, diskContent: string): void {
+    this.diffViewConfig = {
+      filePath: path,
+      originalContent: diskContent,
+      modifiedContent: localContent,
+      language: this.getLanguageFromPath(path),
+    };
+    this.showDiffView = true;
+  }
+
+  /**
+   * Handle diff view resolution
+   */
+  private async handleDiffResolved(e: CustomEvent): Promise<void> {
+    const { action, content } = e.detail;
+    const path = this.diffViewConfig?.filePath;
+
+    if (!path || !this.executionEnvironment) {
+      this.showDiffView = false;
+      this.diffViewConfig = null;
+      return;
+    }
+
+    if (action === 'use-local') {
+      // Save local content to disk
+      await this.executionEnvironment.writeFile(path, content);
+      this.openFiles = this.openFiles.map(f =>
+        f.path === path ? { ...f, content, modified: false } : f
+      );
+      // Update editor if active
+      if (path === this.activeFilePath) {
+        const editor = this.shadowRoot?.querySelector('dees-workspace-monaco') as DeesWorkspaceMonaco;
+        if (editor) {
+          await editor.setContentExternal(content, false);
+        }
+      }
+    } else if (action === 'use-disk') {
+      // Update editor with disk content
+      await this.updateFileContent(path, content, false);
+    }
+
+    this.showDiffView = false;
+    this.diffViewConfig = null;
+  }
+
   private async handleFileSelect(e: CustomEvent<{ path: string; name: string }>) {
     const { path, name } = e.detail;
     await this.openFile(path, name);
@@ -1190,6 +1431,9 @@ testSmartPromise();
       ];
       this.activeFilePath = path;
 
+      // Start watching for external changes
+      this.startWatchingFile(path);
+
       // Initialize IntelliSense lazily after first file opens (Monaco loads on demand)
       if (!this.intelliSenseInitialized) {
         // Wait for Monaco editor to mount and load Monaco from CDN
@@ -1226,6 +1470,9 @@ testSmartPromise();
       if (!confirmed) return;
     }
 
+    // Stop watching this file
+    this.stopWatchingFile(path);
+
     this.openFiles = this.openFiles.filter(f => f.path !== path);
 
     // If closing the active file, activate another one
@@ -1484,6 +1731,44 @@ testSmartPromise();
     }));
   }
 
+  // ========== Bottom Bar Event Handlers ==========
+
+  /**
+   * Handle run-process events from bottom bar widgets
+   * Creates a new terminal tab for the process
+   */
+  private async handleRunProcess(e: CustomEvent<IRunProcessEventDetail>): Promise<void> {
+    const detail = e.detail;
+
+    // Find the terminal component
+    const terminal = this.shadowRoot?.querySelector('dees-workspace-terminal') as DeesWorkspaceTerminal;
+    if (!terminal) {
+      console.warn('Terminal component not found');
+      return;
+    }
+
+    // Expand terminal if collapsed
+    if (this.isTerminalCollapsed) {
+      this.isTerminalCollapsed = false;
+    }
+
+    // Switch to terminal panel
+    this.activeBottomPanel = 'terminal';
+
+    // Wait for UI update
+    await this.updateComplete;
+
+    // Create a new terminal tab for the process
+    await terminal.createProcessTab({
+      type: detail.type,
+      label: detail.label,
+      command: detail.command,
+      args: detail.args,
+      metadata: detail.metadata,
+      switchToTab: true,
+    });
+  }
+
   // ========== Public Layout Methods ==========
 
   /**

ts_web/elements/00group-workspace/index.ts

@@ -6,3 +6,5 @@ export * from './dees-workspace-terminal/index.js';
 export * from './dees-workspace-terminal-preview/index.js';
 export * from './dees-workspace-markdown/index.js';
 export * from './dees-workspace-markdownoutlet/index.js';
+export * from './dees-workspace-bottombar/index.js';
+export * from './dees-workspace-diff-editor/index.js';

ts_web/elements/dees-actionbar/actionbar.interfaces.ts

@@ -0,0 +1,54 @@
+/**
+ * Action button configuration for the action bar
+ */
+export interface IActionBarAction {
+  /** Unique identifier for the action */
+  id: string;
+  /** Button label text */
+  label: string;
+  /** Primary action gets highlighted styling and receives timeout trigger */
+  primary?: boolean;
+  /** Lucide icon name (optional) */
+  icon?: string;
+}
+
+/**
+ * Configuration options for showing an action bar
+ */
+export interface IActionBarOptions {
+  /** Message text to display */
+  message: string;
+  /** Lucide icon name for the message (optional) */
+  icon?: string;
+  /** Visual type affects coloring */
+  type?: 'info' | 'warning' | 'error' | 'question';
+  /** Action buttons to display */
+  actions: IActionBarAction[];
+  /** Timeout configuration (optional) */
+  timeout?: {
+    /** Duration in milliseconds before auto-triggering default action */
+    duration: number;
+    /** ID of the action to auto-trigger when timeout expires */
+    defaultActionId: string;
+  };
+  /** Whether to show a dismiss (X) button */
+  dismissible?: boolean;
+}
+
+/**
+ * Result returned when an action bar is resolved
+ */
+export interface IActionBarResult {
+  /** ID of the action that was triggered */
+  actionId: string;
+  /** Whether the action was triggered by timeout (true) or user click (false) */
+  timedOut: boolean;
+}
+
+/**
+ * Internal queue item for pending action bars
+ */
+export interface IActionBarQueueItem {
+  options: IActionBarOptions;
+  resolve: (result: IActionBarResult) => void;
+}

ts_web/elements/dees-actionbar/dees-actionbar.ts

@@ -0,0 +1,500 @@
+import {
+  customElement,
+  DeesElement,
+  type TemplateResult,
+  html,
+  css,
+  state,
+  cssManager,
+} from '@design.estate/dees-element';
+import { themeDefaultStyles } from '../00theme.js';
+import '../dees-icon/dees-icon.js';
+import type {
+  IActionBarOptions,
+  IActionBarResult,
+  IActionBarQueueItem,
+  IActionBarAction,
+} from './actionbar.interfaces.js';
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'dees-actionbar': DeesActionbar;
+  }
+}
+
+@customElement('dees-actionbar')
+export class DeesActionbar extends DeesElement {
+  // STATIC
+  public static demo = () => {
+    const getActionbar = (e: Event) => {
+      const button = e.currentTarget as HTMLElement;
+      const container = button.closest('.demo-container');
+      return container?.querySelector('dees-actionbar') as DeesActionbar | null;
+    };
+
+    const showActionBar = async (e: Event) => {
+      const actionbar = getActionbar(e);
+      if (!actionbar) return;
+      const result = await actionbar.show({
+        message: 'File changed externally. Reload?',
+        type: 'warning',
+        icon: 'lucide:alertTriangle',
+        actions: [
+          { id: 'reload', label: 'Reload', primary: true },
+          { id: 'ignore', label: 'Ignore' },
+        ],
+        timeout: { duration: 5000, defaultActionId: 'reload' },
+        dismissible: true,
+      });
+      console.log('Action bar result:', result);
+    };
+
+    const showErrorBar = async (e: Event) => {
+      const actionbar = getActionbar(e);
+      if (!actionbar) return;
+      const result = await actionbar.show({
+        message: 'Process failed with exit code 1',
+        type: 'error',
+        icon: 'lucide:xCircle',
+        actions: [
+          { id: 'retry', label: 'Retry', primary: true },
+          { id: 'dismiss', label: 'Dismiss' },
+        ],
+        timeout: { duration: 10000, defaultActionId: 'dismiss' },
+      });
+      console.log('Error bar result:', result);
+    };
+
+    const showQuestionBar = async (e: Event) => {
+      const actionbar = getActionbar(e);
+      if (!actionbar) return;
+      const result = await actionbar.show({
+        message: 'Save changes before closing?',
+        type: 'question',
+        icon: 'lucide:helpCircle',
+        actions: [
+          { id: 'save', label: 'Save', primary: true },
+          { id: 'discard', label: 'Discard' },
+          { id: 'cancel', label: 'Cancel' },
+        ],
+      });
+      console.log('Question bar result:', result);
+    };
+
+    return html`
+      <style>
+        .demo-container {
+          display: flex;
+          flex-direction: column;
+          height: 300px;
+          border: 1px solid #333;
+          border-radius: 8px;
+          overflow: hidden;
+        }
+        .demo-content {
+          flex: 1;
+          padding: 16px;
+          display: flex;
+          gap: 8px;
+          align-items: flex-start;
+        }
+      </style>
+      <div class="demo-container">
+        <div class="demo-content">
+          <dees-button @click=${showActionBar}>Warning</dees-button>
+          <dees-button @click=${showErrorBar}>Error</dees-button>
+          <dees-button @click=${showQuestionBar}>Question</dees-button>
+        </div>
+        <dees-actionbar></dees-actionbar>
+      </div>
+    `;
+  };
+
+  // Queue of pending action bars
+  private queue: IActionBarQueueItem[] = [];
+
+  // Current active bar state
+  @state() accessor currentBar: IActionBarOptions | null = null;
+  @state() accessor timeRemaining: number = 0;
+  @state() accessor progressPercent: number = 100;
+  @state() accessor isVisible: boolean = false;
+
+  // Timeout handling
+  private timeoutInterval: ReturnType<typeof setInterval> | null = null;
+  private currentResolve: ((result: IActionBarResult) => void) | null = null;
+
+  public static styles = [
+    themeDefaultStyles,
+    cssManager.defaultStyles,
+    css`
+      :host {
+        display: grid;
+        grid-template-rows: 0fr;
+        transition: grid-template-rows 0.2s ease-out;
+      }
+
+      :host(.visible) {
+        grid-template-rows: 1fr;
+      }
+
+      .actionbar-item {
+        display: flex;
+        flex-direction: column;
+        min-height: 0;
+        background: ${cssManager.bdTheme('hsl(0 0% 96%)', 'hsl(0 0% 12%)')};
+        border-top: 1px solid ${cssManager.bdTheme('hsl(0 0% 88%)', 'hsl(0 0% 20%)')};
+        overflow: hidden;
+      }
+
+      .progress-bar {
+        height: 3px;
+        background: ${cssManager.bdTheme('hsl(0 0% 90%)', 'hsl(0 0% 18%)')};
+        overflow: hidden;
+      }
+
+      .progress-bar-fill {
+        height: 100%;
+        background: ${cssManager.bdTheme('hsl(210 100% 50%)', 'hsl(210 100% 60%)')};
+        transition: width 0.1s linear;
+      }
+
+      .progress-bar-fill.warning {
+        background: ${cssManager.bdTheme('hsl(38 92% 50%)', 'hsl(38 92% 55%)')};
+      }
+
+      .progress-bar-fill.error {
+        background: ${cssManager.bdTheme('hsl(0 70% 50%)', 'hsl(0 70% 55%)')};
+      }
+
+      .progress-bar-fill.question {
+        background: ${cssManager.bdTheme('hsl(270 70% 50%)', 'hsl(270 70% 60%)')};
+      }
+
+      .content {
+        display: flex;
+        align-items: center;
+        padding: 8px 12px;
+        gap: 12px;
+        min-height: 32px;
+      }
+
+      .message-section {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        flex: 1;
+        min-width: 0;
+      }
+
+      .message-icon {
+        flex-shrink: 0;
+        color: ${cssManager.bdTheme('hsl(0 0% 40%)', 'hsl(0 0% 60%)')};
+      }
+
+      .message-icon.info {
+        color: ${cssManager.bdTheme('hsl(210 100% 45%)', 'hsl(210 100% 60%)')};
+      }
+
+      .message-icon.warning {
+        color: ${cssManager.bdTheme('hsl(38 92% 45%)', 'hsl(38 92% 55%)')};
+      }
+
+      .message-icon.error {
+        color: ${cssManager.bdTheme('hsl(0 70% 50%)', 'hsl(0 70% 55%)')};
+      }
+
+      .message-icon.question {
+        color: ${cssManager.bdTheme('hsl(270 70% 50%)', 'hsl(270 70% 60%)')};
+      }
+
+      .message-text {
+        font-size: 13px;
+        color: ${cssManager.bdTheme('hsl(0 0% 20%)', 'hsl(0 0% 85%)')};
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+      .actions-section {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        flex-shrink: 0;
+      }
+
+      .action-button {
+        display: flex;
+        align-items: center;
+        gap: 4px;
+        padding: 4px 10px;
+        border-radius: 4px;
+        font-size: 12px;
+        font-weight: 500;
+        cursor: pointer;
+        border: 1px solid transparent;
+        transition: all 0.15s ease;
+        white-space: nowrap;
+      }
+
+      .action-button.secondary {
+        background: transparent;
+        color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 70%)')};
+        border-color: ${cssManager.bdTheme('hsl(0 0% 80%)', 'hsl(0 0% 30%)')};
+      }
+
+      .action-button.secondary:hover {
+        background: ${cssManager.bdTheme('hsl(0 0% 92%)', 'hsl(0 0% 18%)')};
+      }
+
+      .action-button.primary {
+        background: ${cssManager.bdTheme('hsl(210 100% 50%)', 'hsl(210 100% 55%)')};
+        color: white;
+      }
+
+      .action-button.primary:hover {
+        background: ${cssManager.bdTheme('hsl(210 100% 45%)', 'hsl(210 100% 50%)')};
+      }
+
+      .action-button.primary.warning {
+        background: ${cssManager.bdTheme('hsl(38 92% 45%)', 'hsl(38 92% 50%)')};
+      }
+
+      .action-button.primary.warning:hover {
+        background: ${cssManager.bdTheme('hsl(38 92% 40%)', 'hsl(38 92% 45%)')};
+      }
+
+      .action-button.primary.error {
+        background: ${cssManager.bdTheme('hsl(0 70% 50%)', 'hsl(0 70% 55%)')};
+      }
+
+      .action-button.primary.error:hover {
+        background: ${cssManager.bdTheme('hsl(0 70% 45%)', 'hsl(0 70% 50%)')};
+      }
+
+      .action-button.primary.question {
+        background: ${cssManager.bdTheme('hsl(270 70% 50%)', 'hsl(270 70% 55%)')};
+      }
+
+      .action-button.primary.question:hover {
+        background: ${cssManager.bdTheme('hsl(270 70% 45%)', 'hsl(270 70% 50%)')};
+      }
+
+      .countdown {
+        font-size: 11px;
+        opacity: 0.8;
+        margin-left: 2px;
+      }
+
+      .dismiss-button {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 20px;
+        height: 20px;
+        border-radius: 4px;
+        cursor: pointer;
+        color: ${cssManager.bdTheme('hsl(0 0% 50%)', 'hsl(0 0% 50%)')};
+        transition: all 0.15s ease;
+      }
+
+      .dismiss-button:hover {
+        background: ${cssManager.bdTheme('hsl(0 0% 88%)', 'hsl(0 0% 22%)')};
+        color: ${cssManager.bdTheme('hsl(0 0% 30%)', 'hsl(0 0% 70%)')};
+      }
+    `,
+  ];
+
+  public render(): TemplateResult {
+    if (!this.currentBar) {
+      return html``;
+    }
+
+    const bar = this.currentBar;
+    const type = bar.type || 'info';
+    const hasTimeout = bar.timeout && this.timeRemaining > 0;
+
+    return html`
+      <div class="actionbar-item">
+        ${hasTimeout ? html`
+          <div class="progress-bar">
+            <div
+              class="progress-bar-fill ${type}"
+              style="width: ${this.progressPercent}%"
+            ></div>
+          </div>
+        ` : ''}
+        <div class="content">
+          <div class="message-section">
+            ${bar.icon ? html`
+              <dees-icon
+                class="message-icon ${type}"
+                .icon=${bar.icon}
+                iconSize="16"
+              ></dees-icon>
+            ` : ''}
+            <span class="message-text">${bar.message}</span>
+          </div>
+          <div class="actions-section">
+            ${bar.actions.map(action => this.renderActionButton(action, bar, hasTimeout))}
+            ${bar.dismissible ? html`
+              <div
+                class="dismiss-button"
+                @click=${() => this.handleDismiss()}
+                title="Dismiss"
+              >
+                <dees-icon .icon=${'lucide:x'} iconSize="14"></dees-icon>
+              </div>
+            ` : ''}
+          </div>
+        </div>
+      </div>
+    `;
+  }
+
+  private renderActionButton(
+    action: IActionBarAction,
+    bar: IActionBarOptions,
+    hasTimeout: boolean | undefined
+  ): TemplateResult {
+    const isPrimary = action.primary;
+    const type = bar.type || 'info';
+    const isDefaultAction = bar.timeout?.defaultActionId === action.id;
+    const showCountdown = hasTimeout && isDefaultAction;
+    const seconds = Math.ceil(this.timeRemaining / 1000);
+
+    return html`
+      <button
+        class="action-button ${isPrimary ? `primary ${type}` : 'secondary'}"
+        @click=${() => this.handleAction(action.id, false)}
+      >
+        ${action.icon ? html`
+          <dees-icon .icon=${action.icon} iconSize="12"></dees-icon>
+        ` : ''}
+        <span>${action.label}</span>
+        ${showCountdown ? html`
+          <span class="countdown">(${seconds}s)</span>
+        ` : ''}
+      </button>
+    `;
+  }
+
+  // ========== Public API ==========
+
+  /**
+   * Show an action bar with the given options.
+   * Returns a promise that resolves when an action is taken.
+   */
+  public async show(options: IActionBarOptions): Promise<IActionBarResult> {
+    return new Promise((resolve) => {
+      // Add to queue
+      this.queue.push({ options, resolve });
+
+      // If no current bar, process queue
+      if (!this.currentBar) {
+        this.processQueue();
+      }
+    });
+  }
+
+  /**
+   * Dismiss the current action bar without triggering any action.
+   */
+  public dismiss(): void {
+    this.handleDismiss();
+  }
+
+  /**
+   * Clear all pending action bars in the queue.
+   */
+  public clearQueue(): void {
+    // Resolve all queued items with dismiss
+    for (const item of this.queue) {
+      item.resolve({ actionId: 'dismissed', timedOut: false });
+    }
+    this.queue = [];
+  }
+
+  // ========== Private Methods ==========
+
+  /**
+   * Hide the current actionbar with animation.
+   * Removes visible class first to trigger CSS transition, then clears content after animation.
+   */
+  private async hideCurrentBar(): Promise<void> {
+    // Remove visible class to start close animation
+    this.classList.remove('visible');
+    this.isVisible = false;
+
+    // Wait for animation to complete (200ms transition + buffer)
+    await new Promise(resolve => setTimeout(resolve, 220));
+
+    // Now safe to clear content
+    this.currentBar = null;
+    this.currentResolve = null;
+  }
+
+  private processQueue(): void {
+    if (this.queue.length === 0) {
+      // Hide with animation - don't await, let it run async
+      this.hideCurrentBar();
+      return;
+    }
+
+    const item = this.queue.shift()!;
+    this.currentBar = item.options;
+    this.currentResolve = item.resolve;
+    this.isVisible = true;
+    this.classList.add('visible');
+
+    // Setup timeout if configured
+    if (item.options.timeout) {
+      this.startTimeout(item.options.timeout.duration, item.options.timeout.defaultActionId);
+    }
+  }
+
+  private startTimeout(duration: number, defaultActionId: string): void {
+    this.timeRemaining = duration;
+    this.progressPercent = 100;
+
+    const startTime = Date.now();
+    const updateInterval = 50; // Update every 50ms for smooth animation
+
+    this.timeoutInterval = setInterval(() => {
+      const elapsed = Date.now() - startTime;
+      this.timeRemaining = Math.max(0, duration - elapsed);
+      this.progressPercent = (this.timeRemaining / duration) * 100;
+
+      if (this.timeRemaining <= 0) {
+        this.clearTimeoutInterval();
+        this.handleAction(defaultActionId, true);
+      }
+    }, updateInterval);
+  }
+
+  private clearTimeoutInterval(): void {
+    if (this.timeoutInterval) {
+      clearInterval(this.timeoutInterval);
+      this.timeoutInterval = null;
+    }
+  }
+
+  private handleAction(actionId: string, timedOut: boolean): void {
+    this.clearTimeoutInterval();
+
+    if (this.currentResolve) {
+      this.currentResolve({ actionId, timedOut });
+    }
+
+    // Process next item in queue
+    this.processQueue();
+  }
+
+  private handleDismiss(): void {
+    this.handleAction('dismissed', false);
+  }
+
+  public async disconnectedCallback(): Promise<void> {
+    await super.disconnectedCallback();
+    this.clearTimeoutInterval();
+  }
+}

ts_web/elements/dees-actionbar/index.ts

@@ -0,0 +1,2 @@
+export * from './dees-actionbar.js';
+export * from './actionbar.interfaces.js';

ts_web/elements/index.ts

@@ -14,6 +14,7 @@ export * from './00group-runtime/index.js';
 export * from './00group-simple/index.js';
 
 // Standalone Components
+export * from './dees-actionbar/index.js';
 export * from './dees-badge/index.js';
 export * from './dees-chips/index.js';
 export * from './dees-contextmenu/index.js';